| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chromeos/login/auth/cryptohome_authenticator.h" | 5 #include "chromeos/login/auth/cryptohome_authenticator.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 } | 900 } |
| 901 | 901 |
| 902 AuthState state = CONTINUE; | 902 AuthState state = CONTINUE; |
| 903 | 903 |
| 904 if (current_state_->cryptohome_outcome() && | 904 if (current_state_->cryptohome_outcome() && |
| 905 current_state_->username_hash_valid()) { | 905 current_state_->username_hash_valid()) { |
| 906 state = ResolveCryptohomeSuccessState(); | 906 state = ResolveCryptohomeSuccessState(); |
| 907 } else { | 907 } else { |
| 908 state = ResolveCryptohomeFailureState(); | 908 state = ResolveCryptohomeFailureState(); |
| 909 LOGIN_LOG(ERROR) << "Cryptohome failure: " | 909 LOGIN_LOG(ERROR) << "Cryptohome failure: " |
| 910 << "state=" << state | 910 << "state(AuthState)=" << state |
| 911 << ", code=" << current_state_->cryptohome_code(); | 911 << ", code(cryptohome::MountError)=" |
| 912 << current_state_->cryptohome_code(); |
| 912 } | 913 } |
| 913 | 914 |
| 914 DCHECK(current_state_->cryptohome_complete()); // Ensure invariant holds. | 915 DCHECK(current_state_->cryptohome_complete()); // Ensure invariant holds. |
| 915 migrate_attempted_ = false; | 916 migrate_attempted_ = false; |
| 916 remove_attempted_ = false; | 917 remove_attempted_ = false; |
| 917 resync_attempted_ = false; | 918 resync_attempted_ = false; |
| 918 ephemeral_mount_attempted_ = false; | 919 ephemeral_mount_attempted_ = false; |
| 919 check_key_attempted_ = false; | 920 check_key_attempted_ = false; |
| 920 | 921 |
| 921 if (state != POSSIBLE_PW_CHANGE && state != NO_MOUNT && | 922 if (state != POSSIBLE_PW_CHANGE && state != NO_MOUNT && |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 Resolve(); | 1037 Resolve(); |
| 1037 } | 1038 } |
| 1038 | 1039 |
| 1039 void CryptohomeAuthenticator::SetOwnerState(bool owner_check_finished, | 1040 void CryptohomeAuthenticator::SetOwnerState(bool owner_check_finished, |
| 1040 bool check_result) { | 1041 bool check_result) { |
| 1041 owner_is_verified_ = owner_check_finished; | 1042 owner_is_verified_ = owner_check_finished; |
| 1042 user_can_login_ = check_result; | 1043 user_can_login_ = check_result; |
| 1043 } | 1044 } |
| 1044 | 1045 |
| 1045 } // namespace chromeos | 1046 } // namespace chromeos |
| OLD | NEW |