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

Traditional Yuletide commit ;-) 

Add Triple DES CFB1 and CFB8 to algorithm list and NID translation.
parent 8580f801

crypto/evp/c_allc.c

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ void OpenSSL_add_all_ciphers(void) 
	EVP_add_cipher(EVP_des_cfb8());

	EVP_add_cipher(EVP_des_ede_cfb());

	EVP_add_cipher(EVP_des_ede3_cfb());

	EVP_add_cipher(EVP_des_ede3_cfb1());

	EVP_add_cipher(EVP_des_ede3_cfb8());



	EVP_add_cipher(EVP_des_ofb());

	EVP_add_cipher(EVP_des_ede_ofb());

crypto/evp/evp_lib.c

+6 −0
Original line number Diff line number Diff line
@@ -159,6 +159,12 @@ int EVP_CIPHER_type(const EVP_CIPHER *ctx) 


		return NID_des_cfb64;



		case NID_des_ede3_cfb64:

		case NID_des_ede3_cfb8:

		case NID_des_ede3_cfb1:



		return NID_des_cfb64;



		default:

		/* Check it has an OID and it is valid */

		otmp = OBJ_nid2obj(nid);