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

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

Issue 123025: Merge 17919 - We don't handle certificate errors during SSL renegotiation.... (Closed) Base URL: svn://chrome-svn/chrome/branches/172/src/
Patch Set: Created 11 years, 6 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 | « no previous file | net/base/ssl_client_socket_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/net/base/net_error_list.h:r69-2775
Merged /trunk/src/net/base/net_error_list.h:r17919
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // This file contains the list of network errors. 5 // This file contains the list of network errors.
6 6
7 // An asynchronous IO operation is not yet complete. This usually does not 7 // An asynchronous IO operation is not yet complete. This usually does not
8 // indicate a fatal error. Typically this error will be generated as a 8 // indicate a fatal error. Typically this error will be generated as a
9 // notification to wait for some external notification that the IO operation 9 // notification to wait for some external notification that the IO operation
10 // finally completed. 10 // finally completed.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // The client and server don't support a common SSL protocol version or 92 // The client and server don't support a common SSL protocol version or
93 // cipher suite. 93 // cipher suite.
94 NET_ERROR(SSL_VERSION_OR_CIPHER_MISMATCH, -113) 94 NET_ERROR(SSL_VERSION_OR_CIPHER_MISMATCH, -113)
95 95
96 // The server requested a renegotiation (rehandshake). 96 // The server requested a renegotiation (rehandshake).
97 NET_ERROR(SSL_RENEGOTIATION_REQUESTED, -114) 97 NET_ERROR(SSL_RENEGOTIATION_REQUESTED, -114)
98 98
99 // The proxy requested authentication (for tunnel establishment). 99 // The proxy requested authentication (for tunnel establishment).
100 NET_ERROR(PROXY_AUTH_REQUESTED, -115) 100 NET_ERROR(PROXY_AUTH_REQUESTED, -115)
101 101
102 // During SSL renegotiation (rehandshake), the server sent a certificate with
103 // an error.
104 //
105 // Note: this error is not in the -2xx range so that it won't be handled as a
106 // certificate error.
107 NET_ERROR(CERT_ERROR_IN_SSL_RENEGOTIATION, -116)
108
102 // Certificate error codes 109 // Certificate error codes
103 // 110 //
104 // The values of certificate error codes must be consecutive. 111 // The values of certificate error codes must be consecutive.
105 112
106 // The server responded with a certificate whose common name did not match 113 // The server responded with a certificate whose common name did not match
107 // the host name. This could mean: 114 // the host name. This could mean:
108 // 115 //
109 // 1. An attacker has redirected our traffic to his server and is 116 // 1. An attacker has redirected our traffic to his server and is
110 // presenting a certificate for which he knows the private key. 117 // presenting a certificate for which he knows the private key.
111 // 118 //
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 NET_ERROR(PAC_STATUS_NOT_OK, -326) 241 NET_ERROR(PAC_STATUS_NOT_OK, -326)
235 242
236 // The evaluation of the PAC script failed. 243 // The evaluation of the PAC script failed.
237 NET_ERROR(PAC_SCRIPT_FAILED, -327) 244 NET_ERROR(PAC_SCRIPT_FAILED, -327)
238 245
239 // The cache does not have the requested entry. 246 // The cache does not have the requested entry.
240 NET_ERROR(CACHE_MISS, -400) 247 NET_ERROR(CACHE_MISS, -400)
241 248
242 // The server's response was insecure (e.g. there was a cert error). 249 // The server's response was insecure (e.g. there was a cert error).
243 NET_ERROR(INSECURE_RESPONSE, -501) 250 NET_ERROR(INSECURE_RESPONSE, -501)
OLDNEW
« no previous file with comments | « no previous file | net/base/ssl_client_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698