Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(586)

Side by Side Diff: content/child/webcrypto/nss/aes_key_nss.h

Issue 630743005: Replace OVERRIDE and FINAL with override and final in content/child/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/child/webcrypto/nss/aes_gcm_nss.cc ('k') | content/child/webcrypto/nss/aes_kw_nss.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_ 5 #ifndef CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_
6 #define CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_ 6 #define CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_
7 7
8 #include <pkcs11t.h> 8 #include <pkcs11t.h>
9 9
10 #include "content/child/webcrypto/algorithm_implementation.h" 10 #include "content/child/webcrypto/algorithm_implementation.h"
(...skipping 19 matching lines...) Expand all
30 const std::string& jwk_suffix); 30 const std::string& jwk_suffix);
31 31
32 // This is the same as the other AesAlgorithm constructor, however 32 // This is the same as the other AesAlgorithm constructor, however
33 // |import_flags| and |all_key_usages| are pre-filled to values for 33 // |import_flags| and |all_key_usages| are pre-filled to values for
34 // encryption/decryption algorithms (supports usages for: encrypt, decrypt, 34 // encryption/decryption algorithms (supports usages for: encrypt, decrypt,
35 // wrap, unwrap). 35 // wrap, unwrap).
36 AesAlgorithm(CK_MECHANISM_TYPE import_mechanism, 36 AesAlgorithm(CK_MECHANISM_TYPE import_mechanism,
37 const std::string& jwk_suffix); 37 const std::string& jwk_suffix);
38 38
39 virtual Status VerifyKeyUsagesBeforeGenerateKey( 39 virtual Status VerifyKeyUsagesBeforeGenerateKey(
40 blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE; 40 blink::WebCryptoKeyUsageMask usage_mask) const override;
41 41
42 virtual Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm, 42 virtual Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
43 bool extractable, 43 bool extractable,
44 blink::WebCryptoKeyUsageMask usage_mask, 44 blink::WebCryptoKeyUsageMask usage_mask,
45 blink::WebCryptoKey* key) const OVERRIDE; 45 blink::WebCryptoKey* key) const override;
46 46
47 virtual Status VerifyKeyUsagesBeforeImportKey( 47 virtual Status VerifyKeyUsagesBeforeImportKey(
48 blink::WebCryptoKeyFormat format, 48 blink::WebCryptoKeyFormat format,
49 blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE; 49 blink::WebCryptoKeyUsageMask usage_mask) const override;
50 50
51 virtual Status ImportKeyRaw(const CryptoData& key_data, 51 virtual Status ImportKeyRaw(const CryptoData& key_data,
52 const blink::WebCryptoAlgorithm& algorithm, 52 const blink::WebCryptoAlgorithm& algorithm,
53 bool extractable, 53 bool extractable,
54 blink::WebCryptoKeyUsageMask usage_mask, 54 blink::WebCryptoKeyUsageMask usage_mask,
55 blink::WebCryptoKey* key) const OVERRIDE; 55 blink::WebCryptoKey* key) const override;
56 56
57 virtual Status ImportKeyJwk(const CryptoData& key_data, 57 virtual Status ImportKeyJwk(const CryptoData& key_data,
58 const blink::WebCryptoAlgorithm& algorithm, 58 const blink::WebCryptoAlgorithm& algorithm,
59 bool extractable, 59 bool extractable,
60 blink::WebCryptoKeyUsageMask usage_mask, 60 blink::WebCryptoKeyUsageMask usage_mask,
61 blink::WebCryptoKey* key) const OVERRIDE; 61 blink::WebCryptoKey* key) const override;
62 62
63 virtual Status ExportKeyRaw(const blink::WebCryptoKey& key, 63 virtual Status ExportKeyRaw(const blink::WebCryptoKey& key,
64 std::vector<uint8_t>* buffer) const OVERRIDE; 64 std::vector<uint8_t>* buffer) const override;
65 65
66 virtual Status ExportKeyJwk(const blink::WebCryptoKey& key, 66 virtual Status ExportKeyJwk(const blink::WebCryptoKey& key,
67 std::vector<uint8_t>* buffer) const OVERRIDE; 67 std::vector<uint8_t>* buffer) const override;
68 68
69 private: 69 private:
70 const CK_MECHANISM_TYPE import_mechanism_; 70 const CK_MECHANISM_TYPE import_mechanism_;
71 const CK_FLAGS import_flags_; 71 const CK_FLAGS import_flags_;
72 const blink::WebCryptoKeyUsageMask all_key_usages_; 72 const blink::WebCryptoKeyUsageMask all_key_usages_;
73 const std::string jwk_suffix_; 73 const std::string jwk_suffix_;
74 }; 74 };
75 75
76 } // namespace webcrypto 76 } // namespace webcrypto
77 77
78 } // namespace content 78 } // namespace content
79 79
80 #endif // CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_ 80 #endif // CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_
OLDNEW
« no previous file with comments | « content/child/webcrypto/nss/aes_gcm_nss.cc ('k') | content/child/webcrypto/nss/aes_kw_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698