www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Enforce OpenSSL 0.9.7 as a minimum requirement in configure, and

Browse Source 
remove #ifdef'ed code which was relevant for earlier versions only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kaspar Brand
2011-08-07 10:36:57 +00:00
parent 7bd59fd67a
commit 2453c22a1a
12 changed files with 20 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ssl/ssl_engine_kernel.c
View File

@@ -1471,7 +1471,7 @@ int ssl_callback_SSLVerify(int ok, X509_STORE_CTX *ctx)
errnum = X509_STORE_CTX_get_error(ctx);
}
#ifdef HAVE_OCSP
#ifndef OPENSSL_NO_OCSP
/* If there was an optional verification error, it's not
* possible to perform OCSP validation since the issuer may be
* missing/untrusted. Fail in that case. */
@@ -2005,7 +2005,7 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
}
/* Dump debugginfo trace to the log file. */
static void log_tracing_state(MODSSL_INFO_CB_ARG_TYPE ssl, conn_rec *c,
static void log_tracing_state(const SSL *ssl, conn_rec *c,
server_rec *s, int where, int rc)
{
/*
@@ -2078,7 +2078,7 @@ static void log_tracing_state(MODSSL_INFO_CB_ARG_TYPE ssl, conn_rec *c,
* client-initiated renegotiations, and for dumping everything to the
* log.
*/
void ssl_callback_Info(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
void ssl_callback_Info(const SSL *ssl, int where, int rc)
{
conn_rec *c;
server_rec *s;