More -Wshorten-64-to-32 fixes.
I had a rewrite of the decrepit ciphers (CAST and Blowfish) to use
CRYPTO_{load,store}_u32_be and drop the old macros, but this is probably
not worth the effort to review. Instead, just fix the type in the macro.
Bug: 516
Change-Id: I1cdecc16f6108a6235f90cf9c2198bc797c6716e
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/54985
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/decrepit/macros.h b/decrepit/macros.h
index 7888f0d..4e4ea93 100644
--- a/decrepit/macros.h
+++ b/decrepit/macros.h
@@ -61,35 +61,35 @@
// NOTE - c is not incremented as per n2l
-#define n2ln(c, l1, l2, n) \
- { \
- c += n; \
- l1 = l2 = 0; \
- switch (n) { \
- case 8: \
- l2 = ((unsigned long)(*(--(c)))); \
- OPENSSL_FALLTHROUGH; \
- case 7: \
- l2 |= ((unsigned long)(*(--(c)))) << 8; \
- OPENSSL_FALLTHROUGH; \
- case 6: \
- l2 |= ((unsigned long)(*(--(c)))) << 16; \
- OPENSSL_FALLTHROUGH; \
- case 5: \
- l2 |= ((unsigned long)(*(--(c)))) << 24; \
- OPENSSL_FALLTHROUGH; \
- case 4: \
- l1 = ((unsigned long)(*(--(c)))); \
- OPENSSL_FALLTHROUGH; \
- case 3: \
- l1 |= ((unsigned long)(*(--(c)))) << 8; \
- OPENSSL_FALLTHROUGH; \
- case 2: \
- l1 |= ((unsigned long)(*(--(c)))) << 16; \
- OPENSSL_FALLTHROUGH; \
- case 1: \
- l1 |= ((unsigned long)(*(--(c)))) << 24; \
- } \
+#define n2ln(c, l1, l2, n) \
+ { \
+ c += n; \
+ l1 = l2 = 0; \
+ switch (n) { \
+ case 8: \
+ l2 = ((uint32_t)(*(--(c)))); \
+ OPENSSL_FALLTHROUGH; \
+ case 7: \
+ l2 |= ((uint32_t)(*(--(c)))) << 8; \
+ OPENSSL_FALLTHROUGH; \
+ case 6: \
+ l2 |= ((uint32_t)(*(--(c)))) << 16; \
+ OPENSSL_FALLTHROUGH; \
+ case 5: \
+ l2 |= ((uint32_t)(*(--(c)))) << 24; \
+ OPENSSL_FALLTHROUGH; \
+ case 4: \
+ l1 = ((uint32_t)(*(--(c)))); \
+ OPENSSL_FALLTHROUGH; \
+ case 3: \
+ l1 |= ((uint32_t)(*(--(c)))) << 8; \
+ OPENSSL_FALLTHROUGH; \
+ case 2: \
+ l1 |= ((uint32_t)(*(--(c)))) << 16; \
+ OPENSSL_FALLTHROUGH; \
+ case 1: \
+ l1 |= ((uint32_t)(*(--(c)))) << 24; \
+ } \
}
// NOTE - c is not incremented as per l2n
@@ -99,25 +99,25 @@
switch (n) { \
case 8: \
*(--(c)) = (unsigned char)(((l2)) & 0xff); \
- OPENSSL_FALLTHROUGH; \
+ OPENSSL_FALLTHROUGH; \
case 7: \
*(--(c)) = (unsigned char)(((l2) >> 8) & 0xff); \
- OPENSSL_FALLTHROUGH; \
+ OPENSSL_FALLTHROUGH; \
case 6: \
*(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
- OPENSSL_FALLTHROUGH; \
+ OPENSSL_FALLTHROUGH; \
case 5: \
*(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
- OPENSSL_FALLTHROUGH; \
+ OPENSSL_FALLTHROUGH; \
case 4: \
*(--(c)) = (unsigned char)(((l1)) & 0xff); \
- OPENSSL_FALLTHROUGH; \
+ OPENSSL_FALLTHROUGH; \
case 3: \
*(--(c)) = (unsigned char)(((l1) >> 8) & 0xff); \
- OPENSSL_FALLTHROUGH; \
+ OPENSSL_FALLTHROUGH; \
case 2: \
*(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
- OPENSSL_FALLTHROUGH; \
+ OPENSSL_FALLTHROUGH; \
case 1: \
*(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
} \
@@ -129,11 +129,9 @@
*((c)++) = (unsigned char)(((l) >> 8L) & 0xff), \
*((c)++) = (unsigned char)(((l)) & 0xff))
-#define n2l(c, l) \
- (l = ((unsigned long)(*((c)++))) << 24L, \
- l |= ((unsigned long)(*((c)++))) << 16L, \
- l |= ((unsigned long)(*((c)++))) << 8L, \
- l |= ((unsigned long)(*((c)++))))
+#define n2l(c, l) \
+ (l = ((uint32_t)(*((c)++))) << 24L, l |= ((uint32_t)(*((c)++))) << 16L, \
+ l |= ((uint32_t)(*((c)++))) << 8L, l |= ((uint32_t)(*((c)++))))
#endif // OPENSSL_HEADER_DECREPIT_MACROS_H
