| 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/x509.h> | 10 #include <openssl/x509.h> |
| 11 | 11 |
| 12 #include "net/base/net_export.h" |
| 12 #include "net/cert/x509_certificate.h" | 13 #include "net/cert/x509_certificate.h" |
| 13 #include "net/log/net_log_parameters_callback.h" | 14 #include "net/log/net_log_parameters_callback.h" |
| 14 | 15 |
| 15 namespace crypto { | 16 namespace crypto { |
| 16 class OpenSSLErrStackTracer; | 17 class OpenSSLErrStackTracer; |
| 17 } | 18 } |
| 18 | 19 |
| 19 namespace tracked_objects { | 20 namespace tracked_objects { |
| 20 class Location; | 21 class Location; |
| 21 } | 22 } |
| (...skipping 13 matching lines...) Expand all Loading... |
| 35 long set_mask; | 36 long set_mask; |
| 36 long clear_mask; | 37 long clear_mask; |
| 37 }; | 38 }; |
| 38 | 39 |
| 39 // Converts an OpenSSL error code into a net error code, walking the OpenSSL | 40 // Converts an OpenSSL error code into a net error code, walking the OpenSSL |
| 40 // error stack if needed. | 41 // error stack if needed. |
| 41 // | 42 // |
| 42 // Note that |tracer| is not currently used in the implementation, but is passed | 43 // Note that |tracer| is not currently used in the implementation, but is passed |
| 43 // in anyway as this ensures the caller will clear any residual codes left on | 44 // in anyway as this ensures the caller will clear any residual codes left on |
| 44 // the error stack. | 45 // the error stack. |
| 45 int MapOpenSSLError(int err, const crypto::OpenSSLErrStackTracer& tracer); | 46 NET_EXPORT_PRIVATE int MapOpenSSLError( |
| 47 int err, |
| 48 const crypto::OpenSSLErrStackTracer& tracer); |
| 46 | 49 |
| 47 // Helper struct to store information about an OpenSSL error stack entry. | 50 // Helper struct to store information about an OpenSSL error stack entry. |
| 48 struct OpenSSLErrorInfo { | 51 struct OpenSSLErrorInfo { |
| 49 OpenSSLErrorInfo() : error_code(0), file(NULL), line(0) {} | 52 OpenSSLErrorInfo() : error_code(0), file(NULL), line(0) {} |
| 50 | 53 |
| 51 uint32_t error_code; | 54 uint32_t error_code; |
| 52 const char* file; | 55 const char* file; |
| 53 int line; | 56 int line; |
| 54 }; | 57 }; |
| 55 | 58 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 78 | 81 |
| 79 bssl::UniquePtr<X509> OSCertHandleToOpenSSL( | 82 bssl::UniquePtr<X509> OSCertHandleToOpenSSL( |
| 80 X509Certificate::OSCertHandle os_handle); | 83 X509Certificate::OSCertHandle os_handle); |
| 81 | 84 |
| 82 bssl::UniquePtr<STACK_OF(X509)> OSCertHandlesToOpenSSL( | 85 bssl::UniquePtr<STACK_OF(X509)> OSCertHandlesToOpenSSL( |
| 83 const X509Certificate::OSCertHandles& os_handles); | 86 const X509Certificate::OSCertHandles& os_handles); |
| 84 | 87 |
| 85 } // namespace net | 88 } // namespace net |
| 86 | 89 |
| 87 #endif // NET_SSL_OPENSSL_SSL_UTIL_H_ | 90 #endif // NET_SSL_OPENSSL_SSL_UTIL_H_ |
| OLD | NEW |