From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 7 Feb 2011 12:47:16 +0000 (+0000)
Subject: Use default ASN1 if flag set.
X-Git-Tag: OpenSSL-fips-2_0-rc1~787
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83e9c36261dc8546276845f48d1ad65967acd598;p=oweals%2Fopenssl.git

Use default ASN1 if flag set.
---

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 138dd47c3d..b180e4828a 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -80,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);