Change default PKCS#12 iteration count to 2048, include rsa_oeap_test in the

[openssl.git] / crypto / pkcs12 / p12_crt.c

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index cf630765bdabd39615c89a40ae156c9dd74b8c8d..96cecc6efc6643e136c5f4859ea2c003b6170ad2 100644 (file)
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -77,7 +77,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
        /* Set defaults */
        if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
        if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-       if(!iter) iter = 1000;
+       if(!iter) iter = 2048;
        if(!mac_iter) mac_iter = 1;
 
        if(!pkey || !cert) {