Let the Nigori client import and export raw encryption keys.

chrome/browser/sync/util/nigori.cc

Index: chrome/browser/sync/util/nigori.cc
diff --git a/chrome/browser/sync/util/nigori.cc b/chrome/browser/sync/util/nigori.cc
index 01de18dce325769d988979f37f08e5b0221b2df3..33d39158331c916f5f310491e3fa19299f78d807 100644
--- a/chrome/browser/sync/util/nigori.cc
+++ b/chrome/browser/sync/util/nigori.cc
@@ -61,19 +61,21 @@ class NigoriStream {
 // static
 const char Nigori::kSaltSalt[] = "saltsalt";
 
-Nigori::Nigori(const std::string& hostname)
-    : hostname_(hostname) {
+Nigori::Nigori() {
 }
 
 Nigori::~Nigori() {
 }
 
-bool Nigori::Init(const std::string& username, const std::string& password) {
+bool Nigori::InitByDerivation(const std::string& hostname,
+                              const std::string& username,
+                              const std::string& password) {
+  hostname_ = hostname;
   username_ = username;
   password_ = password;
 
   NigoriStream salt_password;
-  salt_password << username << hostname_;
+  salt_password << username << hostname;
 
   // Suser = PBKDF2(Username || Servername, "saltsalt", Nsalt, 8)
   scoped_ptr<SymmetricKey> user_salt(SymmetricKey::DeriveKeyFromPassword(
@@ -105,6 +107,22 @@ bool Nigori::Init(const std::string& username, const std::string& password) {
   return true;
 }
 
+bool Nigori::InitByImport(const std::string& user_key,
+                          const std::string& encryption_key,
+                          const std::string& mac_key) {
+  user_key_.reset(SymmetricKey::Import(SymmetricKey::AES, user_key));
+  DCHECK(user_key_.get());
+
+  encryption_key_.reset(SymmetricKey::Import(SymmetricKey::AES,
+                                             encryption_key));
+  DCHECK(encryption_key_.get());
+
+  mac_key_.reset(SymmetricKey::Import(SymmetricKey::HMAC_SHA1, mac_key));
+  DCHECK(mac_key_.get());
+
+  return user_key_.get() && encryption_key_.get() && mac_key_.get();
+}
+
 // Permute[Kenc,Kmac](type || name)
 bool Nigori::Permute(Type type, const std::string& name,
                      std::string* permuted) const {
@@ -228,4 +246,16 @@ bool Nigori::Decrypt(const std::string& encrypted, std::string* value) const {
   return true;
 }
 
+bool Nigori::ExportKeys(std::string* user_key,
+                        std::string* encryption_key,
+                        std::string* mac_key) const {
+  DCHECK(user_key);
+  DCHECK(encryption_key);
+  DCHECK(mac_key);
+
+  return user_key_->GetRawKey(user_key) &&
+      encryption_key_->GetRawKey(encryption_key) &&
+      mac_key_->GetRawKey(mac_key);
+}
+
 }  // namespace browser_sync