sslc does not currently support RAND_egd or RAND_status

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94207 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/ssl_engine_config.c b/ssl_engine_config.c
index ef8ecd86a83667a39605de6150b90f253d8476e7..389ffda136cf7b9542b360d2fac86106ff21ad67 100644 (file)
--- a/ssl_engine_config.c
+++ b/ssl_engine_config.c
@@ -462,8 +462,12 @@ const char *ssl_cmd_SSLRandomSeed(cmd_parms *cmd, void *ctx,
         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;

diff --git a/ssl_engine_rand.c b/ssl_engine_rand.c
index 6acb2d627f572243d6c52d44c6def2bfef60ae4b..f90bf114e8a890cc808e213e1ffe0e2cb2e8a523 100644 (file)
--- a/ssl_engine_rand.c
+++ b/ssl_engine_rand.c
@@ -116,6 +116,7 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
                 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 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
                     continue;
                 nDone += n;
             }
+#endif
             else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
                 struct {
                     time_t t;

diff --git a/ssl_toolkit_compat.h b/ssl_toolkit_compat.h
index 1e5278ba9386273d83c5ef48ccd149b5df1febd9..1db46bbb8a9fa87d0809bb0268ee799819ae21cd 100644 (file)
--- a/ssl_toolkit_compat.h
+++ b/ssl_toolkit_compat.h
@@ -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
@@ -116,4 +118,7 @@
     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 */