From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 29 May 2011 02:32:05 +0000 (+0000)
Subject: Add default ASN1 handling to support FIPS.
X-Git-Tag: OpenSSL_1_0_1-beta1~289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f375a752ecad52372fae4b70c151aac602ea435;p=openssl

Add default ASN1 handling to support FIPS.
---

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 40951a04f0..b180e4828a 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -67,6 +67,8 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 
 	if (c->cipher->set_asn1_parameters != NULL)
 		ret=c->cipher->set_asn1_parameters(c,type);
+	else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1)
+		ret=EVP_CIPHER_set_asn1_iv(c, type);
 	else
 		ret=-1;
 	return(ret);
@@ -78,6 +80,8 @@ int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 
 	if (c->cipher->get_asn1_parameters != NULL)
 		ret=c->cipher->get_asn1_parameters(c,type);
+	else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1)
+		ret=EVP_CIPHER_get_asn1_iv(c, type);
 	else
 		ret=-1;
 	return(ret);