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

Side by Side Diff: crypto/symmetric_key_nss.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Chrome, webkit, remoting and crypto/owners Created 9 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
OLDNEW
1 // Copyright (c) 2010 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 "base/crypto/symmetric_key.h" 5 #include "base/crypto/symmetric_key.h"
eroman 2011/04/13 03:25:22 This needs to be updated yes?
rvargas (doing something else) 2011/04/13 19:55:55 Weird. It's already fixed in my local version. In
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"
eroman 2011/04/13 03:25:22 nit: can you order these? (pre-existing problem).
rvargas (doing something else) 2011/04/13 19:55:55 Same here... already fixed.
12 12
13 namespace base { 13 namespace crypto {
14 14
15 SymmetricKey::~SymmetricKey() {} 15 SymmetricKey::~SymmetricKey() {}
16 16
17 // static 17 // static
18 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm, 18 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
19 size_t key_size_in_bits) { 19 size_t key_size_in_bits) {
20 DCHECK_EQ(AES, algorithm); 20 DCHECK_EQ(AES, algorithm);
21 21
22 EnsureNSSInit(); 22 EnsureNSSInit();
23 if (key_size_in_bits == 0) 23 if (key_size_in_bits == 0)
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 return false; 117 return false;
118 118
119 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);
120 return true; 120 return true;
121 } 121 }
122 122
123 SymmetricKey::SymmetricKey(PK11SymKey* key) : key_(key) { 123 SymmetricKey::SymmetricKey(PK11SymKey* key) : key_(key) {
124 DCHECK(key); 124 DCHECK(key);
125 } 125 }
126 126
127 } // namespace base 127 } // namespace crypto
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698