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

scd: Fix varargs call for 64-bit arch on ECC keys.

Browse Source 
* scd/app-openpgp.c (store_fpr): Remove CARD_VERSION from the
arguments.
(rsa_writekey): Follow the change.
(do_genkey): Likewise.
(ecc_writekey): Likewise.  Cast to size_t.

--

KEYTOCARD caused SEGV of scdaemon on 64-bit arch.  That's because
int is 32-bit, but size_t is 64-bit.
This commit is contained in:
NIIBE Yutaka 2015-01-28 11:24:29 +09:00
parent 6eebc56687
commit f6d3c6e526
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scd/app-openpgp.c
View File

@ -755,10 +755,8 @@ get_algo_byte (int keynumber, key_type_t key_type)
/* Note, that FPR must be at least 20 bytes. */ /* Note, that FPR must be at least 20 bytes. */
static gpg_error_t static gpg_error_t
store_fpr (app_t app, int keynumber, u32 timestamp, store_fpr (app_t app, int keynumber, u32 timestamp, unsigned char *fpr,
unsigned char *fpr, unsigned int card_version, key_type_t key_type, ...)
key_type_t key_type,
...)
{ {
unsigned int n, nbits; unsigned int n, nbits;
unsigned char *buffer, *p; unsigned char *buffer, *p;
@ -821,7 +819,7 @@ store_fpr (app_t app, int keynumber, u32 timestamp,
xfree (buffer); xfree (buffer);
tag = (card_version > 0x0007? 0xC7 : 0xC6) + keynumber; tag = (app->card_version > 0x0007? 0xC7 : 0xC6) + keynumber;
flush_cache_item (app, 0xC5); flush_cache_item (app, 0xC5);
tag2 = 0xCE + keynumber; tag2 = 0xCE + keynumber;
flush_cache_item (app, 0xCD); flush_cache_item (app, 0xCD);
@ -830,7 +828,7 @@ store_fpr (app_t app, int keynumber, u32 timestamp,
if (rc) if (rc)
log_error (_("failed to store the fingerprint: %s\n"),gpg_strerror (rc)); log_error (_("failed to store the fingerprint: %s\n"),gpg_strerror (rc));
if (!rc && card_version > 0x0100) if (!rc && app->card_version > 0x0100)
{ {
unsigned char buf[4]; unsigned char buf[4];
@ -3196,8 +3194,8 @@ rsa_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
goto leave; goto leave;
} }
err = store_fpr (app, keyno, created_at, fprbuf, app->card_version, err = store_fpr (app, keyno, created_at, fprbuf, KEY_TYPE_RSA,
KEY_TYPE_RSA, rsa_n, rsa_n_len, rsa_e, rsa_e_len); rsa_n, rsa_n_len, rsa_e, rsa_e_len);
if (err) if (err)
goto leave; goto leave;
@ -3383,16 +3381,16 @@ ecc_writekey (app_t app, gpg_error_t (*pincb)(void*, const char *, char **),
goto leave; goto leave;
} }
err = store_fpr (app, keyno, created_at, fprbuf, app->card_version, err = store_fpr (app, keyno, created_at, fprbuf,
curve == CURVE_ED25519 ? KEY_TYPE_EDDSA : KEY_TYPE_ECC, curve == CURVE_ED25519 ? KEY_TYPE_EDDSA : KEY_TYPE_ECC,
curve == CURVE_ED25519 ? curve == CURVE_ED25519 ?
"\x09\x2b\x06\x01\x04\x01\xda\x47\x0f\x01" "\x09\x2b\x06\x01\x04\x01\xda\x47\x0f\x01"
: curve == CURVE_NIST_P256 ? : curve == CURVE_NIST_P256 ?
"\x08\x2a\x86\x48\xce\x3d\x03\x01\x07" "\x08\x2a\x86\x48\xce\x3d\x03\x01\x07"
: "\x05\x2b\x81\x04\x00\x0a", : "\x05\x2b\x81\x04\x00\x0a",
curve == CURVE_ED25519 ? 10 (size_t)(curve == CURVE_ED25519 ? 10
: curve == CURVE_NIST_P256? 9 : 6, : curve == CURVE_NIST_P256? 9 : 6),
ecc_q, ecc_q_len, "\x03\x01\x08\x07", 4); ecc_q, ecc_q_len, "\x03\x01\x08\x07", (size_t)4);
if (err) if (err)
goto leave; goto leave;
@ -3604,8 +3602,8 @@ do_genkey (app_t app, ctrl_t ctrl, const char *keynostr, unsigned int flags,
send_status_info (ctrl, "KEY-CREATED-AT", send_status_info (ctrl, "KEY-CREATED-AT",
numbuf, (size_t)strlen(numbuf), NULL, 0); numbuf, (size_t)strlen(numbuf), NULL, 0);
rc = store_fpr (app, keyno, (u32)created_at, fprbuf, app->card_version, rc = store_fpr (app, keyno, (u32)created_at, fprbuf, KEY_TYPE_RSA,
KEY_TYPE_RSA, m, mlen, e, elen); m, mlen, e, elen);
if (rc) if (rc)
goto leave; goto leave;
send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf); send_fpr_if_not_null (ctrl, "KEY-FPR", -1, fprbuf);