Commit 7f52f77e authored by Richard Levitte's avatar Richard Levitte
Browse files

Declare the CFB and OFB modes for AES, and prepare for a declaration 

of CTR mode.
parent 90b480f2

crypto/evp/c_allc.c

+15 −0
Original line number Diff line number Diff line
@@ -149,14 +149,29 @@ void OpenSSL_add_all_ciphers(void) 
#ifndef OPENSSL_NO_AES

	EVP_add_cipher(EVP_aes_128_ecb());

	EVP_add_cipher(EVP_aes_128_cbc());

	EVP_add_cipher(EVP_aes_128_cfb());

	EVP_add_cipher(EVP_aes_128_ofb());

#if 0

	EVP_add_cipher(EVP_aes_128_ctr());

#endif

	EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");

	EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");

	EVP_add_cipher(EVP_aes_192_ecb());

	EVP_add_cipher(EVP_aes_192_cbc());

	EVP_add_cipher(EVP_aes_192_cfb());

	EVP_add_cipher(EVP_aes_192_ofb());

#if 0

	EVP_add_cipher(EVP_aes_192_ctr());

#endif

	EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");

	EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");

	EVP_add_cipher(EVP_aes_256_ecb());

	EVP_add_cipher(EVP_aes_256_cbc());

	EVP_add_cipher(EVP_aes_256_cfb());

	EVP_add_cipher(EVP_aes_256_ofb());

#if 0

	EVP_add_cipher(EVP_aes_256_ctr());

#endif

	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");

	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");

#endif

crypto/evp/evp.h

+15 −0
Original line number Diff line number Diff line
@@ -641,10 +641,25 @@ const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void); 
#ifndef OPENSSL_NO_AES

const EVP_CIPHER *EVP_aes_128_ecb(void);

const EVP_CIPHER *EVP_aes_128_cbc(void);

const EVP_CIPHER *EVP_aes_128_cfb(void);

const EVP_CIPHER *EVP_aes_128_ofb(void);

#if 0

const EVP_CIPHER *EVP_aes_128_ctr(void);

#endif

const EVP_CIPHER *EVP_aes_192_ecb(void);

const EVP_CIPHER *EVP_aes_192_cbc(void);

const EVP_CIPHER *EVP_aes_192_cfb(void);

const EVP_CIPHER *EVP_aes_192_ofb(void);

#if 0

const EVP_CIPHER *EVP_aes_192_ctr(void);

#endif

const EVP_CIPHER *EVP_aes_256_ecb(void);

const EVP_CIPHER *EVP_aes_256_cbc(void);

const EVP_CIPHER *EVP_aes_256_cfb(void);

const EVP_CIPHER *EVP_aes_256_ofb(void);

#if 0

const EVP_CIPHER *EVP_aes_256_ctr(void);

#endif

#endif



void OPENSSL_add_all_algorithms_noconf(void);