-
Notifications
You must be signed in to change notification settings - Fork 239
add adapters for digest trait #678
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.
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
Open
master-hax
wants to merge
7
commits into
rust-embedded:master
Choose a base branch
from
master-hax:digest
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
99588da
add adapter for digest crate
master-hax b0a99a1
cargo fmt
master-hax 3aa98f8
don't forget to flush
master-hax a8c19c1
oops
master-hax 8938119
nit
master-hax f64c5d8
nm
master-hax 74959ae
add documentation macro
master-hax File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
//! Adapters to/from `digest::Digest` traits e.g. sha2::Sha256 | ||
|
||
use core::convert::Infallible; | ||
use digest::Update; | ||
use embedded_io::{ErrorType, Write}; | ||
|
||
/// Adapter from `digest::Digest` traits. | ||
#[derive(Clone)] | ||
pub struct FromDigest<T: ?Sized> { | ||
inner: T, | ||
} | ||
|
||
impl<T> FromDigest<T> { | ||
/// Create a new adapter. | ||
pub fn new(inner: T) -> Self { | ||
Self { inner } | ||
} | ||
|
||
/// Consume the adapter, returning the inner object. | ||
pub fn into_inner(self) -> T { | ||
self.inner | ||
} | ||
} | ||
|
||
impl<T: ?Sized> FromDigest<T> { | ||
/// Borrow the inner object. | ||
pub fn inner(&self) -> &T { | ||
&self.inner | ||
} | ||
|
||
/// Mutably borrow the inner object. | ||
pub fn inner_mut(&mut self) -> &mut T { | ||
&mut self.inner | ||
} | ||
} | ||
|
||
impl<T> ErrorType for FromDigest<T> { | ||
type Error = Infallible; | ||
} | ||
|
||
impl<T: Update> Write for FromDigest<T> { | ||
fn write(&mut self, data: &[u8]) -> Result<usize, <Self as ErrorType>::Error> { | ||
T::update(&mut self.inner, data); | ||
Ok(data.len()) | ||
} | ||
fn flush(&mut self) -> Result<(), <Self as ErrorType>::Error> { | ||
Ok(()) | ||
} | ||
} | ||
|
||
impl<T: Default> Default for FromDigest<T> { | ||
fn default() -> Self { | ||
Self { | ||
inner: T::default(), | ||
} | ||
} | ||
} | ||
|
||
/// Adapter to `digest::Digest` traits. | ||
#[derive(Clone)] | ||
pub struct ToDigest<T: ?Sized> { | ||
inner: T, | ||
} | ||
|
||
impl<T> ToDigest<T> { | ||
/// Create a new adapter. | ||
pub fn new(inner: T) -> Self { | ||
Self { inner } | ||
} | ||
|
||
/// Consume the adapter, returning the inner object. | ||
pub fn into_inner(self) -> T { | ||
self.inner | ||
} | ||
} | ||
|
||
impl<T: ?Sized> ToDigest<T> { | ||
/// Borrow the inner object. | ||
pub fn inner(&self) -> &T { | ||
&self.inner | ||
} | ||
|
||
/// Mutably borrow the inner object. | ||
pub fn inner_mut(&mut self) -> &mut T { | ||
&mut self.inner | ||
} | ||
} | ||
|
||
impl<T: Default> Default for ToDigest<T> { | ||
fn default() -> Self { | ||
Self { | ||
inner: T::default(), | ||
} | ||
} | ||
} | ||
|
||
impl<T: ErrorType<Error = Infallible> + Write> Update for ToDigest<T> { | ||
fn update(&mut self, data: &[u8]) { | ||
match self.inner.write_all(data) { | ||
Ok(()) => {} | ||
Err(_) => unreachable!(), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it's better to do |
||
} | ||
match self.inner.flush() { | ||
Ok(()) => {} | ||
Err(_) => unreachable!(), | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be fine to enable by default since digest is also
no_std
without the default featuresThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i'd prefer to make it optional to not bloat up people's dependency trees and also because the 0.10 vs 0.11 thing