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

change of S2K

Browse Source
This commit is contained in:
NIIBE Yutaka
2016-02-09 14:01:07 +09:00
parent baf09ecac9
commit 34e2099b23
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openpgp.c
View File

@@ -1,7 +1,7 @@
/*
* openpgp.c -- OpenPGP card protocol support
*
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
* Free Software Initiative of Japan
* Author: NIIBE Yutaka <gniibe@fsij.org>
*
@@ -437,9 +437,12 @@ s2k (const unsigned char *salt, size_t slen,
{
sha256_context ctx;
size_t count = S2KCOUNT;
const uint8_t *unique = unique_device_id ();
sha256_start (&ctx);
sha256_update (&ctx, unique, 12);
while (count > slen + ilen)
{
if (slen)