summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/util/cryptographer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/util/cryptographer.cc')
-rw-r--r--chrome/browser/sync/util/cryptographer.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/sync/util/cryptographer.cc b/chrome/browser/sync/util/cryptographer.cc
index 5d1e450..de83652 100644
--- a/chrome/browser/sync/util/cryptographer.cc
+++ b/chrome/browser/sync/util/cryptographer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -172,6 +172,11 @@ void Cryptographer::SetPendingKeys(const sync_pb::EncryptedData& encrypted) {
pending_keys_.reset(new sync_pb::EncryptedData(encrypted));
}
+const sync_pb::EncryptedData& Cryptographer::GetPendingKeys() const {
+ DCHECK(has_pending_keys());
+ return *(pending_keys_.get());
+}
+
bool Cryptographer::DecryptPendingKeys(const KeyParams& params) {
Nigori nigori;
if (!nigori.InitByDerivation(params.hostname,