Skip to content

Replace ring with hmac for hmacs #139

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
ordian merged 2 commits into from
May 11, 2019
Merged

Replace ring with hmac for hmacs #139

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83aa95b
Replace ring with hmac for hmacs
tomaka May 9, 2019
a34ca7d
Merge remote-tracking branch 'upstream/master' into hmac-no-ring
tomaka May 10, 2019
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
92 changes: 67 additions & 25 deletions parity-crypto/src/hmac/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,77 +14,119 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

use digest;
use ring::digest::{SHA256, SHA512};
use ring::hmac::{self, SigningContext};
use digest::{Sha256, Sha512};
use rdigest::generic_array::{GenericArray, typenum::U32, typenum::U64, typenum::U128};
use rhmac::{Hmac, Mac as _};
use rsha2;
use std::marker::PhantomData;
use std::ops::Deref;

/// HMAC signature.
pub struct Signature<T>(hmac::Signature, PhantomData<T>);
pub struct Signature<T>(HashInner, PhantomData<T>);

enum HashInner {
Sha256(GenericArray<u8, U32>),
Sha512(GenericArray<u8, U64>),
}

impl<T> Deref for Signature<T> {
type Target = [u8];

fn deref(&self) -> &Self::Target {
self.0.as_ref()
match &self.0 {
HashInner::Sha256(a) => a.as_slice(),
HashInner::Sha512(a) => a.as_slice(),
}
}
}

/// HMAC signing key.
pub struct SigKey<T>(hmac::SigningKey, PhantomData<T>);
pub struct SigKey<T>(KeyInner, PhantomData<T>);

enum KeyInner {
Sha256(GenericArray<u8, U64>),
Sha512(GenericArray<u8, U128>),
Copy link
Copy Markdown
Contributor

@ordian ordian May 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@tomaka should this be U32 and U64?

(found by @dvdplm)

Copy link
Copy Markdown
Contributor Author

@tomaka tomaka May 13, 2019

Choose a reason for hiding this comment

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

Indeed, probably.

}

impl SigKey<digest::Sha256> {
pub fn sha256(key: &[u8]) -> SigKey<digest::Sha256> {
SigKey(hmac::SigningKey::new(&SHA256, key), PhantomData)
impl SigKey<Sha256> {
pub fn sha256(key: &[u8]) -> SigKey<Sha256> {
SigKey(KeyInner::Sha256(*GenericArray::from_slice(key)), PhantomData)
}
}

impl SigKey<digest::Sha512> {
pub fn sha512(key: &[u8]) -> SigKey<digest::Sha512> {
SigKey(hmac::SigningKey::new(&SHA512, key), PhantomData)
impl SigKey<Sha512> {
pub fn sha512(key: &[u8]) -> SigKey<Sha512> {
SigKey(KeyInner::Sha512(*GenericArray::from_slice(key)), PhantomData)
}
}

/// Compute HMAC signature of `data`.
pub fn sign<T>(k: &SigKey<T>, data: &[u8]) -> Signature<T> {
Signature(hmac::sign(&k.0, data), PhantomData)
let mut signer = Signer::with(k);
signer.update(data);
signer.sign()
}

/// Stateful HMAC computation.
pub struct Signer<T>(SigningContext, PhantomData<T>);
pub struct Signer<T>(SignerInner, PhantomData<T>);

enum SignerInner {
Sha256(Hmac<rsha2::Sha256>),
Sha512(Hmac<rsha2::Sha512>),
}

impl<T> Signer<T> {
pub fn with(key: &SigKey<T>) -> Signer<T> {
Signer(hmac::SigningContext::with_key(&key.0), PhantomData)
match &key.0 {
KeyInner::Sha256(k) => Signer(SignerInner::Sha256(Hmac::new(k)), PhantomData),
KeyInner::Sha512(k) => Signer(SignerInner::Sha512(Hmac::new(k)), PhantomData),
}
}

pub fn update(&mut self, data: &[u8]) {
self.0.update(data)
match &mut self.0 {
SignerInner::Sha256(hmac) => hmac.input(data),
SignerInner::Sha512(hmac) => hmac.input(data),
}
}

pub fn sign(self) -> Signature<T> {
Signature(self.0.sign(), PhantomData)
match self.0 {
SignerInner::Sha256(hmac) => Signature(HashInner::Sha256(hmac.result().code()), PhantomData),
SignerInner::Sha512(hmac) => Signature(HashInner::Sha512(hmac.result().code()), PhantomData),
}
}
}

/// HMAC signature verification key.
pub struct VerifyKey<T>(hmac::VerificationKey, PhantomData<T>);
pub struct VerifyKey<T>(KeyInner, PhantomData<T>);

impl VerifyKey<digest::Sha256> {
pub fn sha256(key: &[u8]) -> VerifyKey<digest::Sha256> {
VerifyKey(hmac::VerificationKey::new(&SHA256, key), PhantomData)
impl VerifyKey<Sha256> {
pub fn sha256(key: &[u8]) -> VerifyKey<Sha256> {
VerifyKey(KeyInner::Sha256(*GenericArray::from_slice(key)), PhantomData)
}
}

impl VerifyKey<digest::Sha512> {
pub fn sha512(key: &[u8]) -> VerifyKey<digest::Sha512> {
VerifyKey(hmac::VerificationKey::new(&SHA512, key), PhantomData)
impl VerifyKey<Sha512> {
pub fn sha512(key: &[u8]) -> VerifyKey<Sha512> {
VerifyKey(KeyInner::Sha512(*GenericArray::from_slice(key)), PhantomData)
}
}

/// Verify HMAC signature of `data`.
pub fn verify<T>(k: &VerifyKey<T>, data: &[u8], sig: &[u8]) -> bool {
hmac::verify(&k.0, data, sig).is_ok()
match &k.0 {
KeyInner::Sha256(k) => {
let mut ctxt = Hmac::<rsha2::Sha256>::new(k);
ctxt.input(data);
ctxt.verify(sig).is_ok()
}
KeyInner::Sha512(k) => {
let mut ctxt = Hmac::<rsha2::Sha512>::new(k);
ctxt.input(data);
ctxt.verify(sig).is_ok()
}
}
}

#[cfg(test)]
Expand Down