[svn] GnuPG - r4490 - branches/STABLE-BRANCH-1-4/checks

[svn author dshaw]

Author: dshaw
Date: 2007-05-02 19:20:45 +0200 (Wed, 02 May 2007)
New Revision: 4490

Modified:
   branches/STABLE-BRANCH-1-4/checks/ChangeLog
   branches/STABLE-BRANCH-1-4/checks/conventional-mdc.test
   branches/STABLE-BRANCH-1-4/checks/conventional.test
   branches/STABLE-BRANCH-1-4/checks/encrypt-dsa.test
   branches/STABLE-BRANCH-1-4/checks/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: branches/STABLE-BRANCH-1-4/checks/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/ChangeLog	2007-04-28 16:04:44 UTC (rev 4489)
+++ branches/STABLE-BRANCH-1-4/checks/ChangeLog	2007-05-02 17:20:45 UTC (rev 4490)
@@ -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>
 
 	* verify.test: Use --allow-multiple-messages instead of

Modified: branches/STABLE-BRANCH-1-4/checks/conventional-mdc.test
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/conventional-mdc.test	2007-04-28 16:04:44 UTC (rev 4489)
+++ branches/STABLE-BRANCH-1-4/checks/conventional-mdc.test	2007-05-02 17:20:45 UTC (rev 4490)
@@ -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: branches/STABLE-BRANCH-1-4/checks/conventional.test
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/conventional.test	2007-04-28 16:04:44 UTC (rev 4489)
+++ branches/STABLE-BRANCH-1-4/checks/conventional.test	2007-05-02 17:20:45 UTC (rev 4490)
@@ -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: branches/STABLE-BRANCH-1-4/checks/encrypt-dsa.test
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/encrypt-dsa.test	2007-04-28 16:04:44 UTC (rev 4489)
+++ branches/STABLE-BRANCH-1-4/checks/encrypt-dsa.test	2007-05-02 17:20:45 UTC (rev 4490)
@@ -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: branches/STABLE-BRANCH-1-4/checks/encrypt.test
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/encrypt.test	2007-04-28 16:04:44 UTC (rev 4489)
+++ branches/STABLE-BRANCH-1-4/checks/encrypt.test	2007-05-02 17:20:45 UTC (rev 4490)
@@ -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