security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

scd: support ECDSA signing.

Browse Source 
* scd/app-openpgp.c (do_sign): Only prepend message digest block
for RSA or do_auth.
(do_auth): Remove message digest block for ECDSA.

--

If we don't need to check the message digest block by SCDaemon, we
don't requite the message digest block for ECDSA by gpg-agent.
This commit is contained in:
NIIBE Yutaka 2013-03-09 09:36:21 +09:00
parent 010bc7f4f0
commit 73ad742dea
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scd/app-openpgp.c
View File

@ -3416,14 +3416,23 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
memcpy (data + sizeof b ## _prefix, indata, indatalen); \ memcpy (data + sizeof b ## _prefix, indata, indatalen); \
} }
X(SHA1, sha1, 1) if (use_auth
else X(RMD160, rmd160, 1) || app->app_local->keyattr[use_auth? 2: 0].key_type == KEY_TYPE_RSA)
else X(SHA224, sha224, app->app_local->extcap.is_v2) {
else X(SHA256, sha256, app->app_local->extcap.is_v2) X(SHA1, sha1, 1)
else X(SHA384, sha384, app->app_local->extcap.is_v2) else X(RMD160, rmd160, 1)
else X(SHA512, sha512, app->app_local->extcap.is_v2) else X(SHA224, sha224, app->app_local->extcap.is_v2)
else X(SHA256, sha256, app->app_local->extcap.is_v2)
else X(SHA384, sha384, app->app_local->extcap.is_v2)
else X(SHA512, sha512, app->app_local->extcap.is_v2)
else
return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
}
else else
return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM); {
datalen = indatalen;
memcpy (data, indata, indatalen);
}
#undef X #undef X
/* Redirect to the AUTH command if asked to. */ /* Redirect to the AUTH command if asked to. */
@ -3515,6 +3524,14 @@ do_auth (app_t app, const char *keyidstr,
if (indatalen > 101) /* For a 2048 bit key. */ if (indatalen > 101) /* For a 2048 bit key. */
return gpg_error (GPG_ERR_INV_VALUE); return gpg_error (GPG_ERR_INV_VALUE);
if (app->app_local->keyattr[2].key_type == KEY_TYPE_ECDSA
&& (indatalen == 51 || indatalen == 67 || indatalen == 83)
{
const char *p = (const char *)indata + 19;
indata = p;
indatalen -= 19;
}
/* Check whether an OpenPGP card of any version has been requested. */ /* Check whether an OpenPGP card of any version has been requested. */
if (!strcmp (keyidstr, "OPENPGP.3")) if (!strcmp (keyidstr, "OPENPGP.3"))
; ;