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

Side by Side Diff: net/socket/ssl_client_socket_openssl.h

Issue 11571059: Add net/android/keystore.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: address marcus' nits. Created 7 years, 10 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 unified diff | Download patch
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "net/base/cert_verify_result.h" 12 #include "net/base/cert_verify_result.h"
13 #include "net/base/completion_callback.h" 13 #include "net/base/completion_callback.h"
14 #include "net/base/io_buffer.h" 14 #include "net/base/io_buffer.h"
15 #include "net/base/ssl_config_service.h" 15 #include "net/base/ssl_config_service.h"
16 #include "net/socket/ssl_client_socket.h" 16 #include "net/socket/ssl_client_socket.h"
17 #include "net/socket/client_socket_handle.h" 17 #include "net/socket/client_socket_handle.h"
18 18
19 // Avoid including misc OpenSSL headers, i.e.:
20 // <openssl/bio.h>
19 typedef struct bio_st BIO; 21 typedef struct bio_st BIO;
22 // <openssl/evp.h>
20 typedef struct evp_pkey_st EVP_PKEY; 23 typedef struct evp_pkey_st EVP_PKEY;
24 // <openssl/ssl.h>
21 typedef struct ssl_st SSL; 25 typedef struct ssl_st SSL;
26 // <openssl/x509.h>
22 typedef struct x509_st X509; 27 typedef struct x509_st X509;
23 28
24 namespace net { 29 namespace net {
25 30
26 class CertVerifier; 31 class CertVerifier;
27 class SingleRequestCertVerifier; 32 class SingleRequestCertVerifier;
28 class SSLCertRequestInfo; 33 class SSLCertRequestInfo;
29 class SSLInfo; 34 class SSLInfo;
30 35
31 // An SSL client socket implemented with OpenSSL. 36 // An SSL client socket implemented with OpenSSL.
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 State next_handshake_state_; 184 State next_handshake_state_;
180 NextProtoStatus npn_status_; 185 NextProtoStatus npn_status_;
181 std::string npn_proto_; 186 std::string npn_proto_;
182 std::string server_protos_; 187 std::string server_protos_;
183 BoundNetLog net_log_; 188 BoundNetLog net_log_;
184 }; 189 };
185 190
186 } // namespace net 191 } // namespace net
187 192
188 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 193 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698