diff options
| author | nharold <nharold@google.com> | 2018-01-17 08:40:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-17 08:40:37 +0000 |
| commit | 36897197cfcc4eb4b96df127d52eeed33afeb73b (patch) | |
| tree | bdc6a466ceddbacc5fff51bfddf8f957417cd410 /server/XfrmControllerTest.cpp | |
| parent | 838f0781ffb4fb75abf16acf0bd456dca3cc9aa1 (diff) | |
| parent | da54f121d3ee5cb9094bdfd4fca46e9085a7d49b (diff) | |
| download | platform_system_netd-36897197cfcc4eb4b96df127d52eeed33afeb73b.tar.gz platform_system_netd-36897197cfcc4eb4b96df127d52eeed33afeb73b.tar.bz2 platform_system_netd-36897197cfcc4eb4b96df127d52eeed33afeb73b.zip | |
Merge "Make Transforms Unidirectional"
Diffstat (limited to 'server/XfrmControllerTest.cpp')
| -rw-r--r-- | server/XfrmControllerTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/server/XfrmControllerTest.cpp b/server/XfrmControllerTest.cpp index 63cf6719e..222326065 100644 --- a/server/XfrmControllerTest.cpp +++ b/server/XfrmControllerTest.cpp @@ -239,8 +239,8 @@ TEST_P(XfrmControllerParameterizedTest, TestIpSecAllocateSpi) { XfrmController ctrl; int outSpi = 0; - Status res = ctrl.ipSecAllocateSpi(1 /* resourceId */, static_cast<int>(XfrmDirection::OUT), - localAddr, remoteAddr, DROID_SPI, &outSpi); + Status res = ctrl.ipSecAllocateSpi(1 /* resourceId */, localAddr, + remoteAddr, DROID_SPI, &outSpi); EXPECT_TRUE(isOk(res)) << res; EXPECT_EQ(DROID_SPI, outSpi); @@ -287,11 +287,11 @@ void testIpSecAddSecurityAssociation(int version, const MockSyscalls& mockSyscal XfrmController ctrl; Status res = ctrl.ipSecAddSecurityAssociation( - 1 /* resourceId */, static_cast<int>(mode), - static_cast<int>(XfrmDirection::OUT), localAddr, remoteAddr, 0 /* underlying network */, - DROID_SPI, "hmac(sha256)" /* auth algo */, authKey, 128 /* auth trunc length */, - "cbc(aes)" /* encryption algo */, cryptKey, 0 /* crypt trunc length? */, "" /* AEAD algo */, - {}, 0, static_cast<int>(XfrmEncapType::NONE), 0 /* local port */, 0 /* remote port */); + 1 /* resourceId */, static_cast<int>(mode), localAddr, remoteAddr, + 0 /* underlying network */, DROID_SPI, "hmac(sha256)" /* auth algo */, + authKey, 128 /* auth trunc length */, "cbc(aes)" /* encryption algo */, cryptKey, + 0 /* crypt trunc length? */, "" /* AEAD algo */, {}, 0, + static_cast<int>(XfrmEncapType::NONE), 0 /* local port */, 0 /* remote port */); EXPECT_TRUE(isOk(res)) << res; EXPECT_EQ(expectedMsgLength, nlMsgBuf.size()); @@ -370,7 +370,7 @@ TEST_F(XfrmControllerTest, TestIpSecAddSecurityAssociationIPv6Encap) { XfrmController ctrl; Status res = ctrl.ipSecAddSecurityAssociation( - 1, static_cast<int>(XfrmMode::TRANSPORT), static_cast<int>(XfrmDirection::OUT), + 1, static_cast<int>(XfrmMode::TRANSPORT), LOCALHOST_V6, TEST_ADDR_V6, 0, DROID_SPI, "hmac(sha256)", {}, 128, "cbc(aes)", {}, 0, "", {}, 0, static_cast<int>(XfrmEncapType::ESPINUDP_NON_IKE), 0, 0); @@ -456,7 +456,7 @@ TEST_P(XfrmControllerParameterizedTest, TestIpSecDeleteSecurityAssociation) { XfrmController ctrl; Status res = ctrl.ipSecDeleteSecurityAssociation( - 1 /* resourceId */, static_cast<int>(XfrmDirection::OUT), localAddr, remoteAddr, DROID_SPI); + 1 /* resourceId */, localAddr, remoteAddr, DROID_SPI); EXPECT_TRUE(isOk(res)) << res; EXPECT_EQ(expectedMsgLength, nlMsgBuf.size()); |