Roll BoringSSL.

This pulls in the following changes and fixes boringssl_unittests to account
for CRLF. With this, boringssl_unittests builds and passes on Win32.

c7dd5f3 ERR_GET_* macros return int.
180d1eb Remove SSL_get_shared_ciphers.
176b70e Silence warnings about unused values.
b99106a Fix bio_test on Windows.
66a3531 Fix BIO_printf on Windows.
fb3ff2c Don't compare signed vs. unsigned.
5e77bd4 Use OPENSSL_64_BIT in rc4.c.
04284b8 Account for Windows and UNIX socket API differences.
357fd0a Remove meth_num in ex_data_impl.c.
775b75f Fix Windows shared library build.
de211db Don't use ssize_t in base64_test.c.
ef5c494 Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
5b33a5e Merge the get_ssl_method hooks between TLS and SSLv3.
a9ca90a Fix ServerHello EC point format extension check.
42e9a77 Split tls1_check_ec_key.
00075b8 Merge IMPLEMENT_tls_meth_func and IMPLEMENT_ssl3_meth_func.
968ddc9 Not everyone keeps bash in /bin.
5491e3f Clean up ssl_cipher_list_to_bytes a little.
6a3ecf3 _POSIX_C_SOURCE needs to be set to a date, at least on FreeBSD.
eba2384 Missing includes for FreeBSD.
ddb3003 Don't include strings.h because of Windows.
dab64ff Use OPENSSL_strcasecmp.
5d0c163 Also clean the last byte of the PSK identity.
704453f Add deprecated functions for tcpdump.
e7fa75b Remove use of GOTPCREL in asm.

BUG=338884

Review URL: https://codereview.chromium.org/618363002

Cr-Commit-Position: refs/heads/master@{#297710}

1 files changed, 3 insertions, 3 deletions

diff --git a/net/ssl/openssl_ssl_util.cc b/net/ssl/openssl_ssl_util.cc
index ffa265e..9fb83a4 100644
--- a/net/ssl/openssl_ssl_util.cc
+++ b/net/ssl/openssl_ssl_util.cc
@@ -43,16 +43,16 @@ class OpenSSLNetErrorLibSingleton {
     net_error_lib_ = ERR_get_next_error_library();
   }
 
-  unsigned net_error_lib() const { return net_error_lib_; }
+  int net_error_lib() const { return net_error_lib_; }
 
  private:
-  unsigned net_error_lib_;
+  int net_error_lib_;
 };
 
 base::LazyInstance<OpenSSLNetErrorLibSingleton>::Leaky g_openssl_net_error_lib =
     LAZY_INSTANCE_INITIALIZER;
 
-unsigned OpenSSLNetErrorLib() {
+int OpenSSLNetErrorLib() {
   return g_openssl_net_error_lib.Get().net_error_lib();
 }