diff options
| author |   guenther <guenther@openbsd.org> | 2016-11-04 17:51:54 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2016-11-04 17:51:54 +0000 |
| commit | c510cf4d50449121aacace121ce80e682e4870d3 (patch) | |
| tree | 9a515354d66360c54eb59db5e273fd958718396e | |
| parent | Add assembler code for the nist 256-bit GFp curve, written initially by (diff) | |
| download | wireguard-openbsd-c510cf4d50449121aacace121ce80e682e4870d3.tar.xz wireguard-openbsd-c510cf4d50449121aacace121ce80e682e4870d3.zip | |
Some tests require internal symbols; have them link with the static
libssl or libtls so they can continue to see them after the shared
library namespace is cleaned up
ok jsing@
| -rw-r--r-- | regress/lib/libssl/Makefile.inc | 2 | ||||
| -rw-r--r-- | regress/lib/libssl/bytestring/Makefile | 4 | ||||
| -rw-r--r-- | regress/lib/libssl/unit/Makefile | 8 | ||||
| -rw-r--r-- | regress/lib/libtls/verify/Makefile | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/regress/lib/libssl/Makefile.inc b/regress/lib/libssl/Makefile.inc new file mode 100644 index 00000000000..a8880845e96 --- /dev/null +++ b/regress/lib/libssl/Makefile.inc @@ -0,0 +1,2 @@ +# Use this variable when the test needs internal symbols from libssl +SSL_INT= -Wl,-Bstatic -lssl -Wl,-Bdynamic diff --git a/regress/lib/libssl/bytestring/Makefile b/regress/lib/libssl/bytestring/Makefile index cc271b1b64e..162c81d255b 100644 --- a/regress/lib/libssl/bytestring/Makefile +++ b/regress/lib/libssl/bytestring/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2016/09/02 17:31:04 beck Exp $ +# $OpenBSD: Makefile,v 1.5 2016/11/04 17:51:54 guenther Exp $ PROG= bytestringtest -LDADD= -lcrypto -lssl +LDADD= ${SSL_INT} -lcrypto DPADD= ${LIBCRYPTO} ${LIBSSL} WARNINGS= Yes CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl diff --git a/regress/lib/libssl/unit/Makefile b/regress/lib/libssl/unit/Makefile index 1bfdea82ebd..1873be69239 100644 --- a/regress/lib/libssl/unit/Makefile +++ b/regress/lib/libssl/unit/Makefile @@ -1,14 +1,12 @@ -# $OpenBSD: Makefile,v 1.5 2016/09/03 16:52:18 bcook Exp $ +# $OpenBSD: Makefile,v 1.6 2016/11/04 17:51:54 guenther Exp $ TEST_CASES+= cipher_list TEST_CASES+= tls_ext_alpn REGRESS_TARGETS= all_tests -LDADD= -lcrypto -lssl -DPADD= ${LIBCRYPTO} ${LIBSSL} WARNINGS= Yes -LDFLAGS+= -lcrypto -lssl +LDLIBS= ${SSL_INT} -lcrypto CFLAGS+= -DLIBRESSL_INTERNAL -Wall -Wundef -Werror CLEANFILES+= ${TEST_CASES} @@ -18,4 +16,6 @@ all_tests: ${TEST_CASES} ./$$test; \ done +${TEST_CASES}: ${LIBSSL} ${LIBCRYPTO} + .include <bsd.regress.mk> diff --git a/regress/lib/libtls/verify/Makefile b/regress/lib/libtls/verify/Makefile index 94bc9760065..c66348a8a6e 100644 --- a/regress/lib/libtls/verify/Makefile +++ b/regress/lib/libtls/verify/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/11/01 11:55:27 jsing Exp $ +# $OpenBSD: Makefile,v 1.2 2016/11/04 17:51:54 guenther Exp $ PROG= verifytest -LDADD= -lcrypto -lssl -ltls +LDADD= -lcrypto -lssl -Wl,-Bstatic -ltls -Wl,-Bdynamic DPADD= ${LIBCRYPTO} ${LIBSSL} ${LIBTLS} WARNINGS= Yes |