Commit 27c58f59 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

toolkit compat for PEM_read_bio_X509 


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

ssl_toolkit_compat.h

+6 −1
Changes for ssl_toolkit_compat.h: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ 
#define MODSSL_BIO_CB_ARG_TYPE const char

#define MODSSL_CRYPTO_CB_ARG_TYPE const char



#define modssl_X509_verify_cert(c) X509_verify_cert(c)

#define modssl_X509_verify_cert X509_verify_cert



#define modssl_PEM_read_bio_X509 PEM_read_bio_X509



#define modssl_set_cipher_list SSL_set_cipher_list
@@ -66,6 +68,9 @@ 


#define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)



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

   PEM_read_bio_X509(b, x, cb)



/* XXX: add configure check */

#ifndef HAVE_SSL_SET_STATE

#define SSL_set_state(ssl, state)

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
@@ -486,11 +486,7 @@ int SSL_CTX_use_certificate_chain( 
    }

    /* optionally skip a leading server certificate */

    if (skipfirst) {

#if SSL_LIBRARY_VERSION < 0x00904000

        if ((x509 = PEM_read_bio_X509(bio, NULL, cb)) == NULL) {

#else

        if ((x509 = PEM_read_bio_X509(bio, NULL, cb, NULL)) == NULL) {

#endif

        if ((x509 = modssl_PEM_read_bio_X509(bio, NULL, cb, NULL)) == NULL) {

            BIO_free(bio);

            return -1;

        }