]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
return NULL if gctx allocation fails.
authorBartel Artem <artem.bartel@gmail.com>
Wed, 11 Jun 2025 03:58:31 +0000 (06:58 +0300)
committerNeil Horman <nhorman@openssl.org>
Thu, 12 Jun 2025 12:50:11 +0000 (08:50 -0400)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27795)

(cherry picked from commit 443298e0f0e2c8225f8c6d6fdc01c6c4d434028b)

providers/implementations/keymgmt/ecx_kmgmt.c

index 219071d6491cbef9cd21c96534516d01e1a7a911..f2e7c795fc11dc17d9f6d2820e14fb948cea9ea3 100644 (file)
@@ -505,15 +505,15 @@ static void *ecx_gen_init(void *provctx, int selection,
         if (algdesc != NULL
                 && !ossl_FIPS_IND_callback(libctx, algdesc, "KeyGen Init")) {
             OPENSSL_free(gctx);
-            return 0;
+            return NULL;
         }
 #endif
+    } else {
+        return NULL;
     }
     if (!ecx_gen_set_params(gctx, params)) {
-        if (gctx != NULL) {
-            ecx_gen_cleanup(gctx);
-            gctx = NULL;
-        }
+        ecx_gen_cleanup(gctx);
+        gctx = NULL;
     }
     return gctx;
 }