[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  19f7130beb97170b8e825aee1ae9e309520f5f29 (commit)
      from  542dfaf3088546899301cf3075d6a801709f26e2 (commit)


- Log -----------------------------------------------------------------
commit 19f7130beb97170b8e825aee1ae9e309520f5f29
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Tue Feb 2 09:55:06 2016 +0300

    GH608: Ensure 64-bit shift no matter sizeof(long)
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/scrypt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
     }