[Chrome OS] Owner keys are generated outside Chrome now; handle appropriately

chrome/browser/chromeos/login/owner_key_utils.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/chromeos/login/owner_key_utils.h"
 
 #include <limits>
 
 #include "base/crypto/rsa_private_key.h"
 #include "base/crypto/signature_creator.h"
@@ skipping 22 matching lines @@
 
 OwnerKeyUtils::~OwnerKeyUtils() {}
 
 ///////////////////////////////////////////////////////////////////////////
 // OwnerKeyUtilsImpl
 
 class OwnerKeyUtilsImpl : public OwnerKeyUtils {
  public:
   OwnerKeyUtilsImpl();
 
-  RSAPrivateKey* GenerateKeyPair();
-
-  bool ExportPublicKeyViaDbus(RSAPrivateKey* pair,
-                              LoginLibrary::Delegate* d);
-
-  bool ExportPublicKeyToFile(RSAPrivateKey* pair, const FilePath& key_file);
-
   bool ImportPublicKey(const FilePath& key_file,
                        std::vector<uint8>* output);
 
   bool Verify(const std::string& data,
               const std::vector<uint8> signature,
               const std::vector<uint8> public_key);
 
   bool Sign(const std::string& data,
             std::vector<uint8>* OUT_signature,
             base::RSAPrivateKey* key);
 
   RSAPrivateKey* FindPrivateKey(const std::vector<uint8>& key);
 
   FilePath GetOwnerKeyFilePath();
 
  protected:
   virtual ~OwnerKeyUtilsImpl();
 
+  bool ExportPublicKeyToFile(RSAPrivateKey* pair, const FilePath& key_file);
+
  private:
   // The file outside the owner's encrypted home directory where her
   // key will live.
   static const char kOwnerKeyFile[];
 
-  // Key generation parameters.
-  static const uint16 kKeySizeInBits;
-
   DISALLOW_COPY_AND_ASSIGN(OwnerKeyUtilsImpl);
 };
 
 // Defined here, instead of up above, because we need OwnerKeyUtilsImpl.
 OwnerKeyUtils* OwnerKeyUtils::Create() {
   if (!factory_)
     return new OwnerKeyUtilsImpl();
   else
     return factory_->CreateOwnerKeyUtils();
 }
 
 // static
 const char OwnerKeyUtilsImpl::kOwnerKeyFile[] = "/var/lib/whitelist/owner.key";
 
-// We're generating and using 2048-bit RSA keys.
-// static
-const uint16 OwnerKeyUtilsImpl::kKeySizeInBits = 2048;
-
 OwnerKeyUtilsImpl::OwnerKeyUtilsImpl() {}
 
 OwnerKeyUtilsImpl::~OwnerKeyUtilsImpl() {}
 
-RSAPrivateKey* OwnerKeyUtilsImpl::GenerateKeyPair() {
-  return RSAPrivateKey::CreateSensitive(kKeySizeInBits);
-}
-
-bool OwnerKeyUtilsImpl::ExportPublicKeyViaDbus(RSAPrivateKey* pair,
-                                               LoginLibrary::Delegate* d) {
-  DCHECK(pair);
-  bool ok = false;
-
-  std::vector<uint8> to_export;
-  if (!pair->ExportPublicKey(&to_export)) {
-    LOG(ERROR) << "Formatting key for export via dbus failed!";
-    return false;
-  }
-
-  if (CrosLibrary::Get()->EnsureLoaded())
-    ok = CrosLibrary::Get()->GetLoginLibrary()->SetOwnerKeyAsync(to_export, d);
-
-  return ok;
-}
-
 bool OwnerKeyUtilsImpl::ExportPublicKeyToFile(RSAPrivateKey* pair,
                                               const FilePath& key_file) {
   DCHECK(pair);
   bool ok = false;
   int safe_file_size = 0;
 
   std::vector<uint8> to_export;
   if (!pair->ExportPublicKey(&to_export)) {
     LOG(ERROR) << "Formatting key for export failed!";
     return false;
@@ skipping 65 matching lines @@
 RSAPrivateKey* OwnerKeyUtilsImpl::FindPrivateKey(
     const std::vector<uint8>& key) {
   return RSAPrivateKey::FindFromPublicKeyInfo(key);
 }
 
 FilePath OwnerKeyUtilsImpl::GetOwnerKeyFilePath() {
   return FilePath(OwnerKeyUtilsImpl::kOwnerKeyFile);
 }
 
 }  // namespace chromeos