aboutsummaryrefslogtreecommitdiffstats
path: root/g10/app-common.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-10-20 09:39:56 +0000
committerWerner Koch <[email protected]>2004-10-20 09:39:56 +0000
commit27d06166d3972b15749d8233459bde88764dae35 (patch)
tree504b346e56d7d3a7fc156e8432b1aafd7c1fa820 /g10/app-common.h
parent* gpg.sgml: Minor language tweaks. (diff)
downloadgnupg-27d06166d3972b15749d8233459bde88764dae35.tar.gz
gnupg-27d06166d3972b15749d8233459bde88764dae35.zip
* apdu.c (apdu_open_reader): Load pcsc_get_status_change fucntion.
(pcsc_get_status): Implemented. (reset_pcsc_reader): Implemented. (open_pcsc_reader): Succeed even with no card inserted. (open_ccid_reader): Set LAST_STATUS. * iso7816.c (iso7816_select_application): Always use 0 for P1.
Diffstat (limited to '')
-rw-r--r--g10/app-common.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/g10/app-common.h b/g10/app-common.h
index 8392b485d..f54f6da92 100644
--- a/g10/app-common.h
+++ b/g10/app-common.h
@@ -16,6 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * $Id$
*/
#ifndef GNUPG_SCD_APP_COMMON_H
@@ -95,6 +97,7 @@ size_t app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff);
/*-- app.c --*/
app_t select_application (ctrl_t ctrl, int slot, const char *name);
void release_application (app_t app);
+int app_munge_serialno (app_t app);
int app_get_serial_and_stamp (app_t app, char **serial, time_t *stamp);
int app_write_learn_status (app_t app, ctrl_t ctrl);
int app_readcert (app_t app, const char *certid,
@@ -143,7 +146,6 @@ int app_openpgp_cardinfo (app_t app,
unsigned char **fpr1,
unsigned char **fpr2,
unsigned char **fpr3);
-#endif /* GNUPG_MAJOR_VERSION != 1 */
int app_openpgp_storekey (app_t app, int keyno,
unsigned char *template, size_t template_len,
time_t created_at,
@@ -154,16 +156,18 @@ int app_openpgp_storekey (app_t app, int keyno,
int app_openpgp_readkey (app_t app, int keyno,
unsigned char **m, size_t *mlen,
unsigned char **e, size_t *elen);
-#if GNUPG_MAJOR_VERSION == 1
-#else
/*-- app-nks.c --*/
int app_select_nks (app_t app);
/*-- app-dinsig.c --*/
int app_select_dinsig (app_t app);
+/*-- app-p15.c --*/
+int app_select_p15 (app_t app);
+
+
+#endif
-#endif /* GNUPG_MAJOR_VERSION != 1 */
#endif /*GNUPG_SCD_APP_COMMON_H*/