Unbreak the namespace build after a broken mk.conf and tool misfire had

me aliasing symbols not in the headers I was procesing.

This unbreaks the namespace build so it will pass again

ok tb@

3 files changed, 3 insertions, 26 deletions

diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 0435f0a75f..683ca17417 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.47 2023/07/07 13:54:45 beck Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.48 2023/07/07 19:37:53 beck Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -185,14 +185,12 @@ X9_62_PENTANOMIAL_new(void)
 {
         return (X9_62_PENTANOMIAL*)ASN1_item_new(&X9_62_PENTANOMIAL_it);
 }
-LCRYPTO_ALIAS(X9_62_PENTANOMIAL_new);
 
 void
 X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X9_62_PENTANOMIAL_it);
 }
-LCRYPTO_ALIAS(X9_62_PENTANOMIAL_free);
 
 static const ASN1_TEMPLATE char_two_def_tt = {
         .flags = 0,
@@ -287,14 +285,12 @@ X9_62_CHARACTERISTIC_TWO_new(void)
 {
         return (X9_62_CHARACTERISTIC_TWO*)ASN1_item_new(&X9_62_CHARACTERISTIC_TWO_it);
 }
-LCRYPTO_ALIAS(X9_62_CHARACTERISTIC_TWO_new);
 
 void
 X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X9_62_CHARACTERISTIC_TWO_it);
 }
-LCRYPTO_ALIAS(X9_62_CHARACTERISTIC_TWO_free);
 
 static const ASN1_TEMPLATE fieldID_def_tt = {
         .flags = 0,
@@ -460,14 +456,12 @@ ECPARAMETERS_new(void)
 {
         return (ECPARAMETERS*)ASN1_item_new(&ECPARAMETERS_it);
 }
-LCRYPTO_ALIAS(ECPARAMETERS_new);
 
 void
 ECPARAMETERS_free(ECPARAMETERS *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &ECPARAMETERS_it);
 }
-LCRYPTO_ALIAS(ECPARAMETERS_free);
 
 static const ASN1_TEMPLATE ECPKPARAMETERS_ch_tt[] = {
         {
@@ -514,28 +508,24 @@ d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
         return (ECPKPARAMETERS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
             &ECPKPARAMETERS_it);
 }
-LCRYPTO_ALIAS(d2i_ECPKPARAMETERS);
 
 int
 i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out)
 {
         return ASN1_item_i2d((ASN1_VALUE *)a, out, &ECPKPARAMETERS_it);
 }
-LCRYPTO_ALIAS(i2d_ECPKPARAMETERS);
 
 ECPKPARAMETERS *
 ECPKPARAMETERS_new(void)
 {
         return (ECPKPARAMETERS *)ASN1_item_new(&ECPKPARAMETERS_it);
 }
-LCRYPTO_ALIAS(ECPKPARAMETERS_new);
 
 void
 ECPKPARAMETERS_free(ECPKPARAMETERS *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &ECPKPARAMETERS_it);
 }
-LCRYPTO_ALIAS(ECPKPARAMETERS_free);
 
 static const ASN1_TEMPLATE EC_PRIVATEKEY_seq_tt[] = {
         {
@@ -589,28 +579,24 @@ d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)
         return (EC_PRIVATEKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
             &EC_PRIVATEKEY_it);
 }
-LCRYPTO_ALIAS(d2i_EC_PRIVATEKEY);
 
 int
 i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out)
 {
         return ASN1_item_i2d((ASN1_VALUE *)a, out, &EC_PRIVATEKEY_it);
 }
-LCRYPTO_ALIAS(i2d_EC_PRIVATEKEY);
 
 EC_PRIVATEKEY *
 EC_PRIVATEKEY_new(void)
 {
         return (EC_PRIVATEKEY *)ASN1_item_new(&EC_PRIVATEKEY_it);
 }
-LCRYPTO_ALIAS(EC_PRIVATEKEY_new);
 
 void
 EC_PRIVATEKEY_free(EC_PRIVATEKEY *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it);
 }
-LCRYPTO_ALIAS(EC_PRIVATEKEY_free);
 
 /* some declarations of internal function */
 
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index 3db1ca2f07..b5788492cc 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.63 2023/07/07 13:54:45 beck Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.64 2023/07/07 19:37:53 beck Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -136,7 +136,6 @@ EC_GROUP_clear_free(EC_GROUP *group)
 {
         EC_GROUP_free(group);
 }
-LCRYPTO_ALIAS(EC_GROUP_clear_free);
 
 int
 EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
@@ -543,7 +542,6 @@ EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
 {
         return EC_GROUP_set_curve(group, p, a, b, ctx);
 }
-LCRYPTO_ALIAS(EC_GROUP_set_curve_GFp);
 
 int
 EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
@@ -551,7 +549,6 @@ EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
 {
         return EC_GROUP_get_curve(group, p, a, b, ctx);
 }
-LCRYPTO_ALIAS(EC_GROUP_get_curve_GFp);
 
 int
 EC_GROUP_get_degree(const EC_GROUP *group)
@@ -730,7 +727,6 @@ EC_POINT_clear_free(EC_POINT *point)
 {
         EC_POINT_free(point);
 }
-LCRYPTO_ALIAS(EC_POINT_clear_free);
 
 int
 EC_POINT_copy(EC_POINT *dest, const EC_POINT *src)
@@ -866,7 +862,6 @@ EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
 {
         return EC_POINT_set_Jprojective_coordinates(group, point, x, y, z, ctx);
 }
-LCRYPTO_ALIAS(EC_POINT_set_Jprojective_coordinates_GFp);
 
 int
 EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
@@ -874,7 +869,6 @@ EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
 {
         return EC_POINT_get_Jprojective_coordinates(group, point, x, y, z, ctx);
 }
-LCRYPTO_ALIAS(EC_POINT_get_Jprojective_coordinates_GFp);
 
 int
 EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
@@ -920,7 +914,6 @@ EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
 {
         return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);
 }
-LCRYPTO_ALIAS(EC_POINT_set_affine_coordinates_GFp);
 
 int
 EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,
@@ -958,7 +951,6 @@ EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point
 {
         return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);
 }
-LCRYPTO_ALIAS(EC_POINT_get_affine_coordinates_GFp);
 
 int
 EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
diff --git a/src/lib/libcrypto/ec/ec_oct.c b/src/lib/libcrypto/ec/ec_oct.c
index b9bc62a4e3..9308d409c2 100644
--- a/src/lib/libcrypto/ec/ec_oct.c
+++ b/src/lib/libcrypto/ec/ec_oct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_oct.c,v 1.15 2023/07/07 13:54:45 beck Exp $ */
+/* $OpenBSD: ec_oct.c,v 1.16 2023/07/07 19:37:53 beck Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -107,7 +107,6 @@ EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
 {
         return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);
 }
-LCRYPTO_ALIAS(EC_POINT_set_compressed_coordinates_GFp);
 
 size_t
 EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,