Don't warn about upcoming YubiKey firmware 2.2.x, it is compatible.

git-svn-id: https://yubikey-personalization.googlecode.com/svn/trunk@246 b62f149e-849f-11dd-9899-c7ba65f7c4c7

diff --git a/NEWS b/NEWS
index 8cdb3f500f28de0ca7cfeccdb2df58ab906267f6..8002d23247593f7ea9ad317d4268616871ecde05 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Yubikey-personalize NEWS -- History of user-visible changes.     -*- outline -*-
 
 * Version 1.3.3 (unreleased)
 
+** Don't warn about upcoming YubiKey firmware 2.2.x, it is compatible.
 
 * Version 1.3.2 (released 2010-03-12)
 

diff --git a/ykcore/ykcore.c b/ykcore/ykcore.c
index 0735aefbff0776d69a52569f168a530bef4095e2..5dbcf6c91a1e26364eae3993a5d91daabf7d31ef 100644 (file)
--- a/ykcore/ykcore.c
+++ b/ykcore/ykcore.c
@@ -89,7 +89,8 @@ int yk_check_firmware_version(YK_KEY *k)
                st.versionMinor == 3)) ||
              (st.versionMajor == 2 &&
               (st.versionMinor == 0 ||
-               st.versionMinor == 1)))) {
+               st.versionMinor == 1 ||
+               st.versionMinor == 2)))) {
                yk_errno = YK_EFIRMWARE;
                return 0;
        }