summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/ec')
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c16
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c10
-rw-r--r--src/lib/libcrypto/ec/ec_oct.c3
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 @@
1/* $OpenBSD: ec_asn1.c,v 1.47 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.48 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -185,14 +185,12 @@ X9_62_PENTANOMIAL_new(void)
185{ 185{
186 return (X9_62_PENTANOMIAL*)ASN1_item_new(&X9_62_PENTANOMIAL_it); 186 return (X9_62_PENTANOMIAL*)ASN1_item_new(&X9_62_PENTANOMIAL_it);
187} 187}
188LCRYPTO_ALIAS(X9_62_PENTANOMIAL_new);
189 188
190void 189void
191X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a) 190X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a)
192{ 191{
193 ASN1_item_free((ASN1_VALUE *)a, &X9_62_PENTANOMIAL_it); 192 ASN1_item_free((ASN1_VALUE *)a, &X9_62_PENTANOMIAL_it);
194} 193}
195LCRYPTO_ALIAS(X9_62_PENTANOMIAL_free);
196 194
197static const ASN1_TEMPLATE char_two_def_tt = { 195static const ASN1_TEMPLATE char_two_def_tt = {
198 .flags = 0, 196 .flags = 0,
@@ -287,14 +285,12 @@ X9_62_CHARACTERISTIC_TWO_new(void)
287{ 285{
288 return (X9_62_CHARACTERISTIC_TWO*)ASN1_item_new(&X9_62_CHARACTERISTIC_TWO_it); 286 return (X9_62_CHARACTERISTIC_TWO*)ASN1_item_new(&X9_62_CHARACTERISTIC_TWO_it);
289} 287}
290LCRYPTO_ALIAS(X9_62_CHARACTERISTIC_TWO_new);
291 288
292void 289void
293X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a) 290X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a)
294{ 291{
295 ASN1_item_free((ASN1_VALUE *)a, &X9_62_CHARACTERISTIC_TWO_it); 292 ASN1_item_free((ASN1_VALUE *)a, &X9_62_CHARACTERISTIC_TWO_it);
296} 293}
297LCRYPTO_ALIAS(X9_62_CHARACTERISTIC_TWO_free);
298 294
299static const ASN1_TEMPLATE fieldID_def_tt = { 295static const ASN1_TEMPLATE fieldID_def_tt = {
300 .flags = 0, 296 .flags = 0,
@@ -460,14 +456,12 @@ ECPARAMETERS_new(void)
460{ 456{
461 return (ECPARAMETERS*)ASN1_item_new(&ECPARAMETERS_it); 457 return (ECPARAMETERS*)ASN1_item_new(&ECPARAMETERS_it);
462} 458}
463LCRYPTO_ALIAS(ECPARAMETERS_new);
464 459
465void 460void
466ECPARAMETERS_free(ECPARAMETERS *a) 461ECPARAMETERS_free(ECPARAMETERS *a)
467{ 462{
468 ASN1_item_free((ASN1_VALUE *)a, &ECPARAMETERS_it); 463 ASN1_item_free((ASN1_VALUE *)a, &ECPARAMETERS_it);
469} 464}
470LCRYPTO_ALIAS(ECPARAMETERS_free);
471 465
472static const ASN1_TEMPLATE ECPKPARAMETERS_ch_tt[] = { 466static const ASN1_TEMPLATE ECPKPARAMETERS_ch_tt[] = {
473 { 467 {
@@ -514,28 +508,24 @@ d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
514 return (ECPKPARAMETERS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 508 return (ECPKPARAMETERS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
515 &ECPKPARAMETERS_it); 509 &ECPKPARAMETERS_it);
516} 510}
517LCRYPTO_ALIAS(d2i_ECPKPARAMETERS);
518 511
519int 512int
520i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out) 513i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out)
521{ 514{
522 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ECPKPARAMETERS_it); 515 return ASN1_item_i2d((ASN1_VALUE *)a, out, &ECPKPARAMETERS_it);
523} 516}
524LCRYPTO_ALIAS(i2d_ECPKPARAMETERS);
525 517
526ECPKPARAMETERS * 518ECPKPARAMETERS *
527ECPKPARAMETERS_new(void) 519ECPKPARAMETERS_new(void)
528{ 520{
529 return (ECPKPARAMETERS *)ASN1_item_new(&ECPKPARAMETERS_it); 521 return (ECPKPARAMETERS *)ASN1_item_new(&ECPKPARAMETERS_it);
530} 522}
531LCRYPTO_ALIAS(ECPKPARAMETERS_new);
532 523
533void 524void
534ECPKPARAMETERS_free(ECPKPARAMETERS *a) 525ECPKPARAMETERS_free(ECPKPARAMETERS *a)
535{ 526{
536 ASN1_item_free((ASN1_VALUE *)a, &ECPKPARAMETERS_it); 527 ASN1_item_free((ASN1_VALUE *)a, &ECPKPARAMETERS_it);
537} 528}
538LCRYPTO_ALIAS(ECPKPARAMETERS_free);
539 529
540static const ASN1_TEMPLATE EC_PRIVATEKEY_seq_tt[] = { 530static const ASN1_TEMPLATE EC_PRIVATEKEY_seq_tt[] = {
541 { 531 {
@@ -589,28 +579,24 @@ d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)
589 return (EC_PRIVATEKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 579 return (EC_PRIVATEKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
590 &EC_PRIVATEKEY_it); 580 &EC_PRIVATEKEY_it);
591} 581}
592LCRYPTO_ALIAS(d2i_EC_PRIVATEKEY);
593 582
594int 583int
595i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out) 584i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out)
596{ 585{
597 return ASN1_item_i2d((ASN1_VALUE *)a, out, &EC_PRIVATEKEY_it); 586 return ASN1_item_i2d((ASN1_VALUE *)a, out, &EC_PRIVATEKEY_it);
598} 587}
599LCRYPTO_ALIAS(i2d_EC_PRIVATEKEY);
600 588
601EC_PRIVATEKEY * 589EC_PRIVATEKEY *
602EC_PRIVATEKEY_new(void) 590EC_PRIVATEKEY_new(void)
603{ 591{
604 return (EC_PRIVATEKEY *)ASN1_item_new(&EC_PRIVATEKEY_it); 592 return (EC_PRIVATEKEY *)ASN1_item_new(&EC_PRIVATEKEY_it);
605} 593}
606LCRYPTO_ALIAS(EC_PRIVATEKEY_new);
607 594
608void 595void
609EC_PRIVATEKEY_free(EC_PRIVATEKEY *a) 596EC_PRIVATEKEY_free(EC_PRIVATEKEY *a)
610{ 597{
611 ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it); 598 ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it);
612} 599}
613LCRYPTO_ALIAS(EC_PRIVATEKEY_free);
614 600
615/* some declarations of internal function */ 601/* some declarations of internal function */
616 602
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 @@
1/* $OpenBSD: ec_lib.c,v 1.63 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.64 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -136,7 +136,6 @@ EC_GROUP_clear_free(EC_GROUP *group)
136{ 136{
137 EC_GROUP_free(group); 137 EC_GROUP_free(group);
138} 138}
139LCRYPTO_ALIAS(EC_GROUP_clear_free);
140 139
141int 140int
142EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src) 141EC_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,
543{ 542{
544 return EC_GROUP_set_curve(group, p, a, b, ctx); 543 return EC_GROUP_set_curve(group, p, a, b, ctx);
545} 544}
546LCRYPTO_ALIAS(EC_GROUP_set_curve_GFp);
547 545
548int 546int
549EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, 547EC_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,
551{ 549{
552 return EC_GROUP_get_curve(group, p, a, b, ctx); 550 return EC_GROUP_get_curve(group, p, a, b, ctx);
553} 551}
554LCRYPTO_ALIAS(EC_GROUP_get_curve_GFp);
555 552
556int 553int
557EC_GROUP_get_degree(const EC_GROUP *group) 554EC_GROUP_get_degree(const EC_GROUP *group)
@@ -730,7 +727,6 @@ EC_POINT_clear_free(EC_POINT *point)
730{ 727{
731 EC_POINT_free(point); 728 EC_POINT_free(point);
732} 729}
733LCRYPTO_ALIAS(EC_POINT_clear_free);
734 730
735int 731int
736EC_POINT_copy(EC_POINT *dest, const EC_POINT *src) 732EC_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,
866{ 862{
867 return EC_POINT_set_Jprojective_coordinates(group, point, x, y, z, ctx); 863 return EC_POINT_set_Jprojective_coordinates(group, point, x, y, z, ctx);
868} 864}
869LCRYPTO_ALIAS(EC_POINT_set_Jprojective_coordinates_GFp);
870 865
871int 866int
872EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, 867EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
@@ -874,7 +869,6 @@ EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
874{ 869{
875 return EC_POINT_get_Jprojective_coordinates(group, point, x, y, z, ctx); 870 return EC_POINT_get_Jprojective_coordinates(group, point, x, y, z, ctx);
876} 871}
877LCRYPTO_ALIAS(EC_POINT_get_Jprojective_coordinates_GFp);
878 872
879int 873int
880EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point, 874EC_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,
920{ 914{
921 return EC_POINT_set_affine_coordinates(group, point, x, y, ctx); 915 return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);
922} 916}
923LCRYPTO_ALIAS(EC_POINT_set_affine_coordinates_GFp);
924 917
925int 918int
926EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point, 919EC_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
958{ 951{
959 return EC_POINT_get_affine_coordinates(group, point, x, y, ctx); 952 return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);
960} 953}
961LCRYPTO_ALIAS(EC_POINT_get_affine_coordinates_GFp);
962 954
963int 955int
964EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, 956EC_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 @@
1/* $OpenBSD: ec_oct.c,v 1.15 2023/07/07 13:54:45 beck Exp $ */ 1/* $OpenBSD: ec_oct.c,v 1.16 2023/07/07 19:37:53 beck Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -107,7 +107,6 @@ EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
107{ 107{
108 return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx); 108 return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);
109} 109}
110LCRYPTO_ALIAS(EC_POINT_set_compressed_coordinates_GFp);
111 110
112size_t 111size_t
113EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, 112EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,