From 903242b9ad2e6fb33393d165d454bbd566ec04c0 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 11 Apr 2011 08:57:54 +0900 Subject: [PATCH 1/3] fix dfuse.py --- ChangeLog | 4 ++++ tool/dfuse.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9280bb2..722c266 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-04-11 NIIBE Yutaka + + * tool/dfuse.py (DFU_STM32.verify): support data size of non-1-KiB. + 2011-02-24 NIIBE Yutaka * src/usb_prop.c (gnuk_device_SetInterface): Fix argument to diff --git a/tool/dfuse.py b/tool/dfuse.py index e826af4..bd85945 100755 --- a/tool/dfuse.py +++ b/tool/dfuse.py @@ -229,7 +229,7 @@ class DFU_STM32: data = ih.memory[start_addr] end_addr = start_addr + len(data) addr = start_addr & 0xfffffc00 - # XXX: data should be 1-KiB aligned and size should be just KiB. + # XXX: data should be 1-KiB aligned if addr != start_addr: raise ValueError, "padding is not supported yet" self.dfuse_set_address_pointer(addr) @@ -272,7 +272,7 @@ class DFU_STM32: data = ih.memory[start_addr] end_addr = start_addr + len(data) addr = start_addr & 0xfffffc00 - # XXX: data should be 1-KiB aligned and size should be just KiB. + # XXX: data should be 1-KiB aligned if addr != start_addr: raise ValueError, "padding is not supported yet" self.dfuse_set_address_pointer(addr) @@ -282,8 +282,8 @@ class DFU_STM32: while addr < end_addr: block = self.dfuse_read_memory() j = 0 - for d in block: - if d != (ord(data[i*1024+j])&0xff): + for c in data[i*1024:i*1024+1024] + if (ord(c)&0xff) != block[j]: raise ValueError, "verify failed at %08x" % (addr + i*1024+j) j += 1 if i & 0x03 == 0x03: From 082efb5dc41217876eb73232e2434bb96251d177 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 15 Apr 2011 17:50:03 +0900 Subject: [PATCH 2/3] Version 0.11 --- ChangeLog | 6 ++++++ README | 14 +++++++------- src/usb_prop.c | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 722c266..ac0c3a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-15 NIIBE Yutaka + + * Version 0.11. + + * src/usb_prop.c (gnukStringSerial): Updated. + 2011-04-11 NIIBE Yutaka * tool/dfuse.py (DFU_STM32.verify): support data size of non-1-KiB. diff --git a/README b/README index 16898bd..a9a0634 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Gnuk - software for GPG USB Token - Version 0.10 - 2011-02-10 + Version 0.11 + 2011-04-15 Niibe Yutaka Free Software Initiative of Japan @@ -26,11 +26,11 @@ USB Token by Gnuk everywhere. Release notes ============= -This is eleventh release of Gnuk. While it works well for specific -usages, it is still experimental. Note that you need to write random -bits after installation of gnuk executable to the chip from this -release. This procedure is required to share a single executable -among multiple devices. +This is twelfth release of Gnuk. While it works well for specific +usages and it is considered stable, it is still somewhat experimental. +Note that you need to write random bits after installation of gnuk +executable to the chip. This procedure is required to share a single +executable among multiple devices. Tested features are: diff --git a/src/usb_prop.c b/src/usb_prop.c index b0e2181..8b9579f 100644 --- a/src/usb_prop.c +++ b/src/usb_prop.c @@ -39,7 +39,7 @@ static uint8_t gnukStringSerial[] = { 13*2+2, /* bLength */ USB_STRING_DESCRIPTOR_TYPE, /* bDescriptorType */ - '0', 0, '.', 0, '1', 0, '0', 0, /* Version number of Gnuk */ + '0', 0, '.', 0, '1', 0, '1', 0, /* Version number of Gnuk */ '-', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, From 6c79434549211c8a5b7c3ac87d7d5978724ede0f Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 18 Apr 2011 17:50:04 +0900 Subject: [PATCH 3/3] Cleanup logo --- ChangeLog | 4 ++ gnuk.svg | 151 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 83 insertions(+), 72 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac0c3a5..06ac1af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-04-18 NIIBE Yutaka + + * gnuk.svg: Updated. + 2011-04-15 NIIBE Yutaka * Version 0.11. diff --git a/gnuk.svg b/gnuk.svg index b16370d..ad1d8e2 100644 --- a/gnuk.svg +++ b/gnuk.svg @@ -1,25 +1,26 @@ - + + id="defs0"> - - - + + + + + + + + + + + + id="metadata0"> image/svg+xml - + @@ -97,50 +123,31 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-308.2677)"> + transform="matrix(-0.80,0,0,0.80,650,-250)"> - - - - + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:2.3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 0,0 c 0,0 0,0 -76,0 0,0 -8,-9 -12,-12 -18,-15 -48,-48 -36,-84 4,-14 12,-36 12,-36 -10,6 -50,26 -66,54 -8,16 -18,30 -18,54 0,24 25,100 48,108 0,0 0,0 150,0 0,0 0,0 150,0 23,-8 48,-84 48,-108 0,-24 -10,-38 -18,-54 -16,-28 -46,-48 -66,-54 0,0 8,22 12,36 12,36 -18,69 -36,84 -4,3 -12,12 -12,12 z" + transform="matrix(-1.76,0,0,1.76,410,560)" + id="path0" /> + d="m 0,592 c 0,0 -90,0 -90,-33 0,-20 4,-28 12,-40 5,-8 8,-18 8,-28 1,-13 1,-20 -8,-36 -6,-9 -8,-23 -5,-33 5,-14 19,-23 33,-25 16,-5 35,-4 50,-5 15,1 34,0 50,5 14,2 28,9 33,25 3,10 -1,24 -5,33 -9,16 -9,23 -8,36 0,10, 3,20 8,28 8,12 12,20 12,40 0,33 -90,33 -90,33 z" + transform="matrix(-1,0,0,1,410,0)" + id="path1" /> + style="fill:#ffffaf;fill-opacity:1;stroke:#000000;stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 236.90125,452.90625 C 135.34805,496.35376 97.060607,634.496 151.37,761.4375 c 50.02335,116.92341 158.1859,159.40625 257.75,159.40625 99.5641,0 207.72665,-42.48284 257.75,-159.40625 C 721.17939,634.496 682.89195,496.35376 581.33875,452.90625 526.07714,429.26367 466.8919,524.375 409.12,524.375 c -57.7719,0 -116.77668,-94.67646 -172.21875,-71.46875 z" + id="path2" + inkscape:connector-curvature="0" /> + +