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

diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c
index 28c6276751..ecd6718279 100644
--- a/src/lib/libcrypto/bn/bn_blind.c
+++ b/src/lib/libcrypto/bn/bn_blind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_blind.c,v 1.16 2017/01/21 11:00:46 beck Exp $ */
+/* $OpenBSD: bn_blind.c,v 1.17 2017/01/29 17:49:22 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -144,7 +144,7 @@ BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod)
         bn_check_top(mod);
 
         if ((ret = calloc(1, sizeof(BN_BLINDING))) == NULL) {
-                BNerr(BN_F_BN_BLINDING_NEW, ERR_R_MALLOC_FAILURE);
+                BNerror(ERR_R_MALLOC_FAILURE);
                 return (NULL);
         }
         if (A != NULL) {
@@ -194,7 +194,7 @@ BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx)
         int ret = 0;
 
         if ((b->A == NULL) || (b->Ai == NULL)) {
-                BNerr(BN_F_BN_BLINDING_UPDATE, BN_R_NOT_INITIALIZED);
+                BNerror(BN_R_NOT_INITIALIZED);
                 goto err;
         }
 
@@ -235,7 +235,7 @@ BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx)
         bn_check_top(n);
 
         if ((b->A == NULL) || (b->Ai == NULL)) {
-                BNerr(BN_F_BN_BLINDING_CONVERT_EX, BN_R_NOT_INITIALIZED);
+                BNerror(BN_R_NOT_INITIALIZED);
                 return (0);
         }
 
@@ -273,7 +273,7 @@ BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx)
                 ret = BN_mod_mul(n, n, r, b->mod, ctx);
         else {
                 if (b->Ai == NULL) {
-                        BNerr(BN_F_BN_BLINDING_INVERT_EX, BN_R_NOT_INITIALIZED);
+                        BNerror(BN_R_NOT_INITIALIZED);
                         return (0);
                 }
                 ret = BN_mod_mul(n, n, b->Ai, b->mod, ctx);
@@ -356,8 +356,7 @@ BN_BLINDING_create_param(BN_BLINDING *b, const BIGNUM *e, BIGNUM *m,
                         unsigned long error = ERR_peek_last_error();
                         if (ERR_GET_REASON(error) == BN_R_NO_INVERSE) {
                                 if (retry_counter-- == 0) {
-                                        BNerr(BN_F_BN_BLINDING_CREATE_PARAM,
-                                            BN_R_TOO_MANY_ITERATIONS);
+                                        BNerror(BN_R_TOO_MANY_ITERATIONS);
                                         goto err;
                                 }
                                 ERR_clear_error();