coelner/gnuk
1
0
Fork 0
mirror of https://salsa.debian.org/gnuk-team/gnuk/gnuk.git synced 2024-09-20 10:50:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
NIIBE Yutaka 2011-05-27 16:08:16 +09:00
parent 450807e8bf
commit 09748fc046
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2011-05-27 NIIBE Yutaka <gniibe@fsij.org>
* tool/gnuk_put_binary.py (main): Confirm Serial ID is written
correctly.
* src/openpgp.c (cmd_write_binary): Fix FILE_EF_SERIAL comparison.
* src/gnuk.ld.in (.gnuk_random, .gnuk_ch_certificate): Put LONG to
have CONTENTS.
* polarssl-0.14.0/include/polarssl/bn_mul.h [__arm__]
(MULADDC_HUIT): New.

3
src/gnuk.ld.in
View File

@ -118,7 +118,7 @@ SECTIONS
{
. = ALIGN (@FLASH_PAGE_SIZE@);
random_bits_start = .;
. += 1;
LONG(0xffffffff);
. = ALIGN (@FLASH_PAGE_SIZE@);
} > flash =0xffffffff
@ -126,6 +126,7 @@ SECTIONS
{
. = ALIGN (@FLASH_PAGE_SIZE@);
ch_certificate_start = .;
LONG(0xffffffff);
. += 1920;
. = ALIGN (@FLASH_PAGE_SIZE@);
} > flash =0xffffffff

2
src/openpgp.c
View File

@ -948,7 +948,7 @@ cmd_write_binary (void)
{
if (file_selection != FILE_EF_CH_CERTIFICATE
&& file_selection != FILE_EF_RANDOM
&& file_selection != FILEID_SERIAL_NO)
&& file_selection != FILE_EF_SERIAL)
{
GPG_COMMAND_NOT_ALLOWED ();
return;

7
tool/gnuk_put_binary.py
View File

@ -107,6 +107,13 @@ def main(fileid, is_update, data, passwd):
gnuk.cmd_select_openpgp()
data_in_device = gnuk.cmd_get_data(0x7f, 0x21)
compare(data[:-2], data_in_device)
elif fileid == 2:
gnuk.cmd_select_openpgp()
data_in_device = gnuk.cmd_get_data(0x00, 0x4f)
for d in data_in_device:
print "%02x" % d,
print
compare(data, data_in_device[8:])
gnuk.connection.disconnect()
return 0