From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 29 Dec 2001 05:02:10 +0000 (+0000)
Subject:   Close a real GP fault.  This is the _wrong_solution_, but stops the
X-Git-Tag: 2.0.30~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3a8787a73217530f065d0d0738aa6baf7c85d1e;p=apache

  Close a real GP fault.  This is the _wrong_solution_, but stops the
  segfaults against very odd RAND_seed errors given garbage in.


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

diff --git a/modules/ssl/ssl_engine_rand.c b/modules/ssl/ssl_engine_rand.c
index 7b41ae0ef9..472a4be7c5 100644
--- a/modules/ssl/ssl_engine_rand.c
+++ b/modules/ssl/ssl_engine_rand.c
@@ -149,14 +149,18 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
                 RAND_seed(stackdata+n, 128);
                 nDone += 128;
 
+#if XXX_SBENTROPY_SOLVED
                 /*
+                 * XXX: This is entirely borked, SCOREBOARD_SIZE < 1024
+                 *
                  * seed in an 1KB extract of the current scoreboard
                  */
                 if (ap_scoreboard_image != NULL) {
                     n = ssl_rand_choosenum(0, SCOREBOARD_SIZE-1024-1);
-                    RAND_seed((unsigned char *)ap_scoreboard_image+n, 1024);
+                    RAND_seed(((unsigned char *)ap_scoreboard_image)+n, 1024);
                     nDone += 1024;
                 }
+#endif
             }
         }
     }