]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Remove pointless warning on pkcs12 import
authorDmitry Belyavskiy <beldmit@gmail.com>
Thu, 1 Jun 2023 15:49:30 +0000 (17:49 +0200)
committerDmitry Belyavskiy <beldmit@gmail.com>
Sat, 3 Jun 2023 14:15:33 +0000 (16:15 +0200)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21107)

apps/pkcs12.c

index b8efb536ddcd31b62e74a2f080c14c3387c1bb92..823d97085d8a616f99727600f3e6a2809dc1f764 100644 (file)
@@ -432,7 +432,7 @@ int pkcs12_main(int argc, char **argv)
             WARN_NO_EXPORT("nomaciter");
         if (cert_pbe == -1 && maciter == -1)
             WARN_NO_EXPORT("nomac");
-        if (macsaltlen != 0)
+        if (macsaltlen != PKCS12_SALT_LEN)
             WARN_NO_EXPORT("macsaltlen");
     }
 #ifndef OPENSSL_NO_DES