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

add/use EVP_PKEY_reference_inc and X509_reference_inc compat macros 

to get these changes working with sslc


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

ssl_engine_kernel.c

+2 −2
Changes for ssl_engine_kernel.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1578,9 +1578,9 @@ static void modssl_proxy_info_log(server_rec *s, 
 */

#define modssl_set_cert_info(info, cert, pkey) \

    *cert = info->x509; \

    X509_reference_inc(*cert); \

    *pkey = info->x_pkey->dec_pkey; \

    CRYPTO_add(&((*cert)->references), +1, CRYPTO_LOCK_X509_PKEY); \

    CRYPTO_add(&((*pkey)->references), +1, CRYPTO_LOCK_X509_PKEY)

    EVP_PKEY_reference_inc(*pkey)



int ssl_callback_proxy_cert(SSL *ssl, X509 **x509, EVP_PKEY **pkey) 

{

ssl_toolkit_compat.h

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


#define modssl_set_cipher_list SSL_set_cipher_list



#define EVP_PKEY_reference_inc(pkey) \

   CRYPTO_add(&((pkey)->references), +1, CRYPTO_LOCK_X509_PKEY)



#define X509_reference_inc(cert) \

   CRYPTO_add(&((cert)->references), +1, CRYPTO_LOCK_X509)



#define HAVE_SSL_RAND_EGD /* since 9.5.1 */



#define HAVE_SSL_X509V3_EXT_d2i