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:27:13 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_config.c ssl_engine_rand.c ssl_toolkit_compat.h
dougm 02/03/26 19:27:13
Modified: modules/ssl ssl_engine_config.c ssl_engine_rand.c
ssl_toolkit_compat.h
Log:
sslc does not currently support RAND_egd or RAND_status
Revision Changes Path
1.44 +4 -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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ssl_engine_config.c 26 Mar 2002 16:57:49 -0000 1.43
+++ ssl_engine_config.c 27 Mar 2002 03:27:13 -0000 1.44
@@ -462,8 +462,12 @@
seed->cpPath = ap_server_root_relative(mc->pPool, arg2+5);
}
else if ((arg2len > 4) && strEQn(arg2, "egd:", 4)) {
+#ifdef HAVE_SSL_RAND_EGD
seed->nSrc = SSL_RSSRC_EGD;
seed->cpPath = ap_server_root_relative(mc->pPool, arg2+4);
+#else
+ return "egd not supported with this SSL toolkit";
+#endif
}
else if (strcEQ(arg2, "builtin")) {
seed->nSrc = SSL_RSSRC_BUILTIN;
1.16 +2 -0 httpd-2.0/modules/ssl/ssl_engine_rand.c
Index: ssl_engine_rand.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_rand.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ssl_engine_rand.c 13 Mar 2002 20:47:55 -0000 1.15
+++ ssl_engine_rand.c 27 Mar 2002 03:27:13 -0000 1.16
@@ -116,6 +116,7 @@
nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes);
ssl_util_ppclose(s, p, fp);
}
+#if HAVE_SSL_RAND_EDG
else if (pRandSeed->nSrc == SSL_RSSRC_EGD) {
/*
* seed in contents provided by the external
@@ -125,6 +126,7 @@
continue;
nDone += n;
}
+#endif
else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
struct {
time_t t;
1.9 +5 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ssl_toolkit_compat.h 27 Mar 2002 03:13:32 -0000 1.8
+++ ssl_toolkit_compat.h 27 Mar 2002 03:27:13 -0000 1.9
@@ -47,6 +47,8 @@
#define modssl_X509_verify_cert(c) X509_verify_cert(c)
+#define HAVE_SSL_RAND_EDG /* since 9.5.1 */
+
#else /* RSA sslc */
#ifndef STACK_OF
@@ -115,5 +117,8 @@
#define modssl_set_verify(ssl, verify, cb) \
SSL_set_verify(ssl, verify, cb)
#endif
+
+/* sslc does not support this function, OpenSSL has since 9.5.1 */
+#define RAND_status() 1
#endif /* SSL_TOOLKIT_COMPAT_H */