tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/src ssl.c
Date Tue, 07 Jun 2005 18:46:09 GMT
mturk       2005/06/07 11:46:09

  Modified:    jni/native/src ssl.c
  Log:
  Make sure 2048 and 4096 bit temp keys are initialized to NULL.
  
  Revision  Changes    Path
  1.26      +9 -7      jakarta-tomcat-connectors/jni/native/src/ssl.c
  
  Index: ssl.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/ssl.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ssl.c	7 Jun 2005 18:42:06 -0000	1.25
  +++ ssl.c	7 Jun 2005 18:46:09 -0000	1.26
  @@ -61,12 +61,14 @@
   #define SSL_TMP_KEY_INIT_DH(bits)  \
       ssl_tmp_key_init_dh(bits, SSL_TMP_KEY_DH_##bits)
   
  -#define SSL_TMP_KEYS_INIT(R)            \
  -    R |= SSL_TMP_KEY_INIT_RSA(512);     \
  -    R |= SSL_TMP_KEY_INIT_RSA(1024);    \
  -    R |= SSL_TMP_KEY_INIT_DH(512);      \
  -    R |= SSL_TMP_KEY_INIT_DH(1024);     \
  -    R |= SSL_TMP_KEY_INIT_DH(2048);     \
  +#define SSL_TMP_KEYS_INIT(R)                    \
  +    SSL_temp_keys[SSL_TMP_KEY_RSA_2048] = NULL; \
  +    SSL_temp_keys[SSL_TMP_KEY_RSA_4096] = NULL; \
  +    R |= SSL_TMP_KEY_INIT_RSA(512);             \
  +    R |= SSL_TMP_KEY_INIT_RSA(1024);            \
  +    R |= SSL_TMP_KEY_INIT_DH(512);              \
  +    R |= SSL_TMP_KEY_INIT_DH(1024);             \
  +    R |= SSL_TMP_KEY_INIT_DH(2048);             \
       R |= SSL_TMP_KEY_INIT_DH(4096)
   
   static int ssl_tmp_key_init_rsa(int bits, int idx)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message