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

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

Issue 6085015: Order function definitions in base/ according to the header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: lrn2merge Created 9 years, 11 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/signature_creator_nss.cc ('k') | base/debug/trace_event.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(PK11SymKey* key) : key_(key) {
16 DCHECK(key);
17 }
18
19 SymmetricKey::~SymmetricKey() {} 15 SymmetricKey::~SymmetricKey() {}
20 16
21 // static 17 // static
22 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm, 18 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
23 size_t key_size_in_bits) { 19 size_t key_size_in_bits) {
24 DCHECK_EQ(AES, algorithm); 20 DCHECK_EQ(AES, algorithm);
25 21
26 EnsureNSSInit(); 22 EnsureNSSInit();
27 if (key_size_in_bits == 0) 23 if (key_size_in_bits == 0)
28 return NULL; 24 return NULL;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 return false; 113 return false;
118 114
119 SECItem* key_item = PK11_GetKeyData(key_.get()); 115 SECItem* key_item = PK11_GetKeyData(key_.get());
120 if (!key_item) 116 if (!key_item)
121 return false; 117 return false;
122 118
123 raw_key->assign(reinterpret_cast<char*>(key_item->data), key_item->len); 119 raw_key->assign(reinterpret_cast<char*>(key_item->data), key_item->len);
124 return true; 120 return true;
125 } 121 }
126 122
123 SymmetricKey::SymmetricKey(PK11SymKey* key) : key_(key) {
124 DCHECK(key);
125 }
126
127 } // namespace base 127 } // namespace base
OLDNEW
« no previous file with comments | « base/crypto/signature_creator_nss.cc ('k') | base/debug/trace_event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698