diff options
| author |   jsing <jsing@openbsd.org> | 2016-12-21 15:51:05 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-12-21 15:51:05 +0000 |
| commit | a90a934f35b0d826f1a0d3f6750a1bdb9b2ddc84 (patch) | |
| tree | 1bd119cab025a2ca4cb7b4a78fdbfea583f1aab0 | |
| parent | tweak previous; (diff) | |
| download | wireguard-openbsd-a90a934f35b0d826f1a0d3f6750a1bdb9b2ddc84.tar.xz wireguard-openbsd-a90a934f35b0d826f1a0d3f6750a1bdb9b2ddc84.zip | |
Update libcrypto regress to handle header and non-exported symbol changes.
| -rw-r--r-- | regress/lib/libcrypto/Makefile.inc | 2 | ||||
| -rw-r--r-- | regress/lib/libcrypto/bn/general/Makefile | 6 | ||||
| -rw-r--r-- | regress/lib/libcrypto/bn/general/bntest.c | 2 | ||||
| -rw-r--r-- | regress/lib/libcrypto/utf8/Makefile | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/regress/lib/libcrypto/Makefile.inc b/regress/lib/libcrypto/Makefile.inc new file mode 100644 index 00000000000..bf016ee9828 --- /dev/null +++ b/regress/lib/libcrypto/Makefile.inc @@ -0,0 +1,2 @@ +# Use this variable when the test needs internal symbols from libcrypto +CRYPTO_INT= -Wl,-Bstatic -lcrypto -Wl,-Bdynamic diff --git a/regress/lib/libcrypto/bn/general/Makefile b/regress/lib/libcrypto/bn/general/Makefile index d686dabd0e8..18207ffb01f 100644 --- a/regress/lib/libcrypto/bn/general/Makefile +++ b/regress/lib/libcrypto/bn/general/Makefile @@ -1,7 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2014/07/08 15:53:52 jsing Exp $ +# $OpenBSD: Makefile,v 1.3 2016/12/21 15:51:05 jsing Exp $ + +.include "../../Makefile.inc" PROG= bntest -LDADD= -lcrypto +LDADD= ${CRYPTO_INT} DPADD= ${LIBCRYPTO} WARNINGS= Yes CFLAGS+= -DLIBRESSL_INTERNAL -Werror diff --git a/regress/lib/libcrypto/bn/general/bntest.c b/regress/lib/libcrypto/bn/general/bntest.c index c5ec3cdc13f..0247dacaa49 100644 --- a/regress/lib/libcrypto/bn/general/bntest.c +++ b/regress/lib/libcrypto/bn/general/bntest.c @@ -84,6 +84,8 @@ #include <openssl/x509.h> #include <openssl/err.h> +int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom); + const int num0 = 100; /* number of tests */ const int num1 = 50; /* additional tests for some functions */ const int num2 = 5; /* number of tests for slow functions */ diff --git a/regress/lib/libcrypto/utf8/Makefile b/regress/lib/libcrypto/utf8/Makefile index 0d97a8a7fd6..5f06560ea55 100644 --- a/regress/lib/libcrypto/utf8/Makefile +++ b/regress/lib/libcrypto/utf8/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2016/09/02 17:02:56 beck Exp $ +# $OpenBSD: Makefile,v 1.6 2016/12/21 15:51:05 jsing Exp $ PROG= utf8test CPPFLAGS+=-I${.CURDIR}/../../../../lib/libcrypto/asn1 -LDADD= -lcrypto +LDADD= ${CRYPTO_INT} DPADD= ${LIBCRYPTO} WARNINGS=Yes CFLAGS+= -DLIBRESSL_INTERNAL -Werror |