]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
PKCS5 PBE: free allocations on unlikely / impossible failure path
authorPauli <paul.dale@oracle.com>
Sun, 13 Sep 2020 21:44:45 +0000 (07:44 +1000)
committerPauli <paul.dale@oracle.com>
Tue, 15 Sep 2020 21:22:43 +0000 (07:22 +1000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/12870)

crypto/evp/p5_crpt.c

index 4e9603757b25bbe912c60c9364981e5f55f6943d..7e9a80e5c0ee0bdfff3940c2f43f8ec8193ec875 100644 (file)
@@ -91,7 +91,7 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
         goto err;
     mdsize = EVP_MD_size(md);
     if (mdsize < 0)
-        return 0;
+        goto err;
     for (i = 1; i < iter; i++) {
         if (!EVP_DigestInit_ex(ctx, md, NULL))
             goto err;