* conventional.test, encrypt.test, encrypt-dsa.test,
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 3 May 2007 00:54:28 +0000 (00:54 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 3 May 2007 00:54:28 +0000 (00:54 +0000)
conventional-mdc.test: Fix some broken tests that were only testing
3DES instead of all available ciphers.

tests/openpgp/ChangeLog
tests/openpgp/conventional-mdc.test
tests/openpgp/conventional.test
tests/openpgp/encrypt-dsa.test
tests/openpgp/encrypt.test

index c4179d4..58b95cf 100644 (file)
@@ -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
 2007-03-04  David Shaw  <dshaw@jabberwocky.com>  (wk)
 
        * verify.test: Use --allow-multiple-messages instead of
index 95a6ba4..b3cf10b 100755 (executable)
@@ -4,23 +4,23 @@
 
 algos="3des"
 
 
 algos="3des"
 
-if have_cipher_algo "idea"; then
+if have_cipher_algo "IDEA"; then
    algos="$algos idea"
 fi
 
    algos="$algos idea"
 fi
 
-if have_cipher_algo "cast5"; then
-   algos="$algos idea"
+if have_cipher_algo "CAST5"; then
+   algos="$algos cast5"
 fi
 
 fi
 
-if have_cipher_algo "blowfish"; then
-   algos="$algos idea"
+if have_cipher_algo "BLOWFISH"; then
+   algos="$algos blowfish"
 fi
 
 fi
 
-if have_cipher_algo "aes"; then
+if have_cipher_algo "AES"; then
    algos="$algos aes aes192 aes256"
 fi
 
    algos="$algos aes aes192 aes256"
 fi
 
-if have_cipher_algo "twofish"; then
+if have_cipher_algo "TWOFISH"; then
    algos="$algos twofish"
 fi
 
    algos="$algos twofish"
 fi
 
index 2fd2730..8b75c8a 100755 (executable)
@@ -11,6 +11,10 @@ done
 
 algos="3des"
 
 
 algos="3des"
 
+if have_cipher_algo "IDEA"; then
+   algos="$algos idea"
+fi
+
 if have_cipher_algo "CAST5"; then
    algos="$algos cast5"
 fi
 if have_cipher_algo "CAST5"; then
    algos="$algos cast5"
 fi
index 0c6333c..4b9da35 100755 (executable)
@@ -11,23 +11,23 @@ done
 
 algos="3des"
 
 
 algos="3des"
 
-if have_cipher_algo "idea"; then
+if have_cipher_algo "IDEA"; then
    algos="$algos idea"
 fi
 
    algos="$algos idea"
 fi
 
-if have_cipher_algo "cast5"; then
-   algos="$algos idea"
+if have_cipher_algo "CAST5"; then
+   algos="$algos cast5"
 fi
 
 fi
 
-if have_cipher_algo "blowfish"; then
-   algos="$algos idea"
+if have_cipher_algo "BLOWFISH"; then
+   algos="$algos blowfish"
 fi
 
 fi
 
-if have_cipher_algo "aes"; then
+if have_cipher_algo "AES"; then
    algos="$algos aes aes192 aes256"
 fi
 
    algos="$algos aes aes192 aes256"
 fi
 
-if have_cipher_algo "twofish"; then
+if have_cipher_algo "TWOFISH"; then
    algos="$algos twofish"
 fi
 
    algos="$algos twofish"
 fi
 
index 44f26a1..35f35d0 100755 (executable)
@@ -11,23 +11,23 @@ done
 
 algos="3des"
 
 
 algos="3des"
 
-if have_cipher_algo "idea"; then
+if have_cipher_algo "IDEA"; then
    algos="$algos idea"
 fi
 
    algos="$algos idea"
 fi
 
-if have_cipher_algo "cast5"; then
-   algos="$algos idea"
+if have_cipher_algo "CAST5"; then
+   algos="$algos cast5"
 fi
 
 fi
 
-if have_cipher_algo "blowfish"; then
-   algos="$algos idea"
+if have_cipher_algo "BLOWFISH"; then
+   algos="$algos blowfish"
 fi
 
 fi
 
-if have_cipher_algo "aes"; then
+if have_cipher_algo "AES"; then
    algos="$algos aes aes192 aes256"
 fi
 
    algos="$algos aes aes192 aes256"
 fi
 
-if have_cipher_algo "twofish"; then
+if have_cipher_algo "TWOFISH"; then
    algos="$algos twofish"
 fi
 
    algos="$algos twofish"
 fi