Imported Upstream version 2.3.0upstream/2.3.0

13 files changed, 84 insertions, 64 deletions

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 59f39e2..984b63f 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -102,9 +102,6 @@ XTESTS = \
 	issue2929.scm \
 	issue2941.scm
 
-# Temporary removed tests:
-#	trust-pgp-4.scm
-
 
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
@@ -268,7 +265,7 @@ sample_msgs = samplemsgs/clearsig-1-key-1.asc \
 
 EXTRA_DIST = defs.scm trust-pgp/common.scm $(XTESTS) $(TEST_FILES) \
 	     mkdemodirs signdemokey $(priv_keys) $(sample_keys)   \
-	     $(sample_msgs) ChangeLog-2011 run-tests.scm trust-pgp-4.scm \
+	     $(sample_msgs) ChangeLog-2011 run-tests.scm \
 	     setup.scm shell.scm all-tests.scm signed-messages.scm
 
 CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \
diff --git a/tests/openpgp/Makefile.in b/tests/openpgp/Makefile.in
index a911259..4622ca0 100644
--- a/tests/openpgp/Makefile.in
+++ b/tests/openpgp/Makefile.in
@@ -140,25 +140,25 @@ host_triplet = @host@
 @GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
 @GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
 @GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
-@GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
-@GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
-@GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+@GNUPG_TPM2DAEMON_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_TPM2DAEMON="\"@GNUPG_TPM2DAEMON_PGM@\""
+@GNUPG_DIRMNGR_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+@GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+@GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
 noinst_PROGRAMS = fake-pinentry$(EXEEXT)
 subdir = tests/openpgp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
-	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
-	$(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
-	$(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
-	$(top_srcdir)/m4/tar-ustar.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4/ksba.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/ldap.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libassuan.m4 $(top_srcdir)/m4/libgcrypt.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/npth.m4 \
+	$(top_srcdir)/m4/ntbtls.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socklen.m4 \
+	$(top_srcdir)/m4/sys_socket_h.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -269,9 +269,11 @@ GMSGFMT_015 = @GMSGFMT_015@
 GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
 GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
 GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_KEYBOXD_PGM = @GNUPG_KEYBOXD_PGM@
 GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GNUPG_TPM2DAEMON_PGM = @GNUPG_TPM2DAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
 GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
@@ -280,6 +282,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
 GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
 GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
 GREP = @GREP@
+HAVE_LIBTSS = @HAVE_LIBTSS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -307,9 +310,10 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBREADLINE = @LIBREADLINE@
 LIBS = @LIBS@
+LIBTSS_CFLAGS = @LIBTSS_CFLAGS@
+LIBTSS_LIBS = @LIBTSS_LIBS@
 LIBUSB_CPPFLAGS = @LIBUSB_CPPFLAGS@
 LIBUSB_LIBS = @LIBUSB_LIBS@
-LIBUTIL_LIBS = @LIBUTIL_LIBS@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -346,13 +350,16 @@ RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SHRED = @SHRED@
 SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
 SQLITE3_LIBS = @SQLITE3_LIBS@
 STRIP = @STRIP@
+SWTPM = @SWTPM@
+SWTPM_IOCTL = @SWTPM_IOCTL@
 SYSROOT = @SYSROOT@
 SYS_SOCKET_H = @SYS_SOCKET_H@
-TAR = @TAR@
+TPMSERVER = @TPMSERVER@
+TSSSTARTUP = @TSSSTARTUP@
+TSS_INCLUDE = @TSS_INCLUDE@
 USE_C99_CFLAGS = @USE_C99_CFLAGS@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
@@ -427,7 +434,7 @@ required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT) \
 AM_CPPFLAGS = -I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6) \
-	$(am__append_7)
+	$(am__append_7) $(am__append_8)
 @HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs = 
 
 # Under Windows we use LockFileEx.  WindowsCE provides this only on
@@ -619,7 +626,7 @@ sample_msgs = samplemsgs/clearsig-1-key-1.asc \
 
 EXTRA_DIST = defs.scm trust-pgp/common.scm $(XTESTS) $(TEST_FILES) \
 	     mkdemodirs signdemokey $(priv_keys) $(sample_keys)   \
-	     $(sample_msgs) ChangeLog-2011 run-tests.scm trust-pgp-4.scm \
+	     $(sample_msgs) ChangeLog-2011 run-tests.scm \
 	     setup.scm shell.scm all-tests.scm signed-messages.scm
 
 CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \
@@ -912,9 +919,6 @@ uninstall-am:
 @HAVE_W32_SYSTEM_TRUE@.rc.o:
 @HAVE_W32_SYSTEM_TRUE@	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
 
