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

Just use escrypt_kdf_nosse if SSE2 is not available.

Browse Source
This commit is contained in:
Frank Denis 2014-05-08 20:18:32 -07:00
parent 2dc7038b58
commit 4ebbd0d992
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsodium/crypto_pwhash/scryptxsalsa208sha256/crypto_scrypt-common.c
View File

@ -153,8 +153,12 @@ escrypt_r(escrypt_local_t * local, const uint8_t * passwd, size_t passwdlen,
if (need > buflen || need < saltlen) { if (need > buflen || need < saltlen) {
return NULL; return NULL;
} }
#ifdef HAVE_EMMINTRIN_H
escrypt_kdf = escrypt_kdf =
sodium_runtime_has_sse2() ? escrypt_kdf_sse : escrypt_kdf_nosse; sodium_runtime_has_sse2() ? escrypt_kdf_sse : escrypt_kdf_nosse;
#else
escrypt_kdf = escrypt_kdf_nosse;
#endif
if (escrypt_kdf(local, passwd, passwdlen, salt, saltlen, if (escrypt_kdf(local, passwd, passwdlen, salt, saltlen,
N, r, p, hash, sizeof(hash))) { N, r, p, hash, sizeof(hash))) {
return NULL; return NULL;
@ -230,9 +234,12 @@ crypto_scrypt_compat(const uint8_t * passwd, size_t passwdlen,
if (escrypt_init_local(&local)) { if (escrypt_init_local(&local)) {
return -1; return -1;
} }
#ifdef HAVE_EMMINTRIN_H
escrypt_kdf = escrypt_kdf =
sodium_runtime_has_sse2() ? escrypt_kdf_sse : escrypt_kdf_nosse; sodium_runtime_has_sse2() ? escrypt_kdf_sse : escrypt_kdf_nosse;
#else
escrypt_kdf = escrypt_kdf_nosse;
#endif
retval = escrypt_kdf(&local, retval = escrypt_kdf(&local,
passwd, passwdlen, salt, saltlen, passwd, passwdlen, salt, saltlen,
N, r, p, buf, buflen); N, r, p, buf, buflen);