diff options
| author | Werner Koch <[email protected]> | 2004-09-20 18:38:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-09-20 18:38:39 +0000 |
| commit | 9d17a635c977a209bee78203e3cfb85a9cb09fc6 (patch) | |
| tree | 9fdd7a23c8193693c305a5f1716f02b170fc2899 /g10/main.h | |
| parent | * cardglue.c (open_card): Use shutdown code if possible. (diff) | |
| download | gnupg-9d17a635c977a209bee78203e3cfb85a9cb09fc6.tar.gz gnupg-9d17a635c977a209bee78203e3cfb85a9cb09fc6.zip | |
* gpg.sgml: Document -K.
* g10.c: Make -K an alias for --list-secret-keys.
* keylist.c (print_card_serialno): New. Taken from gnupg 1.9.11.
(list_keyblock_print): Make use of it.
* keyedit.c (show_key_with_all_names): Print the card S/N.
* keyedit.c (keyedit_menu): New command ADDCARDKEY.
* card-util.c (card_generate_subkey): New.
* keygen.c (generate_card_subkeypair): New.
(gen_card_key): New arg IS_PRIMARY; changed all callers.
* cardglue.c (open_card): Use shutdown code if possible.
(check_card_serialno): Ditto.
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index d86931e8c..c84a059e3 100644 --- a/g10/main.h +++ b/g10/main.h @@ -162,6 +162,10 @@ int keygen_upd_std_prefs( PKT_signature *sig, void *opaque ); int keygen_add_keyserver_url(PKT_signature *sig, void *opaque); int keygen_add_revkey(PKT_signature *sig, void *opaque); int generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock ); +#ifdef ENABLE_CARD_SUPPORT +int generate_card_subkeypair (KBNODE pub_keyblock, KBNODE sec_keyblock, + int keyno, const char *serialno); +#endif /*-- openfile.c --*/ int overwrite_filep( const char *fname ); @@ -257,6 +261,7 @@ void unblock_all_signals(void); void change_pin (int no); void card_status (FILE *fp, char *serialno, size_t serialnobuflen); void card_edit (STRLIST commands); +int card_generate_subkey (KBNODE pub_keyblock, KBNODE sec_keyblock); #endif #endif /*G10_MAIN_H*/ |