VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

added support for flags in bConfirmPIN

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@28 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-01-23 22:45:25 +00:00
parent 1c3a426434
commit ffb210f0a5
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ccid/ccid.c
View File

@@ -797,8 +797,15 @@ perform_PC_to_RDR_Secure(const PC_to_RDR_Secure_t request,
} else { } else {
hints.prompt = "PIN Modification"; hints.prompt = "PIN Modification";
hints.usage = SC_UI_USAGE_CHANGE_PIN; hints.usage = SC_UI_USAGE_CHANGE_PIN;
sc_result = sc_ui_get_pin_pair(&hints, (char **) &curr_pin.data, if (modify->bConfirmPIN & CCID_PIN_CONFIRM_NEW)
(char **) &new_pin.data); hints.flags |= SC_UI_PIN_RETYPE;
if (modify->bConfirmPIN & CCID_PIN_INSERT_OLD) {
sc_result = sc_ui_get_pin_pair(&hints, (char **) &curr_pin.data,
(char **) &new_pin.data);
} else {
/* if only the new pin is requested, it is stored in curr_pin */
sc_result = sc_ui_get_pin(&hints, (char **) &curr_pin.data);
}
} }
if (sc_result < 0) if (sc_result < 0)
goto err; goto err;
@@ -826,11 +833,15 @@ perform_PC_to_RDR_Secure(const PC_to_RDR_Secure_t request,
&sc_result)) &sc_result))
goto err; goto err;
} else { } else {
curr_pin.offset = modify->bInsertionOffsetOld; if (modify->bConfirmPIN & CCID_PIN_INSERT_OLD) {
new_pin.offset = modify->bInsertionOffsetNew; curr_pin.offset = modify->bInsertionOffsetOld;
if (!write_pin(&apdu, &new_pin, blocksize, justify_right, encoding, new_pin.offset = modify->bInsertionOffsetNew;
&sc_result)) if (!write_pin(&apdu, &new_pin, blocksize, justify_right, encoding,
goto err; &sc_result))
goto err;
} else {
curr_pin.offset = modify->bInsertionOffsetNew;
}
} }
if (!get_effective_offset(system_units, length_offset, if (!get_effective_offset(system_units, length_offset,
&curr_pin.length_offset, &sc_result) &curr_pin.length_offset, &sc_result)