diff options
Diffstat (limited to 'Swiften/Crypto/WindowsCryptoProvider.cpp')
| -rw-r--r-- | Swiften/Crypto/WindowsCryptoProvider.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Crypto/WindowsCryptoProvider.cpp b/Swiften/Crypto/WindowsCryptoProvider.cpp index 513941f..c784283 100644 --- a/Swiften/Crypto/WindowsCryptoProvider.cpp +++ b/Swiften/Crypto/WindowsCryptoProvider.cpp @@ -1,11 +1,11 @@ /* - * Copyright (c) 2012-2016 Isode Limited. + * Copyright (c) 2012-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ /* * Copyright (c) 2013 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -37,23 +37,23 @@ namespace { if (!CryptCreateHash(context, algorithm, 0, 0, &hash)) { assert(false); } } virtual ~WindowsHash() { CryptDestroyHash(hash); } - virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE { + virtual Hash& update(const ByteArray& data) override { return updateInternal(data); } - virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE { + virtual Hash& update(const SafeByteArray& data) override { return updateInternal(data); } virtual std::vector<unsigned char> getHash() { std::vector<unsigned char> result; DWORD hashLength = sizeof(DWORD); DWORD hashSize; CryptGetHashParam(hash, HP_HASHSIZE, reinterpret_cast<BYTE*>(&hashSize), &hashLength, 0); result.resize(static_cast<size_t>(hashSize)); @@ -117,23 +117,23 @@ namespace { } ZeroMemory(&info, sizeof(info)); info.HashAlgid = CALG_SHA1; } ~HMACHash() { CryptDestroyHash(hash); } - virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE { + virtual Hash& update(const ByteArray& data) override { return updateInternal(data); } - virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE { + virtual Hash& update(const SafeByteArray& data) override { return updateInternal(data); } virtual std::vector<unsigned char> getHash() { std::vector<unsigned char> result; DWORD hashLength = sizeof(DWORD); DWORD hashSize; CryptGetHashParam(hash, HP_HASHSIZE, reinterpret_cast<BYTE*>(&hashSize), &hashLength, 0); result.resize(static_cast<size_t>(hashSize)); |
Swift