summaryrefslogtreecommitdiff
path: root/OsuLogin
diff options
context:
space:
mode:
author Ecco Park <eccopark@google.com> 2018-08-21 10:53:54 -0700
committer Ecco Park <eccopark@google.com> 2018-08-21 10:57:40 -0700
commitda818e724ef30096a7b2fd0031b7aa032fd1d7ed (patch)
treeb5532e43ff83e4e35a74272623f75295270e26da /OsuLogin
parent68e38df4876a53b70dc26839906d498b456985bd (diff)
passpoint-r2: add trust anchors for WFA Passpoint Release 2.
It is required to authenticate OSU server with OSU Server certificate singed with one of WFA trust anchors. Bug: 112052266 Test: live test with Passpoint r2 AP Change-Id: I01f498c875b067edd03a8bc008644281cb4ab1ff Signed-off-by: Ecco Park <eccopark@google.com>
Diffstat (limited to 'OsuLogin')
-rw-r--r--OsuLogin/AndroidManifest.xml1
-rw-r--r--OsuLogin/res/xml/network_security_config.xml9
2 files changed, 10 insertions, 0 deletions
diff --git a/OsuLogin/AndroidManifest.xml b/OsuLogin/AndroidManifest.xml
index f6cd79be6d..bc32d103bd 100644
--- a/OsuLogin/AndroidManifest.xml
+++ b/OsuLogin/AndroidManifest.xml
@@ -23,6 +23,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<application
+ android:networkSecurityConfig="@xml/network_security_config"
android:enabled="true"
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/OsuLogin/res/xml/network_security_config.xml b/OsuLogin/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..3ef4b84322
--- /dev/null
+++ b/OsuLogin/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+<base-config cleartextTrafficPermitted="true">
+ <trust-anchors>
+ <certificates src="system" />
+ <certificates src="wfa" />
+ </trust-anchors>
+</base-config>
+</network-security-config>