From: Kazuki Yamaguchi <k@rhe.jp>
Date: Thu, 21 Apr 2016 08:35:53 +0000 (+0900)
Subject: Fix EC_KEY_set_private_key() to call key->group->meth->set_private()
X-Git-Tag: OpenSSL_1_1_0-pre6~1069
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=acde647fb0347f64af8f8678b73ce41f2f499c02;p=oweals%2Fopenssl.git

Fix EC_KEY_set_private_key() to call key->group->meth->set_private()

Fix a bug introduced by 6903e2e7e9a4 (Extended EC_METHOD customisation
support., 2016-02-01). key->meth->set_private() is wrongly called where
it should call key->group->meth->set_private().

PR#4517

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
---

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index f7948ccab2..22c6535e30 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -483,8 +483,8 @@ int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key)
 {
     if (key->group == NULL || key->group->meth == NULL)
         return 0;
-    if (key->group->meth->set_private
-        && key->meth->set_private(key, priv_key) == 0)
+    if (key->group->meth->set_private != NULL
+        && key->group->meth->set_private(key, priv_key) == 0)
         return 0;
     if (key->meth->set_private != NULL
         && key->meth->set_private(key, priv_key) == 0)