Skip to content

aes: soft hazmat modules#267

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
May 30, 2021
Merged

aes: soft hazmat modules #267

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
45 changes: 27 additions & 18 deletions aes/src/hazmat.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
target_arch = "aarch64",
feature = "armv8",
not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
any(target_arch = "x86_64", target_arch = "x86"),
not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
target_arch = "x86_64",
target_arch = "x86",
all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
#[cfg(not(feature = "force-soft"))]
if aes_intrinsics::get() {
unsafe { intrinsics::cipher_round(block, round_key) };
} else {
todo!("soft fallback for AES hazmat functions is not yet implemented");
return;
}

soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
#[cfg(not(feature = "force-soft"))]
if aes_intrinsics::get() {
unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
} else {
todo!("soft fallback for AES hazmat functions is not yet implemented");
return;
}

soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
#[cfg(not(feature = "force-soft"))]
if aes_intrinsics::get() {
unsafe { intrinsics::mix_columns(block) };
} else {
todo!("soft fallback for AES hazmat functions is not yet implemented");
return;
}

soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
#[cfg(not(feature = "force-soft"))]
if aes_intrinsics::get() {
unsafe { intrinsics::inv_mix_columns(block) };
} else {
todo!("soft fallback for AES hazmat functions is not yet implemented");
return;
}

soft::inv_mix_columns(block);
}
2 changes: 1 addition & 1 deletion aes/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down
34 changes: 34 additions & 0 deletions aes/src/soft/fixslice32.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
(ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
(ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
use crate::Block;

/// AES cipher (encrypt) round function.
#[inline]
pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
todo!();
}

/// AES cipher (encrypt) round function.
#[inline]
pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
todo!();
}

/// AES mix columns function.
#[inline]
pub(crate) fn mix_columns(_block: &mut Block) {
todo!();
}

/// AES inverse mix columns function.
#[inline]
pub(crate) fn inv_mix_columns(_block: &mut Block) {
todo!();
}
}
34 changes: 34 additions & 0 deletions aes/src/soft/fixslice64.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
(ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
(ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
use crate::Block;

/// AES cipher (encrypt) round function.
#[inline]
pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
todo!();
}

/// AES cipher (encrypt) round function.
#[inline]
pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
todo!();
}

/// AES mix columns function.
#[inline]
pub(crate) fn mix_columns(_block: &mut Block) {
todo!();
}

/// AES inverse mix columns function.
#[inline]
pub(crate) fn inv_mix_columns(_block: &mut Block) {
todo!();
}
}
1 change: 1 addition & 0 deletions aes/tests/hazmat.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
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: soft `hazmat` modules by tarcieri · Pull Request #267 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: soft hazmat modules#267

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

May 30, 2021
 Merged


aes: soft hazmat modules
#267
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


