com php-src: ext/sodium: Fix sodium_pad() with blocks ize >= 256: ext/sodium/libsodium.c

From: Date: Sun, 14 Oct 2018 08:37:37 +0000
Subject: com php-src: ext/sodium: Fix sodium_pad() with blocks ize >= 256: ext/sodium/libsodium.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-103457@lists.php.net to get a copy of this message
Commit: bf48d0c475c0c1312fbf763d221d94e87cf480d0 Author: Frank Denis <github@pureftpd.org> Sun, 14 Oct 2018 10:37:37 +0200 Parents: 15ba7df2245ac177a965346e7ec96a4ab3300839 Branches: PHP-7.2 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf48d0c475c0c1312fbf763d221d94e87cf480d0 Log: ext/sodium: Fix sodium_pad() with blocksize >= 256 Backport from PECL libsodium-php 2.0.12 Changed paths: M ext/sodium/libsodium.c Diff: diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index a5f892f..5462700 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -3424,7 +3424,8 @@ PHP_FUNCTION(sodium_pad) tail = &ZSTR_VAL(padded)[xpadded_len]; mask = 0U; for (i = 0; i < blocksize; i++) { - barrier_mask = (unsigned char) (((i ^ xpadlen) - 1U) >> 8); + barrier_mask = (unsigned char) + (((i ^ xpadlen) - 1U) >> ((sizeof(size_t) - 1U) * CHAR_BIT)); tail[-i] = (tail[-i] & mask) | (0x80 & barrier_mask); mask |= barrier_mask; }

« previous php.cvs (#103457) next »