From: Klas Lindfors Date: Thu, 26 Apr 2012 06:15:46 +0000 (+0200) Subject: don't check for neo after 4, check if it's older than 5 X-Git-Tag: v1.7.0~1^2~20 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cc7c9aa5ce8eee483256957abd76fdee2982d49;p=yubikey-personalization don't check for neo after 4, check if it's older than 5 --- diff --git a/ykpers.c b/ykpers.c index 4e167e2..bce6e97 100644 --- a/ykpers.c +++ b/ykpers.c @@ -441,11 +441,9 @@ static bool vcheck_neo(const YKP_CONFIG *cfg) } -static bool vcheck_neo_after_4(const YKP_CONFIG *cfg) +static bool vcheck_neo_before_5(const YKP_CONFIG *cfg) { - return (cfg->yk_major_version == 2 && - cfg->yk_minor_version == 1 && - cfg->yk_build_version > 4); + return vcheck_neo && cfg->yk_build_version < 5; } static bool capability_has_hidtrig(const YKP_CONFIG *cfg) @@ -460,12 +458,12 @@ static bool capability_has_ticket_first(const YKP_CONFIG *cfg) static bool capability_has_static(const YKP_CONFIG *cfg) { - return vcheck_all(cfg) && !vcheck_neo_after_4(cfg); + return vcheck_all(cfg) && !vcheck_neo_before_5(cfg); } static bool capability_has_static_extras(const YKP_CONFIG *cfg) { - return vcheck_no_v1(cfg) && !vcheck_neo_after_4(cfg); + return vcheck_no_v1(cfg) && !vcheck_neo_before_5(cfg); } static bool capability_has_slot_two(const YKP_CONFIG *cfg)