]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix CID 1466713 : Dead code in encode_key2text.c
authorShane Lontis <shane.lontis@oracle.com>
Mon, 21 Sep 2020 01:09:10 +0000 (11:09 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Wed, 23 Sep 2020 07:16:38 +0000 (17:16 +1000)
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12930)

providers/implementations/encode_decode/encode_key2text.c

index 2cf4fab95fee307a0487cb4dc42dfbfd554f8d7e..d5e80190810e7768717bd13a4436328a7a3bf99f 100644 (file)
@@ -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 */