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

Side by Side Diff: crypto/symmetric_key_nss.cc

Issue 1539353003: Switch to standard integer types in crypto/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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 | « crypto/symmetric_key.h ('k') | crypto/symmetric_key_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) 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/symmetric_key.h" 5 #include "crypto/symmetric_key.h"
6 6
7 #include <nss.h> 7 #include <nss.h>
8 #include <pk11pub.h> 8 #include <pk11pub.h>
9 #include <stddef.h>
9 10
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "crypto/nss_util.h" 12 #include "crypto/nss_util.h"
13 #include "crypto/scoped_nss_types.h"
12 14
13 namespace crypto { 15 namespace crypto {
14 16
15 SymmetricKey::~SymmetricKey() {} 17 SymmetricKey::~SymmetricKey() {}
16 18
17 // static 19 // static
18 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm, 20 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
19 size_t key_size_in_bits) { 21 size_t key_size_in_bits) {
20 DCHECK_EQ(AES, algorithm); 22 DCHECK_EQ(AES, algorithm);
21 23
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 142
141 raw_key->assign(reinterpret_cast<char*>(key_item->data), key_item->len); 143 raw_key->assign(reinterpret_cast<char*>(key_item->data), key_item->len);
142 return true; 144 return true;
143 } 145 }
144 146
145 SymmetricKey::SymmetricKey(PK11SymKey* key) : key_(key) { 147 SymmetricKey::SymmetricKey(PK11SymKey* key) : key_(key) {
146 DCHECK(key); 148 DCHECK(key);
147 } 149 }
148 150
149 } // namespace crypto 151 } // namespace crypto
OLDNEW
« no previous file with comments | « crypto/symmetric_key.h ('k') | crypto/symmetric_key_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698