8000 Fix SSL DEBUG levels to match CVS elog flags. · linearregression/postgres@7005e4c · GitHub
[go: up one dir, main page]
Skip to content

Commit 7005e4c

Browse files
bmomjianbmomjian
committed
Fix SSL DEBUG levels to match CVS elog flags.
1 parent 0bb61f4 commit 7005e4c

File tree

1 file changed

+29
-33
lines changed

1 file changed

+29
-33
lines changed

‎src/backend/libpq/be-secure.c

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.7 2002/06/17 07:33:25 momjian Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.8 2002/06/17 15:19:28 momjian Exp $
1515
*
1616
* Since the server static private key ($DataDir/server.key)
1717
* will normally be stored unencrypted so that the database
@@ -396,7 +396,7 @@ load_dh_file (int keylength)
396396
/* is the prime the correct size? */
397397
if (dh != NULL && 8*DH_size(dh) < keylength)
398398
{
399-
elog(DEBUG1, "DH errors (%s): %d bits expected, %d bits found",
399+
elog(LOG, "DH errors (%s): %d bits expected, %d bits found",
400400
fnbuf, keylength, 8*DH_size(dh));
401401
dh = NULL;
402402
}
@@ -406,18 +406,18 @@ load_dh_file (int keylength)
406406
{
407407
if (DH_check(dh, &codes))
408408
{
409-
elog(DEBUG1, "DH_check error (%s): %s", fnbuf, SSLerrmessage());
409+
elog(LOG, "DH_check error (%s): %s", fnbuf, SSLerrmessage());
410410
return NULL;
411411
}
412412
if (codes & DH_CHECK_P_NOT_PRIME)
413413
{
414-
elog(DEBUG1, "DH error (%s): p is not prime", fnbuf);
414+
elog(LOG, "DH error (%s): p is not prime", fnbuf);
415415
return NULL;
416416
}
417417
if ((codes & DH_NOT_SUITABLE_GENERATOR) &&
418418
(codes & DH_CHECK_P_NOT_SAFE_PRIME))
419419
{
420-
elog(DEBUG1,
420+
elog(LOG,
421421
"DH error (%s): neither suitable generator or safe prime",
422422
fnbuf);
423423
return NULL;
@@ -547,36 +547,32 @@ verify_cb (int ok, X509_STORE_CTX *ctx)
547547
static void
548548
info_cb (SSL *ssl, int type, int args)
549549
{
550-
if (DebugLvl < 2)
551-
return;
552-
553550
switch (type)
554551
{
555-
case SSL_CB_HANDSHAKE_START:
556-
elog(DEBUG1, "SSL: handshake start");
557-
break;
558-
case SSL_CB_HANDSHAKE_DONE:
559-
elog(DEBUG1, "SSL: handshake done");
560-
break;
561-
case SSL_CB_ACCEPT_LOOP:
562-
if (DebugLvl >= 3)
563-
elog(DEBUG1, "SSL: accept loop");
564-
break;
565-
case SSL_CB_ACCEPT_EXIT:
566-
elog(DEBUG1, "SSL: accept exit (%d)", args);
567-
break;
568-
case SSL_CB_CONNECT_LOOP:
569-
elog(DEBUG1, "SSL: connect loop");
570-
break;
571-
case SSL_CB_CONNECT_EXIT:
572-
elog(DEBUG1, "SSL: connect exit (%d)", args);
573-
break;
574-
case SSL_CB_READ_ALERT:
575-
elog(DEBUG1, "SSL: read alert (0x%04x)", args);
576-
break;
577-
case SSL_CB_WRITE_ALERT:
578-
elog(DEBUG1, "SSL: write alert (0x%04x)", args);
579-
break;
552+
case SSL_CB_HANDSHAKE_START:
553+
elog(DEBUG3, "SSL: handshake start");
554+
break;
555+
case SSL_CB_HANDSHAKE_DONE:
556+
elog(DEBUG3, "SSL: handshake done");
557+
break;
558+
case SSL_CB_ACCEPT_LOOP:
559+
elog(DEBUG3, "SSL: accept loop");
560+
break;
561+
case SSL_CB_ACCEPT_EXIT:
562+
elog(DEBUG3, "SSL: accept exit (%d)", args);
563+
break;
564+
case SSL_CB_CONNECT_LOOP:
565+
elog(DEBUG3, "SSL: connect loop");
566+
break;
567+
case SSL_CB_CONNECT_EXIT:
568+
elog(DEBUG3, "SSL: connect exit (%d)", args);
569+
break;
570+
case SSL_CB_READ_ALERT:
571+
elog(DEBUG3, "SSL: read alert (0x%04x)", args);
572+
break;
573+
case SSL_CB_WRITE_ALERT:
574+
elog(DEBUG3, "SSL: write alert (0x%04x)", args);
575+
break;
580576
}
581577
}
582578

0 commit comments

Comments
 (0)
0