diff options
| author | beck <> | 2022-11-11 11:25:18 +0000 |
|---|---|---|
| committer | beck <> | 2022-11-11 11:25:18 +0000 |
| commit | 83e73dadd90af52585df1bcce4e5b84da25fe19e (patch) | |
| tree | ed6caa2922a04c9566669564e9dda8a563bf522a /src/lib/libssl/Makefile | |
| parent | 522ea7abc19e814a672474a8f25f67f470ceb772 (diff) | |
| download | openbsd-83e73dadd90af52585df1bcce4e5b84da25fe19e.tar.gz openbsd-83e73dadd90af52585df1bcce4e5b84da25fe19e.tar.bz2 openbsd-83e73dadd90af52585df1bcce4e5b84da25fe19e.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/Makefile | 7 |
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 | |||
| 16 | CFLAGS+= -Werror | 16 | CFLAGS+= -Werror |
| 17 | .endif | 17 | .endif |
| 18 | CFLAGS+= -DLIBRESSL_INTERNAL | 18 | CFLAGS+= -DLIBRESSL_INTERNAL |
| 19 | .ifdef NAMESPACE | ||
| 20 | CFLAGS+= -DLIBRESSL_NAMESPACE | ||
| 21 | .endif | ||
| 19 | .ifdef TLS1_3 | 22 | .ifdef TLS1_3 |
| 20 | CFLAGS+= -DLIBRESSL_HAS_TLS1_3_CLIENT | 23 | CFLAGS+= -DLIBRESSL_HAS_TLS1_3_CLIENT |
| 21 | CFLAGS+= -DLIBRESSL_HAS_TLS1_3_SERVER | 24 | CFLAGS+= -DLIBRESSL_HAS_TLS1_3_SERVER |
| @@ -24,7 +27,9 @@ CFLAGS+= -DLIBRESSL_HAS_TLS1_3_SERVER | |||
| 24 | CFLAGS+= -DTLS13_DEBUG | 27 | CFLAGS+= -DTLS13_DEBUG |
| 25 | .endif | 28 | .endif |
| 26 | CFLAGS+= -I${.CURDIR} | 29 | CFLAGS+= -I${.CURDIR} |
| 30 | CFLAGS+= -I${.CURDIR}/../libcrypto/hidden | ||
| 27 | CFLAGS+= -I${.CURDIR}/../libcrypto/bio | 31 | CFLAGS+= -I${.CURDIR}/../libcrypto/bio |
| 32 | CFLAGS+= -I${.CURDIR}/hidden | ||
| 28 | 33 | ||
| 29 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto | 34 | LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto |
| 30 | 35 | ||
