Skip to content

digest: allow DynDigest usage without alloc enabled#573

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
Mar 5, 2021
Merged

digest: allow DynDigest usage without alloc enabled #573

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
6 changes: 4 additions & 2 deletions digest/src/digest.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
/// Output size for `Digest`
type OutputSize: ArrayLength<u8>;
Expand Down
32 changes: 26 additions & 6 deletions digest/src/dyn_digest.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
/// Digest input data.
///
/// This method can be called repeatedly for use with streaming messages.
fn update(&mut self, data: &[u8]);

/// Retrieve result and reset hasher instance
fn finalize_reset(&mut self) -> Box<[u8]>;
#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
fn finalize_reset(&mut self) -> Box<[u8]> {
let mut result = vec![0; self.output_size()];
self.finalize_into_reset(&mut result).unwrap();
result.into_boxed_slice()
}

/// Retrieve result and consume boxed hasher instance
fn finalize(self: Box<Self>) -> Box<[u8]>;
#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
#[allow(clippy::boxed_local)]
fn finalize(mut self: Box<Self>) -> Box<[u8]> {
let mut result = vec![0; self.output_size()];
self.finalize_into_reset(&mut result).unwrap();
result.into_boxed_slice()
}

/// Write result into provided array and consume the hasher instance.
///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
fn output_size(&self) -> usize;

/// Clone hasher state into a boxed trait object
#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
fn box_clone(&self) -> Box<dyn DynDigest>;
Comment on lines 51 to 54

@tarcieritarcieriMar 4, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.

Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.

}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
Update::update(self, data);
}

#[cfg(feature = "alloc")]
fn finalize_reset(&mut self) -> Box<[u8]> {
self.finalize_fixed_reset().to_vec().into_boxed_slice()
}

#[cfg(feature = "alloc")]
fn finalize(self: Box<Self>) -> Box<[u8]> {
self.finalize_fixed().to_vec().into_boxed_slice()
}
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
<Self as FixedOutput>::OutputSize::to_usize()
}

