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

test batch file.

apps/pkcs12.c

@@ -69,7 +69,7 @@
 
 EVP_CIPHER *enc;
 
-#define _ITER_ 1000
+#define _ITER_ 2048
 
 #define NOKEYS		0x1
 #define NOCERTS 	0x2

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

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