commit 5070102465dee8e53ed063fa8bcca7fd9bc56f2d
author Alice Wang <aliceywang@google.com> Wed Sep 21 08:51:38 2022 +0000
committer Alice Wang <aliceywang@google.com> Fri Sep 23 08:07:34 2022 +0000
tree 7224d06210ac26789cb2b6cac9267e99c68b9c5a
parent 0da928ae7b39b369a9364ca5dc68739ccfbec69f

Reland "[apkverify] Skip DSA SHA256 during apk verification"

Reland this change as the broken idsig test has been fixed.

Test: libapkverify.integration_test
Bug: 197052981
Change-Id: Ic7c18915b33c506f09a8e821f613668a0600cac2

libs/apkverify/src/v3.rs

diff --git a/libs/apkverify/src/v3.rs b/libs/apkverify/src/v3.rs
index 2a16cb1..5272834 100644
--- a/libs/apkverify/src/v3.rs
+++ b/libs/apkverify/src/v3.rs
@@ -139,7 +139,7 @@
         Ok(self
             .signatures
             .iter()
-            .filter(|sig| sig.signature_algorithm_id.is_some())
+            .filter(|sig| sig.signature_algorithm_id.map_or(false, |algo| algo.is_supported()))
             .max_by_key(|sig| sig.signature_algorithm_id.unwrap().content_digest_algorithm())
             .context("No supported signatures found")?)
     }