Fix firmware version check.

diff --git a/NEWS b/NEWS
index 2e9c87549ec39bb67f0db9a16355b339ea05591f..d62302e6c212758baededc76b3643404e1b602a6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ Yubikey-personalize NEWS -- History of user-visible changes.     -*- outline -*-
 ** Header files are now usable from C++.
 Reported by Giampaolo Bellini.
 
+** ykchalresp incorrectly rejected some newer firmwares.
+Reported by Giampaolo Bellini.
+
 * Version 1.6.1 (released 2011-08-15)
 
 ** Fix test_args_to_config crash on some platform.

diff --git a/ykchalresp.c b/ykchalresp.c
index e7b69231abb7706ae10ff6485a8d0a10a98736ad..f7c8b6cb8963b70c7f2b9a793cb39c795b08e39f 100644 (file)
--- a/ykchalresp.c
+++ b/ykchalresp.c
@@ -173,7 +173,8 @@ int check_firmware(YK_KEY *yk, bool verbose)
        }
 
        if (ykds_version_major(st) < 2 ||
-           ykds_version_minor(st) < 2) {
+           (ykds_version_major(st) == 2
+            && ykds_version_minor(st) < 2)) {
                fprintf(stderr, "Challenge-response not supported before YubiKey 2.2.\n");
                free(st);
                return 0;