cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add temporary compat layer for scryptsalsa208sha256 transition

Browse Source
This commit is contained in:
Frank Denis 2014-05-15 00:09:15 -07:00
parent bd05b7d292
commit ee6412080c
1 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
#include "crypto_hash_sha256.h"
#include "crypto_hash_sha512.h"
#include "crypto_onetimeauth_poly1305.h"
#include "crypto_pwhash_scryptsalsa208sha256.h"
#include "crypto_scalarmult_curve25519.h"
#include "crypto_secretbox_xsalsa20poly1305.h"
#include "crypto_sign_ed25519.h"
@ -14,12 +15,57 @@
#include "crypto_verify_32.h"
#include "export.h"
#ifdef EXPORT_ORIGINAL_IMPLEMENTATIONS
#ifdef __cplusplus
extern "C" {
#endif
SODIUM_EXPORT size_t
crypto_pwhash_scryptxsalsa208sha256_saltbytes(void)
{
return crypto_pwhash_scryptsalsa208sha256_saltbytes();
}
SODIUM_EXPORT size_t
crypto_pwhash_scryptxsalsa208sha256_strbytes(void)
{
return crypto_pwhash_scryptsalsa208sha256_strbytes();
}
SODIUM_EXPORT int
crypto_pwhash_scryptxsalsa208sha256(unsigned char * const out,
unsigned long long outlen,
const char * const passwd,
unsigned long long passwdlen,
const unsigned char * const salt,
unsigned long long opslimit,
size_t memlimit)
{
return crypto_pwhash_scryptsalsa208sha256(out, outlen, passwd, passwdlen,
salt, opslimit, memlimit);
}
SODIUM_EXPORT int
crypto_pwhash_scryptxsalsa208sha256_str(char out[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
const char * const passwd,
unsigned long long passwdlen,
unsigned long long opslimit,
size_t memlimit)
{
return crypto_pwhash_scryptsalsa208sha256_str(out, passwd, passwdlen,
opslimit, memlimit);
}
SODIUM_EXPORT int
crypto_pwhash_scryptxsalsa208sha256_str_verify(const char str[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
const char * const passwd,
unsigned long long passwdlen)
{
return crypto_pwhash_scryptsalsa208sha256_str_verify(str,
passwd, passwdlen);
}
#ifdef EXPORT_ORIGINAL_IMPLEMENTATIONS
#undef crypto_hash_sha256_ref
SODIUM_EXPORT int
crypto_hash_sha256_ref(unsigned char *out, const unsigned char *in,
@ -303,8 +349,8 @@ crypto_stream_salsa20_ref_xor(unsigned char *c,
return crypto_stream_salsa20_xor(c, m, mlen, n, k);
}
#endif
#ifdef __cplusplus
}
#endif
#endif