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

Side by Side Diff: net/socket/ssl_client_socket_nss.cc

Issue 1585041: SSL fixes for sites with buggy DEFLATE support. (Closed)
Patch Set: ... Created 10 years, 8 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
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 case SSL_ERROR_SSL_DISABLED: 183 case SSL_ERROR_SSL_DISABLED:
184 return ERR_NO_SSL_VERSIONS_ENABLED; 184 return ERR_NO_SSL_VERSIONS_ENABLED;
185 case SSL_ERROR_NO_CYPHER_OVERLAP: 185 case SSL_ERROR_NO_CYPHER_OVERLAP:
186 case SSL_ERROR_UNSUPPORTED_VERSION: 186 case SSL_ERROR_UNSUPPORTED_VERSION:
187 return ERR_SSL_VERSION_OR_CIPHER_MISMATCH; 187 return ERR_SSL_VERSION_OR_CIPHER_MISMATCH;
188 case SSL_ERROR_HANDSHAKE_FAILURE_ALERT: 188 case SSL_ERROR_HANDSHAKE_FAILURE_ALERT:
189 case SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT: 189 case SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT:
190 case SSL_ERROR_ILLEGAL_PARAMETER_ALERT: 190 case SSL_ERROR_ILLEGAL_PARAMETER_ALERT:
191 return ERR_SSL_PROTOCOL_ERROR; 191 return ERR_SSL_PROTOCOL_ERROR;
192 case SSL_ERROR_DECOMPRESSION_FAILURE_ALERT:
193 return ERR_SSL_DECOMPRESSION_FAILURE_ALERT;
192 194
193 default: { 195 default: {
194 if (IS_SSL_ERROR(err)) { 196 if (IS_SSL_ERROR(err)) {
195 LOG(WARNING) << "Unknown SSL error " << err << 197 LOG(WARNING) << "Unknown SSL error " << err <<
196 " mapped to net::ERR_SSL_PROTOCOL_ERROR"; 198 " mapped to net::ERR_SSL_PROTOCOL_ERROR";
197 return ERR_SSL_PROTOCOL_ERROR; 199 return ERR_SSL_PROTOCOL_ERROR;
198 } 200 }
199 LOG(WARNING) << "Unknown error " << err << 201 LOG(WARNING) << "Unknown error " << err <<
200 " mapped to net::ERR_FAILED"; 202 " mapped to net::ERR_FAILED";
201 return ERR_FAILED; 203 return ERR_FAILED;
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 PRErrorCode prerr = PR_GetError(); 1438 PRErrorCode prerr = PR_GetError();
1437 if (prerr == PR_WOULD_BLOCK_ERROR) { 1439 if (prerr == PR_WOULD_BLOCK_ERROR) {
1438 LeaveFunction(""); 1440 LeaveFunction("");
1439 return ERR_IO_PENDING; 1441 return ERR_IO_PENDING;
1440 } 1442 }
1441 LeaveFunction(""); 1443 LeaveFunction("");
1442 return MapNSPRError(prerr); 1444 return MapNSPRError(prerr);
1443 } 1445 }
1444 1446
1445 } // namespace net 1447 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698