deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

care garbage collection, again

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-10-10 14:19:31 +09:00
parent 266f93dfac
commit 54f20d8c95
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -9,8 +9,8 @@
2013-10-10 Niibe Yutaka <gniibe@fsij.org> 2013-10-10 Niibe Yutaka <gniibe@fsij.org>
* src/openpgp-do.c (gpg_do_write_prvkey): Two phase write to * src/openpgp-do.c (gpg_do_write_prvkey): Access of data object
work with garbage collection. considering garbage collection.
* src/openpgp.c (cmd_change_password): Call gpg_do_write_simple * src/openpgp.c (cmd_change_password): Call gpg_do_write_simple
after accessing the data object (it may cause garbage collection). after accessing the data object (it may cause garbage collection).

36
src/openpgp-do.c
View File

@@ -748,6 +748,8 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
uint8_t ks_pw1_len = 0; uint8_t ks_pw1_len = 0;
uint8_t ks_rc_len = 0; uint8_t ks_rc_len = 0;
int pubkey_len = KEY_CONTENT_LEN; int pubkey_len = KEY_CONTENT_LEN;
uint8_t ks_info0[KS_META_SIZE];
uint8_t ks_info1[KS_META_SIZE];
DEBUG_INFO ("Key import\r\n"); DEBUG_INFO ("Key import\r\n");
DEBUG_SHORT (key_len); DEBUG_SHORT (key_len);
@@ -855,6 +857,11 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
{ {
ks_pw1_len = ks_pw1[0]; ks_pw1_len = ks_pw1[0];
encrypt_dek (KS_GET_KEYSTRING (ks_pw1), pd->dek_encrypted_1); encrypt_dek (KS_GET_KEYSTRING (ks_pw1), pd->dek_encrypted_1);
if ((ks_pw1_len & PW_LEN_KEYSTRING_BIT))
{
ks_info0[0] = ks_pw1_len & PW_LEN_MASK;
memcpy (KS_GET_SALT (ks_info0), KS_GET_SALT (ks_pw1), SALT_SIZE);
}
} }
else else
{ {
@@ -869,6 +876,11 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
{ {
ks_rc_len = ks_rc[0]; ks_rc_len = ks_rc[0];
encrypt_dek (KS_GET_KEYSTRING (ks_rc), pd->dek_encrypted_2); encrypt_dek (KS_GET_KEYSTRING (ks_rc), pd->dek_encrypted_2);
if ((ks_rc_len & PW_LEN_KEYSTRING_BIT))
{
ks_info1[0] = ks_rc_len & PW_LEN_MASK;
memcpy (KS_GET_SALT (ks_info1), KS_GET_SALT (ks_rc), SALT_SIZE);
}
} }
else else
memset (pd->dek_encrypted_2, 0, DATA_ENCRYPTION_KEY_SIZE); memset (pd->dek_encrypted_2, 0, DATA_ENCRYPTION_KEY_SIZE);
@@ -888,28 +900,12 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
return -1; return -1;
if (++num_prv_keys == NUM_ALL_PRV_KEYS) /* All keys are registered. */ if (++num_prv_keys == NUM_ALL_PRV_KEYS) /* All keys are registered. */
{ { /* Remove contents of keystrings from DO, but length, salt, and iter. */
uint8_t ks_info0[KS_META_SIZE];
uint8_t ks_info1[KS_META_SIZE];
/* Remove contents of keystrings from DO, but length, salt, and iter. */
if ((ks_pw1_len & PW_LEN_KEYSTRING_BIT))
{
ks_info0[0] = ks_pw1_len & PW_LEN_MASK;
memcpy (KS_GET_SALT (ks_info0), KS_GET_SALT (ks_pw1), SALT_SIZE);
}
if ((ks_rc_len & PW_LEN_KEYSTRING_BIT))
{
ks_info1[0] = ks_rc_len & PW_LEN_MASK;
memcpy (KS_GET_SALT (ks_info1), KS_GET_SALT (ks_rc), SALT_SIZE);
}
/* /*
* Note that gpg_do_write_simple may result garbage collection * Note that flash_do_write (above) or gpg_do_write_simple
* for flash ROM. Thus, it must be two phase. * (below) may result garbage collection for flash ROM. Thus,
* the access to ks_pw1/ks_rc must not be done here but before.
*/ */
if ((ks_pw1_len & PW_LEN_KEYSTRING_BIT)) if ((ks_pw1_len & PW_LEN_KEYSTRING_BIT))
gpg_do_write_simple (NR_DO_KEYSTRING_PW1, ks_info0, KS_META_SIZE); gpg_do_write_simple (NR_DO_KEYSTRING_PW1, ks_info0, KS_META_SIZE);