experiment: Write the test, in the beginning.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

8 files changed, 395 insertions, 13 deletions

diff --git a/src/gcrypt-int.h b/src/gcrypt-int.h
index 3a778430..5bfa9a81 100644
--- a/src/gcrypt-int.h
+++ b/src/gcrypt-int.h
@@ -114,12 +114,14 @@ gpg_error_t _gcry_ecc_mul_point (int algo, unsigned char *result,
                                  const unsigned char *scalar,
                                  const unsigned char *point);
 
-gcry_error_t _gcry_pkey_vopen (gcry_pkey_hd_t *h, int algo, va_list arg_ptr);
+gcry_error_t _gcry_pkey_vopen (gcry_pkey_hd_t *h, int algo, unsigned int flags,
+                               va_list arg_ptr);
 gcry_error_t _gcry_pkey_ctl (gcry_pkey_hd_t h, int cmd,
                              void *buffer, size_t buflen);
 gcry_error_t _gcry_pkey_op (gcry_pkey_hd_t h, int cmd,
-                            int num_in, const unsigned char *in[], size_t in_len[],
-                            int num_out, unsigned char *out[], size_t *out_len[]);
+                            int num_in, const unsigned char *const in[],
+                            const size_t in_len[],
+                            int num_out, unsigned char *out[], size_t out_len[]);
 void _gcry_pkey_close (gcry_pkey_hd_t h);
 
 gpg_err_code_t _gcry_md_open (gcry_md_hd_t *h, int algo, unsigned int flags);
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index b4e23c94..b3772768 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -1226,12 +1226,27 @@ enum gcry_pkey_algos
     GCRY_PKEY_ELG                = 20
   };
 
