aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2015-10-17 21:28:25 +0200
committerAndy Polyakov <appro@openssl.org>2015-11-21 14:21:04 +0100
commit3003e0a4220f66690778b3ef7247ad5b56b4a375 (patch)
tree5ea7c0a64c76af2b3e7cd2bf73cf75e648420391 /crypto
parentc880b3e3141ba5229d4ddf8390c4b9e09cd832f8 (diff)
downloadopenssl-3003e0a4220f66690778b3ef7247ad5b56b4a375.tar.gz
Fix (minor) problems found by ubsan
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/evp/scrypt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/scrypt.c b/crypto/evp/scrypt.c
index 26b4e596ba..e609594a91 100644
--- a/crypto/evp/scrypt.c
+++ b/crypto/evp/scrypt.c
@@ -139,7 +139,7 @@ static void scryptROMix(unsigned char *B, uint64_t r, uint64_t N,
*pV = *pB++;
*pV |= *pB++ << 8;
*pV |= *pB++ << 16;
- *pV |= *pB++ << 24;
+ *pV |= (uint32_t)*pB++ << 24;
}
for (i = 1; i < N; i++, pV += 32 * r)