diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-21 01:47:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-21 01:47:14 +0000 |
| commit | 0c1aaef83c4c5cf9be7907698e9fe9dabb12d479 (patch) | |
| tree | 8f87ca3f81df0cb6886c4d2f8ed2bdb70bab5b48 /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | e325f3b14e5dd21ff8d2e3c066fba68c6d0d12f8 (diff) | |
| parent | 3b56cbca28c57787f34d6494fcbff1e1695f334d (diff) | |
Merge "KeyMint vts: Correct the EC curve parameter and some return code" into sc-dev
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/KeyMintTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index 293a010f50..d2b1f4f34e 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp @@ -2303,11 +2303,11 @@ TEST_P(SigningOperationsTest, RsaNonUniqueParams) { .Padding(PaddingMode::NONE) .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN))); - ASSERT_EQ(ErrorCode::UNSUPPORTED_DIGEST, - Begin(KeyPurpose::SIGN, AuthorizationSetBuilder() - .Digest(Digest::NONE) - .Digest(Digest::SHA1) - .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN))); + auto result = Begin(KeyPurpose::SIGN, AuthorizationSetBuilder() + .Digest(Digest::NONE) + .Digest(Digest::SHA1) + .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN)); + ASSERT_TRUE(result == ErrorCode::UNSUPPORTED_DIGEST || result == ErrorCode::INVALID_ARGUMENT); ASSERT_EQ(ErrorCode::UNSUPPORTED_DIGEST, Begin(KeyPurpose::SIGN, |