diff options
| author | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:35:32 +0000 |
|---|---|---|
| committer | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:35:32 +0000 |
| commit | bb899b3fe2faa8e58920dd210ff9e9634838f9e2 (patch) | |
| tree | d8b92db816fa6b6ec4f8b83ddf9e74e52ca38c7a /chrome/browser/sync/protocol | |
| parent | 9ba72485493030204853351beaf92462d33f310a (diff) | |
| download | chromium_src-bb899b3fe2faa8e58920dd210ff9e9634838f9e2.zip chromium_src-bb899b3fe2faa8e58920dd210ff9e9634838f9e2.tar.gz chromium_src-bb899b3fe2faa8e58920dd210ff9e9634838f9e2.tar.bz2 | |
Take 2: sync changes to support encryption
Attempting to resubmit this change. It looks like the reason for the build break on linux was a missing dependency (nss) in the interactive_ui_test target.
BUG=32410
TEST=unittests
Review URL: http://codereview.chromium.org/2828021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/protocol')
| -rw-r--r-- | chrome/browser/sync/protocol/password_specifics.proto | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/sync/protocol/password_specifics.proto b/chrome/browser/sync/protocol/password_specifics.proto index 4d1bc17..efd3400b 100644 --- a/chrome/browser/sync/protocol/password_specifics.proto +++ b/chrome/browser/sync/protocol/password_specifics.proto @@ -10,10 +10,11 @@ option optimize_for = LITE_RUNTIME; package sync_pb; +import "encryption.proto"; import "sync.proto"; -// These are the properties that get serialized into the |blob| field of -// |PasswordSpecifics|. +// These are the properties that get serialized into the |encrypted| field of +// PasswordSpecifics. message PasswordSpecificsData { optional int32 scheme = 1; optional string signon_realm = 2; @@ -29,10 +30,10 @@ message PasswordSpecificsData { optional bool blacklisted = 12; } -// Properties of password sync objects. +// Properties of password sync objects. The actual password data is held in a +// PasswordSpecificsData that is encrypted into |encrypted|. message PasswordSpecifics { - optional string key = 1; - optional string blob = 2; + optional EncryptedData encrypted = 1; } extend EntitySpecifics { |