-# Temporary removed tests:
-#	trust-pgp-4.scm
-
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
 # the 'check' target.  For extra robustness, we merely define a
diff --git a/tests/openpgp/README b/tests/openpgp/README
index 22b7211..d85ff3f 100644
--- a/tests/openpgp/README
+++ b/tests/openpgp/README
@@ -32,7 +32,7 @@ If you want to run gpg under valgrind add with_valgrind=1.
 
 To inspect the environment in which tests are running, or to quickly
 create keys for debugging or testing, you can start a shell.  There is
-one test that doese just that:
+one test that does just that:
 
   obj $ make -C tests/openpgp check TESTS=shell.scm
   PASS: tests/openpgp/setup.scm
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
index d687fe4..046012c 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -45,34 +45,37 @@
      (string-append "--" variant))))
 
  (define setup-use-keyring (setup* "use-keyring"))
- (define setup-extended-key-format (setup* "extended-key-format"))
+ (define setup-use-keyboxd (setup* "use-keyboxd"))
 
  (define all-tests
-   (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am")
+   (parse-makefile-expand "Makefile"
 			  (lambda (filename port key) (parse-makefile port key))
 			  "XTESTS"))
 
  (define tests
    (map (lambda (name)
 	  (test::scm setup
-		     (path-join "tests" "openpgp" name)
+		     (qualify (path-join "tests" "openpgp" name) "standard")
 		     (in-srcdir "tests" "openpgp" name))) all-tests))
 
  (when *run-all-tests*
        (set! tests
 	     (append
 	      tests
+              ;; The second pass uses the keyboxd
 	      (map (lambda (name)
-		     (test::scm setup-use-keyring
+		     (test::scm setup-use-keyboxd
 				(qualify (path-join "tests" "openpgp" name)
-					 "use-keyring")
+					 "keyboxd")
 				(in-srcdir "tests" "openpgp" name)
-				"--use-keyring")) all-tests)
+				"--use-keyboxd")) all-tests)
+              ;; The third pass uses the legact pubring.gpg
 	      (map (lambda (name)
-		     (test::scm setup-extended-key-format
+		     (test::scm setup-use-keyring
 				(qualify (path-join "tests" "openpgp" name)
-					 "extended-key-format")
+					 "keyring")
 				(in-srcdir "tests" "openpgp" name)
-				"--extended-key-format")) all-tests))))
+				"--use-keyring")) all-tests)
+              )))
 
  tests)
