Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fabd96f authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "Fix nonce uniqueness tests" into main am: 8d333ff4 am: 2abfe4ab am:... 

Merge "Fix nonce uniqueness tests" into main am: 8d333ff4 am: 2abfe4ab am: 6187565c am: 88a2b9d4 am: 414b9833

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758146



Change-Id: I442bda877b1279d7a722f21023de70be873c85a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 287a83db 414b9833

keymaster/4.0/vts/functional/HmacKeySharingTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ TEST_P(HmacKeySharingTest, ComputeSharedHmac) { 
    auto nonces = copyNonces(params);

    EXPECT_EQ(allKeymasters().size(), nonces.size());

    std::sort(nonces.begin(), nonces.end());

    std::unique(nonces.begin(), nonces.end());

    nonces.erase(std::unique(nonces.begin(), nonces.end()), nonces.end());

    EXPECT_EQ(allKeymasters().size(), nonces.size());



    auto responses = computeSharedHmac(allKeymasters(), params);

security/sharedsecret/aidl/vts/functional/SharedSecretAidlTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ TEST_F(SharedSecretAidlTest, ComputeSharedSecret) { 
    auto nonces = copyNonces(params);

    EXPECT_EQ(sharedSecrets.size(), nonces.size());

    std::sort(nonces.begin(), nonces.end());

    std::unique(nonces.begin(), nonces.end());

    nonces.erase(std::unique(nonces.begin(), nonces.end()), nonces.end());

    EXPECT_EQ(sharedSecrets.size(), nonces.size());



    auto responses = computeAllSharedSecrets(params);