summaryrefslogtreecommitdiff
path: root/src/lib/libssl/hidden
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>2023-04-23 13:43:47 +0000
committercvs2svn <admin@example.com>2023-04-23 13:43:47 +0000
commite2496982472bdf233be95c5ea72d1c4dc6c91db3 (patch)
tree316488e5daf86864d8466bce0e5b000d85768378 /src/lib/libssl/hidden
parent097d0cf840b9007212bcd2516ed5e18939e6da3d (diff)
downloadopenbsd-tb_20230422.tar.gz
openbsd-tb_20230422.tar.bz2
openbsd-tb_20230422.zip
This commit was manufactured by cvs2git to create tag 'tb_20230422'.tb_20230422
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/hidden/openssl/ssl.h31
-rw-r--r--src/lib/libssl/hidden/ssl_namespace.h37
2 files changed, 0 insertions, 68 deletions
diff --git a/src/lib/libssl/hidden/openssl/ssl.h b/src/lib/libssl/hidden/openssl/ssl.h
deleted file mode 100644
index 540c6e7652..0000000000
--- a/src/lib/libssl/hidden/openssl/ssl.h
+++ /dev/null
@@ -1,31 +0,0 @@
1/* $OpenBSD: ssl.h,v 1.1 2022/11/11 11:25:18 beck Exp $ */
2/*
3 * Copyright (c) 2022 Philip Guenther <guenther@openbsd.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#ifndef _LIBSSL_SSL_H_
19#define _LIBSSL_SSL_H_
20
21#include_next <openssl/ssl.h>
22#include "ssl_namespace.h"
23
24LSSL_USED(BIO_f_ssl);
25LSSL_USED(BIO_new_ssl);
26LSSL_USED(BIO_new_ssl_connect);
27LSSL_UNUSED(BIO_new_buffer_ssl_connect);
28LSSL_UNUSED(BIO_ssl_copy_session_id);
29LSSL_UNUSED(BIO_ssl_shutdown);
30
31#endif /* _LIBSSL_SSL_H_ */
diff --git a/src/lib/libssl/hidden/ssl_namespace.h b/src/lib/libssl/hidden/ssl_namespace.h
deleted file mode 100644
index 7a941a0e10..0000000000
--- a/src/lib/libssl/hidden/ssl_namespace.h
+++ /dev/null
@@ -1,37 +0,0 @@
1/* $OpenBSD: ssl_namespace.h,v 1.2 2023/02/16 08:38:17 tb Exp $ */
2/*
3 * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#ifndef _LIBSSL_SSL_NAMESPACE_H_
19#define _LIBSSL_SSL_NAMESPACE_H_
20
21/*
22 * If marked as 'used', then internal calls use the name with prefix "_lssl_"
23 * and we alias that to the normal name.
24 */
25
26#ifdef LIBRESSL_NAMESPACE
27#define LSSL_UNUSED(x) typeof(x) x __attribute__((deprecated))
28#define LSSL_USED(x) __attribute__((visibility("hidden"))) \
29 typeof(x) x asm("_lssl_"#x)
30#define LSSL_ALIAS(x) asm(".global "#x"; "#x" = _lssl_"#x)
31#else
32#define LSSL_UNUSED(x)
33#define LSSL_USED(x)
34#define LSSL_ALIAS(x) asm("")
35#endif
36
37#endif /* _LIBSSL_SSL_NAMESPACE_H_ */