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

scd: Support "READKEY --advanced" for all cards.

Browse Source 
* scd/command.c (cmd_readkey): Reformat for advanced mode.
--

The --advanced option used to work only if the driver supported that
but not if we extracted the public key from an x.509 certificate.
This patch fixes that.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-01-03 15:17:04 +01:00
parent 3d766924b4
commit cca2b87e79
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scd/command.c
View File

@ -465,7 +465,7 @@ cmd_learn (assuan_context_t ctx, char *line)
static const char hlp_readcert[] = static const char hlp_readcert[] =
"READCERT <hexified_certid>|<keyid>\n" "READCERT <hexified_certid>|<keyid>|<oid>\n"
"\n" "\n"
"Note, that this function may even be used on a locked card."; "Note, that this function may even be used on a locked card.";
static gpg_error_t static gpg_error_t
@ -498,7 +498,7 @@ cmd_readcert (assuan_context_t ctx, char *line)
static const char hlp_readkey[] = static const char hlp_readkey[] =
"READKEY [--advanced] <keyid>\n" "READKEY [--advanced] <keyid>|<oid>\n"
"\n" "\n"
"Return the public key for the given cert or key ID as a standard\n" "Return the public key for the given cert or key ID as a standard\n"
"S-expression.\n" "S-expression.\n"
@ -514,7 +514,7 @@ cmd_readkey (assuan_context_t ctx, char *line)
unsigned char *cert = NULL; unsigned char *cert = NULL;
size_t ncert, n; size_t ncert, n;
ksba_cert_t kc = NULL; ksba_cert_t kc = NULL;
ksba_sexp_t p; ksba_sexp_t p = NULL;
unsigned char *pk; unsigned char *pk;
size_t pklen; size_t pklen;
@ -570,13 +570,36 @@ cmd_readkey (assuan_context_t ctx, char *line)
rc = gpg_error (GPG_ERR_NO_PUBKEY); rc = gpg_error (GPG_ERR_NO_PUBKEY);
goto leave; goto leave;
} }
n = gcry_sexp_canon_len (p, 0, NULL, NULL); n = gcry_sexp_canon_len (p, 0, NULL, NULL);
rc = assuan_send_data (ctx, p, n);
xfree (p);
if (advanced)
{
gcry_sexp_t s_key;
rc = gcry_sexp_new (&s_key, (void*)p, n, 0);
if (rc)
goto leave;
pklen = gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, NULL, 0);
pk = xtrymalloc (pklen);
if (!pk)
{
rc = gpg_error_from_syserror ();
goto leave;
}
log_assert (pklen);
gcry_sexp_sprint (s_key, GCRYSEXP_FMT_ADVANCED, pk, pklen);
gcry_sexp_release (s_key);
/* (One less to adjust for the trailing '\0') */
rc = assuan_send_data (ctx, pk, pklen-1);
xfree (pk);
}
else
rc = assuan_send_data (ctx, p, n);
leave: leave:
xfree (p);
ksba_cert_release (kc); ksba_cert_release (kc);
xfree (cert); xfree (cert);
return rc; return rc;