From 4cd66139cef61e9a7390db304e99ee80f01bf555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 19 Apr 2021 11:49:27 +0200
Subject: [PATCH] core: update_crypto: Ensure we don't overflow while shifting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 984407ba32a0f3d4ed5dd69510b943003bb3bd63)
Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
---
 src/misc/update_crypto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/misc/update_crypto.c b/src/misc/update_crypto.c
index d4e65fa2a6a8..09479468c003 100644
--- a/src/misc/update_crypto.c
+++ b/src/misc/update_crypto.c
@@ -63,7 +63,7 @@ static inline uint32_t scalar_number( const uint8_t *p, int header_len )
     else if( header_len == 2 )
         return( (p[0] << 8) + p[1] );
     else if( header_len == 4 )
-        return( (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3] );
+        return( ((uint32_t)p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3] );
     else
         abort();
 }
-- 
GitLab