From 7bdc3a4cebf164faba5faa915a012d0f0f91264d Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Sun, 27 Sep 2009 02:54:07 +0000 Subject: [PATCH] fixed compatibility to Openssl < 0.9.7g. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@819245 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_vars.c | 4 ++-- modules/ssl/ssl_toolkit_compat.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index cceb2bb4ef..f1683fa867 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -636,7 +636,7 @@ static char *ssl_var_lookup_ssl_cipher(apr_pool_t *p, conn_rec *c, char *var) ssl_var_lookup_ssl_cipher_bits(ssl, &usekeysize, &algkeysize); if (ssl && strEQ(var, "")) { - const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl); + MODSSL_SSL_CIPHER_CONST SSL_CIPHER *cipher = SSL_get_current_cipher(ssl); result = (cipher != NULL ? (char *)SSL_CIPHER_get_name(cipher) : NULL); } else if (strcEQ(var, "_EXPORT")) @@ -657,7 +657,7 @@ static char *ssl_var_lookup_ssl_cipher(apr_pool_t *p, conn_rec *c, char *var) static void ssl_var_lookup_ssl_cipher_bits(SSL *ssl, int *usekeysize, int *algkeysize) { - const SSL_CIPHER *cipher; + MODSSL_SSL_CIPHER_CONST SSL_CIPHER *cipher; *usekeysize = 0; *algkeysize = 0; diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h index 29dff3aaa7..66056ad8bd 100644 --- a/modules/ssl/ssl_toolkit_compat.h +++ b/modules/ssl/ssl_toolkit_compat.h @@ -99,8 +99,10 @@ /** ...shifting sands of openssl... */ #if (OPENSSL_VERSION_NUMBER >= 0x0090707f) # define MODSSL_D2I_SSL_SESSION_CONST const +# define MODSSL_SSL_CIPHER_CONST const #else # define MODSSL_D2I_SSL_SESSION_CONST +# define MODSSL_SSL_CIPHER_CONST #endif #if (OPENSSL_VERSION_NUMBER >= 0x00908000) -- 2.40.0