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

Commit 49f031ea authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Disallow PAP authentication when MPPE is requested am: 4f319df8 

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



Change-Id: I9447047994de63d7e1f0ea09caf41093126c4228
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b36ce68 4f319df8

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

+7 −0
Original line number Diff line number Diff line
@@ -2157,6 +2157,13 @@ public class Vpn { 
                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",

                    (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: