OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
21-May-2007 14:45:11
Branch: OpenSSL-fips-0_9_8-stable Handle:
2007052113450901
Modified files: (Branch:
OpenSSL-fips-0_9_8-stable)
openssl/crypto/evp e_des.c
openssl/ssl s3_lib.c
Log:
Disable DES in FIPS mode.
Summary:
Revision Changes Path
1.9.4.2 +3 -3 openssl/crypto/evp/e_des.c
1.74.2.15.2.3+16 -16 openssl/ssl/s3_lib.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/crypto/evp/e_des.c
============================================================
================
$ cvs diff -u -r1.9.4.1 -r1.9.4.2 e_des.c
--- openssl/crypto/evp/e_des.c 22 Mar 2007 00:38:11
-0000 1.9.4.1
+++ openssl/crypto/evp/e_des.c 21 May 2007 12:45:09
-0000 1.9.4.2
-129,20 +129,20
}
BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8,
8, 64,
- EVP_CIPH_RAND_KEY|EVP_CIPH_FLAG_FIPS,
+ EVP_CIPH_RAND_KEY,
des_init_key, NULL,
EVP_CIPHER_set_asn1_iv,
EVP_CIPHER_get_asn1_iv,
des_ctrl)
BLOCK_CIPHER_def_cfb(des,DES_key_schedule,NID_des,8,8,1,
- EVP_CIPH_RAND_KEY|EVP_CIPH_FLAG_FIPS,
+ EVP_CIPH_RAND_KEY,
des_init_key, NULL,
EVP_CIPHER_set_asn1_iv,
EVP_CIPHER_get_asn1_iv,des_ctrl)
BLOCK_CIPHER_def_cfb(des,DES_key_schedule,NID_des,8,8,8,
- EVP_CIPH_RAND_KEY|EVP_CIPH_FLAG_FIPS,
+ EVP_CIPH_RAND_KEY,
des_init_key,NULL,
EVP_CIPHER_set_asn1_iv,
EVP_CIPHER_get_asn1_iv,des_ctrl)
.
patch -p0 <<' .'
Index: openssl/ssl/s3_lib.c
============================================================
================
$ cvs diff -u -r1.74.2.15.2.2 -r1.74.2.15.2.3 s3_lib.c
--- openssl/ssl/s3_lib.c 24 Apr 2007 11:30:46
-0000 1.74.2.15.2.2
+++ openssl/ssl/s3_lib.c 21 May 2007 12:45:10
-0000 1.74.2.15.2.3
-238,7 +238,7
SSL3_TXT_RSA_DES_40_CBC_SHA,
SSL3_CK_RSA_DES_40_CBC_SHA,
SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
- SSL_EXPORT|SSL_EXP40|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP40,
0,
40,
56,
-251,7 +251,7
SSL3_TXT_RSA_DES_64_CBC_SHA,
SSL3_CK_RSA_DES_64_CBC_SHA,
SSL_kRSA|SSL_aRSA|SSL_DES |SSL_SHA1|SSL_SSLV3,
- SSL_NOT_EXP|SSL_LOW|SSL_FIPS,
+ SSL_NOT_EXP|SSL_LOW,
0,
56,
56,
-278,7 +278,7
SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
SSL3_CK_DH_DSS_DES_40_CBC_SHA,
SSL_kDHd |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
- SSL_EXPORT|SSL_EXP40|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP40,
0,
40,
56,
-291,7 +291,7
SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
SSL3_CK_DH_DSS_DES_64_CBC_SHA,
SSL_kDHd |SSL_aDH|SSL_DES |SSL_SHA1|SSL_SSLV3,
- SSL_NOT_EXP|SSL_LOW|SSL_FIPS,
+ SSL_NOT_EXP|SSL_LOW,
0,
56,
56,
-317,7 +317,7
SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
SSL3_CK_DH_RSA_DES_40_CBC_SHA,
SSL_kDHr |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
- SSL_EXPORT|SSL_EXP40|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP40,
0,
40,
56,
-330,7 +330,7
SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
SSL3_CK_DH_RSA_DES_64_CBC_SHA,
SSL_kDHr |SSL_aDH|SSL_DES |SSL_SHA1|SSL_SSLV3,
- SSL_NOT_EXP|SSL_LOW|SSL_FIPS,
+ SSL_NOT_EXP|SSL_LOW,
0,
56,
56,
-358,7 +358,7
SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA1|SSL_SSLV3,
- SSL_EXPORT|SSL_EXP40|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP40,
0,
40,
56,
-371,7 +371,7
SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
SSL3_CK_EDH_DSS_DES_64_CBC_SHA,
SSL_kEDH|SSL_aDSS|SSL_DES |SSL_SHA1|SSL_SSLV3,
- SSL_NOT_EXP|SSL_LOW|SSL_FIPS,
+ SSL_NOT_EXP|SSL_LOW,
0,
56,
56,
-397,7 +397,7
SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
SSL_kEDH|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
- SSL_EXPORT|SSL_EXP40|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP40,
0,
40,
56,
-410,7 +410,7
SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
SSL3_CK_EDH_RSA_DES_64_CBC_SHA,
SSL_kEDH|SSL_aRSA|SSL_DES |SSL_SHA1|SSL_SSLV3,
- SSL_NOT_EXP|SSL_LOW|SSL_FIPS,
+ SSL_NOT_EXP|SSL_LOW,
0,
56,
56,
-462,7 +462,7
SSL3_TXT_ADH_DES_40_CBC_SHA,
SSL3_CK_ADH_DES_40_CBC_SHA,
SSL_kEDH |SSL_aNULL|SSL_DES|SSL_SHA1|SSL_SSLV3,
- SSL_EXPORT|SSL_EXP40|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP40,
0,
40,
128,
-475,7 +475,7
SSL3_TXT_ADH_DES_64_CBC_SHA,
SSL3_CK_ADH_DES_64_CBC_SHA,
SSL_kEDH |SSL_aNULL|SSL_DES |SSL_SHA1|SSL_SSLV3,
- SSL_NOT_EXP|SSL_LOW|SSL_FIPS,
+ SSL_NOT_EXP|SSL_LOW,
0,
56,
56,
-549,7 +549,7
SSL3_TXT_KRB5_DES_64_CBC_SHA,
SSL3_CK_KRB5_DES_64_CBC_SHA,
SSL_kKRB5|SSL_aKRB5| SSL_DES|SSL_SHA1 |SSL_SSLV3,
- SSL_NOT_EXP|SSL_LOW|SSL_FIPS,
+ SSL_NOT_EXP|SSL_LOW,
0,
56,
56,
-661,7 +661,7
SSL3_TXT_KRB5_DES_40_CBC_SHA,
SSL3_CK_KRB5_DES_40_CBC_SHA,
SSL_kKRB5|SSL_aKRB5| SSL_DES|SSL_SHA1 |SSL_SSLV3,
- SSL_EXPORT|SSL_EXP40|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP40,
0,
40,
56,
-1018,7 +1018,7
TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA|SSL_TLSV1,
- SSL_EXPORT|SSL_EXP56|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP56,
0,
56,
56,
-1031,7 +1031,7
TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA|SSL_TLSV1,
- SSL_EXPORT|SSL_EXP56|SSL_FIPS,
+ SSL_EXPORT|SSL_EXP56,
0,
56,
56,
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
