Removed unused tests I forgot about

Signed-off-by: Jacob Prud'homme <[email protected]>

Author: jacobprudhomme

cryptoki/tests/basic.rs

@@ -2965,160 +2965,6 @@ fn kbkdf_invalid_data_params_double_pipeline_mode() -> TestResult {
     Ok(())
 }
 
-// #[test]
-// #[serial]
-// fn kbkdf_invalid_data_params() -> TestResult {
-//     /* SoftHSM does not support NIST SP800-108 KDF yet */
-//     if is_softhsm() {
-//         return Ok(());
-//     }
-
-//     let (pkcs11, slot) = init_pins();
-
-//     // Open a session and log in
-//     let session = pkcs11.open_rw_session(slot)?;
-//     session.login(UserType::User, Some(&AuthPin::new(USER_PIN.into())))?;
-
-//     // Generate base key
-//     let base_template = vec![
-//         Attribute::Token(true),
-//         Attribute::Private(false),
-//         Attribute::ValueLen((AES256_BLOCK_SIZE as u64).into()),
-//         Attribute::Derive(true),
-//     ];
-//     let base_key = session.generate_key(&Mechanism::AesKeyGen, &base_template)?;
-
-//     // The template of the key to derive
-//     let derived_key_template = vec![
-//         Attribute::Token(false),
-//         Attribute::Private(false),
-//         Attribute::Class(ObjectClass::SECRET_KEY),
-//         Attribute::KeyType(KeyType::AES),
-//         Attribute::ValueLen((AES256_BLOCK_SIZE as u64).into()),
-//         Attribute::Encrypt(true),
-//         Attribute::Decrypt(true),
-//     ];
-
-//     // Instantiate KBKDF in counter mode without additional keys
-//     let counter_format = KbkdfCounterFormat::new(Endianness::Big, 16);
-//     let dkm_length_format =
-//         KbkdfDkmLengthFormat::new(DkmLengthMethod::SumOfKeys, Endianness::Big, 16);
-//     let data_params = vec![
-//         PrfDataParam::new(PrfDataParamType::IterationVariable(Some(&counter_format))),
-//         PrfDataParam::new(PrfDataParamType::ByteArray(b"test_label")),
-//         PrfDataParam::new(PrfDataParamType::ByteArray(&[0])),
-//         PrfDataParam::new(PrfDataParamType::ByteArray(b"\xfe\xed\xbe\xef")),
-//         PrfDataParam::new(PrfDataParamType::DkmLength(&dkm_length_format)),
-//     ];
-//     let params = KbkdfParams::new(MechanismType::AES_CMAC, &data_params, None);
-
-//     // Derive key
-//     let derived_key = session.derive_key(
-//         &Mechanism::KbkdfCounter(params),
-//         base_key,
-//         &derived_key_template,
-//     )?;
-
-//     let wanted_attributes = vec![
-//         AttributeType::Class,
-//         AttributeType::KeyType,
-//         AttributeType::Encrypt,
-//         AttributeType::Decrypt,
-//         AttributeType::Sign,
-//         AttributeType::Verify,
-//         AttributeType::Derive,
-//         AttributeType::ValueLen,
-//     ];
-
-//     // TODO: remove this!
-//     println!(
-//         "Main derived key: {:#?}",
-//         session.get_attributes(derived_key, &wanted_attributes)?
-//     );
-
-//     session.destroy_object(derived_key)?;
-//     session.destroy_object(base_key)?;
-
-//     Ok(())
-// }
-
-// #[test]
-// #[serial]
-// fn kbkdf_missing_data_params() -> TestResult {
-//     /* SoftHSM does not support NIST SP800-108 KDF yet */
-//     if is_softhsm() {
-//         return Ok(());
-//     }
-
-//     let (pkcs11, slot) = init_pins();
-
-//     // Open a session and log in
-//     let session = pkcs11.open_rw_session(slot)?;
-//     session.login(UserType::User, Some(&AuthPin::new(USER_PIN.into())))?;
-
-//     // Generate base key
-//     let base_template = vec![
-//         Attribute::Token(true),
-//         Attribute::Private(false),
-//         Attribute::ValueLen((AES256_BLOCK_SIZE as u64).into()),
-//         Attribute::Derive(true),
-//     ];
-//     let base_key = session.generate_key(&Mechanism::AesKeyGen, &base_template)?;
-
-//     // The template of the key to derive
-//     let derived_key_template = vec![
-//         Attribute::Token(false),
-//         Attribute::Private(false),
-//         Attribute::Class(ObjectClass::SECRET_KEY),
-//         Attribute::KeyType(KeyType::AES),
-//         Attribute::ValueLen((AES256_BLOCK_SIZE as u64).into()),
-//         Attribute::Encrypt(true),
-//         Attribute::Decrypt(true),
-//     ];
-
-//     // Instantiate KBKDF in counter mode without additional keys
-//     let counter_format = KbkdfCounterFormat::new(Endianness::Big, 16);
-//     let dkm_length_format =
-//         KbkdfDkmLengthFormat::new(DkmLengthMethod::SumOfKeys, Endianness::Big, 16);
-//     let data_params = vec![
-//         PrfDataParam::new(PrfDataParamType::IterationVariable(Some(&counter_format))),
-//         PrfDataParam::new(PrfDataParamType::ByteArray(b"test_label")),
-//         PrfDataParam::new(PrfDataParamType::ByteArray(&[0])),
-//         PrfDataParam::new(PrfDataParamType::ByteArray(b"\xfe\xed\xbe\xef")),
-//         PrfDataParam::new(PrfDataParamType::DkmLength(&dkm_length_format)),
-//     ];
-//     let params = KbkdfParams::new(MechanismType::AES_CMAC, &data_params, None);
-
-//     // Derive key
-//     let derived_key = session.derive_key(
-//         &Mechanism::KbkdfCounter(params),
-//         base_key,
-//         &derived_key_template,
-//     )?;
-
-//     let wanted_attributes = vec![
-//         AttributeType::Class,
-//         AttributeType::KeyType,
-//         AttributeType::Encrypt,
-//         AttributeType::Decrypt,
-//         AttributeType::Sign,
-//         AttributeType::Verify,
-//         AttributeType::Derive,
-//         AttributeType::ValueLen,
-//     ];
-
-//     // TODO: remove this!
-//     println!(
-//         "Main derived key: {:#?}",
-//         session.get_attributes(derived_key, &wanted_attributes)?
-//     );
-
-//     session.destroy_object(derived_key)?;
-//     session.destroy_object(base_key)?;
-
-//     Ok(())
-// }
-
 #[test]
 #[serial]
 fn sign_verify_sha1_hmac() -> TestResult {