From ad9befab12376b3a49cde410996ac9f0013d0871 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 17 Nov 2015 12:55:42 +0100 Subject: gpg: Correctly handle keyblocks followed by legacy keys. * g10/keyring.c (keyring_get_keyblock): If we encounter a legacy packet after already having some non-legacy packets, then treat the legacy packet as a keyblock boundary, not as part of the keyblock. * g10/t-keydb-get-keyblock.c: New file. * g10/t-keydb-get-keyblock.gpg: New file. * g10/Makefile.am (EXTRA_DIST): Add t-keydb-get-keyblock.gpg. (module_tests): Add t-keydb-get-keyblock. (t_keydb_get_keyblock_SOURCES): New variable. (t_keydb_get_keyblock_LDADD): Likewise. -- Signed-off-by: Neal H. Walfield GnuPG-bug-id: 2151 --- g10/t-keydb-get-keyblock.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 g10/t-keydb-get-keyblock.c (limited to 'g10/t-keydb-get-keyblock.c') diff --git a/g10/t-keydb-get-keyblock.c b/g10/t-keydb-get-keyblock.c new file mode 100644 index 000000000..2fbcb73e3 --- /dev/null +++ b/g10/t-keydb-get-keyblock.c @@ -0,0 +1,60 @@ +/* t-keydb-get-keyblock.c - Tests for keydb.c. + * Copyright (C) 2015 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 . + */ + +#include "test.c" + +#include "keydb.h" + +static void +do_test (int argc, char *argv[]) +{ + char *fname; + int rc; + KEYDB_HANDLE hd1; + KEYDB_SEARCH_DESC desc1; + KBNODE kb1; + + (void) argc; + (void) argv; + + /* t-keydb-get-keyblock.gpg contains two keys: a modern key followed + by a legacy key. If we get the keyblock for the modern key, we + shouldn't get + + - */ + fname = prepend_srcdir ("t-keydb-get-keyblock.gpg"); + rc = keydb_add_resource (fname, 0); + test_free (fname); + if (rc) + ABORT ("Failed to open keyring."); + + hd1 = keydb_new (); + + rc = classify_user_id ("8061 5870 F5BA D690 3336 86D0 F2AD 85AC 1E42 B367", + &desc1, 0); + if (rc) + ABORT ("Failed to convert fingerprint for 1E42B367"); + + rc = keydb_search (hd1, &desc1, 1, NULL); + if (rc) + ABORT ("Failed to lookup key associated with 1E42B367"); + + rc = keydb_get_keyblock (hd1, &kb1); + TEST_P ("", ! rc); +} -- cgit v1.2.3