scd: Parse "Algorithm Information" data object in scdaemon.

* scd/app-openpgp.c (data_objects): 0x00FA for binary data.
(do_getattr): Parse the data and send it in status lines.
(get_algorithm_attribute_string): New.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-09-04 12:46:51 +09:00
parent 046f419f80
commit eba2563dab
2 changed files with 112 additions and 2 deletions

View File

@ -1208,6 +1208,12 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
key imported. See section 4.4.3.8 of the OpenPGP Smart Card
Application V3.4.
*** KEY-ATTR-INFO <keyref> <string>
This is the response from scdaemon on GETATTR KEY-ATTR-INFO for
OpenPGP cards. <keyref> is the usual keyref (e.g. OPENPGP.1 or
OPENPGP.129) and <string> is the algoritm or curve name, which
is available for the key.
* Format of the --attribute-fd output
When --attribute-fd is set, during key listings (--list-keys,

View File

@ -121,7 +121,7 @@ static struct {
{ 0x00D7, 0, 0x6E, 1, 0, 0, 0, 0, "UIF for Decryption"},
{ 0x00D8, 0, 0x6E, 1, 0, 0, 0, 0, "UIF for Authentication"},
{ 0x00F9, 0, 0, 1, 0, 0, 0, 0, "KDF data object"},
{ 0x00FA, 0, 0, 0, 0, 0, 0, 0, "Algorithm Information"},
{ 0x00FA, 0, 0, 1, 0, 0, 0, 0, "Algorithm Information"},
{ 0 }
};
@ -273,6 +273,8 @@ static gpg_error_t do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
void *pincb_arg,
const void *indata, size_t indatalen,
unsigned char **outdata, size_t *outdatalen);
static const char *get_algorithm_attribute_string (const unsigned char *buffer,
size_t buflen);
static void parse_algorithm_attribute (app_t app, int keyno);
static gpg_error_t change_keyattr_from_string
(app_t app, ctrl_t ctrl,
@ -1245,6 +1247,75 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
if (gpg_err_code (rc) == GPG_ERR_NO_OBJ)
rc = gpg_error (GPG_ERR_NOT_SUPPORTED);
}
else if (table[idx].special == 7)
{
const unsigned char *p = value;
int tag;
size_t len;
if (valuelen < 2)
return gpg_error (GPG_ERR_INV_OBJ);
tag = *p++;
len = *p++;
if (tag != 0x00FA)
return gpg_error (GPG_ERR_INV_OBJ);
if (len == 0x81)
{
if (valuelen < 3)
return gpg_error (GPG_ERR_INV_OBJ);
len = *p++;
}
else if (len == 0x82)
{
if (valuelen < 4)
return gpg_error (GPG_ERR_INV_OBJ);
len = *p++;
len = (len << 8) | *p++;
}
valuelen -= (p - value);
value = p;
if (valuelen != len)
{
if (opt.verbose)
log_info ("Yubikey bug: length %zu != %zu", valuelen, len);
if (app->card->cardtype != CARDTYPE_YUBIKEY)
return gpg_error (GPG_ERR_INV_OBJ);
}
for (; p < value + valuelen; p += len)
{
const char *key_algo_str;
int keyrefno;
if (p + 2 > value + valuelen)
break;
tag = *p++;
len = *p++;
if (tag < 0xc1)
continue;
if (tag == 0xda)
keyrefno = 0x81;
else
keyrefno = tag - 0xc1 + 1;
if (p + len > value + valuelen)
break;
key_algo_str = get_algorithm_attribute_string (p, len);
send_status_printf (ctrl, table[idx].name, "OPENPGP.%u %s",
keyrefno, key_algo_str);
}
}
else
send_status_info (ctrl, table[idx].name, value, valuelen, NULL, 0);
@ -5651,7 +5722,7 @@ parse_historical (struct app_local_s *apploc,
* The constant string is not allocated dynamically, never free it.
*/
static const char *
ecc_curve (unsigned char *buf, size_t buflen)
ecc_curve (const unsigned char *buf, size_t buflen)
{
gcry_mpi_t oid;
char *oidstr;
@ -5682,6 +5753,39 @@ ecc_curve (unsigned char *buf, size_t buflen)
}
static const char *
get_algorithm_attribute_string (const unsigned char *buffer,
size_t buflen)
{
enum gcry_pk_algos galgo;
const char *curve;
unsigned int nbits = 0;
galgo = map_openpgp_pk_to_gcry (*buffer);
nbits = 0;
curve = NULL;
if (*buffer == PUBKEY_ALGO_RSA && (buflen == 5 || buflen == 6))
nbits = (buffer[1]<<8 | buffer[2]);
else if (*buffer == PUBKEY_ALGO_ECDH || *buffer == PUBKEY_ALGO_ECDSA
|| *buffer == PUBKEY_ALGO_EDDSA)
{
int oidlen = buflen - 1;
if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
{ /* Found "pubkey required"-byte for private key template. */
oidlen--;
}
curve = ecc_curve (buffer + 1, oidlen);
}
else if (opt.verbose)
log_printhex (buffer, buflen, "");
return get_keyalgo_string (galgo, nbits, curve);
}
/* Parse and optionally show the algorithm attributes for KEYNO.
KEYNO must be in the range 0..2. */
static void