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,
         unsigned int keyidlen;
 
         /* Set defaults */
-        if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
+        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) iter = PKCS12_DEFAULT_ITER;
         if(!mac_iter) mac_iter = 1;