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

Fixed NullPointerException in IpSecService-Netd binder layer

Browse Source 
Replaced null with empty byte array in createTransportModeTransform
for null auth.getKey, crypt.getKey() and authCrypt.getKey()

Test: Ran CTS test
Bug: 68052730
Change-Id: I5110b1297b4bfbb5766e8ecfd3d64f8110b52945
This commit is contained in:
Manoj Boopathi Raj
2017-10-26 11:49:02 -07:00
committed by manojboopathi
parent 20f339b7df
commit 03bb7d9304
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
View File

@@ -206,7 +206,7 @@ public class IpSecServiceParameterizedTest {
eq(CRYPT_KEY), eq(CRYPT_KEY),
anyInt(), anyInt(),
eq(""), eq(""),
isNull(), eq(new byte[] {}),
eq(0), eq(0),
anyInt(), anyInt(),
anyInt(), anyInt(),
@@ -227,7 +227,7 @@ public class IpSecServiceParameterizedTest {
eq(CRYPT_KEY), eq(CRYPT_KEY),
anyInt(), anyInt(),
eq(""), eq(""),
isNull(), eq(new byte[] {}),
eq(0), eq(0),
anyInt(), anyInt(),
anyInt(), anyInt(),
@@ -256,10 +256,10 @@ public class IpSecServiceParameterizedTest {
anyLong(), anyLong(),
eq(TEST_SPI_OUT), eq(TEST_SPI_OUT),
eq(""), eq(""),
isNull(), eq(new byte[] {}),
eq(0), eq(0),
eq(""), eq(""),
isNull(), eq(new byte[] {}),
eq(0), eq(0),
eq(IpSecAlgorithm.AUTH_CRYPT_AES_GCM), eq(IpSecAlgorithm.AUTH_CRYPT_AES_GCM),
eq(CRYPT_KEY), eq(CRYPT_KEY),
@@ -277,10 +277,10 @@ public class IpSecServiceParameterizedTest {
anyLong(), anyLong(),
eq(TEST_SPI_IN), eq(TEST_SPI_IN),
eq(""), eq(""),
isNull(), eq(new byte[] {}),
eq(0), eq(0),
eq(""), eq(""),
isNull(), eq(new byte[] {}),
eq(0), eq(0),
eq(IpSecAlgorithm.AUTH_CRYPT_AES_GCM), eq(IpSecAlgorithm.AUTH_CRYPT_AES_GCM),
eq(CRYPT_KEY), eq(CRYPT_KEY),