diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bio/bio_lib.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/bio/bss_bio.c | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/bio.h | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index b38d57a726..fb12161a33 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
| @@ -3338,6 +3338,8 @@ _libre_CMS_ContentInfo_it | |||
| 3338 | _libre_CMS_ReceiptRequest_it | 3338 | _libre_CMS_ReceiptRequest_it |
| 3339 | _libre_PKCS12_it | 3339 | _libre_PKCS12_it |
| 3340 | _libre_PKCS12_SAFEBAG_it | 3340 | _libre_PKCS12_SAFEBAG_it |
| 3341 | _libre_BIO_get_ex_new_index | ||
| 3342 | _libre_BIO_new_bio_pair | ||
| 3341 | _libre_RSAPublicKey_it | 3343 | _libre_RSAPublicKey_it |
| 3342 | _libre_RSAPrivateKey_it | 3344 | _libre_RSAPrivateKey_it |
| 3343 | _libre_RSA_PSS_PARAMS_it | 3345 | _libre_RSA_PSS_PARAMS_it |
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c index ba71539223..463d2ad23a 100644 --- a/src/lib/libcrypto/bio/bio_lib.c +++ b/src/lib/libcrypto/bio/bio_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bio_lib.c,v 1.53 2024/03/27 01:22:30 tb Exp $ */ | 1 | /* $OpenBSD: bio_lib.c,v 1.54 2024/07/09 06:14:59 beck 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 | * |
| @@ -851,6 +851,7 @@ BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | |||
| 851 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_BIO, argl, argp, | 851 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_BIO, argl, argp, |
| 852 | new_func, dup_func, free_func); | 852 | new_func, dup_func, free_func); |
| 853 | } | 853 | } |
| 854 | LCRYPTO_ALIAS(BIO_get_ex_new_index); | ||
| 854 | 855 | ||
| 855 | int | 856 | int |
| 856 | BIO_set_ex_data(BIO *bio, int idx, void *data) | 857 | BIO_set_ex_data(BIO *bio, int idx, void *data) |
diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c index 9a3215a7d4..39d8d1e46c 100644 --- a/src/lib/libcrypto/bio/bss_bio.c +++ b/src/lib/libcrypto/bio/bss_bio.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bss_bio.c,v 1.28 2023/07/28 10:13:50 tb Exp $ */ | 1 | /* $OpenBSD: bss_bio.c,v 1.29 2024/07/09 06:14:59 beck Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -617,6 +617,7 @@ BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1, BIO **bio2_p, size_t writebuf2) | |||
| 617 | *bio2_p = bio2; | 617 | *bio2_p = bio2; |
| 618 | return ret; | 618 | return ret; |
| 619 | } | 619 | } |
| 620 | LCRYPTO_ALIAS(BIO_new_bio_pair); | ||
| 620 | 621 | ||
| 621 | size_t | 622 | size_t |
| 622 | BIO_ctrl_get_write_guarantee(BIO *bio) | 623 | BIO_ctrl_get_write_guarantee(BIO *bio) |
diff --git a/src/lib/libcrypto/hidden/openssl/bio.h b/src/lib/libcrypto/hidden/openssl/bio.h index 425d1e2941..03da75a795 100644 --- a/src/lib/libcrypto/hidden/openssl/bio.h +++ b/src/lib/libcrypto/hidden/openssl/bio.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bio.h,v 1.7 2024/03/02 09:22:41 tb Exp $ */ | 1 | /* $OpenBSD: bio.h,v 1.8 2024/07/09 06:14:59 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2023 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2023 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -136,5 +136,7 @@ LCRYPTO_USED(BIO_new_accept); | |||
| 136 | LCRYPTO_USED(BIO_copy_next_retry); | 136 | LCRYPTO_USED(BIO_copy_next_retry); |
| 137 | LCRYPTO_USED(BIO_printf); | 137 | LCRYPTO_USED(BIO_printf); |
| 138 | LCRYPTO_USED(ERR_load_BIO_strings); | 138 | LCRYPTO_USED(ERR_load_BIO_strings); |
| 139 | LCRYPTO_USED(BIO_get_ex_new_index); | ||
| 140 | LCRYPTO_USED(BIO_new_bio_pair); | ||
| 139 | 141 | ||
| 140 | #endif /* _LIBCRYPTO_BIO_H */ | 142 | #endif /* _LIBCRYPTO_BIO_H */ |
