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>

diff --git a/crypto/evp/scrypt.c b/crypto/evp/scrypt.c
index 158816c9d9251d83697b7c1e630eb9cfccebf35a..25b360e210ebbb38e7d07e9d98dcdaae19da82ab 100644 (file)
--- 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;
     }