From 4ce5464faa9c1bc03979e51d3716852dab51c657 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Wed, 20 Jul 2011 12:05:59 +0200 Subject: [PATCH] Accept firmware version 2.3.x too. --- NEWS | 4 ++++ configure.ac | 4 ++-- ykcore/ykcore.c | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 3954458..564ff1e 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ Yubikey-personalize NEWS -- History of user-visible changes. -*- outline -*- +* Version 1.5.3 (unreleased) + +** Accept firmware version 2.3.x too. + * Version 1.5.2 (released 2011-05-10) ** Added an udev file. diff --git a/configure.ac b/configure.ac index a527d61..47491e7 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([yubikey-personalization], [1.5.2], +AC_INIT([yubikey-personalization], [1.5.3], [yubico-devel@googlegroups.com], [ykpers], [http://code.google.com/p/yubikey-personalization/]) AC_CONFIG_AUX_DIR([build-aux]) @@ -37,7 +37,7 @@ AC_CONFIG_MACRO_DIR([m4]) # Interfaces added: AGE++ # Interfaces removed: AGE=0 AC_SUBST(LT_CURRENT, 6) -AC_SUBST(LT_REVISION, 1) +AC_SUBST(LT_REVISION, 2) AC_SUBST(LT_AGE, 5) AM_INIT_AUTOMAKE([-Wall -Werror]) diff --git a/ykcore/ykcore.c b/ykcore/ykcore.c index 56a6752..ca1083d 100644 --- a/ykcore/ykcore.c +++ b/ykcore/ykcore.c @@ -1,6 +1,6 @@ /* -*- mode:C; c-file-style: "bsd" -*- */ /* - * Copyright (c) 2008, 2009, 2010, Yubico AB + * Copyright (c) 2008, 2009, 2010, 2011, Yubico AB * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -106,7 +106,8 @@ int yk_check_firmware_version(YK_KEY *k) (st.versionMajor == 2 && (st.versionMinor == 0 || st.versionMinor == 1 || - st.versionMinor == 2)))) { + st.versionMinor == 2 || + st.versionMinor == 3)))) { yk_errno = YK_EFIRMWARE; return 0; } -- 2.39.5