Changes In Branch require-login-if-needed Through [6db637b204] Excluding Merge-Ins
This is equivalent to a diff from 07d8b72d7d to 6db637b204
|
2015-05-04
| ||
| 16:02 | Merged in trunk check-in: 6938f7a82c user: rkeene tags: require-login-if-needed | |
|
2012-07-24
| ||
| 20:53 | Removed win32 SDK files, which are now part of mingw32 (untested) check-in: c1fa623247 user: rkeene tags: trunk | |
| 15:55 | Added basic stub for adding support for checking if LOGIN_REQUIRED is needed check-in: 6db637b204 user: rkeene tags: require-login-if-needed | |
|
2012-07-22
| ||
| 15:55 | Create new branch named "require-login-if-needed" check-in: 459f215faf user: rkeene tags: require-login-if-needed | |
|
2012-07-21
| ||
| 04:55 | Create new branch named "dodcerts-on-seperate-slot" check-in: caac1986d6 user: rkeene tags: dodcerts-on-seperate-slot | |
|
2012-07-20
| ||
| 01:05 | Corrected arithmetic on a void pointer check-in: 07d8b72d7d user: rkeene tags: trunk | |
| 01:04 | Corrected casting to for %p formatting check-in: c634e02a7f user: rkeene tags: trunk | |
Modified cackey.c from [1be2f8a22e] to [711a90f529].
| ︙ | ︙ | |||
833 834 835 836 837 838 839 840 841 842 843 844 845 846 |
CACKEY_DEBUG_PRINTF("Returning 0x%lx", retval);
return(retval);
}
/* PC/SC Related Functions */
/*
* SYNPOSIS
* void cackey_slots_disconnect_all(void);
*
* ARGUMENTS
* None
*
| > > > > | 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 |
CACKEY_DEBUG_PRINTF("Returning 0x%lx", retval);
return(retval);
}
/* PC/SC Related Functions */
static cackey_ret cackey_login_required(struct cackey_slot *slot) {
return(CACKEY_PCSC_E_NEEDLOGIN);
}
/*
* SYNPOSIS
* void cackey_slots_disconnect_all(void);
*
* ARGUMENTS
* None
*
|
| ︙ | ︙ | |||
1002 1003 1004 1005 1006 1007 1008 | } /* * SYNPOSIS * void cackey_mark_slot_reset(struct cackey_slot *slot); * * ARGUMENTS | | > > | > > > > > > > > > > > > | 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 |
}
/*
* SYNPOSIS
* void cackey_mark_slot_reset(struct cackey_slot *slot);
*
* ARGUMENTS
* ...
*
* RETURN VALUE
* None
*
* NOTES
* This function marks a slot has having been reset, to later be cleaned up.
* Cleanup only happens when a PKCS#11 client calls C_FindObjectsInit.
*
*/
static void cackey_mark_slot_reset(struct cackey_slot *slot) {
int login_required = -1;
if (slot == NULL) {
return;
}
CACKEY_DEBUG_PRINTF("Called.");
if (slot->pcsc_card_connected) {
SCardDisconnect(slot->pcsc_card, SCARD_LEAVE_CARD);
}
slot->slot_reset = 1;
slot->pcsc_card_connected = 0;
slot->token_flags = 0;
if (login_required == -1) {
if (cackey_login_required(slot) != CACKEY_PCSC_S_OK) {
login_required = 1;
} else {
login_required = 0;
}
}
if (login_required) {
slot->token_flags |= CKF_LOGIN_REQUIRED;
}
CACKEY_DEBUG_PRINTF("Returning.");
return;
}
/*
|
| ︙ | ︙ | |||
2394 2395 2396 2397 2398 2399 2400 |
/* End transaction */
cackey_end_transaction(slot);
if (respcode == 0x6982) {
CACKEY_DEBUG_PRINTF("Security status not satisified. Returning NEEDLOGIN");
cackey_mark_slot_reset(slot);
| < < | 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 |
/* End transaction */
cackey_end_transaction(slot);
if (respcode == 0x6982) {
CACKEY_DEBUG_PRINTF("Security status not satisified. Returning NEEDLOGIN");
cackey_mark_slot_reset(slot);
return(CACKEY_PCSC_E_NEEDLOGIN);
}
if (send_ret == CACKEY_PCSC_E_TOKENABSENT) {
CACKEY_DEBUG_PRINTF("Token absent. Returning TOKENABSENT");
cackey_mark_slot_reset(slot);
return(CACKEY_PCSC_E_TOKENABSENT);
}
return(-1);
}
|
| ︙ | ︙ | |||
3732 3733 3734 3735 3736 3737 3738 |
/* Only update the list of slots if we are actually being asked supply the slot information */
if (pSlotList) {
cackey_slots[currslot].active = 1;
cackey_slots[currslot].pcsc_reader = strdup(pcsc_readers);
cackey_slots[currslot].pcsc_card_connected = 0;
cackey_slots[currslot].transaction_depth = 0;
cackey_slots[currslot].transaction_need_hw_lock = 0;
| < | | 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 |
/* Only update the list of slots if we are actually being asked supply the slot information */
if (pSlotList) {
cackey_slots[currslot].active = 1;
cackey_slots[currslot].pcsc_reader = strdup(pcsc_readers);
cackey_slots[currslot].pcsc_card_connected = 0;
cackey_slots[currslot].transaction_depth = 0;
cackey_slots[currslot].transaction_need_hw_lock = 0;
cackey_slots[currslot].token_flags = 0;
cackey_slots[currslot].label = NULL;
cackey_mark_slot_reset(&cackey_slots[currslot]);
}
currslot++;
pcsc_readers += curr_reader_len + 1;
|
| ︙ | ︙ |