Skip to content

aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Dec 31, 2020
Merged

aes: make autodetect unions non-Copy; MSRV 1.49+ #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/aes.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
rust:
- 1.41.0 # MSRV
- 1.49.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
include:
# 32-bit Linux
- target: i686-unknown-linux-gnu
rust: 1.41.0 # MSRV
rust: 1.49.0 # MSRV
deps: sudo apt update && sudo apt install gcc-multilib
- target: i686-unknown-linux-gnu
rust: stable
deps: sudo apt update && sudo apt install gcc-multilib

# 64-bit Linux
- target: x86_64-unknown-linux-gnu
rust: 1.41.0 # MSRV
rust: 1.49.0 # MSRV
- target: x86_64-unknown-linux-gnu
rust: stable
steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
include:
# 32-bit Linux
- target: i686-unknown-linux-gnu
rust: 1.41.0 # MSRV
rust: 1.49.0 # MSRV
deps: sudo apt update && sudo apt install gcc-multilib
- target: i686-unknown-linux-gnu
rust: stable
deps: sudo apt update && sudo apt install gcc-multilib

# 64-bit Linux
- target: x86_64-unknown-linux-gnu
rust: 1.41.0 # MSRV
rust: 1.49.0 # MSRV
- target: x86_64-unknown-linux-gnu
rust: stable
steps:
Expand All@@ -123,13 +123,13 @@ jobs:
include:
# ARM64
- target: aarch64-unknown-linux-gnu
rust: 1.41.0 # MSRV
rust: 1.49.0 # MSRV
- target: aarch64-unknown-linux-gnu
rust: stable

# PPC32
- target: powerpc-unknown-linux-gnu
rust: 1.41.0 # MSRV
rust: 1.49.0 # MSRV
- target: powerpc-unknown-linux-gnu
rust: stable

Expand Down
4 changes: 2 additions & 2 deletions aes/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down
87 changes: 54 additions & 33 deletions aes/src/autodetect.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
generic_array::GenericArray,
BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
$doc:expr
) => {
#[doc=$doc]
#[derive(Clone)]
pub struct $name {
inner: $module::Inner,
token: aes_cpuid::InitToken
}

mod $module {
#[derive(Copy, Clone)]
use core::mem::ManuallyDrop;

pub(super) union Inner {
pub(super) ni: crate::ni::$name,
pub(super) soft: crate::soft::$name,
pub(super) ni: ManuallyDrop<crate::ni::$name>,
pub(super) soft: ManuallyDrop<crate::soft::$name>,
}
}

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
let (token, aesni_present) = aes_cpuid::init_get();

let inner = if aesni_present {
$module::Inner { ni: crate::ni::$name::new(key) }
$module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
} else {
$module::Inner { soft: crate::soft::$name::new(key) }
$module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
};

Self { inner, token }
}
}

impl Clone for $name {
fn clone(&self) -> Self {
let inner = if self.token.get() {
$module::Inner { ni: unsafe { self.inner.ni.clone() } }
} else {
$module::Inner { soft: unsafe { self.inner.soft.clone() } }
};

Self { inner, token: self.token }
}
}

impl BlockCipher for $name {
type BlockSize = U16;
type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
generic_array::GenericArray,
BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
#[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
pub struct $name {
inner: $module::Inner,
token: aes_ssse3_cpuid::InitToken
}

mod $module {
#[allow(clippy::large_enum_variant)]
pub(super) enum Inner {
Ni(crate::ni::$name),
Soft(crate::soft::$name),
use core::mem::ManuallyDrop;

pub(super) union Inner {
pub(super) ni: ManuallyDrop<crate::ni::$name>,
pub(super) soft: ManuallyDrop<crate::soft::$name>,
}
}

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
cipher: $cipher,
nonce: &GenericArray<u8, Self::NonceSize>,
) -> Self {
let inner = if aes_ssse3_cpuid::get() {
$module::Inner::Ni(
crate::ni::$name::from_block_cipher(
unsafe { cipher.inner.ni },
nonce
)
)
let (token, aesni_present) = aes_ssse3_cpuid::init_get();

let inner = if aesni_present {
let ni = crate::ni::$name::from_block_cipher(
unsafe { (*cipher.inner.ni).clone() },
nonce
);

$module::Inner { ni: ManuallyDrop::new(ni) }
} else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
unsafe { cipher.inner.soft },
nonce
)
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
};

Self { inner }
Self { inner, token }
}
}

impl StreamCipher for $name {
#[inline]
fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
match &mut self.inner {
$module::Inner::Ni(aes) => aes.try_apply_keystream(data),
$module::Inner::Soft(aes) => aes.try_apply_keystream(data)
if self.token.get() {
unsafe { (*self.inner.ni).try_apply_keystream(data) }
} else {
unsafe { (*self.inner.soft).try_apply_keystream(data) }
}
}
}

