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

agent: New option --enable-extended-key-format.

Browse source 
* agent/gpg-agent.c (oEnableExtendedKeyFormat): New const.
(opts): New option --enable-extended-key-format.
(parse_rereadable_options): Set option
* agent/findkey.c (write_extended_private_key): Add arg 'update'.
(agent_write_private_key): Implement new option.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-03-24 10:30:17 +01:00
parent 6fab7bba87
commit 2c237c1362
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 52 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

44
agent/findkey.c
View file

@ -52,23 +52,38 @@ struct try_unprotect_arg_s
};
/* Note: Ownership of FNAME and FP are moved to this function. */
static gpg_error_t
write_extended_private_key (char *fname, estream_t fp,
write_extended_private_key (char *fname, estream_t fp, int update,
const void *buf, size_t len)
{
gpg_error_t err;
nvc_t pk = NULL;
gcry_sexp_t key = NULL;
int remove = 0;
int line;
err = nvc_parse_private_key (&pk, &line, fp);
if (err)
if (update)
{
log_error ("error parsing '%s' line %d: %s\n",
fname, line, gpg_strerror (err));
goto leave;
int line;
err = nvc_parse_private_key (&pk, &line, fp);
if (err && gpg_err_code (err) != GPG_ERR_ENOENT)
{
log_error ("error parsing '%s' line %d: %s\n",
fname, line, gpg_strerror (err));
goto leave;
}
}
else
{
pk = nvc_new_private_key ();
if (!pk)
{
err = gpg_error_from_syserror ();
goto leave;
}
}
es_clearerr (fp);
err = gcry_sexp_sscan (&key, NULL, buf, len);
if (err)
@ -111,8 +126,7 @@ write_extended_private_key (char *fname, estream_t fp,
bump_key_eventcounter ();
leave:
if (fp)
es_fclose (fp);
es_fclose (fp);
if (remove)
gnupg_remove (fname);
xfree (fname);
@ -193,11 +207,19 @@ agent_write_private_key (const unsigned char *grip,
if (first != '(')
{
/* Key is in extended format. */
return write_extended_private_key (fname, fp, buffer, length);
/* Key is already in the extended format. */
return write_extended_private_key (fname, fp, 1, buffer, length);
}
if (first == '(' && opt.enable_extended_key_format)
{
/* Key is in the old format - but we want the extended format. */
return write_extended_private_key (fname, fp, 0, buffer, length);
}
}
if (opt.enable_extended_key_format)
return write_extended_private_key (fname, fp, 0, buffer, length);
if (es_fwrite (buffer, length, 1, fp) != 1)
{
gpg_error_t tmperr = gpg_error_from_syserror ();