[svn] gcry - r1378 - trunk/tests

[svn author wk]

Author: wk
Date: 2009-01-21 19:44:57 +0100 (Wed, 21 Jan 2009)
New Revision: 1378

Modified:
   trunk/tests/ChangeLog
   trunk/tests/cavs_driver.pl
   trunk/tests/fipsdrv.c
Log:
print N value for rsa-derive.


Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog	2009-01-21 18:05:24 UTC (rev 1377)
+++ trunk/tests/ChangeLog	2009-01-21 18:44:57 UTC (rev 1378)
@@ -1,6 +1,7 @@
 2009-01-21  Werner Koch  <wk at g10code.com>
 
 	* fipsdrv.c (run_dsa_verify): Use gcry_mpi_scan again.
+	(run_rsa_derive): Also print N.
 
 	* fipsdrv.c (run_dsa_verify): Use hash of the data.
 

Modified: trunk/tests/cavs_driver.pl
===================================================================
--- trunk/tests/cavs_driver.pl	2009-01-21 18:05:24 UTC (rev 1377)
+++ trunk/tests/cavs_driver.pl	2009-01-21 18:44:57 UTC (rev 1378)
@@ -149,6 +149,7 @@
 #        is separated from the previous with a \n in the following order:
 #         P\n
 #         Q\n
+#         N\
 #         D\n
 my $rsa_derive;
 

Modified: trunk/tests/fipsdrv.c
===================================================================
--- trunk/tests/fipsdrv.c	2009-01-21 18:05:24 UTC (rev 1377)
+++ trunk/tests/fipsdrv.c	2009-01-21 18:44:57 UTC (rev 1378)
@@ -1282,7 +1282,7 @@
 /* Derive an RSA key using the S-expression in (DATA,DATALEN).  This
    S-expression is used directly as input to gcry_pk_genkey.  The
    result is printed to stdout with one parameter per line in hex
-   format and in this order: p, q, d.  */
+   format and in this order: p, q, n, d.  */
 static void
 run_rsa_derive (const void *data, size_t datalen)
 {
@@ -1308,13 +1308,13 @@
 
   /* P and Q might have been swapped but we need to to return them in
      the proper order.  Build the parameter list accordingly.  */
-  parmlist = "pqd";
+  parmlist = "pqnd";
   s_top = gcry_sexp_find_token (s_key, "misc-key-info", 0);
   if (s_top)
     {
       l1 = gcry_sexp_find_token (s_top, "p-q-swapped", 0);
       if (l1)
-        parmlist = "qpd";
+        parmlist = "qpnd";
       gcry_sexp_release (l1);
       gcry_sexp_release (s_top);
     }