[code health] Declare one variable per line in fdrm/
Avoid some unbound variables in macro invocations.
Change-Id: I97a2efed56c95188538761873cebd66bf7d44294
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/80470
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fdrm/fx_crypt.cpp b/core/fdrm/fx_crypt.cpp
index 7cc0bc0..503f2d8 100644
--- a/core/fdrm/fx_crypt.cpp
+++ b/core/fdrm/fx_crypt.cpp
@@ -31,7 +31,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
void md5_process(CRYPT_md5_context* ctx, const uint8_t data[64]) {
- uint32_t A, B, C, D, X[16];
+ uint32_t X[16];
GET_UINT32(X[0], data, 0);
GET_UINT32(X[1], data, 4);
GET_UINT32(X[2], data, 8);
@@ -48,16 +48,16 @@
GET_UINT32(X[13], data, 52);
GET_UINT32(X[14], data, 56);
GET_UINT32(X[15], data, 60);
+ uint32_t A = ctx->state[0];
+ uint32_t B = ctx->state[1];
+ uint32_t C = ctx->state[2];
+ uint32_t D = ctx->state[3];
#define S(x, n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
#define P(a, b, c, d, k, s, t) \
{ \
a += F(b, c, d) + X[k] + t; \
a = S(a, s) + b; \
}
- A = ctx->state[0];
- B = ctx->state[1];
- C = ctx->state[2];
- D = ctx->state[3];
#define F(x, y, z) (z ^ (x & (y ^ z)))
P(A, B, C, D, 0, 7, 0xD76AA478);
P(D, A, B, C, 1, 12, 0xE8C7B756);
diff --git a/core/fdrm/fx_crypt_aes.cpp b/core/fdrm/fx_crypt_aes.cpp
index 302d8d6..600642f 100644
--- a/core/fdrm/fx_crypt_aes.cpp
+++ b/core/fdrm/fx_crypt_aes.cpp
@@ -449,7 +449,10 @@
void aes_encrypt_nb_4(CRYPT_aes_context* ctx, unsigned int* block) {
int i;
- const int C1 = 1, C2 = 2, C3 = 3, Nb = 4;
+ const int C1 = 1;
+ const int C2 = 2;
+ const int C3 = 3;
+ const int Nb = 4;
unsigned int* keysched = ctx->keysched;
unsigned int newstate[4];
for (i = 0; i < ctx->Nr - 1; i++) {
@@ -490,7 +493,10 @@
void aes_decrypt_nb_4(CRYPT_aes_context* ctx, unsigned int* block) {
int i;
- const int C1 = 4 - 1, C2 = 4 - 2, C3 = 4 - 3, Nb = 4;
+ const int C1 = 4 - 1;
+ const int C2 = 4 - 2;
+ const int C3 = 4 - 3;
+ const int Nb = 4;
unsigned int* keysched = ctx->invkeysched;
unsigned int newstate[4];
for (i = 0; i < ctx->Nr - 1; i++) {
@@ -530,22 +536,20 @@
} else {
unsigned int temp = ctx->keysched[i - 1];
if (i % Nk == 0) {
- int a, b, c, d;
- a = (temp >> 16) & 0xFF;
- b = (temp >> 8) & 0xFF;
- c = (temp >> 0) & 0xFF;
- d = (temp >> 24) & 0xFF;
+ int a = (temp >> 16) & 0xFF;
+ int b = (temp >> 8) & 0xFF;
+ int c = (temp >> 0) & 0xFF;
+ int d = (temp >> 24) & 0xFF;
temp = Sbox[a] ^ rconst;
temp = (temp << 8) | Sbox[b];
temp = (temp << 8) | Sbox[c];
temp = (temp << 8) | Sbox[d];
rconst = mulby2(rconst);
} else if (i % Nk == 4 && Nk > 6) {
- int a, b, c, d;
- a = (temp >> 24) & 0xFF;
- b = (temp >> 16) & 0xFF;
- c = (temp >> 8) & 0xFF;
- d = (temp >> 0) & 0xFF;
+ int a = (temp >> 24) & 0xFF;
+ int b = (temp >> 16) & 0xFF;
+ int c = (temp >> 8) & 0xFF;
+ int d = (temp >> 0) & 0xFF;
temp = Sbox[a];
temp = (temp << 8) | Sbox[b];
temp = (temp << 8) | Sbox[c];
@@ -559,11 +563,10 @@
unsigned int temp;
temp = ctx->keysched[(ctx->Nr - i) * ctx->Nb + j];
if (i != 0 && i != ctx->Nr) {
- int a, b, c, d;
- a = (temp >> 24) & 0xFF;
- b = (temp >> 16) & 0xFF;
- c = (temp >> 8) & 0xFF;
- d = (temp >> 0) & 0xFF;
+ int a = (temp >> 24) & 0xFF;
+ int b = (temp >> 16) & 0xFF;
+ int c = (temp >> 8) & 0xFF;
+ int d = (temp >> 0) & 0xFF;
temp = D0[Sbox[a]];
temp ^= D1[Sbox[b]];
temp ^= D2[Sbox[c]];
@@ -582,7 +585,9 @@
const unsigned char* src,
int len,
CRYPT_aes_context* ctx) {
- unsigned int iv[4], x[4], ct[4];
+ unsigned int iv[4];
+ unsigned int x[4];
+ unsigned int ct[4];
int i;
DCHECK_EQ((len & 15), 0);
memcpy(iv, ctx->iv, sizeof(iv));
diff --git a/core/fdrm/fx_crypt_sha.cpp b/core/fdrm/fx_crypt_sha.cpp
index 0371685..f5fea2c 100644
--- a/core/fdrm/fx_crypt_sha.cpp
+++ b/core/fdrm/fx_crypt_sha.cpp
@@ -48,12 +48,12 @@
(SHA384_ROTR(x, 28) ^ SHA384_ROTR(x, 34) ^ SHA384_ROTR(x, 39))
#define SHA384_S3(x) \
(SHA384_ROTR(x, 14) ^ SHA384_ROTR(x, 18) ^ SHA384_ROTR(x, 41))
-#define SHA384_P(a, b, c, d, e, f, g, h, x, K) \
- { \
- temp1 = h + SHA384_S3(e) + SHA384_F1(e, f, g) + K + x; \
- temp2 = SHA384_S2(a) + SHA384_F0(a, b, c); \
- d += temp1; \
- h = temp1 + temp2; \
+#define SHA384_P(a, b, c, d, e, f, g, h, x, K) \
+ { \
+ uint64_t temp1 = h + SHA384_S3(e) + SHA384_F1(e, f, g) + K + x; \
+ uint64_t temp2 = SHA384_S2(a) + SHA384_F0(a, b, c); \
+ d += temp1; \
+ h = temp1 + temp2; \
}
#define SHA384_R(t) \
(W[t] = SHA384_S1(W[t - 2]) + W[t - 7] + SHA384_S0(W[t - 15]) + W[t - 16])
@@ -68,12 +68,12 @@
#define F0(x, y, z) ((x & y) | (z & (x | y)))
#define F1(x, y, z) (z ^ (x & (y ^ z)))
#define R(t) (W[t] = S1(W[t - 2]) + W[t - 7] + S0(W[t - 15]) + W[t - 16])
-#define PS(a, b, c, d, e, f, g, h, x, K) \
- { \
- temp1 = h + S3(e) + F1(e, f, g) + K + x; \
- temp2 = S2(a) + F0(a, b, c); \
- d += temp1; \
- h = temp1 + temp2; \
+#define PS(a, b, c, d, e, f, g, h, x, K) \
+ { \
+ uint32_t temp1 = h + S3(e) + F1(e, f, g) + K + x; \
+ uint32_t temp2 = S2(a) + F0(a, b, c); \
+ d += temp1; \
+ h = temp1 + temp2; \
}
namespace {
@@ -88,7 +88,6 @@
void SHATransform(unsigned int* digest, unsigned int* block) {
unsigned int w[80];
- unsigned int a, b, c, d, e;
int t;
for (t = 0; t < 16; t++) {
w[t] = block[t];
@@ -97,11 +96,11 @@
unsigned int tmp = w[t - 3] ^ w[t - 8] ^ w[t - 14] ^ w[t - 16];
w[t] = rol(tmp, 1);
}
- a = digest[0];
- b = digest[1];
- c = digest[2];
- d = digest[3];
- e = digest[4];
+ unsigned int a = digest[0];
+ unsigned int b = digest[1];
+ unsigned int c = digest[2];
+ unsigned int d = digest[3];
+ unsigned int e = digest[4];
for (t = 0; t < 20; t++) {
unsigned int tmp = rol(a, 5) + ((b & c) | (d & ~b)) + e + w[t] + 0x5a827999;
e = d;
@@ -161,8 +160,6 @@
SHA_GET_UINT32(W[14], data, 56);
SHA_GET_UINT32(W[15], data, 60);
- uint32_t temp1;
- uint32_t temp2;
uint32_t A = ctx->state[0];
uint32_t B = ctx->state[1];
uint32_t C = ctx->state[2];
@@ -290,8 +287,6 @@
};
void sha384_process(CRYPT_sha2_context* ctx, const uint8_t data[128]) {
- uint64_t temp1, temp2;
- uint64_t A, B, C, D, E, F, G, H;
uint64_t W[80];
SHA_GET_UINT64(W[0], data, 0);
SHA_GET_UINT64(W[1], data, 8);
@@ -309,14 +304,14 @@
SHA_GET_UINT64(W[13], data, 104);
SHA_GET_UINT64(W[14], data, 112);
SHA_GET_UINT64(W[15], data, 120);
- A = ctx->state[0];
- B = ctx->state[1];
- C = ctx->state[2];
- D = ctx->state[3];
- E = ctx->state[4];
- F = ctx->state[5];
- G = ctx->state[6];
- H = ctx->state[7];
+ uint64_t A = ctx->state[0];
+ uint64_t B = ctx->state[1];
+ uint64_t C = ctx->state[2];
+ uint64_t D = ctx->state[3];
+ uint64_t E = ctx->state[4];
+ uint64_t F = ctx->state[5];
+ uint64_t G = ctx->state[6];
+ uint64_t H = ctx->state[7];
for (int i = 0; i < 10; ++i) {
uint64_t temp[8];
if (i < 2) {
