cmdln/medallion
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change one operation over to new higher level fn

Browse source
This commit is contained in:
Thomas Gideon 2017-02-15 13:50:12 -05:00
parent cfd61ae991
commit 29037a0df7
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/lib.rs
View file

@ -115,31 +115,11 @@ impl<H, C> Token<H, C>
/// Generate the signed token from a key and the specific algorithm /// Generate the signed token from a key and the specific algorithm
pub fn signed(&self, key: &[u8]) -> Result<String, Error> { pub fn signed(&self, key: &[u8]) -> Result<String, Error> {
match self.header.alg() {
&Algorithm::HS256 => self.signed_hmac(key, MessageDigest::sha256()),
&Algorithm::HS384 => self.signed_hmac(key, MessageDigest::sha384()),
&Algorithm::HS512 => self.signed_hmac(key, MessageDigest::sha512()),
&Algorithm::RS256 => self.signed_rsa(key, MessageDigest::sha256()),
&Algorithm::RS384 => self.signed_rsa(key, MessageDigest::sha384()),
&Algorithm::RS512 => self.signed_rsa(key, MessageDigest::sha512()),
}
}
fn signed_hmac(&self, key: &[u8], digest: MessageDigest) -> Result<String, Error> {
let header = try!(Component::to_base64(&self.header)); let header = try!(Component::to_base64(&self.header));
let claims = try!(self.claims.to_base64()); let claims = try!(self.claims.to_base64());
let data = format!("{}.{}", header, claims); let data = format!("{}.{}", header, claims);
let sig = crypt::sign_hmac(&*data, key, digest); let sig = crypt::sign(&*data, key, &self.header.alg());
Ok(format!("{}.{}", data, sig))
}
fn signed_rsa(&self, key: &[u8], digest: MessageDigest) -> Result<String, Error> {
let header = try!(Component::to_base64(&self.header));
let claims = try!(self.claims.to_base64());
let data = format!("{}.{}", header, claims);
let sig = crypt::sign_rsa(&*data, key, digest);
Ok(format!("{}.{}", data, sig)) Ok(format!("{}.{}", data, sig))
} }
} }
@ -176,7 +156,7 @@ mod tests {
} }
#[test] #[test]
pub fn roundtrip() { pub fn roundtrip_hmac() {
let token: Token<DefaultHeader, Claims<EmptyClaim>> = Default::default(); let token: Token<DefaultHeader, Claims<EmptyClaim>> = Default::default();
let key = "secret".as_bytes(); let key = "secret".as_bytes();
let raw = token.signed(key).unwrap(); let raw = token.signed(key).unwrap();