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 31944e21ceefcc4f06ca1ac02120ae1c30b3a0e9..60d94ae46fec792a4a6ede85aa1d77144caae962 100644 (file)
--- 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 0fb54a1ffa27882e586c4471f1f0141fa9ea3adb..cfaf3a0b734a37d49eb09932c45ebafae87d5457 100644 (file)
--- 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 e52fc533745c6b0cc305e06ca96577710aab0828..58aa7b2eca437c543fea3b4c0400c6580170bc87 100644 (file)
--- 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 08cff25e0cd0a47461ae66a387fb9f30028e1e07..4bd15f35a135ac79eed876622452a48d6fa68937 100644 (file)
--- 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 15308badd4aaeff3270eef8ee34d4f5c58040319..14539e035cadd1a7dac6923e0dae0c835882476b 100644 (file)
--- 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 4f41cc2ec2ccc8620d0f76b8cb61b0464ebd9d98..2587020bd718a4a011261f2c1e5f9469b61f42e7 100644 (file)
--- 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 ef6af21a35fdf845fb506092a1f3d6c5c393bd88..2ea021e02cefc24f62cd24558772f2a39aaa6f56 100644 (file)
--- 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 2e2c53b28d09b88b16f2b33736f7e40860c26e5b..2e7cd9161b77d56ff6c27f7dc92483e5e43fbeb8 100644 (file)
--- 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 */
 }