generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
test batch file.
This commit is contained in:
Dr. Stephen Henson 1999-05-18 20:12:54 +00:00
parent b0759f8712
commit 35f7324c23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/pkcs12.c
View File

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

2
crypto/pkcs12/p12_crt.c
View File

@ -77,7 +77,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
/* Set defaults */ /* Set defaults */
if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_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(!mac_iter) mac_iter = 1;
if(!pkey || !cert) { if(!pkey || !cert) {

4
ms/test.bat
View File

@ -7,6 +7,10 @@ set OPENSSL_CONF=..\apps\openssl.cnf
rem run this from inside the bin directory rem run this from inside the bin directory
echo rsa_oaep_test
rsa_oaep_test
if errorlevel 1 goto done
echo destest echo destest
destest destest
if errorlevel 1 goto done if errorlevel 1 goto done