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

Commit a18c3121 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8 am:... 

Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8 am: 49f031ea am: 2f745097 am: c14e9954" into sc-v2-dev
parents 196fc30c 0684759f

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

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