You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2002/03/27 18:02:56 UTC
cvs commit: httpd-2.0/modules/ssl config.m4 ssl_engine_config.c ssl_engine_kernel.c ssl_toolkit_compat.h
dougm 02/03/27 09:02:56
Modified: modules/ssl config.m4 ssl_engine_config.c
ssl_engine_kernel.c ssl_toolkit_compat.h
Log:
add configure checks for ssl functions:
-SSL_set_state: macro in OpenSSL, might be a function in a patched sslc
-SSL_set_cert_store: patch submitted to OpenSSL, might be applied to
OpenSSL or sslc
Revision Changes Path
1.10 +2 -0 httpd-2.0/modules/ssl/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/config.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config.m4 13 Mar 2002 20:47:54 -0000 1.9
+++ config.m4 27 Mar 2002 17:02:56 -0000 1.10
@@ -78,6 +78,8 @@
dnl # hook module into the Autoconf mechanism (--enable-ssl option)
APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [
APACHE_CHECK_SSL_TOOLKIT
+ AC_CHECK_FUNCS(SSL_set_state)
+ AC_CHECK_FUNCS(SSL_set_cert_store)
])
dnl # end of module specific part
1.45 +6 -0 httpd-2.0/modules/ssl/ssl_engine_config.c
Index: ssl_engine_config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ssl_engine_config.c 27 Mar 2002 03:27:13 -0000 1.44
+++ ssl_engine_config.c 27 Mar 2002 17:02:56 -0000 1.45
@@ -665,6 +665,12 @@
#define NO_PER_DIR_SSL_CA \
"Your ssl library does not have support for per-directory CA"
+#ifdef HAVE_SSL_SET_CERT_STORE
+# define MODSSL_HAVE_SSL_SET_CERT_STORE 1
+#else
+# define MODSSL_HAVE_SSL_SET_CERT_STORE 0
+#endif
+
#define MODSSL_SET_CA(f) \
if (cmd->path) \
if (MODSSL_HAVE_SSL_SET_CERT_STORE) \
1.59 +2 -2 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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ssl_engine_kernel.c 27 Mar 2002 03:11:22 -0000 1.58
+++ ssl_engine_kernel.c 27 Mar 2002 17:02:56 -0000 1.59
@@ -578,7 +578,7 @@
* used SSL_CTX_set_cert_store which is not thread safe.
*/
-#if MODSSL_HAVE_SSL_SET_CERT_STORE
+#ifdef HAVE_SSL_SET_CERT_STORE
/*
* check if per-dir and per-server config field are not the same.
* if f is defined in per-dir and not defined in per-server
@@ -629,7 +629,7 @@
"Changed client verification locations "
"will force renegotiation");
}
-#endif /* MODSSL_HAVE_SSL_SET_CERT_STORE */
+#endif /* HAVE_SSL_SET_CERT_STORE */
/*
* SSL renegotiations in conjunction with HTTP
1.19 +1 -2 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ssl_toolkit_compat.h 27 Mar 2002 06:01:03 -0000 1.18
+++ ssl_toolkit_compat.h 27 Mar 2002 17:02:56 -0000 1.19
@@ -78,9 +78,8 @@
#define modssl_PEM_read_bio_PrivateKey(b, k, cb, arg) \
PEM_read_bio_PrivateKey(b, k, cb)
-/* XXX: add configure check */
#ifndef HAVE_SSL_SET_STATE
-#define SSL_set_state(ssl, state)
+#define SSL_set_state(ssl, state) /* XXX: should throw an error */
#endif
#define modssl_set_cipher_list(ssl, l) \