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

test batch file.

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 6a70d9b47c673a1318bf8e77a6b10e0ba350af48..190efc7b42cc48f05698c8fafa5e835fc64f64f1 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -69,7 +69,7 @@
 
 EVP_CIPHER *enc;
 
-#define _ITER_ 1000
+#define _ITER_ 2048
 
 #define NOKEYS         0x1
 #define NOCERTS        0x2

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) {

diff --git a/ms/test.bat b/ms/test.bat
index aa2f5df6d4f253fc2372e557cd6cf52e9823aaec..e2779de2a931d5245ed4d9dd06fd29ca4d41e01d 100755 (executable)
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -7,6 +7,10 @@ set OPENSSL_CONF=..\apps\openssl.cnf
 \r
 rem run this from inside the bin directory\r
 \r
+echo rsa_oaep_test\r
+rsa_oaep_test\r
+if errorlevel 1 goto done\r
+\r
 echo destest\r
 destest\r
 if errorlevel 1 goto done\r