diff options
author | David Benjamin <davidben@google.com> | 2016-04-22 15:02:23 -0400 |
---|---|---|
committer | David Benjamin <davidben@google.com> | 2016-04-29 16:36:16 -0400 |
commit | 4969cc9b0ab2905ec478277f50ed3849b37a6c6b (patch) | |
tree | 552fde383dce1efd213ae145fff808806d76a225 /android_compat_hacks.c | |
parent | 09f2501f7faf115dc26e0c2310b3ea8c97f66007 (diff) | |
download | boringssl-4969cc9b0ab2905ec478277f50ed3849b37a6c6b.tar.gz |
external/boringssl: Sync to d18cb77.
This includes the following changes which are far too many to list here:
https://boringssl.googlesource.com/boringssl/+log/7b8b9c17db93ea5287575b437c77fb36eeb81b31..d18cb77864dcc4b5c7cb08c2331008c01165f34f
This also retires one function from android_compat_hacks.c which is no longer
necessary.
Change-Id: Ie00536d7ad815464b2b031f7bcd1b683e12c1623
Diffstat (limited to 'android_compat_hacks.c')
-rw-r--r-- | android_compat_hacks.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/android_compat_hacks.c b/android_compat_hacks.c index cf4863de..a3f032ec 100644 --- a/android_compat_hacks.c +++ b/android_compat_hacks.c @@ -18,40 +18,10 @@ * The declarations for these functions are in the main BoringSSL headers but * the only definitions are here, in Android land. */ -#include <openssl/base.h> - -#include <assert.h> - -#include <openssl/bn.h> -#include <openssl/cipher.h> -#include <openssl/err.h> #include <openssl/ssl.h> +#include <stdlib.h> -BIGNUM *get_rfc3526_prime_1536(BIGNUM *bn) { - assert(bn == NULL); - - static const uint8_t data[] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2, - 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1, - 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6, - 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD, - 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D, - 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45, - 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9, - 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED, - 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11, - 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D, - 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, 0x98, 0xDA, 0x48, 0x36, - 0x1C, 0x55, 0xD3, 0x9A, 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F, - 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96, 0x1C, 0x62, 0xF3, 0x56, - 0x20, 0x85, 0x52, 0xBB, 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D, - 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, 0xF1, 0x74, 0x6C, 0x08, - 0xCA, 0x23, 0x73, 0x27, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - }; - - return BN_bin2bn(data, sizeof(data), NULL); -} int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len) { return 0; |