diff options
| author | Ansley Peduru <[email protected]> | 2018-01-01 15:40:02 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-01-01 15:40:02 -0500 |
| commit | c2430b87f77a7396aca08e23d99b0fbea589627e (patch) | |
| tree | 32dec00c09d6b7e8d796dd00a0134fe3dec3b959 /openssl/src/pkcs5.rs | |
| parent | Fix x509 doc examples (diff) | |
| parent | Merge pull request #813 from sfackler/ssl-filetype (diff) | |
| download | rust-openssl-c2430b87f77a7396aca08e23d99b0fbea589627e.tar.xz rust-openssl-c2430b87f77a7396aca08e23d99b0fbea589627e.zip | |
Merge branch 'master' into x509-docs
Diffstat (limited to 'openssl/src/pkcs5.rs')
| -rw-r--r-- | openssl/src/pkcs5.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/pkcs5.rs b/openssl/src/pkcs5.rs index b37e4770..02201f02 100644 --- a/openssl/src/pkcs5.rs +++ b/openssl/src/pkcs5.rs @@ -548,7 +548,7 @@ mod tests { #[test] #[cfg(all(feature = "v110", ossl110))] fn scrypt() { - use hex::ToHex; + use hex; let pass = "pleaseletmein"; let salt = "SodiumChloride"; @@ -565,6 +565,6 @@ mod tests { 0, &mut actual, ).unwrap(); - assert_eq!((&actual[..]).to_hex(), expected); + assert_eq!(hex::encode(&actual[..]), expected); } } |