diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/pkcs12/p12_crt.c | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_crt.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crt.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c index 4c36c643ce..40340a7bef 100644 --- a/src/lib/libcrypto/pkcs12/p12_crt.c +++ b/src/lib/libcrypto/pkcs12/p12_crt.c | |||
| @@ -76,7 +76,15 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
| 76 | unsigned int keyidlen; | 76 | unsigned int keyidlen; |
| 77 | 77 | ||
| 78 | /* Set defaults */ | 78 | /* Set defaults */ |
| 79 | if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; | 79 | if(!nid_cert) |
| 80 | { | ||
| 81 | #ifdef OPENSSL_FIPS | ||
| 82 | if (FIPS_mode()) | ||
| 83 | nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | ||
| 84 | else | ||
| 85 | #endif | ||
| 86 | nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC; | ||
| 87 | } | ||
| 80 | if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; | 88 | if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC; |
| 81 | if(!iter) iter = PKCS12_DEFAULT_ITER; | 89 | if(!iter) iter = PKCS12_DEFAULT_ITER; |
| 82 | if(!mac_iter) mac_iter = 1; | 90 | if(!mac_iter) mac_iter = 1; |