aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/evp/evp_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-02-07 12:47:16 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-02-07 12:47:16 +0000
commit83e9c36261dc8546276845f48d1ad65967acd598 (patch)
tree140684288454913eafc00635bfa53d5662960ab8 /crypto/evp/evp_lib.c
parentb68c13154e340f1ef55fa55911d56a11edbcae55 (diff)
downloadopenssl-83e9c36261dc8546276845f48d1ad65967acd598.tar.gz
Use default ASN1 if flag set.
Diffstat (limited to 'crypto/evp/evp_lib.c')
-rw-r--r--crypto/evp/evp_lib.c2
1 files changed, 2 insertions, 0 deletions
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);