1 files changed, 77 insertions, 58 deletions

diff --git a/freebsd/crypto/openssl/crypto/srp/srp_grps.h b/freebsd/crypto/openssl/crypto/bn/bn_srp.c
index f76652cb..706e9fb0 100644
--- a/freebsd/crypto/openssl/crypto/srp/srp_grps.h
+++ b/freebsd/crypto/openssl/crypto/bn/bn_srp.c
@@ -1,6 +1,37 @@
-/* start of generated data */
+#include <machine/rtems-bsd-user-space.h>
 
-static BN_ULONG bn_group_1024_value[] = {
+/*
+ * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "bn_lcl.h"
+#include "internal/nelem.h"
+
+#ifndef OPENSSL_NO_SRP
+
+#include <openssl/srp.h>
+#include "internal/bn_srp.h"
+
+# if (BN_BYTES == 8)
+#  if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#   define bn_pack4(a1,a2,a3,a4) ((a1##UI64<<48)|(a2##UI64<<32)|(a3##UI64<<16)|a4##UI64)
+#  elif defined(__arch64__)
+#   define bn_pack4(a1,a2,a3,a4) ((a1##UL<<48)|(a2##UL<<32)|(a3##UL<<16)|a4##UL)
+#  else
+#   define bn_pack4(a1,a2,a3,a4) ((a1##ULL<<48)|(a2##ULL<<32)|(a3##ULL<<16)|a4##ULL)
+#  endif
+# elif (BN_BYTES == 4)
+#  define bn_pack4(a1,a2,a3,a4)  ((a3##UL<<16)|a4##UL), ((a1##UL<<16)|a2##UL)
+# else
+#  error "unsupported BN_BYTES"
+# endif
+
+static const BN_ULONG bn_group_1024_value[] = {
     bn_pack4(0x9FC6, 0x1D2F, 0xC0EB, 0x06E3),
     bn_pack4(0xFD51, 0x38FE, 0x8376, 0x435B),
     bn_pack4(0x2FD4, 0xCBF4, 0x976E, 0xAA9A),
@@ -19,15 +50,15 @@ static BN_ULONG bn_group_1024_value[] = {
     bn_pack4(0xEEAF, 0x0AB9, 0xADB3, 0x8DD6)
 };
 
-static BIGNUM bn_group_1024 = {
-    bn_group_1024_value,
-    (sizeof(bn_group_1024_value)) / sizeof(BN_ULONG),
-    (sizeof(bn_group_1024_value)) / sizeof(BN_ULONG),
+const BIGNUM bn_group_1024 = {
+    (BN_ULONG *)bn_group_1024_value,
+    OSSL_NELEM(bn_group_1024_value),
+    OSSL_NELEM(bn_group_1024_value),
     0,
     BN_FLG_STATIC_DATA
 };
 
-static BN_ULONG bn_group_1536_value[] = {
+static const BN_ULONG bn_group_1536_value[] = {
     bn_pack4(0xCF76, 0xE3FE, 0xD135, 0xF9BB),
     bn_pack4(0x1518, 0x0F93, 0x499A, 0x234D),
     bn_pack4(0x8CE7, 0xA28C, 0x2442, 0xC6F3),
@@ -54,15 +85,15 @@ static BN_ULONG bn_group_1536_value[] = {
     bn_pack4(0x9DEF, 0x3CAF, 0xB939, 0x277A)
 };
 
-static BIGNUM bn_group_1536 = {
-    bn_group_1536_value,
-    (sizeof(bn_group_1536_value)) / sizeof(BN_ULONG),
-    (sizeof(bn_group_1536_value)) / sizeof(BN_ULONG),
+const BIGNUM bn_group_1536 = {
+    (BN_ULONG *)bn_group_1536_value,
+    OSSL_NELEM(bn_group_1536_value),
+    OSSL_NELEM(bn_group_1536_value),
     0,
     BN_FLG_STATIC_DATA
 };
 
-static BN_ULONG bn_group_2048_value[] = {
+static const BN_ULONG bn_group_2048_value[] = {
     bn_pack4(0x0FA7, 0x111F, 0x9E4A, 0xFF73),
     bn_pack4(0x9B65, 0xE372, 0xFCD6, 0x8EF2),
     bn_pack4(0x35DE, 0x236D, 0x525F, 0x5475),
@@ -97,15 +128,15 @@ static BN_ULONG bn_group_2048_value[] = {
     bn_pack4(0xAC6B, 0xDB41, 0x324A, 0x9A9B)
 };
 
-static BIGNUM bn_group_2048 = {
-    bn_group_2048_value,
-    (sizeof(bn_group_2048_value)) / sizeof(BN_ULONG),
-    (sizeof(bn_group_2048_value)) / sizeof(BN_ULONG),
+const BIGNUM bn_group_2048 = {
+    (BN_ULONG *)bn_group_2048_value,
+    OSSL_NELEM(bn_group_2048_value),
+    OSSL_NELEM(bn_group_2048_value),
     0,
     BN_FLG_STATIC_DATA
 };
 
-static BN_ULONG bn_group_3072_value[] = {
+static const BN_ULONG bn_group_3072_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF),
     bn_pack4(0x4B82, 0xD120, 0xA93A, 0xD2CA),
     bn_pack4(0x43DB, 0x5BFC, 0xE0FD, 0x108E),
@@ -156,15 +187,15 @@ static BN_ULONG bn_group_3072_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF)
 };
 
-static BIGNUM bn_group_3072 = {
-    bn_group_3072_value,
-    (sizeof(bn_group_3072_value)) / sizeof(BN_ULONG),
-    (sizeof(bn_group_3072_value)) / sizeof(BN_ULONG),
+const BIGNUM bn_group_3072 = {
+    (BN_ULONG *)bn_group_3072_value,
+    OSSL_NELEM(bn_group_3072_value),
+    OSSL_NELEM(bn_group_3072_value),
     0,
     BN_FLG_STATIC_DATA
 };
 
-static BN_ULONG bn_group_4096_value[] = {
+static const BN_ULONG bn_group_4096_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF),
     bn_pack4(0x4DF4, 0x35C9, 0x3406, 0x3199),
     bn_pack4(0x86FF, 0xB7DC, 0x90A6, 0xC08F),
@@ -231,15 +262,15 @@ static BN_ULONG bn_group_4096_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF)
 };
 
-static BIGNUM bn_group_4096 = {
-    bn_group_4096_value,
-    (sizeof(bn_group_4096_value)) / sizeof(BN_ULONG),
-    (sizeof(bn_group_4096_value)) / sizeof(BN_ULONG),
+const BIGNUM bn_group_4096 = {
+    (BN_ULONG *)bn_group_4096_value,
+    OSSL_NELEM(bn_group_4096_value),
+    OSSL_NELEM(bn_group_4096_value),
     0,
     BN_FLG_STATIC_DATA
 };
 
-static BN_ULONG bn_group_6144_value[] = {
+static const BN_ULONG bn_group_6144_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF),
     bn_pack4(0xE694, 0xF91E, 0x6DCC, 0x4024),
     bn_pack4(0x12BF, 0x2D5B, 0x0B74, 0x74D6),
@@ -338,15 +369,15 @@ static BN_ULONG bn_group_6144_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF)
 };
 
-static BIGNUM bn_group_6144 = {
-    bn_group_6144_value,
-    (sizeof(bn_group_6144_value)) / sizeof(BN_ULONG),
-    (sizeof(bn_group_6144_value)) / sizeof(BN_ULONG),
+const BIGNUM bn_group_6144 = {
+    (BN_ULONG *)bn_group_6144_value,
+    OSSL_NELEM(bn_group_6144_value),
+    OSSL_NELEM(bn_group_6144_value),
     0,
     BN_FLG_STATIC_DATA
 };
 
-static BN_ULONG bn_group_8192_value[] = {
+static const BN_ULONG bn_group_8192_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF),
     bn_pack4(0x60C9, 0x80DD, 0x98ED, 0xD3DF),
     bn_pack4(0xC81F, 0x56E8, 0x80B9, 0x6E71),
@@ -477,52 +508,40 @@ static BN_ULONG bn_group_8192_value[] = {
     bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF)
 };
 
-static BIGNUM bn_group_8192 = {
-    bn_group_8192_value,
-    (sizeof(bn_group_8192_value)) / sizeof(BN_ULONG),
-    (sizeof(bn_group_8192_value)) / sizeof(BN_ULONG),
+const BIGNUM bn_group_8192 = {
+    (BN_ULONG *)bn_group_8192_value,
+    OSSL_NELEM(bn_group_8192_value),
+    OSSL_NELEM(bn_group_8192_value),
     0,
     BN_FLG_STATIC_DATA
 };
 
-static BN_ULONG bn_generator_19_value[] = { 19 };
+static const BN_ULONG bn_generator_19_value[] = { 19 };
 
-static BIGNUM bn_generator_19 = {
-    bn_generator_19_value,
+const BIGNUM bn_generator_19 = {
+    (BN_ULONG *)bn_generator_19_value,
     1,
     1,
     0,
     BN_FLG_STATIC_DATA
 };
-static BN_ULONG bn_generator_5_value[] = { 5 };
+static const BN_ULONG bn_generator_5_value[] = { 5 };
 
-static BIGNUM bn_generator_5 = {
-    bn_generator_5_value,
+const BIGNUM bn_generator_5 = {
+    (BN_ULONG *)bn_generator_5_value,
     1,
     1,
     0,
     BN_FLG_STATIC_DATA
 };
-static BN_ULONG bn_generator_2_value[] = { 2 };
+static const BN_ULONG bn_generator_2_value[] = { 2 };
 
-static BIGNUM bn_generator_2 = {
-    bn_generator_2_value,
+const BIGNUM bn_generator_2 = {
+    (BN_ULONG *)bn_generator_2_value,
     1,
     1,
     0,
     BN_FLG_STATIC_DATA
 };
 
-static SRP_gN knowngN[] = {
-    {"8192", &bn_generator_19, &bn_group_8192},
-    {"6144", &bn_generator_5, &bn_group_6144},
-    {"4096", &bn_generator_5, &bn_group_4096},
-    {"3072", &bn_generator_5, &bn_group_3072},
-    {"2048", &bn_generator_2, &bn_group_2048},
-    {"1536", &bn_generator_2, &bn_group_1536},
-    {"1024", &bn_generator_2, &bn_group_1024},
-};
-
-#define KNOWN_GN_NUMBER sizeof(knowngN) / sizeof(SRP_gN)
-
-/* end of generated data */
+#endif