commit 4e3d17a7e7f7105c60d11cc143514855efdb9237
author David Benjamin <davidben@chromium.org> Thu Dec 31 13:39:02 2015 -0500
committer Adam Langley <agl@google.com> Tue Feb 02 16:23:05 2016 +0000
tree 95bed7e2a82647368db08e72e5705e3bd66c926c
parent 4aafe6a3af16c577649ad7b8cd94b4635071567b

Remove redundant logic to compute EC public key.

d2i_ECPrivateKey already computes it as of
9f5a314d35e7eb8be36206f6903a818dfaf24eba.

Change-Id: Ie48b2319ee7d96d09c8e4f13d99de38bfa89be76
Reviewed-on: https://boringssl-review.googlesource.com/6857
Reviewed-by: Adam Langley <agl@google.com>

crypto/evp/p_ec_asn1.c

diff --git a/crypto/evp/p_ec_asn1.c b/crypto/evp/p_ec_asn1.c
index c88fb1e..e12508d 100644
--- a/crypto/evp/p_ec_asn1.c
+++ b/crypto/evp/p_ec_asn1.c
@@ -240,38 +240,6 @@
     goto ecerr;
   }
 
-  /* calculate public key (if necessary) */
-  if (EC_KEY_get0_public_key(eckey) == NULL) {
-    const BIGNUM *priv_key;
-    const EC_GROUP *group;
-    EC_POINT *pub_key;
-    /* the public key was not included in the SEC1 private
-     * key => calculate the public key */
-    group = EC_KEY_get0_group(eckey);
-    pub_key = EC_POINT_new(group);
-    if (pub_key == NULL) {
-      OPENSSL_PUT_ERROR(EVP, ERR_R_EC_LIB);
-      goto ecliberr;
-    }
-    if (!EC_POINT_copy(pub_key, EC_GROUP_get0_generator(group))) {
-      EC_POINT_free(pub_key);
-      OPENSSL_PUT_ERROR(EVP, ERR_R_EC_LIB);
-      goto ecliberr;
-    }
-    priv_key = EC_KEY_get0_private_key(eckey);
-    if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, NULL)) {
-      EC_POINT_free(pub_key);
-      OPENSSL_PUT_ERROR(EVP, ERR_R_EC_LIB);
-      goto ecliberr;
-    }
-    if (EC_KEY_set_public_key(eckey, pub_key) == 0) {
-      EC_POINT_free(pub_key);
-      OPENSSL_PUT_ERROR(EVP, ERR_R_EC_LIB);
-      goto ecliberr;
-    }
-    EC_POINT_free(pub_key);
-  }
-
   EVP_PKEY_assign_EC_KEY(pkey, eckey);
   return 1;