6 files changed, 70 insertions, 70 deletions

diff --git a/src/lib/libcrypto/ec/ec2_mult.c b/src/lib/libcrypto/ec/ec2_mult.c
index 8b8aaf7122..d32b7442c4 100644
--- a/src/lib/libcrypto/ec/ec2_mult.c
+++ b/src/lib/libcrypto/ec/ec2_mult.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec2_mult.c,v 1.15 2022/11/26 16:08:52 tb Exp $ */
+/* $OpenBSD: ec2_mult.c,v 1.16 2023/03/27 10:25:02 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -137,7 +137,7 @@ gf2m_Madd(const EC_GROUP *group, const BIGNUM *x, BIGNUM *x1, BIGNUM *z1,
         if ((t2 = BN_CTX_get(ctx)) == NULL)
                 goto err;
 
-        if (!BN_copy(t1, x))
+        if (!bn_copy(t1, x))
                 goto err;
         if (!group->meth->field_mul(group, x1, x1, z2, ctx))
                 goto err;
@@ -183,7 +183,7 @@ gf2m_Mxy(const EC_GROUP *group, const BIGNUM *x, const BIGNUM *y, BIGNUM *x1,
                 return 1;
         }
         if (BN_is_zero(z2)) {
-                if (!BN_copy(x2, x))
+                if (!bn_copy(x2, x))
                         return 0;
                 if (!BN_GF2m_add(z2, x, y))
                         return 0;
diff --git a/src/lib/libcrypto/ec/ec2_smpl.c b/src/lib/libcrypto/ec/ec2_smpl.c
index 84cba1b83b..1ad339cbd7 100644
--- a/src/lib/libcrypto/ec/ec2_smpl.c
+++ b/src/lib/libcrypto/ec/ec2_smpl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec2_smpl.c,v 1.33 2023/03/08 05:45:31 jsing Exp $ */
+/* $OpenBSD: ec2_smpl.c,v 1.34 2023/03/27 10:25:02 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -115,11 +115,11 @@ ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 {
         int i;
 
-        if (!BN_copy(&dest->field, &src->field))
+        if (!bn_copy(&dest->field, &src->field))
                 return 0;
-        if (!BN_copy(&dest->a, &src->a))
+        if (!bn_copy(&dest->a, &src->a))
                 return 0;
-        if (!BN_copy(&dest->b, &src->b))
+        if (!bn_copy(&dest->b, &src->b))
                 return 0;
         dest->poly[0] = src->poly[0];
         dest->poly[1] = src->poly[1];
@@ -146,7 +146,7 @@ ec_GF2m_simple_group_set_curve(EC_GROUP *group,
         int ret = 0, i;
 
         /* group->field */
