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

added support for bNumberMessage

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@29 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-01-24 07:13:29 +00:00
parent ffb210f0a5
commit 431354dac3
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ccid/ccid.c
View File

@@ -715,7 +715,7 @@ perform_PC_to_RDR_Secure(const PC_to_RDR_Secure_t request,
goto err;
}
__u8 bmPINLengthFormat, bmPINBlockString, bmFormatString;
__u8 bmPINLengthFormat, bmPINBlockString, bmFormatString, bNumberMessage;
__u8 *abPINApdu;
uint32_t apdulen;
uint16_t wPINMaxExtraDigit;
@@ -730,6 +730,7 @@ perform_PC_to_RDR_Secure(const PC_to_RDR_Secure_t request,
bmPINLengthFormat = verify->bmPINLengthFormat;
bmPINBlockString = verify->bmPINBlockString;
bmFormatString = verify->bmFormatString;
bNumberMessage = verify->bNumberMessage;
abPINApdu = (__u8*) verify + sizeof(*verify);
apdulen = __le32_to_cpu(request.dwLength) - sizeof(*verify) - sizeof(__u8);
break;
@@ -741,6 +742,7 @@ perform_PC_to_RDR_Secure(const PC_to_RDR_Secure_t request,
bmPINLengthFormat = modify->bmPINLengthFormat;
bmPINBlockString = modify->bmPINBlockString;
bmFormatString = modify->bmFormatString;
bNumberMessage = modify->bNumberMessage;
abPINApdu = (__u8*) modify + sizeof(*modify);
apdulen = __le32_to_cpu(request.dwLength) - sizeof(*modify) - sizeof(__u8);
break;
@@ -790,13 +792,27 @@ perform_PC_to_RDR_Secure(const PC_to_RDR_Secure_t request,
/* get the PIN */
hints.dialog_name = "ccid.PC_to_RDR_Secure";
hints.card = card_in_slot[request.bSlot];
if (bNumberMessage == CCID_PIN_MSG_DEFAULT
|| bNumberMessage == CCID_PIN_MSG_REF
|| bNumberMessage == CCID_PIN_NO_MSG) {
/* don't interprete bMsgIndex*, just use defaults */
if (verify)
hints.usage = SC_UI_USAGE_OTHER;
else
hints.usage = SC_UI_USAGE_CHANGE_PIN;
} else if (bNumberMessage == CCID_PIN_MSG1)
hints.usage = SC_UI_USAGE_OTHER;
else if (bNumberMessage == CCID_PIN_MSG2)
hints.usage = SC_UI_USAGE_NEW_PIN;
else {
sc_result = SC_ERROR_INVALID_ARGUMENTS;
goto err;
}
if (verify) {
hints.prompt = "PIN Verification";
hints.usage = SC_UI_USAGE_OTHER;
sc_result = sc_ui_get_pin(&hints, (char **) &curr_pin.data);
} else {
hints.prompt = "PIN Modification";
hints.usage = SC_UI_USAGE_CHANGE_PIN;
if (modify->bConfirmPIN & CCID_PIN_CONFIRM_NEW)
hints.flags |= SC_UI_PIN_RETYPE;
if (modify->bConfirmPIN & CCID_PIN_INSERT_OLD) {

7
ccid/ccid.h
View File

@@ -65,12 +65,15 @@ extern "C" {
#define CCID_PIN_ENCODING_BIN 0x00
#define CCID_PIN_ENCODING_BCD 0x01
#define CCID_PIN_ENCODING_ASCII 0x02
#define CCID_PIN_UNITS_BYTES 0x80
#define CCID_PIN_JUSTIFY_RIGHT 0x04
#define CCID_PIN_CONFIRM_NEW 0x01
#define CCID_PIN_INSERT_OLD 0x02
#define CCID_PIN_NO_MSG 0x00
#define CCID_PIN_MSG1 0x01
#define CCID_PIN_MSG2 0x02
#define CCID_PIN_MSG_REF 0x03
#define CCID_PIN_MSG_DEFAULT 0xff
#define CCID_SLOTS_UNCHANGED 0x00
#define CCID_SLOT1_CARD_PRESENT 0x01