From 3cb7bd6f19ea649a12f09373977f93f81e110eb6 Mon Sep 17 00:00:00 2001 From: beck Date: Tue, 9 Jul 2024 07:16:44 +0000 Subject: [PATCH] Hide CRYPTO_get_dynlock_create_callback ok tb@ --- lib/libcrypto/Symbols.namespace | 1 + lib/libcrypto/cryptlib.c | 3 ++- lib/libcrypto/hidden/openssl/crypto.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index 8cdca7e4271..4e4f80bc190 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -3346,6 +3346,7 @@ _libre_X509_STORE_set_check_issued _libre_lh_error _libre_DES_check_key _libre_DES_rw_mode +_libre_CRYPTO_get_dynlock_create_callback _libre_RSAPublicKey_it _libre_RSAPrivateKey_it _libre_RSA_PSS_PARAMS_it diff --git a/lib/libcrypto/cryptlib.c b/lib/libcrypto/cryptlib.c index dc62d820827..b9ea39285d1 100644 --- a/lib/libcrypto/cryptlib.c +++ b/lib/libcrypto/cryptlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptlib.c,v 1.51 2024/04/21 13:41:14 tb Exp $ */ +/* $OpenBSD: cryptlib.c,v 1.52 2024/07/09 07:16:44 beck Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -281,6 +281,7 @@ struct CRYPTO_dynlock_value * { return NULL; } +LCRYPTO_ALIAS(CRYPTO_get_dynlock_create_callback); void (*CRYPTO_get_dynlock_lock_callback(void))(int mode, diff --git a/lib/libcrypto/hidden/openssl/crypto.h b/lib/libcrypto/hidden/openssl/crypto.h index fb1b215b96c..1b2d8cbbe74 100644 --- a/lib/libcrypto/hidden/openssl/crypto.h +++ b/lib/libcrypto/hidden/openssl/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.7 2024/04/10 14:51:02 beck Exp $ */ +/* $OpenBSD: crypto.h,v 1.8 2024/07/09 07:16:44 beck Exp $ */ /* * Copyright (c) 2023 Bob Beck * @@ -69,6 +69,7 @@ LCRYPTO_UNUSED(CRYPTO_set_dynlock_lock_callback); LCRYPTO_UNUSED(CRYPTO_set_dynlock_destroy_callback); LCRYPTO_UNUSED(CRYPTO_get_dynlock_lock_callback); LCRYPTO_UNUSED(CRYPTO_get_dynlock_destroy_callback); +LCRYPTO_UNUSED(CRYPTO_get_dynlock_create_callback); LCRYPTO_UNUSED(CRYPTO_malloc); LCRYPTO_UNUSED(CRYPTO_strdup); LCRYPTO_UNUSED(CRYPTO_free); -- 2.20.1