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

Side by Side Diff: components/encryptor/encryptor_password_mac.mm

Issue 183953005: Rename components's Encryptor to OSEncrypt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: similarity Created 6 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
(Empty)
1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "components/encryptor/encryptor_password_mac.h"
6
7 #import <Security/Security.h>
8
9 #include "base/base64.h"
10 #include "base/mac/mac_logging.h"
11 #include "base/rand_util.h"
12 #include "crypto/apple_keychain.h"
13
14 using crypto::AppleKeychain;
15
16 namespace {
17
18 // Generates a random password and adds it to the Keychain. The added password
19 // is returned from the function. If an error occurs, an empty password is
20 // returned.
21 std::string AddRandomPasswordToKeychain(const AppleKeychain& keychain,
22 const std::string& service_name,
23 const std::string& account_name) {
24 // Generate a password with 128 bits of randomness.
25 const int kBytes = 128 / 8;
26 std::string password;
27 base::Base64Encode(base::RandBytesAsString(kBytes), &password);
28 void* password_data =
29 const_cast<void*>(static_cast<const void*>(password.data()));
30
31 OSStatus error = keychain.AddGenericPassword(NULL,
32 service_name.size(),
33 service_name.data(),
34 account_name.size(),
35 account_name.data(),
36 password.size(),
37 password_data,
38 NULL);
39
40 if (error != noErr) {
41 OSSTATUS_DLOG(ERROR, error) << "Keychain add failed";
42 return std::string();
43 }
44
45 return password;
46 }
47
48 } // namespace
49
50 std::string EncryptorPassword::GetEncryptorPassword() const {
51 // These two strings ARE indeed user facing. But they are used to access
52 // the encryption keyword. So as to not lose encrypted data when system
53 // locale changes we DO NOT LOCALIZE.
54 const std::string service_name = "Chrome Safe Storage";
55 const std::string account_name = "Chrome";
56
57 UInt32 password_length = 0;
58 void* password_data = NULL;
59 OSStatus error = keychain_.FindGenericPassword(NULL,
60 service_name.size(),
61 service_name.data(),
62 account_name.size(),
63 account_name.data(),
64 &password_length,
65 &password_data,
66 NULL);
67
68 if (error == noErr) {
69 std::string password =
70 std::string(static_cast<char*>(password_data), password_length);
71 keychain_.ItemFreeContent(NULL, password_data);
72 return password;
73 } else if (error == errSecItemNotFound) {
74 return AddRandomPasswordToKeychain(keychain_, service_name, account_name);
75 } else {
76 OSSTATUS_DLOG(ERROR, error) << "Keychain lookup failed";
77 return std::string();
78 }
79 }
OLDNEW
« no previous file with comments | « components/encryptor/encryptor_password_mac.h ('k') | components/encryptor/encryptor_password_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698