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

Side by Side Diff: crypto/hmac_nss.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.cc ('k') | crypto/hmac_openssl.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 <nss.h> 7 #include <nss.h>
8 #include <pk11pub.h> 8 #include <pk11pub.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 21 matching lines...) Expand all
32 break; 32 break;
33 default: 33 default:
34 NOTREACHED() << "Unsupported hash algorithm"; 34 NOTREACHED() << "Unsupported hash algorithm";
35 break; 35 break;
36 } 36 }
37 } 37 }
38 38
39 HMAC::~HMAC() { 39 HMAC::~HMAC() {
40 } 40 }
41 41
42 bool HMAC::Init(const unsigned char *key, int key_length) { 42 bool HMAC::Init(const unsigned char *key, size_t key_length) {
43 EnsureNSSInit(); 43 EnsureNSSInit();
44 44
45 if (plat_->slot_.get()) { 45 if (plat_->slot_.get()) {
46 // Init must not be called more than twice on the same HMAC object. 46 // Init must not be called more than twice on the same HMAC object.
47 NOTREACHED(); 47 NOTREACHED();
48 return false; 48 return false;
49 } 49 }
50 50
51 plat_->slot_.reset(PK11_GetInternalSlot()); 51 plat_->slot_.reset(PK11_GetInternalSlot());
52 if (!plat_->slot_.get()) { 52 if (!plat_->slot_.get()) {
(...skipping 15 matching lines...) Expand all
68 if (!plat_->sym_key_.get()) { 68 if (!plat_->sym_key_.get()) {
69 NOTREACHED(); 69 NOTREACHED();
70 return false; 70 return false;
71 } 71 }
72 72
73 return true; 73 return true;
74 } 74 }
75 75
76 bool HMAC::Sign(const base::StringPiece& data, 76 bool HMAC::Sign(const base::StringPiece& data,
77 unsigned char* digest, 77 unsigned char* digest,
78 int digest_length) const { 78 size_t digest_length) const {
79 if (!plat_->sym_key_.get()) { 79 if (!plat_->sym_key_.get()) {
80 // Init has not been called before Sign. 80 // Init has not been called before Sign.
81 NOTREACHED(); 81 NOTREACHED();
82 return false; 82 return false;
83 } 83 }
84 84
85 SECItem param = { siBuffer, NULL, 0 }; 85 SECItem param = { siBuffer, NULL, 0 };
86 ScopedPK11Context context(PK11_CreateContextBySymKey(plat_->mechanism_, 86 ScopedPK11Context context(PK11_CreateContextBySymKey(plat_->mechanism_,
87 CKA_SIGN, 87 CKA_SIGN,
88 plat_->sym_key_.get(), 88 plat_->sym_key_.get(),
(...skipping 19 matching lines...) Expand all
108 if (PK11_DigestFinal(context.get(), 108 if (PK11_DigestFinal(context.get(),
109 digest, &len, digest_length) != SECSuccess) { 109 digest, &len, digest_length) != SECSuccess) {
110 NOTREACHED(); 110 NOTREACHED();
111 return false; 111 return false;
112 } 112 }
113 113
114 return true; 114 return true;
115 } 115 }
116 116
117 } // namespace crypto 117 } // namespace crypto
OLDNEW
« no previous file with comments | « crypto/hmac.cc ('k') | crypto/hmac_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698