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

Side by Side Diff: base/crypto/encryptor_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/encryptor_mac.cc ('k') | base/crypto/encryptor_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/encryptor.h" 5 #include "base/crypto/encryptor.h"
6 6
7 #include <cryptohi.h> 7 #include <cryptohi.h>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/crypto/symmetric_key.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/nss_util.h" 12 #include "base/nss_util.h"
12 13
13 namespace base { 14 namespace base {
14 15
15 Encryptor::Encryptor() { 16 Encryptor::Encryptor() {
16 EnsureNSSInit(); 17 EnsureNSSInit();
17 } 18 }
18 19
19 Encryptor::~Encryptor() { 20 Encryptor::~Encryptor() {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 plaintext_len - op_len); 117 plaintext_len - op_len);
117 if (SECSuccess != rv) 118 if (SECSuccess != rv)
118 return false; 119 return false;
119 120
120 plaintext->assign(reinterpret_cast<char *>(&buffer[0]), 121 plaintext->assign(reinterpret_cast<char *>(&buffer[0]),
121 op_len + digest_len); 122 op_len + digest_len);
122 return true; 123 return true;
123 } 124 }
124 125
125 } // namespace base 126 } // namespace base
OLDNEW
« no previous file with comments | « base/crypto/encryptor_mac.cc ('k') | base/crypto/encryptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698