james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #62 from denisenkom/win-fixes

Browse Source 
Fix Win64 building problems for ykcs11.
This commit is contained in:
Alessio Di Mauro
2016-01-18 09:55:21 +01:00
parent 39f5dbd119 47cb761a7e
commit 69b686d9b9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/utils.c
+1 -1
View File
@@ -76,7 +76,7 @@ CK_RV parse_readers(ykpiv_state *state, const CK_BYTE_PTR readers, const CK_ULON
} }
} }
(*n_slots)++; (*n_slots)++;
p += i + 1; p = readers + i + 1;
} }
return CKR_OK; return CKR_OK;
ykcs11/ykcs11.c
+2 -1
View File
@@ -51,7 +51,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(
) )
{ {
CK_BYTE readers[2048]; CK_BYTE readers[2048];
CK_ULONG len = sizeof(readers); size_t len = sizeof(readers);
DIN; DIN;
@@ -536,6 +536,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_OpenSession)(
session.info.state = CKS_RO_PUBLIC_SESSION; // Nobody has logged in, default RW session session.info.state = CKS_RO_PUBLIC_SESSION; // Nobody has logged in, default RW session
} }
session.info.slotID = slotID;
session.info.flags = flags; session.info.flags = flags;
session.info.ulDeviceError = 0; session.info.ulDeviceError = 0;