Ooops, missed part of PKCS#8 patch.

diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index 8412d89ddd51d1e49d0594ce611635ec24d94999..e0dc0ec4ee3df4be9f982d3cba9207b290e951a5 100644 (file)
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -113,7 +113,8 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
        if(!(scheme->parameter = ASN1_TYPE_new())) goto merr;
 
        /* Create random IV */
-       if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0)
+       if (EVP_CIPHER_iv_length(cipher) &&
+               RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0)
                goto err;
 
        EVP_CIPHER_CTX_init(&ctx);