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

Commit 336e7f18 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add IKEv2/IPsec VPN options" am: b189ffb3 am: 9d5397ab am: b9df8248 

Change-Id: I50104a17fd5b7d07cb50b9d6fcc002d7cfd96b6c
parents 64f11ee8 b9df8248

res/values/arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -957,6 +957,9 @@ 
        <item>IPSec Xauth PSK</item>

        <item>IPSec Xauth RSA</item>

        <item>IPSec Hybrid RSA</item>

        <item>IKEv2/IPSec MSCHAPv2</item>

        <item>IKEv2/IPSec PSK</item>

        <item>IKEv2/IPSec RSA</item>

    </string-array>



    <!-- Match this with the constants in VpnProfile. --> <skip />
@@ -968,6 +971,9 @@ 
        <item>IPSec VPN with pre-shared keys and Xauth authentication</item>

        <item>IPSec VPN with certificates and Xauth authentication</item>

        <item>IPSec VPN with certificates and hybrid authentication</item>

        <item>IKEv2/IPSec VPN with certificates and username/password authentication</item>

        <item>IKEv2/IPSec VPN with pre-shared keys</item>

        <item>IKEv2/IPSec VPN with certificates</item>

    </string-array>



    <!-- VPN proxy settings. -->