security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

Create off-line card encryption key with the right size.

Browse Source 
* g10/keygen.c (gen_card_key_with_backup): Get the size of the key
from the card.
--

Formerly the off-line encryption key was created with a fixed length
of 1024 bit.  With this change the key is created as expected.

GnuPG-bug-id: 1230
This commit is contained in:
Werner Koch 2012-11-08 15:59:47 +01:00
parent b1eac93431
commit 64e7c237db
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
g10/keygen.c
View File

@ -3711,10 +3711,25 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary,
PKT_public_key *pk; PKT_public_key *pk;
size_t n; size_t n;
int i; int i;
unsigned int nbits;
sk_unprotected = NULL; sk_unprotected = NULL;
sk_protected = NULL; sk_protected = NULL;
rc = generate_raw_key (algo, 1024, timestamp,
/* Get the size of the key directly from the card. */
{
struct agent_card_info_s info;
memset (&info, 0, sizeof info);
if (!agent_scd_getattr ("KEY-ATTR", &info)
&& info.key_attr[1].algo)
nbits = info.key_attr[1].nbits;
else
nbits = 1024; /* All pre-v2.0 cards. */
agent_release_card_info (&info);
}
rc = generate_raw_key (algo, nbits, timestamp,
&sk_unprotected, &sk_protected); &sk_unprotected, &sk_protected);
if (rc) if (rc)
return rc; return rc;