summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/Symbols.list5
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c20
2 files changed, 10 insertions, 15 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 7d50c8a1bc..ff90316a4c 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1003,9 +1003,6 @@ EC_POINT_set_compressed_coordinates_GFp
1003EC_POINT_set_to_infinity 1003EC_POINT_set_to_infinity
1004EC_POINTs_make_affine 1004EC_POINTs_make_affine
1005EC_POINTs_mul 1005EC_POINTs_mul
1006EC_PRIVATEKEY_free
1007EC_PRIVATEKEY_it
1008EC_PRIVATEKEY_new
1009EC_curve_nid2nist 1006EC_curve_nid2nist
1010EC_curve_nist2nid 1007EC_curve_nist2nid
1011EC_get_builtin_curves 1008EC_get_builtin_curves
@@ -3003,7 +3000,6 @@ d2i_ECParameters
3003d2i_ECPrivateKey 3000d2i_ECPrivateKey
3004d2i_ECPrivateKey_bio 3001d2i_ECPrivateKey_bio
3005d2i_ECPrivateKey_fp 3002d2i_ECPrivateKey_fp
3006d2i_EC_PRIVATEKEY
3007d2i_EC_PUBKEY 3003d2i_EC_PUBKEY
3008d2i_EC_PUBKEY_bio 3004d2i_EC_PUBKEY_bio
3009d2i_EC_PUBKEY_fp 3005d2i_EC_PUBKEY_fp
@@ -3192,7 +3188,6 @@ i2d_ECParameters
3192i2d_ECPrivateKey 3188i2d_ECPrivateKey
3193i2d_ECPrivateKey_bio 3189i2d_ECPrivateKey_bio
3194i2d_ECPrivateKey_fp 3190i2d_ECPrivateKey_fp
3195i2d_EC_PRIVATEKEY
3196i2d_EC_PUBKEY 3191i2d_EC_PUBKEY
3197i2d_EC_PUBKEY_bio 3192i2d_EC_PUBKEY_bio
3198i2d_EC_PUBKEY_fp 3193i2d_EC_PUBKEY_fp
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 4bd95d6efc..c1aedb47ee 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.50 2024/04/15 15:42:23 tb Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.51 2024/04/15 15:44:15 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -558,7 +558,7 @@ static const ASN1_TEMPLATE EC_PRIVATEKEY_seq_tt[] = {
558 }, 558 },
559}; 559};
560 560
561const ASN1_ITEM EC_PRIVATEKEY_it = { 561static const ASN1_ITEM EC_PRIVATEKEY_it = {
562 .itype = ASN1_ITYPE_SEQUENCE, 562 .itype = ASN1_ITYPE_SEQUENCE,
563 .utype = V_ASN1_SEQUENCE, 563 .utype = V_ASN1_SEQUENCE,
564 .templates = EC_PRIVATEKEY_seq_tt, 564 .templates = EC_PRIVATEKEY_seq_tt,
@@ -568,31 +568,31 @@ const ASN1_ITEM EC_PRIVATEKEY_it = {
568 .sname = "EC_PRIVATEKEY", 568 .sname = "EC_PRIVATEKEY",
569}; 569};
570 570
571EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); 571static EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
572void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); 572static void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
573EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); 573static EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
574int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); 574static int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
575 575
576EC_PRIVATEKEY * 576static EC_PRIVATEKEY *
577d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) 577d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)
578{ 578{
579 return (EC_PRIVATEKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, 579 return (EC_PRIVATEKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
580 &EC_PRIVATEKEY_it); 580 &EC_PRIVATEKEY_it);
581} 581}
582 582
583int 583static int
584i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out) 584i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out)
585{ 585{
586 return ASN1_item_i2d((ASN1_VALUE *)a, out, &EC_PRIVATEKEY_it); 586 return ASN1_item_i2d((ASN1_VALUE *)a, out, &EC_PRIVATEKEY_it);
587} 587}
588 588
589EC_PRIVATEKEY * 589static EC_PRIVATEKEY *
590EC_PRIVATEKEY_new(void) 590EC_PRIVATEKEY_new(void)
591{ 591{
592 return (EC_PRIVATEKEY *)ASN1_item_new(&EC_PRIVATEKEY_it); 592 return (EC_PRIVATEKEY *)ASN1_item_new(&EC_PRIVATEKEY_it);
593} 593}
594 594
595void 595static void
596EC_PRIVATEKEY_free(EC_PRIVATEKEY *a) 596EC_PRIVATEKEY_free(EC_PRIVATEKEY *a)
597{ 597{
598 ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it); 598 ASN1_item_free((ASN1_VALUE *)a, &EC_PRIVATEKEY_it);