security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

g10: Properly ignore legacy keys in the keyring cache.

Browse source 
* g10/keyring.c (keyring_rebuild_cache): Properly ignore legacy keys
in the keyring cache.
* tests/migrations/Makefile.am (TESTS): Add new test.
* tests/migrations/common.scm (GPG-no-batch): New variable.
(run-test): New function.
* tests/migrations/issue2276.scm: New file.
* tests/migrations/issue2276.tar.asc: Likewise.

GnuPG-bug-id: 2276
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-07-22 13:29:26 +02:00
parent 45bb9a2a46
commit d9839c9d30
5 changed files with 376 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/migrations/common.scm
View file

@ -30,6 +30,9 @@
--no-secmem-warning --batch
,(string-append "--agent-program=" GPG-AGENT
"|--debug-quick-random")))
(define GPG-no-batch
(filter (lambda (arg) (not (equal? arg '--batch))) GPG))
(define GPGTAR (qualify (string-append (getcwd) "/../../tools/gpgtar")))
(define (untar-armored source-name)
@ -37,3 +40,13 @@
(pipe:open source-name (logior O_RDONLY O_BINARY))
(pipe:spawn `(,@GPG --dearmor))
(pipe:spawn `(,GPGTAR --extract --directory=. -))))
(define (run-test message src-tarball test)
(catch (skip "gpgtar not built")
(call-check `(,GPGTAR --help)))
(with-temporary-working-directory
(info message)
(untar-armored src-tarball)
(setenv "GNUPGHOME" (getcwd) #t)
(test (getcwd))))