Two new functions to write out PKCS#8 private keys. Also fixes for some of

[openssl.git] / crypto / asn1 / p5_pbe.c

diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index 5145c6349e7dba86bea8e10a651fb1c6a2bf0738..30b9049a4573c798680300322251ac4e44d1b9ab 100644 (file)
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -119,6 +119,7 @@ X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt,
                ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
+       if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
        ASN1_INTEGER_set (pbe->iter, iter);
        if (!saltlen) saltlen = PKCS5_SALT_LEN;
        if (!(pbe->salt->data = Malloc (saltlen))) {