commit 19f08e34a09b2e8840751e202191545bc7a816ee
author Tom Sepez <tsepez@chromium.org> Wed Jul 28 00:55:04 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 28 00:55:04 2021 +0000
tree 971ff7d683fd023ccd3ab4ff436f267fb6281e6a
parent 6099f726c770956729b4da5838a64b7500f553de

Make ADD_ROUND_KEY_4 a function-like macro.

Because it does work rather than just standing for something else, and
I'm tired of looking at it in my list of C-style macros to kill off.

-- remove an unneeded #undef

Change-Id: Ibc254e86a5534b9f0e2630d4323cfc7c9ce34d87
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83530
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

core/fdrm/fx_crypt_aes.cpp

diff --git a/core/fdrm/fx_crypt_aes.cpp b/core/fdrm/fx_crypt_aes.cpp
index 3be9ac4..c5718f9 100644
--- a/core/fdrm/fx_crypt_aes.cpp
+++ b/core/fdrm/fx_crypt_aes.cpp
@@ -431,11 +431,10 @@
     0x3c498b28, 0x0d9541ff, 0xa8017139, 0x0cb3de08, 0xb4e49cd8, 0x56c19064,
     0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0,
 };
-#define ADD_ROUND_KEY_4                                                       \
+#define ADD_ROUND_KEY_4()                                                     \
   (block[0] ^= *keysched++, block[1] ^= *keysched++, block[2] ^= *keysched++, \
    block[3] ^= *keysched++)
 #define MOVEWORD(i) (block[i] = newstate[i])
-#undef MAKEWORD
 #define MAKEWORD(i)                                         \
   (newstate[i] = (E0[(block[i] >> 24) & 0xFF] ^             \
                   E1[(block[(i + C1) % Nb] >> 16) & 0xFF] ^ \
@@ -456,7 +455,7 @@
   unsigned int* keysched = ctx->keysched;
   unsigned int newstate[4];
   for (i = 0; i < ctx->Nr - 1; i++) {
-    ADD_ROUND_KEY_4;
+    ADD_ROUND_KEY_4();
     MAKEWORD(0);
     MAKEWORD(1);
     MAKEWORD(2);
@@ -466,7 +465,7 @@
     MOVEWORD(2);
     MOVEWORD(3);
   }
-  ADD_ROUND_KEY_4;
+  ADD_ROUND_KEY_4();
   LASTWORD(0);
   LASTWORD(1);
   LASTWORD(2);
@@ -475,7 +474,7 @@
   MOVEWORD(1);
   MOVEWORD(2);
   MOVEWORD(3);
-  ADD_ROUND_KEY_4;
+  ADD_ROUND_KEY_4();
 }
 #undef MAKEWORD
 #undef LASTWORD
@@ -500,7 +499,7 @@
   unsigned int* keysched = ctx->invkeysched;
   unsigned int newstate[4];
   for (i = 0; i < ctx->Nr - 1; i++) {
-    ADD_ROUND_KEY_4;
+    ADD_ROUND_KEY_4();
     MAKEWORD(0);
     MAKEWORD(1);
     MAKEWORD(2);
@@ -510,7 +509,7 @@
     MOVEWORD(2);
     MOVEWORD(3);
   }
-  ADD_ROUND_KEY_4;
+  ADD_ROUND_KEY_4();
   LASTWORD(0);
   LASTWORD(1);
   LASTWORD(2);
@@ -519,7 +518,7 @@
   MOVEWORD(1);
   MOVEWORD(2);
   MOVEWORD(3);
-  ADD_ROUND_KEY_4;
+  ADD_ROUND_KEY_4();
 }
 #undef MAKEWORD
 #undef LASTWORD