Replace the remaining BN_copy() with bn_copy()

ok jsing

10 files changed, 38 insertions, 38 deletions

diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c
index 61d0cf7a95..9c07f33e1f 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.20 2023/03/07 09:27:10 jsing Exp $ */
+/* $OpenBSD: bn_blind.c,v 1.21 2023/03/27 10:25:02 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -244,7 +244,7 @@ BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx)
                 return (0);
 
         if (r != NULL) {
-                if (!BN_copy(r, b->Ai))
+                if (!bn_copy(r, b->Ai))
                         ret = 0;
         }
 
diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c
index b756d2b305..4e90d5d871 100644
--- a/src/lib/libcrypto/bn/bn_exp.c
+++ b/src/lib/libcrypto/bn/bn_exp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_exp.c,v 1.43 2023/03/27 10:22:47 tb Exp $ */
+/* $OpenBSD: bn_exp.c,v 1.44 2023/03/27 10:25:02 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -816,7 +816,7 @@ BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, const BIGNUM *m,
                         (BN_mod_ct(t, r, m, ctx) && (swap_tmp = r, r = t, t = swap_tmp, 1))))
                 /* BN_MOD_MUL_WORD is only used with 'w' large,
                  * so the BN_ucmp test is probably more overhead
-                 * than always using BN_mod (which uses BN_copy if
+                 * than always using BN_mod (which uses bn_copy if
                  * a similar test returns true). */
                 /* We can use BN_mod and do not need BN_nnmod because our
                  * accumulator is never negative (the result of BN_mod does
@@ -985,7 +985,7 @@ BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
 
         if (m->neg) {
                 /* ignore sign of 'm' */
-                if (!BN_copy(aa, m))
+                if (!bn_copy(aa, m))
                         goto err;
                 aa->neg = 0;
                 if (BN_RECP_CTX_set(&recp, aa, ctx) <= 0)
diff --git a/src/lib/libcrypto/bn/bn_gcd.c b/src/lib/libcrypto/bn/bn_gcd.c
index 138befc868..4a79f26c6f 100644
--- a/src/lib/libcrypto/bn/bn_gcd.c
+++ b/src/lib/libcrypto/bn/bn_gcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_gcd.c,v 1.22 2023/03/27 10:21:23 tb Exp $ */
+/* $OpenBSD: bn_gcd.c,v 1.23 2023/03/27 10:25:02 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -314,7 +314,7 @@ BN_gcd_no_branch(BIGNUM *in, const BIGNUM *a, const BIGNUM *n,
          *      A == gcd(a,n);
          */
 
-        if (!BN_copy(R, A))
+        if (!bn_copy(R, A))
                 goto err;
         ret = R;
 err:
