Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Unified Diff: trunk/src/net/socket/openssl_ssl_util.cc

Issue 405503002: Revert 283813 "Switch to BoringSSL." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/net/socket/openssl_ssl_util.cc
===================================================================
--- trunk/src/net/socket/openssl_ssl_util.cc (revision 283844)
+++ trunk/src/net/socket/openssl_ssl_util.cc (working copy)
@@ -4,8 +4,6 @@
#include "net/socket/openssl_ssl_util.h"
-#include <errno.h>
-
#include <openssl/err.h>
#include <openssl/ssl.h>
@@ -41,16 +39,16 @@
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();
}
@@ -164,7 +162,7 @@
NOTREACHED();
err = ERR_INVALID_ARGUMENT;
}
- ERR_put_error(OpenSSLNetErrorLib(), 0, err,
+ ERR_PUT_error(OpenSSLNetErrorLib(), 0, err,
location.file_name(), location.line_number());
}
« no previous file with comments | « trunk/src/net/quic/crypto/aead_base_encrypter_openssl.cc ('k') | trunk/src/net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698