Commit 4e0bf2de authored by Jeff Trawick's avatar Jeff Trawick
Browse files

fix the interface to PEM_read_bio_X509() with OpenSSL versions older than 0.9.4. 

Submitted by:	Madhu Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@97308 13f79535-47bb-0310-9956-ffa450edef68
parent 9b7afcf5

ssl_toolkit_compat.h

+5 −1
Changes for ssl_toolkit_compat.h: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -97,7 +97,11 @@ 


#define modssl_X509_verify_cert X509_verify_cert



#define modssl_PEM_read_bio_X509 PEM_read_bio_X509

#if (OPENSSL_VERSION_NUMBER < 0x00904000)

#define modssl_PEM_read_bio_X509(b, x, cb, arg) PEM_read_bio_X509(b, x, cb)

#else

#define modssl_PEM_read_bio_X509(b, x, cb, arg) PEM_read_bio_X509(b, x, cb, arg)

#endif



#define modssl_PEM_X509_INFO_read_bio PEM_X509_INFO_read_bio

ssl_util_ssl.c

+1 −5
Changes for ssl_util_ssl.c: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -523,11 +523,7 @@ int SSL_CTX_use_certificate_chain( 
    }

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

    n = 0;

#if SSL_LIBRARY_VERSION < 0x00904000

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

#else

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

#endif

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

        if (!SSL_CTX_add_extra_chain_cert(ctx, x509)) { 

            X509_free(x509);

            BIO_free(bio);