cvs commit: httpd-2.0/modules/ssl mod_ssl.c ssl_engine_init.c

[wr...@apache.org]

wrowe       2003/01/13 09:10:42

  Modified:    modules/ssl mod_ssl.c ssl_engine_init.c
  Log:
    After introducing tests in the cmds, we lose the absolute authority
    of the CRYPTO_malloc_init() which must happen the moment we load the
    module and prior to *any* ssl library fn invocation.
  
    Moved the CRYPTO_malloc_init() into the ssl_register_hooks() function,
    the absolute first call made into any loaded module.
  
  Revision  Changes    Path
  1.76      +3 -0      httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- mod_ssl.c	14 Dec 2002 07:46:45 -0000	1.75
  +++ mod_ssl.c	13 Jan 2003 17:10:42 -0000	1.76
  @@ -212,6 +212,9 @@
                                  apr_pool_t *plog,
                                  apr_pool_t *ptemp)
   {
  +    /* Preregister the malloc callbacks so cmds can make library calls */
  +    CRYPTO_malloc_init();
  +
       /* Register us to handle mod_log_config %c/%x variables */
       ssl_var_log_config_register(pconf);
   #if 0 /* XXX */
  
  
  
  1.109     +0 -1      httpd-2.0/modules/ssl/ssl_engine_init.c
  
  Index: ssl_engine_init.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- ssl_engine_init.c	23 Dec 2002 09:09:21 -0000	1.108
  +++ ssl_engine_init.c	13 Jan 2003 17:10:42 -0000	1.109
  @@ -114,7 +114,6 @@
       ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
                    "Init: Initializing %s library", SSL_LIBRARY_NAME);
   
  -    CRYPTO_malloc_init();
       SSL_load_error_strings();
       SSL_library_init();
   }