Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit16c46d5

Browse files
committed
Go over all OpenSSL return values and make sure we compare them
to the documented API value. The previous code got it right asit's implemented, but accepted too much/too little compared tothe API documentation.Per comment from Zdenek Kotala.
1 parent1ab7dc0 commit16c46d5

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.89 2009/01/01 17:23:42 momjian Exp $
14+
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.90 2009/01/28 15:06:47 mha Exp $
1515
*
1616
* Since the server static private key ($DataDir/server.key)
1717
* will normally be stored unencrypted so that the database
@@ -729,9 +729,9 @@ initialize_SSL(void)
729729
/*
730730
* Load and verify certificate and private key
731731
*/
732-
if (!SSL_CTX_use_certificate_file(SSL_context,
732+
if (SSL_CTX_use_certificate_file(SSL_context,
733733
SERVER_CERT_FILE,
734-
SSL_FILETYPE_PEM))
734+
SSL_FILETYPE_PEM)!=1)
735735
ereport(FATAL,
736736
(errcode(ERRCODE_CONFIG_FILE_ERROR),
737737
errmsg("could not load server certificate file \"%s\": %s",
@@ -760,14 +760,14 @@ initialize_SSL(void)
760760
errdetail("Permissions should be u=rw (0600) or less.")));
761761
#endif
762762

763-
if (!SSL_CTX_use_PrivateKey_file(SSL_context,
763+
if (SSL_CTX_use_PrivateKey_file(SSL_context,
764764
SERVER_PRIVATE_KEY_FILE,
765-
SSL_FILETYPE_PEM))
765+
SSL_FILETYPE_PEM)!=1)
766766
ereport(FATAL,
767767
(errmsg("could not load private key file \"%s\": %s",
768768
SERVER_PRIVATE_KEY_FILE,SSLerrmessage())));
769769

770-
if (!SSL_CTX_check_private_key(SSL_context))
770+
if (SSL_CTX_check_private_key(SSL_context)!=1)
771771
ereport(FATAL,
772772
(errmsg("check of private key failed: %s",
773773
SSLerrmessage())));
@@ -800,7 +800,7 @@ initialize_SSL(void)
800800
ROOT_CERT_FILE)));
801801
}
802802
}
803-
elseif (!SSL_CTX_load_verify_locations(SSL_context,ROOT_CERT_FILE,NULL))
803+
elseif (SSL_CTX_load_verify_locations(SSL_context,ROOT_CERT_FILE,NULL)!=1)
804804
{
805805
/*
806806
* File was there, but we could not load it. This means the file is somehow
@@ -823,7 +823,7 @@ initialize_SSL(void)
823823
if (cvstore)
824824
{
825825
/* Set the flags to check against the complete CRL chain */
826-
if (X509_STORE_load_locations(cvstore,ROOT_CRL_FILE,NULL)!=0)
826+
if (X509_STORE_load_locations(cvstore,ROOT_CRL_FILE,NULL)==1)
827827
/* OpenSSL 0.96 does not support X509_V_FLAG_CRL_CHECK */
828828
#ifdefX509_V_FLAG_CRL_CHECK
829829
X509_STORE_set_flags(cvstore,

‎src/interfaces/libpq/fe-secure.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.118 2009/01/19 17:17:50 tgl Exp $
14+
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.119 2009/01/28 15:06:47 mha Exp $
1515
*
1616
* NOTES
1717
*
@@ -757,7 +757,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
757757
}
758758

759759
/* verify that the cert and key go together */
760-
if (!X509_check_private_key(*x509,*pkey))
760+
if (X509_check_private_key(*x509,*pkey)!=1)
761761
{
762762
char*err=SSLerrmessage();
763763

@@ -1004,7 +1004,7 @@ initialize_SSL(PGconn *conn)
10041004
{
10051005
X509_STORE*cvstore;
10061006

1007-
if (!SSL_CTX_load_verify_locations(SSL_context,fnbuf,NULL))
1007+
if (SSL_CTX_load_verify_locations(SSL_context,fnbuf,NULL)!=1)
10081008
{
10091009
char*err=SSLerrmessage();
10101010

@@ -1023,7 +1023,7 @@ initialize_SSL(PGconn *conn)
10231023
snprintf(fnbuf,sizeof(fnbuf),"%s/%s",homedir,ROOT_CRL_FILE);
10241024

10251025
/* setting the flags to check against the complete CRL chain */
1026-
if (X509_STORE_load_locations(cvstore,fnbuf,NULL)!=0)
1026+
if (X509_STORE_load_locations(cvstore,fnbuf,NULL)==1)
10271027
/* OpenSSL 0.96 does not support X509_V_FLAG_CRL_CHECK */
10281028
#ifdefX509_V_FLAG_CRL_CHECK
10291029
X509_STORE_set_flags(cvstore,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp