commit 016243525e91e6cccedfb159c63d7193787bd5ab
author Cody Kesting <ckesting@google.com> Fri Aug 07 01:14:18 2020 +0000
committer Yan Yan <evitayan@google.com> Wed Sep 02 22:24:08 2020 +0000
tree 60f7575a9dd2b096b672143acbcb0398950df2c8
parent e0157967b2c51dd7d6562da632065671f45b99ad

Fix logging for EMSK in EapAuthenticator.

This CL fixes logging in EapAuthenticator for the EapSuccess case to
correctly log the EMSK. Previously, the MSK was being labeled as the
EMSK.

Bug: 162965419
Test: atest FrameworksIkeTests
Change-Id: I04a9e1f5f6e521b0fffdfeffc120c21e81f77f5a
Merged-In: I04a9e1f5f6e521b0fffdfeffc120c21e81f77f5a
(cherry picked from commit 7983d4af365263bdcd1943e184660541ba003390)

src/java/com/android/internal/net/eap/EapAuthenticator.java

diff --git a/src/java/com/android/internal/net/eap/EapAuthenticator.java b/src/java/com/android/internal/net/eap/EapAuthenticator.java
index 751e51f..c3b5f93 100644
--- a/src/java/com/android/internal/net/eap/EapAuthenticator.java
+++ b/src/java/com/android/internal/net/eap/EapAuthenticator.java
@@ -192,7 +192,7 @@
                                                 TAG,
                                                 "EapSuccess with"
                                                         + " MSK=" + LOG.pii(eapSuccess.msk)
-                                                        + " EMSK=" + LOG.pii(eapSuccess.msk));
+                                                        + " EMSK=" + LOG.pii(eapSuccess.emsk));
                                         mCb.onSuccess(eapSuccess.msk, eapSuccess.emsk);
                                     } else { // finalProcessResponse instanceof EapFailure
                                         mCb.onFail();