fix main and upgrade to Chopstx 0.10

ChangeLog

@@ -1,5 +1,8 @@
 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
 	keep running.
 

NEWS

@@ -5,7 +5,7 @@ Gnuk NEWS - User visible changes
   Released 2015-09-??, by NIIBE Yutaka
 
 ** Upgrade of Chopstx
-We use Chopstx 0.09, which supports Nitrokey-Start.
+We use Chopstx 0.10, which supports Nitrokey-Start.
 
 ** Card serial number
 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.
 
-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
 is somehow stable, but there are no consensus in higer level.
 Especially, OID in the key attribute would be changed in future.

src/main.c

@@ -385,10 +385,6 @@ main (int argc, char *argv[])
 	  break;
 	case LED_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;
 	case LED_GNUK_EXEC:
 	  goto exec;