httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r1700409 - /httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
Date Tue, 01 Sep 2015 07:33:34 GMT
Author: rpluem
Date: Tue Sep  1 07:33:34 2015
New Revision: 1700409

URL: http://svn.apache.org/r1700409
Log:
* mod_ssl: Fix spurious errors when loading certificate chain
  2.2.x uses a home grown version of SSL_CTX_use_certificate_chain_file
  called SSL_CTX_use_certificate_chain() which also needs the
  ERR_clear_error() call.
  trunk patch: N/A, but similar to https://svn.apache.org/r1588427

PR: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794383
Submitted by: sf
Reviewed by: sf, rpluem, ylavic


Modified:
    httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c

Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c?rev=1700409&r1=1700408&r2=1700409&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c Tue Sep  1 07:33:34 2015
@@ -689,6 +689,7 @@ static void ssl_init_ctx_cert_chain(serv
         }
     }
 
+    ERR_clear_error();
     n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
                                       (char *)chain,
                                       skip_first, NULL);



Mime
View raw message