impl StreamCipherSeek for $name {
#[inline]
fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
match &self.inner {
$module::Inner::Ni(aes) => aes.try_current_pos(),
$module::Inner::Soft(aes) => aes.try_current_pos()
if self.token.get() {
unsafe { (*self.inner.ni).try_current_pos() }
} else {
unsafe { (*self.inner.soft).try_current_pos() }
}
}

#[inline]
fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
match &mut self.inner {
$module::Inner::Ni(aes) => aes.try_seek(pos),
$module::Inner::Soft(aes) => aes.try_seek(pos)
if self.token.get() {
unsafe { (*self.inner.ni).try_seek(pos) }
} else {
unsafe { (*self.inner.soft).try_seek(pos) }
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion aes/src/ni/aes128.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
encrypt_keys: [__m128i; 11],
decrypt_keys: [__m128i; 11],
Expand Down
2 changes: 1 addition & 1 deletion aes/src/ni/aes192.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
encrypt_keys: [__m128i; 13],
decrypt_keys: [__m128i; 13],
Expand Down
2 changes: 1 addition & 1 deletion aes/src/ni/aes256.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
encrypt_keys: [__m128i; 15],
decrypt_keys: [__m128i; 15],
Expand Down
4 changes: 0 additions & 4 deletions aes/src/soft/impls.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
) => {
#[doc=$doc]
#[derive(Clone)]
#[cfg_attr(
all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
derive(Copy)
)] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
pub struct $name {
keys: $fixslice_keys,
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
aes: make autodetect unions non-Copy; MSRV 1.49+ by tarcieri · Pull Request #216 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Dec 31, 2020
 Merged


aes: make autodetect unions non-Copy; MSRV 1.49+
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 7 additions & 7 deletions
.github/workflows/aes.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.41.0 # MSRV
 - 1.49.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand All@@ -123,13 +123,13 @@ jobs:
 include:
 # ARM64
 - target: aarch64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: aarch64-unknown-linux-gnu
 rust: stable

 # PPC32
 - target: powerpc-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: powerpc-unknown-linux-gnu
 rust: stable

Expand Down

4 changes: 2 additions & 2 deletions
aes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down

87 changes: 54 additions & 33 deletions
aes/src/autodetect.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
 generic_array::GenericArray,
 BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
 $doc:expr
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 pub struct $name {
 inner: $module::Inner,
 token: aes_cpuid::InitToken
 }

 mod $module {
 #[derive(Copy, Clone)]
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: crate::ni::$name,
 pub(super) soft: crate::soft::$name,
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
 let (token, aesni_present) = aes_cpuid::init_get();

 let inner = if aesni_present {
 $module::Inner { ni: crate::ni::$name::new(key) }
 $module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
 } else {
 $module::Inner { soft: crate::soft::$name::new(key) }
 $module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
 };

 Self { inner, token }
 }
 }

 impl Clone for $name {
 fn clone(&self) -> Self {
 let inner = if self.token.get() {
 $module::Inner { ni: unsafe { self.inner.ni.clone() } }
 } else {
 $module::Inner { soft: unsafe { self.inner.soft.clone() } }
 };

 Self { inner, token: self.token }
 }
 }

 impl BlockCipher for $name {
 type BlockSize = U16;
 type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
 generic_array::GenericArray,
 BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
 };
 use core::mem::ManuallyDrop;

 cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
 #[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
 pub struct $name {
 inner: $module::Inner,
 token: aes_ssse3_cpuid::InitToken
 }

