james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into ykcs11

Browse Source 
Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Klas Lindfors
2015-09-07 14:34:34 +02:00
parent 8c411f4473 1b8d819cc2
commit 984a124508
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+8 -1
View File
@@ -3,7 +3,14 @@ yubico-piv-tool NEWS -- History of user-visible changes. -*- outline -*-
* Version 1.1.0 (unreleased) * Version 1.1.0 (unreleased)
** Support for YubiKey 4 stuff ** Support for YubiKey 4 stuff
ECCP384, touch, retired keys etc
* 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) * Version 1.0.1 (released 2015-07-10)
lib/ykpiv.c
+1 -1
View File
@@ -713,7 +713,7 @@ ykpiv_rc ykpiv_verify(ykpiv_state *state, const char *pin, int *tries) {
} else if(sw == 0x9000) { } else if(sw == 0x9000) {
return YKPIV_OK; return YKPIV_OK;
} else if((sw >> 8) == 0x63) { } else if((sw >> 8) == 0x63) {
*tries = (sw & 0xff); *tries = (sw & 0xf);
return YKPIV_WRONG_PIN; return YKPIV_WRONG_PIN;
} else if(sw == 0x6983) { } else if(sw == 0x6983) {
*tries = 0; *tries = 0;