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 04:56:02 UTC
cvs commit: httpd-2.0/modules/ssl ssl_toolkit_compat.h ssl_util_ssl.c
dougm 02/03/26 19:56:02
Modified: modules/ssl ssl_toolkit_compat.h ssl_util_ssl.c
Log:
toolkit compat for PEM_read_bio_X509
Revision Changes Path
1.14 +6 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ssl_toolkit_compat.h 27 Mar 2002 03:46:36 -0000 1.13
+++ ssl_toolkit_compat.h 27 Mar 2002 03:56:02 -0000 1.14
@@ -46,7 +46,9 @@
#define MODSSL_BIO_CB_ARG_TYPE const char
#define MODSSL_CRYPTO_CB_ARG_TYPE const char
-#define modssl_X509_verify_cert(c) X509_verify_cert(c)
+#define modssl_X509_verify_cert X509_verify_cert
+
+#define modssl_PEM_read_bio_X509 PEM_read_bio_X509
#define modssl_set_cipher_list SSL_set_cipher_list
@@ -65,6 +67,9 @@
#define MODSSL_CRYPTO_CB_ARG_TYPE char
#define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)
+
+#define modssl_PEM_read_bio_X509(b, x, cb, arg) \
+ PEM_read_bio_X509(b, x, cb)
/* XXX: add configure check */
#ifndef HAVE_SSL_SET_STATE
1.14 +1 -5 httpd-2.0/modules/ssl/ssl_util_ssl.c
Index: ssl_util_ssl.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util_ssl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ssl_util_ssl.c 27 Mar 2002 01:28:20 -0000 1.13
+++ ssl_util_ssl.c 27 Mar 2002 03:56:02 -0000 1.14
@@ -486,11 +486,7 @@
}
/* optionally skip a leading server certificate */
if (skipfirst) {
-#if SSL_LIBRARY_VERSION < 0x00904000
- if ((x509 = PEM_read_bio_X509(bio, NULL, cb)) == NULL) {
-#else
- if ((x509 = PEM_read_bio_X509(bio, NULL, cb, NULL)) == NULL) {
-#endif
+ if ((x509 = modssl_PEM_read_bio_X509(bio, NULL, cb, NULL)) == NULL) {
BIO_free(bio);
return -1;
}