diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2009-06-05 15:54:08 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2009-06-05 15:54:08 +0200 |
| commit | 6f287d4e3fdaf4e7ebf1940e157a91d08d0f59fa (patch) | |
| tree | 2f5f7ada97be148fa41769c4a91e5a21956be98f /tests | |
| parent | Define SUN_LEN also for W32. (diff) | |
| download | gnupg2-6f287d4e3fdaf4e7ebf1940e157a91d08d0f59fa.tar.xz gnupg2-6f287d4e3fdaf4e7ebf1940e157a91d08d0f59fa.zip | |
* defs.inc: Improved all_cipher_algos and all_hash_algos to work when
there are more than one line of algorithms. From 1.4.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/ChangeLog | 5 | ||||
| -rwxr-xr-x | tests/openpgp/defs.inc | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog index 078c28676..21d4ef142 100644 --- a/tests/openpgp/ChangeLog +++ b/tests/openpgp/ChangeLog @@ -1,3 +1,8 @@ +2009-06-05 David Shaw <dshaw@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@g10code.com> * mkdemodirs (GPG): Use --no-options. diff --git a/tests/openpgp/defs.inc b/tests/openpgp/defs.inc index b33d9ebf8..2a7683eb6 100755 --- a/tests/openpgp/defs.inc +++ b/tests/openpgp/defs.inc @@ -148,14 +148,13 @@ have_hash_algo () { } 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 |