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

Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev

Browse Source
This commit is contained in:
Nathan Harold
2017-04-14 20:21:13 +00:00
committed by Android (Google) Code Review
parent dc3f163de2 a1ba8122b6
commit 9b807d83a4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View File

@@ -85,8 +85,7 @@ public class IpSecManagerTest extends AndroidTestCase {
randomSpi = randomSpi =
mISM.reserveSecurityParameterIndex( mISM.reserveSecurityParameterIndex(
IpSecTransform.DIRECTION_OUT, IpSecTransform.DIRECTION_OUT,
addr, addr);
IpSecManager.INVALID_SECURITY_PARAMETER_INDEX);
assertTrue(randomSpi.getSpi() != IpSecManager.INVALID_SECURITY_PARAMETER_INDEX); assertTrue(randomSpi.getSpi() != IpSecManager.INVALID_SECURITY_PARAMETER_INDEX);
droidSpi = droidSpi =
@@ -121,8 +120,7 @@ public class IpSecManagerTest extends AndroidTestCase {
IpSecManager.SecurityParameterIndex outSpi = IpSecManager.SecurityParameterIndex outSpi =
mISM.reserveSecurityParameterIndex( mISM.reserveSecurityParameterIndex(
IpSecTransform.DIRECTION_OUT, IpSecTransform.DIRECTION_OUT,
local, local);
IpSecManager.INVALID_SECURITY_PARAMETER_INDEX);
IpSecManager.SecurityParameterIndex inSpi = IpSecManager.SecurityParameterIndex inSpi =
mISM.reserveSecurityParameterIndex( mISM.reserveSecurityParameterIndex(
@@ -133,21 +131,21 @@ public class IpSecManagerTest extends AndroidTestCase {
.setSpi(IpSecTransform.DIRECTION_OUT, outSpi) .setSpi(IpSecTransform.DIRECTION_OUT, outSpi)
.setEncryption( .setEncryption(
IpSecTransform.DIRECTION_OUT, IpSecTransform.DIRECTION_OUT,
new IpSecAlgorithm(IpSecAlgorithm.ALGO_CRYPT_AES_CBC, CRYPT_KEY)) new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY))
.setAuthentication( .setAuthentication(
IpSecTransform.DIRECTION_OUT, IpSecTransform.DIRECTION_OUT,
new IpSecAlgorithm( new IpSecAlgorithm(
IpSecAlgorithm.ALGO_AUTH_HMAC_SHA256, IpSecAlgorithm.AUTH_HMAC_SHA256,
AUTH_KEY, AUTH_KEY,
AUTH_KEY.length * 8)) AUTH_KEY.length * 8))
.setSpi(IpSecTransform.DIRECTION_IN, inSpi) .setSpi(IpSecTransform.DIRECTION_IN, inSpi)
.setEncryption( .setEncryption(
IpSecTransform.DIRECTION_IN, IpSecTransform.DIRECTION_IN,
new IpSecAlgorithm(IpSecAlgorithm.ALGO_CRYPT_AES_CBC, CRYPT_KEY)) new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY))
.setAuthentication( .setAuthentication(
IpSecTransform.DIRECTION_IN, IpSecTransform.DIRECTION_IN,
new IpSecAlgorithm( new IpSecAlgorithm(
IpSecAlgorithm.ALGO_AUTH_HMAC_SHA256, IpSecAlgorithm.AUTH_HMAC_SHA256,
AUTH_KEY, AUTH_KEY,
CRYPT_KEY.length * 8)) CRYPT_KEY.length * 8))
.buildTransportModeTransform(local); .buildTransportModeTransform(local);