From f59637700a7862d05a690656a21d89cdd788c826 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 27 Jan 2011 15:09:59 +0900
Subject: [PATCH] some cosmetic changes

---
 ChangeLog        |  5 ++++-
 NEWS             |  2 +-
 src/openpgp-do.c | 10 ++++++----
 src/usb_prop.c   |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2621835..c594045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2011-01-27  NIIBE Yutaka  <gniibe@fsij.org>
 
-	* src/openpgp.c (cmd_reset_user_password): Added PINPAD_SUPPORT.
+	* src/openpgp-do.c (gpg_do_table): Exclude GPG_DO_CH_CERTIFICATE
+	for now.
+
+	* src/openpgp.c (cmd_reset_user_password): Add PINPAD_SUPPORT.
 
 	* src/gnuk.ld.in: Fix alignment and filling.
 
diff --git a/NEWS b/NEWS
index fd8f522..30743a6 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ Gnuk NEWS - User visible changes
   Released 2011-01-XX, by NIIBE Yutaka
 
 ** Better interoperability to OpenSC.
-Gnuk is not yet supported by OpenSC, but it should be.  With the
+Gnuk is not yet supported by OpenSC, but it could be.  With the
 changes in Gnuk, it could be relatively easily possible to support
 Gnuk Token by OpenSC with a few changes to libopensc/card-openpgp.c,
 and libopensc/pkcs15-openpgp.c.
diff --git a/src/openpgp-do.c b/src/openpgp-do.c
index b1a38dc..07b46fb 100644
--- a/src/openpgp-do.c
+++ b/src/openpgp-do.c
@@ -1,7 +1,7 @@
 /*
  * openpgp-do.c -- OpenPGP card Data Objects (DO) handling
  *
- * Copyright (C) 2010 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -928,8 +928,10 @@ gpg_do_table[] = {
   /* Compound data: Write access only */
   { GPG_DO_KEY_IMPORT, DO_PROC_WRITE, AC_NEVER, AC_ADMIN_AUTHORIZED,
     proc_key_import },
+#if 0
   /* Card holder certificate: Not supported yet */
   { GPG_DO_CH_CERTIFICATE, DO_PROC_READWRITE, AC_NEVER, AC_NEVER, NULL },
+#endif
 };
 
 #define NUM_DO_ENTRIES (int)(sizeof (gpg_do_table) \
@@ -1218,7 +1220,7 @@ gpg_do_get_data (uint16_t tag, int with_tag)
 	}
     }
   else
-    GPG_NO_RECORD();
+    GPG_NO_RECORD ();
 }
 
 void
@@ -1298,7 +1300,7 @@ gpg_do_put_data (uint16_t tag, const uint8_t *data, int len)
 	}
     }
   else
-    GPG_NO_RECORD();
+    GPG_NO_RECORD ();
 }
 
 void
@@ -1320,7 +1322,7 @@ gpg_do_public_key (uint8_t kk_byte)
   if (do_data == NULL)
     {
       DEBUG_INFO ("none.\r\n");
-      GPG_NO_RECORD();
+      GPG_NO_RECORD ();
       return;
     }
 
diff --git a/src/usb_prop.c b/src/usb_prop.c
index f7f767d..9c58f22 100644
--- a/src/usb_prop.c
+++ b/src/usb_prop.c
@@ -1,7 +1,7 @@
 /*
  * usb_prop.c - glue/interface code between Gnuk and USB-FS-Device_Lib
  *
- * Copyright (C) 2010 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.