diff options
| author | Werner Koch <[email protected]> | 2004-09-23 13:32:31 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-09-23 13:32:31 +0000 |
| commit | 42c18de83a8eab8d4da3e4d4193a8750cf8ba6be (patch) | |
| tree | 1ef5722c3febb23acd01cb49bf266dfd370a6047 /g10/app-common.h | |
| parent | * mainproc.c (check_sig_and_print), keyedit.c (show_prefs, (diff) | |
| download | gnupg-42c18de83a8eab8d4da3e4d4193a8750cf8ba6be.tar.gz gnupg-42c18de83a8eab8d4da3e4d4193a8750cf8ba6be.zip | |
* gpg.sgml: Document "addcardkey" and "keytocard".
* apdu.c (open_pcsc_reader): Do not print empty reader string.
* keygen.c (ask_algo): Allow creation of AUTH keys.
* keyid.c (usagestr_from_pk): New.
* app-openpgp.c (app_openpgp_storekey): Call flush_cache.
* keyedit.c (keyedit_menu): New command "keytocard"
(keyedit_menu): Bad hack for the not_with_sk element.
(show_key_with_all_names): Print the usage.
(find_pk_from_sknode): New.
* card-util.c (card_store_subkey): New.
(copy_mpi): New.
* cardglue.c (agent_openpgp_storekey): New.
Diffstat (limited to 'g10/app-common.h')
| -rw-r--r-- | g10/app-common.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/app-common.h b/g10/app-common.h index c61bcca60..8392b485d 100644 --- a/g10/app-common.h +++ b/g10/app-common.h @@ -143,6 +143,7 @@ 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, @@ -153,6 +154,8 @@ 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); @@ -160,8 +163,7 @@ int app_select_nks (app_t app); int app_select_dinsig (app_t app); -#endif - +#endif /* GNUPG_MAJOR_VERSION != 1 */ #endif /*GNUPG_SCD_APP_COMMON_H*/ |