#[cfg(feature = "alloc")]
fn box_clone(&self) -> Box<dyn DynDigest> {
Box::new(self.clone())
}
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
fn clone(&self) -> Self {
self.box_clone()
Expand Down
2 changes: 0 additions & 2 deletions digest/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

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" + '
digest: allow DynDigest usage without `alloc` enabled by tarcieri · Pull Request #573 · RustCrypto/traits · GitHub
Skip to content
digest: allow DynDigest usage without alloc enabled#573

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

Mar 5, 2021
 Merged


digest: allow DynDigest usage without alloc enabled
#573
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


6 changes: 4 additions & 2 deletions
digest/src/digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
 /// Output size for `Digest`
 type OutputSize: ArrayLength<u8>;
Expand Down

32 changes: 26 additions & 6 deletions
digest/src/dyn_digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
 /// Digest input data.
 ///
 /// This method can be called repeatedly for use with streaming messages.
 fn update(&mut self, data: &[u8]);

 /// Retrieve result and reset hasher instance
 fn finalize_reset(&mut self) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Retrieve result and consume boxed hasher instance
 fn finalize(self: Box<Self>) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 #[allow(clippy::boxed_local)]
 fn finalize(mut self: Box<Self>) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Write result into provided array and consume the hasher instance.
 ///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
 fn output_size(&self) -> usize;

 /// Clone hasher state into a boxed trait object
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn box_clone(&self) -> Box<dyn DynDigest>;

Comment on lines

51
 to 
54

@tarcieritarcieriMar 4, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.
Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.
}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 Update::update(self, data);
 }

 #[cfg(feature = "alloc")]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 self.finalize_fixed_reset().to_vec().into_boxed_slice()
 }

 #[cfg(feature = "alloc")]
 fn finalize(self: Box<Self>) -> Box<[u8]> {
 self.finalize_fixed().to_vec().into_boxed_slice()
 }
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 <Self as FixedOutput>::OutputSize::to_usize()
 }

 #[cfg(feature = "alloc")]
 fn box_clone(&self) -> Box<dyn DynDigest> {
 Box::new(self.clone())
 }
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
 fn clone(&self) -> Self {
 self.box_clone()
Expand Down

2 changes: 0 additions & 2 deletions
digest/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

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('^' + ".*" + '
digest: allow DynDigest usage without `alloc` enabled by tarcieri · Pull Request #573 · RustCrypto/traits · GitHub
Skip to content
digest: allow DynDigest usage without alloc enabled#573

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

Mar 5, 2021
 Merged


digest: allow DynDigest usage without alloc enabled
#573
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


6 changes: 4 additions & 2 deletions
digest/src/digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
 /// Output size for `Digest`
 type OutputSize: ArrayLength<u8>;
Expand Down

32 changes: 26 additions & 6 deletions
digest/src/dyn_digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
 /// Digest input data.
 ///
 /// This method can be called repeatedly for use with streaming messages.
 fn update(&mut self, data: &[u8]);

 /// Retrieve result and reset hasher instance
 fn finalize_reset(&mut self) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Retrieve result and consume boxed hasher instance
 fn finalize(self: Box<Self>) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 #[allow(clippy::boxed_local)]
 fn finalize(mut self: Box<Self>) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Write result into provided array and consume the hasher instance.
 ///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
 fn output_size(&self) -> usize;

 /// Clone hasher state into a boxed trait object
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn box_clone(&self) -> Box<dyn DynDigest>;

Comment on lines

51
 to 
54

@tarcieritarcieriMar 4, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.
Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.
}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 Update::update(self, data);
 }

 #[cfg(feature = "alloc")]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 self.finalize_fixed_reset().to_vec().into_boxed_slice()
 }

 #[cfg(feature = "alloc")]
 fn finalize(self: Box<Self>) -> Box<[u8]> {
 self.finalize_fixed().to_vec().into_boxed_slice()
 }
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 <Self as FixedOutput>::OutputSize::to_usize()
 }

 #[cfg(feature = "alloc")]
 fn box_clone(&self) -> Box<dyn DynDigest> {
 Box::new(self.clone())
 }
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
 fn clone(&self) -> Self {
 self.box_clone()
Expand Down

2 changes: 0 additions & 2 deletions
digest/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

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('^' + ".*" + '
digest: allow DynDigest usage without `alloc` enabled by tarcieri · Pull Request #573 · RustCrypto/traits · GitHub
Skip to content
digest: allow DynDigest usage without alloc enabled#573

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

Mar 5, 2021
 Merged


digest: allow DynDigest usage without alloc enabled
#573
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


6 changes: 4 additions & 2 deletions
digest/src/digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
 /// Output size for `Digest`
 type OutputSize: ArrayLength<u8>;
Expand Down

32 changes: 26 additions & 6 deletions
digest/src/dyn_digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
 /// Digest input data.
 ///
 /// This method can be called repeatedly for use with streaming messages.
 fn update(&mut self, data: &[u8]);

 /// Retrieve result and reset hasher instance
 fn finalize_reset(&mut self) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Retrieve result and consume boxed hasher instance
 fn finalize(self: Box<Self>) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 #[allow(clippy::boxed_local)]
 fn finalize(mut self: Box<Self>) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Write result into provided array and consume the hasher instance.
 ///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
 fn output_size(&self) -> usize;

 /// Clone hasher state into a boxed trait object
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn box_clone(&self) -> Box<dyn DynDigest>;

Comment on lines

51
 to 
54

@tarcieritarcieriMar 4, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.
Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.
}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 Update::update(self, data);
 }

 #[cfg(feature = "alloc")]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 self.finalize_fixed_reset().to_vec().into_boxed_slice()
 }

 #[cfg(feature = "alloc")]
 fn finalize(self: Box<Self>) -> Box<[u8]> {
 self.finalize_fixed().to_vec().into_boxed_slice()
 }
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 <Self as FixedOutput>::OutputSize::to_usize()
 }

 #[cfg(feature = "alloc")]
 fn box_clone(&self) -> Box<dyn DynDigest> {
 Box::new(self.clone())
 }
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
 fn clone(&self) -> Self {
 self.box_clone()
Expand Down

2 changes: 0 additions & 2 deletions
digest/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

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" + '
digest: allow DynDigest usage without `alloc` enabled by tarcieri · Pull Request #573 · RustCrypto/traits · GitHub
Skip to content
digest: allow DynDigest usage without alloc enabled#573

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

Mar 5, 2021
 Merged


digest: allow DynDigest usage without alloc enabled
#573
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


6 changes: 4 additions & 2 deletions
digest/src/digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
 /// Output size for `Digest`
 type OutputSize: ArrayLength<u8>;
Expand Down

32 changes: 26 additions & 6 deletions
digest/src/dyn_digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
 /// Digest input data.
 ///
 /// This method can be called repeatedly for use with streaming messages.
 fn update(&mut self, data: &[u8]);

 /// Retrieve result and reset hasher instance
 fn finalize_reset(&mut self) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Retrieve result and consume boxed hasher instance
 fn finalize(self: Box<Self>) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 #[allow(clippy::boxed_local)]
 fn finalize(mut self: Box<Self>) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Write result into provided array and consume the hasher instance.
 ///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
 fn output_size(&self) -> usize;

 /// Clone hasher state into a boxed trait object
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn box_clone(&self) -> Box<dyn DynDigest>;

Comment on lines

51
 to 
54

@tarcieritarcieriMar 4, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.
Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.
}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 Update::update(self, data);
 }

 #[cfg(feature = "alloc")]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 self.finalize_fixed_reset().to_vec().into_boxed_slice()
 }

 #[cfg(feature = "alloc")]
 fn finalize(self: Box<Self>) -> Box<[u8]> {
 self.finalize_fixed().to_vec().into_boxed_slice()
 }
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 <Self as FixedOutput>::OutputSize::to_usize()
 }

 #[cfg(feature = "alloc")]
 fn box_clone(&self) -> Box<dyn DynDigest> {
 Box::new(self.clone())
 }
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
 fn clone(&self) -> Self {
 self.box_clone()
Expand Down

2 changes: 0 additions & 2 deletions
digest/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

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('^' + ".*" + '
digest: allow DynDigest usage without `alloc` enabled by tarcieri · Pull Request #573 · RustCrypto/traits · GitHub
Skip to content
digest: allow DynDigest usage without alloc enabled#573

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

Mar 5, 2021
 Merged


digest: allow DynDigest usage without alloc enabled
#573
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


6 changes: 4 additions & 2 deletions
digest/src/digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
 /// Output size for `Digest`
 type OutputSize: ArrayLength<u8>;
Expand Down

32 changes: 26 additions & 6 deletions
digest/src/dyn_digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
 /// Digest input data.
 ///
 /// This method can be called repeatedly for use with streaming messages.
 fn update(&mut self, data: &[u8]);

 /// Retrieve result and reset hasher instance
 fn finalize_reset(&mut self) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Retrieve result and consume boxed hasher instance
 fn finalize(self: Box<Self>) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 #[allow(clippy::boxed_local)]
 fn finalize(mut self: Box<Self>) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Write result into provided array and consume the hasher instance.
 ///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
 fn output_size(&self) -> usize;

 /// Clone hasher state into a boxed trait object
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn box_clone(&self) -> Box<dyn DynDigest>;

Comment on lines

51
 to 
54

@tarcieritarcieriMar 4, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.
Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.
}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 Update::update(self, data);
 }

 #[cfg(feature = "alloc")]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 self.finalize_fixed_reset().to_vec().into_boxed_slice()
 }

 #[cfg(feature = "alloc")]
 fn finalize(self: Box<Self>) -> Box<[u8]> {
 self.finalize_fixed().to_vec().into_boxed_slice()
 }
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 <Self as FixedOutput>::OutputSize::to_usize()
 }

 #[cfg(feature = "alloc")]
 fn box_clone(&self) -> Box<dyn DynDigest> {
 Box::new(self.clone())
 }
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
 fn clone(&self) -> Self {
 self.box_clone()
Expand Down

2 changes: 0 additions & 2 deletions
digest/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

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('^' + ".*" + '
digest: allow DynDigest usage without `alloc` enabled by tarcieri · Pull Request #573 · RustCrypto/traits · GitHub
Skip to content
digest: allow DynDigest usage without alloc enabled#573

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

Mar 5, 2021
 Merged


digest: allow DynDigest usage without alloc enabled
#573
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


6 changes: 4 additions & 2 deletions
digest/src/digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
 /// Output size for `Digest`
 type OutputSize: ArrayLength<u8>;
Expand Down

32 changes: 26 additions & 6 deletions
digest/src/dyn_digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
 /// Digest input data.
 ///
 /// This method can be called repeatedly for use with streaming messages.
 fn update(&mut self, data: &[u8]);

 /// Retrieve result and reset hasher instance
 fn finalize_reset(&mut self) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Retrieve result and consume boxed hasher instance
 fn finalize(self: Box<Self>) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 #[allow(clippy::boxed_local)]
 fn finalize(mut self: Box<Self>) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Write result into provided array and consume the hasher instance.
 ///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
 fn output_size(&self) -> usize;

 /// Clone hasher state into a boxed trait object
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn box_clone(&self) -> Box<dyn DynDigest>;

Comment on lines

51
 to 
54

@tarcieritarcieriMar 4, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.
Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.
}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 Update::update(self, data);
 }

 #[cfg(feature = "alloc")]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 self.finalize_fixed_reset().to_vec().into_boxed_slice()
 }

 #[cfg(feature = "alloc")]
 fn finalize(self: Box<Self>) -> Box<[u8]> {
 self.finalize_fixed().to_vec().into_boxed_slice()
 }
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 <Self as FixedOutput>::OutputSize::to_usize()
 }

 #[cfg(feature = "alloc")]
 fn box_clone(&self) -> Box<dyn DynDigest> {
 Box::new(self.clone())
 }
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
 fn clone(&self) -> Self {
 self.box_clone()
Expand Down

2 changes: 0 additions & 2 deletions
digest/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

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); }
})();
})();
digest: allow DynDigest usage without `alloc` enabled by tarcieri · Pull Request #573 · RustCrypto/traits · GitHub
Skip to content
digest: allow DynDigest usage without alloc enabled#573

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

