kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-19 18:15:18 -07:00
Code Releases Wiki Activity

Compatibility macros for crypto_pwhash_scryptsalsa208sha256

Browse Source
This commit is contained in:
Frank Denis 2014-05-15 00:53:57 -07:00
parent 492eb4f5df
commit a15eca1e4d
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h
View File

@ -45,4 +45,14 @@ int crypto_pwhash_scryptsalsa208sha256_str_verify(const char str[crypto_pwhash_s
} }
#endif #endif
/* Backward compatibility with version 0.5.0 */
#define crypto_pwhash_scryptxsalsa208sha256_SALTBYTES crypto_pwhash_scryptsalsa208sha256_SALTBYTES
#define crypto_pwhash_scryptxsalsa208sha256_saltbytes crypto_pwhash_scryptsalsa208sha256_saltbytes
#define crypto_pwhash_scryptxsalsa208sha256_STRBYTES crypto_pwhash_scryptsalsa208sha256_STRBYTES
#define crypto_pwhash_scryptxsalsa208sha256_strbytes crypto_pwhash_scryptsalsa208sha256_strbytes
#define crypto_pwhash_scryptxsalsa208sha256 crypto_pwhash_scryptsalsa208sha256
#define crypto_pwhash_scryptxsalsa208sha256_str crypto_pwhash_scryptsalsa208sha256_str
#define crypto_pwhash_scryptxsalsa208sha256_str_verify crypto_pwhash_scryptsalsa208sha256_str_verify
#endif #endif

5
src/libsodium/sodium/compat.c
View File

@ -19,18 +19,21 @@
extern "C" { extern "C" {
#endif #endif
#undef crypto_pwhash_scryptxsalsa208sha256_saltbytes
SODIUM_EXPORT size_t SODIUM_EXPORT size_t
crypto_pwhash_scryptxsalsa208sha256_saltbytes(void) crypto_pwhash_scryptxsalsa208sha256_saltbytes(void)
{ {
return crypto_pwhash_scryptsalsa208sha256_saltbytes(); return crypto_pwhash_scryptsalsa208sha256_saltbytes();
} }
#undef crypto_pwhash_scryptxsalsa208sha256_strbytes
SODIUM_EXPORT size_t SODIUM_EXPORT size_t
crypto_pwhash_scryptxsalsa208sha256_strbytes(void) crypto_pwhash_scryptxsalsa208sha256_strbytes(void)
{ {
return crypto_pwhash_scryptsalsa208sha256_strbytes(); return crypto_pwhash_scryptsalsa208sha256_strbytes();
} }
#undef crypto_pwhash_scryptxsalsa208sha256
SODIUM_EXPORT int SODIUM_EXPORT int
crypto_pwhash_scryptxsalsa208sha256(unsigned char * const out, crypto_pwhash_scryptxsalsa208sha256(unsigned char * const out,
unsigned long long outlen, unsigned long long outlen,
@ -44,6 +47,7 @@ crypto_pwhash_scryptxsalsa208sha256(unsigned char * const out,
salt, opslimit, memlimit); salt, opslimit, memlimit);
} }
#undef crypto_pwhash_scryptxsalsa208sha256_str
SODIUM_EXPORT int SODIUM_EXPORT int
crypto_pwhash_scryptxsalsa208sha256_str(char out[crypto_pwhash_scryptsalsa208sha256_STRBYTES], crypto_pwhash_scryptxsalsa208sha256_str(char out[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
const char * const passwd, const char * const passwd,
@ -55,6 +59,7 @@ crypto_pwhash_scryptxsalsa208sha256_str(char out[crypto_pwhash_scryptsalsa208sha
opslimit, memlimit); opslimit, memlimit);
} }
#undef crypto_pwhash_scryptxsalsa208sha256_str_verify
SODIUM_EXPORT int SODIUM_EXPORT int
crypto_pwhash_scryptxsalsa208sha256_str_verify(const char str[crypto_pwhash_scryptsalsa208sha256_STRBYTES], crypto_pwhash_scryptxsalsa208sha256_str_verify(const char str[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
const char * const passwd, const char * const passwd,