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 06:58:31 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_toolkit_compat.h
dougm 02/03/26 21:58:31
Modified: modules/ssl mod_ssl.h ssl_toolkit_compat.h
Log:
sslc 1.x does not have an x509v3.h
Revision Changes Path
1.90 +4 -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.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mod_ssl.h 27 Mar 2002 02:28:15 -0000 1.89
+++ mod_ssl.h 27 Mar 2002 05:58:31 -0000 1.90
@@ -116,7 +116,6 @@
#include <ssl.h>
#include <err.h>
#include <x509.h>
-#include <x509v3.h>
#include <pem.h>
#include <crypto.h>
#include <evp.h>
@@ -126,6 +125,10 @@
#endif
#include "ssl_toolkit_compat.h"
+
+#ifdef HAVE_SSL_X509V3_H
+#include <x509v3.h>
+#endif
/* mod_ssl headers */
#include "ssl_expr.h"
1.17 +8 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ssl_toolkit_compat.h 27 Mar 2002 05:50:56 -0000 1.16
+++ ssl_toolkit_compat.h 27 Mar 2002 05:58:31 -0000 1.17
@@ -101,6 +101,10 @@
#define modssl_set_verify(ssl, verify, cb) \
SSL_set_verify(ssl, verify)
+#else /* SSLC 1.x */
+
+#define NO_SSL_X509V3_H
+
#endif
/* BEGIN GENERATED SECTION */
@@ -133,6 +137,10 @@
#ifndef modssl_set_verify
#define modssl_set_verify(ssl, verify, cb) \
SSL_set_verify(ssl, verify, cb)
+#endif
+
+#ifndef NO_SSL_X509V3_H
+#define HAVE_SSL_X509V3_H
#endif
#endif /* SSL_TOOLKIT_COMPAT_H */