diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:13:04 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:13:04 +0200 |
| commit | 3a71bc9e4aa4296f460e2e3c55de74c9852477ad (patch) | |
| tree | f816597a7c4322137f0657e7aa2bf392404d1870 /app/openssl/crypto/evp/evp_lib.c | |
| parent | cfe67bfd8260253ce9288225b9e26f666d27133f (diff) | |
| parent | 36247e71df88fa13c6c5a887de3b11d9a883615f (diff) | |
Merge branch 'feature/establish-an-upstream-relationship-with-ics-openvpn-codebase-#5381' into develop
Diffstat (limited to 'app/openssl/crypto/evp/evp_lib.c')
| -rw-r--r-- | app/openssl/crypto/evp/evp_lib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/openssl/crypto/evp/evp_lib.c b/app/openssl/crypto/evp/evp_lib.c index 40951a04..b180e482 100644 --- a/app/openssl/crypto/evp/evp_lib.c +++ b/app/openssl/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); |