Commitef5842b

committed

#ifdef out stuff that shouldn't be compiled when not USE_SSL.

Curious that gcc doesn't complain about unreferenced static variables.

1 parent3752e85 commitef5842bCopy full SHA for ef5842b

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.24 2003/01/08 23:34:22 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.25 2003/02/03 22:29:11 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* Since the server static private key ($DataDir/server.key)`
`17`	`17`	`* will normally be stored unencrypted so that the database`
`@@ -167,6 +167,8 @@ static SSL_CTX *SSL_context = NULL;`
`167`	`167`	`*Protocols" (http://www.skip-vpn.org/spec/numbers.html)`
`168`	`168`	`*for suggestions.`
`169`	`169`	`*/`
	`170`	`+#ifdefUSE_SSL`
	`171`	`+`
`170`	`172`	`staticconstcharfile_dh512[]=`
`171`	`173`	`"-----BEGIN DH PARAMETERS-----\n\`
`172`	`174`	`MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak\n\`
`@@ -205,6 +207,8 @@ AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL\n\`
`205`	`207`	`KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=\n\`
`206`	`208`	`-----END DH PARAMETERS-----\n";`
`207`	`209`
	`210`	`+#endif`
	`211`	`+`
`208`	`212`	`/* ------------------------------------------------------------ */`
`209`	`213`	`/* Procedures common to all secure sessions*/`
`210`	`214`	`/* ------------------------------------------------------------ */`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.20 2003/01/08 23:18:25 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.21 2003/02/03 22:33:51 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* The client requires a valid server certificate. Since`
`@@ -156,6 +156,8 @@ static SSL_CTX *SSL_context = NULL;`
`156`	`156`	`*It's not critical that users have EPH keys, but it doesn't`
`157`	`157`	`*hurt and if it's missing someone will demand it, so....`
`158`	`158`	`*/`
	`159`	`+#ifdefUSE_SSL`
	`160`	`+`
`159`	`161`	`staticconstcharfile_dh512[]=`
`160`	`162`	`"-----BEGIN DH PARAMETERS-----\n\`
`161`	`163`	`MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak\n\`
`@@ -194,6 +196,8 @@ AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL\n\`
`194`	`196`	`KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=\n\`
`195`	`197`	`-----END DH PARAMETERS-----\n";`
`196`	`198`
	`199`	`+#endif`
	`200`	`+`
`197`	`201`	`/* ------------------------------------------------------------ */`
`198`	`202`	`/* Procedures common to all secure sessions*/`
`199`	`203`	`/* ------------------------------------------------------------ */`

Comments

(0)