From 511eb47be9fbc78c29e7388f7bf5713efc213a02 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Thu, 17 Jan 2019 23:59:31 +0100
Subject: [PATCH] Switch to RustCrypto for pbkdf2.

---
 sasl/Cargo.toml          | 1 +
 sasl/src/common/scram.rs | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sasl/Cargo.toml b/sasl/Cargo.toml
index 91527116..10c12e99 100644
--- a/sasl/Cargo.toml
+++ b/sasl/Cargo.toml
@@ -24,6 +24,7 @@ rand_os = "0.1"
 sha-1 = "0.8"
 sha2 = "0.8"
 hmac = "0.7"
+pbkdf2 = { version = "0.3", default-features = false }
 
 [dependencies.openssl]
 version = "0.10.7"
diff --git a/sasl/src/common/scram.rs b/sasl/src/common/scram.rs
index f8bd0709..cc48b439 100644
--- a/sasl/src/common/scram.rs
+++ b/sasl/src/common/scram.rs
@@ -1,9 +1,8 @@
-use openssl::pkcs5::pbkdf2_hmac;
-use openssl::hash::MessageDigest;
 use rand_os::{OsRng, rand_core::{RngCore, Error as RngError}};
 use sha1::{Sha1 as Sha1_hash, Digest};
 use sha2::Sha256 as Sha256_hash;
 use hmac::{Hmac, Mac};
+use pbkdf2::pbkdf2;
 
 use crate::common::Password;
 
@@ -66,7 +65,7 @@ impl ScramProvider for Sha1 { // TODO: look at all these unwraps
         match *password {
             Password::Plain(ref plain) => {
                 let mut result = vec![0; 20];
-                pbkdf2_hmac(plain.as_bytes(), salt, iterations, MessageDigest::sha1(), &mut result).unwrap();
+                pbkdf2::<Hmac<Sha1_hash>>(plain.as_bytes(), salt, iterations, &mut result);
                 Ok(result)
             },
             Password::Pbkdf2 { ref method, salt: ref my_salt, iterations: my_iterations, ref data } => {
@@ -116,7 +115,7 @@ impl ScramProvider for Sha256 { // TODO: look at all these unwraps
         match *password {
             Password::Plain(ref plain) => {
                 let mut result = vec![0; 32];
-                pbkdf2_hmac(plain.as_bytes(), salt, iterations, MessageDigest::sha256(), &mut result).unwrap();
+                pbkdf2::<Hmac<Sha256_hash>>(plain.as_bytes(), salt, iterations, &mut result);
                 Ok(result)
             },
             Password::Pbkdf2 { ref method, salt: ref my_salt, iterations: my_iterations, ref data } => {