pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to RustCrypto for hashes.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2019-01-17 23:32:39 +01:00
parent 03923d4885
commit a661868099
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sasl/Cargo.toml
View file

@ -20,6 +20,8 @@ scram = ["openssl"]
[dependencies] [dependencies]
base64 = "0.10" base64 = "0.10"
sha-1 = "0.8"
sha2 = "0.8"
[dependencies.openssl] [dependencies.openssl]
version = "0.10.7" version = "0.10.7"

13
sasl/src/common/scram.rs
View file

@ -1,10 +1,11 @@
use openssl::pkcs5::pbkdf2_hmac; use openssl::pkcs5::pbkdf2_hmac;
use openssl::hash::hash;
use openssl::hash::MessageDigest; use openssl::hash::MessageDigest;
use openssl::sign::Signer; use openssl::sign::Signer;
use openssl::pkey::PKey; use openssl::pkey::PKey;
use openssl::rand::rand_bytes; use openssl::rand::rand_bytes;
use openssl::error::ErrorStack; use openssl::error::ErrorStack;
use sha1::{Sha1 as Sha1_hash, Digest};
use sha2::Sha256 as Sha256_hash;
use crate::common::Password; use crate::common::Password;
@ -46,7 +47,10 @@ impl ScramProvider for Sha1 { // TODO: look at all these unwraps
fn name() -> &'static str { "SHA-1" } fn name() -> &'static str { "SHA-1" }
fn hash(data: &[u8]) -> Vec<u8> { fn hash(data: &[u8]) -> Vec<u8> {
hash(MessageDigest::sha1(), data).unwrap().to_vec() let hash = Sha1_hash::digest(data);
let mut vec = Vec::with_capacity(Sha1_hash::output_size());
vec.extend_from_slice(hash.as_slice());
vec
} }
fn hmac(data: &[u8], key: &[u8]) -> Vec<u8> { fn hmac(data: &[u8], key: &[u8]) -> Vec<u8> {
@ -90,7 +94,10 @@ impl ScramProvider for Sha256 { // TODO: look at all these unwraps
fn name() -> &'static str { "SHA-256" } fn name() -> &'static str { "SHA-256" }
fn hash(data: &[u8]) -> Vec<u8> { fn hash(data: &[u8]) -> Vec<u8> {
hash(MessageDigest::sha256(), data).unwrap().to_vec() let hash = Sha256_hash::digest(data);
let mut vec = Vec::with_capacity(Sha256_hash::output_size());
vec.extend_from_slice(hash.as_slice());
vec
} }
fn hmac(data: &[u8], key: &[u8]) -> Vec<u8> { fn hmac(data: &[u8], key: &[u8]) -> Vec<u8> {