From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 20 May 2010 08:59:52 +0000 (+0000)
Subject: Don't warn about upcoming YubiKey firmware 2.2.x, it is compatible.
X-Git-Tag: yubikey-personalisation_1.3.5-1~4^2~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46c20d0938fbe6dda3fe78d8f3c30ae5b61f9ac5;p=yubikey-personalization

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

diff --git a/NEWS b/NEWS
index 8cdb3f5..8002d23 100644
--- 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 0735aef..5dbcf6c 100644
--- 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;
 	}