libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

conversions for 64 bit mingw; refs #30

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-04-29 08:31:51 +00:00
parent 7af731ae56
commit eb94c1da69
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cryptoki.hxx
View File

@@ -2256,7 +2256,7 @@ namespace cryptoki {
bool decryptinit(CK_MECHANISM_TYPE type, std::string param) { bool decryptinit(CK_MECHANISM_TYPE type, std::string param) {
CRYPTOLOG("log"); CRYPTOLOG("log");
CK_MECHANISM mech = { CK_MECHANISM mech = {
type, param.size()?&param[0]:0, param.size() type, param.size()?&param[0]:0, (CK_ULONG)param.size()
}; };
CRYPTOLOG("decryptinit: type="<<type<<"; mech=("<<mech.mechanism CRYPTOLOG("decryptinit: type="<<type<<"; mech=("<<mech.mechanism
<<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')'); <<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')');
@@ -2487,7 +2487,7 @@ namespace cryptoki {
CRYPTOLOG("log"); CRYPTOLOG("log");
CK_MECHANISM mech = { CK_MECHANISM mech = {
type, param.size()?const_cast<CK_VOID_PTR>((const void*)&param[0]):0, type, param.size()?const_cast<CK_VOID_PTR>((const void*)&param[0]):0,
param.size() (CK_ULONG)param.size()
}; };
CRYPTOLOG("encryptinit: type="<<type<<"; mech=("<<mech.mechanism CRYPTOLOG("encryptinit: type="<<type<<"; mech=("<<mech.mechanism
<<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')'); <<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')');
@@ -2604,7 +2604,7 @@ namespace cryptoki {
bool signinit(CK_MECHANISM_TYPE type, std::string param) { bool signinit(CK_MECHANISM_TYPE type, std::string param) {
CRYPTOLOG("log"); CRYPTOLOG("log");
CK_MECHANISM mech = { CK_MECHANISM mech = {
type, param.size()?&param[0]:0, param.size() type, param.size()?&param[0]:0, (CK_ULONG)param.size()
}; };
CRYPTOLOG("signinit: type="<<type<<"; mech=("<<mech.mechanism CRYPTOLOG("signinit: type="<<type<<"; mech=("<<mech.mechanism
<<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')'); <<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')');
@@ -2639,7 +2639,7 @@ namespace cryptoki {
bool verifyinit(CK_MECHANISM_TYPE type, std::string param) { bool verifyinit(CK_MECHANISM_TYPE type, std::string param) {
CRYPTOLOG("log"); CRYPTOLOG("log");
CK_MECHANISM mech = { CK_MECHANISM mech = {
type, param.size()?&param[0]:0, param.size() type, param.size()?&param[0]:0, (CK_ULONG)param.size()
}; };
CRYPTOLOG("verifyinit: type="<<type<<"; mech=("<<mech.mechanism CRYPTOLOG("verifyinit: type="<<type<<"; mech=("<<mech.mechanism
<<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')'); <<", "<<mech.pParameter<<", "<<mech.ulParameterLen<<')');