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

Unified Diff: net/socket/ssl_client_socket_mac.h

Issue 174102: Enable SSLClientSocketTest unit tests on Mac OS X by implementing our own cer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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
Index: net/socket/ssl_client_socket_mac.h
===================================================================
--- net/socket/ssl_client_socket_mac.h (revision 24466)
+++ net/socket/ssl_client_socket_mac.h (working copy)
@@ -11,12 +11,15 @@
#include <vector>
#include "base/scoped_ptr.h"
+#include "net/base/cert_verify_result.h"
#include "net/base/completion_callback.h"
#include "net/base/ssl_config_service.h"
#include "net/socket/ssl_client_socket.h"
namespace net {
+class CertVerifier;
+
// An SSL client socket implemented with Secure Transport.
class SSLClientSocketMac : public SSLClientSocket {
public:
@@ -51,6 +54,8 @@
int DoPayloadRead();
int DoPayloadWrite();
int DoHandshake();
+ int DoVerifyCert();
+ int DoVerifyCertComplete(int result);
int DoReadComplete(int result);
void OnWriteComplete(int result);
@@ -79,14 +84,17 @@
STATE_PAYLOAD_READ,
STATE_PAYLOAD_WRITE,
STATE_HANDSHAKE,
+ STATE_VERIFY_CERT,
+ STATE_VERIFY_CERT_COMPLETE,
STATE_READ_COMPLETE,
};
State next_state_;
State next_io_state_;
- // Set when handshake finishes.
scoped_refptr<X509Certificate> server_cert_;
- int server_cert_status_;
+ std::vector<scoped_refptr<X509Certificate> > intermediate_certs_;
+ scoped_ptr<CertVerifier> verifier_;
+ CertVerifyResult server_cert_verify_result_;
bool completed_handshake_;
SSLContextRef ssl_context_;

Powered by Google App Engine
This is Rietveld 408576698