Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disallow PAP authentication when MPPE is requested"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2022-04-06 06:37:06 +00:00
committed by Android (Google) Code Review
parent 0f13416fcd 997a4a3926
commit 31d3768045
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -2313,6 +2313,13 @@ public class Vpn {
"usepeerdns", "idle", "1800", "mtu", "1270", "mru", "1270",
(profile.mppe ? "+mppe" : "nomppe"),
};
if (profile.mppe) {
// Disallow PAP authentication when MPPE is requested, as MPPE cannot work
// with PAP anyway, and users may not expect PAP (plain text) to be used when
// MPPE was requested.
mtpd = Arrays.copyOf(mtpd, mtpd.length + 1);
mtpd[mtpd.length - 1] = "-pap";
}
break;
case VpnProfile.TYPE_L2TP_IPSEC_PSK:
case VpnProfile.TYPE_L2TP_IPSEC_RSA: