commit 9a607658e4cd85c3d1197de51997eef67d4301c0
author Nathan Harold <nharold@google.com> Wed Dec 13 03:57:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 13 03:57:02 2017 +0000
tree 2b26778ab29d9d037cf20f10a7165324b784feb4
parent ab7bb84e34d09efbd4a386052ad7617800c2e12f
parent 78a4d4300bd4571c50f6f38908aeeefde47736ae

Merge "Fix IpSecAlgorithm Lengths in IpSecManagerTest" am: ab2a300272
am: d79c57dde6

Change-Id: I6c09b8b271486530a10d6e4f2beec2aa6b9e9d0c

tests/cts/net/src/android/net/cts/IpSecManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
index 75bc528..9f3ad2f 100644
--- a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
@@ -326,56 +326,56 @@
     public void testAesCbcHmacMd5Tcp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_TCP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacMd5Tcp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_TCP, IPV6_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacMd5Udp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_UDP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacMd5Udp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_MD5, getAuthKey(128), 96);
         checkTransform(IPPROTO_UDP, IPV6_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Tcp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_TCP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Tcp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_TCP, IPV6_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Udp4() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_UDP, IPV4_LOOPBACK, crypt, auth);
     }
 
     public void testAesCbcHmacSha1Udp6() throws Exception {
         IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY);
         IpSecAlgorithm auth = new IpSecAlgorithm(
-                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(256), 128);
+                IpSecAlgorithm.AUTH_HMAC_SHA1, getAuthKey(160), 96);
         checkTransform(IPPROTO_UDP, IPV6_LOOPBACK, crypt, auth);
     }