From f39380d3aa686eec1fb8616c2dd259e8d2f75d30 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 3 Aug 2012 11:20:13 +0900 Subject: [PATCH] version 1.0.1 --- ChangeLog | 11 +++++++++++ NEWS | 9 +++++++++ README | 38 ++++++++++++++++++++------------------ src/main.c | 2 +- src/usb_desc.c | 4 ++-- 5 files changed, 43 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 614c1cd..7195dae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2012-08-03 Niibe Yutaka + + * Version 1.0.1. + * src/usb_desc.c (gnukStringSerial): Updated. + * src/main.c (ID_OFFSET): Fix. + +2012-08-02 Niibe Yutaka + + * test/gnuk.py (gnuk_token.get_string): New. + * test/features/991_version_string.feature: New. + 2012-07-21 Niibe Yutaka * Version 1.0. diff --git a/NEWS b/NEWS index 9990f58..016c370 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,14 @@ Gnuk NEWS - User visible changes +* Major changes in Gnuk 1.0.1 + + Released 2012-08-03, by NIIBE Yutaka + +** USB SerialNumber String +In 1.0, it has a bug for USB SerialNumber String. It has been fixed +in 1.0.1. + + * Major changes in Gnuk 1.0 Released 2012-07-21, by NIIBE Yutaka diff --git a/README b/README index f0f649d..3b3da45 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Gnuk - An Implementation of USB Cryptographic Token for GnuPG - Version 1.0 - 2012-07-21 + Version 1.0.1 + 2012-08-03 Niibe Yutaka Free Software Initiative of Japan @@ -14,9 +14,9 @@ STM32F103 processor. I wish that Gnuk will be a developer's soother who uses GnuPG. I have been nervous of storing secret key(s) on usual secondary storage. -There is a solution with OpenPGP card, but it is not the choice for me -to bring a card reader all the time. With Gnuk, this issue will be -solved by a USB token which is small enough. +There is a solution with OpenPGP card, but it is not the choice for +me, as card reader is not common device. With Gnuk, this issue will +be solved by a USB token. Please look at the graphics of "gnuk.svg" for the software name. My son used to be with his NUK(R), always, everywhere. Now, I am with a @@ -35,7 +35,7 @@ A0: Good points of Gnuk are: Gnuk Token cheaper (see Q8-A8). * You can study Gnuk to modify and to enhance. For example, you can implement your own authentication method with some sensor - such as acceleration sensor. + such as an acceleration sensor. * It is "of Free Software"; Gnuk is distributed under GPLv3+, "by Free Software"; Gnuk development requires only Free Software (GNU Toolchain, Python, etc.), @@ -51,8 +51,8 @@ Q3: What's your recommendation for target board? A3: Orthodox choice is Olimex STM32-H103. If you have skill of electronics and like DIY, STM32 part of STM8S Discovery Kit might be the best choice. - Currently FST-01 (Flying Stone Tiny 01) is under development, - it will be the best choice, hopefully. + FST-01 (Flying Stone Tiny 01) will be soon available for sale, + and it will be the best choice, hopefully. Q4: What's version of GnuPG are you using? A4: In Debian GNU/Linux system, I use gnupg 1.4.11-3 and gnupg-agent @@ -63,12 +63,13 @@ Q5: What's version of pcscd and libccid are you using? A5: In Debian GNU/Linux system, I use pcscd 1.5.5-4 and libccid 1.3.11-2, which is in squeeze. Note that you need to edit /etc/libccid_Info.plist when using libccid (< 1.4.1). + Note that pcscd and libccid are optional, you can use Gnuk without them. Q6: What kinds of hardware is required for development? -A6: You need a target board plus a JTAG debugger. If you just want to - test Gnuk for target boards with DfuSe, JTAG debugger is not - the requirement. Note that for real use, you need JTAG debugger - to enable flash ROM protection. +A6: You need a target board plus a JTAG/SWD debugger. If you just + want to test Gnuk for target boards with DfuSe, JTAG debugger is + not the requirement. Note that for real use, you need JTAG/SWD + debugger to enable flash ROM protection. Q7: How much does it cost? A7: Olimex STM32-H103 plus ARM-USB-TINY-H cost 70 Euro or so. @@ -107,17 +108,18 @@ Ab: That's because gnome-keyring-daemon interferes GnuPG. Type: "GPG Password Agent" and "SSH Key Agent". Qc: Do you know a good SWD debugger to connect FST-01 or something? -Ac: STLink v2 is cheap one. We have a tool/stlinkv2.py as flash ROM -writer program. +Ac: ST-Link/V2 is cheap one. We have a tool/stlinkv2.py as flash ROM + writer program. Release notes ============= -This is version 1.0 release of Gnuk, after a year and eleven months -development. While it is daily use for a year or so, some newly -introduced features (including key generation and firmware upgrade) -should be considered experimental. +This is a minor release in version 1.0 series of Gnuk. + +While it is daily use for more than a year, some newly introduced +features (including key generation and firmware upgrade) should be +considered experimental. Tested features are: diff --git a/src/main.c b/src/main.c index a38e540..701af2b 100644 --- a/src/main.c +++ b/src/main.c @@ -178,7 +178,7 @@ extern msg_t USBthread (void *arg); #define LED_TIMEOUT_STOP MS2ST(200) -#define ID_OFFSET 22 +#define ID_OFFSET 24 static void device_initialize_once (void) { diff --git a/src/usb_desc.c b/src/usb_desc.c index 3d37dbd..81b00b5 100644 --- a/src/usb_desc.c +++ b/src/usb_desc.c @@ -258,11 +258,11 @@ static const uint8_t gnukStringLangID[] = { #include "usb-strings.c.inc" const uint8_t gnukStringSerial[] = { - 17*2+2, /* bLength */ + 19*2+2, /* bLength */ USB_STRING_DESCRIPTOR_TYPE, /* bDescriptorType */ /* FSIJ-1.0 */ 'F', 0, 'S', 0, 'I', 0, 'J', 0, '-', 0, - '1', 0, '.', 0, '0', 0, /* Version number of Gnuk */ + '1', 0, '.', 0, '0', 0, '.', 0, '1', 0, /* Version number of Gnuk */ '-', 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,