Mar 5, 2021
 Merged


digest: allow DynDigest usage without alloc enabled
#573
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


6 changes: 4 additions & 2 deletions
digest/src/digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,10 @@ use generic_array::{ArrayLength, GenericArray};

/// The `Digest` trait specifies an interface common for digest functions.
///
/// It's a convenience wrapper around [`Update`], [`FixedOutput`], [`Reset`],
/// [`Clone`], and [`Default`] traits. It also provides additional convenience methods.
/// It's a convenience wrapper around [`Update`], [`FixedOutput`],
/// [`Reset`][`crate::Reset`], [`Clone`], and [`Default`] traits.
///
/// It also provides additional convenience methods.
pub trait Digest {
 /// Output size for `Digest`
 type OutputSize: ArrayLength<u8>;
Expand Down

32 changes: 26 additions & 6 deletions
digest/src/dyn_digest.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
use alloc::boxed::Box;
use core::fmt;

use super::{FixedOutput, FixedOutputReset, Reset, Update};
use core::fmt;
use generic_array::{typenum::Unsigned, GenericArray};

#[cfg(feature = "alloc")]
use alloc::boxed::Box;

/// The `DynDigest` trait is a modification of `Digest` trait suitable
/// for trait objects.
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub trait DynDigest {
 /// Digest input data.
 ///
 /// This method can be called repeatedly for use with streaming messages.
 fn update(&mut self, data: &[u8]);

 /// Retrieve result and reset hasher instance
 fn finalize_reset(&mut self) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Retrieve result and consume boxed hasher instance
 fn finalize(self: Box<Self>) -> Box<[u8]>;
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 #[allow(clippy::boxed_local)]
 fn finalize(mut self: Box<Self>) -> Box<[u8]> {
 let mut result = vec![0; self.output_size()];
 self.finalize_into_reset(&mut result).unwrap();
 result.into_boxed_slice()
 }

 /// Write result into provided array and consume the hasher instance.
 ///
Expand All@@ -36,6 +49,8 @@ pub trait DynDigest {
 fn output_size(&self) -> usize;

 /// Clone hasher state into a boxed trait object
 #[cfg(feature = "alloc")]
 #[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
 fn box_clone(&self) -> Box<dyn DynDigest>;

Comment on lines

51
 to 
54

@tarcieritarcieriMar 4, 2021

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was able to make the two other alloc-gated methods provided, this one is notably required, and somewhat annoyingly means that downstream impls of DynDigest would also need to alloc-gate this as well.
Given that DynDigest is largely intended as a wrapper for Digest anyway, I'm not sure it's a problem.
}

Expand All@@ -44,10 +59,12 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 Update::update(self, data);
 }

