OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/ssl/ssl_policy.h" | 5 #include "content/browser/ssl/ssl_policy.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 handler->ContinueRequest(); | 60 handler->ContinueRequest(); |
61 break; | 61 break; |
62 case net::ERR_CERT_UNABLE_TO_CHECK_REVOCATION: | 62 case net::ERR_CERT_UNABLE_TO_CHECK_REVOCATION: |
63 // We ignore this error but will show a warning status in the location | 63 // We ignore this error but will show a warning status in the location |
64 // bar. | 64 // bar. |
65 handler->ContinueRequest(); | 65 handler->ContinueRequest(); |
66 break; | 66 break; |
67 case net::ERR_CERT_CONTAINS_ERRORS: | 67 case net::ERR_CERT_CONTAINS_ERRORS: |
68 case net::ERR_CERT_REVOKED: | 68 case net::ERR_CERT_REVOKED: |
69 case net::ERR_CERT_INVALID: | 69 case net::ERR_CERT_INVALID: |
| 70 case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: |
| 71 case net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN: |
70 OnCertErrorInternal(handler, false, handler->fatal()); | 72 OnCertErrorInternal(handler, false, handler->fatal()); |
71 break; | 73 break; |
72 default: | 74 default: |
73 NOTREACHED(); | 75 NOTREACHED(); |
74 handler->CancelRequest(); | 76 handler->CancelRequest(); |
75 break; | 77 break; |
76 } | 78 } |
77 } | 79 } |
78 | 80 |
79 void SSLPolicy::DidRunInsecureContent(NavigationEntryImpl* entry, | 81 void SSLPolicy::DidRunInsecureContent(NavigationEntryImpl* entry, |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED; | 218 SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED; |
217 } | 219 } |
218 | 220 |
219 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) { | 221 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) { |
220 GURL parsed_origin(origin); | 222 GURL parsed_origin(origin); |
221 if (parsed_origin.SchemeIsSecure()) | 223 if (parsed_origin.SchemeIsSecure()) |
222 backend_->HostRanInsecureContent(parsed_origin.host(), pid); | 224 backend_->HostRanInsecureContent(parsed_origin.host(), pid); |
223 } | 225 } |
224 | 226 |
225 } // namespace content | 227 } // namespace content |
OLD | NEW |