Merge "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 fc3148c..bfa0495 100644
--- a/keystore2/tests/keystore2_client_attest_key_tests.rs
+++ b/keystore2/tests/keystore2_client_attest_key_tests.rs
@@ -172,7 +172,9 @@
         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());
-        validate_certchain(&cert_chain).expect("Error while validating cert chain.");
+        // 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.");
 
         // Create EC key and use attestation key to sign it.
         let ec_key_alias = format!("ks_ec_attested_test_key_{}", getuid());
@@ -190,7 +192,9 @@
         cert_chain.extend(attestation_key_metadata.certificate.as_ref().unwrap());
         cert_chain.extend(attestation_key_metadata.certificateChain.as_ref().unwrap());
 
-        validate_certchain(&cert_chain).expect("Error while validating cert chain.");
+        // 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.");
     }
 }