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, 22 insertions, 22 deletions

diff --git a/src/lib/libcrypto/ec/ecp_oct.c b/src/lib/libcrypto/ec/ecp_oct.c
index 994f0b08b1..b93b516907 100644
--- a/src/lib/libcrypto/ec/ecp_oct.c
+++ b/src/lib/libcrypto/ec/ecp_oct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_oct.c,v 1.7 2015/02/09 15:49:22 jsing Exp $ */
+/* $OpenBSD: ecp_oct.c,v 1.8 2017/01/29 17:49:23 beck Exp $ */
 /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * for the OpenSSL project.
  * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -155,9 +155,9 @@ ec_GFp_simple_set_compressed_coordinates(const EC_GROUP * group,
 
                 if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE) {
                         ERR_clear_error();
-                        ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
+                        ECerror(EC_R_INVALID_COMPRESSED_POINT);
                 } else
-                        ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
+                        ECerror(ERR_R_BN_LIB);
                 goto err;
         }
         if (y_bit != BN_is_odd(y)) {
@@ -169,20 +169,20 @@ ec_GFp_simple_set_compressed_coordinates(const EC_GROUP * group,
                                 goto err;
 
                         if (kron == 1)
-                                ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSION_BIT);
+                                ECerror(EC_R_INVALID_COMPRESSION_BIT);
                         else
                                 /*
                                  * BN_mod_sqrt() should have cought this
                                  * error (not a square)
                                  */
-                                ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
+                                ECerror(EC_R_INVALID_COMPRESSED_POINT);
                         goto err;
                 }
                 if (!BN_usub(y, &group->field, y))
                         goto err;
         }
         if (y_bit != BN_is_odd(y)) {
-                ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_INTERNAL_ERROR);
+                ECerror(ERR_R_INTERNAL_ERROR);
                 goto err;
         }
         if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx))
@@ -210,14 +210,14 @@ ec_GFp_simple_point2oct(const EC_GROUP * group, const EC_POINT * point, point_co
         if ((form != POINT_CONVERSION_COMPRESSED)
             && (form != POINT_CONVERSION_UNCOMPRESSED)
             && (form != POINT_CONVERSION_HYBRID)) {
-                ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
+                ECerror(EC_R_INVALID_FORM);
                 goto err;
         }
         if (EC_POINT_is_at_infinity(group, point) > 0) {
                 /* encodes to a single 0 octet */
                 if (buf != NULL) {
                         if (len < 1) {
-                                ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+                                ECerror(EC_R_BUFFER_TOO_SMALL);
                                 return 0;
                         }
                         buf[0] = 0;
@@ -231,7 +231,7 @@ ec_GFp_simple_point2oct(const EC_GROUP * group, const EC_POINT * point, point_co
         /* if 'buf' is NULL, just return required length */
         if (buf != NULL) {
                 if (len < ret) {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+                        ECerror(EC_R_BUFFER_TOO_SMALL);
                         goto err;
                 }
                 if (ctx == NULL) {
@@ -258,7 +258,7 @@ ec_GFp_simple_point2oct(const EC_GROUP * group, const EC_POINT * point, point_co
 
                 skip = field_len - BN_num_bytes(x);
                 if (skip > field_len) {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                        ECerror(ERR_R_INTERNAL_ERROR);
                         goto err;
                 }
                 while (skip > 0) {
@@ -268,13 +268,13 @@ ec_GFp_simple_point2oct(const EC_GROUP * group, const EC_POINT * point, point_co
                 skip = BN_bn2bin(x, buf + i);
                 i += skip;
                 if (i != 1 + field_len) {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                        ECerror(ERR_R_INTERNAL_ERROR);
                         goto err;
                 }
                 if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID) {
                         skip = field_len - BN_num_bytes(y);
                         if (skip > field_len) {
-                                ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                                ECerror(ERR_R_INTERNAL_ERROR);
                                 goto err;
                         }
                         while (skip > 0) {
@@ -285,7 +285,7 @@ ec_GFp_simple_point2oct(const EC_GROUP * group, const EC_POINT * point, point_co
                         i += skip;
                 }
                 if (i != ret) {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                        ECerror(ERR_R_INTERNAL_ERROR);
                         goto err;
                 }
         }
@@ -314,7 +314,7 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
         int ret = 0;
 
         if (len == 0) {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
+                ECerror(EC_R_BUFFER_TOO_SMALL);
                 return 0;
         }
         form = buf[0];
@@ -323,16 +323,16 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
         if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
             && (form != POINT_CONVERSION_UNCOMPRESSED)
             && (form != POINT_CONVERSION_HYBRID)) {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                ECerror(EC_R_INVALID_ENCODING);
                 return 0;
         }
         if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit) {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                ECerror(EC_R_INVALID_ENCODING);
                 return 0;
         }
         if (form == 0) {
                 if (len != 1) {
-                        ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                        ECerror(EC_R_INVALID_ENCODING);
                         return 0;
                 }
                 return EC_POINT_set_to_infinity(group, point);
@@ -341,7 +341,7 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
         enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
 
         if (len != enc_len) {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                ECerror(EC_R_INVALID_ENCODING);
                 return 0;
         }
         if (ctx == NULL) {
@@ -358,7 +358,7 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
         if (!BN_bin2bn(buf + 1, field_len, x))
                 goto err;
         if (BN_ucmp(x, &group->field) >= 0) {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                ECerror(EC_R_INVALID_ENCODING);
                 goto err;
         }
         if (form == POINT_CONVERSION_COMPRESSED) {
@@ -368,12 +368,12 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
                 if (!BN_bin2bn(buf + 1 + field_len, field_len, y))
                         goto err;
                 if (BN_ucmp(y, &group->field) >= 0) {
-                        ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                        ECerror(EC_R_INVALID_ENCODING);
                         goto err;
                 }
                 if (form == POINT_CONVERSION_HYBRID) {
                         if (y_bit != BN_is_odd(y)) {
-                                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                                ECerror(EC_R_INVALID_ENCODING);
                                 goto err;
                         }
                 }
@@ -383,7 +383,7 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
 
         /* test required by X9.62 */
         if (EC_POINT_is_on_curve(group, point, ctx) <= 0) {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
+                ECerror(EC_R_POINT_IS_NOT_ON_CURVE);
                 goto err;
         }
         ret = 1;