From 0a0c1beebf07ca83aac260a398b064f1945bac5f Mon Sep 17 00:00:00 2001 From: tb Date: Thu, 24 Mar 2022 15:58:57 +0000 Subject: [PATCH] Adjust the signer test to link statically and work with hidden tls_signer API. --- regress/lib/libtls/signer/Makefile | 6 ++++-- regress/lib/libtls/signer/signertest.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/regress/lib/libtls/signer/Makefile b/regress/lib/libtls/signer/Makefile index b26141728ca..d87f9031840 100644 --- a/regress/lib/libtls/signer/Makefile +++ b/regress/lib/libtls/signer/Makefile @@ -1,11 +1,13 @@ -# $OpenBSD: Makefile,v 1.1 2022/01/30 18:38:41 jsing Exp $ +# $OpenBSD: Makefile,v 1.2 2022/03/24 15:58:57 tb Exp $ PROG= signertest -LDADD= -lcrypto -lssl -ltls +LDADD= -lcrypto -lssl +LDADD+= -Wl,-Bstatic -ltls -Wl,-Bdynamic DPADD= ${LIBCRYPTO} ${LIBSSL} ${LIBTLS} WARNINGS= Yes CFLAGS+= -DLIBRESSL_INTERNAL -Wall -Wundef -Werror +CFLAGS+= -I${.CURDIR}/../../../../lib/libtls/ REGRESS_TARGETS= \ regress-signertest diff --git a/regress/lib/libtls/signer/signertest.c b/regress/lib/libtls/signer/signertest.c index 50ee5f0c44e..89af2573726 100644 --- a/regress/lib/libtls/signer/signertest.c +++ b/regress/lib/libtls/signer/signertest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signertest.c,v 1.4 2022/02/01 17:19:16 jsing Exp $ */ +/* $OpenBSD: signertest.c,v 1.5 2022/03/24 15:58:57 tb Exp $ */ /* * Copyright (c) 2017, 2018, 2022 Joel Sing * @@ -32,6 +32,8 @@ #include +#include "tls_internal.h" + const char *cert_path; int sign_cb_count; -- 2.20.1