1 files changed, 13 insertions, 17 deletions

diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c
index be1d2a5402..4771a92efd 100644
--- a/src/lib/libcrypto/ec/ecp_nistp256.c
+++ b/src/lib/libcrypto/ec/ecp_nistp256.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_nistp256.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: ecp_nistp256.c,v 1.17 2017/01/29 17:49:23 beck Exp $ */
 /*
  * Written by Adam Langley (Google) for the OpenSSL project
  */
@@ -156,11 +156,11 @@ BN_to_felem(felem out, const BIGNUM * bn)
         memset(b_out, 0, sizeof b_out);
         num_bytes = BN_num_bytes(bn);
         if (num_bytes > sizeof b_out) {
-                ECerr(EC_F_BN_TO_FELEM, EC_R_BIGNUM_OUT_OF_RANGE);
+                ECerror(EC_R_BIGNUM_OUT_OF_RANGE);
                 return 0;
         }
         if (BN_is_negative(bn)) {
-                ECerr(EC_F_BN_TO_FELEM, EC_R_BIGNUM_OUT_OF_RANGE);
+                ECerror(EC_R_BIGNUM_OUT_OF_RANGE);
                 return 0;
         }
         num_bytes = BN_bn2bin(bn, b_in);
@@ -1740,7 +1740,7 @@ nistp256_pre_comp_new()
         NISTP256_PRE_COMP *ret = NULL;
         ret = malloc(sizeof *ret);
         if (!ret) {
-                ECerr(EC_F_NISTP256_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 return ret;
         }
         memset(ret->g_pre_comp, 0, sizeof(ret->g_pre_comp));
@@ -1826,8 +1826,7 @@ ec_GFp_nistp256_group_set_curve(EC_GROUP * group, const BIGNUM * p,
         BN_bin2bn(nistp256_curve_params[2], sizeof(felem_bytearray), curve_b);
         if ((BN_cmp(curve_p, p)) || (BN_cmp(curve_a, a)) ||
             (BN_cmp(curve_b, b))) {
-                ECerr(EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE,
-                    EC_R_WRONG_CURVE_PARAMETERS);
+                ECerror(EC_R_WRONG_CURVE_PARAMETERS);
                 goto err;
         }
         group->field_mod_func = BN_nist_mod_256;
@@ -1849,8 +1848,7 @@ ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP * group,
         longfelem tmp;
 
         if (EC_POINT_is_at_infinity(group, point) > 0) {
-                ECerr(EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES,
-                    EC_R_POINT_AT_INFINITY);
+                ECerror(EC_R_POINT_AT_INFINITY);
                 return 0;
         }
         if ((!BN_to_felem(x_in, &point->X)) || (!BN_to_felem(y_in, &point->Y)) ||
@@ -1864,8 +1862,7 @@ ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP * group,
         felem_contract(x_out, x_in);
         if (x != NULL) {
                 if (!smallfelem_to_BN(x, x_out)) {
-                        ECerr(EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES,
-                            ERR_R_BN_LIB);
+                        ECerror(ERR_R_BN_LIB);
                         return 0;
                 }
         }
@@ -1876,8 +1873,7 @@ ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP * group,
         felem_contract(y_out, y_in);
         if (y != NULL) {
                 if (!smallfelem_to_BN(y, y_out)) {
-                        ECerr(EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES,
-                            ERR_R_BN_LIB);
+                        ECerror(ERR_R_BN_LIB);
                         return 0;
                 }
         }
@@ -1960,7 +1956,7 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                 if (!smallfelem_to_BN(x, g_pre_comp[0][1][0]) ||
                     !smallfelem_to_BN(y, g_pre_comp[0][1][1]) ||
                     !smallfelem_to_BN(z, g_pre_comp[0][1][2])) {
-                        ECerr(EC_F_EC_GFP_NISTP256_POINTS_MUL, ERR_R_BN_LIB);
+                        ECerror(ERR_R_BN_LIB);
                         goto err;
                 }
                 if (!EC_POINT_set_Jprojective_coordinates_GFp(group,
@@ -1993,7 +1989,7 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                             (num_points * 17 + 1), sizeof(smallfelem));
                 }
                 if ((secrets == NULL) || (pre_comp == NULL) || (mixed && (tmp_smallfelems == NULL))) {
-                        ECerr(EC_F_EC_GFP_NISTP256_POINTS_MUL, ERR_R_MALLOC_FAILURE);
+                        ECerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 /*
@@ -2024,7 +2020,7 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                                          * don't guarantee constant-timeness
                                          */
                                         if (!BN_nnmod(tmp_scalar, p_scalar, &group->order, ctx)) {
-                                                ECerr(EC_F_EC_GFP_NISTP256_POINTS_MUL, ERR_R_BN_LIB);
+                                                ECerror(ERR_R_BN_LIB);
                                                 goto err;
                                         }
                                         num_bytes = BN_bn2bin(tmp_scalar, tmp);
@@ -2066,7 +2062,7 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
                          * constant-timeness
                          */
                         if (!BN_nnmod(tmp_scalar, scalar, &group->order, ctx)) {
-                                ECerr(EC_F_EC_GFP_NISTP256_POINTS_MUL, ERR_R_BN_LIB);
+                                ECerror(ERR_R_BN_LIB);
                                 goto err;
                         }
                         num_bytes = BN_bn2bin(tmp_scalar, tmp);
@@ -2090,7 +2086,7 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
         felem_contract(z_in, z_out);
         if ((!smallfelem_to_BN(x, x_in)) || (!smallfelem_to_BN(y, y_in)) ||
             (!smallfelem_to_BN(z, z_in))) {
-                ECerr(EC_F_EC_GFP_NISTP256_POINTS_MUL, ERR_R_BN_LIB);
+                ECerror(ERR_R_BN_LIB);
                 goto err;
         }
         ret = EC_POINT_set_Jprojective_coordinates_GFp(group, r, x, y, z, ctx);