diff options
| author | Stefan Kreutz <mail@skreutz.com> | 2023-03-14 23:55:59 +0100 |
|---|---|---|
| committer | Stefan Kreutz <mail@skreutz.com> | 2023-03-14 23:55:59 +0100 |
| commit | 6490af25cef0279c05ffc772223f76089a01bc09 (patch) | |
| tree | 928715411d11b5e8364388925f2266e90251d7cd | |
| parent | 665135adc33bf10bae4b8b53edee3c6b1cf36ecc (diff) | |
| download | wpa-psk-6490af25cef0279c05ffc772223f76089a01bc09.tar | |
Upgrade pbkdf2 crate
| -rw-r--r-- | Cargo.lock | 10 | ||||
| -rw-r--r-- | wpa-psk/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | wpa-psk/Cargo.toml | 3 | ||||
| -rw-r--r-- | wpa-psk/src/lib.rs | 5 |
4 files changed, 13 insertions, 10 deletions
@@ -24,9 +24,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -256,11 +256,12 @@ checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" dependencies = [ "digest", + "hmac", ] [[package]] @@ -545,7 +546,6 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" name = "wpa-psk" version = "0.2.1" dependencies = [ - "hmac", "pbkdf2", "sha1", ] 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 } |