1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/libcrypto/bn/bn_sqrt.c b/src/lib/libcrypto/bn/bn_sqrt.c
index 5928dfc79d..8514f23a27 100644
--- a/src/lib/libcrypto/bn/bn_sqrt.c
+++ b/src/lib/libcrypto/bn/bn_sqrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_sqrt.c,v 1.8 2017/01/21 09:38:58 beck Exp $ */
+/* $OpenBSD: bn_sqrt.c,v 1.9 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * and Bodo Moeller for the OpenSSL project. */
 /* ====================================================================
@@ -89,7 +89,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                         return ret;
                 }
 
-                BNerr(BN_F_BN_MOD_SQRT, BN_R_P_IS_NOT_PRIME);
+                BNerror(BN_R_P_IS_NOT_PRIME);
                 return (NULL);
         }
 
@@ -250,7 +250,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                         goto end;
                 if (r == 0) {
                         /* m divides p */
-                        BNerr(BN_F_BN_MOD_SQRT, BN_R_P_IS_NOT_PRIME);
+                        BNerror(BN_R_P_IS_NOT_PRIME);
                         goto end;
                 }
         }
@@ -262,7 +262,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                  * Even if  p  is not prime, we should have found some  y
                  * such that r == -1.
                  */
-                BNerr(BN_F_BN_MOD_SQRT, BN_R_TOO_MANY_ITERATIONS);
+                BNerror(BN_R_TOO_MANY_ITERATIONS);
                 goto end;
         }
 
@@ -275,7 +275,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         if (!BN_mod_exp_ct(y, y, q, p, ctx))
                 goto end;
         if (BN_is_one(y)) {
-                BNerr(BN_F_BN_MOD_SQRT, BN_R_P_IS_NOT_PRIME);
+                BNerror(BN_R_P_IS_NOT_PRIME);
                 goto end;
         }
 
@@ -359,7 +359,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                 while (!BN_is_one(t)) {
                         i++;
                         if (i == e) {
-                                BNerr(BN_F_BN_MOD_SQRT, BN_R_NOT_A_SQUARE);
+                                BNerror(BN_R_NOT_A_SQUARE);
                                 goto end;
                         }
                         if (!BN_mod_mul(t, t, t, p, ctx))
@@ -392,7 +392,7 @@ vrfy:
                         err = 1;
 
                 if (!err && 0 != BN_cmp(x, A)) {
-                        BNerr(BN_F_BN_MOD_SQRT, BN_R_NOT_A_SQUARE);
+                        BNerror(BN_R_NOT_A_SQUARE);
                         err = 1;
                 }
         }