From 0932465f0bb6146c20a60a46668721c3b956221c Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 2 Feb 2017 13:07:35 +0900
Subject: [PATCH] Update Chopstx to 1.3.

---
 ChangeLog     | 5 +++++
 NEWS          | 8 ++++++++
 README        | 6 +++++-
 chopstx       | 2 +-
 src/configure | 9 +++++----
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 191ef64..05c8e4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-02  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* chopstx: Update to 1.3.
+	* src/configure: Add BLUE_PILL in the help message.
+
 2017-02-01  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* README: Update README.  Thanks to Paul Fertser.
diff --git a/NEWS b/NEWS
index d024daa..e88f6cc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 Gnuk NEWS - User visible changes
 
+* Major changes in Gnuk 1.2.3
+
+  Released 2017-02-XX, by NIIBE Yutaka
+
+** Upgrade of Chopstx
+We use Chopstx 1.3.
+
+
 * Major changes in Gnuk 1.2.2
 
   Released 2016-10-15, by NIIBE Yutaka
diff --git a/README b/README
index 366ad0f..b47a450 100644
--- a/README
+++ b/README
@@ -248,7 +248,7 @@ External source code
 
 Gnuk is distributed with external source code.
 
-* chopstx/  -- Chopstx 1.2
+* chopstx/  -- Chopstx 1.3
 
   We use Chopstx as the kernel for Gnuk.
 
@@ -552,6 +552,10 @@ Inside GDB, we can connect OpenOCD by:
 
   (gdb) target remote localhost:3333
 
+or
+
+  (gdb) target extended-remote localhost:3333
+
 
 You can see the output of PCSCD:
 
diff --git a/chopstx b/chopstx
index d448d3c..89eb549 160000
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit d448d3c678245b71a28b44652c053968ea70fa56
+Subproject commit 89eb54929e610045d6563a1e6ff24d49c06c427e
diff --git a/src/configure b/src/configure
index a4eda6b..155660f 100755
--- a/src/configure
+++ b/src/configure
@@ -6,7 +6,7 @@ nl=$'\n'
 #
 # This file is *NOT* generated by GNU Autoconf, but written by NIIBE Yutaka
 #
-# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
+# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
 #               Free Software Initiative of Japan
 #
 # This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -118,14 +118,15 @@ Configuration:
 			   FST_01
 			   FST_01G
 			   OLIMEX_STM32_H103
-			   STM32_PRIMER2
-			   STBEE
-			   STBEE_MINI
 			   MAPLE_MINI
 			   ST_DONGLE
 			   ST_NUCLEO_F103
 			   NITROKEY_START
+			   BLUE_PILL
 			   CQ_STARM
+			   STM32_PRIMER2
+			   STBEE
+			   STBEE_MINI
 			   FST_01_00 (unreleased version with 8MHz XTAL)
   --enable-debug	debug with virtual COM port	[no]
   --enable-pinpad=cir