Commit eccbb353 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

*) mod_ssl: clear *SSL errors before loading certificates and checking 

     afterwards. Otherwise errors are reported when other SSL using modules
     are in play. Fixes PR 62880. [Michael Kaufmann]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1845768 13f79535-47bb-0310-9956-ffa450edef68
parent 42844402

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



  *) mod_ssl: clear *SSL errors before loading certificates and checking

     afterwards. Otherwise errors are reported when other SSL using modules

     are in play. Fixes PR 62880. [Michael Kaufmann]



  *) mod_ssl: Correctly merge configurations that have client certificates set

     by SSLProxyMachineCertificate{File|Path}. [Ruediger Pluem]

modules/ssl/ssl_engine_init.c

+2 −0
Changes for modules/ssl/ssl_engine_init.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1063,8 +1063,10 @@ static int use_certificate_chain( 
        ctx->extra_certs = NULL;

    }

#endif



    /* create new extra chain by loading the certs */

    n = 0;

    ERR_clear_error();

    while ((x509 = PEM_read_bio_X509(bio, NULL, cb, NULL)) != NULL) {

        if (!SSL_CTX_add_extra_chain_cert(ctx, x509)) {

            X509_free(x509);

modules/ssl/ssl_util_ocsp.c

+2 −0
Changes for modules/ssl/ssl_util_ocsp.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -363,7 +363,9 @@ static STACK_OF(X509) *modssl_read_ocsp_certificates(const char *file) 
        BIO_free(bio);

        return NULL;

    }



    /* create new extra chain by loading the certs */

    ERR_clear_error();

    while ((x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL)) != NULL) {

        if (!other_certs) {

                other_certs = sk_X509_new_null();