Migrate to new dev macros (#89)

Author: newpavlov

Cargo.lock

@@ -14,3 +14,9 @@ members = [
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io]
+# https://github.com/RustCrypto/traits/pull/1998
+cipher = { git = "https://github.com/RustCrypto/traits" }
+# https://github.com/RustCrypto/utils/pull/1187
+blobby = { git = "https://github.com/RustCrypto/utils" }

Cargo.toml

@@ -1,8 +1,7 @@
-// use belt_ctr::{BeltCtr, BeltCtrCore};
+//! Test vectors from the BelT standard (tables A.15 and A.16):
+//! https://apmi.bsu.by/assets/files/std/belt-spec371.pdf
+use belt_ctr::{BeltCtr, BeltCtrCore};
 
-// Test vectors from the BelT standard (tables A.15 and A.16):
-// https://apmi.bsu.by/assets/files/std/belt-spec371.pdf
-// TODO(tarcieri): update tests to support RustCrypto/traits#1916
-// cipher::stream_cipher_test!(belt_ctr_core, "belt-ctr", BeltCtr);
-// cipher::stream_cipher_seek_test!(belt_ctr_seek, BeltCtr);
-// cipher::iv_state_test!(belt_ctr_iv_state, BeltCtrCore, apply_ks);
+cipher::stream_cipher_test!(belt_ctr_core, "belt-ctr", BeltCtr);
+cipher::stream_cipher_seek_test!(belt_ctr_seek, BeltCtr);
+cipher::iv_state_test!(belt_ctr_iv_state, BeltCtrCore, apply_ks);

belt-ctr/tests/mod.rs

@@ -1,16 +1,13 @@
 #![feature(test)]
 extern crate test;
 
-use aes::Aes128;
-
 cipher::block_encryptor_bench!(
-    KeyIv: cbc::Encryptor<Aes128>,
+    KeyIv: cbc::Encryptor<aes::Aes128>,
     cbc_aes128_encrypt_block,
     cbc_aes128_encrypt_blocks,
 );
-
 cipher::block_decryptor_bench!(
-    KeyIv: cbc::Decryptor<Aes128>,
+    KeyIv: cbc::Decryptor<aes::Aes128>,
     cbc_aes128_decrypt_block,
     cbc_aes128_decrypt_blocks,
 );

cbc/benches/aes128.rs

@@ -0,0 +1,21 @@
+//! Test vectors from CAVP "AES Multiblock Message Test (MMT) Sample Vectors":
+//! <https://csrc.nist.gov/Projects/Cryptographic-Algorithm-Validation-Program/Block-Ciphers>
+use aes::*;
+use cbc::{Decryptor, Encryptor};
+use cipher::block_mode_test;
+
+block_mode_test!(aes128_cbc_enc, "aes128", Encryptor<Aes128>, encrypt);
+block_mode_test!(aes192_cbc_enc, "aes192", Encryptor<Aes192>, encrypt);
+block_mode_test!(aes256_cbc_enc, "aes256", Encryptor<Aes256>, encrypt);
+
+block_mode_test!(aes128_cbc_dec, "aes128", Decryptor<Aes128>, decrypt);
+block_mode_test!(aes192_cbc_dec, "aes192", Decryptor<Aes192>, decrypt);
+block_mode_test!(aes256_cbc_dec, "aes256", Decryptor<Aes256>, decrypt);
+
+block_mode_test!(aes128enc_cbc_enc, "aes128", Encryptor<Aes128Enc>, encrypt);
+block_mode_test!(aes192enc_cbc_enc, "aes192", Encryptor<Aes192Enc>, encrypt);
+block_mode_test!(aes256enc_cbc_enc, "aes256", Encryptor<Aes256Enc>, encrypt);
+
+block_mode_test!(aes128dec_cbc_dec, "aes128", Decryptor<Aes128Dec>, decrypt);
+block_mode_test!(aes192dec_cbc_dec, "aes192", Decryptor<Aes192Dec>, decrypt);
+block_mode_test!(aes256dec_cbc_dec, "aes256", Decryptor<Aes256Dec>, decrypt);

cbc/tests/aes.rs

@@ -0,0 +1,10 @@
+use aes::*;
+use cbc::{Decryptor, Encryptor};
+use cipher::iv_state_test;
+
+iv_state_test!(aes128_cbc_enc_iv_state, Encryptor<Aes128>, encrypt);
+iv_state_test!(aes128_cbc_dec_iv_state, Decryptor<Aes128>, decrypt);
+iv_state_test!(aes192_cbc_enc_iv_state, Encryptor<Aes192>, encrypt);
+iv_state_test!(aes192_cbc_dec_iv_state, Decryptor<Aes192>, decrypt);
+iv_state_test!(aes256_cbc_enc_iv_state, Encryptor<Aes256>, encrypt);
+iv_state_test!(aes256_cbc_dec_iv_state, Decryptor<Aes256>, decrypt);

cbc/tests/aes_cavp.rs

@@ -1,16 +1,13 @@
 #![feature(test)]
 extern crate test;
 
-use aes::Aes128;
-
 cipher::block_encryptor_bench!(
-    KeyIv: cfb_mode::Encryptor<Aes128>,
+    KeyIv: cfb_mode::Encryptor<aes::Aes128>,
     cfb_aes128_encrypt_block,
     cfb_aes128_encrypt_blocks,
 );
-
 cipher::block_decryptor_bench!(
-    KeyIv: cfb_mode::Decryptor<Aes128>,
+    KeyIv: cfb_mode::Decryptor<aes::Aes128>,
     cfb_aes128_decrypt_block,
     cfb_aes128_decrypt_blocks,
 );

cbc/tests/iv_state.rs

@@ -0,0 +1,22 @@
+//! Test vectors from CVAP "AES Multiblock Message Test (MMT) Sample Vectors":
+//! <https://csrc.nist.gov/Projects/Cryptographic-Algorithm-Validation-Program/Block-Ciphers>
+
+use aes::*;
+use cfb_mode::{Decryptor, Encryptor};
+use cipher::block_mode_test;
+
+block_mode_test!(aes128_cfb_enc, "aes128", Encryptor<Aes128>, encrypt);
+block_mode_test!(aes192_cfb_enc, "aes192", Encryptor<Aes192>, encrypt);
+block_mode_test!(aes256_cfb_enc, "aes256", Encryptor<Aes256>, encrypt);
+
+block_mode_test!(aes128_cfb_dec, "aes128", Decryptor<Aes128>, decrypt);
+block_mode_test!(aes192_cfb_dec, "aes192", Decryptor<Aes192>, decrypt);
+block_mode_test!(aes256_cfb_dec, "aes256", Decryptor<Aes256>, decrypt);
+
+block_mode_test!(aes128enc_cfb_enc, "aes128", Encryptor<Aes128Enc>, encrypt);
+block_mode_test!(aes192enc_cfb_enc, "aes192", Encryptor<Aes192Enc>, encrypt);
+block_mode_test!(aes256enc_cfb_enc, "aes256", Encryptor<Aes256Enc>, encrypt);
+
+block_mode_test!(aes128enc_cfb_dec, "aes128", Decryptor<Aes128Enc>, decrypt);
+block_mode_test!(aes192dec_cfb_dec, "aes192", Decryptor<Aes192Enc>, decrypt);
+block_mode_test!(aes256dec_cfb_dec, "aes256", Decryptor<Aes256Enc>, decrypt);