diff options
Diffstat (limited to 'src/Common/SecurityToken.h')
-rw-r--r-- | src/Common/SecurityToken.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Common/SecurityToken.h b/src/Common/SecurityToken.h index 4dff42fa..6c454def 100644 --- a/src/Common/SecurityToken.h +++ b/src/Common/SecurityToken.h @@ -49,61 +49,61 @@ #endif // !TC_WINDOWS #define TC_SECURITY_TOKEN_KEYFILE_URL_PREFIX L"token://" #define TC_SECURITY_TOKEN_KEYFILE_URL_SLOT L"slot" #define TC_SECURITY_TOKEN_KEYFILE_URL_FILE L"file" #include "Token.h" namespace VeraCrypt { struct SecurityTokenInfo: TokenInfo { virtual ~SecurityTokenInfo() {}; virtual BOOL isEditable() const {return true;} CK_FLAGS Flags; string LabelUtf8; }; struct SecurityTokenKeyfile: TokenKeyfile { SecurityTokenKeyfile(); SecurityTokenKeyfile(const TokenKeyfilePath& path); virtual ~SecurityTokenKeyfile() {} operator TokenKeyfilePath () const; - void GetKeyfileData(vector<byte>& keyfileData) const; + void GetKeyfileData(vector<uint8>& keyfileData) const; string IdUtf8; CK_OBJECT_HANDLE Handle; }; struct Pkcs11Exception: public Exception { Pkcs11Exception(CK_RV errorCode = (CK_RV)-1) : ErrorCode(errorCode), SubjectErrorCodeValid(false), SubjectErrorCode((uint64)-1) { } Pkcs11Exception(CK_RV errorCode, uint64 subjectErrorCode) : ErrorCode(errorCode), SubjectErrorCodeValid(true), SubjectErrorCode(subjectErrorCode) { } #ifdef TC_HEADER_Platform_Exception virtual ~Pkcs11Exception() throw () { } TC_SERIALIZABLE_EXCEPTION(Pkcs11Exception); #else void Show(HWND parent) const; #endif operator string () const; CK_RV GetErrorCode() const { return ErrorCode; } @@ -154,71 +154,71 @@ namespace VeraCrypt #endif // !TC_HEADER_Platform_Exception struct Pkcs11Session { Pkcs11Session(): Handle(CK_UNAVAILABLE_INFORMATION), UserLoggedIn(false) { } CK_SESSION_HANDLE Handle; bool UserLoggedIn; }; struct GetPinFunctor { virtual ~GetPinFunctor() { } virtual void operator() (string& str) = 0; virtual void notifyIncorrectPin() = 0; }; struct SendExceptionFunctor { virtual ~SendExceptionFunctor() { } virtual void operator() (const Exception& e) = 0; }; class SecurityToken { public: static void CloseAllSessions() throw (); static void CloseLibrary(); - static void CreateKeyfile(CK_SLOT_ID slotId, vector <byte>& keyfileData, const string& name); + static void CreateKeyfile(CK_SLOT_ID slotId, vector <uint8>& keyfileData, const string& name); static void DeleteKeyfile(const SecurityTokenKeyfile& keyfile); static vector <SecurityTokenKeyfile> GetAvailableKeyfiles(CK_SLOT_ID* slotIdFilter = nullptr, const wstring keyfileIdFilter = wstring()); static list <SecurityTokenInfo> GetAvailableTokens(); static SecurityTokenInfo GetTokenInfo(CK_SLOT_ID slotId); #ifdef TC_WINDOWS static void InitLibrary(const wstring& pkcs11LibraryPath, unique_ptr <GetPinFunctor> pinCallback, unique_ptr <SendExceptionFunctor> warningCallback); #else static void InitLibrary(const string& pkcs11LibraryPath, unique_ptr <GetPinFunctor> pinCallback, unique_ptr <SendExceptionFunctor> warningCallback); #endif static bool IsInitialized() { return Initialized; } static bool IsKeyfilePathValid(const wstring& securityTokenKeyfilePath); static const size_t MaxPasswordLength = 128; protected: static void CloseSession(CK_SLOT_ID slotId); static vector <CK_OBJECT_HANDLE> GetObjects(CK_SLOT_ID slotId, CK_ATTRIBUTE_TYPE objectClass); - static void GetObjectAttribute(CK_SLOT_ID slotId, CK_OBJECT_HANDLE tokenObject, CK_ATTRIBUTE_TYPE attributeType, vector <byte>& attributeValue); + static void GetObjectAttribute(CK_SLOT_ID slotId, CK_OBJECT_HANDLE tokenObject, CK_ATTRIBUTE_TYPE attributeType, vector <uint8>& attributeValue); static list <CK_SLOT_ID> GetTokenSlots(); static void Login(CK_SLOT_ID slotId, const char* pin); static void LoginUserIfRequired(CK_SLOT_ID slotId); static void OpenSession(CK_SLOT_ID slotId); static void CheckLibraryStatus(); static bool Initialized; static unique_ptr <GetPinFunctor> PinCallback; static CK_FUNCTION_LIST_PTR Pkcs11Functions; #ifdef TC_WINDOWS static HMODULE Pkcs11LibraryHandle; #else static void* Pkcs11LibraryHandle; #endif static map <CK_SLOT_ID, Pkcs11Session> Sessions; static unique_ptr <SendExceptionFunctor> WarningCallback; - friend void SecurityTokenKeyfile::GetKeyfileData(vector <byte>& keyfileData) const; + friend void SecurityTokenKeyfile::GetKeyfileData(vector <uint8>& keyfileData) const; }; } #endif // TC_HEADER_Common_SecurityToken |