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

agent: Automatically convert to extended key format by KEYATTR.

Browse Source 
* agent/command.c (cmd_keyattr): Reject when disabled extended key
format.  Handle the case when key is in non-extended format.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-10-28 14:44:41 +09:00
parent 9c4691c73e
commit ed6eb90192
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
agent/command.c
View File

@ -1218,6 +1218,12 @@ cmd_keyattr (assuan_context_t ctx, char *line)
if (ctrl->restricted) if (ctrl->restricted)
return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN)); return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
if (!opt.enable_extended_key_format)
{
err = gpg_error (GPG_ERR_NOT_SUPPORTED);
goto leave;
}
opt_delete = has_option (line, "--delete"); opt_delete = has_option (line, "--delete");
line = skip_options (line); line = skip_options (line);
@ -1248,15 +1254,15 @@ cmd_keyattr (assuan_context_t ctx, char *line)
const char *p; const char *p;
err = agent_raw_key_from_file (ctrl, grip, &s_key, &keymeta); err = agent_raw_key_from_file (ctrl, grip, &s_key, &keymeta);
if (keymeta == NULL) /* Not extended format? */ if (err)
{ goto leave;
err = gpg_error (GPG_ERR_INV_DATA);
goto leave;
}
if (argc == 2) if (argc == 2)
{ {
nve_t e = nvc_lookup (keymeta, argv[1]); nve_t e = NULL;
if (keymeta)
e = nvc_lookup (keymeta, argv[1]);
if (opt_delete) if (opt_delete)
{ {
@ -1275,6 +1281,9 @@ cmd_keyattr (assuan_context_t ctx, char *line)
} }
else if (argc == 3) else if (argc == 3)
{ {
if (!keymeta)
keymeta = nvc_new_private_key ();
err = nvc_set (keymeta, argv[1], argv[2]); err = nvc_set (keymeta, argv[1], argv[2]);
key_attr_write: key_attr_write:
if (!err) if (!err)