[git] GnuPG - branch, master, updated. gnupg-2.1.10-46-gab9a9bc

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  ab9a9bce77d014159c68460f5a7c263fb72f3c1c (commit)
      from  98f9e14323bf806f674b3cc259e19ef6219b4378 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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.

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

-----------------------------------------------------------------------

Summary of changes:
 g10/main.h    | 1 -
 g10/options.h | 7 -------
 2 files changed, 8 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org