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

Solve SSL-C breakage introduced in mod_ssl.h rev 1.129 and

Browse Source 
ssl_engine_kernel.c rev 1.88.  SSL* is not const under SSL-C.

  I've confirmed Jeff's comment that the original patch doesn't harm
  earlier OpenSSL versions which declared no arguments at all.

  I suspect now that we could fold
     #define MODSSL_BIO_CB_ARG_TYPE const char
     #define MODSSL_CRYPTO_CB_ARG_TYPE const char
     #define MODSSL_INFO_CB_ARG_TYPE const SSL*
  into a single MODSSL_CB_ARG_CONST define, but this works for now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99263 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2003-04-05 22:45:28 +00:00
parent 26b6442ad9
commit 474812c956
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/mod_ssl.h
View File

@@ -590,7 +590,7 @@ int ssl_callback_proxy_cert(SSL *ssl, MODSSL_CLIENT_CERT_CB_ARG_TYPE **
int ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *); int ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *); SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
void ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *); void ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
void ssl_callback_LogTracingState(const SSL *, int, int); void ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE SSL *, int, int);
/* Session Cache Support */ /* Session Cache Support */
void ssl_scache_init(server_rec *, apr_pool_t *); void ssl_scache_init(server_rec *, apr_pool_t *);

2
modules/ssl/ssl_engine_kernel.c
View File

@@ -1754,7 +1754,7 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
* SSL handshake and does SSL record layer stuff. We use it to * SSL handshake and does SSL record layer stuff. We use it to
* trace OpenSSL's processing in out SSL logfile. * trace OpenSSL's processing in out SSL logfile.
*/ */
void ssl_callback_LogTracingState(const SSL *ssl, int where, int rc) void ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE ssl, int where, int rc)
{ {
conn_rec *c; conn_rec *c;
server_rec *s; server_rec *s;

2
modules/ssl/ssl_toolkit_compat.h
View File

@@ -107,6 +107,7 @@
#define MODSSL_BIO_CB_ARG_TYPE const char #define MODSSL_BIO_CB_ARG_TYPE const char
#define MODSSL_CRYPTO_CB_ARG_TYPE const char #define MODSSL_CRYPTO_CB_ARG_TYPE const char
#define MODSSL_INFO_CB_ARG_TYPE const SSL*
#define MODSSL_CLIENT_CERT_CB_ARG_TYPE X509 #define MODSSL_CLIENT_CERT_CB_ARG_TYPE X509
#define MODSSL_PCHAR_CAST #define MODSSL_PCHAR_CAST
@@ -161,6 +162,7 @@ typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*);
#define MODSSL_BIO_CB_ARG_TYPE char #define MODSSL_BIO_CB_ARG_TYPE char
#define MODSSL_CRYPTO_CB_ARG_TYPE char #define MODSSL_CRYPTO_CB_ARG_TYPE char
#define MODSSL_INFO_CB_ARG_TYPE SSL*
#define MODSSL_CLIENT_CERT_CB_ARG_TYPE void #define MODSSL_CLIENT_CERT_CB_ARG_TYPE void
#define MODSSL_PCHAR_CAST (char *) #define MODSSL_PCHAR_CAST (char *)