From f02026f6f76299e13e86d72eda1292aed8790474 Mon Sep 17 00:00:00 2001 From: beck <> Date: Wed, 5 Jul 2023 21:23:37 +0000 Subject: Hide symbols in asn1 and bio ok jsing@ --- src/lib/libcrypto/bio/b_dump.c | 8 +++++- src/lib/libcrypto/bio/b_posix.c | 5 +++- src/lib/libcrypto/bio/b_print.c | 7 +++++- src/lib/libcrypto/bio/b_sock.c | 10 +++++++- src/lib/libcrypto/bio/bf_buff.c | 3 ++- src/lib/libcrypto/bio/bf_nbio.c | 3 ++- src/lib/libcrypto/bio/bf_null.c | 3 ++- src/lib/libcrypto/bio/bio_cb.c | 3 ++- src/lib/libcrypto/bio/bio_err.c | 3 ++- src/lib/libcrypto/bio/bio_lib.c | 52 ++++++++++++++++++++++++++++++++++++++- src/lib/libcrypto/bio/bio_meth.c | 20 ++++++++++++++- src/lib/libcrypto/bio/bss_acpt.c | 5 ++-- src/lib/libcrypto/bio/bss_bio.c | 11 ++++++++- src/lib/libcrypto/bio/bss_conn.c | 7 ++++-- src/lib/libcrypto/bio/bss_dgram.c | 5 +++- src/lib/libcrypto/bio/bss_fd.c | 6 ++++- src/lib/libcrypto/bio/bss_file.c | 5 +++- src/lib/libcrypto/bio/bss_log.c | 3 ++- src/lib/libcrypto/bio/bss_mem.c | 4 ++- src/lib/libcrypto/bio/bss_null.c | 3 ++- src/lib/libcrypto/bio/bss_sock.c | 7 ++++-- 21 files changed, 149 insertions(+), 24 deletions(-) (limited to 'src/lib/libcrypto/bio') diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c index 61a83fc44b..70bb9882f3 100644 --- a/src/lib/libcrypto/bio/b_dump.c +++ b/src/lib/libcrypto/bio/b_dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_dump.c,v 1.23 2022/10/17 18:26:41 jsing Exp $ */ +/* $OpenBSD: b_dump.c,v 1.24 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -75,6 +75,7 @@ BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u), { return BIO_dump_indent_cb(cb, u, s, len, 0); } +LCRYPTO_ALIAS(BIO_dump_cb); int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), @@ -148,6 +149,7 @@ BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), #endif return (ret); } +LCRYPTO_ALIAS(BIO_dump_indent_cb); static int write_fp(const void *data, size_t len, void *fp) @@ -160,12 +162,14 @@ BIO_dump_fp(FILE *fp, const char *s, int len) { return BIO_dump_cb(write_fp, fp, s, len); } +LCRYPTO_ALIAS(BIO_dump_fp); int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent) { return BIO_dump_indent_cb(write_fp, fp, s, len, indent); } +LCRYPTO_ALIAS(BIO_dump_indent_fp); static int write_bio(const void *data, size_t len, void *bp) @@ -178,9 +182,11 @@ BIO_dump(BIO *bp, const char *s, int len) { return BIO_dump_cb(write_bio, bp, s, len); } +LCRYPTO_ALIAS(BIO_dump); int BIO_dump_indent(BIO *bp, const char *s, int len, int indent) { return BIO_dump_indent_cb(write_bio, bp, s, len, indent); } +LCRYPTO_ALIAS(BIO_dump_indent); diff --git a/src/lib/libcrypto/bio/b_posix.c b/src/lib/libcrypto/bio/b_posix.c index aed51bd717..d78f25a1f7 100644 --- a/src/lib/libcrypto/bio/b_posix.c +++ b/src/lib/libcrypto/bio/b_posix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_posix.c,v 1.2 2018/03/17 16:20:01 beck Exp $ */ +/* $OpenBSD: b_posix.c,v 1.3 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -72,11 +72,13 @@ BIO_sock_init(void) return (0); return (1); } +LCRYPTO_ALIAS(BIO_sock_init); void BIO_sock_cleanup(void) { } +LCRYPTO_ALIAS(BIO_sock_cleanup); int BIO_socket_nbio(int s, int mode) @@ -88,3 +90,4 @@ BIO_socket_nbio(int s, int mode) return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) != -1); return (1); } +LCRYPTO_ALIAS(BIO_socket_nbio); diff --git a/src/lib/libcrypto/bio/b_print.c b/src/lib/libcrypto/bio/b_print.c index c9d54809a7..a750ac413f 100644 --- a/src/lib/libcrypto/bio/b_print.c +++ b/src/lib/libcrypto/bio/b_print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_print.c,v 1.26 2019/06/28 05:47:57 deraadt Exp $ */ +/* $OpenBSD: b_print.c,v 1.27 2023/07/05 21:23:37 beck Exp $ */ /* Theo de Raadt places this file in the public domain. */ @@ -15,6 +15,7 @@ BIO_printf(BIO *bio, const char *format, ...) va_end(args); return (ret); } +LCRYPTO_ALIAS(BIO_printf); #ifdef HAVE_FUNOPEN static int @@ -39,6 +40,7 @@ BIO_vprintf(BIO *bio, const char *format, va_list args) fail: return (ret); } +LCRYPTO_ALIAS(BIO_vprintf); #else /* !HAVE_FUNOPEN */ @@ -55,6 +57,7 @@ BIO_vprintf(BIO *bio, const char *format, va_list args) free(buf); return (ret); } +LCRYPTO_ALIAS(BIO_vprintf); #endif /* HAVE_FUNOPEN */ @@ -92,6 +95,7 @@ BIO_snprintf(char *buf, size_t n, const char *format, ...) return (-1); return (ret); } +LCRYPTO_ALIAS(BIO_snprintf); int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) @@ -104,3 +108,4 @@ BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) return (-1); return (ret); } +LCRYPTO_ALIAS(BIO_vsnprintf); diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 301f73914a..00bbe9c37e 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_sock.c,v 1.70 2022/12/22 20:13:45 schwarze Exp $ */ +/* $OpenBSD: b_sock.c,v 1.71 2023/07/05 21:23:37 beck Exp $ */ /* * Copyright (c) 2017 Bob Beck * @@ -62,6 +62,7 @@ BIO_get_host_ip(const char *str, unsigned char *ip) freeaddrinfo(res); return (1); } +LCRYPTO_ALIAS(BIO_get_host_ip); int BIO_get_port(const char *str, unsigned short *port_ptr) @@ -89,6 +90,7 @@ BIO_get_port(const char *str, unsigned short *port_ptr) freeaddrinfo(res); return (1); } +LCRYPTO_ALIAS(BIO_get_port); int BIO_sock_error(int sock) @@ -101,12 +103,14 @@ BIO_sock_error(int sock) return (1); return (err); } +LCRYPTO_ALIAS(BIO_sock_error); struct hostent * BIO_gethostbyname(const char *name) { return gethostbyname(name); } +LCRYPTO_ALIAS(BIO_gethostbyname); int BIO_socket_ioctl(int fd, long type, void *arg) @@ -118,6 +122,7 @@ BIO_socket_ioctl(int fd, long type, void *arg) SYSerror(errno); return (ret); } +LCRYPTO_ALIAS(BIO_socket_ioctl); int BIO_get_accept_socket(char *host, int bind_mode) @@ -203,6 +208,7 @@ err: } return (s); } +LCRYPTO_ALIAS(BIO_get_accept_socket); int BIO_accept(int sock, char **addr) @@ -245,9 +251,11 @@ BIO_accept(int sock, char **addr) end: return (ret); } +LCRYPTO_ALIAS(BIO_accept); int BIO_set_tcp_ndelay(int s, int on) { return (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) == 0); } +LCRYPTO_ALIAS(BIO_set_tcp_ndelay); diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c index aa079c5f9e..226c16835a 100644 --- a/src/lib/libcrypto/bio/bf_buff.c +++ b/src/lib/libcrypto/bio/bf_buff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bf_buff.c,v 1.27 2022/01/14 08:40:57 tb Exp $ */ +/* $OpenBSD: bf_buff.c,v 1.28 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -93,6 +93,7 @@ BIO_f_buffer(void) { return (&methods_buffer); } +LCRYPTO_ALIAS(BIO_f_buffer); static int buffer_new(BIO *bi) diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c index 086479ec4c..2aed3b8fb6 100644 --- a/src/lib/libcrypto/bio/bf_nbio.c +++ b/src/lib/libcrypto/bio/bf_nbio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bf_nbio.c,v 1.22 2022/01/14 08:40:57 tb Exp $ */ +/* $OpenBSD: bf_nbio.c,v 1.23 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -100,6 +100,7 @@ BIO_f_nbio_test(void) { return (&methods_nbiof); } +LCRYPTO_ALIAS(BIO_f_nbio_test); static int nbiof_new(BIO *bi) diff --git a/src/lib/libcrypto/bio/bf_null.c b/src/lib/libcrypto/bio/bf_null.c index 129def8c99..055daeb7a9 100644 --- a/src/lib/libcrypto/bio/bf_null.c +++ b/src/lib/libcrypto/bio/bf_null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bf_null.c,v 1.14 2022/01/14 08:40:57 tb Exp $ */ +/* $OpenBSD: bf_null.c,v 1.15 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -93,6 +93,7 @@ BIO_f_null(void) { return (&methods_nullf); } +LCRYPTO_ALIAS(BIO_f_null); static int nullf_new(BIO *bi) diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c index 2ca411cd26..18e9be8d68 100644 --- a/src/lib/libcrypto/bio/bio_cb.c +++ b/src/lib/libcrypto/bio/bio_cb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_cb.c,v 1.18 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bio_cb.c,v 1.19 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -153,3 +153,4 @@ BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, fputs(buf, stderr); return (r); } +LCRYPTO_ALIAS(BIO_debug_callback); diff --git a/src/lib/libcrypto/bio/bio_err.c b/src/lib/libcrypto/bio/bio_err.c index fa5d16aff8..36fabca21c 100644 --- a/src/lib/libcrypto/bio/bio_err.c +++ b/src/lib/libcrypto/bio/bio_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_err.c,v 1.19 2022/07/12 14:42:48 kn Exp $ */ +/* $OpenBSD: bio_err.c,v 1.20 2023/07/05 21:23:37 beck Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -117,3 +117,4 @@ ERR_load_BIO_strings(void) } #endif } +LCRYPTO_ALIAS(ERR_load_BIO_strings); diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c index d14507884b..31127cb444 100644 --- a/src/lib/libcrypto/bio/bio_lib.c +++ b/src/lib/libcrypto/bio/bio_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_lib.c,v 1.44 2023/03/15 06:14:02 tb Exp $ */ +/* $OpenBSD: bio_lib.c,v 1.45 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -129,6 +129,7 @@ BIO_get_new_index(void) return index; } +LCRYPTO_ALIAS(BIO_get_new_index); BIO * BIO_new(const BIO_METHOD *method) @@ -147,6 +148,7 @@ BIO_new(const BIO_METHOD *method) } return (ret); } +LCRYPTO_ALIAS(BIO_new); int BIO_set(BIO *bio, const BIO_METHOD *method) @@ -176,6 +178,7 @@ BIO_set(BIO *bio, const BIO_METHOD *method) } return (1); } +LCRYPTO_ALIAS(BIO_set); int BIO_free(BIO *a) @@ -201,12 +204,14 @@ BIO_free(BIO *a) free(a); return (1); } +LCRYPTO_ALIAS(BIO_free); void BIO_vfree(BIO *a) { BIO_free(a); } +LCRYPTO_ALIAS(BIO_vfree); int BIO_up_ref(BIO *bio) @@ -214,108 +219,126 @@ BIO_up_ref(BIO *bio) int refs = CRYPTO_add(&bio->references, 1, CRYPTO_LOCK_BIO); return (refs > 1) ? 1 : 0; } +LCRYPTO_ALIAS(BIO_up_ref); void * BIO_get_data(BIO *a) { return (a->ptr); } +LCRYPTO_ALIAS(BIO_get_data); void BIO_set_data(BIO *a, void *ptr) { a->ptr = ptr; } +LCRYPTO_ALIAS(BIO_set_data); int BIO_get_init(BIO *a) { return a->init; } +LCRYPTO_ALIAS(BIO_get_init); void BIO_set_init(BIO *a, int init) { a->init = init; } +LCRYPTO_ALIAS(BIO_set_init); int BIO_get_shutdown(BIO *a) { return (a->shutdown); } +LCRYPTO_ALIAS(BIO_get_shutdown); void BIO_set_shutdown(BIO *a, int shut) { a->shutdown = shut; } +LCRYPTO_ALIAS(BIO_set_shutdown); void BIO_clear_flags(BIO *b, int flags) { b->flags &= ~flags; } +LCRYPTO_ALIAS(BIO_clear_flags); int BIO_test_flags(const BIO *b, int flags) { return (b->flags & flags); } +LCRYPTO_ALIAS(BIO_test_flags); void BIO_set_flags(BIO *b, int flags) { b->flags |= flags; } +LCRYPTO_ALIAS(BIO_set_flags); BIO_callback_fn BIO_get_callback(const BIO *b) { return b->callback; } +LCRYPTO_ALIAS(BIO_get_callback); void BIO_set_callback(BIO *b, BIO_callback_fn cb) { b->callback = cb; } +LCRYPTO_ALIAS(BIO_set_callback); BIO_callback_fn_ex BIO_get_callback_ex(const BIO *b) { return b->callback_ex; } +LCRYPTO_ALIAS(BIO_get_callback_ex); void BIO_set_callback_ex(BIO *b, BIO_callback_fn_ex cb) { b->callback_ex = cb; } +LCRYPTO_ALIAS(BIO_set_callback_ex); void BIO_set_callback_arg(BIO *b, char *arg) { b->cb_arg = arg; } +LCRYPTO_ALIAS(BIO_set_callback_arg); char * BIO_get_callback_arg(const BIO *b) { return b->cb_arg; } +LCRYPTO_ALIAS(BIO_get_callback_arg); const char * BIO_method_name(const BIO *b) { return b->method->name; } +LCRYPTO_ALIAS(BIO_method_name); int BIO_method_type(const BIO *b) { return b->method->type; } +LCRYPTO_ALIAS(BIO_method_type); int BIO_read(BIO *b, void *out, int outl) @@ -373,6 +396,7 @@ BIO_read(BIO *b, void *out, int outl) return (ret); } +LCRYPTO_ALIAS(BIO_read); int BIO_write(BIO *b, const void *in, int inl) @@ -429,6 +453,7 @@ BIO_write(BIO *b, const void *in, int inl) return (ret); } +LCRYPTO_ALIAS(BIO_write); int BIO_puts(BIO *b, const char *in) @@ -473,6 +498,7 @@ BIO_puts(BIO *b, const char *in) return (ret); } +LCRYPTO_ALIAS(BIO_puts); int BIO_gets(BIO *b, char *in, int inl) @@ -515,6 +541,7 @@ BIO_gets(BIO *b, char *in, int inl) return (ret); } +LCRYPTO_ALIAS(BIO_gets); int BIO_indent(BIO *b, int indent, int max) @@ -528,6 +555,7 @@ BIO_indent(BIO *b, int indent, int max) return 0; return 1; } +LCRYPTO_ALIAS(BIO_indent); long BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg) @@ -537,6 +565,7 @@ BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg) i = iarg; return (BIO_ctrl(b, cmd, larg, (char *)&i)); } +LCRYPTO_ALIAS(BIO_int_ctrl); char * BIO_ptr_ctrl(BIO *b, int cmd, long larg) @@ -548,6 +577,7 @@ BIO_ptr_ctrl(BIO *b, int cmd, long larg) else return (p); } +LCRYPTO_ALIAS(BIO_ptr_ctrl); long BIO_ctrl(BIO *b, int cmd, long larg, void *parg) @@ -577,6 +607,7 @@ BIO_ctrl(BIO *b, int cmd, long larg, void *parg) return (ret); } +LCRYPTO_ALIAS(BIO_ctrl); long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp) @@ -607,6 +638,7 @@ BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp) return (ret); } +LCRYPTO_ALIAS(BIO_callback_ctrl); /* It is unfortunate to duplicate in functions what the BIO_(w)pending macros * do; but those macros have inappropriate return type, and for interfacing @@ -616,12 +648,14 @@ BIO_ctrl_pending(BIO *bio) { return BIO_ctrl(bio, BIO_CTRL_PENDING, 0, NULL); } +LCRYPTO_ALIAS(BIO_ctrl_pending); size_t BIO_ctrl_wpending(BIO *bio) { return BIO_ctrl(bio, BIO_CTRL_WPENDING, 0, NULL); } +LCRYPTO_ALIAS(BIO_ctrl_wpending); /* @@ -649,6 +683,7 @@ BIO_push(BIO *b, BIO *bio) BIO_ctrl(b, BIO_CTRL_PUSH, 0, lb); return (b); } +LCRYPTO_ALIAS(BIO_push); /* Remove the first and return the rest */ BIO * @@ -671,6 +706,7 @@ BIO_pop(BIO *b) b->prev_bio = NULL; return (ret); } +LCRYPTO_ALIAS(BIO_pop); BIO * BIO_get_retry_BIO(BIO *bio, int *reason) @@ -690,18 +726,21 @@ BIO_get_retry_BIO(BIO *bio, int *reason) *reason = last->retry_reason; return (last); } +LCRYPTO_ALIAS(BIO_get_retry_BIO); int BIO_get_retry_reason(BIO *bio) { return (bio->retry_reason); } +LCRYPTO_ALIAS(BIO_get_retry_reason); void BIO_set_retry_reason(BIO *bio, int reason) { bio->retry_reason = reason; } +LCRYPTO_ALIAS(BIO_set_retry_reason); BIO * BIO_find_type(BIO *bio, int type) @@ -724,6 +763,7 @@ BIO_find_type(BIO *bio, int type) } while (bio != NULL); return (NULL); } +LCRYPTO_ALIAS(BIO_find_type); BIO * BIO_next(BIO *b) @@ -732,6 +772,7 @@ BIO_next(BIO *b) return NULL; return b->next_bio; } +LCRYPTO_ALIAS(BIO_next); /* * Two chains "bio -> oldtail" and "oldhead -> next" become @@ -753,6 +794,7 @@ BIO_set_next(BIO *bio, BIO *next) if (next != NULL) next->prev_bio = bio; } +LCRYPTO_ALIAS(BIO_set_next); void BIO_free_all(BIO *bio) @@ -770,6 +812,7 @@ BIO_free_all(BIO *bio) break; } } +LCRYPTO_ALIAS(BIO_free_all); BIO * BIO_dup_chain(BIO *in) @@ -813,6 +856,7 @@ err: return (NULL); } +LCRYPTO_ALIAS(BIO_dup_chain); void BIO_copy_next_retry(BIO *b) @@ -820,6 +864,7 @@ BIO_copy_next_retry(BIO *b) BIO_set_flags(b, BIO_get_retry_flags(b->next_bio)); b->retry_reason = b->next_bio->retry_reason; } +LCRYPTO_ALIAS(BIO_copy_next_retry); int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, @@ -828,18 +873,21 @@ 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) { return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data)); } +LCRYPTO_ALIAS(BIO_set_ex_data); void * BIO_get_ex_data(BIO *bio, int idx) { return (CRYPTO_get_ex_data(&(bio->ex_data), idx)); } +LCRYPTO_ALIAS(BIO_get_ex_data); unsigned long BIO_number_read(BIO *bio) @@ -848,6 +896,7 @@ BIO_number_read(BIO *bio) return bio->num_read; return 0; } +LCRYPTO_ALIAS(BIO_number_read); unsigned long BIO_number_written(BIO *bio) @@ -856,3 +905,4 @@ BIO_number_written(BIO *bio) return bio->num_write; return 0; } +LCRYPTO_ALIAS(BIO_number_written); diff --git a/src/lib/libcrypto/bio/bio_meth.c b/src/lib/libcrypto/bio/bio_meth.c index d7d100df95..37f866a0c4 100644 --- a/src/lib/libcrypto/bio/bio_meth.c +++ b/src/lib/libcrypto/bio/bio_meth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_meth.c,v 1.8 2022/01/14 08:40:57 tb Exp $ */ +/* $OpenBSD: bio_meth.c,v 1.9 2023/07/05 21:23:37 beck Exp $ */ /* * Copyright (c) 2018 Theo Buehler * @@ -34,18 +34,21 @@ BIO_meth_new(int type, const char *name) return biom; } +LCRYPTO_ALIAS(BIO_meth_new); void BIO_meth_free(BIO_METHOD *biom) { free(biom); } +LCRYPTO_ALIAS(BIO_meth_free); int (*BIO_meth_get_write(const BIO_METHOD *biom))(BIO *, const char *, int) { return biom->bwrite; } +LCRYPTO_ALIAS(BIO_meth_get_write); int BIO_meth_set_write(BIO_METHOD *biom, int (*write)(BIO *, const char *, int)) @@ -53,12 +56,14 @@ BIO_meth_set_write(BIO_METHOD *biom, int (*write)(BIO *, const char *, int)) biom->bwrite = write; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_write); int (*BIO_meth_get_read(const BIO_METHOD *biom))(BIO *, char *, int) { return biom->bread; } +LCRYPTO_ALIAS(BIO_meth_get_read); int BIO_meth_set_read(BIO_METHOD *biom, int (*read)(BIO *, char *, int)) @@ -66,12 +71,14 @@ BIO_meth_set_read(BIO_METHOD *biom, int (*read)(BIO *, char *, int)) biom->bread = read; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_read); int (*BIO_meth_get_puts(const BIO_METHOD *biom))(BIO *, const char *) { return biom->bputs; } +LCRYPTO_ALIAS(BIO_meth_get_puts); int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts)(BIO *, const char *)) @@ -79,12 +86,14 @@ BIO_meth_set_puts(BIO_METHOD *biom, int (*puts)(BIO *, const char *)) biom->bputs = puts; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_puts); int (*BIO_meth_get_gets(const BIO_METHOD *biom))(BIO *, char *, int) { return biom->bgets; } +LCRYPTO_ALIAS(BIO_meth_get_gets); int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets)(BIO *, char *, int)) @@ -92,12 +101,14 @@ BIO_meth_set_gets(BIO_METHOD *biom, int (*gets)(BIO *, char *, int)) biom->bgets = gets; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_gets); long (*BIO_meth_get_ctrl(const BIO_METHOD *biom))(BIO *, int, long, void *) { return biom->ctrl; } +LCRYPTO_ALIAS(BIO_meth_get_ctrl); int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl)(BIO *, int, long, void *)) @@ -105,12 +116,14 @@ BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl)(BIO *, int, long, void *)) biom->ctrl = ctrl; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_ctrl); int (*BIO_meth_get_create(const BIO_METHOD *biom))(BIO *) { return biom->create; } +LCRYPTO_ALIAS(BIO_meth_get_create); int BIO_meth_set_create(BIO_METHOD *biom, int (*create)(BIO *)) @@ -118,12 +131,14 @@ BIO_meth_set_create(BIO_METHOD *biom, int (*create)(BIO *)) biom->create = create; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_create); int (*BIO_meth_get_destroy(const BIO_METHOD *biom))(BIO *) { return biom->destroy; } +LCRYPTO_ALIAS(BIO_meth_get_destroy); int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy)(BIO *)) @@ -131,12 +146,14 @@ BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy)(BIO *)) biom->destroy = destroy; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_destroy); long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom))(BIO *, int, BIO_info_cb *) { return biom->callback_ctrl; } +LCRYPTO_ALIAS(BIO_meth_get_callback_ctrl); int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, @@ -145,3 +162,4 @@ BIO_meth_set_callback_ctrl(BIO_METHOD *biom, biom->callback_ctrl = callback_ctrl; return 1; } +LCRYPTO_ALIAS(BIO_meth_set_callback_ctrl); diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index a619bd7c5d..d74c710a7f 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_acpt.c,v 1.30 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bss_acpt.c,v 1.31 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -118,6 +118,7 @@ BIO_s_accept(void) { return (&methods_acceptp); } +LCRYPTO_ALIAS(BIO_s_accept); static int acpt_new(BIO *bi) @@ -452,4 +453,4 @@ BIO_new_accept(const char *str) return (NULL); } } - +LCRYPTO_ALIAS(BIO_new_accept); diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c index c92d35d118..0de0b604b3 100644 --- a/src/lib/libcrypto/bio/bss_bio.c +++ b/src/lib/libcrypto/bio/bss_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_bio.c,v 1.25 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bss_bio.c,v 1.26 2023/07/05 21:23:37 beck Exp $ */ /* ==================================================================== * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. * @@ -112,6 +112,7 @@ BIO_s_bio(void) { return &methods_biop; } +LCRYPTO_ALIAS(BIO_s_bio); struct bio_bio_st { BIO *peer; /* NULL if buf == NULL. @@ -795,24 +796,28 @@ 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) { return BIO_ctrl(bio, BIO_C_GET_WRITE_GUARANTEE, 0, NULL); } +LCRYPTO_ALIAS(BIO_ctrl_get_write_guarantee); size_t BIO_ctrl_get_read_request(BIO *bio) { return BIO_ctrl(bio, BIO_C_GET_READ_REQUEST, 0, NULL); } +LCRYPTO_ALIAS(BIO_ctrl_get_read_request); int BIO_ctrl_reset_read_request(BIO *bio) { return (BIO_ctrl(bio, BIO_C_RESET_READ_REQUEST, 0, NULL) != 0); } +LCRYPTO_ALIAS(BIO_ctrl_reset_read_request); /* BIO_nread0/nread/nwrite0/nwrite are available only for BIO pairs for now @@ -834,6 +839,7 @@ BIO_nread0(BIO *bio, char **buf) else return (int) ret; } +LCRYPTO_ALIAS(BIO_nread0); int BIO_nread(BIO *bio, char **buf, int num) @@ -850,6 +856,7 @@ BIO_nread(BIO *bio, char **buf, int num) bio->num_read += ret; return ret; } +LCRYPTO_ALIAS(BIO_nread); int BIO_nwrite0(BIO *bio, char **buf) @@ -867,6 +874,7 @@ BIO_nwrite0(BIO *bio, char **buf) else return (int) ret; } +LCRYPTO_ALIAS(BIO_nwrite0); int BIO_nwrite(BIO *bio, char **buf, int num) @@ -883,3 +891,4 @@ BIO_nwrite(BIO *bio, char **buf, int num) bio->num_write += ret; return ret; } +LCRYPTO_ALIAS(BIO_nwrite); diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 8e30bccd51..ded9c0be6d 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_conn.c,v 1.37 2022/01/14 08:40:57 tb Exp $ */ +/* $OpenBSD: bss_conn.c,v 1.38 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -309,6 +309,7 @@ BIO_CONNECT_new(void) memset((char *)&ret->them, 0, sizeof(ret->them)); return (ret); } +LCRYPTO_ALIAS(BIO_CONNECT_new); void BIO_CONNECT_free(BIO_CONNECT *a) @@ -320,12 +321,14 @@ BIO_CONNECT_free(BIO_CONNECT *a) free(a->param_port); free(a); } +LCRYPTO_ALIAS(BIO_CONNECT_free); const BIO_METHOD * BIO_s_connect(void) { return (&methods_connectp); } +LCRYPTO_ALIAS(BIO_s_connect); static int conn_new(BIO *bi) @@ -594,4 +597,4 @@ BIO_new_connect(const char *str) return (NULL); } } - +LCRYPTO_ALIAS(BIO_new_connect); diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c index 0d70daa20e..65a8f6fae4 100644 --- a/src/lib/libcrypto/bio/bss_dgram.c +++ b/src/lib/libcrypto/bio/bss_dgram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_dgram.c,v 1.44 2022/12/26 07:18:51 jmc Exp $ */ +/* $OpenBSD: bss_dgram.c,v 1.45 2023/07/05 21:23:37 beck Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -119,6 +119,7 @@ BIO_s_datagram(void) { return (&methods_dgramp); } +LCRYPTO_ALIAS(BIO_s_datagram); BIO * BIO_new_dgram(int fd, int close_flag) @@ -131,6 +132,7 @@ BIO_new_dgram(int fd, int close_flag) BIO_set_fd(ret, fd, close_flag); return (ret); } +LCRYPTO_ALIAS(BIO_new_dgram); static int dgram_new(BIO *bi) @@ -656,5 +658,6 @@ BIO_dgram_non_fatal_error(int err) } return (0); } +LCRYPTO_ALIAS(BIO_dgram_non_fatal_error); #endif diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c index 7d7c427913..63eac32329 100644 --- a/src/lib/libcrypto/bio/bss_fd.c +++ b/src/lib/libcrypto/bio/bss_fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_fd.c,v 1.20 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bss_fd.c,v 1.21 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -93,6 +93,7 @@ BIO_s_fd(void) { return (&methods_fdp); } +LCRYPTO_ALIAS(BIO_s_fd); BIO * BIO_new_fd(int fd, int close_flag) @@ -104,6 +105,7 @@ BIO_new_fd(int fd, int close_flag) BIO_set_fd(ret, fd, close_flag); return (ret); } +LCRYPTO_ALIAS(BIO_new_fd); static int fd_new(BIO *bi) @@ -251,6 +253,7 @@ BIO_fd_should_retry(int i) } return (0); } +LCRYPTO_ALIAS(BIO_fd_should_retry); int BIO_fd_non_fatal_error(int err) @@ -267,3 +270,4 @@ BIO_fd_non_fatal_error(int err) } return (0); } +LCRYPTO_ALIAS(BIO_fd_non_fatal_error); diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c index 0c9b755025..9b6ca2bdd8 100644 --- a/src/lib/libcrypto/bio/bss_file.c +++ b/src/lib/libcrypto/bio/bss_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_file.c,v 1.34 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bss_file.c,v 1.35 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -137,6 +137,7 @@ BIO_new_file(const char *filename, const char *mode) BIO_set_fp(ret, file, BIO_CLOSE); return (ret); } +LCRYPTO_ALIAS(BIO_new_file); BIO * BIO_new_fp(FILE *stream, int close_flag) @@ -149,12 +150,14 @@ BIO_new_fp(FILE *stream, int close_flag) BIO_set_fp(ret, stream, close_flag); return (ret); } +LCRYPTO_ALIAS(BIO_new_fp); const BIO_METHOD * BIO_s_file(void) { return (&methods_filep); } +LCRYPTO_ALIAS(BIO_s_file); static int file_new(BIO *bi) diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c index 296c87ff89..9e2e882646 100644 --- a/src/lib/libcrypto/bio/bss_log.c +++ b/src/lib/libcrypto/bio/bss_log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_log.c,v 1.23 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bss_log.c,v 1.24 2023/07/05 21:23:37 beck Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -98,6 +98,7 @@ BIO_s_log(void) { return (&methods_slg); } +LCRYPTO_ALIAS(BIO_s_log); static int slg_new(BIO *bi) diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c index 2d03083235..6d0d54db84 100644 --- a/src/lib/libcrypto/bio/bss_mem.c +++ b/src/lib/libcrypto/bio/bss_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_mem.c,v 1.21 2022/02/19 15:59:12 jsing Exp $ */ +/* $OpenBSD: bss_mem.c,v 1.22 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -117,6 +117,7 @@ BIO_s_mem(void) { return &mem_method; } +LCRYPTO_ALIAS(BIO_s_mem); BIO * BIO_new_mem_buf(const void *buf, int buf_len) @@ -148,6 +149,7 @@ BIO_new_mem_buf(const void *buf, int buf_len) return bio; } +LCRYPTO_ALIAS(BIO_new_mem_buf); static int mem_new(BIO *bio) diff --git a/src/lib/libcrypto/bio/bss_null.c b/src/lib/libcrypto/bio/bss_null.c index 8a15b36b31..5f9340967b 100644 --- a/src/lib/libcrypto/bio/bss_null.c +++ b/src/lib/libcrypto/bio/bss_null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_null.c,v 1.12 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bss_null.c,v 1.13 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -89,6 +89,7 @@ BIO_s_null(void) { return (&null_method); } +LCRYPTO_ALIAS(BIO_s_null); static int null_new(BIO *bi) diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c index 3b9a87fd8a..1a13d7fbf7 100644 --- a/src/lib/libcrypto/bio/bss_sock.c +++ b/src/lib/libcrypto/bio/bss_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_sock.c,v 1.25 2022/01/07 09:02:17 tb Exp $ */ +/* $OpenBSD: bss_sock.c,v 1.26 2023/07/05 21:23:37 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -91,6 +91,7 @@ BIO_s_socket(void) { return (&methods_sockp); } +LCRYPTO_ALIAS(BIO_s_socket); BIO * BIO_new_socket(int fd, int close_flag) @@ -103,6 +104,7 @@ BIO_new_socket(int fd, int close_flag) BIO_set_fd(ret, fd, close_flag); return (ret); } +LCRYPTO_ALIAS(BIO_new_socket); static int sock_new(BIO *bi) @@ -222,6 +224,7 @@ BIO_sock_should_retry(int i) } return (0); } +LCRYPTO_ALIAS(BIO_sock_should_retry); int BIO_sock_non_fatal_error(int err) @@ -238,4 +241,4 @@ BIO_sock_non_fatal_error(int err) } return (0); } - +LCRYPTO_ALIAS(BIO_sock_non_fatal_error); -- cgit v1.2.3-55-g6feb