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

Side by Side Diff: net/base/ssl_client_socket_win.cc

Issue 18606: Return ERR_SSL_PROTOCOL_ERROR instead of the default... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 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 | no next file » | 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) 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 #include "net/base/ssl_client_socket_win.h" 5 #include "net/base/ssl_client_socket_win.h"
6 6
7 #include <schnlsp.h> 7 #include <schnlsp.h>
8 8
9 #include "base/lock.h" 9 #include "base/lock.h"
10 #include "base/singleton.h" 10 #include "base/singleton.h"
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 return ERR_UNEXPECTED; 624 return ERR_UNEXPECTED;
625 } 625 }
626 626
627 return transport_->Read(buf, buf_len, &io_callback_); 627 return transport_->Read(buf, buf_len, &io_callback_);
628 } 628 }
629 629
630 int SSLClientSocketWin::DoHandshakeReadComplete(int result) { 630 int SSLClientSocketWin::DoHandshakeReadComplete(int result) {
631 if (result < 0) 631 if (result < 0)
632 return result; 632 return result;
633 if (result == 0 && !ignore_ok_result_) 633 if (result == 0 && !ignore_ok_result_)
634 return ERR_FAILED; // Incomplete response :( 634 return ERR_SSL_PROTOCOL_ERROR; // Incomplete response :(
635 635
636 ignore_ok_result_ = false; 636 ignore_ok_result_ = false;
637 637
638 bytes_received_ += result; 638 bytes_received_ += result;
639 639
640 // Process the contents of recv_buffer_. 640 // Process the contents of recv_buffer_.
641 SECURITY_STATUS status; 641 SECURITY_STATUS status;
642 TimeStamp expiry; 642 TimeStamp expiry;
643 DWORD out_flags; 643 DWORD out_flags;
644 644
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 // compatible with WinHTTP, which doesn't report this error (bug 3004). 1190 // compatible with WinHTTP, which doesn't report this error (bug 3004).
1191 server_cert_status_ &= ~CERT_STATUS_NO_REVOCATION_MECHANISM; 1191 server_cert_status_ &= ~CERT_STATUS_NO_REVOCATION_MECHANISM;
1192 1192
1193 if (IsCertStatusError(server_cert_status_)) 1193 if (IsCertStatusError(server_cert_status_))
1194 return MapCertStatusToNetError(server_cert_status_); 1194 return MapCertStatusToNetError(server_cert_status_);
1195 return OK; 1195 return OK;
1196 } 1196 }
1197 1197
1198 } // namespace net 1198 } // namespace net
1199 1199
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698