projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b68c131
)
Use default ASN1 if flag set.
author
Dr. Stephen Henson
<steve@openssl.org>
Mon, 7 Feb 2011 12:47:16 +0000
(12:47 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Mon, 7 Feb 2011 12:47:16 +0000
(12:47 +0000)
crypto/evp/evp_lib.c
patch
|
blob
|
history
diff --git
a/crypto/evp/evp_lib.c
b/crypto/evp/evp_lib.c
index 138dd47c3dc25f0e9bfa0ac2bde85e249abaca57..b180e4828a8c8901727ffb7676203add0d82ba5c 100644
(file)
--- 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);