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

fix main and upgrade to Chopstx 0.10

Browse Source
This commit is contained in:
NIIBE Yutaka
2015-09-15 10:45:22 +09:00
parent 9b7d400550
commit 03c024f8f6
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2015-09-15 Niibe Yutaka <gniibe@fsij.org> 2015-09-15 Niibe Yutaka <gniibe@fsij.org>
* chopstx: Update to 0.10.
* src/main.c (main): Don't join after calling ccid_usb_reset.
* src/usb-icc.c (ccid_thread): Don't finish on reset, but * src/usb-icc.c (ccid_thread): Don't finish on reset, but
keep running. keep running.

4
NEWS
View File

@@ -5,7 +5,7 @@ Gnuk NEWS - User visible changes
Released 2015-09-??, by NIIBE Yutaka Released 2015-09-??, by NIIBE Yutaka
** Upgrade of Chopstx ** Upgrade of Chopstx
We use Chopstx 0.09, which supports Nitrokey-Start. We use Chopstx 0.10, which supports Nitrokey-Start.
** Card serial number ** Card serial number
The way to determine a serial number of Gnuk Token for card has been The way to determine a serial number of Gnuk Token for card has been
@@ -35,7 +35,7 @@ We use Chopstx 0.07, which supports STM32 Primer2 and CQ STARM, too.
** Experimental Curve25519 support. ** Experimental Curve25519 support.
Gnuk can support Curve25519 (for deecryption). Note that this is Gnuk can support Curve25519 (for decryption). Note that this is
pretty much experimental, and subjects to change. The low level code pretty much experimental, and subjects to change. The low level code
is somehow stable, but there are no consensus in higer level. is somehow stable, but there are no consensus in higer level.
Especially, OID in the key attribute would be changed in future. Especially, OID in the key attribute would be changed in future.

2
chopstx

Submodule chopstx updated: ae0e475373...a30a069ed8

4
src/main.c
View File

@@ -385,10 +385,6 @@ main (int argc, char *argv[])
break; break;
case LED_USB_RESET: case LED_USB_RESET:
ccid_usb_reset (); ccid_usb_reset ();
chopstx_join (ccid_thd, NULL);
/* Invoke the CCID thread again. */
ccid_thd = chopstx_create (PRIO_CCID, __stackaddr_ccid,
__stacksize_ccid, USBthread, NULL);
break; break;
case LED_GNUK_EXEC: case LED_GNUK_EXEC:
goto exec; goto exec;