From: Richard Levitte Date: Tue, 30 Jun 2009 10:27:50 +0000 (+0000) Subject: Add options for Yubikey II setting. X-Git-Tag: yubikey-personalisation_1.3.5-1~4^2~126 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e804aaa16da9d83e8dd29a4a1660c6ed9f6194aa;p=yubikey-personalization Add options for Yubikey II setting. Disable them for now however, since we don't have the values yet --- diff --git a/ykpersonalize.c b/ykpersonalize.c index 8c7ceb7..16783d7 100644 --- a/ykpersonalize.c +++ b/ykpersonalize.c @@ -67,13 +67,29 @@ const char *usage = " [-]append-delay1 set/clear the APPEND_DELAY1 ticket flag.\n" " [-]append-delay2 set/clear the APPEND_DELAY2 ticket flag.\n" " [-]append-cr set/clear the APPEND_CR ticket flag.\n" +#if 0 +" [-]protect-cfg2 set/clear the PROTECT_CFG2 ticket flag.\n" +" (only with Yubikey II!)\n" +#endif " [-]send-ref set/clear the SEND_REF configuration flag.\n" " [-]ticket-first set/clear the TICKET_FIRST configuration flag.\n" +" (only with Yubikey I!)\n" " [-]pacing-10ms set/clear the PACING_10MS configuration flag.\n" " [-]pacing-20ms set/clear the PACING_20MS configuration flag.\n" " [-]allow-hidtrig set/clear the ALLOW_HIDTRIG configuration flag.\n" +" (only with Yubikey I!)\n" " [-]static-ticket set/clear the STATIC_TICKET configuration flag.\n" -"" +#if 0 +" [-]short_ticket set/clear the SHORT_TICKET configuration flag.\n" +" (only with Yubikey II!)\n" +" [-]strong_pw1 set/clear the STRONG_PW1 configuration flag.\n" +" (only with Yubikey II!)\n" +" [-]strong_pw2 set/clear the STRONG_PW2 configuration flag.\n" +" (only with Yubikey II!)\n" +" [-]man_update set/clear the MAN_UPDATE configuration flag.\n" +" (only with Yubikey II!)\n" +#endif +"\n" "-v verbose\n" "-h help (this text)\n" ; @@ -279,6 +295,12 @@ main(int argc, char **argv) ykp_set_tktflag_APPEND_CR(cfg, true); else if (strcmp(optarg, "-append-cr") == 0) ykp_set_tktflag_APPEND_CR(cfg, false); +#if 0 + else if (strcmp(optarg, "protect-cfg2") == 0) + ykp_set_tktflag_PROTECT_CFG2(cfg, true); + else if (strcmp(optarg, "-protect-cfg2") == 0) + ykp_set_tktflag_PROTECT_CFG2(cfg, false); +#endif else if (strcmp(optarg, "send-ref") == 0) ykp_set_cfgflag_SEND_REF(cfg, true); else if (strcmp(optarg, "-send-ref") == 0) @@ -303,6 +325,24 @@ main(int argc, char **argv) ykp_set_cfgflag_STATIC_TICKET(cfg, true); else if (strcmp(optarg, "-static-ticket") == 0) ykp_set_cfgflag_STATIC_TICKET(cfg, false); +#if 0 + else if (strcmp(optarg, "short-ticket") == 0) + ykp_set_cfgflag_SHORT_TICKET(cfg, true); + else if (strcmp(optarg, "-short-ticket") == 0) + ykp_set_cfgflag_SHORT_TICKET(cfg, false); + else if (strcmp(optarg, "strong-pw1") == 0) + ykp_set_cfgflag_STRONG_PW1(cfg, true); + else if (strcmp(optarg, "-strong-pw1") == 0) + ykp_set_cfgflag_STRONG_PW1(cfg, false); + else if (strcmp(optarg, "strong-pw2") == 0) + ykp_set_cfgflag_STRONG_PW2(cfg, true); + else if (strcmp(optarg, "-strong-pw2") == 0) + ykp_set_cfgflag_STRONG_PW2(cfg, false); + else if (strcmp(optarg, "man-update") == 0) + ykp_set_cfgflag_MAN_UPDATE(cfg, true); + else if (strcmp(optarg, "-man-update") == 0) + ykp_set_cfgflag_MAN_UPDATE(cfg, false); +#endif else { fprintf(stderr, "Unknown option '%s'\n", optarg);