Fix bug in OpenSSL code, due to which it cannot be compiled with Borland.

Reported on:
https://github.com/openssl/openssl/commit/98f29466dc1ed7f80b9b8750309a41b5a1150d25#commitcomment-33731077

Source commit: 60c6d908d2d0f8b6df4450f4bfcd3c0120c1d7b9

libs/openssl/crypto/ec/curve448/arch_32/f_impl.h

@@ -14,7 +14,7 @@
 # define HEADER_ARCH_32_F_IMPL_H
 
 # define GF_HEADROOM 2
-# define LIMB(x) ((x##LL) & ((1 << 28) - 1)), ((x##LL) >> 28)
+# define LIMB(x) ((x##ULL) & ((1 << 28) - 1)), ((x##ULL) >> 28)
 # define FIELD_LITERAL(a, b, c, d, e, f, g, h) \
     {{LIMB(a), LIMB(b), LIMB(c), LIMB(d), LIMB(e), LIMB(f), LIMB(g), LIMB(h)}}
 

libs/openssl/crypto/ec/curve448/curve448.c

@@ -27,8 +27,8 @@
 static const curve448_scalar_t precomputed_scalarmul_adjustment = {
     {
         {
-            SC_LIMB(0xc873d6d54a7bb0cfULL), SC_LIMB(0xe933d8d723a70aadULL),
-            SC_LIMB(0xbb124b65129c96fdULL), SC_LIMB(0x00000008335dc163ULL)
+            SC_LIMB(0xc873d6d54a7bb0cf), SC_LIMB(0xe933d8d723a70aad),
+            SC_LIMB(0xbb124b65129c96fd), SC_LIMB(0x00000008335dc163)
         }
     }
 };

libs/openssl/crypto/ec/curve448/f_generic.c

@@ -12,9 +12,9 @@
 #include "field.h"
 
 static const gf MODULUS = {
-    FIELD_LITERAL(0xffffffffffffffULL, 0xffffffffffffffULL, 0xffffffffffffffULL,
-                  0xffffffffffffffULL, 0xfffffffffffffeULL, 0xffffffffffffffULL,
-                  0xffffffffffffffULL, 0xffffffffffffffULL)
+    FIELD_LITERAL(0xffffffffffffff, 0xffffffffffffff, 0xffffffffffffff,
+                  0xffffffffffffff, 0xfffffffffffffe, 0xffffffffffffff,
+                  0xffffffffffffff, 0xffffffffffffff)
 };
 
 /* Serialize to wire format. */

libs/openssl/crypto/ec/curve448/scalar.c

@@ -18,20 +18,20 @@ static const c448_word_t MONTGOMERY_FACTOR = (c448_word_t) 0x3bd440fae918bc5ULL;
 static const curve448_scalar_t sc_p = {
     {
         {
-            SC_LIMB(0x2378c292ab5844f3ULL), SC_LIMB(0x216cc2728dc58f55ULL),
-            SC_LIMB(0xc44edb49aed63690ULL), SC_LIMB(0xffffffff7cca23e9ULL),
-            SC_LIMB(0xffffffffffffffffULL), SC_LIMB(0xffffffffffffffffULL),
-            SC_LIMB(0x3fffffffffffffffULL)
+            SC_LIMB(0x2378c292ab5844f3), SC_LIMB(0x216cc2728dc58f55),
+            SC_LIMB(0xc44edb49aed63690), SC_LIMB(0xffffffff7cca23e9),
+            SC_LIMB(0xffffffffffffffff), SC_LIMB(0xffffffffffffffff),
+            SC_LIMB(0x3fffffffffffffff)
         }
     }
 }, sc_r2 = {
     {
         {
 
-            SC_LIMB(0xe3539257049b9b60ULL), SC_LIMB(0x7af32c4bc1b195d9ULL),
-            SC_LIMB(0x0d66de2388ea1859ULL), SC_LIMB(0xae17cf725ee4d838ULL),
-            SC_LIMB(0x1a9cc14ba3c47c44ULL), SC_LIMB(0x2052bcb7e4d070afULL),
-            SC_LIMB(0x3402a939f823b729ULL)
+            SC_LIMB(0xe3539257049b9b60), SC_LIMB(0x7af32c4bc1b195d9),
+            SC_LIMB(0x0d66de2388ea1859), SC_LIMB(0xae17cf725ee4d838),
+            SC_LIMB(0x1a9cc14ba3c47c44), SC_LIMB(0x2052bcb7e4d070af),
+            SC_LIMB(0x3402a939f823b729)
         }
     }
 };

libs/openssl/crypto/ec/curve448/word.h

@@ -43,7 +43,7 @@ typedef int64_t dsword_t;
 # if C448_WORD_BITS == 64
 #  define SC_LIMB(x) (x)
 # elif C448_WORD_BITS == 32
-#  define SC_LIMB(x) ((uint32_t)(x##LL)),((x##LL) >> 32)
+#  define SC_LIMB(x) ((uint32_t)(x##ULL)),((x##ULL) >> 32)
 # else
 #  error "For now we only support 32- and 64-bit architectures."
 # endif