Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic 'am-febb6164619c46f681eb6dc8a6c58e06'

Browse Source 
* changes:
  Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16 am: 3bac61ac86 am: 96c87f7a9b
  Account for null client certificate am: 1ca57a1d10 am: 4ad314b463 am: 25eff7731a am: b35b219516
  Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269 am: 80b5793645 am: 9c9d4f6f6d  -s ours
This commit is contained in:
Android Build Merger (Role)
2017-01-28 02:16:37 +00:00
committed by Android (Google) Code Review
parent b41e016fb9 36828f5406
commit 59b3558dac
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java
View File

@@ -86,6 +86,16 @@ public class WifiEnterpriseConfigTest {
assertTrue(result[0] == cert0 && result[1] == cert1);
}
@Test
public void testSetClientKeyEntryWithNull() {
mEnterpriseConfig.setClientKeyEntry(null, null);
assertEquals(null, mEnterpriseConfig.getClientCertificateChain());
assertEquals(null, mEnterpriseConfig.getClientCertificate());
mEnterpriseConfig.setClientKeyEntryWithCertificateChain(null, null);
assertEquals(null, mEnterpriseConfig.getClientCertificateChain());
assertEquals(null, mEnterpriseConfig.getClientCertificate());
}
@Test
public void testSetClientCertificateChain() {
PrivateKey clientKey = FakeKeys.RSA_KEY1;