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

Side by Side Diff: crypto/secure_hash_default.cc

Issue 10824076: crypto: Tag some overridden methods with OVERRIDE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "crypto/secure_hash.h" 5 #include "crypto/secure_hash.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/pickle.h" 8 #include "base/pickle.h"
9 #include "crypto/third_party/nss/chromium-blapi.h" 9 #include "crypto/third_party/nss/chromium-blapi.h"
10 #include "crypto/third_party/nss/chromium-sha256.h" 10 #include "crypto/third_party/nss/chromium-sha256.h"
11 11
12 namespace crypto { 12 namespace crypto {
13 13
14 namespace { 14 namespace {
15 15
16 const char kSHA256Descriptor[] = "NSS"; 16 const char kSHA256Descriptor[] = "NSS";
17 17
18 class SecureHashSHA256NSS : public SecureHash { 18 class SecureHashSHA256NSS : public SecureHash {
19 public: 19 public:
20 static const int kSecureHashVersion = 1; 20 static const int kSecureHashVersion = 1;
21 21
22 SecureHashSHA256NSS() { 22 SecureHashSHA256NSS() {
23 SHA256_Begin(&ctx_); 23 SHA256_Begin(&ctx_);
24 } 24 }
25 25
26 virtual ~SecureHashSHA256NSS() { 26 virtual ~SecureHashSHA256NSS() {
27 } 27 }
28 28
29 virtual void Update(const void* input, size_t len) { 29 virtual void Update(const void* input, size_t len) OVERRIDE {
Ryan Sleevi 2012/07/30 00:59:16 Please tag as would be done in a .h file, namely
tfarina 2012/07/30 01:08:12 Done.
30 SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len); 30 SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len);
31 } 31 }
32 32
33 virtual void Finish(void* output, size_t len) { 33 virtual void Finish(void* output, size_t len) OVERRIDE {
34 SHA256_End(&ctx_, static_cast<unsigned char*>(output), NULL, 34 SHA256_End(&ctx_, static_cast<unsigned char*>(output), NULL,
35 static_cast<unsigned int>(len)); 35 static_cast<unsigned int>(len));
36 } 36 }
37 37
38 virtual bool Serialize(Pickle* pickle); 38 virtual bool Serialize(Pickle* pickle) OVERRIDE;
39 virtual bool Deserialize(PickleIterator* data_iterator); 39 virtual bool Deserialize(PickleIterator* data_iterator) OVERRIDE;
40 40
41 private: 41 private:
42 SHA256Context ctx_; 42 SHA256Context ctx_;
43 }; 43 };
44 44
45 bool SecureHashSHA256NSS::Serialize(Pickle* pickle) { 45 bool SecureHashSHA256NSS::Serialize(Pickle* pickle) {
46 if (!pickle) 46 if (!pickle)
47 return false; 47 return false;
48 48
49 if (!pickle->WriteInt(kSecureHashVersion) || 49 if (!pickle->WriteInt(kSecureHashVersion) ||
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 switch (algorithm) { 85 switch (algorithm) {
86 case SHA256: 86 case SHA256:
87 return new SecureHashSHA256NSS(); 87 return new SecureHashSHA256NSS();
88 default: 88 default:
89 NOTIMPLEMENTED(); 89 NOTIMPLEMENTED();
90 return NULL; 90 return NULL;
91 } 91 }
92 } 92 }
93 93
94 } // namespace crypto 94 } // namespace crypto
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698