From 8cf0dd5665d86063864b5d924435312367e2df0c Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 26 Feb 2013 10:25:32 +0900
Subject: [PATCH] fixes to enable reGNUal

---
 ChangeLog          | 7 +++++++
 README             | 4 ++++
 regnual/regnual.ld | 4 ++--
 src/main.c         | 2 ++
 src/random.c       | 8 +++++++-
 src/random.h       | 1 +
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45d39d5..77a53f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-26  Niibe Yutaka  <gniibe@fsij.org>
+
+	* regnual/regnual.ld (MEMORY): Fix start address.
+
+	* src/random.c (random_fini): New.
+	* src/main.c (main): Call random_fini.
+
 2013-02-25  Niibe Yutaka  <gniibe@fsij.org>
 
 	* src/configure: Correct typo in help text.
diff --git a/README b/README
index ce7a511..62011e3 100644
--- a/README
+++ b/README
@@ -1,3 +1,7 @@
+************* THIS IS DEVELOPMENT BRANCH OF GNUK       *************
+************* Text written below is for release 1.0.2, *************
+************* which might not be vaild for this code   *************
+
 Gnuk - An Implementation of USB Cryptographic Token for GnuPG
 
 							  Version 1.0.2
diff --git a/regnual/regnual.ld b/regnual/regnual.ld
index 879b4f1..648b27c 100644
--- a/regnual/regnual.ld
+++ b/regnual/regnual.ld
@@ -7,8 +7,8 @@ __stacks_total_size__   = __main_stack_size__ + __process_stack_size__;
 
 MEMORY
 {
-    ram0 : org = 0x20000000, len = 0x1a00
-    ram1 : org = 0x20001400, len = 20k - 0x1a00
+    ram0 : org = 0x20000000, len = 0x1c00
+    ram1 : org = 0x20001c00, len = 20k - 0x1c00
 }
 
 vector = 0x08000000;
diff --git a/src/main.c b/src/main.c
index 6897a9c..501359b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -428,6 +428,8 @@ main (int argc, char *argv[])
 #endif
     }
 
+  random_fini ();
+
   set_led (1);
   usb_lld_shutdown ();
   /* Disable SysTick */
diff --git a/src/random.c b/src/random.c
index cc6dcd1..29c47c6 100644
--- a/src/random.c
+++ b/src/random.c
@@ -1,7 +1,7 @@
 /*
  * random.c -- get random bytes
  *
- * Copyright (C) 2010, 2011, 2012 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012, 2013 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -40,6 +40,12 @@ random_init (void)
     (void)neug_get (NEUG_KICK_FILLING);
 }
 
+void
+random_fini (void)
+{
+  neug_fini ();
+}
+
 /*
  * Return pointer to random 32-byte
  */
diff --git a/src/random.h b/src/random.h
index 4341169..f54d3b5 100644
--- a/src/random.h
+++ b/src/random.h
@@ -1,4 +1,5 @@
 void random_init (void);
+void random_fini (void);
 
 /* 32-byte random bytes */
 const uint8_t *random_bytes_get (void);