postgres.git / summary / log / commit / refs

commit    4d3ecbfee9dbe34fe20991a5a402b1f949814928
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Fri Oct 07 09:53:40 2016 +0000

    Clear OpenSSL error queue after failed X509_STORE_load_locations() call.
    
    Leaving the error in the error queue used to be harmless, because the
    X509_STORE_load_locations() call used to be the last step in
    initialize_SSL(), and we would clear the queue before the next
    SSL_connect() call. But previous commit moved things around. The symptom
    was that if a CRL file was not found, and one of the subsequent
    initialization steps, like loading the client certificate or private key,
    failed, we would incorrectly print the "no such file" error message from
    the earlier X509_STORE_load_locations() call as the reason.
    
    Backpatch to all supported versions, like the previous patch.


 src/interfaces/libpq/fe-secure-openssl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index 18300f7776f..cdb006409db 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -1000,6 +1000,7 @@ initialize_SSL(PGconn *conn)
 #endif
 			}
 			/* if not found, silently ignore;  we do not require CRL */
+			ERR_clear_error();
 		}
 		have_rootcert = true;
 	}


[parent: 341acf235943]