httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_rand.c
Date Sat, 29 Dec 2001 19:55:46 GMT
trawick     01/12/29 11:55:46

  Modified:    include  scoreboard.h
               modules/ssl ssl_engine_rand.c
  Log:
  tiny cleanup to remove bogus SCOREBOARD_SIZE define
  
  Revision  Changes    Path
  1.35      +0 -3      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- scoreboard.h	18 Dec 2001 13:48:52 -0000	1.34
  +++ scoreboard.h	29 Dec 2001 19:55:46 -0000	1.35
  @@ -195,9 +195,6 @@
       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);
  
  
  
  1.9       +2 -2      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ssl_engine_rand.c	29 Dec 2001 05:02:10 -0000	1.8
  +++ ssl_engine_rand.c	29 Dec 2001 19:55:46 -0000	1.9
  @@ -151,12 +151,12 @@
   
   #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;
                   }
  
  
  

Mime
View raw message