45 changes: 27 additions & 18 deletions
aes/src/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
 target_arch = "aarch64",
 feature = "armv8",
 not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
 any(target_arch = "x86_64", target_arch = "x86"),
 not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
 target_arch = "x86_64",
 target_arch = "x86",
 all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::inv_mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::inv_mix_columns(block);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice32.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
 (ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
 (ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice64.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
 (ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
 (ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

1 change: 1 addition & 0 deletions
aes/tests/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
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: soft `hazmat` modules by tarcieri · Pull Request #267 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: soft hazmat modules#267

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

May 30, 2021
 Merged


aes: soft hazmat modules
#267
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


45 changes: 27 additions & 18 deletions
aes/src/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
 target_arch = "aarch64",
 feature = "armv8",
 not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
 any(target_arch = "x86_64", target_arch = "x86"),
 not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
 target_arch = "x86_64",
 target_arch = "x86",
 all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::inv_mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::inv_mix_columns(block);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice32.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
 (ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
 (ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice64.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
 (ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
 (ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

1 change: 1 addition & 0 deletions
aes/tests/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
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: soft `hazmat` modules by tarcieri · Pull Request #267 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: soft hazmat modules#267

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

May 30, 2021
 Merged


aes: soft hazmat modules
#267
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


45 changes: 27 additions & 18 deletions
aes/src/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
 target_arch = "aarch64",
 feature = "armv8",
 not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
 any(target_arch = "x86_64", target_arch = "x86"),
 not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
 target_arch = "x86_64",
 target_arch = "x86",
 all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::inv_mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::inv_mix_columns(block);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice32.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
 (ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
 (ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice64.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
 (ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
 (ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

1 change: 1 addition & 0 deletions
aes/tests/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
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: soft `hazmat` modules by tarcieri · Pull Request #267 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: soft hazmat modules#267

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

May 30, 2021
 Merged


aes: soft hazmat modules
#267
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


45 changes: 27 additions & 18 deletions
aes/src/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
 target_arch = "aarch64",
 feature = "armv8",
 not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
 any(target_arch = "x86_64", target_arch = "x86"),
 not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
 target_arch = "x86_64",
 target_arch = "x86",
 all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::inv_mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::inv_mix_columns(block);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice32.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
 (ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
 (ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice64.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
 (ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
 (ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

1 change: 1 addition & 0 deletions
aes/tests/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
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: soft `hazmat` modules by tarcieri · Pull Request #267 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: soft hazmat modules#267

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

May 30, 2021
 Merged


aes: soft hazmat modules
#267
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


45 changes: 27 additions & 18 deletions
aes/src/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
 target_arch = "aarch64",
 feature = "armv8",
 not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
 any(target_arch = "x86_64", target_arch = "x86"),
 not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
 target_arch = "x86_64",
 target_arch = "x86",
 all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::inv_mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::inv_mix_columns(block);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice32.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
 (ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
 (ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice64.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
 (ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
 (ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

1 change: 1 addition & 0 deletions
aes/tests/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
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: soft `hazmat` modules by tarcieri · Pull Request #267 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: soft hazmat modules#267

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

May 30, 2021
 Merged


aes: soft hazmat modules
#267
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


45 changes: 27 additions & 18 deletions
aes/src/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
 target_arch = "aarch64",
 feature = "armv8",
 not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
 any(target_arch = "x86_64", target_arch = "x86"),
 not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
 target_arch = "x86_64",
 target_arch = "x86",
 all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::inv_mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::inv_mix_columns(block);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice32.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
 (ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
 (ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice64.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
 (ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
 (ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

1 change: 1 addition & 0 deletions
aes/tests/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
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: soft `hazmat` modules by tarcieri · Pull Request #267 · RustCrypto/block-ciphers · GitHub
Skip to content
aes: soft hazmat modules#267

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

May 30, 2021
 Merged


aes: soft hazmat modules
#267
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


45 changes: 27 additions & 18 deletions
aes/src/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,21 +11,22 @@
//! We do NOT recommending using it to implement any algorithm which has not
//! received extensive peer review by cryptographers.

use crate::Block;
use crate::{soft::fixslice::hazmat as soft, Block};

#[cfg(all(target_arch = "aarch64", feature = "armv8"))]
#[cfg(all(
 target_arch = "aarch64",
 feature = "armv8",
 not(feature = "force-soft")
))]
use crate::armv8::hazmat as intrinsics;

#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
#[cfg(all(
 any(target_arch = "x86_64", target_arch = "x86"),
 not(feature = "force-soft")
))]
use crate::ni::hazmat as intrinsics;

#[cfg(not(any(
 target_arch = "x86_64",
 target_arch = "x86",
 all(target_arch = "aarch64", feature = "armv8")
)))]
compile_error!("the `hazmat` feature is currently only available on x86/x86-64 or aarch64");

#[cfg(not(feature = "force-soft"))]
cpufeatures::new!(aes_intrinsics, "aes");

/// ⚠️ AES cipher (encrypt) round function.
Expand All@@ -44,11 +45,13 @@ cpufeatures::new!(aes_intrinsics, "aes");
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::cipher_round(block, round_key);
}

/// ⚠️ AES equivalent inverse cipher (decrypt) round function.
Expand All@@ -67,11 +70,13 @@ pub fn cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::equiv_inv_cipher_round(block, round_key) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::equiv_inv_cipher_round(block, round_key);
}

/// ⚠️ AES mix columns function.
Expand All@@ -81,11 +86,13 @@ pub fn equiv_inv_cipher_round(block: &mut Block, round_key: &Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::mix_columns(block);
}

/// ⚠️ AES inverse mix columns function.
Expand All@@ -97,9 +104,11 @@ pub fn mix_columns(block: &mut Block) {
/// Use this function with great care! See the [module-level documentation][crate::hazmat]
/// for more information.
pub fn inv_mix_columns(block: &mut Block) {
 #[cfg(not(feature = "force-soft"))]
 if aes_intrinsics::get() {
 unsafe { intrinsics::inv_mix_columns(block) };
 } else {
 todo!("soft fallback for AES hazmat functions is not yet implemented");
 return;
 }

 soft::inv_mix_columns(block);
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@
)]
#![warn(missing_docs, rust_2018_idioms)]

#[cfg(all(feature = "hazmat", not(feature = "force-soft")))]
#[cfg(feature = "hazmat")]
pub mod hazmat;

mod soft;
Expand Down

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice32.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1372,3 +1372,37 @@ fn rotate_rows_and_columns_2_2(x: u32) -> u32 {
 (ror(x, ror_distance(2, 2)) & 0x0f0f0f0f) |
 (ror(x, ror_distance(1, 2)) & 0xf0f0f0f0)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

34 changes: 34 additions & 0 deletions
aes/src/soft/fixslice64.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1426,3 +1426,37 @@ fn rotate_rows_and_columns_2_2(x: u64) -> u64 {
 (ror(x, ror_distance(2, 2)) & 0x00ff00ff00ff00ff) |
 (ror(x, ror_distance(1, 2)) & 0xff00ff00ff00ff00)
}

/// Low-level "hazmat" AES functions.
///
/// Note: this isn't actually used in the `Aes128`/`Aes192`/`Aes256`
/// implementations in this crate, but instead provides raw access to
/// the AES round function gated under the `hazmat` crate feature.
#[cfg(feature = "hazmat")]
pub(crate) mod hazmat {
 use crate::Block;

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES cipher (encrypt) round function.
 #[inline]
 pub(crate) fn equiv_inv_cipher_round(_block: &mut Block, _round_key: &Block) {
 todo!();
 }

 /// AES mix columns function.
 #[inline]
 pub(crate) fn mix_columns(_block: &mut Block) {
 todo!();
 }

 /// AES inverse mix columns function.
 #[inline]
 pub(crate) fn inv_mix_columns(_block: &mut Block) {
 todo!();
 }
}

1 change: 1 addition & 0 deletions
aes/tests/hazmat.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
//! Tests for low-level "hazmat" AES functions.

// TODO(tarcieri): support for using the hazmat functions with the `soft` backend
#![cfg(all(feature = "hazmat", not(feature = "force-soft")))]

use aes::Block;
Expand Down