From 2181c1a42878826074bd2e2b784fe73d11f826a4 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Fri, 7 Oct 2011 11:01:21 +0900
Subject: [PATCH] version 0.14

---
 ChangeLog      |  7 +++++++
 NEWS           | 10 ++++++++++
 README         | 10 ++++++----
 src/neug.c     |  2 +-
 src/random.c   |  2 ++
 src/usb_desc.c |  2 +-
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e2a7697..2e649c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-07  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* Version 0.14.
+	* src/usb_desc.c (gnukStringSerial): Updated.
+
+	* src/random.c (random_init): Call neug_prng_reseed.
+
 2011-10-06  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* src/Makefile.in (random_bits): Remove.
diff --git a/NEWS b/NEWS
index 062af8e..8644738 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,15 @@
 Gnuk NEWS - User visible changes
 
+* Major changes in Gnuk 0.14
+
+  Released 2011-10-07, by NIIBE Yutaka
+
+** Random number generator change
+NeuG, Gniibe's True RNG implementation for STM32F103, has been
+integrated to Gnuk.  It is not needed to put random number bytes
+(generated by host) to Token any more.
+
+
 * Major changes in Gnuk 0.13
 
   Released 2011-06-15, by NIIBE Yutaka
diff --git a/README b/README
index 3496f82..a974551 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 Gnuk - software for GnuPG USB Token
 
-							   Version 0.13
-							     2011-06-15
+							   Version 0.14
+							     2011-10-07
 						           Niibe Yutaka
 				      Free Software Initiative of Japan
 
@@ -27,7 +27,7 @@ FAQ
 ===
 
 Q0: How Gnuk USB Token is superior than other solutions (OpenPGP
-    card 2.0, GPF Crypto Stick, etc) ?
+    card 2.0, GPF Crypto Stick, etc.) ?
     http://www.g10code.de/p-card.html
     http://www.privacyfoundation.de/crypto_stick/
 A0: IMRHO, not quite.  There is no ready-to-use out-of-box product.
@@ -54,6 +54,8 @@ Q3: What's your recommendation for target board?
 A3: Orthodox choice is Olimex STM32-H103.
     If you have skill of electronics and like DIY, STM32 part of STM8S
     Discovery Kit might be the best choice.
+    Currently FST-01 (Flying Stone Tiny 01) is under development,
+    it will be the best choice, hopefully.
 
 Q4: What's version of GnuPG are you using?
 A4: In Debian GNU/Linux system, I use gnupg 1.4.11-3 and gnupg-agent
@@ -125,7 +127,7 @@ It is known not-working well:
 Not supported feature(s):
 
 	* Overriding key import.  You need to remove all keys first.
-	* Key generation
+	* Key generation on device side
 
 
 Targets
diff --git a/src/neug.c b/src/neug.c
index b3b1b99..be95ae9 100644
--- a/src/neug.c
+++ b/src/neug.c
@@ -1,5 +1,5 @@
 /*
- * random.c - random number generation
+ * neug.c - random number generation (from NeuG/src/random.c)
  *
  * Copyright (C) 2011 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
diff --git a/src/random.c b/src/random.c
index a5eef70..95299f6 100644
--- a/src/random.c
+++ b/src/random.c
@@ -38,6 +38,8 @@ random_init (void)
 
   for (i = 0; i < NEUG_PRE_LOOP; i++)
     (void)neug_get (NEUG_KICK_FILLING);
+
+  neug_prng_reseed ();
 }
 
 /*
diff --git a/src/usb_desc.c b/src/usb_desc.c
index c6671d2..47565e9 100644
--- a/src/usb_desc.c
+++ b/src/usb_desc.c
@@ -227,7 +227,7 @@ static const uint8_t gnukStringProduct[] = {
 const uint8_t gnukStringSerial[] = {
   13*2+2,			/* bLength */
   USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */
-  '0', 0, '.', 0, '1', 0, '3', 0, /* Version number of Gnuk */
+  '0', 0, '.', 0, '1', 0, '4', 0, /* Version number of Gnuk */
   '-', 0,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,