commit 96e1a25943ba98e644d71d23dd30815704da77a7
author David Benjamin <davidben@google.com> Wed Aug 10 13:38:51 2016 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Aug 10 19:28:15 2016 +0000
tree 09487d10e8a3c7285b6336e2f9ea7dbb44738a33
parent fbe3a7bb61b440a8599a794682c1075974c44284

Add BN_get_rfc3526_prime_1536.

In OpenSSL 1.1.0, this API has been renamed to gain a BN prefix. Now
that it's no longer squatting on a namespace, provide the function so
wpa_supplicant needn't carry a BoringSSL #ifdef here.

BUG=91

Change-Id: Iac8e90238c816caae6acf0e359893c14a7a970f1
Reviewed-on: https://boringssl-review.googlesource.com/10223
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/dh/params.c

diff --git a/crypto/dh/params.c b/crypto/dh/params.c
index 7e8102a..b9c44ee 100644
--- a/crypto/dh/params.c
+++ b/crypto/dh/params.c
@@ -247,7 +247,7 @@
   STATIC_BIGNUM(dh1024_safe_prime_4)
 };
 
-static BIGNUM bn_two = STATIC_BIGNUM(bn_two_data);
+static const BIGNUM bn_two = STATIC_BIGNUM(bn_two_data);
 
 static DH *get_standard_parameters(const struct standard_parameters *params,
                                    const ENGINE *engine) {
@@ -279,6 +279,41 @@
   return get_standard_parameters(&dh2048_256, engine);
 }
 
+BIGNUM *BN_get_rfc3526_prime_1536(BIGNUM *ret) {
+  static const BN_ULONG kPrime1536Data[] = {
+      TOBN(0xffffffff, 0xffffffff), TOBN(0xf1746c08, 0xca237327),
+      TOBN(0x670c354e, 0x4abc9804), TOBN(0x9ed52907, 0x7096966d),
+      TOBN(0x1c62f356, 0x208552bb), TOBN(0x83655d23, 0xdca3ad96),
+      TOBN(0x69163fa8, 0xfd24cf5f), TOBN(0x98da4836, 0x1c55d39a),
+      TOBN(0xc2007cb8, 0xa163bf05), TOBN(0x49286651, 0xece45b3d),
+      TOBN(0xae9f2411, 0x7c4b1fe6), TOBN(0xee386bfb, 0x5a899fa5),
+      TOBN(0x0bff5cb6, 0xf406b7ed), TOBN(0xf44c42e9, 0xa637ed6b),
+      TOBN(0xe485b576, 0x625e7ec6), TOBN(0x4fe1356d, 0x6d51c245),
+      TOBN(0x302b0a6d, 0xf25f1437), TOBN(0xef9519b3, 0xcd3a431b),
+      TOBN(0x514a0879, 0x8e3404dd), TOBN(0x020bbea6, 0x3b139b22),
+      TOBN(0x29024e08, 0x8a67cc74), TOBN(0xc4c6628b, 0x80dc1cd1),
+      TOBN(0xc90fdaa2, 0x2168c234), TOBN(0xffffffff, 0xffffffff),
+  };
+
+  static const BIGNUM kPrime1536BN = STATIC_BIGNUM(kPrime1536Data);
+
+  BIGNUM *alloc = NULL;
+  if (ret == NULL) {
+    alloc = BN_new();
+    if (alloc == NULL) {
+      return NULL;
+    }
+    ret = alloc;
+  }
+
+  if (!BN_copy(ret, &kPrime1536BN)) {
+    BN_free(alloc);
+    return NULL;
+  }
+
+  return ret;
+}
+
 void DH_check_standard_parameters(DH *dh) {
   unsigned i;