libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

add methods to convert slot and token info from C-structure; refs #28

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-01-13 10:41:34 +00:00
parent 41d8c55db6
commit a9b5d10870
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cryptoki.hxx
View File

@@ -872,13 +872,20 @@ namespace cryptoki {
return res; return res;
} }
//! Read Slot Information
SlotInfo slotinfo() { SlotInfo slotinfo() {
CRYPTOLOG("log"); CRYPTOLOG("log");
SlotInfo info;
CK_SLOT_INFO cInfo; CK_SLOT_INFO cInfo;
//! calls @c C_GetSlotInfo //! calls @c C_GetSlotInfo
if (!check(_library->C_GetSlotInfo(_slot, &cInfo), if (!check(_library->C_GetSlotInfo(_slot, &cInfo),
CRYPTOKI_FN_LOG("C_GetSlotInfo"))) return info; CRYPTOKI_FN_LOG("C_GetSlotInfo")))
return slotinfo(cInfo);
}
//! Convert C-Structure of Slot Information Into C++
SlotInfo slotinfo(const CK_SLOT_INFO& cInfo) {
CRYPTOLOG("log");
SlotInfo info;
info.slotDescription = cInfo.slotDescription; info.slotDescription = cInfo.slotDescription;
info.manufacturerID = cInfo.manufacturerID; info.manufacturerID = cInfo.manufacturerID;
info.flags = cInfo.flags; info.flags = cInfo.flags;
@@ -886,14 +893,20 @@ namespace cryptoki {
info.firmwareVersion = cInfo.firmwareVersion; info.firmwareVersion = cInfo.firmwareVersion;
return info; return info;
} }
//! Read Token Information
TokenInfo tokeninfo() { TokenInfo tokeninfo() {
CRYPTOLOG("log"); CRYPTOLOG("log");
TokenInfo info;
//! calls @c C_GetTokenInfo //! calls @c C_GetTokenInfo
CK_TOKEN_INFO cInfo; CK_TOKEN_INFO cInfo;
if (!check(_library->C_GetTokenInfo(_slot, &cInfo), if (!check(_library->C_GetTokenInfo(_slot, &cInfo),
CRYPTOKI_FN_LOG("C_GetTokenInfo"))) return info; CRYPTOKI_FN_LOG("C_GetTokenInfo")))
return tokeninfo(cInfo);
}
//! Convert C-Structure of Token Information Into C++
TokenInfo tokeninfo(const CK_TOKEN_INFO cInfo) {
TokenInfo info;
info.label = cInfo.label; info.label = cInfo.label;
info.manufacturerID = cInfo.manufacturerID; info.manufacturerID = cInfo.manufacturerID;
info.model = cInfo.model; info.model = cInfo.model;