diff --git a/tests/openpgp/armor.scm b/tests/openpgp/armor.scm
index 3c117dd..a1b0aa9 100755
--- a/tests/openpgp/armor.scm
+++ b/tests/openpgp/armor.scm
@@ -191,7 +191,7 @@ nW1ff9rt1YcTH9LiiE4EGBECAAYFAjnKLe0AEgkQ3uyMCd5BWw4HZUdQRwABAZeBAKDsa7tc
 (info "Checking armored_key_8192")
 (pipe:do
  (pipe:echo armored_key_8192)
- (pipe:gpg '(--import)))
+ (pipe:gpg '(--debug-set-iobuf-size=8 --import)))
 
 (define nopad_armored_msg "-----BEGIN PGP MESSAGE-----
 Version: GnuPG v1.4.11-svn5139 (GNU/Linux)
@@ -758,10 +758,10 @@ wg7Md81a5RI3F2FG8747t9gX
 (info "Importing alpha_seckey")
 (pipe:do
  (pipe:echo alpha_seckey)
- (pipe:gpg '(--import)))
+ (pipe:gpg '(--debug-set-iobuf-size=8 --import)))
 
 (info "Checking for bug #1179")
 (tr:do
  (tr:pipe-do
   (pipe:echo nopad_armored_msg)
-  (pipe:gpg '(--decrypt))))
+  (pipe:gpg '(--debug-set-iobuf-size=8 --decrypt))))
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index b864005..d26d383 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -192,7 +192,7 @@
 
 (define (tool which)
   (case which
-    ((gpg gpg-agent scdaemon gpgsm dirmngr)
+    ((gpg gpg-agent scdaemon gpgsm keyboxd dirmngr)
      (:gc:c:pgmname (assoc (symbol->string which) gpg-components)))
     (else
      (tool-hardcoded which))))
@@ -216,7 +216,7 @@
   (tr:spawn input `(,@GPG --output **out** ,@args **in**)))
 
 (define (pipe:gpg args)
-  (pipe:spawn `(,@GPG --output - ,@args -)))
+  (pipe:spawn `(,@GPG --output - ,@args)))
 
 (define (gpg-with-colons args)
   (let ((s (call-popen `(,@GPG --with-colons ,@args) "")))
@@ -336,6 +336,8 @@
       (create-file "pubring.gpg"))
 
   (create-file "gpg.conf"
+               ;;"log-file socket:///tmp/S.wklog"
+               ;;"verbose"
 	       "no-greeting"
 	       "no-secmem-warning"
 	       "no-permission-warning"
@@ -343,20 +345,27 @@
                "no-auto-key-retrieve"
                "no-auto-key-locate"
 	       "allow-weak-digest-algos"
-               "allow-weak-key-signatures"
+	       "allow-old-cipher-algos"
                "ignore-mdc-error"
 	       (if have-opt-always-trust
 		   "no-auto-check-trustdb" "#no-auto-check-trustdb")
 	       (string-append "agent-program "
 			      (tool 'gpg-agent)
 			      "|--debug-quick-random\n")
+	       (if (flag "--use-keyboxd" *args*)
+		   "use-keyboxd" "#use-keyboxd")
 	       )
+  (create-file "keyboxd.conf"
+               ;;"log-file socket:///tmp/S.wklog"
+               ;;"verbose"
+               ;;"debug ipc"
+	       )
+
   (create-file "gpg-agent.conf"
 	       "allow-preset-passphrase"
 	       "no-grab"
 	       "enable-ssh-support"
-	       (if (flag "--extended-key-format" *args*)
-		   "enable-extended-key-format" "#enable-extended-key-format")
+               "s2k-count 65536"
 	       (string-append "pinentry-program " (tool 'pinentry))
 	       "disable-scdaemon"))
 
@@ -505,5 +514,7 @@
   (set! gpg `(,@valgrind ,@gpg)))
 
 
+;;(set! *args* (append *args* (list "--use-keyboxd")))
+
 
 ;; end
diff --git a/tests/openpgp/gpgconf.scm b/tests/openpgp/gpgconf.scm
index 16e435d..6b70f0a 100644
--- a/tests/openpgp/gpgconf.scm
+++ b/tests/openpgp/gpgconf.scm
@@ -37,10 +37,11 @@
 		(assert (or (not (opt::value)) (string=? "" (opt::value)))))))
 	(progress ".")))))
  (lambda (name . rest) name)
- (list "keyserver" "verbose")
- (list (gpg-config 'gpg "keyserver")
-       (gpg-config 'gpg "verbose"))
- (list (lambda (i) (if (even? i) "hkp://foo.bar" "hkps://bar.baz"))
+ (list "compliance" "verbose" "quiet")
+ (list (gpg-config 'gpg "compliance")
+       (gpg-config 'gpg "verbose")
+       (gpg-config 'gpg "quiet"))
+ (list (lambda (i) (if (even? i) "rfc4880bis" "rfc4880"))
        ;; gpgconf: argument for option verbose of type 0 (none) must
        ;; be positive
        (lambda (i) (+ 1 i))
diff --git a/tests/openpgp/gpgv.scm b/tests/openpgp/gpgv.scm
index 819d15f..398f050 100755
--- a/tests/openpgp/gpgv.scm
+++ b/tests/openpgp/gpgv.scm
@@ -21,7 +21,16 @@
 (load (in-srcdir "tests" "openpgp" "signed-messages.scm"))
 (setup-legacy-environment)
 
-(define keyring (if (file-exists? "pubring.kbx") "pubring.kbx" "pubring.gpg"))
+;; In keyboxd mode we need to export all keys first
+(if (flag "--use-keyboxd" *args*)
+    (call-check `(,@GPG --quiet --yes
+                        --export --yes --batch -o mytrustedkeys.gpg)))
+
+(define keyring (if (flag "--use-keyboxd" *args*)
+                    "mytrustedkeys.gpg"
+                    (if (file-exists? "pubring.kbx")
+                        "pubring.kbx"
+                        "pubring.gpg")))
 
 ;;
 ;; Two simple tests to check that verify fails for bad input data
@@ -66,6 +75,9 @@
 ;; Need to import the ed25519 sample key used for the next two tests.
 (call-check `(,@gpg --quiet --yes
 		    --import ,(in-srcdir "tests" "openpgp" key-file2)))
+(if (flag "--use-keyboxd" *args*)
+    (call-check `(,@GPG --quiet --yes
+                        --export --yes --batch -o mytrustedkeys.gpg)))
 (for-each-p
  "Checking that a valid Ed25519 signature is verified as such"
  (lambda (armored-file)
diff --git a/tests/openpgp/issue2419.scm b/tests/openpgp/issue2419.scm
index 641fb32..1bfabb0 100755
--- a/tests/openpgp/issue2419.scm
+++ b/tests/openpgp/issue2419.scm
@@ -25,5 +25,5 @@
  (onebyte)
  (dearmor (in-srcdir "tests" "openpgp" "samplemsgs/issue2419.asc") onebyte)
  (catch (assert (string-contains? (car *error*) "invalid packet"))
-	(call-popen `(,@GPG --list-packets ,onebyte) "")
+	(call-popen `(,@GPG --log-file - --list-packets ,onebyte) "")
 	(fail "Expected an error but got none")))
diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
index 6cdf19a..2023f17 100755
--- a/tests/openpgp/quick-key-manipulation.scm
+++ b/tests/openpgp/quick-key-manipulation.scm
@@ -34,8 +34,6 @@
 (define alpha "Alpha <alpha@invalid.example.net>")
 (define bravo "Bravo <bravo@invalid.example.net>")
 (define charlie "Charlie <charlie@invalid.example.net>")
-(define delta "Delta <delta@invalid.example.net>")
-(define deltahash "359DC5EFF98B14A58AAA615C638E8BD0CEDA537B")
 
 (define (key-data key)
   (filter (lambda (x) (or (string=? (car x) "pub")
@@ -89,10 +87,6 @@
 (info "Checking that we can revoke a user ID...")
 (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha))
 
-(info "Checking that we can revoke a user ID by its hash...")
-(call-check `(,@GPG --quick-add-uid ,(exact bravo) ,delta))
-(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,deltahash))
-
 (info "Checking that we get an error revoking a non-existent user ID.")
 (catch '()
        (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,charlie))
diff --git a/tests/openpgp/samplekeys/README b/tests/openpgp/samplekeys/README
index f8a7e9e..74635c7 100644
--- a/tests/openpgp/samplekeys/README
+++ b/tests/openpgp/samplekeys/README
@@ -20,6 +20,8 @@ ed25519-cv25519-sample-1.asc  Ed25519+CV25519 sample key (no passphrase)
 silent-running.asc     Collection of sample secret keys (no passphrases)
 rsa-primary-auth-only.pub.asc  rsa2408 primary only, usage: cert,auth
 rsa-primary-auth-only.sec.asc  Ditto but the secret keyblock.
+v5-sample-1-pub.asc    A version 5 key (ed25519/cert,sign,v5+cv25519/v5)
+v5-sample-1-sec.asc    Ditto, but the secret keyblock (unprotected).
 
 
 Notes:
diff --git a/tests/openpgp/setup.scm b/tests/openpgp/setup.scm
index 22c89a3..b92dc07 100755
--- a/tests/openpgp/setup.scm
+++ b/tests/openpgp/setup.scm
@@ -38,7 +38,7 @@
       (for-each
        (lambda (t)
 	 (log (pad t 25) (tool t)))
-       '(gpgconf gpg gpg-agent scdaemon gpgsm dirmngr gpg-connect-agent
+       '(gpgconf gpg gpg-agent scdaemon gpgsm keyboxd dirmngr gpg-connect-agent
 		 gpg-preset-passphrase gpgtar pinentry)))
 
 (setenv "GNUPGHOME" (getcwd) #t)
diff --git a/tests/openpgp/verify.scm b/tests/openpgp/verify.scm
index b4dd49b..afa6b6a 100755
--- a/tests/openpgp/verify.scm
+++ b/tests/openpgp/verify.scm
@@ -51,16 +51,12 @@
  '(msg_ols_asc msg_cols_asc msg_sl_asc msg_oolss_asc msg_cls_asc msg_clss_asc))
 
 (for-each-p
- "Checking that a valid signature over multiple messages is verified as such"
+ "Checking that a valid signature over multiple messages is rejected"
  (lambda (armored-file)
-   (pipe:do
-    (pipe:echo (eval armored-file (current-environment)))
-    (pipe:spawn `(,@GPG --verify --allow-multiple-messages)))
    (catch '()
-	  (pipe:do
-	   (pipe:defer (lambda (sink)
-			 (display armored-file (fdopen sink "w"))))
-	   (pipe:spawn `(,@GPG --verify)))
+          (pipe:do
+           (pipe:echo (eval armored-file (current-environment)))
+           (pipe:spawn `(,@GPG --verify)))
 	  (fail "verification succeeded but should not")))
  '(msg_olsols_asc_multiple msg_clsclss_asc_multiple))