diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-04 08:35:35 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-04 08:35:35 +0200 |
| commit | 3279ad79c3dcecbb2c5c001775d7a28f982e0955 (patch) | |
| tree | 2511b58f7b1b50fc0b9b84efa1c29fe25bd7876b /drivers/builtin_openssl2/crypto/pem/pem_lib.c | |
| parent | 6a4b62e72069f7c96f8b7cb9b7855da0bbd84b63 (diff) | |
| parent | ab623c923d4e2c950342aec5da371cb92b1fbbc6 (diff) | |
Merge pull request #4540 from mrezai/openssl-1.0.2h
Update OpenSSL to 1.0.2h
Diffstat (limited to 'drivers/builtin_openssl2/crypto/pem/pem_lib.c')
| -rw-r--r-- | drivers/builtin_openssl2/crypto/pem/pem_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/builtin_openssl2/crypto/pem/pem_lib.c b/drivers/builtin_openssl2/crypto/pem/pem_lib.c index a29821aab2..fe881d6641 100644 --- a/drivers/builtin_openssl2/crypto/pem/pem_lib.c +++ b/drivers/builtin_openssl2/crypto/pem/pem_lib.c @@ -348,7 +348,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, if (enc != NULL) { objstr = OBJ_nid2sn(EVP_CIPHER_nid(enc)); - if (objstr == NULL) { + if (objstr == NULL || EVP_CIPHER_iv_length(enc) == 0) { PEMerr(PEM_F_PEM_ASN1_WRITE_BIO, PEM_R_UNSUPPORTED_CIPHER); goto err; } |