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@

1 files changed, 30 insertions, 30 deletions

diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c
index e428ac586b..e44104d21c 100644
--- a/src/lib/libcrypto/ec/ec_mult.c
+++ b/src/lib/libcrypto/ec/ec_mult.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_mult.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: ec_mult.c,v 1.20 2017/01/29 17:49:23 beck Exp $ */
 /*
  * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project.
  */
@@ -107,7 +107,7 @@ ec_pre_comp_new(const EC_GROUP * group)
 
         ret = malloc(sizeof(EC_PRE_COMP));
         if (!ret) {
-                ECerr(EC_F_EC_PRE_COMP_NEW, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 return ret;
         }
         ret->group = group;
@@ -205,7 +205,7 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
         if (BN_is_zero(scalar)) {
                 r = malloc(1);
                 if (!r) {
-                        ECerr(EC_F_COMPUTE_WNAF, ERR_R_MALLOC_FAILURE);
+                        ECerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 r[0] = 0;
@@ -215,7 +215,7 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
         if (w <= 0 || w > 7) {
                 /* 'signed char' can represent integers with
                  * absolute values less than 2^7 */
-                ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+                ECerror(ERR_R_INTERNAL_ERROR);
                 goto err;
         }
         bit = 1 << w;           /* at most 128 */
@@ -226,7 +226,7 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
                 sign = -1;
         }
         if (scalar->d == NULL || scalar->top == 0) {
-                ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+                ECerror(ERR_R_INTERNAL_ERROR);
                 goto err;
         }
         len = BN_num_bits(scalar);
@@ -235,7 +235,7 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
                                  * set to the actual length, i.e. at most
                                  * BN_num_bits(scalar) + 1) */
         if (r == NULL) {
-                ECerr(EC_F_COMPUTE_WNAF, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         window_val = scalar->d[0] & mask;
@@ -269,7 +269,7 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
                         }
 
                         if (digit <= -bit || digit >= bit || !(digit & 1)) {
-                                ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+                                ECerror(ERR_R_INTERNAL_ERROR);
                                 goto err;
                         }
                         window_val -= digit;
@@ -280,7 +280,7 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
                          * be 2^w
                          */
                         if (window_val != 0 && window_val != next_bit && window_val != bit) {
-                                ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+                                ECerror(ERR_R_INTERNAL_ERROR);
                                 goto err;
                         }
                 }
@@ -290,13 +290,13 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
                 window_val += bit * BN_is_bit_set(scalar, j + w);
 
                 if (window_val > next_bit) {
-                        ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+                        ECerror(ERR_R_INTERNAL_ERROR);
                         goto err;
                 }
         }
 
         if (j > len + 1) {
-                ECerr(EC_F_COMPUTE_WNAF, ERR_R_INTERNAL_ERROR);
+                ECerror(ERR_R_INTERNAL_ERROR);
                 goto err;
         }
         len = j;
@@ -363,7 +363,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
         int ret = 0;
 
         if (group->meth != r->meth) {
-                ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS);
+                ECerror(EC_R_INCOMPATIBLE_OBJECTS);
                 return 0;
         }
         if ((scalar == NULL) && (num == 0)) {
@@ -371,7 +371,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
         }
         for (i = 0; i < num; i++) {
                 if (group->meth != points[i]->meth) {
-                        ECerr(EC_F_EC_WNAF_MUL, EC_R_INCOMPATIBLE_OBJECTS);
+                        ECerror(EC_R_INCOMPATIBLE_OBJECTS);
                         return 0;
                 }
         }
