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

delete keystring from DO

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-10-11 13:13:07 +09:00
parent 54f20d8c95
commit b7e4f90d96
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2013-10-11 Niibe Yutaka <gniibe@fsij.org>
* src/openpgp-do.c (gpg_do_write_prvkey): Delete keystring
information from data object of NR_DO_KEYSTRING_PW3.
2013-10-10 Niibe Yutaka <gniibe@fsij.org> 2013-10-10 Niibe Yutaka <gniibe@fsij.org>
* src/gnuk.h (S2K_ITER): Remove. It's determined at compile time. * src/gnuk.h (S2K_ITER): Remove. It's determined at compile time.

35
src/openpgp-do.c
View File

@@ -899,8 +899,24 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
if (p == NULL) if (p == NULL)
return -1; return -1;
if (keystring_admin && kk == GPG_KEY_FOR_SIGNING)
{
const uint8_t *ks_admin = gpg_do_read_simple (NR_DO_KEYSTRING_PW3);
if (ks_admin != NULL && (ks_admin[0] & PW_LEN_KEYSTRING_BIT))
{
ks_info0[0] = ks_admin[0] & PW_LEN_MASK;
memcpy (KS_GET_SALT (ks_info0), KS_GET_SALT (ks_admin), SALT_SIZE);
gpg_do_write_simple (NR_DO_KEYSTRING_PW3, ks_info0, KS_META_SIZE);
}
else
{
DEBUG_INFO ("No admin keystring!\r\n");
}
}
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. */ { /* Remove contents of keystrings from DO, but length and salt. */
/* /*
* Note that flash_do_write (above) or gpg_do_write_simple * Note that flash_do_write (above) or gpg_do_write_simple
* (below) may result garbage collection for flash ROM. Thus, * (below) may result garbage collection for flash ROM. Thus,
@@ -911,23 +927,6 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
if ((ks_rc_len & PW_LEN_KEYSTRING_BIT)) if ((ks_rc_len & PW_LEN_KEYSTRING_BIT))
gpg_do_write_simple (NR_DO_KEYSTRING_RC, ks_info1, KS_META_SIZE); gpg_do_write_simple (NR_DO_KEYSTRING_RC, ks_info1, KS_META_SIZE);
if (keystring_admin)
{
const uint8_t *ks_admin = gpg_do_read_simple (NR_DO_KEYSTRING_PW3);
if (ks_admin != NULL)
{
ks_info0[0] = ks_admin[0] & PW_LEN_MASK;
memcpy (KS_GET_SALT (ks_info0), KS_GET_SALT (ks_admin),
SALT_SIZE);
gpg_do_write_simple (NR_DO_KEYSTRING_PW3, ks_info0, KS_META_SIZE);
}
else
{
DEBUG_INFO ("No admin keystring!\r\n");
}
}
} }
return 0; return 0;