[git] GnuPG - branch, master, updated. gnupg-2.1.11-126-g02cf135

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  02cf1357dd5ee34a57371f55b9d312b8b9e3a7e8 (commit)
       via  71040f48ef6bf88e88cb05c2aee8a77d682b2a33 (commit)
      from  02ef6bb105bb2793115ea5e7868d722bf0aea0a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 02cf1357dd5ee34a57371f55b9d312b8b9e3a7e8
Author: Justus Winter <justus at g10code.com>
Date:   Thu Apr 7 13:55:42 2016 +0200

    g10: Fix exporting secret keys of certain sizes.
    
    * g10/build-packet.c (do_key): Do not use the header length specified
    by the public key packet from the keyring, but let 'write_header2'
    compute the required length.
    --
    Specifically exporting RSA keys of length 1024 failed, as the encoded
    public key packet requires 141 bytes a length that fits into one byte,
    but the secret key is significantly larger, making the export fail.
    
    GnuPG-bug-id: 2307
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/build-packet.c b/g10/build-packet.c
index 40c466b..e244bda 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -486,7 +486,7 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
       /* Build the header of the packet - which we must do after
          writing all the other stuff, so that we know the length of
          the packet */
-      write_header2 (out, ctb, iobuf_get_temp_length(a), pk->hdrbytes);
+      write_header2 (out, ctb, iobuf_get_temp_length(a), 0);
        /* And finally write it out to the real stream. */
       err = iobuf_write_temp (out, a);
     }

commit 71040f48ef6bf88e88cb05c2aee8a77d682b2a33
Author: Justus Winter <justus at g10code.com>
Date:   Thu Apr 7 13:51:26 2016 +0200

    g10: Fix typo.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/packet.h b/g10/packet.h
index c1aaedb..194c134 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -327,7 +327,7 @@ struct seckey_info
 /****************
  * The in-memory representation of a public key (RFC 4880, Section
  * 5.5).  Note: this structure contains significantly more information
- * thatn is contained in an OpenPGP public key packet.  This
+ * than is contained in an OpenPGP public key packet.  This
  * information is derived from the self-signed signatures (by
  * merge_keys_and_selfsig()) and is ignored when serializing the
  * packet.  The fields that are actually written out when serializing

-----------------------------------------------------------------------

Summary of changes:
 g10/build-packet.c | 2 +-
 g10/packet.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org