Skip to content
This repository was archived by the owner on May 25, 2021. It is now read-only.

Use more commonly used scrypt parameter names. #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use more commonly used scrypt parameter names. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/main/java/com/lambdaworks/crypto/SCrypt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public class SCrypt {
*
* @param passwd Password.
* @param salt Salt.
* @param N CPU cost parameter.
* @param r Memory cost parameter.
* @param N CPU/memory cost parameter.
* @param r Block size parameter.
* @param p Parallelization parameter.
* @param dkLen Intended length of the derived key.
*
Expand All @@ -54,8 +54,8 @@ public static byte[] scrypt(byte[] passwd, byte[] salt, int N, int r, int p, int
*
* @param passwd Password.
* @param salt Salt.
* @param N CPU cost parameter.
* @param r Memory cost parameter.
* @param N CPU/memory cost parameter.
* @param r Block size parameter.
* @param p Parallelization parameter.
* @param dkLen Intended length of the derived key.
*
Expand All @@ -68,8 +68,8 @@ public static byte[] scrypt(byte[] passwd, byte[] salt, int N, int r, int p, int
*
* @param passwd Password.
* @param salt Salt.
* @param N CPU cost parameter.
* @param r Memory cost parameter.
* @param N CPU/memory cost parameter.
* @param r Block size parameter.
* @param p Parallelization parameter.
* @param dkLen Intended length of the derived key.
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/lambdaworks/crypto/SCryptUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public class SCryptUtil {
* in {@link SCryptUtil}.
*
* @param passwd Password.
* @param N CPU cost parameter.
* @param r Memory cost parameter.
* @param N CPU/memory cost parameter.
* @param r Block size parameter.
* @param p Parallelization parameter.
*
* @return The hashed password.
Expand Down