diff options
| author | Etan Cohen <etancohen@google.com> | 2017-06-21 11:22:22 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-06-23 09:20:54 -0700 |
| commit | efadd5383b5a98dcc249d3b8700142d3d748989f (patch) | |
| tree | 098bcf30531a5e10496b0c32b2886079980f6952 /service | |
| parent | a939bad4d61d9e750994b0fa4e0caa2e6cddefc7 (diff) | |
[AWARE] Mask passphrase/pmk information
Bug: 62866763
Test: validated that logs don't show pmk/passphrase anymore
Change-Id: I8ce5b2e6192af05f8748bee51e13312b65185a1d
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareStateManager.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java index 988485634..fc0013529 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java @@ -2329,13 +2329,14 @@ public class WifiAwareStateManager implements WifiAwareShellCommand.DelegatedShe int channel, byte[] peer, String interfaceName, byte[] pmk, String passphrase, boolean isOutOfBand) { if (VDBG) { - Log.v(TAG, - "initiateDataPathSetupLocal(): transactionId=" + transactionId - + ", networkSpecifier=" + networkSpecifier + ", peerId=" + peerId - + ", channelRequestType=" + channelRequestType + ", channel=" + channel - + ", peer=" + String.valueOf(HexEncoding.encode(peer)) - + ", interfaceName=" + interfaceName + ", pmk=" + pmk - + ", passphrase=" + passphrase + ", isOutOfBand=" + isOutOfBand); + Log.v(TAG, "initiateDataPathSetupLocal(): transactionId=" + transactionId + + ", networkSpecifier=" + networkSpecifier + ", peerId=" + peerId + + ", channelRequestType=" + channelRequestType + ", channel=" + channel + + ", peer=" + + String.valueOf(HexEncoding.encode(peer)) + ", interfaceName=" + interfaceName + + ", pmk=" + ((pmk == null) ? "" : "*") + ", passphrase=" + ( + (passphrase == null) ? "" : "*") + ", isOutOfBand=" + + isOutOfBand); } boolean success = mWifiAwareNativeApi.initiateDataPath(transactionId, peerId, @@ -2354,10 +2355,10 @@ public class WifiAwareStateManager implements WifiAwareShellCommand.DelegatedShe Log.v(TAG, "respondToDataPathRequestLocal(): transactionId=" + transactionId + ", accept=" + accept + ", ndpId=" + ndpId + ", interfaceName=" + interfaceName - + ", pmk=" + pmk + ", passphrase=" + passphrase + ", isOutOfBand=" + + ", pmk=" + ((pmk == null) ? "" : "*") + ", passphrase=" + + ((passphrase == null) ? "" : "*") + ", isOutOfBand=" + isOutOfBand); } - boolean success = mWifiAwareNativeApi.respondToDataPathRequest(transactionId, accept, ndpId, interfaceName, pmk, passphrase, isOutOfBand, mCapabilities); if (!success) { |