Roll src/third_party/boringssl/src/ to 209b2562235f7dab66b8260624e7b3c5b00d14a6.

net/ssl/openssl_ssl_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/openssl_ssl_util.h"
 
 #include <errno.h>
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ skipping 161 matching lines @@
 }  // namespace
 
 void OpenSSLPutNetError(const tracked_objects::Location& location, int err) {
   // Net error codes are negative. Encode them as positive numbers.
   err = -err;
   if (err < 0 || err > 0xfff) {
     // OpenSSL reserves 12 bits for the reason code.
     NOTREACHED();
     err = ERR_INVALID_ARGUMENT;
   }
-  ERR_put_error(OpenSSLNetErrorLib(), 0, err,
+  ERR_put_error(OpenSSLNetErrorLib(), err, location.function_name(),

[achuithb, 2015/07/21 21:15:00]

../../net/ssl/openssl_ssl_util.cc: In function 'void
net::OpenSSLPutNetError(const tracked_objects::Location&, int)':
../../net/ssl/openssl_ssl_util.cc:182:67: error: invalid conversion from 'const
char*' to 'int' [-fpermissive]
   ERR_put_error(OpenSSLNetErrorLib(), err, location.function_name(),
                                                                   ^
In file included from ../../net/ssl/openssl_ssl_util.cc:9:0:
../../third_party/boringssl/src/include/openssl/err.h:313:21: note: initializing
argument 3 of 'void ERR_put_error(int, int, int, const char*, unsigned int)'
 OPENSSL_EXPORT void ERR_put_error(int library, int func, int reason,

                 location.file_name(), location.line_number());
 }
 
 int MapOpenSSLError(int err, const crypto::OpenSSLErrStackTracer& tracer) {
   OpenSSLErrorInfo error_info;
   return MapOpenSSLErrorWithDetails(err, tracer, &error_info);
 }
 
 int MapOpenSSLErrorWithDetails(int err,
                                const crypto::OpenSSLErrStackTracer& tracer,
@@ skipping 40 matching lines @@
 
 NetLog::ParametersCallback CreateNetLogOpenSSLErrorCallback(
     int net_error,
     int ssl_error,
     const OpenSSLErrorInfo& error_info) {
   return base::Bind(&NetLogOpenSSLErrorCallback,
                     net_error, ssl_error, error_info);
 }
 
 }  // namespace net