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

S2KCOUNT default change

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-12-19 16:20:22 +09:00
parent ade0ea65eb
commit 3fa7d039f1
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2013-12-19 Niibe Yutaka <gniibe@fsij.org>
* src/openpgp.c (S2KCOUNT): It's now 192, as the threat model
of Gnuk Token is different.
2013-12-19 Niibe Yutaka <gniibe@fsij.org> 2013-12-19 Niibe Yutaka <gniibe@fsij.org>
* polarssl/library/bignum.c (mpi_montsqr): New. * polarssl/library/bignum.c (mpi_montsqr): New.

9
src/openpgp.c
View File

@@ -422,7 +422,14 @@ cmd_change_password (void)
} }
#define S2KCOUNT 65535 #ifndef S2KCOUNT
/*
* OpenPGP uses the value 65535 for the key on disk.
* Given the condition that the access to flash ROM is harder than disk,
* that is, the threat model is different, we chose the default value 192.
*/
#define S2KCOUNT 192
#endif
void void
s2k (const unsigned char *salt, size_t slen, s2k (const unsigned char *salt, size_t slen,
const unsigned char *input, size_t ilen, unsigned char output[32]) const unsigned char *input, size_t ilen, unsigned char output[32])