On Sun, Feb 06, 2000, Svenning S�rensen wrote:
> There seems to be a conflict between mod_ssl and the OpenSSL snapshot.
>
> Both define a function, d2i_PrivateKey_bio(), but with conflicting parameter
> lists.
> [...]
I've this now fixed for mod_ssl 2.5.1 with the appended patch. With
this patch it compiled fine against both OpenSSL 0.9.4 and the latest
snapshot. Thanks for your feedback.
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
Index: ssl_engine_vars.c
===================================================================
RCS file: /e/modssl/cvs/mod_ssl/pkg.apache/src/modules/ssl/ssl_engine_vars.c,v
retrieving revision 1.45
diff -u -r1.45 ssl_engine_vars.c
--- ssl_engine_vars.c 1999/12/30 20:58:08 1.45
+++ ssl_engine_vars.c 2000/02/06 13:32:59
@@ -296,7 +296,7 @@
result = ssl_var_lookup_ssl_version(p, var+8);
}
else if (ssl != NULL && strcEQ(var, "PROTOCOL")) {
- result = SSL_get_version(ssl);
+ result = (char *)SSL_get_version(ssl);
}
else if (ssl != NULL && strcEQ(var, "SESSION_ID")) {
SSL_SESSION *pSession = SSL_get_session(ssl);
Index: ssl_util_ssl.c
===================================================================
RCS file: /e/modssl/cvs/mod_ssl/pkg.apache/src/modules/ssl/ssl_util_ssl.c,v
retrieving revision 1.18
diff -u -r1.18 ssl_util_ssl.c
--- ssl_util_ssl.c 1999/12/30 20:58:09 1.18
+++ ssl_util_ssl.c 2000/02/06 13:31:14
@@ -141,13 +141,15 @@
return rc;
}
-static EVP_PKEY *d2i_PrivateKey_bio(BIO *bio, EVP_PKEY *key)
+#if SSL_LIBRARY_VERSION <= 0x00904100
+static EVP_PKEY *d2i_PrivateKey_bio(BIO *bio, EVP_PKEY **key)
{
return ((EVP_PKEY *)ASN1_d2i_bio(
(char *(*)())EVP_PKEY_new,
(char *(*)())d2i_PrivateKey,
(bio), (unsigned char **)(key)));
}
+#endif
EVP_PKEY *SSL_read_PrivateKey(FILE *fp, EVP_PKEY **key, int (*cb)())
{
______________________________________________________________________
Apache Interface to OpenSSL (mod_ssl) www.modssl.org
User Support Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
