diff --git a/.gitignore b/.gitignore index 5079514..b0242ea 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ regnual/regnual.elf doc/_build tests/.cache tests/__pycache__ +tests/.pytest_cache diff --git a/ChangeLog b/ChangeLog index 3b118dc..386fad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-03-04 NIIBE Yutaka + + * VERSION: 1.2.14. + + * chopstx: Update to 1.14. + + * tool/gnuk_token.py: Add 1209:2440. + 2019-02-24 NIIBE Yutaka * src/usb-ccid.c (ccid_thread): Clean up the ack button state diff --git a/NEWS b/NEWS index b5bb408..bd39b9e 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,18 @@ Gnuk NEWS - User visible changes +* Major changes in Gnuk 1.2.14 + + Released 2019-03-05, by NIIBE Yutaka + +** Timeout for ACK button support +When a user doesn't acknowledge (> 15 seconds), the operation +timeouts, and authentication state is cleared. + +** Upgrade of Chopstx +We use Chopstx 1.14. + + * Major changes in Gnuk 1.2.13 Released 2018-12-26, by NIIBE Yutaka diff --git a/README b/README index eb47e0f..07755f3 100644 --- a/README +++ b/README @@ -1,14 +1,14 @@ Gnuk - An Implementation of USB Cryptographic Token for GnuPG - Version 1.2.13 - 2018-12-26 + Version 1.2.14 + 2019-03-05 Niibe Yutaka Free Software Initiative of Japan Release Notes ============= -This is the release of Gnuk, version 1.2.13, which has major +This is the release of Gnuk, version 1.2.14, which has major incompatible changes to Gnuk 1.0.x. Specifically, it now supports overriding key import, but importing keys (or generating keys) results password reset. Also, you need to import private keys before changing @@ -249,7 +249,7 @@ External source code Gnuk is distributed with external source code. -* chopstx/ -- Chopstx 1.13 +* chopstx/ -- Chopstx 1.14 We use Chopstx as the kernel for Gnuk. @@ -372,9 +372,9 @@ On Debian we can install the packages of gcc-arm-none-eabi, gdb-arm-none-eabi and its friends. I'm using: binutils-arm-none-eabi 2.31.1-2+10 - gcc-arm-none-eabi 15:7-2018-q2-4 - gdb-arm-none-eabi 7.12-6+9+b2 - libnewlib-arm-none-eabi 3.0.0.20180802-2 + gcc-arm-none-eabi 15:7-2018-q2-6 + gdb-multiarch 8.2.1-1 + libnewlib-arm-none-eabi 3.1.0.20181231-1 Or else, see https://launchpad.net/gcc-arm-embedded for preparation of GNU Toolchain for 'arm-none-eabi' target. diff --git a/VERSION b/VERSION index b8c202b..a11d2c3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -release/1.2.13 +release/1.2.14 diff --git a/chopstx b/chopstx index bd330d8..aeea3c3 160000 --- a/chopstx +++ b/chopstx @@ -1 +1 @@ -Subproject commit bd330d81c3d8d557edcec610b2b7c25390ee3ff0 +Subproject commit aeea3c31f8dab3e5920e4c35f6199b519f928c79 diff --git a/tool/gnuk_token.py b/tool/gnuk_token.py index 977a426..03bff9e 100644 --- a/tool/gnuk_token.py +++ b/tool/gnuk_token.py @@ -30,6 +30,7 @@ from array import array USB_PRODUCT_LIST=[ { 'vendor' : 0x234b, 'product' : 0x0000 }, # FSIJ Gnuk Token { 'vendor' : 0x20a0, 'product' : 0x4211 }, # Nitrokey Start + { 'vendor' : 0x1209, 'product' : 0x2440 }, # GnuPG e.V. ] # USB class, subclass, protocol