@@ -524,7 +524,7 @@ BN_mod_inverse_no_branch(BIGNUM *in, const BIGNUM *a, const BIGNUM *n,
         if (BN_is_one(A)) {
                 /* Y*a == 1  (mod |n|) */
                 if (!Y->neg && BN_ucmp(Y, n) < 0) {
-                        if (!BN_copy(R, Y))
+                        if (!bn_copy(R, Y))
                                 goto err;
                 } else {
                         if (!BN_nnmod(R, Y, n, ctx))
@@ -779,7 +779,7 @@ BN_mod_inverse_internal(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ct
                                         if (!BN_lshift(tmp, X, 2))
                                                 goto err;
                                 } else if (D->top == 1) {
-                                        if (!BN_copy(tmp, X))
+                                        if (!bn_copy(tmp, X))
                                                 goto err;
                                         if (!BN_mul_word(tmp, D->d[0]))
                                                 goto err;
@@ -815,7 +815,7 @@ BN_mod_inverse_internal(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ct
         if (BN_is_one(A)) {
                 /* Y*a == 1  (mod |n|) */
                 if (!Y->neg && BN_ucmp(Y, n) < 0) {
-                        if (!BN_copy(R, Y))
+                        if (!bn_copy(R, Y))
                                 goto err;
                 } else {
                         if (!BN_nnmod(R, Y,n, ctx))
diff --git a/src/lib/libcrypto/bn/bn_gf2m.c b/src/lib/libcrypto/bn/bn_gf2m.c
index 3a0accb4a2..62ac2a5151 100644
--- a/src/lib/libcrypto/bn/bn_gf2m.c
+++ b/src/lib/libcrypto/bn/bn_gf2m.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_gf2m.c,v 1.31 2023/03/27 10:20:27 tb Exp $ */
+/* $OpenBSD: bn_gf2m.c,v 1.32 2023/03/27 10:25:02 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -643,7 +643,7 @@ BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         if (BN_is_zero(u))
                 goto err;
 
-        if (!BN_copy(v, p))
+        if (!bn_copy(v, p))
                 goto err;
 #if 0
         if (!BN_one(b))
@@ -773,7 +773,7 @@ BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         }
 #endif
 
-        if (!BN_copy(r, b))
+        if (!bn_copy(r, b))
                 goto err;
         ret = 1;
 
@@ -865,7 +865,7 @@ BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x, const BIGNUM *p,
                 goto err;
         if (!BN_GF2m_mod(a, x, p))
                 goto err;
-        if (!BN_copy(b, p))
+        if (!bn_copy(b, p))
                 goto err;
 
         while (!BN_is_odd(a)) {
@@ -912,7 +912,7 @@ BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x, const BIGNUM *p,
                 }
         } while (1);
 
-        if (!BN_copy(r, u))
+        if (!bn_copy(r, u))
                 goto err;
         ret = 1;
 
@@ -985,7 +985,7 @@ BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const int p[],
                                 goto err;
                 }
         }
-        if (!BN_copy(r, u))
+        if (!bn_copy(r, u))
                 goto err;
         ret = 1;
 
@@ -1117,7 +1117,7 @@ BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
         if (p[0] & 0x1) /* m is odd */
         {
                 /* compute half-trace of a */
-                if (!BN_copy(z, a))
+                if (!bn_copy(z, a))
                         goto err;
                 for (j = 1; j <= (p[0] - 1) / 2; j++) {
                         if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx))
@@ -1143,7 +1143,7 @@ BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
                         if (!BN_GF2m_mod_arr(rho, rho, p))
                                 goto err;
                         BN_zero(z);
-                        if (!BN_copy(w, rho))
+                        if (!bn_copy(w, rho))
                                 goto err;
                         for (j = 1; j <= p[0] - 1; j++) {
                                 if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx))
@@ -1174,7 +1174,7 @@ BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
                 goto err;
         }
 
-        if (!BN_copy(r, z))
+        if (!bn_copy(r, z))
                 goto err;
 
         ret = 1;
diff --git a/src/lib/libcrypto/bn/bn_isqrt.c b/src/lib/libcrypto/bn/bn_isqrt.c
index ec77e1b078..4a757b02ce 100644
--- a/src/lib/libcrypto/bn/bn_isqrt.c
+++ b/src/lib/libcrypto/bn/bn_isqrt.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bn_isqrt.c,v 1.6 2022/12/17 15:56:25 jsing Exp $ */
+/*      $OpenBSD: bn_isqrt.c,v 1.7 2023/03/27 10:25:02 tb Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  *
@@ -141,7 +141,7 @@ bn_isqrt(BIGNUM *out_sqrt, int *out_perfect, const BIGNUM *n, BN_CTX *in_ctx)
                 *out_perfect = perfect;
 
         if (out_sqrt != NULL) {
-                if (!BN_copy(out_sqrt, a))
+                if (!bn_copy(out_sqrt, a))
                         goto err;
         }
 
diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c
index 9da03e2c6e..49cc6662db 100644
--- a/src/lib/libcrypto/bn/bn_lib.c
+++ b/src/lib/libcrypto/bn/bn_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_lib.c,v 1.77 2023/03/27 08:37:33 tb Exp $ */
+/* $OpenBSD: bn_lib.c,v 1.78 2023/03/27 10:25:02 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -333,7 +333,7 @@ BN_dup(const BIGNUM *a)
         t = BN_new();
         if (t == NULL)
                 return NULL;
-        if (!BN_copy(t, a)) {
+        if (!bn_copy(t, a)) {
                 BN_free(t);
                 return NULL;
         }
diff --git a/src/lib/libcrypto/bn/bn_mont.c b/src/lib/libcrypto/bn/bn_mont.c
index b7b2384cff..4b904c876a 100644
--- a/src/lib/libcrypto/bn/bn_mont.c
+++ b/src/lib/libcrypto/bn/bn_mont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_mont.c,v 1.54 2023/03/27 10:21:23 tb Exp $ */
+/* $OpenBSD: bn_mont.c,v 1.55 2023/03/27 10:25:02 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -166,9 +166,9 @@ BN_MONT_CTX_copy(BN_MONT_CTX *dst, BN_MONT_CTX *src)
         if (dst == src)
                 return dst;
 
-        if (!BN_copy(&dst->RR, &src->RR))
+        if (!bn_copy(&dst->RR, &src->RR))
                 return NULL;
-        if (!BN_copy(&dst->N, &src->N))
+        if (!bn_copy(&dst->N, &src->N))
                 return NULL;
 
         dst->ri = src->ri;
@@ -198,7 +198,7 @@ BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
         /* Save modulus and determine length of R. */
         if (BN_is_zero(mod))
                 goto err;
-        if (!BN_copy(&mont->N, mod))
+        if (!bn_copy(&mont->N, mod))
                  goto err;
         mont->N.neg = 0;
         mont->ri = ((BN_num_bits(mod) + BN_BITS2 - 1) / BN_BITS2) * BN_BITS2;
diff --git a/src/lib/libcrypto/bn/bn_recp.c b/src/lib/libcrypto/bn/bn_recp.c
index 117f8933bb..35390e30d4 100644
--- a/src/lib/libcrypto/bn/bn_recp.c
+++ b/src/lib/libcrypto/bn/bn_recp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_recp.c,v 1.18 2023/02/13 04:25:37 jsing Exp $ */
+/* $OpenBSD: bn_recp.c,v 1.19 2023/03/27 10:25:02 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -99,7 +99,7 @@ BN_RECP_CTX_free(BN_RECP_CTX *recp)
 int
 BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx)
 {
-        if (!BN_copy(&(recp->N), d))
+        if (!bn_copy(&(recp->N), d))
                 return 0;
         BN_zero(&(recp->Nr));
         recp->num_bits = BN_num_bits(d);
@@ -160,7 +160,7 @@ BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, BN_RECP_CTX *recp,
 
         if (BN_ucmp(m, &(recp->N)) < 0) {
                 BN_zero(d);
-                if (!BN_copy(r, m)) {
+                if (!bn_copy(r, m)) {
                         BN_CTX_end(ctx);
                         return 0;
                 }
diff --git a/src/lib/libcrypto/bn/bn_sqrt.c b/src/lib/libcrypto/bn/bn_sqrt.c
index 9bbca4267a..3d9f017f59 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.15 2023/03/07 09:27:10 jsing Exp $ */
+/* $OpenBSD: bn_sqrt.c,v 1.16 2023/03/27 10:25:02 tb Exp $ */
 /* Written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * and Bodo Moeller for the OpenSSL project. */
 /* ====================================================================
@@ -209,7 +209,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                 if (!BN_mod_mul(x, x, t, p, ctx))
                         goto end;
 
-                if (!BN_copy(ret, x))
+                if (!bn_copy(ret, x))
                         goto end;
                 err = 0;
                 goto vrfy;
@@ -217,7 +217,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
 
         /* e > 2, so we really have to use the Tonelli/Shanks algorithm.
          * First, find some  y  that is not a square. */
-        if (!BN_copy(q, p)) /* use 'q' as temp */
+        if (!bn_copy(q, p)) /* use 'q' as temp */
                 goto end;
         q->neg = 0;
         i = 2;
@@ -344,7 +344,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                  */
 
                 if (BN_is_one(b)) {
-                        if (!BN_copy(ret, x))
+                        if (!bn_copy(ret, x))
                                 goto end;
                         err = 0;
                         goto vrfy;
@@ -368,7 +368,7 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                 }
 
                 /* t := y^2^(e - i - 1) */
-                if (!BN_copy(t, y))
+                if (!bn_copy(t, y))
                         goto end;
                 for (j = e - i - 1; j > 0; j--) {
                         if (!BN_mod_sqr(t, t, p, ctx))
diff --git a/src/lib/libcrypto/bn/bn_x931p.c b/src/lib/libcrypto/bn/bn_x931p.c
index e73c416e3f..9105be11cd 100644
--- a/src/lib/libcrypto/bn/bn_x931p.c
+++ b/src/lib/libcrypto/bn/bn_x931p.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_x931p.c,v 1.15 2022/12/26 07:18:51 jmc Exp $ */
+/* $OpenBSD: bn_x931p.c,v 1.16 2023/03/27 10:25:02 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2005.
  */
@@ -73,7 +73,7 @@ bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx, BN_GENCB *cb)
 {
         int i = 0, is_prime;
 
-        if (!BN_copy(pi, Xpi))
+        if (!bn_copy(pi, Xpi))
                 return 0;
         if (!BN_is_odd(pi) && !BN_add_word(pi, 1))
                 return 0;
@@ -170,7 +170,7 @@ BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, const BIGNUM *Xp,
         for (;;) {
                 int i = 1;
                 BN_GENCB_call(cb, 0, i++);
-                if (!BN_copy(pm1, p))
+                if (!bn_copy(pm1, p))
                         goto err;
                 if (!BN_sub_word(pm1, 1))
                         goto err;