From: Jeff Trawick <trawick@apache.org>
Date: Sat, 29 Dec 2001 19:55:46 +0000 (+0000)
Subject: tiny cleanup to remove bogus SCOREBOARD_SIZE define
X-Git-Tag: 2.0.30~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c44e1c672ec1b9855e21ca31542b8e64f37e143;p=apache

tiny cleanup to remove bogus SCOREBOARD_SIZE define


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

diff --git a/include/scoreboard.h b/include/scoreboard.h
index 6b4effdecf..ba6ba5e3ad 100644
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -195,9 +195,6 @@ typedef struct {
     char value[VALUE_LENGTH];
 } status_table_entry;
 
-/* XXX what should mod_ssl init use instead of this? */
-#define SCOREBOARD_SIZE		sizeof(scoreboard)
-
 AP_DECLARE(int) ap_exists_scoreboard_image(void);
 AP_DECLARE_NONSTD(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);
 AP_DECLARE(void) ap_increment_counts(void *sbh, request_rec *r);
diff --git a/modules/ssl/ssl_engine_rand.c b/modules/ssl/ssl_engine_rand.c
index 472a4be7c5..0aa74dbe3b 100644
--- a/modules/ssl/ssl_engine_rand.c
+++ b/modules/ssl/ssl_engine_rand.c
@@ -151,12 +151,12 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
 
 #if XXX_SBENTROPY_SOLVED
                 /*
-                 * XXX: This is entirely borked, SCOREBOARD_SIZE < 1024
+                 * XXX: This is entirely borked, sizeof(scoreboard) < 1024
                  *
                  * seed in an 1KB extract of the current scoreboard
                  */
                 if (ap_scoreboard_image != NULL) {
-                    n = ssl_rand_choosenum(0, SCOREBOARD_SIZE-1024-1);
+                    n = ssl_rand_choosenum(0, sizeof(scoreboard)-1024-1);
                     RAND_seed(((unsigned char *)ap_scoreboard_image)+n, 1024);
                     nDone += 1024;
                 }