diff options
author | tb <> | 2022-03-24 15:58:57 +0000 |
---|---|---|
committer | tb <> | 2022-03-24 15:58:57 +0000 |
commit | 80d852cc002e94f322c0b40acf6e6dbf50c5fb4f (patch) | |
tree | bc8f0435c301d69eabe5c2397c5c7f50391259aa /src/regress/lib | |
parent | c2b41371c51b7f4d7be47e059b1cd15c7e321b31 (diff) | |
download | openbsd-80d852cc002e94f322c0b40acf6e6dbf50c5fb4f.tar.gz openbsd-80d852cc002e94f322c0b40acf6e6dbf50c5fb4f.tar.bz2 openbsd-80d852cc002e94f322c0b40acf6e6dbf50c5fb4f.zip |
Adjust the signer test to link statically and work with hidden tls_signer
API.
Diffstat (limited to 'src/regress/lib')
-rw-r--r-- | src/regress/lib/libtls/signer/Makefile | 6 | ||||
-rw-r--r-- | src/regress/lib/libtls/signer/signertest.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/regress/lib/libtls/signer/Makefile b/src/regress/lib/libtls/signer/Makefile index b26141728c..d87f903184 100644 --- a/src/regress/lib/libtls/signer/Makefile +++ b/src/regress/lib/libtls/signer/Makefile | |||
@@ -1,11 +1,13 @@ | |||
1 | # $OpenBSD: Makefile,v 1.1 2022/01/30 18:38:41 jsing Exp $ | 1 | # $OpenBSD: Makefile,v 1.2 2022/03/24 15:58:57 tb Exp $ |
2 | 2 | ||
3 | PROG= signertest | 3 | PROG= signertest |
4 | LDADD= -lcrypto -lssl -ltls | 4 | LDADD= -lcrypto -lssl |
5 | LDADD+= -Wl,-Bstatic -ltls -Wl,-Bdynamic | ||
5 | DPADD= ${LIBCRYPTO} ${LIBSSL} ${LIBTLS} | 6 | DPADD= ${LIBCRYPTO} ${LIBSSL} ${LIBTLS} |
6 | 7 | ||
7 | WARNINGS= Yes | 8 | WARNINGS= Yes |
8 | CFLAGS+= -DLIBRESSL_INTERNAL -Wall -Wundef -Werror | 9 | CFLAGS+= -DLIBRESSL_INTERNAL -Wall -Wundef -Werror |
10 | CFLAGS+= -I${.CURDIR}/../../../../lib/libtls/ | ||
9 | 11 | ||
10 | REGRESS_TARGETS= \ | 12 | REGRESS_TARGETS= \ |
11 | regress-signertest | 13 | regress-signertest |
diff --git a/src/regress/lib/libtls/signer/signertest.c b/src/regress/lib/libtls/signer/signertest.c index 50ee5f0c44..89af257372 100644 --- a/src/regress/lib/libtls/signer/signertest.c +++ b/src/regress/lib/libtls/signer/signertest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: signertest.c,v 1.4 2022/02/01 17:19:16 jsing Exp $ */ | 1 | /* $OpenBSD: signertest.c,v 1.5 2022/03/24 15:58:57 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017, 2018, 2022 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017, 2018, 2022 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -32,6 +32,8 @@ | |||
32 | 32 | ||
33 | #include <tls.h> | 33 | #include <tls.h> |
34 | 34 | ||
35 | #include "tls_internal.h" | ||
36 | |||
35 | const char *cert_path; | 37 | const char *cert_path; |
36 | int sign_cb_count; | 38 | int sign_cb_count; |
37 | 39 | ||