Merge branch 'fmtandfix' into 'main'

Ran rustfmt and cargo fix on the code base

Closes #5

See merge request fabinfra/fabaccess/nfc_rs!4
This commit is contained in:
Kai Kriegel 2022-05-05 11:53:21 +00:00
commit f69bf50633
4 changed files with 518 additions and 245 deletions

View File

@ -42,8 +42,9 @@ mod tests {
let data_enc = crate::crypto::cipher::aes::AES::encrypt(&data, &key, &iv).unwrap(); let data_enc = crate::crypto::cipher::aes::AES::encrypt(&data, &key, &iv).unwrap();
let data_enc_expected = hex!("3c79d74a4969ba7123e5d8f6df24493112d221fd131a4617d0eda5d92ccc1b46"); let data_enc_expected =
hex!("3c79d74a4969ba7123e5d8f6df24493112d221fd131a4617d0eda5d92ccc1b46");
assert_eq!(data_enc, data_enc_expected); assert_eq!(data_enc, data_enc_expected);
} }
} }

View File

@ -1,7 +1,7 @@
use crate::crypto::cipher::{aes, tdes, tdes_2k, tdes_3k, Cipher}; use crate::crypto::cipher::{aes, tdes, tdes_2k, tdes_3k, Cipher};
use crate::crypto::cipher_type::CipherType; use crate::crypto::cipher_type::CipherType;
use crate::crypto::cipher_type::CipherType::*; use crate::crypto::cipher_type::CipherType::*;
use crate::error::Error;
use crate::error::Result; use crate::error::Result;
use simple_error::simple_error; use simple_error::simple_error;

File diff suppressed because it is too large Load Diff

View File

@ -3,7 +3,7 @@
//! **WARNING** This is alpha quality software at best and should not be relied upon. **WARNING** //! **WARNING** This is alpha quality software at best and should not be relied upon. **WARNING**
//! //!
//!The `desfire` Crate provides the cryptographic methods and specific commands for interfacing //!The `desfire` Crate provides the cryptographic methods and specific commands for interfacing
//! with NXP MiFare Desfire cards. //! with NXP MiFare Desfire cards.
//! //!
use crate::iso7816_4::apducommand::APDUCommand; use crate::iso7816_4::apducommand::APDUCommand;
@ -33,4 +33,3 @@ pub trait Card {
/// <returns>Application Protocol Data Unit Response - ISO 7816</returns> /// <returns>Application Protocol Data Unit Response - ISO 7816</returns>
fn transmit(&self, apdu_cmd: APDUCommand) -> Result<APDUResponse>; fn transmit(&self, apdu_cmd: APDUCommand) -> Result<APDUResponse>;
} }