Merge "Add minimum TLS version for Wi-Fi EAP network"
This commit is contained in:
committed by
Android (Google) Code Review
commit
cbe52e6b1c
@@ -211,6 +211,15 @@
|
||||
<item>Require certificate status</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Match this with the integer value of WifiEnterpriseConfig.TlsVersion -->
|
||||
<!-- Type of TlsVersion -->
|
||||
<string-array name="wifi_eap_tls_ver" translatable="false">
|
||||
<item>TLS v1.0</item>
|
||||
<item>TLS v1.1</item>
|
||||
<item>TLS v1.2</item>
|
||||
<item>TLS v1.3</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Wi-Fi AP band settings. Either 2.4GHz or 5GHz prefer. -->
|
||||
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
|
||||
<string-array translatable="false" name="wifi_ap_band">
|
||||
|
@@ -1545,6 +1545,8 @@
|
||||
<string name="please_select_phase2">Phase 2 authentication</string>
|
||||
<!-- Label for the EAP CA certificate of the network -->
|
||||
<string name="wifi_eap_ca_cert">CA certificate</string>
|
||||
<!-- Label for the EAP minimum TLS version of the network -->
|
||||
<string name="wifi_eap_min_tls_ver">Minimum TLS version</string>
|
||||
<!-- Label for the OCSP type of the network. [CHAR LIMIT=32] -->
|
||||
<string name="wifi_eap_ocsp">Online Certificate Status</string>
|
||||
<!-- Label for the domain name that the EAP CA certificate(s) can be used to validate. -->
|
||||
|
Reference in New Issue
Block a user