From 957b11334a7afb14537322f0e4795b2e368b3f59 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sun, 29 Jan 2017 17:49:23 +0000
Subject: Send the function codes from the error functions to the bit bucket,
 as was done earlier in libssl. Thanks inoguchi@ for noticing libssl had more
 reacharounds into this. ok jsing@ inoguchi@

---
 src/lib/libcrypto/ec/ec_curve.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/lib/libcrypto/ec/ec_curve.c')

diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c
index c8eee285b6..1ee2a7c8e8 100644
--- a/src/lib/libcrypto/ec/ec_curve.c
+++ b/src/lib/libcrypto/ec/ec_curve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_curve.c,v 1.14 2016/11/04 17:33:19 miod Exp $ */
+/* $OpenBSD: ec_curve.c,v 1.15 2017/01/29 17:49:23 beck Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -3168,7 +3168,7 @@ ec_group_new_from_data(const ec_list_element curve)
 	const unsigned char *params;
 
 	if ((ctx = BN_CTX_new()) == NULL) {
-		ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_MALLOC_FAILURE);
+		ECerror(ERR_R_MALLOC_FAILURE);
 		goto err;
 	}
 	data = curve.data;
@@ -3180,19 +3180,19 @@ ec_group_new_from_data(const ec_list_element curve)
 	if (!(p = BN_bin2bn(params + 0 * param_len, param_len, NULL)) ||
 	    !(a = BN_bin2bn(params + 1 * param_len, param_len, NULL)) ||
 	    !(b = BN_bin2bn(params + 2 * param_len, param_len, NULL))) {
-		ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
+		ECerror(ERR_R_BN_LIB);
 		goto err;
 	}
 	if (curve.meth != 0) {
 		meth = curve.meth();
 		if (((group = EC_GROUP_new(meth)) == NULL) ||
 		    (!(group->meth->group_set_curve(group, p, a, b, ctx)))) {
-			ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+			ECerror(ERR_R_EC_LIB);
 			goto err;
 		}
 	} else if (data->field_type == NID_X9_62_prime_field) {
 		if ((group = EC_GROUP_new_curve_GFp(p, a, b, ctx)) == NULL) {
-			ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+			ECerror(ERR_R_EC_LIB);
 			goto err;
 		}
 	}
@@ -3200,37 +3200,37 @@ ec_group_new_from_data(const ec_list_element curve)
 	else {			/* field_type ==
 				 * NID_X9_62_characteristic_two_field */
 		if ((group = EC_GROUP_new_curve_GF2m(p, a, b, ctx)) == NULL) {
-			ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+			ECerror(ERR_R_EC_LIB);
 			goto err;
 		}
 	}
 #endif
 
 	if ((P = EC_POINT_new(group)) == NULL) {
-		ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+		ECerror(ERR_R_EC_LIB);
 		goto err;
 	}
 	if (!(x = BN_bin2bn(params + 3 * param_len, param_len, NULL))
 	    || !(y = BN_bin2bn(params + 4 * param_len, param_len, NULL))) {
-		ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
+		ECerror(ERR_R_BN_LIB);
 		goto err;
 	}
 	if (!EC_POINT_set_affine_coordinates_GFp(group, P, x, y, ctx)) {
-		ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+		ECerror(ERR_R_EC_LIB);
 		goto err;
 	}
 	if (!(order = BN_bin2bn(params + 5 * param_len, param_len, NULL))
 	    || !BN_set_word(x, (BN_ULONG) data->cofactor)) {
-		ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
+		ECerror(ERR_R_BN_LIB);
 		goto err;
 	}
 	if (!EC_GROUP_set_generator(group, P, order, x)) {
-		ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+		ECerror(ERR_R_EC_LIB);
 		goto err;
 	}
 	if (seed_len) {
 		if (!EC_GROUP_set_seed(group, params - seed_len, seed_len)) {
-			ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+			ECerror(ERR_R_EC_LIB);
 			goto err;
 		}
 	}
@@ -3266,7 +3266,7 @@ EC_GROUP_new_by_curve_name(int nid)
 			break;
 		}
 	if (ret == NULL) {
-		ECerr(EC_F_EC_GROUP_NEW_BY_CURVE_NAME, EC_R_UNKNOWN_GROUP);
+		ECerror(EC_R_UNKNOWN_GROUP);
 		return NULL;
 	}
 	EC_GROUP_set_curve_name(ret, nid);
-- 
cgit v1.2.3-55-g6feb