-        if (!BN_copy(&group->field, p))
+        if (!bn_copy(&group->field, p))
                 goto err;
         i = BN_GF2m_poly2arr(&group->field, group->poly, 6) - 1;
         if ((i != 5) && (i != 3)) {
@@ -185,15 +185,15 @@ ec_GF2m_simple_group_get_curve(const EC_GROUP *group,
         int ret = 0;
 
         if (p != NULL) {
-                if (!BN_copy(p, &group->field))
+                if (!bn_copy(p, &group->field))
                         return 0;
         }
         if (a != NULL) {
-                if (!BN_copy(a, &group->a))
+                if (!bn_copy(a, &group->a))
                         goto err;
         }
         if (b != NULL) {
-                if (!BN_copy(b, &group->b))
+                if (!bn_copy(b, &group->b))
                         goto err;
         }
         ret = 1;
@@ -274,11 +274,11 @@ ec_GF2m_simple_point_finish(EC_POINT *point)
 static int
 ec_GF2m_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
 {
-        if (!BN_copy(&dest->X, &src->X))
+        if (!bn_copy(&dest->X, &src->X))
                 return 0;
-        if (!BN_copy(&dest->Y, &src->Y))
+        if (!bn_copy(&dest->Y, &src->Y))
                 return 0;
-        if (!BN_copy(&dest->Z, &src->Z))
+        if (!bn_copy(&dest->Z, &src->Z))
                 return 0;
         dest->Z_is_one = src->Z_is_one;
 
@@ -310,13 +310,13 @@ ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *poi
                 ECerror(ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
         }
-        if (!BN_copy(&point->X, x))
+        if (!bn_copy(&point->X, x))
                 goto err;
         BN_set_negative(&point->X, 0);
-        if (!BN_copy(&point->Y, y))
+        if (!bn_copy(&point->Y, y))
                 goto err;
         BN_set_negative(&point->Y, 0);
-        if (!BN_copy(&point->Z, BN_value_one()))
+        if (!bn_copy(&point->Z, BN_value_one()))
                 goto err;
         BN_set_negative(&point->Z, 0);
         point->Z_is_one = 1;
@@ -345,12 +345,12 @@ ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
                 return 0;
         }
         if (x != NULL) {
-                if (!BN_copy(x, &point->X))
+                if (!bn_copy(x, &point->X))
                         goto err;
                 BN_set_negative(x, 0);
         }
         if (y != NULL) {
-                if (!BN_copy(y, &point->Y))
+                if (!bn_copy(y, &point->Y))
                         goto err;
                 BN_set_negative(y, 0);
         }
@@ -406,18 +406,18 @@ ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
                 goto err;
 
         if (a->Z_is_one) {
-                if (!BN_copy(x0, &a->X))
+                if (!bn_copy(x0, &a->X))
                         goto err;
-                if (!BN_copy(y0, &a->Y))
+                if (!bn_copy(y0, &a->Y))
                         goto err;
         } else {
                 if (!EC_POINT_get_affine_coordinates(group, a, x0, y0, ctx))
                         goto err;
         }
         if (b->Z_is_one) {
-                if (!BN_copy(x1, &b->X))
+                if (!bn_copy(x1, &b->X))
                         goto err;
-                if (!BN_copy(y1, &b->Y))
+                if (!bn_copy(y1, &b->Y))
                         goto err;
         } else {
                 if (!EC_POINT_get_affine_coordinates(group, b, x1, y1, ctx))
@@ -647,9 +647,9 @@ ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
 
         if (!EC_POINT_get_affine_coordinates(group, point, x, y, ctx))
                 goto err;
-        if (!BN_copy(&point->X, x))
+        if (!bn_copy(&point->X, x))
                 goto err;
-        if (!BN_copy(&point->Y, y))
+        if (!bn_copy(&point->Y, y))
                 goto err;
         if (!BN_one(&point->Z))
                 goto err;
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index 3799498ab1..2f9f05cc56 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_key.c,v 1.31 2023/03/07 09:27:10 jsing Exp $ */
+/* $OpenBSD: ec_key.c,v 1.32 2023/03/27 10:25:02 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -172,7 +172,7 @@ EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
                         if (dest->priv_key == NULL)
                                 return NULL;
                 }
-                if (!BN_copy(dest->priv_key, src->priv_key))
+                if (!bn_copy(dest->priv_key, src->priv_key))
                         return NULL;
         }
         /* copy method/extra data */
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index 2d14f9c9c5..38ddd7af9f 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lib.c,v 1.51 2023/03/08 06:47:30 jsing Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.52 2023/03/27 10:25:02 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -181,9 +181,9 @@ EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
                 dest->generator = NULL;
         }
 
-        if (!BN_copy(&dest->order, &src->order))
+        if (!bn_copy(&dest->order, &src->order))
                 return 0;
-        if (!BN_copy(&dest->cofactor, &src->cofactor))
+        if (!bn_copy(&dest->cofactor, &src->cofactor))
                 return 0;
 
         dest->curve_name = src->curve_name;
@@ -279,7 +279,7 @@ ec_guess_cofactor(EC_GROUP *group)
                 if (!BN_set_bit(q, BN_num_bits(&group->field) - 1))
                         goto err;
         } else {
-                if (!BN_copy(q, &group->field))
+                if (!bn_copy(q, &group->field))
                         goto err;
         }
 
@@ -357,12 +357,12 @@ EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
         if (!EC_POINT_copy(group->generator, generator))
                 return 0;
 
-        if (!BN_copy(&group->order, order))
+        if (!bn_copy(&group->order, order))
                 return 0;
 
         /* Either take the provided positive cofactor, or try to compute it. */
         if (cofactor != NULL && !BN_is_zero(cofactor)) {
-                if (!BN_copy(&group->cofactor, cofactor))
+                if (!bn_copy(&group->cofactor, cofactor))
                         return 0;
         } else if (!ec_guess_cofactor(group))
                 return 0;
@@ -387,7 +387,7 @@ EC_GROUP_get0_generator(const EC_GROUP *group)
 int
 EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx)
 {
-        if (!BN_copy(order, &group->order))
+        if (!bn_copy(order, &group->order))
                 return 0;
 
         return !BN_is_zero(order);
@@ -402,7 +402,7 @@ EC_GROUP_order_bits(const EC_GROUP *group)
 int
 EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor, BN_CTX *ctx)
 {
-        if (!BN_copy(cofactor, &group->cofactor))
+        if (!bn_copy(cofactor, &group->cofactor))
                 return 0;
 
         return !BN_is_zero(&group->cofactor);
diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index 8b85bf32fa..915cf15f72 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_mont.c,v 1.27 2023/03/08 05:45:31 jsing Exp $ */
+/* $OpenBSD: ecp_mont.c,v 1.28 2023/03/27 10:25:02 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -220,7 +220,7 @@ ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx)
                 ECerror(EC_R_NOT_INITIALIZED);
                 return 0;
         }
-        if (!BN_copy(r, group->mont_one))
+        if (!bn_copy(r, group->mont_one))
                 return 0;
         return 1;
 }
diff --git a/src/lib/libcrypto/ec/ecp_smpl.c b/src/lib/libcrypto/ec/ecp_smpl.c
index 9af6034601..90330652e4 100644
--- a/src/lib/libcrypto/ec/ecp_smpl.c
+++ b/src/lib/libcrypto/ec/ecp_smpl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_smpl.c,v 1.42 2023/03/08 05:45:31 jsing Exp $ */
+/* $OpenBSD: ecp_smpl.c,v 1.43 2023/03/27 10:25:02 tb 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.
@@ -102,11 +102,11 @@ ec_GFp_simple_group_finish(EC_GROUP *group)
 int
 ec_GFp_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 {
-        if (!BN_copy(&dest->field, &src->field))
+        if (!bn_copy(&dest->field, &src->field))
                 return 0;
-        if (!BN_copy(&dest->a, &src->a))
+        if (!bn_copy(&dest->a, &src->a))
                 return 0;
-        if (!BN_copy(&dest->b, &src->b))
+        if (!bn_copy(&dest->b, &src->b))
                 return 0;
 
         dest->a_is_minus3 = src->a_is_minus3;
@@ -137,7 +137,7 @@ ec_GFp_simple_group_set_curve(EC_GROUP *group,
                 goto err;
 
         /* group->field */
-        if (!BN_copy(&group->field, p))
+        if (!bn_copy(&group->field, p))
                 goto err;
         BN_set_negative(&group->field, 0);
 
@@ -147,7 +147,7 @@ ec_GFp_simple_group_set_curve(EC_GROUP *group,
         if (group->meth->field_encode) {
                 if (!group->meth->field_encode(group, &group->a, tmp_a, ctx))
                         goto err;
-        } else if (!BN_copy(&group->a, tmp_a))
+        } else if (!bn_copy(&group->a, tmp_a))
                 goto err;
 
         /* group->b */
@@ -177,7 +177,7 @@ ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNU
         BN_CTX *new_ctx = NULL;
 
         if (p != NULL) {
-                if (!BN_copy(p, &group->field))
+                if (!bn_copy(p, &group->field))
                         return 0;
         }
         if (a != NULL || b != NULL) {
@@ -197,11 +197,11 @@ ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNU
                         }
                 } else {
                         if (a != NULL) {
-                                if (!BN_copy(a, &group->a))
+                                if (!bn_copy(a, &group->a))
                                         goto err;
                         }
                         if (b != NULL) {
-                                if (!BN_copy(b, &group->b))
+                                if (!bn_copy(b, &group->b))
                                         goto err;
                         }
                 }
