From: Bruno Haible Date: Sat, 9 Mar 2019 21:21:25 +0000 (+0100) Subject: crypto/des: Fix undefined behaviour. X-Git-Tag: v1.0~5048 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b64bf15ed34a2bdb095d2b5e84e3e3e8bb71e91e;p=gnulib.git crypto/des: Fix undefined behaviour. * lib/des.c (READ_64BIT_DATA): Cast bytes to 'unsigned int', to avoid shift operations on 'int'. --- diff --git a/ChangeLog b/ChangeLog index 62ab7565b8..0a2d13e01d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-03-09 Bruno Haible + + 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 Fix undefined behaviour. diff --git a/lib/des.c b/lib/des.c index f3571920a3..ba174f7f4c 100644 --- 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;