comparison lib/des.c @ 40215:88b18d82fa61

crypto/des: Fix undefined behaviour. * lib/des.c (READ_64BIT_DATA): Cast bytes to 'unsigned int', to avoid shift operations on 'int'.
author Bruno Haible <bruno@clisp.org>
date Sat, 09 Mar 2019 22:21:25 +0100
parents b06060465f09
children
comparison
equal deleted inserted replaced
40214:452ab00796c7 40215:88b18d82fa61
405 405
406 /* 406 /*
407 * Macros to convert 8 bytes from/to 32bit words. 407 * Macros to convert 8 bytes from/to 32bit words.
408 */ 408 */
409 #define READ_64BIT_DATA(data, left, right) \ 409 #define READ_64BIT_DATA(data, left, right) \
410 left = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]; \ 410 left = ((uint32_t) data[0] << 24) \
411 right = (data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7]; 411 | ((uint32_t) data[1] << 16) \
412 | ((uint32_t) data[2] << 8) \
413 | (uint32_t) data[3]; \
414 right = ((uint32_t) data[4] << 24) \
415 | ((uint32_t) data[5] << 16) \
416 | ((uint32_t) data[6] << 8) \
417 | (uint32_t) data[7];
412 418
413 #define WRITE_64BIT_DATA(data, left, right) \ 419 #define WRITE_64BIT_DATA(data, left, right) \
414 data[0] = (left >> 24) &0xff; data[1] = (left >> 16) &0xff; \ 420 data[0] = (left >> 24) &0xff; data[1] = (left >> 16) &0xff; \
415 data[2] = (left >> 8) &0xff; data[3] = left &0xff; \ 421 data[2] = (left >> 8) &0xff; data[3] = left &0xff; \
416 data[4] = (right >> 24) &0xff; data[5] = (right >> 16) &0xff; \ 422 data[4] = (right >> 24) &0xff; data[5] = (right >> 16) &0xff; \
417 data[6] = (right >> 8) &0xff; data[7] = right &0xff; 423 data[6] = (right >> 8) &0xff; data[7] = right &0xff;
418 424
419 /* 425 /*