security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

agent: Support --format=ssh option for READKEY.

Browse Source 
* agent/command.c (cmd_readkey): Handle --format=ssh to return key
in SSH format.

--

GnuPG-bug-id: 6012
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-06-02 20:45:32 +09:00
parent 5a327e8001
commit d7a3c455c5
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
agent/command.c
View File

@ -1203,7 +1203,7 @@ cmd_genkey (assuan_context_t ctx, char *line)
static const char hlp_readkey[] = static const char hlp_readkey[] =
"READKEY [--no-data] <hexstring_with_keygrip>\n" "READKEY [--no-data] [--format=ssh] <hexstring_with_keygrip>\n"
" --card <keyid>\n" " --card <keyid>\n"
"\n" "\n"
"Return the public key for the given keygrip or keyid.\n" "Return the public key for the given keygrip or keyid.\n"
@ -1216,20 +1216,22 @@ cmd_readkey (assuan_context_t ctx, char *line)
unsigned char grip[20]; unsigned char grip[20];
gcry_sexp_t s_pkey = NULL; gcry_sexp_t s_pkey = NULL;
unsigned char *pkbuf = NULL; unsigned char *pkbuf = NULL;
char *serialno = NULL;
char *keyidbuf = NULL;
size_t pkbuflen; size_t pkbuflen;
int opt_card, opt_no_data; int opt_card, opt_no_data, opt_format_ssh;
if (ctrl->restricted) if (ctrl->restricted)
return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN)); return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
opt_no_data = has_option (line, "--no-data"); opt_no_data = has_option (line, "--no-data");
opt_card = has_option (line, "--card"); opt_card = has_option (line, "--card");
opt_format_ssh = has_option (line, "--format=ssh");
line = skip_options (line); line = skip_options (line);
if (opt_card) if (opt_card)
{ {
char *serialno = NULL;
char *keyidbuf = NULL;
const char *keyid = line; const char *keyid = line;
rc = agent_card_getattr (ctrl, "SERIALNO", &serialno, NULL); rc = agent_card_getattr (ctrl, "SERIALNO", &serialno, NULL);
@ -1270,7 +1272,8 @@ cmd_readkey (assuan_context_t ctx, char *line)
goto leave; goto leave;
} }
rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen); xfree (serialno);
xfree (keyidbuf);
} }
else else
{ {
@ -1280,24 +1283,48 @@ cmd_readkey (assuan_context_t ctx, char *line)
rc = agent_public_key_from_file (ctrl, grip, &s_pkey); rc = agent_public_key_from_file (ctrl, grip, &s_pkey);
if (!rc) if (!rc)
{
if (opt_format_ssh)
{
estream_t stream = NULL;
stream = es_fopenmem (0, "r+b");
if (!stream)
{
rc = gpg_error_from_syserror ();
goto leave;
}
rc = ssh_public_key_in_base64 (s_pkey, stream, "(none)");
if (rc)
{
es_fclose (stream);
goto leave;
}
rc = es_fclose_snatch (stream, (void **)&pkbuf, &pkbuflen);
if (rc)
goto leave;
}
else
{ {
pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0); pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
log_assert (pkbuflen); log_assert (pkbuflen);
pkbuf = xtrymalloc (pkbuflen); pkbuf = xtrymalloc (pkbuflen);
if (!pkbuf) if (!pkbuf)
rc = gpg_error_from_syserror ();
else
{ {
rc = gpg_error_from_syserror ();
goto leave;
}
pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON,
pkbuf, pkbuflen); pkbuf, pkbuflen);
rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
} }
} }
} }
rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
leave: leave:
xfree (keyidbuf);
xfree (serialno);
xfree (pkbuf); xfree (pkbuf);
gcry_sexp_release (s_pkey); gcry_sexp_release (s_pkey);
return leave_cmd (ctx, rc); return leave_cmd (ctx, rc);