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

[svn author dshaw]

Author: dshaw
Date: 2010-10-20 04:27:25 +0200 (Wed, 20 Oct 2010)
New Revision: 5459

Modified:
   branches/STABLE-BRANCH-1-4/checks/ChangeLog
   branches/STABLE-BRANCH-1-4/checks/armor.test
Log:
* armor.test: Tweak the bug 1179 test to only run if Twofish is
included in the program.  The sample message requires Twofish.


Modified: branches/STABLE-BRANCH-1-4/checks/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/ChangeLog	2010-10-18 18:19:45 UTC (rev 5458)
+++ branches/STABLE-BRANCH-1-4/checks/ChangeLog	2010-10-20 02:27:25 UTC (rev 5459)
@@ -1,3 +1,8 @@
+2010-10-19  David Shaw  <dshaw at jabberwocky.com>
+
+	* armor.test: Tweak the bug 1179 test to only run if Twofish is
+	included in the program.  The sample message requires Twofish.
+
 2010-05-12  Werner Koch  <wk at g10code.com>
 
 	* armor.test: Extend to test bug 1179.

Modified: branches/STABLE-BRANCH-1-4/checks/armor.test
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/armor.test	2010-10-18 18:19:45 UTC (rev 5458)
+++ branches/STABLE-BRANCH-1-4/checks/armor.test	2010-10-20 02:27:25 UTC (rev 5459)
@@ -739,16 +739,20 @@
 # armor filter gpg swalled the CRC line and passed the '-----END...'
 # line on to the decryption layer.
 
-i=alpha_seckey
-info "importing: $i"
-eval "(IFS=; echo \"\$$i\")" >x
-$GPG --import x || true
+# Can only perform this test if we have Twofish
 
-i=nopad_armored_msg
-info "checking: $i"
-eval "(IFS=; echo \"\$$i\")" >x
-if echo "abc" | $GPG  --passphrase-fd 0 -o - x > /dev/null ; then
-   :
-else
-   error "bug#1179 is back in town"
+if $GPG --with-colons --list-config ciphername | grep TWOFISH > /dev/null 2>/dev/null ; then
+    i=alpha_seckey
+    info "importing: $i"
+    eval "(IFS=; echo \"\$$i\")" >x
+    $GPG --import x || true
+
+    i=nopad_armored_msg
+    info "checking: $i"
+    eval "(IFS=; echo \"\$$i\")" >x
+    if echo "abc" | $GPG  --passphrase-fd 0 -o - x > /dev/null ; then
+	:
+    else
+	error "bug#1179 is back in town"
+    fi
 fi