You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by kb...@apache.org on 2013/11/23 16:01:08 UTC
svn commit: r1544812 - /httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
Author: kbrand
Date: Sat Nov 23 15:01:08 2013
New Revision: 1544812
URL: http://svn.apache.org/r1544812
Log:
Followup to r1544774: do not ignore failures from ssl_server_import_{cert,key}
in ssl_init_server_certs
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=1544812&r1=1544811&r2=1544812&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Sat Nov 23 15:01:08 2013
@@ -886,7 +886,7 @@ static apr_status_t ssl_server_import_ce
X509 *cert;
if (!(asn1 = ssl_asn1_table_get(mc->tPublicCert, id))) {
- return APR_EGENERAL;
+ return APR_NOTFOUND;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02232)
@@ -941,7 +941,7 @@ static apr_status_t ssl_server_import_ke
pkey_type = (idx == SSL_AIDX_RSA) ? EVP_PKEY_RSA : EVP_PKEY_DSA;
if (!(asn1 = ssl_asn1_table_get(mc->tPrivateKey, id))) {
- return APR_EGENERAL;
+ return APR_NOTFOUND;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02236)
@@ -1058,9 +1058,18 @@ static apr_status_t ssl_init_server_cert
#endif
have_rsa = ssl_server_import_cert(s, mctx, rsa_id, SSL_AIDX_RSA);
+ if (have_rsa != APR_SUCCESS && have_rsa != APR_NOTFOUND) {
+ return have_rsa;
+ }
have_dsa = ssl_server_import_cert(s, mctx, dsa_id, SSL_AIDX_DSA);
+ if (have_dsa != APR_SUCCESS && have_dsa != APR_NOTFOUND) {
+ return have_dsa;
+ }
#ifdef HAVE_ECC
have_ecc = ssl_server_import_cert(s, mctx, ecc_id, SSL_AIDX_ECC);
+ if (have_ecc != APR_SUCCESS && have_ecc != APR_NOTFOUND) {
+ return have_ecc;
+ }
#endif
if ((have_rsa != APR_SUCCESS) && (have_dsa != APR_SUCCESS)
@@ -1079,9 +1088,18 @@ static apr_status_t ssl_init_server_cert
}
have_rsa = ssl_server_import_key(s, mctx, rsa_id, SSL_AIDX_RSA);
+ if (have_rsa != APR_SUCCESS && have_rsa != APR_NOTFOUND) {
+ return have_rsa;
+ }
have_dsa = ssl_server_import_key(s, mctx, dsa_id, SSL_AIDX_DSA);
+ if (have_dsa != APR_SUCCESS && have_dsa != APR_NOTFOUND) {
+ return have_dsa;
+ }
#ifdef HAVE_ECC
have_ecc = ssl_server_import_key(s, mctx, ecc_id, SSL_AIDX_ECC);
+ if (have_ecc != APR_SUCCESS && have_ecc != APR_NOTFOUND) {
+ return have_ecc;
+ }
#endif
if ((have_rsa != APR_SUCCESS) && (have_dsa != APR_SUCCESS)