Beginnings of EVP cipher overhaul. This should eventually

enhance and tidy up the EVP interface.

This patch adds initial support for variable length ciphers
and changes S/MIME code to use this.

Some other library functions need modifying to support use
of modified cipher parameters.

Also need to change all the cipher functions that should
return error codes, but currenly don't.

And of course it needs extensive testing...

35 files changed, 154 insertions, 53 deletions

diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c
index 5d16b865c5..a458921583 100644
--- a/crypto/evp/e_cbc_3d.c
+++ b/crypto/evp/e_cbc_3d.c
@@ -72,6 +72,7 @@ static EVP_CIPHER d_cbc_ede_cipher2=
 	{
 	NID_des_ede_cbc,
 	8,16,8,
+	EVP_CIPH_CBC_MODE,
 	des_cbc_ede_init_key,
 	des_cbc_ede_cipher,
 	NULL,
@@ -79,12 +80,14 @@ static EVP_CIPHER d_cbc_ede_cipher2=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 static EVP_CIPHER d_cbc_ede_cipher3=
 	{
 	NID_des_ede3_cbc,
 	8,24,8,
+	EVP_CIPH_CBC_MODE,
 	des_cbc_ede3_init_key,
 	des_cbc_ede_cipher,
 	NULL,
@@ -92,6 +95,7 @@ static EVP_CIPHER d_cbc_ede_cipher3=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_ede_cbc(void)
diff --git a/crypto/evp/e_cbc_bf.c b/crypto/evp/e_cbc_bf.c
index 9bcba3c516..489e63041d 100644
--- a/crypto/evp/e_cbc_bf.c
+++ b/crypto/evp/e_cbc_bf.c
@@ -70,6 +70,7 @@ static EVP_CIPHER bfish_cbc_cipher=
 	{
 	NID_bf_cbc,
 	8,EVP_BLOWFISH_KEY_SIZE,8,
+	EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	bf_cbc_init_key,
 	bf_cbc_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER bfish_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_bf_cbc(void)
@@ -91,7 +93,7 @@ static void bf_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
-		BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+		BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void bf_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_cbc_c.c b/crypto/evp/e_cbc_c.c
index 6845b0b44c..4e8fda9e64 100644
--- a/crypto/evp/e_cbc_c.c
+++ b/crypto/evp/e_cbc_c.c
@@ -71,6 +71,7 @@ static EVP_CIPHER cast5_cbc_cipher=
 	{
 	NID_cast5_cbc,
 	8,EVP_CAST5_KEY_SIZE,8,
+	EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	cast_cbc_init_key,
 	cast_cbc_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER cast5_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_cast5_cbc(void)
@@ -92,7 +94,7 @@ static void cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
-		CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+		CAST_set_key(&(ctx->c.cast_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_cbc_d.c b/crypto/evp/e_cbc_d.c
index 5b4e5b8601..ae9d25aca1 100644
--- a/crypto/evp/e_cbc_d.c
+++ b/crypto/evp/e_cbc_d.c
@@ -70,6 +70,7 @@ static EVP_CIPHER d_cbc_cipher=
 	{
 	NID_des_cbc,
 	8,8,8,
+	EVP_CIPH_CBC_MODE,
 	des_cbc_init_key,
 	des_cbc_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER d_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_cbc(void)
diff --git a/crypto/evp/e_cbc_i.c b/crypto/evp/e_cbc_i.c
index 34b44aa21f..b74f280614 100644
--- a/crypto/evp/e_cbc_i.c
+++ b/crypto/evp/e_cbc_i.c
@@ -71,6 +71,7 @@ static EVP_CIPHER i_cbc_cipher=
 	{
 	NID_idea_cbc,
 	8,16,8,
+	EVP_CIPH_CBC_MODE,
 	idea_cbc_init_key,
 	idea_cbc_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER i_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_idea_cbc(void)
diff --git a/crypto/evp/e_cbc_r2.c b/crypto/evp/e_cbc_r2.c
index 9dfada4ea6..dc94b4fe1f 100644
--- a/crypto/evp/e_cbc_r2.c
+++ b/crypto/evp/e_cbc_r2.c
@@ -80,6 +80,7 @@ static EVP_CIPHER r2_cbc_cipher=
 	{
 	NID_rc2_cbc,
 	8,EVP_RC2_KEY_SIZE,8,
+	EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	rc2_cbc_init_key,
 	rc2_cbc_cipher,
 	NULL,
@@ -87,12 +88,14 @@ static EVP_CIPHER r2_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
 	rc2_set_asn1_type_and_iv,
 	rc2_get_asn1_type_and_iv,
+	NULL
 	};
 
 static EVP_CIPHER r2_64_cbc_cipher=
 	{
 	NID_rc2_64_cbc,
 	8,8 /* 64 bit */,8,
+	EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	rc2_cbc_init_key,
 	rc2_cbc_cipher,
 	NULL,
@@ -100,12 +103,14 @@ static EVP_CIPHER r2_64_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
 	rc2_set_asn1_type_and_iv,
 	rc2_get_asn1_type_and_iv,
+	NULL
 	};
 
 static EVP_CIPHER r2_40_cbc_cipher=
 	{
 	NID_rc2_40_cbc,
 	8,5 /* 40 bit */,8,
+	EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	rc2_cbc_init_key,
 	rc2_cbc_cipher,
 	NULL,
@@ -113,6 +118,7 @@ static EVP_CIPHER r2_40_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
 	rc2_set_asn1_type_and_iv,
 	rc2_get_asn1_type_and_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc2_cbc(void)
@@ -138,7 +144,7 @@ static void rc2_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
 		RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
-			key,EVP_CIPHER_CTX_key_length(ctx)*8);
+			key,EVP_CIPHER_key_length(ctx->cipher)*8);
 	}
 
 static void rc2_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@@ -193,6 +199,7 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 		if (e != EVP_CIPHER_CTX_cipher(c))
 			{
 			EVP_CIPHER_CTX_cipher(c)=e;
+			EVP_CIPHER_CTX_set_key_length(c, EVP_CIPHER_key_length(c));
 			rc2_cbc_init_key(c,NULL,NULL,1);
 			}
 		}
diff --git a/crypto/evp/e_cbc_r5.c b/crypto/evp/e_cbc_r5.c
index cea3fe333a..4e71f46d02 100644
--- a/crypto/evp/e_cbc_r5.c
+++ b/crypto/evp/e_cbc_r5.c
@@ -71,6 +71,7 @@ static EVP_CIPHER rc5_32_12_16_cbc_cipher=
 	{
 	NID_rc5_cbc,
 	8,EVP_RC5_32_12_16_KEY_SIZE,8,
+	EVP_CIPH_CBC_MODE,
 	r_32_12_16_cbc_init_key,
 	r_32_12_16_cbc_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER rc5_32_12_16_cbc_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc5_32_12_16_cbc(void)
diff --git a/crypto/evp/e_cfb_3d.c b/crypto/evp/e_cfb_3d.c
index b364bd4e31..73b989b3b6 100644
--- a/crypto/evp/e_cfb_3d.c
+++ b/crypto/evp/e_cfb_3d.c
@@ -72,6 +72,7 @@ static EVP_CIPHER d_ede_cfb_cipher2=
 	{
 	NID_des_ede_cfb64,
 	1,16,8,
+	EVP_CIPH_CFB_MODE,
 	des_ede_cfb_init_key,
 	des_ede_cfb_cipher,
 	NULL,
@@ -79,12 +80,14 @@ static EVP_CIPHER d_ede_cfb_cipher2=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 static EVP_CIPHER d_ede3_cfb_cipher3=
 	{
 	NID_des_ede3_cfb64,
 	1,24,8,
+	EVP_CIPH_CFB_MODE,
 	des_ede3_cfb_init_key,
 	des_ede_cfb_cipher,
 	NULL,
@@ -92,6 +95,7 @@ static EVP_CIPHER d_ede3_cfb_cipher3=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_ede_cfb(void)
diff --git a/crypto/evp/e_cfb_bf.c b/crypto/evp/e_cfb_bf.c
index 63e1e624ea..b09485531f 100644
--- a/crypto/evp/e_cfb_bf.c
+++ b/crypto/evp/e_cfb_bf.c
@@ -70,6 +70,7 @@ static EVP_CIPHER bfish_cfb_cipher=
 	{
 	NID_bf_cfb64,
 	1,EVP_BLOWFISH_KEY_SIZE,8,
+	EVP_CIPH_CFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	bf_cfb_init_key,
 	bf_cfb_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER bfish_cfb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_bf_cfb(void)
@@ -93,7 +95,7 @@ static void bf_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
-		BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+		BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void bf_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_cfb_c.c b/crypto/evp/e_cfb_c.c
index f04bac034b..c4efb64bd2 100644
--- a/crypto/evp/e_cfb_c.c
+++ b/crypto/evp/e_cfb_c.c
@@ -71,6 +71,7 @@ static EVP_CIPHER cast5_cfb_cipher=
 	{
 	NID_cast5_cfb64,
 	1,EVP_CAST5_KEY_SIZE,8,
+	EVP_CIPH_CFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	cast_cfb_init_key,
 	cast_cfb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER cast5_cfb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_cast5_cfb(void)
@@ -94,7 +96,7 @@ static void cast_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
-		CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+		CAST_set_key(&(ctx->c.cast_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void cast_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_cfb_d.c b/crypto/evp/e_cfb_d.c
index 9e1714bd15..6817d78073 100644
--- a/crypto/evp/e_cfb_d.c
+++ b/crypto/evp/e_cfb_d.c
@@ -70,6 +70,7 @@ static EVP_CIPHER d_cfb_cipher=
 	{
 	NID_des_cfb64,
 	1,8,8,
+	EVP_CIPH_CFB_MODE,
 	des_cfb_init_key,
 	des_cfb_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER d_cfb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_cfb(void)
diff --git a/crypto/evp/e_cfb_i.c b/crypto/evp/e_cfb_i.c
index 31c76c6dac..e228057fa1 100644
--- a/crypto/evp/e_cfb_i.c
+++ b/crypto/evp/e_cfb_i.c
@@ -71,6 +71,7 @@ static EVP_CIPHER i_cfb_cipher=
 	{
 	NID_idea_cfb64,
 	1,IDEA_KEY_LENGTH,IDEA_BLOCK,
+	EVP_CIPH_CFB_MODE,
 	idea_cfb_init_key,
 	idea_cfb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER i_cfb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_idea_cfb(void)
diff --git a/crypto/evp/e_cfb_r2.c b/crypto/evp/e_cfb_r2.c
index 32dd77eb7c..6e5ee8dac6 100644
--- a/crypto/evp/e_cfb_r2.c
+++ b/crypto/evp/e_cfb_r2.c
@@ -71,6 +71,7 @@ static EVP_CIPHER r2_cfb_cipher=
 	{
 	NID_rc2_cfb64,
 	1,EVP_RC2_KEY_SIZE,8,
+	EVP_CIPH_CFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	rc2_cfb_init_key,
 	rc2_cfb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER r2_cfb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc2_cfb(void)
@@ -95,7 +97,7 @@ static void rc2_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
 		RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
-			key,EVP_CIPHER_CTX_key_length(ctx)*8);
+			key,EVP_CIPHER_key_length(ctx->cipher)*8);
 	}
 
 static void rc2_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_cfb_r5.c b/crypto/evp/e_cfb_r5.c
index 8e79728946..25ec1193ca 100644
--- a/crypto/evp/e_cfb_r5.c
+++ b/crypto/evp/e_cfb_r5.c
@@ -71,6 +71,7 @@ static EVP_CIPHER rc5_cfb_cipher=
 	{
 	NID_rc5_cfb64,
 	1,EVP_RC5_32_12_16_KEY_SIZE,8,
+	EVP_CIPH_CFB_MODE,
 	rc5_32_12_16_cfb_init_key,
 	rc5_32_12_16_cfb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER rc5_cfb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc5_32_12_16_cfb(void)
diff --git a/crypto/evp/e_ecb_3d.c b/crypto/evp/e_ecb_3d.c
index 806e971d36..5308557ee4 100644
--- a/crypto/evp/e_ecb_3d.c
+++ b/crypto/evp/e_ecb_3d.c
@@ -72,6 +72,7 @@ static EVP_CIPHER d_ede_cipher2=
 	{
 	NID_des_ede,
 	8,16,0,
+	EVP_CIPH_ECB_MODE,
 	des_ede_init_key,
 	des_ede_cipher,
 	NULL,
@@ -79,18 +80,22 @@ static EVP_CIPHER d_ede_cipher2=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 static EVP_CIPHER d_ede3_cipher3=
 	{
 	NID_des_ede3,
 	8,24,0,
+	EVP_CIPH_ECB_MODE,
 	des_ede3_init_key,
 	des_ede_cipher,
 	NULL,
 	sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	NULL,
+	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_ede(void)
diff --git a/crypto/evp/e_ecb_bf.c b/crypto/evp/e_ecb_bf.c
index 334736d253..31aef248bf 100644
--- a/crypto/evp/e_ecb_bf.c
+++ b/crypto/evp/e_ecb_bf.c
@@ -70,6 +70,7 @@ static EVP_CIPHER bfish_ecb_cipher=
 	{
 	NID_bf_ecb,
 	8,EVP_BLOWFISH_KEY_SIZE,0,
+	EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	bf_ecb_init_key,
 	bf_ecb_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER bfish_ecb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_bf_ecb(void)
@@ -88,7 +90,7 @@ static void bf_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	     unsigned char *iv, int enc)
 	{
 	if (key != NULL)
-		BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+		BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void bf_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_ecb_c.c b/crypto/evp/e_ecb_c.c
index ad14e203cb..7eafb8d9b2 100644
--- a/crypto/evp/e_ecb_c.c
+++ b/crypto/evp/e_ecb_c.c
@@ -71,6 +71,7 @@ static EVP_CIPHER cast5_ecb_cipher=
 	{
 	NID_cast5_ecb,
 	8,EVP_CAST5_KEY_SIZE,0,
+	EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	cast_ecb_init_key,
 	cast_ecb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER cast5_ecb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_cast5_ecb(void)
@@ -89,7 +91,7 @@ static void cast_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	     unsigned char *iv, int enc)
 	{
 	if (key != NULL)
-		CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+		CAST_set_key(&(ctx->c.cast_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void cast_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_ecb_d.c b/crypto/evp/e_ecb_d.c
index c11bef55ef..b55d5b0ee4 100644
--- a/crypto/evp/e_ecb_d.c
+++ b/crypto/evp/e_ecb_d.c
@@ -70,6 +70,7 @@ static EVP_CIPHER d_ecb_cipher=
 	{
 	NID_des_ecb,
 	8,8,0,
+	EVP_CIPH_ECB_MODE,
 	des_ecb_init_key,
 	des_ecb_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER d_ecb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_ecb(void)
diff --git a/crypto/evp/e_ecb_i.c b/crypto/evp/e_ecb_i.c
index 50a3da1bba..7e614c6439 100644
--- a/crypto/evp/e_ecb_i.c
+++ b/crypto/evp/e_ecb_i.c
@@ -71,6 +71,7 @@ static EVP_CIPHER i_ecb_cipher=
 	{
 	NID_idea_ecb,
 	8,16,0,
+	EVP_CIPH_ECB_MODE,
 	idea_ecb_init_key,
 	idea_ecb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER i_ecb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_idea_ecb(void)
diff --git a/crypto/evp/e_ecb_r2.c b/crypto/evp/e_ecb_r2.c
index 3c2330130d..41d6337fc6 100644
--- a/crypto/evp/e_ecb_r2.c
+++ b/crypto/evp/e_ecb_r2.c
@@ -71,6 +71,7 @@ static EVP_CIPHER r2_ecb_cipher=
 	{
 	NID_rc2_ecb,
 	8,EVP_RC2_KEY_SIZE,0,
+	EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	rc2_ecb_init_key,
 	rc2_ecb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER r2_ecb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc2_ecb(void)
@@ -90,7 +92,7 @@ static void rc2_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	{
 	if (key != NULL)
 		RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
-			key,EVP_CIPHER_CTX_key_length(ctx)*8);
+			key,EVP_CIPHER_key_length(ctx->cipher)*8);
 	}
 
 static void rc2_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_ecb_r5.c b/crypto/evp/e_ecb_r5.c
index ef43ce34bf..1bf19e6f95 100644
--- a/crypto/evp/e_ecb_r5.c
+++ b/crypto/evp/e_ecb_r5.c
@@ -71,6 +71,7 @@ static EVP_CIPHER rc5_ecb_cipher=
 	{
 	NID_rc5_ecb,
 	8,EVP_RC5_32_12_16_KEY_SIZE,0,
+	EVP_CIPH_ECB_MODE,
 	rc5_32_12_16_ecb_init_key,
 	rc5_32_12_16_ecb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER rc5_ecb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc5_32_12_16_ecb(void)
diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 0a62c10aa9..0d31a66061 100644
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -69,12 +69,14 @@ static EVP_CIPHER n_cipher=
 	{
 	NID_undef,
 	1,0,0,
+	0,
 	null_init_key,
 	null_cipher,
 	NULL,
 	0,
 	NULL,
 	NULL,
+	NULL
 	};
 
 EVP_CIPHER *EVP_enc_null(void)
diff --git a/crypto/evp/e_ofb_3d.c b/crypto/evp/e_ofb_3d.c
index d1a33e2ecd..c1714fda8d 100644
--- a/crypto/evp/e_ofb_3d.c
+++ b/crypto/evp/e_ofb_3d.c
@@ -72,6 +72,7 @@ static EVP_CIPHER d_ede_ofb_cipher2=
 	{
 	NID_des_ede_ofb64,
 	1,16,8,
+	EVP_CIPH_OFB_MODE,
 	des_ede_ofb_init_key,
 	des_ede_ofb_cipher,
 	NULL,
@@ -79,12 +80,14 @@ static EVP_CIPHER d_ede_ofb_cipher2=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 static EVP_CIPHER d_ede3_ofb_cipher3=
 	{
 	NID_des_ede3_ofb64,
 	1,24,8,
+	EVP_CIPH_OFB_MODE,
 	des_ede3_ofb_init_key,
 	des_ede_ofb_cipher,
 	NULL,
@@ -92,6 +95,7 @@ static EVP_CIPHER d_ede3_ofb_cipher3=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
 	EVP_CIPHER_set_asn1_iv,
         EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_ede_ofb(void)
diff --git a/crypto/evp/e_ofb_bf.c b/crypto/evp/e_ofb_bf.c
index c82154b549..12d35c122b 100644
--- a/crypto/evp/e_ofb_bf.c
+++ b/crypto/evp/e_ofb_bf.c
@@ -70,6 +70,7 @@ static EVP_CIPHER bfish_ofb_cipher=
 	{
 	NID_bf_ofb64,
 	1,EVP_BLOWFISH_KEY_SIZE,8,
+	EVP_CIPH_OFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	bf_ofb_init_key,
 	bf_ofb_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER bfish_ofb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_bf_ofb(void)
@@ -93,7 +95,7 @@ static void bf_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
-		BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key);
+		BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void bf_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_ofb_c.c b/crypto/evp/e_ofb_c.c
index 971043de4c..fbdcf98c61 100644
--- a/crypto/evp/e_ofb_c.c
+++ b/crypto/evp/e_ofb_c.c
@@ -71,6 +71,7 @@ static EVP_CIPHER cast5_ofb_cipher=
 	{
 	NID_cast5_ofb64,
 	1,EVP_CAST5_KEY_SIZE,8,
+	EVP_CIPH_OFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	cast_ofb_init_key,
 	cast_ofb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER cast5_ofb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.cast_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_cast5_ofb(void)
@@ -94,7 +96,7 @@ static void cast_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
-		CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
+		CAST_set_key(&(ctx->c.cast_ks),EVP_CIPHER_CTX_key_length(ctx),key);
 	}
 
 static void cast_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_ofb_d.c b/crypto/evp/e_ofb_d.c
index d51ce230f4..7ced394a2b 100644
--- a/crypto/evp/e_ofb_d.c
+++ b/crypto/evp/e_ofb_d.c
@@ -70,6 +70,7 @@ static EVP_CIPHER d_ofb_cipher=
 	{
 	NID_des_ofb64,
 	1,8,8,
+	EVP_CIPH_OFB_MODE,
 	des_ofb_init_key,
 	des_ofb_cipher,
 	NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER d_ofb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_des_ofb(void)
diff --git a/crypto/evp/e_ofb_i.c b/crypto/evp/e_ofb_i.c
index 389206ef36..7c97cbd7b6 100644
--- a/crypto/evp/e_ofb_i.c
+++ b/crypto/evp/e_ofb_i.c
@@ -71,6 +71,7 @@ static EVP_CIPHER i_ofb_cipher=
 	{
 	NID_idea_ofb64,
 	1,IDEA_KEY_LENGTH,IDEA_BLOCK,
+	EVP_CIPH_OFB_MODE,
 	idea_ofb_init_key,
 	idea_ofb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER i_ofb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.idea_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_idea_ofb(void)
diff --git a/crypto/evp/e_ofb_r2.c b/crypto/evp/e_ofb_r2.c
index 60ae3d4507..696d58b0c4 100644
--- a/crypto/evp/e_ofb_r2.c
+++ b/crypto/evp/e_ofb_r2.c
@@ -71,6 +71,7 @@ static EVP_CIPHER r2_ofb_cipher=
 	{
 	NID_rc2_ofb64,
 	1,EVP_RC2_KEY_SIZE,8,
+	EVP_CIPH_OFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
 	rc2_ofb_init_key,
 	rc2_ofb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER r2_ofb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc2_ofb(void)
@@ -95,7 +97,7 @@ static void rc2_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 	if (key != NULL)
 		RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
-			key,EVP_CIPHER_CTX_key_length(ctx)*8);
+			key,EVP_CIPHER_key_length(ctx->cipher)*8);
 	}
 
 static void rc2_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
diff --git a/crypto/evp/e_ofb_r5.c b/crypto/evp/e_ofb_r5.c
index 30136824eb..205aaf9cd7 100644
--- a/crypto/evp/e_ofb_r5.c
+++ b/crypto/evp/e_ofb_r5.c
@@ -71,6 +71,7 @@ static EVP_CIPHER rc5_ofb_cipher=
 	{
 	NID_rc5_ofb64,
 	1,EVP_RC5_32_12_16_KEY_SIZE,8,
+	EVP_CIPH_OFB_MODE,
 	rc5_32_12_16_ofb_init_key,
 	rc5_32_12_16_ofb_cipher,
 	NULL,
@@ -78,6 +79,7 @@ static EVP_CIPHER rc5_ofb_cipher=
 		sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc5_ks)),
 	EVP_CIPHER_set_asn1_iv,
 	EVP_CIPHER_get_asn1_iv,
+	NULL
 	};
 
 EVP_CIPHER *EVP_rc5_32_12_16_ofb(void)
diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index c7e58a75cc..1ac9f70691 100644
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -71,6 +71,7 @@ static EVP_CIPHER r4_cipher=
 	{
 	NID_rc4,
 	1,EVP_RC4_KEY_SIZE,0,
+	EVP_CIPH_VAR