OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/ssl/ ssl_ciph.c

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
13-Aug-2007 20:35:04
  Branch: OpenSSL-fips-0_9_8-stable        Handle:
2007081319350400

  Modified files:           (Branch:
OpenSSL-fips-0_9_8-stable)
    openssl/ssl             ssl_ciph.c

  Log:
    Make FIPS cipher alias work again.

  Summary:
    Revision    Changes     Path
    1.49.2.14.2.3+2  -1      openssl/ssl/ssl_ciph.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/ssl/ssl_ciph.c
 
============================================================
================
  $ cvs diff -u -r1.49.2.14.2.2 -r1.49.2.14.2.3 ssl_ciph.c
  --- openssl/ssl/ssl_ciph.c	24 Apr 2007 11:30:48
-0000	1.49.2.14.2.2
  +++ openssl/ssl/ssl_ciph.c	13 Aug 2007 18:35:04
-0000	1.49.2.14.2.3
   -222,6 +222,7 
   	{0,SSL_TXT_LOW,   0, 0,   SSL_LOW,
0,0,0,0,SSL_STRONG_MASK},
   	{0,SSL_TXT_MEDIUM,0, 0,SSL_MEDIUM,
0,0,0,0,SSL_STRONG_MASK},
   	{0,SSL_TXT_HIGH,  0, 0,  SSL_HIGH,
0,0,0,0,SSL_STRONG_MASK},
  +	{0,SSL_TXT_FIPS,  0, 0,  SSL_FIPS,
0,0,0,0,SSL_FIPS|SSL_STRONG_NONE},
   	};
   
   void ssl_load_ciphers(void)
   -1085,7 +1086,7 
   	if (*cipher_list_by_id != NULL)
   		sk_SSL_CIPHER_free(*cipher_list_by_id);
   	*cipher_list_by_id = tmp_cipher_list;
 
-	sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_cipher_p
tr_id_cmp);
 
+	(void)sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_ci
pher_ptr_id_cmp);
   
   	return(cipherstack);
   	}
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org