diff options
| author | Dmitry-Me <wipedout@yandex.ru> | 2016-02-02 09:55:06 +0300 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-02 11:22:32 -0500 |
| commit | 19f7130beb97170b8e825aee1ae9e309520f5f29 (patch) | |
| tree | 603441e8b7c599c1b5c9df61b902eb20e63ab00a /crypto/evp | |
| parent | 542dfaf3088546899301cf3075d6a801709f26e2 (diff) | |
| download | openssl-19f7130beb97170b8e825aee1ae9e309520f5f29.zip openssl-19f7130beb97170b8e825aee1ae9e309520f5f29.tar.gz openssl-19f7130beb97170b8e825aee1ae9e309520f5f29.tar.bz2 | |
GH608: Ensure 64-bit shift no matter sizeof(long)
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/scrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/scrypt.c b/crypto/evp/scrypt.c index 158816c..25b360e 100644 --- a/crypto/evp/scrypt.c +++ b/crypto/evp/scrypt.c @@ -228,7 +228,7 @@ int EVP_PBE_scrypt(const char *pass, size_t passlen, */ if (16 * r <= LOG2_UINT64_MAX) { - if (N >= (1UL << (16 * r))) + if (N >= (((uint64_t)1) << (16 * r))) return 0; } |