You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2003/04/06 00:45:29 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_kernel.c ssl_toolkit_compat.h
wrowe 2003/04/05 14:45:29
Modified: modules/ssl mod_ssl.h ssl_engine_kernel.c
ssl_toolkit_compat.h
Log:
Solve SSL-C breakage introduced in mod_ssl.h rev 1.129 and
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.
Revision Changes Path
1.131 +1 -1 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- mod_ssl.h 4 Apr 2003 04:02:01 -0000 1.130
+++ mod_ssl.h 5 Apr 2003 22:45:28 -0000 1.131
@@ -590,7 +590,7 @@
int ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
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 */
void ssl_scache_init(server_rec *, apr_pool_t *);
1.92 +1 -1 httpd-2.0/modules/ssl/ssl_engine_kernel.c
Index: ssl_engine_kernel.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ssl_engine_kernel.c 5 Apr 2003 19:04:44 -0000 1.91
+++ ssl_engine_kernel.c 5 Apr 2003 22:45:28 -0000 1.92
@@ -1754,7 +1754,7 @@
* SSL handshake and does SSL record layer stuff. We use it to
* 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;
server_rec *s;
1.31 +2 -0 httpd-2.0/modules/ssl/ssl_toolkit_compat.h
Index: ssl_toolkit_compat.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_toolkit_compat.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ssl_toolkit_compat.h 3 Apr 2003 04:54:20 -0000 1.30
+++ ssl_toolkit_compat.h 5 Apr 2003 22:45:28 -0000 1.31
@@ -107,6 +107,7 @@
#define MODSSL_BIO_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_PCHAR_CAST
@@ -161,6 +162,7 @@
#define MODSSL_BIO_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_PCHAR_CAST (char *)