commit aadf1ee77f6d612f3b24df61e36cb2e1606361d8
author Brian Smith <brian@briansmith.org> Fri Feb 05 11:25:51 2016 -1000
committer David Benjamin <davidben@google.com> Mon Feb 08 18:28:31 2016 +0000
tree a9a67bb75c7c52196fba7decc485d5b08b6ee253
parent 8c5ea1338a0f0b575f02532b0cec35f8415e1ba5

Minimize the scope of the |BN_*_SIZE_*| constants.

mul.c is the only file that uses these values.

Change-Id: I50a685cbff0f26357229e742f42e014434e9cebe
Reviewed-on: https://boringssl-review.googlesource.com/7061
Reviewed-by: David Benjamin <davidben@google.com>

crypto/bn/internal.h

diff --git a/crypto/bn/internal.h b/crypto/bn/internal.h
index 7ee94fc..cb57bb4 100644
--- a/crypto/bn/internal.h
+++ b/crypto/bn/internal.h
@@ -181,12 +181,6 @@
 #endif
 
 
-/* Pentium pro 16,16,16,32,64 */
-/* Alpha       16,16,16,16.64 */
-#define BN_MULL_SIZE_NORMAL (16)              /* 32 */
-#define BN_MUL_RECURSIVE_SIZE_NORMAL (16)     /* 32 less than */
-#define BN_SQR_RECURSIVE_SIZE_NORMAL (16)     /* 32 */
-
 #define STATIC_BIGNUM(x)                                \
   {                                                     \
     (BN_ULONG *)x, sizeof(x) / sizeof(BN_ULONG),        \

crypto/bn/mul.c

diff --git a/crypto/bn/mul.c b/crypto/bn/mul.c
index 84dc24c..d2d8fd8 100644
--- a/crypto/bn/mul.c
+++ b/crypto/bn/mul.c
@@ -62,6 +62,10 @@
 #include "internal.h"
 
 
+#define BN_MUL_RECURSIVE_SIZE_NORMAL 16
+#define BN_SQR_RECURSIVE_SIZE_NORMAL BN_MUL_RECURSIVE_SIZE_NORMAL
+
+
 void bn_mul_normal(BN_ULONG *r, BN_ULONG *a, int na, BN_ULONG *b, int nb) {
   BN_ULONG *rr;
 
@@ -593,7 +597,8 @@
     }
   }
 
-  if ((al >= BN_MULL_SIZE_NORMAL) && (bl >= BN_MULL_SIZE_NORMAL)) {
+  static const int kMulNormalSize = 16;
+  if (al >= kMulNormalSize && bl >= kMulNormalSize) {
     if (i >= -1 && i <= 1) {
       /* Find out the power of two lower or equal
          to the longest of the two numbers */