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

Unified Diff: net/ssl/openssl_ssl_util.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/ssl/openssl_client_key_store_unittest.cc ('k') | net/ssl/openssl_ssl_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/openssl_ssl_util.h
diff --git a/net/ssl/openssl_ssl_util.h b/net/ssl/openssl_ssl_util.h
index 9082fdf3bbf94e9b81c069f68249c48a9c929fdb..06fd40901ade396ceee7ddf61de01b557d321c8a 100644
--- a/net/ssl/openssl_ssl_util.h
+++ b/net/ssl/openssl_ssl_util.h
@@ -7,11 +7,10 @@
#include <stdint.h>
-#include <openssl/ssl.h>
+#include <openssl/x509.h>
#include "net/cert/x509_certificate.h"
#include "net/log/net_log_parameters_callback.h"
-#include "net/ssl/scoped_openssl_types.h"
namespace crypto {
class OpenSSLErrStackTracer;
@@ -77,9 +76,10 @@ NetLogParametersCallback CreateNetLogOpenSSLErrorCallback(
// this SSL connection.
int GetNetSSLVersion(SSL* ssl);
-ScopedX509 OSCertHandleToOpenSSL(X509Certificate::OSCertHandle os_handle);
+bssl::UniquePtr<X509> OSCertHandleToOpenSSL(
+ X509Certificate::OSCertHandle os_handle);
-ScopedX509Stack OSCertHandlesToOpenSSL(
+bssl::UniquePtr<STACK_OF(X509)> OSCertHandlesToOpenSSL(
const X509Certificate::OSCertHandles& os_handles);
} // namespace net
« no previous file with comments | « net/ssl/openssl_client_key_store_unittest.cc ('k') | net/ssl/openssl_ssl_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698