No OneTemporary
Actions

Size

30 KB

Subscribers

None

View Options

	diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
	index deed63d82..06705311d 100644
	--- a/tests/openpgp/Makefile.am
	+++ b/tests/openpgp/Makefile.am
	@@ -1,243 +1,244 @@
	# Makefile.am - For tests/openpgp
	# Copyright (C) 1998, 1999, 2000, 2001, 2003,
	# 2010 Free Software Foundation, Inc.
	#
	# This file is part of GnuPG.
	#
	# GnuPG is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by
	# the Free Software Foundation; either version 3 of the License, or
	# (at your option) any later version.
	#
	# GnuPG is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with this program; if not, see <https://www.gnu.org/licenses/>.
	# Process this file with automake to create Makefile.in


	# Programs required before we can run these tests.
	required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT) \
	../../tools/gpg-connect-agent$(EXEEXT) \
	../gpgscm/gpgscm$(EXEEXT)

	AM_CPPFLAGS = -I$(top_srcdir)/common
	include $(top_srcdir)/am/cmacros.am

	AM_CFLAGS =

	noinst_PROGRAMS = fake-pinentry

	fake_pinentry_SOURCES = fake-pinentry.c

	TMP ?= /tmp

	TESTS_ENVIRONMENT = LC_ALL=C \
	EXEEXT=$(EXEEXT) \
	PATH=../gpgscm:$(PATH) \
	TMP=$(TMP) \
	srcdir=$(abs_srcdir) \
	objdir=$(abs_top_builddir) \
	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm:$(abs_top_srcdir)/tests/openpgp

	XTESTS = \
	version.scm \
	enarmor.scm \
	mds.scm \
	decrypt.scm \
	decrypt-multifile.scm \
	decrypt-dsa.scm \
	sigs.scm \
	sigs-dsa.scm \
	encrypt.scm \
	encrypt-multifile.scm \
	encrypt-dsa.scm \
	compression.scm \
	seat.scm \
	clearsig.scm \
	encryptp.scm \
	detach.scm \
	detachm.scm \
	armsigs.scm \
	armencrypt.scm \
	armencryptp.scm \
	signencrypt.scm \
	signencrypt-dsa.scm \
	armsignencrypt.scm \
	armdetach.scm \
	armdetachm.scm \
	genkey1024.scm \
	conventional.scm \
	conventional-mdc.scm \
	multisig.scm \
	verify.scm \
	verify-multifile.scm \
	gpgv-forged-keyring.scm \
	armor.scm \
	import.scm \
	import-revocation-certificate.scm \
	ecc.scm \
	4gb-packet.scm \
	tofu.scm \
	gpgtar.scm \
	use-exact-key.scm \
	default-key.scm \
	export.scm \
	ssh-import.scm \
	ssh-export.scm \
	quick-key-manipulation.scm \
	key-selection.scm \
	+ delete-keys.scm \
	issue2015.scm \
	issue2346.scm \
	issue2417.scm \
	issue2419.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
	# dependency on 'xcheck', so this hack should also work even if
	# automake would emit the 'check' target, as adding dependencies to
	# targets is okay.
	check: xcheck

	.PHONY: xcheck
	xcheck:
	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
	run-tests.scm $(TESTFLAGS) $(XTESTS)

	TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
	plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
	plain-largeo.asc \
	pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc \
	gpg.conf.tmpl gpg-agent.conf.tmpl \
	bug537-test.data.asc bug894-test.asc \
	bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
	tofu/conflicting/1C005AF3.gpg \
	tofu/conflicting/1C005AF3-secret.gpg \
	tofu/conflicting/1C005AF3-1.txt \
	tofu/conflicting/1C005AF3-2.txt \
	tofu/conflicting/1C005AF3-3.txt \
	tofu/conflicting/1C005AF3-4.txt \
	tofu/conflicting/1C005AF3-5.txt \
	tofu/conflicting/B662E42F.gpg \
	tofu/conflicting/B662E42F-secret.gpg \
	tofu/conflicting/B662E42F-1.txt \
	tofu/conflicting/B662E42F-2.txt \
	tofu/conflicting/B662E42F-3.txt \
	tofu/conflicting/B662E42F-4.txt \
	tofu/conflicting/B662E42F-5.txt \
	tofu/conflicting/BE04EB2B.gpg \
	tofu/conflicting/BE04EB2B-secret.gpg \
	tofu/conflicting/BE04EB2B-1.txt \
	tofu/conflicting/BE04EB2B-2.txt \
	tofu/conflicting/BE04EB2B-3.txt \
	tofu/conflicting/BE04EB2B-4.txt \
	tofu/conflicting/BE04EB2B-5.txt \
	tofu/cross-sigs/EC38277E-secret.gpg \
	tofu/cross-sigs/EC38277E-1.gpg \
	tofu/cross-sigs/EC38277E-1.txt \
	tofu/cross-sigs/EC38277E-2.gpg \
	tofu/cross-sigs/EC38277E-2.txt \
	tofu/cross-sigs/EC38277E-3.txt \
	tofu/cross-sigs/871C2247-secret.gpg \
	tofu/cross-sigs/871C2247-1.gpg \
	tofu/cross-sigs/871C2247-1.txt \
	tofu/cross-sigs/871C2247-2.gpg \
	tofu/cross-sigs/871C2247-2.txt \
	tofu/cross-sigs/871C2247-3.gpg \
	tofu/cross-sigs/871C2247-3.txt \
	tofu/cross-sigs/871C2247-4.gpg \
	tofu/cross-sigs/README \
	key-selection/0.asc \
	key-selection/1.asc \
	key-selection/2.asc \
	key-selection/3.asc \
	key-selection/4.asc

	data_files = data-500 data-9000 data-32000 data-80000 plain-large

	priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.asc \
	privkeys/7E201E28B6FEB2927B321F443205F4724EBE637E.asc \
	privkeys/13FDB8809B17C5547779F9D205C45F47CE0217CE.asc \
	privkeys/343D8AF79796EE107D645A2787A9D9252F924E6F.asc \
	privkeys/8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34.asc \
	privkeys/0D6F6AD4C4C803B25470F9104E9F4E6A4CA64255.asc \
	privkeys/FD692BD59D6640A84C8422573D469F84F3B98E53.asc \
	privkeys/76F7E2B35832976B50A27A282D9B87E44577EB66.asc \
	privkeys/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD.asc \
	privkeys/0DD40284FF992CD24DC4AAC367037E066FCEE26A.asc \
	privkeys/2BC997C0B8691D41D29A4EC81CCBCF08454E4961.asc \
	privkeys/3C9D5ECA70130C2DBB1FC6AC0076BEEEC197716F.asc \
	privkeys/449E644892C951A37525654730DD32C202079926.asc \
	privkeys/58FFE844087634E62440224908BDE44BEA7EB730.asc \
	privkeys/4DF9172D6FF428C97A0E9AA96F03E8BCE3B2F188.asc \
	privkeys/9D7CD8F53F2F14C3E2177D1E9D1D11F39513A4A4.asc \
	privkeys/6E6B7ED0BD4425018FFC54F3921D5467A3AE00EB.asc \
	privkeys/C905D0AB6AE9655C5A35975939997BBF3325D6DD.asc \
	privkeys/B2BAA7144303DF19BB6FDE23781DD3FDD97918D4.asc \
	privkeys/CF60965BF51F67CF80DECE853E0D2D343468571D.asc \
	privkeys/DF00E361D34F80868D06879AC21D7A7D4E4FAD76.asc \
	privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc \
	privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc \
	privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc \
	privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc \
	privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc \
	privkeys/1E28F20E41B54C2D1234D896096495FF57E08D18.asc \
	privkeys/EB33B687EB8581AB64D04852A54453E85F3DF62D.asc \
	privkeys/C6A6390E9388CDBAD71EAEA698233FE5E04F001E.asc \
	privkeys/D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc

	sample_keys = samplekeys/README \
	samplekeys/ecc-sample-1-pub.asc \
	samplekeys/ecc-sample-2-pub.asc \
	samplekeys/ecc-sample-3-pub.asc \
	samplekeys/ecc-sample-1-sec.asc \
	samplekeys/ecc-sample-2-sec.asc \
	samplekeys/ecc-sample-3-sec.asc \
	samplekeys/eddsa-sample-1-pub.asc \
	samplekeys/eddsa-sample-1-sec.asc \
	samplekeys/dda252ebb8ebe1af-1.asc \
	samplekeys/dda252ebb8ebe1af-2.asc \
	samplekeys/whats-new-in-2.1.asc \
	samplekeys/e2e-p256-1-clr.asc \
	samplekeys/e2e-p256-1-prt.asc \
	samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc \
	samplekeys/rsa-rsa-sample-1.asc \
	samplekeys/ed25519-cv25519-sample-1.asc \
	samplekeys/silent-running.asc \
	samplekeys/ssh-dsa.key \
	samplekeys/ssh-ecdsa.key \
	samplekeys/ssh-ed25519.key \
	samplekeys/ssh-rsa.key \
	samplekeys/issue2346.gpg \
	samplekeys/authenticate-only.pub.asc \
	samplekeys/authenticate-only.sec.asc

	sample_msgs = samplemsgs/issue2419.asc \
	samplemsgs/clearsig-1-key-1.asc \
	samplemsgs/signed-1-key-1.asc \
	samplemsgs/revoke-2D727CC768697734.asc

	EXTRA_DIST = defs.scm $(XTESTS) $(TEST_FILES) \
	mkdemodirs signdemokey $(priv_keys) $(sample_keys) \
	$(sample_msgs) ChangeLog-2011 run-tests.scm \
	setup.scm shell.scm

	CLEANFILES = prepared.stamp x y yy z out err $(data_files) \
	plain-1 plain-2 plain-3 trustdb.gpg .lock .\#lk \
	*.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \
	pubring.gpg pubring.gpg~ pubring.kbx pubring.kbx~ \
	secring.gpg pubring.pkr secring.skr \
	gnupg-test.stop random_seed gpg-agent.log tofu.db \
	passphrases sshcontrol S.gpg-agent.ssh

	clean-local:
	-rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d


	# We need to depend on a couple of programs so that the tests don't
	# start before all programs are built.
	all-local: $(required_pgms)
	diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
	index ef81f9964..78670801a 100644
	--- a/tests/openpgp/defs.scm
	+++ b/tests/openpgp/defs.scm
	@@ -1,308 +1,357 @@
	;; Common definitions for the OpenPGP test scripts.
	;;
	;; Copyright (C) 2016 g10 Code GmbH
	;;
	;; This file is part of GnuPG.
	;;
	;; GnuPG is free software; you can redistribute it and/or modify
	;; it under the terms of the GNU General Public License as published by
	;; the Free Software Foundation; either version 3 of the License, or
	;; (at your option) any later version.
	;;
	;; GnuPG is distributed in the hope that it will be useful,
	;; but WITHOUT ANY WARRANTY; without even the implied warranty of
	;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	;; GNU General Public License for more details.
	;;
	;; You should have received a copy of the GNU General Public License
	;; along with this program; if not, see <http://www.gnu.org/licenses/>.

	;;
	;; Constants.
	;;

	(define usrname1 "one@example.com")
	(define usrpass1 "def")
	(define usrname2 "two@example.com")
	(define usrpass2 "")
	(define usrname3 "three@example.com")
	(define usrpass3 "")

	(define dsa-usrname1 "pgp5")
	;; we use the sub key because we do not yet have the logic to to derive
	;; the first encryption key from a keyblock (I guess) (Well of course
	;; we have this by now and the notation below will lookup the primary
	;; first and then search for the encryption subkey.)
	(define dsa-usrname2 "0xCB879DE9")

	+(define keys
	+ (package
	+ (define (new fpr grip uids subkeys)
	+ (package))
	+ (define (subkey fpr grip)
	+ (package))
	+ (define alfa (new "A0FF4590BB6122EDEF6E3C542D727CC768697734"
	+ "76F7E2B35832976B50A27A282D9B87E44577EB66"
	+ '("alfa@example.net" "alpha@example.net")
	+ (list
	+ (subkey "3B3FBC948FE59301ED629EFB6AE6D7EE46A871F8"
	+ "A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD"))))
	+ (define one (new "289B0EF1D105E124B6F626020EF77096D74C5F22"
	+ "50B2D4FA4122C212611048BC5FC31BD44393626E"
	+ '("one@example.com")
	+ (list
	+ (subkey "EB467DCA4AD7676A6A62B2ABABAB28A247BE2775"
	+ "7E201E28B6FEB2927B321F443205F4724EBE637E"))))
	+ (define two (new "C1DEBB34EA8B71009EAFA474973D50E1C40FDECF"
	+ "343D8AF79796EE107D645A2787A9D9252F924E6F"
	+ '("two@example.com")
	+ (list
	+ (subkey "CD3D0F5701CBFCACB2A4907305A37887B27907AA"
	+ "8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34"))))))
	+
	(define key-file1 "samplekeys/rsa-rsa-sample-1.asc")
	(define key-file2 "samplekeys/ed25519-cv25519-sample-1.asc")

	(define plain-files '("plain-1" "plain-2" "plain-3"))
	(define data-files '("data-500" "data-9000" "data-32000" "data-80000"))
	(define exp-files '())

	(let ((verbose (string->number (getenv "verbose"))))
	(if (number? verbose)
	(set-verbose! verbose)))

	(define (qualify executable)
	(string-append executable (getenv "EXEEXT")))

	(define (getenv' key default)
	(let ((value (getenv key)))
	(if (string=? "" value)
	default
	value)))

	(define tools
	'((gpgv "GPGV" "g10/gpgv")
	(gpg-connect-agent "GPG_CONNECT_AGENT" "tools/gpg-connect-agent")
	(gpgconf "GPGCONF" "tools/gpgconf")
	(gpg-preset-passphrase "GPG_PRESET_PASSPHRASE"
	"agent/gpg-preset-passphrase")
	(gpgtar "GPGTAR" "tools/gpgtar")
	(gpg-zip "GPGZIP" "tools/gpg-zip")
	(pinentry "PINENTRY" "tests/openpgp/fake-pinentry")))

	(define (tool-hardcoded which)
	(let ((t (assoc which tools))
	(prefix (getenv "BIN_PREFIX")))
	(getenv' (cadr t)
	(qualify (if (string=? prefix "")
	(string-append (getenv "objdir") "/" (caddr t))
	(string-append prefix "/" (basename (caddr t))))))))

	(define (gpg-conf . args)
	(let ((s (call-popen `(,(tool-hardcoded 'gpgconf) ,@args) "")))
	(map (lambda (line) (string-split line #\:))
	(string-split-newlines s))))
	(define :gc:c:name car)
	(define :gc:c:description cadr)
	(define :gc:c:pgmname caddr)

	(setenv "GNUPG_BUILDDIR" (getenv "objdir") #t)
	(define gpg-components (gpg-conf '--build-prefix (getenv "objdir")
	'--list-components))

	(define (tool which)
	(case which
	((gpg gpg-agent scdaemon gpgsm dirmngr)
	(:gc:c:pgmname (assoc (symbol->string which) gpg-components)))
	(else
	(tool-hardcoded which))))

	(define (gpg-has-option? option)
	(string-contains? (call-popen `(,(tool 'gpg) --dump-options) "")
	option))

	(define have-opt-always-trust
	(catch #f
	(call-check `(,(tool 'gpg) --gpgconf-test --always-trust))
	#t))

	(define GPG `(,(tool 'gpg) --no-permission-warning
	,@(if have-opt-always-trust '(--always-trust) '())))
	(define GPGV `(,(tool 'gpgv)))
	(define PINENTRY (tool 'pinentry))

	(define (tr:gpg input args)
	(tr:spawn input `(,@GPG --output out ,@args in)))

	(define (pipe:gpg args)
	(pipe:spawn `(,@GPG --output - ,@args -)))

	(define (gpg-with-colons args)
	(let ((s (call-popen `(,@GPG --with-colons ,@args) "")))
	(map (lambda (line) (string-split line #\:))
	(string-split-newlines s))))

	+;; Convenient accessors for the colon output.
	+(define (:type x) (string->symbol (list-ref x 0)))
	+(define (:length x) (string->number (list-ref x 2)))
	+(define (:alg x) (string->number (list-ref x 3)))
	+(define (:expire x) (list-ref x 6))
	+(define (:fpr x) (list-ref x 9))
	+(define (:cap x) (list-ref x 11))
	+
	+(define (have-public-key? key)
	+ (catch #f
	+ (pair? (filter (lambda (l) (and (equal? 'fpr (:type l))
	+ (equal? key::fpr (:fpr l))))
	+ (gpg-with-colons `(--list-keys ,key::fpr))))))
	+
	+(define (have-secret-key? key)
	+ (catch #f
	+ (pair? (filter (lambda (l) (and (equal? 'fpr (:type l))
	+ (equal? key::fpr (:fpr l))))
	+ (gpg-with-colons `(--list-secret-keys ,key::fpr))))))
	+
	+(define (have-secret-key-file? key)
	+ (file-exists? (path-join (getenv "GNUPGHOME") "private-keys-v1.d"
	+ (string-append key::grip ".key"))))
	+
	(define (get-config what)
	(string-split (caddar (gpg-with-colons `(--list-config ,what))) #\;))

	(define all-pubkey-algos (delay (get-config "pubkeyname")))
	(define all-hash-algos (delay (get-config "digestname")))
	(define all-cipher-algos (delay (get-config "ciphername")))
	(define all-compression-algos (delay (get-config "compressname")))

	(define (have-pubkey-algo? x)
	(not (not (member x (force all-pubkey-algos)))))
	(define (have-hash-algo? x)
	(not (not (member x (force all-hash-algos)))))
	(define (have-cipher-algo? x)
	(not (not (member x (force all-cipher-algos)))))

	(define (gpg-pipe args0 args1 errfd)
	(lambda (source sink)
	(let* ((p (pipe))
	(task0 (spawn-process-fd `(,@GPG ,@args0)
	source (:write-end p) errfd))
	(_ (close (:write-end p)))
	(task1 (spawn-process-fd `(,@GPG ,@args1)
	(:read-end p) sink errfd)))
	(close (:read-end p))
	(wait-processes (list GPG GPG) (list task0 task1) #t))))

	(setenv "GPG_AGENT_INFO" "" #t)
	(setenv "GNUPGHOME" (getcwd) #t)

	;;
	;; GnuPG helper.
	;;

	;; Call GPG to obtain the hash sums. Either specify an input file in
	;; ARGS, or an string in INPUT. Returns a list of (<algo>
	;; "<hashsum>") lists.
	(define (gpg-hash-string args input)
	(map
	(lambda (line)
	(let ((p (string-split line #\:)))
	(list (string->number (cadr p)) (caddr p))))
	(string-split-newlines
	(call-popen `(,@GPG --with-colons ,@args) input))))

	;; Dearmor a file.
	(define (dearmor source-name sink-name)
	(pipe:do
	(pipe:open source-name (logior O_RDONLY O_BINARY))
	(pipe:spawn `(,@GPG --dearmor))
	(pipe:write-to sink-name (logior O_WRONLY O_CREAT O_BINARY) #o600)))

	;;
	;; Support for test environment creation and teardown.
	;;

	(define (make-test-data filename size)
	(call-with-binary-output-file
	filename
	(lambda (port)
	(display (make-random-string size) port))))

	(define (create-gpghome)
	(log "Creating test environment...")

	(srandom (getpid))
	(make-test-data "random_seed" 600)

	(log "Creating configuration files")
	(for-each
	(lambda (name)
	(file-copy (in-srcdir (string-append name ".tmpl")) name)
	(let ((p (open-input-output-file name)))
	(cond
	((string=? "gpg.conf" name)
	(if have-opt-always-trust
	(display "no-auto-check-trustdb\n" p))
	(display (string-append "agent-program "
	(tool 'gpg-agent)
	"\|--debug-quick-random\n") p)
	(display "allow-weak-digest-algos\n" p))
	((string=? "gpg-agent.conf" name)
	(display (string-append "pinentry-program " PINENTRY "\n") p)))))
	'("gpg.conf" "gpg-agent.conf")))

	;; Initialize the test environment, install appropriate configuration
	;; and start the agent, without any keys.
	(define (setup-environment)
	(create-gpghome)
	(start-agent))

	(define (create-legacy-gpghome)
	(log "Creating sample data files")
	(for-each
	(lambda (size)
	(make-test-data (string-append "data-" (number->string size))
	size))
	'(500 9000 32000 80000))

	(log "Unpacking samples")
	(for-each
	(lambda (name)
	(dearmor (in-srcdir (string-append name "o.asc")) name))
	'("plain-1" "plain-2" "plain-3" "plain-large"))

	(mkdir "private-keys-v1.d" "-rwx")

	(log "Storing private keys")
	(for-each
	(lambda (name)
	(dearmor (in-srcdir (string-append "/privkeys/" name ".asc"))
	(string-append "private-keys-v1.d/" name ".key")))
	'("50B2D4FA4122C212611048BC5FC31BD44393626E"
	"7E201E28B6FEB2927B321F443205F4724EBE637E"
	"13FDB8809B17C5547779F9D205C45F47CE0217CE"
	"343D8AF79796EE107D645A2787A9D9252F924E6F"
	"8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34"
	"0D6F6AD4C4C803B25470F9104E9F4E6A4CA64255"
	"FD692BD59D6640A84C8422573D469F84F3B98E53"
	"76F7E2B35832976B50A27A282D9B87E44577EB66"
	"A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD"
	"00FE67F28A52A8AA08FFAED20AF832DA916D1985"
	"1DF48228FEFF3EC2481B106E0ACA8C465C662CC5"
	"A2832820DC9F40751BDCD375BB0945BA33EC6B4C"
	"ADE710D74409777B7729A7653373D820F67892E0"
	"CEFC51AF91F68A2904FBFF62C4F075A4785B803F"
	"1E28F20E41B54C2D1234D896096495FF57E08D18"
	"EB33B687EB8581AB64D04852A54453E85F3DF62D"
	"C6A6390E9388CDBAD71EAEA698233FE5E04F001E"
	"D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3"))

	(log "Importing public demo and test keys")
	(for-each
	(lambda (file)
	(call-check `(,@GPG --yes --import ,(in-srcdir file))))
	(list "pubdemo.asc" "pubring.asc" key-file1))

	(pipe:do
	(pipe:open (in-srcdir "pubring.pkr.asc") (logior O_RDONLY O_BINARY))
	(pipe:spawn `(,@GPG --dearmor))
	(pipe:spawn `(,@GPG --yes --import))))

	(define (preset-passphrases)
	(log "Presetting passphrases")
	;; one@example.com
	(call-check `(,(tool 'gpg-preset-passphrase)
	--preset --passphrase def
	"50B2D4FA4122C212611048BC5FC31BD44393626E"))
	(call-check `(,(tool 'gpg-preset-passphrase)
	--preset --passphrase def
	"7E201E28B6FEB2927B321F443205F4724EBE637E"))
	;; alpha@example.net
	(call-check `(,(tool 'gpg-preset-passphrase)
	--preset --passphrase abc
	"76F7E2B35832976B50A27A282D9B87E44577EB66"))
	(call-check `(,(tool 'gpg-preset-passphrase)
	--preset --passphrase abc
	"A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD")))

	;; Initialize the test environment, install appropriate configuration
	;; and start the agent, with the keys from the legacy test suite.
	(define (setup-legacy-environment)
	(create-gpghome)
	(if (member "--unpack-tarball" args)
	(begin
	(call-check `(,(tool 'gpgtar) --extract --directory=. ,(cadr args)))
	(start-agent))
	(begin
	(start-agent)
	(create-legacy-gpghome)))
	(preset-passphrases))

	;; Create the socket dir and start the agent.
	(define (start-agent)
	(log "Starting gpg-agent...")
	(atexit stop-agent)
	(catch (log "Warning: Creating socket directory failed:" (car error))
	(call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
	(call-check `(,(tool 'gpg-connect-agent) --verbose
	,(string-append "--agent-program=" (tool 'gpg-agent)
	"\|--debug-quick-random")
	/bye)))

	;; Stop the agent and remove the socket dir.
	(define (stop-agent)
	(log "Stopping gpg-agent...")
	(catch (log "Warning: Removing socket directory failed.")
	(call-popen `(,(tool 'gpgconf) --remove-socketdir) ""))
	(call-check `(,(tool 'gpg-connect-agent) --verbose --no-autostart
	killagent /bye)))
	diff --git a/tests/openpgp/delete-keys.scm b/tests/openpgp/delete-keys.scm
	new file mode 100755
	index 000000000..9a187a2f9
	--- /dev/null
	+++ b/tests/openpgp/delete-keys.scm
	@@ -0,0 +1,103 @@
	+#!/usr/bin/env gpgscm
	+
	+;; Copyright (C) 2016 g10 Code GmbH
	+;;
	+;; This file is part of GnuPG.
	+;;
	+;; GnuPG is free software; you can redistribute it and/or modify
	+;; it under the terms of the GNU General Public License as published by
	+;; the Free Software Foundation; either version 3 of the License, or
	+;; (at your option) any later version.
	+;;
	+;; GnuPG is distributed in the hope that it will be useful,
	+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
	+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	+;; GNU General Public License for more details.
	+;;
	+;; You should have received a copy of the GNU General Public License
	+;; along with this program; if not, see <http://www.gnu.org/licenses/>.
	+
	+(load (with-path "defs.scm"))
	+(setup-legacy-environment)
	+
	+(let* ((key keys::alfa)
	+ (subkey (car key::subkeys)))
	+ (assert (have-public-key? key))
	+ (assert (have-public-key? subkey))
	+ (assert (have-secret-key? key))
	+ (assert (have-secret-key-file? key))
	+ (assert (have-secret-key? subkey))
	+ (assert (have-secret-key-file? subkey))
	+
	+ ;; Firstly, delete the secret key.
	+ (call-check `(,@gpg --delete-secret-keys ,key::fpr))
	+ (assert (have-public-key? key))
	+ (assert (have-public-key? subkey))
	+ (assert (not (have-secret-key? key)))
	+ (assert (not (have-secret-key-file? key)))
	+ (assert (not (have-secret-key? subkey)))
	+ (assert (not (have-secret-key-file? subkey)))
	+
	+ ;; Now, delete the public key.
	+ (call-check `(,@gpg --delete-keys ,key::fpr))
	+ (assert (not (have-public-key? key)))
	+ (assert (not (have-public-key? subkey))))
	+
	+;; Do the same for key one, but do the subkeys separately.
	+(let* ((key keys::one)
	+ (subkey (car key::subkeys)))
	+ (assert (have-public-key? key))
	+ (assert (have-public-key? subkey))
	+ (assert (have-secret-key? key))
	+ (assert (have-secret-key-file? key))
	+ (assert (have-secret-key-file? key))
	+ (assert (have-secret-key? subkey))
	+ (assert (have-secret-key-file? subkey))
	+
	+ ;; Firstly, delete the secret subkey.
	+ (call-check `(,@gpg --delete-secret-keys ,subkey::fpr))
	+ (assert (have-public-key? key))
	+ (assert (have-public-key? subkey))
	+ ;; JW: Deleting the secret subkey also deletes the secret key.
	+ ;; XXX (assert (have-secret-key? key))
	+ ;; XXX (assert (have-secret-key-file? key))
	+ (assert (not (have-secret-key? subkey)))
	+ (assert (not (have-secret-key-file? subkey)))
	+
	+ ;; Then, delete the secret key.
	+ ;; XXX (call-check `(,@gpg --delete-secret-keys ,key::fpr))
	+ (assert (have-public-key? key))
	+ (assert (have-public-key? subkey))
	+ (assert (not (have-secret-key? key)))
	+ (assert (not (have-secret-key-file? key)))
	+ (assert (not (have-secret-key? subkey)))
	+ (assert (not (have-secret-key-file? subkey)))
	+
	+ ;; Now, delete the public subkey.
	+ (call-check `(,@gpg --delete-keys ,subkey::fpr))
	+ ;; JW: Deleting the subkey also deletes the key.
	+ ;; XXX (assert (have-public-key? key))
	+ (assert (not (have-public-key? subkey)))
	+
	+ ;; Now, delete the public key.
	+ ;; XXX (call-check `(,@gpg --delete-keys ,key::fpr))
	+ (assert (not (have-public-key? key)))
	+ (assert (not (have-public-key? subkey))))
	+
	+(let* ((key keys::two)
	+ (subkey (car key::subkeys)))
	+ (assert (have-public-key? key))
	+ (assert (have-public-key? subkey))
	+ (assert (have-secret-key? key))
	+ (assert (have-secret-key-file? key))
	+ (assert (have-secret-key? subkey))
	+ (assert (have-secret-key-file? subkey))
	+
	+ ;; Delete everything at once.
	+ (call-check `(,@gpg --delete-secret-and-public-key ,key::fpr))
	+ (assert (not (have-public-key? key)))
	+ (assert (not (have-public-key? subkey)))
	+ (assert (not (have-secret-key? key)))
	+ (assert (not (have-secret-key-file? key)))
	+ (assert (not (have-secret-key? subkey)))
	+ (assert (not (have-secret-key-file? subkey))))
	diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
	index 9b9c91914..d43f7b53a 100755
	--- a/tests/openpgp/quick-key-manipulation.scm
	+++ b/tests/openpgp/quick-key-manipulation.scm
	@@ -1,161 +1,154 @@
	#!/usr/bin/env gpgscm

	;; Copyright (C) 2016 g10 Code GmbH
	;;
	;; This file is part of GnuPG.
	;;
	;; GnuPG is free software; you can redistribute it and/or modify
	;; it under the terms of the GNU General Public License as published by
	;; the Free Software Foundation; either version 3 of the License, or
	;; (at your option) any later version.
	;;
	;; GnuPG is distributed in the hope that it will be useful,
	;; but WITHOUT ANY WARRANTY; without even the implied warranty of
	;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	;; GNU General Public License for more details.
	;;
	;; You should have received a copy of the GNU General Public License
	;; along with this program; if not, see <http://www.gnu.org/licenses/>.

	(load (with-path "defs.scm"))
	(setup-environment)

	;; XXX because of --always-trust, the trustdb is not created.
	;; Therefore, we redefine GPG without --always-trust.
	(define GPG `(,(tool 'gpg) --no-permission-warning))

	(define (exact id)
	(string-append "=" id))

	-;; Convenient accessors for the colon output.
	-(define (:length x) (string->number (list-ref x 2)))
	-(define (:alg x) (string->number (list-ref x 3)))
	-(define (:expire x) (list-ref x 6))
	-(define (:fpr x) (list-ref x 9))
	-(define (:cap x) (list-ref x 11))
	-
	(define (count-uids-of-secret-key id)
	(length (filter (lambda (x) (and (string=? "uid" (car x))
	(not (string=? "r" (cadr x)))))
	(gpg-with-colons
	`(--with-fingerprint
	--list-secret-keys ,(exact id))))))

	(define alpha "Alpha <alpha@invalid.example.net>")
	(define bravo "Bravo <bravo@invalid.example.net>")

	(define (key-data key)
	(filter (lambda (x) (or (string=? (car x) "pub")
	(string=? (car x) "sub")))
	(gpg-with-colons `(-k ,key))))

	(setenv "PINENTRY_USER_DATA" "test" #t)

	(info "Checking quick key generation...")
	(call-check `(,@GPG --quick-generate-key ,alpha))

	(define keyinfo (gpg-with-colons `(-k ,(exact alpha))))
	(define fpr (:fpr (assoc "fpr" keyinfo)))

	(assert (= 1 (count-uids-of-secret-key alpha)))
	(assert (not (equal? "" (:expire (assoc "pub" keyinfo)))))

	(info "Checking that we can add a user ID...")

	;; Make sure the key capabilities don't change when we add a user id.
	;; (See bug #2697.)
	(let ((pre (key-data (exact alpha)))
	(result (call-check `(,@GPG --quick-add-uid ,(exact alpha) ,bravo)))
	(post (key-data (exact alpha))))
	(if (not (equal? pre post))
	(begin
	(display "Key capabilities changed when adding a user id:")
	(newline)
	(display " Pre: ")
	(display pre)
	(newline)
	(display " Post: ")
	(display post)
	(newline)
	(exit 1))))

	(assert (= 2 (count-uids-of-secret-key alpha)))
	(assert (= 2 (count-uids-of-secret-key bravo)))

	(info "Checking that we can revoke a user ID...")
	(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha))

	(assert (= 1 (count-uids-of-secret-key bravo)))

	(info "Checking that we can change the expiration time.")

	(define (expiration-time id)
	(:expire (assoc "pub" (gpg-with-colons `(-k ,id)))))

	;; Remove the expiration date.
	(call-check `(,@gpg --quick-set-expire ,fpr "0"))
	(assert (equal? "" (expiration-time fpr)))

	;; Make the key expire in one year.
	(call-check `(,@gpg --quick-set-expire ,fpr "1y"))
	;; XXX It'd be nice to check that the value is right.
	(assert (not (equal? "" (expiration-time fpr))))


	;;
	;; Check --quick-addkey
	;;

	;; Get the subkeys.
	(define (get-subkeys)
	(filter (lambda (x) (equal? "sub" (car x)))
	(gpg-with-colons `(-k ,fpr))))

	;; This keeps track of the number of subkeys.
	(define count (length (get-subkeys)))

	(for-each-p
	"Checking that we can add subkeys..."
	(lambda (args check)
	(set! count (+ 1 count))
	(call-check `(,@gpg --quick-add-key ,fpr ,@args))
	(let ((subkeys (get-subkeys)))
	(assert (= count (length subkeys)))
	(if check (check (last subkeys)))))
	;; A bunch of arguments...
	'(()
	(- - -)
	(default default never)
	(rsa sign "2d")
	(rsa1024 sign "2w")
	(rsa2048 encr "2m")
	(rsa4096 sign,auth "2y")
	(future-default))
	;; ... with functions to check that the created key matches the
	;; expectations (or #f for no tests).
	(list
	#f
	#f
	(lambda (subkey)
	(assert (equal? "" (:expire subkey))))
	(lambda (subkey)
	(assert (= 1 (:alg subkey)))
	(assert (string-contains? (:cap subkey) "s"))
	(assert (not (equal? "" (:expire subkey)))))
	(lambda (subkey)
	(assert (= 1 (:alg subkey)))
	(assert (= 1024 (:length subkey)))
	(assert (string-contains? (:cap subkey) "s"))
	(assert (not (equal? "" (:expire subkey)))))
	(lambda (subkey)
	(assert (= 1 (:alg subkey)))
	(assert (= 2048 (:length subkey)))
	(assert (string-contains? (:cap subkey) "e"))
	(assert (not (equal? "" (:expire subkey)))))
	(lambda (subkey)
	(assert (= 1 (:alg subkey)))
	(assert (= 4096 (:length subkey)))
	(assert (string-contains? (:cap subkey) "s"))
	(assert (string-contains? (:cap subkey) "a"))
	(assert (not (equal? "" (:expire subkey)))))
	#f))

File Metadata

Mime Type: text/x-diff
Expires: Thu, Mar 19, 5:24 AM (1 d, 5 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 5f/4d/cdf50cb365b1487547199b270edc

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions