diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-05-23 19:26:06 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-05-26 01:38:11 +0200 |
| commit | 85e5e383f9b879736d7a793a5dc0f9bce20b8383 (patch) | |
| tree | be3657150ecacdf8b52a398479d38996634ffc8c /src/Common/SecurityToken.cpp | |
| parent | a8651ac01420b337ea21ab6c7284c6d04c0330b4 (diff) | |
| download | VeraCrypt-85e5e383f9b879736d7a793a5dc0f9bce20b8383.tar.gz VeraCrypt-85e5e383f9b879736d7a793a5dc0f9bce20b8383.zip | |
Windows: solve 64-bit compilation warnings after checking that they are harmless.
Diffstat (limited to 'src/Common/SecurityToken.cpp')
| -rw-r--r-- | src/Common/SecurityToken.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Common/SecurityToken.cpp b/src/Common/SecurityToken.cpp index 1bbad78e..bbcefe30 100644 --- a/src/Common/SecurityToken.cpp +++ b/src/Common/SecurityToken.cpp @@ -132,8 +132,8 @@ namespace VeraCrypt { CKA_CLASS, &dataClass, sizeof (dataClass) },
{ CKA_TOKEN, &trueVal, sizeof (trueVal) },
{ CKA_PRIVATE, &trueVal, sizeof (trueVal) },
- { CKA_LABEL, (CK_UTF8CHAR *) name.c_str(), name.size() },
- { CKA_VALUE, &keyfileData.front(), keyfileData.size() }
+ { CKA_LABEL, (CK_UTF8CHAR *) name.c_str(), (CK_ULONG) name.size() },
+ { CKA_VALUE, &keyfileData.front(), (CK_ULONG) keyfileData.size() }
};
CK_OBJECT_HANDLE keyfileHandle;
@@ -420,7 +420,7 @@ namespace VeraCrypt else if (Sessions[slotId].UserLoggedIn)
return;
- CK_RV status = Pkcs11Functions->C_Login (Sessions[slotId].Handle, CKU_USER, (CK_CHAR_PTR) pin.c_str(), pin.size());
+ CK_RV status = Pkcs11Functions->C_Login (Sessions[slotId].Handle, CKU_USER, (CK_CHAR_PTR) pin.c_str(), (CK_ULONG) pin.size());
if (status != CKR_OK)
throw Pkcs11Exception (status);
|