Modernize crypt-des.c a bit, avoiding dubious casts. The header comment for this file says it assumes that "the CPU is not picky about alignment", which we wouldn't really accept for Postgres. The two functions that have alignment requirements have been hacked in ways that are inconsistent and yet both ugly. des_setkey just casts its "const char *" argument to "const uint32 *", relying on the caller to ensure that that pointer is actually word-aligned, which the caller does by declaring the buffer as uint32[] and then casting to "char *". Meanwhile des_cipher carefully memcpy's to and from an internal uint32[] buffer, which is pretty silly given that what it's passed must be word-aligned for the benefit of des_setkey. And on top of that we have a bunch of ugly casting and oddly-written pointer arithmetic in the caller px_crypt_des. The odd pointer arithmetic causes warnings about possible buffer overrun when using recent gcc at -O3 or higher.
Let's clean this up by converting the buffer variable into a union of a uint8 array and a uint32 array, so that we can remove all these casts, and also replace the strange loop logic with a simple subscript variable to satisfy gcc. Reported-by: Andres Freund <[email protected]> Author: Tom Lane <[email protected]> Co-authored-by: Ayush Tiwari <[email protected]> Discussion: https://postgr.es/m/[email protected] Discussion: https://postgr.es/m/3nuudxv365kjnmwjhnygdakhxuktpdjvf26rt26eb44esgqdrj@y2x3vomkrfoo Backpatch-through: 14 Branch ------ REL_14_STABLE Details ------- https://git.postgresql.org/pg/commitdiff/2a972dd5fb13489e057b0237bd5f7c8f6ef35b86 Modified Files -------------- contrib/pgcrypto/crypt-des.c | 53 ++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
