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

Commit a5d599f7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: a18c3121

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780



Change-Id: I0c82fda5497bace30d49989b8e84ebc98250ca8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 466149ed a18c3121

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: