| Index: chrome/browser/chromeos/login/parallel_authenticator.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/login/parallel_authenticator.cc (revision 106962)
|
| +++ chrome/browser/chromeos/login/parallel_authenticator.cc (working copy)
|
| @@ -751,15 +751,6 @@
|
| 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.
|
| @@ -782,12 +773,6 @@
|
| 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(),
|
|
|