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

Enable PSK in FIPS mode. 

Enable PSK ciphersuites with AES or DES3 in FIPS mode.
parent 26bda7ef

ssl/s3_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	SSL_3DES,

	SSL_SHA1,

	SSL_TLSV1,

	SSL_NOT_EXP|SSL_HIGH,

	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,

	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,

	168,

	168,
@@ -1694,7 +1694,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	SSL_AES128,

	SSL_SHA1,

	SSL_TLSV1,

	SSL_NOT_EXP|SSL_HIGH,

	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,

	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,

	128,

	128,
@@ -1710,7 +1710,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	SSL_AES256,

	SSL_SHA1,

	SSL_TLSV1,

	SSL_NOT_EXP|SSL_HIGH,

	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,

	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,

	256,

	256,