From 6490af25cef0279c05ffc772223f76089a01bc09 Mon Sep 17 00:00:00 2001
From: Stefan Kreutz <mail@skreutz.com>
Date: Tue, 14 Mar 2023 23:55:59 +0100
Subject: Upgrade pbkdf2 crate

---
 wpa-psk/CHANGELOG.md | 5 +++++
 wpa-psk/Cargo.toml   | 3 +--
 wpa-psk/src/lib.rs   | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'wpa-psk')

diff --git a/wpa-psk/CHANGELOG.md b/wpa-psk/CHANGELOG.md
index c32ff78..b7e945b 100644
--- a/wpa-psk/CHANGELOG.md
+++ b/wpa-psk/CHANGELOG.md
@@ -10,6 +10,11 @@ The format is based on [Keep A Changelog][] and this project adheres to
 
 ## Unreleased
 
+### Changed
+
+- Updated `pbkdf2` crate.
+- Removed direct dependency on `hmac` crate.
+
 ## [0.2.1] - 2022-02-16
 
 ### Added
diff --git a/wpa-psk/Cargo.toml b/wpa-psk/Cargo.toml
index ebaf9f5..fde4476 100644
--- a/wpa-psk/Cargo.toml
+++ b/wpa-psk/Cargo.toml
@@ -12,6 +12,5 @@ categories = ["algorithms"]
 publish = true
 
 [dependencies]
-pbkdf2 = { version = "0.11.0", default-features = false }
-hmac = { version = "0.12.1", default-features = false }
+pbkdf2 = { version = "0.12.1", default-features = false, features = ["hmac"] }
 sha1 = { version = "0.10.5", default-features = false }
diff --git a/wpa-psk/src/lib.rs b/wpa-psk/src/lib.rs
index db114ab..d0ffbc4 100644
--- a/wpa-psk/src/lib.rs
+++ b/wpa-psk/src/lib.rs
@@ -30,8 +30,7 @@
 
 use std::{error::Error, fmt::Display};
 
-use hmac::Hmac;
-use pbkdf2::pbkdf2;
+use pbkdf2::pbkdf2_hmac;
 use sha1::Sha1;
 
 /// An SSID consisting of 1 up to 32 arbitrary bytes.
@@ -150,7 +149,7 @@ pub fn wpa_psk(ssid: &Ssid, passphrase: &Passphrase) -> [u8; 32] {
 /// See [`wpa_psk`].
 pub fn wpa_psk_unchecked(ssid: &[u8], passphrase: &[u8]) -> [u8; 32] {
     let mut buf = [0u8; 32];
-    pbkdf2::<Hmac<Sha1>>(passphrase, ssid, 4096, &mut buf);
+    pbkdf2_hmac::<Sha1>(passphrase, ssid, 4096, &mut buf);
     buf
 }
 
-- 
cgit v1.2.3