 #[cfg(feature = "alloc")]
 fn finalize_reset(&mut self) -> Box<[u8]> {
 self.finalize_fixed_reset().to_vec().into_boxed_slice()
 }

 #[cfg(feature = "alloc")]
 fn finalize(self: Box<Self>) -> Box<[u8]> {
 self.finalize_fixed().to_vec().into_boxed_slice()
 }
Expand DownExpand Up@@ -78,11 +95,14 @@ impl<D: Update + FixedOutputReset + Clone + 'static> DynDigest for D {
 <Self as FixedOutput>::OutputSize::to_usize()
 }

 #[cfg(feature = "alloc")]
 fn box_clone(&self) -> Box<dyn DynDigest> {
 Box::new(self.clone())
 }
}

#[cfg(feature = "alloc")]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
impl Clone for Box<dyn DynDigest> {
 fn clone(&self) -> Self {
 self.box_clone()
Expand Down

2 changes: 0 additions & 2 deletions
digest/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,15 +50,13 @@ pub mod dev;
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub mod core_api;
mod digest;
#[cfg(feature = "alloc")]
mod dyn_digest;

pub use crate::digest::{Digest, Output};
use core::fmt;
#[cfg(feature = "core-api")]
#[cfg_attr(docsrs, doc(cfg(feature = "core-api")))]
pub use crypto_common::block_buffer;
#[cfg(feature = "alloc")]
pub use dyn_digest::{DynDigest, InvalidBufferLength};
pub use generic_array::{self, typenum::consts, GenericArray};

Expand Down