[Pkg-gnupg-commit] [gnupg2] 05/09: more bugfix patches from upstream
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Thu May 11 02:43:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit 573453d4d61452ac65a5d5e8a4445d8ca8a3ad5f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed May 10 09:41:54 2017 -0400
more bugfix patches from upstream
---
debian/patches/0056-doc-Fix-documentation.patch | 26 +++++++
debian/patches/0057-gpg-Fix-typo.patch | 25 +++++++
...g-Properly-account-for-ring-trust-packets.patch | 83 ++++++++++++++++++++++
debian/patches/series | 3 +
4 files changed, 137 insertions(+)
diff --git a/debian/patches/0056-doc-Fix-documentation.patch b/debian/patches/0056-doc-Fix-documentation.patch
new file mode 100644
index 0000000..699e955
--- /dev/null
+++ b/debian/patches/0056-doc-Fix-documentation.patch
@@ -0,0 +1,26 @@
+From: Justus Winter <justus at g10code.com>
+Date: Mon, 8 May 2017 12:18:19 +0200
+Subject: doc: Fix documentation.
+
+--
+Fixes-commit: da4db172f6f8fb254b770e59770c531a488e2400
+Signed-off-by: Justus Winter <justus at g10code.com>
+
+(cherry picked from commit 6fdeef5b61c814ba0e475bfc36655e4fe69d7c41)
+---
+ doc/gpg.texi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/gpg.texi b/doc/gpg.texi
+index aa55cb8..1a0ea55 100644
+--- a/doc/gpg.texi
++++ b/doc/gpg.texi
+@@ -393,7 +393,7 @@ functionality is also available as the subcommand "passwd" with the
+ @option{--edit-card} command.
+
+ @item --delete-keys @code{name}
+- at itemx --delete-keys @code{name}
++ at opindex delete-keys
+ Remove key from the public keyring. In batch mode either @option{--yes} is
+ required or the key must be specified by fingerprint. This is a
+ safeguard against accidental deletion of multiple keys.
diff --git a/debian/patches/0057-gpg-Fix-typo.patch b/debian/patches/0057-gpg-Fix-typo.patch
new file mode 100644
index 0000000..c2bdce9
--- /dev/null
+++ b/debian/patches/0057-gpg-Fix-typo.patch
@@ -0,0 +1,25 @@
+From: Justus Winter <justus at g10code.com>
+Date: Mon, 8 May 2017 13:52:39 +0200
+Subject: gpg: Fix typo.
+
+--
+Signed-off-by: Justus Winter <justus at g10code.com>
+
+(cherry picked from commit 692208fd6c1547cc7dd2062a1d1c9499bc0a8be4)
+---
+ g10/packet.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/g10/packet.h b/g10/packet.h
+index 3cb1e3b..78486d7 100644
+--- a/g10/packet.h
++++ b/g10/packet.h
+@@ -623,7 +623,7 @@ struct parse_packet_ctx_s
+ iobuf_t inp; /* The input stream with the packets. */
+ struct packet_struct last_pkt; /* The last parsed packet. */
+ int free_last_pkt; /* Indicates that LAST_PKT must be freed. */
+- int skip_meta; /* Skip right trust packets. */
++ int skip_meta; /* Skip ring trust packets. */
+ };
+ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+
diff --git a/debian/patches/0058-gpg-Properly-account-for-ring-trust-packets.patch b/debian/patches/0058-gpg-Properly-account-for-ring-trust-packets.patch
new file mode 100644
index 0000000..3d6db10
--- /dev/null
+++ b/debian/patches/0058-gpg-Properly-account-for-ring-trust-packets.patch
@@ -0,0 +1,83 @@
+From: Justus Winter <justus at g10code.com>
+Date: Mon, 8 May 2017 14:24:00 +0200
+Subject: gpg: Properly account for ring trust packets.
+
+* g10/keyring.c (keyring_get_keyblock): Use the parser's packet count
+instead of counting ourself.
+* g10/packet.h (struct parse_packet_ctx_s): New field
+'n_parsed_packets'.
+(init_parse_packet): Initialize new field.
+* g10/parse-packet.c (parse): Count packets.
+--
+
+The 'keyring' keystore depends on the number of packets for delete and
+update operations. With the rework of the ring trust packets, the
+trust packets were no longer properly accounted for leading to keyring
+corruptions.
+
+The 'keybox' store was not affected.
+
+GnuPG-bug-id: 3123
+GnuPG-bug-id: 3135
+GnuPG-bug-id: 3144
+Fixes-commit: a8895c99a7d0750132477d80cd66caaf3a709113
+Signed-off-by: Justus Winter <justus at g10code.com>
+(cherry picked from commit 22739433e98be80e46fe7d01d52a9627c1aebaae)
+---
+ g10/keyring.c | 4 ++--
+ g10/packet.h | 2 ++
+ g10/parse-packet.c | 3 +++
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/g10/keyring.c b/g10/keyring.c
+index e223f0f..50f1b82 100644
+--- a/g10/keyring.c
++++ b/g10/keyring.c
+@@ -409,11 +409,11 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
+ pkt = xmalloc (sizeof *pkt);
+ init_packet (pkt);
+ init_parse_packet (&parsectx, a);
+- hd->found.n_packets = 0;;
++ hd->found.n_packets = 0;
+ lastnode = NULL;
+ save_mode = set_packet_list_mode(0);
+ while ((rc=parse_packet (&parsectx, pkt)) != -1) {
+- hd->found.n_packets++;
++ hd->found.n_packets = parsectx.n_parsed_packets;
+ if (gpg_err_code (rc) == GPG_ERR_UNKNOWN_PACKET) {
+ free_packet (pkt, &parsectx);
+ init_packet (pkt);
+diff --git a/g10/packet.h b/g10/packet.h
+index 78486d7..6a98db9 100644
+--- a/g10/packet.h
++++ b/g10/packet.h
+@@ -624,6 +624,7 @@ struct parse_packet_ctx_s
+ struct packet_struct last_pkt; /* The last parsed packet. */
+ int free_last_pkt; /* Indicates that LAST_PKT must be freed. */
+ int skip_meta; /* Skip ring trust packets. */
++ unsigned int n_parsed_packets; /* Number of parsed packets. */
+ };
+ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+
+@@ -633,6 +634,7 @@ typedef struct parse_packet_ctx_s *parse_packet_ctx_t;
+ (a)->last_pkt.pkt.generic= NULL;\
+ (a)->free_last_pkt = 0; \
+ (a)->skip_meta = 0; \
++ (a)->n_parsed_packets = 0; \
+ } while (0)
+
+ #define deinit_parse_packet(a) do { \
+diff --git a/g10/parse-packet.c b/g10/parse-packet.c
+index fa44f83..dbb7af8 100644
+--- a/g10/parse-packet.c
++++ b/g10/parse-packet.c
+@@ -764,6 +764,9 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
+ partial? (new_ctb ? " partial" : " indeterminate") :"",
+ new_ctb? " new-ctb":"");
+
++ /* Count it. */
++ ctx->n_parsed_packets++;
++
+ pkt->pkttype = pkttype;
+ rc = GPG_ERR_UNKNOWN_PACKET; /* default error */
+ switch (pkttype)
diff --git a/debian/patches/series b/debian/patches/series
index a99ffe1..ce93f06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,6 @@ skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-avai
0052-dirmngr-Fix-final-close-of-LISTEN_FD.patch
0053-g10-invalidate-the-fd-cache-for-keyring.patch
0054-dirmngr-Fix-aliasing-problem-in-dns.c.patch
+0056-doc-Fix-documentation.patch
+0057-gpg-Fix-typo.patch
+0058-gpg-Properly-account-for-ring-trust-packets.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list