From e09b39da942e19d4becad8f9c7aadc206385b58b Mon Sep 17 00:00:00 2001 From: "albertb@chromium.org" Date: Fri, 11 Jun 2010 23:06:49 +0000 Subject: This is the first patch to support encryption. The Cryptographer class manages a map of Nigori instances and allows data encrypted using different pass-phrase to be decrypted easily. BUG=none TEST=CryptographerTest, NigoriTest Review URL: http://codereview.chromium.org/2727006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49608 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome.gyp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'chrome/chrome.gyp') diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 004e713..01876fb 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -785,6 +785,13 @@ 'notifier', 'sync', ], + 'conditions': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + 'dependencies': [ + '../build/linux/system.gyp:nss' + ], + }], + ], }, { 'target_name': 'notifier', @@ -877,12 +884,16 @@ 'sources': [ '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc', '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h', + '<(protoc_out_dir)/chrome/browser/sync/protocol/encryption.pb.cc', + '<(protoc_out_dir)/chrome/browser/sync/protocol/encryption.pb.h', '<(protoc_out_dir)/chrome/browser/sync/protocol/autofill_specifics.pb.cc', '<(protoc_out_dir)/chrome/browser/sync/protocol/autofill_specifics.pb.h', '<(protoc_out_dir)/chrome/browser/sync/protocol/bookmark_specifics.pb.cc', '<(protoc_out_dir)/chrome/browser/sync/protocol/bookmark_specifics.pb.h', '<(protoc_out_dir)/chrome/browser/sync/protocol/extension_specifics.pb.cc', '<(protoc_out_dir)/chrome/browser/sync/protocol/extension_specifics.pb.h', + '<(protoc_out_dir)/chrome/browser/sync/protocol/nigori_specifics.pb.cc', + '<(protoc_out_dir)/chrome/browser/sync/protocol/nigori_specifics.pb.h', '<(protoc_out_dir)/chrome/browser/sync/protocol/password_specifics.pb.cc', '<(protoc_out_dir)/chrome/browser/sync/protocol/password_specifics.pb.h', '<(protoc_out_dir)/chrome/browser/sync/protocol/preference_specifics.pb.cc', @@ -986,6 +997,8 @@ 'browser/sync/util/closure.h', 'browser/sync/util/crypto_helpers.cc', 'browser/sync/util/crypto_helpers.h', + 'browser/sync/util/cryptographer.cc', + 'browser/sync/util/cryptographer.h', 'browser/sync/util/dbgq.h', 'browser/sync/util/extensions_activity_monitor.cc', 'browser/sync/util/extensions_activity_monitor.h', -- cgit v1.1