Revert 283813 "Switch to BoringSSL."

trunk/src/net/socket/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/socket/openssl_ssl_util.h"
 
-#include <errno.h>
-
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "crypto/openssl_util.h"
 #include "net/base/net_errors.h"
 
 namespace net {
@@ skipping 15 matching lines @@
  public:
   OpenSSLNetErrorLibSingleton() {
     crypto::EnsureOpenSSLInit();
 
     // Allocate a new error library value for inserting net errors into
     // OpenSSL. This does not register any ERR_STRING_DATA for the errors, so
     // stringifying error codes through OpenSSL will return NULL.
     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();
 }
 
 int MapOpenSSLErrorSSL(unsigned long error_code) {
   DCHECK_EQ(ERR_LIB_SSL, ERR_GET_LIB(error_code));
 
   DVLOG(1) << "OpenSSL SSL error, reason: " << ERR_GET_REASON(error_code)
            << ", name: " << ERR_error_string(error_code, NULL);
   switch (ERR_GET_REASON(error_code)) {
     case SSL_R_READ_TIMEOUT_EXPIRED:
@@ skipping 93 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(), 0, err,
                 location.file_name(), location.line_number());
 }
 
 int MapOpenSSLError(int err, const crypto::OpenSSLErrStackTracer& tracer) {
   switch (err) {
     case SSL_ERROR_WANT_READ:
     case SSL_ERROR_WANT_WRITE:
       return ERR_IO_PENDING;
     case SSL_ERROR_SYSCALL:
       LOG(ERROR) << "OpenSSL SYSCALL error, earliest error code in "
@@ skipping 15 matching lines @@
       } while (error_code != 0);
       return ERR_SSL_PROTOCOL_ERROR;
     default:
       // TODO(joth): Implement full mapping.
       LOG(WARNING) << "Unknown OpenSSL error " << err;
       return ERR_SSL_PROTOCOL_ERROR;
   }
 }
 
 }  // namespace net