summaryrefslogtreecommitdiffstats
path: root/third_party/boringssl
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-04-02 22:39:16 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-03 05:40:05 +0000
commit8f7efab800fc6987499c5365fce22349e3a4ef50 (patch)
tree078ef6ee4c0525fb62537d49a122f2d1ab2f9e9d /third_party/boringssl
parentd7180836244cfbc01e551ee9f482df798503a142 (diff)
downloadchromium_src-8f7efab800fc6987499c5365fce22349e3a4ef50.zip
chromium_src-8f7efab800fc6987499c5365fce22349e3a4ef50.tar.gz
chromium_src-8f7efab800fc6987499c5365fce22349e3a4ef50.tar.bz2
Require ECDHE for False Start.
This adds just enough of an implementation of ECDHE_RSA to tlslite to support it on the server side. It also rolls BoringSSL e2e1326..4d78718 to pick up the corresponding BoringSSL change. Summary of changes available at: https://boringssl.googlesource.com/boringssl/+log/e2e1326..4d78718 BUG=460271 Review URL: https://codereview.chromium.org/1057733002 Cr-Commit-Position: refs/heads/master@{#323645}
Diffstat (limited to 'third_party/boringssl')
-rw-r--r--third_party/boringssl/boringssl.gypi2
-rw-r--r--third_party/boringssl/boringssl_tests.gypi34
-rw-r--r--third_party/boringssl/boringssl_unittest.cc8
-rw-r--r--third_party/boringssl/update_gypi_and_asm.py6
4 files changed, 36 insertions, 14 deletions
diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi
index d2fc5d4..01a4230 100644
--- a/third_party/boringssl/boringssl.gypi
+++ b/third_party/boringssl/boringssl.gypi
@@ -182,6 +182,8 @@
'src/crypto/sha/sha512.c',
'src/crypto/stack/stack.c',
'src/crypto/thread.c',
+ 'src/crypto/thread_pthread.c',
+ 'src/crypto/thread_win.c',
'src/crypto/time_support.c',
'src/crypto/x509/a_digest.c',
'src/crypto/x509/a_sign.c',
diff --git a/third_party/boringssl/boringssl_tests.gypi b/third_party/boringssl/boringssl_tests.gypi
index 0373742..e1b606a 100644
--- a/third_party/boringssl/boringssl_tests.gypi
+++ b/third_party/boringssl/boringssl_tests.gypi
@@ -13,7 +13,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/base64/base64_test.c',
+ 'src/crypto/base64/base64_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -26,7 +26,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/bio/bio_test.c',
+ 'src/crypto/bio/bio_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -39,7 +39,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/bn/bn_test.c',
+ 'src/crypto/bn/bn_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -52,7 +52,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/bytestring/bytestring_test.c',
+ 'src/crypto/bytestring/bytestring_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -117,7 +117,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/digest/digest_test.c',
+ 'src/crypto/digest/digest_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -182,7 +182,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/err/err_test.c',
+ 'src/crypto/err/err_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -195,7 +195,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/evp/evp_test.c',
+ 'src/crypto/evp/evp_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -208,7 +208,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/evp/pbkdf_test.c',
+ 'src/crypto/evp/pbkdf_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -234,7 +234,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/crypto/hmac/hmac_test.c',
+ 'src/crypto/hmac/hmac_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -293,6 +293,19 @@
'msvs_disabled_warnings': [ 4267, ],
},
{
+ 'target_name': 'boringssl_thread_test',
+ 'type': 'executable',
+ 'dependencies': [
+ 'boringssl.gyp:boringssl',
+ ],
+ 'sources': [
+ 'src/crypto/thread_test.c',
+ ],
+ # TODO(davidben): Fix size_t truncations in BoringSSL.
+ # https://crbug.com/429039
+ 'msvs_disabled_warnings': [ 4267, ],
+ },
+ {
'target_name': 'boringssl_pkcs7_test',
'type': 'executable',
'dependencies': [
@@ -325,7 +338,7 @@
'boringssl.gyp:boringssl',
],
'sources': [
- 'src/ssl/ssl_test.c',
+ 'src/ssl/ssl_test.cc',
],
# TODO(davidben): Fix size_t truncations in BoringSSL.
# https://crbug.com/429039
@@ -359,6 +372,7 @@
'boringssl_pqueue_test',
'boringssl_rsa_test',
'boringssl_ssl_test',
+ 'boringssl_thread_test',
],
}
}
diff --git a/third_party/boringssl/boringssl_unittest.cc b/third_party/boringssl/boringssl_unittest.cc
index d568e33..52bac99 100644
--- a/third_party/boringssl/boringssl_unittest.cc
+++ b/third_party/boringssl/boringssl_unittest.cc
@@ -237,9 +237,13 @@ TEST(BoringSSL, PQueue) {
}
TEST(BoringSSL, HKDF) {
- TestSimple("hkdf_test");
+ TestSimple("hkdf_test");
}
TEST(BoringSSL, PBKDF) {
- TestSimple("pbkdf_test");
+ TestSimple("pbkdf_test");
+}
+
+TEST(BoringSSL, Thread) {
+ TestSimple("thread_test");
}
diff --git a/third_party/boringssl/update_gypi_and_asm.py b/third_party/boringssl/update_gypi_and_asm.py
index 4112c4d..3c6b524 100644
--- a/third_party/boringssl/update_gypi_and_asm.py
+++ b/third_party/boringssl/update_gypi_and_asm.py
@@ -77,9 +77,11 @@ def FindCFiles(directory, filter_func):
for (path, dirnames, filenames) in os.walk(directory):
for filename in filenames:
- if filename.endswith('.c') and filter_func(filename, False):
- cfiles.append(os.path.join(path, filename))
+ if not filename.endswith('.c') and not filename.endswith('.cc'):
continue
+ if not filter_func(filename, False):
+ continue
+ cfiles.append(os.path.join(path, filename))
for (i, dirname) in enumerate(dirnames):
if not filter_func(dirname, True):