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

Fix from HEAD.

parent 4685663d

ssl/s3_lib.c

+10 −10
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	TLS1_TXT_RSA_WITH_AES_128_SHA,

	TLS1_CK_RSA_WITH_AES_128_SHA,

	SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,

	SSL_NOT_EXP|SSL_MEDIUM,

	SSL_NOT_EXP|SSL_HIGH,

	0,

	128,

	128,
@@ -763,7 +763,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	TLS1_TXT_DH_DSS_WITH_AES_128_SHA,

	TLS1_CK_DH_DSS_WITH_AES_128_SHA,

	SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,

	SSL_NOT_EXP|SSL_MEDIUM,

	SSL_NOT_EXP|SSL_HIGH,

	0,

	128,

	128,
@@ -776,7 +776,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	TLS1_TXT_DH_RSA_WITH_AES_128_SHA,

	TLS1_CK_DH_RSA_WITH_AES_128_SHA,

	SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,

	SSL_NOT_EXP|SSL_MEDIUM,

	SSL_NOT_EXP|SSL_HIGH,

	0,

	128,

	128,
@@ -789,7 +789,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,

	TLS1_CK_DHE_DSS_WITH_AES_128_SHA,

	SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,

	SSL_NOT_EXP|SSL_MEDIUM,

	SSL_NOT_EXP|SSL_HIGH,

	0,

	128,

	128,
@@ -802,7 +802,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,

	TLS1_CK_DHE_RSA_WITH_AES_128_SHA,

	SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,

	SSL_NOT_EXP|SSL_MEDIUM,

	SSL_NOT_EXP|SSL_HIGH,

	0,

	128,

	128,
@@ -815,7 +815,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
	TLS1_TXT_ADH_WITH_AES_128_SHA,

	TLS1_CK_ADH_WITH_AES_128_SHA,

	SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,

	SSL_NOT_EXP|SSL_MEDIUM,

	SSL_NOT_EXP|SSL_HIGH,

	0,

	128,

	128,
@@ -964,7 +964,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
            TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA,

            TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA,

            SSL_kECDH|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,

            SSL_NOT_EXP|SSL_MEDIUM,

            SSL_NOT_EXP|SSL_HIGH,

            0,

            128,

            128,
@@ -1048,7 +1048,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
            TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA,

            TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA,

            SSL_kECDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,

            SSL_NOT_EXP|SSL_MEDIUM,

            SSL_NOT_EXP|SSL_HIGH,

            0,

            128,

            128,
@@ -1322,7 +1322,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
            TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,

            TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,

            SSL_kECDHE|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,

            SSL_NOT_EXP|SSL_MEDIUM,

            SSL_NOT_EXP|SSL_HIGH,

            0,

            128,

            128,
@@ -1338,7 +1338,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 
            TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA,

            TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA,

            SSL_kECDHE|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,

            SSL_NOT_EXP|SSL_MEDIUM,

            SSL_NOT_EXP|SSL_HIGH,

            0,

            128,

            128,