Author: dshaw
Date: 2007-05-03 02:54:28 +0200 (Thu, 03 May 2007)
New Revision: 4491
Modified:
trunk/tests/openpgp/ChangeLog
trunk/tests/openpgp/conventional-mdc.test
trunk/tests/openpgp/conventional.test
trunk/tests/openpgp/encrypt-dsa.test
trunk/tests/openpgp/encrypt.test
Log:
* conventional.test, encrypt.test, encrypt-dsa.test,
conventional-mdc.test: Fix some broken tests that were only testing
3DES instead of all available ciphers.
Modified: trunk/tests/openpgp/ChangeLog
===================================================================
--- trunk/tests/openpgp/ChangeLog 2007-05-02 17:20:45 UTC (rev 4490)
+++ trunk/tests/openpgp/ChangeLog 2007-05-03 00:54:28 UTC (rev 4491)
@@ -1,3 +1,9 @@
+2007-05-02 David Shaw <dshaw at 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 at jabberwocky.com> (wk)
* verify.test: Use --allow-multiple-messages instead of
Modified: trunk/tests/openpgp/conventional-mdc.test
===================================================================
--- trunk/tests/openpgp/conventional-mdc.test 2007-05-02 17:20:45 UTC (rev 4490)
+++ trunk/tests/openpgp/conventional-mdc.test 2007-05-03 00:54:28 UTC (rev 4491)
@@ -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
Modified: trunk/tests/openpgp/conventional.test
===================================================================
--- trunk/tests/openpgp/conventional.test 2007-05-02 17:20:45 UTC (rev 4490)
+++ trunk/tests/openpgp/conventional.test 2007-05-03 00:54:28 UTC (rev 4491)
@@ -11,6 +11,10 @@
algos="3des"
+if have_cipher_algo "IDEA"; then
+ algos="$algos idea"
+fi
+
if have_cipher_algo "CAST5"; then
algos="$algos cast5"
fi
Modified: trunk/tests/openpgp/encrypt-dsa.test
===================================================================
--- trunk/tests/openpgp/encrypt-dsa.test 2007-05-02 17:20:45 UTC (rev 4490)
+++ trunk/tests/openpgp/encrypt-dsa.test 2007-05-03 00:54:28 UTC (rev 4491)
@@ -11,23 +11,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
Modified: trunk/tests/openpgp/encrypt.test
===================================================================
--- trunk/tests/openpgp/encrypt.test 2007-05-02 17:20:45 UTC (rev 4490)
+++ trunk/tests/openpgp/encrypt.test 2007-05-03 00:54:28 UTC (rev 4491)
@@ -11,23 +11,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