summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-04-04 16:12:16 +0200
committerWerner Koch <wk@gnupg.org>2013-04-04 16:50:45 +0200
commit855b1a8f81b5a3b5b31d0c3c303675425f58a5af (patch)
tree392592213aa025cc184166dae23bfca4494cdd13 /doc
parent02e8344d3803b80b74bc9b56d718304a6588bc14 (diff)
downloadlibgcrypt-855b1a8f81b5a3b5b31d0c3c303675425f58a5af.tar.gz
Add the SCRYPT KDF function
* scrypt.c, scrypt.h: New files. * memxor.c, memxor.h: New files. * cipher/Makefile.am: Add new files. * cipher/kdf.c (gcry_kdf_derive): Support GCRY_KDF_SCRYPT. * src/gcrypt.h.in (GCRY_KDF_SCRYPT): New. -- Signed-off-by: Christian Grothoff <christian@grothoff.org> I added the ChangeLog entry and the missing signed-off line. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/gcrypt.texi6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index bef91f7b..fe040f02 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -3172,6 +3172,12 @@ iteration count.
@item GCRY_KDF_PBKDF2
The PKCS#5 Passphrase Based Key Derivation Function number 2.
+@item GCRY_KDF_SCRYPT
+The SCRYPT Key Derivation Function. The subalgorithm is used to specify
+the CPU/memory cost paramter N, and the number of iterations
+is used for the parallelization parameter p. The block size is fixed
+at 8 in the current implementation.
+
@end table
@end deftypefun