-gcry_error_t gcry_pkey_open (gcry_pkey_hd_t *h_p, int algo, ...);
+#define GCRY_PKEY_FLAG_PREHASH (1 << 0)
+#define GCRY_PKEY_FLAG_CONTEXT (1 << 1)
+
+enum gcry_pkey_curves
+  {
+    GCRY_PKEY_CURVE_ED25519
+  };
+
+enum gcry_pkey_ops
+  {
+    GCRY_PKEY_OP_VERIFY,
+    GCRY_PKEY_OP_SIGN
+  };
+
+gcry_error_t gcry_pkey_open (gcry_pkey_hd_t *h_p, int algo, unsigned int flags, ...);
 gcry_error_t gcry_pkey_ctl (gcry_pkey_hd_t h, int cmd,
                             void *buffer, size_t buflen);
 gcry_error_t gcry_pkey_op (gcry_pkey_hd_t h, int cmd,
-                           int num_in, const unsigned char *in[], size_t in_len[],
-                           int num_out, unsigned char *out[], size_t *out_len[]);
+                           int num_in, const unsigned char *const in[],
+                           const size_t in_len[],
+                           int num_out, unsigned char *out[], size_t out_len[]);
 void gcry_pkey_close (gcry_pkey_hd_t h);
 
 /************************************
diff --git a/src/libgcrypt.def b/src/libgcrypt.def
index 5fb207c9..ddbe8cf7 100644
--- a/src/libgcrypt.def
+++ b/src/libgcrypt.def
@@ -289,4 +289,9 @@ EXPORTS
       gcry_ecc_get_algo_keylen  @249
       gcry_ecc_mul_point        @250
 
+      gcry_pkey_open            @251
+      gcry_pkey_ctl             @252
+      gcry_pkey_op              @253
+      gcry_pkey_close           @254
+
 ;; end of file with public symbols for Windows.
diff --git a/src/libgcrypt.vers b/src/libgcrypt.vers
index 0ed10d51..81df1534 100644
--- a/src/libgcrypt.vers
+++ b/src/libgcrypt.vers
@@ -122,6 +122,7 @@ GCRYPT_1.6 {
 
     gcry_ctx_release;
 
+    gcry_pkey_open; gcry_pkey_ctl; gcry_pkey_op; gcry_pkey_close;
   local:
     *;
 
diff --git a/src/visibility.c b/src/visibility.c
index 81b6165d..86ec3786 100644
--- a/src/visibility.c
+++ b/src/visibility.c
@@ -1151,13 +1151,13 @@ gcry_ecc_mul_point (int curveid, unsigned char *result,
 }
 
 gcry_error_t
-gcry_pkey_open (gcry_pkey_hd_t *h_p, int algo, ...)
+gcry_pkey_open (gcry_pkey_hd_t *h_p, int algo, unsigned int flags, ...)
 {
   gcry_error_t err;
   va_list arg_ptr;
 
-  va_start (arg_ptr, algo);
-  err = _gcry_pkey_vopen  (h_p, algo, arg_ptr);
+  va_start (arg_ptr, flags);
+  err = _gcry_pkey_vopen  (h_p, algo, flags, arg_ptr);
   va_end (arg_ptr);
   return err;
 }
@@ -1171,8 +1171,9 @@ gcry_pkey_ctl (gcry_pkey_hd_t h, int cmd,
 
 gcry_error_t
 gcry_pkey_op (gcry_pkey_hd_t h, int cmd,
-              int num_in, const unsigned char *in[], size_t in_len[],
-              int num_out, unsigned char *out[], size_t *out_len[])
+              int num_in, const unsigned char *const in[],
+              const size_t in_len[],
+              int num_out, unsigned char *out[], size_t out_len[])
 {
   return _gcry_pkey_op (h, cmd, num_in, in, in_len, num_out, out, out_len);
 }
@@ -1180,7 +1181,7 @@ gcry_pkey_op (gcry_pkey_hd_t h, int cmd,
 void
 gcry_pkey_close (gcry_pkey_hd_t h)
 {
-  gcry_pkey_close (h);
+  _gcry_pkey_close (h);
 }
 
 gcry_error_t
diff --git a/src/visibility.h b/src/visibility.h
index b7e8369a..454a8264 100644
--- a/src/visibility.h
+++ b/src/visibility.h
@@ -168,6 +168,11 @@ MARK_VISIBLEX (gcry_pubkey_get_sexp)
 MARK_VISIBLEX (gcry_ecc_get_algo_keylen)
 MARK_VISIBLEX (gcry_ecc_mul_point)
 
+MARK_VISIBLEX (gcry_pkey_open)
+MARK_VISIBLEX (gcry_pkey_op)
+MARK_VISIBLEX (gcry_pkey_ctl)
+MARK_VISIBLEX (gcry_pkey_close)
+
 MARK_VISIBLEX (gcry_kdf_derive)
 
 MARK_VISIBLEX (gcry_prime_check)
@@ -367,6 +372,11 @@ MARK_VISIBLEX (_gcry_mpi_get_const)
 #define gcry_ecc_get_algo_keylen    _gcry_USE_THE_UNDERSCORED_FUNCTION
 #define gcry_ecc_mul_point          _gcry_USE_THE_UNDERSCORED_FUNCTION
 
+#define gcry_pkey_open              _gcry_USE_THE_UNDERSCORED_FUNCTION
+#define gcry_pkey_ctl               _gcry_USE_THE_UNDERSCORED_FUNCTION
+#define gcry_pkey_op                _gcry_USE_THE_UNDERSCORED_FUNCTION
+#define gcry_pkey_open              _gcry_USE_THE_UNDERSCORED_FUNCTION
+
 #define gcry_md_algo_info           _gcry_USE_THE_UNDERSCORED_FUNCTION
 #define gcry_md_algo_name           _gcry_USE_THE_UNDERSCORED_FUNCTION
 #define gcry_md_close               _gcry_USE_THE_UNDERSCORED_FUNCTION
diff --git a/tests/t-ed25519-rfc8032.inp b/tests/t-ed25519-rfc8032.inp
new file mode 100644
index 00000000..5a2405c8
--- /dev/null
+++ b/tests/t-ed25519-rfc8032.inp
@@ -0,0 +1,93 @@
+# t-ed25519-rfc8032.inp
+# This is from RFC 8032
+#
+
+# 7.1.  Test Vectors for Ed25519
+
+# TEST 1
+TST: 1
+ALG: Ed25519
+SK:  9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60
+PK:  d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a
+MSG:
+SIG: e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b
+
+# TEST 2
+TST: 2
+ALG: Ed25519
+SK:  4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb
+PK:  3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c
+MSG: 72
+SIG: 92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00
+
+# TEST 3
+TST: 3
+ALG: Ed25519
+SK:  c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7
+PK:  fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025
+MSG: af82
+SIG: 6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a
+
+#TEST 1024
+TST: 4
+ALG: Ed25519
+SK:  f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5
+PK:  278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e
+MSG: 08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0
+SIG: 0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03
+
+# TEST SHA(abc)
+TST: 5
+ALG: Ed25519
+SK:  833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42
+PK:  ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf
+MSG: ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f
+SIG: dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704
+
+# 7.2.  Test Vectors for Ed25519ctx
+
+# foo
+TST: 6
+ALG: Ed25519ctx
+SK:  0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6
+PK:  dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292
+MSG: f726936d19c800494e3fdaff20b276a8
+CTX: 666f6f
+SIG: 55a4cc2f70a54e04288c5f4cd1e45a7bb520b36292911876cada7323198dd87a8b36950b95130022907a7fb7c4e9b2d5f6cca685a587b4b21f4b888e4e7edb0d
+
+# bar
+TST: 7
+ALG: Ed25519ctx
+SK:  0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6
+PK:  dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292
+MSG: f726936d19c800494e3fdaff20b276a8
+CTX: 626172
+SIG: fc60d5872fc46b3aa69f8b5b4351d5808f92bcc044606db097abab6dbcb1aee3216c48e8b3b66431b5b186d1d28f8ee15a5ca2df6668346291c2043d4eb3e90d
+
+# foo2
+TST: 8
+ALG: Ed25519ctx
+SK:  0305334e381af78f141cb666f6199f57bc3495335a256a95bd2a55bf546663f6
+PK:  dfc9425e4f968f7f0c29f0259cf5f9aed6851c2bb4ad8bfb860cfee0ab248292
+MSG: 508e9e6882b979fea900f62adceaca35
+CTX: 666f6f
+SIG: 8b70c1cc8310e1de20ac53ce28ae6e7207f33c3295e03bb5c0732a1d20dc64908922a8b052cf99b7c4fe107a5abb5b2c4085ae75890d02df26269d8945f84b0b
+
+# foo3
+TST: 9
+ALG: Ed25519ctx
+SK:  ab9c2853ce297ddab85c993b3ae14bcad39b2c682beabc27d6d4eb20711d6560
+PK:  0f1d1274943b91415889152e893d80e93275a1fc0b65fd71b4b0dda10ad7d772
+MSG: f726936d19c800494e3fdaff20b276a8
+CTX: 666f6f
+SIG: 21655b5f1aa965996b3f97b3c849eafba922a0a62992f73b3d1b73106a84ad85e9b86a7b6005ea868337ff2d20a7f5fbd4cd10b0be49a68da2b2e0dc0ad8960f
+
+# 7.3.  Test Vectors for Ed25519ph
+
+# TEST abc
+TST: 10
+ALG: Ed25519ph
+SK:  833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42
+PK:  ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf
+MSG: 616263
+SIG: 98a70222f0b8121aa9d30f813d683f809e462b469c7ff87639499bb94e6dae4131f85042463c2a355a2003d062adf5aaa10b8c61e636062aaad11c2a26083406
diff --git a/tests/t-ed25519.c b/tests/t-ed25519.c
index 567bc797..9a3c2f6e 100644
--- a/tests/t-ed25519.c
+++ b/tests/t-ed25519.c
@@ -32,10 +32,12 @@
 #define PGM "t-ed25519"
 #include "t-common.h"
 #define N_TESTS 1026
+#define N_TESTS2 10
 
 static int sign_with_pk;
 static int no_verify;
 static int custom_data_file;
+static int custom_data_file2;
 static int in_fips_mode = 0;
 
 
@@ -414,11 +416,246 @@ check_ed25519 (const char *fname)
 }
 
 
+static void
+one_test_using_new_api (int testno, const char *alg,
+                        const char *sk, const char *pk,
+                        const char *msg,  const char *ctx, const char *sig)
+{
+  gpg_error_t err;
+  int i;
+  char *p;
+  void *buffer = NULL;
+  void *buffer2 = NULL;
+  size_t buflen, buflen2;
+  gcry_pkey_hd_t h0 = NULL;
+  gcry_pkey_hd_t h1 = NULL;
+  char *sig_rs_string = NULL;
+  const unsigned char * in[4];
+  size_t in_len[4];
+  unsigned char *out[2] = { NULL, NULL };
+  size_t out_len[2] = { 0, 0 };
+  unsigned int flags;
+
+  if (verbose > 1)
+    info ("Running test %d\n", testno);
+
+  if (alg == NULL || !strcmp (alg, "Ed25519"))
+    flags = 0;
+  else if (!strcmp (alg, "Ed25519ph"))
+    flags = GCRY_PKEY_FLAG_PREHASH;
+  else if (!strcmp (alg, "Ed25519ctx"))
+    flags = GCRY_PKEY_FLAG_CONTEXT;
+  else
+    {
+      fail ("error parsing for test %d, %s: %s",
+            testno, "alg", "invalid algo string");
+      goto leave;
+    }
+
+  if (!(buffer = hex2buffer (sk, &buflen)))
+    {
+      fail ("error parsing for test %d, %s: %s",
+            testno, "sk", "invalid hex string");
+      goto leave;
+    }
+  if (!(buffer2 = hex2buffer (pk, &buflen2)))
+    {
+      fail ("error parsing for test %d, %s: %s",
+            testno, "pk", "invalid hex string");
+      goto leave;
+    }
+  if (sign_with_pk)
+    err = gcry_pkey_open (&h0, GCRY_PKEY_ECC, flags,
+                          GCRY_PKEY_CURVE_ED25519,
+                          buffer2, buflen2,
+                          buffer, buflen);
+  else
+    err = gcry_pkey_open (&h0, GCRY_PKEY_ECC, flags,
+                          GCRY_PKEY_CURVE_ED25519,
+                          NULL, 0,
+                          buffer, buflen);
+  if (err)
+    {
+      fail ("error opening PKEY for test %d, %s: %s",
+            testno, "sk", gpg_strerror (err));
+      goto leave;
+    }
+
+  err = gcry_pkey_open (&h1, GCRY_PKEY_ECC, flags,
+                        GCRY_PKEY_CURVE_ED25519,
+                        buffer2, buflen2);
+  if (err)
+    {
+      fail ("error opening PKEY for test %d, %s: %s",
+            testno, "pk", gpg_strerror (err));
+      goto leave;
+    }
+
+  xfree (buffer);
+  xfree (buffer2);
+
+  if (!(buffer = hex2buffer (msg, &buflen)))
+    {
+      fail ("error parsing for test %d, %s: %s",
+            testno, "msg", "invalid hex string");
+      goto leave;
+    }
+
+  in[0] = buffer;
+  in_len[0] = buflen;
+
+  if (ctx)
+    {
+      if (!(buffer2 = hex2buffer (ctx, &buflen2)))
+        {
+          fail ("error parsing for test %d, %s: %s",
+                testno, "ctx", "invalid hex string");
+          goto leave;
+        }
+    }
+  else
+    {
+      buffer2 = NULL;
+      buflen2 = 0;
+    }
+
+  in[1] = buffer2;
+  in_len[1] = buflen2;
+
+  err = gcry_pkey_op (h0, GCRY_PKEY_OP_SIGN,
+                      ctx? 2: 1, in, in_len,
+                      2, out, out_len);
+  if (in_fips_mode)
+    {
+      if (!err)
+        fail ("gcry_pkey_op is not expected to work in FIPS mode for test %d",
+              testno);
+      if (verbose > 1)
+        info ("not executed in FIPS mode\n");
+      goto leave;
+    }
+  if (err)
+    fail ("gcry_pkey_op failed for test %d: %s", testno, gpg_strerror (err));
+
+  sig_rs_string = xmalloc (2*(out_len[0] + out_len[1])+1);
+  p = sig_rs_string;
+  *p = 0;
+  for (i=0; i < out_len[0]; i++, p += 2)
+    snprintf (p, 3, "%02x", out[0][i]);
+  for (i=0; i < out_len[1]; i++, p += 2)
+    snprintf (p, 3, "%02x", out[1][i]);
+  if (strcmp (sig_rs_string, sig))
+    {
+      fail ("gcry_pkey_op failed for test %d: %s",
+            testno, "wrong value returned");
+      info ("  expected: '%s'", sig);
+      info ("       got: '%s'", sig_rs_string);
+    }
+
+  if (!no_verify)
+    {
+      in[1] = out[0];
+      in_len[1] = out_len[0];
+      in[2] = out[1];
+      in_len[2] = out_len[1];
+      if (ctx)
+        {
+          in[3] = buffer2;
+          in_len[3] = buflen2;
+        }
+
+      if ((err = gcry_pkey_op (h1, GCRY_PKEY_OP_VERIFY,
+                               ctx? 4: 3, in, in_len, 0, NULL, 0)))
+        fail ("GCRY_PKEY_OP_VERIFY failed for test %d: %s",
+              testno, gpg_strerror (err));
+    }
+
+ leave:
+  xfree (buffer);
+  xfree (buffer2);
+  xfree (out[0]);
+  xfree (out[1]);
+  xfree (sig_rs_string);
+  gcry_pkey_close (h0);
+  gcry_pkey_close (h1);
+}
+
+
+static void
+check_ed25519_using_new_api (const char *fname)
+{
+  FILE *fp;
+  int lineno, ntests;
+  char *line;
+  int testno;
+  char *alg, *sk, *pk, *msg, *ctx, *sig;
+
+  info ("Checking Ed25519 with new API.\n");
+
+  fp = fopen (fname, "r");
+  if (!fp)
+    die ("error opening '%s': %s\n", fname, strerror (errno));
+
+  testno = 0;
+  alg = sk = pk = msg = ctx = sig = NULL;
+  lineno = ntests = 0;
+  while ((line = read_textline (fp, &lineno)))
+    {
+      if (!strncmp (line, "TST:", 4))
+        testno = atoi (line+4);
+      else if (!strncmp (line, "ALG:", 3))
+        copy_data (&alg, line, lineno);
+      else if (!strncmp (line, "SK:", 3))
+        copy_data (&sk, line, lineno);
+      else if (!strncmp (line, "PK:", 3))
+        copy_data (&pk, line, lineno);
+      else if (!strncmp (line, "MSG:", 4))
+        copy_data (&msg, line, lineno);
+      else if (!strncmp (line, "CTX:", 3))
+        copy_data (&ctx, line, lineno);
+      else if (!strncmp (line, "SIG:", 4))
+        copy_data (&sig, line, lineno);
+      else
+        fail ("unknown tag at input line %d", lineno);
+
+      xfree (line);
+      if (testno && sk && pk && msg && sig)
+        {
+          one_test_using_new_api (testno, alg, sk, pk, msg, ctx, sig);
+          ntests++;
+          if (!(ntests % 256))
+            show_note ("%d of %d tests done\n", ntests, N_TESTS2);
+          xfree (alg); alg = NULL;
+          xfree (sk);  sk = NULL;
+          xfree (pk);  pk = NULL;
+          xfree (msg); msg = NULL;
+          xfree (ctx); ctx = NULL;
+          xfree (sig); sig = NULL;
+        }
+
+    }
+  xfree (alg);
+  xfree (sk);
+  xfree (pk);
+  xfree (msg);
+  xfree (ctx);
+  xfree (sig);
+
+  if (ntests != N_TESTS2 && !custom_data_file2)
+    fail ("did %d tests but expected %d", ntests, N_TESTS2);
+  else if ((ntests % 256))
+    show_note ("%d tests done\n", ntests);
+
+  fclose (fp);
+}
+
+
 int
 main (int argc, char **argv)
 {
   int last_argc = -1;
   char *fname = NULL;
+  char *fname2 = NULL;
 
   if (argc)
     { argc--; argv++; }
@@ -439,7 +676,8 @@ main (int argc, char **argv)
                  "  --debug         flyswatter\n"
                  "  --sign-with-pk  also use the public key for signing\n"
                  "  --no-verify     skip the verify test\n"
-                 "  --data FNAME    take test data from file FNAME\n",
+                 "  --data FNAME    take test data from file FNAME\n"
+                 "  --data2 FNAME2  take test data2 from file FNAME2\n",
                  stdout);
           exit (0);
         }
@@ -474,6 +712,16 @@ main (int argc, char **argv)
               argc--; argv++;
             }
         }
+      else if (!strcmp (*argv, "--data1"))
+        {
+          argc--; argv++;
+          if (argc)
+            {
+              xfree (fname2);
+              fname2 = xstrdup (*argv);
+              argc--; argv++;
+            }
+        }
       else if (!strncmp (*argv, "--", 2))
         die ("unknown option '%s'", *argv);
 
@@ -484,6 +732,11 @@ main (int argc, char **argv)
   else
     custom_data_file = 1;
 
+  if (!fname2)
+    fname2 = prepend_srcdir ("t-ed25519-rfc8032.inp");
+  else
+    custom_data_file2 = 1;
+
   xgcry_control ((GCRYCTL_DISABLE_SECMEM, 0));
   if (!gcry_check_version (GCRYPT_VERSION))
     die ("version mismatch\n");
@@ -497,9 +750,11 @@ main (int argc, char **argv)
 
   start_timer ();
   check_ed25519 (fname);
+  check_ed25519_using_new_api (fname2);
   stop_timer ();
 
   xfree (fname);
+  xfree (fname2);
 
   info ("All tests completed in %s.  Errors: %d\n",
         elapsed_time (1), error_count);