From 2acb19520a72251a1a78470f65c905f12ab0204a Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 2 Aug 2014 12:29:15 -0700 Subject: [PATCH] Add crypto_pwhash_scryptsalsa208sha256_STRPREFIX --- .../scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c | 6 ++++++ .../include/sodium/crypto_pwhash_scryptsalsa208sha256.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c index b4e64a5a..50b0b0ff 100644 --- a/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +++ b/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c @@ -61,6 +61,12 @@ crypto_pwhash_scryptsalsa208sha256_strbytes(void) return crypto_pwhash_scryptsalsa208sha256_STRBYTES; } +const char * +crypto_pwhash_scryptsalsa208sha256_strprefix(void) +{ + return crypto_pwhash_scryptsalsa208sha256_STRPREFIX; +} + size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void) { diff --git a/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h b/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h index 7de83955..b97bce2c 100644 --- a/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h +++ b/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h @@ -20,6 +20,10 @@ size_t crypto_pwhash_scryptsalsa208sha256_saltbytes(void); SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_strbytes(void); +#define crypto_pwhash_scryptsalsa208sha256_STRPREFIX "$7$" +SODIUM_EXPORT +const char *crypto_pwhash_scryptsalsa208sha256_strprefix(void); + #define crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE 524288ULL SODIUM_EXPORT size_t crypto_pwhash_scryptsalsa208sha256_opslimit_interactive(void);