diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2007-05-03 02:54:28 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2007-05-03 02:54:28 +0200 |
| commit | 19df6dc9e38035a2fab1d8ac593dde00f3b2b4a3 (patch) | |
| tree | 1a7134ccea8008e028d0696783bc601a90ad3d64 /tests | |
| parent | 2007-04-26 Marcus Brinkmann <marcus@g10code.de> (diff) | |
| download | gnupg2-19df6dc9e38035a2fab1d8ac593dde00f3b2b4a3.tar.xz gnupg2-19df6dc9e38035a2fab1d8ac593dde00f3b2b4a3.zip | |
* conventional.test, encrypt.test, encrypt-dsa.test,
conventional-mdc.test: Fix some broken tests that were only testing
3DES instead of all available ciphers.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/ChangeLog | 6 | ||||
| -rwxr-xr-x | tests/openpgp/conventional-mdc.test | 14 | ||||
| -rwxr-xr-x | tests/openpgp/conventional.test | 4 | ||||
| -rwxr-xr-x | tests/openpgp/encrypt-dsa.test | 14 | ||||
| -rwxr-xr-x | tests/openpgp/encrypt.test | 14 |
5 files changed, 31 insertions, 21 deletions
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog index c4179d474..58b95cfb0 100644 --- a/tests/openpgp/ChangeLog +++ b/tests/openpgp/ChangeLog @@ -1,3 +1,9 @@ +2007-05-02 David Shaw <dshaw@jabberwocky.com> + + * conventional.test, encrypt.test, encrypt-dsa.test, + conventional-mdc.test: Fix some broken tests that were only + testing 3DES instead of all available ciphers. + 2007-03-04 David Shaw <dshaw@jabberwocky.com> (wk) * verify.test: Use --allow-multiple-messages instead of diff --git a/tests/openpgp/conventional-mdc.test b/tests/openpgp/conventional-mdc.test index 95a6ba476..b3cf10b3a 100755 --- a/tests/openpgp/conventional-mdc.test +++ b/tests/openpgp/conventional-mdc.test @@ -4,23 +4,23 @@ algos="3des" -if have_cipher_algo "idea"; then +if have_cipher_algo "IDEA"; then algos="$algos idea" fi -if have_cipher_algo "cast5"; then - algos="$algos idea" +if have_cipher_algo "CAST5"; then + algos="$algos cast5" fi -if have_cipher_algo "blowfish"; then - algos="$algos idea" +if have_cipher_algo "BLOWFISH"; then + algos="$algos blowfish" fi -if have_cipher_algo "aes"; then +if have_cipher_algo "AES"; then algos="$algos aes aes192 aes256" fi -if have_cipher_algo "twofish"; then +if have_cipher_algo "TWOFISH"; then algos="$algos twofish" fi diff --git a/tests/openpgp/conventional.test b/tests/openpgp/conventional.test index 2fd273028..8b75c8a50 100755 --- a/tests/openpgp/conventional.test +++ b/tests/openpgp/conventional.test @@ -11,6 +11,10 @@ done algos="3des" +if have_cipher_algo "IDEA"; then + algos="$algos idea" +fi + if have_cipher_algo "CAST5"; then algos="$algos cast5" fi diff --git a/tests/openpgp/encrypt-dsa.test b/tests/openpgp/encrypt-dsa.test index 0c6333c21..4b9da35ff 100755 --- a/tests/openpgp/encrypt-dsa.test +++ b/tests/openpgp/encrypt-dsa.test @@ -11,23 +11,23 @@ done algos="3des" -if have_cipher_algo "idea"; then +if have_cipher_algo "IDEA"; then algos="$algos idea" fi -if have_cipher_algo "cast5"; then - algos="$algos idea" +if have_cipher_algo "CAST5"; then + algos="$algos cast5" fi -if have_cipher_algo "blowfish"; then - algos="$algos idea" +if have_cipher_algo "BLOWFISH"; then + algos="$algos blowfish" fi -if have_cipher_algo "aes"; then +if have_cipher_algo "AES"; then algos="$algos aes aes192 aes256" fi -if have_cipher_algo "twofish"; then +if have_cipher_algo "TWOFISH"; then algos="$algos twofish" fi diff --git a/tests/openpgp/encrypt.test b/tests/openpgp/encrypt.test index 44f26a17a..35f35d0e5 100755 --- a/tests/openpgp/encrypt.test +++ b/tests/openpgp/encrypt.test @@ -11,23 +11,23 @@ done algos="3des" -if have_cipher_algo "idea"; then +if have_cipher_algo "IDEA"; then algos="$algos idea" fi -if have_cipher_algo "cast5"; then - algos="$algos idea" +if have_cipher_algo "CAST5"; then + algos="$algos cast5" fi -if have_cipher_algo "blowfish"; then - algos="$algos idea" +if have_cipher_algo "BLOWFISH"; then + algos="$algos blowfish" fi -if have_cipher_algo "aes"; then +if have_cipher_algo "AES"; then algos="$algos aes aes192 aes256" fi -if have_cipher_algo "twofish"; then +if have_cipher_algo "TWOFISH"; then algos="$algos twofish" fi |