From: Dmitry-Me <wipedout@yandex.ru>
Date: Tue, 2 Feb 2016 06:55:06 +0000 (+0300)
Subject: GH608: Ensure 64-bit shift no matter sizeof(long)
X-Git-Tag: OpenSSL_1_1_0-pre3~323
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19f7130beb97170b8e825aee1ae9e309520f5f29;p=oweals%2Fopenssl.git

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 158816c9d9..25b360e210 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;
     }