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

Side by Side Diff: base/crypto/symmetric_key_nss.cc

Issue 1528021: Implement PBKDF2-based key derivation, random key generation,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Make albertb's suggested changes. Created 10 years, 8 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 | « base/crypto/symmetric_key_mac.cc ('k') | base/crypto/symmetric_key_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "base/crypto/symmetric_key.h" 5 #include "base/crypto/symmetric_key.h"
6 6
7 #include <nss.h> 7 #include <nss.h>
8 #include <pk11pub.h> 8 #include <pk11pub.h>
9 9
10 #include "base/nss_util.h" 10 #include "base/nss_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 12
13 namespace base { 13 namespace base {
14 14
15 SymmetricKey::~SymmetricKey() {}
16
15 // static 17 // static
16 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm, 18 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
17 size_t key_size_in_bits) { 19 size_t key_size_in_bits) {
18 DCHECK_EQ(AES, algorithm); 20 DCHECK_EQ(AES, algorithm);
19 21
20 EnsureNSSInit(); 22 EnsureNSSInit();
21 if (key_size_in_bits == 0) 23 if (key_size_in_bits == 0)
22 return NULL; 24 return NULL;
23 25
24 ScopedPK11Slot slot(PK11_GetBestSlot(CKM_AES_KEY_GEN, NULL)); 26 ScopedPK11Slot slot(PK11_GetBestSlot(CKM_AES_KEY_GEN, NULL));
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 87
86 SECItem* key_item = PK11_GetKeyData(key_.get()); 88 SECItem* key_item = PK11_GetKeyData(key_.get());
87 if (!key_item) 89 if (!key_item)
88 return false; 90 return false;
89 91
90 raw_key->assign(reinterpret_cast<char*>(key_item->data), key_item->len); 92 raw_key->assign(reinterpret_cast<char*>(key_item->data), key_item->len);
91 return true; 93 return true;
92 } 94 }
93 95
94 } // namespace base 96 } // namespace base
OLDNEW
« no previous file with comments | « base/crypto/symmetric_key_mac.cc ('k') | base/crypto/symmetric_key_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698