From: Klas Lindfors <klas@yubico.com>
Date: Thu, 26 Apr 2012 05:42:04 +0000 (+0200)
Subject: there was no 2.1.9 and there might be a neo with 2.1.9
X-Git-Tag: v1.7.0~1^2~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2d68341b4b756e561b9e7fea3de6c759a6038f0;p=yubikey-personalization

there was no 2.1.9 and there might be a neo with 2.1.9
---

diff --git a/ykpers.c b/ykpers.c
index 802aa71..d284ab3 100644
--- a/ykpers.c
+++ b/ykpers.c
@@ -170,7 +170,7 @@ int ykp_configure_command(YKP_CONFIG *cfg, uint8_t command)
 		}
 		/* The NEO Beta key is versioned from 2.1.4 but doesn't support slot2 */
 		else if( cfg->yk_major_version == 2 && cfg->yk_minor_version == 1 &&
-			  cfg->yk_build_version >= 4 && cfg->yk_build_version != 9) {
+			  cfg->yk_build_version >= 4) {
 			ykp_errno = YKP_EYUBIKEYVER;
 			return 0;
 		}
@@ -187,7 +187,7 @@ int ykp_configure_command(YKP_CONFIG *cfg, uint8_t command)
 	case SLOT_NDEF:
 		/* NDEF is available for neo, thus within 2.1 from build 4 */
 		if (!(cfg->yk_major_version == 2 && cfg->yk_minor_version == 1 &&
-			  cfg->yk_build_version >= 4 && cfg->yk_build_version != 9))
+			  cfg->yk_build_version >= 4))
 			ykp_errno = YKP_EYUBIKEYVER;
 		break;
 	default:
@@ -437,8 +437,7 @@ static bool vcheck_neo(const YKP_CONFIG *cfg)
 {
 	return (cfg->yk_major_version == 2 &&
 			cfg->yk_minor_version == 1 &&
-			cfg->yk_build_version >= 4 &&
-			cfg->yk_build_version != 9);
+			cfg->yk_build_version >= 4);
 
 }
 
@@ -446,8 +445,7 @@ static bool vcheck_neo_after_4(const YKP_CONFIG *cfg)
 {
 	return (cfg->yk_major_version == 2 &&
 			cfg->yk_minor_version == 1 &&
-			cfg->yk_build_version > 4 &&
-			cfg->yk_build_version != 9);
+			cfg->yk_build_version > 4);
 }
 
 static bool capability_has_hidtrig(const YKP_CONFIG *cfg)
diff --git a/ykpersonalize.c b/ykpersonalize.c
index 2c3fe30..2f441d0 100644
--- a/ykpersonalize.c
+++ b/ykpersonalize.c
@@ -135,8 +135,7 @@ int main(int argc, char **argv)
 			 ykds_version_minor(st) >= 2) ||
 			(ykds_version_major(st) == 2 && // neo has serial functions
 			 ykds_version_minor(st) == 1 &&
-			 ykds_version_build(st) >= 4 &&
-			 ykds_version_build(st) != 9))) {
+			 ykds_version_build(st) >= 4))) {
 		unsigned int serial;
 		if (! yk_get_serial(yk, 0, 0, &serial)) {
 			printf ("Failed to read serial number (serial-api-visible disabled?).\n");