aesni -> 2018 edition

.travis.yml

@@ -12,7 +12,7 @@ matrix:
       rust: nightly
 
     - env: NAME="aes+aesni test"
-      rust: 1.27.0
+      rust: 1.31.0
       script: ./test_aes.sh
     - env: NAME="aes+aesni test"
       rust: stable
@@ -39,7 +39,7 @@ matrix:
     - rust: nightly
 
 install:
-- cargo install cross || true
+  - cargo install cross || true
 
 script:
   - cross test --verbose --all --release --target $TARGET

Cargo.toml

@@ -1,6 +1,8 @@
 [workspace]
 members = [
+    "aes/aes",
     "aes/aes-soft",
+    "aes/aesni",
     "blowfish",
     "block-modes",
     "cast5",

README.md

@@ -32,7 +32,7 @@ cryptographic and security reviews.
 
 ### Minimum Supported Rust Version
 All crates in this repository support Rust 1.22 or higher. (except `aesni` and
-`aes` crates, which require Rust 1.27) In future minimum supported Rust version
+`aes` crates, which require Rust 1.31) In future minimum supported Rust version
 can be changed, but it will be done with the minor version bump.
 
 ## Usage

aes/aes/Cargo.toml

@@ -20,5 +20,3 @@ aesni = { version = "0.6", default-features = false }
 
 [dev-dependencies]
 block-cipher-trait = { version = "0.6", features = ["dev"] }
-
-[workspace]

aes/aesni/Cargo.toml

@@ -8,6 +8,7 @@ documentation = "https://docs.rs/aesni"
 repository = "https://github.com/RustCrypto/block-ciphers"
 keywords = ["crypto", "aes", "rijndael", "block-cipher"]
 categories = ["cryptography", "no-std"]
+edition = "2018"
 
 [dependencies]
 block-cipher-trait = "0.6"
@@ -23,8 +24,6 @@ default = ["ctr"]
 ctr = ["stream-cipher"]
 nocheck = []
 
-[workspace]
-
 [package.metadata.docs.rs]
 rustc-args = ["-C", "target-feature=+aes,+ssse3"]
 rustdoc-args = ["-C", "target-feature=+aes,+ssse3"]

aes/aesni/benches/aes128.rs

@@ -1,8 +1,8 @@
 #![no_std]
 #![cfg(any(target_arch = "x86_64", target_arch = "x86"))]
 #![feature(test)]
-extern crate aesni;
 extern crate test;
+use aesni;
 
 use aesni::Aes128;
 use aesni::block_cipher_trait::BlockCipher;

aes/aesni/benches/aes128_ctr.rs

@@ -1,6 +1,5 @@
 #![cfg(feature = "ctr")]
 #![feature(test)]
-#[macro_use] extern crate stream_cipher;
-extern crate aesni;
+use stream_cipher::bench_sync;
 
 bench_sync!(aesni::Aes128Ctr);

aes/aesni/benches/aes192.rs

@@ -1,8 +1,8 @@
 #![no_std]
 #![cfg(any(target_arch = "x86_64", target_arch = "x86"))]
 #![feature(test)]
-extern crate aesni;
 extern crate test;
+use aesni;
 
 use aesni::Aes192;
 use aesni::block_cipher_trait::BlockCipher;

aes/aesni/benches/aes192_ctr.rs

@@ -1,6 +1,5 @@
 #![cfg(feature = "ctr")]
 #![feature(test)]
-#[macro_use] extern crate stream_cipher;
-extern crate aesni;
+use stream_cipher::bench_sync;
 
 bench_sync!(aesni::Aes192Ctr);

aes/aesni/benches/aes256.rs

@@ -1,8 +1,8 @@
 #![no_std]
 #![cfg(any(target_arch = "x86_64", target_arch = "x86"))]
 #![feature(test)]
-extern crate aesni;
 extern crate test;
+use aesni;
 
 use aesni::Aes256;
 use aesni::block_cipher_trait::BlockCipher;

aes/aesni/benches/aes256_ctr.rs

@@ -1,6 +1,5 @@
 #![cfg(feature = "ctr")]
 #![feature(test)]
-#[macro_use] extern crate stream_cipher;
-extern crate aesni;
+use stream_cipher::bench_sync;
 
 bench_sync!(aesni::Aes256Ctr);

aes/aesni/src/aes128/expand.rs

@@ -1,7 +1,7 @@
-use arch::*;
-
 use core::mem;
 
+use crate::arch::*;
+
 macro_rules! expand_round {
     ($enc_keys:expr, $dec_keys:expr, $pos:expr, $round:expr) => {
         let mut t1 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 1));

aes/aesni/src/aes128/mod.rs

@@ -1,10 +1,11 @@
+use core::mem;
+
+use opaque_debug::impl_opaque_debug;
 use block_cipher_trait::generic_array::GenericArray;
 use block_cipher_trait::generic_array::typenum::{U16, U8};
 use block_cipher_trait::BlockCipher;
