| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef NET_SSL_OPENSSL_SSL_UTIL_H_ | 5 #ifndef NET_SSL_OPENSSL_SSL_UTIL_H_ |
| 6 #define NET_SSL_OPENSSL_SSL_UTIL_H_ | 6 #define NET_SSL_OPENSSL_SSL_UTIL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <openssl/ssl.h> | 10 #include <openssl/x509.h> |
| 11 | 11 |
| 12 #include "net/cert/x509_certificate.h" | 12 #include "net/cert/x509_certificate.h" |
| 13 #include "net/log/net_log_parameters_callback.h" | 13 #include "net/log/net_log_parameters_callback.h" |
| 14 #include "net/ssl/scoped_openssl_types.h" | |
| 15 | 14 |
| 16 namespace crypto { | 15 namespace crypto { |
| 17 class OpenSSLErrStackTracer; | 16 class OpenSSLErrStackTracer; |
| 18 } | 17 } |
| 19 | 18 |
| 20 namespace tracked_objects { | 19 namespace tracked_objects { |
| 21 class Location; | 20 class Location; |
| 22 } | 21 } |
| 23 | 22 |
| 24 namespace net { | 23 namespace net { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 // Creates NetLog callback for an OpenSSL error. | 69 // Creates NetLog callback for an OpenSSL error. |
| 71 NetLogParametersCallback CreateNetLogOpenSSLErrorCallback( | 70 NetLogParametersCallback CreateNetLogOpenSSLErrorCallback( |
| 72 int net_error, | 71 int net_error, |
| 73 int ssl_error, | 72 int ssl_error, |
| 74 const OpenSSLErrorInfo& error_info); | 73 const OpenSSLErrorInfo& error_info); |
| 75 | 74 |
| 76 // Returns the net SSL version number (see ssl_connection_status_flags.h) for | 75 // Returns the net SSL version number (see ssl_connection_status_flags.h) for |
| 77 // this SSL connection. | 76 // this SSL connection. |
| 78 int GetNetSSLVersion(SSL* ssl); | 77 int GetNetSSLVersion(SSL* ssl); |
| 79 | 78 |
| 80 ScopedX509 OSCertHandleToOpenSSL(X509Certificate::OSCertHandle os_handle); | 79 bssl::UniquePtr<X509> OSCertHandleToOpenSSL( |
| 80 X509Certificate::OSCertHandle os_handle); |
| 81 | 81 |
| 82 ScopedX509Stack OSCertHandlesToOpenSSL( | 82 bssl::UniquePtr<STACK_OF(X509)> OSCertHandlesToOpenSSL( |
| 83 const X509Certificate::OSCertHandles& os_handles); | 83 const X509Certificate::OSCertHandles& os_handles); |
| 84 | 84 |
| 85 } // namespace net | 85 } // namespace net |
| 86 | 86 |
| 87 #endif // NET_SSL_OPENSSL_SSL_UTIL_H_ | 87 #endif // NET_SSL_OPENSSL_SSL_UTIL_H_ |
| OLD | NEW |