]> Savannah Git Hosting - gnulib.git/commitdiff
crypto/des: Fix undefined behaviour.
authorBruno Haible <bruno@clisp.org>
Sat, 9 Mar 2019 21:21:25 +0000 (22:21 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 9 Mar 2019 21:21:25 +0000 (22:21 +0100)
* lib/des.c (READ_64BIT_DATA): Cast bytes to 'unsigned int', to avoid
shift operations on 'int'.

ChangeLog
lib/des.c

index 62ab7565b83487862e094f9da552b0655df04502..0a2d13e01d364a0523f4b30b0c9d12c359c63e06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-09  Bruno Haible  <bruno@clisp.org>
+
+       crypto/des: Fix undefined behaviour.
+       * lib/des.c (READ_64BIT_DATA): Cast bytes to 'unsigned int', to avoid
+       shift operations on 'int'.
+
 2019-03-09  Bruno Haible  <bruno@clisp.org>
 
        Fix undefined behaviour.
index f3571920a37ef63c60bbd8ca58569a6cb425b1e5..ba174f7f4ccbf9a0055d0e9da2261f69c081c1ea 100644 (file)
--- a/lib/des.c
+++ b/lib/des.c
@@ -407,11 +407,17 @@ gl_des_is_weak_key (const char * key)
  * Macros to convert 8 bytes from/to 32bit words.
  */
 #define READ_64BIT_DATA(data, left, right)                                 \
-    left  = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];  \
-    right = (data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7];
+    left  = ((uint32_t) data[0] << 24)                                     \
+            | ((uint32_t) data[1] << 16)                                   \
+            | ((uint32_t) data[2] << 8)                                    \
+            | (uint32_t) data[3];                                          \
+    right = ((uint32_t) data[4] << 24)                                     \
+            | ((uint32_t) data[5] << 16)                                   \
+            | ((uint32_t) data[6] << 8)                                    \
+            | (uint32_t) data[7];
 
 #define WRITE_64BIT_DATA(data, left, right)                                \
-    data[0] = (left >> 24) &0xff; data[1] = (left >> 16) &0xff;    \
+    data[0] = (left >> 24) &0xff; data[1] = (left >> 16) &0xff;            \
     data[2] = (left >> 8) &0xff; data[3] = left &0xff;                     \
     data[4] = (right >> 24) &0xff; data[5] = (right >> 16) &0xff;          \
     data[6] = (right >> 8) &0xff; data[7] = right &0xff;