aboutsummaryrefslogtreecommitdiffstats
path: root/g10/main.h
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-09-25 13:04:55 +0000
committerDavid Shaw <[email protected]>2004-09-25 13:04:55 +0000
commit2ff6607f0d0a3e911cb02c719dabc8e5cf6a994b (patch)
tree4980aecbdb74dbb13990a4673bf24defa1d8db9a /g10/main.h
parent* main.h: Create S2K_DIGEST_ALGO macro so we do not need to always set (diff)
downloadgnupg-2ff6607f0d0a3e911cb02c719dabc8e5cf6a994b.tar.gz
gnupg-2ff6607f0d0a3e911cb02c719dabc8e5cf6a994b.zip
* main.h, g10.c (main), card-util.c (change_pin): If "admin" has not been
issued, skip right to the CHV1/CHV2 PIN change. No need to show the unblock or admin PIN change option. (card_edit): Add "admin" command to add admin commands to the menu. Do not allow admin commands until "admin" is given. * app-openpgp.c (verify_chv3): Show a countdown of how many wrong admin PINs can be entered before the card is locked. * options.h, g10.c (main), app-openpgp.c (verify_chv3): Remove --allow-admin.
Diffstat (limited to 'g10/main.h')
-rw-r--r--g10/main.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/main.h b/g10/main.h
index 71c1a2b3e..aa213bbe0 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -265,7 +265,7 @@ void unblock_all_signals(void);
#ifdef ENABLE_CARD_SUPPORT
/*-- card-util.c --*/
-void change_pin (int no);
+void change_pin (int no, int allow_admin);
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);