From da29e6947c59cc7458469cfa28ed28db73c06c1a Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Mon, 24 Aug 2015 08:28:49 +0200 Subject: [PATCH 1/3] authentication failed is supposed to be 0x63cX not 0x630X so mask everything but the low 4 bits for remaining tries --- lib/ykpiv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ykpiv.c b/lib/ykpiv.c index 4dbff20..2c50af3 100644 --- a/lib/ykpiv.c +++ b/lib/ykpiv.c @@ -680,7 +680,7 @@ ykpiv_rc ykpiv_verify(ykpiv_state *state, const char *pin, int *tries) { } else if(sw == 0x9000) { return YKPIV_OK; } else if((sw >> 8) == 0x63) { - *tries = (sw & 0xff); + *tries = (sw & 0xf); return YKPIV_WRONG_PIN; } else if(sw == 0x6983) { *tries = 0; From f511a3730d710bb446c2817cd6f1e5def2c044e3 Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Fri, 4 Sep 2015 09:13:34 +0200 Subject: [PATCH 2/3] NEWS for 1.0.2 --- NEWS | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d0818a1..35ff2f8 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ yubico-piv-tool NEWS -- History of user-visible changes. -*- outline -*- -* Version 1.0.2 (unreleased) +* Version 1.0.2 (released 2015-09-04) + +** Query for different passwords/pins on stdin if they're not supplied. + +** If a reader fails continue trying matching readers. + +** Authentication failed is supposed to be 0x63cX not 0x630X. * Version 1.0.1 (released 2015-07-10) From 1b8d819cc2c3638c81c4c9239f2d44e4eca22c8f Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Fri, 4 Sep 2015 09:22:32 +0200 Subject: [PATCH 3/3] bump versions --- NEWS | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 35ff2f8..334a654 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ yubico-piv-tool NEWS -- History of user-visible changes. -*- outline -*- +* Version 1.0.3 (unreleased) + * Version 1.0.2 (released 2015-09-04) ** Query for different passwords/pins on stdin if they're not supplied. diff --git a/configure.ac b/configure.ac index 6f487ee..ff69bb9 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([yubico-piv-tool], [1.0.2]) +AC_INIT([yubico-piv-tool], [1.0.3]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -35,7 +35,7 @@ AC_CONFIG_MACRO_DIR([m4]) # Interfaces added: AGE++ # Interfaces removed: AGE=0 AC_SUBST([LT_CURRENT], 1) -AC_SUBST([LT_REVISION], 7) +AC_SUBST([LT_REVISION], 8) AC_SUBST([LT_AGE], 0) AM_INIT_AUTOMAKE([-Wall -Werror foreign])