Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[buddy/hashers] Fix reflection warnings. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harold wants to merge 2 commits into
base: master
Choose a base branch
Loading
from
Open

[buddy/hashers] Fix reflection warnings. #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b6ed03
[buddy/hashers] Fix reflection warnings.
harold Apr 29, 2020
84f8c47
Merge branch 'master' into lein-check-clean-2020-04-29
harold Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions 13 src/clj/buddy/hashers.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
[buddy.core.bytes :as bytes]
[clojure.string :as str]
[clojurewerkz.scrypt.core :as scrypt])
(:import org.bouncycastle.crypto.digests.SHA1Digest
(:import org.bouncycastle.crypto.Digest
org.bouncycastle.crypto.digests.SHA1Digest
org.bouncycastle.crypto.digests.SHA256Digest
org.bouncycastle.crypto.digests.SHA3Digest
org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator
org.bouncycastle.crypto.generators.BCrypt
org.bouncycastle.crypto.params.KeyParameter
org.bouncycastle.crypto.generators.Argon2BytesGenerator
org.bouncycastle.crypto.params.Argon2Parameters
org.bouncycastle.crypto.params.Argon2Parameters$Builder
Expand Down Expand Up @@ -91,11 +93,12 @@
(let [salt (codecs/to-bytes (or salt (nonce/random-bytes 12)))
alg (keyword (str "pbkdf2+" (name digest)))
iterations (or iterations (get +iterations+ alg))
digest (hash/resolve-digest-engine digest)
^Digest digest (hash/resolve-digest-engine digest)
dsize (* 8 (.getDigestSize digest))
pgen (doto (PKCS5S2ParametersGenerator. digest)
(.init password salt iterations))
password (.getKey (.generateDerivedParameters pgen dsize))]
^KeyParameter cparams (.generateDerivedParameters pgen dsize)
password (.getKey cparams)]
{:alg alg
:password password
:salt salt
Expand Down Expand Up @@ -228,7 +231,8 @@
iterations (or iterations (get +iterations+ alg))
pgen (doto (PKCS5S2ParametersGenerator. (SHA256Digest.))
(.init password salt iterations))
password (.getKey (.generateDerivedParameters pgen 160))]
^KeyParameter cparams (.generateDerivedParameters pgen 160)
password (.getKey cparams)]
{:alg alg
:password password
:salt salt
Expand Down Expand Up @@ -412,4 +416,3 @@
:update false}
{:valid result
:update (and result (must-update? pparams))}))))

Morty Proxy This is a proxified and sanitized view of the page, visit original site.