Merge "Revert "Disable cert validation in tests until b/263254184 is fixed""
diff --git a/keystore2/tests/keystore2_client_attest_key_tests.rs b/keystore2/tests/keystore2_client_attest_key_tests.rs
index 2d44753..4febd9b 100644
--- a/keystore2/tests/keystore2_client_attest_key_tests.rs
+++ b/keystore2/tests/keystore2_client_attest_key_tests.rs
@@ -149,9 +149,7 @@
let mut cert_chain: Vec<u8> = Vec::new();
cert_chain.extend(attestation_key_metadata.certificate.as_ref().unwrap());
cert_chain.extend(attestation_key_metadata.certificateChain.as_ref().unwrap());
- // The server seems to be issuing test certs with invalid subject names.
- // Re-enable when b/263254184 is fixed
- // validate_certchain(&cert_chain).expect("Error while validating cert chain.");
+ validate_certchain(&cert_chain).expect("Error while validating cert chain.");
// Create EC key and use attestation key to sign it.
let ec_key_alias = format!("ks_ec_attested_test_key_{}", getuid());
@@ -168,9 +166,7 @@
cert_chain.extend(attestation_key_metadata.certificate.as_ref().unwrap());
cert_chain.extend(attestation_key_metadata.certificateChain.as_ref().unwrap());
- // The server seems to be issuing test certs with invalid subject names.
- // Re-enable when b/263254184 is fixed
- // validate_certchain(&cert_chain).expect("Error while validating cert chain.");
+ validate_certchain(&cert_chain).expect("Error while validating cert chain.");
}
}