[svn] GnuPG - r5035 - trunk/tests/openpgp

[svn author dshaw]

Author: dshaw
Date: 2009-06-05 15:54:08 +0200 (Fri, 05 Jun 2009)
New Revision: 5035

Modified:
   trunk/tests/openpgp/ChangeLog
   trunk/tests/openpgp/defs.inc
Log:
* defs.inc: Improved all_cipher_algos and all_hash_algos to work when
there are more than one line of algorithms.  From 1.4.


Modified: trunk/tests/openpgp/ChangeLog
===================================================================
--- trunk/tests/openpgp/ChangeLog	2009-06-04 14:19:21 UTC (rev 5034)
+++ trunk/tests/openpgp/ChangeLog	2009-06-05 13:54:08 UTC (rev 5035)
@@ -1,3 +1,8 @@
+2009-06-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* defs.inc: Improved all_cipher_algos and all_hash_algos to work
+	when there are more than one line of algorithms.  From 1.4.
+
 2009-04-19  Werner Koch  <wk at g10code.com>
 
 	* mkdemodirs (GPG): Use --no-options.

Modified: trunk/tests/openpgp/defs.inc
===================================================================
--- trunk/tests/openpgp/defs.inc	2009-06-04 14:19:21 UTC (rev 5034)
+++ trunk/tests/openpgp/defs.inc	2009-06-05 13:54:08 UTC (rev 5035)
@@ -148,14 +148,13 @@
 }
 
 all_cipher_algos () {
-  ../../g10/gpg2 --homedir . --version | grep "Cipher" | sed 's/^Cipher: //; s/,//g'
+  ../../g10/gpg2 --homedir . --with-colons --list-config ciphername | sed 's/^cfg:ciphername://; s/;/ /g'
 }
 
 all_hash_algos () {
-  ../../g10/gpg2 --homedir . --version | grep "Hash" | sed 's/^Hash: //; s/,//g'
+  ../../g10/gpg2 --homedir . --with-colons --list-config digestname | sed 's/^cfg:digestname://; s/;/ /g'
 }
 
-
 set -e
 pgmname=`basename $0`
 #trap cleanup SIGHUP SIGINT SIGQUIT