From: Niels Möller <nisse@lysator.liu.se>
Date: Mon, 14 May 2007 14:54:23 +0000 (+0200)
Subject: Don't use WITH_PUBLIC_KEY / WITH_HOGWEED, the Makefile sorts out which
X-Git-Tag: nettle_2.0_release_20090608~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=623682a75cb115630c7e3351772a71d99e6befdd;p=thirdparty%2Fnettle.git

Don't use WITH_PUBLIC_KEY / WITH_HOGWEED, the Makefile sorts out which
files should be compiled.

Rev: nettle/testsuite/dsa-keygen-test.c:1.2
Rev: nettle/testsuite/dsa-test.c:1.2
Rev: nettle/testsuite/pkcs1-test.c:1.2
Rev: nettle/testsuite/rsa-encrypt-test.c:1.2
Rev: nettle/testsuite/rsa-keygen-test.c:1.2
Rev: nettle/testsuite/rsa-test.c:1.2
Rev: nettle/testsuite/rsa2sexp-test.c:1.2
Rev: nettle/testsuite/sexp2rsa-test.c:1.2
---

diff --git a/testsuite/dsa-keygen-test.c b/testsuite/dsa-keygen-test.c
index 31944e21..60d94ae4 100644
--- a/testsuite/dsa-keygen-test.c
+++ b/testsuite/dsa-keygen-test.c
@@ -11,8 +11,6 @@ progress(void *ctx UNUSED, int c)
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
-
   struct dsa_public_key pub;
   struct dsa_private_key key;
   
@@ -37,8 +35,4 @@ test_main(void)
   dsa_private_key_clear(&key);
   
   SUCCESS();
-  
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }
diff --git a/testsuite/dsa-test.c b/testsuite/dsa-test.c
index 0fb54a1f..cfaf3a0b 100644
--- a/testsuite/dsa-test.c
+++ b/testsuite/dsa-test.c
@@ -3,7 +3,6 @@
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
   struct dsa_public_key pub;
   struct dsa_private_key key;
 
@@ -44,8 +43,4 @@ test_main(void)
   dsa_private_key_clear(&key);
 
   SUCCESS();
-  
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }
diff --git a/testsuite/pkcs1-test.c b/testsuite/pkcs1-test.c
index e52fc533..58aa7b2e 100644
--- a/testsuite/pkcs1-test.c
+++ b/testsuite/pkcs1-test.c
@@ -1,14 +1,10 @@
 #include "testutils.h"
 
-#if WITH_PUBLIC_KEY
-# include "pkcs1.h"
-#endif
+#include "pkcs1.h"
 
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
-  
   uint8_t buffer[16];
   uint8_t expected[16] = {    1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 			   0xff, 0xff, 0xff, 0xff, 0,    'a',  'b',  'c' };
@@ -19,7 +15,4 @@ test_main(void)
   ASSERT(MEMEQ(sizeof(buffer), buffer, expected));
 
   SUCCESS();
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }
diff --git a/testsuite/rsa-encrypt-test.c b/testsuite/rsa-encrypt-test.c
index 08cff25e..4bd15f35 100644
--- a/testsuite/rsa-encrypt-test.c
+++ b/testsuite/rsa-encrypt-test.c
@@ -1,15 +1,11 @@
 #include "testutils.h"
 
-#if WITH_PUBLIC_KEY
-# include "rsa.h"
-#endif
-
+#include "rsa.h"
 #include "knuth-lfib.h"
 
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
   struct rsa_public_key pub;
   struct rsa_private_key key;
   struct knuth_lfib_ctx lfib;
@@ -67,9 +63,5 @@ test_main(void)
   mpz_clear(gibberish);
   free(decrypted);
   SUCCESS();
-  
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }
   
diff --git a/testsuite/rsa-keygen-test.c b/testsuite/rsa-keygen-test.c
index 15308bad..14539e03 100644
--- a/testsuite/rsa-keygen-test.c
+++ b/testsuite/rsa-keygen-test.c
@@ -11,8 +11,6 @@ progress(void *ctx UNUSED, int c)
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
-
   struct rsa_public_key pub;
   struct rsa_private_key key;
   
@@ -78,8 +76,4 @@ test_main(void)
   mpz_clear(expected);
 
   SUCCESS();
-  
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }
diff --git a/testsuite/rsa-test.c b/testsuite/rsa-test.c
index 4f41cc2e..2587020b 100644
--- a/testsuite/rsa-test.c
+++ b/testsuite/rsa-test.c
@@ -3,8 +3,6 @@
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
-
   struct rsa_public_key pub;
   struct rsa_private_key key;
 
@@ -171,8 +169,4 @@ test_main(void)
   mpz_clear(expected);
 
   SUCCESS();
-  
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }
diff --git a/testsuite/rsa2sexp-test.c b/testsuite/rsa2sexp-test.c
index ef6af21a..2ea021e0 100644
--- a/testsuite/rsa2sexp-test.c
+++ b/testsuite/rsa2sexp-test.c
@@ -5,7 +5,6 @@
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
   struct rsa_public_key pub;
   struct rsa_private_key priv;
 
@@ -105,8 +104,4 @@ test_main(void)
   rsa_private_key_clear(&priv);
   
   SUCCESS();
-  
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }
diff --git a/testsuite/sexp2rsa-test.c b/testsuite/sexp2rsa-test.c
index 2e2c53b2..2e7cd916 100644
--- a/testsuite/sexp2rsa-test.c
+++ b/testsuite/sexp2rsa-test.c
@@ -3,7 +3,6 @@
 int
 test_main(void)
 {
-#if WITH_PUBLIC_KEY
   struct rsa_public_key pub;
   struct rsa_private_key priv;
   
@@ -43,9 +42,5 @@ test_main(void)
   rsa_private_key_clear(&priv);
   
   SUCCESS();
-  
-#else /* !WITH_PUBLIC_KEY */
-  SKIP();
-#endif /* !WITH_PUBLIC_KEY */
 }