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

Side by Side Diff: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc

Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_json_schema
Patch Set: Fix merge error. Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 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 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/extensions/api/easy_unlock_private/easy_unlock_private_ crypto_delegate.h" 5 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_ crypto_delegate.h"
6 6
7 #include "chromeos/dbus/dbus_thread_manager.h" 7 #include "chromeos/dbus/dbus_thread_manager.h"
8 #include "chromeos/dbus/easy_unlock_client.h" 8 #include "chromeos/dbus/easy_unlock_client.h"
9 #include "third_party/cros_system_api/dbus/service_constants.h" 9 #include "third_party/cros_system_api/dbus/service_constants.h"
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 ~EasyUnlockPrivateCryptoDelegateChromeOS() override {} 49 ~EasyUnlockPrivateCryptoDelegateChromeOS() override {}
50 50
51 void GenerateEcP256KeyPair(const KeyPairCallback& callback) override { 51 void GenerateEcP256KeyPair(const KeyPairCallback& callback) override {
52 dbus_client_->GenerateEcP256KeyPair(callback); 52 dbus_client_->GenerateEcP256KeyPair(callback);
53 } 53 }
54 54
55 void PerformECDHKeyAgreement( 55 void PerformECDHKeyAgreement(
56 const easy_unlock_private::PerformECDHKeyAgreement::Params& params, 56 const easy_unlock_private::PerformECDHKeyAgreement::Params& params,
57 const DataCallback& callback) override { 57 const DataCallback& callback) override {
58 dbus_client_->PerformECDHKeyAgreement( 58 dbus_client_->PerformECDHKeyAgreement(
59 params.private_key, 59 std::string(params.private_key.begin(), params.private_key.end()),
60 params.public_key, 60 std::string(params.public_key.begin(), params.public_key.end()),
61 callback); 61 callback);
62 } 62 }
63 63
64 void CreateSecureMessage( 64 void CreateSecureMessage(
65 const easy_unlock_private::CreateSecureMessage::Params& params, 65 const easy_unlock_private::CreateSecureMessage::Params& params,
66 const DataCallback& callback) override { 66 const DataCallback& callback) override {
67 chromeos::EasyUnlockClient::CreateSecureMessageOptions options; 67 chromeos::EasyUnlockClient::CreateSecureMessageOptions options;
68 options.key = params.key; 68 options.key.assign(params.key.begin(), params.key.end());
69 if (params.options.associated_data) 69 if (params.options.associated_data) {
70 options.associated_data = *params.options.associated_data; 70 options.associated_data.assign(params.options.associated_data->begin(),
71 if (params.options.public_metadata) 71 params.options.associated_data->end());
72 options.public_metadata = *params.options.public_metadata; 72 }
73 if (params.options.verification_key_id) 73 if (params.options.public_metadata) {
74 options.verification_key_id = *params.options.verification_key_id; 74 options.public_metadata.assign(params.options.public_metadata->begin(),
75 if (params.options.decryption_key_id) 75 params.options.public_metadata->end());
76 options.decryption_key_id = *params.options.decryption_key_id; 76 }
77 if (params.options.verification_key_id) {
78 options.verification_key_id.assign(
79 params.options.verification_key_id->begin(),
80 params.options.verification_key_id->end());
81 }
82 if (params.options.decryption_key_id) {
83 options.decryption_key_id.assign(
84 params.options.decryption_key_id->begin(),
85 params.options.decryption_key_id->end());
86 }
77 options.encryption_type = 87 options.encryption_type =
78 EncryptionTypeToString(params.options.encrypt_type); 88 EncryptionTypeToString(params.options.encrypt_type);
79 options.signature_type = 89 options.signature_type =
80 SignatureTypeToString(params.options.sign_type); 90 SignatureTypeToString(params.options.sign_type);
81 91
82 dbus_client_->CreateSecureMessage(params.payload, options, callback); 92 dbus_client_->CreateSecureMessage(
93 std::string(params.payload.begin(), params.payload.end()), options,
94 callback);
83 } 95 }
84 96
85 void UnwrapSecureMessage( 97 void UnwrapSecureMessage(
86 const easy_unlock_private::UnwrapSecureMessage::Params& params, 98 const easy_unlock_private::UnwrapSecureMessage::Params& params,
87 const DataCallback& callback) override { 99 const DataCallback& callback) override {
88 chromeos::EasyUnlockClient::UnwrapSecureMessageOptions options; 100 chromeos::EasyUnlockClient::UnwrapSecureMessageOptions options;
89 options.key = params.key; 101 options.key.assign(params.key.begin(), params.key.end());
90 if (params.options.associated_data) 102 if (params.options.associated_data) {
91 options.associated_data = *params.options.associated_data; 103 options.associated_data.assign(params.options.associated_data->begin(),
104 params.options.associated_data->end());
105 }
92 options.encryption_type = 106 options.encryption_type =
93 EncryptionTypeToString(params.options.encrypt_type); 107 EncryptionTypeToString(params.options.encrypt_type);
94 options.signature_type = 108 options.signature_type =
95 SignatureTypeToString(params.options.sign_type); 109 SignatureTypeToString(params.options.sign_type);
96 110
97 dbus_client_->UnwrapSecureMessage(params.secure_message, options, callback); 111 dbus_client_->UnwrapSecureMessage(
112 std::string(params.secure_message.begin(), params.secure_message.end()),
113 options, callback);
98 } 114 }
99 115
100 private: 116 private:
101 chromeos::EasyUnlockClient* dbus_client_; 117 chromeos::EasyUnlockClient* dbus_client_;
102 118
103 DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateCryptoDelegateChromeOS); 119 DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateCryptoDelegateChromeOS);
104 }; 120 };
105 121
106 } // namespace 122 } // namespace
107 123
108 // static 124 // static
109 scoped_ptr<EasyUnlockPrivateCryptoDelegate> 125 scoped_ptr<EasyUnlockPrivateCryptoDelegate>
110 EasyUnlockPrivateCryptoDelegate::Create() { 126 EasyUnlockPrivateCryptoDelegate::Create() {
111 return scoped_ptr<EasyUnlockPrivateCryptoDelegate>( 127 return scoped_ptr<EasyUnlockPrivateCryptoDelegate>(
112 new EasyUnlockPrivateCryptoDelegateChromeOS()); 128 new EasyUnlockPrivateCryptoDelegateChromeOS());
113 } 129 }
114 130
115 } // namespace api 131 } // namespace api
116 } // namespace extensions 132 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698