httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_init.c ssl_engine_pphrase.c
Date Wed, 13 Mar 2002 04:49:24 GMT
dougm       02/03/12 20:49:24

  Modified:    modules/ssl ssl_engine_init.c ssl_engine_pphrase.c
  Log:
  switch to ptemp pool for ssl_pphrase_Handle
  
  Revision  Changes    Path
  1.55      +7 -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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- ssl_engine_init.c	13 Mar 2002 04:38:35 -0000	1.54
  +++ ssl_engine_init.c	13 Mar 2002 04:49:23 -0000	1.55
  @@ -268,7 +268,13 @@
        */
       ssl_rand_seed(base_server, ptemp, SSL_RSCTX_STARTUP, "Init: ");
   
  -    ssl_pphrase_Handle(base_server, p);
  +    /*
  +     * read server private keys/public certs into memory.
  +     * decrypting any encrypted keys via configured SSLPassPhraseDialogs
  +     * anything that needs to live longer than ptemp needs to also survive
  +     * restarts, in which case they'll live inside s->process->pool.
  +     */
  +    ssl_pphrase_Handle(base_server, ptemp);
   
       ssl_tmp_keys_init(base_server);
   
  
  
  
  1.23      +1 -1      httpd-2.0/modules/ssl/ssl_engine_pphrase.c
  
  Index: ssl_engine_pphrase.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ssl_engine_pphrase.c	13 Mar 2002 03:59:43 -0000	1.22
  +++ ssl_engine_pphrase.c	13 Mar 2002 04:49:23 -0000	1.23
  @@ -109,7 +109,7 @@
   static char *asn1_table_vhost_key(SSLModConfigRec *mc, apr_pool_t *p,
                                     char *id, char *an)
   {
  -    /* 'p' pool used here is cleared on restarts */
  +    /* 'p' pool used here is cleared on restarts (or sooner) */
       char *key = apr_psprintf(p, "%s:%s", id, an);
       void *keyptr = apr_hash_get(mc->tVHostKeys, key,
                                   APR_HASH_KEY_STRING);
  
  
  

Mime
View raw message