Commit 086d475f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make FIPS cipher alias work again.

parent 7f1288da

ssl/ssl_ciph.c

+2 −1
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static const SSL_CIPHER cipher_aliases[]={ 
	{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 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, 
	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_ptr_id_cmp);

	(void)sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_cipher_ptr_id_cmp);



	return(cipherstack);

	}