Commit d282836f authored by Doug MacEachern's avatar Doug MacEachern
Browse files

toolkit compat for PEM_read_bio_PrivateKey 


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

ssl_toolkit_compat.h

+5 −0
Changes for ssl_toolkit_compat.h: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 


#define modssl_PEM_read_bio_X509 PEM_read_bio_X509



#define modssl_PEM_read_bio_PrivateKey PEM_read_bio_PrivateKey



#define modssl_set_cipher_list SSL_set_cipher_list



#define HAVE_SSL_RAND_EGD /* since 9.5.1 */
@@ -71,6 +73,9 @@ 
#define modssl_PEM_read_bio_X509(b, x, cb, arg) \

   PEM_read_bio_X509(b, x, cb)



#define modssl_PEM_read_bio_PrivateKey(b, k, cb, arg) \

   PEM_read_bio_PrivateKey(b, k, cb)



/* XXX: add configure check */

#ifndef HAVE_SSL_SET_STATE

#define SSL_set_state(ssl, state)

ssl_util_ssl.c

+1 −1
Changes for ssl_util_ssl.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ EVP_PKEY *SSL_read_PrivateKey(char* filename, EVP_PKEY **key, int (*cb)(char*,in 
    /* 1. try PEM (= DER+Base64+headers) */

       if ((bioS=BIO_new_file(filename, "r")) == NULL)

               return NULL;

       rc = PEM_read_bio_PrivateKey(bioS, key, cb, s);

       rc = modssl_PEM_read_bio_PrivateKey(bioS, key, cb, s);

       BIO_free(bioS);



    if (rc == NULL) {