diff options
| -rw-r--r-- | apps/pkcs12.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_crt.c | 2 | ||||
| -rwxr-xr-x | ms/test.bat | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 6a70d9b47c..190efc7b42 100644 --- 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 cf630765bd..96cecc6efc 100644 --- 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 aa2f5df6d4..e2779de2a9 100755 --- a/ms/test.bat +++ b/ms/test.bat @@ -7,6 +7,10 @@ set OPENSSL_CONF=..\apps\openssl.cnf rem run this from inside the bin directory
+echo rsa_oaep_test
+rsa_oaep_test
+if errorlevel 1 goto done
+
echo destest
destest
if errorlevel 1 goto done
|