[Pkg-gnupg-commit] [gnupg2] 46/159: g10: clean up of headers for card.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit ab9a9bce77d014159c68460f5a7c263fb72f3c1c
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Dec 21 20:56:29 2015 +0900

    g10: clean up of headers for card.
    
    * g10/main.h (save_unprotected_key_to_card): Remove.
    * g10/options.h (ctapi_driver, pcsc_driver, disable_ccid): Remove.
---
 g10/main.h    | 1 -
 g10/options.h | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/g10/main.h b/g10/main.h
index 60bbd24..c3a2114 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -297,7 +297,6 @@ gpg_error_t generate_subkeypair (ctrl_t ctrl, kbnode_t pub_keyblock);
 #ifdef ENABLE_CARD_SUPPORT
 gpg_error_t generate_card_subkeypair (kbnode_t pub_keyblock,
                                       int keyno, const char *serialno);
-int save_unprotected_key_to_card (PKT_public_key *sk, int keyno);
 #endif
 
 
diff --git a/g10/options.h b/g10/options.h
index 0bb2aae..1407b2f 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -220,13 +220,6 @@ struct
      value. */
   int limit_card_insert_tries;
 
-#ifdef ENABLE_CARD_SUPPORT
-  /* FIXME: We don't needs this here as it is done in scdaemon. */
-  const char *ctapi_driver; /* Library to access the ctAPI. */
-  const char *pcsc_driver;  /* Library to access the PC/SC system. */
-  int disable_ccid;    /* Disable the use of the internal CCID driver. */
-#endif /*ENABLE_CARD_SUPPORT*/
-
   struct
   {
     /* If set, require an 0x19 backsig to be present on signatures

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git