Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
| commit | 497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch) | |
| tree | 4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Swiften/Crypto/OpenSSLCryptoProvider.cpp | |
| parent | 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff) | |
| download | swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2 | |
Remove Swiften/Base/Override.h
Replaced SWIFTEN_OVERRIDE with C++11 standard override
keyword.
Test-Information:
Tested on macOS 10.12.5 with clang trunk.
Change-Id: If89c6cc2a648662522a320834c314496c943a55a
Diffstat (limited to 'Swiften/Crypto/OpenSSLCryptoProvider.cpp')
| -rw-r--r-- | Swiften/Crypto/OpenSSLCryptoProvider.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.cpp b/Swiften/Crypto/OpenSSLCryptoProvider.cpp index c785041..b46cb2a 100644 --- a/Swiften/Crypto/OpenSSLCryptoProvider.cpp +++ b/Swiften/Crypto/OpenSSLCryptoProvider.cpp @@ -1,113 +1,113 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Crypto/OpenSSLCryptoProvider.h> #include <openssl/sha.h> #include <openssl/md5.h> #include <openssl/hmac.h> #include <cassert> #include <boost/numeric/conversion/cast.hpp> #include <Swiften/Crypto/Hash.h> #include <Swiften/Base/ByteArray.h> #pragma GCC diagnostic ignored "-Wdeprecated-declarations" using namespace Swift; namespace { class SHA1Hash : public Hash { public: SHA1Hash() : finalized(false) { if (!SHA1_Init(&context)) { assert(false); } } ~SHA1Hash() { } - 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() SWIFTEN_OVERRIDE { + virtual std::vector<unsigned char> getHash() override { assert(!finalized); std::vector<unsigned char> result(SHA_DIGEST_LENGTH); SHA1_Final(vecptr(result), &context); return result; } private: template<typename ContainerType> Hash& updateInternal(const ContainerType& data) { assert(!finalized); if (!SHA1_Update(&context, vecptr(data), data.size())) { assert(false); } return *this; } private: SHA_CTX context; bool finalized; }; class MD5Hash : public Hash { public: MD5Hash() : finalized(false) { if (!MD5_Init(&context)) { assert(false); } } ~MD5Hash() { } - 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() SWIFTEN_OVERRIDE { + virtual std::vector<unsigned char> getHash() override { assert(!finalized); std::vector<unsigned char> result(MD5_DIGEST_LENGTH); MD5_Final(vecptr(result), &context); return result; } private: template<typename ContainerType> Hash& updateInternal(const ContainerType& data) { assert(!finalized); if (!MD5_Update(&context, vecptr(data), data.size())) { assert(false); } return *this; } private: MD5_CTX context; bool finalized; }; template<typename T> ByteArray getHMACSHA1Internal(const T& key, const ByteArray& data) { unsigned int len = SHA_DIGEST_LENGTH; std::vector<unsigned char> result(len); HMAC(EVP_sha1(), vecptr(key), boost::numeric_cast<int>(key.size()), vecptr(data), data.size(), vecptr(result), &len); return result; } } |