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

Side by Side Diff: net/base/ssl_info.h

Issue 7995014: Revert 102322 - For the SSL cert status, convert anonymous enum that gives bit values into a type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « net/base/ssl_config_service.cc ('k') | net/base/x509_certificate_mac.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BASE_SSL_INFO_H_ 5 #ifndef NET_BASE_SSL_INFO_H_
6 #define NET_BASE_SSL_INFO_H_ 6 #define NET_BASE_SSL_INFO_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "net/base/cert_status_flags.h"
13 #include "net/base/net_export.h" 12 #include "net/base/net_export.h"
14 #include "net/base/x509_cert_types.h" 13 #include "net/base/x509_cert_types.h"
15 14
16 namespace net { 15 namespace net {
17 16
18 class X509Certificate; 17 class X509Certificate;
19 18
20 // SSL connection info. 19 // SSL connection info.
21 // This is really a struct. All members are public. 20 // This is really a struct. All members are public.
22 class NET_EXPORT SSLInfo { 21 class NET_EXPORT SSLInfo {
(...skipping 17 matching lines...) Expand all
40 39
41 // Adds the specified |error| to the cert status. 40 // Adds the specified |error| to the cert status.
42 void SetCertError(int error); 41 void SetCertError(int error);
43 42
44 // The SSL certificate. 43 // The SSL certificate.
45 scoped_refptr<X509Certificate> cert; 44 scoped_refptr<X509Certificate> cert;
46 45
47 // Bitmask of status info of |cert|, representing, for example, known errors 46 // Bitmask of status info of |cert|, representing, for example, known errors
48 // and extended validation (EV) status. 47 // and extended validation (EV) status.
49 // See cert_status_flags.h for values. 48 // See cert_status_flags.h for values.
50 CertStatus cert_status; 49 int cert_status;
51 50
52 // The security strength, in bits, of the SSL cipher suite. 51 // The security strength, in bits, of the SSL cipher suite.
53 // 0 means the connection is not encrypted. 52 // 0 means the connection is not encrypted.
54 // -1 means the security strength is unknown. 53 // -1 means the security strength is unknown.
55 int security_bits; 54 int security_bits;
56 55
57 // Information about the SSL connection itself. See 56 // Information about the SSL connection itself. See
58 // ssl_connection_status_flags.h for values. The protocol version, 57 // ssl_connection_status_flags.h for values. The protocol version,
59 // ciphersuite, and compression in use are encoded within. 58 // ciphersuite, and compression in use are encoded within.
60 int connection_status; 59 int connection_status;
61 60
62 // If the certificate is valid, then this is true iff it was rooted at a 61 // If the certificate is valid, then this is true iff it was rooted at a
63 // standard CA root. (As opposed to a user-installed root.) 62 // standard CA root. (As opposed to a user-installed root.)
64 bool is_issued_by_known_root; 63 bool is_issued_by_known_root;
65 64
66 HandshakeType handshake_type; 65 HandshakeType handshake_type;
67 66
68 // The hashes of the SubjectPublicKeyInfos from each certificate in the chain. 67 // The hashes of the SubjectPublicKeyInfos from each certificate in the chain.
69 std::vector<SHA1Fingerprint> public_key_hashes; 68 std::vector<SHA1Fingerprint> public_key_hashes;
70 }; 69 };
71 70
72 } // namespace net 71 } // namespace net
73 72
74 #endif // NET_BASE_SSL_INFO_H_ 73 #endif // NET_BASE_SSL_INFO_H_
OLDNEW
« no previous file with comments | « net/base/ssl_config_service.cc ('k') | net/base/x509_certificate_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698