diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ec_signature_creator_impl.h | 4 | ||||
| -rw-r--r-- | crypto/mock_apple_keychain.h | 22 | ||||
| -rw-r--r-- | crypto/secure_hash_default.cc | 8 | ||||
| -rw-r--r-- | crypto/secure_hash_openssl.cc | 8 |
4 files changed, 21 insertions, 21 deletions
diff --git a/crypto/ec_signature_creator_impl.h b/crypto/ec_signature_creator_impl.h index 8ef67cd..f2ef9d6 100644 --- a/crypto/ec_signature_creator_impl.h +++ b/crypto/ec_signature_creator_impl.h @@ -17,10 +17,10 @@ class ECSignatureCreatorImpl : public ECSignatureCreator { virtual bool Sign(const uint8* data, int data_len, - std::vector<uint8>* signature) OVERRIDE; + std::vector<uint8>* signature) override; virtual bool DecodeSignature(const std::vector<uint8>& der_sig, - std::vector<uint8>* out_raw_sig) OVERRIDE; + std::vector<uint8>* out_raw_sig) override; private: ECPrivateKey* key_; diff --git a/crypto/mock_apple_keychain.h b/crypto/mock_apple_keychain.h index 73beb09..d957316 100644 --- a/crypto/mock_apple_keychain.h +++ b/crypto/mock_apple_keychain.h @@ -40,9 +40,9 @@ class CRYPTO_EXPORT MockAppleKeychain : public AppleKeychain { const char* accountName, UInt32* passwordLength, void** passwordData, - SecKeychainItemRef* itemRef) const OVERRIDE; + SecKeychainItemRef* itemRef) const override; virtual OSStatus ItemFreeContent(SecKeychainAttributeList* attrList, - void* data) const OVERRIDE; + void* data) const override; virtual OSStatus AddGenericPassword( SecKeychainRef keychain, UInt32 serviceNameLength, @@ -51,7 +51,7 @@ class CRYPTO_EXPORT MockAppleKeychain : public AppleKeychain { const char* accountName, UInt32 passwordLength, const void* passwordData, - SecKeychainItemRef* itemRef) const OVERRIDE; + SecKeychainItemRef* itemRef) const override; #if !defined(OS_IOS) virtual OSStatus ItemCopyAttributesAndData( @@ -60,23 +60,23 @@ class CRYPTO_EXPORT MockAppleKeychain : public AppleKeychain { SecItemClass* itemClass, SecKeychainAttributeList** attrList, UInt32* length, - void** outData) const OVERRIDE; + void** outData) const override; // Pass "fail_me" as the data to get errSecAuthFailed. virtual OSStatus ItemModifyAttributesAndData( SecKeychainItemRef itemRef, const SecKeychainAttributeList* attrList, UInt32 length, - const void* data) const OVERRIDE; + const void* data) const override; virtual OSStatus ItemFreeAttributesAndData(SecKeychainAttributeList* attrList, - void* data) const OVERRIDE; - virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const OVERRIDE; + void* data) const override; + virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const override; virtual OSStatus SearchCreateFromAttributes( CFTypeRef keychainOrArray, SecItemClass itemClass, const SecKeychainAttributeList* attrList, - SecKeychainSearchRef* searchRef) const OVERRIDE; + SecKeychainSearchRef* searchRef) const override; virtual OSStatus SearchCopyNext(SecKeychainSearchRef searchRef, - SecKeychainItemRef* itemRef) const OVERRIDE; + SecKeychainItemRef* itemRef) const override; // Pass "some.domain.com" as the serverName to get errSecDuplicateItem. virtual OSStatus AddInternetPassword( SecKeychainRef keychain, @@ -91,8 +91,8 @@ class CRYPTO_EXPORT MockAppleKeychain : public AppleKeychain { SecAuthenticationType authenticationType, UInt32 passwordLength, const void* passwordData, - SecKeychainItemRef* itemRef) const OVERRIDE; - virtual void Free(CFTypeRef ref) const OVERRIDE; + SecKeychainItemRef* itemRef) const override; + virtual void Free(CFTypeRef ref) const override; // Return the counts of objects returned by Create/Copy functions but never // Free'd as they should have been. diff --git a/crypto/secure_hash_default.cc b/crypto/secure_hash_default.cc index 7b912e1..1f5e59b 100644 --- a/crypto/secure_hash_default.cc +++ b/crypto/secure_hash_default.cc @@ -28,17 +28,17 @@ class SecureHashSHA256NSS : public SecureHash { } // SecureHash implementation: - virtual void Update(const void* input, size_t len) OVERRIDE { + virtual void Update(const void* input, size_t len) override { SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len); } - virtual void Finish(void* output, size_t len) OVERRIDE { + virtual void Finish(void* output, size_t len) override { SHA256_End(&ctx_, static_cast<unsigned char*>(output), NULL, static_cast<unsigned int>(len)); } - virtual bool Serialize(Pickle* pickle) OVERRIDE; - virtual bool Deserialize(PickleIterator* data_iterator) OVERRIDE; + virtual bool Serialize(Pickle* pickle) override; + virtual bool Deserialize(PickleIterator* data_iterator) override; private: SHA256Context ctx_; diff --git a/crypto/secure_hash_openssl.cc b/crypto/secure_hash_openssl.cc index 84d28a5..61946a8 100644 --- a/crypto/secure_hash_openssl.cc +++ b/crypto/secure_hash_openssl.cc @@ -30,18 +30,18 @@ class SecureHashSHA256OpenSSL : public SecureHash { OPENSSL_cleanse(&ctx_, sizeof(ctx_)); } - virtual void Update(const void* input, size_t len) OVERRIDE { + virtual void Update(const void* input, size_t len) override { SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len); } - virtual void Finish(void* output, size_t len) OVERRIDE { + virtual void Finish(void* output, size_t len) override { ScopedOpenSSLSafeSizeBuffer<SHA256_DIGEST_LENGTH> result( static_cast<unsigned char*>(output), len); SHA256_Final(result.safe_buffer(), &ctx_); } - virtual bool Serialize(Pickle* pickle) OVERRIDE; - virtual bool Deserialize(PickleIterator* data_iterator) OVERRIDE; + virtual bool Serialize(Pickle* pickle) override; + virtual bool Deserialize(PickleIterator* data_iterator) override; private: SHA256_CTX ctx_; |