Commit a6cd8707 authored by Richard Levitte's avatar Richard Levitte
Browse files

The AES modes OFB and CFB are defined with 128 feedback bits. This 

deviates from the "standard" 64 bits of feedback that all other
algorithms are using.  Therefore, let's redo certain EVP macros to
accept different amounts of feedback bits for these modes.

Also, change e_aes.c to provide all usually available modes for AES.
CTR isn't included yet.
parent 97879bcd

crypto/evp/e_aes.c

+18 −28
Original line number Diff line number Diff line
@@ -66,30 +66,20 @@ typedef struct 


#define data(ctx)	EVP_C_DATA(EVP_AES_KEY,ctx)



#define IMPLEMENT_BLOCK_CIPHER_def_ecb_cbc(cname, ksched, cprefix, kstruct, \

			  nid, block_size, key_len, iv_len, flags, \

			  init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \

BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched) \

BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, iv_len, flags, \

		     init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, 0, flags, \

		     init_key, cleanup, set_asn1, get_asn1, ctrl)



IMPLEMENT_BLOCK_CIPHER_def_ecb_cbc(aes_128, ks, AES, EVP_AES_KEY,

				   NID_aes_128, 16, 16, 16,

IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY,

		       NID_aes_128, 16, 16, 16, 128,

		       0, aes_init_key, NULL, 

		       EVP_CIPHER_set_asn1_iv,

		       EVP_CIPHER_get_asn1_iv,

		       NULL)

IMPLEMENT_BLOCK_CIPHER_def_ecb_cbc(aes_192, ks, AES, EVP_AES_KEY,

				   NID_aes_192, 16, 24, 16,

IMPLEMENT_BLOCK_CIPHER(aes_192, ks, AES, EVP_AES_KEY,

		       NID_aes_192, 16, 24, 16, 128,

		       0, aes_init_key, NULL, 

		       EVP_CIPHER_set_asn1_iv,

		       EVP_CIPHER_get_asn1_iv,

		       NULL)

IMPLEMENT_BLOCK_CIPHER_def_ecb_cbc(aes_256, ks, AES, EVP_AES_KEY,

				   NID_aes_256, 16, 32, 16,

IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY,

		       NID_aes_256, 16, 32, 16, 128,

		       0, aes_init_key, NULL, 

		       EVP_CIPHER_set_asn1_iv,

		       EVP_CIPHER_get_asn1_iv,

crypto/evp/e_bf.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ typedef struct 


#define data(ctx)	EVP_C_DATA(EVP_BF_KEY,ctx)



IMPLEMENT_BLOCK_CIPHER(bf, ks, BF, EVP_BF_KEY, NID_bf, 8, 16, 8,

IMPLEMENT_BLOCK_CIPHER(bf, ks, BF, EVP_BF_KEY, NID_bf, 8, 16, 8, 64,

			EVP_CIPH_VARIABLE_LENGTH, bf_init_key, NULL, 

			EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)

crypto/evp/e_cast.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ typedef struct 
#define data(ctx)	EVP_C_DATA(EVP_CAST_KEY,ctx)



IMPLEMENT_BLOCK_CIPHER(cast5, ks, CAST, EVP_CAST_KEY, 

			NID_cast5, 8, CAST_KEY_LENGTH, 8,

			NID_cast5, 8, CAST_KEY_LENGTH, 8, 64,

			EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL,

			EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)

crypto/evp/e_des.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
	return 1;

}



BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8,

BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64,

			0, des_init_key, NULL,

			EVP_CIPHER_set_asn1_iv,

			EVP_CIPHER_get_asn1_iv,

crypto/evp/e_des3.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int des_ede_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
	return 1;

}



BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY, NID_des_ede, 8, 16, 8,

BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY, NID_des_ede, 8, 16, 8, 64,

			0, des_ede_init_key, NULL, 

			EVP_CIPHER_set_asn1_iv,

			EVP_CIPHER_get_asn1_iv,
@@ -141,7 +141,7 @@ BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY, NID_des_ede, 8, 16, 8, 
#define des_ede3_cbc_cipher des_ede_cbc_cipher

#define des_ede3_ecb_cipher des_ede_ecb_cipher



BLOCK_CIPHER_defs(des_ede3, DES_EDE_KEY, NID_des_ede3, 8, 24, 8,

BLOCK_CIPHER_defs(des_ede3, DES_EDE_KEY, NID_des_ede3, 8, 24, 8, 64,

			0, des_ede3_init_key, NULL, 

			EVP_CIPHER_set_asn1_iv,

			EVP_CIPHER_get_asn1_iv,