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

Side by Side Diff: crypto/hmac_openssl.cc

Issue 11419270: Use size_t as the type of key_length and digest_length arguments of HMAC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove the DCHECK on a digest_length of 0 from hmac_openssl.cc Created 8 years 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 | « crypto/hmac_nss.cc ('k') | crypto/hmac_unittest.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/hmac.h" 5 #include "crypto/hmac.h"
6 6
7 #include <openssl/hmac.h> 7 #include <openssl/hmac.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "crypto/openssl_util.h" 15 #include "crypto/openssl_util.h"
16 16
17 namespace crypto { 17 namespace crypto {
18 18
19 struct HMACPlatformData { 19 struct HMACPlatformData {
20 std::vector<unsigned char> key; 20 std::vector<unsigned char> key;
21 }; 21 };
22 22
23 HMAC::HMAC(HashAlgorithm hash_alg) 23 HMAC::HMAC(HashAlgorithm hash_alg)
24 : hash_alg_(hash_alg), plat_(new HMACPlatformData()) { 24 : hash_alg_(hash_alg), plat_(new HMACPlatformData()) {
25 // Only SHA-1 and SHA-256 hash algorithms are supported now. 25 // Only SHA-1 and SHA-256 hash algorithms are supported now.
26 DCHECK(hash_alg_ == SHA1 || hash_alg_ == SHA256); 26 DCHECK(hash_alg_ == SHA1 || hash_alg_ == SHA256);
27 } 27 }
28 28
29 bool HMAC::Init(const unsigned char* key, int key_length) { 29 bool HMAC::Init(const unsigned char* key, size_t key_length) {
30 // Init must not be called more than once on the same HMAC object. 30 // Init must not be called more than once on the same HMAC object.
31 DCHECK(plat_->key.empty()); 31 DCHECK(plat_->key.empty());
32 32
33 plat_->key.assign(key, key + key_length); 33 plat_->key.assign(key, key + key_length);
34 return true; 34 return true;
35 } 35 }
36 36
37 HMAC::~HMAC() { 37 HMAC::~HMAC() {
38 // Zero out key copy. 38 // Zero out key copy.
39 plat_->key.assign(plat_->key.size(), 0); 39 plat_->key.assign(plat_->key.size(), 0);
40 STLClearObject(&plat_->key); 40 STLClearObject(&plat_->key);
41 } 41 }
42 42
43 bool HMAC::Sign(const base::StringPiece& data, 43 bool HMAC::Sign(const base::StringPiece& data,
44 unsigned char* digest, 44 unsigned char* digest,
45 int digest_length) const { 45 size_t digest_length) const {
46 DCHECK_GE(digest_length, 0);
47 DCHECK(!plat_->key.empty()); // Init must be called before Sign. 46 DCHECK(!plat_->key.empty()); // Init must be called before Sign.
48 47
49 ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> result(digest, digest_length); 48 ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> result(digest, digest_length);
50 return ::HMAC(hash_alg_ == SHA1 ? EVP_sha1() : EVP_sha256(), 49 return ::HMAC(hash_alg_ == SHA1 ? EVP_sha1() : EVP_sha256(),
51 &plat_->key[0], plat_->key.size(), 50 &plat_->key[0], plat_->key.size(),
52 reinterpret_cast<const unsigned char*>(data.data()), 51 reinterpret_cast<const unsigned char*>(data.data()),
53 data.size(), 52 data.size(),
54 result.safe_buffer(), NULL); 53 result.safe_buffer(), NULL);
55 } 54 }
56 55
57 } // namespace crypto 56 } // namespace crypto
OLDNEW
« no previous file with comments | « crypto/hmac_nss.cc ('k') | crypto/hmac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698