projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13bca90
)
Fix warning.
author
Dr. Stephen Henson
<steve@openssl.org>
Mon, 16 Sep 2013 05:12:00 +0000
(06:12 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sun, 22 Sep 2013 17:24:12 +0000
(18:24 +0100)
crypto/pkcs12/p12_crt.c
patch
|
blob
|
history
diff --git
a/crypto/pkcs12/p12_crt.c
b/crypto/pkcs12/p12_crt.c
index 9d9a25d0990c7f1c4b977476758cc86ecd73a79f..a34915d02d14dee31102ea2d8557789cd933011c 100644
(file)
--- a/
crypto/pkcs12/p12_crt.c
+++ b/
crypto/pkcs12/p12_crt.c
@@
-90,12
+90,14
@@
PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
/* Set defaults */
if (!nid_cert)
+ {
#ifdef OPENSSL_FIPS
if (FIPS_mode())
nid_cert = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
else
#endif
nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
+ }
if (!nid_key)
nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
if (!iter)