Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31d37680 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Disallow PAP authentication when MPPE is requested"

parents 0f13416f 997a4a39

services/core/java/com/android/server/connectivity/Vpn.java

+7 −0
Original line number Diff line number Diff line
@@ -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: