Commit c3df11d3 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

  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/modules/ssl@92646 13f79535-47bb-0310-9956-ffa450edef68
parent d39752e6
Loading
Loading
Loading
Loading
+5 −1
Changes for ssl_engine_rand.c: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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
            }
        }
    }