aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2003-10-11 16:32:03 +0000
committerWerner Koch <[email protected]>2003-10-11 16:32:03 +0000
commitbc14a878e2b4acc9e2beda9638eb079895f9611c (patch)
tree0355bbc035a1fe76db7da68c203b66060f1eb39a
parentPrepared for next development cycle (diff)
downloadgnupg-bc14a878e2b4acc9e2beda9638eb079895f9611c.tar.gz
gnupg-bc14a878e2b4acc9e2beda9638eb079895f9611c.zip
Always enable the gen_card_key prototype.
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/keygen.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 165997611..e45d02100 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-11 Werner Koch <[email protected]>
+
+ * keygen.c: Always enable the gen_card_key prototype.
+
2003-10-10 Werner Koch <[email protected]>
* cardglue.c (card_close): New.
diff --git a/g10/keygen.c b/g10/keygen.c
index a3cf67150..b57206f88 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -114,10 +114,8 @@ static int mdc_available,ks_modify;
static void do_generate_keypair( struct para_data_s *para,
struct output_control_s *outctrl, int card );
static int write_keyblock( IOBUF out, KBNODE node );
-#ifdef ENABLE_CARD_SUPPORT
static int gen_card_key (int algo, int keyno, KBNODE pub_root, KBNODE sec_root,
u32 expireval, struct para_data_s *para);
-#endif
static void
write_uid( KBNODE root, const char *s )