Address comments

src/test_helpers/mod.rs

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::api::attestation_store::{self, Attestation, AttestationStore};
 use crate::clock::CtapInstant;
 use crate::ctap::command::{
-    AuthenticatorAttestationMaterial, AuthenticatorConfigParameters,
-    AuthenticatorVendorConfigureParameters, Command,
+    AuthenticatorAttestationMaterial, AuthenticatorConfigParameters, Command,
 };
 use crate::ctap::data_formats::ConfigSubCommand;
 use crate::ctap::status_code::Ctap2StatusCode;
@@ -32,22 +32,17 @@ pub fn enable_enterprise_attestation(
     state: &mut CtapState,
     env: &mut impl Env,
 ) -> Result<AuthenticatorAttestationMaterial, Ctap2StatusCode> {
-    let dummy_key = [0x41; key_material::ATTESTATION_PRIVATE_KEY_LENGTH];
-    let dummy_cert = vec![0xdd; 20];
     let attestation_material = AuthenticatorAttestationMaterial {
-        certificate: dummy_cert,
-        private_key: dummy_key,
+        certificate: vec![0xdd; 20],
+        private_key: [0x41; key_material::ATTESTATION_PRIVATE_KEY_LENGTH],
     };
-    let configure_params = AuthenticatorVendorConfigureParameters {
-        lockdown: false,
-        attestation_material: Some(attestation_material.clone()),
+
+    let attestation = Attestation {
+        private_key: attestation_material.private_key,
+        certificate: attestation_material.certificate.clone(),
     };
-    #[cfg(feature = "vendor_hid")]
-    let vendor_channel = VENDOR_CHANNEL;
-    #[cfg(not(feature = "vendor_hid"))]
-    let vendor_channel = DUMMY_CHANNEL;
-    let vendor_command = Command::AuthenticatorVendorConfigure(configure_params);
-    state.process_parsed_command(env, vendor_command, vendor_channel, CtapInstant::new(0))?;
+    env.attestation_store()
+        .set(&attestation_store::Id::Enterprise, Some(&attestation))?;
 
     let config_params = AuthenticatorConfigParameters {
         sub_command: ConfigSubCommand::EnableEnterpriseAttestation,