summaryrefslogtreecommitdiff
path: root/src/lib/libssl/Makefile
diff options
context:
space:
mode:
authorbeck <>2022-11-11 11:25:18 +0000
committerbeck <>2022-11-11 11:25:18 +0000
commit0ba6b15619d4e4feafccdbd0226ee99b70553a11 (patch)
treeed6caa2922a04c9566669564e9dda8a563bf522a /src/lib/libssl/Makefile
parente917fd8e13a8b1acf3b53461d4ba34d7022a216e (diff)
downloadopenbsd-0ba6b15619d4e4feafccdbd0226ee99b70553a11.tar.gz
openbsd-0ba6b15619d4e4feafccdbd0226ee99b70553a11.tar.bz2
openbsd-0ba6b15619d4e4feafccdbd0226ee99b70553a11.zip
Add support for symbol hiding disabled by default.
Fully explained in libcrypto/README. TL;DR make sure libcrypto and libssl's function calls internally and to each other are via symbol names that won't get overridden by linking other libraries. Mostly work by guenther@, which will currently be gated behind a build setting NAMESPACE=yes. once we convert all the symbols to this method we will do a major bump and pick up the changes. ok tb@ jsing@
Diffstat (limited to 'src/lib/libssl/Makefile')
-rw-r--r--src/lib/libssl/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index 1788cd75a3..a6ee26a667 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.77 2022/08/17 07:39:19 jsing Exp $ 1# $OpenBSD: Makefile,v 1.78 2022/11/11 11:25:18 beck Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.ifndef NOMAN 4.ifndef NOMAN
@@ -16,6 +16,9 @@ CFLAGS+= -Wall -Wundef
16CFLAGS+= -Werror 16CFLAGS+= -Werror
17.endif 17.endif
18CFLAGS+= -DLIBRESSL_INTERNAL 18CFLAGS+= -DLIBRESSL_INTERNAL
19.ifdef NAMESPACE
20CFLAGS+= -DLIBRESSL_NAMESPACE
21.endif
19.ifdef TLS1_3 22.ifdef TLS1_3
20CFLAGS+= -DLIBRESSL_HAS_TLS1_3_CLIENT 23CFLAGS+= -DLIBRESSL_HAS_TLS1_3_CLIENT
21CFLAGS+= -DLIBRESSL_HAS_TLS1_3_SERVER 24CFLAGS+= -DLIBRESSL_HAS_TLS1_3_SERVER
@@ -24,7 +27,9 @@ CFLAGS+= -DLIBRESSL_HAS_TLS1_3_SERVER
24CFLAGS+= -DTLS13_DEBUG 27CFLAGS+= -DTLS13_DEBUG
25.endif 28.endif
26CFLAGS+= -I${.CURDIR} 29CFLAGS+= -I${.CURDIR}
30CFLAGS+= -I${.CURDIR}/../libcrypto/hidden
27CFLAGS+= -I${.CURDIR}/../libcrypto/bio 31CFLAGS+= -I${.CURDIR}/../libcrypto/bio
32CFLAGS+= -I${.CURDIR}/hidden
28 33
29LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto 34LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto
30 35