Removed legacy encoding mechanism that was temporarely used at one point while WebUI was still be...

chrome/browser/chromeos/login/parallel_authenticator.cc

 // Copyright (c) 2011 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/parallel_authenticator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 733 matching lines @@
 }
 std::string ParallelAuthenticator::DecryptToken(
     const std::string& encrypted_token_hex) {
   if (!LoadSupplementalUserKey())
     return std::string();
   return DecryptTokenWithKey(supplemental_user_key_.get(),
                              SaltAsAscii(),
                              encrypted_token_hex);
 }
 
-std::string ParallelAuthenticator::DecryptLegacyToken(
-    const std::string& encrypted_token_hex) {
-  scoped_ptr<crypto::SymmetricKey> key(
-      crypto::SymmetricKey::DeriveKeyFromPassword(
-          crypto::SymmetricKey::AES, UserSupplementalKeyAsAscii(),
-          SaltAsAscii(), 1000, 256));
-  return DecryptTokenWithKey(key.get(), SaltAsAscii(), encrypted_token_hex);
-}
-
 std::string ParallelAuthenticator::HashPassword(const std::string& password) {
   // Get salt, ascii encode, update sha with that, then update with ascii
   // of password, then end.
   std::string ascii_salt = SaltAsAscii();
   char passhash_buf[kPassHashLen];
 
   // Hash salt and password
   crypto::SHA256HashString(ascii_salt + password,
                            &passhash_buf, sizeof(passhash_buf));
 
   return StringToLowerASCII(base::HexEncode(
       reinterpret_cast<const void*>(passhash_buf),
       sizeof(passhash_buf) / 2));
 }
 
 std::string ParallelAuthenticator::SaltAsAscii() {
   LoadSystemSalt();  // no-op if it's already loaded.
   return StringToLowerASCII(base::HexEncode(
       reinterpret_cast<const void*>(system_salt_.data()),
       system_salt_.size()));
 }
 
-std::string ParallelAuthenticator::UserSupplementalKeyAsAscii() {
-  // TODO(zelidrag, wad): http://crosbug.com/18633 - Replace this with the real
-  // user suplemental key gets exposed in from cryptolib.
-  return SaltAsAscii();
-}
-
 void ParallelAuthenticator::ResolveLoginCompletionStatus() {
   // Shortcut online state resolution process.
   current_state_->RecordOnlineLoginStatus(GaiaAuthConsumer::ClientLoginResult(),
                                           LoginFailure::None());
   Resolve();
 }
 
 }  // namespace chromeos