Commit 91d568e9 authored by Tom Lane's avatar Tom Lane

Fix the sense of the test on DH_check()'s return value. This was preventing

custom-generated DH parameters from actually being used by the server.
Found by Michael Fuhr.
parent 2246e317
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.69 2006/05/06 02:24:39 momjian Exp $ * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.70 2006/05/12 22:44:36 tgl Exp $
* *
* Since the server static private key ($DataDir/server.key) * Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database * will normally be stored unencrypted so that the database
...@@ -524,7 +524,7 @@ load_dh_file(int keylength) ...@@ -524,7 +524,7 @@ load_dh_file(int keylength)
/* make sure the DH parameters are usable */ /* make sure the DH parameters are usable */
if (dh != NULL) if (dh != NULL)
{ {
if (DH_check(dh, &codes)) if (DH_check(dh, &codes) == 0)
{ {
elog(LOG, "DH_check error (%s): %s", fnbuf, SSLerrmessage()); elog(LOG, "DH_check error (%s): %s", fnbuf, SSLerrmessage());
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment