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

Unified Diff: net/socket/ssl_server_socket_impl.h

Issue 2400033005: Use BoringSSL scopers in //net. (Closed)
Patch Set: eroman comments Created 4 years, 2 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
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/ssl_server_socket_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_server_socket_impl.h
diff --git a/net/socket/ssl_server_socket_impl.h b/net/socket/ssl_server_socket_impl.h
index 94fd6b594f7ad3a7f7eb92489e23437ab75084d9..5437e4e5a5e5aede4490940954573e58b4cac222 100644
--- a/net/socket/ssl_server_socket_impl.h
+++ b/net/socket/ssl_server_socket_impl.h
@@ -5,6 +5,7 @@
#ifndef NET_SOCKET_SSL_SERVER_SOCKET_IMPL_H_
#define NET_SOCKET_SSL_SERVER_SOCKET_IMPL_H_
+#include <openssl/base.h>
#include <stdint.h>
#include <memory>
@@ -13,16 +14,8 @@
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/socket/ssl_server_socket.h"
-#include "net/ssl/scoped_openssl_types.h"
#include "net/ssl/ssl_server_config.h"
-// Avoid including misc OpenSSL headers, i.e.:
-// <openssl/bio.h>
-typedef struct bio_st BIO;
-// <openssl/ssl.h>
-typedef struct ssl_st SSL;
-typedef struct x509_store_ctx_st X509_STORE_CTX;
-
namespace net {
class SSLInfo;
@@ -38,7 +31,7 @@ class SSLServerContextImpl : public SSLServerContext {
std::unique_ptr<StreamSocket> socket) override;
private:
- ScopedSSL_CTX ssl_ctx_;
+ bssl::UniquePtr<SSL_CTX> ssl_ctx_;
// Options for the SSL socket.
SSLServerConfig ssl_server_config_;
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/ssl_server_socket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698