[svn] gcry - r1380 - in trunk: . tests

[svn author wk]

Author: wk
Date: 2009-01-22 12:51:22 +0100 (Thu, 22 Jan 2009)
New Revision: 1380

Modified:
   trunk/THANKS
   trunk/tests/ChangeLog
   trunk/tests/cavs_driver.pl
   trunk/tests/cavs_tests.sh
Log:
DSA Tweak for the CAVS test script


Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog	2009-01-22 10:38:22 UTC (rev 1379)
+++ trunk/tests/ChangeLog	2009-01-22 11:51:22 UTC (rev 1380)
@@ -1,5 +1,7 @@
 2009-01-22  Werner Koch  <wk at g10code.com>
 
+	* cavs_tests.sh: Pass option -D to driver if required.
+
 	* fipsdrv.c (run_dsa_sign): Use hash of the data.
 	(dsa_gen_with_seed): New.
 	(run_dsa_pqg_gen): Add args SEED and SEEDLEN and use them.

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2009-01-22 10:38:22 UTC (rev 1379)
+++ trunk/THANKS	2009-01-22 11:51:22 UTC (rev 1380)
@@ -119,6 +119,7 @@
 Simon Josefsson            jas at extundo.com
 SL Baur 		   steve at xemacs.org
 Stephan Austermuehle       au at hcsd.de
+Stephan Müller             smueller at atsec com
 Stephane Corthesy          stephane at sente.ch
 Stefan Karrmann 	   S.Karrmann at gmx.net
 Stefan Keller		   dres at cs.tu-berlin.de

Modified: trunk/tests/cavs_driver.pl
===================================================================
--- trunk/tests/cavs_driver.pl	2009-01-22 10:38:22 UTC (rev 1379)
+++ trunk/tests/cavs_driver.pl	2009-01-22 11:51:22 UTC (rev 1380)
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $Id: cavs_driver.pl 1494 2009-01-21 19:30:16Z smueller $
+# $Id: cavs_driver.pl 1495 2009-01-22 10:47:13Z smueller $
 #
 # CAVS test driver (based on the OpenSSL driver)
 # Written by: Stephan Müller <sm at atsec.com>
@@ -1518,6 +1518,11 @@
 		die "Return value does not contain all expected values of P, Q, G, Seed, c, H for dsa_pqggen"
 			if (!defined($P) || !defined($Q) || !defined($G) ||
 			    !defined($Seed) || !defined($c) || !defined($H));
+
+		# now change the counter to decimal as CAVS wants decimal
+		# counter value although all other is HEX
+		$c = hex($c);
+
 		$out .= "P = $P\n";
 		$out .= "Q = $Q\n";
 		$out .= "G = $G\n";

Modified: trunk/tests/cavs_tests.sh
===================================================================
--- trunk/tests/cavs_tests.sh	2009-01-22 10:38:22 UTC (rev 1379)
+++ trunk/tests/cavs_tests.sh	2009-01-22 11:51:22 UTC (rev 1380)
@@ -46,6 +46,7 @@
     local rspfile
     local tmprspfile
     local respdir
+    local dflag=""
 
     tmprspfile=$(echo "$reqfile" | sed 's,.req$,.rsp,')
     rspfile=$(echo "$tmprspfile" | sed 's,/req/,/resp/,' )
@@ -53,8 +54,12 @@
     [ -f "$tmprspfile" ] && rm "$tmprspfile"
     [ -d "$respdir" ] || mkdir "$respdir"
     [ -f "$rspfile" ] &&  rm "$rspfile"
+
+    if echo "$reqfile" | grep '/DSA/req/' >/dev/null 2>/dev/null; then
+        dflag="-D"
+    fi 
     
-    if ./cavs_driver.pl -I libgcrypt "$reqfile"; then
+    if ./cavs_driver.pl -I libgcrypt $dflag "$reqfile"; then
       if [ -f "$tmprspfile" ]; then
           mv "$tmprspfile" "$rspfile"
       else 
@@ -119,7 +124,7 @@
 
 if [ -f "$errors_seen_file" ]; then
     rm "$errors_seen_file"
-    echo "Error enountered - not packing up response file" >&2
+    echo "Error encountered - not packing up response file" >&2
     exit 1
 fi