diff options
author | Kenny Root <kroot@google.com> | 2015-11-05 20:20:27 +0000 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2015-11-05 20:20:27 +0000 |
commit | 03bcf618b7ed811b305845461fbb5497dfe55ac3 (patch) | |
tree | 24150183cfed2ad79eb2258cf525b4fc4544bd2d /src/ssl/tls_record.c | |
parent | fdeb488e6332a17729db5a04236e48a46a019272 (diff) | |
download | external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.zip external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.gz external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.bz2 |
Revert "external/boringssl: sync with upstream."
This reverts commit fdeb488e6332a17729db5a04236e48a46a019272.
This breaks trusty since it doesn't have setjmp.h
Change-Id: I960e25aa0bb2eef1237743b1567f7cb7f6d40497
Diffstat (limited to 'src/ssl/tls_record.c')
-rw-r--r-- | src/ssl/tls_record.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/ssl/tls_record.c b/src/ssl/tls_record.c index bdc5c01..36e31b4 100644 --- a/src/ssl/tls_record.c +++ b/src/ssl/tls_record.c @@ -114,7 +114,6 @@ #include <openssl/err.h> #include "internal.h" -#include "../crypto/internal.h" /* kMaxEmptyRecords is the number of consecutive, empty records that will be @@ -123,16 +122,6 @@ * forever. */ static const uint8_t kMaxEmptyRecords = 32; -static struct CRYPTO_STATIC_MUTEX g_big_buffer_lock = CRYPTO_STATIC_MUTEX_INIT; -static uint64_t g_big_buffer_use_count = 0; - -uint64_t OPENSSL_get_big_buffer_use_count(void) { - CRYPTO_STATIC_MUTEX_lock_read(&g_big_buffer_lock); - uint64_t ret = g_big_buffer_use_count; - CRYPTO_STATIC_MUTEX_unlock(&g_big_buffer_lock); - return ret; -} - size_t ssl_record_prefix_len(const SSL *ssl) { if (SSL_IS_DTLS(ssl)) { return DTLS1_RT_HEADER_LENGTH + @@ -241,14 +230,6 @@ enum ssl_open_record_t tls_open_record( return ssl_open_record_error; } - if (extra > 0 && - (ciphertext_len > SSL3_RT_MAX_ENCRYPTED_LENGTH || - plaintext_len > SSL3_RT_MAX_PLAIN_LENGTH)) { - CRYPTO_STATIC_MUTEX_lock_write(&g_big_buffer_lock); - g_big_buffer_use_count++; - CRYPTO_STATIC_MUTEX_unlock(&g_big_buffer_lock); - } - /* Limit the number of consecutive empty records. */ if (plaintext_len == 0) { ssl->s3->empty_record_count++; |