From: Shane Lontis <shane.lontis@oracle.com>
Date: Mon, 21 Sep 2020 01:09:10 +0000 (+1000)
Subject: Fix CID 1466713 : Dead code in encode_key2text.c
X-Git-Tag: openssl-3.0.0-alpha7~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad2dbfb543ac1ba9c074fccd75c06b1d5d491393;p=thirdparty%2Fopenssl.git

Fix CID 1466713 : Dead code in encode_key2text.c

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12930)
---

diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c
index 2cf4fab95fe..d5e80190810 100644
--- a/providers/implementations/encode_decode/encode_key2text.c
+++ b/providers/implementations/encode_decode/encode_key2text.c
@@ -390,23 +390,20 @@ static int ec_param_explicit_gen_to_text(BIO *out, const EC_GROUP *group,
         || EC_POINT_point2bn(group, point, form, gen, ctx) == NULL)
         return 0;
 
-    if (gen != NULL) {
-        switch (form) {
-        case POINT_CONVERSION_COMPRESSED:
-           glabel = "Generator (compressed):";
-           break;
-        case POINT_CONVERSION_UNCOMPRESSED:
-            glabel = "Generator (uncompressed):";
-            break;
-        case POINT_CONVERSION_HYBRID:
-            glabel = "Generator (hybrid):";
-            break;
-        default:
-            return 0;
-        }
-        return print_labeled_bignum(out, glabel, gen);
+    switch (form) {
+    case POINT_CONVERSION_COMPRESSED:
+       glabel = "Generator (compressed):";
+       break;
+    case POINT_CONVERSION_UNCOMPRESSED:
+        glabel = "Generator (uncompressed):";
+        break;
+    case POINT_CONVERSION_HYBRID:
+        glabel = "Generator (hybrid):";
+        break;
+    default:
+        return 0;
     }
-    return 1;
+    return print_labeled_bignum(out, glabel, gen);
 }
 
 /* Print explicit parameters */