From: Matt Caswell <matt@openssl.org>
Date: Tue, 29 May 2018 13:33:12 +0000 (+0100)
Subject: Remove some logically dead code
X-Git-Tag: OpenSSL_1_1_1-pre8~105
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5be77b074c17a506f222a28f13a0b64bbef9da7a;p=oweals%2Fopenssl.git

Remove some logically dead code

Issues found by Coverity

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6373)
---

diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 2fde4f7a5b..b4105c20f2 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -219,10 +219,8 @@ static int pkey_ecies_encrypt(EVP_PKEY_CTX *ctx,
 
         if (dctx->md)
             md_type = EVP_MD_type(dctx->md);
-        else if (ec_nid == NID_sm2)
-            md_type = NID_sm3;
         else
-            md_type = NID_sha256;
+            md_type = NID_sm3;
 
         if (out == NULL) {
             *outlen = SM2_ciphertext_size(ec, EVP_get_digestbynid(md_type),
@@ -259,13 +257,12 @@ static int pkey_ecies_decrypt(EVP_PKEY_CTX *ctx,
 
         if (dctx->md)
             md_type = EVP_MD_type(dctx->md);
-        else if (ec_nid == NID_sm2)
-            md_type = NID_sm3;
         else
-            md_type = NID_sha256;
+            md_type = NID_sm3;
 
         if (out == NULL) {
-            *outlen = SM2_plaintext_size(ec, EVP_get_digestbynid(md_type), inlen);
+            *outlen = SM2_plaintext_size(ec, EVP_get_digestbynid(md_type),
+                                         inlen);
             ret = 1;
         }
         else {