@@ -252,9 +252,9 @@ ec_GFp_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
                 if (!group->meth->field_decode(group, b, &group->b, ctx))
                         goto err;
         } else {
-                if (!BN_copy(a, &group->a))
+                if (!bn_copy(a, &group->a))
                         goto err;
-                if (!BN_copy(b, &group->b))
+                if (!bn_copy(b, &group->b))
                         goto err;
         }
 
@@ -317,11 +317,11 @@ ec_GFp_simple_point_finish(EC_POINT *point)
 int
 ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
 {
-        if (!BN_copy(&dest->X, &src->X))
+        if (!bn_copy(&dest->X, &src->X))
                 return 0;
-        if (!BN_copy(&dest->Y, &src->Y))
+        if (!bn_copy(&dest->Y, &src->Y))
                 return 0;
-        if (!BN_copy(&dest->Z, &src->Z))
+        if (!bn_copy(&dest->Z, &src->Z))
                 return 0;
         dest->Z_is_one = src->Z_is_one;
 
@@ -416,15 +416,15 @@ ec_GFp_simple_get_Jprojective_coordinates(const EC_GROUP *group,
                 }
         } else {
                 if (x != NULL) {
-                        if (!BN_copy(x, &point->X))
+                        if (!bn_copy(x, &point->X))
                                 goto err;
                 }
                 if (y != NULL) {
-                        if (!BN_copy(y, &point->Y))
+                        if (!bn_copy(y, &point->Y))
                                 goto err;
                 }
                 if (z != NULL) {
-                        if (!BN_copy(z, &point->Z))
+                        if (!bn_copy(z, &point->Z))
                                 goto err;
                 }
         }
