diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-11-23 07:42:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-23 15:44:33 +0000 |
| commit | cea915b5bfb88df2fa4b06d8aed7715b9ccc24fe (patch) | |
| tree | 2632d11f54d69f5d39bfda0904a4947417dca53c /ios | |
| parent | 19acda1ba5c116bbc4cea6c9163d10c65a9ba1c8 (diff) | |
| download | chromium_src-cea915b5bfb88df2fa4b06d8aed7715b9ccc24fe.zip chromium_src-cea915b5bfb88df2fa4b06d8aed7715b9ccc24fe.tar.gz chromium_src-cea915b5bfb88df2fa4b06d8aed7715b9ccc24fe.tar.bz2 | |
Fix unrecoverable SSL interstitials.
Unrecoverable SSL errors were broken in Merge 229993, by the upstream CL:
https://codereview.chromium.org/23965003/.
This fix removes the iOS specific interstitial.mm and uses interstitial_page_impl
instead.
It also adds support for unrecoverable errors, by returning a DENIED judgment
to some errors.
BUG=310607
TEST=Go to https://test-sspev.verisign.com/. Clicking on "Revoked" should trigger an unrecoverable error, clicking on "Expired" should trigger a recoverable error (with a "proceed anyway" button)
Review URL: https://chromereviews.googleplex.com/12347017
Review URL: https://codereview.chromium.org/1469063002
Cr-Commit-Position: refs/heads/master@{#361109}
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/provider/ios_provider_chrome.gyp | 2 | ||||
| -rw-r--r-- | ios/public/provider/chrome/browser/browser_constants.cc | 11 | ||||
| -rw-r--r-- | ios/public/provider/chrome/browser/browser_constants.h | 17 |
3 files changed, 30 insertions, 0 deletions
diff --git a/ios/provider/ios_provider_chrome.gyp b/ios/provider/ios_provider_chrome.gyp index 2a7cb38..5ef9094 100644 --- a/ios/provider/ios_provider_chrome.gyp +++ b/ios/provider/ios_provider_chrome.gyp @@ -11,6 +11,8 @@ 'target_name': 'ios_provider_chrome_browser', 'type': 'static_library', 'sources': [ + '../public/provider/chrome/browser/browser_constants.cc', + '../public/provider/chrome/browser/browser_constants.h', '../public/provider/chrome/browser/browser_state/chrome_browser_state.cc', '../public/provider/chrome/browser/browser_state/chrome_browser_state.h', '../public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h', diff --git a/ios/public/provider/chrome/browser/browser_constants.cc b/ios/public/provider/chrome/browser/browser_constants.cc new file mode 100644 index 0000000..5b89c12 --- /dev/null +++ b/ios/public/provider/chrome/browser/browser_constants.cc @@ -0,0 +1,11 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ios/public/provider/chrome/browser/browser_constants.h" + +namespace ios { + +const char kSpoofingAttemptFlag[] = "SpoofingAttempt_IOS"; + +} // namespace ios diff --git a/ios/public/provider/chrome/browser/browser_constants.h b/ios/public/provider/chrome/browser/browser_constants.h new file mode 100644 index 0000000..b40b26b --- /dev/null +++ b/ios/public/provider/chrome/browser/browser_constants.h @@ -0,0 +1,17 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef IOS_PUBLIC_PROVIDER_CHROME_BROWSER_BROWSER_CONSTANTS_H_ +#define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_BROWSER_CONSTANTS_H_ + +namespace ios { + +// This string is a flag for net::SSLInfo signaling that the error is not a +// typical certificate error, but rather is a spoofing attempt. +// It can be used to customize the interstitial error page. +extern const char kSpoofingAttemptFlag[]; + +} // namespace ios + +#endif // IOS_PUBLIC_PROVIDER_CHROME_BROWSER_BROWSER_CONSTANTS_H_ |