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

Side by Side Diff: net/ssl/ssl_config.h

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/ssl/client_cert_store.h ('k') | net/test/embedded_test_server/embedded_test_server.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_SSL_CONFIG_H_ 5 #ifndef NET_SSL_SSL_CONFIG_H_
6 #define NET_SSL_SSL_CONFIG_H_ 6 #define NET_SSL_SSL_CONFIG_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "net/base/net_export.h" 10 #include "net/base/net_export.h"
11 #include "net/cert/x509_certificate.h" 11 #include "net/cert/x509_certificate.h"
12 #include "net/socket/next_proto.h"
12 13
13 namespace net { 14 namespace net {
14 15
15 // Various TLS/SSL ProtocolVersion values encoded as uint16 16 // Various TLS/SSL ProtocolVersion values encoded as uint16
16 // struct { 17 // struct {
17 // uint8 major; 18 // uint8 major;
18 // uint8 minor; 19 // uint8 minor;
19 // } ProtocolVersion; 20 // } ProtocolVersion;
20 // The most significant byte is |major|, and the least significant byte 21 // The most significant byte is |major|, and the least significant byte
21 // is |minor|. 22 // is |minor|.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // revocation checking is disabled. 149 // revocation checking is disabled.
149 // NOTE: Only used by NSS. 150 // NOTE: Only used by NSS.
150 bool cert_io_enabled; 151 bool cert_io_enabled;
151 152
152 // The list of application level protocols supported. If set, this will 153 // The list of application level protocols supported. If set, this will
153 // enable Next Protocol Negotiation (if supported). The order of the 154 // enable Next Protocol Negotiation (if supported). The order of the
154 // protocols doesn't matter expect for one case: if the server supports Next 155 // protocols doesn't matter expect for one case: if the server supports Next
155 // Protocol Negotiation, but there is no overlap between the server's and 156 // Protocol Negotiation, but there is no overlap between the server's and
156 // client's protocol sets, then the first protocol in this list will be 157 // client's protocol sets, then the first protocol in this list will be
157 // requested by the client. 158 // requested by the client.
158 std::vector<std::string> next_protos; 159 NextProtoVector next_protos;
159 160
160 scoped_refptr<X509Certificate> client_cert; 161 scoped_refptr<X509Certificate> client_cert;
161 }; 162 };
162 163
163 } // namespace net 164 } // namespace net
164 165
165 #endif // NET_SSL_SSL_CONFIG_H_ 166 #endif // NET_SSL_SSL_CONFIG_H_
OLDNEW
« no previous file with comments | « net/ssl/client_cert_store.h ('k') | net/test/embedded_test_server/embedded_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698