diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-02-03 22:33:51 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-02-03 22:33:51 +0000 |
commit | ef5842b5f718437b504e801258025b188f764380 (patch) | |
tree | b72d239b90d315f15e2a9c5795800d016884e4b0 /src | |
parent | 3752e85bad45e98383ea1c9e7e7dbaf13f41da7e (diff) | |
download | postgresql-ef5842b5f718437b504e801258025b188f764380.tar.gz postgresql-ef5842b5f718437b504e801258025b188f764380.zip |
#ifdef out stuff that shouldn't be compiled when not USE_SSL.
Curious that gcc doesn't complain about unreferenced static variables.
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/libpq/be-secure.c | 6 | ||||
-rw-r--r-- | src/interfaces/libpq/fe-secure.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index 81bfb920bf6..d599defe49e 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.24 2003/01/08 23:34:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.25 2003/02/03 22:29:11 tgl Exp $ * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database @@ -167,6 +167,8 @@ static SSL_CTX *SSL_context = NULL; * Protocols" (http://www.skip-vpn.org/spec/numbers.html) * for suggestions. */ +#ifdef USE_SSL + static const char file_dh512[] = "-----BEGIN DH PARAMETERS-----\n\ MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak\n\ @@ -205,6 +207,8 @@ AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL\n\ KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=\n\ -----END DH PARAMETERS-----\n"; +#endif + /* ------------------------------------------------------------ */ /* Procedures common to all secure sessions */ /* ------------------------------------------------------------ */ diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index 6a37662321d..62ac69d0b4a 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.20 2003/01/08 23:18:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.21 2003/02/03 22:33:51 tgl Exp $ * * NOTES * The client *requires* a valid server certificate. Since @@ -156,6 +156,8 @@ static SSL_CTX *SSL_context = NULL; * It's not critical that users have EPH keys, but it doesn't * hurt and if it's missing someone will demand it, so.... */ +#ifdef USE_SSL + static const char file_dh512[] = "-----BEGIN DH PARAMETERS-----\n\ MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak\n\ @@ -194,6 +196,8 @@ AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL\n\ KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=\n\ -----END DH PARAMETERS-----\n"; +#endif + /* ------------------------------------------------------------ */ /* Procedures common to all secure sessions */ /* ------------------------------------------------------------ */ |