 mod $module {
 #[allow(clippy::large_enum_variant)]
 pub(super) enum Inner {
 Ni(crate::ni::$name),
 Soft(crate::soft::$name),
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
 cipher: $cipher,
 nonce: &GenericArray<u8, Self::NonceSize>,
 ) -> Self {
 let inner = if aes_ssse3_cpuid::get() {
 $module::Inner::Ni(
 crate::ni::$name::from_block_cipher(
 unsafe { cipher.inner.ni },
 nonce
 )
 )
 let (token, aesni_present) = aes_ssse3_cpuid::init_get();

 let inner = if aesni_present {
 let ni = crate::ni::$name::from_block_cipher(
 unsafe { (*cipher.inner.ni).clone() },
 nonce
 );

 $module::Inner { ni: ManuallyDrop::new(ni) }
 } else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
 unsafe { cipher.inner.soft },
 nonce
 )
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
 };

 Self { inner }
 Self { inner, token }
 }
 }

 impl StreamCipher for $name {
 #[inline]
 fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_apply_keystream(data),
 $module::Inner::Soft(aes) => aes.try_apply_keystream(data)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_apply_keystream(data) }
 } else {
 unsafe { (*self.inner.soft).try_apply_keystream(data) }
 }
 }
 }

 impl StreamCipherSeek for $name {
 #[inline]
 fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
 match &self.inner {
 $module::Inner::Ni(aes) => aes.try_current_pos(),
 $module::Inner::Soft(aes) => aes.try_current_pos()
 if self.token.get() {
 unsafe { (*self.inner.ni).try_current_pos() }
 } else {
 unsafe { (*self.inner.soft).try_current_pos() }
 }
 }

 #[inline]
 fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_seek(pos),
 $module::Inner::Soft(aes) => aes.try_seek(pos)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_seek(pos) }
 } else {
 unsafe { (*self.inner.soft).try_seek(pos) }
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes128.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
 encrypt_keys: [__m128i; 11],
 decrypt_keys: [__m128i; 11],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes192.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
 encrypt_keys: [__m128i; 13],
 decrypt_keys: [__m128i; 13],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes256.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
 encrypt_keys: [__m128i; 15],
 decrypt_keys: [__m128i; 15],
Expand Down

4 changes: 0 additions & 4 deletions
aes/src/soft/impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 #[cfg_attr(
 all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
 derive(Copy)
 )] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
 pub struct $name {
 keys: $fixslice_keys,
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
aes: make autodetect unions non-Copy; MSRV 1.49+ by tarcieri · Pull Request #216 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Dec 31, 2020
 Merged


aes: make autodetect unions non-Copy; MSRV 1.49+
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 7 additions & 7 deletions
.github/workflows/aes.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.41.0 # MSRV
 - 1.49.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand All@@ -123,13 +123,13 @@ jobs:
 include:
 # ARM64
 - target: aarch64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: aarch64-unknown-linux-gnu
 rust: stable

 # PPC32
 - target: powerpc-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: powerpc-unknown-linux-gnu
 rust: stable

Expand Down

4 changes: 2 additions & 2 deletions
aes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down

87 changes: 54 additions & 33 deletions
aes/src/autodetect.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
 generic_array::GenericArray,
 BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
 $doc:expr
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 pub struct $name {
 inner: $module::Inner,
 token: aes_cpuid::InitToken
 }

 mod $module {
 #[derive(Copy, Clone)]
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: crate::ni::$name,
 pub(super) soft: crate::soft::$name,
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
 let (token, aesni_present) = aes_cpuid::init_get();

 let inner = if aesni_present {
 $module::Inner { ni: crate::ni::$name::new(key) }
 $module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
 } else {
 $module::Inner { soft: crate::soft::$name::new(key) }
 $module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
 };

 Self { inner, token }
 }
 }

 impl Clone for $name {
 fn clone(&self) -> Self {
 let inner = if self.token.get() {
 $module::Inner { ni: unsafe { self.inner.ni.clone() } }
 } else {
 $module::Inner { soft: unsafe { self.inner.soft.clone() } }
 };

 Self { inner, token: self.token }
 }
 }

 impl BlockCipher for $name {
 type BlockSize = U16;
 type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
 generic_array::GenericArray,
 BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
 };
 use core::mem::ManuallyDrop;

 cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
 #[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
 pub struct $name {
 inner: $module::Inner,
 token: aes_ssse3_cpuid::InitToken
 }

 mod $module {
 #[allow(clippy::large_enum_variant)]
 pub(super) enum Inner {
 Ni(crate::ni::$name),
 Soft(crate::soft::$name),
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
 cipher: $cipher,
 nonce: &GenericArray<u8, Self::NonceSize>,
 ) -> Self {
 let inner = if aes_ssse3_cpuid::get() {
 $module::Inner::Ni(
 crate::ni::$name::from_block_cipher(
 unsafe { cipher.inner.ni },
 nonce
 )
 )
 let (token, aesni_present) = aes_ssse3_cpuid::init_get();

 let inner = if aesni_present {
 let ni = crate::ni::$name::from_block_cipher(
 unsafe { (*cipher.inner.ni).clone() },
 nonce
 );

 $module::Inner { ni: ManuallyDrop::new(ni) }
 } else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
 unsafe { cipher.inner.soft },
 nonce
 )
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
 };

 Self { inner }
 Self { inner, token }
 }
 }

 impl StreamCipher for $name {
 #[inline]
 fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_apply_keystream(data),
 $module::Inner::Soft(aes) => aes.try_apply_keystream(data)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_apply_keystream(data) }
 } else {
 unsafe { (*self.inner.soft).try_apply_keystream(data) }
 }
 }
 }

 impl StreamCipherSeek for $name {
 #[inline]
 fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
 match &self.inner {
 $module::Inner::Ni(aes) => aes.try_current_pos(),
 $module::Inner::Soft(aes) => aes.try_current_pos()
 if self.token.get() {
 unsafe { (*self.inner.ni).try_current_pos() }
 } else {
 unsafe { (*self.inner.soft).try_current_pos() }
 }
 }

 #[inline]
 fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_seek(pos),
 $module::Inner::Soft(aes) => aes.try_seek(pos)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_seek(pos) }
 } else {
 unsafe { (*self.inner.soft).try_seek(pos) }
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes128.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
 encrypt_keys: [__m128i; 11],
 decrypt_keys: [__m128i; 11],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes192.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
 encrypt_keys: [__m128i; 13],
 decrypt_keys: [__m128i; 13],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes256.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
 encrypt_keys: [__m128i; 15],
 decrypt_keys: [__m128i; 15],
Expand Down

4 changes: 0 additions & 4 deletions
aes/src/soft/impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 #[cfg_attr(
 all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
 derive(Copy)
 )] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
 pub struct $name {
 keys: $fixslice_keys,
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
aes: make autodetect unions non-Copy; MSRV 1.49+ by tarcieri · Pull Request #216 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Dec 31, 2020
 Merged


aes: make autodetect unions non-Copy; MSRV 1.49+
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 7 additions & 7 deletions
.github/workflows/aes.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.41.0 # MSRV
 - 1.49.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand All@@ -123,13 +123,13 @@ jobs:
 include:
 # ARM64
 - target: aarch64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: aarch64-unknown-linux-gnu
 rust: stable

 # PPC32
 - target: powerpc-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: powerpc-unknown-linux-gnu
 rust: stable

Expand Down

4 changes: 2 additions & 2 deletions
aes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down

87 changes: 54 additions & 33 deletions
aes/src/autodetect.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
 generic_array::GenericArray,
 BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
 $doc:expr
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 pub struct $name {
 inner: $module::Inner,
 token: aes_cpuid::InitToken
 }

 mod $module {
 #[derive(Copy, Clone)]
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: crate::ni::$name,
 pub(super) soft: crate::soft::$name,
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
 let (token, aesni_present) = aes_cpuid::init_get();

 let inner = if aesni_present {
 $module::Inner { ni: crate::ni::$name::new(key) }
 $module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
 } else {
 $module::Inner { soft: crate::soft::$name::new(key) }
 $module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
 };

 Self { inner, token }
 }
 }

 impl Clone for $name {
 fn clone(&self) -> Self {
 let inner = if self.token.get() {
 $module::Inner { ni: unsafe { self.inner.ni.clone() } }
 } else {
 $module::Inner { soft: unsafe { self.inner.soft.clone() } }
 };

 Self { inner, token: self.token }
 }
 }

 impl BlockCipher for $name {
 type BlockSize = U16;
 type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
 generic_array::GenericArray,
 BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
 };
 use core::mem::ManuallyDrop;

 cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
 #[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
 pub struct $name {
 inner: $module::Inner,
 token: aes_ssse3_cpuid::InitToken
 }

 mod $module {
 #[allow(clippy::large_enum_variant)]
 pub(super) enum Inner {
 Ni(crate::ni::$name),
 Soft(crate::soft::$name),
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
 cipher: $cipher,
 nonce: &GenericArray<u8, Self::NonceSize>,
 ) -> Self {
 let inner = if aes_ssse3_cpuid::get() {
 $module::Inner::Ni(
 crate::ni::$name::from_block_cipher(
 unsafe { cipher.inner.ni },
 nonce
 )
 )
 let (token, aesni_present) = aes_ssse3_cpuid::init_get();

 let inner = if aesni_present {
 let ni = crate::ni::$name::from_block_cipher(
 unsafe { (*cipher.inner.ni).clone() },
 nonce
 );

 $module::Inner { ni: ManuallyDrop::new(ni) }
 } else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
 unsafe { cipher.inner.soft },
 nonce
 )
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
 };

 Self { inner }
 Self { inner, token }
 }
 }

 impl StreamCipher for $name {
 #[inline]
 fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_apply_keystream(data),
 $module::Inner::Soft(aes) => aes.try_apply_keystream(data)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_apply_keystream(data) }
 } else {
 unsafe { (*self.inner.soft).try_apply_keystream(data) }
 }
 }
 }

 impl StreamCipherSeek for $name {
 #[inline]
 fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
 match &self.inner {
 $module::Inner::Ni(aes) => aes.try_current_pos(),
 $module::Inner::Soft(aes) => aes.try_current_pos()
 if self.token.get() {
 unsafe { (*self.inner.ni).try_current_pos() }
 } else {
 unsafe { (*self.inner.soft).try_current_pos() }
 }
 }

 #[inline]
 fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_seek(pos),
 $module::Inner::Soft(aes) => aes.try_seek(pos)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_seek(pos) }
 } else {
 unsafe { (*self.inner.soft).try_seek(pos) }
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes128.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
 encrypt_keys: [__m128i; 11],
 decrypt_keys: [__m128i; 11],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes192.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
 encrypt_keys: [__m128i; 13],
 decrypt_keys: [__m128i; 13],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes256.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
 encrypt_keys: [__m128i; 15],
 decrypt_keys: [__m128i; 15],
Expand Down

4 changes: 0 additions & 4 deletions
aes/src/soft/impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 #[cfg_attr(
 all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
 derive(Copy)
 )] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
 pub struct $name {
 keys: $fixslice_keys,
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
aes: make autodetect unions non-Copy; MSRV 1.49+ by tarcieri · Pull Request #216 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Dec 31, 2020
 Merged


aes: make autodetect unions non-Copy; MSRV 1.49+
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 7 additions & 7 deletions
.github/workflows/aes.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.41.0 # MSRV
 - 1.49.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand All@@ -123,13 +123,13 @@ jobs:
 include:
 # ARM64
 - target: aarch64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: aarch64-unknown-linux-gnu
 rust: stable

 # PPC32
 - target: powerpc-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: powerpc-unknown-linux-gnu
 rust: stable

Expand Down

4 changes: 2 additions & 2 deletions
aes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down

87 changes: 54 additions & 33 deletions
aes/src/autodetect.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
 generic_array::GenericArray,
 BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
 $doc:expr
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 pub struct $name {
 inner: $module::Inner,
 token: aes_cpuid::InitToken
 }

 mod $module {
 #[derive(Copy, Clone)]
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: crate::ni::$name,
 pub(super) soft: crate::soft::$name,
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
 let (token, aesni_present) = aes_cpuid::init_get();

 let inner = if aesni_present {
 $module::Inner { ni: crate::ni::$name::new(key) }
 $module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
 } else {
 $module::Inner { soft: crate::soft::$name::new(key) }
 $module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
 };

 Self { inner, token }
 }
 }

 impl Clone for $name {
 fn clone(&self) -> Self {
 let inner = if self.token.get() {
 $module::Inner { ni: unsafe { self.inner.ni.clone() } }
 } else {
 $module::Inner { soft: unsafe { self.inner.soft.clone() } }
 };

 Self { inner, token: self.token }
 }
 }

 impl BlockCipher for $name {
 type BlockSize = U16;
 type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
 generic_array::GenericArray,
 BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
 };
 use core::mem::ManuallyDrop;

 cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
 #[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
 pub struct $name {
 inner: $module::Inner,
 token: aes_ssse3_cpuid::InitToken
 }

 mod $module {
 #[allow(clippy::large_enum_variant)]
 pub(super) enum Inner {
 Ni(crate::ni::$name),
 Soft(crate::soft::$name),
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
 cipher: $cipher,
 nonce: &GenericArray<u8, Self::NonceSize>,
 ) -> Self {
 let inner = if aes_ssse3_cpuid::get() {
 $module::Inner::Ni(
 crate::ni::$name::from_block_cipher(
 unsafe { cipher.inner.ni },
 nonce
 )
 )
 let (token, aesni_present) = aes_ssse3_cpuid::init_get();

 let inner = if aesni_present {
 let ni = crate::ni::$name::from_block_cipher(
 unsafe { (*cipher.inner.ni).clone() },
 nonce
 );

 $module::Inner { ni: ManuallyDrop::new(ni) }
 } else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
 unsafe { cipher.inner.soft },
 nonce
 )
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
 };

 Self { inner }
 Self { inner, token }
 }
 }

 impl StreamCipher for $name {
 #[inline]
 fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_apply_keystream(data),
 $module::Inner::Soft(aes) => aes.try_apply_keystream(data)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_apply_keystream(data) }
 } else {
 unsafe { (*self.inner.soft).try_apply_keystream(data) }
 }
 }
 }

 impl StreamCipherSeek for $name {
 #[inline]
 fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
 match &self.inner {
 $module::Inner::Ni(aes) => aes.try_current_pos(),
 $module::Inner::Soft(aes) => aes.try_current_pos()
 if self.token.get() {
 unsafe { (*self.inner.ni).try_current_pos() }
 } else {
 unsafe { (*self.inner.soft).try_current_pos() }
 }
 }

 #[inline]
 fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_seek(pos),
 $module::Inner::Soft(aes) => aes.try_seek(pos)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_seek(pos) }
 } else {
 unsafe { (*self.inner.soft).try_seek(pos) }
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes128.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
 encrypt_keys: [__m128i; 11],
 decrypt_keys: [__m128i; 11],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes192.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
 encrypt_keys: [__m128i; 13],
 decrypt_keys: [__m128i; 13],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes256.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
 encrypt_keys: [__m128i; 15],
 decrypt_keys: [__m128i; 15],
Expand Down

4 changes: 0 additions & 4 deletions
aes/src/soft/impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 #[cfg_attr(
 all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
 derive(Copy)
 )] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
 pub struct $name {
 keys: $fixslice_keys,
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
aes: make autodetect unions non-Copy; MSRV 1.49+ by tarcieri · Pull Request #216 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Dec 31, 2020
 Merged


aes: make autodetect unions non-Copy; MSRV 1.49+
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 7 additions & 7 deletions
.github/workflows/aes.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.41.0 # MSRV
 - 1.49.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand All@@ -123,13 +123,13 @@ jobs:
 include:
 # ARM64
 - target: aarch64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: aarch64-unknown-linux-gnu
 rust: stable

 # PPC32
 - target: powerpc-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: powerpc-unknown-linux-gnu
 rust: stable

Expand Down

4 changes: 2 additions & 2 deletions
aes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down

87 changes: 54 additions & 33 deletions
aes/src/autodetect.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
 generic_array::GenericArray,
 BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
 $doc:expr
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 pub struct $name {
 inner: $module::Inner,
 token: aes_cpuid::InitToken
 }

 mod $module {
 #[derive(Copy, Clone)]
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: crate::ni::$name,
 pub(super) soft: crate::soft::$name,
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
 let (token, aesni_present) = aes_cpuid::init_get();

 let inner = if aesni_present {
 $module::Inner { ni: crate::ni::$name::new(key) }
 $module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
 } else {
 $module::Inner { soft: crate::soft::$name::new(key) }
 $module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
 };

 Self { inner, token }
 }
 }

 impl Clone for $name {
 fn clone(&self) -> Self {
 let inner = if self.token.get() {
 $module::Inner { ni: unsafe { self.inner.ni.clone() } }
 } else {
 $module::Inner { soft: unsafe { self.inner.soft.clone() } }
 };

 Self { inner, token: self.token }
 }
 }

 impl BlockCipher for $name {
 type BlockSize = U16;
 type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
 generic_array::GenericArray,
 BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
 };
 use core::mem::ManuallyDrop;

 cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
 #[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
 pub struct $name {
 inner: $module::Inner,
 token: aes_ssse3_cpuid::InitToken
 }

 mod $module {
 #[allow(clippy::large_enum_variant)]
 pub(super) enum Inner {
 Ni(crate::ni::$name),
 Soft(crate::soft::$name),
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
 cipher: $cipher,
 nonce: &GenericArray<u8, Self::NonceSize>,
 ) -> Self {
 let inner = if aes_ssse3_cpuid::get() {
 $module::Inner::Ni(
 crate::ni::$name::from_block_cipher(
 unsafe { cipher.inner.ni },
 nonce
 )
 )
 let (token, aesni_present) = aes_ssse3_cpuid::init_get();

 let inner = if aesni_present {
 let ni = crate::ni::$name::from_block_cipher(
 unsafe { (*cipher.inner.ni).clone() },
 nonce
 );

 $module::Inner { ni: ManuallyDrop::new(ni) }
 } else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
 unsafe { cipher.inner.soft },
 nonce
 )
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
 };

 Self { inner }
 Self { inner, token }
 }
 }

 impl StreamCipher for $name {
 #[inline]
 fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_apply_keystream(data),
 $module::Inner::Soft(aes) => aes.try_apply_keystream(data)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_apply_keystream(data) }
 } else {
 unsafe { (*self.inner.soft).try_apply_keystream(data) }
 }
 }
 }

 impl StreamCipherSeek for $name {
 #[inline]
 fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
 match &self.inner {
 $module::Inner::Ni(aes) => aes.try_current_pos(),
 $module::Inner::Soft(aes) => aes.try_current_pos()
 if self.token.get() {
 unsafe { (*self.inner.ni).try_current_pos() }
 } else {
 unsafe { (*self.inner.soft).try_current_pos() }
 }
 }

 #[inline]
 fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_seek(pos),
 $module::Inner::Soft(aes) => aes.try_seek(pos)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_seek(pos) }
 } else {
 unsafe { (*self.inner.soft).try_seek(pos) }
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes128.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
 encrypt_keys: [__m128i; 11],
 decrypt_keys: [__m128i; 11],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes192.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
 encrypt_keys: [__m128i; 13],
 decrypt_keys: [__m128i; 13],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes256.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
 encrypt_keys: [__m128i; 15],
 decrypt_keys: [__m128i; 15],
Expand Down

4 changes: 0 additions & 4 deletions
aes/src/soft/impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 #[cfg_attr(
 all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
 derive(Copy)
 )] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
 pub struct $name {
 keys: $fixslice_keys,
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
aes: make autodetect unions non-Copy; MSRV 1.49+ by tarcieri · Pull Request #216 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Dec 31, 2020
 Merged


aes: make autodetect unions non-Copy; MSRV 1.49+
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 7 additions & 7 deletions
.github/workflows/aes.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.41.0 # MSRV
 - 1.49.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand All@@ -123,13 +123,13 @@ jobs:
 include:
 # ARM64
 - target: aarch64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: aarch64-unknown-linux-gnu
 rust: stable

 # PPC32
 - target: powerpc-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: powerpc-unknown-linux-gnu
 rust: stable

Expand Down

4 changes: 2 additions & 2 deletions
aes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down

87 changes: 54 additions & 33 deletions
aes/src/autodetect.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
 generic_array::GenericArray,
 BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
 $doc:expr
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 pub struct $name {
 inner: $module::Inner,
 token: aes_cpuid::InitToken
 }

 mod $module {
 #[derive(Copy, Clone)]
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: crate::ni::$name,
 pub(super) soft: crate::soft::$name,
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
 let (token, aesni_present) = aes_cpuid::init_get();

 let inner = if aesni_present {
 $module::Inner { ni: crate::ni::$name::new(key) }
 $module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
 } else {
 $module::Inner { soft: crate::soft::$name::new(key) }
 $module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
 };

 Self { inner, token }
 }
 }

 impl Clone for $name {
 fn clone(&self) -> Self {
 let inner = if self.token.get() {
 $module::Inner { ni: unsafe { self.inner.ni.clone() } }
 } else {
 $module::Inner { soft: unsafe { self.inner.soft.clone() } }
 };

 Self { inner, token: self.token }
 }
 }

 impl BlockCipher for $name {
 type BlockSize = U16;
 type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
 generic_array::GenericArray,
 BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
 };
 use core::mem::ManuallyDrop;

 cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
 #[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
 pub struct $name {
 inner: $module::Inner,
 token: aes_ssse3_cpuid::InitToken
 }

 mod $module {
 #[allow(clippy::large_enum_variant)]
 pub(super) enum Inner {
 Ni(crate::ni::$name),
 Soft(crate::soft::$name),
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
 cipher: $cipher,
 nonce: &GenericArray<u8, Self::NonceSize>,
 ) -> Self {
 let inner = if aes_ssse3_cpuid::get() {
 $module::Inner::Ni(
 crate::ni::$name::from_block_cipher(
 unsafe { cipher.inner.ni },
 nonce
 )
 )
 let (token, aesni_present) = aes_ssse3_cpuid::init_get();

 let inner = if aesni_present {
 let ni = crate::ni::$name::from_block_cipher(
 unsafe { (*cipher.inner.ni).clone() },
 nonce
 );

 $module::Inner { ni: ManuallyDrop::new(ni) }
 } else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
 unsafe { cipher.inner.soft },
 nonce
 )
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
 };

 Self { inner }
 Self { inner, token }
 }
 }

 impl StreamCipher for $name {
 #[inline]
 fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_apply_keystream(data),
 $module::Inner::Soft(aes) => aes.try_apply_keystream(data)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_apply_keystream(data) }
 } else {
 unsafe { (*self.inner.soft).try_apply_keystream(data) }
 }
 }
 }

 impl StreamCipherSeek for $name {
 #[inline]
 fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
 match &self.inner {
 $module::Inner::Ni(aes) => aes.try_current_pos(),
 $module::Inner::Soft(aes) => aes.try_current_pos()
 if self.token.get() {
 unsafe { (*self.inner.ni).try_current_pos() }
 } else {
 unsafe { (*self.inner.soft).try_current_pos() }
 }
 }

 #[inline]
 fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_seek(pos),
 $module::Inner::Soft(aes) => aes.try_seek(pos)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_seek(pos) }
 } else {
 unsafe { (*self.inner.soft).try_seek(pos) }
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes128.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
 encrypt_keys: [__m128i; 11],
 decrypt_keys: [__m128i; 11],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes192.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
 encrypt_keys: [__m128i; 13],
 decrypt_keys: [__m128i; 13],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes256.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
 encrypt_keys: [__m128i; 15],
 decrypt_keys: [__m128i; 15],
Expand Down

4 changes: 0 additions & 4 deletions
aes/src/soft/impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 #[cfg_attr(
 all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
 derive(Copy)
 )] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
 pub struct $name {
 keys: $fixslice_keys,
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
aes: make autodetect unions non-Copy; MSRV 1.49+ by tarcieri · Pull Request #216 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: make autodetect unions non-Copy; MSRV 1.49+#216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Dec 31, 2020
 Merged


aes: make autodetect unions non-Copy; MSRV 1.49+
#216
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 7 additions & 7 deletions
.github/workflows/aes.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.41.0 # MSRV
 - 1.49.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -50,15 +50,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand DownExpand Up@@ -89,15 +89,15 @@ jobs:
 include:
 # 32-bit Linux
 - target: i686-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 deps: sudo apt update && sudo apt install gcc-multilib
 - target: i686-unknown-linux-gnu
 rust: stable
 deps: sudo apt update && sudo apt install gcc-multilib

 # 64-bit Linux
 - target: x86_64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: x86_64-unknown-linux-gnu
 rust: stable
 steps:
Expand All@@ -123,13 +123,13 @@ jobs:
 include:
 # ARM64
 - target: aarch64-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: aarch64-unknown-linux-gnu
 rust: stable

 # PPC32
 - target: powerpc-unknown-linux-gnu
 rust: 1.41.0 # MSRV
 rust: 1.49.0 # MSRV
 - target: powerpc-unknown-linux-gnu
 rust: stable

Expand Down

4 changes: 2 additions & 2 deletions
aes/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ using a portable implementation based on bitslicing.

## Minimum Supported Rust Version

Rust **1.41** or higher.
Rust **1.49** or higher.

Minimum supported Rust version can be changed in the future, but it will be
done with a minor version bump.
Expand DownExpand Up@@ -74,7 +74,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes/badge.svg
[docs-link]: https://docs.rs/aes/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[hazmat-image]: https://img.shields.io/badge/crypto-hazmat%E2%9A%A0-red.svg
[hazmat-link]: https://github.com/RustCrypto/meta/blob/master/HAZMAT.md
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
Expand Down

87 changes: 54 additions & 33 deletions
aes/src/autodetect.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use cipher::{
 generic_array::GenericArray,
 BlockCipher, BlockDecrypt, BlockEncrypt, NewBlockCipher,
};
use core::mem::ManuallyDrop;

cpuid_bool::new!(aes_cpuid, "aes");

Expand All@@ -18,17 +19,17 @@ macro_rules! define_aes_impl {
 $doc:expr
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 pub struct $name {
 inner: $module::Inner,
 token: aes_cpuid::InitToken
 }

 mod $module {
 #[derive(Copy, Clone)]
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: crate::ni::$name,
 pub(super) soft: crate::soft::$name,
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -40,15 +41,27 @@ macro_rules! define_aes_impl {
 let (token, aesni_present) = aes_cpuid::init_get();

 let inner = if aesni_present {
 $module::Inner { ni: crate::ni::$name::new(key) }
 $module::Inner { ni: ManuallyDrop::new(crate::ni::$name::new(key)) }
 } else {
 $module::Inner { soft: crate::soft::$name::new(key) }
 $module::Inner { soft: ManuallyDrop::new(crate::soft::$name::new(key)) }
 };

 Self { inner, token }
 }
 }

 impl Clone for $name {
 fn clone(&self) -> Self {
 let inner = if self.token.get() {
 $module::Inner { ni: unsafe { self.inner.ni.clone() } }
 } else {
 $module::Inner { soft: unsafe { self.inner.soft.clone() } }
 };

 Self { inner, token: self.token }
 }
 }

 impl BlockCipher for $name {
 type BlockSize = U16;
 type ParBlocks = U8;
Expand DownExpand Up@@ -110,6 +123,7 @@ pub(crate) mod ctr {
 generic_array::GenericArray,
 BlockCipher, FromBlockCipher, SeekNum, StreamCipher, StreamCipherSeek,
 };
 use core::mem::ManuallyDrop;

 cpuid_bool::new!(aes_ssse3_cpuid, "aes", "ssse3");

Expand All@@ -124,13 +138,15 @@ pub(crate) mod ctr {
 #[cfg_attr(docsrs, doc(cfg(feature = "ctr")))]
 pub struct $name {
 inner: $module::Inner,
 token: aes_ssse3_cpuid::InitToken
 }

 mod $module {
 #[allow(clippy::large_enum_variant)]
 pub(super) enum Inner {
 Ni(crate::ni::$name),
 Soft(crate::soft::$name),
 use core::mem::ManuallyDrop;

 pub(super) union Inner {
 pub(super) ni: ManuallyDrop<crate::ni::$name>,
 pub(super) soft: ManuallyDrop<crate::soft::$name>,
 }
 }

Expand All@@ -142,50 +158,55 @@ pub(crate) mod ctr {
 cipher: $cipher,
 nonce: &GenericArray<u8, Self::NonceSize>,
 ) -> Self {
 let inner = if aes_ssse3_cpuid::get() {
 $module::Inner::Ni(
 crate::ni::$name::from_block_cipher(
 unsafe { cipher.inner.ni },
 nonce
 )
 )
 let (token, aesni_present) = aes_ssse3_cpuid::init_get();

 let inner = if aesni_present {
 let ni = crate::ni::$name::from_block_cipher(
 unsafe { (*cipher.inner.ni).clone() },
 nonce
 );

 $module::Inner { ni: ManuallyDrop::new(ni) }
 } else {
$module::Inner::Soft(
crate::soft::$name::from_block_cipher(
 unsafe { cipher.inner.soft },
 nonce
 )
)
let soft = crate::soft::$name::from_block_cipher(
unsafe { (*cipher.inner.soft).clone() },
nonce
);

$module::Inner { soft: ManuallyDrop::new(soft) }
 };

 Self { inner }
 Self { inner, token }
 }
 }

 impl StreamCipher for $name {
 #[inline]
 fn try_apply_keystream(&mut self, data: &mut [u8]) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_apply_keystream(data),
 $module::Inner::Soft(aes) => aes.try_apply_keystream(data)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_apply_keystream(data) }
 } else {
 unsafe { (*self.inner.soft).try_apply_keystream(data) }
 }
 }
 }

 impl StreamCipherSeek for $name {
 #[inline]
 fn try_current_pos<T: SeekNum>(&self) -> Result<T, OverflowError> {
 match &self.inner {
 $module::Inner::Ni(aes) => aes.try_current_pos(),
 $module::Inner::Soft(aes) => aes.try_current_pos()
 if self.token.get() {
 unsafe { (*self.inner.ni).try_current_pos() }
 } else {
 unsafe { (*self.inner.soft).try_current_pos() }
 }
 }

 #[inline]
 fn try_seek<T: SeekNum>(&mut self, pos: T) -> Result<(), LoopError> {
 match &mut self.inner {
 $module::Inner::Ni(aes) => aes.try_seek(pos),
 $module::Inner::Soft(aes) => aes.try_seek(pos)
 if self.token.get() {
 unsafe { (*self.inner.ni).try_seek(pos) }
 } else {
 unsafe { (*self.inner.soft).try_seek(pos) }
 }
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes128.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-128 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes128 {
 encrypt_keys: [__m128i; 11],
 decrypt_keys: [__m128i; 11],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes192.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-192 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes192 {
 encrypt_keys: [__m128i; 13],
 decrypt_keys: [__m128i; 13],
Expand Down

2 changes: 1 addition & 1 deletion
aes/src/ni/aes256.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ mod expand;
mod test_expand;

/// AES-256 block cipher
#[derive(Copy, Clone)]
#[derive(Clone)]
pub struct Aes256 {
 encrypt_keys: [__m128i; 15],
 decrypt_keys: [__m128i; 15],
Expand Down

4 changes: 0 additions & 4 deletions
aes/src/soft/impls.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,6 @@ macro_rules! define_aes_impl {
 ) => {
 #[doc=$doc]
 #[derive(Clone)]
 #[cfg_attr(
 all(any(target_arch = "x86_64", target_arch = "x86"), not(feature = "force-soft")),
 derive(Copy)
 )] // TODO(tarcieri): remove this when `ManuallyDrop` is stable
 pub struct $name {
 keys: $fixslice_keys,
 }
Expand Down