LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic "encap-api" into pi-dev

Browse Source 
* changes:
  Require explicitly supplied truncation length
  Clarify UDP encapsulation socket API
This commit is contained in:
Benedict Wong
2018-03-30 20:28:19 +00:00
committed by Android (Google) Code Review
parent 07019bb20f 2e1ebb60e6
commit c37a5742a2
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/net/java/android/net/IpSecAlgorithmTest.java
View File

@@ -22,8 +22,12 @@ import static org.junit.Assert.fail;
import android.os.Parcel;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import java.util.AbstractMap.SimpleEntry;
import java.util.Arrays;
import java.util.Map.Entry;
import java.util.Random;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,19 +44,29 @@ public class IpSecAlgorithmTest {
};
@Test
public void testDefaultTruncLen() throws Exception {
IpSecAlgorithm explicit =
public void testNoTruncLen() throws Exception {
Entry<String, Integer>[] authAndAeadList =
new Entry[] {
new SimpleEntry<>(IpSecAlgorithm.AUTH_HMAC_MD5, 128),
new SimpleEntry<>(IpSecAlgorithm.AUTH_HMAC_SHA1, 160),
new SimpleEntry<>(IpSecAlgorithm.AUTH_HMAC_SHA256, 256),
new SimpleEntry<>(IpSecAlgorithm.AUTH_HMAC_SHA384, 384),
new SimpleEntry<>(IpSecAlgorithm.AUTH_HMAC_SHA512, 512),
new SimpleEntry<>(IpSecAlgorithm.AUTH_CRYPT_AES_GCM, 224)
};
// Expect auth and aead algorithms to throw errors if trunclen is omitted.
for (Entry<String, Integer> algData : authAndAeadList) {
try {
new IpSecAlgorithm(
IpSecAlgorithm.AUTH_HMAC_SHA256, Arrays.copyOf(KEY_MATERIAL, 256 / 8), 256);
IpSecAlgorithm implicit =
new IpSecAlgorithm(
IpSecAlgorithm.AUTH_HMAC_SHA256, Arrays.copyOf(KEY_MATERIAL, 256 / 8));
assertTrue(
"Default Truncation Length Incorrect, Explicit: "
+ explicit
+ "implicit: "
+ implicit,
IpSecAlgorithm.equals(explicit, implicit));
algData.getKey(), Arrays.copyOf(KEY_MATERIAL, algData.getValue() / 8));
fail("Expected exception on unprovided auth trunclen");
} catch (IllegalArgumentException expected) {
}
}
// Ensure crypt works with no truncation length supplied.
new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, Arrays.copyOf(KEY_MATERIAL, 256 / 8));
}
@Test

3
tests/net/java/android/net/IpSecConfigTest.java
View File

@@ -62,7 +62,8 @@ public class IpSecConfigTest {
c.setAuthentication(
new IpSecAlgorithm(
IpSecAlgorithm.AUTH_HMAC_MD5,
new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0}));
new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0},
128));
c.setAuthenticatedEncryption(
new IpSecAlgorithm(
IpSecAlgorithm.AUTH_CRYPT_AES_GCM,

4
tests/net/java/android/net/IpSecManagerTest.java
View File

@@ -179,7 +179,7 @@ public class IpSecManagerTest {
IpSecManager.UdpEncapsulationSocket encapSocket =
mIpSecManager.openUdpEncapsulationSocket(TEST_UDP_ENCAP_PORT);
assertNotNull(encapSocket.getSocket());
assertNotNull(encapSocket.getFileDescriptor());
assertEquals(TEST_UDP_ENCAP_PORT, encapSocket.getPort());
encapSocket.close();
@@ -202,7 +202,7 @@ public class IpSecManagerTest {
IpSecManager.UdpEncapsulationSocket encapSocket =
mIpSecManager.openUdpEncapsulationSocket();
assertNotNull(encapSocket.getSocket());
assertNotNull(encapSocket.getFileDescriptor());
assertEquals(TEST_UDP_ENCAP_PORT, encapSocket.getPort());
encapSocket.close();