Merge "Don't require UNKNOWN_ERROR" into main am: 606a406750

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

Change-Id: Iea95e5d2e565bdc4908587e5d07203946d24efbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-21 19:32:52 +00:00
committed by Automerger Merge Worker

View File

@@ -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());
} }