]> err.no Git - yubikey-personalization/commitdiff
there was no 2.1.9 and there might be a neo with 2.1.9
authorKlas Lindfors <klas@yubico.com>
Thu, 26 Apr 2012 05:42:04 +0000 (07:42 +0200)
committerKlas Lindfors <klas@yubico.com>
Thu, 26 Apr 2012 05:42:04 +0000 (07:42 +0200)
ykpers.c
ykpersonalize.c

index 802aa7153429faac9bdcd3d4dffe4b22d7a09daa..d284ab33ffde14eae0a21cba52ca4db1a14f8707 100644 (file)
--- 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)
index 2c3fe30e1d0cbf55838acfcb9e6eaea5b2b822db..2f441d02a9d491cc119b6b3b1514a9599a1c5b50 100644 (file)
@@ -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");