From 3074058ff7736c45a22f255d83b4e39cafaa0960 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 22 Dec 2011 17:10:41 +0900
Subject: [PATCH] more fix to CERTDO_SUPPORT

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

diff --git a/ChangeLog b/ChangeLog
index 5d6704b..f5cf0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-22  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (extended_capabilities) [CERTDO_SUPPORT]:
+	conditionalize.
+
 2011-12-21  Niibe Yutaka  <gniibe@fsij.org>
 
 	* src/openpgp-do.c (gpg_do_get_data) [CERTDO_SUPPORT]: ifdef out.
diff --git a/src/openpgp-do.c b/src/openpgp-do.c
index cd9ab77..c297939 100644
--- a/src/openpgp-do.c
+++ b/src/openpgp-do.c
@@ -98,14 +98,18 @@ static const uint8_t extended_capabilities[] __attribute__ ((aligned (1))) = {
 				 */
   0,		  /* Secure Messaging Algorithm: N/A (TDES=0, AES=1) */
   0x00, 0x00,	  /* Max get challenge */
+#ifdef CERTDO_SUPPORT
   0x07, 0xfe,	  /* max. length of cardholder certificate (2KB - 2)*/
+#else
+  0x00, 0x00,
+#endif
   /* Max. length of command data */
   (MAX_CMD_APDU_SIZE>>8), (MAX_CMD_APDU_SIZE&0xff),
   /* Max. length of response data */
-#if 0
-  (MAX_RES_APDU_SIZE>>8), (MAX_RES_APDU_SIZE&0xff),
-#else
+#ifdef CERTDO_SUPPORT
   0x08, 0x00,		     /* the case of cardholder ceritificate */
+#else
+  (MAX_RES_APDU_SIZE>>8), (MAX_RES_APDU_SIZE&0xff),
 #endif
 };