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

Commit 39704549 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't require UNKNOWN_ERROR" into main am: 606a4067 am: 6375a4ce 

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



Change-Id: Ib9c56a03a2ca3495d39f45a3871c83688008054b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 863da398 6375a4ce

security/keymint/aidl/vts/functional/KeyMintTest.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -4797,7 +4797,7 @@ TEST_P(ImportKeyTest, RsaOaepMGFDigestSuccess) { 




        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        string result;

        string result;

        EXPECT_EQ(ErrorCode::UNKNOWN_ERROR, Finish(ciphertext1, &result));

        EXPECT_NE(ErrorCode::OK, Finish(ciphertext1, &result));

        EXPECT_EQ(0U, result.size());

        EXPECT_EQ(0U, result.size());

    }

    }

}

}
@@ -5305,7 +5305,7 @@ TEST_P(EncryptionOperationsTest, RsaOaepSuccess) { 




        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        string result;

        string result;

        EXPECT_EQ(ErrorCode::UNKNOWN_ERROR, Finish(ciphertext1, &result));

        EXPECT_NE(ErrorCode::OK, Finish(ciphertext1, &result));

        EXPECT_EQ(0U, result.size());

        EXPECT_EQ(0U, result.size());

    }

    }

}

}
@@ -5372,7 +5372,7 @@ TEST_P(EncryptionOperationsTest, RsaOaepDecryptWithWrongDigest) { 
                                                                .Digest(Digest::SHA_2_256)

                                                                .Digest(Digest::SHA_2_256)

                                                                .Padding(PaddingMode::RSA_OAEP)));

                                                                .Padding(PaddingMode::RSA_OAEP)));

    string result;

    string result;

    EXPECT_EQ(ErrorCode::UNKNOWN_ERROR, Finish(ciphertext, &result));

    EXPECT_NE(ErrorCode::OK, Finish(ciphertext, &result));

    EXPECT_EQ(0U, result.size());

    EXPECT_EQ(0U, result.size());

}

}
@@ -5442,7 +5442,7 @@ TEST_P(EncryptionOperationsTest, RsaOaepWithMGFDigestSuccess) { 




        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

        string result;

        string result;

        EXPECT_EQ(ErrorCode::UNKNOWN_ERROR, Finish(ciphertext1, &result));

        EXPECT_NE(ErrorCode::OK, Finish(ciphertext1, &result));

        EXPECT_EQ(0U, result.size());

        EXPECT_EQ(0U, result.size());

    }

    }

}

}
@@ -5486,7 +5486,7 @@ TEST_P(EncryptionOperationsTest, RsaOaepMGFDigestDefaultSuccess) { 




    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

    string result;

    string result;

    EXPECT_EQ(ErrorCode::UNKNOWN_ERROR, Finish(ciphertext, &result));

    EXPECT_NE(ErrorCode::OK, Finish(ciphertext, &result));

    EXPECT_EQ(0U, result.size());

    EXPECT_EQ(0U, result.size());

}

}
@@ -5618,7 +5618,7 @@ TEST_P(EncryptionOperationsTest, RsaPkcs1Success) { 




    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params));

    string result;

    string result;

    EXPECT_EQ(ErrorCode::UNKNOWN_ERROR, Finish(ciphertext1, &result));

    EXPECT_NE(ErrorCode::OK, Finish(ciphertext1, &result));

    EXPECT_EQ(0U, result.size());

    EXPECT_EQ(0U, result.size());

}

}