From ecc472a0b43d2d6e76cb007be9690b7a3a5cfa46 Mon Sep 17 00:00:00 2001 From: beck Date: Tue, 9 Jul 2024 06:14:59 +0000 Subject: [PATCH] Hide symbols for two missed public functions in bio.h ok tb@ --- lib/libcrypto/Symbols.namespace | 2 ++ lib/libcrypto/bio/bio_lib.c | 3 ++- lib/libcrypto/bio/bss_bio.c | 3 ++- lib/libcrypto/hidden/openssl/bio.h | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index b38d57a726e..fb12161a339 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -3338,6 +3338,8 @@ _libre_CMS_ContentInfo_it _libre_CMS_ReceiptRequest_it _libre_PKCS12_it _libre_PKCS12_SAFEBAG_it +_libre_BIO_get_ex_new_index +_libre_BIO_new_bio_pair _libre_RSAPublicKey_it _libre_RSAPrivateKey_it _libre_RSA_PSS_PARAMS_it diff --git a/lib/libcrypto/bio/bio_lib.c b/lib/libcrypto/bio/bio_lib.c index ba715392237..463d2ad23a3 100644 --- a/lib/libcrypto/bio/bio_lib.c +++ b/lib/libcrypto/bio/bio_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_lib.c,v 1.53 2024/03/27 01:22:30 tb Exp $ */ +/* $OpenBSD: bio_lib.c,v 1.54 2024/07/09 06:14:59 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -851,6 +851,7 @@ BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_BIO, argl, argp, new_func, dup_func, free_func); } +LCRYPTO_ALIAS(BIO_get_ex_new_index); int BIO_set_ex_data(BIO *bio, int idx, void *data) diff --git a/lib/libcrypto/bio/bss_bio.c b/lib/libcrypto/bio/bss_bio.c index 9a3215a7d48..39d8d1e46ce 100644 --- a/lib/libcrypto/bio/bss_bio.c +++ b/lib/libcrypto/bio/bss_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_bio.c,v 1.28 2023/07/28 10:13:50 tb Exp $ */ +/* $OpenBSD: bss_bio.c,v 1.29 2024/07/09 06:14:59 beck Exp $ */ /* ==================================================================== * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. * @@ -617,6 +617,7 @@ BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1, BIO **bio2_p, size_t writebuf2) *bio2_p = bio2; return ret; } +LCRYPTO_ALIAS(BIO_new_bio_pair); size_t BIO_ctrl_get_write_guarantee(BIO *bio) diff --git a/lib/libcrypto/hidden/openssl/bio.h b/lib/libcrypto/hidden/openssl/bio.h index 425d1e29415..03da75a795f 100644 --- a/lib/libcrypto/hidden/openssl/bio.h +++ b/lib/libcrypto/hidden/openssl/bio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bio.h,v 1.7 2024/03/02 09:22:41 tb Exp $ */ +/* $OpenBSD: bio.h,v 1.8 2024/07/09 06:14:59 beck Exp $ */ /* * Copyright (c) 2023 Bob Beck * @@ -136,5 +136,7 @@ LCRYPTO_USED(BIO_new_accept); LCRYPTO_USED(BIO_copy_next_retry); LCRYPTO_USED(BIO_printf); LCRYPTO_USED(ERR_load_BIO_strings); +LCRYPTO_USED(BIO_get_ex_new_index); +LCRYPTO_USED(BIO_new_bio_pair); #endif /* _LIBCRYPTO_BIO_H */ -- 2.20.1