aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--NEWS14
-rw-r--r--README6
-rw-r--r--VERSION2
m---------chopstx0
5 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 072584b..496eddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2017-08-11 NIIBE Yutaka <gniibe@fsij.org>
+ * VERSION: 1.2.5.
+ * chopstx: Update to 1.4.
+
* src/gnuk.ld.in (__process3_stack_size__): Tweak the size.
* src/configure: Define STM32F103_OVERRIDE_FLASH_SIZE_KB for
diff --git a/NEWS b/NEWS
index 6e21a55..027346b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,19 @@
Gnuk NEWS - User visible changes
+* Major changes in Gnuk 1.2.5
+
+ Released 2017-08-11, by NIIBE Yutaka
+
+** "factory-reset" fix
+Gnuk's behavior was implemented by referring the gpg implementation.
+It found that gpg implementation was not good from the viewpoint of
+the OpenPGP card specification. GnuPG was fixed to match the OpenPGP
+card specification already. Thus, Gnuk is now fixed.
+
+** Upgrade of Chopstx
+We use Chopstx 1.4.
+
+
* Major changes in Gnuk 1.2.4
Released 2017-05-12, by NIIBE Yutaka
diff --git a/README b/README
index 08feaed..d319332 100644
--- a/README
+++ b/README
@@ -1,14 +1,14 @@
Gnuk - An Implementation of USB Cryptographic Token for GnuPG
- Version 1.2.4
- 2017-05-12
+ Version 1.2.5
+ 2017-08-11
Niibe Yutaka
Free Software Initiative of Japan
Release Notes
=============
-This is the release of Gnuk, version 1.2.4, which has major
+This is the release of Gnuk, version 1.2.5, 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. Please update your documentation for Gnuk Token, so
diff --git a/VERSION b/VERSION
index 61b467a..3de73a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-release/1.2.4
+release/1.2.5
diff --git a/chopstx b/chopstx
-Subproject 87767f1be5d8d4adac8d23a285250299eccee3f
+Subproject d8df82badf671fef49d5eae2e5a2f1b5ae46bf9