diff options
author | tb <> | 2025-03-09 15:17:22 +0000 |
---|---|---|
committer | tb <> | 2025-03-09 15:17:22 +0000 |
commit | 02325d3f08b84c968c0a9d0980ccca4efca3c676 (patch) | |
tree | 08d72fa2e2521e07c1958b49caf20cec50549672 /src | |
parent | 85cb68064f0dbda5b0f9fd114c7c3eb0e727fa17 (diff) | |
download | openbsd-02325d3f08b84c968c0a9d0980ccca4efca3c676.tar.gz openbsd-02325d3f08b84c968c0a9d0980ccca4efca3c676.tar.bz2 openbsd-02325d3f08b84c968c0a9d0980ccca4efca3c676.zip |
Unexport X509_NAME_print()
Nothing uses this anymore. M2Crypto has been patched and a fix for
opensc has been upstreamed.
ok jsing
This is the start of a major bump. Don't build the tree until I have
synced sets in about 20 commits.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/a_strex.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/x509.h | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 8459316be1..22e7565b71 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -2476,7 +2476,6 @@ X509_NAME_hash_old | |||
2476 | X509_NAME_it | 2476 | X509_NAME_it |
2477 | X509_NAME_new | 2477 | X509_NAME_new |
2478 | X509_NAME_oneline | 2478 | X509_NAME_oneline |
2479 | X509_NAME_print | ||
2480 | X509_NAME_print_ex | 2479 | X509_NAME_print_ex |
2481 | X509_NAME_print_ex_fp | 2480 | X509_NAME_print_ex_fp |
2482 | X509_NAME_set | 2481 | X509_NAME_set |
diff --git a/src/lib/libcrypto/asn1/a_strex.c b/src/lib/libcrypto/asn1/a_strex.c index a9ee0dd9c9..5523c22cc4 100644 --- a/src/lib/libcrypto/asn1/a_strex.c +++ b/src/lib/libcrypto/asn1/a_strex.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_strex.c,v 1.36 2025/02/08 03:41:36 tb Exp $ */ | 1 | /* $OpenBSD: a_strex.c,v 1.37 2025/03/09 15:17:22 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -590,7 +590,7 @@ x509_name_entry_include(const X509_NAME_ENTRY *ne) | |||
590 | return 0; | 590 | return 0; |
591 | } | 591 | } |
592 | 592 | ||
593 | int | 593 | static int |
594 | X509_NAME_print(BIO *bio, const X509_NAME *name, int obase) | 594 | X509_NAME_print(BIO *bio, const X509_NAME *name, int obase) |
595 | { | 595 | { |
596 | CBB cbb; | 596 | CBB cbb; |
@@ -640,7 +640,6 @@ X509_NAME_print(BIO *bio, const X509_NAME *name, int obase) | |||
640 | 640 | ||
641 | return ret; | 641 | return ret; |
642 | } | 642 | } |
643 | LCRYPTO_ALIAS(X509_NAME_print); | ||
644 | 643 | ||
645 | /* Wrappers round the main functions */ | 644 | /* Wrappers round the main functions */ |
646 | 645 | ||
diff --git a/src/lib/libcrypto/hidden/openssl/x509.h b/src/lib/libcrypto/hidden/openssl/x509.h index ac990a631d..e6104cd451 100644 --- a/src/lib/libcrypto/hidden/openssl/x509.h +++ b/src/lib/libcrypto/hidden/openssl/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.14 2024/08/31 10:46:40 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.15 2025/03/09 15:17:22 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -422,7 +422,6 @@ LCRYPTO_USED(X509_print_fp); | |||
422 | LCRYPTO_USED(X509_CRL_print_fp); | 422 | LCRYPTO_USED(X509_CRL_print_fp); |
423 | LCRYPTO_USED(X509_REQ_print_fp); | 423 | LCRYPTO_USED(X509_REQ_print_fp); |
424 | LCRYPTO_USED(X509_NAME_print_ex_fp); | 424 | LCRYPTO_USED(X509_NAME_print_ex_fp); |
425 | LCRYPTO_USED(X509_NAME_print); | ||
426 | LCRYPTO_USED(X509_NAME_print_ex); | 425 | LCRYPTO_USED(X509_NAME_print_ex); |
427 | LCRYPTO_USED(X509_print_ex); | 426 | LCRYPTO_USED(X509_print_ex); |
428 | LCRYPTO_USED(X509_print); | 427 | LCRYPTO_USED(X509_print); |
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 7390aaebfb..a198b23202 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.120 2025/03/01 11:31:28 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.121 2025/03/09 15:17:22 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -788,7 +788,6 @@ int X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent, | |||
788 | unsigned long flags); | 788 | unsigned long flags); |
789 | 789 | ||
790 | #ifndef OPENSSL_NO_BIO | 790 | #ifndef OPENSSL_NO_BIO |
791 | int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase); | ||
792 | int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent, | 791 | int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent, |
793 | unsigned long flags); | 792 | unsigned long flags); |
794 | int X509_print_ex(BIO *bp,X509 *x, unsigned long nmflag, unsigned long cflag); | 793 | int X509_print_ex(BIO *bp,X509 *x, unsigned long nmflag, unsigned long cflag); |