diff options
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 20 |
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 | |||
1003 | EC_POINT_set_to_infinity | 1003 | EC_POINT_set_to_infinity |
1004 | EC_POINTs_make_affine | 1004 | EC_POINTs_make_affine |
1005 | EC_POINTs_mul | 1005 | EC_POINTs_mul |
1006 | EC_PRIVATEKEY_free | ||
1007 | EC_PRIVATEKEY_it | ||
1008 | EC_PRIVATEKEY_new | ||
1009 | EC_curve_nid2nist | 1006 | EC_curve_nid2nist |
1010 | EC_curve_nist2nid | 1007 | EC_curve_nist2nid |
1011 | EC_get_builtin_curves | 1008 | EC_get_builtin_curves |
@@ -3003,7 +3000,6 @@ d2i_ECParameters | |||
3003 | d2i_ECPrivateKey | 3000 | d2i_ECPrivateKey |
3004 | d2i_ECPrivateKey_bio | 3001 | d2i_ECPrivateKey_bio |
3005 | d2i_ECPrivateKey_fp | 3002 | d2i_ECPrivateKey_fp |
3006 | d2i_EC_PRIVATEKEY | ||
3007 | d2i_EC_PUBKEY | 3003 | d2i_EC_PUBKEY |
3008 | d2i_EC_PUBKEY_bio | 3004 | d2i_EC_PUBKEY_bio |
3009 | d2i_EC_PUBKEY_fp | 3005 | d2i_EC_PUBKEY_fp |
@@ -3192,7 +3188,6 @@ i2d_ECParameters | |||
3192 | i2d_ECPrivateKey | 3188 | i2d_ECPrivateKey |
3193 | i2d_ECPrivateKey_bio | 3189 | i2d_ECPrivateKey_bio |
3194 | i2d_ECPrivateKey_fp | 3190 | i2d_ECPrivateKey_fp |
3195 | i2d_EC_PRIVATEKEY | ||
3196 | i2d_EC_PUBKEY | 3191 | i2d_EC_PUBKEY |
3197 | i2d_EC_PUBKEY_bio | 3192 | i2d_EC_PUBKEY_bio |
3198 | i2d_EC_PUBKEY_fp | 3193 | i2d_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 | ||
561 | const ASN1_ITEM EC_PRIVATEKEY_it = { | 561 | static 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 | ||
571 | EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); | 571 | static EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); |
572 | void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); | 572 | static void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); |
573 | EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); | 573 | static EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); |
574 | int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); | 574 | static int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); |
575 | 575 | ||
576 | EC_PRIVATEKEY * | 576 | static EC_PRIVATEKEY * |
577 | d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) | 577 | d2i_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 | ||
583 | int | 583 | static int |
584 | i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out) | 584 | i2d_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 | ||
589 | EC_PRIVATEKEY * | 589 | static EC_PRIVATEKEY * |
590 | EC_PRIVATEKEY_new(void) | 590 | EC_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 | ||
595 | void | 595 | static void |
596 | EC_PRIVATEKEY_free(EC_PRIVATEKEY *a) | 596 | EC_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); |