[svn] GnuPG - r4630 - branches/STABLE-BRANCH-1-4/checks

[svn author dshaw]

Author: dshaw
Date: 2007-11-28 16:15:37 +0100 (Wed, 28 Nov 2007)
New Revision: 4630

Modified:
   branches/STABLE-BRANCH-1-4/checks/ChangeLog
   branches/STABLE-BRANCH-1-4/checks/defs.inc
   branches/STABLE-BRANCH-1-4/checks/sigs-dsa.test
Log:
* defs.inc: Use new --list-config method to get cipher and digest
names.


Modified: branches/STABLE-BRANCH-1-4/checks/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/ChangeLog	2007-11-28 15:09:52 UTC (rev 4629)
+++ branches/STABLE-BRANCH-1-4/checks/ChangeLog	2007-11-28 15:15:37 UTC (rev 4630)
@@ -1,3 +1,8 @@
+2007-11-28  David Shaw  <dshaw at jabberwocky.com>
+
+	* defs.inc: Use new --list-config method to get cipher and digest
+	names.
+
 2007-07-18  David Shaw  <dshaw at jabberwocky.com>
 
 	* defs.inc (all_hash_algos): See "all_cipher_algos", below.

Modified: branches/STABLE-BRANCH-1-4/checks/defs.inc
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/defs.inc	2007-11-28 15:09:52 UTC (rev 4629)
+++ branches/STABLE-BRANCH-1-4/checks/defs.inc	2007-11-28 15:15:37 UTC (rev 4630)
@@ -131,11 +131,11 @@
 }
 
 all_cipher_algos () {
-  ../g10/gpg --homedir . --version | grep "Cipher" | sed 's/^Cipher: //; s/,//g'
+  ../g10/gpg --homedir . --with-colons --list-config ciphername | sed 's/^cfg:ciphername://; s/;/ /g'
 }
 
 all_hash_algos () {
-  ../g10/gpg --homedir . --version | grep "Hash" | sed 's/^Hash: //; s/,//g'
+  ../g10/gpg --homedir . --with-colons --list-config digestname | sed 's/^cfg:digestname://; s/;/ /g'
 }
 
 set -e

Modified: branches/STABLE-BRANCH-1-4/checks/sigs-dsa.test
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/sigs-dsa.test	2007-11-28 15:09:52 UTC (rev 4629)
+++ branches/STABLE-BRANCH-1-4/checks/sigs-dsa.test	2007-11-28 15:15:37 UTC (rev 4630)
@@ -19,4 +19,3 @@
 	break
     done
 done
-