summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2018-02-18 10:18:00 +0100
committerNiels Möller <nisse@lysator.liu.se>2018-02-18 10:18:00 +0100
commitc5fc9131b13d53b07b7aa371f30df8621cf2abb8 (patch)
treef922d5cccb962037b025634c125997c3996df514
parentd6e8d7f7fe518fa4d1649ce591cc5e68a7374b82 (diff)
downloadnettle-c5fc9131b13d53b07b7aa371f30df8621cf2abb8.tar.gz
Fix link failure for pss-mgf1-test, in non-hogweed builds.
-rw-r--r--ChangeLog6
-rw-r--r--testsuite/.test-rules.make6
-rw-r--r--testsuite/Makefile.in4
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f9a87f37..e354cdde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-18 Niels Möller <nisse@lysator.liu.se>
+
+ * testsuite/Makefile.in (TS_NETTLE_SOURCES): Moved pss-mgf1-test.c...
+ (TS_HOGWEED_SOURCES): ...to here. Fixes link failure in builds
+ without public-key support.
+
2018-02-18 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* examples/nettle-openssl.c): Move expressions with side effects
diff --git a/testsuite/.test-rules.make b/testsuite/.test-rules.make
index 1f780310..12c39f30 100644
--- a/testsuite/.test-rules.make
+++ b/testsuite/.test-rules.make
@@ -163,9 +163,6 @@ yarrow-test$(EXEEXT): yarrow-test.$(OBJEXT)
pbkdf2-test$(EXEEXT): pbkdf2-test.$(OBJEXT)
$(LINK) pbkdf2-test.$(OBJEXT) $(TEST_OBJS) -o pbkdf2-test$(EXEEXT)
-pss-mgf1-test$(EXEEXT): pss-mgf1-test.$(OBJEXT)
- $(LINK) pss-mgf1-test.$(OBJEXT) $(TEST_OBJS) -o pss-mgf1-test$(EXEEXT)
-
sexp-test$(EXEEXT): sexp-test.$(OBJEXT)
$(LINK) sexp-test.$(OBJEXT) $(TEST_OBJS) -o sexp-test$(EXEEXT)
@@ -193,6 +190,9 @@ pss-test$(EXEEXT): pss-test.$(OBJEXT)
rsa-sign-tr-test$(EXEEXT): rsa-sign-tr-test.$(OBJEXT)
$(LINK) rsa-sign-tr-test.$(OBJEXT) $(TEST_OBJS) -o rsa-sign-tr-test$(EXEEXT)
+pss-mgf1-test$(EXEEXT): pss-mgf1-test.$(OBJEXT)
+ $(LINK) pss-mgf1-test.$(OBJEXT) $(TEST_OBJS) -o pss-mgf1-test$(EXEEXT)
+
rsa-pss-sign-tr-test$(EXEEXT): rsa-pss-sign-tr-test.$(OBJEXT)
$(LINK) rsa-pss-sign-tr-test.$(OBJEXT) $(TEST_OBJS) -o rsa-pss-sign-tr-test$(EXEEXT)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 3117d66d..df1c8150 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -30,13 +30,13 @@ TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
hmac-test.c umac-test.c \
meta-hash-test.c meta-cipher-test.c\
meta-aead-test.c meta-armor-test.c \
- buffer-test.c yarrow-test.c pbkdf2-test.c pss-mgf1-test.c
+ buffer-test.c yarrow-test.c pbkdf2-test.c
TS_HOGWEED_SOURCES = sexp-test.c sexp-format-test.c \
rsa2sexp-test.c sexp2rsa-test.c \
bignum-test.c random-prime-test.c \
pkcs1-test.c pss-test.c rsa-sign-tr-test.c \
- rsa-pss-sign-tr-test.c \
+ pss-mgf1-test.c rsa-pss-sign-tr-test.c \
rsa-test.c rsa-encrypt-test.c rsa-keygen-test.c \
dsa-test.c dsa-keygen-test.c \
curve25519-dh-test.c \