-use arch::*;
-
-use core::mem;
-use utils::{Block128, Block128x8};
+use crate::arch::*;
+use crate::utils::{Block128, Block128x8};
 
 mod expand;
 #[cfg(test)]

aes/aesni/src/aes128/test_expand.rs

@@ -1,5 +1,5 @@
 use super::expand::expand;
-use utils::check;
+use crate::utils::check;
 
 #[test]
 fn test() {

aes/aesni/src/aes192/expand.rs

@@ -1,7 +1,7 @@
-use arch::*;
-
 use core::{mem, ptr};
 
+use crate::arch::*;
+
 macro_rules! expand_round {
     ($t1:expr, $t3:expr, $round:expr) => {{
         let mut t1 = $t1;

aes/aesni/src/aes192/mod.rs

@@ -1,10 +1,11 @@
+use core::mem;
+
+use opaque_debug::impl_opaque_debug;
 use block_cipher_trait::generic_array::GenericArray;
 use block_cipher_trait::generic_array::typenum::{U16, U24, U8};
 use block_cipher_trait::BlockCipher;
-use arch::*;
-
-use core::mem;
-use utils::{Block128, Block128x8};
+use crate::arch::*;
+use crate::utils::{Block128, Block128x8};
 
 mod expand;
 #[cfg(test)]

aes/aesni/src/aes192/test_expand.rs

@@ -1,5 +1,5 @@
 use super::expand::expand;
-use utils::check;
+use crate::utils::check;
 
 #[test]
 fn test() {

aes/aesni/src/aes256/expand.rs

@@ -1,12 +1,12 @@
-use arch::*;
-
 use core::mem;
 
+use crate::arch::*;
+
 macro_rules! expand_round {
     ($enc_keys:expr, $dec_keys:expr, $pos:expr, $round:expr) => {
-        let mut t1 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 2));;
+        let mut t1 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 2));
         let mut t2;
-        let mut t3 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 1));;
+        let mut t3 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 1));
         let mut t4;
 
         t2 = _mm_aeskeygenassist_si128(t3, $round);
@@ -41,9 +41,9 @@ macro_rules! expand_round {
 
 macro_rules! expand_round_last {
     ($enc_keys:expr, $dec_keys:expr, $pos:expr, $round:expr) => {
-        let mut t1 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 2));;
+        let mut t1 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 2));
         let mut t2;
-        let t3 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 1));;
+        let t3 = _mm_load_si128($enc_keys.as_ptr().offset($pos - 1));
         let mut t4;
 
         t2 = _mm_aeskeygenassist_si128(t3, $round);

aes/aesni/src/aes256/mod.rs

@@ -1,10 +1,11 @@
+use core::mem;
+
+use opaque_debug::impl_opaque_debug;
 use block_cipher_trait::generic_array::GenericArray;
 use block_cipher_trait::generic_array::typenum::{U16, U32, U8};
 use block_cipher_trait::BlockCipher;
-use arch::*;
-
-use core::mem;
-use utils::{Block128, Block128x8};
+use crate::arch::*;
+use crate::utils::{Block128, Block128x8};
 
 mod expand;
 #[cfg(test)]

aes/aesni/src/aes256/test_expand.rs

@@ -1,5 +1,5 @@
 use super::expand::expand;
-use utils::check;
+use crate::utils::check;
 
 #[test]
 fn test() {

aes/aesni/src/ctr.rs

@@ -1,13 +1,14 @@
 use core::{mem, cmp};
-use arch::*;
 
-use super::{Aes128, Aes192, Aes256};
 use block_cipher_trait::BlockCipher;
 use block_cipher_trait::generic_array::GenericArray;
 use block_cipher_trait::generic_array::typenum::U16;
 use stream_cipher::{
     SyncStreamCipher, SyncStreamCipherSeek, NewStreamCipher, LoopError,
 };
+use opaque_debug::impl_opaque_debug;
+use super::{Aes128, Aes192, Aes256};
+use crate::arch::*;
 
 const BLOCK_SIZE: usize = 16;
 const PAR_BLOCKS: usize = 8;

aes/aesni/src/lib.rs

@@ -71,10 +71,10 @@
 //! - [Intel AES-NI whitepaper](https://software.intel.com/sites/default/files/article/165683/aes-wp-2012-09-22-v01.pdf)
 //! - [Use of the AES Instruction Set](https://www.cosic.esat.kuleuven.be/ecrypt/AESday/slides/Use_of_the_AES_Instruction_Set.pdf)
 #![no_std]
-pub extern crate block_cipher_trait;
-#[macro_use] extern crate opaque_debug;
+pub use block_cipher_trait;
 #[cfg(feature = "ctr")]
-pub extern crate stream_cipher;
+pub use stream_cipher;
+
 #[cfg(not(feature = "nocheck"))]
 mod target_checks;
 #[macro_use]