@@ -384,7 +384,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
         if (scalar != NULL) {
                 generator = EC_GROUP_get0_generator(group);
                 if (generator == NULL) {
-                        ECerr(EC_F_EC_WNAF_MUL, EC_R_UNDEFINED_GENERATOR);
+                        ECerror(EC_R_UNDEFINED_GENERATOR);
                         goto err;
                 }
                 /* look if we can use precomputed multiples of generator */
@@ -413,7 +413,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
 
                         /* check that pre_comp looks sane */
                         if (pre_comp->num != (pre_comp->numblocks * pre_points_per_block)) {
-                                ECerr(EC_F_EC_WNAF_MUL, ERR_R_INTERNAL_ERROR);
+                                ECerror(ERR_R_INTERNAL_ERROR);
                                 goto err;
                         }
                 } else {
@@ -429,7 +429,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
         /* includes space for pivot */
         wNAF = reallocarray(NULL, (totalnum + 1), sizeof wNAF[0]);
         if (wNAF == NULL) {
-                ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -440,7 +440,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
         val_sub = reallocarray(NULL, totalnum, sizeof val_sub[0]);
 
         if (wsize == NULL || wNAF_len == NULL || val_sub == NULL) {
-                ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -466,7 +466,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
 
                 if (pre_comp == NULL) {
                         if (num_scalar != 1) {
-                                ECerr(EC_F_EC_WNAF_MUL, ERR_R_INTERNAL_ERROR);
+                                ECerror(ERR_R_INTERNAL_ERROR);
                                 goto err;
                         }
                         /* we have already generated a wNAF for 'scalar' */
@@ -474,7 +474,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
                         size_t tmp_len = 0;
 
                         if (num_scalar != 0) {
-                                ECerr(EC_F_EC_WNAF_MUL, ERR_R_INTERNAL_ERROR);
+                                ECerror(ERR_R_INTERNAL_ERROR);
                                 goto err;
                         }
                         /*
@@ -524,7 +524,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
                                          */
                                         numblocks = (tmp_len + blocksize - 1) / blocksize;
                                         if (numblocks > pre_comp->numblocks) {
-                                                ECerr(EC_F_EC_WNAF_MUL, ERR_R_INTERNAL_ERROR);
+                                                ECerror(ERR_R_INTERNAL_ERROR);
                                                 goto err;
                                         }
                                         totalnum = num + numblocks;
@@ -537,7 +537,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
                                         if (i < totalnum - 1) {
                                                 wNAF_len[i] = blocksize;
                                                 if (tmp_len < blocksize) {
-                                                        ECerr(EC_F_EC_WNAF_MUL, ERR_R_INTERNAL_ERROR);
+                                                        ECerror(ERR_R_INTERNAL_ERROR);
                                                         goto err;
                                                 }
                                                 tmp_len -= blocksize;
@@ -553,7 +553,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
                                         wNAF[i + 1] = NULL;
                                         wNAF[i] = malloc(wNAF_len[i]);
                                         if (wNAF[i] == NULL) {
-                                                ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
+                                                ECerror(ERR_R_MALLOC_FAILURE);
                                                 goto err;
                                         }
                                         memcpy(wNAF[i], pp, wNAF_len[i]);
@@ -561,7 +561,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
                                                 max_len = wNAF_len[i];
 
                                         if (*tmp_points == NULL) {
-                                                ECerr(EC_F_EC_WNAF_MUL, ERR_R_INTERNAL_ERROR);
+                                                ECerror(ERR_R_INTERNAL_ERROR);
                                                 goto err;
                                         }
                                         val_sub[i] = tmp_points;
@@ -579,7 +579,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
          */
         val = reallocarray(NULL, (num_val + 1), sizeof val[0]);
         if (val == NULL) {
-                ECerr(EC_F_EC_WNAF_MUL, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         val[num_val] = NULL;    /* pivot element */
@@ -596,7 +596,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
                 }
         }
         if (!(v == val + num_val)) {
-                ECerr(EC_F_EC_WNAF_MUL, ERR_R_INTERNAL_ERROR);
+                ECerror(ERR_R_INTERNAL_ERROR);
                 goto err;
         }
         if (!(tmp = EC_POINT_new(group)))
@@ -743,7 +743,7 @@ ec_wNAF_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
 
         generator = EC_GROUP_get0_generator(group);
         if (generator == NULL) {
-                ECerr(EC_F_EC_WNAF_PRECOMPUTE_MULT, EC_R_UNDEFINED_GENERATOR);
+                ECerror(EC_R_UNDEFINED_GENERATOR);
                 goto err;
         }
         if (ctx == NULL) {
@@ -758,7 +758,7 @@ ec_wNAF_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
         if (!EC_GROUP_get_order(group, order, ctx))
                 goto err;
         if (BN_is_zero(order)) {
-                ECerr(EC_F_EC_WNAF_PRECOMPUTE_MULT, EC_R_UNKNOWN_ORDER);
+                ECerror(EC_R_UNKNOWN_ORDER);
                 goto err;
         }
         bits = BN_num_bits(order);
@@ -786,20 +786,20 @@ ec_wNAF_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
 
         points = reallocarray(NULL, (num + 1), sizeof(EC_POINT *));
         if (!points) {
-                ECerr(EC_F_EC_WNAF_PRECOMPUTE_MULT, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         var = points;
         var[num] = NULL;        /* pivot */
         for (i = 0; i < num; i++) {
                 if ((var[i] = EC_POINT_new(group)) == NULL) {
-                        ECerr(EC_F_EC_WNAF_PRECOMPUTE_MULT, ERR_R_MALLOC_FAILURE);
+                        ECerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
         }
 
         if (!(tmp_point = EC_POINT_new(group)) || !(base = EC_POINT_new(group))) {
-                ECerr(EC_F_EC_WNAF_PRECOMPUTE_MULT, ERR_R_MALLOC_FAILURE);
+                ECerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         if (!EC_POINT_copy(base, generator))
@@ -829,7 +829,7 @@ ec_wNAF_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
                         size_t k;
 
                         if (blocksize <= 2) {
-                                ECerr(EC_F_EC_WNAF_PRECOMPUTE_MULT, ERR_R_INTERNAL_ERROR);
+                                ECerror(ERR_R_INTERNAL_ERROR);
                                 goto err;
                         }
                         if (!EC_POINT_dbl(group, base, tmp_point, ctx))