@@ -499,11 +499,11 @@ ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT
                         }
                 } else {
                         if (x != NULL) {
-                                if (!BN_copy(x, &point->X))
+                                if (!bn_copy(x, &point->X))
                                         goto err;
                         }
                         if (y != NULL) {
-                                if (!BN_copy(y, &point->Y))
+                                if (!bn_copy(y, &point->Y))
                                         goto err;
                         }
                 }
@@ -606,9 +606,9 @@ ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const E
 
         /* n1, n2 */
         if (b->Z_is_one) {
-                if (!BN_copy(n1, &a->X))
+                if (!bn_copy(n1, &a->X))
                         goto end;
-                if (!BN_copy(n2, &a->Y))
+                if (!bn_copy(n2, &a->Y))
                         goto end;
                 /* n1 = X_a */
                 /* n2 = Y_a */
@@ -628,9 +628,9 @@ ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const E
 
         /* n3, n4 */
         if (a->Z_is_one) {
-                if (!BN_copy(n3, &b->X))
+                if (!bn_copy(n3, &b->X))
                         goto end;
-                if (!BN_copy(n4, &b->Y))
+                if (!bn_copy(n4, &b->Y))
                         goto end;
                 /* n3 = X_b */
                 /* n4 = Y_b */
@@ -681,14 +681,14 @@ ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const E
 
         /* Z_r */
         if (a->Z_is_one && b->Z_is_one) {
-                if (!BN_copy(&r->Z, n5))
+                if (!bn_copy(&r->Z, n5))
                         goto end;
         } else {
                 if (a->Z_is_one) {
-                        if (!BN_copy(n0, &b->Z))
+                        if (!bn_copy(n0, &b->Z))
                                 goto end;
                 } else if (b->Z_is_one) {
-                        if (!BN_copy(n0, &a->Z))
+                        if (!bn_copy(n0, &a->Z))
                                 goto end;
                 } else {
                         if (!field_mul(group, n0, &a->Z, &b->Z, ctx))
@@ -832,7 +832,7 @@ ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX
 
         /* Z_r */
         if (a->Z_is_one) {
-                if (!BN_copy(n0, &a->Y))
+                if (!bn_copy(n0, &a->Y))
                         goto err;
         } else {
                 if (!field_mul(group, n0, &a->Y, &a->Z, ctx))
@@ -1214,11 +1214,11 @@ ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *po
 
                 if (heap[2 * i] != NULL) {
                         if ((heap[2 * i + 1] == NULL) || BN_is_zero(heap[2 * i + 1])) {
-                                if (!BN_copy(heap[i], heap[2 * i]))
+                                if (!bn_copy(heap[i], heap[2 * i]))
                                         goto err;
                         } else {
                                 if (BN_is_zero(heap[2 * i])) {
-                                        if (!BN_copy(heap[i], heap[2 * i + 1]))
+                                        if (!bn_copy(heap[i], heap[2 * i + 1]))
                                                 goto err;
                                 } else {
                                         if (!group->meth->field_mul(group, heap[i],
@@ -1256,12 +1256,12 @@ ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *po
                                 goto err;
                         if (!group->meth->field_mul(group, tmp1, heap[i / 2], heap[i], ctx))
                                 goto err;
-                        if (!BN_copy(heap[i], tmp0))
+                        if (!bn_copy(heap[i], tmp0))
                                 goto err;
-                        if (!BN_copy(heap[i + 1], tmp1))
+                        if (!bn_copy(heap[i + 1], tmp1))
                                 goto err;
                 } else {
-                        if (!BN_copy(heap[i], heap[i / 2]))
+                        if (!bn_copy(heap[i], heap[i / 2]))
                                 goto err;
                 }
         }
@@ -1473,7 +1473,7 @@ ec_GFp_simple_mul_ct(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
             !bn_wexpand(lambda, group_top + 2))
                 goto err;
 
-        if (!BN_copy(k, scalar))
+        if (!bn_copy(k, scalar))
                 goto err;
 
         BN_set_flags(k, BN_FLG_CONSTTIME);