Merge "Fixing RSA tests not using the correct exponent" am: ba111275cb

am: a895ba8ff4

Change-Id: Ic0ad74ce178b395c22291c3fcf3f54e0f09d4a8a
This commit is contained in:
Max Bires
2019-12-03 11:53:27 -08:00
committed by android-build-merger

View File

@@ -527,9 +527,9 @@ TEST_F(NewKeyGenerationTest, Rsa) {
HidlBuf key_blob; HidlBuf key_blob;
KeyCharacteristics key_characteristics; KeyCharacteristics key_characteristics;
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(key_size, 3) .RsaSigningKey(key_size, 65537)
.Digest(Digest::NONE) .Digest(Digest::NONE)
.Padding(PaddingMode::NONE), .Padding(PaddingMode::NONE),
&key_blob, &key_characteristics)); &key_blob, &key_characteristics));
ASSERT_GT(key_blob.size(), 0U); ASSERT_GT(key_blob.size(), 0U);
@@ -579,11 +579,12 @@ TEST_F(NewKeyGenerationTest, NoInvalidRsaSizes) {
for (auto key_size : InvalidKeySizes(Algorithm::RSA)) { for (auto key_size : InvalidKeySizes(Algorithm::RSA)) {
HidlBuf key_blob; HidlBuf key_blob;
KeyCharacteristics key_characteristics; KeyCharacteristics key_characteristics;
ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE, GenerateKey(AuthorizationSetBuilder() ASSERT_EQ(ErrorCode::UNSUPPORTED_KEY_SIZE,
.RsaSigningKey(key_size, 3) GenerateKey(AuthorizationSetBuilder()
.Digest(Digest::NONE) .RsaSigningKey(key_size, 65537)
.Padding(PaddingMode::NONE), .Digest(Digest::NONE)
&key_blob, &key_characteristics)); .Padding(PaddingMode::NONE),
&key_blob, &key_characteristics));
} }
} }