Check-in [9723187878]
Overview
SHA1:9723187878058a172be1009ca0c0ac53e0212340
Date: 2015-07-17 02:53:25
User: rkeene
Comment:Made 0x6d00 wrong instruction handling handling also work for CACs
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2015-07-23
18:24
[fed23dc867] Updated KPS certificates (user: rkeene, tags: trunk)
2015-07-17
18:54
[a2a8052958] Added support for reader filtering (user: rkeene, tags: reader-filtering)
02:53
[9723187878] Made 0x6d00 wrong instruction handling handling also work for CACs (user: rkeene, tags: trunk)
2015-07-16
17:04
[526fde7c45] Updated Windows zlib build (user: rkeene, tags: trunk)
Changes

Modified cackey.c from [06b013b460] to [609a23ada9].

  3410   3410   		if (response_code == 0x6983) {
  3411   3411   			CACKEY_DEBUG_PRINTF("PIN Verification failed, device is locked");
  3412   3412   
  3413   3413   			return(CACKEY_PCSC_E_LOCKED);
  3414   3414   		}
  3415   3415   
  3416   3416   		if (response_code == 0x6d00) {
  3417         -			if (have_piv == 1 && retries > 0) {
         3417  +			if (retries > 0) {
  3418   3418   				CACKEY_DEBUG_PRINTF("Got ISO 7816 Response \"6D 00\" in response to a VERIFY request.");
  3419         -				CACKEY_DEBUG_PRINTF("We did not expect this because it is not mentioned in NIST SP 800-73-3 Part 2 Section 3.2.1");
         3419  +				CACKEY_DEBUG_PRINTF("We did not expect this because it is not mentioned in NIST SP 800-73-3 Part 2 Section 3.2.1 or GSC-IS v2.1");
  3420   3420   				CACKEY_DEBUG_PRINTF("We are going to try to reset the card and select the applet again.");
  3421   3421   
  3422   3422   				cackey_mark_slot_reset(slot);
  3423   3423   
  3424   3424   				connect_ret = cackey_connect_card(slot);
  3425   3425   				if (connect_ret != CACKEY_PCSC_S_OK) {
  3426   3426   					CACKEY_DEBUG_PRINTF("Unable to reconnect after resetting the card, returning in error.");