libressl/0026-gost-use-ECerror-to-report-EC-errors.patch

From 4db6b93111cff924d0ba6650ef351939d67e94a5 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Wed, 18 Mar 2020 14:05:08 +0300
Subject: [PATCH 26/87] gost: use ECerror to report EC errors

GOST code uses GOSTerror(EC_R_foo) to report several errors. Use
ECerror(EC_R_foo) instead to make error messages match error code.

Sponsored by ROSA Linux.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
---
 src/lib/libcrypto/gost/gostr341001_ameth.c |  2 +-
 src/lib/libcrypto/gost/gostr341001_key.c   | 14 +++++++-------
 src/lib/libcrypto/gost/gostr341001_pmeth.c |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/libcrypto/gost/gostr341001_ameth.c b/src/lib/libcrypto/gost/gostr341001_ameth.c
index 27a95f206..0e9521178 100644
--- a/src/lib/libcrypto/gost/gostr341001_ameth.c
+++ b/src/lib/libcrypto/gost/gostr341001_ameth.c
@@ -547,7 +547,7 @@ param_decode_gost01(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
 	}
 	group = EC_GROUP_new_by_curve_name(nid);
 	if (group == NULL) {
-		GOSTerror(EC_R_EC_GROUP_NEW_BY_NAME_FAILURE);
+		ECerror(EC_R_EC_GROUP_NEW_BY_NAME_FAILURE);
 		GOST_KEY_free(ec);
 		return 0;
 	}
diff --git a/src/lib/libcrypto/gost/gostr341001_key.c b/src/lib/libcrypto/gost/gostr341001_key.c
index 0af39f21b..74f8cab9d 100644
--- a/src/lib/libcrypto/gost/gostr341001_key.c
+++ b/src/lib/libcrypto/gost/gostr341001_key.c
@@ -121,7 +121,7 @@ GOST_KEY_check_key(const GOST_KEY *key)
 		return 0;
 	}
 	if (EC_POINT_is_at_infinity(key->group, key->pub_key) != 0) {
-		GOSTerror(EC_R_POINT_AT_INFINITY);
+		ECerror(EC_R_POINT_AT_INFINITY);
 		goto err;
 	}
 	if ((ctx = BN_CTX_new()) == NULL)
@@ -131,14 +131,14 @@ GOST_KEY_check_key(const GOST_KEY *key)
 
 	/* testing whether the pub_key is on the elliptic curve */
 	if (EC_POINT_is_on_curve(key->group, key->pub_key, ctx) == 0) {
-		GOSTerror(EC_R_POINT_IS_NOT_ON_CURVE);
+		ECerror(EC_R_POINT_IS_NOT_ON_CURVE);
 		goto err;
 	}
 	/* testing whether pub_key * order is the point at infinity */
 	if ((order = BN_new()) == NULL)
 		goto err;
 	if (EC_GROUP_get_order(key->group, order, ctx) == 0) {
-		GOSTerror(EC_R_INVALID_GROUP_ORDER);
+		ECerror(EC_R_INVALID_GROUP_ORDER);
 		goto err;
 	}
 	if (EC_POINT_mul(key->group, point, NULL, key->pub_key, order,
@@ -147,7 +147,7 @@ GOST_KEY_check_key(const GOST_KEY *key)
 		goto err;
 	}
 	if (EC_POINT_is_at_infinity(key->group, point) == 0) {
-		GOSTerror(EC_R_WRONG_ORDER);
+		ECerror(EC_R_WRONG_ORDER);
 		goto err;
 	}
 	/*
@@ -156,7 +156,7 @@ GOST_KEY_check_key(const GOST_KEY *key)
 	 */
 	if (key->priv_key != NULL) {
 		if (BN_cmp(key->priv_key, order) >= 0) {
-			GOSTerror(EC_R_WRONG_ORDER);
+			ECerror(EC_R_WRONG_ORDER);
 			goto err;
 		}
 		if (EC_POINT_mul(key->group, point, key->priv_key, NULL, NULL,
@@ -165,7 +165,7 @@ GOST_KEY_check_key(const GOST_KEY *key)
 			goto err;
 		}
 		if (EC_POINT_cmp(key->group, point, key->pub_key, ctx) != 0) {
-			GOSTerror(EC_R_INVALID_PRIVATE_KEY);
+			ECerror(EC_R_INVALID_PRIVATE_KEY);
 			goto err;
 		}
 	}
@@ -212,7 +212,7 @@ GOST_KEY_set_public_key_affine_coordinates(GOST_KEY *key, BIGNUM *x, BIGNUM *y)
 	 * out of range.
 	 */
 	if (BN_cmp(x, tx) != 0 || BN_cmp(y, ty) != 0) {
-		GOSTerror(EC_R_COORDINATES_OUT_OF_RANGE);
+		ECerror(EC_R_COORDINATES_OUT_OF_RANGE);
 		goto err;
 	}
 	if (GOST_KEY_set_public_key(key, point) == 0)
diff --git a/src/lib/libcrypto/gost/gostr341001_pmeth.c b/src/lib/libcrypto/gost/gostr341001_pmeth.c
index 0eb1d873d..0e0cae99e 100644
--- a/src/lib/libcrypto/gost/gostr341001_pmeth.c
+++ b/src/lib/libcrypto/gost/gostr341001_pmeth.c
@@ -246,7 +246,7 @@ pkey_gost01_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
 		*siglen = 2 * size;
 		return 1;
 	} else if (*siglen < 2 * size) {
-		GOSTerror(EC_R_BUFFER_TOO_SMALL);
+		ECerror(EC_R_BUFFER_TOO_SMALL);
 		return 0;
 	}
 	if (tbs_len != 32 && tbs_len != 64) {
-- 
2.17.1