Merge "Add IKEv2/IPsec VPN options"

This commit is contained in:
Benedict Wong
2020-01-23 05:11:47 +00:00
committed by Gerrit Code Review

View File

@@ -912,6 +912,9 @@
<item>IPSec Xauth PSK</item> <item>IPSec Xauth PSK</item>
<item>IPSec Xauth RSA</item> <item>IPSec Xauth RSA</item>
<item>IPSec Hybrid RSA</item> <item>IPSec Hybrid RSA</item>
<item>IKEv2/IPSec MSCHAPv2</item>
<item>IKEv2/IPSec PSK</item>
<item>IKEv2/IPSec RSA</item>
</string-array> </string-array>
<!-- Match this with the constants in VpnProfile. --> <skip /> <!-- Match this with the constants in VpnProfile. --> <skip />
@@ -923,6 +926,9 @@
<item>IPSec VPN with pre-shared keys and Xauth authentication</item> <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 Xauth authentication</item>
<item>IPSec VPN with certificates and hybrid 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> </string-array>
<!-- VPN proxy settings. --> <!-- VPN proxy settings. -->