security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: enable OpenPGP export of cleartext keys with comments

Browse Source 
* g10/export.c (cleartext_secret_key_to_openpgp): ignore trailing
sublists in private-key S-expression.

--

When gpg-agent learns about a private key from its ssh-agent
interface, it stores its S-expression with the comment attached.  The
export mechanism for OpenPGP keys already in cleartext was too brittle
because it would choke on these comments.  This change lets it ignore
any additional trailing sublists.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Gnupg-Bug-Id: 4490
This commit is contained in:
Daniel Kahn Gillmor 2019-05-13 21:22:38 -04:00
parent 484d6ba589
commit 29adca88f5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/export.c
View File

@ -596,7 +596,10 @@ cleartext_secret_key_to_openpgp (gcry_sexp_t s_key, PKT_public_key *pk)
top_list = gcry_sexp_find_token (s_key, "private-key", 0); top_list = gcry_sexp_find_token (s_key, "private-key", 0);
if (!top_list) if (!top_list)
goto bad_seckey; goto bad_seckey;
if (gcry_sexp_length(top_list) != 2)
/* ignore all S-expression after the first sublist -- we assume that
they are comments or otherwise irrelevant to OpenPGP */
if (gcry_sexp_length(top_list) < 2)
goto bad_seckey; goto bad_seckey;
key = gcry_sexp_nth (top_list, 1); key = gcry_sexp_nth (top_list, 1);
if (!key) if (!key)