diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-04-04 16:12:16 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-04-04 16:50:45 +0200 |
commit | 855b1a8f81b5a3b5b31d0c3c303675425f58a5af (patch) | |
tree | 392592213aa025cc184166dae23bfca4494cdd13 /src | |
parent | 02e8344d3803b80b74bc9b56d718304a6588bc14 (diff) | |
download | libgcrypt-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 'src')
-rw-r--r-- | src/gcrypt.h.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in index 83437991..dff0e0b1 100644 --- a/src/gcrypt.h.in +++ b/src/gcrypt.h.in @@ -1193,7 +1193,8 @@ enum gcry_kdf_algos GCRY_KDF_SALTED_S2K = 17, GCRY_KDF_ITERSALTED_S2K = 19, GCRY_KDF_PBKDF1 = 33, - GCRY_KDF_PBKDF2 = 34 + GCRY_KDF_PBKDF2 = 34, + GCRY_KDF_SCRYPT = 35 }; /* Derive a key from a passphrase. */ |