fixup! fixup! Fix PBMAC1 MAC verification in FIPS mode

beldmit · Aug 9, 2024 · 8d920c3 · 8d920c3
1 parent dae6e74
commit 8d920c3
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
@@ -825,9 +825,8 @@ int pkcs12_main(int argc, char **argv)
         const ASN1_OBJECT *macobj;
 
         PKCS12_get0_mac(NULL, &macalgid, NULL, NULL, p12);
-        /* current hash algorithms do not use parameters so extract just name,
-           in future alg_print() may be needed */
         X509_ALGOR_get0(&macobj, NULL, NULL, macalgid);
+
         if (OBJ_obj2nid(macobj) != NID_pbmac1) {
             EVP_KDF *pkcs12kdf;
 
@@ -839,7 +838,7 @@ int pkcs12_main(int argc, char **argv)
                 goto end;
             }
             EVP_KDF_free(pkcs12kdf);
-	}
+        }
 
         /* If we enter empty password try no password first */
         if (!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {