285d04
diff -up ./cmd/pk12util/pk12util.c.pkcs12_fips_defaults ./cmd/pk12util/pk12util.c
285d04
--- ./cmd/pk12util/pk12util.c.pkcs12_fips_defaults	2022-07-20 13:40:24.152212683 -0700
285d04
+++ ./cmd/pk12util/pk12util.c	2022-07-20 13:42:40.031094190 -0700
285d04
@@ -1146,6 +1146,11 @@ main(int argc, char **argv)
285d04
         goto done;
285d04
     }
285d04
 
285d04
+    if (PK11_IsFIPS()) {
285d04
+        cipher =  SEC_OID_AES_256_CBC;
285d04
+        certCipher =  SEC_OID_AES_128_CBC;
285d04
+    }
285d04
+
285d04
     if (pk12util.options[opt_Cipher].activated) {
285d04
         char *cipherString = pk12util.options[opt_Cipher].arg;
285d04
 
285d04
@@ -1160,9 +1165,6 @@ main(int argc, char **argv)
285d04
         }
285d04
     }
285d04
 
285d04
-    if (PK11_IsFIPS()) {
285d04
-        certCipher =  SEC_OID_UNKNOWN;
285d04
-    }
285d04
     if (pk12util.options[opt_CertCipher].activated) {
285d04
         char *cipherString = pk12util.options[opt_CertCipher].arg;
285d04