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

Side by Side Diff: components/webdata/encryptor/encryptor_mac.mm

Issue 12902030: Make Encryptor a component. Used by //chrome and (soon) //components/webdata. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove duplicate include. Created 7 years, 9 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) 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 "chrome/browser/password_manager/encryptor.h" 5 #include "components/webdata/encryptor/encryptor.h"
6 6
7 #include <CommonCrypto/CommonCryptor.h> // for kCCBlockSizeAES128 7 #include <CommonCrypto/CommonCryptor.h> // for kCCBlockSizeAES128
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/password_manager/encryptor_password_mac.h" 12 #include "components/webdata/encryptor/encryptor_password_mac.h"
13 #include "crypto/apple_keychain.h" 13 #include "crypto/apple_keychain.h"
14 #include "crypto/encryptor.h" 14 #include "crypto/encryptor.h"
15 #include "crypto/symmetric_key.h" 15 #include "crypto/symmetric_key.h"
16 16
17 using crypto::AppleKeychain; 17 using crypto::AppleKeychain;
18 18
19 namespace { 19 namespace {
20 20
21 // Salt for Symmetric key derivation. 21 // Salt for Symmetric key derivation.
22 const char kSalt[] = "saltysalt"; 22 const char kSalt[] = "saltysalt";
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 if (!encryptor.Decrypt(raw_ciphertext, plaintext)) 141 if (!encryptor.Decrypt(raw_ciphertext, plaintext))
142 return false; 142 return false;
143 143
144 return true; 144 return true;
145 } 145 }
146 146
147 void Encryptor::UseMockKeychain(bool use_mock) { 147 void Encryptor::UseMockKeychain(bool use_mock) {
148 use_mock_keychain = use_mock; 148 use_mock_keychain = use_mock;
149 } 149 }
150 150
OLDNEW
« no previous file with comments | « components/webdata/encryptor/encryptor.h ('k') | components/webdata/encryptor/encryptor_password_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698