diff --git a/BUILD.gn b/BUILD.gn index 161519e..0f2e28a 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -915,7 +915,7 @@ "//device/bluetooth/public/mojom:fake_bluetooth_interfaces_js_data_deps", "//device/usb/public/mojom:mojom_js_data_deps", "//device/vr/public/mojom:mojom_js_data_deps", - "//media/capture/mojo:image_capture_js_data_deps", + "//media/capture/mojom:image_capture_js_data_deps", "//mojo/public/interfaces/bindings/tests:test_data_deps", "//services/shape_detection/public/mojom:mojom_js_data_deps", "//services/device/public/mojom:mojom_js_data_deps",
diff --git a/DEPS b/DEPS index dfce07b..6107a6a 100644 --- a/DEPS +++ b/DEPS
@@ -83,7 +83,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': 'd500271571b92cb18dcd7b15885b51e8f437d640', + 'v8_revision': 'e1de5c822d8fe7db4a1d80d15e7ea4a771c5f32f', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. @@ -91,7 +91,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '888081d59aae6bb4b2322501d84bd645b8a8c6de', + 'angle_revision': 'b27b03a2c9ead5e4b367e9199a47d3de8a9a6663', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling build tools # and whatever else without interference from each other. @@ -103,7 +103,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': '71cdd20e9d7400b8b2f34a07037564ec87bda3e8', + 'pdfium_revision': '9a7c2396705a23d1ce6bdba0025eb2316ae301c4', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openmax_dl # and whatever else without interference from each other. @@ -111,7 +111,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - 'boringssl_revision': '8df8e64205d0f8334ee4d403306bfcd4287004b0', + 'boringssl_revision': 'f8058d41147543d6ad9a5ae5d70e7d19198bbe33', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling google-toolbox-for-mac # and whatever else without interference from each other. @@ -365,7 +365,7 @@ }, 'src/third_party/ffmpeg': - Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '9ca66eafaf6fbbde11862e1468b365220ca142fd', + Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'ef99a5d2520f934fa6c74ef7219aaa47e8717914', 'src/third_party/flac': Var('chromium_git') + '/chromium/deps/flac.git' + '@' + '7d0f5b3a173ffe98db08057d1f52b7787569e0a6', @@ -495,7 +495,7 @@ Var('chromium_git') + '/webm/libwebm.git' + '@' + 'b03c65468b06d097f27235d93d76bfc45f490ede', 'src/third_party/libyuv': - Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '66305588755486b27380b58c04aa8c1cf4541af3', # from r1698 + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '98a0a157dcf5dee0882b2dfcc9578ab1f44afb12', # from r1703 'src/third_party/lighttpd': { 'url': Var('chromium_git') + '/chromium/deps/lighttpd.git' + '@' + Var('lighttpd_revision'), @@ -514,7 +514,7 @@ }, 'src/third_party/mesa/src': - Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + 'ef811c6bd4de74e13e7035ca882cc77f85793fef', + Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '92521a7a302b58aaa242b90192eaddb67ea3d0c2', # GNU binutils assembler for x86-64. 'src/third_party/mingw-w64/mingw/bin': { @@ -680,7 +680,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@988621f08f6d7de6645a98efdf7ab8dc9e341a71', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@23d80a8f4bd2d2220e56209dfdf3cd01428708bf', 'condition': 'checkout_src_internal', },
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn index 0490652..8a1de6a 100644 --- a/android_webview/BUILD.gn +++ b/android_webview/BUILD.gn
@@ -714,7 +714,7 @@ "//components/safe_browsing/renderer:throttles", "//components/safe_browsing/triggers", "//components/safe_browsing/web_ui", - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", "//components/supervised_user_error_page", "//components/supervised_user_error_page:gin", "//components/url_matcher",
diff --git a/android_webview/DEPS b/android_webview/DEPS index 1fe149f..06231b6 100644 --- a/android_webview/DEPS +++ b/android_webview/DEPS
@@ -14,7 +14,7 @@ "+components/version_info", # Only allow this header in spellchecking since allowing all of spellchecking # would include both browser and renderer components. - "+components/spellcheck/spellcheck_build_features.h", + "+components/spellcheck/spellcheck_buildflags.h", "+components/supervised_user_error_page", "+components/web_restrictions", "+content/public/common",
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index b226976..17b10518 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc
@@ -46,7 +46,7 @@ #include "components/safe_browsing/browser/browser_url_loader_throttle.h" #include "components/safe_browsing/browser/mojo_safe_browsing_impl.h" #include "components/safe_browsing/features.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" @@ -677,7 +677,7 @@ return g_should_create_task_scheduler; } -scoped_refptr<content::ResourceDispatcherHostLoginDelegate> +scoped_refptr<content::LoginDelegate> AwContentBrowserClient::CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index dcea7f8..b79c289e 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h
@@ -168,8 +168,7 @@ bool is_main_frame, ui::PageTransition transition) override; bool ShouldCreateTaskScheduler() override; - scoped_refptr<content::ResourceDispatcherHostLoginDelegate> - CreateLoginDelegate( + scoped_refptr<content::LoginDelegate> CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter, bool is_main_frame,
diff --git a/android_webview/browser/aw_login_delegate.h b/android_webview/browser/aw_login_delegate.h index 74aab8f..74f9161 100644 --- a/android_webview/browser/aw_login_delegate.h +++ b/android_webview/browser/aw_login_delegate.h
@@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/optional.h" #include "base/strings/string16.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/resource_request_info.h" namespace net { @@ -22,8 +22,7 @@ namespace android_webview { -class AwLoginDelegate : - public content::ResourceDispatcherHostLoginDelegate { +class AwLoginDelegate : public content::LoginDelegate { public: AwLoginDelegate( net::AuthChallengeInfo* auth_info, @@ -36,7 +35,7 @@ const base::string16& password); virtual void Cancel(); - // from ResourceDispatcherHostLoginDelegate + // content::LoginDelegate: void OnRequestCancelled() override; private:
diff --git a/android_webview/lib/aw_main_delegate.cc b/android_webview/lib/aw_main_delegate.cc index 909be8056..69bcfc2 100644 --- a/android_webview/lib/aw_main_delegate.cc +++ b/android_webview/lib/aw_main_delegate.cc
@@ -34,7 +34,7 @@ #include "components/crash/content/app/breakpad_linux.h" #include "components/crash/core/common/crash_key.h" #include "components/safe_browsing/android/safe_browsing_api_handler_bridge.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/browser/android/browser_media_player_manager_register.h" #include "content/public/browser/browser_main_runner.h" #include "content/public/browser/browser_thread.h"
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h index fa6944a..0a9362c8 100644 --- a/android_webview/renderer/aw_content_renderer_client.h +++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "components/safe_browsing/common/safe_browsing.mojom.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/web_restrictions/interfaces/web_restrictions.mojom.h" #include "content/public/renderer/content_renderer_client.h" #include "services/service_manager/public/cpp/local_interface_provider.h"
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index e830c3a..f5d913c 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn
@@ -62,6 +62,8 @@ "accessibility/accessibility_highlight_layer.h", "accessibility/accessibility_layer.cc", "accessibility/accessibility_layer.h", + "accessibility/chromevox_layout_manager.cc", + "accessibility/chromevox_layout_manager.h", "accessibility/default_accessibility_delegate.cc", "accessibility/default_accessibility_delegate.h", "accessibility/focus_ring_controller.cc", @@ -632,8 +634,6 @@ "system/power/power_status_view.h", "system/power/scoped_backlights_forced_off.cc", "system/power/scoped_backlights_forced_off.h", - "system/power/tablet_power_button_controller.cc", - "system/power/tablet_power_button_controller.h", "system/power/tray_power.cc", "system/power/tray_power.h", "system/power/video_activity_notifier.cc", @@ -748,6 +748,8 @@ "system/unified/feature_pods_container_view.h", "system/unified/quiet_mode_feature_pod_controller.cc", "system/unified/quiet_mode_feature_pod_controller.h", + "system/unified/sign_out_button.cc", + "system/unified/sign_out_button.h", "system/unified/top_shortcut_button.cc", "system/unified/top_shortcut_button.h", "system/unified/top_shortcuts_view.cc", @@ -1400,6 +1402,7 @@ "accessibility/accessibility_controller_unittest.cc", "accessibility/accessibility_focus_ring_controller_unittest.cc", "accessibility/accessibility_highlight_controller_unittest.cc", + "accessibility/chromevox_layout_manager_unittest.cc", "accessibility/touch_accessibility_enabler_unittest.cc", "accessibility/touch_exploration_controller_unittest.cc", "app_list/app_list_presenter_delegate_unittest.cc", @@ -1533,11 +1536,11 @@ "system/palette/tools/screenshot_unittest.cc", "system/power/backlights_forced_off_setter_unittest.cc", "system/power/peripheral_battery_notifier_unittest.cc", + "system/power/power_button_controller_unittest.cc", "system/power/power_button_screenshot_controller_unittest.cc", "system/power/power_event_observer_unittest.cc", "system/power/power_status_unittest.cc", "system/power/power_status_view_unittest.cc", - "system/power/tablet_power_button_controller_unittest.cc", "system/power/tray_power_unittest.cc", "system/power/video_activity_notifier_unittest.cc", "system/rotation/tray_rotation_lock_unittest.cc", @@ -1867,14 +1870,14 @@ "system/cast/tray_cast_test_api.h", "system/palette/palette_tray_test_api.cc", "system/palette/palette_tray_test_api.h", + "system/power/power_button_controller_test_api.cc", + "system/power/power_button_controller_test_api.h", "system/power/power_button_screenshot_controller_test_api.cc", "system/power/power_button_screenshot_controller_test_api.h", "system/power/power_button_test_base.cc", "system/power/power_button_test_base.h", "system/power/power_event_observer_test_api.cc", "system/power/power_event_observer_test_api.h", - "system/power/tablet_power_button_controller_test_api.cc", - "system/power/tablet_power_button_controller_test_api.h", "system/status_area_widget_test_helper.cc", "system/status_area_widget_test_helper.h", "system/tray/system_tray_test_api.cc",
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index f18caee8..8b0011fd2 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -22,11 +22,11 @@ #include "ash/shell_test_api.h" #include "ash/system/brightness_control_delegate.h" #include "ash/system/keyboard_brightness_control_delegate.h" +#include "ash/system/power/power_button_controller_test_api.h" #include "ash/test/ash_test_base.h" #include "ash/test_media_client.h" #include "ash/test_screenshot_delegate.h" #include "ash/wm/lock_state_controller.h" -#include "ash/wm/lock_state_controller_test_api.h" #include "ash/wm/panels/panel_layout_manager.h" #include "ash/wm/test_session_state_animator.h" #include "ash/wm/window_positioning_utils.h" @@ -1037,10 +1037,11 @@ ui::test::EventGenerator& generator = GetEventGenerator(); // Power key (reserved) should always be handled. - LockStateControllerTestApi test_api(Shell::Get()->lock_state_controller()); - EXPECT_FALSE(test_api.is_animating_lock()); + PowerButtonControllerTestApi test_api( + Shell::Get()->power_button_controller()); + EXPECT_FALSE(test_api.PowerButtonMenuTimerIsRunning()); generator.PressKey(ui::VKEY_POWER, ui::EF_NONE); - EXPECT_TRUE(test_api.is_animating_lock()); + EXPECT_TRUE(test_api.PowerButtonMenuTimerIsRunning()); auto press_and_release_alt_tab = [&generator]() { generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN); @@ -1085,10 +1086,11 @@ ui::test::EventGenerator& generator = GetEventGenerator(); // Power key (reserved) should always be handled. - LockStateControllerTestApi test_api(Shell::Get()->lock_state_controller()); - EXPECT_FALSE(test_api.is_animating_lock()); + PowerButtonControllerTestApi test_api( + Shell::Get()->power_button_controller()); + EXPECT_FALSE(test_api.PowerButtonMenuTimerIsRunning()); generator.PressKey(ui::VKEY_POWER, ui::EF_NONE); - EXPECT_TRUE(test_api.is_animating_lock()); + EXPECT_TRUE(test_api.PowerButtonMenuTimerIsRunning()); // A pinned window can consume ALT-TAB (preferred), but no side effect. ASSERT_EQ(w1, wm::GetActiveWindow());
diff --git a/ash/accessibility/chromevox_layout_manager.cc b/ash/accessibility/chromevox_layout_manager.cc new file mode 100644 index 0000000..09e3cbe --- /dev/null +++ b/ash/accessibility/chromevox_layout_manager.cc
@@ -0,0 +1,38 @@ +// Copyright 2018 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 "ash/accessibility/chromevox_layout_manager.h" + +#include "base/logging.h" + +namespace ash { + +ChromeVoxLayoutManager::ChromeVoxLayoutManager() = default; + +ChromeVoxLayoutManager::~ChromeVoxLayoutManager() = default; + +void ChromeVoxLayoutManager::OnWindowAddedToLayout(aura::Window* child) { + chromevox_window_ = child; + UpdateLayout(); +} + +void ChromeVoxLayoutManager::OnWindowRemovedFromLayout(aura::Window* child) { + // NOTE: In browser_tests a second ChromeVoxPanel can be created while the + // first one in closing due to races between loading the extension and + // closing the widget. We only track the latest panel. + if (child == chromevox_window_) + chromevox_window_ = nullptr; + UpdateLayout(); +} + +void ChromeVoxLayoutManager::SetChildBounds(aura::Window* child, + const gfx::Rect& requested_bounds) { + SetChildBoundsDirect(child, requested_bounds); +} + +void ChromeVoxLayoutManager::UpdateLayout() { + // TODO: Implement by moving the code out of ChromeVoxPanel. +} + +} // namespace ash
diff --git a/ash/accessibility/chromevox_layout_manager.h b/ash/accessibility/chromevox_layout_manager.h new file mode 100644 index 0000000..1263a8a --- /dev/null +++ b/ash/accessibility/chromevox_layout_manager.h
@@ -0,0 +1,47 @@ +// Copyright 2018 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 ASH_ACCESSIBILITY_CHROMEVOX_LAYOUT_MANAGER_H_ +#define ASH_ACCESSIBILITY_CHROMEVOX_LAYOUT_MANAGER_H_ + +#include "ash/ash_export.h" +#include "base/macros.h" +#include "ui/aura/layout_manager.h" + +namespace ash { + +// ChromeVoxLayoutManager manages the container window used for the ChromeVox +// spoken feedback panel, which sits at the top of the display. It insets the +// display work area bounds when ChromeVox is visible. The ChromeVox panel is +// created by Chrome because spoken feedback is implemented by an extension. +// Exported for test. +class ASH_EXPORT ChromeVoxLayoutManager : public aura::LayoutManager { + public: + ChromeVoxLayoutManager(); + ~ChromeVoxLayoutManager() override; + + // aura::LayoutManager: + void OnWindowResized() override {} + void OnWindowAddedToLayout(aura::Window* child) override; + void OnWillRemoveWindowFromLayout(aura::Window* child) override {} + void OnWindowRemovedFromLayout(aura::Window* child) override; + void OnChildWindowVisibilityChanged(aura::Window* child, + bool visible) override {} + void SetChildBounds(aura::Window* child, + const gfx::Rect& requested_bounds) override; + + aura::Window* chromevox_window_for_test() { return chromevox_window_; } + + private: + // Updates the ChromeVox window bounds and the display work area. + void UpdateLayout(); + + aura::Window* chromevox_window_ = nullptr; + + DISALLOW_COPY_AND_ASSIGN(ChromeVoxLayoutManager); +}; + +} // namespace ash + +#endif // ASH_ACCESSIBILITY_CHROMEVOX_LAYOUT_MANAGER_H_
diff --git a/ash/accessibility/chromevox_layout_manager_unittest.cc b/ash/accessibility/chromevox_layout_manager_unittest.cc new file mode 100644 index 0000000..d4f021d --- /dev/null +++ b/ash/accessibility/chromevox_layout_manager_unittest.cc
@@ -0,0 +1,66 @@ +// Copyright 2018 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 "ash/accessibility/chromevox_layout_manager.h" + +#include <memory> + +#include "ash/shell.h" +#include "ash/test/ash_test_base.h" +#include "ui/views/widget/widget.h" + +namespace ash { +namespace { + +ChromeVoxLayoutManager* GetLayoutManager() { + aura::Window* container = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), kShellWindowId_ChromeVoxContainer); + return static_cast<ChromeVoxLayoutManager*>(container->layout_manager()); +} + +using ChromeVoxLayoutManagerTest = AshTestBase; + +TEST_F(ChromeVoxLayoutManagerTest, Basics) { + ChromeVoxLayoutManager* layout_manager = GetLayoutManager(); + ASSERT_TRUE(layout_manager); + + // The layout manager doesn't track anything at startup. + EXPECT_FALSE(layout_manager->chromevox_window_for_test()); + + // Simulate chrome creating the ChromeVox widget. The layout manager starts + // managing it. + std::unique_ptr<views::Widget> widget = + CreateTestWidget(nullptr, kShellWindowId_ChromeVoxContainer); + EXPECT_EQ(widget->GetNativeWindow(), + layout_manager->chromevox_window_for_test()); + + // The layout manager doesn't track anything after the widget closes. + widget.reset(); + EXPECT_FALSE(layout_manager->chromevox_window_for_test()); +} + +TEST_F(ChromeVoxLayoutManagerTest, Shutdown) { + ChromeVoxLayoutManager* layout_manager = GetLayoutManager(); + ASSERT_TRUE(layout_manager); + + // Simulate chrome creating the ChromeVox widget. The layout manager starts + // managing it. + std::unique_ptr<views::Widget> widget = + CreateTestWidget(nullptr, kShellWindowId_ChromeVoxContainer); + EXPECT_EQ(widget->GetNativeWindow(), + layout_manager->chromevox_window_for_test()); + + // Don't close the window. + widget.release(); + + // Ash should not crash if the window is still open at shutdown. +} + +// TODO: Test the following: +// - Initial ChromeVox window bounds. +// - Display work area updates. +// - Bounds and work area updates during fullscreen. + +} // namespace +} // namespace ash
diff --git a/ash/drag_drop/drag_drop_interactive_uitest.cc b/ash/drag_drop/drag_drop_interactive_uitest.cc index 57a5119..64d6c5a 100644 --- a/ash/drag_drop/drag_drop_interactive_uitest.cc +++ b/ash/drag_drop/drag_drop_interactive_uitest.cc
@@ -87,25 +87,25 @@ void DragDropAcrossMultiDisplay_Step4() { ui_controls::SendMouseEventsNotifyWhenDone(ui_controls::LEFT, ui_controls::UP, - base::Bind(&QuitLoop)); + base::BindOnce(&QuitLoop)); } void DragDropAcrossMultiDisplay_Step3() { // Move to the edge of the 1st display so that the mouse // is moved to 2nd display by ash. ui_controls::SendMouseMoveNotifyWhenDone( - 399, 10, base::Bind(&DragDropAcrossMultiDisplay_Step4)); + 399, 10, base::BindOnce(&DragDropAcrossMultiDisplay_Step4)); } void DragDropAcrossMultiDisplay_Step2() { ui_controls::SendMouseMoveNotifyWhenDone( - 20, 10, base::Bind(&DragDropAcrossMultiDisplay_Step3)); + 20, 10, base::BindOnce(&DragDropAcrossMultiDisplay_Step3)); } void DragDropAcrossMultiDisplay_Step1() { ui_controls::SendMouseEventsNotifyWhenDone( ui_controls::LEFT, ui_controls::DOWN, - base::Bind(&DragDropAcrossMultiDisplay_Step2)); + base::BindOnce(&DragDropAcrossMultiDisplay_Step2)); } } // namespace @@ -133,7 +133,7 @@ EXPECT_EQ(root_windows[1], target->GetNativeView()->GetRootWindow()); ui_controls::SendMouseMoveNotifyWhenDone( - 10, 10, base::Bind(&DragDropAcrossMultiDisplay_Step1)); + 10, 10, base::BindOnce(&DragDropAcrossMultiDisplay_Step1)); base::RunLoop().Run();
diff --git a/ash/public/cpp/ash_features.cc b/ash/public/cpp/ash_features.cc index 0d464aa..cebb067 100644 --- a/ash/public/cpp/ash_features.cc +++ b/ash/public/cpp/ash_features.cc
@@ -13,6 +13,9 @@ const base::Feature kKeyboardShortcutViewer{"KeyboardShortcutViewer", base::FEATURE_ENABLED_BY_DEFAULT}; +const base::Feature kNewOverviewAnimations{"NewOverviewAnimations", + base::FEATURE_ENABLED_BY_DEFAULT}; + const base::Feature kSystemTrayUnified{"SystemTrayUnified", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -24,6 +27,10 @@ return base::FeatureList::IsEnabled(kKeyboardShortcutViewer); } +bool IsNewOverviewAnimationsEnabled() { + return base::FeatureList::IsEnabled(kNewOverviewAnimations); +} + bool IsSystemTrayUnifiedEnabled() { return base::FeatureList::IsEnabled(kSystemTrayUnified); }
diff --git a/ash/public/cpp/ash_features.h b/ash/public/cpp/ash_features.h index 67a905a..ccc0974 100644 --- a/ash/public/cpp/ash_features.h +++ b/ash/public/cpp/ash_features.h
@@ -21,6 +21,11 @@ // https://crbug.com/755448. ASH_PUBLIC_EXPORT extern const base::Feature kKeyboardShortcutViewer; +// Enables the new overview animations. +// TODO(wutao): Remove this after the feature is fully launched. +// https://crbug.com/801465. +ASH_PUBLIC_EXPORT extern const base::Feature kNewOverviewAnimations; + // Enables new system menu. ASH_PUBLIC_EXPORT extern const base::Feature kSystemTrayUnified; @@ -28,6 +33,8 @@ ASH_PUBLIC_EXPORT bool IsKeyboardShortcutViewerEnabled(); +ASH_PUBLIC_EXPORT bool IsNewOverviewAnimationsEnabled(); + ASH_PUBLIC_EXPORT bool IsSystemTrayUnifiedEnabled(); } // namespace features
diff --git a/ash/public/cpp/ash_switches.cc b/ash/public/cpp/ash_switches.cc index 46cab86..a98bc21 100644 --- a/ash/public/cpp/ash_switches.cc +++ b/ash/public/cpp/ash_switches.cc
@@ -56,12 +56,6 @@ const char kAshEnableMagnifierKeyScroller[] = "ash-enable-magnifier-key-scroller"; -// Enables the new overview animations. -// TODO(wutao): Remove this once the feature is launched. -// https://crbug.com/801465. -const char kAshEnableNewOverviewAnimations[] = - "ash-enable-new-overview-animations"; - // Enables the new overview ui. // TODO(sammiequon): Remove this once the feature is launched. crbug.com/782330. const char kAshEnableNewOverviewUi[] = "ash-enable-new-overview-ui"; @@ -149,10 +143,6 @@ // Whether this device has an internal stylus. const char kHasInternalStylus[] = "has-internal-stylus"; -// If true, a long press of the power button in tablet mode will show the power -// button menu. -const char kShowPowerButtonMenu[] = "show-power-button-menu"; - // Draws a circle at each touch point, similar to the Android OS developer // option "Show taps". const char kShowTaps[] = "show-taps";
diff --git a/ash/public/cpp/ash_switches.h b/ash/public/cpp/ash_switches.h index 1573a1c0..104bd80 100644 --- a/ash/public/cpp/ash_switches.h +++ b/ash/public/cpp/ash_switches.h
@@ -28,7 +28,6 @@ ASH_PUBLIC_EXPORT extern const char kAshEnableV1AppBackButton[]; ASH_PUBLIC_EXPORT extern const char kAshEnableDisplayMoveWindowAccels[]; ASH_PUBLIC_EXPORT extern const char kAshEnableMagnifierKeyScroller[]; -ASH_PUBLIC_EXPORT extern const char kAshEnableNewOverviewAnimations[]; ASH_PUBLIC_EXPORT extern const char kAshEnableNewOverviewUi[]; ASH_PUBLIC_EXPORT extern const char kAshEnableNightLight[]; ASH_PUBLIC_EXPORT extern const char kAshEnablePaletteOnAllDisplays[]; @@ -60,7 +59,6 @@ ASH_PUBLIC_EXPORT extern const char kAuraLegacyPowerButton[]; ASH_PUBLIC_EXPORT extern const char kForceClamshellPowerButton[]; ASH_PUBLIC_EXPORT extern const char kHasInternalStylus[]; -ASH_PUBLIC_EXPORT extern const char kShowPowerButtonMenu[]; ASH_PUBLIC_EXPORT extern const char kShowTaps[]; ASH_PUBLIC_EXPORT extern const char kShowViewsLogin[]; ASH_PUBLIC_EXPORT extern const char kShowWebUiLock[];
diff --git a/ash/public/cpp/shell_window_ids.cc b/ash/public/cpp/shell_window_ids.cc index ac85430..054d444 100644 --- a/ash/public/cpp/shell_window_ids.cc +++ b/ash/public/cpp/shell_window_ids.cc
@@ -13,7 +13,7 @@ // containers appearing later in the list. const int32_t kActivatableShellWindowIds[] = { kShellWindowId_OverlayContainer, kShellWindowId_LockSystemModalContainer, - kShellWindowId_SettingBubbleContainer, + kShellWindowId_ChromeVoxContainer, kShellWindowId_SettingBubbleContainer, kShellWindowId_LockActionHandlerContainer, kShellWindowId_LockScreenContainer, kShellWindowId_SystemModalContainer, kShellWindowId_AlwaysOnTopContainer, kShellWindowId_AppListContainer,
diff --git a/ash/public/cpp/shell_window_ids.h b/ash/public/cpp/shell_window_ids.h index 0460376..237b169 100644 --- a/ash/public/cpp/shell_window_ids.h +++ b/ash/public/cpp/shell_window_ids.h
@@ -108,6 +108,9 @@ // changes (volume, brightness, input method bubbles, etc.). kShellWindowId_SettingBubbleContainer, + // Contains the ChromeVox spoken feedback window. + kShellWindowId_ChromeVoxContainer, + // The container for special components overlaid onscreen, such as the // region selector for partial screenshots. kShellWindowId_OverlayContainer, @@ -157,6 +160,7 @@ kShellWindowId_MenuContainer, kShellWindowId_DragImageAndTooltipContainer, kShellWindowId_SettingBubbleContainer, + kShellWindowId_ChromeVoxContainer, kShellWindowId_OverlayContainer, kShellWindowId_DockedMagnifierContainer, kShellWindowId_MouseCursorContainer,
diff --git a/ash/resources/vector_icons/BUILD.gn b/ash/resources/vector_icons/BUILD.gn index 53e84035..2093732 100644 --- a/ash/resources/vector_icons/BUILD.gn +++ b/ash/resources/vector_icons/BUILD.gn
@@ -258,7 +258,9 @@ "system_menu_volume_medium.icon", "system_menu_volume_mute.1x.icon", "system_menu_volume_mute.icon", + "system_power_button_menu_power_off.1x.icon", "system_power_button_menu_power_off.icon", + "system_power_button_menu_sign_out.1x.icon", "system_power_button_menu_sign_out.icon", "system_tray_accessibility.1x.icon", "system_tray_accessibility.icon",
diff --git a/ash/resources/vector_icons/system_power_button_menu_power_off.1x.icon b/ash/resources/vector_icons/system_power_button_menu_power_off.1x.icon new file mode 100644 index 0000000..7ec17a8a --- /dev/null +++ b/ash/resources/vector_icons/system_power_button_menu_power_off.1x.icon
@@ -0,0 +1,24 @@ +// Copyright 2018 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. + +CANVAS_DIMENSIONS, 24, +MOVE_TO, 13, 3, +LINE_TO, 11, 3, +LINE_TO, 11, 13, +LINE_TO, 13, 13, +LINE_TO, 13, 3, +CLOSE, +MOVE_TO, 17.83f, 5.17f, +LINE_TO, 16.41f, 6.59f, +CUBIC_TO, 17.99f, 7.86f, 19, 9.81f, 19, 12, +CUBIC_TO, 19, 15.87f, 15.87f, 19, 12, 19, +CUBIC_TO, 8.13f, 19, 5, 15.87f, 5, 12, +CUBIC_TO, 5, 9.81f, 6.01f, 7.86f, 7.58f, 6.58f, +LINE_TO, 6.17f, 5.17f, +CUBIC_TO, 4.23f, 6.82f, 3, 9.26f, 3, 12, +CUBIC_TO, 3, 16.97f, 7.03f, 21, 12, 21, +CUBIC_TO, 16.97f, 21, 21, 16.97f, 21, 12, +CUBIC_TO, 21, 9.26f, 19.77f, 6.82f, 17.83f, 5.17f, +CLOSE, +END
diff --git a/ash/resources/vector_icons/system_power_button_menu_power_off.icon b/ash/resources/vector_icons/system_power_button_menu_power_off.icon index 100b953..16dcf407 100644 --- a/ash/resources/vector_icons/system_power_button_menu_power_off.icon +++ b/ash/resources/vector_icons/system_power_button_menu_power_off.icon
@@ -2,26 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -CANVAS_DIMENSIONS, 18, -MOVE_TO, -3, -3, -R_H_LINE_TO, 24, -R_V_LINE_TO, 24, -H_LINE_TO, -3, +MOVE_TO, 26, 6, +LINE_TO, 22, 6, +LINE_TO, 22, 26, +LINE_TO, 26, 26, +LINE_TO, 26, 6, CLOSE, -MOVE_TO, 10, 0, -H_LINE_TO, 8, -R_V_LINE_TO, 10, -R_H_LINE_TO, 2, -V_LINE_TO, 0, -CLOSE, -R_MOVE_TO, 4.83f, 2.17f, -R_LINE_TO, -1.42f, 1.42f, -ARC_TO, 6.92f, 6.92f, 0, 0, 1, 16, 9, -R_CUBIC_TO, 0, 3.87f, -3.13f, 7, -7, 7, -ARC_TO, 7, 7, 0, 0, 1, 4.58f, 3.58f, -LINE_TO, 3.17f, 2.17f, -ARC_TO, 8.93f, 8.93f, 0, 0, 0, 0, 9, -R_ARC_TO, 9, 9, 0, 0, 0, 18, 0, -R_CUBIC_TO, 0, -2.74f, -1.23f, -5.18f, -3.17f, -6.83f, +MOVE_TO, 35.66f, 10.34f, +LINE_TO, 32.82f, 13.18f, +CUBIC_TO, 35.98f, 15.72f, 38, 19.62f, 38, 24, +CUBIC_TO, 38, 31.74f, 31.74f, 38, 24, 38, +CUBIC_TO, 16.26f, 38, 10, 31.74f, 10, 24, +CUBIC_TO, 10, 19.62f, 12.02f, 15.72f, 15.16f, 13.16f, +LINE_TO, 12.34f, 10.34f, +CUBIC_TO, 8.46f, 13.64f, 6, 18.52f, 6, 24, +CUBIC_TO, 6, 33.94f, 14.06f, 42, 24, 42, +CUBIC_TO, 33.94f, 42, 42, 33.94f, 42, 24, +CUBIC_TO, 42, 18.52f, 39.54f, 13.64f, 35.66f, 10.34f, CLOSE, END
diff --git a/ash/resources/vector_icons/system_power_button_menu_sign_out.1x.icon b/ash/resources/vector_icons/system_power_button_menu_sign_out.1x.icon new file mode 100644 index 0000000..12b7a60 --- /dev/null +++ b/ash/resources/vector_icons/system_power_button_menu_sign_out.1x.icon
@@ -0,0 +1,35 @@ +// Copyright 2018 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. + +CANVAS_DIMENSIONS, 24, +MOVE_TO, 10.09f, 15.59f, +LINE_TO, 11.5f, 17, +LINE_TO, 16.5f, 12, +LINE_TO, 11.5f, 7, +LINE_TO, 10.09f, 8.41f, +LINE_TO, 12.67f, 11, +LINE_TO, 3, 11, +LINE_TO, 3, 13, +LINE_TO, 12.67f, 13, +LINE_TO, 10.09f, 15.59f, +CLOSE, +MOVE_TO, 19, 3, +LINE_TO, 5, 3, +CUBIC_TO, 3.89f, 3, 3, 3.9f, 3, 5, +LINE_TO, 3, 9, +LINE_TO, 5, 9, +LINE_TO, 5, 5, +LINE_TO, 19, 5, +LINE_TO, 19, 19, +LINE_TO, 5, 19, +LINE_TO, 5, 15, +LINE_TO, 3, 15, +LINE_TO, 3, 19, +CUBIC_TO, 3, 20.1f, 3.89f, 21, 5, 21, +LINE_TO, 19, 21, +CUBIC_TO, 20.1f, 21, 21, 20.1f, 21, 19, +LINE_TO, 21, 5, +CUBIC_TO, 21, 3.9f, 20.1f, 3, 19, 3, +CLOSE, +END
diff --git a/ash/resources/vector_icons/system_power_button_menu_sign_out.icon b/ash/resources/vector_icons/system_power_button_menu_sign_out.icon index a876d7e..e369261 100644 --- a/ash/resources/vector_icons/system_power_button_menu_sign_out.icon +++ b/ash/resources/vector_icons/system_power_button_menu_sign_out.icon
@@ -2,39 +2,33 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -CANVAS_DIMENSIONS, 18, -MOVE_TO, -3, -3, -R_H_LINE_TO, 24, -R_V_LINE_TO, 24, -H_LINE_TO, -3, +MOVE_TO, 20.18f, 31.18f, +LINE_TO, 23, 34, +LINE_TO, 33, 24, +LINE_TO, 23, 14, +LINE_TO, 20.18f, 16.82f, +LINE_TO, 25.34f, 22, +LINE_TO, 6, 22, +LINE_TO, 6, 26, +LINE_TO, 25.34f, 26, +LINE_TO, 20.18f, 31.18f, CLOSE, -MOVE_TO, 7.09f, 12.59f, -LINE_TO, 8.5f, 14, -R_LINE_TO, 5, -5, -R_LINE_TO, -5, -5, -R_LINE_TO, -1.41f, 1.41f, -LINE_TO, 9.67f, 8, -H_LINE_TO, 0, -R_V_LINE_TO, 2, -R_H_LINE_TO, 9.67f, -R_LINE_TO, -2.58f, 2.59f, -CLOSE, -MOVE_TO, 16, 0, -H_LINE_TO, 2, -R_ARC_TO, 2, 2, 0, 0, 0, -2, 2, -R_V_LINE_TO, 4, -R_H_LINE_TO, 2, -V_LINE_TO, 2, -R_H_LINE_TO, 14, -R_V_LINE_TO, 14, -H_LINE_TO, 2, -R_V_LINE_TO, -4, -H_LINE_TO, 0, -R_V_LINE_TO, 4, -R_ARC_TO, 2, 2, 0, 0, 0, 2, 2, -R_H_LINE_TO, 14, -R_CUBIC_TO, 1.1f, 0, 2, -0.9f, 2, -2, -V_LINE_TO, 2, -R_CUBIC_TO, 0, -1.1f, -0.9f, -2, -2, -2, +MOVE_TO, 38, 6, +LINE_TO, 10, 6, +CUBIC_TO, 7.78f, 6, 6, 7.8f, 6, 10, +LINE_TO, 6, 18, +LINE_TO, 10, 18, +LINE_TO, 10, 10, +LINE_TO, 38, 10, +LINE_TO, 38, 38, +LINE_TO, 10, 38, +LINE_TO, 10, 30, +LINE_TO, 6, 30, +LINE_TO, 6, 38, +CUBIC_TO, 6, 40.2f, 7.78f, 42, 10, 42, +LINE_TO, 38, 42, +CUBIC_TO, 40.2f, 42, 42, 40.2f, 42, 38, +LINE_TO, 42, 10, +CUBIC_TO, 42, 7.8f, 40.2f, 6, 38, 6, CLOSE, END
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 0ff96ef..2c4e543 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc
@@ -9,6 +9,7 @@ #include <queue> #include <vector> +#include "ash/accessibility/chromevox_layout_manager.h" #include "ash/accessibility/touch_exploration_controller.h" #include "ash/ash_constants.h" #include "ash/ash_touch_exploration_manager_chromeos.h" @@ -929,6 +930,14 @@ settings_bubble_container->SetProperty(kUsesScreenCoordinatesKey, true); settings_bubble_container->SetProperty(kLockedToRootKey, true); + aura::Window* chromevox_container = + CreateContainer(kShellWindowId_ChromeVoxContainer, "ChromeVoxContainer", + lock_screen_related_containers); + ::wm::SetChildWindowVisibilityChangesAnimated(chromevox_container); + chromevox_container->SetProperty(kUsesScreenCoordinatesKey, true); + chromevox_container->SetProperty(kLockedToRootKey, true); + chromevox_container->SetLayoutManager(new ChromeVoxLayoutManager()); + aura::Window* virtual_keyboard_parent_container = CreateContainer( kShellWindowId_ImeWindowParentContainer, "VirtualKeyboardParentContainer", lock_screen_related_containers);
diff --git a/ash/system/power/power_button_controller.cc b/ash/system/power/power_button_controller.cc index 2fb240e..3759954 100644 --- a/ash/system/power/power_button_controller.cc +++ b/ash/system/power/power_button_controller.cc
@@ -11,10 +11,11 @@ #include "ash/public/cpp/shell_window_ids.h" #include "ash/session/session_controller.h" #include "ash/shell.h" +#include "ash/shell_port.h" #include "ash/shutdown_reason.h" #include "ash/system/power/power_button_display_controller.h" +#include "ash/system/power/power_button_menu_screen_view.h" #include "ash/system/power/power_button_screenshot_controller.h" -#include "ash/system/power/tablet_power_button_controller.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/session_state_animator.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" @@ -22,23 +23,55 @@ #include "base/time/default_tick_clock.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/display/types/display_snapshot.h" -#include "ui/events/event.h" +#include "ui/views/widget/widget.h" namespace ash { namespace { -// When clamshell power button behavior is forced, turn the screen off this long -// after locking is requested via the power button. -constexpr base::TimeDelta kDisplayOffAfterLockDelay = +// Time that power button should be pressed before starting to show the power +// button menu animation. +constexpr base::TimeDelta kStartPowerButtonMenuAnimationTimeout = + base::TimeDelta::FromMilliseconds(500); + +// Time that power button should be pressed before starting to shutdown. +constexpr base::TimeDelta kStartShutdownTimeout = base::TimeDelta::FromSeconds(3); +// Creates a fullscreen widget responsible for showing the power button menu. +std::unique_ptr<views::Widget> CreateMenuWidget() { + auto menu_widget = std::make_unique<views::Widget>(); + views::Widget::InitParams params( + views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; + params.keep_on_top = true; + params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; + params.name = "PowerButtonMenuWindow"; + params.layer_type = ui::LAYER_SOLID_COLOR; + params.parent = Shell::GetPrimaryRootWindow()->GetChildById( + kShellWindowId_OverlayContainer); + menu_widget->Init(params); + + gfx::Rect widget_bounds = + display::Screen::GetScreen()->GetPrimaryDisplay().bounds(); + menu_widget->SetBounds(widget_bounds); + return menu_widget; +} + } // namespace +constexpr base::TimeDelta PowerButtonController::kScreenStateChangeDelay; + +constexpr base::TimeDelta PowerButtonController::kIgnoreRepeatedButtonUpDelay; + +constexpr base::TimeDelta + PowerButtonController::kIgnorePowerButtonAfterResumeDelay; + PowerButtonController::PowerButtonController( BacklightsForcedOffSetter* backlights_forced_off_setter) : backlights_forced_off_setter_(backlights_forced_off_setter), lock_state_controller_(Shell::Get()->lock_state_controller()), tick_clock_(base::DefaultTickClock::GetInstance()), + backlights_forced_off_observer_(this), weak_factory_(this) { ProcessCommandLine(); display_controller_ = std::make_unique<PowerButtonDisplayController>( @@ -50,11 +83,15 @@ &PowerButtonController::OnGetSwitchStates, weak_factory_.GetWeakPtr())); chromeos::AccelerometerReader::GetInstance()->AddObserver(this); Shell::Get()->display_configurator()->AddObserver(this); - Shell::Get()->PrependPreTargetHandler(this); + backlights_forced_off_observer_.Add(backlights_forced_off_setter); + Shell::Get()->tablet_mode_controller()->AddObserver(this); + ShellPort::Get()->AddLockStateObserver(this); } PowerButtonController::~PowerButtonController() { - Shell::Get()->RemovePreTargetHandler(this); + ShellPort::Get()->RemoveLockStateObserver(this); + if (Shell::Get()->tablet_mode_controller()) + Shell::Get()->tablet_mode_controller()->RemoveObserver(this); Shell::Get()->display_configurator()->RemoveObserver(this); chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this); chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver( @@ -65,22 +102,24 @@ bool down, const base::TimeTicks& timestamp) { power_button_down_ = down; - if (down) - started_lock_animation_for_power_button_down_ = false; - // Avoid starting the lock/shutdown sequence if the power button is pressed - // while the screen is off (http://crbug.com/128451), unless an external - // display is still on (http://crosbug.com/p/24912). - if (brightness_is_zero_ && !internal_display_off_and_external_display_on_) + // Ignore power button if lock button is being pressed. + if (lock_button_down_) return; - const SessionController* const session_controller = - Shell::Get()->session_controller(); if (button_type_ == ButtonType::LEGACY) { + // Avoid starting the lock/shutdown sequence if the power button is pressed + // while the screen is off (http://crbug.com/128451), unless an external + // display is still on (http://crosbug.com/p/24912). + if (brightness_is_zero_ && !internal_display_off_and_external_display_on_) + return; + // If power button releases won't get reported correctly because we're not // running on official hardware, just lock the screen or shut down // immediately. if (down) { + const SessionController* const session_controller = + Shell::Get()->session_controller(); if (session_controller->CanLockScreen() && !session_controller->IsUserSessionBlocked() && !lock_state_controller_->LockRequested()) { @@ -93,35 +132,51 @@ } if (down) { - // If we already have a pending request to lock the screen, wait. - if (lock_state_controller_->LockRequested()) + if (turn_screen_off_for_tap_) { + force_off_on_button_up_ = true; + + // When the system resumes in response to the power button being pressed, + // Chrome receives powerd's SuspendDone signal and notification that the + // backlight has been turned back on before seeing the power button events + // that woke the system. Avoid forcing off display just after resuming to + // ensure that we don't turn the display off in response to the events. + if (timestamp - last_resume_time_ <= kIgnorePowerButtonAfterResumeDelay) + force_off_on_button_up_ = false; + + // The actual display may remain off for a short period after powerd asks + // Chrome to turn it on. If the user presses the power button again during + // this time, they probably intend to turn the display on. Avoid forcing + // off in this case. + if (timestamp - display_controller_->screen_state_last_changed() <= + kScreenStateChangeDelay) { + force_off_on_button_up_ = false; + } + } + + screen_off_when_power_button_down_ = !display_controller_->IsScreenOn(); + display_controller_->SetBacklightsForcedOff(false); + + power_button_menu_timer_.Start( + FROM_HERE, kStartPowerButtonMenuAnimationTimeout, this, + &PowerButtonController::OnPowerButtonMenuTimeout); + + shutdown_timer_.Start(FROM_HERE, kStartShutdownTimeout, this, + &PowerButtonController::OnShutdownTimeout); + } else { + const base::TimeTicks previous_up_time = last_button_up_time_; + last_button_up_time_ = timestamp; + + const bool menu_timer_was_running = power_button_menu_timer_.IsRunning(); + power_button_menu_timer_.Stop(); + shutdown_timer_.Stop(); + + // Ignore the event if it comes too soon after the last one. + if (timestamp - previous_up_time <= kIgnoreRepeatedButtonUpDelay) return; - if (session_controller->CanLockScreen() && - !session_controller->IsUserSessionBlocked()) { - lock_state_controller_->StartLockThenShutdownAnimation( - ShutdownReason::POWER_BUTTON); - started_lock_animation_for_power_button_down_ = true; - } else { - lock_state_controller_->StartShutdownAnimation( - ShutdownReason::POWER_BUTTON); - } - } else { // Button is up. - if (lock_state_controller_->CanCancelLockAnimation()) - lock_state_controller_->CancelLockAnimation(); - else if (lock_state_controller_->CanCancelShutdownAnimation()) - lock_state_controller_->CancelShutdownAnimation(); - - // Avoid awkwardly keeping the display on at the lock screen for a long time - // if we're forcing clamshell behavior on a convertible device, since it - // makes it difficult to transport the device while it's in tablet mode. - if (force_clamshell_power_button_ && - started_lock_animation_for_power_button_down_ && - (session_controller->IsScreenLocked() || - lock_state_controller_->LockRequested())) { - display_off_timer_.Start( - FROM_HERE, kDisplayOffAfterLockDelay, this, - &PowerButtonController::ForceDisplayOffAfterLock); + if (menu_timer_was_running && !screen_off_when_power_button_down_ && + force_off_on_button_up_) { + display_controller_->SetBacklightsForcedOff(true); } } } @@ -131,6 +186,10 @@ const base::TimeTicks& timestamp) { lock_button_down_ = down; + // Ignore the lock button behavior if power button is being pressed. + if (power_button_down_) + return; + const SessionController* const session_controller = Shell::Get()->session_controller(); if (!session_controller->CanLockScreen() || @@ -140,29 +199,25 @@ return; } - // Give the power button precedence over the lock button. - if (power_button_down_) - return; - + DismissMenu(); if (down) lock_state_controller_->StartLockAnimation(); else lock_state_controller_->CancelLockAnimation(); } -void PowerButtonController::OnKeyEvent(ui::KeyEvent* event) { - if (event->key_code() != ui::VKEY_POWER) - display_off_timer_.Stop(); +void PowerButtonController::CancelPowerButtonEvent() { + force_off_on_button_up_ = false; + StopTimersAndDismissMenu(); } -void PowerButtonController::OnMouseEvent(ui::MouseEvent* event) { - if (event->flags() & ui::EF_IS_SYNTHESIZED) - return; - display_off_timer_.Stop(); +bool PowerButtonController::IsMenuOpened() const { + return menu_widget_ && menu_widget_->GetLayer()->GetTargetVisibility(); } -void PowerButtonController::OnTouchEvent(ui::TouchEvent* event) { - display_off_timer_.Stop(); +void PowerButtonController::DismissMenu() { + if (IsMenuOpened()) + menu_widget_->Hide(); } void PowerButtonController::OnDisplayModeChanged( @@ -191,77 +246,98 @@ if (lock_state_controller_->ShutdownRequested()) return; - // PowerButtonDisplayController ignores power button events, so tell it to - // stop forcing the display off if TabletPowerButtonController isn't - // being used. - if (down && force_clamshell_power_button_) - display_controller_->SetBacklightsForcedOff(false); - // Handle tablet mode power button screenshot accelerator. if (screenshot_controller_ && screenshot_controller_->OnPowerButtonEvent(down, timestamp)) { return; } - // Handle tablet power button behavior. Should show power button menu only if - // |show_power_button_menu_| is true and the device is in tablet mode. - if (button_type_ == ButtonType::NORMAL && tablet_controller_ && - (!show_power_button_menu_ || Shell::Get() - ->tablet_mode_controller() - ->IsTabletModeWindowManagerEnabled())) { - tablet_controller_->OnPowerButtonEvent(down, timestamp); - return; - } - - // Handle clamshell power button behavior. OnPowerButtonEvent(down, timestamp); } +void PowerButtonController::SuspendImminent( + power_manager::SuspendImminent::Reason reason) { + DismissMenu(); +} + +void PowerButtonController::SuspendDone(const base::TimeDelta& sleep_duration) { + last_resume_time_ = tick_clock_->NowTicks(); +} + void PowerButtonController::OnGetSwitchStates( base::Optional<chromeos::PowerManagerClient::SwitchStates> result) { if (!result.has_value()) return; - // Tablet power button behavior (except |force_clamshell_power_button_|) and - // power button screenshot accelerator are enabled on devices that have a - // tablet mode switch. + // Turn screen off if tapping the power button (except + // |force_clamshell_power_button_|) and power button screenshot accelerator + // are enabled on devices that have a tablet mode switch. if (result->tablet_mode == chromeos::PowerManagerClient::TabletMode::UNSUPPORTED) { return; } has_tablet_mode_switch_ = true; - InitControllerMembers(); + InitTabletPowerButtonMembers(); } void PowerButtonController::OnAccelerometerUpdated( scoped_refptr<const chromeos::AccelerometerUpdate> update) { - // Tablet power button behavior (except |force_clamshell_power_button_|) and - // power button screenshot accelerator are enabled on devices that can enter - // tablet mode, which must have a tablet mode switch or report accelerometer - // data before user actions. + // Turn screen off if tapping the power button (except + // |force_clamshell_power_button_|) and power button screenshot accelerator + // are enabled on devices that can enter tablet mode, which must have a tablet + // mode switch or report accelerometer data before user actions. if (has_tablet_mode_switch_ || !observe_accelerometer_events_) return; - InitControllerMembers(); + InitTabletPowerButtonMembers(); } -void PowerButtonController::SetTickClockForTesting( - base::TickClock* tick_clock) { - DCHECK(tick_clock); - tick_clock_ = tick_clock; - - display_controller_ = std::make_unique<PowerButtonDisplayController>( - backlights_forced_off_setter_, tick_clock_); +void PowerButtonController::OnBacklightsForcedOffChanged(bool forced_off) { + DismissMenu(); } -bool PowerButtonController::TriggerDisplayOffTimerForTesting() { - if (!display_off_timer_.IsRunning()) - return false; +void PowerButtonController::OnScreenStateChanged( + BacklightsForcedOffSetter::ScreenState screen_state) { + DismissMenu(); +} - base::Closure task = display_off_timer_.user_task(); - display_off_timer_.Stop(); - task.Run(); - return true; +void PowerButtonController::OnTabletModeStarted() { + StopTimersAndDismissMenu(); +} + +void PowerButtonController::OnTabletModeEnded() { + StopTimersAndDismissMenu(); +} + +void PowerButtonController::OnLockStateEvent( + LockStateObserver::EventType event) { + // Reset |lock_button_down_| when lock animation finished. LOCK_RELEASED is + // not allowed when screen is locked, which means OnLockButtonEvent will not + // be called in lock screen. This will lead |lock_button_down_| to stay in a + // dirty state if press lock button after login but release in lock screen. + if (event == EVENT_LOCK_ANIMATION_FINISHED) + lock_button_down_ = false; +} + +void PowerButtonController::StopTimersAndDismissMenu() { + shutdown_timer_.Stop(); + power_button_menu_timer_.Stop(); + DismissMenu(); +} + +void PowerButtonController::OnPowerButtonMenuTimeout() { + if (!menu_widget_) + menu_widget_ = CreateMenuWidget(); + menu_widget_->SetContentsView(new PowerButtonMenuScreenView()); + menu_widget_->Show(); + + static_cast<PowerButtonMenuScreenView*>(menu_widget_->GetContentsView()) + ->ScheduleShowHideAnimation(true); +} + +void PowerButtonController::OnShutdownTimeout() { + display_controller_->SetBacklightsForcedOff(true); + lock_state_controller_->RequestShutdown(ShutdownReason::POWER_BUTTON); } void PowerButtonController::ProcessCommandLine() { @@ -272,23 +348,15 @@ observe_accelerometer_events_ = cl->HasSwitch(switches::kAshEnableTabletMode); force_clamshell_power_button_ = cl->HasSwitch(switches::kForceClamshellPowerButton); - show_power_button_menu_ = cl->HasSwitch(switches::kShowPowerButtonMenu); } -void PowerButtonController::ForceDisplayOffAfterLock() { - display_controller_->SetBacklightsForcedOff(true); -} - -void PowerButtonController::InitControllerMembers() { - if (!force_clamshell_power_button_ && !tablet_controller_) { - tablet_controller_ = std::make_unique<TabletPowerButtonController>( - display_controller_.get(), backlights_forced_off_setter_, - show_power_button_menu_, tick_clock_); - } +void PowerButtonController::InitTabletPowerButtonMembers() { + if (!force_clamshell_power_button_) + turn_screen_off_for_tap_ = true; if (!screenshot_controller_) { - screenshot_controller_ = std::make_unique<PowerButtonScreenshotController>( - tablet_controller_.get(), tick_clock_, force_clamshell_power_button_); + screenshot_controller_ = + std::make_unique<PowerButtonScreenshotController>(tick_clock_); } }
diff --git a/ash/system/power/power_button_controller.h b/ash/system/power/power_button_controller.h index 330b873..6f7cf8725 100644 --- a/ash/system/power/power_button_controller.h +++ b/ash/system/power/power_button_controller.h
@@ -8,37 +8,44 @@ #include <memory> #include "ash/ash_export.h" +#include "ash/system/power/backlights_forced_off_setter.h" +#include "ash/wm/lock_state_observer.h" +#include "ash/wm/tablet_mode/tablet_mode_observer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chromeos/accelerometer/accelerometer_reader.h" #include "chromeos/dbus/power_manager_client.h" #include "ui/display/manager/chromeos/display_configurator.h" -#include "ui/events/event_handler.h" namespace base { class TickClock; class TimeTicks; } // namespace base +namespace views { +class Widget; +} // namespace views + namespace ash { -class BacklightsForcedOffSetter; class LockStateController; class PowerButtonDisplayController; class PowerButtonScreenshotController; -class TabletPowerButtonController; -// Handles power button and lock button events. For convertible/tablet devices, -// power button events are handled by TabletPowerButtonController to -// perform tablet power button behavior, except forced clamshell set by -// command line. For clamshell devices, power button acts locking or shutdown. -// On tablet mode, power button may also be consumed to take a screenshot. +// Handles power button and lock button events. Holding the power button +// displays a menu and later shuts down on all devices. Tapping the power button +// of convertible/slate/detachable devices (except forced clamshell set by +// command line) will turn screen off but nothing will happen for clamshell +// devices. In tablet mode, power button may also be consumed to take a +// screenshot. class ASH_EXPORT PowerButtonController - : public ui::EventHandler, - public display::DisplayConfigurator::Observer, + : public display::DisplayConfigurator::Observer, public chromeos::PowerManagerClient::Observer, - public chromeos::AccelerometerReader::Observer { + public chromeos::AccelerometerReader::Observer, + public BacklightsForcedOffSetter::Observer, + public TabletModeObserver, + public LockStateObserver { public: enum class ButtonType { // Indicates normal power button type. @@ -50,20 +57,41 @@ LEGACY, }; + // Amount of time since last screen state change that power button event needs + // to be ignored. + static constexpr base::TimeDelta kScreenStateChangeDelay = + base::TimeDelta::FromMilliseconds(500); + + // Ignore button-up events occurring within this many milliseconds of the + // previous button-up event. This prevents us from falling behind if the power + // button is pressed repeatedly. + static constexpr base::TimeDelta kIgnoreRepeatedButtonUpDelay = + base::TimeDelta::FromMilliseconds(500); + + // Amount of time since last SuspendDone() that power button event needs to be + // ignored. + static constexpr base::TimeDelta kIgnorePowerButtonAfterResumeDelay = + base::TimeDelta::FromSeconds(2); + explicit PowerButtonController( BacklightsForcedOffSetter* backlights_forced_off_setter); ~PowerButtonController() override; - // Handles clamshell power button behavior. + // Handles power button behavior. void OnPowerButtonEvent(bool down, const base::TimeTicks& timestamp); // Handles lock button behavior. void OnLockButtonEvent(bool down, const base::TimeTicks& timestamp); - // ui::EventHandler: - void OnKeyEvent(ui::KeyEvent* event) override; - void OnMouseEvent(ui::MouseEvent* event) override; - void OnTouchEvent(ui::TouchEvent* event) override; + // Cancels the ongoing power button behavior. This can be called while the + // button is still held to prevent any action from being taken on release. + void CancelPowerButtonEvent(); + + // True if the menu is opened. + bool IsMenuOpened() const; + + // Dismisses the menu. + void DismissMenu(); // display::DisplayConfigurator::Observer: void OnDisplayModeChanged( @@ -73,9 +101,11 @@ void BrightnessChanged(int level, bool user_initiated) override; void PowerButtonEventReceived(bool down, const base::TimeTicks& timestamp) override; + void SuspendImminent(power_manager::SuspendImminent::Reason reason) override; + void SuspendDone(const base::TimeDelta& sleep_duration) override; - // Initializes the |tablet_controller_| and |screenshot_controller_| according - // to the tablet mode switch in |result|. + // Initializes |turn_screen_off_for_tap_| and |screenshot_controller_| + // according to the tablet mode switch in |result|. void OnGetSwitchStates( base::Optional<chromeos::PowerManagerClient::SwitchStates> result); @@ -85,39 +115,38 @@ void OnAccelerometerUpdated( scoped_refptr<const chromeos::AccelerometerUpdate> update) override; - // Overrides the tick clock used by |this| for testing. - void SetTickClockForTesting(base::TickClock* tick_clock); + // BacklightsForcedOffSetter::Observer: + void OnBacklightsForcedOffChanged(bool forced_off) override; + void OnScreenStateChanged( + BacklightsForcedOffSetter::ScreenState screen_state) override; - // If |display_off_timer_| is running, stops it, runs its task, and returns - // true. Otherwise, returns false. - bool TriggerDisplayOffTimerForTesting() WARN_UNUSED_RESULT; + // TabletModeObserver: + void OnTabletModeStarted() override; + void OnTabletModeEnded() override; - PowerButtonScreenshotController* screenshot_controller_for_test() { - return screenshot_controller_.get(); - } - - TabletPowerButtonController* tablet_power_button_controller_for_test() { - return tablet_controller_.get(); - } - - void set_power_button_type_for_test(ButtonType button_type) { - button_type_ = button_type; - } + // LockStateObserver: + void OnLockStateEvent(LockStateObserver::EventType event) override; private: + friend class PowerButtonControllerTestApi; + + // Stops |power_button_menu_timer_|, |shutdown_timer_| and dismisses the power + // button menu. + void StopTimersAndDismissMenu(); + + // Called by |power_button_menu_timer_| to start showing power button menu. + void OnPowerButtonMenuTimeout(); + + // Called by |shutdown_timer_| to turn the screen off and request shutdown. + void OnShutdownTimeout(); + // Updates |button_type_| and |force_clamshell_power_button_| based on the // current command line. void ProcessCommandLine(); - // Called by |display_off_timer_| to force backlights off shortly after the - // screen is locked. Only used when |force_clamshell_power_button_| is true. - void ForceDisplayOffAfterLock(); - - // Initializes |tablet_controller_| and |screenshot_controller_|. - void InitControllerMembers(); - - // Used to force backlights off, when needed. - BacklightsForcedOffSetter* backlights_forced_off_setter_; // Not owned. + // Initializes tablet power button behavior related members + // |turn_screen_off_for_tap_| and |screenshot_controller_|. + void InitTabletPowerButtonMembers(); // Are the power or lock buttons currently held? bool power_button_down_ = false; @@ -138,21 +167,25 @@ // mode. bool observe_accelerometer_events_ = false; - // True if the device should show power button menu when the power button is - // long-pressed. - bool show_power_button_menu_ = false; - // True if the device should use non-tablet-style power button behavior even // if it is a convertible device. bool force_clamshell_power_button_ = false; - // True if the lock animation was started for the last power button down - // event. - bool started_lock_animation_for_power_button_down_ = false; - // True if the device has tablet mode switch. bool has_tablet_mode_switch_ = false; + // True if should turn screen off when tapping the power button. + bool turn_screen_off_for_tap_ = false; + + // True if the screen was off when the power button was pressed. + bool screen_off_when_power_button_down_ = false; + + // True if the next button release event should force the display off. + bool force_off_on_button_up_ = false; + + // Used to force backlights off, when needed. + BacklightsForcedOffSetter* backlights_forced_off_setter_; // Not owned. + LockStateController* lock_state_controller_; // Not owned. // Time source for performed action times. @@ -164,12 +197,26 @@ // Handles events for power button screenshot. std::unique_ptr<PowerButtonScreenshotController> screenshot_controller_; - // Handles events for convertible/tablet devices. - std::unique_ptr<TabletPowerButtonController> tablet_controller_; + // Saves the most recent timestamp that powerd resumed from suspend, + // updated in SuspendDone(). + base::TimeTicks last_resume_time_; - // Used to run ForceDisplayOffAfterLock() shortly after the screen is locked. - // Only started when |force_clamshell_power_button_| is true. - base::OneShotTimer display_off_timer_; + // Saves the most recent timestamp that power button was released. + base::TimeTicks last_button_up_time_; + + // Started when the power button is pressed and stopped when it's released. + // Runs OnShutdownTimeout() to start shutdown. + base::OneShotTimer shutdown_timer_; + + // Started when the power button is pressed and stopped when it's released. + // Runs OnPowerButtonMenuTimeout() to show the power button menu. + base::OneShotTimer power_button_menu_timer_; + + // The fullscreen widget of power button menu. + std::unique_ptr<views::Widget> menu_widget_; + + ScopedObserver<BacklightsForcedOffSetter, BacklightsForcedOffSetter::Observer> + backlights_forced_off_observer_; base::WeakPtrFactory<PowerButtonController> weak_factory_;
diff --git a/ash/system/power/power_button_controller_test_api.cc b/ash/system/power/power_button_controller_test_api.cc new file mode 100644 index 0000000..0ebad831 --- /dev/null +++ b/ash/system/power/power_button_controller_test_api.cc
@@ -0,0 +1,105 @@ +// Copyright 2017 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 "ash/system/power/power_button_controller_test_api.h" + +#include "ash/system/power/power_button_display_controller.h" +#include "ash/system/power/power_button_menu_screen_view.h" +#include "ash/system/power/power_button_menu_view.h" +#include "ash/system/power/power_button_screenshot_controller.h" +#include "base/time/default_tick_clock.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/views/widget/widget.h" + +namespace ash { + +PowerButtonControllerTestApi::PowerButtonControllerTestApi( + PowerButtonController* controller) + : controller_(controller) {} + +PowerButtonControllerTestApi::~PowerButtonControllerTestApi() = default; + +bool PowerButtonControllerTestApi::ShutdownTimerIsRunning() const { + return controller_->shutdown_timer_.IsRunning(); +} + +bool PowerButtonControllerTestApi::TriggerShutdownTimeout() { + if (!controller_->shutdown_timer_.IsRunning()) + return false; + + base::Closure task = controller_->shutdown_timer_.user_task(); + controller_->shutdown_timer_.Stop(); + task.Run(); + return true; +} + +bool PowerButtonControllerTestApi::PowerButtonMenuTimerIsRunning() const { + return controller_->power_button_menu_timer_.IsRunning(); +} + +bool PowerButtonControllerTestApi::TriggerPowerButtonMenuTimeout() { + if (!controller_->power_button_menu_timer_.IsRunning()) + return false; + + base::Closure task = controller_->power_button_menu_timer_.user_task(); + controller_->power_button_menu_timer_.Stop(); + task.Run(); + return true; +} + +void PowerButtonControllerTestApi::SendKeyEvent(ui::KeyEvent* event) { + controller_->display_controller_->OnKeyEvent(event); +} + +gfx::Rect PowerButtonControllerTestApi::GetMenuBoundsInScreen() const { + return IsMenuOpened() ? GetPowerButtonMenuView()->GetBoundsInScreen() + : gfx::Rect(); +} + +PowerButtonMenuView* PowerButtonControllerTestApi::GetPowerButtonMenuView() + const { + return IsMenuOpened() ? static_cast<PowerButtonMenuScreenView*>( + controller_->menu_widget_->GetContentsView()) + ->power_button_menu_view() + : nullptr; +} + +bool PowerButtonControllerTestApi::IsMenuOpened() const { + return controller_->IsMenuOpened(); +} + +bool PowerButtonControllerTestApi::MenuHasSignOutItem() const { + return IsMenuOpened() && + GetPowerButtonMenuView()->sign_out_item_for_testing(); +} + +bool PowerButtonControllerTestApi::ShouldTurnScreenOffForTap() const { + return controller_->turn_screen_off_for_tap_; +} + +PowerButtonScreenshotController* +PowerButtonControllerTestApi::GetScreenshotController() { + return controller_->screenshot_controller_.get(); +} + +void PowerButtonControllerTestApi::SetPowerButtonType( + PowerButtonController::ButtonType button_type) { + controller_->button_type_ = button_type; +} + +void PowerButtonControllerTestApi::SetTickClock(base::TickClock* tick_clock) { + DCHECK(tick_clock); + controller_->tick_clock_ = tick_clock; + + controller_->display_controller_ = + std::make_unique<PowerButtonDisplayController>( + controller_->backlights_forced_off_setter_, controller_->tick_clock_); +} + +void PowerButtonControllerTestApi::SetTurnScreenOffForTap( + bool turn_screen_off_for_tap) { + controller_->turn_screen_off_for_tap_ = turn_screen_off_for_tap; +} + +} // namespace ash
diff --git a/ash/system/power/power_button_controller_test_api.h b/ash/system/power/power_button_controller_test_api.h new file mode 100644 index 0000000..ed9680a --- /dev/null +++ b/ash/system/power/power_button_controller_test_api.h
@@ -0,0 +1,83 @@ +// Copyright 2017 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 ASH_SYSTEM_POWER_POWER_BUTTON_CONTROLLER_TEST_API_H_ +#define ASH_SYSTEM_POWER_POWER_BUTTON_CONTROLLER_TEST_API_H_ + +#include "ash/system/power/power_button_controller.h" +#include "base/compiler_specific.h" +#include "base/macros.h" + +namespace base { +class TickClock; +} // namespace base + +namespace ui { +class KeyEvent; +} // namespace ui + +namespace gfx { +class Rect; +} // namespace gfx + +namespace ash { +class PowerButtonMenuView; +class PowerButtonScreenshotController; + +// Helper class used by tests to access PowerButtonController's internal state. +class PowerButtonControllerTestApi { + public: + explicit PowerButtonControllerTestApi(PowerButtonController* controller); + ~PowerButtonControllerTestApi(); + + // Returns true when |controller_->shutdown_timer_| is running. + bool ShutdownTimerIsRunning() const; + + // If |controller_->shutdown_timer_| is running, stops it, runs its task, and + // returns true. Otherwise, returns false. + bool TriggerShutdownTimeout() WARN_UNUSED_RESULT; + + // Returns true when |power_button_menu_timer_| is running. + bool PowerButtonMenuTimerIsRunning() const; + + // If |controller_->power_button_menu_timer_| is running, stops it, runs its + // task, and returns true. Otherwise, returns false. + bool TriggerPowerButtonMenuTimeout() WARN_UNUSED_RESULT; + + // Sends |event| to |controller_->display_controller_|. + void SendKeyEvent(ui::KeyEvent* event); + + // Gets the bounds of the menu view in screen. + gfx::Rect GetMenuBoundsInScreen() const; + + // Gets the PowerButtonMenuView of the |controller_|'s menu, which is used by + // GetMenuBoundsInScreen. + PowerButtonMenuView* GetPowerButtonMenuView() const; + + // True if the menu is opened. + bool IsMenuOpened() const; + + // True if |controller_|'s menu has a sign out item. + bool MenuHasSignOutItem() const; + + // True if should turn screen off when tapping the power button. + bool ShouldTurnScreenOffForTap() const; + + PowerButtonScreenshotController* GetScreenshotController(); + + void SetPowerButtonType(PowerButtonController::ButtonType button_type); + + void SetTickClock(base::TickClock* tick_clock); + + void SetTurnScreenOffForTap(bool turn_screen_off_for_tap); + + private: + PowerButtonController* controller_; // Not owned. + + DISALLOW_COPY_AND_ASSIGN(PowerButtonControllerTestApi); +}; + +} // namespace ash + +#endif // ASH_SYSTEM_POWER_POWER_BUTTON_CONTROLLER_TEST_API_H_
diff --git a/ash/system/power/tablet_power_button_controller_unittest.cc b/ash/system/power/power_button_controller_unittest.cc similarity index 64% rename from ash/system/power/tablet_power_button_controller_unittest.cc rename to ash/system/power/power_button_controller_unittest.cc index 7131b7ce..dd9bed1 100644 --- a/ash/system/power/tablet_power_button_controller_unittest.cc +++ b/ash/system/power/power_button_controller_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/system/power/tablet_power_button_controller.h" +#include "ash/system/power/power_button_controller.h" #include "ash/accessibility/accessibility_controller.h" #include "ash/accessibility/test_accessibility_controller_client.h" @@ -10,8 +10,8 @@ #include "ash/public/cpp/ash_switches.h" #include "ash/session/session_controller.h" #include "ash/shell.h" +#include "ash/system/power/power_button_controller_test_api.h" #include "ash/system/power/power_button_test_base.h" -#include "ash/system/power/tablet_power_button_controller_test_api.h" #include "ash/test_media_client.h" #include "ash/touch/touch_devices_controller.h" #include "ash/wm/lock_state_controller_test_api.h" @@ -20,6 +20,7 @@ #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h" #include "chromeos/dbus/fake_power_manager_client.h" +#include "chromeos/dbus/fake_session_manager_client.h" #include "chromeos/dbus/power_manager/suspend.pb.h" #include "ui/events/event.h" #include "ui/events/test/event_generator.h" @@ -35,10 +36,10 @@ } // namespace -class TabletPowerButtonControllerTest : public PowerButtonTestBase { +class PowerButtonControllerTest : public PowerButtonTestBase { public: - TabletPowerButtonControllerTest() = default; - ~TabletPowerButtonControllerTest() override = default; + PowerButtonControllerTest() = default; + ~PowerButtonControllerTest() override = default; void SetUp() override { PowerButtonTestBase::SetUp(); @@ -49,7 +50,7 @@ // Advance a duration longer than |kIgnorePowerButtonAfterResumeDelay| to // avoid events being ignored. tick_clock_.Advance( - TabletPowerButtonController::kIgnorePowerButtonAfterResumeDelay + + PowerButtonController::kIgnorePowerButtonAfterResumeDelay + base::TimeDelta::FromMilliseconds(2)); // Run the event loop so that PowerButtonDisplayController can receive the @@ -58,112 +59,202 @@ } protected: - bool GetLockedState() { - // LockScreen is an async mojo call. - SessionController* const session_controller = - Shell::Get()->session_controller(); - session_controller->FlushMojoForTest(); - return session_controller->IsScreenLocked(); - } - bool GetGlobalTouchscreenEnabled() const { return Shell::Get()->touch_devices_controller()->GetTouchscreenEnabled( TouchscreenEnabledSource::GLOBAL); } - DISALLOW_COPY_AND_ASSIGN(TabletPowerButtonControllerTest); + // Tapping power button when screen is off will turn the screen on but not + // showing the menu. + void TappingPowerButtonWhenScreenIsIdleOff() { + power_manager_client_->SendBrightnessChanged(0, true); + PressPowerButton(); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + EXPECT_FALSE(power_manager_client_->backlights_forced_off()); + power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, true); + ReleasePowerButton(); + EXPECT_FALSE(power_manager_client_->backlights_forced_off()); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + } + + // Press the power button to show the menu. + void OpenPowerButtonMenu() { + PressPowerButton(); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + ASSERT_TRUE(power_button_test_api_->TriggerPowerButtonMenuTimeout()); + ReleasePowerButton(); + ASSERT_TRUE(power_button_test_api_->IsMenuOpened()); + } + + // Tap outside of the menu view to dismiss the menu. + void TapToDismissPowerButtonMenu() { + gfx::Rect menu_bounds = power_button_test_api_->GetMenuBoundsInScreen(); + GetEventGenerator().GestureTapAt( + gfx::Point(menu_bounds.x() - 5, menu_bounds.y() - 5)); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); + } + + void PressLockButton() { + power_button_controller_->OnLockButtonEvent(true, base::TimeTicks::Now()); + } + + void ReleaseLockButton() { + power_button_controller_->OnLockButtonEvent(false, base::TimeTicks::Now()); + } + + DISALLOW_COPY_AND_ASSIGN(PowerButtonControllerTest); }; -TEST_F(TabletPowerButtonControllerTest, LockScreenIfRequired) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - SetShouldLockScreenAutomatically(true); - ASSERT_FALSE(GetLockedState()); - - // On User logged in status, power-button-press-release should lock screen if - // automatic screen-locking was requested. - PressPowerButton(); - ReleasePowerButton(); - EXPECT_TRUE(GetLockedState()); - - // On locked state, power-button-press-release should do nothing. - PressPowerButton(); - ReleasePowerButton(); - EXPECT_TRUE(GetLockedState()); - - // Unlock the sceen. - UnlockScreen(); - ASSERT_FALSE(GetLockedState()); - - // power-button-press-release should not lock the screen if automatic - // screen-locking wasn't requested. - SetShouldLockScreenAutomatically(false); - PressPowerButton(); - ReleasePowerButton(); - EXPECT_FALSE(GetLockedState()); -} - -// Tests that shutdown animation is not started if the power button is released -// quickly. -TEST_F(TabletPowerButtonControllerTest, - ReleasePowerButtonBeforeStartingShutdownAnimation) { - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); +// Tests that tapping power button of a clamshell device. +TEST_F(PowerButtonControllerTest, TappingPowerButtonOfClamshell) { + // Should not turn the screen off when screen is on. + InitPowerButtonControllerMembers(PowerManagerClient::TabletMode::UNSUPPORTED); + EXPECT_FALSE(turn_screen_off_for_tap_); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - ReleasePowerButton(); - power_manager_client_->SendBrightnessChanged(0, true); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); - EXPECT_TRUE(power_manager_client_->backlights_forced_off()); - PressPowerButton(); - power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, true); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); ReleasePowerButton(); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); -} - -// Tests that the shutdown animation is started when the power button is -// released after the timer fires. -TEST_F(TabletPowerButtonControllerTest, - ReleasePowerButtonDuringShutdownAnimation) { - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->TriggerShutdownTimeout()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - ReleasePowerButton(); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - // Test again when backlights is forced off. AdvanceClockToAvoidIgnoring(); + // Should turn screen on if screen is off. + TappingPowerButtonWhenScreenIsIdleOff(); +} + +// Tests that tapping power button of a device that has tablet mode switch. +TEST_F(PowerButtonControllerTest, TappingPowerButtonOfTablet) { + // Should turn screen off if screen is on and power button menu will not be + // shown. + EXPECT_TRUE(turn_screen_off_for_tap_); PressPowerButton(); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + EXPECT_FALSE(power_manager_client_->backlights_forced_off()); ReleasePowerButton(); - power_manager_client_->SendBrightnessChanged(0, true); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); EXPECT_TRUE(power_manager_client_->backlights_forced_off()); - PressPowerButton(); - power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, true); + // Should turn screen on if screen is off. + AdvanceClockToAvoidIgnoring(); + TappingPowerButtonWhenScreenIsIdleOff(); + + // Should not turn screen off if clamshell-like power button behavior is + // requested. + ForceClamshellPowerButton(); + SetTabletModeSwitchState(PowerManagerClient::TabletMode::ON); + AdvanceClockToAvoidIgnoring(); + EXPECT_FALSE(turn_screen_off_for_tap_); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - EXPECT_TRUE(tablet_test_api_->TriggerShutdownTimeout()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); + PressPowerButton(); ReleasePowerButton(); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); } -// Tests tapping power button when screen is idle off. -TEST_F(TabletPowerButtonControllerTest, TappingPowerButtonWhenScreenIsIdleOff) { - power_manager_client_->SendBrightnessChanged(0, true); +// Tests that release power button after menu is opened but before trigger +// shutdown will not turn screen off. +TEST_F(PowerButtonControllerTest, ReleasePowerButtonAfterShowPowerButtonMenu) { PressPowerButton(); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, true); + EXPECT_TRUE(power_button_test_api_->TriggerPowerButtonMenuTimeout()); ReleasePowerButton(); + EXPECT_TRUE(power_button_test_api_->IsMenuOpened()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_manager_client_->backlights_forced_off()); +} + +// Tests that the real shutdown is started if the power button is released +// after the timer fires when screen is on. +TEST_F(PowerButtonControllerTest, RealShutdownIfScreenIsOn) { + PressPowerButton(); + EXPECT_TRUE(power_button_test_api_->TriggerShutdownTimeout()); + ShutdownSoundPlayed(); + EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); + ReleasePowerButton(); + EXPECT_TRUE(power_manager_client_->backlights_forced_off()); + // Release power button if real shutdown started will not cancel the shutdown. + EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); +} + +// Tests that the real shutdown is started if the power button is released +// after the timer fires when screen is off. +TEST_F(PowerButtonControllerTest, RealShutdownIfScreenIsOff) { + // Press power button to turn screen off. + PressPowerButton(); + ReleaseLockButton(); + + PressPowerButton(); + EXPECT_TRUE(power_button_test_api_->TriggerShutdownTimeout()); + ShutdownSoundPlayed(); + EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); + ReleasePowerButton(); + EXPECT_TRUE(power_manager_client_->backlights_forced_off()); + // Release power button if real shutdown started will not cancel the shutdown. + EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); +} + +// Should dismiss the menu if locking screen when menu is opened. +TEST_F(PowerButtonControllerTest, LockScreenIfMenuIsOpened) { + Initialize(ButtonType::NORMAL, LoginStatus::USER); + OpenPowerButtonMenu(); + EXPECT_TRUE(power_button_test_api_->IsMenuOpened()); + PressLockButton(); + ReleaseLockButton(); + EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); + EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); +} + +// Tests press lock button and power button in sequence. +TEST_F(PowerButtonControllerTest, PressAfterAnotherReleased) { + // Tap power button after press lock button should still turn screen off. + Initialize(ButtonType::NORMAL, LoginStatus::USER); + PressLockButton(); + ReleaseLockButton(); + EXPECT_FALSE(power_manager_client_->backlights_forced_off()); + PressPowerButton(); + ReleasePowerButton(); + EXPECT_TRUE(power_manager_client_->backlights_forced_off()); + + // Press lock button after tap power button should still lock screen. + PressPowerButton(); + ReleasePowerButton(); + PressLockButton(); + ReleaseLockButton(); + EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); + EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count()); +} + +// Tests press lock/power button before release power/lock button. +TEST_F(PowerButtonControllerTest, PressBeforeAnotherReleased) { + // Press lock button when power button is still being pressed will be ignored + // and continue to turn screen off. + Initialize(ButtonType::NORMAL, LoginStatus::USER); + EXPECT_FALSE(power_manager_client_->backlights_forced_off()); + PressPowerButton(); + PressLockButton(); + ReleaseLockButton(); + ReleasePowerButton(); + EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); + EXPECT_EQ(0, session_manager_client_->request_lock_screen_call_count()); + EXPECT_TRUE(power_manager_client_->backlights_forced_off()); + + // Turn the screen on. + PressPowerButton(); + ReleasePowerButton(); + // Press power button when lock button is still being pressed. The pressing of + // power button will be ignored and continue to lock screen. + PressLockButton(); + PressPowerButton(); + ReleasePowerButton(); + ReleaseLockButton(); + EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); + EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); } // Tests tapping power button when device is suspended without backlights forced // off. -TEST_F(TabletPowerButtonControllerTest, +TEST_F(PowerButtonControllerTest, TappingPowerButtonWhenSuspendedWithoutBacklightsForcedOff) { power_manager_client_->SendSuspendImminent( power_manager::SuspendImminent_Reason_OTHER); @@ -176,25 +267,25 @@ // are not forced off. tick_clock_.Advance(base::TimeDelta::FromMilliseconds(500)); PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); ReleasePowerButton(); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); // Send the power button event after a longer delay and check that backlights // are forced off. tick_clock_.Advance(base::TimeDelta::FromMilliseconds(1600)); PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); ReleasePowerButton(); power_manager_client_->SendBrightnessChanged(0, true); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); EXPECT_TRUE(power_manager_client_->backlights_forced_off()); } // Tests tapping power button when device is suspended with backlights forced // off. -TEST_F(TabletPowerButtonControllerTest, +TEST_F(PowerButtonControllerTest, TappingPowerButtonWhenSuspendedWithBacklightsForcedOff) { PressPowerButton(); ReleasePowerButton(); @@ -212,25 +303,25 @@ tick_clock_.Advance(base::TimeDelta::FromMilliseconds(500)); PressPowerButton(); power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, true); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); ReleasePowerButton(); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); // Send the power button event after a longer delay and check that backlights // are forced off. tick_clock_.Advance(base::TimeDelta::FromMilliseconds(1600)); PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); ReleasePowerButton(); power_manager_client_->SendBrightnessChanged(0, true); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); EXPECT_TRUE(power_manager_client_->backlights_forced_off()); } // For convertible device working on laptop mode, tests keyboard/mouse event // when screen is off. -TEST_F(TabletPowerButtonControllerTest, ConvertibleOnLaptopMode) { +TEST_F(PowerButtonControllerTest, ConvertibleOnLaptopMode) { EnableTabletMode(false); // KeyEvent should SetBacklightsForcedOff(false). @@ -266,7 +357,7 @@ // For convertible device working on tablet mode, keyboard/mouse event should // not SetBacklightsForcedOff(false) when screen is off. -TEST_F(TabletPowerButtonControllerTest, ConvertibleOnTabletMode) { +TEST_F(PowerButtonControllerTest, ConvertibleOnTabletMode) { EnableTabletMode(true); PressPowerButton(); @@ -282,7 +373,7 @@ // Tests that a single set of power button pressed-and-released operation should // cause only one SetBacklightsForcedOff call. -TEST_F(TabletPowerButtonControllerTest, IgnorePowerOnKeyEvent) { +TEST_F(PowerButtonControllerTest, IgnorePowerOnKeyEvent) { ui::KeyEvent power_key_pressed(ui::ET_KEY_PRESSED, ui::VKEY_POWER, ui::EF_NONE); ui::KeyEvent power_key_released(ui::ET_KEY_RELEASED, ui::VKEY_POWER, @@ -292,22 +383,22 @@ // generated for each pressing and releasing, and multiple repeating pressed // events depending on holding. ASSERT_EQ(0, power_manager_client_->num_set_backlights_forced_off_calls()); - tablet_test_api_->SendKeyEvent(&power_key_pressed); - tablet_test_api_->SendKeyEvent(&power_key_pressed); + power_button_test_api_->SendKeyEvent(&power_key_pressed); + power_button_test_api_->SendKeyEvent(&power_key_pressed); PressPowerButton(); - tablet_test_api_->SendKeyEvent(&power_key_pressed); - tablet_test_api_->SendKeyEvent(&power_key_pressed); - tablet_test_api_->SendKeyEvent(&power_key_pressed); + power_button_test_api_->SendKeyEvent(&power_key_pressed); + power_button_test_api_->SendKeyEvent(&power_key_pressed); + power_button_test_api_->SendKeyEvent(&power_key_pressed); ReleasePowerButton(); - tablet_test_api_->SendKeyEvent(&power_key_released); - tablet_test_api_->SendKeyEvent(&power_key_released); + power_button_test_api_->SendKeyEvent(&power_key_released); + power_button_test_api_->SendKeyEvent(&power_key_released); EXPECT_EQ(1, power_manager_client_->num_set_backlights_forced_off_calls()); } // Tests that under (1) tablet power button pressed/released, (2) keyboard/mouse // events on laptop mode when screen is off, requesting/stopping backlights // forced off should update the global touchscreen enabled status. -TEST_F(TabletPowerButtonControllerTest, DisableTouchscreenWhileForcedOff) { +TEST_F(PowerButtonControllerTest, DisableTouchscreenWhileForcedOff) { // Tests tablet power button. ASSERT_TRUE(GetGlobalTouchscreenEnabled()); PressPowerButton(); @@ -346,7 +437,7 @@ // When the screen is turned off automatically, the touchscreen should also be // disabled. -TEST_F(TabletPowerButtonControllerTest, DisableTouchscreenForInactivity) { +TEST_F(PowerButtonControllerTest, DisableTouchscreenForInactivity) { ASSERT_TRUE(GetGlobalTouchscreenEnabled()); // Turn screen off for automated change (e.g. user is inactive). @@ -362,54 +453,35 @@ } // When user switches convertible device between laptop mode and tablet mode, -// power button may be pressed and held, which may cause unwanted shutdown. -TEST_F(TabletPowerButtonControllerTest, +// power button may be pressed and held, which may cause unwanted unclean +// shutdown. +TEST_F(PowerButtonControllerTest, EnterOrLeaveTabletModeWhilePressingPowerButton) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - SetShouldLockScreenAutomatically(true); - ASSERT_FALSE(GetLockedState()); - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); - tablet_controller_->OnTabletModeStarted(); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + power_button_controller_->OnTabletModeStarted(); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); tick_clock_.Advance(base::TimeDelta::FromMilliseconds(1500)); ReleasePowerButton(); - EXPECT_FALSE(GetLockedState()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->TriggerShutdownTimeout()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - tablet_controller_->OnTabletModeStarted(); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + power_button_controller_->OnTabletModeEnded(); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); tick_clock_.Advance(base::TimeDelta::FromMilliseconds(2500)); ReleasePowerButton(); - EXPECT_FALSE(GetLockedState()); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); - tablet_controller_->OnTabletModeEnded(); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); - tick_clock_.Advance(base::TimeDelta::FromMilliseconds(3500)); - ReleasePowerButton(); - EXPECT_FALSE(GetLockedState()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->TriggerShutdownTimeout()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - tablet_controller_->OnTabletModeEnded(); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); - tick_clock_.Advance(base::TimeDelta::FromMilliseconds(4500)); - ReleasePowerButton(); - EXPECT_FALSE(GetLockedState()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); } // Tests that repeated power button releases are ignored (crbug.com/675291). -TEST_F(TabletPowerButtonControllerTest, IgnoreRepeatedPowerButtonReleases) { +TEST_F(PowerButtonControllerTest, IgnoreRepeatedPowerButtonReleases) { // Set backlights forced off for starting point. PressPowerButton(); ReleasePowerButton(); @@ -440,7 +512,7 @@ } // Tests that lid closed/open events stop forcing off backlights. -TEST_F(TabletPowerButtonControllerTest, LidEventsStopForcingOff) { +TEST_F(PowerButtonControllerTest, LidEventsStopForcingOff) { // Pressing/releasing power button to set backlights forced off. PressPowerButton(); ReleasePowerButton(); @@ -466,7 +538,7 @@ } // Tests that tablet mode events from powerd stop forcing off backlights. -TEST_F(TabletPowerButtonControllerTest, TabletModeEventsStopForcingOff) { +TEST_F(PowerButtonControllerTest, TabletModeEventsStopForcingOff) { PressPowerButton(); ReleasePowerButton(); ASSERT_TRUE(power_manager_client_->backlights_forced_off()); @@ -485,7 +557,7 @@ // Tests that with system reboot, the global touchscreen enabled status should // be synced with new backlights forced off state from powerd. -TEST_F(TabletPowerButtonControllerTest, SyncTouchscreenEnabled) { +TEST_F(PowerButtonControllerTest, SyncTouchscreenEnabled) { Shell::Get()->touch_devices_controller()->SetTouchscreenEnabled( false, TouchscreenEnabledSource::GLOBAL); ASSERT_FALSE(GetGlobalTouchscreenEnabled()); @@ -503,29 +575,9 @@ EXPECT_TRUE(GetGlobalTouchscreenEnabled()); } -// Tests that tablet power button behavior is enabled on setting tablet mode -// switch enabled, otherwise it is disabled. -TEST_F(TabletPowerButtonControllerTest, EnableOnAccelerometerUpdate) { - ASSERT_TRUE(tablet_controller_); - ResetPowerButtonController(); - EXPECT_FALSE(tablet_controller_); - - SetTabletModeSwitchState(PowerManagerClient::TabletMode::ON); - EXPECT_TRUE(tablet_controller_); - - // If clamshell-like power button behavior is requested via a flag, the - // TabletPowerButtonController shouldn't be initialized in response to - // set tablet mode switch enabled. - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kForceClamshellPowerButton); - ResetPowerButtonController(); - SetTabletModeSwitchState(PowerManagerClient::TabletMode::ON); - EXPECT_FALSE(tablet_controller_); -} - // Tests that when backlights get forced off due to tablet power button, media // sessions should be suspended. -TEST_F(TabletPowerButtonControllerTest, SuspendMediaSessions) { +TEST_F(PowerButtonControllerTest, SuspendMediaSessions) { TestMediaClient client; Shell::Get()->media_controller()->SetClient(client.CreateAssociatedPtrInfo()); ASSERT_FALSE(client.media_sessions_suspended()); @@ -541,7 +593,7 @@ // Tests that when system is suspended with backlights forced off, and then // system resumes due to power button pressed without power button event fired // (crbug.com/735291), that we stop forcing off backlights. -TEST_F(TabletPowerButtonControllerTest, SuspendDoneStopsForcingOff) { +TEST_F(PowerButtonControllerTest, SuspendDoneStopsForcingOff) { PressPowerButton(); ReleasePowerButton(); power_manager_client_->SendBrightnessChanged(0, true); @@ -554,55 +606,10 @@ EXPECT_FALSE(power_manager_client_->backlights_forced_off()); } -// Tests that for tablet power button induced locking screen, locking animations -// are immediate. -TEST_F(TabletPowerButtonControllerTest, ImmediateLockAnimations) { - TestSessionStateAnimator* test_animator = new TestSessionStateAnimator; - lock_state_controller_->set_animator_for_test(test_animator); - Initialize(ButtonType::NORMAL, LoginStatus::USER); - SetShouldLockScreenAutomatically(true); - ASSERT_FALSE(GetLockedState()); - - PressPowerButton(); - ReleasePowerButton(); - // Tests that locking animation starts. - EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); - - // Tests that we have two active animation containers for pre-lock animation, - // which are non lock screen containers and shelf container. - EXPECT_EQ(2u, test_animator->GetAnimationCount()); - test_animator->AreContainersAnimated( - LockStateController::kPreLockContainersMask, - SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY); - // Tests that after finishing immediate animation, we have no active - // animations left. - test_animator->Advance(test_animator->GetDuration( - SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE)); - EXPECT_EQ(0u, test_animator->GetAnimationCount()); - - // Flushes locking screen async request to start post-lock animation. - EXPECT_TRUE(GetLockedState()); - EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); - // Tests that we have two active animation container for post-lock animation, - // which are lock screen containers and shelf container. - EXPECT_EQ(2u, test_animator->GetAnimationCount()); - test_animator->AreContainersAnimated( - SessionStateAnimator::LOCK_SCREEN_CONTAINERS, - SessionStateAnimator::ANIMATION_RAISE_TO_SCREEN); - test_animator->AreContainersAnimated(SessionStateAnimator::SHELF, - SessionStateAnimator::ANIMATION_FADE_IN); - // Tests that after finishing immediate animation, we have no active - // animations left. Also checks that animation ends. - test_animator->Advance(test_animator->GetDuration( - SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE)); - EXPECT_EQ(0u, test_animator->GetAnimationCount()); - EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); -} - // Tests that updating power button behavior from tablet behavior to clamshell // behavior will initially enable touchscreen on global touchscreen enabled // status (b/64972736). -TEST_F(TabletPowerButtonControllerTest, TouchscreenEnabledClamshell) { +TEST_F(PowerButtonControllerTest, TouchscreenEnabledClamshell) { PressPowerButton(); ReleasePowerButton(); ASSERT_TRUE(power_manager_client_->backlights_forced_off()); @@ -612,9 +619,7 @@ // flag, resetting backlights forced off state in powerd and // PowerButtonController. power_manager_client_->SetBacklightsForcedOff(false); - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kForceClamshellPowerButton); - ResetPowerButtonController(); + ForceClamshellPowerButton(); // Run the event loop for PowerButtonDisplayController to get backlight state. base::RunLoop().RunUntilIdle(); SetTabletModeSwitchState(PowerManagerClient::TabletMode::ON); @@ -623,8 +628,7 @@ // Tests that during the interval that the display is turning on, tablet power // button should not set display off (crbug.com/735225). -TEST_F(TabletPowerButtonControllerTest, - IgnoreForcingOffWhenDisplayIsTurningOn) { +TEST_F(PowerButtonControllerTest, IgnoreForcingOffWhenDisplayIsTurningOn) { PressPowerButton(); ReleasePowerButton(); power_manager_client_->SendBrightnessChanged(0, true); @@ -637,7 +641,7 @@ EXPECT_FALSE(power_manager_client_->backlights_forced_off()); // Since display could still be off, ignore forcing off. - tick_clock_.Advance(TabletPowerButtonController::kScreenStateChangeDelay - + tick_clock_.Advance(PowerButtonController::kScreenStateChangeDelay - base::TimeDelta::FromMilliseconds(1)); PressPowerButton(); ReleasePowerButton(); @@ -654,7 +658,7 @@ // Tests that a11y alert is sent on tablet power button induced screen state // change. -TEST_F(TabletPowerButtonControllerTest, A11yAlert) { +TEST_F(PowerButtonControllerTest, A11yAlert) { TestAccessibilityControllerClient client; AccessibilityController* controller = Shell::Get()->accessibility_controller(); @@ -672,133 +676,63 @@ ReleasePowerButton(); } -class TabletPowerButtonControllerShowMenuTest : public PowerButtonTestBase { - public: - TabletPowerButtonControllerShowMenuTest() { - set_show_power_button_menu(true); - } - ~TabletPowerButtonControllerShowMenuTest() override = default; - - void SetUp() override { - PowerButtonTestBase::SetUp(); - - InitPowerButtonControllerMembers(PowerManagerClient::TabletMode::ON); - EnableTabletMode(true); - - // Advance a duration longer than |kIgnorePowerButtonAfterResumeDelay| to - // avoid events being ignored. - tick_clock_.Advance( - TabletPowerButtonController::kIgnorePowerButtonAfterResumeDelay + - base::TimeDelta::FromMilliseconds(2)); - } - - // Press the power button to show the menu. - void OpenPowerButtonMenu() { - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - ASSERT_TRUE(tablet_test_api_->TriggerPowerButtonMenuTimeout()); - ReleasePowerButton(); - ASSERT_TRUE(tablet_test_api_->IsMenuOpened()); - } - - // Tap outside of the menu view to dismiss the menu. - void TapToDismissPowerButtonMenu() { - gfx::Rect menu_bounds = tablet_test_api_->GetMenuBoundsInScreen(); - GetEventGenerator().GestureTapAt( - gfx::Point(menu_bounds.x() - 5, menu_bounds.y() - 5)); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); - } - - DISALLOW_COPY_AND_ASSIGN(TabletPowerButtonControllerShowMenuTest); -}; - -// Tests that the power off menu will not be shown if the power button is -// released quickly. -TEST_F(TabletPowerButtonControllerShowMenuTest, - ReleasePowerButtonBeforeShowPowerButtonMenu) { - // Tap the power button when screen is on will turn screen off. - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - ReleasePowerButton(); - power_manager_client_->SendBrightnessChanged(0, true); - EXPECT_FALSE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - EXPECT_TRUE(power_manager_client_->backlights_forced_off()); - - AdvanceClockToAvoidIgnoring(); - // Tap the power button when screen is off will turn screen on. - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - ReleasePowerButton(); - EXPECT_FALSE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); -} - // Tests that tap outside of the menu bounds will dimiss the menu. -TEST_F(TabletPowerButtonControllerShowMenuTest, TapToDismissMenu) { +TEST_F(PowerButtonControllerTest, TapToDismissMenu) { OpenPowerButtonMenu(); TapToDismissPowerButtonMenu(); } // Tests the menu items according to the login status. -TEST_F(TabletPowerButtonControllerShowMenuTest, MenuItemsToLoginStatus) { +TEST_F(PowerButtonControllerTest, MenuItemsToLoginStatus) { // No sign out item if user is not logged in. ClearLogin(); Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::NOT_LOGGED_IN); OpenPowerButtonMenu(); - EXPECT_FALSE(tablet_test_api_->MenuHasSignOutItem()); + EXPECT_FALSE(power_button_test_api_->MenuHasSignOutItem()); TapToDismissPowerButtonMenu(); // Should have sign out item if user is login. CreateUserSessions(1); Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER); OpenPowerButtonMenu(); - EXPECT_TRUE(tablet_test_api_->MenuHasSignOutItem()); + EXPECT_TRUE(power_button_test_api_->MenuHasSignOutItem()); TapToDismissPowerButtonMenu(); // Should have sign out item if user is logged in but screen is locked. Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::LOCKED); OpenPowerButtonMenu(); - EXPECT_TRUE(tablet_test_api_->MenuHasSignOutItem()); + EXPECT_TRUE(power_button_test_api_->MenuHasSignOutItem()); } // Repeat long press should redisplay the menu. -TEST_F(TabletPowerButtonControllerShowMenuTest, PressButtonWhenMenuIsOpened) { +TEST_F(PowerButtonControllerTest, PressButtonWhenMenuIsOpened) { OpenPowerButtonMenu(); AdvanceClockToAvoidIgnoring(); OpenPowerButtonMenu(); } -// Tests that we do not show power button menu if kShowPowerButtonMenu is set -// but the device is in clamshell mode. -TEST_F(TabletPowerButtonControllerShowMenuTest, ClamshellShowPowerButtonMenu) { +// Tests that switches between laptop mode and tablet mode should dismiss the +// opened menu. +TEST_F(PowerButtonControllerTest, EnterOrLeaveTabletModeDismissMenu) { OpenPowerButtonMenu(); + power_button_controller_->OnTabletModeEnded(); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); - // Change from tablet mode to clamshell mode should dismiss the menu. - EnableTabletMode(false); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); - - // Should not show the power button menu even if the kShowPowerButtonMenu of - // the device is set but not in tablet mode. - PressPowerButton(); - ASSERT_FALSE(tablet_test_api_->TriggerPowerButtonMenuTimeout()); - ReleasePowerButton(); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); + OpenPowerButtonMenu(); + power_button_controller_->OnTabletModeStarted(); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); } // Tests that screen changes to idle off will dismiss the opened menu. -TEST_F(TabletPowerButtonControllerShowMenuTest, - DismissMenuWhenScreenIsIdleOff) { +TEST_F(PowerButtonControllerTest, DismissMenuWhenScreenIsIdleOff) { OpenPowerButtonMenu(); // Mock screen idle off. power_manager_client_->SendBrightnessChanged(0, true); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); } // Tests that tapping the power button should dimiss the opened menu. -TEST_F(TabletPowerButtonControllerShowMenuTest, - TappingPowerButtonWhenMenuIsOpened) { +TEST_F(PowerButtonControllerTest, TappingPowerButtonWhenMenuIsOpened) { OpenPowerButtonMenu(); // Tapping the power button when menu is opened will dismiss the menu. @@ -807,31 +741,31 @@ ReleasePowerButton(); power_manager_client_->SendBrightnessChanged(0, true); EXPECT_TRUE(power_manager_client_->backlights_forced_off()); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); // Long press the power button when backlights are off will show the menu. PressPowerButton(); power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, true); - EXPECT_TRUE(tablet_test_api_->TriggerPowerButtonMenuTimeout()); + EXPECT_TRUE(power_button_test_api_->TriggerPowerButtonMenuTimeout()); ReleasePowerButton(); - EXPECT_TRUE(tablet_test_api_->IsMenuOpened()); + EXPECT_TRUE(power_button_test_api_->IsMenuOpened()); // Tapping the power button will dismiss the menu. AdvanceClockToAvoidIgnoring(); PressPowerButton(); ReleasePowerButton(); power_manager_client_->SendBrightnessChanged(0, true); EXPECT_TRUE(power_manager_client_->backlights_forced_off()); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); } // Tests that suspend will dismiss the opened menu. -TEST_F(TabletPowerButtonControllerShowMenuTest, SuspendWithMenuOn) { +TEST_F(PowerButtonControllerTest, SuspendWithMenuOn) { OpenPowerButtonMenu(); power_manager_client_->SendSuspendImminent( power_manager::SuspendImminent_Reason_OTHER); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); power_manager_client_->SendSuspendDone(); - EXPECT_FALSE(tablet_test_api_->IsMenuOpened()); + EXPECT_FALSE(power_button_test_api_->IsMenuOpened()); } } // namespace ash
diff --git a/ash/system/power/power_button_menu_item_view.cc b/ash/system/power/power_button_menu_item_view.cc index 8a772a7e..62c9ad8 100644 --- a/ash/system/power/power_button_menu_item_view.cc +++ b/ash/system/power/power_button_menu_item_view.cc
@@ -27,7 +27,7 @@ constexpr int kIconSize = 24; // Top padding of the image icon to the top of the item view. -constexpr int kIconTopPadding = 16; +constexpr int kIconTopPadding = 24; // Top padding of the label of title to the top of the item view. constexpr int kTitleTopPadding = 50;
diff --git a/ash/system/power/power_button_menu_screen_view.cc b/ash/system/power/power_button_menu_screen_view.cc index 4e0fb63..468e3b6 100644 --- a/ash/system/power/power_button_menu_screen_view.cc +++ b/ash/system/power/power_button_menu_screen_view.cc
@@ -4,8 +4,9 @@ #include "ash/system/power/power_button_menu_screen_view.h" +#include "ash/shell.h" +#include "ash/system/power/power_button_controller.h" #include "ash/system/power/power_button_menu_view.h" -#include "ash/system/power/tablet_power_button_controller.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" @@ -29,10 +30,7 @@ : public views::View, public ui::ImplicitAnimationObserver { public: - explicit PowerButtonMenuBackgroundView( - TabletPowerButtonController* controller) - : controller_(controller) { - DCHECK(controller_); + PowerButtonMenuBackgroundView() { SetPaintToLayer(ui::LAYER_SOLID_COLOR); layer()->SetColor(kShieldColor); } @@ -42,7 +40,7 @@ void OnImplicitAnimationsCompleted() override { if (layer()->opacity() == 0.f) { SetVisible(false); - controller_->DismissMenu(); + Shell::Get()->power_button_controller()->DismissMenu(); } } @@ -61,15 +59,11 @@ } private: - TabletPowerButtonController* controller_ = nullptr; // Not owned. - DISALLOW_COPY_AND_ASSIGN(PowerButtonMenuBackgroundView); }; -PowerButtonMenuScreenView::PowerButtonMenuScreenView( - TabletPowerButtonController* controller) { - power_button_screen_background_shield_ = - new PowerButtonMenuBackgroundView(controller); +PowerButtonMenuScreenView::PowerButtonMenuScreenView() { + power_button_screen_background_shield_ = new PowerButtonMenuBackgroundView(); AddChildView(power_button_screen_background_shield_); power_button_menu_view_ = new PowerButtonMenuView();
diff --git a/ash/system/power/power_button_menu_screen_view.h b/ash/system/power/power_button_menu_screen_view.h index bd5a0ee..3a88200 100644 --- a/ash/system/power/power_button_menu_screen_view.h +++ b/ash/system/power/power_button_menu_screen_view.h
@@ -12,7 +12,6 @@ namespace ash { class PowerButtonMenuView; -class TabletPowerButtonController; // PowerButtonMenuScreenView is the top-level view of power button menu UI. It // creates a PowerButtonMenuBackgroundView to display the fullscreen background @@ -20,7 +19,7 @@ class ASH_EXPORT PowerButtonMenuScreenView : public views::View, public display::DisplayObserver { public: - explicit PowerButtonMenuScreenView(TabletPowerButtonController* controller); + PowerButtonMenuScreenView(); ~PowerButtonMenuScreenView() override; PowerButtonMenuView* power_button_menu_view() const {
diff --git a/ash/system/power/power_button_screenshot_controller.cc b/ash/system/power/power_button_screenshot_controller.cc index 7208eb8b51..91b582b 100644 --- a/ash/system/power/power_button_screenshot_controller.cc +++ b/ash/system/power/power_button_screenshot_controller.cc
@@ -7,7 +7,6 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" #include "ash/system/power/power_button_controller.h" -#include "ash/system/power/tablet_power_button_controller.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" @@ -30,12 +29,8 @@ PowerButtonScreenshotController::kScreenshotChordDelay; PowerButtonScreenshotController::PowerButtonScreenshotController( - TabletPowerButtonController* tablet_controller, - base::TickClock* tick_clock, - bool force_clamshell_power_button) - : tablet_controller_(tablet_controller), - tick_clock_(tick_clock), - force_clamshell_power_button_(force_clamshell_power_button) { + base::TickClock* tick_clock) + : tick_clock_(tick_clock) { DCHECK(tick_clock_); // Using prepend to make sure this event handler is put in front of // AcceleratorFilter. See Shell::Init(). @@ -60,22 +55,8 @@ return true; } - // If forced clamshell power button releases when - // |clamshell_power_button_timer_| is still running, stop the timer to - // invalidate this delayed power button behavior. - if (!down) { - clamshell_power_button_timer_.Stop(); + if (!down) return false; - } - - // If forced clamshell power button, start a timer waiting volume down key - // pressed. When timing out, perform this delayed power button behavior. - if (force_clamshell_power_button_ && !volume_down_key_pressed_ && down) { - clamshell_power_button_timer_.Start( - FROM_HERE, kScreenshotChordDelay, this, - &PowerButtonScreenshotController::OnClamshellPowerButtonTimeout); - return true; - } // If volume key is pressed, mark power button as consumed. This invalidates // other power button's behavior when user tries to operate screenshot. @@ -89,7 +70,6 @@ ui::KeyboardCode key_code = event->key_code(); if (key_code != ui::VKEY_VOLUME_DOWN && key_code != ui::VKEY_VOLUME_UP) return; - clamshell_power_button_timer_.Stop(); if (key_code == ui::VKEY_VOLUME_DOWN) { if (event->type() == ui::ET_KEY_PRESSED) { @@ -113,12 +93,9 @@ if (key_code == ui::VKEY_VOLUME_UP) volume_up_key_pressed_ = event->type() == ui::ET_KEY_PRESSED; - // When volume key is pressed, cancel the ongoing tablet power button - // behavior. - if ((volume_down_key_pressed_ || volume_up_key_pressed_) && - tablet_controller_) { - tablet_controller_->CancelTabletPowerButton(); - } + // When volume key is pressed, cancel the ongoing power button behavior. + if (volume_down_key_pressed_ || volume_up_key_pressed_) + Shell::Get()->power_button_controller()->CancelPowerButtonEvent(); // On volume down key pressed while power button not pressed yet state, do not // propagate volume down key pressed event for chord delay time. Start the @@ -167,9 +144,4 @@ Shell::Get()->accelerator_controller()->PerformActionIfEnabled(VOLUME_DOWN); } -void PowerButtonScreenshotController::OnClamshellPowerButtonTimeout() { - Shell::Get()->power_button_controller()->OnPowerButtonEvent( - true, tick_clock_->NowTicks()); -} - } // namespace ash
diff --git a/ash/system/power/power_button_screenshot_controller.h b/ash/system/power/power_button_screenshot_controller.h index 42c2935..f746b80 100644 --- a/ash/system/power/power_button_screenshot_controller.h +++ b/ash/system/power/power_button_screenshot_controller.h
@@ -19,8 +19,6 @@ namespace ash { -class TabletPowerButtonController; - // Handles power button screenshot accelerator. The screenshot condition is // pressing power button and volume down key simultaneously, similar to Android // phones. @@ -31,10 +29,7 @@ static constexpr base::TimeDelta kScreenshotChordDelay = base::TimeDelta::FromMilliseconds(150); - PowerButtonScreenshotController( - TabletPowerButtonController* tablet_controller, - base::TickClock* tick_clock, - bool force_clamshell_power_button); + explicit PowerButtonScreenshotController(base::TickClock* tick_clock); ~PowerButtonScreenshotController() override; // Returns true if power button event is consumed by |this|, otherwise false. @@ -54,10 +49,6 @@ // Called by |volume_down_timer_| to perform volume down accelerator. void OnVolumeDownTimeout(); - // Called by |clamshell_power_button_timer_| to start clamshell power button - // behavior. - void OnClamshellPowerButtonTimeout(); - // True if volume down key is pressed. bool volume_down_key_pressed_ = false; @@ -81,20 +72,9 @@ // volume down accelerator. base::OneShotTimer volume_down_timer_; - // Started when clamshell power button is pressed and volume key is not - // pressed. Stopped when volume key is pressed or power button is released. - // Runs OnClamshellTimeout to start clamshell power button behavior. - base::OneShotTimer clamshell_power_button_timer_; - - TabletPowerButtonController* tablet_controller_; // Not owned. - // Time source for performed action times. base::TickClock* tick_clock_; // Not owned. - // Initialized by PowerButtonController to indicate using non-tablet-style - // power button behavior even if we're running on a convertible device. - const bool force_clamshell_power_button_; - DISALLOW_COPY_AND_ASSIGN(PowerButtonScreenshotController); };
diff --git a/ash/system/power/power_button_screenshot_controller_test_api.cc b/ash/system/power/power_button_screenshot_controller_test_api.cc index b191a45..8b19033 100644 --- a/ash/system/power/power_button_screenshot_controller_test_api.cc +++ b/ash/system/power/power_button_screenshot_controller_test_api.cc
@@ -27,20 +27,4 @@ return true; } -bool PowerButtonScreenshotControllerTestApi:: - ClamshellPowerButtonTimerIsRunning() const { - return controller_->clamshell_power_button_timer_.IsRunning(); -} - -bool PowerButtonScreenshotControllerTestApi:: - TriggerClamshellPowerButtonTimer() { - if (!controller_->clamshell_power_button_timer_.IsRunning()) - return false; - - base::Closure task = controller_->clamshell_power_button_timer_.user_task(); - controller_->clamshell_power_button_timer_.Stop(); - task.Run(); - return true; -} - } // namespace ash
diff --git a/ash/system/power/power_button_screenshot_controller_test_api.h b/ash/system/power/power_button_screenshot_controller_test_api.h index 1053df6..1e5a81a 100644 --- a/ash/system/power/power_button_screenshot_controller_test_api.h +++ b/ash/system/power/power_button_screenshot_controller_test_api.h
@@ -24,13 +24,6 @@ // and returns true. Otherwise returns false. bool TriggerVolumeDownTimer() WARN_UNUSED_RESULT; - // Returns true if |controller_->clamshell_power_button_timer_| is running. - bool ClamshellPowerButtonTimerIsRunning() const; - - // If |clamshell_power_button_timer_| is running, stops it, runs its task, and - // returns true. Otherwise returns false. - bool TriggerClamshellPowerButtonTimer() WARN_UNUSED_RESULT; - private: PowerButtonScreenshotController* controller_;
diff --git a/ash/system/power/power_button_screenshot_controller_unittest.cc b/ash/system/power/power_button_screenshot_controller_unittest.cc index bbd2e99..3042e724 100644 --- a/ash/system/power/power_button_screenshot_controller_unittest.cc +++ b/ash/system/power/power_button_screenshot_controller_unittest.cc
@@ -9,9 +9,9 @@ #include "ash/login_status.h" #include "ash/shell.h" #include "ash/system/power/power_button_controller.h" +#include "ash/system/power/power_button_controller_test_api.h" #include "ash/system/power/power_button_screenshot_controller_test_api.h" #include "ash/system/power/power_button_test_base.h" -#include "ash/system/power/tablet_power_button_controller_test_api.h" #include "ash/test_screenshot_delegate.h" #include "ash/wm/lock_state_controller_test_api.h" #include "base/test/simple_test_tick_clock.h" @@ -39,7 +39,7 @@ // Advance a duration longer than |kIgnorePowerButtonAfterResumeDelay| to // avoid events being ignored. tick_clock_.Advance( - TabletPowerButtonController::kIgnorePowerButtonAfterResumeDelay + + PowerButtonController::kIgnorePowerButtonAfterResumeDelay + base::TimeDelta::FromMilliseconds(2)); } @@ -181,52 +181,50 @@ EXPECT_FALSE(LastKeyConsumed()); } -// Tests volume key pressed cancels the ongoing convertible power button. +// Tests volume key pressed cancels the ongoing power button behavior. TEST_F(PowerButtonScreenshotControllerTest, - PowerButtonPressedFirst_VolumeKeyCancelConvertiblePowerButton) { - // Tests volume down key can stop convertible power button's shutdown timer. + PowerButtonPressedFirst_VolumeKeyCancelPowerButton) { + // Tests volume down key can stop power button's shutdown timer and power + // button menu timer. PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); PressKey(ui::VKEY_VOLUME_DOWN); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); ReleasePowerButton(); ReleaseKey(ui::VKEY_VOLUME_DOWN); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - // Tests volume down key can stop shutdown animation timer. + // Tests volume up key can stop power button's shutdown timer and power button + // menu timer. Also tests that volume up key is not consumed. PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->TriggerShutdownTimeout()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); + EXPECT_TRUE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_TRUE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + PressKey(ui::VKEY_VOLUME_UP); + EXPECT_FALSE(LastKeyConsumed()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); + ReleasePowerButton(); + ReleaseKey(ui::VKEY_VOLUME_UP); + EXPECT_FALSE(power_manager_client_->backlights_forced_off()); + EXPECT_FALSE(LastKeyConsumed()); +} + +// Tests volume key pressed can not cancel the started real shutdown. +TEST_F(PowerButtonScreenshotControllerTest, + PowerButtonPressedFirst_VolumeKeyNotCancelPowerButton) { + // Power button shutdown behavior will turn screen off and then start the real + // shutdown. + PressPowerButton(); + EXPECT_TRUE(power_button_test_api_->TriggerShutdownTimeout()); + ShutdownSoundPlayed(); + EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); PressKey(ui::VKEY_VOLUME_DOWN); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); ReleasePowerButton(); ReleaseKey(ui::VKEY_VOLUME_DOWN); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - - // Tests volume up key can stop convertible power button's shutdown timer. - // Also tests that volume up key is not consumed. - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->ShutdownTimerIsRunning()); - PressKey(ui::VKEY_VOLUME_UP); - EXPECT_FALSE(LastKeyConsumed()); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); - ReleasePowerButton(); - ReleaseKey(ui::VKEY_VOLUME_UP); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - EXPECT_FALSE(LastKeyConsumed()); - - // Tests volume up key can stop shutdown animation timer. - // Also tests that volume up key is not consumed. - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->TriggerShutdownTimeout()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - PressKey(ui::VKEY_VOLUME_UP); - EXPECT_FALSE(LastKeyConsumed()); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); - ReleasePowerButton(); - ReleaseKey(ui::VKEY_VOLUME_UP); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - EXPECT_FALSE(LastKeyConsumed()); + EXPECT_TRUE(power_manager_client_->backlights_forced_off()); + EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); } // Tests volume down key pressed first and meets screenshot chord condition. @@ -296,178 +294,25 @@ EXPECT_FALSE(LastKeyConsumed()); } -// Tests volume key pressed first invalidates convertible power button behavior. +// Tests volume key pressed first invalidates the power button behavior. TEST_F(PowerButtonScreenshotControllerTest, VolumeKeyPressedFirst_InvalidateConvertiblePowerButton) { - // Tests volume down key invalidates convertible power button behavior. + // Tests volume down key invalidates the power button behavior. PressKey(ui::VKEY_VOLUME_DOWN); PressPowerButton(); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); ReleasePowerButton(); ReleaseKey(ui::VKEY_VOLUME_DOWN); EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - // Tests volume up key invalidates convertible power button behavior. Also + // Tests volume up key invalidates the power button behavior. Also // tests that volume up key is not consumed. PressKey(ui::VKEY_VOLUME_UP); PressPowerButton(); EXPECT_FALSE(LastKeyConsumed()); - EXPECT_FALSE(tablet_test_api_->ShutdownTimerIsRunning()); - ReleasePowerButton(); - ReleaseKey(ui::VKEY_VOLUME_UP); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - EXPECT_FALSE(LastKeyConsumed()); -} - -// Test fixture used for testing power button screenshot behavior under forced -// clamshell power button. -class ClamshellPowerButtonScreenshotControllerTest - : public PowerButtonScreenshotControllerTest { - public: - ClamshellPowerButtonScreenshotControllerTest() = default; - ~ClamshellPowerButtonScreenshotControllerTest() override = default; - - // PowerButtonScreenshotControllerTest: - void SetUp() override { - PowerButtonScreenshotControllerTest::SetUp(); - ForceClamshellPowerButton(); - SetTabletModeSwitchState(chromeos::PowerManagerClient::TabletMode::ON); - InitScreenshotTestApi(); - } - - private: - DISALLOW_COPY_AND_ASSIGN(ClamshellPowerButtonScreenshotControllerTest); -}; - -// Tests on user session power button pressed first for waiting volume down key, -// and it timeouts. -TEST_F(ClamshellPowerButtonScreenshotControllerTest, - PowerButtonPressedFirst_UserSessionWaitForVolumeDownKey) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - PressPowerButton(); - // Verifies that lock animation is not running when waiting for volume key. - EXPECT_TRUE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); - EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); - // Starts lock animation once it is done with waiting. - EXPECT_TRUE(screenshot_test_api_->TriggerClamshellPowerButtonTimer()); - EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); - ReleasePowerButton(); -} - -// Tests on non user session power button pressed first for waiting volume down -// key, and it timeouts. -TEST_F(ClamshellPowerButtonScreenshotControllerTest, - PowerButtonPressedFirst_NonUserSessionWaitForVolumeDownKey) { - Initialize(ButtonType::NORMAL, LoginStatus::NOT_LOGGED_IN); - PressPowerButton(); - // Verifies that shutdown animation is not running when waiting for volume - // key. - EXPECT_TRUE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); - // Starts shutdown animation once it is done with waiting. - EXPECT_TRUE(screenshot_test_api_->TriggerClamshellPowerButtonTimer()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - ReleasePowerButton(); -} - -// Tests when power button pressed first, its release or volume key pressed -// should stop clamshell power button timer to invalidate the delayed power -// button behavior. -TEST_F(ClamshellPowerButtonScreenshotControllerTest, - PowerButtonPressedFirst_StopClamshellPowerButtonTimer) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - // Tests volume down key stops clamshell power button timer. - PressPowerButton(); - EXPECT_TRUE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); - tick_clock_.Advance(PowerButtonScreenshotController::kScreenshotChordDelay - - base::TimeDelta::FromMilliseconds(1)); - PressKey(ui::VKEY_VOLUME_DOWN); - // Under screenshot chord condition, screenshot is taken and volume down key - // pressed is consumed. - EXPECT_EQ(1, GetScreenshotCount()); - EXPECT_TRUE(LastKeyConsumed()); - EXPECT_FALSE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); - ReleaseKey(ui::VKEY_VOLUME_DOWN); - ReleasePowerButton(); - EXPECT_FALSE(LastKeyConsumed()); - - // Tests volume up key stops clamshell power button timer. - ResetScreenshotCount(); - PressPowerButton(); - EXPECT_TRUE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); - PressKey(ui::VKEY_VOLUME_UP); - // volume up is not used for taking screenshot so it is not consumed. - EXPECT_EQ(0, GetScreenshotCount()); - EXPECT_FALSE(LastKeyConsumed()); - EXPECT_FALSE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); - ReleaseKey(ui::VKEY_VOLUME_UP); - ReleasePowerButton(); - EXPECT_FALSE(LastKeyConsumed()); - - // Tests power button release before its timeout stops clamshell power button - // timer. - PressPowerButton(); - EXPECT_TRUE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); - ReleasePowerButton(); - EXPECT_FALSE(screenshot_test_api_->ClamshellPowerButtonTimerIsRunning()); -} - -// Same as PowerButtonTestBase except that switches::kShowPowerButtonMenu is -// set. -class PowerButtonScreenshotControllerShowMenuTest - : public PowerButtonScreenshotControllerTest { - public: - PowerButtonScreenshotControllerShowMenuTest() { - set_show_power_button_menu(true); - } - ~PowerButtonScreenshotControllerShowMenuTest() override = default; - - private: - DISALLOW_COPY_AND_ASSIGN(PowerButtonScreenshotControllerShowMenuTest); -}; - -// Tests volume key pressed stops showing the power button menu. -TEST_F(PowerButtonScreenshotControllerShowMenuTest, - PowerButtonPressedFirst_VolumeKeyCancelTabletPowerButton) { - // Tests volume down key can stop the power button menu timer. - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - PressKey(ui::VKEY_VOLUME_DOWN); - EXPECT_FALSE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - ReleasePowerButton(); - ReleaseKey(ui::VKEY_VOLUME_DOWN); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - - // Tests volume up key can stop power button menu timer. Also tests that - // volume up key is not consumed. - PressPowerButton(); - EXPECT_TRUE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - PressKey(ui::VKEY_VOLUME_UP); - EXPECT_FALSE(LastKeyConsumed()); - EXPECT_FALSE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - ReleasePowerButton(); - ReleaseKey(ui::VKEY_VOLUME_UP); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - EXPECT_FALSE(LastKeyConsumed()); -} - -// Tests volume key pressed first invalidates showing the power button menu. -TEST_F(PowerButtonScreenshotControllerShowMenuTest, - VolumeKeyPressedFirst_InvalidateTabletPowerButton) { - // Tests volume down key invalidates showing the power button menu. - PressKey(ui::VKEY_VOLUME_DOWN); - PressPowerButton(); - EXPECT_FALSE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); - ReleasePowerButton(); - ReleaseKey(ui::VKEY_VOLUME_DOWN); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - - // Tests volume up key invalidates showing the power button menu. Also tests - // that volume up key is not consumed. - PressKey(ui::VKEY_VOLUME_UP); - PressPowerButton(); - EXPECT_FALSE(LastKeyConsumed()); - EXPECT_FALSE(tablet_test_api_->PowerButtonMenuTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->ShutdownTimerIsRunning()); + EXPECT_FALSE(power_button_test_api_->PowerButtonMenuTimerIsRunning()); ReleasePowerButton(); ReleaseKey(ui::VKEY_VOLUME_UP); EXPECT_FALSE(power_manager_client_->backlights_forced_off());
diff --git a/ash/system/power/power_button_test_base.cc b/ash/system/power/power_button_test_base.cc index 3a10e9a..b73fbab 100644 --- a/ash/system/power/power_button_test_base.cc +++ b/ash/system/power/power_button_test_base.cc
@@ -4,13 +4,14 @@ #include "ash/system/power/power_button_test_base.h" +#include "ash/accessibility/accessibility_controller.h" #include "ash/public/cpp/ash_switches.h" #include "ash/session/session_controller.h" #include "ash/session/test_session_controller_client.h" #include "ash/shell.h" #include "ash/shell_test_api.h" #include "ash/system/power/power_button_controller.h" -#include "ash/system/power/tablet_power_button_controller_test_api.h" +#include "ash/system/power/power_button_controller_test_api.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/lock_state_controller_test_api.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" @@ -38,19 +39,14 @@ session_manager_client_ = new chromeos::FakeSessionManagerClient; dbus_setter->SetSessionManagerClient( base::WrapUnique(session_manager_client_)); - if (has_tablet_mode_switch_) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kAshEnableTabletMode); - } - if (show_power_button_menu_) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kShowPowerButtonMenu); - } AshTestBase::SetUp(); lock_state_controller_ = Shell::Get()->lock_state_controller(); lock_state_test_api_ = std::make_unique<LockStateControllerTestApi>(lock_state_controller_); + + a11y_controller_ = Shell::Get()->accessibility_controller(); + a11y_controller_->SetClient(a11y_client_.CreateInterfacePtrAndBind()); } void PowerButtonTestBase::TearDown() { @@ -60,6 +56,7 @@ void PowerButtonTestBase::ResetPowerButtonController() { ShellTestApi().ResetPowerButtonControllerForTest(); + power_button_test_api_ = nullptr; InitPowerButtonControllerMembers( chromeos::PowerManagerClient::TabletMode::UNSUPPORTED); } @@ -67,20 +64,19 @@ void PowerButtonTestBase::InitPowerButtonControllerMembers( chromeos::PowerManagerClient::TabletMode initial_tablet_mode_switch_state) { power_button_controller_ = Shell::Get()->power_button_controller(); - power_button_controller_->SetTickClockForTesting(&tick_clock_); + power_button_test_api_ = + std::make_unique<PowerButtonControllerTestApi>(power_button_controller_); + power_button_test_api_->SetTickClock(&tick_clock_); if (initial_tablet_mode_switch_state != chromeos::PowerManagerClient::TabletMode::UNSUPPORTED) { SetTabletModeSwitchState(initial_tablet_mode_switch_state); - tablet_controller_ = - power_button_controller_->tablet_power_button_controller_for_test(); - tablet_test_api_ = std::make_unique<TabletPowerButtonControllerTestApi>( - tablet_controller_); - screenshot_controller_ = - power_button_controller_->screenshot_controller_for_test(); + turn_screen_off_for_tap_ = + power_button_test_api_->ShouldTurnScreenOffForTap(); + screenshot_controller_ = power_button_test_api_->GetScreenshotController(); } else { - tablet_test_api_ = nullptr; - tablet_controller_ = nullptr; + turn_screen_off_for_tap_ = false; + power_button_test_api_->SetTurnScreenOffForTap(turn_screen_off_for_tap_); screenshot_controller_ = nullptr; } } @@ -92,10 +88,9 @@ chromeos::PowerManagerClient::LidState::OPEN, tablet_mode_switch_state}); - tablet_controller_ = - power_button_controller_->tablet_power_button_controller_for_test(); - screenshot_controller_ = - power_button_controller_->screenshot_controller_for_test(); + turn_screen_off_for_tap_ = + power_button_test_api_->ShouldTurnScreenOffForTap(); + screenshot_controller_ = power_button_test_api_->GetScreenshotController(); } void PowerButtonTestBase::ForceClamshellPowerButton() { @@ -129,7 +124,7 @@ void PowerButtonTestBase::Initialize( PowerButtonController::ButtonType button_type, LoginStatus status) { - power_button_controller_->set_power_button_type_for_test(button_type); + power_button_test_api_->SetPowerButtonType(button_type); if (status == LoginStatus::NOT_LOGGED_IN) ClearLogin(); else @@ -154,9 +149,12 @@ } void PowerButtonTestBase::AdvanceClockToAvoidIgnoring() { - tick_clock_.Advance( - TabletPowerButtonController::kIgnoreRepeatedButtonUpDelay + - base::TimeDelta::FromMilliseconds(1)); + tick_clock_.Advance(PowerButtonController::kIgnoreRepeatedButtonUpDelay + + base::TimeDelta::FromMilliseconds(1)); +} + +void PowerButtonTestBase::ShutdownSoundPlayed() { + a11y_controller_->FlushMojoForTest(); } } // namespace ash
diff --git a/ash/system/power/power_button_test_base.h b/ash/system/power/power_button_test_base.h index 860fb41..d37feb03 100644 --- a/ash/system/power/power_button_test_base.h +++ b/ash/system/power/power_button_test_base.h
@@ -7,8 +7,8 @@ #include <memory> +#include "ash/accessibility/test_accessibility_controller_client.h" #include "ash/system/power/power_button_controller.h" -#include "ash/system/power/tablet_power_button_controller.h" #include "ash/test/ash_test_base.h" #include "base/test/simple_test_tick_clock.h" #include "ui/events/keycodes/keyboard_codes_posix.h" @@ -20,10 +20,11 @@ namespace ash { +class AccessibilityController; class LockStateController; class LockStateControllerTestApi; +class PowerButtonControllerTestApi; class PowerButtonScreenshotController; -class TabletPowerButtonControllerTestApi; enum class LoginStatus; // Base test fixture and utils for testing power button related functions. @@ -45,14 +46,14 @@ // Initializes |power_button_controller_| and other members that point at // objects owned by it. If |initial_tablet_mode_switch_state| is not // UNSUPPORTED, tablet mode switch will be set and PowerButtonController will - // create TabletPowerButtonController and PowerButtonScreenshotController - // on getting the switch. + // set |turn_screen_off_for_tap_| to true and create + // PowerButtonScreenshotController on getting the switch. void InitPowerButtonControllerMembers(chromeos::PowerManagerClient::TabletMode initial_tablet_mode_switch_state); // Sets the tablet mode switch state. And then PowerButtonController will - // initialize |tablet_controller_| and |screenshot_controller_| if the switch - // state is not UNSUPPORTED. + // initialize |turn_screen_off_for_tap_| and |screenshot_controller_| if the + // switch state is not UNSUPPORTED. void SetTabletModeSwitchState( chromeos::PowerManagerClient::TabletMode tablet_mode_switch_state); @@ -92,13 +93,11 @@ // they come too close. void AdvanceClockToAvoidIgnoring(); - void set_has_tablet_mode_switch(bool has_tablet_mode_switch) { - has_tablet_mode_switch_ = has_tablet_mode_switch; - } + // Simulate that shutdown sound duration callback is done. + void ShutdownSoundPlayed(); - void set_show_power_button_menu(bool show_power_button_menu) { - show_power_button_menu_ = show_power_button_menu; - } + // True if should turn screen off when tapping the power button. + bool turn_screen_off_for_tap_ = false; // Ownership is passed on to chromeos::DBusThreadManager. chromeos::FakePowerManagerClient* power_manager_client_ = nullptr; @@ -106,33 +105,17 @@ PowerButtonController* power_button_controller_ = nullptr; // Not owned. LockStateController* lock_state_controller_ = nullptr; // Not owned. - TabletPowerButtonController* tablet_controller_ = nullptr; // Not owned. PowerButtonScreenshotController* screenshot_controller_ = nullptr; // Not owned. std::unique_ptr<LockStateControllerTestApi> lock_state_test_api_; - std::unique_ptr<TabletPowerButtonControllerTestApi> tablet_test_api_; + std::unique_ptr<PowerButtonControllerTestApi> power_button_test_api_; base::SimpleTestTickClock tick_clock_; - - // Indicates whether switches::kAshEnableTabletMode is appended. - bool has_tablet_mode_switch_ = true; - - // Indicates whether switches::kShowPowerButtonMenu is appended. - bool show_power_button_menu_ = false; + AccessibilityController* a11y_controller_; + TestAccessibilityControllerClient a11y_client_; DISALLOW_COPY_AND_ASSIGN(PowerButtonTestBase); }; -// Base test fixture same as PowerButtonTestBase excepts that tablet mode swtich -// is not set. -class NoTabletModePowerButtonTestBase : public PowerButtonTestBase { - public: - NoTabletModePowerButtonTestBase() { set_has_tablet_mode_switch(false); } - ~NoTabletModePowerButtonTestBase() override {} - - private: - DISALLOW_COPY_AND_ASSIGN(NoTabletModePowerButtonTestBase); -}; - } // namespace ash #endif // ASH_SYSTEM_POWER_POWER_BUTTON_TEST_BASE_H_
diff --git a/ash/system/power/tablet_power_button_controller.cc b/ash/system/power/tablet_power_button_controller.cc deleted file mode 100644 index 03335a97..0000000 --- a/ash/system/power/tablet_power_button_controller.cc +++ /dev/null
@@ -1,245 +0,0 @@ -// Copyright 2016 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 "ash/system/power/tablet_power_button_controller.h" - -#include "ash/accessibility/accessibility_delegate.h" -#include "ash/public/cpp/ash_switches.h" -#include "ash/public/cpp/shell_window_ids.h" -#include "ash/session/session_controller.h" -#include "ash/shell.h" -#include "ash/shell_delegate.h" -#include "ash/shutdown_reason.h" -#include "ash/system/power/power_button_display_controller.h" -#include "ash/system/power/power_button_menu_screen_view.h" -#include "ash/wm/lock_state_controller.h" -#include "ash/wm/tablet_mode/tablet_mode_controller.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" -#include "base/time/tick_clock.h" -#include "chromeos/dbus/dbus_thread_manager.h" -#include "ui/events/devices/input_device_manager.h" -#include "ui/events/devices/stylus_state.h" -#include "ui/events/event.h" -#include "ui/views/widget/widget.h" - -namespace ash { - -namespace { - -// Amount of time the power button must be held to start the pre-shutdown -// animation when in tablet mode. This differs depending on whether the screen -// is on or off when the power button is initially pressed. -constexpr base::TimeDelta kShutdownWhenScreenOnTimeout = - base::TimeDelta::FromMilliseconds(500); -// TODO(derat): This is currently set to a high value to work around delays in -// powerd's reports of button-up events when the preceding button-down event -// turns the display on. Set it to a lower value once powerd no longer blocks on -// asking Chrome to turn the display on: http://crbug.com/685734 -constexpr base::TimeDelta kShutdownWhenScreenOffTimeout = - base::TimeDelta::FromMilliseconds(2000); - -// Time that power button should be pressed before starting to show the power -// off menu animation. -constexpr base::TimeDelta kStartPowerButtonMenuAnimationTimeout = - base::TimeDelta::FromMilliseconds(500); - -// Creates a fullscreen widget responsible for showing the power button menu. -std::unique_ptr<views::Widget> CreateMenuWidget() { - auto menu_widget = std::make_unique<views::Widget>(); - views::Widget::InitParams params( - views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; - params.keep_on_top = true; - params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; - params.name = "PowerButtonMenuWindow"; - params.layer_type = ui::LAYER_SOLID_COLOR; - params.parent = Shell::GetPrimaryRootWindow()->GetChildById( - kShellWindowId_OverlayContainer); - menu_widget->Init(params); - - gfx::Rect widget_bounds = - display::Screen::GetScreen()->GetPrimaryDisplay().bounds(); - menu_widget->SetBounds(widget_bounds); - return menu_widget; -} - -} // namespace - -constexpr base::TimeDelta TabletPowerButtonController::kScreenStateChangeDelay; - -constexpr base::TimeDelta - TabletPowerButtonController::kIgnoreRepeatedButtonUpDelay; - -constexpr base::TimeDelta - TabletPowerButtonController::kIgnorePowerButtonAfterResumeDelay; - -TabletPowerButtonController::TabletPowerButtonController( - PowerButtonDisplayController* display_controller, - BacklightsForcedOffSetter* backlights_forced_off_setter, - bool show_power_button_menu, - base::TickClock* tick_clock) - : lock_state_controller_(Shell::Get()->lock_state_controller()), - display_controller_(display_controller), - backlights_forced_off_observer_(this), - show_power_button_menu_(show_power_button_menu), - tick_clock_(tick_clock) { - chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver( - this); - backlights_forced_off_observer_.Add(backlights_forced_off_setter); - Shell::Get()->tablet_mode_controller()->AddObserver(this); -} - -TabletPowerButtonController::~TabletPowerButtonController() { - if (Shell::Get()->tablet_mode_controller()) - Shell::Get()->tablet_mode_controller()->RemoveObserver(this); - chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver( - this); -} - -void TabletPowerButtonController::OnPowerButtonEvent( - bool down, - const base::TimeTicks& timestamp) { - if (down) { - force_off_on_button_up_ = true; - - // When the system resumes in response to the power button being pressed, - // Chrome receives powerd's SuspendDone signal and notification that the - // backlight has been turned back on before seeing the power button events - // that woke the system. Avoid forcing off display just after resuming to - // ensure that we don't turn the display off in response to the events. - if (timestamp - last_resume_time_ <= kIgnorePowerButtonAfterResumeDelay) - force_off_on_button_up_ = false; - - // The actual display may remain off for a short period after powerd asks - // Chrome to turn it on. If the user presses the power button again during - // this time, they probably intend to turn the display on. Avoid forcing off - // in this case. - if (timestamp - display_controller_->screen_state_last_changed() <= - kScreenStateChangeDelay) { - force_off_on_button_up_ = false; - } - - screen_off_when_power_button_down_ = !display_controller_->IsScreenOn(); - display_controller_->SetBacklightsForcedOff(false); - if (show_power_button_menu_) { - power_button_menu_timer_.Start( - FROM_HERE, kStartPowerButtonMenuAnimationTimeout, this, - &TabletPowerButtonController::OnPowerButtonMenuTimeout); - } else { - StartShutdownTimer(); - } - } else { - const base::TimeTicks previous_up_time = last_button_up_time_; - last_button_up_time_ = timestamp; - - // When power button is released, cancel shutdown animation whenever it is - // still cancellable. - if (lock_state_controller_->CanCancelShutdownAnimation()) - lock_state_controller_->CancelShutdownAnimation(); - - // Ignore the event if it comes too soon after the last one. - if (timestamp - previous_up_time <= kIgnoreRepeatedButtonUpDelay) { - shutdown_timer_.Stop(); - power_button_menu_timer_.Stop(); - return; - } - - if (shutdown_timer_.IsRunning() || power_button_menu_timer_.IsRunning()) { - shutdown_timer_.Stop(); - power_button_menu_timer_.Stop(); - if (!screen_off_when_power_button_down_ && force_off_on_button_up_) { - display_controller_->SetBacklightsForcedOff(true); - LockScreenIfRequired(); - } - } - } -} - -bool TabletPowerButtonController::IsMenuOpened() const { - return menu_widget_ && menu_widget_->GetLayer()->GetTargetVisibility(); -} - -void TabletPowerButtonController::DismissMenu() { - if (IsMenuOpened()) - menu_widget_->Hide(); -} - -void TabletPowerButtonController::CancelTabletPowerButton() { - if (lock_state_controller_->CanCancelShutdownAnimation()) - lock_state_controller_->CancelShutdownAnimation(); - force_off_on_button_up_ = false; - shutdown_timer_.Stop(); - power_button_menu_timer_.Stop(); -} - -void TabletPowerButtonController::OnBacklightsForcedOffChanged( - bool forced_off) { - DismissMenu(); -} - -void TabletPowerButtonController::OnScreenStateChanged( - BacklightsForcedOffSetter::ScreenState screen_state) { - DismissMenu(); -} - -void TabletPowerButtonController::SuspendImminent( - power_manager::SuspendImminent::Reason reason) { - DismissMenu(); -} - -void TabletPowerButtonController::SuspendDone( - const base::TimeDelta& sleep_duration) { - last_resume_time_ = tick_clock_->NowTicks(); -} - -void TabletPowerButtonController::OnTabletModeStarted() { - power_button_menu_timer_.Stop(); - shutdown_timer_.Stop(); - if (lock_state_controller_->CanCancelShutdownAnimation()) - lock_state_controller_->CancelShutdownAnimation(); -} - -void TabletPowerButtonController::OnTabletModeEnded() { - power_button_menu_timer_.Stop(); - DismissMenu(); - shutdown_timer_.Stop(); - if (lock_state_controller_->CanCancelShutdownAnimation()) - lock_state_controller_->CancelShutdownAnimation(); -} - -void TabletPowerButtonController::StartShutdownTimer() { - base::TimeDelta timeout = screen_off_when_power_button_down_ - ? kShutdownWhenScreenOffTimeout - : kShutdownWhenScreenOnTimeout; - shutdown_timer_.Start(FROM_HERE, timeout, this, - &TabletPowerButtonController::OnShutdownTimeout); -} - -void TabletPowerButtonController::OnShutdownTimeout() { - lock_state_controller_->StartShutdownAnimation(ShutdownReason::POWER_BUTTON); -} - -void TabletPowerButtonController::LockScreenIfRequired() { - SessionController* session_controller = Shell::Get()->session_controller(); - if (session_controller->ShouldLockScreenAutomatically() && - session_controller->CanLockScreen() && - !session_controller->IsUserSessionBlocked() && - !lock_state_controller_->LockRequested()) { - lock_state_controller_->LockWithoutAnimation(); - } -} - -void TabletPowerButtonController::OnPowerButtonMenuTimeout() { - if (!menu_widget_) - menu_widget_ = CreateMenuWidget(); - menu_widget_->SetContentsView(new PowerButtonMenuScreenView(this)); - menu_widget_->Show(); - - static_cast<PowerButtonMenuScreenView*>(menu_widget_->GetContentsView()) - ->ScheduleShowHideAnimation(true); -} - -} // namespace ash
diff --git a/ash/system/power/tablet_power_button_controller.h b/ash/system/power/tablet_power_button_controller.h deleted file mode 100644 index 566fea5..0000000 --- a/ash/system/power/tablet_power_button_controller.h +++ /dev/null
@@ -1,153 +0,0 @@ -// Copyright 2016 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 ASH_SYSTEM_POWER_TABLET_POWER_BUTTON_CONTROLLER_H_ -#define ASH_SYSTEM_POWER_TABLET_POWER_BUTTON_CONTROLLER_H_ - -#include <memory> -#include <utility> - -#include "ash/ash_export.h" -#include "ash/system/power/backlights_forced_off_setter.h" -#include "ash/wm/tablet_mode/tablet_mode_observer.h" -#include "base/macros.h" -#include "base/scoped_observer.h" -#include "base/time/time.h" -#include "base/timer/timer.h" -#include "chromeos/dbus/power_manager_client.h" -#include "ui/events/devices/input_device_event_observer.h" -#include "ui/events/event_handler.h" -#include "ui/gfx/geometry/vector3d_f.h" - -namespace base { -class TickClock; -} // namespace base - -namespace views { -class Widget; -} // namespace views - -namespace ash { -class LockStateController; -class PowerButtonDisplayController; - -// Handles power button events on convertible/tablet device. This class is -// instantiated and used in PowerButtonController. -class ASH_EXPORT TabletPowerButtonController - : public BacklightsForcedOffSetter::Observer, - public chromeos::PowerManagerClient::Observer, - public TabletModeObserver { - public: - // Amount of time since last screen state change that power button event needs - // to be ignored. - static constexpr base::TimeDelta kScreenStateChangeDelay = - base::TimeDelta::FromMilliseconds(500); - - // Ignore button-up events occurring within this many milliseconds of the - // previous button-up event. This prevents us from falling behind if the power - // button is pressed repeatedly. - static constexpr base::TimeDelta kIgnoreRepeatedButtonUpDelay = - base::TimeDelta::FromMilliseconds(500); - - // Amount of time since last SuspendDone() that power button event needs to be - // ignored. - static constexpr base::TimeDelta kIgnorePowerButtonAfterResumeDelay = - base::TimeDelta::FromSeconds(2); - - TabletPowerButtonController( - PowerButtonDisplayController* display_controller, - BacklightsForcedOffSetter* backlights_forced_off_setter, - bool show_power_button_menu, - base::TickClock* tick_clock); - ~TabletPowerButtonController() override; - - // Handles a power button event. - void OnPowerButtonEvent(bool down, const base::TimeTicks& timestamp); - - // True if the menu is opened. - bool IsMenuOpened() const; - - // Dismisses the menu. - void DismissMenu(); - - // Cancel the ongoing tablet power button behavior. - void CancelTabletPowerButton(); - - // BacklightsForcedOffSetter::Observer: - void OnBacklightsForcedOffChanged(bool forced_off) override; - void OnScreenStateChanged( - BacklightsForcedOffSetter::ScreenState screen_state) override; - - // chromeos::PowerManagerClient::Observer: - void SuspendImminent(power_manager::SuspendImminent::Reason reason) override; - void SuspendDone(const base::TimeDelta& sleep_duration) override; - - // TabletModeObserver: - void OnTabletModeStarted() override; - void OnTabletModeEnded() override; - - private: - friend class TabletPowerButtonControllerTestApi; - - // Starts |shutdown_timer_| when the power button is pressed while in - // tablet mode. - void StartShutdownTimer(); - - // Called by |shutdown_timer_| to start the pre-shutdown animation. - void OnShutdownTimeout(); - - // Locks the screen if the "Show lock screen when waking from sleep" pref is - // set and locking is possible. - void LockScreenIfRequired(); - - // Called by |power_button_menu_timer_| to start showing the power button - // menu. - void OnPowerButtonMenuTimeout(); - - // True if the screen was off when the power button was pressed. - bool screen_off_when_power_button_down_ = false; - - // Saves the most recent timestamp that powerd is resuming from suspend, - // updated in SuspendDone(). - base::TimeTicks last_resume_time_; - - // Saves the most recent timestamp that power button is released. - base::TimeTicks last_button_up_time_; - - // True if power button released should force off display. - bool force_off_on_button_up_ = true; - - // Started when the tablet power button is pressed and stopped when it's - // released. Runs OnShutdownTimeout() to start shutdown. - base::OneShotTimer shutdown_timer_; - - // Used when |show_power_button_menu_| is true. Started when the power button - // is pressed and stopped when it's released. Runs OnPowerButtonMenuTimeout() - // to show the power button menu. - base::OneShotTimer power_button_menu_timer_; - - // The fullscreen widget of power button menu. - std::unique_ptr<views::Widget> menu_widget_; - - LockStateController* lock_state_controller_; // Not owned. - - // Used to interact with the display. - PowerButtonDisplayController* display_controller_; // Not owned. - - ScopedObserver<BacklightsForcedOffSetter, BacklightsForcedOffSetter::Observer> - backlights_forced_off_observer_; - - // If true, start the |power_button_menu_timer_| to show the menu when the - // power button is long pressed. - bool show_power_button_menu_ = false; - - // Time source for performed action times. - base::TickClock* tick_clock_; // Not owned. - - DISALLOW_COPY_AND_ASSIGN(TabletPowerButtonController); -}; - -} // namespace ash - -#endif // ASH_SYSTEM_POWER_TABLET_POWER_BUTTON_CONTROLLER_H_
diff --git a/ash/system/power/tablet_power_button_controller_test_api.cc b/ash/system/power/tablet_power_button_controller_test_api.cc deleted file mode 100644 index c9be0ec..0000000 --- a/ash/system/power/tablet_power_button_controller_test_api.cc +++ /dev/null
@@ -1,77 +0,0 @@ -// Copyright 2017 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 "ash/system/power/tablet_power_button_controller_test_api.h" - -#include "ash/system/power/power_button_display_controller.h" -#include "ash/system/power/power_button_menu_screen_view.h" -#include "ash/system/power/power_button_menu_view.h" -#include "ash/system/power/tablet_power_button_controller.h" -#include "ui/gfx/geometry/rect.h" -#include "ui/views/widget/widget.h" - -namespace ash { - -TabletPowerButtonControllerTestApi::TabletPowerButtonControllerTestApi( - TabletPowerButtonController* controller) - : controller_(controller) {} - -TabletPowerButtonControllerTestApi::~TabletPowerButtonControllerTestApi() = - default; - -bool TabletPowerButtonControllerTestApi::ShutdownTimerIsRunning() const { - return controller_->shutdown_timer_.IsRunning(); -} - -bool TabletPowerButtonControllerTestApi::TriggerShutdownTimeout() { - if (!controller_->shutdown_timer_.IsRunning()) - return false; - - base::Closure task = controller_->shutdown_timer_.user_task(); - controller_->shutdown_timer_.Stop(); - task.Run(); - return true; -} - -bool TabletPowerButtonControllerTestApi::PowerButtonMenuTimerIsRunning() const { - return controller_->power_button_menu_timer_.IsRunning(); -} - -bool TabletPowerButtonControllerTestApi::TriggerPowerButtonMenuTimeout() { - if (!controller_->power_button_menu_timer_.IsRunning()) - return false; - - base::Closure task = controller_->power_button_menu_timer_.user_task(); - controller_->power_button_menu_timer_.Stop(); - task.Run(); - return true; -} - -void TabletPowerButtonControllerTestApi::SendKeyEvent(ui::KeyEvent* event) { - controller_->display_controller_->OnKeyEvent(event); -} - -gfx::Rect TabletPowerButtonControllerTestApi::GetMenuBoundsInScreen() const { - return IsMenuOpened() ? GetPowerButtonMenuView()->GetBoundsInScreen() - : gfx::Rect(); -} - -PowerButtonMenuView* -TabletPowerButtonControllerTestApi::GetPowerButtonMenuView() const { - return IsMenuOpened() ? static_cast<PowerButtonMenuScreenView*>( - controller_->menu_widget_->GetContentsView()) - ->power_button_menu_view() - : nullptr; -} - -bool TabletPowerButtonControllerTestApi::IsMenuOpened() const { - return controller_->IsMenuOpened(); -} - -bool TabletPowerButtonControllerTestApi::MenuHasSignOutItem() const { - return IsMenuOpened() && - GetPowerButtonMenuView()->sign_out_item_for_testing(); -} - -} // namespace ash
diff --git a/ash/system/power/tablet_power_button_controller_test_api.h b/ash/system/power/tablet_power_button_controller_test_api.h deleted file mode 100644 index 6c66177..0000000 --- a/ash/system/power/tablet_power_button_controller_test_api.h +++ /dev/null
@@ -1,69 +0,0 @@ -// Copyright 2017 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 ASH_SYSTEM_POWER_TABLET_POWER_BUTTON_CONTROLLER_TEST_API_H_ -#define ASH_SYSTEM_POWER_TABLET_POWER_BUTTON_CONTROLLER_TEST_API_H_ - -#include "base/compiler_specific.h" -#include "base/macros.h" - -namespace ui { -class KeyEvent; -} // namespace ui - -namespace gfx { -class Rect; -} // namespace gfx - -namespace ash { -class PowerButtonMenuView; -class TabletPowerButtonController; - -// Helper class used by tests to access TabletPowerButtonController's -// internal state. -class TabletPowerButtonControllerTestApi { - public: - explicit TabletPowerButtonControllerTestApi( - TabletPowerButtonController* controller); - ~TabletPowerButtonControllerTestApi(); - - // Returns true when |controller_->shutdown_timer_| is running. - bool ShutdownTimerIsRunning() const; - - // If |controller_->shutdown_timer_| is running, stops it, runs its task, and - // returns true. Otherwise, returns false. - bool TriggerShutdownTimeout() WARN_UNUSED_RESULT; - - // Returns true when |power_button_menu_timer_| is running. - bool PowerButtonMenuTimerIsRunning() const; - - // If |controller_->power_button_menu_timer_| is running, stops it, runs its - // task, and returns true. Otherwise, returns false. - bool TriggerPowerButtonMenuTimeout() WARN_UNUSED_RESULT; - - // Sends |event| to |controller_->display_controller_|. - void SendKeyEvent(ui::KeyEvent* event); - - // Gets the bounds of the menu view in screen. - gfx::Rect GetMenuBoundsInScreen() const; - - // Gets the PowerButtonMenuView of the |controller_|'s menu, which is used by - // GetMenuBoundsInScreen. - PowerButtonMenuView* GetPowerButtonMenuView() const; - - // True if the menu is opened. - bool IsMenuOpened() const; - - // True if |controller_|'s menu has a sign out item. - bool MenuHasSignOutItem() const; - - private: - TabletPowerButtonController* controller_; // Not owned. - - DISALLOW_COPY_AND_ASSIGN(TabletPowerButtonControllerTestApi); -}; - -} // namespace ash - -#endif // ASH_SYSTEM_POWER_TABLET_POWER_BUTTON_CONTROLLER_TEST_API_H_
diff --git a/ash/system/unified/sign_out_button.cc b/ash/system/unified/sign_out_button.cc new file mode 100644 index 0000000..70f251d --- /dev/null +++ b/ash/system/unified/sign_out_button.cc
@@ -0,0 +1,80 @@ +// Copyright 2018 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 "ash/system/unified/sign_out_button.h" + +#include "ash/session/session_controller.h" +#include "ash/shell.h" +#include "ash/system/tray/tray_constants.h" +#include "ash/system/tray/tray_popup_utils.h" +#include "ash/system/user/login_status.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/canvas.h" +#include "ui/views/animation/flood_fill_ink_drop_ripple.h" +#include "ui/views/animation/ink_drop_highlight.h" +#include "ui/views/animation/ink_drop_impl.h" +#include "ui/views/animation/ink_drop_mask.h" +#include "ui/views/border.h" + +namespace ash { + +SignOutButton::SignOutButton(views::ButtonListener* listener) + : views::LabelButton(listener, + user::GetLocalizedSignOutStringForStatus( + Shell::Get()->session_controller()->login_status(), + false /* multiline */)) { + SetVisible(Shell::Get()->session_controller()->login_status() != + LoginStatus::NOT_LOGGED_IN); + + SetEnabledTextColors(kUnifiedMenuTextColor); + SetHorizontalAlignment(gfx::ALIGN_CENTER); + SetBorder(views::CreateEmptyBorder(gfx::Insets())); + TrayPopupUtils::ConfigureTrayPopupButton(this); +} + +SignOutButton::~SignOutButton() = default; + +gfx::Size SignOutButton::CalculatePreferredSize() const { + return gfx::Size(label()->GetPreferredSize().width() + kTrayItemSize, + kTrayItemSize); +} + +int SignOutButton::GetHeightForWidth(int width) const { + return kTrayItemSize; +} + +void SignOutButton::PaintButtonContents(gfx::Canvas* canvas) { + gfx::Rect rect(GetContentsBounds()); + cc::PaintFlags flags; + flags.setAntiAlias(true); + flags.setColor(kUnifiedMenuButtonColor); + flags.setStyle(cc::PaintFlags::kFill_Style); + canvas->DrawRoundRect(rect, kTrayItemSize / 2, flags); + + views::LabelButton::PaintButtonContents(canvas); +} + +std::unique_ptr<views::InkDrop> SignOutButton::CreateInkDrop() { + return TrayPopupUtils::CreateInkDrop(this); +} + +std::unique_ptr<views::InkDropRipple> SignOutButton::CreateInkDropRipple() + const { + return TrayPopupUtils::CreateInkDropRipple( + TrayPopupInkDropStyle::FILL_BOUNDS, this, + GetInkDropCenterBasedOnLastEvent(), kUnifiedMenuIconColor); +} + +std::unique_ptr<views::InkDropHighlight> SignOutButton::CreateInkDropHighlight() + const { + return TrayPopupUtils::CreateInkDropHighlight( + TrayPopupInkDropStyle::FILL_BOUNDS, this, kUnifiedMenuIconColor); +} + +std::unique_ptr<views::InkDropMask> SignOutButton::CreateInkDropMask() const { + return std::make_unique<views::RoundRectInkDropMask>(size(), gfx::Insets(), + kTrayItemSize / 2); +} + +} // namespace ash
diff --git a/ash/system/unified/sign_out_button.h b/ash/system/unified/sign_out_button.h new file mode 100644 index 0000000..2dda4cb --- /dev/null +++ b/ash/system/unified/sign_out_button.h
@@ -0,0 +1,36 @@ +// Copyright 2018 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 ASH_SYSTEM_UNIFIED_SIGN_OUT_BUTTON_H_ +#define ASH_SYSTEM_UNIFIED_SIGN_OUT_BUTTON_H_ + +#include "ui/views/controls/button/label_button.h" + +namespace ash { + +// Sign out button shown in TopShortcutView with TopShortcutButtons. +// Shows the label like "Sign out", "Exit guest", etc. depending on the session +// status. Not visible when not signed in. +class SignOutButton : public views::LabelButton { + public: + SignOutButton(views::ButtonListener* listener); + ~SignOutButton() override; + + // views::LabelButton: + gfx::Size CalculatePreferredSize() const override; + int GetHeightForWidth(int width) const override; + void PaintButtonContents(gfx::Canvas* canvas) override; + std::unique_ptr<views::InkDrop> CreateInkDrop() override; + std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override; + std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() + const override; + std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override; + + private: + DISALLOW_COPY_AND_ASSIGN(SignOutButton); +}; + +} // namespace ash + +#endif // ASH_SYSTEM_UNIFIED_SIGN_OUT_BUTTON_H_
diff --git a/ash/system/unified/top_shortcuts_view.cc b/ash/system/unified/top_shortcuts_view.cc index e127d7c..b31787cb 100644 --- a/ash/system/unified/top_shortcuts_view.cc +++ b/ash/system/unified/top_shortcuts_view.cc
@@ -12,6 +12,7 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_popup_utils.h" #include "ash/system/unified/collapse_button.h" +#include "ash/system/unified/sign_out_button.h" #include "ash/system/unified/top_shortcut_button.h" #include "ash/system/unified/unified_system_tray_controller.h" #include "ui/views/layout/box_layout.h" @@ -32,6 +33,9 @@ // |power_button_| which is always shown as enabled. const bool can_show_web_ui = TrayPopupUtils::CanOpenWebUISettings(); + sign_out_button_ = new SignOutButton(this); + AddChildView(sign_out_button_); + lock_button_ = new TopShortcutButton(this, kSystemMenuLockIcon, IDS_ASH_STATUS_TRAY_LOCK); lock_button_->SetEnabled(can_show_web_ui && @@ -65,7 +69,9 @@ void TopShortcutsView::ButtonPressed(views::Button* sender, const ui::Event& event) { - if (sender == lock_button_) + if (sender == sign_out_button_) + controller_->HandleSignOutAction(); + else if (sender == lock_button_) controller_->HandleLockAction(); else if (sender == settings_button_) controller_->HandleSettingsAction();
diff --git a/ash/system/unified/top_shortcuts_view.h b/ash/system/unified/top_shortcuts_view.h index 5a4e3df..0f9c940 100644 --- a/ash/system/unified/top_shortcuts_view.h +++ b/ash/system/unified/top_shortcuts_view.h
@@ -11,8 +11,9 @@ namespace ash { class CollapseButton; -class UnifiedSystemTrayController; +class SignOutButton; class TopShortcutButton; +class UnifiedSystemTrayController; // Top shortcuts view shown on the top of UnifiedSystemTrayView. class TopShortcutsView : public views::View, public views::ButtonListener { @@ -27,6 +28,7 @@ UnifiedSystemTrayController* controller_; // Owned by views hierarchy. + SignOutButton* sign_out_button_ = nullptr; TopShortcutButton* lock_button_ = nullptr; TopShortcutButton* settings_button_ = nullptr; TopShortcutButton* power_button_ = nullptr;
diff --git a/ash/system/unified/unified_system_tray_controller.cc b/ash/system/unified/unified_system_tray_controller.cc index e086630..0eedfdf 100644 --- a/ash/system/unified/unified_system_tray_controller.cc +++ b/ash/system/unified/unified_system_tray_controller.cc
@@ -6,6 +6,7 @@ #include "ash/metrics/user_metrics_action.h" #include "ash/metrics/user_metrics_recorder.h" +#include "ash/session/session_controller.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_controller.h" #include "ash/system/unified/feature_pod_controller_base.h" @@ -28,6 +29,11 @@ return unified_view_; } +void UnifiedSystemTrayController::HandleSignOutAction() { + Shell::Get()->metrics()->RecordUserMetricsAction(UMA_STATUS_AREA_SIGN_OUT); + Shell::Get()->session_controller()->RequestSignOut(); +} + void UnifiedSystemTrayController::HandleLockAction() { Shell::Get()->metrics()->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN); chromeos::DBusThreadManager::Get()
diff --git a/ash/system/unified/unified_system_tray_controller.h b/ash/system/unified/unified_system_tray_controller.h index f017e01..8b6a07bf 100644 --- a/ash/system/unified/unified_system_tray_controller.h +++ b/ash/system/unified/unified_system_tray_controller.h
@@ -24,6 +24,8 @@ // Create the view. The created view is unowned. UnifiedSystemTrayView* CreateView(); + // Sign out from the current user. Called from the view. + void HandleSignOutAction(); // Show lock screen which asks the user password. Called from the view. void HandleLockAction(); // Show WebUI settings. Called from the view.
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc index 8952192..56c3146 100644 --- a/ash/test/ui_controls_factory_ash.cc +++ b/ash/test/ui_controls_factory_ash.cc
@@ -61,7 +61,7 @@ bool alt, bool command) override { return SendKeyPressNotifyWhenDone(window, key, control, shift, alt, command, - base::Closure()); + base::OnceClosure()); } bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, @@ -70,13 +70,13 @@ bool shift, bool alt, bool command, - const base::Closure& closure) override { + base::OnceClosure closure) override { aura::Window* root = window ? window->GetRootWindow() : ash::Shell::GetRootWindowForNewWindows(); UIControlsAura* ui_controls = GetUIControlsForRootWindow(root); return ui_controls && - ui_controls->SendKeyPressNotifyWhenDone(window, key, control, shift, - alt, command, closure); + ui_controls->SendKeyPressNotifyWhenDone( + window, key, control, shift, alt, command, std::move(closure)); } bool SendMouseMove(long x, long y) override { @@ -87,11 +87,11 @@ bool SendMouseMoveNotifyWhenDone(long x, long y, - const base::Closure& closure) override { + base::OnceClosure closure) override { gfx::Point p(x, y); UIControlsAura* ui_controls = GetUIControlsAt(p); - return ui_controls && - ui_controls->SendMouseMoveNotifyWhenDone(p.x(), p.y(), closure); + return ui_controls && ui_controls->SendMouseMoveNotifyWhenDone( + p.x(), p.y(), std::move(closure)); } bool SendMouseEvents(MouseButton type, int state) override { @@ -102,11 +102,11 @@ bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& closure) override { + base::OnceClosure closure) override { gfx::Point p(aura::Env::GetInstance()->last_mouse_location()); UIControlsAura* ui_controls = GetUIControlsAt(p); - return ui_controls && - ui_controls->SendMouseEventsNotifyWhenDone(type, state, closure); + return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone( + type, state, std::move(closure)); } bool SendMouseClick(MouseButton type) override {
diff --git a/ash/wm/client_controlled_state.cc b/ash/wm/client_controlled_state.cc index a1c243a..2d6204ad 100644 --- a/ash/wm/client_controlled_state.cc +++ b/ash/wm/client_controlled_state.cc
@@ -27,6 +27,22 @@ namespace ash { namespace wm { +namespace { +// |kMinimumOnScreenArea + 1| is used to avoid adjusting loop. +constexpr int kClientControlledWindowMinimumOnScreenArea = + kMinimumOnScreenArea + 1; +} // namespace + +// static +void ClientControlledState::AdjustBoundsForMinimumWindowVisibility( + aura::Window* window, + gfx::Rect* bounds) { + AdjustBoundsToEnsureWindowVisibility( + window->GetRootWindow()->bounds(), + kClientControlledWindowMinimumOnScreenArea, + kClientControlledWindowMinimumOnScreenArea, bounds); +} + ClientControlledState::ClientControlledState(std::unique_ptr<Delegate> delegate) : BaseState(mojom::WindowStateType::DEFAULT), delegate_(std::move(delegate)) {} @@ -115,6 +131,15 @@ void ClientControlledState::HandleWorkspaceEvents(WindowState* window_state, const WMEvent* event) { // Client is responsible for adjusting bounds after workspace bounds change. + + if (event->type() == WM_EVENT_ADDED_TO_WORKSPACE) { + aura::Window* window = window_state->window(); + gfx::Rect bounds = window->bounds(); + AdjustBoundsForMinimumWindowVisibility(window, &bounds); + + if (window->bounds() != bounds) + window_state->SetBoundsConstrained(bounds); + } } void ClientControlledState::HandleCompoundEvents(WindowState* window_state,
diff --git a/ash/wm/client_controlled_state.h b/ash/wm/client_controlled_state.h index 6189a4d..e175ed2 100644 --- a/ash/wm/client_controlled_state.h +++ b/ash/wm/client_controlled_state.h
@@ -45,6 +45,11 @@ const gfx::Rect& requested_bounds) = 0; }; + // Adjust bounds to ensure window visibility, which is used for window added + // to a new workspace. + static void AdjustBoundsForMinimumWindowVisibility(aura::Window* window, + gfx::Rect* bounds); + explicit ClientControlledState(std::unique_ptr<Delegate> delegate); ~ClientControlledState() override;
diff --git a/ash/wm/client_controlled_state_unittest.cc b/ash/wm/client_controlled_state_unittest.cc index 47a67ef..0f8a040 100644 --- a/ash/wm/client_controlled_state_unittest.cc +++ b/ash/wm/client_controlled_state_unittest.cc
@@ -431,5 +431,26 @@ EXPECT_EQ(gfx::Rect(0, 0, 100, 100), delegate()->requested_bounds()); } +TEST_F(ClientControlledStateTest, MoveWindowToDisplayWindowVisibility) { + UpdateDisplay("1000x500, 500x500"); + + state()->set_bounds_locally(true); + widget()->SetBounds(gfx::Rect(600, 0, 100, 200)); + state()->set_bounds_locally(false); + EXPECT_EQ(gfx::Rect(600, 0, 100, 200), widget()->GetWindowBoundsInScreen()); + + display::Screen* screen = display::Screen::GetScreen(); + + const int64_t first_display_id = screen->GetAllDisplays()[0].id(); + const int64_t second_display_id = screen->GetAllDisplays()[1].id(); + EXPECT_EQ(first_display_id, screen->GetDisplayNearestWindow(window()).id()); + + MoveWindowToDisplay(window(), second_display_id); + + // Ensure |ash::wm::kMinimumOnScreenArea + 1| window visibility for window + // added to a new workspace. + EXPECT_EQ(gfx::Rect(1474, 0, 100, 200), widget()->GetWindowBoundsInScreen()); +} + } // namespace wm } // namespace ash
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index 70b092f..a684ebe 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc
@@ -7,8 +7,6 @@ #include <memory> #include <utility> -#include "ash/accessibility/accessibility_controller.h" -#include "ash/accessibility/test_accessibility_controller_client.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/config.h" #include "ash/session/session_controller.h" @@ -77,9 +75,6 @@ test_animator_ = new TestSessionStateAnimator; lock_state_controller_->set_animator_for_test(test_animator_); lock_state_test_api_->set_shutdown_controller(&test_shutdown_controller_); - - a11y_controller_ = Shell::Get()->accessibility_controller(); - a11y_controller_->SetClient(a11y_client_.CreateInterfacePtrAndBind()); } protected: @@ -203,22 +198,6 @@ SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS)); } - void ExpectShutdownAnimationFinished() { - SCOPED_TRACE("Failure in ExpectShutdownAnimationFinished"); - EXPECT_EQ(0u, test_animator_->GetAnimationCount()); - EXPECT_FALSE(test_animator_->AreContainersAnimated( - SessionStateAnimator::ROOT_CONTAINER, - SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS)); - } - - void ExpectShutdownAnimationCancel() { - SCOPED_TRACE("Failure in ExpectShutdownAnimationCancel"); - EXPECT_LT(0u, test_animator_->GetAnimationCount()); - EXPECT_TRUE(test_animator_->AreContainersAnimated( - SessionStateAnimator::ROOT_CONTAINER, - SessionStateAnimator::ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS)); - } - void ExpectWallpaperIsShowing() { SCOPED_TRACE("Failure in ExpectWallpaperIsShowing"); EXPECT_LT(0u, test_animator_->GetAnimationCount()); @@ -270,13 +249,8 @@ lock_state_controller_->OnLockScreenHide(closure); } - // Simulate that shutdown sound duration callback is done. - void ShutdownSoundPlayed() { a11y_controller_->FlushMojoForTest(); } - TestShutdownController test_shutdown_controller_; TestSessionStateAnimator* test_animator_ = nullptr; // not owned - AccessibilityController* a11y_controller_; - TestAccessibilityControllerClient a11y_client_; private: DISALLOW_COPY_AND_ASSIGN(LockStateControllerTest); @@ -361,248 +335,65 @@ EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); } -// When we hold the power button while the user isn't logged in, we should shut -// down the machine directly. -TEST_F(LockStateControllerTest, ShutdownWhenNotLoggedIn) { - Initialize(ButtonType::NORMAL, LoginStatus::NOT_LOGGED_IN); +// Test that we ignore power button presses when the screen is turned off on an +// unofficial system. +TEST_F(LockStateControllerTest, LegacyIgnorePowerButtonIfScreenIsOff) { + Initialize(ButtonType::LEGACY, LoginStatus::USER); - // Press the power button and check that we start the shutdown timer. + // When the screen brightness is at 0%, we shouldn't do anything in response + // to power button presses. + power_manager_client_->SendBrightnessChanged(0, true); PressPowerButton(); EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - ExpectShutdownAnimationStarted(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN, 0.5f); - - // Release the power button before the shutdown timer fires. ReleasePowerButton(); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); - ExpectShutdownAnimationCancel(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_REVERT, 0.5f); - - // Press the button again and make the shutdown timeout fire this time. - // Check that we start the timer for actually requesting the shutdown. - PressPowerButton(); - - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - - Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); - ExpectShutdownAnimationFinished(); - lock_state_test_api_->trigger_shutdown_timeout(); - - ShutdownSoundPlayed(); - EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); - EXPECT_EQ(0, NumShutdownRequests()); - - // When the timout fires, we should request a shutdown. - lock_state_test_api_->trigger_real_shutdown_timeout(); - - EXPECT_EQ(1, NumShutdownRequests()); -} - -// Test that we lock the screen and deal with unlocking correctly. -TEST_F(LockStateControllerTest, LockAndUnlock) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - ExpectUnlockedState(); - - // Press the power button and check that the lock timer is started and that we - // start lifting the non-screen-locker containers. - PressPowerButton(); - - ExpectPreLockAnimationStarted(); - EXPECT_TRUE(lock_state_test_api_->is_lock_cancellable()); - EXPECT_EQ(0, session_manager_client_->request_lock_screen_call_count()); - - test_animator_->CompleteAllAnimations(true); - ExpectPreLockAnimationFinished(); - - EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count()); - - // Notify that we locked successfully. - lock_state_controller_->OnStartingLock(); - // We had that animation already. - EXPECT_EQ(0u, test_animator_->GetAnimationCount()); - - LockScreen(); - - ExpectPostLockAnimationStarted(); - test_animator_->CompleteAllAnimations(true); - ExpectPostLockAnimationFinished(); - - // When we release the power button, the lock-to-shutdown timer should be - // stopped. - ExpectLockedState(); - EXPECT_TRUE(lock_state_test_api_->lock_to_shutdown_timer_is_running()); - ReleasePowerButton(); - ExpectLockedState(); - EXPECT_FALSE(lock_state_test_api_->lock_to_shutdown_timer_is_running()); - - // The backlights shouldn't be forced off when clamshell power button behavior - // isn't explicitly requested. - EXPECT_FALSE(power_button_controller_->TriggerDisplayOffTimerForTesting()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - - // Notify that the screen has been unlocked. We should show the - // non-screen-locker windows. - bool called = false; - SuccessfulAuthentication(&called); - - ExpectUnlockBeforeUIDestroyedAnimationStarted(); - EXPECT_FALSE(called); - test_animator_->CompleteAllAnimations(true); - ExpectUnlockBeforeUIDestroyedAnimationFinished(); - - EXPECT_TRUE(called); - - UnlockScreen(); - - ExpectUnlockAfterUIDestroyedAnimationStarted(); - test_animator_->CompleteAllAnimations(true); - ExpectUnlockAfterUIDestroyedAnimationFinished(); - - ExpectUnlockedState(); -} - -// Test that we deal with cancelling lock correctly. -TEST_F(LockStateControllerTest, LockAndCancel) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - ExpectUnlockedState(); - - // Press the power button and check that the lock timer is started and that we - // start lifting the non-screen-locker containers. - PressPowerButton(); - - ExpectPreLockAnimationStarted(); - EXPECT_TRUE(lock_state_test_api_->is_lock_cancellable()); - - // forward only half way through - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f); - - // Release the button before the lock timer fires. - ReleasePowerButton(); - - ExpectPreLockAnimationCancel(); - - Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); - ExpectUnlockedState(); - EXPECT_EQ(0, session_manager_client_->request_lock_screen_call_count()); -} - -// Test that we deal with cancelling lock correctly. -TEST_F(LockStateControllerTest, LockAndCancelAndLockAgain) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - ExpectUnlockedState(); - - // Press the power button and check that the lock timer is started and that we - // start lifting the non-screen-locker containers. - PressPowerButton(); - - ExpectPreLockAnimationStarted(); - EXPECT_TRUE(lock_state_test_api_->is_lock_cancellable()); - - // forward only half way through - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f); - - // Release the button before the lock timer fires. - ReleasePowerButton(); - ExpectPreLockAnimationCancel(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDO_MOVE_WINDOWS, - 0.5f); - - PressPowerButton(); - ExpectPreLockAnimationStarted(); - EXPECT_TRUE(lock_state_test_api_->is_lock_cancellable()); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.6f); - - EXPECT_EQ(0, session_manager_client_->request_lock_screen_call_count()); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.6f); - ExpectPreLockAnimationFinished(); - EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count()); -} - -// Hold the power button down from the unlocked state to eventual shutdown. -TEST_F(LockStateControllerTest, LockToShutdown) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - // Hold the power button and lock the screen. + // After increasing the brightness to 10%, we should start the timer like + // usual. + power_manager_client_->SendBrightnessChanged(10, true); PressPowerButton(); EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); - - Advance(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE); - LockScreen(); - Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); - - // When the lock-to-shutdown timeout fires, we should start the shutdown - // timer. - EXPECT_TRUE(lock_state_test_api_->lock_to_shutdown_timer_is_running()); - - lock_state_test_api_->trigger_lock_to_shutdown_timeout(); - - ExpectShutdownAnimationStarted(); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - - // Fire the shutdown timeout and check that we request shutdown. - Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); - ExpectShutdownAnimationFinished(); - lock_state_test_api_->trigger_shutdown_timeout(); - - ShutdownSoundPlayed(); - EXPECT_TRUE(lock_state_test_api_->real_shutdown_timer_is_running()); - EXPECT_EQ(0, NumShutdownRequests()); - lock_state_test_api_->trigger_real_shutdown_timeout(); - EXPECT_EQ(1, NumShutdownRequests()); + ReleasePowerButton(); } -// Hold the power button down from the unlocked state to eventual shutdown, -// then release the button while system does locking. -TEST_F(LockStateControllerTest, CancelLockToShutdown) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); +TEST_F(LockStateControllerTest, LegacyHonorPowerButtonInDockedMode) { + Initialize(ButtonType::LEGACY, LoginStatus::USER); + // Create two outputs, the first internal and the second external. + display::DisplayConfigurator::DisplayStateList outputs; + std::unique_ptr<display::DisplaySnapshot> internal_display = + display::FakeDisplaySnapshot::Builder() + .SetId(123) + .SetNativeMode(gfx::Size(1, 1)) + .SetType(display::DISPLAY_CONNECTION_TYPE_INTERNAL) + .Build(); + outputs.push_back(internal_display.get()); + + std::unique_ptr<display::DisplaySnapshot> external_display = + display::FakeDisplaySnapshot::Builder() + .SetId(456) + .SetNativeMode(gfx::Size(1, 1)) + .SetType(display::DISPLAY_CONNECTION_TYPE_HDMI) + .Build(); + outputs.push_back(external_display.get()); + + // When all of the displays are turned off (e.g. due to user inactivity), the + // power button should be ignored. + power_manager_client_->SendBrightnessChanged(0, true); + internal_display->set_current_mode(nullptr); + external_display->set_current_mode(nullptr); + power_button_controller_->OnDisplayModeChanged(outputs); PressPowerButton(); - - // Hold the power button and lock the screen. - EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); - - Advance(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE); - LockScreen(); - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, 0.5f); - - // Power button is released while system attempts to lock. + EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); ReleasePowerButton(); - Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); - - EXPECT_FALSE(lock_state_controller_->ShutdownRequested()); - EXPECT_FALSE(lock_state_test_api_->lock_to_shutdown_timer_is_running()); - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); -} - -// Test that we handle the case where lock requests are ignored. -TEST_F(LockStateControllerTest, Lock) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - // Hold the power button and lock the screen. + // When the screen brightness is 0% but the external display is still turned + // on (indicating either docked mode or the user having manually decreased the + // brightness to 0%), the power button should still be handled. + external_display->set_current_mode(external_display->modes().back().get()); + power_button_controller_->OnDisplayModeChanged(outputs); PressPowerButton(); - ExpectPreLockAnimationStarted(); - - Advance(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE); - - EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count()); - EXPECT_TRUE(lock_state_test_api_->lock_fail_timer_is_running()); - // We shouldn't start the lock-to-shutdown timer until the screen has actually - // been locked and this was animated. - EXPECT_FALSE(lock_state_test_api_->lock_to_shutdown_timer_is_running()); - - // Act as if the request timed out. - EXPECT_DEATH(lock_state_test_api_->trigger_lock_fail_timeout(), ""); + EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); + ReleasePowerButton(); } // Test the basic operation of the lock button (not logged in). @@ -636,6 +427,7 @@ PressLockButton(); ExpectPreLockAnimationStarted(); AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f); + ExpectPreLockAnimationRunning(); // If the button is released immediately, we shouldn't lock the screen. ReleaseLockButton(); @@ -675,54 +467,6 @@ ExpectPostLockAnimationFinished(); } -// Test that the power button takes priority over the lock button. -TEST_F(LockStateControllerTest, PowerButtonPreemptsLockButton) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - // While the lock button is down, hold the power button. - PressLockButton(); - ExpectPreLockAnimationStarted(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.1f); - ExpectPreLockAnimationRunning(); - - PressPowerButton(); - ExpectPreLockAnimationRunning(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.1f); - ExpectPreLockAnimationRunning(); - - // The lock timer shouldn't be stopped when the lock button is released. - ReleaseLockButton(); - ExpectPreLockAnimationRunning(); - - ReleasePowerButton(); - ExpectPreLockAnimationCancel(); - - Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); - ExpectUnlockedState(); - - // Now press the power button first and then the lock button. - PressPowerButton(); - ExpectPreLockAnimationStarted(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.1f); - - PressLockButton(); - ExpectPreLockAnimationRunning(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.1f); - - // Releasing the power button should stop the lock timer. - ReleasePowerButton(); - ExpectPreLockAnimationCancel(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.1f); - - ReleaseLockButton(); - ExpectPreLockAnimationCancel(); -} - // When the screen is locked without going through the usual power-button // slow-close path (e.g. via the wrench menu), test that we still show the // fast-close animation. @@ -802,99 +546,13 @@ EXPECT_EQ(1, NumShutdownRequests()); } -TEST_F(LockStateControllerTest, RequestAndCancelShutdownFromLockScreen) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - LockScreen(); - Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); - ExpectLockedState(); - - // Press the power button and check that we start the shutdown timer. - PressPowerButton(); - EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); - EXPECT_TRUE(lock_state_test_api_->shutdown_timer_is_running()); - - ExpectShutdownAnimationStarted(); - - AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN, 0.5f); - - // Release the power button before the shutdown timer fires. - ReleasePowerButton(); - - EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running()); - - ExpectShutdownAnimationCancel(); - - Advance(SessionStateAnimator::ANIMATION_SPEED_REVERT_SHUTDOWN); - ExpectLockedState(); -} - -// Test that we ignore power button presses when the screen is turned off. -TEST_F(LockStateControllerTest, IgnorePowerButtonIfScreenIsOff) { - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - // When the screen brightness is at 0%, we shouldn't do anything in response - // to power button presses. - power_manager_client_->SendBrightnessChanged(0, true); - PressPowerButton(); - EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); - ReleasePowerButton(); - - // After increasing the brightness to 10%, we should start the timer like - // usual. - power_manager_client_->SendBrightnessChanged(10, true); - PressPowerButton(); - EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); - ReleasePowerButton(); -} - -TEST_F(LockStateControllerTest, HonorPowerButtonInDockedMode) { - // Create two outputs, the first internal and the second external. - display::DisplayConfigurator::DisplayStateList outputs; - - std::unique_ptr<display::DisplaySnapshot> internal_display = - display::FakeDisplaySnapshot::Builder() - .SetId(123) - .SetNativeMode(gfx::Size(1, 1)) - .SetType(display::DISPLAY_CONNECTION_TYPE_INTERNAL) - .Build(); - outputs.push_back(internal_display.get()); - - std::unique_ptr<display::DisplaySnapshot> external_display = - display::FakeDisplaySnapshot::Builder() - .SetId(456) - .SetNativeMode(gfx::Size(1, 1)) - .SetType(display::DISPLAY_CONNECTION_TYPE_HDMI) - .Build(); - outputs.push_back(external_display.get()); - - // When all of the displays are turned off (e.g. due to user inactivity), the - // power button should be ignored. - power_manager_client_->SendBrightnessChanged(0, true); - internal_display->set_current_mode(nullptr); - external_display->set_current_mode(nullptr); - power_button_controller_->OnDisplayModeChanged(outputs); - PressPowerButton(); - EXPECT_FALSE(lock_state_test_api_->is_animating_lock()); - ReleasePowerButton(); - - // When the screen brightness is 0% but the external display is still turned - // on (indicating either docked mode or the user having manually decreased the - // brightness to 0%), the power button should still be handled. - external_display->set_current_mode(external_display->modes().back().get()); - power_button_controller_->OnDisplayModeChanged(outputs); - PressPowerButton(); - EXPECT_TRUE(lock_state_test_api_->is_animating_lock()); - ReleasePowerButton(); -} - -// Test that hidden wallpaper appears and revers correctly on lock/cancel. +// Test that hidden wallpaper appears and reverts correctly on lock/cancel. TEST_F(LockStateControllerTest, TestHiddenWallpaperLockCancel) { Initialize(ButtonType::NORMAL, LoginStatus::USER); HideWallpaper(); ExpectUnlockedState(); - PressPowerButton(); + PressLockButton(); ExpectPreLockAnimationStarted(); ExpectWallpaperIsShowing(); @@ -903,7 +561,7 @@ AdvancePartially(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE, 0.5f); // Release the button before the lock timer fires. - ReleasePowerButton(); + ReleaseLockButton(); ExpectPreLockAnimationCancel(); ExpectWallpaperIsHiding(); @@ -925,9 +583,9 @@ ExpectUnlockedState(); - // Press the power button and check that the lock timer is started and that we + // Press the lock button and check that the lock timer is started and that we // start lifting the non-screen-locker containers. - PressPowerButton(); + PressLockButton(); ExpectPreLockAnimationStarted(); ExpectWallpaperIsShowing(); @@ -938,7 +596,7 @@ LockScreen(); - ReleasePowerButton(); + ReleaseLockButton(); ExpectPostLockAnimationStarted(); Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); @@ -946,7 +604,7 @@ ExpectLockedState(); - SuccessfulAuthentication(NULL); + SuccessfulAuthentication(nullptr); ExpectUnlockBeforeUIDestroyedAnimationStarted(); Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); @@ -970,75 +628,6 @@ ExpectUnlockedState(); } -// Test that backlights are forced off shortly after the screen is locked when -// clamshell-style power button behavior is forced. -TEST_F(LockStateControllerTest, ClamshellDisplayOffAfterLock) { - ForceClamshellPowerButton(); - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - // If the power button isn't held long enough for the screen to be locked, the - // backlights shouldn't be forced off. - PressPowerButton(); - ReleasePowerButton(); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - EXPECT_FALSE(power_button_controller_->TriggerDisplayOffTimerForTesting()); - - // Now hold the power button long enough to lock the screen. - PressPowerButton(); - Advance(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE); - LockScreen(); - EXPECT_FALSE(power_button_controller_->TriggerDisplayOffTimerForTesting()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - - // After releasing the power button, the display should still be on, but it - // should be forced off after the display-off timer fires. - ReleasePowerButton(); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - EXPECT_TRUE(power_button_controller_->TriggerDisplayOffTimerForTesting()); - EXPECT_TRUE(power_manager_client_->backlights_forced_off()); - - // Pressing the power button should turn the display back on. - PressPowerButton(); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - ReleasePowerButton(); - - // Now that the screen is already locked, the timer shouldn't be started if - // the power button is pressed and released again. - PressPowerButton(); - ReleasePowerButton(); - ASSERT_FALSE(power_button_controller_->TriggerDisplayOffTimerForTesting()); - ASSERT_FALSE(power_manager_client_->backlights_forced_off()); -} - -// Test that user activity prevents backlights from being forced off after the -// screen is locked. -TEST_F(LockStateControllerTest, CancelClamshellDisplayOffAfterLock) { - ForceClamshellPowerButton(); - Initialize(ButtonType::NORMAL, LoginStatus::USER); - - // If a key is pressed shortly after locking, the display-off timer should be - // stopped. - PressPowerButton(); - Advance(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE); - LockScreen(); - ReleasePowerButton(); - PressKey(ui::VKEY_A); - ReleaseKey(ui::VKEY_A); - EXPECT_FALSE(power_button_controller_->TriggerDisplayOffTimerForTesting()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - UnlockScreen(); - - // Mouse events should also stop the timer. - PressPowerButton(); - Advance(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE); - LockScreen(); - ReleasePowerButton(); - GenerateMouseMoveEvent(); - EXPECT_FALSE(power_button_controller_->TriggerDisplayOffTimerForTesting()); - EXPECT_FALSE(power_manager_client_->backlights_forced_off()); - UnlockScreen(); -} - // Tests the default behavior of disabling the touchscreen when the screen is // turned off due to user inactivity. TEST_F(LockStateControllerTest, DisableTouchscreenForScreenOff) {
diff --git a/ash/wm/overview/overview_utils.cc b/ash/wm/overview/overview_utils.cc index a16b3eb..c327fc3a 100644 --- a/ash/wm/overview/overview_utils.cc +++ b/ash/wm/overview/overview_utils.cc
@@ -4,6 +4,7 @@ #include "ash/wm/overview/overview_utils.h" +#include "ash/public/cpp/ash_features.h" #include "ash/public/cpp/ash_switches.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" @@ -106,8 +107,7 @@ bool IsNewOverviewAnimationsEnabled() { if (g_enable_new_overview_animations == base::nullopt) { g_enable_new_overview_animations = - base::make_optional(base::CommandLine::ForCurrentProcess()->HasSwitch( - ash::switches::kAshEnableNewOverviewAnimations)); + base::make_optional(ash::features::IsNewOverviewAnimationsEnabled()); } return g_enable_new_overview_animations.value();
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index 97a31b4..45e37bd 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc
@@ -353,8 +353,11 @@ size_t remaining_items = 0; for (std::unique_ptr<WindowGrid>& window_grid : grid_list_) { if (IsNewOverviewAnimationsEnabled()) { - window_grid->SetWindowListAnimationStates(selected_item_, - OverviewTransition::kExit); + window_grid->SetWindowListAnimationStates( + selected_item_ && selected_item_->window_grid() == window_grid.get() + ? selected_item_ + : nullptr, + OverviewTransition::kExit); } for (const auto& window_selector_item : window_grid->window_list()) window_selector_item->RestoreWindow(/*reset_transform=*/true); @@ -757,6 +760,12 @@ void WindowSelector::ContentsChanged(views::Textfield* sender, const base::string16& new_contents) { + // If the user enters underline mode via CTRL+SHIFT+U, ContentsChanged + // will get called after shutdown has started. Prevent anything from + // happening if shutdown has started (grids have been cleared). + if (grid_list_.size() < 1) + return; + text_filter_string_length_ = new_contents.length(); if (!text_filter_string_length_) num_times_textfield_cleared_++;
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index b807fc81..3c51b70 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc
@@ -2145,9 +2145,6 @@ // Tests window list animation states are correctly updated. TEST_F(WindowSelectorTest, SetWindowListAnimationStates) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kAshEnableNewOverviewAnimations); - gfx::Rect bounds(0, 0, 400, 400); std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); @@ -2189,9 +2186,6 @@ // Tests window list animation states are correctly updated with selected // window. TEST_F(WindowSelectorTest, SetWindowListAnimationStatesWithSelectedWindow) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kAshEnableNewOverviewAnimations); - gfx::Rect bounds(0, 0, 400, 400); std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); @@ -2228,9 +2222,6 @@ // Tests OverviewWindowAnimationObserver can handle deleted window. TEST_F(WindowSelectorTest, OverviewWindowAnimationObserverCanHandleDeletedWindow) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kAshEnableNewOverviewAnimations); - gfx::Rect bounds(0, 0, 400, 400); std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); @@ -2271,9 +2262,6 @@ // Tests can handle OverviewWindowAnimationObserver was deleted. TEST_F(WindowSelectorTest, HandleOverviewWindowAnimationObserverWasDeleted) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kAshEnableNewOverviewAnimations); - gfx::Rect bounds(0, 0, 400, 400); std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); @@ -2311,9 +2299,6 @@ // Tests can handle |gained_active| window is not in the |window_grid| when // OnWindowActivated. TEST_F(WindowSelectorTest, HandleActiveWindowNotInWindowGrid) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kAshEnableNewOverviewAnimations); - gfx::Rect bounds(0, 0, 400, 400); std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); @@ -2353,9 +2338,6 @@ // animations. // Fails consistently; see https://crbug.com/812497. TEST_F(WindowSelectorTest, DISABLED_HandleAlwaysOnTopWindow) { - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kAshEnableNewOverviewAnimations); - gfx::Rect bounds(0, 0, 400, 400); std::unique_ptr<aura::Window> window1(CreateWindow(bounds)); std::unique_ptr<aura::Window> window2(CreateWindow(bounds)); @@ -2713,6 +2695,25 @@ ToggleOverview(); } +// Verify that the system does not crash when exiting overview mode after +// pressing CTRL+SHIFT+U. +TEST_F(WindowSelectorTest, ExitInUnderlineMode) { + std::unique_ptr<aura::Window> window( + CreateWindow(gfx::Rect(10, 10, 200, 200))); + + ToggleOverview(); + + // Enter underline mode on the text selector by generating CTRL+SHIFT+U + // sequence. + GetEventGenerator().PressKey(ui::VKEY_U, + ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN); + GetEventGenerator().ReleaseKey(ui::VKEY_U, + ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN); + + // Test that leaving overview mode cleans up properly. + ToggleOverview(); +} + class SplitViewWindowSelectorTest : public WindowSelectorTest { public: SplitViewWindowSelectorTest() = default;
diff --git a/base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java index d456fc0..7beffef 100644 --- a/base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java +++ b/base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java
@@ -32,7 +32,11 @@ */ void onConnectionSetup(Bundle connectionBundle, List<IBinder> clientInterfaces); - /** Called when the service gets destroyed. */ + /** + * Called when the service gets destroyed. + * Note that the system might kill the process hosting the service without this method being + * called. + */ void onDestroy(); /**
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py index e9bf3cf..895ed99e 100644 --- a/build/android/pylib/gtest/gtest_test_instance.py +++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -284,7 +284,8 @@ # TODO(jbudorick): Support multiple test suites. if len(args.suite_name) > 1: raise ValueError('Platform mode currently supports only 1 gtest suite') - self._chartjson_result_file = args.chartjson_result_file + self._isolated_script_test_perf_output = ( + args.isolated_script_test_perf_output) self._exe_dist_dir = None self._external_shard_index = args.test_launcher_shard_index self._extract_test_list_from_filter = args.extract_test_list_from_filter @@ -433,8 +434,8 @@ return self._gtest_filter @property - def chartjson_result_file(self): - return self._chartjson_result_file + def isolated_script_test_perf_output(self): + return self._isolated_script_test_perf_output @property def package(self):
diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py index 3306a22..9856017 100644 --- a/build/android/pylib/local/device/local_device_gtest_run.py +++ b/build/android/pylib/local/device/local_device_gtest_run.py
@@ -464,10 +464,11 @@ device_temp_file.NamedDeviceTemporaryDirectory( adb=device.adb, dir='/sdcard/'), self._test_instance.gs_test_artifacts_bucket) as test_artifacts_dir: - with contextlib_ext.Optional( + with (contextlib_ext.Optional( device_temp_file.DeviceTempFile( adb=device.adb, dir=self._delegate.ResultsDirectory(device)), - self._test_instance.chartjson_result_file) as chartjson_result_file: + self._test_instance.isolated_script_test_perf_output) + ) as isolated_script_test_perf_output: flags = list(self._test_instance.flags) if self._test_instance.enable_xml_result_parsing: @@ -476,9 +477,9 @@ if self._test_instance.gs_test_artifacts_bucket: flags.append('--test_artifacts_dir=%s' % test_artifacts_dir.name) - if self._test_instance.chartjson_result_file: - flags.append('--chartjson_result_file=%s' - % chartjson_result_file.name) + if self._test_instance.isolated_script_test_perf_output: + flags.append('--isolated_script_test_perf_output=%s' + % isolated_script_test_perf_output.name) logging.info('flags:') for f in flags: @@ -518,14 +519,15 @@ str(e)) gtest_xml = None - if self._test_instance.chartjson_result_file: + if self._test_instance.isolated_script_test_perf_output: try: - device.PullFile(chartjson_result_file.name, - self._test_instance.chartjson_result_file) + device.PullFile( + isolated_script_test_perf_output.name, + self._test_instance.isolated_script_test_perf_output) except device_errors.CommandFailedError as e: logging.warning( 'Failed to pull chartjson results %s: %s', - chartjson_result_file.name, str(e)) + isolated_script_test_perf_output.name, str(e)) test_artifacts_url = self._UploadTestArtifacts(device, test_artifacts_dir)
diff --git a/build/android/test_runner.py b/build/android/test_runner.py index 2d34b30c..1789466 100755 --- a/build/android/test_runner.py +++ b/build/android/test_runner.py
@@ -300,7 +300,7 @@ help='Host directory to which app data files will be' ' saved. Used with --app-data-file.') parser.add_argument( - '--chartjson-result-file', + '--isolated-script-test-perf-output', help='If present, store chartjson results on this path.') parser.add_argument( '--delete-stale-data',
diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn index 4c681e8..60e3f052 100644 --- a/build/config/mac/BUILD.gn +++ b/build/config/mac/BUILD.gn
@@ -90,8 +90,8 @@ # //build/toolchain/mac/linker_driver.py. # Remove this config if a target wishes to change the arguments passed to the # strip command during linking. This config by default strips all symbols -# from a binary, but some targets may wish to specify a saves file to preserve -# specific symbols. +# from a binary, but some targets may wish to specify an exports file to +# preserve specific symbols. config("strip_all") { if (enable_stripping) { ldflags = [ "-Wcrl,strip,-x,-S" ]
diff --git a/cc/benchmarks/rasterize_and_record_benchmark.cc b/cc/benchmarks/rasterize_and_record_benchmark.cc index c983cda..66017c06 100644 --- a/cc/benchmarks/rasterize_and_record_benchmark.cc +++ b/cc/benchmarks/rasterize_and_record_benchmark.cc
@@ -98,8 +98,12 @@ DCHECK(!results_.get()); results_ = base::WrapUnique(new base::DictionaryValue); results_->SetInteger("pixels_recorded", record_results_.pixels_recorded); - results_->SetInteger("picture_memory_usage", - static_cast<int>(record_results_.bytes_used)); + results_->SetInteger("painter_memory_usage", + static_cast<int>(record_results_.painter_memory_usage)); + results_->SetInteger("paint_op_memory_usage", + static_cast<int>(record_results_.paint_op_memory_usage)); + results_->SetInteger("paint_op_count", + static_cast<int>(record_results_.paint_op_count)); for (int i = 0; i < RecordingSource::RECORDING_MODE_COUNT; i++) { std::string name = base::StringPrintf("record_time%s_ms", kModeSuffixes[i]); @@ -146,7 +150,8 @@ RecordingModeToPaintingControlSetting( static_cast<RecordingSource::RecordingMode>(mode_index)); base::TimeDelta min_time = base::TimeDelta::Max(); - size_t memory_used = 0; + size_t paint_op_memory_usage = 0; + size_t paint_op_count = 0; scoped_refptr<DisplayItemList> display_list; for (int i = 0; i < record_repeat_count_; ++i) { @@ -162,11 +167,13 @@ display_list, painter->GetApproximateUnsharedMemoryUsage(), layer_tree_host_->recording_scale_factor()); - if (memory_used) { + if (paint_op_memory_usage) { // Verify we are recording the same thing each time. - DCHECK_EQ(memory_used, display_list->BytesUsed()); + DCHECK_EQ(paint_op_memory_usage, display_list->BytesUsed()); + DCHECK_EQ(paint_op_count, display_list->op_count()); } else { - memory_used = display_list->BytesUsed(); + paint_op_memory_usage = display_list->BytesUsed(); + paint_op_count = display_list->op_count(); } timer.NextLap(); @@ -178,8 +185,10 @@ } if (mode_index == RecordingSource::RECORD_NORMALLY) { - record_results_.bytes_used += - memory_used + painter->GetApproximateUnsharedMemoryUsage(); + record_results_.painter_memory_usage += + painter->GetApproximateUnsharedMemoryUsage(); + record_results_.paint_op_memory_usage += paint_op_memory_usage; + record_results_.paint_op_count += paint_op_count; record_results_.pixels_recorded += painter->PaintableRegion().width() * painter->PaintableRegion().height(); } @@ -187,9 +196,7 @@ } } -RasterizeAndRecordBenchmark::RecordResults::RecordResults() - : pixels_recorded(0), bytes_used(0) {} - +RasterizeAndRecordBenchmark::RecordResults::RecordResults() = default; RasterizeAndRecordBenchmark::RecordResults::~RecordResults() = default; } // namespace cc
diff --git a/cc/benchmarks/rasterize_and_record_benchmark.h b/cc/benchmarks/rasterize_and_record_benchmark.h index 9e865ce..efb6266b 100644 --- a/cc/benchmarks/rasterize_and_record_benchmark.h +++ b/cc/benchmarks/rasterize_and_record_benchmark.h
@@ -45,8 +45,10 @@ RecordResults(); ~RecordResults(); - int pixels_recorded; - size_t bytes_used; + int pixels_recorded = 0; + size_t painter_memory_usage = 0; + size_t paint_op_memory_usage = 0; + size_t paint_op_count = 0; base::TimeDelta total_best_time[RecordingSource::RECORDING_MODE_COUNT]; };
diff --git a/cc/benchmarks/rasterize_and_record_benchmark_impl.cc b/cc/benchmarks/rasterize_and_record_benchmark_impl.cc index 48b578f..4246625 100644 --- a/cc/benchmarks/rasterize_and_record_benchmark_impl.cc +++ b/cc/benchmarks/rasterize_and_record_benchmark_impl.cc
@@ -153,8 +153,6 @@ std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue()); result->SetDouble("rasterize_time_ms", rasterize_results_.total_best_time.InMillisecondsF()); - result->SetDouble("total_pictures_in_pile_size", - static_cast<int>(rasterize_results_.total_memory_usage)); result->SetInteger("pixels_rasterized", rasterize_results_.pixels_rasterized); result->SetInteger("pixels_rasterized_with_non_solid_color", rasterize_results_.pixels_rasterized_with_non_solid_color); @@ -225,17 +223,12 @@ rasterize_results_.pixels_rasterized += tile_size; rasterize_results_.total_best_time += min_time; } - - const RasterSource* layer_raster_source = layer->GetRasterSource(); - rasterize_results_.total_memory_usage += - layer_raster_source->GetMemoryUsage(); } RasterizeAndRecordBenchmarkImpl::RasterizeResults::RasterizeResults() : pixels_rasterized(0), pixels_rasterized_with_non_solid_color(0), pixels_rasterized_as_opaque(0), - total_memory_usage(0), total_layers(0), total_picture_layers(0), total_picture_layers_with_no_content(0),
diff --git a/cc/benchmarks/rasterize_and_record_benchmark_impl.h b/cc/benchmarks/rasterize_and_record_benchmark_impl.h index 5c224da..be8a6de 100644 --- a/cc/benchmarks/rasterize_and_record_benchmark_impl.h +++ b/cc/benchmarks/rasterize_and_record_benchmark_impl.h
@@ -42,7 +42,6 @@ int pixels_rasterized_with_non_solid_color; int pixels_rasterized_as_opaque; base::TimeDelta total_best_time; - size_t total_memory_usage; int total_layers; int total_picture_layers; int total_picture_layers_with_no_content;
diff --git a/cc/trees/image_animation_controller.cc b/cc/trees/image_animation_controller.cc index 1a19cbc..0362e598 100644 --- a/cc/trees/image_animation_controller.cc +++ b/cc/trees/image_animation_controller.cc
@@ -21,8 +21,10 @@ ImageAnimationController::ImageAnimationController( base::SingleThreadTaskRunner* task_runner, - base::Closure invalidation_callback) - : notifier_(task_runner, invalidation_callback) {} + base::RepeatingClosure invalidation_callback, + bool enable_image_animation_resync) + : notifier_(task_runner, invalidation_callback), + enable_image_animation_resync_(enable_image_animation_resync) {} ImageAnimationController::~ImageAnimationController() = default; @@ -71,7 +73,7 @@ // If we were able to advance this animation, invalidate it on the sync // tree. - if (state.AdvanceFrame(now)) + if (state.AdvanceFrame(now, enable_image_animation_resync_)) images_animated_on_sync_tree_.insert(id); // Update the next invalidation time to the earliest time at which we need @@ -216,7 +218,8 @@ } bool ImageAnimationController::AnimationState::AdvanceFrame( - base::TimeTicks now) { + base::TimeTicks now, + bool enable_image_animation_resync) { DCHECK(ShouldAnimate()); // Start the animation from the first frame, if not yet started. We don't need @@ -240,7 +243,8 @@ // up and start again from the current frame. // Note that we don't need to invalidate this image since the active tree // is already displaying the current frame. - if (now - next_desired_frame_time_ > kAnimationResyncCutoff) { + if (enable_image_animation_resync && + now - next_desired_frame_time_ > kAnimationResyncCutoff) { DCHECK_EQ(pending_index_, active_index_); next_desired_frame_time_ = now + frames_[pending_index_].duration; return false; @@ -268,8 +272,8 @@ // pages that try to sync an image and some other resource (e.g. audio), // especially if users switch tabs (and thus stop drawing the animation, // which will pause it) during that initial loop, then switch back later. - if (next_frame_index == 0u && repetitions_completed_ == 1 && - next_desired_frame_time <= now) { + if (enable_image_animation_resync && next_frame_index == 0u && + repetitions_completed_ == 1 && next_desired_frame_time <= now) { pending_index_ = 0u; next_desired_frame_time_ = now + frames_[0].duration; repetitions_completed_ = 0; @@ -369,7 +373,7 @@ ImageAnimationController::DelayedNotifier::DelayedNotifier( base::SingleThreadTaskRunner* task_runner, - base::Closure closure) + base::RepeatingClosure closure) : task_runner_(task_runner), closure_(std::move(closure)), weak_factory_(this) {
diff --git a/cc/trees/image_animation_controller.h b/cc/trees/image_animation_controller.h index 13a85bb..7ccf9eb 100644 --- a/cc/trees/image_animation_controller.h +++ b/cc/trees/image_animation_controller.h
@@ -58,8 +58,11 @@ // created. // |task_runner| is the thread on which the controller is used. The // invalidation_callback can only be run on this thread. + // |enable_image_animation_resync| specifies whether the animation can be + // reset to the beginning to avoid skipping many frames. ImageAnimationController(base::SingleThreadTaskRunner* task_runner, - base::Closure invalidation_callback); + base::RepeatingClosure invalidation_callback, + bool enable_image_animation_resync); ~ImageAnimationController(); // Called to update the state for a PaintImage received in a new recording. @@ -110,7 +113,7 @@ ~AnimationState(); bool ShouldAnimate() const; - bool AdvanceFrame(base::TimeTicks now); + bool AdvanceFrame(base::TimeTicks now, bool enable_image_animation_resync); void UpdateMetadata(const DiscardableImageMap::AnimatedImageMetadata& data); void PushPendingToActive(); @@ -193,7 +196,7 @@ class DelayedNotifier { public: DelayedNotifier(base::SingleThreadTaskRunner* task_runner, - base::Closure closure); + base::RepeatingClosure closure); ~DelayedNotifier(); void Schedule(base::TimeTicks now, base::TimeTicks notification_time); @@ -204,7 +207,7 @@ void Notify(); base::SingleThreadTaskRunner* task_runner_; - base::Closure closure_; + base::RepeatingClosure closure_; // Set if a notification is currently pending. base::Optional<base::TimeTicks> pending_notification_time_; @@ -231,6 +234,8 @@ PaintImageIdFlatSet images_animated_on_sync_tree_; DelayedNotifier notifier_; + + const bool enable_image_animation_resync_; }; } // namespace cc
diff --git a/cc/trees/image_animation_controller_unittest.cc b/cc/trees/image_animation_controller_unittest.cc index 1a4c486..95a5fdf 100644 --- a/cc/trees/image_animation_controller_unittest.cc +++ b/cc/trees/image_animation_controller_unittest.cc
@@ -78,7 +78,8 @@ base::Bind(&ImageAnimationControllerTest::RequestInvalidation, base::Unretained(this)); controller_ = std::make_unique<ImageAnimationController>( - task_runner_.get(), invalidation_callback); + task_runner_.get(), invalidation_callback, + GetEnableImageAnimationResync()); now_ += base::TimeDelta::FromSeconds(10); } @@ -151,6 +152,8 @@ void AdvanceNow(base::TimeDelta delta) { now_ += delta; } + virtual bool GetEnableImageAnimationResync() const { return true; } + base::TimeTicks now_; int invalidation_count_ = 0; std::unique_ptr<ImageAnimationController> controller_; @@ -734,4 +737,112 @@ controller_->UnregisterAnimationDriver(data.paint_image_id, &driver); } +class ImageAnimationControllerNoResyncTest + : public ImageAnimationControllerTest { + protected: + bool GetEnableImageAnimationResync() const override { return false; } +}; + +TEST_F(ImageAnimationControllerNoResyncTest, NoSyncCutoffAfterIdle) { + std::vector<FrameMetadata> frames = { + FrameMetadata(true, base::TimeDelta::FromMilliseconds(2)), + FrameMetadata(true, base::TimeDelta::FromMilliseconds(3))}; + + DiscardableImageMap::AnimatedImageMetadata data( + PaintImage::GetNextId(), PaintImage::CompletionState::DONE, frames, + kAnimationLoopInfinite, 0); + controller_->UpdateAnimatedImage(data); + FakeAnimationDriver driver; + controller_->RegisterAnimationDriver(data.paint_image_id, &driver); + controller_->UpdateStateFromDrivers(now_); + + // Advance the first frame. + task_runner_->VerifyDelay(base::TimeDelta()); + base::RunLoop().RunUntilIdle(); + EXPECT_EQ(invalidation_count_, 1); + auto animated_images = controller_->AnimateForSyncTree(now_); + EXPECT_EQ(animated_images.size(), 0u); + EXPECT_EQ(controller_->GetFrameIndexForImage(data.paint_image_id, + WhichTree::PENDING_TREE), + 0u); + EXPECT_EQ(controller_->GetFrameIndexForImage(data.paint_image_id, + WhichTree::ACTIVE_TREE), + 0u); + controller_->DidActivate(); + + // Invalidation request for the second frame. + task_runner_->VerifyDelay(frames[0].duration); + + // Advance the time by 10 min (divisible by animation duration) and first + // frame duration. + AdvanceNow(base::TimeDelta::FromMinutes(10) + frames[0].duration); + + // Animate again, it should not restart from the start. Should display second + // animation frame. + animated_images = controller_->AnimateForSyncTree(now_); + EXPECT_EQ(animated_images.size(), 1u); + EXPECT_EQ(controller_->GetFrameIndexForImage(data.paint_image_id, + WhichTree::PENDING_TREE), + 1u); + EXPECT_EQ(controller_->GetFrameIndexForImage(data.paint_image_id, + WhichTree::ACTIVE_TREE), + 0u); + controller_->DidActivate(); + + // New invalidation request since the desired invalidation time changed. + task_runner_->VerifyDelay(frames[1].duration); + invalidation_count_ = 0; + base::RunLoop().RunUntilIdle(); + EXPECT_EQ(invalidation_count_, 1); + + controller_->UnregisterAnimationDriver(data.paint_image_id, &driver); +} + +TEST_F(ImageAnimationControllerNoResyncTest, SkipsLoopsAfterFirstIteration) { + std::vector<FrameMetadata> frames = { + FrameMetadata(true, base::TimeDelta::FromMilliseconds(2)), + FrameMetadata(true, base::TimeDelta::FromMilliseconds(3)), + FrameMetadata(true, base::TimeDelta::FromMilliseconds(4)), + FrameMetadata(true, base::TimeDelta::FromMilliseconds(5))}; + + DiscardableImageMap::AnimatedImageMetadata data( + PaintImage::GetNextId(), PaintImage::CompletionState::PARTIALLY_DONE, + frames, kAnimationLoopInfinite, 0); + controller_->UpdateAnimatedImage(data); + FakeAnimationDriver driver; + controller_->RegisterAnimationDriver(data.paint_image_id, &driver); + controller_->UpdateStateFromDrivers(now_); + + // Perform the first loop while the image is partially loaded, until the third + // frame. + LoopOnceNoDelay(data.paint_image_id, frames, 3u, 0); + + // The invalidation has been scheduled with a delay for the third frame's + // duration. + task_runner_->VerifyDelay(frames[2].duration); + + // |now_| is set to the desired time for the fourth frame. Advance further so + // we reach the time for the second frame. + AdvanceNow(frames[3].duration + frames[0].duration); + + // Finish the image load. + data.completion_state = PaintImage::CompletionState::DONE; + controller_->UpdateAnimatedImage(data); + controller_->UpdateStateFromDrivers(now_); + + // Invalidation is scheduled immediately because we are way past the desired + // time. We skip frames even after the image is loaded. + task_runner_->VerifyDelay(base::TimeDelta()); + auto animated_images = controller_->AnimateForSyncTree(now_); + EXPECT_EQ(animated_images.size(), 1u); + EXPECT_EQ(animated_images.count(data.paint_image_id), 1u); + EXPECT_EQ(controller_->GetFrameIndexForImage(data.paint_image_id, + WhichTree::PENDING_TREE), + 1u); + EXPECT_EQ(controller_->GetFrameIndexForImage(data.paint_image_id, + WhichTree::ACTIVE_TREE), + 2u); + controller_->UnregisterAnimationDriver(data.paint_image_id, &driver); +} + } // namespace cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 9fefa22..9319a74 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -290,8 +290,9 @@ base::Closure invalidation_callback = base::Bind(&LayerTreeHostImpl::RequestInvalidationForAnimatedImages, base::Unretained(this)); - image_animation_controller_.emplace(GetTaskRunner(), - std::move(invalidation_callback)); + image_animation_controller_.emplace( + GetTaskRunner(), std::move(invalidation_callback), + settings_.enable_image_animation_resync); } }
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index c9ad35f47..be4f876 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h
@@ -142,6 +142,10 @@ // Whether images should be animated in the compositor. bool enable_image_animations = false; + // Whether image animations can be reset to the beginning to avoid skipping + // many frames. Only effective if |enable_image_animations| is true. + bool enable_image_animation_resync = true; + // Whether to use edge anti-aliasing for all layer types that supports it. bool enable_edge_anti_aliasing = true;
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index fbcf20cd..d898d3b 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn
@@ -625,13 +625,13 @@ deps += [ ":chrome_helpers" ] } - # Remove the default strip configuration (which strips all symbols) so that - # a saves file can be specified. if (enable_stripping) { - remove_configs = [ "//build/config/mac:strip_all" ] - - ldflags = - [ "-Wcrl,strip,-s," + rebase_path("app/app.saves", root_build_dir) ] + # At link time, preserve the global symbols specified in the .exports + # file. All other global symbols will be marked as private. The default + # //build/config/mac:strip_all config will then remove the remaining + # local and debug symbols. + ldflags = [ "-Wl,-exported_symbols_list," + + rebase_path("app/app.exports", root_build_dir) ] } } @@ -821,13 +821,13 @@ ] } - # Remove the default strip configuration (which strips all symbols) so that - # a saves file can be specified. if (enable_stripping) { - remove_configs = [ "//build/config/mac:strip_all" ] - - ldflags += - [ "-Wcrl,strip,-s," + rebase_path("app/app.saves", root_build_dir) ] + # At link time, preserve the global symbols specified in the .exports + # file. All other global symbols will be marked as private. The default + # //build/config/mac:strip_all config will then remove the remaining + # local and debug symbols. + ldflags += [ "-Wl,-exported_symbols_list," + + rebase_path("app/app.exports", root_build_dir) ] } } @@ -1827,7 +1827,6 @@ if (is_android && is_component_build) { deps += [ "//device/gamepad", - "//device/sensors", "//ui/events/devices", ] }
diff --git a/chrome/android/java/res/drawable-hdpi/bottom_toolbar_top_line.png b/chrome/android/java/res/drawable-hdpi/bottom_toolbar_top_line.png deleted file mode 100644 index 6bf7158..0000000 --- a/chrome/android/java/res/drawable-hdpi/bottom_toolbar_top_line.png +++ /dev/null Binary files differ
diff --git a/chrome/android/java/res/drawable-mdpi/bottom_toolbar_top_line.png b/chrome/android/java/res/drawable-mdpi/bottom_toolbar_top_line.png deleted file mode 100644 index 76a8c8d..0000000 --- a/chrome/android/java/res/drawable-mdpi/bottom_toolbar_top_line.png +++ /dev/null Binary files differ
diff --git a/chrome/android/java/res/drawable-xhdpi/bottom_toolbar_top_line.png b/chrome/android/java/res/drawable-xhdpi/bottom_toolbar_top_line.png deleted file mode 100644 index 8900e4f6..0000000 --- a/chrome/android/java/res/drawable-xhdpi/bottom_toolbar_top_line.png +++ /dev/null Binary files differ
diff --git a/chrome/android/java/res/drawable-xxhdpi/bottom_toolbar_top_line.png b/chrome/android/java/res/drawable-xxhdpi/bottom_toolbar_top_line.png deleted file mode 100644 index 8849b9e8..0000000 --- a/chrome/android/java/res/drawable-xxhdpi/bottom_toolbar_top_line.png +++ /dev/null Binary files differ
diff --git a/chrome/android/java/res/drawable/modern_bottom_toolbar_shadow.xml b/chrome/android/java/res/drawable/modern_bottom_toolbar_shadow.xml deleted file mode 100644 index 242138a4..0000000 --- a/chrome/android/java/res/drawable/modern_bottom_toolbar_shadow.xml +++ /dev/null
@@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright 2017 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. --> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <bitmap - android:src="@drawable/toolbar_shadow_focused" - android:gravity="top|fill_horizontal" /> - </item> - <item> - <bitmap - android:src="@drawable/bottom_toolbar_top_line" - android:gravity="top|fill_horizontal" /> - </item> -</layer-list>
diff --git a/chrome/android/java/res/drawable/toolbar_handle_light.xml b/chrome/android/java/res/drawable/toolbar_handle_light.xml deleted file mode 100644 index f0de86c..0000000 --- a/chrome/android/java/res/drawable/toolbar_handle_light.xml +++ /dev/null
@@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright 2017 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. --> - -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - <solid android:color="@color/white_alpha_50" /> - <size - android:width="@dimen/toolbar_handle_width" - android:height="@dimen/toolbar_handle_height" /> - <corners android:radius="@dimen/toolbar_handle_corner_radius" /> -</shape> \ No newline at end of file
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml index ccd1575a..08480f2 100644 --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml
@@ -265,14 +265,8 @@ <dimen name="tablet_toolbar_end_padding">6dp</dimen> <dimen name="location_bar_status_separator_width">1dp</dimen> - <!-- Bottom toolbar dimensions --> - <dimen name="bottom_toolbar_top_margin">2dp</dimen> - <dimen name="bottom_toolbar_url_bar_top_margin">3.5dp</dimen> - <dimen name="bottom_toolbar_background_focused_left_margin">6dp</dimen> - <dimen name="bottom_location_bar_content_lateral_inset">8dp</dimen> - <dimen name="bottom_location_bar_content_vertical_inset">4dp</dimen> - - <!-- Modern toolbar background dimensions --> + <!-- Modern toolbar dimensions --> + <dimen name="modern_toolbar_background_focused_left_margin">6dp</dimen> <dimen name="modern_toolbar_background_size">40dp</dimen> <dimen name="modern_toolbar_background_corner_radius">20dp</dimen> <dimen name="modern_toolbar_background_lateral_inset">2dp</dimen> @@ -514,7 +508,6 @@ <!-- Chrome Home dimensions --> <dimen name="chrome_home_min_full_half_distance">160dp</dimen> - <dimen name="chrome_home_progress_bar_height">4dp</dimen> <dimen name="chrome_home_incognito_ntp_bottom_margin">32dp</dimen> <!-- TextBubble dimensions -->
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/UrlConstants.java b/chrome/android/java/src/org/chromium/chrome/browser/UrlConstants.java index 4beb3ad9..532538b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/UrlConstants.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/UrlConstants.java
@@ -74,4 +74,7 @@ public static final String MY_ACTIVITY_URL_IN_HISTORY = "https://myactivity.google.com/myactivity/?utm_source=chrome_h"; + + public static final String CHROME_MEMEX_URL = "https://chrome-memex.appspot.com/"; + public static final String CHROME_MEMEX_DEV_URL = "https://chrome-memex-dev.appspot.com/"; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browseractions/BrowserActionsContextMenuHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/browseractions/BrowserActionsContextMenuHelper.java index a26b9d9..745a73c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/browseractions/BrowserActionsContextMenuHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browseractions/BrowserActionsContextMenuHelper.java
@@ -33,7 +33,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.VisibleForTesting; -import org.chromium.base.metrics.RecordHistogram; +import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem; @@ -119,6 +119,7 @@ private final Runnable mOnMenuShownListener; private final Callback<Boolean> mOnShareClickedRunnable; private final PendingIntent mOnBrowserActionSelectedCallback; + private final EnumeratedHistogramSample mActionHistogram; private final List<Pair<Integer, List<ContextMenuItem>>> mItems; @@ -154,7 +155,7 @@ mItemSelectedCallback = new Callback<Integer>() { @Override public void onResult(Integer result) { - onItemSelected(result); + onItemSelected(result, true); } }; mOnShareClickedRunnable = new Callback<Boolean>() { @@ -179,6 +180,8 @@ mMenuItemDelegate = new BrowserActionsContextMenuItemDelegate(mActivity, sourcePackageName); mOnBrowserActionSelectedCallback = onBrowserActionSelectedCallback; mProgressDialog = new ProgressDialog(mActivity); + mActionHistogram = + new EnumeratedHistogramSample("BrowserActions.SelectedOption", NUM_ACTIONS); mItems = buildContextMenuItems(customItems, sourcePackageName); } @@ -249,45 +252,54 @@ } } - boolean onItemSelected(int itemId) { + boolean onItemSelected(int itemId, boolean recordMetrics) { if (itemId == R.id.browser_actions_open_in_background) { if (mIsNativeInitialized) { - recordBrowserActionsSelection(ACTION_OPEN_IN_NEW_CHROME_TAB); handleOpenInBackground(); } else { mPendingItemId = itemId; waitNativeInitialized(); } } else if (itemId == R.id.browser_actions_open_in_incognito_tab) { - recordBrowserActionsSelection(ACTION_OPEN_IN_INCOGNITO_TAB); mMenuItemDelegate.onOpenInIncognitoTab(mCurrentContextMenuParams.getLinkUrl()); notifyBrowserActionSelected(BrowserActionsIntent.ITEM_OPEN_IN_INCOGNITO); } else if (itemId == R.id.browser_actions_save_link_as) { if (mIsNativeInitialized) { - recordBrowserActionsSelection(ACTION_DOWNLOAD_PAGE); handleDownload(); } else { mPendingItemId = itemId; waitNativeInitialized(); } } else if (itemId == R.id.browser_actions_copy_address) { - recordBrowserActionsSelection(ACTION_COPY_LINK); mMenuItemDelegate.onSaveToClipboard(mCurrentContextMenuParams.getLinkUrl()); notifyBrowserActionSelected(BrowserActionsIntent.ITEM_COPY); } else if (itemId == R.id.browser_actions_share) { - recordBrowserActionsSelection(ACTION_SHARE); mMenuItemDelegate.share(false, mCurrentContextMenuParams.getLinkUrl()); notifyBrowserActionSelected(BrowserActionsIntent.ITEM_SHARE); } else if (mCustomItemActionMap.indexOfKey(itemId) >= 0) { - recordBrowserActionsSelection(ACTION_APP_PROVIDED); mMenuItemDelegate.onCustomItemSelected(mCustomItemActionMap.get(itemId)); } + if (recordMetrics) recordBrowserActionsSelection(itemId); return true; } - private void recordBrowserActionsSelection(@BrowserActionsActionId int itemId) { - RecordHistogram.recordEnumeratedHistogram( - "BrowserActions.SelectedOption", itemId, NUM_ACTIONS); + private void recordBrowserActionsSelection(int itemId) { + @BrowserActionsActionId + final int actionId; + if (itemId == R.id.browser_actions_open_in_background) { + actionId = ACTION_OPEN_IN_NEW_CHROME_TAB; + } else if (itemId == R.id.browser_actions_open_in_incognito_tab) { + actionId = ACTION_OPEN_IN_INCOGNITO_TAB; + } else if (itemId == R.id.browser_actions_save_link_as) { + actionId = ACTION_DOWNLOAD_PAGE; + } else if (itemId == R.id.browser_actions_copy_address) { + actionId = ACTION_COPY_LINK; + } else if (itemId == R.id.browser_actions_share) { + actionId = ACTION_SHARE; + } else { + actionId = ACTION_APP_PROVIDED; + } + mActionHistogram.record(actionId); } private void notifyBrowserActionSelected(int menuId) { @@ -365,7 +377,7 @@ } if (mPendingItemId != 0) { dismissProgressDialog(); - onItemSelected(mPendingItemId); + onItemSelected(mPendingItemId, false); mPendingItemId = 0; mActivity.finish(); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java index bfeb912..7146a438 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
@@ -8,7 +8,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.os.SystemClock; -import android.view.ViewConfiguration; +import android.support.annotation.IntDef; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.animation.Interpolator; @@ -44,6 +44,8 @@ import org.chromium.ui.resources.ResourceManager; import java.io.Serializable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; @@ -60,8 +62,18 @@ STACK_OFFSET_Y_PERCENT, } + @IntDef({DRAG_DIRECTION_NONE, DRAG_DIRECTION_HORIZONTAL, DRAG_DIRECTION_VERTICAL}) + @Retention(RetentionPolicy.SOURCE) + public @interface DragDirection {} + private static final int DRAG_DIRECTION_NONE = 0; + private static final int DRAG_DIRECTION_HORIZONTAL = 1; + private static final int DRAG_DIRECTION_VERTICAL = 2; + private enum SwipeMode { NONE, SEND_TO_STACK, SWITCH_STACK } + public static final int NORMAL_STACK_INDEX = 0; + public static final int INCOGNITO_STACK_INDEX = 1; + private static final String TAG = "StackLayout"; // One stack for normal tabs and one stack for incognito tabs. @@ -76,7 +88,6 @@ private static final int FLING_MIN_DURATION = 100; // ms private static final float THRESHOLD_TO_SWITCH_STACK = 0.4f; - private static final float THRESHOLD_TIME_TO_SWITCH_STACK_INPUT_MODE = 200; private static final int NEW_TAB_ANIMATION_DURATION_MS = 300; public static final int MODERN_TOP_MARGIN_DP = 16; @@ -114,12 +125,13 @@ private float mInnerMarginPercent; private float mStackOffsetYPercent; + @DragDirection + private int mDragDirection = DRAG_DIRECTION_NONE; + private SwipeMode mInputMode = SwipeMode.NONE; private float mLastOnDownX; private float mLastOnDownY; private long mLastOnDownTimeStamp; - private final float mMinShortPressThresholdSqr; // Computed from Android ViewConfiguration - private final float mMinDirectionThreshold; // Computed from Android ViewConfiguration // Pre-allocated temporary arrays that store id of visible tabs. // They can be used to call populatePriorityVisibilityList. @@ -162,10 +174,10 @@ @Override public void onDown(float x, float y, boolean fromMouse, int buttons) { long time = time(); + mDragDirection = DRAG_DIRECTION_NONE; mLastOnDownX = x; mLastOnDownY = y; mLastOnDownTimeStamp = time; - mInputMode = computeInputMode(time, x, y, 0, 0); mStacks.get(getTabStackIndex()).onDown(time); } @@ -182,6 +194,9 @@ float amountY = dy; mInputMode = computeInputMode(time, x, y, amountX, amountY); + if (mDragDirection == DRAG_DIRECTION_HORIZONTAL) amountY = 0; + if (mDragDirection == DRAG_DIRECTION_VERTICAL) amountX = 0; + if (oldInputMode == SwipeMode.SEND_TO_STACK && mInputMode == SwipeMode.SWITCH_STACK) { mStacks.get(getTabStackIndex()).onUpOrCancel(time); } else if (oldInputMode == SwipeMode.SWITCH_STACK @@ -275,10 +290,6 @@ mGestureHandler = new StackLayoutGestureHandler(); mGestureEventFilter = new GestureEventFilter(context, mGestureHandler); - final ViewConfiguration configuration = ViewConfiguration.get(context); - mMinDirectionThreshold = configuration.getScaledTouchSlop(); - mMinShortPressThresholdSqr = - configuration.getScaledPagingTouchSlop() * configuration.getScaledPagingTouchSlop(); mMinMaxInnerMargin = (int) (MIN_INNER_MARGIN_PERCENT_DP + 0.5); mFlingSpeed = FLING_SPEED_DP; @@ -348,8 +359,8 @@ * @return The tab stack state for the given mode. * @VisibleForTesting */ - public Stack getTabStack(boolean incognito) { - return mStacks.get(incognito ? 1 : 0); + public Stack getTabStackAtIndex(int index) { + return mStacks.get(index); } /** @@ -372,7 +383,7 @@ boolean incognito = mTemporarySelectedStack != null ? mTemporarySelectedStack : mTabModelSelector.isIncognitoSelected(); - return incognito ? 1 : 0; + return incognito ? INCOGNITO_STACK_INDEX : NORMAL_STACK_INDEX; } else { return TabModelUtils.getTabById(mTabModelSelector.getModel(true), tabId) != null ? 1 : 0; @@ -386,7 +397,7 @@ * @return The tab stack state for the given tab id. * @VisibleForTesting */ - protected Stack getTabStack(int tabId) { + protected Stack getTabStackForTabId(int tabId) { return mStacks.get(getTabStackIndex(tabId)); } @@ -412,7 +423,7 @@ @Override public void onTabClosing(long time, int id) { - Stack stack = getTabStack(id); + Stack stack = getTabStackForTabId(id); if (stack == null) return; stack.tabClosingEffect(time, id); @@ -426,7 +437,8 @@ @Override public void onTabsAllClosing(long time, boolean incognito) { super.onTabsAllClosing(time, incognito); - getTabStack(incognito).tabsAllClosingEffect(time); + getTabStackAtIndex(incognito ? INCOGNITO_STACK_INDEX : NORMAL_STACK_INDEX) + .tabsAllClosingEffect(time); // trigger the overlap animation. startMarginAnimation(true); // Animate the stack to leave incognito mode. @@ -436,7 +448,8 @@ @Override public void onTabClosureCancelled(long time, int id, boolean incognito) { super.onTabClosureCancelled(time, id, incognito); - getTabStack(incognito).undoClosure(time, id); + getTabStackAtIndex(incognito ? INCOGNITO_STACK_INDEX : NORMAL_STACK_INDEX) + .undoClosure(time, id); } @Override @@ -599,7 +612,7 @@ */ public void uiRequestingCloseTab(long time, int id) { // Start the tab closing effect if necessary. - getTabStack(id).tabClosingEffect(time, id); + getTabStackForTabId(id).tabClosingEffect(time, id); int incognitoCount = mTabModelSelector.getModel(true).getCount(); TabModel model = mTabModelSelector.getModelForTabId(id); @@ -785,37 +798,45 @@ private SwipeMode computeInputMode(long time, float x, float y, float dx, float dy) { if (!mStacks.get(1).isDisplayable()) return SwipeMode.SEND_TO_STACK; int currentIndex = getTabStackIndex(); - float relativeX = mLastOnDownX - (x + dx); - float relativeY = mLastOnDownY - (y + dy); - float distanceToDownSqr = dx * dx + dy * dy; - float switchDelta = getOrientation() == Orientation.PORTRAIT ? relativeX : relativeY; - float otherDelta = getOrientation() == Orientation.PORTRAIT ? relativeY : relativeX; - // Dragging in the opposite direction of the stack switch - if (distanceToDownSqr > mMinDirectionThreshold * mMinDirectionThreshold - && Math.abs(otherDelta) > Math.abs(switchDelta)) { - return SwipeMode.SEND_TO_STACK; - } - // Dragging in a direction the stack cannot switch - if (Math.abs(switchDelta) > mMinDirectionThreshold) { - if ((currentIndex == 0) ^ (switchDelta > 0) - ^ (getOrientation() == Orientation.PORTRAIT - && LocalizationUtils.isLayoutRtl())) { - return SwipeMode.SEND_TO_STACK; + // When a drag starts, lock the drag into being either horizontal or vertical until the + // next touch down. The deltas here are already verified by StackLayoutGestureHandler as + // being above some threshold so that we know we're handling a drag or fling and not a long + // press. + if (mDragDirection == DRAG_DIRECTION_NONE) { + if (Math.abs(dx) > Math.abs(dy)) { + mDragDirection = DRAG_DIRECTION_HORIZONTAL; } else { - return SwipeMode.SWITCH_STACK; + mDragDirection = DRAG_DIRECTION_VERTICAL; } } - // Not moving the finger - if (time - mLastOnDownTimeStamp > THRESHOLD_TIME_TO_SWITCH_STACK_INPUT_MODE) { + if ((mDragDirection == DRAG_DIRECTION_VERTICAL) + ^ (getOrientation() == Orientation.LANDSCAPE)) { return SwipeMode.SEND_TO_STACK; } - // Dragging fast - if (distanceToDownSqr > mMinShortPressThresholdSqr) { + + float relativeX = mLastOnDownX - (x + dx); + float relativeY = mLastOnDownY - (y + dy); + float switchDelta = getOrientation() == Orientation.PORTRAIT ? relativeX : relativeY; + + // In LTR portrait mode, the first stack can be swiped to the left to switch to the second + // stack, and the second stack can be swiped to the right to switch to the first stack. We + // reverse the check for RTL portrait mode because increasing the stack index corresponds + // to a negative switchDelta. + // + // Landscape mode is like LTR portrait mode (increasing the stack index corresponds to a + // positive switchDelta). + final boolean isRtlPortraitMode = + (getOrientation() == Orientation.PORTRAIT && LocalizationUtils.isLayoutRtl()); + if ((currentIndex == 0) ^ (switchDelta > 0) ^ isRtlPortraitMode) { + // Dragging in a direction the stack cannot switch. Pass the drag to the Stack, which + // will treat it as intending to discard a tab. + return SwipeMode.SEND_TO_STACK; + } else { + // Interpret the drag as intending to switch between tab stacks. return SwipeMode.SWITCH_STACK; } - return SwipeMode.NONE; } class PortraitViewport {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java index dad853a..e85c510 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
@@ -1293,13 +1293,6 @@ } @Override - public void showUnhandledTapUIIfNeeded(final int x, final int y) { - if (!isOverlayVideoMode()) { - mSelectionController.handleShowUnhandledTapUIIfNeeded(x, y); - } - } - - @Override public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) { if (mSelectWordAroundCaretCounter > 0) mSelectWordAroundCaretCounter--; if (mSelectWordAroundCaretCounter > 0 @@ -1327,6 +1320,13 @@ public void cancelAllRequests() {} } + /** Shows the Unhandled Tap UI. Called by {@link ContextualSearchTabHelper}. */ + void onShowUnhandledTapUIIfNeeded(int x, int y) { + if (!isOverlayVideoMode()) { + mSelectionController.handleShowUnhandledTapUIIfNeeded(x, y); + } + } + /** * @return Whether the display is in a full-screen video overlay mode. */
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java index fc68c94..a0edbba 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java
@@ -30,6 +30,9 @@ /** The Tab that this helper tracks. */ private final Tab mTab; + // Device scale factor. + private final float mPxToDp; + /** Notification handler for Contextual Search events. */ private TemplateUrlServiceObserver mTemplateUrlObserver; @@ -73,6 +76,11 @@ if (NetworkChangeNotifier.isInitialized()) { NetworkChangeNotifier.addConnectionTypeObserver(this); } + float scaleFactor = 1.f; + if (tab != null && tab.getActivity() != null && tab.getActivity().getResources() != null) { + scaleFactor /= tab.getActivity().getResources().getDisplayMetrics().density; + } + mPxToDp = scaleFactor; } // ============================================================================================ @@ -219,6 +227,7 @@ contextualSearchManager.getContextualSearchSelectionClient())); contextualSearchManager.suppressContextualSearchForSmartSelection( mSelectionClientManager.isSmartSelectionEnabledInChrome()); + nativeInstallUnhandledTapNotifierIfNeeded(mNativeHelper, webContents, mPxToDp); } } @@ -303,6 +312,20 @@ } } + /** + * Notifies this helper to show the Unhandled Tap UI due to a tap at the given pixel + * coordinates. + */ + @CalledByNative + void onShowUnhandledTapUIIfNeeded(int x, int y) { + // Only notify the manager if we currently have a valid listener. + if (mGestureStateListener != null && getContextualSearchManager(mTab) != null) { + getContextualSearchManager(mTab).onShowUnhandledTapUIIfNeeded(x, y); + } + } + private native long nativeInit(Profile profile); + private native void nativeInstallUnhandledTapNotifierIfNeeded( + long nativeContextualSearchTabHelper, WebContents webContents, float pxToDpScaleFactor); private native void nativeDestroy(long nativeContextualSearchTabHelper); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java index 3163e34..628a4f9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
@@ -162,12 +162,6 @@ } @Override - public void showUnhandledTapUIIfNeeded(int x, int y) { - mSmartSelectionClient.showUnhandledTapUIIfNeeded(x, y); - mContextualSearchSelectionClient.showUnhandledTapUIIfNeeded(x, y); - } - - @Override public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) { mSmartSelectionClient.selectWordAroundCaretAck(didSelect, startAdjust, endAdjust); mContextualSearchSelectionClient.selectWordAroundCaretAck(
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java index 5c2347a..d00b7e9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
@@ -482,7 +482,7 @@ * @return True if Sole integration is enabled. */ public boolean isSoleEnabled() { - return mSharedPreferences.getBoolean(SOLE_INTEGRATION_ENABLED_KEY, false); + return mSharedPreferences.getBoolean(SOLE_INTEGRATION_ENABLED_KEY, true); } /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java index 26fc274..cdb0118 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
@@ -10,14 +10,17 @@ import org.chromium.base.SysUtils; import org.chromium.base.TraceEvent; import org.chromium.chrome.browser.ChromeActivity; +import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.ServiceTabLauncher; import org.chromium.chrome.browser.TabState; +import org.chromium.chrome.browser.UrlConstants; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabDelegateFactory; import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType; +import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType; import org.chromium.chrome.browser.util.IntentUtils; import org.chromium.components.url_formatter.UrlFormatter; import org.chromium.content_public.browser.LoadUrlParams; @@ -169,6 +172,22 @@ // The parent tab was already closed. Do not open child tabs. if (mTabModel.isClosurePending(parentId)) return false; + // For this experiment, avoid creating extra new tabs, if there is already a tab with the + // same url and use that tab instead. + if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_MEMEX) && parent != null) { + String parentUrl = parent.getUrl(); + if (parentUrl.startsWith(UrlConstants.CHROME_MEMEX_URL) + || parentUrl.startsWith(UrlConstants.CHROME_MEMEX_DEV_URL)) { + for (int i = 0; i < mTabModel.getCount(); i++) { + String tabUrl = mTabModel.getTabAt(i).getUrl(); + if (url.equals(tabUrl)) { + mTabModel.setIndex(i, TabSelectionType.FROM_USER); + return false; + } + } + } + } + // If parent is in the same tab model, place the new tab next to it. int position = TabModel.INVALID_TAB_INDEX; int index = TabModelUtils.getTabIndexById(mTabModel, parentId);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java deleted file mode 100644 index ac54cebb..0000000 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java +++ /dev/null
@@ -1,1146 +0,0 @@ -// Copyright 2016 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. - -package org.chromium.chrome.browser.toolbar; - -import android.animation.Animator; -import android.animation.ValueAnimator; -import android.content.Context; -import android.content.res.ColorStateList; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.LayerDrawable; -import android.os.SystemClock; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v7.widget.Toolbar; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewGroup; -import android.view.accessibility.AccessibilityNodeInfo; -import android.view.animation.Interpolator; -import android.widget.FrameLayout; -import android.widget.ImageView; - -import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.chrome.R; -import org.chromium.chrome.browser.ChromeActivity; -import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper; -import org.chromium.chrome.browser.device.DeviceClassManager; -import org.chromium.chrome.browser.infobar.InfoBar; -import org.chromium.chrome.browser.infobar.InfoBarContainer; -import org.chromium.chrome.browser.infobar.InfoBarContainer.InfoBarContainerObserver; -import org.chromium.chrome.browser.tab.EmptyTabObserver; -import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.tab.TabObserver; -import org.chromium.chrome.browser.util.AccessibilityUtil; -import org.chromium.chrome.browser.util.ColorUtils; -import org.chromium.chrome.browser.util.MathUtils; -import org.chromium.chrome.browser.widget.TintedImageButton; -import org.chromium.chrome.browser.widget.ToolbarProgressBar; -import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet; -import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.StateChangeReason; -import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver; -import org.chromium.chrome.browser.widget.bottomsheet.EmptyBottomSheetObserver; -import org.chromium.ui.UiUtils; -import org.chromium.ui.base.LocalizationUtils; -import org.chromium.ui.interpolators.BakedBezierInterpolator; - -/** - * Phone specific toolbar that exists at the bottom of the screen. - */ -public class BottomToolbarPhone extends ToolbarPhone { - /** - * The observer used to listen to {@link BottomSheet} events. - */ - private final BottomSheetObserver mBottomSheetObserver = new EmptyBottomSheetObserver() { - @Override - public void onSheetOpened(@StateChangeReason int reason) { - onPrimaryColorChanged(true); - // If the toolbar is focused, switch focus to the bottom sheet before changing the - // content description. If the content description is changed while the view is - // focused, the new content description is read immediately. - if (hasFocus() && !urlHasFocus()) mBottomSheet.requestFocus(); - - if (isNativeLibraryReady()) mLocationBar.updateLoadingState(true); - updateContentDescription(); - } - - @Override - public void onSheetClosed(@StateChangeReason int reason) { - onPrimaryColorChanged(true); - updateMenuButtonClickableState(); - - mLocationBar.updateLoadingState(true); - updateContentDescription(); - } - - @Override - public void onSheetReleased() { - onPrimaryColorChanged(true); - } - - @Override - public void onSheetOffsetChanged(float heightFraction) { - boolean isMovingDown = heightFraction < mLastHeightFraction; - mLastHeightFraction = heightFraction; - - // The only time the omnibox should have focus is when the sheet is fully expanded. Any - // movement of the sheet should unfocus it. - if (isMovingDown && getLocationBar().isUrlBarFocused()) { - getLocationBar().setUrlBarFocus(false); - // Revert the URL to match the current page. - getLocationBar().setUrlToPageUrl(); - } - boolean buttonsClickable = heightFraction == 0.f; - mToggleTabStackButton.setClickable(buttonsClickable); - updateMenuButtonClickableState(); - mExpandButton.setClickable(buttonsClickable); - } - - @Override - public void onTransitionPeekToHalf(float transitionFraction) { - if (mLastPeekToHalfHeightFraction == transitionFraction) return; - - boolean isMovingUp = transitionFraction > mLastPeekToHalfHeightFraction; - mLastPeekToHalfHeightFraction = transitionFraction; - updateToolbarButtonAnimation(isMovingUp); - } - }; - - /** The time a transition for the top toolbar shadow should take in ms. */ - private static final int DURATION_SHADOW_TRANSITION_MS = 250; - - /** The background alpha for the tab switcher in Chrome Modern. */ - private static final float MODERN_TAB_SWITCHER_TOOLBAR_ALPHA = 0.9f; - - /** The white version of the toolbar handle; used for dark themes and incognito. */ - private final Drawable mHandleLight; - - /** The dark version of the toolbar handle; this is the default handle to use. */ - private final Drawable mHandleDark; - - /** A handle to the bottom sheet. */ - private BottomSheet mBottomSheet; - - /** A handle to the expand button that Chrome Home may or may not use. */ - private TintedImageButton mExpandButton; - - /** - * Whether the toolbar buttons are hidden regardless of whether the URL bar is focused. - */ - private boolean mHidingToolbarButtons; - - /** - * This tracks the height fraction of the bottom bar to determine if it is moving up or down. - */ - private float mLastHeightFraction; - - /** - * This tracks the peek-to-half height fraction of the bottom bar to determine if it is moving - * up or down. - */ - private float mLastPeekToHalfHeightFraction; - - /** The toolbar handle view that indicates the toolbar can be pulled upward. */ - private ImageView mToolbarHandleView; - - /** Whether or not the expand button should be used. */ - private boolean mUseExpandButton; - - /** The shadow above the bottom toolbar. */ - private ImageView mBottomToolbarTopShadow; - - /** - * Tracks whether the toolbar buttons are hidden, with 1.f being fully visible and 0.f being - * fully hidden. - */ - private float mToolbarButtonVisibilityPercent; - - /** - * The interpolator for the toolbar button animation. It will either be a fade-in or fade-out - * curve depending on whether the buttons are being shown or hidden. - */ - private Interpolator mToolbarButtonAnimationIterpolator; - - /** Whether the appearance of the toolbar buttons is currently animating. */ - private boolean mAnimatingToolbarButtonAppearance; - - /** Whether the disappearance of the toolbar buttons is currently animating. */ - private boolean mAnimatingToolbarButtonDisappearance; - - /** The height of the location bar background. */ - private float mLocationBarBackgroundHeight; - - /** - * The float used to inset the rect returned by {@link #getLocationBarContentRect(Rect)}. - * This extra vertical inset is needed to ensure the anonymize layer doesn't draw outside of the - * background bounds. - */ - private float mLocationBarContentVerticalInset; - - /** - * The float used to inset the rect returned by {@link #getLocationBarContentRect(Rect)}. - * This extra lateral inset is needed to ensure the anonymize layer doesn't draw outside of the - * background bounds. - */ - private float mLocationBarContentLateralInset; - - /** - * The extra margin to apply to the left side of the location bar when it is focused. - */ - private int mLocationBarExtraFocusedLeftMargin; - - /** The top shadow drawable of the bottom toolbar if it exists. */ - private LayerDrawable mBottomToolbarTopShadowDrawable; - - /** Observer of the infobar container to change the toolbar shadow. */ - private InfoBarContainerObserver mInfoBarContainerObserver; - - /** - * A tab observer to attach/detach the {@link InfoBarContainerObserver} for the bottom toolbar - * top shadow. - */ - private TabObserver mTopShadowTabObserver; - - /** A handle to the {@link ChromeActivity} this toolbar exists in. */ - private ChromeActivity mActivity; - - /** Whether the toolbar is currently being shown in the NTP. */ - private boolean mShownInNtp; - - /** - * Constructs a BottomToolbarPhone object. - * @param context The Context in which this View object is created. - * @param attrs The AttributeSet that was specified with this View. - */ - public BottomToolbarPhone(Context context, AttributeSet attrs) { - super(context, attrs); - - Resources res = context.getResources(); - mHandleDark = ApiCompatibilityUtils.getDrawable(res, R.drawable.toolbar_handle_dark); - mHandleLight = ApiCompatibilityUtils.getDrawable(res, R.drawable.toolbar_handle_light); - mLocationBarContentLateralInset = - res.getDimensionPixelSize(R.dimen.bottom_location_bar_content_lateral_inset); - mLocationBarContentVerticalInset = - res.getDimensionPixelSize(R.dimen.bottom_location_bar_content_vertical_inset); - mLocationBarExtraFocusedLeftMargin = - res.getDimensionPixelSize(R.dimen.bottom_toolbar_background_focused_left_margin); - - mToolbarShadowPermanentlyHidden = true; - mToolbarButtonVisibilityPercent = 1.f; - mToolbarButtonAnimationIterpolator = BakedBezierInterpolator.FADE_OUT_CURVE; - - mInfoBarContainerObserver = new InfoBarContainerObserver() { - @Override - public void onAddInfoBar(InfoBarContainer c, InfoBar infoBar, boolean isFirst) { - if (!isFirst) return; - createShadowTransitionAnimator(1, 0).start(); - } - - @Override - public void onRemoveInfoBar(InfoBarContainer c, InfoBar infoBar, boolean isLast) { - if (!isLast) return; - createShadowTransitionAnimator(0, 1).start(); - } - - @Override - public void onInfoBarContainerAttachedToWindow(boolean hasInfobars) {} - - @Override - public void onInfoBarContainerShownRatioChanged(InfoBarContainer c, float shownRatio) { - if (c.isAnimating()) return; - mBottomToolbarTopShadowDrawable.getDrawable(0).setAlpha( - (int) (255 * (1 - shownRatio))); - mBottomToolbarTopShadowDrawable.getDrawable(1).setAlpha((int) (255 * shownRatio)); - } - }; - - mTopShadowTabObserver = new EmptyTabObserver() { - @Override - public void onShown(Tab tab) { - if (tab.getInfoBarContainer() == null) return; - tab.getInfoBarContainer().addObserver(mInfoBarContainerObserver); - } - - @Override - public void onHidden(Tab tab) { - if (tab.getInfoBarContainer() == null) return; - tab.getInfoBarContainer().removeObserver(mInfoBarContainerObserver); - } - - @Override - public void onContentChanged(Tab tab) { - if (tab.getInfoBarContainer() == null) return; - tab.getInfoBarContainer().addObserver(mInfoBarContainerObserver); - } - }; - } - - /** - * Get the view and drawable for the bottom toolbar's top shadow and initialized the drawable - * state. - */ - private void initBottomToolbarTopShadow() { - mBottomToolbarTopShadow = - (ImageView) getRootView().findViewById(R.id.bottom_toolbar_shadow); - mBottomToolbarTopShadowDrawable = (LayerDrawable) ApiCompatibilityUtils.getDrawable( - getResources(), R.drawable.modern_bottom_toolbar_shadow); - - mBottomToolbarTopShadowDrawable.getDrawable(0).setAlpha(255); - mBottomToolbarTopShadowDrawable.getDrawable(1).setAlpha(0); - - mBottomToolbarTopShadow.setImageDrawable(mBottomToolbarTopShadowDrawable); - } - - /** - * @param activity The {@link ChromeActivity} displaying this toolbar. - */ - public void setActivity(ChromeActivity activity) { - mActivity = activity; - } - - /** - * @return The expand button if it is being used. - */ - public View getExpandButton() { - return mExpandButton; - } - - /** - * @return Whether the expand button is currently being used. - */ - public boolean isUsingExpandButton() { - return mUseExpandButton; - } - - /** - * Set the color of the pull handle used by the toolbar. - * @param useLightDrawable If the handle color should be light. - */ - public void updateHandleTint(boolean useLightDrawable) { - mToolbarHandleView.setImageDrawable(useLightDrawable ? mHandleLight : mHandleDark); - } - - /** - * @return Whether or not the toolbar is currently using a light theme color. - */ - public boolean isLightTheme() { - return !ColorUtils.shouldUseLightForegroundOnBackground(getTabThemeColor()); - } - - @Override - public boolean isInTabSwitcherMode() { - return super.isInTabSwitcherMode() && (mBottomSheet == null || !mBottomSheet.isSheetOpen()); - } - - @Override - protected boolean shouldDrawShadow() { - return mBottomSheet.isSheetOpen() || super.shouldDrawShadow(); - } - - /** Shows the tab switcher toolbar. */ - public void showTabSwitcherToolbar() { - setTabSwitcherMode(true, true, false); - } - - /** Shows the normal toolbar. */ - public void showNormalToolbar() { - // TODO(twellington): Add animation. - setTabSwitcherMode(false, true, false, false); - - // Typically #onTabSwitcherTransitionFinished() is called when the tab switcher is finished - // hiding. In this scenario, however, we are showing the normal toolbar without hiding - // the tab switcher. Call #onTabSwitcherTransitionFinished() directly so that ToolbarPhone - // updates its state. - onTabSwitcherTransitionFinished(); - } - - @Override - protected void setTabSwitcherMode(boolean inTabSwitcherMode, boolean showToolbar, - boolean delayAnimation, boolean animate) { - super.setTabSwitcherMode(inTabSwitcherMode, showToolbar, delayAnimation, animate); - mExpandButton.setClickable(!inTabSwitcherMode); - updateContentDescription(); - - // Reset top shadow drawable state. - if (inTabSwitcherMode) { - mBottomToolbarTopShadowDrawable.getDrawable(0).setAlpha(255); - mBottomToolbarTopShadowDrawable.getDrawable(1).setAlpha(0); - } - } - - @Override - protected void onTabSwitcherTransitionFinished() { - super.onTabSwitcherTransitionFinished(); - updateContentDescription(); - } - - @Override - protected void onTabOrModelChanged() { - super.onTabOrModelChanged(); - attachShadowTabObserverToCurrentTab(); - } - - @Override - public void onStateRestored() { - super.onStateRestored(); - attachShadowTabObserverToCurrentTab(); - } - - /** - * Attempt to attach the tab observer that controls the top shadow to the current tab. - */ - private void attachShadowTabObserverToCurrentTab() { - Tab currentTab = getToolbarDataProvider().getTab(); - if (currentTab == null) return; - - currentTab.addObserver(mTopShadowTabObserver); - - if (currentTab.getInfoBarContainer() == null) return; - currentTab.getInfoBarContainer().addObserver(mInfoBarContainerObserver); - } - - /** - * Create a transition animation for the top shadow. - * @param start The start opacity of the primary drawable (the shadow rather than the line). - * @param end The end opacity of the primary drawable. - * @return An {@link Animator} that runs the transition. - */ - private Animator createShadowTransitionAnimator(float start, float end) { - ValueAnimator transition = ValueAnimator.ofFloat(start, end); - transition.setDuration(DURATION_SHADOW_TRANSITION_MS); - transition.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator valueAnimator) { - float value = (float) valueAnimator.getAnimatedValue(); - mBottomToolbarTopShadowDrawable.getDrawable(0).setAlpha((int) (value * 255)); - mBottomToolbarTopShadowDrawable.getDrawable(1).setAlpha((int) ((1 - value) * 255)); - } - }); - return transition; - } - - @Override - protected int getProgressBarColor() { - int color = super.getProgressBarColor(); - if (getToolbarDataProvider().getTab() != null) { - // ToolbarDataProvider itself accounts for Chrome Home and will return default colors, - // so pull the progress bar color from the tab. - color = getToolbarDataProvider().getTab().getThemeColor(); - } - return color; - } - - @Override - protected int getProgressBarTopMargin() { - // In the case where the toolbar is at the bottom of the screen, the progress bar should - // be at the top of the screen. - return 0; - } - - @Override - protected int getProgressBarHeight() { - return getResources().getDimensionPixelSize(R.dimen.chrome_home_progress_bar_height); - } - - @Override - protected ToolbarProgressBar createProgressBar() { - return new ToolbarProgressBar( - getContext(), getProgressBarHeight(), getProgressBarTopMargin(), true); - } - - @Override - public void onUrlFocusChange(boolean hasFocus) { - mActivity.getBottomSheetContentController().onOmniboxFocusChange(hasFocus); - - super.onUrlFocusChange(hasFocus); - } - - @Override - protected void triggerUrlFocusAnimation(final boolean hasFocus) { - super.triggerUrlFocusAnimation(hasFocus); - - if (mBottomSheet == null || !hasFocus) return; - - mBottomSheet.setSheetState( - BottomSheet.SHEET_STATE_FULL, true, StateChangeReason.OMNIBOX_FOCUS); - } - - @Override - public void setBottomSheet(BottomSheet sheet) { - assert mBottomSheet == null; - - mBottomSheet = sheet; - getLocationBar().setBottomSheet(mBottomSheet); - mBottomSheet.addObserver(mBottomSheetObserver); - - updateContentDescription(); - } - - @Override - public boolean shouldIgnoreSwipeGesture() { - // Only detect swipes if the bottom sheet in the peeking state and not animating. - return mBottomSheet.getSheetState() != BottomSheet.SHEET_STATE_PEEK - || mBottomSheet.isRunningSettleAnimation() || super.shouldIgnoreSwipeGesture(); - } - - @Override - protected void addProgressBarToHierarchy() { - if (mProgressBar == null) return; - - ViewGroup coordinator = (ViewGroup) getRootView().findViewById(R.id.coordinator); - UiUtils.insertBefore(coordinator, mProgressBar, mBottomSheet); - - mProgressBar.setProgressBarContainer(coordinator); - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - - if (!mDisableLocationBarRelayout && !isInTabSwitcherMode() - && (mAnimatingToolbarButtonAppearance || mAnimatingToolbarButtonDisappearance)) { - // ToolbarPhone calls #updateUrlExpansionAnimation() in its #onMeasure(). If the toolbar - // button visibility animation is running, call #updateToolbarButtonVisibility() to - // ensure that view properties are set correctly. - updateToolbarButtonVisibility(); - } - } - - /** - * @return The extra top margin that should be applied to the browser controls views to - * correctly offset them from the handle that sits above them. - */ - private int getExtraTopMargin() { - return getResources().getDimensionPixelSize(R.dimen.bottom_toolbar_top_margin); - } - - @Override - public void getLocationBarContentRect(Rect outRect) { - super.getLocationBarContentRect(outRect); - - outRect.left += mLocationBarContentLateralInset; - outRect.top += mLocationBarContentVerticalInset; - outRect.right -= mLocationBarContentLateralInset; - outRect.bottom -= mLocationBarContentVerticalInset; - } - - @Override - protected int getFocusedLocationBarWidth(int containerWidth, int priorVisibleWidth) { - return super.getFocusedLocationBarWidth(containerWidth, priorVisibleWidth) - - mLocationBarExtraFocusedLeftMargin - mLocationBarBackgroundPadding.left - - mLocationBarBackgroundPadding.right; - } - - @Override - protected int getFocusedLocationBarLeftMargin(int priorVisibleWidth) { - int baseMargin = mToolbarSidePadding + mLocationBarExtraFocusedLeftMargin; - if (ApiCompatibilityUtils.isLayoutRtl(mLocationBar)) { - return baseMargin - mLocationBarBackgroundPadding.right; - } else { - return baseMargin - priorVisibleWidth + mLocationBarBackgroundPadding.left; - } - } - - @Override - protected int getLocationBarBackgroundVerticalMargin(float expansion) { - return (int) ((mLocationBar.getHeight() - mLocationBarBackgroundHeight) / 2); - } - - @Override - protected int getLeftPositionOfLocationBarBackground(VisualState visualState) { - if (!mAnimatingToolbarButtonAppearance && !mAnimatingToolbarButtonDisappearance) { - return super.getLeftPositionOfLocationBarBackground(visualState); - } - - int currentPosition = getViewBoundsLeftOfLocationBar(visualState); - int targetPosition = currentPosition + getLocationBarBackgroundLeftOffset(); - return (int) MathUtils.interpolate( - currentPosition, targetPosition, mToolbarButtonVisibilityPercent); - } - - @Override - protected int getFocusedLeftPositionOfLocationBarBackground() { - return mToolbarSidePadding; - } - - @Override - protected int getRightPositionOfLocationBarBackground(VisualState visualState) { - if (!mAnimatingToolbarButtonAppearance && !mAnimatingToolbarButtonDisappearance) { - return super.getRightPositionOfLocationBarBackground(visualState); - } - - int currentPosition = getViewBoundsRightOfLocationBar(visualState); - int targetPosition = currentPosition - getLocationBarBackgroundRightOffset(); - return (int) MathUtils.interpolate( - currentPosition, targetPosition, mToolbarButtonVisibilityPercent); - } - - @Override - protected int getFocusedRightPositionOfLocationBarBackground() { - return getWidth() - mToolbarSidePadding; - } - - private int getToolbarButtonsWidthForBackgroundOffset() { - return mToolbarButtonsContainer.getMeasuredWidth(); - } - - private int getLocationBarBackgroundLeftOffset() { - return !ApiCompatibilityUtils.isLayoutRtl(this) - ? 0 - : getToolbarButtonsWidthForBackgroundOffset() - mToolbarSidePadding; - } - - private int getLocationBarBackgroundRightOffset() { - return !ApiCompatibilityUtils.isLayoutRtl(this) - ? getToolbarButtonsWidthForBackgroundOffset() - mToolbarSidePadding - : 0; - } - - @Override - protected int getBoundsAfterAccountingForRightButtons() { - if (!mHidingToolbarButtons) return super.getBoundsAfterAccountingForRightButtons(); - - return mMenuButton.getMeasuredWidth() + mToolbarSidePadding; - } - - @Override - protected boolean isChildLeft(View child) { - return (child == mNewTabButton || child == mExpandButton) ^ LocalizationUtils.isLayoutRtl(); - } - - @Override - public void onFinishInflate() { - super.onFinishInflate(); - - // Chrome Home does not support a home button. Remove the View to save memory. - removeView(mHomeButton); - mBrowsingModeViews.remove(mHomeButton); - mHomeButton = null; - - mExpandButton = (TintedImageButton) findViewById(R.id.expand_sheet_button); - mExpandButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - if (mBottomSheet != null && mTabSwitcherState == STATIC_TAB) { - mBottomSheet.onExpandButtonPressed(); - } - } - }); - mExpandButton.setAccessibilityDelegate(new AccessibilityDelegate() { - @Override - public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { - super.onInitializeAccessibilityNodeInfo(host, info); - - AccessibilityNodeInfoCompat infoCompat = new AccessibilityNodeInfoCompat(info); - infoCompat.setClickable(true); - infoCompat.addAction(new AccessibilityNodeInfoCompat.AccessibilityActionCompat( - AccessibilityNodeInfoCompat.ACTION_CLICK, - getResources().getString( - R.string.bottom_sheet_expand_button_accessibility))); - } - }); - - // Add extra top margin to the URL bar to compensate for the change to location bar's - // vertical margin in the constructor. - ((MarginLayoutParams) mLocationBar.findViewById(R.id.url_bar).getLayoutParams()).topMargin = - getResources().getDimensionPixelSize(R.dimen.bottom_toolbar_url_bar_top_margin); - - // Exclude the location bar from the list of browsing mode views. This prevents its - // visibility from changing during transitions. - mBrowsingModeViews.remove(mLocationBar); - - updateToolbarTopMargin(); - } - - @Override - protected void initLocationBarBackground() { - Resources res = getResources(); - mLocationBarBackgroundHeight = - res.getDimensionPixelSize(R.dimen.modern_toolbar_background_size); - mLocationBarBackground = - ApiCompatibilityUtils.getDrawable(res, R.drawable.modern_toolbar_background); - mLocationBarBackground.getPadding(mLocationBarBackgroundPadding); - mLocationBarBackground.mutate(); - mLocationBar.setPadding(mLocationBarBackgroundPadding.left, - mLocationBarBackgroundPadding.top, mLocationBarBackgroundPadding.right, - mLocationBarBackgroundPadding.bottom); - } - - @Override - public void initialize(ToolbarDataProvider toolbarDataProvider, - ToolbarTabController tabController, AppMenuButtonHelper appMenuButtonHelper) { - super.initialize(toolbarDataProvider, tabController, appMenuButtonHelper); - mAppMenuButtonHelper.setShowMenuOnUp(true); - } - - /** - * Update the top margin of all the components inside the toolbar. If the toolbar handle is - * being used, extra margin is added. - */ - private void updateToolbarTopMargin() { - // Programmatically apply a top margin to all the children of the toolbar container. This - // is done so the view hierarchy does not need to be changed. - int topMarginForControls = getExtraTopMargin(); - - View topShadow = findViewById(R.id.bottom_toolbar_shadow); - - for (int i = 0; i < getChildCount(); i++) { - View curView = getChildAt(i); - - // Skip the shadow that sits at the top of the toolbar since this needs to sit on top - // of the toolbar. - if (curView == topShadow) continue; - - ((MarginLayoutParams) curView.getLayoutParams()).topMargin = topMarginForControls; - } - } - - @Override - protected boolean shouldDrawLocationBarBackground() { - return mLocationBar.getAlpha() > 0 || mForceDrawLocationBarBackground; - } - - @Override - public void onAttachedToWindow() { - super.onAttachedToWindow(); - - // The toolbar handle is part of the control container so it can draw on top of the - // other toolbar views, this way there is only a single handle instead of each having its - // own. Get the root view and search for the handle. - mToolbarHandleView = (ImageView) getRootView().findViewById(R.id.toolbar_handle); - mToolbarHandleView.setImageDrawable(mHandleDark); - - setUseExpandButton(); - - initBottomToolbarTopShadow(); - - if (mToolbarShadowPermanentlyHidden) mToolbarShadow.setVisibility(View.GONE); - } - - @Override - public void onNativeLibraryReady() { - super.onNativeLibraryReady(); - - mNewTabButton.setIsModern(); - if (mBottomSheet != null) mLocationBar.updateLoadingState(true); - } - - @Override - protected void updateVisualsForToolbarState() { - super.updateVisualsForToolbarState(); - - getProgressBar().setThemeColor(getProgressBarColor(), isIncognito()); - - // TODO(mdjones): Creating a new tab from the tab switcher skips the - // drawTabSwitcherFadeAnimation which would otherwise make this line unnecessary. - if (mTabSwitcherState == STATIC_TAB) mToolbarHandleView.setAlpha(1f); - - // The tab switcher's background color should not affect the toolbar handle; it should only - // switch color based on the static tab's theme color. This is done so fade in/out looks - // correct. - mToolbarHandleView.setImageDrawable(isLightTheme() ? mHandleDark : mHandleLight); - if (mUseExpandButton) { - ColorStateList tint = isIncognito() ? mLightModeTint : mDarkModeTint; - mExpandButton.setTint(tint); - } - - if (mBottomSheet != null && mBottomSheet.isSheetOpen()) { - updateButtonsContainerVisibilityAndTranslation(); - updateMenuButtonClickableState(); - } - - mToggleTabStackButton.setClickable(mBottomSheet == null); - - DrawableCompat.setTint(mLocationBarBackground, - isIncognito() ? Color.WHITE - : ApiCompatibilityUtils.getColor( - getResources(), R.color.modern_light_grey)); - } - - @Override - protected void onPrimaryColorChanged(boolean shouldAnimate) { - // Intentionally not calling super to avoid needless work. - getProgressBar().setThemeColor(getProgressBarColor(), isIncognito()); - } - - @Override - protected boolean shouldDrawLocationBar() { - return true; - } - - @Override - protected void drawTabSwitcherFadeAnimation(boolean animationFinished, float progress) { - mNewTabButton.setAlpha(progress); - - mLocationBar.setAlpha(1f - progress); - mLocationBar.setVisibility(MathUtils.areFloatsEqual(mLocationBar.getAlpha(), 0f) - ? View.INVISIBLE - : View.VISIBLE); - - mToolbarHandleView.setAlpha(1f - progress); - if (mUseExpandButton) mExpandButton.setAlpha(1f - progress); - - updateToolbarBackground(ColorUtils.getColorWithOverlay( - getTabThemeColor(), getToolbarColorForVisualState(mVisualState), progress)); - - mBottomToolbarTopShadow.setAlpha(1f - progress); - - // Don't use transparency for accessibility mode or low-end devices since the - // {@link OverviewListLayout} will be used instead of the normal tab switcher. - if (!DeviceClassManager.enableAccessibilityLayout()) { - float toolbarAlpha = MODERN_TAB_SWITCHER_TOOLBAR_ALPHA; - float alphaTransition = 1f - toolbarAlpha; - mToolbarBackground.setAlpha((int) ((1f - (alphaTransition * progress)) * 255)); - } - } - - @Override - public void finishAnimations() { - super.finishAnimations(); - drawTabSwitcherFadeAnimation(true, mTabSwitcherModePercent); - } - - @Override - protected void drawTabSwitcherAnimationOverlay(Canvas canvas, float animationProgress) { - // Intentionally overridden to block everything but the compositor screen shot. Otherwise - // the toolbar in Chrome Home does not have an animation overlay component. - if (mTextureCaptureMode) { - super.drawTabSwitcherAnimationOverlay(canvas, 0f); - if (mUseExpandButton && mExpandButton.getVisibility() != View.GONE) { - canvas.save(); - translateCanvasToView(this, mToolbarButtonsContainer, canvas); - drawChild(canvas, mExpandButton, SystemClock.uptimeMillis()); - canvas.restore(); - } - } - } - - @Override - protected void resetNtpAnimationValues() { - // The NTP animations don't matter if the browser is in tab switcher mode. - if (mTabSwitcherState != ToolbarPhone.STATIC_TAB) return; - super.resetNtpAnimationValues(); - } - - @Override - protected void updateToolbarBackground(VisualState visualState) { - if (visualState == VisualState.TAB_SWITCHER_NORMAL - || visualState == VisualState.TAB_SWITCHER_INCOGNITO) { - // drawTabSwitcherFadeAnimation will handle the background color transition. - if (DeviceClassManager.enableAccessibilityLayout()) { - drawTabSwitcherFadeAnimation(true, mTabSwitcherModePercent); - } - return; - } - - super.updateToolbarBackground(visualState); - } - - @Override - protected int getToolbarButtonVisibility() { - if (mUrlExpansionPercent == 1f) return INVISIBLE; - if (mHidingToolbarButtons) return INVISIBLE; - return VISIBLE; - } - - @Override - protected float getUrlActionsTranslationXForExpansionAnimation( - boolean isLocationBarRtl, float locationBarBaseTranslationX) { - if (!mHidingToolbarButtons) { - return super.getUrlActionsTranslationXForExpansionAnimation( - isLocationBarRtl, locationBarBaseTranslationX); - } - - float urlActionsTranslationX = 0; - // When the end toolbar buttons are not hidden, URL actions are shown and hidden due to - // a change in location bar's width. When the end toolbar buttons are hidden, the - // location bar's width does not change by as much, causing the end location for the URL - // actions to be immediately visible. Translate the URL action container so that their - // appearance is animated. - float urlActionsTranslationXOffset = - mUrlActionContainer.getWidth() * (1 - mUrlExpansionPercent); - if (isLocationBarRtl) { - urlActionsTranslationX -= urlActionsTranslationXOffset; - } else { - urlActionsTranslationX += urlActionsTranslationXOffset; - } - - return urlActionsTranslationX; - } - - @Override - protected void onHomeButtonUpdate(boolean homeButtonEnabled) { - // Intentionally does not call super. Chrome Home does not support a home button. - } - - /** - * Sets the height and title text appearance of the provided toolbar so that its style is - * consistent with BottomToolbarPhone. - * @param otherToolbar The other {@link Toolbar} to style. - */ - public void setOtherToolbarStyle(Toolbar otherToolbar) { - // Android's Toolbar class typically changes its height based on device orientation. - // BottomToolbarPhone has a fixed height. Update |toolbar| to match. - otherToolbar.getLayoutParams().height = getHeight(); - - // Android Toolbar action buttons are aligned based on the minimum height. - int extraTopMargin = getExtraTopMargin(); - otherToolbar.setMinimumHeight(getHeight() - extraTopMargin); - - otherToolbar.setTitleTextAppearance(otherToolbar.getContext(), R.style.BlackHeadline1); - ApiCompatibilityUtils.setPaddingRelative(otherToolbar, - ApiCompatibilityUtils.getPaddingStart(otherToolbar), - otherToolbar.getPaddingTop() + extraTopMargin, - ApiCompatibilityUtils.getPaddingEnd(otherToolbar), otherToolbar.getPaddingBottom()); - } - - /** - * @param shownInNtp Whether the toolbar is currently being shown in the NTP. - */ - public void setShownInNtp(boolean shownInNtp) { - if (shownInNtp == mShownInNtp) return; - - mShownInNtp = shownInNtp; - updateToolbarBackground(mVisualState); - } - - @Override - protected void onAccessibilityStatusChanged(boolean enabled) { - setUseExpandButton(); - } - - /** - * Sets whether or not the expand button is used and updates the handle view and expand button - * accordingly. - */ - private void setUseExpandButton() { - mUseExpandButton = AccessibilityUtil.isAccessibilityEnabled(); - - // This method may be called due to an accessibility state change. Return early if the - // needed views are null. - if (mToolbarHandleView == null || mExpandButton == null) return; - - mExpandButton.setVisibility(mUseExpandButton ? View.VISIBLE : View.GONE); - - updateVisualsForToolbarState(); - } - - /** - * Called when the sheet is transitioning from peek <-> half to update the toolbar button - * animation. - * @param isMovingUp Whether the sheet is currently moving up. - */ - private void updateToolbarButtonAnimation(boolean isMovingUp) { - // Update the interpolator if the toolbar buttons are fully visible or fully hidden. - if (mToolbarButtonVisibilityPercent == 0.f || mToolbarButtonVisibilityPercent == 1.f) { - mToolbarButtonAnimationIterpolator = isMovingUp ? BakedBezierInterpolator.FADE_OUT_CURVE - : BakedBezierInterpolator.FADE_IN_CURVE; - } - - if (isMovingUp && !mAnimatingToolbarButtonDisappearance - && mToolbarButtonVisibilityPercent != 0.f) { - onToolbarButtonAnimationStart(false); - } else if (!isMovingUp && !mAnimatingToolbarButtonAppearance - && mToolbarButtonVisibilityPercent != 1.f) { - onToolbarButtonAnimationStart(true); - } - - if (!mAnimatingToolbarButtonDisappearance && !mAnimatingToolbarButtonAppearance) return; - - mToolbarButtonVisibilityPercent = mToolbarButtonAnimationIterpolator.getInterpolation( - 1.f - mLastPeekToHalfHeightFraction); - updateToolbarButtonVisibility(); - - if ((mAnimatingToolbarButtonDisappearance - && MathUtils.areFloatsEqual(mLastPeekToHalfHeightFraction, 1.f)) - || (mAnimatingToolbarButtonAppearance - && MathUtils.areFloatsEqual(mLastPeekToHalfHeightFraction, 0.f))) { - onToolbarButtonAnimationEnd(mAnimatingToolbarButtonAppearance); - } - } - - private void onToolbarButtonAnimationStart(boolean visible) { - if (mAnimatingToolbarButtonAppearance || mAnimatingToolbarButtonDisappearance) { - // Cancel any previously running animations. - if (mAnimatingToolbarButtonAppearance) mDisableLocationBarRelayout = false; - - mAnimatingToolbarButtonDisappearance = false; - mAnimatingToolbarButtonAppearance = false; - } - - if (mUrlFocusChangeInProgress) { - if (visible) { - mHidingToolbarButtons = false; - mToolbarButtonVisibilityPercent = 1.f; - - mToolbarButtonsContainer.setAlpha(1.f); - mToolbarButtonsContainer.setVisibility(View.VISIBLE); - mToolbarButtonsContainer.setTranslationX(0); - - mToggleTabStackButton.setAlpha(1.f); - mToggleTabStackButton.setVisibility(View.VISIBLE); - - if (mUseExpandButton) { - if (mTabSwitcherState != ENTERING_TAB_SWITCHER) mExpandButton.setAlpha(1.f); - mExpandButton.setVisibility(View.VISIBLE); - } - - post(() -> requestLayout()); - } else { - mToolbarButtonVisibilityPercent = 0.f; - // Wait to set mShouldHideToolbarButtons until URL focus finishes. - } - - return; - } - - mAnimatingToolbarButtonDisappearance = !visible; - mAnimatingToolbarButtonAppearance = visible; - - if (!visible) { - mHidingToolbarButtons = true; - mLayoutLocationBarInFocusedMode = true; - requestLayout(); - } else { - mDisableLocationBarRelayout = true; - } - } - - private void onToolbarButtonAnimationEnd(boolean visible) { - if (visible) { - mHidingToolbarButtons = false; - mDisableLocationBarRelayout = false; - mLayoutLocationBarInFocusedMode = false; - requestLayout(); - } - - mAnimatingToolbarButtonDisappearance = false; - mAnimatingToolbarButtonAppearance = false; - mLocationBar.scrollUrlBarToTld(); - } - - @Override - protected void onUrlFocusChangeAnimationFinished() { - if (urlHasFocus()) { - mHidingToolbarButtons = true; - mToolbarButtonVisibilityPercent = 0.f; - updateButtonsContainerVisibilityAndTranslation(); - } - updateMenuButtonClickableState(); - } - - @Override - protected int getToolbarColorForVisualState(final VisualState visualState) { - if (visualState == VisualState.TAB_SWITCHER_INCOGNITO) { - return ApiCompatibilityUtils.getColor(getResources(), - DeviceClassManager.enableAccessibilityLayout() ? R.color.incognito_primary_color - : R.color.modern_primary_color); - } else if (visualState == VisualState.NORMAL && mShownInNtp) { - // TODO(twellington): Ideally the VisualState would be set to NEW_TAB_NORMAL and that - // would be used to set the toolbar background. The VisualState is used for some toolbar - // animations that we don't run on BottomToolbarPhone. Those animations need to be - // reworked before the VisualState can be set to NEW_TAB_NORMAL when the Chrome Home NTP - // is showing. - return Color.TRANSPARENT; - } else if (visualState == VisualState.NORMAL - || visualState == VisualState.TAB_SWITCHER_NORMAL) { - return ApiCompatibilityUtils.getColor(getResources(), R.color.modern_primary_color); - } - - return super.getToolbarColorForVisualState(visualState); - } - - /** - * Updates the visibility and translation of the toolbar buttons by calling - * {@link #updateButtonsContainerVisibilityAndTranslation()} and manipulating the LocationBar's - * translation X. - */ - private void updateToolbarButtonVisibility() { - updateButtonsContainerVisibilityAndTranslation(); - - float locationBarTranslationX; - boolean isLocationBarRtl = ApiCompatibilityUtils.isLayoutRtl(mLocationBar); - FrameLayout.LayoutParams locationBarLayoutParams = getFrameLayoutParams(mLocationBar); - int currentLeftMargin = locationBarLayoutParams.leftMargin; - int currentWidth = locationBarLayoutParams.width; - - if (isLocationBarRtl) { - // The location bar contents should be aligned with the right side of the toolbar. - // If RTL text is displayed in an LTR toolbar, the right position of the location bar - // background will change as the location bar background expands/contracts. - locationBarTranslationX = - -currentWidth + getRightPositionOfLocationBarBackground(mVisualState); - if (!mHasVisibleViewPriorToUrlBar) locationBarTranslationX -= mToolbarSidePadding; - } else { - // The location bar contents should be aligned with the left side of the location bar - // background. If LTR text is displayed in an RTL toolbar, the current left position of - // the location bar background will change as the location bar background - // expands/contracts. - locationBarTranslationX = mUnfocusedLocationBarLayoutLeft - + getLeftPositionOfLocationBarBackground(mVisualState) - mToolbarSidePadding; - } - - locationBarTranslationX -= currentLeftMargin; - - // Get the padding straight from the location bar instead of - // |mLocationBarBackgroundPadding|, because it might be different in incognito mode. - if (isLocationBarRtl) { - locationBarTranslationX -= mLocationBar.getPaddingRight(); - } else { - locationBarTranslationX += mLocationBar.getPaddingLeft(); - } - - mLocationBar.setTranslationX(locationBarTranslationX); - - // Force an invalidation of the location bar to properly handle the clipping of the URL - // bar text as a result of the bounds changing. - mLocationBar.invalidate(); - invalidate(); - } - - /** - * Updates the visibility, alpha and translation of the buttons container based on - * {@link #mToolbarButtonVisibilityPercent}. The entire {@link #mToolbarButtonsContainer} is - * faded out and translated so that the buttons appear to slide off the toolbar. - */ - private void updateButtonsContainerVisibilityAndTranslation() { - mToggleTabStackButton.setAlpha(1.f); - mToggleTabStackButton.setVisibility(View.VISIBLE); - - if (mUseExpandButton) { - if (mTabSwitcherState != ENTERING_TAB_SWITCHER) mExpandButton.setAlpha(1.f); - mExpandButton.setVisibility(View.VISIBLE); - } - - boolean isRtl = ApiCompatibilityUtils.isLayoutRtl(this); - - float toolbarButtonsContainerWidth = mToolbarButtonsContainer.getMeasuredWidth(); - float toolbarButtonsTranslationX = - toolbarButtonsContainerWidth * (1.f - mToolbarButtonVisibilityPercent); - if (isRtl) toolbarButtonsTranslationX *= -1; - - mToolbarButtonsContainer.setTranslationX(toolbarButtonsTranslationX); - mToolbarButtonsContainer.setAlpha(mToolbarButtonVisibilityPercent); - mToolbarButtonsContainer.setVisibility( - mToolbarButtonVisibilityPercent > 0.f ? View.VISIBLE : View.INVISIBLE); - } - - private void updateMenuButtonClickableState() { - mMenuButton.setClickable(!urlHasFocus() && !mBottomSheet.isSheetOpen()); - } - - private void updateContentDescription() { - if (isInTabSwitcherMode() || mBottomSheet.isSheetOpen()) { - setContentDescription(null); - } else { - setContentDescription( - getResources().getString(R.string.bottom_sheet_accessibility_toolbar)); - } - } -}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/OWNERS b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/OWNERS index 8efec3b..f47a3405 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/OWNERS +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/OWNERS
@@ -1,4 +1,2 @@ tedchoc@chromium.org yusufo@chromium.org - -per-file BottomToolbarPhone.java=mdjones@chromium.org
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java index ddefbe1..f664e39 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -126,9 +126,6 @@ */ public static final int MINIMUM_LOAD_PROGRESS = 5; - private static final String CHROME_MEMEX_URL = "https://chrome-memex.appspot.com/"; - private static final String CHROME_MEMEX_DEV_URL = "https://chrome-memex-dev.appspot.com/"; - private final ToolbarLayout mToolbar; private final ToolbarControlContainer mControlContainer; @@ -1024,15 +1021,16 @@ TabModel model = mTabModelSelector.getModel(false); for (int i = 0; i < model.getCount(); i++) { String url = model.getTabAt(i).getUrl(); - if (url.startsWith(CHROME_MEMEX_URL) || url.startsWith(CHROME_MEMEX_DEV_URL)) { + if (url.startsWith(UrlConstants.CHROME_MEMEX_URL) + || url.startsWith(UrlConstants.CHROME_MEMEX_DEV_URL)) { model.setIndex(i, TabSelectionType.FROM_USER); return; } } mTabModelSelector.openNewTab( - new LoadUrlParams(CHROME_MEMEX_URL, PageTransition.AUTO_BOOKMARK), - TabLaunchType.FROM_CHROME_UI, null, false); + new LoadUrlParams(UrlConstants.CHROME_MEMEX_URL, PageTransition.AUTO_BOOKMARK), + TabLaunchType.FROM_EXTERNAL_APP, null, false); } /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java index 3b752cdea..e9585b31 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
@@ -388,7 +388,7 @@ mLocationBarBackgroundPadding.bottom); mModernLocationBarExtraFocusedStartMargin = getResources().getDimensionPixelSize( - R.dimen.bottom_toolbar_background_focused_left_margin); + R.dimen.modern_toolbar_background_focused_left_margin); mLocationBarBackgroundCornerRadius = 0; } else { mLocationBarVerticalMargin =
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApi.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApi.java index af2f6e8..856ae9a5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApi.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApi.java
@@ -78,12 +78,6 @@ Intent setupVrIntent(Intent intent); /** - * Whether the user is currently in a VR session. Note that this should be treated as heuristic, - * and may at times be wrong. - */ - boolean isInVrSession(); - - /** * Closes this DaydreamApi instance. */ void close();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java index 78ad63af..699a2d4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java
@@ -135,11 +135,6 @@ } @Override - public boolean isInVrSession() { - return DaydreamApi.isInVrSession(mContext); - } - - @Override public void close() { if (mDaydreamApi == null) return; mDaydreamApi.close();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java index 1dd4503..4caf5e2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
@@ -114,8 +114,9 @@ private static final String VR_CORE_MARKET_URI = "market://details?id=" + VrCoreVersionChecker.VR_CORE_PACKAGE_ID; + private static final String GVR_KEYBOARD_PACKAGE_ID = "com.google.android.vr.inputmethod"; private static final String GVR_KEYBOARD_MARKET_URI = - "market://details?id=com.google.android.vr.inputmethod"; + "market://details?id=" + GVR_KEYBOARD_PACKAGE_ID; // This value is intentionally probably overkill. This is the time we need to wait from when // Chrome is resumed, to when Chrome actually renders a black frame, so that we can cancel the @@ -136,6 +137,7 @@ private @VrSupportLevel int mVrSupportLevel; private int mCachedVrCorePackageVersion; + private int mCachedGvrKeyboardPackageVersion; // How often to prompt the user to enter VR feedback. private int mFeedbackFrequency; @@ -328,6 +330,7 @@ } // Handles the result of requesting to update GVR Keyboard. if (requestCode == GVR_KEYBOARD_UPDATE_RESULT) { + if (sInstance != null) sInstance.onGvrKeyboardMaybeUpdated(); return true; } return false; @@ -786,6 +789,11 @@ ContextUtils.getApplicationContext(), VrCoreVersionChecker.VR_CORE_PACKAGE_ID); } + private int getGvrKeyboardPackageVersion() { + return PackageUtils.getPackageVersion( + ContextUtils.getApplicationContext(), GVR_KEYBOARD_PACKAGE_ID); + } + /** * Updates mVrSupportLevel to the correct value. isVrCoreCompatible might return different value * at runtime. @@ -818,8 +826,12 @@ } private void onVrServicesMaybeUpdated() { - int vrCorePackageVersion = getVrCorePackageVersion(); - if (mCachedVrCorePackageVersion == vrCorePackageVersion) return; + if (mCachedVrCorePackageVersion == getVrCorePackageVersion()) return; + ApplicationLifetime.terminate(true); + } + + private void onGvrKeyboardMaybeUpdated() { + if (mCachedGvrKeyboardPackageVersion == getGvrKeyboardPackageVersion()) return; ApplicationLifetime.terminate(true); } @@ -971,16 +983,16 @@ } private void onVrIntent() { - mNeedsAnimationCancel = true; - mInVrAtChromeLaunch = true; if (mInVr) return; + mNeedsAnimationCancel = true; mEnterVrOnStartup = true; // TODO(mthiesse): Assuming we've gone through DON flow saves ~2 seconds on VR entry. See // the comments in enterVr(). This may not always be the case in the future, but for now // it's a reasonable assumption. mDonSucceeded = true; + mInVrAtChromeLaunch = true; if (!mPaused) enterVrAfterDon(); } @@ -1362,23 +1374,24 @@ }); } - mCancellingEntryAnimation = false; - if (mEnterVrOnStartup) { // This means that Chrome was started with a VR intent, so we should enter VR. // TODO(crbug.com/776235): VR intents are dispatched to ChromeActivity via a launcher // which should handle the DON flow to simplify the logic in VrShellDelegate. assert !mProbablyInDon; if (DEBUG_LOGS) Log.i(TAG, "onResume: entering VR mode for VR intent"); + mCancellingEntryAnimation = false; if (enterVrInternal() == ENTER_VR_CANCELLED) { cancelPendingVrEntry(); } } else if (mDonSucceeded) { + mCancellingEntryAnimation = false; handleDonFlowSuccess(); } else { if (mProbablyInDon) { // This means the user backed out of the DON flow, and we won't be entering VR. maybeSetPresentResult(false, mDonSucceeded); + shutdownVr(true, false); } // If we were resumed at the wrong density, we need to trigger activity recreation. @@ -1425,6 +1438,10 @@ // are safe. if (mInVr) mVrShell.pause(); if (mShowingDaydreamDoff || mProbablyInDon) return; + + // TODO(mthiesse): When the user resumes Chrome in a 2D context, we don't want to tear down + // VR UI, so for now, exit VR. + shutdownVr(true /* disableVrMode */, false /* stayingInChrome */); } protected void onPause() { @@ -1435,6 +1452,10 @@ unregisterDaydreamIntent(mVrDaydreamApi); if (mVrSupportLevel == VrSupportLevel.VR_NOT_AVAILABLE) return; + // TODO(ymalik): We should be able to remove this if we handle it for multi-window in + // {@link onMultiWindowModeChanged} since we're calling it in onStop. + if (!mInVr && !mProbablyInDon) cancelPendingVrEntry(); + // When the active web page has a vrdisplayactivate event handler, // mListeningForWebVrActivate should be set to true, which means a vrdisplayactive event // should be fired once DON flow finished. However, DON flow will pause our activity, @@ -1453,12 +1474,12 @@ private void onStart() { mStopped = false; if (mDonSucceeded) setWindowModeForVr(); - if (mInVr && !mVrDaydreamApi.isInVrSession()) shutdownVr(true, false); } private void onStop() { if (DEBUG_LOGS) Log.i(TAG, "onStop"); mStopped = true; + if (!mProbablyInDon) cancelPendingVrEntry(); assert !mCancellingEntryAnimation; } @@ -1776,6 +1797,7 @@ } /* package */ void promptForKeyboardUpdate() { + mCachedGvrKeyboardPackageVersion = getGvrKeyboardPackageVersion(); mActivity.startActivityForResult( new Intent(Intent.ACTION_VIEW, Uri.parse(GVR_KEYBOARD_MARKET_URI)), GVR_KEYBOARD_UPDATE_RESULT);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableBottomSheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableBottomSheetContent.java index 9644b11..20d86fd0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableBottomSheetContent.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableBottomSheetContent.java
@@ -11,7 +11,6 @@ import org.chromium.base.CollectionUtil; import org.chromium.chrome.browser.ChromeActivity; -import org.chromium.chrome.browser.toolbar.BottomToolbarPhone; import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet; import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent; @@ -80,9 +79,6 @@ activity.getBottomSheet().setSheetState(BottomSheet.SHEET_STATE_FULL, true); } }); - - ((BottomToolbarPhone) activity.getToolbarManager().getToolbar()) - .setOtherToolbarStyle(mToolbarView); } @Override
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd index 19e1f69..6e91969 100644 --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -3224,9 +3224,6 @@ <message name="IDS_BOTTOM_SHEET_PULL_TO_REFRESH_HELP_BUBBLE_ACCESSIBILITY_MESSAGE" desc="Text displayed in a help bubble above the address bar when TalkBack is enabled. “access” is a verb (imperative). The intent of the string is to help users find the address bar at the bottom of the screen."> Access the address bar at the bottom of your screen </message> - <message name="IDS_BOTTOM_SHEET_EXPAND_BUTTON_ACCESSIBILITY" desc="Part of the accessibility string read when the expand button is tapped informing users that tapping button will show downloads, bookmarks, and history. 'access' is a verb. 'Downloads', 'Bookmarks', and 'History' should use the same translations as in Chrome settings and menu items. TalkBack will read 'Expand navigation panel button. Double tap to access downloads, bookmarks, and history'."> - access downloads, bookmarks, and history. - </message> <message name="IDS_BOTTOM_SHEET_ACCESSIBILITY_DESCRIPTION" desc="Accessibility string read when the navigation panel is focused informing the user that the panel can be closed by swiping down."> Navigation panel. Swipe down to close. </message> @@ -3263,9 +3260,6 @@ <message name="IDS_CHROME_HOME_MENU_HISTORY_HELP_BUBBLE" desc="Help text. Shown after a user taps the ‘History’ item in the three-dot menu of mobile Chrome. Context: In Chrome Hub, ‘History’ is moving from the three-dot menu to a bottom navigation bar, which can be accessed by swiping the address bar up. This help text notifies the user of the change. Please ensure ‘History’ in this message matches the ‘History’ menu item and button label."> “History” is moving. Next time, pull the address bar up. </message> - <message name="IDS_BOTTOM_SHEET_ACCESSIBILITY_TOOLBAR" desc="Accessibilty string read when the bottom toolbar, containing the adddress bar and some buttons, is focused. Informs users that they can pull up on the address bar to see their bookmarks and other content."> - Address bar. Swipe up to see downloads, bookmarks, and history. - </message> <!-- Photo picker --> <message name="IDS_PHOTO_PICKER_SELECT_IMAGES" desc="The label in the title bar of the Photo Picker dialog, suggesting which action the user should take.">
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni index 3c13b5d70..3760ce3 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni
@@ -1240,7 +1240,6 @@ "java/src/org/chromium/chrome/browser/tabmodel/document/StorageDelegate.java", "java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java", "java/src/org/chromium/chrome/browser/toolbar/ActionModeController.java", - "java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java", "java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java", "java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbarAnimationDelegate.java", "java/src/org/chromium/chrome/browser/toolbar/HomePageButton.java",
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java index 6205cbe..7a61cb7 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
@@ -998,7 +998,8 @@ "getStack must be executed on the ui thread", ThreadUtils.runningOnUiThread()); LayoutManagerChromePhone layoutManagerPhone = (LayoutManagerChromePhone) layoutManager; StackLayout layout = (StackLayout) layoutManagerPhone.getOverviewLayout(); - return (layout).getTabStack(isIncognito); + return (layout).getTabStackAtIndex( + isIncognito ? StackLayout.INCOGNITO_STACK_INDEX : StackLayout.NORMAL_STACK_INDEX); } private int getLayoutTabInStackCount(final boolean isIncognito) {
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/browseractions/BrowserActionActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/browseractions/BrowserActionActivityTest.java index 93cf361..134669f 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/browseractions/BrowserActionActivityTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/browseractions/BrowserActionActivityTest.java
@@ -340,7 +340,7 @@ ThreadUtils.runOnUiThreadBlocking(new Runnable() { @Override public void run() { - activity.getHelperForTesting().onItemSelected(itemid); + activity.getHelperForTesting().onItemSelected(itemid, false); } }); @@ -577,7 +577,7 @@ StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); try { activity.getHelperForTesting().onItemSelected( - R.id.browser_actions_open_in_background); + R.id.browser_actions_open_in_background, false); } finally { StrictMode.setThreadPolicy(oldPolicy); }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java index e9ed617d..480b0610 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java
@@ -266,7 +266,7 @@ mManager.getActiveLayout() instanceof StackLayout); StackLayout layout = (StackLayout) mManager.getActiveLayout(); - Stack stack = layout.getTabStack(false); + Stack stack = layout.getTabStackAtIndex(StackLayout.NORMAL_STACK_INDEX); StackTab[] tabs = stack.getTabs(); long time = 0;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java index 93b2c58..311f5dee 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java
@@ -200,7 +200,7 @@ @Override public void run() { mContextualSearchManager.getGestureStateListener().onTouchDown(); - mContextualSearchClient.showUnhandledTapUIIfNeeded(0, 0); + mContextualSearchManager.onShowUnhandledTapUIIfNeeded(0, 0); } }); } @@ -212,7 +212,7 @@ ThreadUtils.runOnUiThreadBlocking(new Runnable() { @Override public void run() { - mContextualSearchClient.showUnhandledTapUIIfNeeded(0, 0); + mContextualSearchManager.onShowUnhandledTapUIIfNeeded(0, 0); mContextualSearchClient.onSelectionEvent( SelectionEventType.SELECTION_HANDLES_CLEARED, 0, 0); }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTransitionTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTransitionTest.java index 5a2f288a..bd3a4868 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTransitionTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTransitionTest.java
@@ -6,13 +6,17 @@ import static org.chromium.chrome.browser.vr_shell.TestFramework.PAGE_LOAD_TIMEOUT_S; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.PAGE_LOAD_TIMEOUT_S; +import static org.chromium.chrome.browser.vr_shell.VrTestFramework.POLL_CHECK_INTERVAL_LONG_MS; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.POLL_CHECK_INTERVAL_SHORT_MS; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.POLL_TIMEOUT_LONG_MS; import static org.chromium.chrome.browser.vr_shell.VrTestFramework.POLL_TIMEOUT_SHORT_MS; import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_DON_ENABLED; import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_VIEWER_DAYDREAM; +import android.annotation.TargetApi; import android.app.Activity; +import android.graphics.Bitmap; +import android.graphics.Color; import android.os.Build; import android.os.SystemClock; import android.support.test.InstrumentationRegistry; @@ -64,6 +68,7 @@ @UseRunnerDelegate(ChromeJUnit4RunnerDelegate.class) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, "enable-webvr"}) @MinAndroidSdkLevel(Build.VERSION_CODES.KITKAT) // WebVR and WebXR are only supported on K+ +@TargetApi(Build.VERSION_CODES.KITKAT) // Necessary to allow taking screenshots with UiAutomation public class WebVrTransitionTest { @ClassParameter private static List<ParameterSet> sClassParams = @@ -115,6 +120,30 @@ framework.loadUrlAndAwaitInitialization(url, PAGE_LOAD_TIMEOUT_S); TransitionUtils.enterPresentationOrFail(framework); Assert.assertTrue("VrShellDelegate is in VR", VrShellDelegate.isInVr()); + + // Initial Pixel Test - Verify that the Canvas is blue. + // The Canvas is set to blue while presenting. + final UiDevice uiDevice = + UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); + + CriteriaHelper.pollInstrumentationThread(new Criteria() { + @Override + public boolean isSatisfied() { + Bitmap bmpCurrentScreen = InstrumentationRegistry.getInstrumentation() + .getUiAutomation() + .takeScreenshot(); + + if (bmpCurrentScreen != null) { + // Calculate center of eye coordinates. + int iheight = uiDevice.getDisplayHeight() / 2; + int iwidth = uiDevice.getDisplayWidth() / 4; + + // Verify screen is blue. + return Color.BLUE == bmpCurrentScreen.getPixel(iwidth, iheight); + } + return false; + } + }, POLL_TIMEOUT_LONG_MS, POLL_CHECK_INTERVAL_LONG_MS); } /**
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/mock/MockVrDaydreamApi.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/mock/MockVrDaydreamApi.java index a5f1b85b..6e2acf82 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/mock/MockVrDaydreamApi.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/mock/MockVrDaydreamApi.java
@@ -100,9 +100,4 @@ public void setForwardSetupIntent(boolean forward) { mForwardSetupIntent = forward; } - - @Override - public boolean isInVrSession() { - return true; - } }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManagerTest.java index 3ef1ad2..b08bc3c 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManagerTest.java
@@ -50,9 +50,6 @@ public void onSelectionEvent(int eventType, float posXPix, float posYPix) {} @Override - public void showUnhandledTapUIIfNeeded(int x, int y) {} - - @Override public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) {} @Override
diff --git a/chrome/app/app.exports b/chrome/app/app.exports new file mode 100644 index 0000000..8aeb0da --- /dev/null +++ b/chrome/app/app.exports
@@ -0,0 +1,10 @@ +# Copyright (c) 2011 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. + +# This file is passed to `ld -exported_symbol_list` and contains the list of +# symbol names that will remain globally visible in the final link output from +# the Mac browser and helper executables. All other symbols will be treated as +# if they have hidden visibility. + +_main
diff --git a/chrome/app/app.saves b/chrome/app/app.saves deleted file mode 100644 index f002013d..0000000 --- a/chrome/app/app.saves +++ /dev/null
@@ -1,8 +0,0 @@ -# Copyright (c) 2011 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. - -# This file lists symbols that should not be stripped from the Mac browser and -# helper app executables. - -_main
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 64643d83..5641004 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -1712,8 +1712,8 @@ "//components/security_state/core", "//components/sessions", "//components/signin/core/browser", - "//components/signin/core/browser:signin_features", - "//components/spellcheck:build_features", + "//components/signin/core/browser:signin_buildflags", + "//components/spellcheck:buildflags", "//components/ssl_config", "//components/ssl_errors", "//components/startup_metric_utils/browser:host", @@ -1941,6 +1941,10 @@ "android/contextualsearch/ctr_suppression.h", "android/contextualsearch/resolved_search_term.cc", "android/contextualsearch/resolved_search_term.h", + "android/contextualsearch/unhandled_tap_notifier_impl.cc", + "android/contextualsearch/unhandled_tap_notifier_impl.h", + "android/contextualsearch/unhandled_tap_web_contents_observer.cc", + "android/contextualsearch/unhandled_tap_web_contents_observer.h", "android/cookies/cookies_fetcher_util.cc", "android/crash/pure_java_exception_handler.cc", "android/crash/pure_java_exception_handler.h", @@ -3477,26 +3481,6 @@ "renderer_host/chrome_extension_message_filter.h", "signin/chrome_proximity_auth_client.cc", "signin/chrome_proximity_auth_client.h", - "signin/easy_unlock_app_manager.cc", - "signin/easy_unlock_app_manager.h", - "signin/easy_unlock_auth_attempt.cc", - "signin/easy_unlock_auth_attempt.h", - "signin/easy_unlock_metrics.cc", - "signin/easy_unlock_metrics.h", - "signin/easy_unlock_notification_controller.cc", - "signin/easy_unlock_notification_controller.h", - "signin/easy_unlock_notification_controller_chromeos.cc", - "signin/easy_unlock_notification_controller_chromeos.h", - "signin/easy_unlock_screenlock_state_handler.cc", - "signin/easy_unlock_screenlock_state_handler.h", - "signin/easy_unlock_service.cc", - "signin/easy_unlock_service.h", - "signin/easy_unlock_service_factory.cc", - "signin/easy_unlock_service_factory.h", - "signin/easy_unlock_service_regular.cc", - "signin/easy_unlock_service_regular.h", - "signin/easy_unlock_service_signin_chromeos.cc", - "signin/easy_unlock_service_signin_chromeos.h", "speech/extension_api/tts_engine_extension_api.cc", "speech/extension_api/tts_engine_extension_api.h", "speech/extension_api/tts_engine_extension_observer.cc", @@ -3642,6 +3626,31 @@ "//media/cast:net", "//services/device/public/mojom", ] + + if (is_chromeos) { + sources += [ + "signin/easy_unlock_app_manager.cc", + "signin/easy_unlock_app_manager.h", + "signin/easy_unlock_auth_attempt.cc", + "signin/easy_unlock_auth_attempt.h", + "signin/easy_unlock_metrics.cc", + "signin/easy_unlock_metrics.h", + "signin/easy_unlock_notification_controller.cc", + "signin/easy_unlock_notification_controller.h", + "signin/easy_unlock_notification_controller_chromeos.cc", + "signin/easy_unlock_notification_controller_chromeos.h", + "signin/easy_unlock_screenlock_state_handler.cc", + "signin/easy_unlock_screenlock_state_handler.h", + "signin/easy_unlock_service.cc", + "signin/easy_unlock_service.h", + "signin/easy_unlock_service_factory.cc", + "signin/easy_unlock_service_factory.h", + "signin/easy_unlock_service_regular.cc", + "signin/easy_unlock_service_regular.h", + "signin/easy_unlock_service_signin_chromeos.cc", + "signin/easy_unlock_service_signin_chromeos.h", + ] + } } if (enable_mdns) {
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 5e3665d..12e01ca3 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -76,11 +76,11 @@ #include "components/security_state/core/features.h" #include "components/security_state/core/security_state.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_switches.h" #include "components/spellcheck/common/spellcheck_features.h" #include "components/spellcheck/common/spellcheck_switches.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/ssl_config/ssl_config_switches.h" #include "components/suggestions/features.h" #include "components/sync/driver/sync_driver_switches.h" @@ -3748,7 +3748,7 @@ {"ash-enable-new-overview-animations", flag_descriptions::kAshEnableNewOverviewAnimationsName, flag_descriptions::kAshEnableNewOverviewAnimationsDescription, kOsCrOS, - SINGLE_VALUE_TYPE(ash::switches::kAshEnableNewOverviewAnimations)}, + FEATURE_VALUE_TYPE(ash::features::kNewOverviewAnimations)}, {"enable-experimental-crostini-ui", flag_descriptions::kExperimentalCrostiniUIName, flag_descriptions::kExperimentalCrostiniUIDescription, kOsCrOS,
diff --git a/chrome/browser/android/DEPS b/chrome/browser/android/DEPS index cc1bb3a..d42425c9 100644 --- a/chrome/browser/android/DEPS +++ b/chrome/browser/android/DEPS
@@ -15,6 +15,7 @@ "+sandbox/sandbox_features.h", "+third_party/gvr-android-sdk", "+third_party/WebKit/public/platform/media_download_in_product_help.mojom.h", + "+third_party/WebKit/public/platform/unhandled_tap_notifier.mojom.h", ] specific_include_rules = {
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc index 21678f03..ac4148a 100644 --- a/chrome/browser/android/chrome_feature_list.cc +++ b/chrome/browser/android/chrome_feature_list.cc
@@ -356,7 +356,7 @@ base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kSoleIntegration{"SoleIntegration", - base::FEATURE_DISABLED_BY_DEFAULT}; + base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kSpannableInlineAutocomplete{ "SpannableInlineAutocomplete", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.cc b/chrome/browser/android/contextualsearch/contextual_search_manager.cc index c985300..2ee3567 100644 --- a/chrome/browser/android/contextualsearch/contextual_search_manager.cc +++ b/chrome/browser/android/contextualsearch/contextual_search_manager.cc
@@ -14,7 +14,6 @@ #include "base/time/time.h" #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h" #include "chrome/browser/android/contextualsearch/resolved_search_term.h" -#include "chrome/browser/android/tab_android.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/contextual_search/browser/contextual_search_js_api_service_impl.h"
diff --git a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc index 41c30fd..8700892 100644 --- a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc +++ b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc
@@ -6,10 +6,13 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" +#include "build/build_config.h" +#include "chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_change_registrar.h" +#include "content/public/browser/web_contents.h" #include "jni/ContextualSearchTabHelper_jni.h" using base::android::JavaParamRef; @@ -24,8 +27,9 @@ pref_change_registrar_->Init(profile->GetPrefs()); pref_change_registrar_->Add( prefs::kContextualSearchEnabled, - base::Bind(&ContextualSearchTabHelper::OnContextualSearchPrefChanged, - weak_factory_.GetWeakPtr())); + base::BindRepeating( + &ContextualSearchTabHelper::OnContextualSearchPrefChanged, + weak_factory_.GetWeakPtr())); } ContextualSearchTabHelper::~ContextualSearchTabHelper() { @@ -38,6 +42,33 @@ Java_ContextualSearchTabHelper_onContextualSearchPrefChanged(env, jobj); } +void ContextualSearchTabHelper::OnShowUnhandledTapUIIfNeeded(int x_px, + int y_px) { + JNIEnv* env = base::android::AttachCurrentThread(); + ScopedJavaLocalRef<jobject> jobj = weak_java_ref_.get(env); + Java_ContextualSearchTabHelper_onShowUnhandledTapUIIfNeeded(env, jobj, x_px, + y_px); +} + +void ContextualSearchTabHelper::InstallUnhandledTapNotifierIfNeeded( + JNIEnv* env, + jobject obj, + const JavaParamRef<jobject>& j_base_web_contents, + jfloat device_scale_factor) { + DCHECK(j_base_web_contents); + content::WebContents* base_web_contents = + content::WebContents::FromJavaWebContents(j_base_web_contents); + DCHECK(base_web_contents); + if (!unhandled_tap_web_contents_observer_) { + unhandled_tap_web_contents_observer_.reset( + new contextual_search::UnhandledTapWebContentsObserver( + base_web_contents, device_scale_factor, + base::BindRepeating( + &ContextualSearchTabHelper::OnShowUnhandledTapUIIfNeeded, + weak_factory_.GetWeakPtr()))); + } +} + void ContextualSearchTabHelper::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { delete this;
diff --git a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h index 36f7b2c..c7832e8 100644 --- a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h +++ b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.h
@@ -15,17 +15,42 @@ class Profile; +namespace contextual_search { +class UnhandledTapWebContentsObserver; +} + class ContextualSearchTabHelper { public: ContextualSearchTabHelper(JNIEnv* env, jobject obj, Profile* profile); void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); + // Installs the UnhandledTapNotifier Mojo handler if needed. + // The |j_base_web_contents| is a java WebContents of the base page tab. + // The |device_scale_factor| is the ratio of pixels to dips. + void InstallUnhandledTapNotifierIfNeeded( + JNIEnv* env, + jobject obj, + const base::android::JavaParamRef<jobject>& j_base_web_contents, + jfloat device_scale_factor); + private: ~ContextualSearchTabHelper(); + + // Methods that call back to Java. + // Call when the preferences change. void OnContextualSearchPrefChanged(); + // Call when an unhandled tap needs to show the UI for a tap at the given + // position. + void OnShowUnhandledTapUIIfNeeded(int x_px, int y_px); JavaObjectWeakGlobalRef weak_java_ref_; std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_; + + // The unhandled tap WebContentsObserver for the current tab. + // Installs a mojo handler for ShowUnhandledTapUIIfNeeded. + std::unique_ptr<contextual_search::UnhandledTapWebContentsObserver> + unhandled_tap_web_contents_observer_; + base::WeakPtrFactory<ContextualSearchTabHelper> weak_factory_; DISALLOW_COPY_AND_ASSIGN(ContextualSearchTabHelper); };
diff --git a/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.cc b/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.cc new file mode 100644 index 0000000..36fa718 --- /dev/null +++ b/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.cc
@@ -0,0 +1,47 @@ +// Copyright 2018 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 "chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h" + +#include <utility> + +#include "base/memory/ptr_util.h" +#include "content/public/common/use_zoom_for_dsf_policy.h" +#include "mojo/public/cpp/bindings/strong_binding.h" + +namespace contextual_search { + +UnhandledTapNotifierImpl::UnhandledTapNotifierImpl( + float device_scale_factor, + UnhandledTapCallback callback) + : device_scale_factor_(device_scale_factor), + unhandled_tap_callback_(std::move(callback)) {} + +UnhandledTapNotifierImpl::~UnhandledTapNotifierImpl() {} + +void UnhandledTapNotifierImpl::ShowUnhandledTapUIIfNeeded( + blink::mojom::UnhandledTapInfoPtr unhandled_tap_info) { + float x_px = unhandled_tap_info->tapped_position_in_viewport.x(); + float y_px = unhandled_tap_info->tapped_position_in_viewport.y(); + + if (!content::IsUseZoomForDSFEnabled()) { + x_px /= device_scale_factor_; + y_px /= device_scale_factor_; + } + // Call back through the callback if possible. (The callback uses a weakptr + // that might make this a NOP). + unhandled_tap_callback_.Run(x_px, y_px); +} + +// static +void CreateUnhandledTapNotifierImpl( + float device_scale_factor, + UnhandledTapCallback callback, + blink::mojom::UnhandledTapNotifierRequest request) { + mojo::MakeStrongBinding(std::make_unique<UnhandledTapNotifierImpl>( + device_scale_factor, std::move(callback)), + std::move(request)); +} + +} // namespace contextual_search
diff --git a/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h b/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h new file mode 100644 index 0000000..3340608 --- /dev/null +++ b/chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h
@@ -0,0 +1,49 @@ +// Copyright 2018 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 CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_UNHANDLED_TAP_NOTIFIER_IMPL_H_ +#define CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_UNHANDLED_TAP_NOTIFIER_IMPL_H_ + +#include "base/macros.h" +#include "chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h" +#include "third_party/WebKit/public/platform/unhandled_tap_notifier.mojom.h" + +namespace contextual_search { + +// Implements a Mojo service endpoint for the mojo unhandled-tap notifier +// message. +class UnhandledTapNotifierImpl : public blink::mojom::UnhandledTapNotifier { + public: + // Creates an implementation that will scale tap locations by the given + // |scale_factor| (when needed) and call the given |callback| when Mojo + // ShowUnhandledTapUIIfNeeded messages are received for the + // unhandled_tap_notifier service. + UnhandledTapNotifierImpl(float device_scale_factor, + UnhandledTapCallback callback); + + ~UnhandledTapNotifierImpl() override; + + // Mojo UnhandledTapNotifier implementation. + void ShowUnhandledTapUIIfNeeded( + blink::mojom::UnhandledTapInfoPtr unhandled_tap_info) override; + + private: + // Scale factor between pixels and DPs. + float device_scale_factor_; + + // Callback to call when an unhandled tap notification takes place. + UnhandledTapCallback unhandled_tap_callback_; + + DISALLOW_COPY_AND_ASSIGN(UnhandledTapNotifierImpl); +}; + +// static +void CreateUnhandledTapNotifierImpl( + float device_scale_factor, + UnhandledTapCallback callback, + blink::mojom::UnhandledTapNotifierRequest request); + +} // namespace contextual_search + +#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_UNHANDLED_TAP_NOTIFIER_IMPL_H_
diff --git a/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc new file mode 100644 index 0000000..74e86be --- /dev/null +++ b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.cc
@@ -0,0 +1,42 @@ +// Copyright 2018 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 "chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h" + +#include <utility> + +#include "base/memory/ptr_util.h" +#include "build/build_config.h" +#include "third_party/WebKit/public/public_features.h" + +#if BUILDFLAG(ENABLE_UNHANDLED_TAP) +#include "chrome/browser/android/contextualsearch/unhandled_tap_notifier_impl.h" +#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) + +namespace contextual_search { + +UnhandledTapWebContentsObserver::UnhandledTapWebContentsObserver( + content::WebContents* web_contents, + float device_scale_factor, + UnhandledTapCallback callback) + : content::WebContentsObserver(web_contents) { +#if BUILDFLAG(ENABLE_UNHANDLED_TAP) + registry_.AddInterface( + base::BindRepeating(&contextual_search::CreateUnhandledTapNotifierImpl, + device_scale_factor, std::move(callback))); +#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) +} + +UnhandledTapWebContentsObserver::~UnhandledTapWebContentsObserver() {} + +void UnhandledTapWebContentsObserver::OnInterfaceRequestFromFrame( + content::RenderFrameHost* render_frame_host, + const std::string& interface_name, + mojo::ScopedMessagePipeHandle* interface_pipe) { +#if BUILDFLAG(ENABLE_UNHANDLED_TAP) + registry_.TryBindInterface(interface_name, interface_pipe); +#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) +} + +} // namespace contextual_search
diff --git a/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h new file mode 100644 index 0000000..d5bbd4b --- /dev/null +++ b/chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h
@@ -0,0 +1,46 @@ +// Copyright 2018 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 CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_UNHANDLED_TAP_WEB_CONTENTS_OBSERVER_H_ +#define CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_UNHANDLED_TAP_WEB_CONTENTS_OBSERVER_H_ + +#include "base/macros.h" +#include "content/public/browser/render_frame_host.h" +#include "content/public/browser/web_contents_observer.h" +#include "services/service_manager/public/cpp/binder_registry.h" + +namespace contextual_search { + +typedef base::RepeatingCallback<void(int x_px, int y_px)> UnhandledTapCallback; + +// Binds a Mojo unhandled-tap notifier message-handler to the frame host +// observed by this observer. +class UnhandledTapWebContentsObserver : public content::WebContentsObserver { + public: + // Creates an observer for the given |web_contents| that binds a Mojo request + // for an endpoint to the UnhandledTapNotifier service. This will create an + // instance of the contextual_search::CreateUnhandledTapNotifierImpl to handle + // those messages. May use the given |scale_factor| to convert from dips to + // pixels for tap coordinates when calling back through the given |callback|. + UnhandledTapWebContentsObserver(content::WebContents* web_contents, + float device_scale_factor, + UnhandledTapCallback callback); + + ~UnhandledTapWebContentsObserver() override; + + private: + // content::WebContentsObserver implementation. + void OnInterfaceRequestFromFrame( + content::RenderFrameHost* render_frame_host, + const std::string& interface_name, + mojo::ScopedMessagePipeHandle* interface_pipe) override; + + service_manager::BinderRegistry registry_; + + DISALLOW_COPY_AND_ASSIGN(UnhandledTapWebContentsObserver); +}; + +} // namespace contextual_search + +#endif // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_UNHANDLED_TAP_WEB_CONTENTS_OBSERVER_H_
diff --git a/chrome/browser/android/hung_renderer_infobar_delegate.cc b/chrome/browser/android/hung_renderer_infobar_delegate.cc index f1583dc..7845a76 100644 --- a/chrome/browser/android/hung_renderer_infobar_delegate.cc +++ b/chrome/browser/android/hung_renderer_infobar_delegate.cc
@@ -69,7 +69,7 @@ bool HungRendererInfoBarDelegate::Accept() { LogEvent(KILL_CLICKED); - render_process_host_->Shutdown(content::RESULT_CODE_HUNG, false); + render_process_host_->Shutdown(content::RESULT_CODE_HUNG); return true; }
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc index 6426433..de8f6679 100644 --- a/chrome/browser/apps/guest_view/web_view_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -3716,7 +3716,7 @@ auto* rph = GetGuestWebContents()->GetMainFrame()->GetProcess(); content::RenderProcessHostWatcher crash_observer( rph, content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - EXPECT_TRUE(rph->Shutdown(content::RESULT_CODE_KILLED, false)); + EXPECT_TRUE(rph->Shutdown(content::RESULT_CODE_KILLED)); crash_observer.Wait(); EXPECT_FALSE(GetGuestWebContents()->GetMainFrame()->GetView());
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 5c8745b..ddd9d20 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd
@@ -68,7 +68,7 @@ </if> </structures> <includes> - <if expr="is_win or is_macosx or is_linux"> + <if expr="is_win or is_macosx or desktop_linux or chromeos"> <include name="IDR_ABOUT_DISCARDS_CSS" file="resources\discards\discards.css" type="BINDATA" /> <include name="IDR_ABOUT_DISCARDS_HTML" file="resources\discards\discards.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_ABOUT_DISCARDS_JS" file="resources\discards\discards.js" type="BINDATA" />
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index d2916a7..54414c7d 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -180,7 +180,7 @@ #include "components/safe_browsing/features.h" #include "components/safe_browsing/password_protection/password_protection_navigation_throttle.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h" #include "components/task_scheduler_util/common/variations_util.h" #include "components/translate/core/common/translate_switches.h" @@ -3962,7 +3962,7 @@ ->CreateClientCertStore(); } -scoped_refptr<content::ResourceDispatcherHostLoginDelegate> +scoped_refptr<content::LoginDelegate> ChromeContentBrowserClient::CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 9bab5a8..b07fc3c 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h
@@ -418,8 +418,7 @@ base::OnceCallback<void(bool)> callback) override; std::unique_ptr<net::ClientCertStore> CreateClientCertStore( content::ResourceContext* resource_context) override; - scoped_refptr<content::ResourceDispatcherHostLoginDelegate> - CreateLoginDelegate( + scoped_refptr<content::LoginDelegate> CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter, bool is_main_frame,
diff --git a/chrome/browser/chrome_navigation_browsertest.cc b/chrome/browser/chrome_navigation_browsertest.cc index 6df411c..62a87562 100644 --- a/chrome/browser/chrome_navigation_browsertest.cc +++ b/chrome/browser/chrome_navigation_browsertest.cc
@@ -1013,7 +1013,7 @@ ->GetProcess(); content::RenderProcessHostWatcher crash_observer( process, content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - process->Shutdown(-1, true); + process->Shutdown(-1); crash_observer.Wait(); // Attempt to navigate to a chrome://... URL. This used to hang and never
diff --git a/chrome/browser/chrome_service.cc b/chrome/browser/chrome_service.cc index 10faefa..a6e8369 100644 --- a/chrome/browser/chrome_service.cc +++ b/chrome/browser/chrome_service.cc
@@ -7,7 +7,7 @@ #include "base/no_destructor.h" #include "chrome/browser/chrome_browser_main_extra_parts.h" #include "chrome/common/constants.mojom.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h"
diff --git a/chrome/browser/chrome_site_per_process_browsertest.cc b/chrome/browser/chrome_site_per_process_browsertest.cc index 749d418..37f72267 100644 --- a/chrome/browser/chrome_site_per_process_browsertest.cc +++ b/chrome/browser/chrome_site_per_process_browsertest.cc
@@ -26,7 +26,7 @@ #include "components/app_modal/native_app_modal_dialog.h" #include "components/guest_view/browser/guest_view_manager_delegate.h" #include "components/guest_view/browser/test_guest_view_manager.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_handle.h"
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 1378e6e..bc72201 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn
@@ -75,6 +75,7 @@ "//components/captive_portal", "//components/certificate_reporting:cert_logger_proto", "//components/component_updater:crl_set_remover", + "//components/consent_auditor:consent_auditor", "//components/constrained_window", "//components/content_settings/core/browser", "//components/crash/content/app",
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 1dd5937..2ffaca4 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -1329,6 +1329,7 @@ } void AccessibilityManager::OnChromeVoxPanelClosing() { + // TODO: Handle this in ash::ChromeVoxLayoutManager. chromevox_panel_->ResetPanelHeight(); chromevox_panel_widget_observer_.reset(); chromevox_panel_ = nullptr;
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc index ecb1e251..3648516 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -44,7 +44,8 @@ namespace { -constexpr char kTestUserName[] = "owner@invalid.domain"; +// Use a real domain to avoid policy loading problems. +constexpr char kTestUserName[] = "owner@gmail.com"; constexpr char kTestUserGaiaId[] = "9876543210"; constexpr int kTestAutoclickDelayMs = 2000;
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc index 05cfe30..a770e3d 100644 --- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc +++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
@@ -103,7 +103,7 @@ views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); aura::Window* root_window = ash::Shell::GetPrimaryRootWindow(); params.parent = ash::Shell::GetContainer( - root_window, ash::kShellWindowId_SettingBubbleContainer); + root_window, ash::kShellWindowId_ChromeVoxContainer); params.delegate = this; params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; params.bounds = gfx::Rect(0, 0, root_window->bounds().width(), @@ -127,6 +127,9 @@ } void ChromeVoxPanel::Close() { + // NOTE: CloseNow() does not work here due to a use-after-free where + // WebContentsImpl accesses a deleted RenderFrameHost. It's not clear if it's + // legal to close a WebContents during DidFinishNavigation. widget_->Close(); } @@ -216,10 +219,13 @@ } void ChromeVoxPanel::SendPanelHeightToAsh(int panel_height) { - // TODO(mash): Replace with shelf mojo API. ash::Shelf* shelf = ash::Shelf::ForWindow(GetRootWindow()); ash::ShelfLayoutManager* shelf_layout_manager = shelf ? shelf->shelf_layout_manager() : nullptr; if (shelf_layout_manager) shelf_layout_manager->SetChromeVoxPanelHeight(panel_height); + // NOTE: Setting the panel height causes a display work area change, + // which causes a display::DisplayManager::NotifyMetricsChanged, which calls + // OnDisplayMetricsChanged which calls UpdateWidgetBounds. This can result + // in multiple bounds updates when the window is opened and closed. }
diff --git a/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter.cc b/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter.cc index 0759b35..7273f4b 100644 --- a/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter.cc +++ b/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter.cc
@@ -210,8 +210,13 @@ event.type() == ui::ET_MOUSE_MOVED) { const ui::MouseEvent mouse_event = static_cast<const ui::MouseEvent&>(event); - if (OnMouseEvent(&mouse_event)) + if (OnMouseEvent(&mouse_event) && (event.type() == ui::ET_MOUSE_PRESSED || + event.type() == ui::ET_MOUSE_RELEASED)) { + // Cancel only click events if they were consumed by Select-to-Speak. + // Mouse move and drag should still happen or the mouse cursor may + // not be drawn in the right place. return ui::EVENT_REWRITE_DISCARD; + } } return ui::EVENT_REWRITE_CONTINUE;
diff --git a/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter_unittest.cc b/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter_unittest.cc index 1dbe4786..7ec50ea 100644 --- a/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/accessibility/select_to_speak_event_rewriter_unittest.cc
@@ -11,6 +11,7 @@ #include "ash/test/ash_test_helper.h" #include "ash/test/ash_test_views_delegate.h" #include "base/macros.h" +#include "chrome/browser/chromeos/ash_config.h" #include "chrome/browser/chromeos/events/event_rewriter_controller.h" #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" #include "chrome/test/base/testing_profile.h" @@ -178,11 +179,13 @@ generator_->PressLeftButton(); EXPECT_EQ(click_location, mouse_event_delegate_->last_mouse_event_location()); + // Drags are not blocked. gfx::Point drag_location = gfx::Point(120, 32); generator_->DragMouseTo(drag_location); EXPECT_EQ(drag_location, mouse_event_delegate_->last_mouse_event_location()); EXPECT_TRUE(mouse_event_delegate_->CapturedMouseEvent(ui::ET_MOUSE_DRAGGED)); - EXPECT_FALSE(event_capturer_.last_mouse_event()); + EXPECT_TRUE(event_capturer_.last_mouse_event()); + event_capturer_.Reset(); generator_->ReleaseLeftButton(); EXPECT_EQ(drag_location, mouse_event_delegate_->last_mouse_event_location()); @@ -192,6 +195,10 @@ } TEST_F(SelectToSpeakEventRewriterTest, SearchPlusDragOnLargeDisplay) { + // TODO: Failing in mus_unit_tests, see https://crbug.com/818362. + if (ash::Shell::GetAshConfig() == ash::Config::MUS) { + return; + } // This display has twice the number of pixels per DIP. THis means that // each event coming in in px needs to be divided by two to be converted // to DIPs. @@ -209,7 +216,8 @@ EXPECT_EQ(gfx::Point(drag_location_px.x() / 2, drag_location_px.y() / 2), mouse_event_delegate_->last_mouse_event_location()); EXPECT_TRUE(mouse_event_delegate_->CapturedMouseEvent(ui::ET_MOUSE_DRAGGED)); - EXPECT_FALSE(event_capturer_.last_mouse_event()); + EXPECT_TRUE(event_capturer_.last_mouse_event()); + event_capturer_.Reset(); generator_->ReleaseLeftButton(); EXPECT_EQ(gfx::Point(drag_location_px.x() / 2, drag_location_px.y() / 2),
diff --git a/chrome/browser/chromeos/arc/arc_support_host.cc b/chrome/browser/chromeos/arc/arc_support_host.cc index e039b6bb..d7996db 100644 --- a/chrome/browser/chromeos/arc/arc_support_host.cc +++ b/chrome/browser/chromeos/arc/arc_support_host.cc
@@ -6,15 +6,18 @@ #include <string> #include <utility> +#include <vector> #include "base/bind.h" #include "base/i18n/timezone.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/sha1.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" +#include "chrome/browser/consent_auditor/consent_auditor_factory.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" @@ -23,6 +26,7 @@ #include "chrome/browser/ui/extensions/app_launch_params.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/grit/generated_resources.h" +#include "components/consent_auditor/consent_auditor.h" #include "components/user_manager/known_user.h" #include "extensions/browser/extension_registry.h" #include "ui/base/l10n/l10n_util.h" @@ -78,14 +82,22 @@ constexpr char kAuthErrorMessage[] = "errorMessage"; // "onAgree" is fired when a user clicks "Agree" button. -// The message should have the following three fields: +// The message should have the following fields: +// - tosContent +// - tosShown // - isMetricsEnabled // - isBackupRestoreEnabled +// - isBackupRestoreManaged // - isLocationServiceEnabled +// - isLocationServiceManaged constexpr char kEventOnAgreed[] = "onAgreed"; +constexpr char kTosContent[] = "tosContent"; +constexpr char kTosShown[] = "tosShown"; constexpr char kIsMetricsEnabled[] = "isMetricsEnabled"; constexpr char kIsBackupRestoreEnabled[] = "isBackupRestoreEnabled"; +constexpr char kIsBackupRestoreManaged[] = "isBackupRestoreManaged"; constexpr char kIsLocationServiceEnabled[] = "isLocationServiceEnabled"; +constexpr char kIsLocationServiceManaged[] = "isLocationServiceManaged"; // "onRetryClicked" is fired when a user clicks "RETRY" button on the error // page. @@ -158,6 +170,28 @@ } // namespace +// static +std::vector<int> ArcSupportHost::ComputePlayToSConsentIds( + const std::string& content) { + std::vector<int> result; + + // Record the content length and the SHA1 hash of the content, rather than + // wastefully copying the entire content which is dynamically loaded from + // Play, rather than included in the Chrome build itself. + result.push_back(static_cast<int>(content.length())); + + uint8_t hash[base::kSHA1Length]; + base::SHA1HashBytes(reinterpret_cast<const uint8_t*>(content.c_str()), + content.size(), hash); + for (size_t i = 0; i < base::kSHA1Length; i += 4) { + uint32_t acc = + hash[i] << 24 | hash[i + 1] << 16 | hash[i + 2] << 8 | hash[i + 3]; + result.push_back(static_cast<int>(acc)); + } + + return result; +} + ArcSupportHost::ArcSupportHost(Profile* profile) : profile_(profile), request_open_app_callback_(base::Bind(&RequestOpenApp)) { @@ -581,17 +615,54 @@ auth_delegate_->OnAuthFailed(error_message); } else if (event == kEventOnAgreed) { DCHECK(tos_delegate_); + bool tos_shown; + std::string tos_content; bool is_metrics_enabled; bool is_backup_restore_enabled; + bool is_backup_restore_managed; bool is_location_service_enabled; - if (!message.GetBoolean(kIsMetricsEnabled, &is_metrics_enabled) || + bool is_location_service_managed; + if (!message.GetString(kTosContent, &tos_content) || + !message.GetBoolean(kTosShown, &tos_shown) || + !message.GetBoolean(kIsMetricsEnabled, &is_metrics_enabled) || !message.GetBoolean(kIsBackupRestoreEnabled, &is_backup_restore_enabled) || + !message.GetBoolean(kIsBackupRestoreManaged, + &is_backup_restore_managed) || !message.GetBoolean(kIsLocationServiceEnabled, - &is_location_service_enabled)) { + &is_location_service_enabled) || + !message.GetBoolean(kIsLocationServiceManaged, + &is_location_service_managed)) { NOTREACHED(); return; } + + // Record acceptance of ToS if it was shown to the user. + if (tos_shown) { + ConsentAuditorFactory::GetForProfile(profile_)->RecordGaiaConsent( + consent_auditor::Feature::PLAY_STORE, + ComputePlayToSConsentIds(tos_content), + IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE, + consent_auditor::ConsentStatus::GIVEN); + } + + // If the user - not policy - chose Backup and Restore, record consent. + if (is_backup_restore_enabled && !is_backup_restore_managed) { + ConsentAuditorFactory::GetForProfile(profile_)->RecordGaiaConsent( + consent_auditor::Feature::BACKUP_AND_RESTORE, + {IDS_ARC_OPT_IN_DIALOG_BACKUP_RESTORE}, + IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE, + consent_auditor::ConsentStatus::GIVEN); + } + + // If the user - not policy - chose Location Services, record consent. + if (is_location_service_enabled && !is_location_service_managed) { + ConsentAuditorFactory::GetForProfile(profile_)->RecordGaiaConsent( + consent_auditor::Feature::GOOGLE_LOCATION_SERVICE, + {IDS_ARC_OPT_IN_LOCATION_SETTING}, IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE, + consent_auditor::ConsentStatus::GIVEN); + } + tos_delegate_->OnTermsAgreed(is_metrics_enabled, is_backup_restore_enabled, is_location_service_enabled); } else if (event == kEventOnRetryClicked) {
diff --git a/chrome/browser/chromeos/arc/arc_support_host.h b/chrome/browser/chromeos/arc/arc_support_host.h index a1ef654..197b6b6 100644 --- a/chrome/browser/chromeos/arc/arc_support_host.h +++ b/chrome/browser/chromeos/arc/arc_support_host.h
@@ -7,6 +7,7 @@ #include <memory> #include <string> +#include <vector> #include "base/callback.h" #include "base/macros.h" @@ -169,6 +170,12 @@ void SetRequestOpenAppCallbackForTesting( const RequestOpenAppCallback& callback); + // Computes consent IDs based on the content of the Play ToS. Useful as the + // Play ToS is not contained within the Chrome binary, but rather fetched + // live. + // Returns a vector of consent "IDs" based on the Play ToS content. + static std::vector<int> ComputePlayToSConsentIds(const std::string& content); + private: struct PreferenceCheckboxData { PreferenceCheckboxData() : PreferenceCheckboxData(false, false) {}
diff --git a/chrome/browser/chromeos/arc/arc_support_host_unittest.cc b/chrome/browser/chromeos/arc/arc_support_host_unittest.cc index 10932c1e..c34d5fa 100644 --- a/chrome/browser/chromeos/arc/arc_support_host_unittest.cc +++ b/chrome/browser/chromeos/arc/arc_support_host_unittest.cc
@@ -4,9 +4,15 @@ #include "chrome/browser/chromeos/arc/arc_support_host.h" +#include <vector> + #include "chrome/browser/chromeos/arc/extensions/fake_arc_support.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" +#include "chrome/browser/consent_auditor/consent_auditor_factory.h" +#include "chrome/browser/sync/user_event_service_factory.h" +#include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" +#include "components/consent_auditor/consent_auditor.h" #include "components/user_manager/scoped_user_manager.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gmock/include/gmock/gmock.h" @@ -54,17 +60,43 @@ using MockErrorDelegate = StrictMock<MockErrorDelegateNonStrict>; -class ArcSupportHostTest : public testing::Test { +// TODO(jhorwich): Integrate with centralized FakeConsentAuditor. +class FakeConsentAuditor : public consent_auditor::ConsentAuditor { + public: + static std::unique_ptr<KeyedService> Build(content::BrowserContext* context) { + return std::make_unique<FakeConsentAuditor>( + Profile::FromBrowserContext(context)); + } + + explicit FakeConsentAuditor(Profile* profile) + : ConsentAuditor( + profile->GetPrefs(), + browser_sync::UserEventServiceFactory::GetForProfile(profile), + std::string(), + std::string()) {} + + ~FakeConsentAuditor() override = default; + + void RecordGaiaConsent(consent_auditor::Feature feature, + const std::vector<int>& description_grd_ids, + int confirmation_grd_id, + consent_auditor::ConsentStatus status) override {} + + private: + DISALLOW_COPY_AND_ASSIGN(FakeConsentAuditor); +}; + +class ArcSupportHostTest : public BrowserWithTestWindowTest { public: ArcSupportHostTest() = default; ~ArcSupportHostTest() override = default; void SetUp() override { + BrowserWithTestWindowTest::SetUp(); user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>( std::make_unique<chromeos::FakeChromeUserManager>()); - profile_ = std::make_unique<TestingProfile>(); - support_host_ = std::make_unique<ArcSupportHost>(profile_.get()); + support_host_ = std::make_unique<ArcSupportHost>(profile()); fake_arc_support_ = std::make_unique<FakeArcSupport>(support_host_.get()); } @@ -75,8 +107,9 @@ fake_arc_support_.reset(); support_host_.reset(); - profile_.reset(); user_manager_enabler_.reset(); + + BrowserWithTestWindowTest::TearDown(); } ArcSupportHost* support_host() { return support_host_.get(); } @@ -107,11 +140,17 @@ kFakeActiveDirectoryPrefix); } - private: - // Fake as if the current testing thread is UI thread. - content::TestBrowserThreadBundle bundle_; + FakeConsentAuditor* consent_auditor() { + return static_cast<FakeConsentAuditor*>( + ConsentAuditorFactory::GetForProfile(profile())); + } - std::unique_ptr<TestingProfile> profile_; + // BrowserWithTestWindowTest: + TestingProfile::TestingFactories GetTestingFactories() override { + return {{ConsentAuditorFactory::GetInstance(), FakeConsentAuditor::Build}}; + } + + private: std::unique_ptr<ArcSupportHost> support_host_; std::unique_ptr<FakeArcSupport> fake_arc_support_; std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
diff --git a/chrome/browser/chromeos/arc/extensions/fake_arc_support.cc b/chrome/browser/chromeos/arc/extensions/fake_arc_support.cc index a7e661ea..d193d7a 100644 --- a/chrome/browser/chromeos/arc/extensions/fake_arc_support.cc +++ b/chrome/browser/chromeos/arc/extensions/fake_arc_support.cc
@@ -78,9 +78,13 @@ DCHECK_EQ(ui_page_, ArcSupportHost::UIPage::TERMS); base::DictionaryValue message; message.SetString("event", "onAgreed"); + message.SetString("tosContent", tos_content_); + message.SetBoolean("tosShown", tos_shown_); message.SetBoolean("isMetricsEnabled", metrics_mode_); message.SetBoolean("isBackupRestoreEnabled", backup_and_restore_mode_); + message.SetBoolean("isBackupRestoreManaged", backup_and_restore_managed_); message.SetBoolean("isLocationServiceEnabled", location_service_mode_); + message.SetBoolean("isLocationServiceManaged", location_service_managed_); SerializeAndSend(native_message_host_.get(), message); }
diff --git a/chrome/browser/chromeos/arc/extensions/fake_arc_support.h b/chrome/browser/chromeos/arc/extensions/fake_arc_support.h index 89e843f..f4cef85 100644 --- a/chrome/browser/chromeos/arc/extensions/fake_arc_support.h +++ b/chrome/browser/chromeos/arc/extensions/fake_arc_support.h
@@ -55,8 +55,14 @@ void ClickSendFeedbackButton(); bool metrics_mode() const { return metrics_mode_; } + bool backup_and_restore_managed() const { + return backup_and_restore_managed_; + } bool backup_and_restore_mode() const { return backup_and_restore_mode_; } + bool location_service_managed() const { return location_service_managed_; } bool location_service_mode() const { return location_service_mode_; } + const std::string& tos_content() const { return tos_content_; } + bool tos_shown() const { return tos_shown_; } // Emulates checking preference box. void set_metrics_mode(bool mode) { metrics_mode_ = mode; } @@ -65,6 +71,20 @@ } void set_location_service_mode(bool mode) { location_service_mode_ = mode; } + // Allows control of whether some preferences are managed by policy. + void set_backup_and_restore_managed(bool managed) { + backup_and_restore_managed_ = managed; + } + void set_location_service_managed(bool managed) { + location_service_managed_ = managed; + } + + // Allows emulation of the ToS display. + void set_tos_content(const std::string& tos_content) { + tos_content_ = tos_content; + } + void set_tos_shown(bool shown) { tos_shown_ = shown; } + // Emulate setting the Active Directory auth federation URL. void set_active_directory_auth_federation_url( const std::string& federation_url) { @@ -106,8 +126,12 @@ std::unique_ptr<extensions::NativeMessageHost> native_message_host_; ArcSupportHost::UIPage ui_page_ = ArcSupportHost::UIPage::NO_PAGE; bool metrics_mode_ = false; + bool backup_and_restore_managed_ = false; bool backup_and_restore_mode_ = false; + bool location_service_managed_ = false; bool location_service_mode_ = false; + std::string tos_content_; + bool tos_shown_ = false; std::string active_directory_auth_federation_url_; std::string active_directory_auth_device_management_url_prefix_; base::ObserverList<Observer> observer_list_;
diff --git a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc index 310f341..43fa1d7 100644 --- a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc +++ b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
@@ -4,6 +4,7 @@ #include <memory> #include <ostream> +#include <vector> #include "base/bind.h" #include "base/macros.h" @@ -13,9 +14,14 @@ #include "chrome/browser/chromeos/arc/extensions/fake_arc_support.h" #include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" +#include "chrome/browser/consent_auditor/consent_auditor_factory.h" +#include "chrome/browser/sync/user_event_service_factory.h" +#include "chrome/grit/generated_resources.h" +#include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/arc/arc_prefs.h" +#include "components/consent_auditor/consent_auditor.h" #include "components/prefs/pref_service.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "components/user_manager/scoped_user_manager.h" @@ -24,41 +30,94 @@ namespace arc { -class ArcTermsOfServiceDefaultNegotiatorTest : public testing::Test { +// TODO(jhorwich): Integrate with centralized FakeConsentAuditor. +class FakeConsentAuditor : public consent_auditor::ConsentAuditor { + public: + static std::unique_ptr<KeyedService> Build(content::BrowserContext* context) { + return std::make_unique<FakeConsentAuditor>( + Profile::FromBrowserContext(context)); + } + + explicit FakeConsentAuditor(Profile* profile) + : ConsentAuditor( + profile->GetPrefs(), + browser_sync::UserEventServiceFactory::GetForProfile(profile), + std::string(), + std::string()) {} + ~FakeConsentAuditor() override = default; + + void RecordGaiaConsent(consent_auditor::Feature feature, + const std::vector<int>& description_grd_ids, + int confirmation_grd_id, + consent_auditor::ConsentStatus status) override { + std::vector<int> ids = description_grd_ids; + ids.push_back(confirmation_grd_id); + recorded_id_vectors_.push_back(ids); + recorded_features_.push_back(feature); + recorded_statuses_.push_back(status); + } + + const std::vector<std::vector<int>>& recorded_id_vectors() { + return recorded_id_vectors_; + } + + const std::vector<consent_auditor::Feature>& recorded_features() { + return recorded_features_; + } + + const std::vector<consent_auditor::ConsentStatus>& recorded_statuses() { + return recorded_statuses_; + } + + private: + std::vector<std::vector<int>> recorded_id_vectors_; + std::vector<consent_auditor::Feature> recorded_features_; + std::vector<consent_auditor::ConsentStatus> recorded_statuses_; + + DISALLOW_COPY_AND_ASSIGN(FakeConsentAuditor); +}; + +class ArcTermsOfServiceDefaultNegotiatorTest + : public BrowserWithTestWindowTest { public: ArcTermsOfServiceDefaultNegotiatorTest() = default; ~ArcTermsOfServiceDefaultNegotiatorTest() override = default; void SetUp() override { + BrowserWithTestWindowTest::SetUp(); user_manager_enabler_ = std::make_unique<user_manager::ScopedUserManager>( std::make_unique<chromeos::FakeChromeUserManager>()); - profile_ = std::make_unique<TestingProfile>(); - - support_host_ = std::make_unique<ArcSupportHost>(profile_.get()); + support_host_ = std::make_unique<ArcSupportHost>(profile()); fake_arc_support_ = std::make_unique<FakeArcSupport>(support_host_.get()); negotiator_ = std::make_unique<ArcTermsOfServiceDefaultNegotiator>( - profile_->GetPrefs(), support_host()); + profile()->GetPrefs(), support_host()); } void TearDown() override { negotiator_.reset(); fake_arc_support_.reset(); support_host_.reset(); - profile_.reset(); user_manager_enabler_.reset(); + + BrowserWithTestWindowTest::TearDown(); } - TestingProfile* profile() { return profile_.get(); } ArcSupportHost* support_host() { return support_host_.get(); } FakeArcSupport* fake_arc_support() { return fake_arc_support_.get(); } ArcTermsOfServiceNegotiator* negotiator() { return negotiator_.get(); } - private: - // Fake as if the current testing thread is UI thread. - content::TestBrowserThreadBundle bundle_; + FakeConsentAuditor* consent_auditor() { + return static_cast<FakeConsentAuditor*>( + ConsentAuditorFactory::GetForProfile(profile())); + } - std::unique_ptr<TestingProfile> profile_; + // BrowserWithTestWindowTest: + TestingProfile::TestingFactories GetTestingFactories() override { + return {{ConsentAuditorFactory::GetInstance(), FakeConsentAuditor::Build}}; + } + + private: std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_; std::unique_ptr<ArcSupportHost> support_host_; std::unique_ptr<FakeArcSupport> fake_arc_support_; @@ -110,6 +169,11 @@ EXPECT_EQ(status, Status::PENDING); EXPECT_EQ(fake_arc_support()->ui_page(), ArcSupportHost::UIPage::TERMS); + // Emulate showing of a ToS page with a hard-coded ToS. + std::string tos_content = "fake ToS"; + fake_arc_support()->set_tos_content(tos_content); + fake_arc_support()->set_tos_shown(true); + // By default, the preference related checkboxes are checked, despite that // the preferences default to false. EXPECT_FALSE( @@ -153,6 +217,28 @@ profile()->GetPrefs()->GetBoolean(prefs::kArcBackupRestoreEnabled)); EXPECT_TRUE( profile()->GetPrefs()->GetBoolean(prefs::kArcLocationServiceEnabled)); + + // Make sure consent auditing is recording expected consents. + std::vector<int> tos_consent = + ArcSupportHost::ComputePlayToSConsentIds(tos_content); + tos_consent.push_back(IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE); + const std::vector<int> backup_consent = {IDS_ARC_OPT_IN_DIALOG_BACKUP_RESTORE, + IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE}; + const std::vector<int> location_consent = { + IDS_ARC_OPT_IN_LOCATION_SETTING, IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE}; + const std::vector<std::vector<int>> consent_ids = { + tos_consent, backup_consent, location_consent}; + const std::vector<consent_auditor::Feature> features = { + consent_auditor::Feature::PLAY_STORE, + consent_auditor::Feature::BACKUP_AND_RESTORE, + consent_auditor::Feature::GOOGLE_LOCATION_SERVICE}; + const std::vector<consent_auditor::ConsentStatus> statuses = { + consent_auditor::ConsentStatus::GIVEN, + consent_auditor::ConsentStatus::GIVEN, + consent_auditor::ConsentStatus::GIVEN}; + EXPECT_EQ(consent_auditor()->recorded_id_vectors(), consent_ids); + EXPECT_EQ(consent_auditor()->recorded_features(), features); + EXPECT_EQ(consent_auditor()->recorded_statuses(), statuses); } TEST_F(ArcTermsOfServiceDefaultNegotiatorTest, AcceptWithUnchecked) { @@ -164,6 +250,11 @@ EXPECT_EQ(status, Status::PENDING); EXPECT_EQ(fake_arc_support()->ui_page(), ArcSupportHost::UIPage::TERMS); + // Emulate showing of a ToS page with a hard-coded ID. + const std::string tos_content = "fake ToS content"; + fake_arc_support()->set_tos_content(tos_content); + fake_arc_support()->set_tos_shown(true); + // Override the preferences from the default values to true. profile()->GetPrefs()->SetBoolean(prefs::kArcBackupRestoreEnabled, true); profile()->GetPrefs()->SetBoolean(prefs::kArcLocationServiceEnabled, true); @@ -188,6 +279,65 @@ profile()->GetPrefs()->GetBoolean(prefs::kArcBackupRestoreEnabled)); EXPECT_FALSE( profile()->GetPrefs()->GetBoolean(prefs::kArcLocationServiceEnabled)); + + // Make sure consent auditing is only recording the ToS accept. + std::vector<int> tos_consent = + ArcSupportHost::ComputePlayToSConsentIds(tos_content); + tos_consent.push_back(IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE); + const std::vector<std::vector<int>> consent_ids = {tos_consent}; + const std::vector<consent_auditor::Feature> features = { + consent_auditor::Feature::PLAY_STORE}; + const std::vector<consent_auditor::ConsentStatus> statuses = { + consent_auditor::ConsentStatus::GIVEN}; + EXPECT_EQ(consent_auditor()->recorded_id_vectors(), consent_ids); + EXPECT_EQ(consent_auditor()->recorded_features(), features); + EXPECT_EQ(consent_auditor()->recorded_statuses(), statuses); +} + +TEST_F(ArcTermsOfServiceDefaultNegotiatorTest, AcceptWithManagedToS) { + // Verifies that we don't record ToS consent if the ToS is not shown due to + // a managed user scenario. + // Also verifies that a managed setting for Backup and Restore is not recorded + // while an unmanaged setting for Location Services still is recorded. + // Show Terms of service page. + Status status = Status::PENDING; + negotiator()->StartNegotiation(UpdateStatusCallback(&status)); + + // TERMS page should be shown. + EXPECT_EQ(status, Status::PENDING); + EXPECT_EQ(fake_arc_support()->ui_page(), ArcSupportHost::UIPage::TERMS); + + // Emulate ToS not shown, and Backup and Restore as a managed setting. + fake_arc_support()->set_tos_content("no ToS shown"); + fake_arc_support()->set_tos_shown(false); + fake_arc_support()->set_backup_and_restore_managed(true); + + // Override the preferences from the default values to true. + profile()->GetPrefs()->SetBoolean(prefs::kArcBackupRestoreEnabled, true); + profile()->GetPrefs()->SetBoolean(prefs::kArcLocationServiceEnabled, true); + + // Click the "AGREE" button so that the callback should be invoked + // with |agreed| = true. + fake_arc_support()->ClickAgreeButton(); + EXPECT_EQ(status, Status::ACCEPTED); + + // Make sure preference values are now updated. + EXPECT_TRUE( + profile()->GetPrefs()->GetBoolean(prefs::kArcBackupRestoreEnabled)); + EXPECT_TRUE( + profile()->GetPrefs()->GetBoolean(prefs::kArcLocationServiceEnabled)); + + // Make sure consent auditing is recording expected consents. + const std::vector<int> location_consent = { + IDS_ARC_OPT_IN_LOCATION_SETTING, IDS_ARC_OPT_IN_DIALOG_BUTTON_AGREE}; + const std::vector<std::vector<int>> consent_ids = {location_consent}; + const std::vector<consent_auditor::Feature> features = { + consent_auditor::Feature::GOOGLE_LOCATION_SERVICE}; + const std::vector<consent_auditor::ConsentStatus> statuses = { + consent_auditor::ConsentStatus::GIVEN}; + EXPECT_EQ(consent_auditor()->recorded_id_vectors(), consent_ids); + EXPECT_EQ(consent_auditor()->recorded_features(), features); + EXPECT_EQ(consent_auditor()->recorded_statuses(), statuses); } TEST_F(ArcTermsOfServiceDefaultNegotiatorTest, Cancel) {
diff --git a/chrome/browser/chromeos/login/easy_unlock/OWNERS b/chrome/browser/chromeos/login/easy_unlock/OWNERS index d9752ad..964c9a9d 100644 --- a/chrome/browser/chromeos/login/easy_unlock/OWNERS +++ b/chrome/browser/chromeos/login/easy_unlock/OWNERS
@@ -1,4 +1,4 @@ -tengs@chromium.org xiyuan@chromium.org +jhawkins@chromium.org # COMPONENT: UI>ProximityAuth
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index be40a19..d124add3 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn
@@ -171,14 +171,6 @@ "api/downloads/downloads_api.h", "api/downloads_internal/downloads_internal_api.cc", "api/downloads_internal/downloads_internal_api.h", - "api/easy_unlock_private/easy_unlock_private_api.cc", - "api/easy_unlock_private/easy_unlock_private_api.h", - "api/easy_unlock_private/easy_unlock_private_connection.cc", - "api/easy_unlock_private/easy_unlock_private_connection.h", - "api/easy_unlock_private/easy_unlock_private_connection_manager.cc", - "api/easy_unlock_private/easy_unlock_private_connection_manager.h", - "api/easy_unlock_private/easy_unlock_private_crypto_delegate.h", - "api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc", "api/extension_action/extension_action_api.cc", "api/extension_action/extension_action_api.h", "api/extension_action/extension_page_actions_api_constants.cc", @@ -918,6 +910,15 @@ sources += [ "api/certificate_provider/certificate_provider_api.cc", "api/certificate_provider/certificate_provider_api.h", + "api/easy_unlock_private/easy_unlock_private_api.cc", + "api/easy_unlock_private/easy_unlock_private_api.h", + "api/easy_unlock_private/easy_unlock_private_connection.cc", + "api/easy_unlock_private/easy_unlock_private_connection.h", + "api/easy_unlock_private/easy_unlock_private_connection_manager.cc", + "api/easy_unlock_private/easy_unlock_private_connection_manager.h", + "api/easy_unlock_private/easy_unlock_private_crypto_delegate.h", + "api/easy_unlock_private/easy_unlock_private_crypto_delegate_chromeos.cc", + "api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc", "api/enterprise_device_attributes/enterprise_device_attributes_api.cc", "api/enterprise_device_attributes/enterprise_device_attributes_api.h", "api/enterprise_platform_keys/enterprise_platform_keys_api.cc", @@ -1003,7 +1004,6 @@ } } else { sources += [ - "api/easy_unlock_private/easy_unlock_private_crypto_delegate_stub.cc", "api/image_writer_private/operation_nonchromeos.cc", "api/image_writer_private/removable_storage_provider_linux.cc", "api/messaging/native_message_process_host.cc",
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc index c8dc598..20fe947 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
@@ -20,6 +20,8 @@ #include "base/timer/timer.h" #include "base/values.h" #include "build/build_config.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.h" #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h" #include "chrome/browser/profiles/profile.h" @@ -44,19 +46,14 @@ #include "components/proximity_auth/switches.h" #include "components/signin/core/account_id/account_id.h" #include "components/strings/grit/components_strings.h" +#include "components/user_manager/user_manager.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/chromeos/devicetype_utils.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/range/range.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h" -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" -#include "components/user_manager/user_manager.h" -#include "ui/chromeos/devicetype_utils.h" -#endif - using proximity_auth::ScreenlockState; namespace extensions { @@ -138,24 +135,13 @@ ExtensionFunction::ResponseAction EasyUnlockPrivateGetStringsFunction::Run() { std::unique_ptr<base::DictionaryValue> strings(new base::DictionaryValue); -#if defined(OS_CHROMEOS) const base::string16 device_type = ui::GetChromeOSDeviceName(); -#else - // TODO(isherman): Set an appropriate device name for non-ChromeOS devices. - const base::string16 device_type = base::ASCIIToUTF16("Chromeschnozzle"); -#endif // defined(OS_CHROMEOS) -#if defined(OS_CHROMEOS) const user_manager::UserManager* manager = user_manager::UserManager::Get(); const user_manager::User* user = manager ? manager->GetActiveUser() : NULL; const std::string user_email_utf8 = user ? user->display_email() : std::string(); const base::string16 user_email = base::UTF8ToUTF16(user_email_utf8); -#else - // TODO(isherman): Set an appropriate user display email for non-ChromeOS - // platforms. - const base::string16 user_email = base::UTF8ToUTF16("superman@example.com"); -#endif // defined(OS_CHROMEOS) // Common strings. strings->SetString("learnMoreLinkTitle", @@ -826,7 +812,6 @@ easy_unlock_private::GetSignInChallenge::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); -#if defined(OS_CHROMEOS) Profile* profile = Profile::FromBrowserContext(browser_context()); const std::string challenge = EasyUnlockService::Get(profile)->GetChallenge(); @@ -846,10 +831,6 @@ OnDone(challenge, std::string()); } return true; -#else // if !defined(OS_CHROMEOS) - SetError("Sign-in not supported."); - return false; -#endif // defined(OS_CHROMEOS) } void EasyUnlockPrivateGetSignInChallengeFunction::OnDone(
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 6eadd740..da67267 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -798,10 +798,11 @@ ASSERT_TRUE(is_installed); } -// Test that a cross-process navigation away from a hosted app stays in the same -// BrowsingInstance, so that postMessage calls to the app's other windows still -// work. -IN_PROC_BROWSER_TEST_F(AppApiTest, SameBrowsingInstanceAfterSwap) { +// Test that a cross-site renderer-initiated navigation away from a hosted app +// stays in the same BrowsingInstance, so that postMessage calls to the app's +// other windows still work, and a cross-site browser-initiated navigation away +// from a hosted app switches BrowsingInstances. +IN_PROC_BROWSER_TEST_F(AppApiTest, NavigatePopupFromAppToOutsideApp) { extensions::ProcessMap* process_map = extensions::ProcessMap::Get(browser()->profile()); @@ -828,13 +829,40 @@ SiteInstance* popup_instance = popup_contents->GetSiteInstance(); EXPECT_EQ(app_instance, popup_instance); - // Navigate the popup to another process outside the app. + // Do a renderer-initiated navigation in the popup to a URL outside the app. GURL non_app_url(base_url.Resolve("path3/empty.html")); - ui_test_utils::NavigateToURL(active_browser_list->get(1), non_app_url); - SiteInstance* new_instance = popup_contents->GetSiteInstance(); - EXPECT_NE(app_instance, new_instance); + content::TestNavigationObserver observer(popup_contents); + EXPECT_TRUE(ExecuteScript( + popup_contents, + base::StringPrintf("location = '%s';", non_app_url.spec().c_str()))); + observer.Wait(); - // It should still be in the same BrowsingInstance, allowing postMessage to - // work. - EXPECT_TRUE(app_instance->IsRelatedSiteInstance(new_instance)); + // The popup will stay in the same SiteInstance, unless we are in + // --site-per-process mode, in which case it will go into a new related + // SiteInstance. Either case will allow postMessage to still work. + EXPECT_TRUE( + app_instance->IsRelatedSiteInstance(popup_contents->GetSiteInstance())); + if (content::AreAllSitesIsolatedForTesting()) + EXPECT_NE(app_instance, popup_contents->GetSiteInstance()); + else + EXPECT_EQ(app_instance, popup_contents->GetSiteInstance()); + + // Go back to app process in the popup. + { + content::TestNavigationObserver observer(popup_contents); + popup_contents->GetController().GoBack(); + observer.Wait(); + EXPECT_EQ(app_instance, popup_contents->GetSiteInstance()); + } + + // Do a browser-initiated navigation in the popup to a URL outside the app. + // This should swap BrowsingInstances. + { + content::TestNavigationObserver observer(popup_contents); + ui_test_utils::NavigateToURL(active_browser_list->get(1), non_app_url); + observer.Wait(); + EXPECT_NE(app_instance, popup_contents->GetSiteInstance()); + EXPECT_FALSE( + app_instance->IsRelatedSiteInstance(popup_contents->GetSiteInstance())); + } }
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc index d1bca5b3..449ced91 100644 --- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc +++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -48,7 +48,7 @@ #include "chrome/browser/speech/extension_api/tts_extension_api.h" #include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h" #include "chrome/common/buildflags.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" #include "ppapi/features/features.h" @@ -85,7 +85,9 @@ extensions::CookiesAPI::GetFactoryInstance(); extensions::DeveloperPrivateAPI::GetFactoryInstance(); extensions::DialAPIFactory::GetInstance(); +#if defined(OS_CHROMEOS) extensions::EasyUnlockPrivateAPI::GetFactoryInstance(); +#endif extensions::ExtensionActionAPI::GetFactoryInstance(); extensions::ExtensionGarbageCollectorFactory::GetInstance(); extensions::ExtensionStorageMonitorFactory::GetInstance();
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 94b5d49f..773ebd9 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -75,8 +75,8 @@ GetBackgroundHostForExtension(extension_id); ASSERT_TRUE(extension_host); - extension_host->render_process_host()->Shutdown(content::RESULT_CODE_KILLED, - false); + extension_host->render_process_host()->Shutdown( + content::RESULT_CODE_KILLED); ASSERT_TRUE(WaitForExtensionCrash(extension_id)); ASSERT_FALSE(GetProcessManager()-> GetBackgroundHostForExtension(extension_id));
diff --git a/chrome/browser/extensions/extension_web_ui_browsertest.cc b/chrome/browser/extensions/extension_web_ui_browsertest.cc deleted file mode 100644 index 169bfe2c..0000000 --- a/chrome/browser/extensions/extension_web_ui_browsertest.cc +++ /dev/null
@@ -1,70 +0,0 @@ -// Copyright 2018 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 "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/url_constants.h" -#include "chrome/test/base/ui_test_utils.h" -#include "content/public/browser/web_contents.h" -#include "content/public/test/browser_test_utils.h" -#include "extensions/browser/extension_registry.h" -#include "extensions/browser/test_extension_registry_observer.h" -#include "extensions/common/extension.h" -#include "net/test/embedded_test_server/embedded_test_server.h" - -using ExtensionWebUIBrowserTest = ExtensionBrowserTest; - -namespace extensions { - -IN_PROC_BROWSER_TEST_F(ExtensionWebUIBrowserTest, - NavigateToDefaultChromePageOnExtensionUnload) { - TabStripModel* tab_strip_model = browser()->tab_strip_model(); - - const Extension* extension = - LoadExtension(test_data_dir_.AppendASCII("api_test") - .AppendASCII("override") - .AppendASCII("history")); - ASSERT_TRUE(extension); - std::string extension_id = extension->id(); - - // Open the chrome://history/ page in the current tab. - GURL extension_url(chrome::kChromeUIHistoryURL); - ui_test_utils::NavigateToURL(browser(), extension_url); - content::WaitForLoadStop(tab_strip_model->GetActiveWebContents()); - - // Check that the chrome://history/ page contains the extension's content. - std::string location; - EXPECT_TRUE(content::ExecuteScriptAndExtractString( - browser()->tab_strip_model()->GetActiveWebContents(), - "domAutomationController.send(location.href);\n", &location)); - EXPECT_EQ(extension_id, GURL(location).host()); // Extension has control. - - ASSERT_EQ(1, tab_strip_model->count()); - - // Uninstall the extension. - ExtensionService* service = - ExtensionSystem::Get(browser()->profile())->extension_service(); - ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile()); - TestExtensionRegistryObserver registry_observer(registry); - service->UnloadExtension(extension->id(), UnloadedExtensionReason::UNINSTALL); - registry_observer.WaitForExtensionUnloaded(); - - // Check that the opened chrome://history/ page contains the default chrome - // history page content. - ASSERT_EQ(1, tab_strip_model->count()); - content::WaitForLoadStop(tab_strip_model->GetActiveWebContents()); - EXPECT_EQ( - chrome::kChromeUIHistoryURL, - tab_strip_model->GetActiveWebContents()->GetLastCommittedURL().spec()); - - EXPECT_TRUE(content::ExecuteScriptAndExtractString( - tab_strip_model->GetActiveWebContents(), - "domAutomationController.send(location.href);\n", &location)); - // Default history page has control. - EXPECT_EQ(chrome::kChromeUIHistoryURL, GURL(location).spec()); -} - -} // namespace extensions
diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc index 7d4b04b1..15b11d2 100644 --- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
@@ -126,8 +126,8 @@ #endif using content::BrowserThread; +using content::LoginDelegate; using content::RenderViewHost; -using content::ResourceDispatcherHostLoginDelegate; using content::ResourceRequestInfo; using content::ResourceType;
diff --git a/chrome/browser/media/single_client_video_capture_host.h b/chrome/browser/media/single_client_video_capture_host.h index 2a0dad3..0f61fe0 100644 --- a/chrome/browser/media/single_client_video_capture_host.h +++ b/chrome/browser/media/single_client_video_capture_host.h
@@ -16,7 +16,7 @@ #include "base/sequence_checker.h" #include "content/public/browser/video_capture_device_launcher.h" #include "content/public/common/media_stream_request.h" -#include "media/capture/mojo/video_capture.mojom.h" +#include "media/capture/mojom/video_capture.mojom.h" #include "media/capture/video/video_frame_receiver.h" namespace media {
diff --git a/chrome/browser/notifications/notification_platform_bridge_win.cc b/chrome/browser/notifications/notification_platform_bridge_win.cc index f5ad2301..7e8b7686 100644 --- a/chrome/browser/notifications/notification_platform_bridge_win.cc +++ b/chrome/browser/notifications/notification_platform_bridge_win.cc
@@ -25,6 +25,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task_scheduler/post_task.h" #include "base/win/core_winrt_util.h" +#include "base/win/registry.h" #include "base/win/scoped_hstring.h" #include "base/win/scoped_winrt_initializer.h" #include "base/win/windows_version.h" @@ -37,6 +38,7 @@ #include "chrome/browser/notifications/notification_template_builder.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_features.h" +#include "chrome/install_static/install_util.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/shell_util.h" #include "components/version_info/channel.h" @@ -461,10 +463,23 @@ /*supports_synchronization=*/true)); } + // Test to see if the notification_helper.exe has been registered in the + // system, either under HKCU or HKLM. + bool IsToastActivatorRegistered() { + base::win::RegKey key; + base::string16 path = + InstallUtil::GetToastActivatorRegistryPath() + L"\\LocalServer32"; + HKEY root = install_static::IsSystemInstall() ? HKEY_LOCAL_MACHINE + : HKEY_CURRENT_USER; + return ERROR_SUCCESS == key.Open(root, path.c_str(), KEY_QUERY_VALUE); + } + void SetReadyCallback( NotificationPlatformBridge::NotificationBridgeReadyCallback callback) { DCHECK(task_runner_->RunsTasksInCurrentSequence()); - std::move(callback).Run(com_functions_initialized_); + std::move(callback).Run( + com_functions_initialized_ && IsToastActivatorRegistered() && + InstallUtil::IsStartMenuShortcutWithActivatorGuidInstalled()); } void HandleEvent(winui::Notifications::IToastNotification* notification,
diff --git a/chrome/browser/offline_pages/offline_page_utils_unittest.cc b/chrome/browser/offline_pages/offline_page_utils_unittest.cc index a99a69ea..d5fe7433 100644 --- a/chrome/browser/offline_pages/offline_page_utils_unittest.cc +++ b/chrome/browser/offline_pages/offline_page_utils_unittest.cc
@@ -34,7 +34,6 @@ #include "components/offline_pages/core/offline_page_feature.h" #include "components/offline_pages/core/offline_page_model.h" #include "components/offline_pages/core/offline_page_test_archiver.h" -#include "components/offline_pages/core/offline_page_test_store.h" #include "components/offline_pages/core/offline_page_types.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc index 87daab64..df335694 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -549,7 +549,7 @@ } #endif -PrefService* ChromePasswordManagerClient::GetPrefs() { +PrefService* ChromePasswordManagerClient::GetPrefs() const { return profile_->GetPrefs(); }
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h index 1fcf9e2..a721437 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.h +++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -88,7 +88,7 @@ const GURL& origin, const std::vector<const autofill::PasswordForm*>* federated_matches) const override; - PrefService* GetPrefs() override; + PrefService* GetPrefs() const override; password_manager::PasswordStore* GetPasswordStore() const override; password_manager::PasswordSyncState GetPasswordSyncState() const override; bool WasLastNavigationHTTPError() const override;
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index cd88dc5..ac4b1c0 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -53,7 +53,7 @@ #include "components/safe_browsing/common/safe_browsing_prefs.h" #include "components/search_engines/default_search_policy_handler.h" #include "components/signin/core/browser/signin_pref_names.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/ssl_config/ssl_config_prefs.h" #include "components/sync/base/pref_names.h" #include "components/sync/driver/sync_policy_handler.h"
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index a40c50e..7f08268df 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc
@@ -1947,8 +1947,7 @@ extensions::ExtensionHost* extension_host = extensions::ProcessManager::Get(browser()->profile()) ->GetBackgroundHostForExtension(kGoodCrxId); - extension_host->render_process_host()->Shutdown(content::RESULT_CODE_KILLED, - false); + extension_host->render_process_host()->Shutdown(content::RESULT_CODE_KILLED); extension_crashed_observer.Wait(); extension_loaded_observer.WaitForExtensionLoaded(); }
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index fe137a8..1694880 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc
@@ -133,13 +133,15 @@ #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h" -#include "chrome/browser/signin/easy_unlock_service.h" #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" #include "extensions/browser/api/audio/audio_api.h" #include "extensions/browser/api/runtime/runtime_api.h" #include "extensions/browser/extension_prefs.h" +#if defined(OS_CHROMEOS) +#include "chrome/browser/signin/easy_unlock_service.h" +#endif #endif // BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_OFFLINE_PAGES) @@ -382,7 +384,7 @@ BackgroundModeManager::RegisterPrefs(registry); #endif -#if BUILDFLAG(ENABLE_EXTENSIONS) +#if BUILDFLAG(ENABLE_EXTENSIONS) and defined(OS_CHROMEOS) EasyUnlockService::RegisterPrefs(registry); #endif
diff --git a/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc b/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc index 064676a..65481d1 100644 --- a/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc +++ b/chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc
@@ -738,8 +738,8 @@ content::RenderProcessHost::AllHostsIterator()); !iter.IsAtEnd(); iter.Advance()) { ++host_count; - iter.GetCurrentValue()->Shutdown(content::RESULT_CODE_KILLED, - true /* wait */); + // TODO(wez): This used to use wait=true. + iter.GetCurrentValue()->Shutdown(content::RESULT_CODE_KILLED); } // There should be at most one render_process_host, that created for the SW. EXPECT_EQ(1, host_count);
diff --git a/chrome/browser/printing/print_browsertest.cc b/chrome/browser/printing/print_browsertest.cc index 6d567d6..475402bf 100644 --- a/chrome/browser/printing/print_browsertest.cc +++ b/chrome/browser/printing/print_browsertest.cc
@@ -122,8 +122,7 @@ void KillRenderProcess(int document_cookie, const PrintHostMsg_DidPrintContent_Params& param) { - base::ScopedAllowBaseSyncPrimitivesForTesting allow_sync_primitives; - rph_->Shutdown(0, true); + rph_->Shutdown(0); } content::RenderProcessHost* rph_; @@ -401,7 +400,7 @@ test_frame->GetProcess(), content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); // Shutdown the subframe. - ASSERT_TRUE(test_frame->GetProcess()->Shutdown(0, false)); + ASSERT_TRUE(test_frame->GetProcess()->Shutdown(0)); render_process_watcher.Wait(); ASSERT_FALSE(test_frame->IsRenderFrameLive());
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc index ba08440..8bbea7c 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -82,7 +82,7 @@ #include "chrome/common/buildflags.h" #include "components/feature_engagement/buildflags.h" #include "components/policy/content/policy_blacklist_navigation_throttle.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "extensions/features/features.h" #include "ppapi/features/features.h" #include "printing/features/features.h" @@ -136,10 +136,12 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h" #include "chrome/browser/extensions/browser_context_keyed_service_factories.h" #include "chrome/browser/extensions/extension_management.h" -#include "chrome/browser/signin/easy_unlock_service_factory.h" #include "chrome/browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h" #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" #include "extensions/browser/browser_context_keyed_service_factories.h" +#if defined(OS_CHROMEOS) +#include "chrome/browser/signin/easy_unlock_service_factory.h" +#endif #endif #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS) @@ -241,7 +243,9 @@ DownloadCoreServiceFactory::GetInstance(); DownloadServiceFactory::GetInstance(); #if BUILDFLAG(ENABLE_EXTENSIONS) +#if defined(OS_CHROMEOS) EasyUnlockServiceFactory::GetInstance(); +#endif EnhancedBookmarkKeyServiceFactory::GetInstance(); #endif #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index badd497..41211912 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -91,7 +91,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/spellcheck/browser/spellcheck_host_metrics.h" #include "components/spellcheck/common/spellcheck_common.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/strings/grit/components_strings.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h"
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc index 61de0fd2..9a88524 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
@@ -27,7 +27,7 @@ #include "components/spellcheck/browser/spelling_service_client.h" #include "components/spellcheck/common/spellcheck_common.h" #include "components/spellcheck/common/spellcheck_result.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h"
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc index 3e897db4..bae652f 100644 --- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc +++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -589,7 +589,7 @@ // Kill the renderer process, simulating a crash. This should the ProcessDied // method to be called. Alternatively, RenderProcessHost::OnChannelError can // be called to directly force a call to ProcessDied. - wc1->GetMainFrame()->GetProcess()->Shutdown(-1, true); + wc1->GetMainFrame()->GetProcess()->Shutdown(-1); observer.Wait(); }
diff --git a/chrome/browser/renderer_host/site_per_process_text_input_browsertest.cc b/chrome/browser/renderer_host/site_per_process_text_input_browsertest.cc index 69c34d4..d5693f6 100644 --- a/chrome/browser/renderer_host/site_per_process_text_input_browsertest.cc +++ b/chrome/browser/renderer_host/site_per_process_text_input_browsertest.cc
@@ -520,7 +520,7 @@ std::unique_ptr<content::TestRenderWidgetHostViewDestructionObserver> destruction_observer( new content::TestRenderWidgetHostViewDestructionObserver(first_view)); - frames[0]->GetProcess()->Shutdown(0, false); + frames[0]->GetProcess()->Shutdown(0); destruction_observer->Wait(); // Verify that the TextInputManager is no longer tracking TextInputState for @@ -533,7 +533,7 @@ destruction_observer.reset( new content::TestRenderWidgetHostViewDestructionObserver( frames[1]->GetView())); - frames[1]->GetProcess()->Shutdown(0, false); + frames[1]->GetProcess()->Shutdown(0); destruction_observer->Wait(); EXPECT_EQ(
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher.cc b/chrome/browser/resource_coordinator/tab_activity_watcher.cc index 73c8fe7..b842807 100644 --- a/chrome/browser/resource_coordinator/tab_activity_watcher.cc +++ b/chrome/browser/resource_coordinator/tab_activity_watcher.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/resource_coordinator/tab_activity_watcher.h" +#include "base/metrics/histogram_macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/resource_coordinator/tab_metrics_logger.h" #include "chrome/browser/resource_coordinator/time.h" @@ -27,6 +28,14 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY( resource_coordinator::TabActivityWatcher::WebContentsData); +// Use a 1-day max for tab visibility histograms since it's not uncommon to keep +// a tab in the same visibility state for a very long time (see Tab.VisibleTime +// which has 5% of samples in the overflow bucket with a 1-hour max). +#define UMA_TAB_VISIBILITY_HISTOGRAM(visibility, sample) \ + UMA_HISTOGRAM_CUSTOM_TIMES("Tab.Visibility." visibility, sample, \ + base::TimeDelta::FromMilliseconds(1), \ + base::TimeDelta::FromDays(1), 50) + namespace resource_coordinator { // Per-WebContents helper class that observes its WebContents, notifying @@ -199,19 +208,49 @@ } void OnVisibilityChanged(content::Visibility visibility) override { - // Ignore visibility changes while the WebContents is being destroyed. - if (web_contents()->IsBeingDestroyed()) - return; + // Record Tab.Visibility.* histogram and do associated bookkeeping. + // Recording is done at every visibility state change rather than just when + // the WebContents is destroyed to reduce data loss on session end. + RecordVisibilityHistogram(visibility); - // TODO(michaelpg): Consider tracking occluded tabs, not just background - // tabs. - if (visibility == content::Visibility::HIDDEN) - WasHidden(); - else - WasShown(); + // Record background tab UKMs and do associated bookkepping. + if (!web_contents()->IsBeingDestroyed()) { + // TODO(michaelpg): Consider treating occluded tabs as hidden. + if (visibility == content::Visibility::HIDDEN) { + WasHidden(); + } else { + WasShown(); + } + } + } + + void RecordVisibilityHistogram(content::Visibility new_visibility) { + const base::TimeTicks now = NowTicks(); + const base::TimeDelta duration = now - last_visibility_change_time_; + switch (visibility_) { + case content::Visibility::VISIBLE: { + UMA_TAB_VISIBILITY_HISTOGRAM("Visible", duration); + break; + } + + case content::Visibility::OCCLUDED: { + UMA_TAB_VISIBILITY_HISTOGRAM("Occluded", duration); + break; + } + + case content::Visibility::HIDDEN: { + UMA_TAB_VISIBILITY_HISTOGRAM("Hidden", duration); + break; + } + } + + visibility_ = new_visibility; + last_visibility_change_time_ = now; } void WebContentsDestroyed() override { + RecordVisibilityHistogram(visibility_); + if (was_replaced_) return; @@ -300,6 +339,12 @@ // If true, future events such as the tab being destroyed won't be logged. bool was_replaced_ = false; + // Current tab visibility. + content::Visibility visibility_ = web_contents()->GetVisibility(); + + // The last time at which |visibility_| changed. + base::TimeTicks last_visibility_change_time_ = NowTicks(); + DISALLOW_COPY_AND_ASSIGN(WebContentsData); };
diff --git a/chrome/browser/resources/chromeos/arc_support/background.js b/chrome/browser/resources/chromeos/arc_support/background.js index 29a71ffa..66a73de 100644 --- a/chrome/browser/resources/chromeos/arc_support/background.js +++ b/chrome/browser/resources/chromeos/arc_support/background.js
@@ -114,6 +114,8 @@ this.checkbox_ = container.querySelector('.checkbox-option'); this.label_ = container.querySelector('.checkbox-text'); + this.isManaged_ = false; + var learnMoreLink = this.label_.querySelector(learnMoreLinkId); if (learnMoreLink) { learnMoreLink.addEventListener( @@ -144,12 +146,21 @@ } /** + * Returns if the checkbox reflects a managed setting, rather than a + * user-controlled setting. + */ + isManaged() { + return this.isManaged_; + } + + /** * Called when the preference value in native code is updated. */ onPreferenceChanged(isEnabled, isManaged) { this.checkbox_.checked = isEnabled; this.checkbox_.disabled = isManaged; this.label_.disabled = isManaged; + this.isManaged_ = isManaged; if (this.policyIndicator_) { if (isManaged) { @@ -283,6 +294,9 @@ this.isManaged_ = isManaged; + this.tosContent_ = ''; + this.tosShown_ = false; + // Set event listener for webview loading. this.termsView_ = container.querySelector('#terms-view'); this.termsView_.addEventListener( @@ -431,6 +445,7 @@ // their language by selection at the bottom of the Terms Of Service // content. this.state_ = LoadState.LOADING; + this.tosContent_ = ''; // Show loading page. this.loadingContainer_.hidden = false; this.contentContainer_.hidden = true; @@ -443,7 +458,22 @@ // state_ is set to ABORTED. Here, switch the view only for the // successful loading case. if (this.state_ == LoadState.LOADING) { + var getToSContent = {code: 'getToSContent();'}; + termsPage.termsView_.executeScript( + getToSContent, this.onGetToSContent_.bind(this)); + } + } + + /** Callback for getToSContent. */ + onGetToSContent_(results) { + if (this.state_ == LoadState.LOADING) { + if (!results || results.length != 1 || typeof results[0] !== 'string') { + this.onTermsViewLoadAborted_('unable to get ToS content'); + return; + } this.state_ = LoadState.LOADED; + this.tosContent_ = results[0]; + this.tosShown_ = true; this.showContent_(); if (this.fastLocation_) { @@ -486,9 +516,13 @@ /** Called when "AGREE" button is clicked. */ onAgree() { sendNativeMessage('onAgreed', { + tosContent: this.tosContent_, + tosShown: this.tosShown_, isMetricsEnabled: this.metricsCheckbox_.isChecked(), isBackupRestoreEnabled: this.backupRestoreCheckbox_.isChecked(), - isLocationServiceEnabled: this.locationServiceCheckbox_.isChecked() + isBackupRestoreManaged: this.backupRestoreCheckbox_.isManaged(), + isLocationServiceEnabled: this.locationServiceCheckbox_.isChecked(), + isLocationServiceManaged: this.locationServiceCheckbox_.isManaged() }); }
diff --git a/chrome/browser/resources/chromeos/arc_support/playstore.js b/chrome/browser/resources/chromeos/arc_support/playstore.js index 8d52066..cfeb35d0 100644 --- a/chrome/browser/resources/chromeos/arc_support/playstore.js +++ b/chrome/browser/resources/chromeos/arc_support/playstore.js
@@ -113,6 +113,14 @@ } /** + * Returns the raw body HTML of the ToS contents. + * @return {string} HTML of document body. + */ +function getToSContent() { + return document.body.innerHTML; +} + +/** * Formats current document in order to display it correctly. */ function formatDocument() {
diff --git a/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.html b/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.html index 8c7d6c1..af490f28 100644 --- a/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.html +++ b/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.html
@@ -52,7 +52,7 @@ networking-private="[[networkingPrivate]]" global-policy="[[globalPolicy_]]" network-properties="{{networkProperties_}}" - enable-connect="{{enableConnect_}}" connect-on-save + enable-connect="{{enableConnect_}}" share-allow-enable="[[shareAllowEnable_]]" share-default="[[shareDefault_]]" error="{{error_}}"
diff --git a/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.js b/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.js index 847f8af..aab38dde 100644 --- a/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.js +++ b/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog.js
@@ -131,6 +131,6 @@ /** @private */ onConnectTap_: function() { - this.$.networkConfig.saveOrConnect(); + this.$.networkConfig.connect(); }, });
diff --git a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js b/chrome/browser/resources/chromeos/login/arc_terms_of_service.js index a54a0a9..7535582 100644 --- a/chrome/browser/resources/chromeos/login/arc_terms_of_service.js +++ b/chrome/browser/resources/chromeos/login/arc_terms_of_service.js
@@ -50,7 +50,7 @@ * @private */ onRetry_: function() { - this.screen.reloadPlayStore(); + this.screen.reloadPlayStoreToS(); }, /**
diff --git a/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js b/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js index fdd8841..504dc02 100644 --- a/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js +++ b/chrome/browser/resources/chromeos/login/screen_arc_terms_of_service.js
@@ -273,7 +273,7 @@ chrome.send( 'arcTermsOfServiceAccept', - [isBackupRestoreEnabled, isLocationServiceEnabled]); + [isBackupRestoreEnabled, isLocationServiceEnabled, this.tosContent_]); }, /** @@ -388,6 +388,21 @@ return; } + var getToSContent = {code: 'getToSContent();'}; + var termsView = this.getElement_('arc-tos-view'); + termsView.executeScript(getToSContent, this.onGetToSContent_.bind(this)); + }, + + /** + * Handles callback for getToSContent. + */ + onGetToSContent_: function(results) { + if (!results || results.length != 1 || typeof results[0] !== 'string') { + this.showError_(); + return; + } + + this.tosContent_ = results[0]; this.removeClass_('arc-tos-loading'); this.removeClass_('error'); this.addClass_('arc-tos-loaded'); @@ -412,6 +427,14 @@ * Handles event when terms view cannot be loaded. */ onTermsViewErrorOccurred: function(details) { + this.showError_(); + }, + + /** + * Shows error UI when terms view cannot be loaded or terms content cannot + * be fetched from webview. + */ + showError_: function() { this.termsError = true; this.removeClass_('arc-tos-loading'); this.removeClass_('arc-tos-loaded');
diff --git a/chrome/browser/resources/media_router/extension/BUILD.gn b/chrome/browser/resources/media_router/extension/BUILD.gn index 3b00256..a3a19d8 100644 --- a/chrome/browser/resources/media_router/extension/BUILD.gn +++ b/chrome/browser/resources/media_router/extension/BUILD.gn
@@ -46,19 +46,26 @@ outputs += [ "${target_gen_dir}/${module_name}.js" ] } args = [ "--module-specs" ] + mr_module_specs + [ - "--prelude-file", - rebase_path("prelude.js", root_build_dir), "--output-dir", - rebase_path(target_gen_dir + "/", root_build_dir), + rebase_path(target_gen_dir, root_build_dir), "--", ] + rebase_path(module_inputs, root_build_dir) } +copy("copy_prelude") { + sources = [ + "prelude.js", + ] + outputs = [ + "${target_gen_dir}/prelude.js", + ] +} + # Produce the Media Router extension. At present, the extension isn't # included in the Chromium distribution, but it can be sideloaded into # Chromium for testing. action("media_router") { - script = "assemble_extension.py" + script = "generate_manifest.py" inputs = [ "manifest.yaml", ] @@ -66,6 +73,7 @@ "$target_gen_dir/manifest.json", ] deps = [ + ":copy_prelude", ":media_router_modules", ] if (enable_media_router_jscompile) {
diff --git a/chrome/browser/resources/media_router/extension/concat_js_modules.py b/chrome/browser/resources/media_router/extension/concat_js_modules.py index cda9ca1d..2dda378 100644 --- a/chrome/browser/resources/media_router/extension/concat_js_modules.py +++ b/chrome/browser/resources/media_router/extension/concat_js_modules.py
@@ -25,18 +25,10 @@ "--output-dir", help="Directory where output files are written.") parser.add_argument( - "--prelude-file", - help="A prelude file included in every output module.") - parser.add_argument( "sources", nargs="+", help="JS input files.") args = parser.parse_args() - # Read the prelude file, which contains code to be placed at the - # start of each module. - with open(args.prelude_file, "r") as prelude_in: - prelude = prelude_in.read() - # Loop over all specified modules, and simulaneously traverse the # list of source files using `source_index`. source_index = 0 @@ -53,8 +45,6 @@ # Write the module file. module_file = os.path.join(args.output_dir, module_name + ".js") with open(module_file, "w") as module_out: - module_out.write(prelude) - # Append as many input files as requested by the module spec. for i in range(input_count): source_file = args.sources[source_index]
diff --git a/chrome/browser/resources/media_router/extension/assemble_extension.py b/chrome/browser/resources/media_router/extension/generate_manifest.py similarity index 84% rename from chrome/browser/resources/media_router/extension/assemble_extension.py rename to chrome/browser/resources/media_router/extension/generate_manifest.py index 7b2df0a25..196dca7 100644 --- a/chrome/browser/resources/media_router/extension/assemble_extension.py +++ b/chrome/browser/resources/media_router/extension/generate_manifest.py
@@ -2,11 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -"""This script generates manifest.json from manifest.yaml. - -In the future it may copy other non-JS files into the target -directory, hence the name of the script. -""" +"""This script generates manifest.json from manifest.yaml.""" import argparse import json
diff --git a/chrome/browser/resources/media_router/extension/manifest.yaml b/chrome/browser/resources/media_router/extension/manifest.yaml index 4eeb52a..5e27745 100644 --- a/chrome/browser/resources/media_router/extension/manifest.yaml +++ b/chrome/browser/resources/media_router/extension/manifest.yaml
@@ -30,6 +30,7 @@ # Background script. "background": { "scripts": [ + "prelude.js", "common.js", "mirroring_common.js", "background_script.js"
diff --git a/chrome/browser/resources/settings/controls/important_site_checkbox.html b/chrome/browser/resources/settings/controls/important_site_checkbox.html index e70da80b..20e0d91 100644 --- a/chrome/browser/resources/settings/controls/important_site_checkbox.html +++ b/chrome/browser/resources/settings/controls/important_site_checkbox.html
@@ -37,10 +37,13 @@ <div class="label">[[site.registerableDomain]]</div> <div class="secondary label"> <span class="storage-size">[[site.storageSize]]</span> - <template is="dom-if" if="[[site.hasNotifications]]"> - <span class="middot">·</span> - <span class="has-notifications">$i18n{notificationWarning}</span> - </template> + <span class="middot" hidden$="[[!site.hasNotifications]]"> + · + </span> + <span class="has-notifications" + hidden$="[[!site.hasNotifications]]"> + $i18n{notificationWarning} + </span> </div> </paper-checkbox> </div>
diff --git a/chrome/browser/resources/settings/internet_page/internet_config.html b/chrome/browser/resources/settings/internet_page/internet_config.html index 01e3cfa..fce0c7e 100644 --- a/chrome/browser/resources/settings/internet_page/internet_config.html +++ b/chrome/browser/resources/settings/internet_page/internet_config.html
@@ -43,14 +43,14 @@ <paper-button class="cancel-button" on-click="onCancelTap_"> $i18n{cancel} </paper-button> - <template is="dom-if" if="[[isConfigured_(networkProperties_, guid)]]"> - <paper-button class="action-button" on-click="onSaveOrConnectTap_" + <template is="dom-if" if="[[!showConnect]]"> + <paper-button class="action-button" on-click="onSaveTap_" disabled="[[!enableSave_]]"> $i18n{save} </paper-button> </template> - <template is="dom-if" if="[[!isConfigured_(networkProperties_, guid)]]"> - <paper-button class="action-button" on-click="onSaveOrConnectTap_" + <template is="dom-if" if="[[showConnect]]"> + <paper-button class="action-button" on-click="onConnectTap_" disabled="[[!enableConnect_]]"> $i18n{networkButtonConnect} </paper-button>
diff --git a/chrome/browser/resources/settings/internet_page/internet_config.js b/chrome/browser/resources/settings/internet_page/internet_config.js index 6aab8e2..ba7c90d 100644 --- a/chrome/browser/resources/settings/internet_page/internet_config.js +++ b/chrome/browser/resources/settings/internet_page/internet_config.js
@@ -56,6 +56,12 @@ */ name: String, + /** + * Set to true to show the 'connect' button instead of 'save'. + * @private + */ + showConnect: Boolean, + /** @private */ enableConnect_: Boolean, @@ -134,22 +140,18 @@ return this.i18n('networkErrorUnknown'); }, - /** - * @return {boolean} - * @private - */ - isConfigured_: function() { - const source = this.networkProperties_.Source; - return !!this.guid && !!source && source != CrOnc.Source.NONE; - }, - /** @private */ onCancelTap_: function() { this.close(); }, /** @private */ - onSaveOrConnectTap_: function() { - this.$.networkConfig.saveOrConnect(); + onSaveTap_: function() { + this.$.networkConfig.save(); + }, + + /** @private */ + onConnectTap_: function() { + this.$.networkConfig.connect(); }, });
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chrome/browser/resources/settings/internet_page/internet_detail_page.html index cbee01f..200cf41a 100644 --- a/chrome/browser/resources/settings/internet_page/internet_detail_page.html +++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
@@ -182,13 +182,11 @@ </div> </template> <!-- IP Address. --> - <template is="dom-if" - if="[[showIpAddress_(ipAddress_, networkProperties)]]"> - <div class="settings-box two-line single-column stretch"> - <div>$i18n{networkIPAddress}</div> - <div class="secondary">[[ipAddress_]]</div> - </div> - </template> + <div class="settings-box two-line single-column stretch" + hidden$="[[!showIpAddress_(ipAddress_, networkProperties)]]"> + <div>$i18n{networkIPAddress}</div> + <div class="secondary">[[ipAddress_]]</div> + </div> <!-- Properties to always show if present. --> <template is="dom-if" if="[[hasInfoFields_(networkProperties)]]"> <div class="settings-box single-column stretch">
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.js b/chrome/browser/resources/settings/internet_page/internet_detail_page.js index b8c3480..68663748 100644 --- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js +++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
@@ -630,7 +630,9 @@ this.showTetherDialog_(); return; } - + // Clear the error state when 'Connect' is clicked to force a connect + // attempt instead of showing the configuration UI. + this.networkProperties.ErrorState = ''; this.fire('network-connect', {networkProperties: this.networkProperties}); },
diff --git a/chrome/browser/resources/settings/internet_page/internet_page.js b/chrome/browser/resources/settings/internet_page/internet_page.js index 5aff075..ed1eda81 100644 --- a/chrome/browser/resources/settings/internet_page/internet_page.js +++ b/chrome/browser/resources/settings/internet_page/internet_page.js
@@ -272,23 +272,27 @@ */ onShowConfig_: function(event) { const properties = event.detail; + let configAndConnect = !properties.GUID; // New configuration this.showConfig_( - properties.Type, properties.GUID, CrOnc.getNetworkName(properties)); + configAndConnect, properties.Type, properties.GUID, + CrOnc.getNetworkName(properties)); }, /** + * @param {boolean} configAndConnect * @param {string} type * @param {string=} guid * @param {string=} name * @private */ - showConfig_: function(type, guid, name) { + showConfig_: function(configAndConnect, type, guid, name) { const configDialog = /** @type {!InternetConfigElement} */ (this.$.configDialog); configDialog.type = /** @type {chrome.networkingPrivate.NetworkType} */ (type); configDialog.guid = guid || ''; configDialog.name = name || ''; + configDialog.showConnect = configAndConnect; configDialog.open(); }, @@ -378,7 +382,7 @@ /** @private */ onAddWiFiTap_: function() { if (loadTimeData.getBoolean('networkSettingsConfig')) - this.showConfig_(CrOnc.Type.WI_FI); + this.showConfig_(true /* configAndConnect */, CrOnc.Type.WI_FI); else chrome.send('addNetwork', [CrOnc.Type.WI_FI]); }, @@ -386,7 +390,7 @@ /** @private */ onAddVPNTap_: function() { if (loadTimeData.getBoolean('networkSettingsConfig')) - this.showConfig_(CrOnc.Type.VPN); + this.showConfig_(true /* configAndConnect */, CrOnc.Type.VPN); else chrome.send('addNetwork', [CrOnc.Type.VPN]); }, @@ -600,7 +604,8 @@ } if (properties.Connectable === false || properties.ErrorState) { - this.showConfig_(properties.Type, properties.GUID, name); + this.showConfig_( + true /* configAndConnect */, properties.Type, properties.GUID, name); return; } @@ -614,7 +619,9 @@ console.error( 'networkingPrivate.startConnect error: ' + message + ' For: ' + properties.GUID); - this.showConfig_(properties.Type, properties.GUID, name); + this.showConfig_( + true /* configAndConnect */, properties.Type, properties.GUID, + name); } }); },
diff --git a/chrome/browser/resources/settings/internet_page/internet_subpage.html b/chrome/browser/resources/settings/internet_page/internet_subpage.html index ad9e3d4..4cf85de 100644 --- a/chrome/browser/resources/settings/internet_page/internet_subpage.html +++ b/chrome/browser/resources/settings/internet_page/internet_subpage.html
@@ -149,14 +149,11 @@ </template> <!-- Text shown if no networks exist. --> - <template is="dom-if" - if="[[!shouldShowNetworkList_(networkStateList_)]]"> - <div - inner-h-t-m-l= - "[[getNoNetworksString_(deviceState, tetherDeviceState)]]" - class="no-networks"> - </div> - </template> + <div hidden="[[shouldShowNetworkList_(networkStateList_)]]" + inner-h-t-m-l= + "[[getNoNetworksString_(deviceState, tetherDeviceState)]]" + class="no-networks"> + </div> <template is="dom-if" if="[[isEqual_('VPN', deviceState.Type)]]"> <!-- Third party VPNs. -->
diff --git a/chrome/browser/resources/settings/languages_page/edit_dictionary_page.html b/chrome/browser/resources/settings/languages_page/edit_dictionary_page.html index ce5c803d..fd7cf42f 100644 --- a/chrome/browser/resources/settings/languages_page/edit_dictionary_page.html +++ b/chrome/browser/resources/settings/languages_page/edit_dictionary_page.html
@@ -64,11 +64,10 @@ </template> </iron-list> </template> - <template is="dom-if" if="[[!hasWords_(words_.length)]]"> - <div id="noWordsLabel" class="list-item"> - $i18n{noCustomDictionaryWordsFound} - </div> - </template> + <div id="noWordsLabel" class="list-item" + hidden$="[[hasWords_(words_.length)]]"> + $i18n{noCustomDictionaryWordsFound} + </div> </div> </template> <script src="edit_dictionary_page.js"></script>
diff --git a/chrome/browser/resources/settings/passwords_and_forms_page/password_list_item.html b/chrome/browser/resources/settings/passwords_and_forms_page/password_list_item.html index 59f3d8a..7476e8f 100644 --- a/chrome/browser/resources/settings/passwords_and_forms_page/password_list_item.html +++ b/chrome/browser/resources/settings/passwords_and_forms_page/password_list_item.html
@@ -59,11 +59,10 @@ focus-row-control focus-type="showPassword"> </button> </template> - <template is="dom-if" if="[[item.entry.federationText]]"> - <span class="password-field text-elide" id="federated"> - [[item.entry.federationText]] - </span> - </template> + <span class="password-field text-elide" id="federated" + hidden$="[[!item.entry.federationText]]"> + [[item.entry.federationText]] + </span> </div> <button is="paper-icon-button-light" id="passwordMenu" class="icon-more-vert" on-click="onPasswordMenuTap_"
diff --git a/chrome/browser/resources/settings/people_page/user_list.html b/chrome/browser/resources/settings/people_page/user_list.html index 4ca878ee..f6fe26bb 100644 --- a/chrome/browser/resources/settings/people_page/user_list.html +++ b/chrome/browser/resources/settings/people_page/user_list.html
@@ -41,9 +41,10 @@ <img class="user-icon" src="[[getProfilePictureUrl_(item)]]"> <div class="flex layout vertical user-info no-min-width"> <div class="text-elide">[[getUserName_(item)]]</div> - <template is="dom-if" if="[[shouldShowEmail_(item)]]"> - <div class="secondary text-elide">[[item.displayEmail]]</div> - </template> + <div class="secondary text-elide" + hidden$="[[!shouldShowEmail_(item)]]"> + [[item.displayEmail]] + </div> </div> <button is="paper-icon-button-light" class="icon-clear" on-click="removeUser_"
diff --git a/chrome/browser/resources/settings/people_page/users_page.html b/chrome/browser/resources/settings/people_page/users_page.html index bd58da4..52376e68 100644 --- a/chrome/browser/resources/settings/people_page/users_page.html +++ b/chrome/browser/resources/settings/people_page/users_page.html
@@ -26,14 +26,14 @@ display: block; } </style> - <template is="dom-if" if="[[isWhitelistManaged_]]"> - <div class="settings-box">$i18n{settingsManagedLabel}</div> - </template> - <template is="dom-if" if="[[!isWhitelistManaged_]]"> - <template is="dom-if" if="[[!isOwner_]]"> - <div class="settings-box">$i18n{usersModifiedByOwnerLabel}</div> - </template> - </template> + <div class="settings-box" hidden$="[[!isWhitelistManaged_]]"> + $i18n{settingsManagedLabel} + </div> + <div class="settings-box" + hidden$="[[shouldHideModifiedByOwnerLabel_( + isWhitelistManaged_, isOwner_)]]"> + $i18n{usersModifiedByOwnerLabel} + </div> <settings-toggle-button class="first" pref="{{prefs.cros.accounts.allowBWSI}}" label="$i18n{guestBrowsingLabel}"
diff --git a/chrome/browser/resources/settings/people_page/users_page.js b/chrome/browser/resources/settings/people_page/users_page.js index 2d14833a0..f0d58476 100644 --- a/chrome/browser/resources/settings/people_page/users_page.js +++ b/chrome/browser/resources/settings/people_page/users_page.js
@@ -76,5 +76,10 @@ */ isEditingUsersDisabled_: function(isOwner, isWhitelistManaged, allowGuest) { return !isOwner || isWhitelistManaged || allowGuest; - } + }, + + /** @return {boolean} */ + shouldHideModifiedByOwnerLabel_: function() { + return this.isWhitelistManaged_ || this.isOwner_; + }, });
diff --git a/chrome/browser/signin/account_consistency_mode_manager.h b/chrome/browser/signin/account_consistency_mode_manager.h index 07c39ab4..918f41fa 100644 --- a/chrome/browser/signin/account_consistency_mode_manager.h +++ b/chrome/browser/signin/account_consistency_mode_manager.h
@@ -11,7 +11,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/prefs/pref_member.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" namespace user_prefs { class PrefRegistrySyncable;
diff --git a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc index 555d846..5835fb8 100644 --- a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc +++ b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc
@@ -16,7 +16,7 @@ #include "components/prefs/testing_pref_store.h" #include "components/signin/core/browser/profile_management_switches.h" #include "components/signin/core/browser/scoped_account_consistency.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_pref_names.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/common/content_features.h"
diff --git a/chrome/browser/signin/account_reconcilor_factory.cc b/chrome/browser/signin/account_reconcilor_factory.cc index b0d640c..ead4a503e 100644 --- a/chrome/browser/signin/account_reconcilor_factory.cc +++ b/chrome/browser/signin/account_reconcilor_factory.cc
@@ -19,7 +19,7 @@ #include "components/signin/core/browser/account_reconcilor_delegate.h" #include "components/signin/core/browser/mirror_account_reconcilor_delegate.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #if defined(OS_CHROMEOS) #include "base/time/time.h"
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc index 28b6350..75726971 100644 --- a/chrome/browser/signin/chrome_signin_client.cc +++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -40,8 +40,8 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_management_switches.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_cookie_change_subscription.h" -#include "components/signin/core/browser/signin_features.h" #include "components/signin/core/browser/signin_header_helper.h" #include "components/signin/core/browser/signin_pref_names.h" #include "components/signin/core/browser/signin_switches.h"
diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc index 2ad9dbd..791ae50 100644 --- a/chrome/browser/signin/chrome_signin_helper.cc +++ b/chrome/browser/signin/chrome_signin_helper.cc
@@ -37,7 +37,7 @@ #include "components/signin/core/browser/account_reconcilor.h" #include "components/signin/core/browser/chrome_connected_header_helper.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_header_helper.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_request_info.h"
diff --git a/chrome/browser/signin/chrome_signin_helper_unittest.cc b/chrome/browser/signin/chrome_signin_helper_unittest.cc index 1f498e0..9963aab0 100644 --- a/chrome/browser/signin/chrome_signin_helper_unittest.cc +++ b/chrome/browser/signin/chrome_signin_helper_unittest.cc
@@ -11,7 +11,7 @@ #include "base/strings/stringprintf.h" #include "components/signin/core/browser/profile_management_switches.h" #include "components/signin/core/browser/scoped_account_consistency.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "content/public/browser/resource_request_info.h" #include "content/public/test/test_browser_thread_bundle.h" #include "net/http/http_response_headers.h"
diff --git a/chrome/browser/signin/easy_unlock_app_manager.cc b/chrome/browser/signin/easy_unlock_app_manager.cc index 22c69631..4f68217 100644 --- a/chrome/browser/signin/easy_unlock_app_manager.cc +++ b/chrome/browser/signin/easy_unlock_app_manager.cc
@@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/location.h" #include "base/macros.h" +#include "base/sys_info.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h" #include "chrome/browser/extensions/component_loader.h" @@ -23,10 +24,6 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/one_shot_event.h" -#if defined(OS_CHROMEOS) -#include "base/sys_info.h" -#endif - namespace { class EasyUnlockAppManagerImpl : public EasyUnlockAppManager { @@ -101,14 +98,12 @@ if (!extension_service) return; -#if defined(OS_CHROMEOS) // TODO(xiyuan): Remove this when the app is bundled with chrome. if (!base::SysInfo::IsRunningOnChromeOS() && !base::CommandLine::ForCurrentProcess()->HasSwitch( proximity_auth::switches::kForceLoadEasyUnlockAppInTests)) { return; } -#endif if (app_path_.empty()) return; @@ -184,15 +179,11 @@ return false; // TODO(tbarzic): Restrict this to EasyUnlock app. -#if defined(OS_CHROMEOS) extensions::ScreenlockPrivateEventRouter* screenlock_router = extensions::ScreenlockPrivateEventRouter::GetFactoryInstance()->Get( extension_service->profile()); return screenlock_router->OnAuthAttempted( proximity_auth::mojom::AuthType::USER_CLICK, std::string()); -#else - return false; -#endif // defined(OS_CHROMEOS) } } // namespace
diff --git a/chrome/browser/signin/easy_unlock_app_manager_unittest.cc b/chrome/browser/signin/easy_unlock_app_manager_unittest.cc index 31c80c8..5134c93 100644 --- a/chrome/browser/signin/easy_unlock_app_manager_unittest.cc +++ b/chrome/browser/signin/easy_unlock_app_manager_unittest.cc
@@ -15,6 +15,9 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "build/build_config.h" +#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/chromeos/settings/device_settings_service.h" #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h" @@ -36,12 +39,6 @@ #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" -#include "chrome/browser/chromeos/settings/cros_settings.h" -#include "chrome/browser/chromeos/settings/device_settings_service.h" -#endif - namespace easy_unlock_private_api = extensions::api::easy_unlock_private; namespace screenlock_private_api = extensions::api::screenlock_private; namespace app_runtime_api = extensions::api::app_runtime; @@ -282,13 +279,11 @@ // Needed by extension system. content::TestBrowserThreadBundle thread_bundle_; -#if defined(OS_CHROMEOS) // Cros settings and device settings are needed when creating user manager. chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; chromeos::ScopedTestCrosSettings test_cros_settings_; // Needed for creating ExtensionService. chromeos::ScopedTestUserManager test_user_manager_; -#endif TestingProfile profile_;
diff --git a/chrome/browser/signin/easy_unlock_auth_attempt.cc b/chrome/browser/signin/easy_unlock_auth_attempt.cc index ab68fbe..b485fc59 100644 --- a/chrome/browser/signin/easy_unlock_auth_attempt.cc +++ b/chrome/browser/signin/easy_unlock_auth_attempt.cc
@@ -8,16 +8,13 @@ #include "base/command_line.h" #include "base/logging.h" #include "build/build_config.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" #include "chrome/browser/signin/easy_unlock_app_manager.h" #include "components/proximity_auth/screenlock_bridge.h" #include "components/proximity_auth/switches.h" #include "crypto/encryptor.h" #include "crypto/symmetric_key.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" -#endif - namespace { // Decrypts the secret that should be used to login from |wrapped_secret| using @@ -174,11 +171,7 @@ } std::string unwrapped_secret = UnwrapSecret(wrapped_secret, raw_session_key); - - std::string key_label; -#if defined(OS_CHROMEOS) - key_label = chromeos::EasyUnlockKeyManager::GetKeyLabel(0u); -#endif // defined(OS_CHROMEOS) + std::string key_label = chromeos::EasyUnlockKeyManager::GetKeyLabel(0u); const bool kSuccess = true; finalized_callback_.Run(type_, kSuccess, account_id, unwrapped_secret,
diff --git a/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc b/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc index 4da7bbbe..f719eede 100644 --- a/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc +++ b/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
@@ -9,27 +9,22 @@ #include "base/command_line.h" #include "base/macros.h" #include "build/build_config.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" #include "chrome/browser/signin/easy_unlock_app_manager.h" #include "components/proximity_auth/screenlock_bridge.h" #include "components/proximity_auth/switches.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" -#endif - namespace { // Fake user ids used in tests. const char kTestUser1[] = "user1"; const char kTestUser2[] = "user2"; -#if defined(OS_CHROMEOS) const unsigned char kSecret[] = { 0x7c, 0x85, 0x82, 0x7d, 0x00, 0x1f, 0x6a, 0x29, 0x2f, 0xc4, 0xb5, 0x60, 0x08, 0x9b, 0xb0, 0x5b }; -#endif const unsigned char kSessionKey[] = { 0xc3, 0xd9, 0x83, 0x16, 0x52, 0xde, 0x99, 0xd7, 0x4e, 0x60, 0xf9, 0xec, @@ -42,12 +37,10 @@ 0xfc, 0x40, 0x1f, 0xeb, 0x75, 0x64, 0x52, 0xd8 }; -#if defined(OS_CHROMEOS) std::string GetSecret() { return std::string(reinterpret_cast<const char*>(kSecret), arraysize(kSecret)); } -#endif std::string GetWrappedSecret() { return std::string(reinterpret_cast<const char*>(kWrappedSecret), @@ -186,7 +179,6 @@ void AttemptEasySignin(const AccountId& account_id, const std::string& secret, const std::string& key_label) override { -#if defined(OS_CHROMEOS) ASSERT_TRUE(account_id_ == account_id) << "account_id_=" << account_id_.Serialize() << " != " << account_id.Serialize(); @@ -199,9 +191,6 @@ ASSERT_EQ(chromeos::EasyUnlockKeyManager::GetKeyLabel(0u), key_label); state_ = STATE_SIGNIN_DONE; } -#else // if !defined(OS_CHROMEOS) - ADD_FAILURE() << "Should not be reached."; -#endif } private: @@ -372,7 +361,6 @@ ASSERT_EQ(TestLockHandler::STATE_UNLOCK_DONE, lock_handler_->state()); } -#if defined(OS_CHROMEOS) class EasyUnlockAuthAttemptSigninTest : public testing::Test { public: EasyUnlockAuthAttemptSigninTest() {} @@ -578,6 +566,5 @@ EXPECT_EQ(TestLockHandler::STATE_SIGNIN_DONE, lock_handler_->state()); } -#endif // defined(OS_CHROMEOS) } // namespace
diff --git a/chrome/browser/signin/easy_unlock_notification_controller.cc b/chrome/browser/signin/easy_unlock_notification_controller.cc index 416b3ca..babbf33 100644 --- a/chrome/browser/signin/easy_unlock_notification_controller.cc +++ b/chrome/browser/signin/easy_unlock_notification_controller.cc
@@ -6,39 +6,9 @@ #include "base/memory/ptr_util.h" #include "build/build_config.h" - -#if defined(OS_CHROMEOS) #include "chrome/browser/signin/easy_unlock_notification_controller_chromeos.h" -#endif - -namespace { - -// Stub implementation of EasyUnlockNotificationController for non-ChromeOS -// platforms. -class EasyUnlockNotificationControllerStub - : public EasyUnlockNotificationController { - public: - EasyUnlockNotificationControllerStub() {} - ~EasyUnlockNotificationControllerStub() override {} - - // EasyUnlockNotificationController: - void ShowChromebookAddedNotification() override {} - void ShowPairingChangeNotification() override {} - void ShowPairingChangeAppliedNotification( - const std::string& phone_name) override {} - void ShowPromotionNotification() override {} - - private: - DISALLOW_COPY_AND_ASSIGN(EasyUnlockNotificationControllerStub); -}; - -} // namespace std::unique_ptr<EasyUnlockNotificationController> EasyUnlockNotificationController::Create(Profile* profile) { -#if defined(OS_CHROMEOS) return std::make_unique<EasyUnlockNotificationControllerChromeOS>(profile); -#else - return std::make_unique<EasyUnlockNotificationControllerStub>(); -#endif }
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc index 6d9c35c..9f8e2aa 100644 --- a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc +++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
@@ -13,10 +13,7 @@ #include "chrome/browser/signin/easy_unlock_metrics.h" #include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" - -#if defined(OS_CHROMEOS) #include "ui/chromeos/devicetype_utils.h" -#endif using proximity_auth::ScreenlockState; @@ -360,12 +357,7 @@ } base::string16 EasyUnlockScreenlockStateHandler::GetDeviceName() { -#if defined(OS_CHROMEOS) return ui::GetChromeOSDeviceName(); -#else - // TODO(tbarzic): Figure out the name for non Chrome OS case. - return base::ASCIIToUTF16("Chrome"); -#endif } void EasyUnlockScreenlockStateHandler::UpdateScreenlockAuthType() {
diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc index 34eedb5..e0849e9 100644 --- a/chrome/browser/signin/easy_unlock_service.cc +++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -22,6 +22,12 @@ #include "base/version.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" +#include "chrome/browser/chromeos/login/easy_unlock/secure_message_delegate_chromeos.h" +#include "chrome/browser/chromeos/login/session/user_session_manager.h" +#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/chrome_proximity_auth_client.h" #include "chrome/browser/signin/easy_unlock_app_manager.h" @@ -32,6 +38,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" +#include "chromeos/dbus/dbus_thread_manager.h" +#include "chromeos/dbus/power_manager_client.h" +#include "chromeos/login/auth/user_context.h" #include "components/cryptauth/cryptauth_client_impl.h" #include "components/cryptauth/cryptauth_device_manager.h" #include "components/cryptauth/cryptauth_enrollment_manager.h" @@ -46,6 +55,8 @@ #include "components/proximity_auth/proximity_auth_system.h" #include "components/proximity_auth/screenlock_bridge.h" #include "components/proximity_auth/switches.h" +#include "components/session_manager/core/session_manager.h" +#include "components/signin/core/account_id/account_id.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/user_manager/user.h" @@ -53,20 +64,6 @@ #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_adapter_factory.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h" -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" -#include "chrome/browser/chromeos/login/easy_unlock/secure_message_delegate_chromeos.h" -#include "chrome/browser/chromeos/login/session/user_session_manager.h" -#include "chrome/browser/chromeos/profiles/profile_helper.h" -#include "chromeos/dbus/dbus_thread_manager.h" -#include "chromeos/dbus/power_manager_client.h" -#include "chromeos/login/auth/user_context.h" -#include "components/session_manager/core/session_manager.h" -#include "components/signin/core/account_id/account_id.h" -#endif - using proximity_auth::ScreenlockState; namespace { @@ -85,14 +82,10 @@ // static EasyUnlockService* EasyUnlockService::GetForUser( const user_manager::User& user) { -#if defined(OS_CHROMEOS) Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(&user); if (!profile) return NULL; return EasyUnlockService::Get(profile); -#else - return NULL; -#endif } class EasyUnlockService::BluetoothDetector @@ -172,7 +165,6 @@ DISALLOW_COPY_AND_ASSIGN(BluetoothDetector); }; -#if defined(OS_CHROMEOS) class EasyUnlockService::PowerMonitor : public chromeos::PowerManagerClient::Observer { public: @@ -234,7 +226,6 @@ DISALLOW_COPY_AND_ASSIGN(PowerMonitor); }; -#endif EasyUnlockService::EasyUnlockService(Profile* profile) : profile_(profile), @@ -261,10 +252,8 @@ void EasyUnlockService::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterStringPref(prefs::kEasyUnlockDeviceId, std::string()); registry->RegisterDictionaryPref(prefs::kEasyUnlockHardlockState); -#if defined(OS_CHROMEOS) EasyUnlockTpmKeyManager::RegisterLocalStatePrefs(registry); proximity_auth::ProximityAuthLocalStatePrefManager::RegisterPrefs(registry); -#endif } // static @@ -278,9 +267,7 @@ DictionaryPrefUpdate update(local_state, prefs::kEasyUnlockHardlockState); update->RemoveWithoutPathExpansion(account_id.GetUserEmail(), NULL); -#if defined(OS_CHROMEOS) EasyUnlockTpmKeyManager::ResetLocalStateForUser(account_id); -#endif } // static @@ -318,15 +305,10 @@ if (!IsAllowedInternal()) return false; -#if defined(OS_CHROMEOS) if (!bluetooth_detector_->IsPresent()) return false; return true; -#else - // TODO(xiyuan): Revisit when non-chromeos platforms are supported. - return false; -#endif } bool EasyUnlockService::IsEnabled() const { @@ -406,10 +388,8 @@ handler->ChangeState(state); if (state == ScreenlockState::AUTHENTICATED) { -#if defined(OS_CHROMEOS) if (power_monitor_) power_monitor_->RecordStartUpTime(); -#endif } else if (auth_attempt_.get()) { // Clean up existing auth attempt if we can no longer authenticate the // remote device. @@ -515,7 +495,6 @@ } void EasyUnlockService::CheckCryptohomeKeysAndMaybeHardlock() { -#if defined(OS_CHROMEOS) const AccountId& account_id = GetAccountId(); if (!account_id.is_valid() || !IsChromeOSLoginEnabled()) return; @@ -548,7 +527,6 @@ chromeos::UserContext(account_id), base::Bind(&EasyUnlockService::OnCryptohomeKeysFetchedForChecking, weak_ptr_factory_.GetWeakPtr(), account_id, paired_devices)); -#endif } void EasyUnlockService::SetTrialRun() { @@ -582,9 +560,7 @@ ResetScreenlockState(); bluetooth_detector_.reset(); proximity_auth_system_.reset(); -#if defined(OS_CHROMEOS) power_monitor_.reset(); -#endif weak_ptr_factory_.InvalidateWeakPtrs(); } @@ -605,28 +581,25 @@ if (proximity_auth_system_) proximity_auth_system_->Start(); -#if defined(OS_CHROMEOS) if (!power_monitor_) power_monitor_.reset(new PowerMonitor(this)); -#endif } else { bool bluetooth_waking_up = false; -#if defined(OS_CHROMEOS) + // If the service is not allowed due to bluetooth not being detected just // after system suspend is done, give bluetooth more time to be detected // before disabling the app (and resetting screenlock state). bluetooth_waking_up = power_monitor_.get() && power_monitor_->waking_up() && !bluetooth_detector_->IsPresent(); -#endif if (!bluetooth_waking_up) { app_manager_->DisableAppIfLoaded(); + if (proximity_auth_system_) proximity_auth_system_->Stop(); -#if defined(OS_CHROMEOS) + power_monitor_.reset(); -#endif } } } @@ -672,15 +645,7 @@ InitializeInternal(); -#if defined(OS_CHROMEOS) - // Only start Bluetooth detection for ChromeOS since the feature is - // only offered on ChromeOS. Enabling this on non-ChromeOS platforms - // previously introduced a performance regression: http://crbug.com/404482 - // Make sure not to reintroduce a performance regression if re-enabling on - // additional platforms. - // TODO(xiyuan): Revisit when non-chromeos platforms are supported. bluetooth_detector_->Initialize(); -#endif // defined(OS_CHROMEOS) } void EasyUnlockService::OnBluetoothAdapterPresentChanged() { @@ -793,7 +758,6 @@ proximity_auth_system_->Start(); } -#if defined(OS_CHROMEOS) void EasyUnlockService::OnCryptohomeKeysFetchedForChecking( const AccountId& account_id, const std::set<std::string> paired_devices, @@ -822,7 +786,6 @@ void EasyUnlockService::HandleUserReauth( const chromeos::UserContext& user_context) {} -#endif void EasyUnlockService::PrepareForSuspend() { app_manager_->DisableAppIfLoaded(); @@ -843,7 +806,6 @@ return; } -#if defined(OS_CHROMEOS) // If this is called before the session is started, the chances are Chrome // is restarting in order to apply user flags. Don't check TPM keys in this // case. @@ -856,7 +818,6 @@ EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_) ->PrepareTpmKey(true /* check_private_key */, base::Closure()); -#endif // defined(OS_CHROMEOS) tpm_key_checked_ = true; }
diff --git a/chrome/browser/signin/easy_unlock_service.h b/chrome/browser/signin/easy_unlock_service.h index 76d747d..e72d32cb 100644 --- a/chrome/browser/signin/easy_unlock_service.h +++ b/chrome/browser/signin/easy_unlock_service.h
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "build/build_config.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h" #include "chrome/browser/signin/chrome_proximity_auth_client.h" #include "chrome/browser/signin/easy_unlock_auth_attempt.h" #include "chrome/browser/signin/easy_unlock_metrics.h" @@ -22,10 +23,6 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/proximity_auth/screenlock_state.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h" -#endif - class AccountId; namespace base { @@ -33,11 +30,9 @@ class ListValue; } -#if defined(OS_CHROMEOS) namespace chromeos { class UserContext; } -#endif namespace user_manager { class User; @@ -217,11 +212,9 @@ // initiated by the Easy Unlock app. void RecordClickOnLockIcon(); -#if defined(OS_CHROMEOS) // Called when the user reauths (e.g. in chrome://settings) so we can cache // the user context for the setup flow. virtual void HandleUserReauth(const chromeos::UserContext& user_context); -#endif void AddObserver(EasyUnlockServiceObserver* observer); void RemoveObserver(EasyUnlockServiceObserver* observer); @@ -325,14 +318,12 @@ // Unlock gets disabled. EasyUnlockScreenlockStateHandler* GetScreenlockStateHandler(); -#if defined(OS_CHROMEOS) // Callback for get key operation from CheckCryptohomeKeysAndMaybeHardlock. void OnCryptohomeKeysFetchedForChecking( const AccountId& account_id, const std::set<std::string> paired_devices, bool success, const chromeos::EasyUnlockDeviceKeyDataList& key_data_list); -#endif // Updates the service to state for handling system suspend. void PrepareForSuspend(); @@ -366,11 +357,9 @@ // app in favor of |proximity_auth_system_|. std::unique_ptr<proximity_auth::ProximityAuthSystem> proximity_auth_system_; -#if defined(OS_CHROMEOS) // Monitors suspend and wake state of ChromeOS. class PowerMonitor; std::unique_ptr<PowerMonitor> power_monitor_; -#endif // Whether the service has been shut down. bool shut_down_;
diff --git a/chrome/browser/signin/easy_unlock_service_factory.cc b/chrome/browser/signin/easy_unlock_service_factory.cc index 5e54ddd..4916f4a 100644 --- a/chrome/browser/signin/easy_unlock_service_factory.cc +++ b/chrome/browser/signin/easy_unlock_service_factory.cc
@@ -7,12 +7,15 @@ #include "base/command_line.h" #include "base/memory/singleton.h" #include "build/build_config.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" +#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/cryptauth/chrome_cryptauth_service_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/easy_unlock_app_manager.h" #include "chrome/browser/signin/easy_unlock_service.h" #include "chrome/browser/signin/easy_unlock_service_regular.h" +#include "chrome/browser/signin/easy_unlock_service_signin_chromeos.h" #include "chrome/common/chrome_switches.h" #include "chrome/grit/browser_resources.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" @@ -21,12 +24,6 @@ #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h" -#include "chrome/browser/chromeos/profiles/profile_helper.h" -#include "chrome/browser/signin/easy_unlock_service_signin_chromeos.h" -#endif - namespace { // Gets the file path from which easy unlock app should be loaded. @@ -40,9 +37,7 @@ return command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath); #endif // !defined(NDEBUG) -#if defined(OS_CHROMEOS) return base::FilePath("/usr/share/chromeos-assets/easy_unlock"); -#endif // defined(OS_CHROMEOS) #endif // defined(GOOGLE_CHROME_BUILD) return base::FilePath(); @@ -70,9 +65,7 @@ DependsOn(ChromeCryptAuthServiceFactory::GetInstance()); DependsOn( extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); -#if defined(OS_CHROMEOS) DependsOn(EasyUnlockTpmKeyManagerFactory::GetInstance()); -#endif } EasyUnlockServiceFactory::~EasyUnlockServiceFactory() { @@ -83,7 +76,6 @@ EasyUnlockService* service = NULL; int manifest_id = 0; -#if defined(OS_CHROMEOS) if (chromeos::ProfileHelper::IsLockScreenAppProfile( Profile::FromBrowserContext(context))) { return nullptr; @@ -96,7 +88,6 @@ service = new EasyUnlockServiceSignin(Profile::FromBrowserContext(context)); manifest_id = IDR_EASY_UNLOCK_MANIFEST_SIGNIN; } -#endif if (!service) { service = @@ -110,6 +101,7 @@ service->Initialize(EasyUnlockAppManager::Create( extensions::ExtensionSystem::Get(context), manifest_id, app_path)); + return service; } @@ -122,12 +114,11 @@ content::BrowserContext* EasyUnlockServiceFactory::GetBrowserContextToUse( content::BrowserContext* context) const { -#if defined(OS_CHROMEOS) if (chromeos::ProfileHelper::IsSigninProfile( Profile::FromBrowserContext(context))) { return chrome::GetBrowserContextOwnInstanceInIncognito(context); } -#endif + return chrome::GetBrowserContextRedirectedInIncognito(context); }
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc index 5dd1d1b..100b38d 100644 --- a/chrome/browser/signin/easy_unlock_service_regular.cc +++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -8,17 +8,24 @@ #include <utility> +#include "apps/app_lifetime_monitor_factory.h" #include "base/base64url.h" #include "base/bind.h" #include "base/command_line.h" #include "base/json/json_string_value_serializer.h" +#include "base/linux_util.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/sys_info.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/time/default_clock.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" +#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h" +#include "chrome/browser/chromeos/login/session/user_session_manager.h" +#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/cryptauth/chrome_cryptauth_service_factory.h" #include "chrome/browser/gcm/gcm_profile_service_factory.h" #include "chrome/browser/profiles/profile.h" @@ -52,25 +59,15 @@ #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/translate/core/browser/translate_download_manager.h" +#include "components/user_manager/user_manager.h" #include "components/version_info/version_info.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "extensions/browser/event_router.h" #include "extensions/common/constants.h" #include "google_apis/gaia/gaia_auth_util.h" - -#if defined(OS_CHROMEOS) -#include "apps/app_lifetime_monitor_factory.h" -#include "base/linux_util.h" -#include "base/threading/thread_task_runner_handle.h" -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" -#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h" -#include "chrome/browser/chromeos/login/session/user_session_manager.h" -#include "chrome/browser/chromeos/profiles/profile_helper.h" -#include "components/user_manager/user_manager.h" #include "ui/display/manager/display_manager.h" #include "ui/display/manager/managed_display_info.h" -#endif namespace { @@ -138,7 +135,6 @@ const cryptauth::RemoteDeviceList& remote_devices) { SetProximityAuthDevices(GetAccountId(), remote_devices); -#if defined(OS_CHROMEOS) // We need to store a copy of |remote devices_| in the TPM, so it can be // retrieved on the sign-in screen when a user session has not been started // yet. @@ -181,11 +177,9 @@ // TODO(tengs): Rename this function after the easy_unlock app is replaced. SetRemoteDevices(*device_list); -#endif } bool EasyUnlockServiceRegular::ShouldPromote() { -#if defined(OS_CHROMEOS) if (base::CommandLine::ForCurrentProcess()->HasSwitch( proximity_auth::switches::kDisableBluetoothLowEnergyDiscovery) || !base::FeatureList::IsEnabled(features::kEasyUnlockPromotions)) { @@ -197,9 +191,6 @@ } return true; -#else - return false; -#endif } void EasyUnlockServiceRegular::StartPromotionManager() { @@ -246,7 +237,6 @@ void EasyUnlockServiceRegular::LaunchSetup() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -#if defined(OS_CHROMEOS) // TODO(tengs): To keep login working for existing EasyUnlock users, we need // to explicitly disable login here for new users who set up EasyUnlock. // After a sufficient number of releases, we should make the default value @@ -265,12 +255,8 @@ if (!reauth_success) OpenSetupApp(); } -#else - OpenSetupApp(); -#endif } -#if defined(OS_CHROMEOS) void EasyUnlockServiceRegular::HandleUserReauth( const chromeos::UserContext& user_context) { // Cache the user context for the next X minutes, so the user doesn't have to @@ -312,7 +298,6 @@ // cryptohome keys against the keys in local preferences as a sanity check. CheckCryptohomeKeysAndMaybeHardlock(); } -#endif const base::DictionaryValue* EasyUnlockServiceRegular::GetPermitAccess() const { const base::DictionaryValue* pairing_dict = @@ -493,7 +478,6 @@ pref_manager_.reset(new proximity_auth::ProximityAuthProfilePrefManager( profile()->GetPrefs())); -#if defined(OS_CHROMEOS) // TODO(tengs): Due to badly configured browser_tests, Chrome crashes during // shutdown. Revisit this condition after migration is fully completed. if (!base::CommandLine::ForCurrentProcess()->HasSwitch( @@ -515,13 +499,10 @@ proximity_auth::prefs::kProximityAuthIsChromeOSLoginEnabled, base::Bind(&EasyUnlockServiceRegular::RefreshCryptohomeKeysIfPossible, weak_ptr_factory_.GetWeakPtr())); -#endif } void EasyUnlockServiceRegular::ShutdownInternal() { -#if defined(OS_CHROMEOS) short_lived_user_context_.reset(); -#endif turn_off_flow_status_ = EasyUnlockService::IDLE; proximity_auth::ScreenlockBridge::Get()->RemoveObserver(this); @@ -530,7 +511,6 @@ } bool EasyUnlockServiceRegular::IsAllowedInternal() const { -#if defined(OS_CHROMEOS) user_manager::UserManager* user_manager = user_manager::UserManager::Get(); if (!user_manager->IsLoggedInAsUserWithGaiaAccount()) return false; @@ -548,14 +528,9 @@ return false; return true; -#else - // TODO(xiyuan): Revisit when non-chromeos platforms are supported. - return false; -#endif } bool EasyUnlockServiceRegular::IsEnabled() const { -#if defined(OS_CHROMEOS) if (base::CommandLine::ForCurrentProcess()->HasSwitch( proximity_auth::switches::kDisableBluetoothLowEnergyDiscovery)) { // The feature is enabled iff there are any paired devices set by the @@ -565,9 +540,6 @@ } return pref_manager_ && pref_manager_->IsEasyUnlockEnabled(); -#else - return false; -#endif } bool EasyUnlockServiceRegular::IsChromeOSLoginEnabled() const { @@ -616,12 +588,9 @@ // changes an existing key. // Note: We do not show a notification when EasyUnlock is disabled by sync nor // if EasyUnlock was enabled through the setup app. -#if defined(OS_CHROMEOS) bool is_setup_fresh = short_lived_user_context_ && short_lived_user_context_->user_context(); -#else - bool is_setup_fresh = true; -#endif + if (public_keys_after_sync.size() > 0 && !is_setup_fresh) { if (public_keys_before_sync.size() == 0) { notification_controller_->ShowChromebookAddedNotification(); @@ -759,7 +728,6 @@ } void EasyUnlockServiceRegular::RefreshCryptohomeKeysIfPossible() { -#if defined(OS_CHROMEOS) // If the user reauthed on the settings page, then the UserContext will be // cached. if (short_lived_user_context_ && short_lived_user_context_->user_context()) { @@ -781,7 +749,4 @@ } else { CheckCryptohomeKeysAndMaybeHardlock(); } -#else - CheckCryptohomeKeysAndMaybeHardlock(); -#endif }
diff --git a/chrome/browser/signin/easy_unlock_service_regular.h b/chrome/browser/signin/easy_unlock_service_regular.h index e3213eae..b43492b 100644 --- a/chrome/browser/signin/easy_unlock_service_regular.h +++ b/chrome/browser/signin/easy_unlock_service_regular.h
@@ -12,15 +12,12 @@ #include "base/macros.h" #include "base/time/time.h" #include "build/build_config.h" +#include "chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h" #include "chrome/browser/signin/easy_unlock_service.h" #include "components/cryptauth/cryptauth_device_manager.h" #include "components/prefs/pref_change_registrar.h" #include "components/proximity_auth/screenlock_bridge.h" -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h" -#endif - namespace base { class DictionaryValue; class ListValue; @@ -104,9 +101,7 @@ bool IsChromeOSLoginEnabled() const override; void OnWillFinalizeUnlock(bool success) override; void OnSuspendDoneInternal() override; -#if defined(OS_CHROMEOS) void HandleUserReauth(const chromeos::UserContext& user_context) override; -#endif // CryptAuthDeviceManager::Observer: void OnSyncStarted() override; @@ -131,7 +126,6 @@ const cryptauth::ToggleEasyUnlockResponse& response); void OnToggleEasyUnlockApiFailed(const std::string& error_message); -#if defined(OS_CHROMEOS) // Called with the user's credentials (e.g. username and password) after the // user reauthenticates to begin setup. void OpenSetupAppAfterReauth(const chromeos::UserContext& user_context); @@ -143,7 +137,6 @@ bool success); std::unique_ptr<chromeos::ShortLivedUserContext> short_lived_user_context_; -#endif // Updates local state with the preference from the user's profile, so they // can be accessed on the sign-in screen.
diff --git a/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc b/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc index 8164c6a..82db7e4 100644 --- a/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc +++ b/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc
@@ -22,8 +22,8 @@ #include "components/signin/core/browser/profile_management_switches.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/scoped_account_consistency.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_error_controller.h" -#include "components/signin/core/browser/signin_features.h" #include "components/signin/core/browser/signin_pref_names.h" #include "components/signin/core/browser/test_signin_client.h" #include "components/signin/core/browser/webdata/token_web_data.h"
diff --git a/chrome/browser/signin/signin_ui_util.h b/chrome/browser/signin/signin_ui_util.h index d90127d..fdc4b6f8 100644 --- a/chrome/browser/signin/signin_ui_util.h +++ b/chrome/browser/signin/signin_ui_util.h
@@ -11,7 +11,7 @@ #include "base/strings/string16.h" #include "build/buildflag.h" #include "components/signin/core/browser/account_info.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_metrics.h" class Profile;
diff --git a/chrome/browser/signin/unified_consent_helper.cc b/chrome/browser/signin/unified_consent_helper.cc index d4e55a7..350dc3c 100644 --- a/chrome/browser/signin/unified_consent_helper.cc +++ b/chrome/browser/signin/unified_consent_helper.cc
@@ -8,7 +8,7 @@ #include "build/buildflag.h" #include "chrome/browser/signin/account_consistency_mode_manager.h" #include "chrome/common/chrome_features.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" bool IsUnifiedConsentEnabled(Profile* profile) { #if BUILDFLAG(ENABLE_DICE_SUPPORT)
diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc index 28b271d..d209a66 100644 --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc
@@ -4,42 +4,23 @@ #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" -#include <memory> -#include <set> #include <string> -#include <utility> -#include <vector> #include "base/bind.h" #include "base/macros.h" -#include "base/memory/ptr_util.h" -#include "base/strings/utf_string_conversions.h" -#include "base/synchronization/lock.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" -#include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" -#include "chrome/common/url_constants.h" #include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" -#include "content/public/browser/render_view_host.h" -#include "content/public/browser/resource_context.h" #include "content/public/browser/speech_recognition_manager.h" -#include "content/public/browser/speech_recognition_session_config.h" #include "content/public/browser/speech_recognition_session_context.h" #include "content/public/browser/web_contents.h" -#include "content/public/browser/web_contents_observer.h" #include "content/public/common/speech_recognition_error.h" #include "content/public/common/speech_recognition_result.h" -#include "extensions/features/features.h" -#include "net/url_request/url_request_context_getter.h" - -#if defined(OS_WIN) -#include "chrome/installer/util/wmi.h" -#endif #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/extensions/extension_service.h" @@ -52,155 +33,6 @@ namespace speech { -namespace { - -void TabClosedCallbackOnIOThread(int render_process_id, int render_view_id) { - DCHECK_CURRENTLY_ON(BrowserThread::IO); - - SpeechRecognitionManager* manager = SpeechRecognitionManager::GetInstance(); - // |manager| becomes NULL if a browser shutdown happens between the post of - // this task (from the UI thread) and this call (on the IO thread). In this - // case we just return. - if (!manager) - return; - - manager->AbortAllSessionsForRenderView(render_process_id, render_view_id); -} - -} // namespace - -// Simple utility to get notified when a WebContent (a tab or an extension's -// background page) is closed or crashes. The callback will always be called on -// the UI thread. -class ChromeSpeechRecognitionManagerDelegate::TabWatcher - : public base::RefCountedThreadSafe<TabWatcher> { - public: - typedef base::Callback<void(int render_process_id, int render_view_id)> - TabClosedCallback; - - explicit TabWatcher(TabClosedCallback tab_closed_callback) - : tab_closed_callback_(tab_closed_callback) { - } - - // Starts monitoring the WebContents corresponding to the given - // |render_process_id|, |render_view_id| pair, invoking |tab_closed_callback_| - // if closed/unloaded. - void Watch(int render_process_id, int render_view_id) { - if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { - BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind( - &TabWatcher::Watch, this, render_process_id, render_view_id)); - return; - } - - WebContents* web_contents = tab_util::GetWebContentsByID(render_process_id, - render_view_id); - // Sessions initiated by speech input extension APIs will end up in a NULL - // WebContent here, but they are properly managed by the - // chrome::SpeechInputExtensionManager. However, sessions initiated within a - // extension using the (new) speech JS APIs, will be properly handled here. - // TODO(primiano) turn this line into a DCHECK once speech input extension - // API is deprecated. - if (!web_contents) - return; - - // Avoid multiple registrations for the same |web_contents|. - if (FindWebContents(web_contents) != registered_web_contents_.end()) - return; - - registered_web_contents_.push_back(std::make_unique<WebContentsTracker>( - web_contents, - base::Bind(&TabWatcher::OnTabClosed, - // |this| outlives WebContentsTracker. - base::Unretained(this), web_contents), - render_process_id, render_view_id)); - } - - void OnTabClosed(content::WebContents* web_contents) { - auto iter = FindWebContents(web_contents); - DCHECK(iter != registered_web_contents_.end()); - int render_process_id = (*iter)->render_process_id(); - int render_view_id = (*iter)->render_view_id(); - registered_web_contents_.erase(iter); - - tab_closed_callback_.Run(render_process_id, render_view_id); - } - - private: - class WebContentsTracker : public content::WebContentsObserver { - public: - WebContentsTracker(content::WebContents* web_contents, - const base::Closure& finished_callback, - int render_process_id, - int render_view_id) - : content::WebContentsObserver(web_contents), - web_contents_(web_contents), - finished_callback_(finished_callback), - render_process_id_(render_process_id), - render_view_id_(render_view_id) {} - - ~WebContentsTracker() override {} - - int render_process_id() const { return render_process_id_; } - int render_view_id() const { return render_view_id_; } - const content::WebContents* GetWebContents() const { return web_contents_; } - - private: - // content::WebContentsObserver overrides. - void WebContentsDestroyed() override { - Observe(nullptr); - finished_callback_.Run(); - // NOTE: We are deleted now. - } - void RenderViewHostChanged(content::RenderViewHost* old_host, - content::RenderViewHost* new_host) override { - Observe(nullptr); - finished_callback_.Run(); - // NOTE: We are deleted now. - } - - // Raw pointer to our WebContents. - // - // Although we are a WebContentsObserver, calling - // WebContents::web_contents() would return NULL once we unregister - // ourselves in WebContentsDestroyed() or RenderViewHostChanged(). So we - // store a reference to perform cleanup. - const content::WebContents* const web_contents_; - const base::Closure finished_callback_; - const int render_process_id_; - const int render_view_id_; - }; - - friend class base::RefCountedThreadSafe<TabWatcher>; - - ~TabWatcher() { - } - - // Helper function to find the iterator in |registered_web_contents_| which - // contains |web_contents|. - std::vector<std::unique_ptr<WebContentsTracker>>::iterator FindWebContents( - content::WebContents* web_contents) { - for (auto i = registered_web_contents_.begin(); - i != registered_web_contents_.end(); ++i) { - if ((*i)->GetWebContents() == web_contents) - return i; - } - - return registered_web_contents_.end(); - } - - // Keeps track of which WebContent(s) have been registered, in order to avoid - // double registrations on WebContentsObserver and to pass the correct render - // process id and render view id to |tab_closed_callback_| after the process - // has gone away. - std::vector<std::unique_ptr<WebContentsTracker>> registered_web_contents_; - - // Callback used to notify, on the thread specified by |callback_thread_| the - // closure of a registered tab. - TabClosedCallback tab_closed_callback_; - - DISALLOW_COPY_AND_ASSIGN(TabWatcher); -}; - ChromeSpeechRecognitionManagerDelegate ::ChromeSpeechRecognitionManagerDelegate() { } @@ -209,29 +41,8 @@ ::~ChromeSpeechRecognitionManagerDelegate() { } -void ChromeSpeechRecognitionManagerDelegate::TabClosedCallback( - int render_process_id, int render_view_id) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - - // Tell the S.R. Manager (which lives on the IO thread) to abort all the - // sessions for the given renderer view. - BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind( - &TabClosedCallbackOnIOThread, render_process_id, render_view_id)); -} - void ChromeSpeechRecognitionManagerDelegate::OnRecognitionStart( int session_id) { - const content::SpeechRecognitionSessionContext& context = - SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - - // Register callback to auto abort session on tab closure. - // |tab_watcher_| is lazyly istantiated on the first call. - if (!tab_watcher_.get()) { - tab_watcher_ = new TabWatcher( - base::Bind(&ChromeSpeechRecognitionManagerDelegate::TabClosedCallback, - base::Unretained(this))); - } - tab_watcher_->Watch(context.render_process_id, context.render_view_id); } void ChromeSpeechRecognitionManagerDelegate::OnAudioStart(int session_id) { @@ -278,20 +89,20 @@ DCHECK_NE(context.render_process_id, 0); int render_process_id = context.render_process_id; - int render_view_id = context.render_view_id; + int render_frame_id = context.render_frame_id; if (context.embedder_render_process_id) { // If this is a request originated from a guest, we need to re-route the // permission check through the embedder (app). render_process_id = context.embedder_render_process_id; - render_view_id = context.embedder_render_view_id; + render_frame_id = context.embedder_render_frame_id; } - // Check that the render view type is appropriate, and whether or not we + // Check that the render frame type is appropriate, and whether or not we // need to request permission from the user. BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - base::BindOnce(&CheckRenderViewType, std::move(callback), - render_process_id, render_view_id)); + base::BindOnce(&CheckRenderFrameType, std::move(callback), + render_process_id, render_frame_id)); } content::SpeechRecognitionEventListener* @@ -311,18 +122,18 @@ } // static. -void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType( +void ChromeSpeechRecognitionManagerDelegate::CheckRenderFrameType( base::OnceCallback<void(bool ask_user, bool is_allowed)> callback, int render_process_id, - int render_view_id) { + int render_frame_id) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - content::RenderViewHost* render_view_host = - content::RenderViewHost::FromID(render_process_id, render_view_id); + content::RenderFrameHost* render_frame_host = + content::RenderFrameHost::FromID(render_process_id, render_frame_id); bool allowed = false; bool check_permission = false; - if (!render_view_host) { + if (!render_frame_host) { // This happens for extensions. Manifest should be checked for permission. allowed = true; check_permission = false; @@ -333,7 +144,8 @@ } #if BUILDFLAG(ENABLE_EXTENSIONS) - WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); + WebContents* web_contents = + WebContents::FromRenderFrameHost(render_frame_host); extensions::ViewType view_type = extensions::GetViewType(web_contents); if (view_type == extensions::VIEW_TYPE_TAB_CONTENTS ||
diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h index a2aab11..032ce396 100644 --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
@@ -7,7 +7,6 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/memory/ref_counted.h" #include "content/public/browser/speech_recognition_event_listener.h" #include "content/public/browser/speech_recognition_manager_delegate.h" #include "content/public/browser/speech_recognition_session_config.h" @@ -50,20 +49,13 @@ content::SpeechRecognitionEventListener* GetEventListener() override; bool FilterProfanities(int render_process_id) override; - // Callback called by |tab_watcher_| on the IO thread to signal tab closure. - virtual void TabClosedCallback(int render_process_id, int render_view_id); - private: - class TabWatcher; - // Checks for VIEW_TYPE_TAB_CONTENTS host in the UI thread and notifies back // the result in the IO thread through |callback|. - static void CheckRenderViewType( + static void CheckRenderFrameType( base::OnceCallback<void(bool ask_user, bool is_allowed)> callback, int render_process_id, - int render_view_id); - - scoped_refptr<TabWatcher> tab_watcher_; + int render_frame_id); DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionManagerDelegate); };
diff --git a/chrome/browser/spellchecker/spell_check_panel_host_impl.h b/chrome/browser/spellchecker/spell_check_panel_host_impl.h index efca908..07e738b 100644 --- a/chrome/browser/spellchecker/spell_check_panel_host_impl.h +++ b/chrome/browser/spellchecker/spell_check_panel_host_impl.h
@@ -7,7 +7,7 @@ #include "base/macros.h" #include "components/spellcheck/common/spellcheck_panel.mojom.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #if !BUILDFLAG(HAS_SPELLCHECK_PANEL) #error "Spellcheck panel should be enabled."
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc index cca9f37..84b9c3b 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -23,7 +23,7 @@ #include "components/data_use_measurement/core/data_use_user_data.h" #include "components/spellcheck/browser/spellcheck_platform.h" #include "components/spellcheck/common/spellcheck_common.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "net/base/load_flags.h"
diff --git a/chrome/browser/spellchecker/spellcheck_mac_view_browsertest.mm b/chrome/browser/spellchecker/spellcheck_mac_view_browsertest.mm index f82036c..bf01a63b 100644 --- a/chrome/browser/spellchecker/spellcheck_mac_view_browsertest.mm +++ b/chrome/browser/spellchecker/spellcheck_mac_view_browsertest.mm
@@ -6,7 +6,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index f83bd7d5..d0a6473 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc
@@ -26,7 +26,7 @@ #include "components/spellcheck/browser/spelling_service_client.h" #include "components/spellcheck/common/spellcheck.mojom.h" #include "components/spellcheck/common/spellcheck_common.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc index 96933d4..f053b4f 100644 --- a/chrome/browser/sync/chrome_sync_client.cc +++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -57,7 +57,7 @@ #include "components/password_manager/sync/browser/password_model_worker.h" #include "components/search_engines/search_engine_data_type_controller.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/sync/base/pref_names.h" #include "components/sync/base/report_unrecoverable_error.h" #include "components/sync/driver/async_directory_type_controller.h"
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 114193f..da1b3b5 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -1011,7 +1011,7 @@ "//components/sessions", "//components/signin/core/account_id", "//components/signin/core/browser", - "//components/signin/core/browser:signin_features", + "//components/signin/core/browser:signin_buildflags", "//components/spellcheck/browser", "//components/ssl_errors", "//components/startup_metric_utils/browser:lib", @@ -2119,6 +2119,7 @@ "//chromeos:cryptohome_proto", "//chromeos/components/tether", "//components/arc", + "//components/consent_auditor:consent_auditor", "//components/cryptauth", "//components/drive:drive_chromeos", "//components/exo", @@ -3713,8 +3714,8 @@ "webui/print_preview/print_preview_handler.h", "webui/print_preview/print_preview_ui.cc", "webui/print_preview/print_preview_ui.h", - "webui/print_preview/printer_capabilities.cc", - "webui/print_preview/printer_capabilities.h", + "webui/print_preview/print_preview_utils.cc", + "webui/print_preview/print_preview_utils.h", "webui/print_preview/printer_handler.cc", "webui/print_preview/printer_handler.h", "webui/print_preview/sticky_settings.cc",
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 835e615f..daeff3d 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc
@@ -2123,21 +2123,7 @@ web_contents->GetURL().host_piece() == extension->id()) || (extensions::TabHelper::FromWebContents(web_contents) ->extension_app() == extension)) { - if (tab_strip_model_->count() > 1) { - tab_strip_model_->CloseWebContentsAt(i, TabStripModel::CLOSE_NONE); - } else { - // If there is only 1 tab remaining, do not close it and instead - // navigate to the default NTP. Note that if there is an installed - // extension that overrides the NTP page, that extension's content - // will override the NTP contents. - GURL url(chrome::kChromeUINewTabURL); - web_contents->GetController().LoadURL( - url, - content::Referrer::SanitizeForRequest( - url, - content::Referrer(url, blink::kWebReferrerPolicyDefault)), - ui::PAGE_TRANSITION_RELOAD, std::string()); - } + tab_strip_model_->CloseWebContentsAt(i, TabStripModel::CLOSE_NONE); } else { chrome::UnmuteIfMutedByExtension(web_contents, extension->id()); }
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 295b76f..b76ad03 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc
@@ -33,7 +33,6 @@ #include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/first_run/first_run.h" @@ -106,7 +105,6 @@ #include "content/public/test/test_navigation_observer.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" -#include "extensions/browser/test_extension_registry_observer.h" #include "extensions/browser/uninstall_reason.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" @@ -609,7 +607,7 @@ content::RenderProcessHostWatcher crash_observer( child_process, content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(dialog_queue->HasActiveDialog()); @@ -643,7 +641,7 @@ content::RenderProcessHostWatcher crash_observer( child_process, content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(js_helper->IsShowingDialogForTesting()); @@ -1109,43 +1107,6 @@ ASSERT_EQ(1, browser()->tab_strip_model()->count()); } -// Tests that when an extension is unloaded, if only one tab is opened -// containing extenions-related content, then the tab is kept open and is -// directed to the default NTP. -IN_PROC_BROWSER_TEST_F(BrowserTest, NavigateToDefaultNTPPageOnExtensionUnload) { - ASSERT_TRUE(embedded_test_server()->Start()); - TabStripModel* tab_strip_model = browser()->tab_strip_model(); - - const Extension* extension = - LoadExtension(test_data_dir_.AppendASCII("options_page/")); - ASSERT_TRUE(extension); - - GURL extension_url = extension->GetResourceURL("options.html"); - ui_test_utils::NavigateToURL(browser(), extension_url); - content::WaitForLoadStop(tab_strip_model->GetActiveWebContents()); - - ASSERT_EQ(1, browser()->tab_strip_model()->count()); - EXPECT_EQ( - extension_url.spec(), - tab_strip_model->GetActiveWebContents()->GetLastCommittedURL().spec()); - - // Uninstall the extension. - ExtensionService* service = - extensions::ExtensionSystem::Get(browser()->profile()) - ->extension_service(); - extensions::ExtensionRegistry* registry = - extensions::ExtensionRegistry::Get(browser()->profile()); - extensions::TestExtensionRegistryObserver registry_observer(registry); - service->UnloadExtension(extension->id(), - extensions::UnloadedExtensionReason::UNINSTALL); - registry_observer.WaitForExtensionUnloaded(); - content::WaitForLoadStop(tab_strip_model->GetActiveWebContents()); - - // There should only be one tab now, with the NTP loaded. - ASSERT_EQ(1, tab_strip_model->count()); - EXPECT_TRUE(search::IsInstantNTP(tab_strip_model->GetActiveWebContents())); -} - // Open with --app-id=<id>, and see that an application tab opens by default. IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) { ASSERT_TRUE(embedded_test_server()->Start()); @@ -2407,7 +2368,7 @@ web_contents->GetContainerBounds().size(); RenderViewSizeObserver observer(web_contents, browser()->window()); - // Navigate to a non-NTP, without resizing WebContentsView. + // Navigate to a non-NTP page, without resizing WebContentsView. ui_test_utils::NavigateToURL(browser(), embedded_test_server()->GetURL("/title1.html")); ASSERT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); @@ -2445,7 +2406,7 @@ EXPECT_EQ(wcv_commit_size0, web_contents->GetContainerBounds().size()); #endif - // Navigate to another non-NTP, without resizing WebContentsView. + // Navigate to another non-NTP page, without resizing WebContentsView. ui_test_utils::NavigateToURL(browser(), https_test_server.GetURL("/title2.html")); ASSERT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); @@ -2461,7 +2422,7 @@ web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); EXPECT_EQ(wcv_commit_size1, web_contents->GetContainerBounds().size()); - // Navigate from NTP to a non-NTP, resizing WebContentsView while + // Navigate from NTP to a non-NTP page, resizing WebContentsView while // navigation entry is pending. ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); gfx::Size wcv_resize_insets(1, 1);
diff --git a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm index 766468e..f71758b 100644 --- a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm +++ b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
@@ -58,7 +58,6 @@ NSString* const kSearchTouchId = @"SEARCH"; NSString* const kStarTouchId = @"BOOKMARK"; NSString* const kNewTabTouchId = @"NEW-TAB"; -NSString* const kExitFullscreenTouchId = @"EXIT-FULLSCREEN"; NSString* const kFullscreenOriginLabelTouchId = @"FULLSCREEN-ORIGIN-LABEL"; // The button indexes in the back and forward segment control. @@ -343,8 +342,6 @@ [touchBarItem setView:[NSTextField labelWithAttributedString:attributedString.get()]]; - } else if ([identifier hasSuffix:kExitFullscreenTouchId]) { - return nil; } return touchBarItem.autorelease(); @@ -353,28 +350,9 @@ - (NSTouchBar*)createTabFullscreenTouchBar API_AVAILABLE(macos(10.12.2)) { base::scoped_nsobject<NSTouchBar> touchBar([[ui::NSTouchBar() alloc] init]); [touchBar setDelegate:self]; - - if ([touchBar respondsToSelector: - @selector(setEscapeKeyReplacementItemIdentifier:)]) { - NSString* exitIdentifier = - ui::GetTouchBarItemId(kTabFullscreenTouchBarId, kExitFullscreenTouchId); - [touchBar setEscapeKeyReplacementItemIdentifier:exitIdentifier]; - [touchBar setDefaultItemIdentifiers:@[ ui::GetTouchBarItemId( - kTabFullscreenTouchBarId, - kFullscreenOriginLabelTouchId) ]]; - - base::scoped_nsobject<NSCustomTouchBarItem> touchBarItem( - [[ui::NSCustomTouchBarItem() alloc] initWithIdentifier:exitIdentifier]); - - [touchBarItem - setView:[NSButton buttonWithTitle:l10n_util::GetNSString( - IDS_TOUCH_BAR_EXIT_FULLSCREEN) - target:self - action:@selector(exitFullscreenForTab:)]]; - [touchBar - setTemplateItems:[NSSet setWithObject:touchBarItem.autorelease()]]; - } - + [touchBar setDefaultItemIdentifiers:@[ ui::GetTouchBarItemId( + kTabFullscreenTouchBarId, + kFullscreenOriginLabelTouchId) ]]; return touchBar.autorelease(); } @@ -499,12 +477,6 @@ commandUpdater_->ExecuteCommand(command); } -- (void)exitFullscreenForTab:(id)sender { - browser_->exclusive_access_manager() - ->fullscreen_controller() - ->ExitExclusiveAccessIfNecessary(); -} - - (void)executeCommand:(id)sender { int command = [sender tag]; ui::LogTouchBarUMA(TouchBarActionFromCommand(command));
diff --git a/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm b/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm index ef7cbf0..2cc8fdc 100644 --- a/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_touch_bar_unittest.mm
@@ -36,7 +36,6 @@ NSString* const kSearchTouchId = @"SEARCH"; NSString* const kStarTouchId = @"BOOKMARK"; NSString* const kNewTabTouchId = @"NEW-TAB"; -NSString* const kExitFullscreenTouchId = @"EXIT-FULLSCREEN"; NSString* const kFullscreenOriginLabelTouchId = @"FULLSCREEN-ORIGIN-LABEL"; // The button indexes in the back and forward segment control. @@ -110,8 +109,6 @@ EXPECT_TRUE( [touch_bar_items containsObject:GetFullscreenTouchBarItemId( kFullscreenOriginLabelTouchId)]); - EXPECT_TRUE([[touch_bar escapeKeyReplacementItemIdentifier] - isEqualToString:GetFullscreenTouchBarItemId(kExitFullscreenTouchId)]); BOOL no = NO; [[[bwc() stub] andReturnValue:OCMOCK_VALUE(no)]
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 28b6279..088ed300 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -196,7 +196,7 @@ - (IBAction)kill:(id)sender { if (hungWidget_) - hungWidget_->GetProcess()->Shutdown(content::RESULT_CODE_HUNG, false); + hungWidget_->GetProcess()->Shutdown(content::RESULT_CODE_HUNG); // Cannot call performClose:, because the close button is disabled. [self close];
diff --git a/chrome/browser/ui/login/login_handler.h b/chrome/browser/ui/login/login_handler.h index 3c9c2b4..36fba38 100644 --- a/chrome/browser/ui/login/login_handler.h +++ b/chrome/browser/ui/login/login_handler.h
@@ -16,8 +16,8 @@ #include "base/optional.h" #include "base/synchronization/lock.h" #include "components/password_manager/core/browser/password_manager.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/notification_observer.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" #include "content/public/browser/resource_request_info.h" class GURL; @@ -37,7 +37,7 @@ // This is the base implementation for the OS-specific classes that route // authentication info to the net::URLRequest that needs it. These functions // must be implemented in a thread safe manner. -class LoginHandler : public content::ResourceDispatcherHostLoginDelegate, +class LoginHandler : public content::LoginDelegate, public password_manager::LoginModelObserver, public content::NotificationObserver { public: @@ -75,7 +75,7 @@ interstitial_delegate_ = delegate; } - // ResourceDispatcherHostLoginDelegate implementation: + // LoginDelegate implementation: void OnRequestCancelled() override; // Use this to build a view with password manager support. |password_manager|
diff --git a/chrome/browser/ui/passwords/password_manager_presenter.cc b/chrome/browser/ui/passwords/password_manager_presenter.cc index 693675b6..481225f 100644 --- a/chrome/browser/ui/passwords/password_manager_presenter.cc +++ b/chrome/browser/ui/passwords/password_manager_presenter.cc
@@ -243,7 +243,8 @@ } if (password_manager::sync_util::IsSyncAccountCredential( *password_list_[index], sync_service, - SigninManagerFactory::GetForProfile(password_view_->GetProfile()))) { + SigninManagerFactory::GetForProfile(password_view_->GetProfile()), + password_view_->GetProfile()->GetPrefs())) { base::RecordAction( base::UserMetricsAction("PasswordManager_SyncCredentialShown")); }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 9f991a4..2d31b0c3 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -205,10 +205,10 @@ void MoveMouseAndPress(const gfx::Point& screen_pos, ui_controls::MouseButton button, int state, - const base::Closure& closure) { + base::OnceClosure closure) { ASSERT_TRUE(ui_controls::SendMouseMove(screen_pos.x(), screen_pos.y())); - ASSERT_TRUE( - ui_controls::SendMouseEventsNotifyWhenDone(button, state, closure)); + ASSERT_TRUE(ui_controls::SendMouseEventsNotifyWhenDone(button, state, + std::move(closure))); } // PageNavigator implementation that records the URL. @@ -856,11 +856,12 @@ // and drop checking state. ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone( loc.x() + 10, loc.y(), - base::Bind(&BookmarkBarViewTest7::Step3A, this))); + base::BindOnce(&BookmarkBarViewTest7::Step3A, this))); #else // Start a drag. ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone( - loc.x() + 10, loc.y(), base::Bind(&BookmarkBarViewTest7::Step4, this))); + loc.x() + 10, loc.y(), + base::BindOnce(&BookmarkBarViewTest7::Step4, this))); // See comment above this method as to why we do this. ScheduleMouseMoveInBackground(loc.x(), loc.y()); @@ -874,7 +875,7 @@ views::View::ConvertPointToScreen(other_button, &loc); ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone( - loc.x(), loc.y(), base::Bind(&BookmarkBarViewTest7::Step4, this))); + loc.x(), loc.y(), base::BindOnce(&BookmarkBarViewTest7::Step4, this))); } void Step4() { @@ -956,10 +957,11 @@ // and drop checking state. ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone( loc.x() + 10, loc.y(), - base::Bind(&BookmarkBarViewTest8::Step3A, this))); + base::BindOnce(&BookmarkBarViewTest8::Step3A, this))); #else ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone( - loc.x() + 10, loc.y(), base::Bind(&BookmarkBarViewTest8::Step4, this))); + loc.x() + 10, loc.y(), + base::BindOnce(&BookmarkBarViewTest8::Step4, this))); // See comment above this method as to why we do this. ScheduleMouseMoveInBackground(loc.x(), loc.y()); #endif @@ -972,7 +974,8 @@ views::View::ConvertPointToScreen(other_button, &loc); ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone( - loc.x() + 10, loc.y(), base::Bind(&BookmarkBarViewTest8::Step4, this))); + loc.x() + 10, loc.y(), + base::BindOnce(&BookmarkBarViewTest8::Step4, this))); } void Step4() { @@ -985,7 +988,7 @@ gfx::Point loc(button->width() / 2, button->height() / 2); views::View::ConvertPointToScreen(button, &loc); ASSERT_TRUE(ui_controls::SendMouseMoveNotifyWhenDone( - loc.x(), loc.y(), base::Bind(&BookmarkBarViewTest8::Step5, this))); + loc.x(), loc.y(), base::BindOnce(&BookmarkBarViewTest8::Step5, this))); } void Step5() { @@ -1367,7 +1370,7 @@ // And press enter so that the cancel button is selected. ASSERT_TRUE(ui_controls::SendKeyPressNotifyWhenDone( window_->GetNativeWindow(), ui::VKEY_RETURN, false, false, false, false, - base::Closure())); + base::OnceClosure())); waiter.WaitForDialogClose(); Done(); }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 9599f8c..3ad3d7a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -24,7 +24,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/strings/grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/events/keycodes/keyboard_codes.h"
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc index e0418b0f..df78a217 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
@@ -31,7 +31,7 @@ #include "chrome/grit/generated_resources.h" #include "components/bubble/bubble_controller.h" #include "components/signin/core/browser/account_info.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "extensions/common/extension.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_features.h"
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index ae8b1d5..1cc7f25 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1836,12 +1836,28 @@ } void BrowserView::OnWindowBeginUserBoundsChange() { + if (interactive_resize_) + return; WebContents* web_contents = GetActiveWebContents(); if (!web_contents) return; + interactive_resize_ = ResizeSession(); + interactive_resize_->begin_timestamp = base::TimeTicks::Now(); web_contents->GetRenderViewHost()->NotifyMoveOrResizeStarted(); } +void BrowserView::OnWindowEndUserBoundsChange() { + if (!interactive_resize_) + return; + auto now = base::TimeTicks::Now(); + DCHECK(!interactive_resize_->begin_timestamp.is_null()); + UMA_HISTOGRAM_TIMES("BrowserWindow.Resize.Duration", + now - interactive_resize_->begin_timestamp); + UMA_HISTOGRAM_COUNTS_1000("BrowserWindow.Resize.StepCount", + interactive_resize_->step_count); + interactive_resize_.reset(); +} + void BrowserView::OnWidgetMove() { if (!initialized_) { // Creating the widget can trigger a move. Ignore it until we've initialized @@ -2025,6 +2041,32 @@ } } +void BrowserView::OnBoundsChanged(const gfx::Rect& previous_bounds) { + if (!interactive_resize_) + return; + auto now = base::TimeTicks::Now(); + if (!interactive_resize_->last_resize_timestamp.is_null()) { + const auto& current_size = size(); + // If size doesn't change, then do not update the timestamp. + if (current_size == previous_bounds.size()) + return; + UMA_HISTOGRAM_CUSTOM_TIMES("BrowserWindow.Resize.StepInterval", + now - interactive_resize_->last_resize_timestamp, + base::TimeDelta::FromMilliseconds(1), + base::TimeDelta::FromSeconds(1), 50); + UMA_HISTOGRAM_CUSTOM_COUNTS( + "BrowserWindow.Resize.StepBoundsChange.Width", + std::abs(previous_bounds.size().width() - current_size.width()), + 1 /* min */, 300 /* max */, 100 /* buckets */); + UMA_HISTOGRAM_CUSTOM_COUNTS( + "BrowserWindow.Resize.StepBoundsChange.Height", + std::abs(previous_bounds.size().height() - current_size.height()), + 1 /* min */, 300 /* max */, 100 /* buckets */); + } + ++interactive_resize_->step_count; + interactive_resize_->last_resize_timestamp = now; +} + void BrowserView::ChildPreferredSizeChanged(View* child) { Layout(); }
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 6227cc17..a61dbe8 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -429,6 +429,7 @@ views::View* GetContentsView() override; views::ClientView* CreateClientView(views::Widget* widget) override; void OnWindowBeginUserBoundsChange() override; + void OnWindowEndUserBoundsChange() override; void OnWidgetMove() override; views::Widget* GetWidget() override; const views::Widget* GetWidget() const override; @@ -455,6 +456,7 @@ void ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) override; void PaintChildren(const views::PaintInfo& paint_info) override; + void OnBoundsChanged(const gfx::Rect& previous_bounds) override; void ChildPreferredSizeChanged(View* child) override; void GetAccessibleNodeData(ui::AXNodeData* node_data) override; void OnThemeChanged() override; @@ -751,6 +753,16 @@ std::unique_ptr<FullscreenControlHost> fullscreen_control_host_; + struct ResizeSession { + // The time when user started resizing the window. + base::TimeTicks begin_timestamp; + base::TimeTicks last_resize_timestamp; + // The number of times the window size is changed from the start (i.e. since + // begin_timestamp). + size_t step_count = 0; + }; + base::Optional<ResizeSession> interactive_resize_; + mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_{ this};
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 5561aae..4661edd 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -360,7 +360,7 @@ // Try to generate a crash report for the hung process. CrashDumpAndTerminateHungChildProcess(rph->GetHandle()); #else - rph->Shutdown(content::RESULT_CODE_HUNG, false); + rph->Shutdown(content::RESULT_CODE_HUNG); #endif } return true;
diff --git a/chrome/browser/ui/views/menu_test_base.cc b/chrome/browser/ui/views/menu_test_base.cc index 4eeff9a..64910fb 100644 --- a/chrome/browser/ui/views/menu_test_base.cc +++ b/chrome/browser/ui/views/menu_test_base.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/menu_test_base.h" + +#include "base/strings/utf_string_conversions.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "ui/base/test/ui_controls.h" @@ -30,11 +31,10 @@ next); } -void MenuTestBase::KeyPress(ui::KeyboardCode keycode, - const base::Closure& next) { - ui_controls::SendKeyPressNotifyWhenDone( - GetWidget()->GetNativeWindow(), keycode, false, false, - false, false, next); +void MenuTestBase::KeyPress(ui::KeyboardCode keycode, base::OnceClosure next) { + ui_controls::SendKeyPressNotifyWhenDone(GetWidget()->GetNativeWindow(), + keycode, false, false, false, false, + std::move(next)); } int MenuTestBase::GetMenuRunnerFlags() {
diff --git a/chrome/browser/ui/views/menu_test_base.h b/chrome/browser/ui/views/menu_test_base.h index 0a4c1af..45b6c13 100644 --- a/chrome/browser/ui/views/menu_test_base.h +++ b/chrome/browser/ui/views/menu_test_base.h
@@ -45,7 +45,7 @@ virtual void Click(views::View* view, const base::Closure& next); // Generate a keypress and run |next| once the event has been processed. - void KeyPress(ui::KeyboardCode keycode, const base::Closure& next); + void KeyPress(ui::KeyboardCode keycode, base::OnceClosure next); views::MenuItemView* menu() { return menu_;
diff --git a/chrome/browser/ui/views/passwords/password_sign_in_promo_view.cc b/chrome/browser/ui/views/passwords/password_sign_in_promo_view.cc index bff56c3..95b058b3 100644 --- a/chrome/browser/ui/views/passwords/password_sign_in_promo_view.cc +++ b/chrome/browser/ui/views/passwords/password_sign_in_promo_view.cc
@@ -12,7 +12,7 @@ #include "chrome/browser/ui/views/harmony/chrome_typography.h" #include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/account_info.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/md_text_button.h" #include "ui/views/layout/fill_layout.h"
diff --git a/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc b/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc index 71e9a1b..dd1c3991 100644 --- a/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc
@@ -51,7 +51,7 @@ web_contents->GetMainFrame()->GetProcess(); content::RenderProcessHostWatcher crash_observer( process, content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - process->Shutdown(content::RESULT_CODE_KILLED, false); + process->Shutdown(content::RESULT_CODE_KILLED); crash_observer.Wait(); }
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 3f55663..1e70bc6 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -461,13 +461,11 @@ return true; } - bool DragInputToNotifyWhenDone(int x, - int y, - const base::Closure& task) { + bool DragInputToNotifyWhenDone(int x, int y, base::OnceClosure task) { if (input_source() == INPUT_SOURCE_MOUSE) - return ui_controls::SendMouseMoveNotifyWhenDone(x, y, task); + return ui_controls::SendMouseMoveNotifyWhenDone(x, y, std::move(task)); #if defined(OS_CHROMEOS) - base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task); + base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(task)); event_generator_->MoveTouch(gfx::Point(x, y)); #else NOTREACHED(); @@ -2375,9 +2373,9 @@ } bool DragTabAndExecuteTaskWhenDone(const gfx::Point& position, - const base::Closure& task) { - return ui_controls::SendMouseMoveNotifyWhenDone( - position.x(), position.y(), task); + base::Closure task) { + return ui_controls::SendMouseMoveNotifyWhenDone(position.x(), position.y(), + std::move(task)); } void QuitWhenNotDragging() {
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc index 848b7de..42b1a01 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
@@ -67,7 +67,7 @@ private: // Finishes the drag-and-drop operation started in DoDragAndDrop(). - void FinishDragAndDrop(const base::Closure& quit_closure); + void FinishDragAndDrop(base::Closure quit_closure); // InProcessBrowserTest: void SetUpCommandLine(base::CommandLine* command_line) override; @@ -106,11 +106,9 @@ new content::MessageLoopRunner(); ui_controls::SendMouseMoveNotifyWhenDone( - end.x() + 10, - end.y(), - base::Bind(&ToolbarViewInteractiveUITest::FinishDragAndDrop, - base::Unretained(this), - runner->QuitClosure())); + end.x() + 10, end.y(), + base::BindOnce(&ToolbarViewInteractiveUITest::FinishDragAndDrop, + base::Unretained(this), runner->QuitClosure())); // Also post a move task to the drag and drop thread. if (!dnd_thread_.get()) { @@ -134,7 +132,7 @@ } void ToolbarViewInteractiveUITest::FinishDragAndDrop( - const base::Closure& quit_closure) { + base::Closure quit_closure) { dnd_thread_.reset(); TestWhileInDragOperation(); ui_controls::SendMouseEventsNotifyWhenDone(ui_controls::LEFT, ui_controls::UP,
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 8b87a09..5b4f1c7 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -81,7 +81,7 @@ #include "components/safe_browsing/web_ui/constants.h" #include "components/safe_browsing/web_ui/safe_browsing_ui.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/content_client.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc index 98a0359d..3a23730 100644 --- a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
@@ -5,9 +5,11 @@ #include "chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h" #include "base/i18n/timezone.h" +#include "chrome/browser/chromeos/arc/arc_support_host.h" #include "chrome/browser/chromeos/arc/optin/arc_optin_preference_handler.h" #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" +#include "chrome/browser/consent_auditor/consent_auditor_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/grit/generated_resources.h" @@ -16,6 +18,7 @@ #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "components/arc/arc_prefs.h" +#include "components/consent_auditor/consent_auditor.h" #include "components/login/localized_values_builder.h" #include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" @@ -136,11 +139,13 @@ void ArcTermsOfServiceScreenHandler::OnBackupAndRestoreModeChanged( bool enabled, bool managed) { + backup_restore_managed_ = managed; CallJS("setBackupAndRestoreMode", enabled, managed); } void ArcTermsOfServiceScreenHandler::OnLocationServicesModeChanged( bool enabled, bool managed) { + location_services_managed_ = managed; CallJS("setLocationServicesMode", enabled, managed); } @@ -229,12 +234,40 @@ void ArcTermsOfServiceScreenHandler::HandleAccept( bool enable_backup_restore, - bool enable_location_services) { + bool enable_location_services, + const std::string& tos_content) { if (!NeedDispatchEventOnAction()) return; - pref_handler_->EnableBackupRestore(enable_backup_restore); pref_handler_->EnableLocationService(enable_location_services); + + consent_auditor::ConsentAuditor* consent_auditor = + ConsentAuditorFactory::GetForProfile( + ProfileManager::GetPrimaryUserProfile()); + + // Record acceptance of Play ToS. + consent_auditor->RecordGaiaConsent( + consent_auditor::Feature::PLAY_STORE, + ArcSupportHost::ComputePlayToSConsentIds(tos_content), + IDS_ARC_OOBE_TERMS_BUTTON_ACCEPT, consent_auditor::ConsentStatus::GIVEN); + + // If the user - not policy - chose Backup and Restore, record consent. + if (enable_backup_restore && !backup_restore_managed_) { + consent_auditor->RecordGaiaConsent( + consent_auditor::Feature::BACKUP_AND_RESTORE, + {IDS_ARC_OPT_IN_DIALOG_BACKUP_RESTORE}, + IDS_ARC_OOBE_TERMS_BUTTON_ACCEPT, + consent_auditor::ConsentStatus::GIVEN); + } + + // If the user - not policy - chose Location Services, record consent. + if (enable_location_services && !location_services_managed_) { + consent_auditor->RecordGaiaConsent( + consent_auditor::Feature::GOOGLE_LOCATION_SERVICE, + {IDS_ARC_OPT_IN_LOCATION_SETTING}, IDS_ARC_OOBE_TERMS_BUTTON_ACCEPT, + consent_auditor::ConsentStatus::GIVEN); + } + for (auto& observer : observer_list_) observer.OnAccept(); }
diff --git a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h index b626fb1f..4aea413 100644 --- a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
@@ -66,7 +66,8 @@ void DoShow(); void HandleSkip(); void HandleAccept(bool enable_backup_restore, - bool enable_location_services); + bool enable_location_services, + const std::string& tos_content); // Loads Play Store ToS content in case default network exists. If // |ignore_network_state| is set then network state is not checked. void MaybeLoadPlayStoreToS(bool ignore_network_state); @@ -91,6 +92,10 @@ // To filter out duplicate notifications from html. bool action_taken_ = false; + // To track if optional features are managed preferences. + bool backup_restore_managed_ = false; + bool location_services_managed_ = false; + std::unique_ptr<arc::ArcOptInPreferenceHandler> pref_handler_; DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenHandler);
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc index 1252977..5bdf402 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc
@@ -19,7 +19,7 @@ #include "base/task_scheduler/post_task.h" #include "chrome/browser/printing/pwg_raster_converter.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/webui/print_preview/printer_capabilities.h" +#include "chrome/browser/ui/webui/print_preview/print_preview_utils.h" #include "components/cloud_devices/common/cloud_device_description.h" #include "components/cloud_devices/common/printer_description.h" #include "device/base/device_client.h"
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc index b17d6ba..09c7646d 100644 --- a/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc +++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc
@@ -20,11 +20,12 @@ #include "chrome/browser/chromeos/printing/ppd_provider_factory.h" #include "chrome/browser/chromeos/printing/printer_configurer.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/webui/print_preview/printer_capabilities.h" +#include "chrome/browser/ui/webui/print_preview/print_preview_utils.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/debug_daemon_client.h" #include "chromeos/printing/ppd_provider.h" #include "chromeos/printing/printer_configuration.h" +#include "components/printing/common/printer_capabilities.h" #include "content/public/browser/browser_thread.h" #include "printing/backend/print_backend_consts.h" @@ -66,7 +67,7 @@ base::PostTaskWithTraitsAndReplyWithResult( FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND}, base::BindOnce(&printing::GetSettingsOnBlockingPool, printer->id(), - basic_info), + basic_info, nullptr), std::move(cb)); }
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc index 5d3076d..c756a0b 100644 --- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc +++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
@@ -12,7 +12,8 @@ #include "base/memory/ref_counted.h" #include "base/task_scheduler/post_task.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/ui/webui/print_preview/printer_capabilities.h" +#include "chrome/browser/ui/webui/print_preview/print_preview_utils.h" +#include "components/printing/common/printer_capabilities.h" #include "content/public/browser/browser_thread.h" #include "printing/backend/print_backend.h" @@ -46,7 +47,8 @@ return nullptr; } - return printing::GetSettingsOnBlockingPool(device_name, basic_info); + return printing::GetSettingsOnBlockingPool(device_name, basic_info, + print_backend); } std::string GetDefaultPrinterAsync() {
diff --git a/chrome/browser/ui/webui/print_preview/printer_capabilities.cc b/chrome/browser/ui/webui/print_preview/print_preview_utils.cc similarity index 63% rename from chrome/browser/ui/webui/print_preview/printer_capabilities.cc rename to chrome/browser/ui/webui/print_preview/print_preview_utils.cc index 918401ab..d316673 100644 --- a/chrome/browser/ui/webui/print_preview/printer_capabilities.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/webui/print_preview/printer_capabilities.h" +#include "chrome/browser/ui/webui/print_preview/print_preview_utils.h" #include <memory> #include <string> @@ -19,27 +19,15 @@ #include "build/build_config.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/printing/print_view_manager.h" -#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" #include "chrome/browser/ui/webui/print_preview/printer_handler.h" #include "components/crash/core/common/crash_keys.h" -#include "components/printing/common/cloud_print_cdd_conversion.h" +#include "components/printing/common/printer_capabilities.h" #include "content/public/browser/render_frame_host.h" -#include "printing/backend/print_backend.h" #include "printing/backend/print_backend_consts.h" #include "printing/page_range.h" -#if defined(OS_WIN) -#include "base/strings/string_split.h" -#include "base/strings/string_util.h" -#include "base/strings/utf_string_conversions.h" -#include "components/strings/grit/components_strings.h" -#include "ui/base/l10n/l10n_util.h" -#endif - namespace printing { -const char kPrinter[] = "printer"; - // Keys for a dictionary specifying a custom vendor capability. See // settings/advanced_settings/advanced_settings_item.js in // chrome/browser/resources/print_preview. @@ -53,57 +41,6 @@ namespace { -// Returns a dictionary representing printer capabilities as CDD. Returns -// an empty dictionary if a dictionary could not be generated. -std::unique_ptr<base::DictionaryValue> -GetPrinterCapabilitiesOnBlockingPoolThread(const std::string& device_name) { - base::AssertBlockingAllowed(); - DCHECK(!device_name.empty()); - - scoped_refptr<PrintBackend> print_backend( - PrintBackend::CreateInstance(nullptr)); - - VLOG(1) << "Get printer capabilities start for " << device_name; - crash_keys::ScopedPrinterInfo crash_key( - print_backend->GetPrinterDriverInfo(device_name)); - - auto empty_capabilities = std::make_unique<base::DictionaryValue>(); - std::unique_ptr<base::DictionaryValue> printer_info; - if (!print_backend->IsValidPrinter(device_name)) { - LOG(WARNING) << "Invalid printer " << device_name; - return empty_capabilities; - } - - PrinterSemanticCapsAndDefaults info; - if (!print_backend->GetPrinterSemanticCapsAndDefaults(device_name, &info)) { - LOG(WARNING) << "Failed to get capabilities for " << device_name; - return empty_capabilities; - } - - return cloud_print::PrinterSemanticCapsAndDefaultsToCdd(info); -} - -#if defined(OS_WIN) -std::string GetUserFriendlyName(const std::string& printer_name) { - // |printer_name| may be a UNC path like \\printserver\printername. - if (!base::StartsWith(printer_name, "\\\\", - base::CompareCase::INSENSITIVE_ASCII)) { - return printer_name; - } - - // If it is a UNC path, split the "printserver\printername" portion and - // generate a friendly name, like Windows does. - std::string printer_name_trimmed = printer_name.substr(2); - std::vector<std::string> tokens = base::SplitString( - printer_name_trimmed, "\\", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); - if (tokens.size() != 2 || tokens[0].empty() || tokens[1].empty()) - return printer_name; - return l10n_util::GetStringFUTF8( - IDS_PRINT_PREVIEW_FRIENDLY_WIN_NETWORK_PRINTER_NAME, - base::UTF8ToUTF16(tokens[1]), base::UTF8ToUTF16(tokens[0])); -} -#endif - void PrintersToValues(const PrinterList& printer_list, base::ListValue* printers) { for (const PrinterBasicInfo& printer : printer_list) { @@ -173,68 +110,6 @@ } // namespace -std::pair<std::string, std::string> GetPrinterNameAndDescription( - const PrinterBasicInfo& printer) { -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) - // On Mac, |printer.printer_description| specifies the printer name and - // |printer.printer_name| specifies the device name / printer queue name. - // Chrome OS emulates the Mac behavior. - const std::string& real_name = printer.printer_description; - std::string real_description; - const auto it = printer.options.find(kDriverNameTagName); - if (it != printer.options.end()) - real_description = it->second; - return std::make_pair(real_name, real_description); -#elif defined(OS_WIN) - return std::make_pair(GetUserFriendlyName(printer.printer_name), - printer.printer_description); -#else - return std::make_pair(printer.printer_name, printer.printer_description); -#endif -} - -std::unique_ptr<base::DictionaryValue> GetSettingsOnBlockingPool( - const std::string& device_name, - const PrinterBasicInfo& basic_info) { - base::AssertBlockingAllowed(); - - const auto printer_name_description = - GetPrinterNameAndDescription(basic_info); - const std::string& printer_name = printer_name_description.first; - const std::string& printer_description = printer_name_description.second; - - auto printer_info = std::make_unique<base::DictionaryValue>(); - printer_info->SetString(kSettingDeviceName, device_name); - printer_info->SetString(kSettingPrinterName, printer_name); - printer_info->SetString(kSettingPrinterDescription, printer_description); - printer_info->SetBoolean( - kCUPSEnterprisePrinter, - base::ContainsKey(basic_info.options, kCUPSEnterprisePrinter) && - basic_info.options.at(kCUPSEnterprisePrinter) == kValueTrue); - - auto printer_info_capabilities = std::make_unique<base::DictionaryValue>(); - printer_info_capabilities->SetDictionary(kPrinter, std::move(printer_info)); - printer_info_capabilities->Set( - kSettingCapabilities, - GetPrinterCapabilitiesOnBlockingPoolThread(device_name)); - - return printer_info_capabilities; -} - -void ConvertPrinterListForCallback( - const PrinterHandler::AddedPrintersCallback& callback, - PrinterHandler::GetPrintersDoneCallback done_callback, - const PrinterList& printer_list) { - base::ListValue printers; - PrintersToValues(printer_list, &printers); - - VLOG(1) << "Enumerate printers finished, found " << printers.GetSize() - << " printers"; - if (!printers.empty()) - callback.Run(printers); - std::move(done_callback).Run(); -} - std::unique_ptr<base::DictionaryValue> ValidateCddForPrintPreview( const base::DictionaryValue& cdd) { auto validated_cdd = @@ -291,6 +166,20 @@ return validated_cdd; } +void ConvertPrinterListForCallback( + const PrinterHandler::AddedPrintersCallback& callback, + PrinterHandler::GetPrintersDoneCallback done_callback, + const PrinterList& printer_list) { + base::ListValue printers; + PrintersToValues(printer_list, &printers); + + VLOG(1) << "Enumerate printers finished, found " << printers.GetSize() + << " printers"; + if (!printers.empty()) + callback.Run(printers); + std::move(done_callback).Run(); +} + void StartLocalPrint(const std::string& ticket_json, const scoped_refptr<base::RefCountedBytes>& print_data, content::WebContents* preview_web_contents, @@ -329,4 +218,5 @@ preview_web_contents->GetMainFrame(), std::move(callback)); } + } // namespace printing
diff --git a/chrome/browser/ui/webui/print_preview/printer_capabilities.h b/chrome/browser/ui/webui/print_preview/print_preview_utils.h similarity index 68% rename from chrome/browser/ui/webui/print_preview/printer_capabilities.h rename to chrome/browser/ui/webui/print_preview/print_preview_utils.h index 04dd0fee..87db929e 100644 --- a/chrome/browser/ui/webui/print_preview/printer_capabilities.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINTER_CAPABILITIES_H_ -#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINTER_CAPABILITIES_H_ +#ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_UTILS_H_ +#define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_UTILS_H_ #include <memory> #include <string> @@ -19,29 +19,14 @@ namespace printing { -struct PrinterBasicInfo; - // Printer capability setting keys. extern const char kOptionKey[]; -extern const char kPrinter[]; extern const char kTypeKey[]; extern const char kSelectCapKey[]; extern const char kSelectString[]; extern const char kTypeKey[]; extern const char kVendorCapabilityKey[]; -// Extracts the printer display name and description from the -// appropriate fields in |printer| for the platform. -std::pair<std::string, std::string> GetPrinterNameAndDescription( - const PrinterBasicInfo& printer); - -// Returns the JSON representing printer capabilities for the device registered -// as |device_name| in the PrinterBackend. The returned dictionary is suitable -// for passage to the WebUI. -std::unique_ptr<base::DictionaryValue> GetSettingsOnBlockingPool( - const std::string& device_name, - const PrinterBasicInfo& basic_info); - // Converts |printer_list| to a base::ListValue form, runs |callback| with the // converted list as the argument if it is not empty, and runs |done_callback|. void ConvertPrinterListForCallback( @@ -61,6 +46,7 @@ const scoped_refptr<base::RefCountedBytes>& print_data, content::WebContents* preview_web_contents, PrinterHandler::PrintCallback callback); + } // namespace printing -#endif // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINTER_CAPABILITIES_H_ +#endif // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_UTILS_H_
diff --git a/chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_utils_unittest.cc similarity index 77% rename from chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc rename to chrome/browser/ui/webui/print_preview/print_preview_utils_unittest.cc index 4be22d605..ed32d2a 100644 --- a/chrome/browser/ui/webui/print_preview/printer_capabilities_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_utils_unittest.cc
@@ -4,13 +4,9 @@ #include <memory> -#include "base/bind.h" -#include "base/memory/ref_counted.h" #include "base/stl_util.h" #include "base/test/values_test_util.h" -#include "chrome/browser/ui/webui/print_preview/printer_capabilities.h" -#include "content/public/test/test_browser_thread_bundle.h" -#include "printing/backend/test_print_backend.h" +#include "chrome/browser/ui/webui/print_preview/print_preview_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/geometry/size.h" @@ -26,6 +22,7 @@ const char kMediaSizes[] = "media_sizes"; const char kPagesPerSheet[] = "Pages per sheet"; const char kPaperType[] = "Paper Type"; +const char kPrinter[] = "printer"; const char kValue[] = "value"; const char kVendorCapability[] = "vendor_capability"; @@ -214,87 +211,9 @@ } // namespace -class PrinterCapabilitiesTest : public testing::Test { - public: - PrinterCapabilitiesTest() {} - ~PrinterCapabilitiesTest() override {} +using PrintPreviewUtilsTest = testing::Test; - protected: - void SetUp() override { - test_backend_ = base::MakeRefCounted<TestPrintBackend>(); - PrintBackend::SetPrintBackendForTesting(test_backend_.get()); - } - - void TearDown() override { test_backend_ = nullptr; } - - TestPrintBackend* print_backend() { return test_backend_.get(); } - - private: - content::TestBrowserThreadBundle test_browser_threads_; - scoped_refptr<TestPrintBackend> test_backend_; -}; - -// Verify that we don't crash for a missing printer and a nullptr is never -// returned. -TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) { - PrinterBasicInfo basic_info; - std::string printer_name = "missing_printer"; - - std::unique_ptr<base::DictionaryValue> settings_dictionary = - GetSettingsOnBlockingPool(printer_name, basic_info); - - ASSERT_TRUE(settings_dictionary); -} - -TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) { - std::string printer_name = "test_printer"; - PrinterBasicInfo basic_info; - auto caps = std::make_unique<PrinterSemanticCapsAndDefaults>(); - - // set a capability - caps->dpis = {gfx::Size(600, 600)}; - - print_backend()->AddValidPrinter(printer_name, std::move(caps)); - - std::unique_ptr<base::DictionaryValue> settings_dictionary = - GetSettingsOnBlockingPool(printer_name, basic_info); - - // verify settings were created - ASSERT_TRUE(settings_dictionary); - - // verify capabilities and have one entry - base::DictionaryValue* cdd; - ASSERT_TRUE(settings_dictionary->GetDictionary(kSettingCapabilities, &cdd)); - - // read the CDD for the dpi attribute. - base::DictionaryValue* caps_dict; - ASSERT_TRUE(cdd->GetDictionary(kPrinter, &caps_dict)); - EXPECT_TRUE(caps_dict->HasKey(kDpi)); -} - -// Ensure that the capabilities dictionary is present but empty if the backend -// doesn't return capabilities. -TEST_F(PrinterCapabilitiesTest, NullCapabilitiesExcluded) { - std::string printer_name = "test_printer"; - PrinterBasicInfo basic_info; - - // return false when attempting to retrieve capabilities - print_backend()->AddValidPrinter(printer_name, nullptr); - - std::unique_ptr<base::DictionaryValue> settings_dictionary = - GetSettingsOnBlockingPool(printer_name, basic_info); - - // verify settings were created - ASSERT_TRUE(settings_dictionary); - - // verify that capabilities is an empty dictionary - base::DictionaryValue* caps_dict; - ASSERT_TRUE( - settings_dictionary->GetDictionary(kSettingCapabilities, &caps_dict)); - EXPECT_TRUE(caps_dict->empty()); -} - -TEST_F(PrinterCapabilitiesTest, FullCddPassthrough) { +TEST_F(PrintPreviewUtilsTest, FullCddPassthrough) { base::DictionaryValue printer = GetCapabilitiesFull(); base::DictionaryValue cdd; cdd.SetKey(kPrinter, printer.Clone()); @@ -302,7 +221,7 @@ ValidatePrinter(cdd_out.get(), printer); } -TEST_F(PrinterCapabilitiesTest, FilterBadList) { +TEST_F(PrintPreviewUtilsTest, FilterBadList) { base::DictionaryValue printer = GetCapabilitiesFull(); printer.RemoveKey(kMediaSizes); base::Value::ListStorage list_media; @@ -315,7 +234,7 @@ ValidatePrinter(cdd_out.get(), printer); } -TEST_F(PrinterCapabilitiesTest, FilterBadOptionOneElement) { +TEST_F(PrintPreviewUtilsTest, FilterBadOptionOneElement) { base::DictionaryValue printer = GetCapabilitiesFull(); printer.RemoveKey(kDpi); base::Value options(base::Value::Type::DICTIONARY); @@ -330,7 +249,7 @@ ValidatePrinter(cdd_out.get(), printer); } -TEST_F(PrinterCapabilitiesTest, FilterBadOptionAllElement) { +TEST_F(PrintPreviewUtilsTest, FilterBadOptionAllElement) { base::DictionaryValue printer = GetCapabilitiesFull(); printer.RemoveKey(kDpi); base::Value options(base::Value::Type::DICTIONARY); @@ -345,7 +264,7 @@ ValidatePrinter(cdd_out.get(), printer); } -TEST_F(PrinterCapabilitiesTest, FilterBadVendorCapabilityAllElement) { +TEST_F(PrintPreviewUtilsTest, FilterBadVendorCapabilityAllElement) { base::DictionaryValue printer = GetCapabilitiesFull(); base::Value* select_cap_0 = printer.FindKeyOfType(kVendorCapability, base::Value::Type::LIST) @@ -362,7 +281,7 @@ ValidatePrinter(cdd_out.get(), printer); } -TEST_F(PrinterCapabilitiesTest, FilterBadVendorCapabilityOneElement) { +TEST_F(PrintPreviewUtilsTest, FilterBadVendorCapabilityOneElement) { base::DictionaryValue printer = GetCapabilitiesFull(); base::Value* vendor_dictionary = printer.FindKeyOfType(kVendorCapability, base::Value::Type::LIST)
diff --git a/chrome/browser/ui/webui/print_preview/privet_printer_handler.cc b/chrome/browser/ui/webui/print_preview/privet_printer_handler.cc index 6df2047b..5e3966d 100644 --- a/chrome/browser/ui/webui/print_preview/privet_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/privet_printer_handler.cc
@@ -19,7 +19,7 @@ #include "chrome/browser/printing/cloud_print/privet_constants.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager_factory.h" -#include "chrome/browser/ui/webui/print_preview/printer_capabilities.h" +#include "chrome/browser/ui/webui/print_preview/print_preview_utils.h" #include "chrome/common/chrome_switches.h" #include "components/signin/core/browser/signin_manager.h" #include "ui/gfx/geometry/size.h" @@ -192,7 +192,7 @@ std::make_unique<base::DictionaryValue>(); FillPrinterDescription(name, *description, true, printer_info.get()); base::DictionaryValue printer_info_and_caps; - printer_info_and_caps.SetDictionary(printing::kPrinter, + printer_info_and_caps.SetDictionary(cloud_print::kPrivetTypePrinter, std::move(printer_info)); std::unique_ptr<base::DictionaryValue> capabilities_copy = capabilities->CreateDeepCopy();
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc index 0413442..01a4bba 100644 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -29,7 +29,7 @@ #include "components/google/core/browser/google_util.h" #include "components/password_manager/core/browser/password_manager_constants.h" #include "components/safe_browsing/common/safe_browsing_prefs.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/strings/grit/components_strings.h" #include "components/subresource_filter/core/browser/subresource_filter_features.h" #include "content/public/browser/web_ui_data_source.h"
diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h index 0ea976f..de9b0e1 100644 --- a/chrome/browser/ui/webui/settings/people_handler.h +++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -19,7 +19,7 @@ #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "components/prefs/pref_change_registrar.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_manager_base.h" #include "components/sync/driver/sync_service_observer.h"
diff --git a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc index a4d90b66..348fcc4 100644 --- a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc +++ b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
@@ -84,7 +84,7 @@ { content::RenderProcessHostWatcher crash_observer( host, content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - host->Shutdown(0, false); + host->Shutdown(0); crash_observer.Wait(); } EXPECT_FALSE(web_contents->GetRenderViewHost()->IsRenderViewLive());
diff --git a/chrome/browser/vr/speech_recognizer_unittest.cc b/chrome/browser/vr/speech_recognizer_unittest.cc index b0d557b..af2702492 100644 --- a/chrome/browser/vr/speech_recognizer_unittest.cc +++ b/chrome/browser/vr/speech_recognizer_unittest.cc
@@ -66,9 +66,8 @@ session_id_ = 0; } - void AbortAllSessionsForRenderProcess(int render_process_id) override {} - void AbortAllSessionsForRenderView(int render_process_id, - int render_view_id) override {} + void AbortAllSessionsForRenderFrame(int render_process_id, + int render_frame_id) override {} void StopAudioCaptureForSession(int session_id) override {} const content::SpeechRecognitionSessionConfig& GetSessionConfig( @@ -84,7 +83,7 @@ } int GetSession(int render_process_id, - int render_view_id, + int render_frame_id, int request_id) const override { return session_id_; }
diff --git a/chrome/browser/web_bluetooth_browsertest.cc b/chrome/browser/web_bluetooth_browsertest.cc index 89e768e..ba21663 100644 --- a/chrome/browser/web_bluetooth_browsertest.cc +++ b/chrome/browser/web_bluetooth_browsertest.cc
@@ -80,7 +80,7 @@ web_contents_->GetMainFrame()->GetProcess(); content::RenderProcessHostWatcher crash_observer( process, content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - process->Shutdown(0, false); + process->Shutdown(0); crash_observer.Wait(); // Reload tab.
diff --git a/chrome/common/extensions/api/BUILD.gn b/chrome/common/extensions/api/BUILD.gn index a3a90e9f..059d6b44 100644 --- a/chrome/common/extensions/api/BUILD.gn +++ b/chrome/common/extensions/api/BUILD.gn
@@ -39,7 +39,6 @@ "dial.idl", "downloads.idl", "downloads_internal.idl", - "easy_unlock_private.idl", "font_settings.json", "gcm.json", "history.json", @@ -92,6 +91,7 @@ schema_sources += [ "certificate_provider.idl", "certificate_provider_internal.idl", + "easy_unlock_private.idl", "echo_private.json", "enterprise_device_attributes.idl", "enterprise_platform_keys.idl",
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json index b9b4a4f..59d13d4 100644 --- a/chrome/common/extensions/api/_permission_features.json +++ b/chrome/common/extensions/api/_permission_features.json
@@ -267,7 +267,8 @@ "easyUnlockPrivate": { "channel": "stable", "extension_types": ["platform_app"], - "location": "component" + "location": "component", + "platforms": ["chromeos"] }, "embeddedExtensionOptions": { "channel": "trunk",
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_starter/background.js b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/background.js new file mode 100644 index 0000000..dd2c417 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/background.js
@@ -0,0 +1,9 @@ +// Copyright 2018 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. + +'use strict'; + +chrome.browserAction.onClicked.addListener(function() { + chrome.tabs.create({url: 'index.html'}); +});
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_starter/index.html b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/index.html new file mode 100644 index 0000000..a254f12 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/index.html
@@ -0,0 +1,20 @@ +<!-- Copyright 2018 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. --> + +<html> + <head> + <title>FriendBlock</title> + <style> + button { + padding: 10px; + background-color: #3C79F8; + display: inline-block; + } + </style> + </head> + <body> + <button>FriendBlock Contacts</button> + <div id="friendDiv"></div> + </body> +</html>
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_starter/manifest.json b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/manifest.json new file mode 100644 index 0000000..1035894 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/manifest.json
@@ -0,0 +1,15 @@ +{ + "name": "OAuth Tutorial FriendBlock", + "version": "1.0", + "description": "Uses OAuth to connect to Google's People API and display contacts photos.", + "manifest_version": 2, + "browser_action": { + "default_title": "FriendBlock, friends face's in a block." + }, + "background": { + "scripts": [ + "background.js" + ], + "persistent": false + } + }
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_starter/oauth.js b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/oauth.js new file mode 100644 index 0000000..73e23976 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_starter/oauth.js
@@ -0,0 +1,13 @@ +// Copyright 2018 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. + +'use strict'; + +window.onload = function() { + document.querySelector('button').addEventListener('click', function() { + chrome.identity.getAuthToken({interactive: true}, function(token) { + console.log(token); + }); + }); +};
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete.zip b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete.zip new file mode 100644 index 0000000..72a3843 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete.zip Binary files differ
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/background.js b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/background.js new file mode 100644 index 0000000..dd2c417 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/background.js
@@ -0,0 +1,9 @@ +// Copyright 2018 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. + +'use strict'; + +chrome.browserAction.onClicked.addListener(function() { + chrome.tabs.create({url: 'index.html'}); +});
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/index.html b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/index.html new file mode 100644 index 0000000..bf79418 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/index.html
@@ -0,0 +1,17 @@ +<html> + <head> + <title>FriendBlock</title> + <style> + button { + padding: 10px; + background-color: #3C79F8; + display: inline-block; + } + </style> + <script type="text/javascript" src="oauth.js"></script> + </head> + <body> + <button>FriendBlock Contacts</button> + <div id="friendDiv"></div> + </body> + </html>
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/manifest.json b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/manifest.json new file mode 100644 index 0000000..5afe50be --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/manifest.json
@@ -0,0 +1,23 @@ +{ + "name": "OAuth Tutorial FriendBlock", + "version": "1.0", + "description": "Uses OAuth to connect to Google's People API and display contacts photos.", + "manifest_version": 2, + "browser_action": { + "default_title": "FriendBlock, friends face's in a block." + }, + "permissions": [ + "identity" + ], + "background": { + "scripts": [ + "background.js" + ], + "persistent": false + }, + "oauth2": { + "client_id": "ClientIDFromGoogleAPIConsole", + "scopes":["https://www.googleapis.com/auth/contacts.readonly"] + }, + "key": "KeyFromDeveloperDashboardHere" +}
diff --git a/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/oauth.js b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/oauth.js new file mode 100644 index 0000000..f59da65 --- /dev/null +++ b/chrome/common/extensions/docs/examples/tutorials/oauth_tutorial_complete/oauth.js
@@ -0,0 +1,41 @@ +// Copyright 2018 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. + +'use strict'; + +window.onload = function() { + document.querySelector('button').addEventListener('click', function() { + chrome.identity.getAuthToken({interactive: true}, function(token) { + var init = { + method: 'GET', + async: true, + headers: { + Authorization: 'Bearer ' + token, + 'Content-Type': 'application/json' + }, + 'contentType': 'json' + }; + fetch( + 'https://people.googleapis.com/v1/contactGroups/all?maxMembers=20&key=<API_Key_Here>', + init) + .then((response) => response.json()) + .then(function(data) { + let photoDiv = document.querySelector('#friendDiv'); + let returnedContacts = data.memberResourceNames; + for (var i = 0; i < returnedContacts.length; i++) { + fetch( + 'https://people.googleapis.com/v1/' + returnedContacts[i] + + '?personFields=photos&key=<API_Key_Here>', + init) + .then((response) => response.json()) + .then(function(data) { + let profileImg = document.createElement('img'); + profileImg.src = data.photos[0].url; + photoDiv.appendChild(profileImg); + }); + }; + }); + }); + }); +};
diff --git a/chrome/common/extensions/docs/static/images/best_practices/enable_html.png b/chrome/common/extensions/docs/static/images/best_practices/enable_html.png new file mode 100644 index 0000000..ecb7b45f --- /dev/null +++ b/chrome/common/extensions/docs/static/images/best_practices/enable_html.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/best_practices/enable_permissions.png b/chrome/common/extensions/docs/static/images/best_practices/enable_permissions.png new file mode 100644 index 0000000..6b7ab11 --- /dev/null +++ b/chrome/common/extensions/docs/static/images/best_practices/enable_permissions.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/oauth2/api_credentials.png b/chrome/common/extensions/docs/static/images/oauth2/api_credentials.png new file mode 100644 index 0000000..8a86586 --- /dev/null +++ b/chrome/common/extensions/docs/static/images/oauth2/api_credentials.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/oauth2/create_credentials.png b/chrome/common/extensions/docs/static/images/oauth2/create_credentials.png new file mode 100644 index 0000000..26712fac --- /dev/null +++ b/chrome/common/extensions/docs/static/images/oauth2/create_credentials.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/oauth2/enable_people.png b/chrome/common/extensions/docs/static/images/oauth2/enable_people.png new file mode 100644 index 0000000..06dfe36 --- /dev/null +++ b/chrome/common/extensions/docs/static/images/oauth2/enable_people.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/oauth2/extension_ids.png b/chrome/common/extensions/docs/static/images/oauth2/extension_ids.png new file mode 100644 index 0000000..41eb0b5 --- /dev/null +++ b/chrome/common/extensions/docs/static/images/oauth2/extension_ids.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/oauth2/first_flow.png b/chrome/common/extensions/docs/static/images/oauth2/first_flow.png new file mode 100644 index 0000000..ca9d027 --- /dev/null +++ b/chrome/common/extensions/docs/static/images/oauth2/first_flow.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/oauth2/friendblock_block.png b/chrome/common/extensions/docs/static/images/oauth2/friendblock_block.png new file mode 100644 index 0000000..40a89d2 --- /dev/null +++ b/chrome/common/extensions/docs/static/images/oauth2/friendblock_block.png Binary files differ
diff --git a/chrome/common/extensions/docs/static/images/oauth2/register_extension.png b/chrome/common/extensions/docs/static/images/oauth2/register_extension.png new file mode 100644 index 0000000..a48b2853 --- /dev/null +++ b/chrome/common/extensions/docs/static/images/oauth2/register_extension.png Binary files differ
diff --git a/chrome/common/extensions/docs/templates/articles/tut_oauth.html b/chrome/common/extensions/docs/templates/articles/tut_oauth.html index 9cef58d..0917acae 100644 --- a/chrome/common/extensions/docs/templates/articles/tut_oauth.html +++ b/chrome/common/extensions/docs/templates/articles/tut_oauth.html
@@ -1,218 +1,382 @@ -<h1>Tutorial: OAuth</h1> - - +<h1>OAuth2: Authenticate Users with Google</h1> <p> -<a href="http://oauth.net/">OAuth</a> is an open protocol that aims to standardize the way desktop and web applications access a user's private data. OAuth provides a mechanism for users to grant access to private data without sharing their private credentials (username/password). Many sites have started enabling APIs to use OAuth because of its security and standard set of libraries. + <a href="https://oauth.net/2/">OAuth2</a> is the industry-standard + protocol for authorization. + It provides a mechanism for users to grant web and desktop applications + access to private information without sharing their username, password and + other private credentials. </p> <p> -This tutorial will walk you through the necessary steps for creating a Google Chrome Extension that uses OAuth to access an API. It leverages a library that you can reuse in your extensions. + This tutorial builds an extension that accesses a user's Google contacts using + the <a href="https://developers.google.com/people/">Google People API</a> and + the <a href="/identity">Chrome Identity API</a>. + Because extensions don’t load over HTTPS, + can’t perform redirects or set cookies, + they rely on the Chrome Identity API to use OAuth2. +</p> +<h2 id="set_up">Get Started</h2> +<p> + Begin by creating a directory and the following starter files. </p> <p> -This tutorial uses the <a href="http://code.google.com/apis/documents/">Google Documents List Data API</a> as an example OAuth-enabled API endpoint. + The full, completed extension can be downloaded + <a href="examples/tutorials/oauth_tutorial_complete.zip" + download="oauth_tutorial_complete.zip">here</a>. </p> - -<h2 id="requirements">Requirements</h2> - +<h3 id="manifest">manifest.json</h3> <p> -This tutorial expects that you have some experience writing extensions for Google Chrome and some familiarity with the <a href="http://code.google.com/apis/accounts/docs/OAuth.html">3-legged OAuth</a> flow. Although you don’t need a background in the <a href="http://code.google.com/apis/documents/">Google Documents List Data API</a> (or the other <a href="http://code.google.com/apis/gdata/">Google Data APIs</a> for that matter), having an understanding of the protocol may be helpful. + Add the manifest by creating a file called <code>manifest.json</code> + and include the following code. + Or download the file + <a href="examples/tutorials/oauth_starter/manifest.json" + download="manifest.json">here</a>. </p> - -<h2 id="getting-started">Getting started</h2> - -<p> -First, copy the four library files from the Chromium source tree at <a href="https://chromium.googlesource.com/chromium/src/+/master/chrome/common/extensions/docs/examples/extensions/oauth_contacts/">.../examples/extensions/oauth_contacts/</a>: -</p> -<ul> -<li><strong><a href="examples/extensions/oauth_contacts/chrome_ex_oauth.html" download="chrome_ex_oauth.html">chrome_ex_oauth.html</a></strong> - interstitial page for the oauth_callback URL</li> -<li><strong><a href="examples/extensions/oauth_contacts/chrome_ex_oauth.js" download="chrome_ex_oauth.js">chrome_ex_oauth.js</a></strong> - core OAuth library</li> -<li><strong><a href="examples/extensions/oauth_contacts/chrome_ex_oauthsimple.js" download="chrome_ex_oauthsimple.js">chrome_ex_oauthsimple.js</a></strong> - helpful wrapper for chrome_ex_oauth.js</li> -<li><strong><a href="examples/extensions/oauth_contacts/onload.js" download="onload.js">onload.js</a></strong> - -initializes chrome_ex_oauth.html and redirects the page if needed to start the OAuth flow</li> -</ul> - -<p>Place the four library files in the root of your extension directory (or wherever your JavaScript is stored). Then include the .js files in your background page in the following order:</p> - -<pre> -<script type="text/javascript" src="chrome_ex_oauthsimple.js"></script> -<script type="text/javascript" src="chrome_ex_oauth.js"></script> -<script type="text/javascript" src="onload.js"></script> -</pre> - -<p>Your background page will manage the OAuth flow.</p> - -<h2 id="oauth-dance">The OAuth dance in an extension</h2> - -<p> -If you are familiar with the OAuth protocol, you'll recall that the OAuth dance consists of three steps: -</p> - -<ol> -<li>fetching an initial request token</li> -<li>having the user authorize the request token</li> -<li>fetching an access token</li> -</ol> - -<p>In the context of an extension, this flow gets a bit tricky. Namely, there is no established consumer key/secret between the service provider and the application. That is, there is no web application URL for the user to be redirected to after the approval process. -</p> - -<p> -Luckily, Google and a few other companies have been working on an <a href="http://code.google.com/apis/accounts/docs/OAuthForInstalledApps.html">OAuth for installed applications</a> solution that you can use from an extension environment. In the installed applications OAuth dance, the consumer key/secret are ‘anonymous’/’anonymous’ and you provide an <em>application name</em> for the user to grant access to (instead of an application URL). The end result is the same: your background page requests the initial token, opens a new tab to the approval page, and finally makes the asynchronous call for the access token. -</p> - -<h3 id="set-code">Setup code</h3> - -<p>To initialize the library, create a <code>ChromeExOAuth</code> object in the background page:</p> - -<pre> -var oauth = ChromeExOAuth.initBackgroundPage({ - 'request_url': <OAuth request URL>, - 'authorize_url': <OAuth authorize URL>, - 'access_url': <OAuth access token URL>, - 'consumer_key': <OAuth consumer key>, - 'consumer_secret': <OAuth consumer secret>, - 'scope': <scope of data access, not used by all OAuth providers>, - 'app_name': <application name, not used by all OAuth providers> -}); -</pre> - -<p>In the case of the Documents List API and Google’s OAuth endpoints, a possible initialization may be:</p> - -<pre> -var oauth = ChromeExOAuth.initBackgroundPage({ - 'request_url': 'https://www.google.com/accounts/OAuthGetRequestToken', - 'authorize_url': 'https://www.google.com/accounts/OAuthAuthorizeToken', - 'access_url': 'https://www.google.com/accounts/OAuthGetAccessToken', - 'consumer_key': 'anonymous', - 'consumer_secret': 'anonymous', - 'scope': 'https://docs.google.com/feeds/', - 'app_name': 'My Google Docs Extension' -}); -</pre> - -<p> -To use the OAuth library, -you must declare the "tabs" permision in the -<a href="manifest">extension manifest</a>. -You must also declare the sites you are using -including the request URL, the authorize URL, access URL, -and, if necessary, the scope URL. -For example: -</p> - <pre data-filename="manifest.json"> -"permissions": [ "tabs", "https://docs.google.com/feeds/*", - "https://www.google.com/accounts/OAuthGetRequestToken", - "https://www.google.com/accounts/OAuthAuthorizeToken", - "https://www.google.com/accounts/OAuthGetAccessToken" -] -</pre> - -<h3 id="request-token">Fetching and authorizing a request token</h3> - -<p> -Once you have your background page set up, call the <code>authorize()</code> function to begin the OAuth dance and redirect the user to the OAuth provider. The client library abstracts most of this process, so all you need to do is pass a callback to the <code>authorize()</code> function, and a new tab will open and redirect the user. -</p> - -<pre> -oauth.authorize(function() { - // ... Ready to fetch private data ... -}); -</pre> - -<p> -You don't need to provide any additional logic for storing the token and secret, as this library already stores these values in the browser’s <code>localStorage</code>. If the library already has an access token stored for the current scope, then no tab will be opened. In either case, the callback will be called. -</p> - -<h3 id="signed-requests">Sending signed API requests</h3> - -<p> -Once your specified callback is executed, call the <code>sendSignedRequest()</code> function to send signed requests to your API endpoint(s). <code>sendSignedRequest()</code> takes three arguments: a URI, a callback function, and an optional parameter object. The callback is passed two arguments: the response text and the <code>XMLHttpRequest</code> object that was used to make the request. -</p> - -<p>This example sends an HTTP <code>GET</code>:</p> - -<pre> -function callback(resp, xhr) { - // ... Process text response ... -}; - -function onAuthorized() { - var url = 'https://docs.google.com/feeds/default/private/full'; - var request = { - 'method': 'GET', - 'parameters': {'alt': 'json'} - }; - - // Send: GET https://docs.google.com/feeds/default/private/full?alt=json - oauth.sendSignedRequest(url, callback, request); -}; - -oauth.authorize(onAuthorized); -</pre> - -<p>A more complex example using an HTTP <code>POST</code> might look like this:</p> - -<pre> -function onAuthorized() { - var url = 'https://docs.google.com/feeds/default/private/full'; - var request = { - 'method': 'POST', - 'headers': { - 'GData-Version': '3.0', - 'Content-Type': 'application/atom+xml' + { + "name": "OAuth Tutorial FriendBlock", + "version": "1.0", + "description": "Uses OAuth to connect to Google's People API and display contacts photos.", + "manifest_version": 2, + "browser_action": { + "default_title": "FriendBlock, friends face's in a block." }, - 'parameters': { - 'alt': 'json' - }, - 'body': 'Data to send' - }; - - // Send: POST https://docs.google.com/feeds/default/private/full?alt=json - oauth.sendSignedRequest(url, callback, request); -}; -</pre> - -<p> -By default, the <code>sendSignedRequest()</code> function sends the <code>oauth_*</code> parameters in the URL (by calling <code>oauth.signURL()</code>). If you prefer to send the <code>oauth_*</code> parameters in the <code>Authorization</code> header (or need direct access to the generated header), use <code>getAuthorizationHeader()</code>. Its arguments are a URI, an HTTP method, and an optional object of URL query parameters as key/value pairs. -</p> - -<p>Here is the example above using <code>getAuthorizationHeader()</code> and an <code>XMLHttpRequest</code> object:</p> - -<pre> -function stringify(parameters) { - var params = []; - for(var p in parameters) { - params.push(encodeURIComponent(p) + '=' + - encodeURIComponent(parameters[p])); + "background": { + "scripts": [ + "background.js" + ], + "persistent": false + } } - return params.join('&'); -}; - -function onAuthorized() { - var method = 'POST'; - var url = 'https://docs.google.com/feeds/default/private/full'; - var params = {'alt': 'json'}; - - var xhr = new XMLHttpRequest(); - xhr.onreadystatechange = function(data) { - callback(xhr, data); - }; - xhr.open(method, url + '?' + stringify(params), true); - xhr.setRequestHeader('GData-Version', '3.0'); - xhr.setRequestHeader('Content-Type', 'application/atom+xml'); - xhr.setRequestHeader('Authorization', oauth.getAuthorizationHeader(url, method, params)); - - xhr.send('Data to send'); -}; +</pre> +<h3 id="background">background.js</h3> +<p> + Add the background script by creating a file called <code>background.js</code> + and include the following code. + Or download the file + <a href="examples/tutorials/oauth_starter/background.js" + download="background.js">here</a>. +</p> +<pre data-filename="background.js"> + chrome.browserAction.onClicked.addListener(function() { + chrome.tabs.create({url: 'index.html'}); + }); +</pre> +<h3 id="index">index.html</h3> +<p> + Add an HTML file called <code>index.html</code> + and include the following code. + Or download the file + <a href="examples/tutorials/oauth_starter/index.html" + download="index.html">here</a>. +</p> +<pre data-filename="index.html"> + <html> + <head> + <title>FriendBlock</title> + <style> + button { + padding: 10px; + background-color: #3C79F8; + display: inline-block; + } + </style> + </head> + <body> + <button>FriendBlock Contacts</button> + <div id="friendDiv"></div> + </body> + </html> </pre> -<h2 id="sample-code">Sample code</h2> - +<h2 id="upload_to_dashboard">Upload to the Developer Dashboard</h2> <p> -Sample extensions that use these techniques are available in the Chromium source tree: + Package the extension directory into a <code>.zip</code> file + and upload it to the + <a href="https://chrome.google.com/webstore/developer/dashboard"> + Chrome Developer Dashboard + </a> + without publishing it: </p> - -<ul> -<li><a href="https://chromium.googlesource.com/chromium/src/+/master/chrome/common/extensions/docs/examples/extensions/gdocs/">.../examples/extensions/gdocs/</a></li> -<li><a href="https://chromium.googlesource.com/chromium/src/+/master/chrome/common/extensions/docs/examples/extensions/oauth_contacts/">.../examples/extensions/oauth_contacts/</a></li> -</ul> +<ol> + <li> + At the Developer Dashboard, click <strong>Add new item</strong>. + </li> + <li> + Click <strong>Choose file</strong> and select the + <code>.zip</code> extension directory and upload it. + </li> + <li> + Without filling in additional fields, + select <strong>Save Draft and return to dashboard</strong>. + </li> +</ol> +<p> + Find the extension under <strong>Your Listings</strong> + and click on <strong>more info</strong>. + From the popup, + copy the public key and add it to the manifest inside the unzipped directory + under the <a href="/key"><code>"key"</code></a> field. +</p> +<pre data-filename="manifest.json"> + { + "name": "OAuth Tutorial FaceBlcok", + ... + "key": "ThisKeyIsGoingToBeVeryLong/go8GGC2u3UD9WI3MkmBgyiDPP2OreImEQhPvwpliioUMJmERZK3zPAx72z8MDvGp7Fx7ZlzuZpL4yyp4zXBI+MUhFGoqEh32oYnm4qkS4JpjWva5Ktn4YpAWxd4pSCVs8I4MZms20+yx5OlnlmWQEwQiiIwPPwG1e1jRw0Ak5duPpE3uysVGZXkGhC5FyOFM+oVXwc1kMqrrKnQiMJ3lgh59LjkX4z1cDNX3MomyUMJ+I+DaWC2VdHggB74BNANSd+zkPQeNKg3o7FetlDJya1bk8ofdNBARxHFMBtMXu/ONfCT3Q2kCY9gZDRktmNRiHG/1cXhkIcN1RWrbsCkwIDAQAB" + } +</pre> +<h2 id="extension_management">Compare IDs</h2> +<p> + Open the Extensions Management page at + <code>chrome://extensions</code>, + ensure developer mode is enabled + and upload the unpackaged extension directory. + Compare the extension ID on the extensions management page + to the Item ID in the Developer Dashboard. + They should match. +</p> +<img src="{{static}}/images/oauth2/extension_ids.png" + height="400" + alt="The ID of the extension matches in all places."> +<p> + The extension will maintain the same ID by including + the <code>"key"</code> field in the manifest. + Preserving a single ID is essential for API registration. +</p> +<h2 id="oauth_client">Create OAuth Client ID</h2> +<p> + Navigate to the + <a href="https://console.developers.google.com/apis"> + Google API console + </a> + and create a new project. + Once ready, + select <strong>Credentials</strong> in the sidebar, + click <strong>Create credentials</strong> + and choose <strong>OAuth client ID</strong>. +</p> +<img src="{{static}}/images/oauth2/create_credentials.png" + height="400" + alt="Create credentials for extension."> +<p> + On the Create client ID page, + select <strong>Chrome App</strong>. + Fill out the name of the extension + and place the extension ID at the end of the URL in the + Application ID field. +</p> +<img src="{{static}}/images/oauth2/register_extension.png" + height="350" + alt="Fill out extension information."> +<p> + Finish by clicking create. + The console will provide an OAuth client ID. +</p> +<h2 id="oauth_registration">Register OAuth in Manifest</h2> +<p> + Include the <code>"oauth2"</code> field in the extension manifest. + Place the generated OAuth client ID under <code>"client_id"</code>. + Include an empty string in <code>"scopes"</code> for now. +</p> +<pre data-filename="manifest.json"> +{ + "name": "OAuth Tutorial FriendBlock", + ... + "oauth2": { + "client_id": "yourExtensionOAuthClientIDWillGoHere.apps.googleusercontent.com", + "scopes":[""] + }, + ... +} +</pre> +<h2 id="identity_permission">Initiate First OAuth Flow</h2> +<p> + Register the <a href="/identity"><code>identity</code></a> + permission in the manifest. +</p> +<pre data-filename="manifest.json"> + { + "name": "OAuth Tutorial FaceBlcok", + ... + "permissions": [ + "identity" + ], + ... + } +</pre> +<p> + Create a file to manage the OAuth flow called + <code>oauth.js</code> and include the following code. + Or download it + <a href="examples/tutorials/oauth_starter/oauth.js" + download="oauth.js">here</a>. +</p> +<pre data-filename="oauth.js"> + window.onload = function() { + document.querySelector('button').addEventListener('click', function() { + chrome.identity.getAuthToken({interactive: true}, function(token) { + console.log(token); + }); + }); + }; +</pre> +<p> + Place a script tag for <code>oauth.js</code> in the head of + <code>index.html</code>. +</p> +<pre data-filename="index.html"> + ... + <head> + <title>FriendBlock</title> + ... + <script type="text/javascript" src="oauth.js"></script> + </head> + ... +</pre> +<p> + Reload the extension and click on the browser icon to open + <code>index.html</code>. + Open the console and click on the "FriendBlock Contacts" + button. + An OAuth token will appear in the console. +</p> +<img src="{{static}}/images/oauth2/first_flow.png" + height="150" + alt="View the token in the console."> +<h2 id="enable_people">Enable the Google People API</h2> +<p> + Return to the Google API console + and select <strong>Library</strong> from the sidebar. + Search for "Google People API", + click on the correct result + and enable it. +</p> +<img src="{{static}}/images/oauth2/enable_people.png" + height="250" + alt="Enable the People API."> +<p> + Add the + <a href="https://developers.google.com/people/"> + Google People API + </a> + client libary to <code>"scopes"</code> in the extension manifest. +</p> +<pre data-filename="manifest.json"> +{ + "name": "OAuth Tutorial FaceBlcok", + ... + "oauth2": { + "client_id": "yourExtensionOAuthClientIDWillGoHere.apps.googleusercontent.com", + "scopes": [ + "https://www.googleapis.com/auth/contacts.readonly" + ] + }, + ... +} +</pre> +<p> + Return to the Google API console + and navigate back to credentials. + Click "Create credentials" + and select "API key" from the dropdown. +</p> +<img src="{{static}}/images/oauth2/api_credentials.png" + height="350" + alt="Create People API credentials."> +<p> + Keep the generated API key for later use. +</p> +<h2 id="create_call">Create First API Request</h2> +<p> + Now that the extension has proper permissions, credentials, + and can authorize a Google user, + it can request data through the People API. + Update the code in <code>oauth.js</code> + to match below. +</p> +<pre data-filename="oauth.js"> + window.onload = function() { + document.querySelector('button').addEventListener('click', function() { + chrome.identity.getAuthToken({interactive: true}, function(token) { + let init = { + method: 'GET', + async: true, + headers: { + Authorization: 'Bearer ' + token, + 'Content-Type': 'application/json' + }, + 'contentType': 'json' + }; + fetch( + 'https://people.googleapis.com/v1/contactGroups/all?maxMembers=20&key=<b><API_Key_Here></b>', + init) + .then((response) => response.json()) + .then(function(data) { + console.log(data) + }); + }); + }); + }; +</pre> +<p> + Replace <code><API_Key_Here></code> with the API key + generated from the Google API console. + The extension should log a JSON object + that includes an array of <code>people/account_id</code>s + under the <code>memberResourceNames</code> field. +</p> +<h2 id="block_faces">Block Faces</h2> +<p> + Now that the extension is returning a list of the user's contacts, + it can make additional requests to + <a href="https://developers.google.com/people/v1/read-people"> + retrieve those contact's profiles and information + </a>. + The extension will use the <code>memberResourceNames</code> + to retrieve the photo information of user contacts. + Update <code>oauth.js</code> to include the following code. +</p> +<pre data-filename="oauth.js"> + window.onload = function() { + document.querySelector('button').addEventListener('click', function() { + chrome.identity.getAuthToken({interactive: true}, function(token) { + let init = { + method: 'GET', + async: true, + headers: { + Authorization: 'Bearer ' + token, + 'Content-Type': 'application/json' + }, + 'contentType': 'json' + }; + fetch( + 'https://people.googleapis.com/v1/contactGroups/all?maxMembers=20&key=<b><API_Key_Here></b>', + init) + .then((response) => response.json()) + .then(function(data) { + let photoDiv = document.querySelector('#friendDiv'); + let returnedContacts = data.memberResourceNames; + for (let i = 0; i < returnedContacts.length; i++) { + fetch( + 'https://people.googleapis.com/v1/' + returnedContacts[i] + + '?personFields=photos&key=<b><API_Key_Here></b>', + init) + .then((response) => response.json()) + .then(function(data) { + let profileImg = document.createElement('img'); + profileImg.src = data.photos[0].url; + photoDiv.appendChild(profileImg); + }); + }; + }); + }); + }); + }; +</pre> +<p> + Reload and return to the extension. + Click the FriendBlock button and ta-da! + Enjoy contact's faces in a block. +</p> +<img src="{{static}}/images/oauth2/friendblock_block.png" + height="300" + alt="Contact faces in a block.">
diff --git a/chrome/common/extensions/docs/templates/articles/user_privacy.html b/chrome/common/extensions/docs/templates/articles/user_privacy.html new file mode 100644 index 0000000..08b51ae1 --- /dev/null +++ b/chrome/common/extensions/docs/templates/articles/user_privacy.html
@@ -0,0 +1,137 @@ +<h1>Protect User Privacy</h1> + +<p> + Users will not install an extension if it compromises their privacy + or asks for more permissions that it seems to need. + Permission requests should make sense to users + and be limited to the critical information necessary + to implement the extension. + Extensions that collect or transmit any user data must comply with the + <a href="https://developer.chrome.com/webstore/program_policies#userdata"> + user data privacy policies + </a>. +</p> +<p> + Protect and respect extension users by including these precautions + to keep their identity safe. + Remember: the less data an extension can access, + the less data it can accidentally leak. +</p> +<h2 id="required_permissions">Reduce Required Permissions</h2> + +<p> + The APIs an extension can access is specified in the permissions field of the + <a href="/manifest">manifest</a>. + The more permissions granted, + the more avenues an attacker has to intercept information. + Only the APIs an extension depends on should be listed, + and consideration should be given to less invasive options. + The less permissions an extension requests, + the less permission warnings will be shown to a user. + Users are more likely to install an extension with limited warnings. +</p> +<p> + Extensions should not "future proof" access to user data + by requesting permissions that they do not currently need, + but may implement in the future. + Include new permissions with extension updates + and consider making them <a href="#optional_permissions">optional</a>. +</p> +<h3 id="activeTab">activeTab</h3> +<p> + Extensions using host permissions to inject scripts can often substitute + <a href="/activeTab"><code>activeTab</code></a> instead. + The <code>activeTab</code> + permission will grant an extension temporary access to + the currently active tab, + only when the user <i>invokes</i> the extension. + Access is cut off when the user navigates away from or closes the current tab. + It serves as an alternative for many uses of + <code><all_urls></code>. + +</p> +<pre data-filename="manifest.json"> + { + "name": "Very Secure Extension", + "version": "1.0", + "description": "Example of a Secure Extension", + <b>"permissions": ["activeTab"],</b> + "manifest_version": 2 + } +</pre> +<p> + The activeTab permission displays no warning messages during installation. +</p> + +<h2 id="optional_permissions">Opt for Optional Permissions</h2> +<p> + Empower users to choose which features + and permissions they need from an extension by including + <a href="/permissions#manifest">optional permissions</a>. + If a feature is not essential to the core functionality of an extension, + make it optional and move the API or domain into the + <code>optional_permissions</code> field. +</p> +<pre data-filename="manifest.json"> + { + "name": "Very Secure Extension", + ... + <b>"optional_permissions": [ "tabs", "https://www.google.com/" ]</b>, + ... + } +</pre> +<p> + Including optional permissions allows an extension to explain why + it needs a particular permission when the user enables the relevant feature. + The extension can offer the user an option to enable features. +</p> +<img src="{{static}}/images/best_practices/enable_html.png" + height="150" + alt="A screenshot of a popup asking to enable permissions."> +<p> + Clicking <strong>Okay!</strong> will trigger the following event in the + background script. +</p> +<pre data-filename="background.js"> + document.querySelector('#button').addEventListener('click', function(event) { + // Permissions must be requested from inside a user gesture, like a button's + // click handler. + chrome.permissions.request({ + permissions: ['tabs'], + origins: ['http://www.google.com/'] + }, function(granted) { + // The callback argument will be true if the user granted the permissions. + if (granted) { + // doSomething(); + } else { + // doSomethingElse(); + } + }); + }); +</pre> +<p> + The user will then be prompted with the following request. +</p> +<img src="{{static}}/images/best_practices/enable_permissions.png" + height="200" + alt="A screenshot of optional permissions request."> +<p> + Optional permissions can also be implemented in an extension update. + Doing so will make the new feature available to users without disabling + the extension, + as may happen if updating with new required permissions. +</p> +<h2 id="data_collection">Limit and Secure User Information</h2> +<p> + Only request the minimum + <a href="/webstore/user_data">user data</a> + an extension needs. + The less information an extension asks from a user means + less exposure if the extension is compromised. +</p> +<p> + All requested user data should be treated with care. + Store and retrieve data in a secure server with a registered domain. + Always use HTTPS to connect and avoid keeping sensitive user data in the + client side of an extension as extension storage is not encrypted. +</p>
diff --git a/chrome/common/extensions/docs/templates/json/chrome_sidenav.json b/chrome/common/extensions/docs/templates/json/chrome_sidenav.json index 95299c7..fc389d1 100644 --- a/chrome/common/extensions/docs/templates/json/chrome_sidenav.json +++ b/chrome/common/extensions/docs/templates/json/chrome_sidenav.json
@@ -530,6 +530,10 @@ "href": "/extensions/content_scripts" }, { + "title": "Protect User Privacy", + "href": "/extensions/user_privacy" + }, + { "title": "activeTab Permission", "href": "/extensions/activeTab" },
diff --git a/chrome/common/extensions/docs/templates/public/extensions/user_privacy.html b/chrome/common/extensions/docs/templates/public/extensions/user_privacy.html new file mode 100644 index 0000000..3a6af2a --- /dev/null +++ b/chrome/common/extensions/docs/templates/public/extensions/user_privacy.html
@@ -0,0 +1 @@ +{{+partials.standard_extensions_article article:articles.user_privacy/}}
diff --git a/chrome/common/profiling/memlog_allocator_shim.cc b/chrome/common/profiling/memlog_allocator_shim.cc index d957b09..1633cdcd 100644 --- a/chrome/common/profiling/memlog_allocator_shim.cc +++ b/chrome/common/profiling/memlog_allocator_shim.cc
@@ -355,11 +355,11 @@ if (LIKELY(!reentering)) g_prevent_reentrancy.Pointer()->Set(true); - AllocatorShimLogFree(address); const AllocatorDispatch* const next = self->next; next->free_function(next, address, context); if (LIKELY(!reentering)) { + AllocatorShimLogFree(address); g_prevent_reentrancy.Pointer()->Set(false); } } @@ -416,9 +416,18 @@ void* ptr, size_t size, void* context) { - AllocatorShimLogFree(ptr); + // If this is our first time passing through, set the reentrancy bit. + bool reentering = g_prevent_reentrancy.Pointer()->Get(); + if (LIKELY(!reentering)) + g_prevent_reentrancy.Pointer()->Set(true); + const AllocatorDispatch* const next = self->next; next->free_definite_size_function(next, ptr, size, context); + + if (LIKELY(!reentering)) { + AllocatorShimLogFree(ptr); + g_prevent_reentrancy.Pointer()->Set(false); + } } AllocatorDispatch g_memlog_hooks = {
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index b4626ee..aa26cb1d 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc
@@ -211,7 +211,8 @@ const base::FilePath& target_path, const base::Version& new_version, WorkItemList* list) { - base::string16 toast_activator_reg_path = GetToastActivatorRegistryPath(); + base::string16 toast_activator_reg_path = + InstallUtil::GetToastActivatorRegistryPath(); if (toast_activator_reg_path.empty()) { LOG(DFATAL) << "Cannot retrieve the toast activator registry path";
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc index 74bcb7a..e5d5fdb 100644 --- a/chrome/installer/setup/setup_util.cc +++ b/chrome/installer/setup/setup_util.cc
@@ -879,18 +879,4 @@ windows_version >= base::win::VERSION_WIN10_RS1; } -base::string16 GetToastActivatorRegistryPath() { - // CLSID has a string format of "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}", - // which contains 38 characters. The length is 39 to make space for the null - // string terminator. - constexpr int kGuidLength = 39; - base::string16 guid_string; - if (::StringFromGUID2(install_static::GetToastActivatorClsid(), - base::WriteInto(&guid_string, kGuidLength), - kGuidLength) != kGuidLength) { - return base::string16(); - } - return L"Software\\Classes\\CLSID\\" + guid_string; -} - } // namespace installer
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h index ed655efc..e7ec901 100644 --- a/chrome/installer/setup/setup_util.h +++ b/chrome/installer/setup/setup_util.h
@@ -162,10 +162,6 @@ // tiles. bool OsSupportsDarkTextTiles(); -// Returns the toast activator registry path if found, or an empty string in -// case of error. -base::string16 GetToastActivatorRegistryPath(); - } // namespace installer #endif // CHROME_INSTALLER_SETUP_SETUP_UTIL_H_
diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc index 3c535059..22e3439 100644 --- a/chrome/installer/setup/setup_util_unittest.cc +++ b/chrome/installer/setup/setup_util_unittest.cc
@@ -453,24 +453,6 @@ EXPECT_FALSE(start_time.is_null()); } -TEST(SetupUtilTest, GetToastActivatorRegistryPath) { - base::string16 toast_activator_reg_path = - installer::GetToastActivatorRegistryPath(); - EXPECT_FALSE(toast_activator_reg_path.empty()); - - // Confirm that the string is a path followed by a GUID. - size_t guid_begin = toast_activator_reg_path.find('{'); - EXPECT_NE(base::string16::npos, guid_begin); - EXPECT_NE(0u, guid_begin); - EXPECT_EQ(L'\\', toast_activator_reg_path[guid_begin - 1]); - - // A GUID has the form "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}". - constexpr size_t kGuidLength = 38; - EXPECT_EQ(kGuidLength, toast_activator_reg_path.length() - guid_begin); - - EXPECT_EQ('}', toast_activator_reg_path.back()); -} - namespace installer { class DeleteRegistryKeyPartialTest : public ::testing::Test {
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index c49315d9..50bbe89 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc
@@ -640,7 +640,8 @@ InstallUtil::DeleteRegistryKey(root, reg_app_id, WorkItem::kWow64Default); // Delete Software\Classes\CLSID\|toast_activator_clsid|. - base::string16 toast_activator_reg_path = GetToastActivatorRegistryPath(); + base::string16 toast_activator_reg_path = + InstallUtil::GetToastActivatorRegistryPath(); if (!toast_activator_reg_path.empty()) { InstallUtil::DeleteRegistryKey(root, toast_activator_reg_path, WorkItem::kWow64Default);
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc index 995cad7..d3642b3 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc
@@ -23,6 +23,7 @@ #include "base/values.h" #include "base/version.h" #include "base/win/registry.h" +#include "base/win/shortcut.h" #include "base/win/windows_version.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -33,6 +34,7 @@ #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/l10n_string_util.h" +#include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/work_item_list.h" @@ -278,6 +280,49 @@ } // static +bool InstallUtil::IsStartMenuShortcutWithActivatorGuidInstalled() { + BrowserDistribution* dist = BrowserDistribution::GetDistribution(); + base::FilePath shortcut_path; + + if (!ShellUtil::GetShortcutPath( + ShellUtil::SHORTCUT_LOCATION_START_MENU_ROOT, dist, + install_static::IsSystemInstall() ? ShellUtil::SYSTEM_LEVEL + : ShellUtil::CURRENT_USER, + &shortcut_path)) { + return false; + } + + shortcut_path = + shortcut_path.Append(dist->GetShortcutName() + installer::kLnkExt); + if (!base::PathExists(shortcut_path)) + return false; + + base::win::ShortcutProperties properties; + base::win::ResolveShortcutProperties( + shortcut_path, + base::win::ShortcutProperties::PROPERTIES_TOAST_ACTIVATOR_CLSID, + &properties); + + return ::IsEqualCLSID(properties.toast_activator_clsid, + install_static::GetToastActivatorClsid()); +} + +// static +base::string16 InstallUtil::GetToastActivatorRegistryPath() { + // CLSID has a string format of "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}", + // which contains 38 characters. The length is 39 to make space for the + // string terminator. + constexpr int kGuidLength = 39; + base::string16 guid_string; + if (::StringFromGUID2(install_static::GetToastActivatorClsid(), + base::WriteInto(&guid_string, kGuidLength), + kGuidLength) != kGuidLength) { + return base::string16(); + } + return L"Software\\Classes\\CLSID\\" + guid_string; +} + +// static bool InstallUtil::GetEULASentinelFilePath(base::FilePath* path) { base::FilePath user_data_dir; if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h index 0b94257aa..7c6bf75 100644 --- a/chrome/installer/util/install_util.h +++ b/chrome/installer/util/install_util.h
@@ -89,6 +89,14 @@ // Returns true if the sentinel file exists (or the path cannot be obtained). static bool IsFirstRunSentinelPresent(); + // Test to see if a Start menu shortcut exists with the right toast activator + // CLSID registered. + static bool IsStartMenuShortcutWithActivatorGuidInstalled(); + + // Returns the toast activator registry path if found, or an empty string in + // case of error. + static base::string16 GetToastActivatorRegistryPath(); + // Populates |path| with EULA sentinel file path. Returns false on error. static bool GetEULASentinelFilePath(base::FilePath* path);
diff --git a/chrome/installer/util/install_util_unittest.cc b/chrome/installer/util/install_util_unittest.cc index 29f108d0..5f3472d8 100644 --- a/chrome/installer/util/install_util_unittest.cc +++ b/chrome/installer/util/install_util_unittest.cc
@@ -554,3 +554,21 @@ EXPECT_TRUE(InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER, L"TestKey", WorkItem::kWow64Default)); } + +TEST_F(InstallUtilTest, GetToastActivatorRegistryPath) { + base::string16 toast_activator_reg_path = + InstallUtil::GetToastActivatorRegistryPath(); + EXPECT_FALSE(toast_activator_reg_path.empty()); + + // Confirm that the string is a path followed by a GUID. + size_t guid_begin = toast_activator_reg_path.find('{'); + EXPECT_NE(std::wstring::npos, guid_begin); + ASSERT_GE(guid_begin, 1u); + EXPECT_EQ(L'\\', toast_activator_reg_path[guid_begin - 1]); + + // A GUID has the form "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}". + constexpr size_t kGuidLength = 38; + EXPECT_EQ(kGuidLength, toast_activator_reg_path.length() - guid_begin); + + EXPECT_EQ('}', toast_activator_reg_path.back()); +}
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index 1ec9a53..b9c85dd 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn
@@ -127,7 +127,7 @@ "//components/safe_browsing/renderer:throttles", "//components/security_interstitials/core:", "//components/security_interstitials/core/common/interfaces:", - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", "//components/startup_metric_utils/common:interfaces", "//components/subresource_filter/content/renderer", "//components/task_scheduler_util/common",
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 700886c..2b090b35 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -81,7 +81,7 @@ #include "components/pdf/renderer/pepper_pdf_host.h" #include "components/safe_browsing/renderer/threat_dom_details.h" #include "components/safe_browsing/renderer/websocket_sb_handshake_throttle.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "components/startup_metric_utils/common/startup_metric.mojom.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" @@ -1217,6 +1217,13 @@ } } +void ChromeContentRendererClient::PostIOThreadCreated( + base::SingleThreadTaskRunner* io_thread_task_runner) { + io_thread_task_runner->PostTask( + FROM_HERE, base::BindOnce(&ThreadProfiler::StartOnChildThread, + metrics::CallStackProfileParams::IO_THREAD)); +} + void ChromeContentRendererClient::PostCompositorThreadCreated( base::SingleThreadTaskRunner* compositor_thread_task_runner) { compositor_thread_task_runner->PostTask(
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index a7d4d890..92967a4 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -21,7 +21,7 @@ #include "components/nacl/common/buildflags.h" #include "components/rappor/public/interfaces/rappor_recorder.mojom.h" #include "components/safe_browsing/common/safe_browsing.mojom.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_thread.h" #include "extensions/features/features.h" @@ -145,6 +145,8 @@ void DeferMediaLoad(content::RenderFrame* render_frame, bool has_played_media_before, const base::Closure& closure) override; + void PostIOThreadCreated( + base::SingleThreadTaskRunner* io_thread_task_runner) override; void PostCompositorThreadCreated( base::SingleThreadTaskRunner* compositor_thread_task_runner) override; bool RunIdleHandlerWhenWidgetsHidden() override;
diff --git a/chrome/service/BUILD.gn b/chrome/service/BUILD.gn index 058473db..31ea147d 100644 --- a/chrome/service/BUILD.gn +++ b/chrome/service/BUILD.gn
@@ -63,6 +63,7 @@ "//components/cloud_devices/common", "//components/data_use_measurement/core", "//components/network_session_configurator/browser", + "//components/printing/common", "//google_apis", "//jingle:notifier", "//mojo/edk/system",
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index c52e001f..999f06a 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -348,7 +348,7 @@ "//chrome/browser/profiling_host:profiling_browsertests", "//components/grpc_support/test:quic_test_server", "//components/nacl/common:buildflags", - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", "//components/sync:test_support_model", "//extensions/features", "//media:media_features", @@ -1264,7 +1264,6 @@ "../browser/extensions/extension_unload_browsertest.cc", "../browser/extensions/extension_url_rewrite_browsertest.cc", "../browser/extensions/extension_view_host_factory_browsertest.cc", - "../browser/extensions/extension_web_ui_browsertest.cc", "../browser/extensions/extension_websocket_apitest.cc", "../browser/extensions/extension_webui_apitest.cc", "../browser/extensions/extension_with_management_policy_apitest.cc", @@ -2120,6 +2119,8 @@ data = [ "//testing/scripts/run_performance_tests.py", + "//testing/scripts/run_gtest_perf_test.py", + "//testing/scripts/run_telemetry_benchmark_as_googletest.py", ] } @@ -2701,7 +2702,7 @@ "//components/safe_browsing:features", "//components/safe_browsing/db", "//components/safe_browsing/db:test_database_manager", - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", "//components/strings", "//components/subresource_filter/core/browser:test_support", "//components/sync:test_support_driver", @@ -3011,7 +3012,7 @@ deps += [ "//chrome/browser/resource_coordinator:tab_metrics_event_proto", "//components/favicon/core/test:test_support", - "//components/signin/core/browser:signin_features", + "//components/signin/core/browser:signin_buildflags", "//services/metrics/public/cpp:ukm_builders", "//third_party/libaddressinput", ] @@ -3253,7 +3254,6 @@ "../browser/extensions/api/developer_private/extension_info_generator_unittest.cc", "../browser/extensions/api/device_permissions_manager_unittest.cc", "../browser/extensions/api/downloads/downloads_api_unittest.cc", - "../browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc", "../browser/extensions/api/extension_action/browser_action_unittest.cc", "../browser/extensions/api/extension_action/extension_action_prefs_unittest.cc", "../browser/extensions/api/file_system/file_system_api_unittest.cc", @@ -3389,10 +3389,6 @@ "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc", "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h", "../browser/safe_search_api/safe_search_url_checker_unittest.cc", - "../browser/signin/easy_unlock_auth_attempt_unittest.cc", - "../browser/signin/easy_unlock_notification_controller_chromeos_unittest.cc", - "../browser/signin/easy_unlock_screenlock_state_handler_unittest.cc", - "../browser/signin/easy_unlock_service_unittest_chromeos.cc", "../browser/sync/glue/extensions_activity_monitor_unittest.cc", "../browser/sync_file_system/drive_backend/callback_helper_unittest.cc", "../browser/sync_file_system/drive_backend/callback_tracker_unittest.cc", @@ -3538,8 +3534,13 @@ } if (is_chromeos) { sources += [ + "../browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc", "../browser/extensions/api/file_system/consent_provider_unittest.cc", "../browser/signin/easy_unlock_app_manager_unittest.cc", + "../browser/signin/easy_unlock_auth_attempt_unittest.cc", + "../browser/signin/easy_unlock_notification_controller_chromeos_unittest.cc", + "../browser/signin/easy_unlock_screenlock_state_handler_unittest.cc", + "../browser/signin/easy_unlock_service_unittest_chromeos.cc", ] } else { sources += [ @@ -3727,7 +3728,7 @@ "../browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc", "../browser/ui/webui/print_preview/print_preview_handler_unittest.cc", "../browser/ui/webui/print_preview/print_preview_ui_unittest.cc", - "../browser/ui/webui/print_preview/printer_capabilities_unittest.cc", + "../browser/ui/webui/print_preview/print_preview_utils_unittest.cc", ] deps += [ @@ -4992,7 +4993,7 @@ "//chrome/renderer", "//components/about_handler", "//components/autofill/content/renderer:test_support", - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", "//content/test:test_support", "//extensions/features", "//media/cast:test_support", @@ -5414,6 +5415,8 @@ "//testing/scripts/common.py", "//testing/xvfb.py", "//testing/scripts/run_gtest_perf_test.py", + "//testing/scripts/run_performance_tests.py", + "//testing/scripts/run_telemetry_benchmark_as_googletest.py", "//tools/perf/generate_legacy_perf_dashboard_json.py", ]
diff --git a/chrome/test/base/chrome_render_view_test.cc b/chrome/test/base/chrome_render_view_test.cc index bc26e29b..a29e761f 100644 --- a/chrome/test/base/chrome_render_view_test.cc +++ b/chrome/test/base/chrome_render_view_test.cc
@@ -17,7 +17,7 @@ #include "components/autofill/content/renderer/test_password_autofill_agent.h" #include "components/autofill/content/renderer/test_password_generation_agent.h" #include "components/spellcheck/renderer/spellcheck.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/common/renderer_preferences.h" #include "content/public/renderer/render_view.h"
diff --git a/chrome/test/base/interactive_test_utils.cc b/chrome/test/base/interactive_test_utils.cc index 22a8418..56fce71 100644 --- a/chrome/test/base/interactive_test_utils.cc +++ b/chrome/test/base/interactive_test_utils.cc
@@ -202,11 +202,13 @@ void ClickTask(ui_controls::MouseButton button, int state, - const base::Closure& followup) { - if (!followup.is_null()) - ui_controls::SendMouseEventsNotifyWhenDone(button, state, followup); - else + base::OnceClosure followup) { + if (!followup.is_null()) { + ui_controls::SendMouseEventsNotifyWhenDone(button, state, + std::move(followup)); + } else { ui_controls::SendMouseEvents(button, state); + } } } // namespace internal
diff --git a/chrome/test/base/interactive_test_utils.h b/chrome/test/base/interactive_test_utils.h index 55fea9a..b7c2b57 100644 --- a/chrome/test/base/interactive_test_utils.h +++ b/chrome/test/base/interactive_test_utils.h
@@ -194,7 +194,7 @@ // ui_controls_linux.cc and ui_controls_mac.cc void ClickTask(ui_controls::MouseButton button, int state, - const base::Closure& followup); + base::OnceClosure followup); } // namespace internal
diff --git a/chrome/test/base/interactive_test_utils_cocoa.mm b/chrome/test/base/interactive_test_utils_cocoa.mm index ee4e8c2..7743d9eb 100644 --- a/chrome/test/base/interactive_test_utils_cocoa.mm +++ b/chrome/test/base/interactive_test_utils_cocoa.mm
@@ -38,7 +38,7 @@ ui_controls::SendMouseMoveNotifyWhenDone( center.x, center.y, - base::Bind(&internal::ClickTask, button, state, task)); + base::BindOnce(&internal::ClickTask, button, state, task)); } } // namespace
diff --git a/chrome/test/base/interactive_test_utils_common_views.cc b/chrome/test/base/interactive_test_utils_common_views.cc index c28f5b48..ce7ce3360 100644 --- a/chrome/test/base/interactive_test_utils_common_views.cc +++ b/chrome/test/base/interactive_test_utils_common_views.cc
@@ -32,9 +32,8 @@ gfx::Point view_center(view->width() / 2, view->height() / 2); views::View::ConvertPointToScreen(view, &view_center); ui_controls::SendMouseMoveNotifyWhenDone( - view_center.x(), - view_center.y(), - base::Bind(&internal::ClickTask, button, state, closure)); + view_center.x(), view_center.y(), + base::BindOnce(&internal::ClickTask, button, state, closure)); } } // namespace ui_test_utils
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h index 4efe0795..5d339e1e2 100644 --- a/chrome/test/base/view_event_test_base.h +++ b/chrome/test/base/view_event_test_base.h
@@ -69,7 +69,7 @@ // // Schedule the mouse move at a location slightly different from where // // you really want to move to. // ui_controls::SendMouseMoveNotifyWhenDone(loc.x + 10, loc.y, -// base::Bind(&YYY, this)); +// base::BindOnce(&YYY, this)); // // Then use this to schedule another mouse move. // ScheduleMouseMoveInBackground(loc.x, loc.y);
diff --git a/chrome/test/data/extensions/permissions_increase/v1/manifest.json b/chrome/test/data/extensions/permissions_increase/v1/manifest.json index b88a4e1..374769e 100644 --- a/chrome/test/data/extensions/permissions_increase/v1/manifest.json +++ b/chrome/test/data/extensions/permissions_increase/v1/manifest.json
@@ -1,6 +1,7 @@ { "version": "1", + "manifest_version": 2, "name": "Permission Test", - "background_page": "background.html", + "background": { "page": "background.html" }, "update_url": "http://localhost/autoupdate/updates.xml" }
diff --git a/chrome/test/data/extensions/permissions_increase/v2/manifest.json b/chrome/test/data/extensions/permissions_increase/v2/manifest.json index 6d59e06..e33a7064 100644 --- a/chrome/test/data/extensions/permissions_increase/v2/manifest.json +++ b/chrome/test/data/extensions/permissions_increase/v2/manifest.json
@@ -1,7 +1,8 @@ { "version": "2", + "manifest_version": 2, "name": "Permission Test", - "background_page": "background.html", + "background": { "page": "background.html" }, "update_url": "http://localhost/autoupdate/updates.xml", "permissions": [ "tabs"
diff --git a/chrome/test/data/extensions/permissions_increase/v3/manifest.json b/chrome/test/data/extensions/permissions_increase/v3/manifest.json index 6a84a37c..ec937c6 100644 --- a/chrome/test/data/extensions/permissions_increase/v3/manifest.json +++ b/chrome/test/data/extensions/permissions_increase/v3/manifest.json
@@ -1,7 +1,8 @@ { "version": "3", + "manifest_version": 2, "name": "Permission Test", - "background_page": "background.html", + "background": { "page": "background.html" }, "update_url": "http://localhost/autoupdate/updates.xml", "permissions": [ "tabs", "management"
diff --git a/chrome/test/data/import/firefox/57.0.1/favicons.sqlite b/chrome/test/data/import/firefox/57.0.1/favicons.sqlite index 9c09ef25..72a58f4 100644 --- a/chrome/test/data/import/firefox/57.0.1/favicons.sqlite +++ b/chrome/test/data/import/firefox/57.0.1/favicons.sqlite Binary files differ
diff --git a/chrome/test/data/webui/settings/edit_dictionary_page_test.js b/chrome/test/data/webui/settings/edit_dictionary_page_test.js index 570caece..8c320333 100644 --- a/chrome/test/data/webui/settings/edit_dictionary_page_test.js +++ b/chrome/test/data/webui/settings/edit_dictionary_page_test.js
@@ -91,7 +91,7 @@ function() { Polymer.dom.flush(); - assertTrue(!!editDictPage.$$('#noWordsLabel')); + assertFalse(editDictPage.$.noWordsLabel.hidden); assertFalse(!!editDictPage.$$('#list')); }); }); @@ -104,7 +104,7 @@ MockInteractions.tap(addWordButton); Polymer.dom.flush(); - assertFalse(!!editDictPage.$$('#noWordsLabel')); + assertTrue(editDictPage.$.noWordsLabel.hidden); assertTrue(!!editDictPage.$$('#list')); assertEquals(2, editDictPage.$$('#list').items.length); });
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc index 528b73ff..d779eb6 100644 --- a/chrome/utility/importer/firefox_importer.cc +++ b/chrome/utility/importer/firefox_importer.cc
@@ -843,6 +843,9 @@ std::map<uint64_t, size_t> icon_cache; for (const auto& entry : bookmarks) { + // Reset the SQL statement at the start of the loop rather than at the end + // to simplify early-continue logic. + s.Reset(true); s.BindString(0, entry.url.spec()); if (s.Step()) { uint64_t icon_id = s.ColumnInt64(0); @@ -865,6 +868,5 @@ favicons->push_back(usage_data); icon_cache[icon_id] = favicons->size() - 1; } - s.Reset(true); } }
diff --git a/chrome/utility/importer/firefox_importer_unittest.cc b/chrome/utility/importer/firefox_importer_unittest.cc index 863b4570c..79eaf3b 100644 --- a/chrome/utility/importer/firefox_importer_unittest.cc +++ b/chrome/utility/importer/firefox_importer_unittest.cc
@@ -207,17 +207,15 @@ EXPECT_EQ("https://www.mozilla.org/en-US/about/", bookmarks[4].url.spec()); EXPECT_EQ("https://www.google.com/", bookmarks[5].url.spec()); - ASSERT_EQ(5u, favicons.size()); + ASSERT_EQ(4u, favicons.size()); EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/0-1513248843421", favicons[0].favicon_url.spec()); EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/1-1513248843424", favicons[1].favicon_url.spec()); - EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/2-1513248843426", - favicons[2].favicon_url.spec()); EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/3-1513248843427", - favicons[3].favicon_url.spec()); + favicons[2].favicon_url.spec()); EXPECT_EQ("http://www.mozilla.org/2005/made-up-favicon/4-1513248843429", - favicons[4].favicon_url.spec()); + favicons[3].favicon_url.spec()); } TEST(FirefoxImporterTest, ImportHistorySchema) {
diff --git a/chromecast/android/BUILD.gn b/chromecast/android/BUILD.gn index c8b4580ef..6bc8eed 100644 --- a/chromecast/android/BUILD.gn +++ b/chromecast/android/BUILD.gn
@@ -36,7 +36,6 @@ deps += [ "//device/bluetooth", "//device/gamepad", - "//device/sensors", "//media/midi", "//ui/android", "//ui/events/devices",
diff --git a/chromecast/media/cma/backend/BUILD.gn b/chromecast/media/cma/backend/BUILD.gn index dbf25f69..1d0f2a1 100644 --- a/chromecast/media/cma/backend/BUILD.gn +++ b/chromecast/media/cma/backend/BUILD.gn
@@ -117,16 +117,28 @@ ] } +cast_source_set("audio_helpers") { + sources = [ + "audio_fader.cc", + "audio_fader.h", + ] + + deps = [ + "//base", + "//media", + ] +} + cast_source_set("for_mixer_audio") { sources = [ "audio_decoder_for_mixer.cc", "audio_decoder_for_mixer.h", - "audio_fader.cc", - "audio_fader.h", "buffering_mixer_source.cc", "buffering_mixer_source.h", "cast_audio_json.cc", "cast_audio_json.h", + "direct_mixer_source.cc", + "direct_mixer_source.h", "filter_group.cc", "filter_group.h", "media_codec_support_cast_audio.cc", @@ -150,6 +162,7 @@ deps = [ ":audio_buildflags", + ":audio_helpers", ":null", ":public", "//base", @@ -183,6 +196,7 @@ ] deps = [ + ":audio_helpers", ":for_mixer_audio", ":public", "//base",
diff --git a/chromecast/media/cma/backend/audio_fader.cc b/chromecast/media/cma/backend/audio_fader.cc index e951314..f7d2beb 100644 --- a/chromecast/media/cma/backend/audio_fader.cc +++ b/chromecast/media/cma/backend/audio_fader.cc
@@ -43,7 +43,7 @@ // Move data in fade_buffer_ to start. for (int c = 0; c < fade_buffer_->channels(); ++c) { - float* channel_data = buffer->channel(c); + float* channel_data = fade_buffer_->channel(c); memmove(channel_data, channel_data + filled_frames, buffered_frames_ * sizeof(float)); }
diff --git a/chromecast/media/cma/backend/audio_fader_unittest.cc b/chromecast/media/cma/backend/audio_fader_unittest.cc index 195b1d2c..c1d7047 100644 --- a/chromecast/media/cma/backend/audio_fader_unittest.cc +++ b/chromecast/media/cma/backend/audio_fader_unittest.cc
@@ -4,6 +4,7 @@ #include <algorithm> #include <limits> +#include <memory> #include "base/macros.h" #include "chromecast/media/cma/backend/audio_fader.h" @@ -21,6 +22,16 @@ const int kNumChannels = 2; const int kFadeFrames = 128; +std::unique_ptr<::media::AudioBus> CreateAudioBus(int num_frames) { + auto buffer = ::media::AudioBus::Create(kNumChannels, num_frames); + // Fill with invalid values. + for (int c = 0; c < buffer->channels(); ++c) { + float* channel_data = buffer->channel(c); + std::fill_n(channel_data, num_frames, -2.0f); + } + return buffer; +} + class TestFaderSource : public AudioFader::Source { public: TestFaderSource() @@ -76,7 +87,7 @@ // The fader should fill its internal buffer, plus the size of the request. EXPECT_EQ(frames_needed, kFadeFrames + kFillSize); - auto dest = ::media::AudioBus::Create(kNumChannels, kFillSize); + auto dest = CreateAudioBus(kFillSize); EXPECT_EQ(fader.FillFrames(kFillSize, dest.get()), kFillSize); // Test that FramesNeededFromSource() works correctly. @@ -99,7 +110,7 @@ const int kFillSize = kFadeFrames * 2 / 3; int frames_needed = fader.FramesNeededFromSource(kFillSize); - auto dest = ::media::AudioBus::Create(kNumChannels, kFillSize); + auto dest = CreateAudioBus(kFillSize); EXPECT_EQ(fader.FillFrames(kFillSize, dest.get()), kFillSize); // Fader's internal buffer should be full. @@ -132,7 +143,7 @@ EXPECT_EQ(fader.buffered_frames(), 0); const int kFillSize = kFadeFrames * 2; - auto dest = ::media::AudioBus::Create(kNumChannels, kFillSize); + auto dest = CreateAudioBus(kFillSize); int frames_needed = fader.FramesNeededFromSource(kFillSize); EXPECT_EQ(fader.FillFrames(kFillSize, dest.get()), kFillSize); @@ -160,7 +171,7 @@ EXPECT_EQ(fader.buffered_frames(), 0); const int kFillSize = kFadeFrames * 2; - auto dest = ::media::AudioBus::Create(kNumChannels, kFillSize); + auto dest = CreateAudioBus(kFillSize); int frames_needed = fader.FramesNeededFromSource(kFillSize); EXPECT_EQ(fader.FillFrames(kFillSize, dest.get()), kFillSize); @@ -186,6 +197,7 @@ // Data should be faded out. EXPECT_EQ(dest->channel(0)[0], 1.0f); EXPECT_LT(dest->channel(0)[filled - 1], 0.1f); + EXPECT_GE(dest->channel(0)[filled - 1], 0.0f); // Fader's internal buffer should be empty since we are fully faded out. EXPECT_EQ(fader.buffered_frames(), 0); @@ -199,7 +211,7 @@ EXPECT_EQ(fader.buffered_frames(), 0); const int kFillSize = kFadeFrames * 2; - auto dest = ::media::AudioBus::Create(kNumChannels, kFillSize); + auto dest = CreateAudioBus(kFillSize); int frames_needed = fader.FramesNeededFromSource(kFillSize); EXPECT_EQ(fader.FillFrames(kFillSize, dest.get()), kFillSize); @@ -222,6 +234,7 @@ // Data should be partially faded out. EXPECT_EQ(dest->channel(0)[0], 1.0f); EXPECT_LT(dest->channel(0)[filled - 1], 1.0f); + EXPECT_GE(dest->channel(0)[filled - 1], 0.0f); float fade_min = dest->channel(0)[filled - 1]; // Fader's internal buffer should be partially full. @@ -254,7 +267,7 @@ // The source only partially fills the fader request. Since we're fading in // from silence, the fader should output silence. - auto dest = ::media::AudioBus::Create(kNumChannels, kFillSize); + auto dest = CreateAudioBus(kFillSize); source.set_max_fill_frames(10); int filled = fader.FillFrames(kFillSize, dest.get()); @@ -280,7 +293,7 @@ const int kFillSize = kFadeFrames * 2 / 3; int frames_needed = fader.FramesNeededFromSource(kFillSize); - auto dest = ::media::AudioBus::Create(kNumChannels, kFillSize); + auto dest = CreateAudioBus(kFillSize); EXPECT_EQ(fader.FillFrames(kFillSize, dest.get()), kFillSize); // Fader's internal buffer should be full. @@ -300,6 +313,7 @@ // Data should be faded out. EXPECT_LE(dest->channel(0)[0], fade_max); + EXPECT_GE(dest->channel(0)[0], 0.0f); EXPECT_EQ(dest->channel(0)[filled - 1], 0.0f); // Test that FramesNeededFromSource() works correctly.
diff --git a/chromecast/media/cma/backend/direct_mixer_source.cc b/chromecast/media/cma/backend/direct_mixer_source.cc new file mode 100644 index 0000000..224862c76 --- /dev/null +++ b/chromecast/media/cma/backend/direct_mixer_source.cc
@@ -0,0 +1,142 @@ +// Copyright 2018 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 "chromecast/media/cma/backend/direct_mixer_source.h" + +#include "base/logging.h" +#include "chromecast/media/cma/backend/stream_mixer.h" +#include "chromecast/public/media/direct_audio_source.h" +#include "chromecast/public/media/media_pipeline_device_params.h" +#include "media/base/audio_bus.h" + +namespace chromecast { +namespace media { + +namespace { + +const int kNumOutputChannels = 2; + +std::string AudioContentTypeToString(media::AudioContentType type) { + switch (type) { + case media::AudioContentType::kAlarm: + return "alarm"; + case media::AudioContentType::kCommunication: + return "communication"; + default: + return "media"; + } +} + +} // namespace + +// static +DirectAudioSourceToken* CastMediaShlib::AddDirectAudioSource( + DirectAudioSource* source, + const MediaPipelineDeviceParams& params, + int source_sample_rate, + int playout_channel) { + DCHECK(source); + return new DirectMixerSource(source, params, source_sample_rate, + playout_channel); +} + +// static +void CastMediaShlib::RemoveDirectAudioSource(DirectAudioSourceToken* token) { + DirectMixerSource* source = static_cast<DirectMixerSource*>(token); + source->Remove(); +} + +DirectMixerSource::DirectMixerSource(DirectAudioSource* direct_source, + const MediaPipelineDeviceParams& params, + int source_sample_rate, + int playout_channel) + : source_(direct_source), + num_channels_(kNumOutputChannels), + input_samples_per_second_(source_sample_rate), + primary_(params.audio_type != + MediaPipelineDeviceParams::kAudioStreamSoundEffects), + device_id_(params.device_id), + content_type_(params.content_type), + playout_channel_(playout_channel), + mixer_(StreamMixer::Get()), + channel_vector_(num_channels_) { + DCHECK(source_); + LOG(INFO) << "Create " << device_id_ << " (" << this + << "), content type = " << AudioContentTypeToString(content_type_); + DCHECK(source_); + DCHECK(mixer_); + + mixer_->AddInput(this); +} + +DirectMixerSource::~DirectMixerSource() { + LOG(INFO) << "Destroy " << device_id_ << " (" << this << ")"; +} + +int DirectMixerSource::num_channels() { + return num_channels_; +} +int DirectMixerSource::input_samples_per_second() { + return input_samples_per_second_; +} +bool DirectMixerSource::primary() { + return primary_; +} +const std::string& DirectMixerSource::device_id() { + return device_id_; +} +AudioContentType DirectMixerSource::content_type() { + return content_type_; +} +int DirectMixerSource::desired_read_size() { + return source_->GetDesiredFillSize(); +} +int DirectMixerSource::playout_channel() { + return playout_channel_; +} + +void DirectMixerSource::SetVolumeMultiplier(float multiplier) { + mixer_->SetVolumeMultiplier(this, multiplier); +} + +void DirectMixerSource::InitializeAudioPlayback( + int read_size, + RenderingDelay initial_rendering_delay) { + source_->InitializeAudioPlayback(read_size, initial_rendering_delay); +} + +int DirectMixerSource::FillAudioPlaybackFrames(int num_frames, + RenderingDelay rendering_delay, + ::media::AudioBus* buffer) { + DCHECK(buffer); + DCHECK_EQ(num_channels_, buffer->channels()); + DCHECK_GE(buffer->frames(), num_frames); + for (int c = 0; c < num_channels_; ++c) { + channel_vector_[c] = buffer->channel(c); + } + + return source_->FillAudioPlaybackFrames(num_frames, rendering_delay, + channel_vector_); +} + +void DirectMixerSource::OnAudioPlaybackError(MixerError error) { + if (error == MixerError::kInputIgnored) { + LOG(INFO) << "Mixer input " << device_id_ << " (" << this << ")" + << " now being ignored due to output sample rate change"; + } + source_->OnAudioPlaybackError(); +} + +void DirectMixerSource::Remove() { + LOG(INFO) << "Remove " << device_id_ << " (" << this << ")"; + mixer_->RemoveInput(this); +} + +void DirectMixerSource::FinalizeAudioPlayback() { + source_->OnAudioPlaybackComplete(); + delete this; +} + +} // namespace media +} // namespace chromecast
diff --git a/chromecast/media/cma/backend/direct_mixer_source.h b/chromecast/media/cma/backend/direct_mixer_source.h new file mode 100644 index 0000000..bee97d79 --- /dev/null +++ b/chromecast/media/cma/backend/direct_mixer_source.h
@@ -0,0 +1,87 @@ +// Copyright 2018 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 CHROMECAST_MEDIA_CMA_BACKEND_DIRECT_MIXER_SOURCE_H_ +#define CHROMECAST_MEDIA_CMA_BACKEND_DIRECT_MIXER_SOURCE_H_ + +#include <string> +#include <vector> + +#include "base/macros.h" +#include "chromecast/media/cma/backend/mixer_input.h" +#include "chromecast/public/media/media_pipeline_backend.h" +#include "chromecast/public/volume_control.h" + +namespace media { +class AudioBus; +} // namespace media + +namespace chromecast { +namespace media { +class DirectAudioSource; +struct MediaPipelineDeviceParams; +class StreamMixer; + +// Empty interface so we can use a pointer to DirectMixerSource as the token. +class DirectAudioSourceToken {}; + +// A simple adapter for DirectAudioSource to map the public API to the +// MixerInput::Source API. +class DirectMixerSource : public MixerInput::Source, + public DirectAudioSourceToken { + public: + using RenderingDelay = MediaPipelineBackend::AudioDecoder::RenderingDelay; + + DirectMixerSource(DirectAudioSource* direct_source, + const MediaPipelineDeviceParams& params, + int source_sample_rate, + int playout_channel); + + // Sets the volume multiplier for this stream. If |multiplier| < 0, sets the + // volume multiplier to 0. + void SetVolumeMultiplier(float multiplier); + + // Removes this source from the mixer asynchronously. After this method is + // called, no more calls will be made to delegate methods. The source will + // be removed from the mixer once it has faded out appropriately. + void Remove(); + + private: + ~DirectMixerSource() override; + + // MixerInput::Source implementation: + int num_channels() override; + int input_samples_per_second() override; + bool primary() override; + const std::string& device_id() override; + AudioContentType content_type() override; + int desired_read_size() override; + int playout_channel() override; + + void InitializeAudioPlayback(int read_size, + RenderingDelay initial_rendering_delay) override; + int FillAudioPlaybackFrames(int num_frames, + RenderingDelay rendering_delay, + ::media::AudioBus* buffer) override; + void OnAudioPlaybackError(MixerError error) override; + void FinalizeAudioPlayback() override; + + DirectAudioSource* const source_; + const int num_channels_; + const int input_samples_per_second_; + const bool primary_; + const std::string device_id_; + const AudioContentType content_type_; + const int playout_channel_; + StreamMixer* const mixer_; + + std::vector<float*> channel_vector_; + + DISALLOW_COPY_AND_ASSIGN(DirectMixerSource); +}; + +} // namespace media +} // namespace chromecast + +#endif // CHROMECAST_MEDIA_CMA_BACKEND_DIRECT_MIXER_SOURCE_H_
diff --git a/chromecast/media/cma/backend/media_pipeline_backend_manager.cc b/chromecast/media/cma/backend/media_pipeline_backend_manager.cc index 06ea1ec..db832f5d 100644 --- a/chromecast/media/cma/backend/media_pipeline_backend_manager.cc +++ b/chromecast/media/cma/backend/media_pipeline_backend_manager.cc
@@ -160,6 +160,14 @@ wrapper->LogicalResume(); } +void MediaPipelineBackendManager::AddExtraPlayingStream(bool sfx) { + UpdatePlayingAudioCount(sfx, 1); +} + +void MediaPipelineBackendManager::RemoveExtraPlayingStream(bool sfx) { + UpdatePlayingAudioCount(sfx, -1); +} + void MediaPipelineBackendManager::SetGlobalVolumeMultiplier( AudioContentType type, float multiplier) {
diff --git a/chromecast/media/cma/backend/media_pipeline_backend_manager.h b/chromecast/media/cma/backend/media_pipeline_backend_manager.h index 32911d8..97b7d20 100644 --- a/chromecast/media/cma/backend/media_pipeline_backend_manager.h +++ b/chromecast/media/cma/backend/media_pipeline_backend_manager.h
@@ -104,7 +104,14 @@ void LogicalPause(MediaPipelineBackend* backend); void LogicalResume(MediaPipelineBackend* backend); - // Sets a global multiplier for output volume for streams fo the given |type|. + // Add/remove a playing audio stream that is not accounted for by a + // MediaPipelineBackend instance (for example, direct audio output using + // CastMediaShlib::AddDirectAudioSource()). |sfx| indicates whether or not + // the stream is a sound effects stream (has no effect on volume feedback). + void AddExtraPlayingStream(bool sfx); + void RemoveExtraPlayingStream(bool sfx); + + // Sets a global multiplier for output volume for streams of the given |type|. // The multiplier may be any value >= 0; if the resulting volume for an // individual stream would be > 1.0, that stream's volume is clamped to 1.0. // The default multiplier is 1.0. May be called on any thread.
diff --git a/chromecast/media/cma/backend/stream_mixer.cc b/chromecast/media/cma/backend/stream_mixer.cc index cde899c..4d93a10 100644 --- a/chromecast/media/cma/backend/stream_mixer.cc +++ b/chromecast/media/cma/backend/stream_mixer.cc
@@ -256,19 +256,6 @@ post_processing_pipeline_factory_)); linearize_filter_ = filter_groups_.back().get(); - // StreamMixer can downmix N channels to 1 channel. - CHECK(num_output_channels_ == 1 || - num_output_channels_ == linearize_filter_->GetOutputChannelCount()) - << "PostProcessor configuration channel count does not match command line" - << " flag: " << linearize_filter_->GetOutputChannelCount() << " vs " - << num_output_channels_; - - int loopback_channel_count = - num_output_channels_ == 1 ? 1 : mix_filter_->GetOutputChannelCount(); - CHECK_LE(loopback_channel_count, 2) - << "PostProcessor configuration has " << loopback_channel_count - << " channels after 'mix' group, but only 1 or 2 are allowed."; - LOG(INFO) << "PostProcessor configuration:"; if (default_filter_ == mix_filter_) { LOG(INFO) << "Stream layer: none"; @@ -332,6 +319,8 @@ output_->OptimalWriteFramesCount() & ~(filter_frame_alignment_ - 1); CHECK_GT(frames_per_write_, 0); + ValidatePostProcessors(); + // Initialize filters. for (auto&& filter_group : filter_groups_) { filter_group->Initialize(output_samples_per_second_); @@ -702,5 +691,24 @@ } } +void StreamMixer::ValidatePostProcessorsForTest() { + ValidatePostProcessors(); +} + +void StreamMixer::ValidatePostProcessors() { + // Ensure filter configuration is viable. + // This can't be done in CreatePostProcessors() because it breaks tests. + CHECK(num_output_channels_ == 1 || + num_output_channels_ == linearize_filter_->GetOutputChannelCount()) + << "PostProcessor configuration channel count does not match command line" + << " flag: " << linearize_filter_->GetOutputChannelCount() << " vs " + << num_output_channels_; + int loopback_channel_count = + num_output_channels_ == 1 ? 1 : mix_filter_->GetOutputChannelCount(); + CHECK_LE(loopback_channel_count, 2) + << "PostProcessor configuration has " << loopback_channel_count + << " channels after 'mix' group, but only 1 or 2 are allowed."; +} + } // namespace media } // namespace chromecast
diff --git a/chromecast/media/cma/backend/stream_mixer.h b/chromecast/media/cma/backend/stream_mixer.h index 117f958..0145d2e 100644 --- a/chromecast/media/cma/backend/stream_mixer.h +++ b/chromecast/media/cma/backend/stream_mixer.h
@@ -102,6 +102,7 @@ std::unique_ptr<PostProcessingPipelineFactory> pipeline_factory, const std::string& pipeline_json); void SetNumOutputChannelsForTest(int num_output_channels); + void ValidatePostProcessorsForTest(); int num_output_channels() const { return num_output_channels_; } private: @@ -120,6 +121,7 @@ }; void CreatePostProcessors(PostProcessingPipelineParser* pipeline_parser); + void ValidatePostProcessors(); void FinalizeOnMixerThread(); void Start(); void Stop();
diff --git a/chromecast/media/cma/backend/stream_mixer_unittest.cc b/chromecast/media/cma/backend/stream_mixer_unittest.cc index 0fc8c4e..517335c 100644 --- a/chromecast/media/cma/backend/stream_mixer_unittest.cc +++ b/chromecast/media/cma/backend/stream_mixer_unittest.cc
@@ -1110,6 +1110,7 @@ } TEST_F(StreamMixerDeathTest, CrashesIfChannelCountDoesNotMatchFlags) { + const int kNumOutputChannels = 2; const std::string config = R"Json({ "postprocessors": { "linearize": { @@ -1122,13 +1123,17 @@ }})Json"; ::testing::FLAGS_gtest_death_test_style = "threadsafe"; - ASSERT_DEATH(mixer_->ResetPostProcessorsForTest( - std::make_unique<MockPostProcessorFactory>(), config), + mixer_->SetNumOutputChannelsForTest(kNumOutputChannels); + mixer_->ResetPostProcessorsForTest( + std::make_unique<MockPostProcessorFactory>(), config); + + ASSERT_DEATH(mixer_->ValidatePostProcessorsForTest(), DeathRegex("PostProcessor configuration channel count does not " "match command line flag")); } TEST_F(StreamMixerDeathTest, CrashesIfMoreThan2LoopbackChannels) { + const int kNumOutputChannels = 2; const std::string config = R"Json({ "postprocessors": { "output_streams": [{ @@ -1149,8 +1154,12 @@ }})Json"; ::testing::FLAGS_gtest_death_test_style = "threadsafe"; - ASSERT_DEATH(mixer_->ResetPostProcessorsForTest( - std::make_unique<MockPostProcessorFactory>(), config), + mixer_->SetNumOutputChannelsForTest(kNumOutputChannels); + + mixer_->ResetPostProcessorsForTest( + std::make_unique<MockPostProcessorFactory>(), config); + + ASSERT_DEATH(mixer_->ValidatePostProcessorsForTest(), DeathRegex("loopback_channel_count <= 2")); }
diff --git a/chromecast/public/cast_media_shlib.h b/chromecast/public/cast_media_shlib.h index e9976c8..8cb99cf 100644 --- a/chromecast/public/cast_media_shlib.h +++ b/chromecast/public/cast_media_shlib.h
@@ -17,6 +17,8 @@ enum SampleFormat : int; +class DirectAudioSource; +class DirectAudioSourceToken; class MediaPipelineBackend; struct MediaPipelineDeviceParams; class VideoPlane; @@ -132,6 +134,24 @@ static bool SetVideoPlaneImage(int width, int height, const uint8_t* data) __attribute__((__weak__)); static void ClearVideoPlaneImage() __attribute__((__weak__)); + + // Sets up a direct audio source for output. The media backend will pull audio + // directly from |source| whenever more output data is needed; this provides + // low-latency output. The source must remain valid until + // OnAudioPlaybackComplete() has been called on it. + // Returns nullptr if a direct source cannot be added. Otherwise, returns a + // token that must be passed to RemoveDirectAudioSource() to remove the source + // when desired. + static DirectAudioSourceToken* AddDirectAudioSource( + DirectAudioSource* source, + const MediaPipelineDeviceParams& params, + int source_sample_rate, + int playout_channel) __attribute__((__weak__)); + + // Removes a direct audio source, given the |token| that was returned by + // AddDirectAudioSource(). + static void RemoveDirectAudioSource(DirectAudioSourceToken* token) + __attribute__((__weak__)); }; } // namespace media
diff --git a/chromecast/public/cast_sys_info.h b/chromecast/public/cast_sys_info.h index 4948088c..eedd67f1 100644 --- a/chromecast/public/cast_sys_info.h +++ b/chromecast/public/cast_sys_info.h
@@ -8,6 +8,8 @@ #include <string> #include <vector> +#include "chromecast_export.h" // NOLINT(build/include) + namespace chromecast { // Pure abstract interface for system information which is accessed by other @@ -51,6 +53,10 @@ virtual std::string GetFactoryCountry() = 0; virtual std::string GetFactoryLocale(std::string* second_locale) = 0; + // TODO(bcf): Make unstatic in next API update. + static CHROMECAST_EXPORT std::vector<std::string> GetFactoryLocaleList() + __attribute__((__weak__)); + // Returns the name of the wifi interface used to connect to the internet. virtual std::string GetWifiInterface() = 0; // Returns the name of the software AP interface.
diff --git a/chromecast/public/media/BUILD.gn b/chromecast/public/media/BUILD.gn index 2a43094..448f4fd 100644 --- a/chromecast/public/media/BUILD.gn +++ b/chromecast/public/media/BUILD.gn
@@ -12,6 +12,7 @@ "cast_decrypt_config.h", "cast_key_system.h", "decoder_config.h", + "direct_audio_source.h", "media_pipeline_backend.h", "media_pipeline_device_params.h", "stream_id.h",
diff --git a/chromecast/public/media/direct_audio_source.h b/chromecast/public/media/direct_audio_source.h new file mode 100644 index 0000000..9a19865 --- /dev/null +++ b/chromecast/public/media/direct_audio_source.h
@@ -0,0 +1,63 @@ +// Copyright 2018 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 CHROMECAST_PUBLIC_MEDIA_DIRECT_AUDIO_SOURCE_H_ +#define CHROMECAST_PUBLIC_MEDIA_DIRECT_AUDIO_SOURCE_H_ + +#include <vector> + +#include "media_pipeline_backend.h" + +namespace chromecast { +namespace media { + +// Direct audio source for the backend, used for low-latency audio output. +// All methods are called from a high-priority thread that is internal to the +// media backend, and therefore all methods should be threadsafe. Once a direct +// audio source has been added to the backend, it must not be deleted until +// after OnAudioPlaybackComplete() has been called on it. +class DirectAudioSource { + public: + using RenderingDelay = MediaPipelineBackend::AudioDecoder::RenderingDelay; + + // Returns the desired playback buffer size in frames. This is the desired + // value for |num_frames| when FillAudioPlaybackFrames(); it affects the + // playback latency (larger value = higher latency). The backend may choose a + // different actual buffer size. + virtual int GetDesiredFillSize() = 0; + + // Called when the source has been added to the backend, before any other + // calls are made. The |read_size| is the number of frames that will be + // requested for each call to FillAudioPlaybackFrames(). The + // |initial_rendering_delay| is the rendering delay estimate for the first + // call to FillAudioPlaybackFrames(). + virtual void InitializeAudioPlayback( + int read_size, + RenderingDelay initial_rendering_delay) = 0; + + // Called to read more audio data from the source. The source must fill in + // the |channels| with up to |num_frames| of audio. Note that only planar + // float format is supported.The |rendering_delay| indicates when the first + // frame of the filled data will be played out. + // Returns the number of frames filled. + virtual int FillAudioPlaybackFrames(int num_frames, + RenderingDelay rendering_delay, + const std::vector<float*>& channels) = 0; + + // Called when an error occurs in audio playback. FillAudioPlaybackFrames() + // will not be called after an error occurs. + virtual void OnAudioPlaybackError() = 0; + + // Called when audio playback is complete for this source. The source can only + // be safely deleted after OnAudioPlaybackComplete() has been called. + virtual void OnAudioPlaybackComplete() = 0; + + protected: + virtual ~DirectAudioSource() = default; +}; + +} // namespace media +} // namespace chromecast + +#endif // CHROMECAST_PUBLIC_MEDIA_DIRECT_AUDIO_SOURCE_H_
diff --git a/chromecast/public/media/media_pipeline_backend.h b/chromecast/public/media/media_pipeline_backend.h index f8d25811..e7a75cb1 100644 --- a/chromecast/public/media/media_pipeline_backend.h +++ b/chromecast/public/media/media_pipeline_backend.h
@@ -6,6 +6,7 @@ #define CHROMECAST_PUBLIC_MEDIA_MEDIA_PIPELINE_BACKEND_H_ #include <stdint.h> + #include <string> #include "cast_key_status.h"
diff --git a/chromeos/network/dhcp_pac_file_fetcher_chromeos.cc b/chromeos/network/dhcp_pac_file_fetcher_chromeos.cc index ff02714..9e1166c 100644 --- a/chromeos/network/dhcp_pac_file_fetcher_chromeos.cc +++ b/chromeos/network/dhcp_pac_file_fetcher_chromeos.cc
@@ -45,7 +45,8 @@ int DhcpProxyScriptFetcherChromeos::Fetch( base::string16* utf16_text, - const net::CompletionCallback& callback) { + const net::CompletionCallback& callback, + const net::NetLogWithSource& net_log) { if (!network_handler_task_runner_.get()) return net::ERR_PAC_NOT_IN_DHCP; CHECK(!callback.is_null());
diff --git a/chromeos/network/dhcp_pac_file_fetcher_chromeos.h b/chromeos/network/dhcp_pac_file_fetcher_chromeos.h index 8c7bd68..e0039b0 100644 --- a/chromeos/network/dhcp_pac_file_fetcher_chromeos.h +++ b/chromeos/network/dhcp_pac_file_fetcher_chromeos.h
@@ -20,6 +20,7 @@ namespace net { class URLRequestContext; +class NetLogWithSource; class ProxyScriptFetcher; } @@ -37,7 +38,8 @@ // net::DhcpProxyScriptFetcher int Fetch(base::string16* utf16_text, - const net::CompletionCallback& callback) override; + const net::CompletionCallback& callback, + const net::NetLogWithSource& net_log) override; void Cancel() override; void OnShutdown() override; const GURL& GetPacURL() const override;
diff --git a/chromeos/network/managed_network_configuration_handler_unittest.cc b/chromeos/network/managed_network_configuration_handler_unittest.cc index 3ac42095..fcf8010a 100644 --- a/chromeos/network/managed_network_configuration_handler_unittest.cc +++ b/chromeos/network/managed_network_configuration_handler_unittest.cc
@@ -431,6 +431,25 @@ EXPECT_EQ(*expected_shill_properties, *properties); } +TEST_F(ManagedNetworkConfigurationHandlerTest, + SetPolicyUpdateManagedVPNNoUserAuthType) { + InitializeStandardProfiles(); + SetUpEntry("policy/shill_managed_vpn.json", kUser1ProfilePath, "entry_path"); + + std::unique_ptr<base::DictionaryValue> expected_shill_properties = + test_utils::ReadTestDictionary("policy/shill_policy_on_managed_vpn.json"); + + SetPolicy(::onc::ONC_SOURCE_USER_POLICY, kUser1, + "policy/policy_vpn_no_user_auth_type.onc"); + base::RunLoop().RunUntilIdle(); + + const base::DictionaryValue* properties = + GetShillServiceClient()->GetServiceProperties( + "{a3860e83-f03d-4cb1-bafa-b22c9e746950}"); + ASSERT_TRUE(properties); + EXPECT_EQ(*expected_shill_properties, *properties); +} + TEST_F(ManagedNetworkConfigurationHandlerTest, SetPolicyReapplyToManaged) { InitializeStandardProfiles(); SetUpEntry("policy/shill_policy_on_unmanaged_wifi1.json",
diff --git a/chromeos/network/network_connection_handler_impl.cc b/chromeos/network/network_connection_handler_impl.cc index f6f11577..18d4ffe 100644 --- a/chromeos/network/network_connection_handler_impl.cc +++ b/chromeos/network/network_connection_handler_impl.cc
@@ -85,23 +85,24 @@ return false; } -bool VPNRequiresCredentials(const std::string& service_path, - const std::string& provider_type, - const base::DictionaryValue& provider_properties) { +std::string VPNCheckCredentials( + const std::string& service_path, + const std::string& provider_type, + const base::DictionaryValue& provider_properties) { if (provider_type == shill::kProviderOpenVpn) { std::string username; provider_properties.GetStringWithoutPathExpansion( shill::kOpenVPNUserProperty, &username); if (username.empty()) { NET_LOG(ERROR) << "OpenVPN: No username for: " << service_path; - return true; + return NetworkConnectionHandler::kErrorConfigurationRequired; } bool passphrase_required = false; provider_properties.GetBooleanWithoutPathExpansion( shill::kPassphraseRequiredProperty, &passphrase_required); if (passphrase_required) { NET_LOG(ERROR) << "OpenVPN: Passphrase Required for: " << service_path; - return true; + return NetworkConnectionHandler::kErrorPassphraseRequired; } NET_LOG_EVENT("OpenVPN Is Configured", service_path); } else { @@ -110,17 +111,17 @@ shill::kL2tpIpsecPskRequiredProperty, &passphrase_required); if (passphrase_required) { NET_LOG(ERROR) << "VPN: PSK Required for: " << service_path; - return true; + return NetworkConnectionHandler::kErrorConfigurationRequired; } provider_properties.GetBooleanWithoutPathExpansion( shill::kPassphraseRequiredProperty, &passphrase_required); if (passphrase_required) { NET_LOG(ERROR) << "VPN: Passphrase Required for: " << service_path; - return true; + return NetworkConnectionHandler::kErrorPassphraseRequired; } NET_LOG(EVENT) << "VPN Is Configured: " << service_path; } - return false; + return std::string(); } std::string GetDefaultUserProfilePath(const NetworkState* network) { @@ -544,9 +545,10 @@ // VPN may require a username, and/or passphrase to be set. (Check after // ensuring that any required certificates are configured). DCHECK(provider_properties); - if (VPNRequiresCredentials(service_path, vpn_provider_type, - *provider_properties)) { - ErrorCallbackForPendingRequest(service_path, kErrorConfigurationRequired); + std::string error = VPNCheckCredentials(service_path, vpn_provider_type, + *provider_properties); + if (!error.empty()) { + ErrorCallbackForPendingRequest(service_path, error); return; }
diff --git a/chromeos/network/onc/onc_normalizer.cc b/chromeos/network/onc/onc_normalizer.cc index dfac5ac..2ee24bee 100644 --- a/chromeos/network/onc/onc_normalizer.cc +++ b/chromeos/network/onc/onc_normalizer.cc
@@ -194,9 +194,12 @@ ::onc::client_cert::kClientCertRef, clientcert_type == ::onc::client_cert::kRef); - std::string user_auth_type; - openvpn->GetStringWithoutPathExpansion( - ::onc::openvpn::kUserAuthenticationType, &user_auth_type); + base::Value* user_auth_type_value = openvpn->FindKeyOfType( + ::onc::openvpn::kUserAuthenticationType, base::Value::Type::STRING); + // If UserAuthenticationType is unspecified, do not strip Password and OTP. + if (!user_auth_type_value) + return; + std::string user_auth_type = user_auth_type_value->GetString(); RemoveEntryUnless( openvpn, ::onc::openvpn::kPassword,
diff --git a/chromeos/services/BUILD.gn b/chromeos/services/BUILD.gn index aeec53b4..5e25e1ff 100644 --- a/chromeos/services/BUILD.gn +++ b/chromeos/services/BUILD.gn
@@ -23,10 +23,6 @@ deps += [ "//chromeos/services/assistant:tests" ] } - data_deps = [ - "//testing/buildbot/filters:services_unittests_filters", - ] - catalog = ":chromeos_services_unittests_catalog" }
diff --git a/chromeos/services/assistant/BUILD.gn b/chromeos/services/assistant/BUILD.gn index 0fe7438..8587942 100644 --- a/chromeos/services/assistant/BUILD.gn +++ b/chromeos/services/assistant/BUILD.gn
@@ -21,6 +21,7 @@ "//chromeos", "//chromeos/assistant:buildflags", "//chromeos/services/assistant/public/mojom", + "//components/signin/core/account_id", "//services/identity/public/mojom", ]
diff --git a/chromeos/test/data/network/policy/policy_vpn.onc b/chromeos/test/data/network/policy/policy_vpn.onc index 3091a74..336de9f 100644 --- a/chromeos/test/data/network/policy/policy_vpn.onc +++ b/chromeos/test/data/network/policy/policy_vpn.onc
@@ -8,6 +8,7 @@ "AutoConnect":false, "Host":"vpn.my.domain.com", "OpenVPN":{ + "OTP":"ignored OTP", "Password":"some password", "Port":443, "Proto":"udp",
diff --git a/chromeos/test/data/network/policy/policy_vpn_no_user_auth_type.onc b/chromeos/test/data/network/policy/policy_vpn_no_user_auth_type.onc new file mode 100644 index 0000000..8345438e --- /dev/null +++ b/chromeos/test/data/network/policy/policy_vpn_no_user_auth_type.onc
@@ -0,0 +1,22 @@ +{ + "NetworkConfigurations":[ + { + "GUID":"{a3860e83-f03d-4cb1-bafa-b22c9e746950}", + "Name":"my vpn", + "Type":"VPN", + "VPN":{ + "AutoConnect":false, + "Host":"vpn.my.domain.com", + "OpenVPN":{ + "Password":"some password", + "Port":443, + "Proto":"udp", + "SaveCredentials":false, + "Username":"abc ${LOGIN_EMAIL} def" + }, + "Type":"OpenVPN" + } + } + ], + "Type":"UnencryptedConfiguration" +}
diff --git a/components/consent_auditor/consent_auditor.cc b/components/consent_auditor/consent_auditor.cc index b38d1b7d..38a97fd 100644 --- a/components/consent_auditor/consent_auditor.cc +++ b/components/consent_auditor/consent_auditor.cc
@@ -32,12 +32,12 @@ switch (feature) { case consent_auditor::Feature::CHROME_SYNC: return UserEventSpecifics::UserConsent::CHROME_SYNC; - case consent_auditor::Feature::FEATURE_COUNT: - // TODO(crbug.com/645032): There is currently just one supported feature, - // but histograms with only one bucket are not supported. Remove this hack - // when more features are added, or when crbug.com/645032 is fixed. - NOTREACHED(); - return UserEventSpecifics::UserConsent::FEATURE_UNSPECIFIED; + case consent_auditor::Feature::PLAY_STORE: + return UserEventSpecifics::UserConsent::PLAY_STORE; + case consent_auditor::Feature::BACKUP_AND_RESTORE: + return UserEventSpecifics::UserConsent::BACKUP_AND_RESTORE; + case consent_auditor::Feature::GOOGLE_LOCATION_SERVICE: + return UserEventSpecifics::UserConsent::GOOGLE_LOCATION_SERVICE; } NOTREACHED(); return UserEventSpecifics::UserConsent::FEATURE_UNSPECIFIED; @@ -88,18 +88,18 @@ if (!base::FeatureList::IsEnabled(switches::kSyncUserConsentEvents)) return; - DCHECK_NE(consent_auditor::Feature::FEATURE_COUNT, feature); + DCHECK_LE(feature, consent_auditor::Feature::FEATURE_LAST); switch (status) { case ConsentStatus::GIVEN: UMA_HISTOGRAM_ENUMERATION( "Privacy.ConsentAuditor.ConsentGiven.Feature", feature, - static_cast<int>(consent_auditor::Feature::FEATURE_COUNT)); + static_cast<int>(consent_auditor::Feature::FEATURE_LAST) + 1); break; case ConsentStatus::NOT_GIVEN: UMA_HISTOGRAM_ENUMERATION( "Privacy.ConsentAuditor.ConsentNotGiven.Feature", feature, - static_cast<int>(consent_auditor::Feature::FEATURE_COUNT)); + static_cast<int>(consent_auditor::Feature::FEATURE_LAST) + 1); break; }
diff --git a/components/consent_auditor/consent_auditor.h b/components/consent_auditor/consent_auditor.h index f23dc43..723c2ce7 100644 --- a/components/consent_auditor/consent_auditor.h +++ b/components/consent_auditor/consent_auditor.h
@@ -35,11 +35,11 @@ // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ConsentAuditorFeature enum class Feature { CHROME_SYNC = 0, + PLAY_STORE = 1, + BACKUP_AND_RESTORE = 2, + GOOGLE_LOCATION_SERVICE = 3, - // TODO(crbug.com/645032): There is currently just one supported feature, but - // histograms with only one bucket are not supported. Remove this hack when - // more features are added, or when crbug.com/645032 is fixed. - FEATURE_COUNT = 2 + FEATURE_LAST = GOOGLE_LOCATION_SERVICE }; // Whether a consent is given or not given.
diff --git a/components/exo/client_controlled_shell_surface.cc b/components/exo/client_controlled_shell_surface.cc index fcd7350..142d5c9 100644 --- a/components/exo/client_controlled_shell_surface.cc +++ b/components/exo/client_controlled_shell_surface.cc
@@ -13,6 +13,7 @@ #include "ash/wm/drag_details.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/toplevel_window_event_handler.h" +#include "ash/wm/window_positioning_utils.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_resizer.h" #include "ash/wm/window_state.h" @@ -642,8 +643,22 @@ (client_controlled_move_resize_ && (!resizer_ || resizer_->details().window_component != HTCAPTION))) { { - ScopedSetBoundsLocally scoped_set_bounds(this); - widget_->SetBounds(bounds); + // Calculate a minimum window visibility required bounds. + aura::Window* window = widget_->GetNativeWindow(); + gfx::Rect rect(bounds); + wm::ConvertRectFromScreen(window->GetRootWindow(), &rect); + ash::wm::ClientControlledState::AdjustBoundsForMinimumWindowVisibility( + window, &rect); + wm::ConvertRectToScreen(window->GetRootWindow(), &rect); + + if (bounds != rect) { + // Request the client a new bounds to ensure that it has enough visible + // area. + window->SetBounds(rect); + } else { + ScopedSetBoundsLocally scoped_set_bounds(this); + widget_->SetBounds(bounds); + } } UpdateSurfaceBounds(); return;
diff --git a/components/offline_pages/core/BUILD.gn b/components/offline_pages/core/BUILD.gn index 331769d..872df3b6 100644 --- a/components/offline_pages/core/BUILD.gn +++ b/components/offline_pages/core/BUILD.gn
@@ -105,8 +105,6 @@ "offline_page_metadata_store_test_util.h", "offline_page_test_archiver.cc", "offline_page_test_archiver.h", - "offline_page_test_store.cc", - "offline_page_test_store.h", "stub_offline_page_model.cc", "stub_offline_page_model.h", "system_download_manager_stub.cc",
diff --git a/components/offline_pages/core/background/pending_state_updater.cc b/components/offline_pages/core/background/pending_state_updater.cc index 5746423..b581a6d 100644 --- a/components/offline_pages/core/background/pending_state_updater.cc +++ b/components/offline_pages/core/background/pending_state_updater.cc
@@ -20,7 +20,7 @@ void PendingStateUpdater::UpdateRequestsOnLossOfNetwork() { requests_pending_another_download_ = false; request_coordinator_->GetAllRequests( - base::Bind(&PendingStateUpdater::SetPendingStatesAndNotifyChanged, + base::Bind(&PendingStateUpdater::NotifyChangedPendingStates, weak_ptr_factory_.GetWeakPtr())); } @@ -33,13 +33,13 @@ // All available requests expect for the picked request changed to waiting // for another download to complete. - requests_pending_another_download_ = true; for (auto& request : *available_requests) { if (request.request_id() != picked_request_id) { request.set_pending_state(PendingState::PENDING_ANOTHER_DOWNLOAD); request_coordinator_->NotifyChanged(request); } } + requests_pending_another_download_ = true; } void PendingStateUpdater::SetPendingState(SavePageRequest& request) { @@ -48,15 +48,15 @@ RequestCoordinator::RequestCoordinatorState::OFFLINING) { request.set_pending_state(PendingState::PENDING_ANOTHER_DOWNLOAD); } else { + requests_pending_another_download_ = false; request.set_pending_state(PendingState::PENDING_NETWORK); } } } -void PendingStateUpdater::SetPendingStatesAndNotifyChanged( +void PendingStateUpdater::NotifyChangedPendingStates( std::vector<std::unique_ptr<SavePageRequest>> requests) { - for (auto& request : requests) { - SetPendingState(*request.get()); + for (const auto& request : requests) { request_coordinator_->NotifyChanged(*request); } }
diff --git a/components/offline_pages/core/background/pending_state_updater.h b/components/offline_pages/core/background/pending_state_updater.h index 55cc278d..5a3c8f66 100644 --- a/components/offline_pages/core/background/pending_state_updater.h +++ b/components/offline_pages/core/background/pending_state_updater.h
@@ -34,10 +34,9 @@ void SetPendingState(SavePageRequest& request); private: - // Set PendingState for multiple requests and notify - // RequestCoordinator::Observers. Callback for - // RequestCoordinator::GetAllRequests. - void SetPendingStatesAndNotifyChanged( + // Notify RequestCoordinator::Observers that the PendingState changed for + // multiple requests. Callback for RequestCoordinator::GetAllRequests. + void NotifyChangedPendingStates( std::vector<std::unique_ptr<SavePageRequest>> requests); // Unowned pointer.
diff --git a/components/offline_pages/core/background/request_coordinator.cc b/components/offline_pages/core/background/request_coordinator.cc index 78a883fa..88168a30 100644 --- a/components/offline_pages/core/background/request_coordinator.cc +++ b/components/offline_pages/core/background/request_coordinator.cc
@@ -321,6 +321,9 @@ const GetRequestsCallback& callback, GetRequestsResult result, std::vector<std::unique_ptr<SavePageRequest>> requests) { + for (auto& request : requests) { + pending_state_updater_.SetPendingState(*request.get()); + } callback.Run(std::move(requests)); }
diff --git a/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc b/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc index 4ea0238..685b871 100644 --- a/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc +++ b/components/offline_pages/core/model/offline_page_model_taskified_unittest.cc
@@ -28,7 +28,6 @@ #include "components/offline_pages/core/offline_page_metadata_store_test_util.h" #include "components/offline_pages/core/offline_page_model.h" #include "components/offline_pages/core/offline_page_test_archiver.h" -#include "components/offline_pages/core/offline_page_test_store.h" #include "components/offline_pages/core/offline_page_types.h" #include "components/offline_pages/core/system_download_manager_stub.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/offline_pages/core/offline_page_test_store.cc b/components/offline_pages/core/offline_page_test_store.cc deleted file mode 100644 index 8a69733..0000000 --- a/components/offline_pages/core/offline_page_test_store.cc +++ /dev/null
@@ -1,169 +0,0 @@ -// Copyright 2015 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 "components/offline_pages/core/offline_page_test_store.h" - -#include <map> -#include <utility> - -#include "base/bind.h" -#include "base/location.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace offline_pages { - -OfflinePageTestStore::OfflinePageTestStore( - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) - : task_runner_(task_runner), - scenario_(TestScenario::SUCCESSFUL), - store_state_(StoreState::NOT_LOADED), - initialize_attempts_count_(0) {} - -// This ctor is used in tests to 'reload' the model. Therefore it starts -// from NOT_LOADED and 0 attampts, to be able to verify those directly and not -// accumulate form previous load. However, the set of test pages is preserved. -OfflinePageTestStore::OfflinePageTestStore( - const OfflinePageTestStore& other_store) - : task_runner_(other_store.task_runner_), - scenario_(other_store.scenario_), - store_state_(StoreState::NOT_LOADED), - initialize_attempts_count_(0), - offline_pages_(other_store.offline_pages_) {} - -OfflinePageTestStore::~OfflinePageTestStore() {} - -void OfflinePageTestStore::Initialize(const InitializeCallback& callback) { - initialize_attempts_count_++; - if (scenario_ == TestScenario::LOAD_FAILED_RESET_FAILED || - scenario_ == TestScenario::LOAD_FAILED_RESET_SUCCESS) { - store_state_ = StoreState::FAILED_LOADING; - offline_pages_.clear(); - } else { - store_state_ = StoreState::LOADED; - } - task_runner_->PostTask( - FROM_HERE, base::Bind(callback, store_state_ == StoreState::LOADED)); -} - -void OfflinePageTestStore::GetOfflinePages(const LoadCallback& callback) { - task_runner_->PostTask(FROM_HERE, base::Bind(callback, GetAllPages())); -} - -void OfflinePageTestStore::AddOfflinePage(const OfflinePageItem& offline_page, - const AddCallback& callback) { - ItemActionStatus result; - if (store_state_ == StoreState::LOADED && - scenario_ != TestScenario::WRITE_FAILED) { - if (offline_pages_.count(offline_page.offline_id)) { - result = ItemActionStatus::ALREADY_EXISTS; - } else { - offline_pages_[offline_page.offline_id] = offline_page; - last_saved_page_ = offline_page; - result = ItemActionStatus::SUCCESS; - } - } else { - result = ItemActionStatus::STORE_ERROR; - } - if (!callback.is_null()) - task_runner_->PostTask(FROM_HERE, base::Bind(callback, result)); -} - -void OfflinePageTestStore::UpdateOfflinePages( - const std::vector<OfflinePageItem>& pages, - const UpdateCallback& callback) { - std::unique_ptr<OfflinePagesUpdateResult> result( - new OfflinePagesUpdateResult(StoreState::LOADED)); - if (scenario_ == TestScenario::WRITE_FAILED) { - for (const auto& page : pages) { - result->item_statuses.push_back( - std::make_pair(page.offline_id, ItemActionStatus::STORE_ERROR)); - } - } else { - for (const auto& page : pages) { - offline_pages_[page.offline_id] = page; - last_saved_page_ = page; - result->item_statuses.push_back( - std::make_pair(page.offline_id, ItemActionStatus::SUCCESS)); - } - result->updated_items.insert(result->updated_items.begin(), pages.begin(), - pages.end()); - } - if (!callback.is_null()) - task_runner_->PostTask(FROM_HERE, - base::BindOnce(callback, std::move(result))); -} - -void OfflinePageTestStore::RemoveOfflinePages( - const std::vector<int64_t>& offline_ids, - const UpdateCallback& callback) { - std::unique_ptr<OfflinePagesUpdateResult> result( - new OfflinePagesUpdateResult(StoreState::LOADED)); - - ASSERT_FALSE(offline_ids.empty()); - if (scenario_ == TestScenario::REMOVE_FAILED) { - for (const auto& offline_id : offline_ids) { - result->item_statuses.push_back( - std::make_pair(offline_id, ItemActionStatus::STORE_ERROR)); - } - // Anything different that LOADED is good here. - result->store_state = StoreState::FAILED_LOADING; - } else { - for (const auto& offline_id : offline_ids) { - auto iter = offline_pages_.find(offline_id); - ItemActionStatus status; - if (iter != offline_pages_.end()) { - result->updated_items.push_back(iter->second); - status = ItemActionStatus::SUCCESS; - offline_pages_.erase(iter); - } else { - status = ItemActionStatus::NOT_FOUND; - } - result->item_statuses.push_back(std::make_pair(offline_id, status)); - } - } - - task_runner_->PostTask(FROM_HERE, - base::BindOnce(callback, std::move(result))); -} - -void OfflinePageTestStore::Reset(const ResetCallback& callback) { - if (scenario_ == TestScenario::LOAD_FAILED_RESET_FAILED) { - store_state_ = StoreState::FAILED_RESET; - } else { - store_state_ = StoreState::NOT_LOADED; - // Scenario is flipped to successful here, as the reset succeeds. - if (scenario_ == TestScenario::LOAD_FAILED_RESET_SUCCESS) - scenario_ = TestScenario::SUCCESSFUL; - } - - offline_pages_.clear(); - task_runner_->PostTask( - FROM_HERE, base::Bind(callback, store_state_ == StoreState::NOT_LOADED)); -} - -StoreState OfflinePageTestStore::state() const { - return store_state_; -} - -void OfflinePageTestStore::UpdateLastAccessTime( - int64_t offline_id, - const base::Time& last_access_time) { - auto iter = offline_pages_.find(offline_id); - if (iter == offline_pages_.end()) - return; - iter->second.last_access_time = last_access_time; -} - -std::vector<OfflinePageItem> OfflinePageTestStore::GetAllPages() const { - std::vector<OfflinePageItem> offline_pages; - for (const auto& id_page_pair : offline_pages_) - offline_pages.push_back(id_page_pair.second); - return offline_pages; -} - -void OfflinePageTestStore::ClearAllPages() { - offline_pages_.clear(); -} - -} // namespace offline_pages
diff --git a/components/offline_pages/core/offline_page_test_store.h b/components/offline_pages/core/offline_page_test_store.h deleted file mode 100644 index 0b04b794..0000000 --- a/components/offline_pages/core/offline_page_test_store.h +++ /dev/null
@@ -1,80 +0,0 @@ -// Copyright 2015 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 COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_TEST_STORE_H_ -#define COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_TEST_STORE_H_ - -#include <stdint.h> - -#include <map> -#include <vector> - -#include "base/macros.h" -#include "base/memory/ref_counted.h" -#include "base/single_thread_task_runner.h" -#include "components/offline_pages/core/offline_page_item.h" -#include "components/offline_pages/core/offline_page_metadata_store.h" - -namespace offline_pages { - -// Offline page store to be used for testing purposes. It stores offline pages -// in memory. All callbacks are posted immediately through a provided -// |task_runner|. -class OfflinePageTestStore : public OfflinePageMetadataStore { - public: - enum class TestScenario { - SUCCESSFUL, - WRITE_FAILED, - LOAD_FAILED_RESET_SUCCESS, - LOAD_FAILED_RESET_FAILED, - REMOVE_FAILED, - }; - - explicit OfflinePageTestStore( - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - explicit OfflinePageTestStore(const OfflinePageTestStore& other_store); - ~OfflinePageTestStore() override; - - // OfflinePageMetadataStore overrides: - void Initialize(const InitializeCallback& callback) override; - void GetOfflinePages(const LoadCallback& callback) override; - void AddOfflinePage(const OfflinePageItem& offline_page, - const AddCallback& callback) override; - void UpdateOfflinePages(const std::vector<OfflinePageItem>& pages, - const UpdateCallback& callback) override; - void RemoveOfflinePages(const std::vector<int64_t>& offline_ids, - const UpdateCallback& callback) override; - void Reset(const ResetCallback& callback) override; - StoreState state() const override; - - void UpdateLastAccessTime(int64_t offline_id, - const base::Time& last_access_time); - - // Returns all pages, regardless their states. - std::vector<OfflinePageItem> GetAllPages() const; - - // Clear all pages in the store. - void ClearAllPages(); - - const OfflinePageItem& last_saved_page() const { return last_saved_page_; } - - void set_test_scenario(TestScenario scenario) { scenario_ = scenario; }; - - int initialize_attempts_count() const { return initialize_attempts_count_; } - - private: - OfflinePageItem last_saved_page_; - scoped_refptr<base::SingleThreadTaskRunner> task_runner_; - TestScenario scenario_; - StoreState store_state_; - int initialize_attempts_count_; - - std::map<int64_t, OfflinePageItem> offline_pages_; - - DISALLOW_ASSIGN(OfflinePageTestStore); -}; - -} // namespace offline_pages - -#endif // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_TEST_STORE_H_
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn index 91b341c..2cbe288 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn
@@ -11,8 +11,8 @@ import("//build/config/android/rules.gni") } -buildflag_header("build_features") { - header = "features.h" +buildflag_header("buildflags") { + header = "buildflags.h" flags = [ "ENABLE_VR=$enable_vr" ] } @@ -155,7 +155,7 @@ "//third_party/metrics_proto", ] deps = [ - ":build_features", + ":buildflags", ":in_memory_url_index_cache_proto", "//base", "//base:i18n",
diff --git a/components/omnibox/browser/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc index 8455c4fa..e2c17664 100644 --- a/components/omnibox/browser/autocomplete_match.cc +++ b/components/omnibox/browser/autocomplete_match.cc
@@ -21,7 +21,7 @@ #include "base/trace_event/memory_usage_estimator.h" #include "build/build_config.h" #include "components/omnibox/browser/autocomplete_provider.h" -#include "components/omnibox/browser/features.h" +#include "components/omnibox/browser/buildflags.h" #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/omnibox/browser/suggestion_answer.h" #include "components/search_engines/template_url.h"
diff --git a/components/password_manager/core/browser/credential_manager_impl_unittest.cc b/components/password_manager/core/browser/credential_manager_impl_unittest.cc index 1c205987..939c5c14 100644 --- a/components/password_manager/core/browser/credential_manager_impl_unittest.cc +++ b/components/password_manager/core/browser/credential_manager_impl_unittest.cc
@@ -61,9 +61,10 @@ explicit MockPasswordManagerClient(PasswordStore* store) : store_(store), password_manager_(this) { - prefs_.registry()->RegisterBooleanPref(prefs::kCredentialsEnableAutosignin, - true); - prefs_.registry()->RegisterBooleanPref( + prefs_ = std::make_unique<TestingPrefServiceSimple>(); + prefs_->registry()->RegisterBooleanPref(prefs::kCredentialsEnableAutosignin, + true); + prefs_->registry()->RegisterBooleanPref( prefs::kWasAutoSignInFirstRunExperienceShown, true); } ~MockPasswordManagerClient() override {} @@ -83,7 +84,7 @@ PasswordStore* GetPasswordStore() const override { return store_; } - PrefService* GetPrefs() override { return &prefs_; } + PrefService* GetPrefs() const override { return prefs_.get(); } const PasswordManager* GetPasswordManager() const override { return &password_manager_; @@ -121,12 +122,12 @@ PasswordFormManager* pending_manager() const { return manager_.get(); } void set_zero_click_enabled(bool zero_click_enabled) { - prefs_.SetBoolean(prefs::kCredentialsEnableAutosignin, zero_click_enabled); + prefs_->SetBoolean(prefs::kCredentialsEnableAutosignin, zero_click_enabled); } void set_first_run_seen(bool first_run_seen) { - prefs_.SetBoolean(prefs::kWasAutoSignInFirstRunExperienceShown, - first_run_seen); + prefs_->SetBoolean(prefs::kWasAutoSignInFirstRunExperienceShown, + first_run_seen); } void set_last_committed_url(GURL last_committed_url) { @@ -134,7 +135,7 @@ } private: - TestingPrefServiceSimple prefs_; + std::unique_ptr<TestingPrefServiceSimple> prefs_; PasswordStore* store_; std::unique_ptr<PasswordFormManager> manager_; PasswordManager password_manager_;
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc index 32feed2..011dfad 100644 --- a/components/password_manager/core/browser/password_form_manager_unittest.cc +++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -360,11 +360,12 @@ public: TestPasswordManagerClient() : driver_(new NiceMock<MockPasswordManagerDriver>) { - prefs_.registry()->RegisterBooleanPref(prefs::kCredentialsEnableService, - true); + prefs_ = std::make_unique<TestingPrefServiceSimple>(); + prefs_->registry()->RegisterBooleanPref(prefs::kCredentialsEnableService, + true); } - PrefService* GetPrefs() override { return &prefs_; } + PrefService* GetPrefs() const override { return prefs_.get(); } MockPasswordManagerDriver* mock_driver() { return driver_.get(); } @@ -377,7 +378,7 @@ void KillDriver() { driver_.reset(); } private: - TestingPrefServiceSimple prefs_; + std::unique_ptr<TestingPrefServiceSimple> prefs_; std::unique_ptr<MockPasswordManagerDriver> driver_; };
diff --git a/components/password_manager/core/browser/password_generation_manager_unittest.cc b/components/password_manager/core/browser/password_generation_manager_unittest.cc index 75741e9..437f0975 100644 --- a/components/password_manager/core/browser/password_generation_manager_unittest.cc +++ b/components/password_manager/core/browser/password_generation_manager_unittest.cc
@@ -93,7 +93,7 @@ ~MockPasswordManagerClient() override { store_->ShutdownOnUIThread(); } PasswordStore* GetPasswordStore() const override { return store_.get(); } - PrefService* GetPrefs() override { return prefs_.get(); } + PrefService* GetPrefs() const override { return prefs_.get(); } TestPasswordManagerDriver* test_driver() { return &driver_; }
diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h index 7bbf998a2..2a63313a 100644 --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h
@@ -170,7 +170,7 @@ const; // Gets prefs associated with this embedder. - virtual PrefService* GetPrefs() = 0; + virtual PrefService* GetPrefs() const = 0; // Returns the PasswordStore associated with this instance. virtual PasswordStore* GetPasswordStore() const = 0;
diff --git a/components/password_manager/core/browser/password_manager_client_helper.h b/components/password_manager/core/browser/password_manager_client_helper.h index 6e42ee96..dac3fbf 100644 --- a/components/password_manager/core/browser/password_manager_client_helper.h +++ b/components/password_manager/core/browser/password_manager_client_helper.h
@@ -19,7 +19,7 @@ // Methods required from PasswordManagerClient implementation: virtual bool IsIncognito() const = 0; - virtual PrefService* GetPrefs() = 0; + virtual PrefService* GetPrefs() const = 0; virtual PasswordManager* GetPasswordManager() = 0; protected:
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc index c09e790..5d498c0c 100644 --- a/components/password_manager/core/browser/password_manager_unittest.cc +++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -76,7 +76,7 @@ MOCK_METHOD1(NotifySuccessfulLoginWithExistingPassword, void(const autofill::PasswordForm&)); MOCK_METHOD0(AutomaticPasswordSaveIndicator, void()); - MOCK_METHOD0(GetPrefs, PrefService*()); + MOCK_CONST_METHOD0(GetPrefs, PrefService*()); MOCK_CONST_METHOD0(GetMainFrameURL, const GURL&()); MOCK_METHOD0(GetDriver, PasswordManagerDriver*()); MOCK_CONST_METHOD0(GetStoreResultFilter, const MockStoreResultFilter*());
diff --git a/components/password_manager/core/browser/stub_password_manager_client.cc b/components/password_manager/core/browser/stub_password_manager_client.cc index 7654e2bc..e7e2d20 100644 --- a/components/password_manager/core/browser/stub_password_manager_client.cc +++ b/components/password_manager/core/browser/stub_password_manager_client.cc
@@ -51,7 +51,7 @@ void StubPasswordManagerClient::AutomaticPasswordSave( std::unique_ptr<PasswordFormManager> saved_manager) {} -PrefService* StubPasswordManagerClient::GetPrefs() { +PrefService* StubPasswordManagerClient::GetPrefs() const { return nullptr; }
diff --git a/components/password_manager/core/browser/stub_password_manager_client.h b/components/password_manager/core/browser/stub_password_manager_client.h index cee51f05..bd8b0b7 100644 --- a/components/password_manager/core/browser/stub_password_manager_client.h +++ b/components/password_manager/core/browser/stub_password_manager_client.h
@@ -45,7 +45,7 @@ void NotifyStorePasswordCalled() override; void AutomaticPasswordSave( std::unique_ptr<PasswordFormManager> saved_manager) override; - PrefService* GetPrefs() override; + PrefService* GetPrefs() const override; PasswordStore* GetPasswordStore() const override; const GURL& GetLastCommittedEntryURL() const override; const CredentialsFilter* GetStoreResultFilter() const override;
diff --git a/components/password_manager/sync/browser/BUILD.gn b/components/password_manager/sync/browser/BUILD.gn index f51fef1..e3788b9 100644 --- a/components/password_manager/sync/browser/BUILD.gn +++ b/components/password_manager/sync/browser/BUILD.gn
@@ -28,6 +28,10 @@ "//net", "//url", ] + + if (!is_ios) { + deps += [ "//components/safe_browsing/common:safe_browsing_prefs" ] + } } source_set("unit_tests") { @@ -55,4 +59,8 @@ "//testing/gmock", "//testing/gtest", ] + + if (!is_ios) { + deps += [ "//components/safe_browsing/common:safe_browsing_prefs" ] + } }
diff --git a/components/password_manager/sync/browser/DEPS b/components/password_manager/sync/browser/DEPS index 5b102b5..1bf7913 100644 --- a/components/password_manager/sync/browser/DEPS +++ b/components/password_manager/sync/browser/DEPS
@@ -1,6 +1,7 @@ include_rules = [ "+components/keyed_service/core", "+components/pref_registry", + "+components/safe_browsing/common", "+components/signin/core/browser", "+components/sync/base", "+components/sync/driver",
diff --git a/components/password_manager/sync/browser/password_sync_util.cc b/components/password_manager/sync/browser/password_sync_util.cc index 8637fd2b..8697747 100644 --- a/components/password_manager/sync/browser/password_sync_util.cc +++ b/components/password_manager/sync/browser/password_sync_util.cc
@@ -5,11 +5,16 @@ #include "components/password_manager/sync/browser/password_sync_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "components/autofill/core/common/password_form.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" #include "url/origin.h" +#if !defined(OS_IOS) +#include "components/safe_browsing/common/safe_browsing_prefs.h" +#endif // !OS_IOS + using autofill::PasswordForm; using url::Origin; @@ -38,9 +43,9 @@ return signin_manager->GetAuthenticatedAccountInfo().email; } -bool IsSyncAccountCredential(const autofill::PasswordForm& form, - const syncer::SyncService* sync_service, - const SigninManagerBase* signin_manager) { +bool IsGoogleSyncAccount(const autofill::PasswordForm& form, + const syncer::SyncService* sync_service, + const SigninManagerBase* signin_manager) { const Origin gaia_origin = Origin::Create(GaiaUrls::GetInstance()->gaia_url().GetOrigin()); if (!Origin::Create(GURL(form.signon_realm)).IsSameOriginWith(gaia_origin) && @@ -59,5 +64,37 @@ GetSyncUsernameIfSyncingPasswords(sync_service, signin_manager)); } +bool IsSyncAccountCredential(const autofill::PasswordForm& form, + const syncer::SyncService* sync_service, + const SigninManagerBase* signin_manager, + PrefService* prefs) { +#if defined(OS_IOS) + return IsGoogleSyncAccount(form, sync_service, signin_manager); +#else + if (safe_browsing::MatchesPasswordProtectionLoginURL(form.origin, *prefs) || + safe_browsing::MatchesPasswordProtectionChangePasswordURL(form.origin, + *prefs)) { + // Form is on one of the enterprise configured password protection URLs, + // then we need to check its user name field. + std::string sync_user_name = + GetSyncUsernameIfSyncingPasswords(sync_service, signin_manager); + + // User is not signed in or is not syncing password. + if (sync_user_name.empty()) + return false; + + // For some SSO case, username might not be the complete email address. + // It might be the email prefix before '@'. + std::string username = base::UTF16ToUTF8(form.username_value); + if (username.find('@') == std::string::npos) { + username += "@"; + username += gaia::ExtractDomainName(sync_user_name); + } + return gaia::AreEmailsSame(username, sync_user_name); + } + return IsGoogleSyncAccount(form, sync_service, signin_manager); +#endif +} + } // namespace sync_util } // namespace password_manager
diff --git a/components/password_manager/sync/browser/password_sync_util.h b/components/password_manager/sync/browser/password_sync_util.h index 3a60b3b..9b1b041 100644 --- a/components/password_manager/sync/browser/password_sync_util.h +++ b/components/password_manager/sync/browser/password_sync_util.h
@@ -8,6 +8,7 @@ #include <string> #include "components/autofill/core/common/password_form.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync/driver/sync_service.h" @@ -23,12 +24,20 @@ const syncer::SyncService* sync_service, const SigninManagerBase* signin_manager); +// If |form| doesn't match GAIA sign-on realm or enterprise-specified password +// protection URL, returns false. Otherwise, checks if the username +// in |form| matches sync account. +bool IsSyncAccountCredential(const autofill::PasswordForm& form, + const syncer::SyncService* sync_service, + const SigninManagerBase* signin_manager, + PrefService* prefs); + // Returns true if |form| corresponds to the account specified by // GetSyncUsernameIfSyncingPasswords. Returns false if // GetSyncUsernameIfSyncingPasswords does not specify any account. -bool IsSyncAccountCredential(const autofill::PasswordForm& form, - const syncer::SyncService* sync_service, - const SigninManagerBase* signin_manager); +bool IsGoogleSyncAccount(const autofill::PasswordForm& form, + const syncer::SyncService* sync_service, + const SigninManagerBase* signin_manager); } // namespace sync_util } // namespace password_manager
diff --git a/components/password_manager/sync/browser/password_sync_util_unittest.cc b/components/password_manager/sync/browser/password_sync_util_unittest.cc index d3cb4a0..4ccabdb1 100644 --- a/components/password_manager/sync/browser/password_sync_util_unittest.cc +++ b/components/password_manager/sync/browser/password_sync_util_unittest.cc
@@ -7,10 +7,17 @@ #include <stddef.h> #include "base/macros.h" +#include "build/build_config.h" #include "components/autofill/core/common/password_form.h" #include "components/password_manager/sync/browser/sync_username_test_base.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" +#if !defined(OS_IOS) +#include "components/safe_browsing/common/safe_browsing_prefs.h" +#endif // !OS_IOS + using autofill::PasswordForm; namespace password_manager { @@ -61,7 +68,7 @@ } } -TEST_F(PasswordSyncUtilTest, IsSyncAccountCredential) { +TEST_F(PasswordSyncUtilTest, IsGoogleSyncAccount) { const struct { PasswordForm form; std::string fake_sync_username; @@ -82,10 +89,77 @@ SetSyncingPasswords(true); FakeSigninAs(kTestCases[i].fake_sync_username); EXPECT_EQ(kTestCases[i].expected_result, - IsSyncAccountCredential(kTestCases[i].form, sync_service(), - signin_manager())); + IsGoogleSyncAccount(kTestCases[i].form, sync_service(), + signin_manager())); } } +#if !defined(OS_IOS) +class PasswordSyncUtilEnterpriseTest : public SyncUsernameTestBase { + public: + void SetUp() override { + // prefs_ = std::make_unique<TestingPrefServiceSimple>(); + prefs_.registry()->RegisterListPref(prefs::kPasswordProtectionLoginURLs); + prefs_.registry()->RegisterStringPref( + prefs::kPasswordProtectionChangePasswordURL, ""); + } + + protected: + TestingPrefServiceSimple prefs_; +}; + +TEST_F(PasswordSyncUtilEnterpriseTest, + IsSyncAccountCredentialForEnterpriseSSO) { + prefs_.SetString(prefs::kPasswordProtectionChangePasswordURL, + "https://pwchange.mydomain.com/"); + base::ListValue login_url; + login_url.AppendString("https://login.mydomain.com/"); + prefs_.Set(prefs::kPasswordProtectionLoginURLs, login_url); + const struct { + PasswordForm form; + std::string fake_sync_username; + bool expected_result; + } kTestCases[] = { + {SimpleNonGaiaForm("sync_user@mydomain.com", + "https://pwchange.mydomain.com/"), + "sync_user@mydomain.com", true}, + {SimpleNonGaiaForm("sync_user@mydomain.com", + "https://login.mydomain.com/"), + "sync_user@mydomain.com", true}, + {SimpleNonGaiaForm("non_sync_user@mydomain.com", + "https://pwchange.mydomain.com/"), + "sync_user@mydomain.com", false}, + {SimpleNonGaiaForm("non_sync_user@mydomain.com", + "https://login.mydomain.com/"), + "sync_user@mydomain.com", false}, + {SimpleNonGaiaForm("sync_user", "https://pwchange.mydomain.com/"), + "sync_user@mydomain.com", true}, + {SimpleNonGaiaForm("sync_user", "https://login.mydomain.com/"), + "sync_user@mydomain.com", true}, + {SimpleNonGaiaForm("non_sync_user", "https://pwchange.mydomain.com/"), + "sync_user@mydomain.com", false}, + {SimpleNonGaiaForm("non_sync_user", "https://login.mydomain.com/"), + "sync_user@mydomain.com", false}, + {SimpleNonGaiaForm("", "https://pwchange.mydomain.com/"), + "sync_user@mydomain.com", false}, + {SimpleNonGaiaForm("", "https://login.mydomain.com/"), + "sync_user@mydomain.com", false}, + {SimpleNonGaiaForm("sync_user@mydomain.com", "https://otherdomain.com/"), + "sync_user@mydomain.com", false}, + {SimpleNonGaiaForm("sync_user", "https://otherdomain.com/"), + "sync_user@mydomain.com", false}, + }; + + for (size_t i = 0; i < arraysize(kTestCases); ++i) { + SCOPED_TRACE(testing::Message() << "i=" << i); + SetSyncingPasswords(true); + FakeSigninAs(kTestCases[i].fake_sync_username); + EXPECT_EQ(kTestCases[i].expected_result, + IsSyncAccountCredential(kTestCases[i].form, sync_service(), + signin_manager(), &prefs_)); + } +} +#endif // !OS_IOS + } // namespace sync_util } // namespace password_manager
diff --git a/components/password_manager/sync/browser/sync_credentials_filter.cc b/components/password_manager/sync/browser/sync_credentials_filter.cc index 73300eeaa..71e264de 100644 --- a/components/password_manager/sync/browser/sync_credentials_filter.cc +++ b/components/password_manager/sync/browser/sync_credentials_filter.cc
@@ -81,16 +81,16 @@ return !gaia::ShouldSkipSavePasswordForGaiaURL(main_frame_url) && !sync_util::IsSyncAccountCredential( form, sync_service_factory_function_.Run(), - signin_manager_factory_function_.Run()); + signin_manager_factory_function_.Run(), client_->GetPrefs()); } void SyncCredentialsFilter::ReportFormLoginSuccess( const PasswordFormManager& form_manager) const { if (!form_manager.IsNewLogin() && - sync_util::IsSyncAccountCredential( - form_manager.pending_credentials(), - sync_service_factory_function_.Run(), - signin_manager_factory_function_.Run())) { + sync_util::IsSyncAccountCredential(form_manager.pending_credentials(), + sync_service_factory_function_.Run(), + signin_manager_factory_function_.Run(), + client_->GetPrefs())) { base::RecordAction(base::UserMetricsAction( "PasswordManager_SyncCredentialFilledAndLoginSuccessfull")); }
diff --git a/components/password_manager/sync/browser/sync_username_test_base.cc b/components/password_manager/sync/browser/sync_username_test_base.cc index 922acd9..58ab04f 100644 --- a/components/password_manager/sync/browser/sync_username_test_base.cc +++ b/components/password_manager/sync/browser/sync_username_test_base.cc
@@ -58,6 +58,16 @@ return form; } +// static +PasswordForm SyncUsernameTestBase::SimpleNonGaiaForm(const char* username, + const char* origin) { + PasswordForm form; + form.signon_realm = "https://site.com"; + form.username_value = base::ASCIIToUTF16(username); + form.origin = GURL(origin); + return form; +} + void SyncUsernameTestBase::SetSyncingPasswords(bool syncing_passwords) { sync_service_.set_syncing_passwords(syncing_passwords); }
diff --git a/components/password_manager/sync/browser/sync_username_test_base.h b/components/password_manager/sync/browser/sync_username_test_base.h index 4717409..0717488 100644 --- a/components/password_manager/sync/browser/sync_username_test_base.h +++ b/components/password_manager/sync/browser/sync_username_test_base.h
@@ -33,6 +33,8 @@ // Produce a sample PasswordForm. static autofill::PasswordForm SimpleGaiaForm(const char* username); static autofill::PasswordForm SimpleNonGaiaForm(const char* username); + static autofill::PasswordForm SimpleNonGaiaForm(const char* username, + const char* origin); // Instruct the sync service to pretend whether or not it is syncing // passwords.
diff --git a/components/printing/common/BUILD.gn b/components/printing/common/BUILD.gn index 6818524..b1c0f11b 100644 --- a/components/printing/common/BUILD.gn +++ b/components/printing/common/BUILD.gn
@@ -8,16 +8,21 @@ "cloud_print_cdd_conversion.h", "print_messages.cc", "print_messages.h", + "printer_capabilities.cc", + "printer_capabilities.h", "printing_param_traits_macros.h", ] deps = [ "//base", "//components/cloud_devices/common:common", + "//components/crash/core/common", + "//components/strings:components_strings_grit", "//ipc", "//printing", "//printing/common:common", "//third_party/WebKit/public:blink_headers", + "//ui/base", "//ui/gfx", "//ui/gfx/geometry", "//ui/gfx/ipc",
diff --git a/components/printing/common/DEPS b/components/printing/common/DEPS new file mode 100644 index 0000000..00d1bb7b --- /dev/null +++ b/components/printing/common/DEPS
@@ -0,0 +1,5 @@ +include_rules = [ + "+components/crash/core/common", + "+components/strings/grit", + "+ui/base/l10n", +]
diff --git a/components/printing/common/printer_capabilities.cc b/components/printing/common/printer_capabilities.cc new file mode 100644 index 0000000..902da5e --- /dev/null +++ b/components/printing/common/printer_capabilities.cc
@@ -0,0 +1,140 @@ +// Copyright 2018 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 "components/printing/common/printer_capabilities.h" + +#include <memory> +#include <string> +#include <utility> +#include <vector> + +#include "base/logging.h" +#include "base/stl_util.h" +#include "base/strings/string_piece.h" +#include "base/threading/thread_restrictions.h" +#include "base/values.h" +#include "build/build_config.h" +#include "components/crash/core/common/crash_keys.h" +#include "components/printing/common/cloud_print_cdd_conversion.h" +#include "printing/backend/print_backend.h" +#include "printing/backend/print_backend_consts.h" + +#if defined(OS_WIN) +#include "base/strings/string_split.h" +#include "base/strings/string_util.h" +#include "base/strings/utf_string_conversions.h" +#include "components/strings/grit/components_strings.h" +#include "ui/base/l10n/l10n_util.h" +#endif + +namespace printing { + +const char kPrinter[] = "printer"; + +namespace { + +// Returns a dictionary representing printer capabilities as CDD. Returns +// an empty dictionary if a dictionary could not be generated. +std::unique_ptr<base::DictionaryValue> +GetPrinterCapabilitiesOnBlockingPoolThread( + const std::string& device_name, + scoped_refptr<PrintBackend> print_backend) { + base::AssertBlockingAllowed(); + DCHECK(!device_name.empty()); + scoped_refptr<PrintBackend> backend = + print_backend ? print_backend + : printing::PrintBackend::CreateInstance(nullptr); + + VLOG(1) << "Get printer capabilities start for " << device_name; + crash_keys::ScopedPrinterInfo crash_key( + backend->GetPrinterDriverInfo(device_name)); + + auto empty_capabilities = std::make_unique<base::DictionaryValue>(); + std::unique_ptr<base::DictionaryValue> printer_info; + if (!backend->IsValidPrinter(device_name)) { + LOG(WARNING) << "Invalid printer " << device_name; + return empty_capabilities; + } + + PrinterSemanticCapsAndDefaults info; + if (!backend->GetPrinterSemanticCapsAndDefaults(device_name, &info)) { + LOG(WARNING) << "Failed to get capabilities for " << device_name; + return empty_capabilities; + } + + return cloud_print::PrinterSemanticCapsAndDefaultsToCdd(info); +} + +#if defined(OS_WIN) +std::string GetUserFriendlyName(const std::string& printer_name) { + // |printer_name| may be a UNC path like \\printserver\printername. + if (!base::StartsWith(printer_name, "\\\\", + base::CompareCase::INSENSITIVE_ASCII)) { + return printer_name; + } + + // If it is a UNC path, split the "printserver\printername" portion and + // generate a friendly name, like Windows does. + std::string printer_name_trimmed = printer_name.substr(2); + std::vector<std::string> tokens = base::SplitString( + printer_name_trimmed, "\\", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); + if (tokens.size() != 2 || tokens[0].empty() || tokens[1].empty()) + return printer_name; + return l10n_util::GetStringFUTF8( + IDS_PRINT_PREVIEW_FRIENDLY_WIN_NETWORK_PRINTER_NAME, + base::UTF8ToUTF16(tokens[1]), base::UTF8ToUTF16(tokens[0])); +} +#endif + +} // namespace + +std::pair<std::string, std::string> GetPrinterNameAndDescription( + const PrinterBasicInfo& printer) { +#if defined(OS_MACOSX) || defined(OS_CHROMEOS) + // On Mac, |printer.printer_description| specifies the printer name and + // |printer.printer_name| specifies the device name / printer queue name. + // Chrome OS emulates the Mac behavior. + const std::string& real_name = printer.printer_description; + std::string real_description; + const auto it = printer.options.find(kDriverNameTagName); + if (it != printer.options.end()) + real_description = it->second; + return std::make_pair(real_name, real_description); +#elif defined(OS_WIN) + return std::make_pair(GetUserFriendlyName(printer.printer_name), + printer.printer_description); +#else + return std::make_pair(printer.printer_name, printer.printer_description); +#endif +} + +std::unique_ptr<base::DictionaryValue> GetSettingsOnBlockingPool( + const std::string& device_name, + const PrinterBasicInfo& basic_info, + scoped_refptr<PrintBackend> print_backend) { + base::AssertBlockingAllowed(); + + const auto printer_name_description = + GetPrinterNameAndDescription(basic_info); + const std::string& printer_name = printer_name_description.first; + const std::string& printer_description = printer_name_description.second; + + auto printer_info = std::make_unique<base::DictionaryValue>(); + printer_info->SetString(kSettingDeviceName, device_name); + printer_info->SetString(kSettingPrinterName, printer_name); + printer_info->SetString(kSettingPrinterDescription, printer_description); + printer_info->SetBoolean( + kCUPSEnterprisePrinter, + base::ContainsKey(basic_info.options, kCUPSEnterprisePrinter) && + basic_info.options.at(kCUPSEnterprisePrinter) == kValueTrue); + + auto printer_info_capabilities = std::make_unique<base::DictionaryValue>(); + printer_info_capabilities->SetDictionary(kPrinter, std::move(printer_info)); + printer_info_capabilities->Set( + kSettingCapabilities, + GetPrinterCapabilitiesOnBlockingPoolThread(device_name, print_backend)); + return printer_info_capabilities; +} + +} // namespace printing
diff --git a/components/printing/common/printer_capabilities.h b/components/printing/common/printer_capabilities.h new file mode 100644 index 0000000..91019fd --- /dev/null +++ b/components/printing/common/printer_capabilities.h
@@ -0,0 +1,42 @@ +// Copyright 2018 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 COMPONENTS_PRINTING_COMMON_PRINTER_CAPABILITIES_H_ +#define COMPONENTS_PRINTING_COMMON_PRINTER_CAPABILITIES_H_ + +#include <memory> +#include <string> +#include <utility> + +#include "base/memory/scoped_refptr.h" + +namespace base { +class DictionaryValue; +} + +namespace printing { + +class PrintBackend; +struct PrinterBasicInfo; + +extern const char kPrinter[]; + +// Extracts the printer display name and description from the +// appropriate fields in |printer| for the platform. +std::pair<std::string, std::string> GetPrinterNameAndDescription( + const PrinterBasicInfo& printer); + +// Returns the JSON representing printer capabilities for the device registered +// as |device_name| in the PrinterBackend. The returned dictionary is suitable +// for passage to the WebUI. The settings are obtained using |print_backend| if +// it is provided. If |print_backend| is null, uses a new PrintBackend instance +// with default settings. +std::unique_ptr<base::DictionaryValue> GetSettingsOnBlockingPool( + const std::string& device_name, + const PrinterBasicInfo& basic_info, + scoped_refptr<PrintBackend> print_backend); + +} // namespace printing + +#endif // COMPONENTS_PRINTING_COMMON_PRINTER_CAPABILITIES_H_
diff --git a/components/printing/test/BUILD.gn b/components/printing/test/BUILD.gn index 65e63db..a7e114db 100644 --- a/components/printing/test/BUILD.gn +++ b/components/printing/test/BUILD.gn
@@ -12,6 +12,7 @@ "print_mock_render_thread.h", "print_test_content_renderer_client.cc", "print_test_content_renderer_client.h", + "printer_capabilities_unittest.cc", ] public_deps = [
diff --git a/components/printing/test/printer_capabilities_unittest.cc b/components/printing/test/printer_capabilities_unittest.cc new file mode 100644 index 0000000..b645ef30 --- /dev/null +++ b/components/printing/test/printer_capabilities_unittest.cc
@@ -0,0 +1,103 @@ +// Copyright 2018 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 <memory> + +#include "base/bind.h" +#include "base/memory/ref_counted.h" +#include "base/stl_util.h" +#include "base/values.h" +#include "components/printing/common/printer_capabilities.h" +#include "content/public/test/test_browser_thread_bundle.h" +#include "printing/backend/test_print_backend.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/geometry/size.h" + +namespace printing { + +namespace { +const char kDpi[] = "dpi"; +} + +class PrinterCapabilitiesTest : public testing::Test { + public: + PrinterCapabilitiesTest() {} + ~PrinterCapabilitiesTest() override {} + + protected: + void SetUp() override { + test_backend_ = base::MakeRefCounted<TestPrintBackend>(); + PrintBackend::SetPrintBackendForTesting(test_backend_.get()); + } + + void TearDown() override { test_backend_ = nullptr; } + + TestPrintBackend* print_backend() { return test_backend_.get(); } + + private: + content::TestBrowserThreadBundle test_browser_threads_; + scoped_refptr<TestPrintBackend> test_backend_; +}; + +// Verify that we don't crash for a missing printer and a nullptr is never +// returned. +TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) { + PrinterBasicInfo basic_info; + std::string printer_name = "missing_printer"; + + std::unique_ptr<base::DictionaryValue> settings_dictionary = + GetSettingsOnBlockingPool(printer_name, basic_info, nullptr); + + ASSERT_TRUE(settings_dictionary); +} + +TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) { + std::string printer_name = "test_printer"; + PrinterBasicInfo basic_info; + auto caps = std::make_unique<PrinterSemanticCapsAndDefaults>(); + + // set a capability + caps->dpis = {gfx::Size(600, 600)}; + + print_backend()->AddValidPrinter(printer_name, std::move(caps)); + + std::unique_ptr<base::DictionaryValue> settings_dictionary = + GetSettingsOnBlockingPool(printer_name, basic_info, print_backend()); + + // verify settings were created + ASSERT_TRUE(settings_dictionary); + + // verify capabilities and have one entry + base::DictionaryValue* cdd; + ASSERT_TRUE(settings_dictionary->GetDictionary(kSettingCapabilities, &cdd)); + + // read the CDD for the dpi attribute. + base::DictionaryValue* caps_dict; + ASSERT_TRUE(cdd->GetDictionary(kPrinter, &caps_dict)); + EXPECT_TRUE(caps_dict->HasKey(kDpi)); +} + +// Ensure that the capabilities dictionary is present but empty if the backend +// doesn't return capabilities. +TEST_F(PrinterCapabilitiesTest, NullCapabilitiesExcluded) { + std::string printer_name = "test_printer"; + PrinterBasicInfo basic_info; + + // return false when attempting to retrieve capabilities + print_backend()->AddValidPrinter(printer_name, nullptr); + + std::unique_ptr<base::DictionaryValue> settings_dictionary = + GetSettingsOnBlockingPool(printer_name, basic_info, print_backend()); + + // verify settings were created + ASSERT_TRUE(settings_dictionary); + + // verify that capabilities is an empty dictionary + base::DictionaryValue* caps_dict; + ASSERT_TRUE( + settings_dictionary->GetDictionary(kSettingCapabilities, &caps_dict)); + EXPECT_TRUE(caps_dict->empty()); +} + +} // namespace printing
diff --git a/components/safe_browsing/browser/threat_details.cc b/components/safe_browsing/browser/threat_details.cc index da73d15..d33cbfb 100644 --- a/components/safe_browsing/browser/threat_details.cc +++ b/components/safe_browsing/browser/threat_details.cc
@@ -558,8 +558,8 @@ // OnReceivedThreatDOMDetails will be called when the renderer replies. // TODO(mattm): In theory, if the user proceeds through the warning DOM // detail collection could be started once the page loads. - web_contents()->ForEachFrame(base::BindRepeating( - &ThreatDetails::RequestThreatDOMDetails, base::Unretained(this))); + web_contents()->ForEachFrame( + base::BindRepeating(&ThreatDetails::RequestThreatDOMDetails, this)); } } @@ -568,9 +568,9 @@ frame->GetRemoteInterfaces()->GetInterface(&threat_reporter); safe_browsing::mojom::ThreatReporter* raw_threat_report = threat_reporter.get(); - raw_threat_report->GetThreatDOMDetails(base::BindOnce( - &ThreatDetails::OnReceivedThreatDOMDetails, base::Unretained(this), - base::Passed(&threat_reporter), frame)); + raw_threat_report->GetThreatDOMDetails( + base::BindOnce(&ThreatDetails::OnReceivedThreatDOMDetails, this, + base::Passed(&threat_reporter), frame)); } // When the renderer is done, this is called.
diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn index cf446098..c96c513e 100644 --- a/components/signin/core/browser/BUILD.gn +++ b/components/signin/core/browser/BUILD.gn
@@ -9,8 +9,8 @@ import("//build/config/android/rules.gni") } -buildflag_header("signin_features") { - header = "signin_features.h" +buildflag_header("signin_buildflags") { + header = "signin_buildflags.h" flags = [ "ENABLE_DICE_SUPPORT=$enable_dice_support", "ENABLE_MIRROR=$enable_mirror", @@ -108,6 +108,7 @@ public_deps = [ ":account_info", + ":signin_buildflags", "//base", "//components/content_settings/core/browser", "//components/content_settings/core/common", @@ -115,7 +116,6 @@ "//components/keyed_service/core", "//components/prefs", "//components/signin/core/account_id", - "//components/signin/core/browser:signin_features", "//google_apis", "//net", "//ui/gfx", @@ -219,13 +219,13 @@ ] deps = [ + ":signin_buildflags", ":test_support", "//base/test:test_support", "//components/content_settings/core/browser", "//components/os_crypt:test_support", "//components/pref_registry:pref_registry", "//components/prefs", - "//components/signin/core/browser:signin_features", "//components/sync_preferences", "//components/sync_preferences:test_support", "//testing/gmock",
diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc index 3b2304f..285977a2 100644 --- a/components/signin/core/browser/account_reconcilor.cc +++ b/components/signin/core/browser/account_reconcilor.cc
@@ -20,8 +20,8 @@ #include "components/signin/core/browser/account_reconcilor_delegate.h" #include "components/signin/core/browser/profile_management_switches.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_client.h" -#include "components/signin/core/browser/signin_features.h" #include "components/signin/core/browser/signin_metrics.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h"
diff --git a/components/signin/core/browser/account_reconcilor_unittest.cc b/components/signin/core/browser/account_reconcilor_unittest.cc index 0fbc532..25dc923 100644 --- a/components/signin/core/browser/account_reconcilor_unittest.cc +++ b/components/signin/core/browser/account_reconcilor_unittest.cc
@@ -25,7 +25,7 @@ #include "components/signin/core/browser/mirror_account_reconcilor_delegate.h" #include "components/signin/core/browser/profile_management_switches.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_metrics.h" #include "components/signin/core/browser/test_signin_client.h"
diff --git a/components/signin/core/browser/profile_management_switches.cc b/components/signin/core/browser/profile_management_switches.cc index 851bf9f..7900941 100644 --- a/components/signin/core/browser/profile_management_switches.cc +++ b/components/signin/core/browser/profile_management_switches.cc
@@ -12,7 +12,7 @@ #include "base/metrics/field_trial_params.h" #include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/signin/core/browser/signin_switches.h" #if defined(OS_CHROMEOS)
diff --git a/components/signin/core/browser/profile_management_switches_unittest.cc b/components/signin/core/browser/profile_management_switches_unittest.cc index 8aa9c2b..c0f4046 100644 --- a/components/signin/core/browser/profile_management_switches_unittest.cc +++ b/components/signin/core/browser/profile_management_switches_unittest.cc
@@ -11,7 +11,7 @@ #include "base/message_loop/message_loop.h" #include "components/prefs/pref_member.h" #include "components/signin/core/browser/scoped_account_consistency.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/signin/core/browser/scoped_account_consistency.cc b/components/signin/core/browser/scoped_account_consistency.cc index 952a08f..82038615 100644 --- a/components/signin/core/browser/scoped_account_consistency.cc +++ b/components/signin/core/browser/scoped_account_consistency.cc
@@ -12,7 +12,7 @@ #include "base/feature_list.h" #include "base/logging.h" #include "base/test/scoped_feature_list.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" namespace signin {
diff --git a/components/signin/core/browser/signin_header_helper.h b/components/signin/core/browser/signin_header_helper.h index 2d0f0b2..f3d260f 100644 --- a/components/signin/core/browser/signin_header_helper.h +++ b/components/signin/core/browser/signin_header_helper.h
@@ -11,7 +11,7 @@ #include "components/prefs/pref_member.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "url/gurl.h" namespace content_settings {
diff --git a/components/signin/core/browser/signin_header_helper_unittest.cc b/components/signin/core/browser/signin_header_helper_unittest.cc index 9056b83e..870bd70 100644 --- a/components/signin/core/browser/signin_header_helper_unittest.cc +++ b/components/signin/core/browser/signin_header_helper_unittest.cc
@@ -14,7 +14,7 @@ #include "components/prefs/pref_member.h" #include "components/signin/core/browser/chrome_connected_header_helper.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "google_apis/gaia/gaia_urls.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
diff --git a/components/signin/core/browser/signin_switches.h b/components/signin/core/browser/signin_switches.h index 291c602..71cf2a5 100644 --- a/components/signin/core/browser/signin_switches.h +++ b/components/signin/core/browser/signin_switches.h
@@ -5,7 +5,7 @@ #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_SWITCHES_H_ #define COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_SWITCHES_H_ -#include "components/signin/core/browser/signin_features.h" +#include "components/signin/core/browser/signin_buildflags.h" namespace switches {
diff --git a/components/spellcheck/BUILD.gn b/components/spellcheck/BUILD.gn index a7d28cb..06df29d 100644 --- a/components/spellcheck/BUILD.gn +++ b/components/spellcheck/BUILD.gn
@@ -5,11 +5,11 @@ import("//build/buildflag_header.gni") import("//components/spellcheck/spellcheck_build_features.gni") -buildflag_header("build_features") { +buildflag_header("buildflags") { # Name this "build" features to avoid confusion with # components/spellcheck/common/spellcheck_features.h which are runtime # features. - header = "spellcheck_build_features.h" + header = "spellcheck_buildflags.h" flags = [ "ENABLE_SPELLCHECK=$enable_spellcheck", "USE_BROWSER_SPELLCHECKER=$use_browser_spellchecker",
diff --git a/components/spellcheck/browser/BUILD.gn b/components/spellcheck/browser/BUILD.gn index dd0e7c9..e984ced2 100644 --- a/components/spellcheck/browser/BUILD.gn +++ b/components/spellcheck/browser/BUILD.gn
@@ -26,7 +26,7 @@ public_deps = [ "//base", - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", "//components/spellcheck/common", ] deps = [
diff --git a/components/spellcheck/browser/spell_check_host_impl.h b/components/spellcheck/browser/spell_check_host_impl.h index 1898007..a419ef80 100644 --- a/components/spellcheck/browser/spell_check_host_impl.h +++ b/components/spellcheck/browser/spell_check_host_impl.h
@@ -8,7 +8,7 @@ #include "base/macros.h" #include "build/build_config.h" #include "components/spellcheck/common/spellcheck.mojom.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #if defined(OS_ANDROID) #include "components/spellcheck/browser/spellchecker_session_bridge_android.h"
diff --git a/components/spellcheck/common/BUILD.gn b/components/spellcheck/common/BUILD.gn index ad6a9cf..05c37de39 100644 --- a/components/spellcheck/common/BUILD.gn +++ b/components/spellcheck/common/BUILD.gn
@@ -21,7 +21,7 @@ public_deps = [ ":interfaces", - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", ] deps = [
diff --git a/components/spellcheck/common/spellcheck.typemap b/components/spellcheck/common/spellcheck.typemap index f4aa4588..42e0739 100644 --- a/components/spellcheck/common/spellcheck.typemap +++ b/components/spellcheck/common/spellcheck.typemap
@@ -9,7 +9,7 @@ traits_headers = [ "//components/spellcheck/common/spellcheck_struct_traits.h" ] deps = [ - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", ] type_mappings = [
diff --git a/components/spellcheck/common/spellcheck_features.cc b/components/spellcheck/common/spellcheck_features.cc index c3865f7..a0c016de 100644 --- a/components/spellcheck/common/spellcheck_features.cc +++ b/components/spellcheck/common/spellcheck_features.cc
@@ -5,7 +5,7 @@ #include "components/spellcheck/common/spellcheck_features.h" #include "base/sys_info.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" namespace spellcheck {
diff --git a/components/spellcheck/common/spellcheck_features.h b/components/spellcheck/common/spellcheck_features.h index 311ac738..ca3d968b 100644 --- a/components/spellcheck/common/spellcheck_features.h +++ b/components/spellcheck/common/spellcheck_features.h
@@ -6,7 +6,7 @@ #define COMPONENTS_SPELLCHECK_COMMON_SPELLCHECK_FEATURES_H_ #include "base/feature_list.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" namespace spellcheck {
diff --git a/components/spellcheck/common/spellcheck_switches.cc b/components/spellcheck/common/spellcheck_switches.cc index 614b96a..4586982 100644 --- a/components/spellcheck/common/spellcheck_switches.cc +++ b/components/spellcheck/common/spellcheck_switches.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "build/build_config.h" #include "components/spellcheck/common/spellcheck_switches.h" -#include "components/spellcheck/spellcheck_build_features.h" + +#include "build/build_config.h" +#include "components/spellcheck/spellcheck_buildflags.h" namespace spellcheck { namespace switches {
diff --git a/components/spellcheck/common/spellcheck_switches.h b/components/spellcheck/common/spellcheck_switches.h index 30977908..e99b5831 100644 --- a/components/spellcheck/common/spellcheck_switches.h +++ b/components/spellcheck/common/spellcheck_switches.h
@@ -6,7 +6,7 @@ #define COMPONENTS_SPELLCHECK_COMMON_SPELLCHECK_SWITCHES_H_ #include "build/build_config.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" namespace spellcheck { namespace switches {
diff --git a/components/spellcheck/renderer/BUILD.gn b/components/spellcheck/renderer/BUILD.gn index 0d0fa00..d7a72675 100644 --- a/components/spellcheck/renderer/BUILD.gn +++ b/components/spellcheck/renderer/BUILD.gn
@@ -41,7 +41,7 @@ } public_deps = [ - "//components/spellcheck:build_features", + "//components/spellcheck:buildflags", ] deps = [ "//base:i18n",
diff --git a/components/spellcheck/renderer/hunspell_engine.cc b/components/spellcheck/renderer/hunspell_engine.cc index f7080e5e..e8b0ef07 100644 --- a/components/spellcheck/renderer/hunspell_engine.cc +++ b/components/spellcheck/renderer/hunspell_engine.cc
@@ -13,7 +13,7 @@ #include "base/time/time.h" #include "components/spellcheck/common/spellcheck.mojom.h" #include "components/spellcheck/common/spellcheck_common.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/common/service_names.mojom.h" #include "content/public/renderer/render_thread.h" #include "services/service_manager/public/cpp/local_interface_provider.h"
diff --git a/components/spellcheck/renderer/spellcheck.cc b/components/spellcheck/renderer/spellcheck.cc index 3c0016d..ac38e98 100644 --- a/components/spellcheck/renderer/spellcheck.cc +++ b/components/spellcheck/renderer/spellcheck.cc
@@ -25,7 +25,7 @@ #include "components/spellcheck/common/spellcheck_switches.h" #include "components/spellcheck/renderer/spellcheck_language.h" #include "components/spellcheck/renderer/spellcheck_provider.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/common/service_manager_connection.h" #include "content/public/common/simple_connection_filter.h" #include "content/public/renderer/render_frame.h"
diff --git a/components/spellcheck/renderer/spellcheck.h b/components/spellcheck/renderer/spellcheck.h index 630b479..f5617c68 100644 --- a/components/spellcheck/renderer/spellcheck.h +++ b/components/spellcheck/renderer/spellcheck.h
@@ -17,7 +17,7 @@ #include "base/strings/string16.h" #include "components/spellcheck/common/spellcheck.mojom.h" #include "components/spellcheck/renderer/custom_dictionary_engine.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "mojo/public/cpp/bindings/binding_set.h" #include "services/service_manager/public/cpp/binder_registry.h"
diff --git a/components/spellcheck/renderer/spellcheck_panel.h b/components/spellcheck/renderer/spellcheck_panel.h index 97a65f9..78ed48c 100644 --- a/components/spellcheck/renderer/spellcheck_panel.h +++ b/components/spellcheck/renderer/spellcheck_panel.h
@@ -7,7 +7,7 @@ #include "base/macros.h" #include "components/spellcheck/common/spellcheck_panel.mojom.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/renderer/render_frame_observer.h" #include "mojo/public/cpp/bindings/binding_set.h" #include "services/service_manager/public/cpp/binder_registry.h"
diff --git a/components/spellcheck/renderer/spellcheck_provider.cc b/components/spellcheck/renderer/spellcheck_provider.cc index 94b4fb9..073f2c03 100644 --- a/components/spellcheck/renderer/spellcheck_provider.cc +++ b/components/spellcheck/renderer/spellcheck_provider.cc
@@ -10,7 +10,7 @@ #include "components/spellcheck/common/spellcheck_result.h" #include "components/spellcheck/renderer/spellcheck.h" #include "components/spellcheck/renderer/spellcheck_language.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/common/service_names.mojom.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h"
diff --git a/components/spellcheck/renderer/spellcheck_provider.h b/components/spellcheck/renderer/spellcheck_provider.h index c82bef3..be3dbce2 100644 --- a/components/spellcheck/renderer/spellcheck_provider.h +++ b/components/spellcheck/renderer/spellcheck_provider.h
@@ -10,7 +10,7 @@ #include "base/containers/id_map.h" #include "base/macros.h" #include "components/spellcheck/common/spellcheck.mojom.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" #include "third_party/WebKit/public/web/WebTextCheckClient.h"
diff --git a/components/spellcheck/renderer/spellcheck_provider_test.cc b/components/spellcheck/renderer/spellcheck_provider_test.cc index 1d5fdf2c..b7f4a04990 100644 --- a/components/spellcheck/renderer/spellcheck_provider_test.cc +++ b/components/spellcheck/renderer/spellcheck_provider_test.cc
@@ -12,7 +12,7 @@ #include "components/spellcheck/common/spellcheck.mojom.h" #include "components/spellcheck/common/spellcheck_result.h" #include "components/spellcheck/renderer/spellcheck.h" -#include "components/spellcheck/spellcheck_build_features.h" +#include "components/spellcheck/spellcheck_buildflags.h" FakeTextCheckingCompletion::FakeTextCheckingCompletion() : completion_count_(0), cancellation_count_(0) {}
diff --git a/components/sync/protocol/proto_enum_conversions.cc b/components/sync/protocol/proto_enum_conversions.cc index 6ab7a11..24dc909 100644 --- a/components/sync/protocol/proto_enum_conversions.cc +++ b/components/sync/protocol/proto_enum_conversions.cc
@@ -320,10 +320,14 @@ const char* ProtoEnumToString( sync_pb::UserEventSpecifics::UserConsent::Feature feature) { ASSERT_ENUM_BOUNDS(sync_pb::UserEventSpecifics::UserConsent, Feature, - FEATURE_UNSPECIFIED, CHROME_SYNC); + FEATURE_UNSPECIFIED, GOOGLE_LOCATION_SERVICE); switch (feature) { ENUM_CASE(sync_pb::UserEventSpecifics::UserConsent, FEATURE_UNSPECIFIED); ENUM_CASE(sync_pb::UserEventSpecifics::UserConsent, CHROME_SYNC); + ENUM_CASE(sync_pb::UserEventSpecifics::UserConsent, PLAY_STORE); + ENUM_CASE(sync_pb::UserEventSpecifics::UserConsent, BACKUP_AND_RESTORE); + ENUM_CASE(sync_pb::UserEventSpecifics::UserConsent, + GOOGLE_LOCATION_SERVICE); } NOTREACHED(); return "";
diff --git a/components/sync/protocol/user_event_specifics.proto b/components/sync/protocol/user_event_specifics.proto index b800700..5177f1e6 100644 --- a/components/sync/protocol/user_event_specifics.proto +++ b/components/sync/protocol/user_event_specifics.proto
@@ -93,6 +93,9 @@ enum Feature { FEATURE_UNSPECIFIED = 0; CHROME_SYNC = 1; + PLAY_STORE = 2; + BACKUP_AND_RESTORE = 3; + GOOGLE_LOCATION_SERVICE = 4; } optional Feature feature = 1; // Ids of the strings of the consent text presented to the user.
diff --git a/components/toolbar/BUILD.gn b/components/toolbar/BUILD.gn index ca41307..82cd988 100644 --- a/components/toolbar/BUILD.gn +++ b/components/toolbar/BUILD.gn
@@ -7,8 +7,8 @@ import("//device/vr/features/features.gni") import("//components/vector_icons/vector_icons.gni") -buildflag_header("build_features") { - header = "features.h" +buildflag_header("buildflags") { + header = "buildflags.h" flags = [ "ENABLE_VR=$enable_vr" ] } @@ -61,7 +61,7 @@ ] deps = [ - ":build_features", + ":buildflags", "//components/google/core/browser", "//components/prefs", "//components/resources",
diff --git a/components/toolbar/toolbar_model_impl.cc b/components/toolbar/toolbar_model_impl.cc index 2d23c24d..0d6bbaf 100644 --- a/components/toolbar/toolbar_model_impl.cc +++ b/components/toolbar/toolbar_model_impl.cc
@@ -13,7 +13,7 @@ #include "components/prefs/pref_service.h" #include "components/security_state/core/security_state.h" #include "components/strings/grit/components_strings.h" -#include "components/toolbar/features.h" +#include "components/toolbar/buildflags.h" #include "components/toolbar/toolbar_field_trial.h" #include "components/toolbar/toolbar_model_delegate.h" #include "components/url_formatter/elide_url.h"
diff --git a/components/viz/service/display_embedder/gpu_display_provider.cc b/components/viz/service/display_embedder/gpu_display_provider.cc index 6d2a3ad..e894e03 100644 --- a/components/viz/service/display_embedder/gpu_display_provider.cc +++ b/components/viz/service/display_embedder/gpu_display_provider.cc
@@ -107,22 +107,11 @@ bool gpu_compositing = !force_software_compositing; (void)compositing_mode_reporter_; -#if !defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW) - // TODO(crbug.com/730660): On Mac/Android the handle is not an - // AcceleratedWidget, and the widget is only available in the browser process - // via GpuSurfaceTracker (and maybe can't be used in the viz process??) - NOTIMPLEMENTED(); - gfx::AcceleratedWidget widget = 0; - (void)widget; -#else - gfx::AcceleratedWidget widget = surface_handle; -#endif - std::unique_ptr<OutputSurface> output_surface; if (!gpu_compositing) { output_surface = std::make_unique<SoftwareOutputSurface>( - CreateSoftwareOutputDeviceForPlatform(widget), task_runner_); + CreateSoftwareOutputDeviceForPlatform(surface_handle), task_runner_); } else { auto context_provider = base::MakeRefCounted<InProcessContextProvider>( gpu_service_, surface_handle, gpu_memory_buffer_manager_.get(), @@ -179,23 +168,25 @@ std::unique_ptr<SoftwareOutputDevice> GpuDisplayProvider::CreateSoftwareOutputDeviceForPlatform( - gfx::AcceleratedWidget widget) { + gpu::SurfaceHandle surface_handle) { +#if defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW) + gfx::AcceleratedWidget widget = surface_handle; +#endif + #if defined(OS_WIN) if (!output_device_backing_) output_device_backing_ = std::make_unique<OutputDeviceBacking>(); return std::make_unique<SoftwareOutputDeviceWin>(output_device_backing_.get(), widget); #elif defined(OS_MACOSX) - // TODO(crbug.com/730660): We don't have a widget here, so what do we do to - // get something we can draw to? Can we use an IO surface? Can we use CA - // layers and overlays like we do for gpu compositing? - // See https://chromium-review.googlesource.com/c/chromium/src/+/792295 to - // no longer have GpuSurfaceTracker. - // Part of the SoftwareOutputDeviceMac::EndPaint probably needs to move to - // the browser process, and we need to set up transport of an IO surface to - // here? - // return std::make_unique<SoftwareOutputDeviceMac>(widget); + // TODO(crbug.com/730660): What do we do to get something we can draw to? Can + // we use an IO surface? Can we use CA layers and overlays like we do for gpu + // compositing? See https://crrev.com/c/792295 to no longer have + // GpuSurfaceTracker. Part of the SoftwareOutputDeviceMac::EndPaint probably + // needs to move to the browser process, and we need to set up transport of an + // IO surface to here? NOTIMPLEMENTED(); + (void)widget; return nullptr; #elif defined(OS_ANDROID) // Android does not do software compositing, so we can't get here.
diff --git a/components/viz/service/display_embedder/gpu_display_provider.h b/components/viz/service/display_embedder/gpu_display_provider.h index e41a3992..5ea8038 100644 --- a/components/viz/service/display_embedder/gpu_display_provider.h +++ b/components/viz/service/display_embedder/gpu_display_provider.h
@@ -53,7 +53,7 @@ private: std::unique_ptr<SoftwareOutputDevice> CreateSoftwareOutputDeviceForPlatform( - gfx::AcceleratedWidget widget); + gpu::SurfaceHandle surface_handle); const uint32_t restart_id_; scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service_;
diff --git a/components/viz/service/frame_sinks/video_capture/frame_sink_video_capturer_impl.cc b/components/viz/service/frame_sinks/video_capture/frame_sink_video_capturer_impl.cc index 0bdeff0..9d44508b9 100644 --- a/components/viz/service/frame_sinks/video_capture/frame_sink_video_capturer_impl.cc +++ b/components/viz/service/frame_sinks/video_capture/frame_sink_video_capturer_impl.cc
@@ -17,7 +17,7 @@ #include "components/viz/service/frame_sinks/video_capture/frame_sink_video_capturer_manager.h" #include "media/base/limits.h" #include "media/base/video_util.h" -#include "media/capture/mojo/video_capture_types.mojom.h" +#include "media/capture/mojom/video_capture_types.mojom.h" #include "mojo/public/cpp/bindings/strong_binding.h" #include "ui/gfx/color_space.h" #include "ui/gfx/geometry/size.h"
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index e2f66c5..176868f 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn
@@ -53,7 +53,6 @@ "//device/bluetooth", "//device/gamepad", "//device/geolocation", - "//device/sensors", "//device/usb", "//gpu", "//media",
diff --git a/content/app/DEPS b/content/app/DEPS index b562b5a..1020b8e 100644 --- a/content/app/DEPS +++ b/content/app/DEPS
@@ -4,7 +4,6 @@ "+device/bluetooth", "+device/gamepad", "+device/geolocation", - "+device/sensors", "+device/usb", # For loading V8's initial snapshot from external files. "+gin/public/isolate_holder.h",
diff --git a/content/app/OWNERS b/content/app/OWNERS index 92c84d9e..66daea88 100644 --- a/content/app/OWNERS +++ b/content/app/OWNERS
@@ -1,2 +1,3 @@ jcivelli@chromium.org rockot@chromium.org +per-file sandbox_helper_win.cc=file://sandbox/win/OWNERS
diff --git a/content/app/sandbox_helper_win.cc b/content/app/sandbox_helper_win.cc index 3791888e..e24ee42 100644 --- a/content/app/sandbox_helper_win.cc +++ b/content/app/sandbox_helper_win.cc
@@ -18,7 +18,10 @@ sandbox::ApplyProcessMitigationsToCurrentProcess( sandbox::MITIGATION_DEP | sandbox::MITIGATION_DEP_NO_ATL_THUNK | - sandbox::MITIGATION_HARDEN_TOKEN_IL_POLICY); + sandbox::MITIGATION_HARDEN_TOKEN_IL_POLICY | + sandbox::MITIGATION_IMAGE_LOAD_NO_REMOTE | + sandbox::MITIGATION_IMAGE_LOAD_NO_LOW_LABEL | + sandbox::MITIGATION_IMAGE_LOAD_PREFER_SYS32); // Note: these mitigations are "post-startup". Some mitigations that need // to be enabled sooner (e.g. MITIGATION_EXTENSION_POINT_DISABLE) are done // so in Chrome_ELF.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index db266c7..d967c234 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -739,8 +739,6 @@ "download/save_file.h", "download/save_file_manager.cc", "download/save_file_manager.h", - "download/save_file_resource_handler.cc", - "download/save_file_resource_handler.h", "download/save_item.cc", "download/save_item.h", "download/save_package.cc",
diff --git a/content/browser/DEPS b/content/browser/DEPS index 3bb22b7..1679126 100644 --- a/content/browser/DEPS +++ b/content/browser/DEPS
@@ -30,7 +30,6 @@ "+device/gamepad", # For gamepad API "+device/geolocation/public/cpp", "+device/nfc", - "+device/sensors", "+device/vr", # For WebVR API # This can only be used on POSIX, in particular it mustn't be used on Windows # in the browser DLL.
diff --git a/content/browser/android/selection_popup_controller.cc b/content/browser/android/selection_popup_controller.cc index 4ebfcfc..9a7b795 100644 --- a/content/browser/android/selection_popup_controller.cc +++ b/content/browser/android/selection_popup_controller.cc
@@ -175,16 +175,6 @@ return true; } -void SelectionPopupController::OnShowUnhandledTapUIIfNeeded(int x_px, - int y_px) { - JNIEnv* env = AttachCurrentThread(); - ScopedJavaLocalRef<jobject> obj = java_obj_.get(env); - if (obj.is_null()) - return; - Java_SelectionPopupControllerImpl_onShowUnhandledTapUIIfNeeded( - env, obj, static_cast<jint>(x_px), static_cast<jint>(y_px)); -} - void SelectionPopupController::OnSelectWordAroundCaretAck(bool did_select, int start_adjust, int end_adjust) {
diff --git a/content/browser/android/selection_popup_controller.h b/content/browser/android/selection_popup_controller.h index 624ce0a..287626b 100644 --- a/content/browser/android/selection_popup_controller.h +++ b/content/browser/android/selection_popup_controller.h
@@ -38,8 +38,6 @@ void OnDragUpdate(const gfx::PointF& position); void OnSelectionChanged(const std::string& text); bool ShowSelectionMenu(const ContextMenuParams& params, int handle_height); - // |x| and |y| are in physical pixel scale. - void OnShowUnhandledTapUIIfNeeded(int x_px, int y_px); void OnSelectWordAroundCaretAck(bool did_select, int start_adjust, int end_adjust);
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index c924922..8da5fe2 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc
@@ -128,17 +128,16 @@ return termination_status_; } -bool ChildProcessLauncher::Terminate(int exit_code, bool wait) { +bool ChildProcessLauncher::Terminate(int exit_code) { return IsStarting() ? false : ChildProcessLauncherHelper::TerminateProcess( - GetProcess(), exit_code, wait); + GetProcess(), exit_code); } // static bool ChildProcessLauncher::TerminateProcess(const base::Process& process, - int exit_code, - bool wait) { - return ChildProcessLauncherHelper::TerminateProcess(process, exit_code, wait); + int exit_code) { + return ChildProcessLauncherHelper::TerminateProcess(process, exit_code); } // static
diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h index 7763d0c..31d206e 100644 --- a/content/browser/child_process_launcher.h +++ b/content/browser/child_process_launcher.h
@@ -130,15 +130,13 @@ // Terminates the process associated with this ChildProcessLauncher. // Returns true if the process was stopped, false if the process had not been // started yet or could not be stopped. - // Note that |exit_code| and |wait| are not used on Android. - bool Terminate(int exit_code, bool wait); + // Note that |exit_code| is not used on Android. + bool Terminate(int exit_code); // Similar to Terminate() but takes in a |process|. // On Android |process| must have been started by ChildProcessLauncher for // this method to work. - static bool TerminateProcess(const base::Process& process, - int exit_code, - bool wait); + static bool TerminateProcess(const base::Process& process, int exit_code); // Replaces the ChildProcessLauncher::Client for testing purposes. Returns the // previous client.
diff --git a/content/browser/child_process_launcher_helper.h b/content/browser/child_process_launcher_helper.h index 2dac50f..30d314f3 100644 --- a/content/browser/child_process_launcher_helper.h +++ b/content/browser/child_process_launcher_helper.h
@@ -156,10 +156,8 @@ // Terminates |process|. // Returns true if the process was stopped, false if the process had not been // started yet or could not be stopped. - // Note that |exit_code| and |wait| are not used on Android. - static bool TerminateProcess(const base::Process& process, - int exit_code, - bool wait); + // Note that |exit_code| is not used on Android. + static bool TerminateProcess(const base::Process& process, int exit_code); // Terminates the process with the normal exit code and ensures it has been // stopped. By returning a normal exit code this ensures UMA won't treat this
diff --git a/content/browser/child_process_launcher_helper_android.cc b/content/browser/child_process_launcher_helper_android.cc index 989018e..3867bf3 100644 --- a/content/browser/child_process_launcher_helper_android.cc +++ b/content/browser/child_process_launcher_helper_android.cc
@@ -160,8 +160,8 @@ } // static -bool ChildProcessLauncherHelper::TerminateProcess( - const base::Process& process, int exit_code, bool wait) { +bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process, + int exit_code) { BrowserThread::PostTask(BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind(&StopChildProcess, process.Handle())); return true;
diff --git a/content/browser/child_process_launcher_helper_fuchsia.cc b/content/browser/child_process_launcher_helper_fuchsia.cc index 6d5e6ca..8be1b0e4 100644 --- a/content/browser/child_process_launcher_helper_fuchsia.cc +++ b/content/browser/child_process_launcher_helper_fuchsia.cc
@@ -31,9 +31,8 @@ // static bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process, - int exit_code, - bool wait) { - return process.Terminate(exit_code, wait); + int exit_code) { + return process.Terminate(exit_code, false); } // static
diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc index 1b8601d..64957aa 100644 --- a/content/browser/child_process_launcher_helper_linux.cc +++ b/content/browser/child_process_launcher_helper_linux.cc
@@ -130,9 +130,11 @@ } // static -bool ChildProcessLauncherHelper::TerminateProcess( - const base::Process& process, int exit_code, bool wait) { - return process.Terminate(exit_code, wait); +bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process, + int exit_code) { + // TODO(https://crbug.com/818244): Determine whether we should also call + // EnsureProcessTerminated() to make sure of process-exit, and reap it. + return process.Terminate(exit_code, false); } // static
diff --git a/content/browser/child_process_launcher_helper_mac.cc b/content/browser/child_process_launcher_helper_mac.cc index 666b5e7..3dd188d 100644 --- a/content/browser/child_process_launcher_helper_mac.cc +++ b/content/browser/child_process_launcher_helper_mac.cc
@@ -232,9 +232,11 @@ } // static -bool ChildProcessLauncherHelper::TerminateProcess( - const base::Process& process, int exit_code, bool wait) { - return process.Terminate(exit_code, wait); +bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process, + int exit_code) { + // TODO(https://crbug.com/818244): Determine whether we should also call + // EnsureProcessTerminated() to make sure of process-exit, and reap it. + return process.Terminate(exit_code, false); } // static
diff --git a/content/browser/child_process_launcher_helper_win.cc b/content/browser/child_process_launcher_helper_win.cc index b9183469..bf9836e 100644 --- a/content/browser/child_process_launcher_helper_win.cc +++ b/content/browser/child_process_launcher_helper_win.cc
@@ -96,9 +96,9 @@ } // static -bool ChildProcessLauncherHelper::TerminateProcess( - const base::Process& process, int exit_code, bool wait) { - return process.Terminate(exit_code, wait); +bool ChildProcessLauncherHelper::TerminateProcess(const base::Process& process, + int exit_code) { + return process.Terminate(exit_code, false); } void ChildProcessLauncherHelper::ForceNormalProcessTerminationSync(
diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc index 942d5d2..412b31f5 100644 --- a/content/browser/child_process_security_policy_browsertest.cc +++ b/content/browser/child_process_security_policy_browsertest.cc
@@ -11,6 +11,7 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/result_codes.h" +#include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test.h" #include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" @@ -49,8 +50,11 @@ 1U); WebContents* web_contents = shell()->web_contents(); - web_contents->GetMainFrame()->GetProcess()->Shutdown(RESULT_CODE_KILLED, - true); + content::RenderProcessHostWatcher exit_observer( + web_contents->GetMainFrame()->GetProcess(), + content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); + web_contents->GetMainFrame()->GetProcess()->Shutdown(RESULT_CODE_KILLED); + exit_observer.Wait(); web_contents->GetController().Reload(ReloadType::NORMAL, true); EXPECT_EQ(
diff --git a/content/browser/device_sensors/DEPS b/content/browser/device_sensors/DEPS deleted file mode 100644 index 860720f..0000000 --- a/content/browser/device_sensors/DEPS +++ /dev/null
@@ -1,3 +0,0 @@ -include_rules = [ - "+device/sensors/public/cpp", -]
diff --git a/content/browser/download/save_file.h b/content/browser/download/save_file.h index 7e8d743..688574b0 100644 --- a/content/browser/download/save_file.h +++ b/content/browser/download/save_file.h
@@ -43,7 +43,6 @@ // Accessors. SaveItemId save_item_id() const { return info_->save_item_id; } int render_process_id() const { return info_->render_process_id; } - int request_id() const { return info_->request_id; } SaveFileCreateInfo::SaveFileSource save_source() const { return info_->save_source; }
diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index 770f5d26..8fdf839d 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc
@@ -11,18 +11,16 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" -#include "base/threading/thread.h" #include "components/download/public/common/download_task_runner.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/download/save_file.h" -#include "content/browser/download/save_file_resource_handler.h" #include "content/browser/download/save_package.h" -#include "content/browser/loader/resource_dispatcher_host_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/resource_context.h" +#include "content/public/browser/storage_partition.h" #include "content/public/common/previews_state.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" @@ -30,6 +28,9 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" +#include "services/network/public/cpp/simple_url_loader.h" +#include "services/network/public/cpp/simple_url_loader_stream_consumer.h" +#include "services/network/public/mojom/url_loader_factory.mojom.h" #include "url/gurl.h" namespace content { @@ -41,6 +42,101 @@ } // namespace +class SaveFileManager::SimpleURLLoaderHelper + : public network::SimpleURLLoaderStreamConsumer { + public: + static std::unique_ptr<SimpleURLLoaderHelper> CreateAndStartDownload( + std::unique_ptr<network::ResourceRequest> resource_request, + SaveItemId save_item_id, + SavePackageId save_package_id, + int render_process_id, + int render_frame_routing_id, + const net::NetworkTrafficAnnotationTag& annotation_tag, + network::mojom::URLLoaderFactory* url_loader_factory, + SaveFileManager* save_file_manager) { + return std::unique_ptr<SimpleURLLoaderHelper>(new SimpleURLLoaderHelper( + std::move(resource_request), save_item_id, save_package_id, + render_process_id, render_frame_routing_id, annotation_tag, + url_loader_factory, save_file_manager)); + } + + ~SimpleURLLoaderHelper() override = default; + + private: + SimpleURLLoaderHelper( + std::unique_ptr<network::ResourceRequest> resource_request, + SaveItemId save_item_id, + SavePackageId save_package_id, + int render_process_id, + int render_frame_routing_id, + const net::NetworkTrafficAnnotationTag& annotation_tag, + network::mojom::URLLoaderFactory* url_loader_factory, + SaveFileManager* save_file_manager) + : save_file_manager_(save_file_manager), + save_item_id_(save_item_id), + save_package_id_(save_package_id) { + GURL url = resource_request->url; + url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request), + annotation_tag); + // We can use Unretained below as |url_loader_| is owned by |this|, so the + // callback won't be invoked if |this| gets deleted. + url_loader_->SetOnResponseStartedCallback(base::BindRepeating( + &SimpleURLLoaderHelper::OnResponseStarted, base::Unretained(this), url, + render_process_id, render_frame_routing_id)); + url_loader_->DownloadAsStream(url_loader_factory, this); + } + + void OnResponseStarted(GURL url, + int render_process_id, + int render_frame_routing_id, + const GURL& final_url, + const network::ResourceResponseHead& response_head) { + std::string content_disposition; + if (response_head.headers) { + response_head.headers->GetNormalizedHeader("Content-Disposition", + &content_disposition); + } + + auto info = std::make_unique<SaveFileCreateInfo>( + url, final_url, save_item_id_, save_package_id_, render_process_id, + render_frame_routing_id, content_disposition); + download::GetDownloadTaskRunner()->PostTask( + FROM_HERE, base::BindOnce(&SaveFileManager::StartSave, + save_file_manager_, std::move(info))); + } + + // network::SimpleURLLoaderStreamConsumer implementation: + void OnDataReceived(base::StringPiece string_piece, + base::OnceClosure resume) override { + // TODO(jcivelli): we should make threading sane and avoid copying + // |string_piece| bytes. + download::GetDownloadTaskRunner()->PostTask( + FROM_HERE, + base::BindOnce(&SaveFileManager::UpdateSaveProgress, save_file_manager_, + save_item_id_, string_piece.as_string())); + std::move(resume).Run(); + } + + void OnComplete(bool success) override { + download::GetDownloadTaskRunner()->PostTask( + FROM_HERE, + base::BindOnce(&SaveFileManager::SaveFinished, save_file_manager_, + save_item_id_, save_package_id_, success)); + } + + void OnRetry(base::OnceClosure start_retry) override { + // Retries are not enabled. + NOTREACHED(); + } + + SaveFileManager* save_file_manager_; + SaveItemId save_item_id_; + SavePackageId save_package_id_; + std::unique_ptr<network::SimpleURLLoader> url_loader_; + + DISALLOW_COPY_AND_ASSIGN(SimpleURLLoaderHelper); +}; + SaveFileManager::SaveFileManager() { DCHECK(g_save_file_manager == nullptr); g_save_file_manager = this; @@ -96,6 +192,7 @@ SaveFileCreateInfo::SaveFileSource save_source, const base::FilePath& file_full_path, ResourceContext* context, + StoragePartition* storage_partition, SavePackage* save_package) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -106,13 +203,48 @@ // Register a saving job. if (save_source == SaveFileCreateInfo::SAVE_FILE_FROM_NET) { DCHECK(url.is_valid()); + // Starts the actual download. + if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL( + render_process_host_id, url)) { + download::GetDownloadTaskRunner()->PostTask( + FROM_HERE, + base::BindOnce(&SaveFileManager::SaveFinished, this, save_item_id, + save_package->id(), /*success=*/false)); + return; + } - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::BindOnce(&SaveFileManager::OnSaveURL, this, url, referrer, - save_item_id, save_package->id(), render_process_host_id, - render_view_routing_id, render_frame_routing_id, - context)); + net::NetworkTrafficAnnotationTag traffic_annotation = + net::DefineNetworkTrafficAnnotation("save_file_manager", R"( + semantics { + sender: "Save File" + description: "Saving url to local file." + trigger: + "User clicks on 'Save link as...' context menu command to save a " + "link." + data: "None." + destination: WEBSITE + } + policy { + cookies_allowed: YES + cookies_store: "user" + setting: + "This feature cannot be disable by settings. The request is made " + "only if user chooses 'Save link as...' in context menu." + policy_exception_justification: "Not implemented." + })"); + + auto request = std::make_unique<network::ResourceRequest>(); + request->url = url; + request->referrer = referrer.url; + request->priority = net::DEFAULT_PRIORITY; + request->load_flags = net::LOAD_SKIP_CACHE_VALIDATION; + + url_loader_helpers_[save_item_id] = + SimpleURLLoaderHelper::CreateAndStartDownload( + std::move(request), save_item_id, save_package->id(), + render_process_host_id, render_frame_routing_id, traffic_annotation, + storage_partition->GetURLLoaderFactoryForBrowserProcess().get(), + this); } else { // We manually start the save job. auto info = std::make_unique<SaveFileCreateInfo>( @@ -204,15 +336,14 @@ // thread). We may receive a few more updates before the IO thread gets the // cancel message. We just delete the data since the SaveFile has been deleted. void SaveFileManager::UpdateSaveProgress(SaveItemId save_item_id, - net::IOBuffer* data, - int data_len) { + const std::string& data) { DCHECK(download::GetDownloadTaskRunner()->RunsTasksInCurrentSequence()); SaveFile* save_file = LookupSaveFile(save_item_id); if (save_file) { DCHECK(save_file->InProgress()); download::DownloadInterruptReason reason = - save_file->AppendDataToFile(data->data(), data_len); + save_file->AppendDataToFile(data.data(), data.size()); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::BindOnce(&SaveFileManager::OnUpdateSaveProgress, this, @@ -233,17 +364,15 @@ int64_t bytes_so_far = 0; SaveFile* save_file = LookupSaveFile(save_item_id); - if (save_file != nullptr) { + // Note that we might not have a save_file: canceling starts on the download + // thread but the load is canceled on the UI thread. The request might finish + // while thread hoping. + if (save_file) { DCHECK(save_file->InProgress()); DVLOG(20) << __func__ << "() save_file = " << save_file->DebugString(); bytes_so_far = save_file->BytesSoFar(); save_file->Finish(); save_file->Detach(); - } else { - // We got called before StartSave - this should only happen if - // ResourceHandler failed before it got a chance to parse headers - // and metadata. - DCHECK(!is_success); } BrowserThread::PostTask( @@ -283,98 +412,12 @@ int64_t bytes_so_far, bool is_success) { DCHECK_CURRENTLY_ON(BrowserThread::UI); + ClearURLLoader(save_item_id); SavePackage* package = LookupPackage(save_item_id); if (package) package->SaveFinished(save_item_id, bytes_so_far, is_success); } -// Notifications sent from the UI thread and run on the IO thread. - -void SaveFileManager::OnSaveURL(const GURL& url, - const Referrer& referrer, - SaveItemId save_item_id, - SavePackageId save_package_id, - int render_process_host_id, - int render_view_routing_id, - int render_frame_routing_id, - ResourceContext* context) { - DCHECK_CURRENTLY_ON(BrowserThread::IO); - - const net::URLRequestContext* request_context = context->GetRequestContext(); - if (!request_context->job_factory()->IsHandledProtocol(url.scheme())) { - // Since any URLs which have non-standard scheme have been filtered - // by save manager(see GURL::SchemeIsStandard). This situation - // should not happen. - NOTREACHED(); - return; - } - - net::NetworkTrafficAnnotationTag traffic_annotation = - net::DefineNetworkTrafficAnnotation("save_file_manager", R"( - semantics { - sender: "Save File" - description: "Saving url to local file." - trigger: - "User clicks on 'Save link as...' context menu command to save a " - "link." - data: "None." - destination: WEBSITE - } - policy { - cookies_allowed: YES - cookies_store: "user" - setting: - "This feature cannot be disable by settings. The request is made " - "only if user chooses 'Save link as...' in context menu." - policy_exception_justification: "Not implemented." - })"); - std::unique_ptr<net::URLRequest> request(request_context->CreateRequest( - url, net::DEFAULT_PRIORITY, nullptr, traffic_annotation)); - request->set_method("GET"); - - // The URLRequest needs to be initialized with the referrer and other - // information prior to issuing it. - ResourceDispatcherHostImpl::Get()->InitializeURLRequest( - request.get(), referrer, - false, // download. - render_process_host_id, render_view_routing_id, render_frame_routing_id, - PREVIEWS_OFF, context); - - // So far, for saving page, we need fetch content from cache, in the - // future, maybe we can use a configuration to configure this behavior. - request->SetLoadFlags(net::LOAD_SKIP_CACHE_VALIDATION); - - // Check if the renderer is permitted to request the requested URL. - using AuthorizationState = SaveFileResourceHandler::AuthorizationState; - AuthorizationState authorization_state = AuthorizationState::AUTHORIZED; - if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL( - render_process_host_id, url)) { - DVLOG(1) << "Denying unauthorized save of " << url.possibly_invalid_spec(); - authorization_state = AuthorizationState::NOT_AUTHORIZED; - // No need to return here (i.e. okay to begin processing the request below), - // because NOT_AUTHORIZED will cause the request to be cancelled. See also - // doc comments for AuthorizationState enum. - } - - std::unique_ptr<SaveFileResourceHandler> handler(new SaveFileResourceHandler( - request.get(), save_item_id, save_package_id, render_process_host_id, - render_frame_routing_id, url, authorization_state)); - - ResourceDispatcherHostImpl::Get()->BeginURLRequest( - std::move(request), std::move(handler), - false, // download - false, // content_initiated (download specific) - false, // do_not_prompt_for_login (download specific) - context); -} - -void SaveFileManager::ExecuteCancelSaveRequest(int render_process_id, - int request_id) { - DCHECK_CURRENTLY_ON(BrowserThread::IO); - ResourceDispatcherHostImpl::Get()->CancelRequest( - render_process_id, request_id); -} - // Notifications sent from the UI thread and run on the file thread. // This method will be sent via a user action, or shutdown on the UI thread, @@ -395,15 +438,9 @@ base::DeleteFile(save_file->FullPath(), false); } else if (save_file->save_source() == SaveFileCreateInfo::SAVE_FILE_FROM_NET) { - // If the data comes from the net IO thread and hasn't completed - // yet, then forward the cancel message to IO thread & cancel the - // save locally. If the data doesn't come from the IO thread, - // we can ignore the message. BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::BindOnce(&SaveFileManager::ExecuteCancelSaveRequest, this, - save_file->render_process_id(), - save_file->request_id())); + BrowserThread::UI, FROM_HERE, + base::BindOnce(&SaveFileManager::ClearURLLoader, this, save_item_id)); } // Whatever the save file is complete or not, just delete it. This @@ -412,6 +449,13 @@ } } +void SaveFileManager::ClearURLLoader(SaveItemId save_item_id) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + auto url_loader_iter = url_loader_helpers_.find(save_item_id); + if (url_loader_iter != url_loader_helpers_.end()) + url_loader_helpers_.erase(url_loader_iter); +} + void SaveFileManager::OnDeleteDirectoryOrFile(const base::FilePath& full_path, bool is_dir) { DCHECK(download::GetDownloadTaskRunner()->RunsTasksInCurrentSequence());
diff --git a/content/browser/download/save_file_manager.h b/content/browser/download/save_file_manager.h index b8f0eb79..d6e539c 100644 --- a/content/browser/download/save_file_manager.h +++ b/content/browser/download/save_file_manager.h
@@ -10,27 +10,22 @@ // thread or the UI thread. It coordinates the notifications from the network // and UI. // -// The SaveFileManager itself is a singleton object owned by the -// ResourceDispatcherHostImpl. +// The SaveFileManager itself is a singleton object created and owned by the +// BrowserMainLoop. // -// The data sent to SaveFileManager have 2 sources, one is from -// ResourceDispatcherHostImpl, run in network IO thread, the all sub-resources -// and save-only-HTML pages will be got from network IO. The second is from -// render process, those html pages which are serialized from DOM will be -// composed in render process and encoded to its original encoding, then sent -// to UI loop in browser process, then UI loop will dispatch the data to -// SaveFileManager on the file thread. SaveFileManager will directly -// call SaveFile's method to persist data. +// The data sent to SaveFileManager have 2 sources: +// - SimpleURLLoaders which are used to download sub-resources and +// save-only-HTML pages +// - render processese, for HTML pages which are serialized from the DOM in +// their original encoding. The data is received on the UI thread and +// dispatched directly to the SaveFileManager on the file thread. // // A typical saving job operation involves multiple threads and sequences: // -// Updating an in progress save file -// io_thread -// |----> data from net ---->| -// | -// | +// Updating an in progress save file: // |----> data from ---->| | // | render process | | +// | SimpleURLLoaders | | // ui_thread | | // download_task_runner (writes to disk) // |----> stats ---->| @@ -62,6 +57,7 @@ #include <memory> #include <string> #include <unordered_map> +#include <vector> #include "base/macros.h" #include "base/memory/ref_counted.h" @@ -74,14 +70,11 @@ class FilePath; } -namespace net { -class IOBuffer; -} - namespace content { class ResourceContext; class SaveFile; class SavePackage; +class StoragePartition; struct Referrer; class CONTENT_EXPORT SaveFileManager @@ -95,10 +88,8 @@ // Lifetime management. void Shutdown(); - // Save the specified URL. Caller has to guarantee that |save_package| will - // be alive until the call to RemoveSaveFile. Called on the UI thread (and in - // case of network downloads forwarded to the ResourceDispatcherHostImpl on - // the IO thread). + // Saves the specified URL |url|. |save_package| must not be deleted before + // the call to RemoveSaveFile. Should be called on the UI thread, void SaveURL(SaveItemId save_item_id, const GURL& url, const Referrer& referrer, @@ -108,13 +99,12 @@ SaveFileCreateInfo::SaveFileSource save_source, const base::FilePath& file_full_path, ResourceContext* context, + StoragePartition* storage_partition, SavePackage* save_package); // Notifications sent from the IO thread and run on the file thread: void StartSave(std::unique_ptr<SaveFileCreateInfo> info); - void UpdateSaveProgress(SaveItemId save_item_id, - net::IOBuffer* data, - int size); + void UpdateSaveProgress(SaveItemId save_item_id, const std::string& data); void SaveFinished(SaveItemId save_item_id, SavePackageId save_package_id, bool is_success); @@ -150,6 +140,8 @@ private: friend class base::RefCountedThreadSafe<SaveFileManager>; + class SimpleURLLoaderHelper; + ~SaveFileManager(); // A cleanup helper that runs on the file thread. @@ -205,10 +197,12 @@ int render_process_host_id, int render_view_routing_id, int render_frame_routing_id, - ResourceContext* context); - // Call ResourceDispatcherHostImpl's CancelRequest method to execute cancel - // action in the IO thread. - void ExecuteCancelSaveRequest(int render_process_id, int request_id); + StoragePartition* storage_partition); + + // Called on the UI thread to remove the SimpleURLLoader in + // |url_loader_helpers_| associated with |save_item_id|. This stops the load + // if it is not complete. + void ClearURLLoader(SaveItemId save_item_id); // A map from save_item_id into SaveFiles. std::unordered_map<SaveItemId, std::unique_ptr<SaveFile>, SaveItemId::Hasher> @@ -218,6 +212,13 @@ // SavePackageMap maps save item ids to their SavePackage. std::unordered_map<SaveItemId, SavePackage*, SaveItemId::Hasher> packages_; + // The helper object doing the actual download. Should be accessed on the UI + // thread. + std::unordered_map<SaveItemId, + std::unique_ptr<SimpleURLLoaderHelper>, + SaveItemId::Hasher> + url_loader_helpers_; + DISALLOW_COPY_AND_ASSIGN(SaveFileManager); };
diff --git a/content/browser/download/save_file_resource_handler.cc b/content/browser/download/save_file_resource_handler.cc deleted file mode 100644 index fee5c7a..0000000 --- a/content/browser/download/save_file_resource_handler.cc +++ /dev/null
@@ -1,128 +0,0 @@ -// Copyright (c) 2012 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 "content/browser/download/save_file_resource_handler.h" - -#include <string> - -#include "base/bind.h" -#include "base/logging.h" -#include "base/message_loop/message_loop.h" -#include "base/strings/string_number_conversions.h" -#include "components/download/public/common/download_task_runner.h" -#include "content/browser/download/save_file_manager.h" -#include "content/browser/loader/resource_controller.h" -#include "net/base/io_buffer.h" -#include "net/http/http_response_headers.h" -#include "net/url_request/redirect_info.h" -#include "net/url_request/url_request_status.h" -#include "services/network/public/cpp/resource_response.h" - -namespace content { - -SaveFileResourceHandler::SaveFileResourceHandler( - net::URLRequest* request, - SaveItemId save_item_id, - SavePackageId save_package_id, - int render_process_host_id, - int render_frame_routing_id, - const GURL& url, - AuthorizationState authorization_state) - : ResourceHandler(request), - save_item_id_(save_item_id), - save_package_id_(save_package_id), - render_process_id_(render_process_host_id), - render_frame_routing_id_(render_frame_routing_id), - url_(url), - save_manager_(SaveFileManager::Get()), - authorization_state_(authorization_state) {} - -SaveFileResourceHandler::~SaveFileResourceHandler() { -} - -void SaveFileResourceHandler::OnRequestRedirected( - const net::RedirectInfo& redirect_info, - network::ResourceResponse* response, - std::unique_ptr<ResourceController> controller) { - final_url_ = redirect_info.new_url; - controller->Resume(); -} - -void SaveFileResourceHandler::OnResponseStarted( - network::ResourceResponse* response, - std::unique_ptr<ResourceController> controller) { - std::string content_disposition; - if (response->head.headers) { - response->head.headers->GetNormalizedHeader("Content-Disposition", - &content_disposition); - } - - auto info = std::make_unique<SaveFileCreateInfo>( - url_, final_url_, save_item_id_, save_package_id_, render_process_id_, - render_frame_routing_id_, GetRequestID(), content_disposition); - download::GetDownloadTaskRunner()->PostTask( - FROM_HERE, base::BindOnce(&SaveFileManager::StartSave, save_manager_, - std::move(info))); - controller->Resume(); -} - -void SaveFileResourceHandler::OnWillStart( - const GURL& url, - std::unique_ptr<ResourceController> controller) { - if (authorization_state_ == AuthorizationState::AUTHORIZED) { - controller->Resume(); - } else { - controller->Cancel(); - } -} - -void SaveFileResourceHandler::OnWillRead( - scoped_refptr<net::IOBuffer>* buf, - int* buf_size, - std::unique_ptr<ResourceController> controller) { - DCHECK_EQ(AuthorizationState::AUTHORIZED, authorization_state_); - DCHECK(buf && buf_size); - if (!read_buffer_.get()) { - *buf_size = kReadBufSize; - read_buffer_ = new net::IOBuffer(*buf_size); - } - *buf = read_buffer_.get(); - controller->Resume(); -} - -void SaveFileResourceHandler::OnReadCompleted( - int bytes_read, - std::unique_ptr<ResourceController> controller) { - DCHECK_EQ(AuthorizationState::AUTHORIZED, authorization_state_); - DCHECK(read_buffer_.get()); - // We are passing ownership of this buffer to the save file manager. - scoped_refptr<net::IOBuffer> buffer; - read_buffer_.swap(buffer); - download::GetDownloadTaskRunner()->PostTask( - FROM_HERE, - base::BindOnce(&SaveFileManager::UpdateSaveProgress, save_manager_, - save_item_id_, base::RetainedRef(buffer), bytes_read)); - controller->Resume(); -} - -void SaveFileResourceHandler::OnResponseCompleted( - const net::URLRequestStatus& status, - std::unique_ptr<ResourceController> controller) { - if (authorization_state_ != AuthorizationState::AUTHORIZED) - DCHECK(!status.is_success()); - - download::GetDownloadTaskRunner()->PostTask( - FROM_HERE, - base::BindOnce(&SaveFileManager::SaveFinished, save_manager_, - save_item_id_, save_package_id_, - status.is_success() && !status.is_io_pending())); - read_buffer_ = nullptr; - controller->Resume(); -} - -void SaveFileResourceHandler::OnDataDownloaded(int bytes_downloaded) { - NOTREACHED(); -} - -} // namespace content
diff --git a/content/browser/download/save_file_resource_handler.h b/content/browser/download/save_file_resource_handler.h deleted file mode 100644 index e371cbe1..0000000 --- a/content/browser/download/save_file_resource_handler.h +++ /dev/null
@@ -1,100 +0,0 @@ -// Copyright (c) 2012 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 CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_RESOURCE_HANDLER_H_ -#define CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_RESOURCE_HANDLER_H_ - -#include "base/macros.h" -#include "base/memory/ref_counted.h" -#include "content/browser/download/save_types.h" -#include "content/browser/loader/resource_handler.h" -#include "url/gurl.h" - -namespace net { -class URLRequest; -} - -namespace content { -class ResourceController; -class SaveFileManager; - -// Forwards data to the save thread. -class SaveFileResourceHandler : public ResourceHandler { - public: - // Unauthorized requests are cancelled from OnWillStart callback. - // - // This way of handling unauthorized requests allows unified handling of all - // SaveFile requests - communicating the failure to OnResponseCompleted - // happens in a generic, typical way, reusing common infrastructure code - // (rather than forcing an ad-hoc, Save-File-specific call to - // OnResponseCompleted from ResourceDispatcherHostImpl::BeginSaveFile). - enum class AuthorizationState { - AUTHORIZED, - NOT_AUTHORIZED, - }; - - SaveFileResourceHandler(net::URLRequest* request, - SaveItemId save_item_id, - SavePackageId save_package_id, - int render_process_host_id, - int render_frame_routing_id, - const GURL& url, - AuthorizationState authorization_state); - ~SaveFileResourceHandler() override; - - // ResourceHandler Implementation: - - // Saves the redirected URL to final_url_, we need to use the original - // URL to match original request. - void OnRequestRedirected( - const net::RedirectInfo& redirect_info, - network::ResourceResponse* response, - std::unique_ptr<ResourceController> controller) override; - - // Sends the download creation information to the download thread. - void OnResponseStarted( - network::ResourceResponse* response, - std::unique_ptr<ResourceController> controller) override; - - // Pass-through implementation. - void OnWillStart(const GURL& url, - std::unique_ptr<ResourceController> controller) override; - - // Creates a new buffer, which will be handed to the download thread for file - // writing and deletion. - void OnWillRead(scoped_refptr<net::IOBuffer>* buf, - int* buf_size, - std::unique_ptr<ResourceController> controller) override; - - // Passes the buffer to the download file writer. - void OnReadCompleted(int bytes_read, - std::unique_ptr<ResourceController> controller) override; - - void OnResponseCompleted( - const net::URLRequestStatus& status, - std::unique_ptr<ResourceController> controller) override; - - // N/A to this flavor of SaveFileResourceHandler. - void OnDataDownloaded(int bytes_downloaded) override; - - private: - SaveItemId save_item_id_; - SavePackageId save_package_id_; - int render_process_id_; - int render_frame_routing_id_; - scoped_refptr<net::IOBuffer> read_buffer_; - GURL url_; - GURL final_url_; - SaveFileManager* save_manager_; - - AuthorizationState authorization_state_; - - static const int kReadBufSize = 32768; // bytes - - DISALLOW_COPY_AND_ASSIGN(SaveFileResourceHandler); -}; - -} // namespace content - -#endif // CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_RESOURCE_HANDLER_H_
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index 977eda1..a7d9f445 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc
@@ -820,7 +820,13 @@ requester_frame->render_view_host()->GetRoutingID(), requester_frame->routing_id(), save_item_ptr->save_source(), save_item_ptr->full_path(), - web_contents()->GetBrowserContext()->GetResourceContext(), this); + web_contents()->GetBrowserContext()->GetResourceContext(), + web_contents() + ->GetRenderViewHost() + ->GetProcess() + ->GetStoragePartition(), + this); + } while (process_all_remaining_items && !waiting_item_queue_.empty()); } @@ -1046,16 +1052,10 @@ } if (!data.empty()) { - // Prepare buffer for saving HTML data. - scoped_refptr<net::IOBuffer> new_data(new net::IOBuffer(data.size())); - memcpy(new_data->data(), data.data(), data.size()); - // Call write file functionality in download sequence. download::GetDownloadTaskRunner()->PostTask( - FROM_HERE, - base::BindOnce(&SaveFileManager::UpdateSaveProgress, file_manager_, - save_item->id(), base::RetainedRef(new_data), - static_cast<int>(data.size()))); + FROM_HERE, base::BindOnce(&SaveFileManager::UpdateSaveProgress, + file_manager_, save_item->id(), data)); } // Current frame is completed saving, call finish in download sequence.
diff --git a/content/browser/download/save_package.h b/content/browser/download/save_package.h index 425d6dab..f09df9c 100644 --- a/content/browser/download/save_package.h +++ b/content/browser/download/save_package.h
@@ -45,15 +45,15 @@ class SavePackage; class WebContents; -// The SavePackage object manages the process of saving a page as only-html or -// complete-html or MHTML and providing the information for displaying saving -// status. Saving page as only-html means means that we save web page to a -// single HTML file regardless internal sub resources and sub frames. Saving -// page as complete-html page means we save not only the main html file the user -// told it to save but also a directory for the auxiliary files such as all -// sub-frame html files, image files, css files and js files. Saving page as -// MHTML means the same thing as complete-html, but it uses the MHTML format to -// contain the html and all auxiliary files in a single text file. +// SavePackage manages the process of saving a page as only-HTML, complete-HTML +// or MHTML and provides status information about the job. +// - only-html: the web page is saved to a single HTML file excluding +// sub-resources and sub-frames +// - complete-html: the web page's main frame HTML is saved to the user selected +// file and a directory for the auxiliary files such as all sub-frame html +// files, image files, css files and js files is created +// - MHTML: the main frame and all auxiliary files are stored a single text +// file using the MHTML format. // // Each page saving job may include one or multiple files which need to be // saved. Each file is represented by a SaveItem, and all SaveItems are owned
diff --git a/content/browser/download/save_types.cc b/content/browser/download/save_types.cc index 81e5925..80d714b 100644 --- a/content/browser/download/save_types.cc +++ b/content/browser/download/save_types.cc
@@ -21,7 +21,6 @@ save_package_id(save_package_id), render_process_id(render_process_id), render_frame_routing_id(render_frame_routing_id), - request_id(-1), save_source(save_source) {} SaveFileCreateInfo::SaveFileCreateInfo(const GURL& url, @@ -30,7 +29,6 @@ SavePackageId save_package_id, int render_process_id, int render_frame_routing_id, - int request_id, const std::string& content_disposition) : url(url), final_url(final_url), @@ -38,7 +36,6 @@ save_package_id(save_package_id), render_process_id(render_process_id), render_frame_routing_id(render_frame_routing_id), - request_id(request_id), content_disposition(content_disposition), save_source(SaveFileCreateInfo::SAVE_FILE_FROM_NET) {}
diff --git a/content/browser/download/save_types.h b/content/browser/download/save_types.h index 027daec..20c8089 100644 --- a/content/browser/download/save_types.h +++ b/content/browser/download/save_types.h
@@ -57,7 +57,6 @@ SavePackageId save_package_id, int render_process_id, int render_frame_routing_id, - int request_id, const std::string& content_disposition); SaveFileCreateInfo(const SaveFileCreateInfo& other); @@ -78,8 +77,6 @@ // IDs for looking up the contents we are associated with. int render_process_id; int render_frame_routing_id; - // Handle for informing the ResourceDispatcherHost of a UI based cancel. - int request_id; // Disposition info from HTTP response. std::string content_disposition; // Source type of saved file.
diff --git a/content/browser/frame_host/frame_tree_browsertest.cc b/content/browser/frame_host/frame_tree_browsertest.cc index 13a8fae..f506ac6 100644 --- a/content/browser/frame_host/frame_tree_browsertest.cc +++ b/content/browser/frame_host/frame_tree_browsertest.cc
@@ -131,8 +131,8 @@ RenderProcessHostWatcher crash_observer( shell()->web_contents(), RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - ASSERT_TRUE(shell()->web_contents()->GetMainFrame()->GetProcess()->Shutdown( - 0, false)); + ASSERT_TRUE( + shell()->web_contents()->GetMainFrame()->GetProcess()->Shutdown(0)); crash_observer.Wait(); // The frame tree should be cleared.
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc index c1f61006..0cb359a 100644 --- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc +++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -4591,7 +4591,7 @@ shell()->web_contents()->GetMainFrame()->GetProcess(); RenderProcessHostWatcher crash_observer( process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - process->Shutdown(0, false); + process->Shutdown(0); crash_observer.Wait(); { TestNavigationObserver back_load_observer(shell()->web_contents());
diff --git a/content/browser/frame_host/render_frame_host_impl_browsertest.cc b/content/browser/frame_host/render_frame_host_impl_browsertest.cc index ede479b3..e304fb6f 100644 --- a/content/browser/frame_host/render_frame_host_impl_browsertest.cc +++ b/content/browser/frame_host/render_frame_host_impl_browsertest.cc
@@ -565,7 +565,7 @@ RenderProcessHost* renderer_process = main_frame->GetProcess(); RenderProcessHostWatcher crash_observer( renderer_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - renderer_process->Shutdown(0, false); + renderer_process->Shutdown(0); crash_observer.Wait(); // The |stream_handle_| must have been released now. @@ -703,7 +703,7 @@ RenderProcessHost* renderer_process = main_frame->GetProcess(); RenderProcessHostWatcher crash_observer( renderer_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - renderer_process->Shutdown(0, false); + renderer_process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(main_frame->GetSuddenTerminationDisablerState(
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc index d7342d6..283d3ba 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1261,6 +1261,15 @@ if (IsCurrentlySameSite(render_frame_host_.get(), dest_url)) return SiteInstanceDescriptor(render_frame_host_->GetSiteInstance()); + // At this point, |dest_url| corresponds to a cross-site navigation. See if + // we can swap BrowsingInstances to avoid unneeded process sharing. This is + // done for certain main frame browser-initiated navigations. See + // https://crbug.com/803367. + if (IsBrowsingInstanceSwapAllowedForPageTransition(transition, dest_url)) { + return SiteInstanceDescriptor(browser_context, dest_url, + SiteInstanceRelation::UNRELATED); + } + // Shortcut some common cases for reusing an existing frame's SiteInstance. // There are several reasons for this: // - looking at the main frame and openers is required for TDI mode. @@ -1337,6 +1346,43 @@ SiteInstanceRelation::RELATED); } +bool RenderFrameHostManager::IsBrowsingInstanceSwapAllowedForPageTransition( + ui::PageTransition transition, + const GURL& dest_url) { + // Disallow BrowsingInstance swaps for subframes. + if (!frame_tree_node_->IsMainFrame()) + return false; + + // Skip data: and file: URLs, as some tests rely on browser-initiated + // navigations to those URLs to stay in the same process. Swapping + // BrowsingInstances for those URLs may not carry much benefit anyway, since + // they're likely less common. + // + // Note that such URLs are not considered same-site, but since their + // SiteInstance site URL is based only on scheme (e.g., all data URLs use a + // site URL of "data:"), a browser-initiated navigation from one such URL to + // another will still stay in the same SiteInstance, due to the matching site + // URL. + if (dest_url.SchemeIsFile() || dest_url.SchemeIs(url::kDataScheme)) + return false; + + // Allow page transitions corresponding to certain browser-initiated + // navigations: typing in the URL, using a bookmark, or using search. + switch (ui::PageTransitionStripQualifier(transition)) { + case ui::PAGE_TRANSITION_TYPED: + case ui::PAGE_TRANSITION_AUTO_BOOKMARK: + case ui::PAGE_TRANSITION_GENERATED: + case ui::PAGE_TRANSITION_KEYWORD: + return true; + // TODO(alexmos): PAGE_TRANSITION_AUTO_TOPLEVEL is not included due to a + // bug that would cause unneeded BrowsingInstance swaps for DevTools, + // https://crbug.com/733767. Once that bug is fixed, consider adding this + // transition here. + default: + return false; + } +} + bool RenderFrameHostManager::IsRendererTransferNeededForNavigation( RenderFrameHostImpl* rfh, const GURL& dest_url) { @@ -1498,6 +1544,20 @@ return true; } + // If the last successful URL was "about:blank" with a unique origin (which + // implies that it was a browser-initiated navigation to "about:blank"), none + // of the cases above apply, but we should still allow a scenario like + // foo.com -> about:blank -> foo.com to be treated as same-site, as some + // tests rely on that behavior. To accomplish this, compare |dest_url| + // against the site URL. + if (candidate->last_successful_url().IsAboutBlank() && + candidate->GetLastCommittedOrigin().unique() && + SiteInstanceImpl::IsSameWebSite( + browser_context, candidate->GetSiteInstance()->original_url(), + dest_url, should_compare_effective_urls)) { + return true; + } + // Not same-site. return false; }
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h index 60acbfeb..2ae62929 100644 --- a/content/browser/frame_host/render_frame_host_manager.h +++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -595,6 +595,27 @@ bool force_browsing_instance_swap, bool was_server_redirect); + // Returns true if a navigation to |dest_url| that uses the specified + // PageTransition in the current frame is allowed to swap BrowsingInstances. + // DetermineSiteInstanceForURL() uses this helper to determine when it is + // allowed to swap BrowsingInstances to avoid unneeded process sharing. See + // https://crbug.com/803367. + // + // Note that this is different from + // ShouldSwapBrowsingInstancesForNavigation(), which identifies cases in + // which a BrowsingInstance swap is *required* (e.g., for security). This + // function only identifies cases where a BrowsingInstance swap *may* be + // performed to optimize process placement. In particular, this is true for + // certain browser-initiated transitions for main frame navigations. + // + // Returning true here doesn't imply that DetermineSiteInstanceForURL() will + // swap BrowsingInstances. For example, this swap will not be done for + // same-site navigations, for history navigations, or when starting from an + // uninitialized SiteInstance. + bool IsBrowsingInstanceSwapAllowedForPageTransition( + ui::PageTransition transition, + const GURL& dest_url); + // Converts a SiteInstanceDescriptor to the actual SiteInstance it describes. // If a |candidate_instance| is provided (is not nullptr) and it matches the // description, it is returned as is.
diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc index dd84768..3d05acd 100644 --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -230,8 +230,8 @@ EXPECT_TRUE(success); // Now navigate the new window to a different site. - NavigateToURL(new_shell, - embedded_test_server()->GetURL("foo.com", "/title1.html")); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance( + new_shell, embedded_test_server()->GetURL("foo.com", "/title1.html"))); scoped_refptr<SiteInstance> new_site_instance( new_shell->web_contents()->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); @@ -661,7 +661,7 @@ // Now navigate the new tab to a different site. GURL cross_site_url( embedded_test_server()->GetURL("foo.com", "/title1.html")); - NavigateToURL(new_shell, cross_site_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, cross_site_url)); scoped_refptr<SiteInstance> new_site_instance( new_shell->web_contents()->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); @@ -682,7 +682,7 @@ // If it navigates away to another process, the original window should // still be able to close it (using a cross-process close message). - NavigateToURL(new_shell, cross_site_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, cross_site_url)); EXPECT_EQ(new_site_instance.get(), new_shell->web_contents()->GetSiteInstance()); WebContentsDestroyedWatcher close_watcher(new_shell->web_contents()); @@ -736,7 +736,7 @@ // Now navigate the new tab to a different site. GURL cross_site_url( embedded_test_server()->GetURL("foo.com", "/title1.html")); - NavigateToURL(new_shell, cross_site_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, cross_site_url)); scoped_refptr<SiteInstance> new_site_instance( new_shell->web_contents()->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); @@ -818,7 +818,7 @@ // Now navigate the new tab to a different site. GURL foo_url(embedded_test_server()->GetURL("foo.com", "/title2.html")); - EXPECT_TRUE(NavigateToURL(new_shell, foo_url)); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, foo_url)); scoped_refptr<SiteInstance> new_site_instance( new_shell->web_contents()->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); @@ -833,7 +833,7 @@ Shell* new_shell2 = OpenPopup(new_shell, GURL(url::kAboutBlankURL), "bar"); EXPECT_TRUE(new_shell2); GURL bar_url(embedded_test_server()->GetURL("bar.com", "/title3.html")); - EXPECT_TRUE(NavigateToURL(new_shell2, bar_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(new_shell2, bar_url)); // Check that the new popup's window.opener has name "foo", which verifies // that new swapped-out RenderViews also propagate window.name. This has to @@ -890,8 +890,9 @@ WaitForLoadStop(foo_contents); EXPECT_EQ("/navigate_opener.html", foo_contents->GetLastCommittedURL().path()); - NavigateToURL(new_shell, embedded_test_server()->GetURL( - "foo.com", "/post_message.html")); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance( + new_shell, + embedded_test_server()->GetURL("foo.com", "/post_message.html"))); scoped_refptr<SiteInstance> foo_site_instance( foo_contents->GetSiteInstance()); EXPECT_NE(orig_site_instance, foo_site_instance); @@ -910,8 +911,8 @@ WebContents* new_contents = new_shell2->web_contents(); WaitForLoadStop(new_contents); EXPECT_EQ("/title2.html", new_contents->GetLastCommittedURL().path()); - NavigateToURL(new_shell2, - embedded_test_server()->GetURL("/post_message.html")); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance( + new_shell2, embedded_test_server()->GetURL("/post_message.html"))); EXPECT_EQ(orig_site_instance.get(), new_contents->GetSiteInstance()); RenderFrameHostManager* new_manager = static_cast<WebContentsImpl*>(new_contents)->GetRenderManagerForTesting(); @@ -1025,8 +1026,9 @@ WaitForLoadStop(foo_contents); EXPECT_EQ("/navigate_opener.html", foo_contents->GetLastCommittedURL().path()); - NavigateToURL(new_shell, embedded_test_server()->GetURL( - "foo.com", "/post_message.html")); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance( + new_shell, + embedded_test_server()->GetURL("foo.com", "/post_message.html"))); scoped_refptr<SiteInstance> foo_site_instance( foo_contents->GetSiteInstance()); EXPECT_NE(orig_site_instance, foo_site_instance); @@ -1110,8 +1112,8 @@ EXPECT_EQ(orig_site_instance, blank_site_instance); // Now navigate the original (opener) tab to a different site. - NavigateToURL(shell(), - embedded_test_server()->GetURL("foo.com", "/title1.html")); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance( + shell(), embedded_test_server()->GetURL("foo.com", "/title1.html"))); scoped_refptr<SiteInstance> new_site_instance( shell()->web_contents()->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); @@ -1212,7 +1214,7 @@ // Now navigate the opened window to a different site. GURL cross_site_url( embedded_test_server()->GetURL("foo.com", "/title1.html")); - NavigateToURL(new_shell, cross_site_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, cross_site_url)); scoped_refptr<SiteInstance> new_site_instance( new_shell->web_contents()->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); @@ -1227,7 +1229,7 @@ RenderProcessHostWatcher exit_observer( orig_process, RenderProcessHostWatcher::WATCH_FOR_HOST_DESTRUCTION); - NavigateToURL(shell(), cross_site_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(shell(), cross_site_url)); exit_observer.Wait(); scoped_refptr<SiteInstance> new_site_instance2( shell()->web_contents()->GetSiteInstance()); @@ -2057,19 +2059,18 @@ // 2. Send the second tab to a different process. GURL cross_site_url( embedded_test_server()->GetURL("foo.com", "/title1.html")); - NavigateToURL(new_shell, cross_site_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, cross_site_url)); scoped_refptr<SiteInstance> new_site_instance( new_shell->web_contents()->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); // 3. Send the first tab to the second tab's process. - NavigateToURL(shell(), cross_site_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(shell(), cross_site_url)); // Make sure it ends up at the right page. WaitForLoadStop(shell()->web_contents()); EXPECT_EQ(cross_site_url, shell()->web_contents()->GetLastCommittedURL()); - EXPECT_EQ(new_site_instance.get(), - shell()->web_contents()->GetSiteInstance()); + EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance()); } // Ensure that renderer-side debug URLs do not cause a process swap, since they @@ -2252,7 +2253,7 @@ ASSERT_TRUE(initial_rvh); // Navigate to url1 and check bindings. - NavigateToURL(new_shell, url1); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, url1)); // The navigation should have used the first SiteInstance, otherwise // |initial_rvh| did not have a chance to be used. EXPECT_EQ(new_web_contents->GetSiteInstance(), site_instance1); @@ -2675,7 +2676,7 @@ GURL cross_site_url = embedded_test_server()->GetURL("foo.com", "/title2.html"); - EXPECT_TRUE(NavigateToURL(new_shell, cross_site_url)); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(new_shell, cross_site_url)); scoped_refptr<SiteInstance> foo_site_instance( new_shell->web_contents()->GetSiteInstance()); @@ -2686,7 +2687,7 @@ popup_root->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( popup_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - popup_process->Shutdown(0, false); + popup_process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(popup_root->current_frame_host()->IsRenderFrameLive()); EXPECT_FALSE( @@ -2734,7 +2735,7 @@ Shell* foo_shell = OpenPopup(shell(), GURL(url::kAboutBlankURL), "foo"); EXPECT_TRUE(foo_shell); GURL foo_url(embedded_test_server()->GetURL("foo.com", "/post_message.html")); - NavigateToURL(foo_shell, foo_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(foo_shell, foo_url)); GURL bar_url(embedded_test_server()->GetURL( "/frame_tree/page_with_post_message_frames.html")); @@ -2955,7 +2956,7 @@ RenderProcessHost* process = popup_root->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - process->Shutdown(0, false); + process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(popup_root->current_frame_host()->IsRenderFrameLive()); EXPECT_FALSE( @@ -3018,7 +3019,7 @@ RenderProcessHost* process = rfh_a->GetProcess(); RenderProcessHostWatcher crash_observer( process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - process->Shutdown(0, false); + process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(popup_root->current_frame_host()->IsRenderFrameLive()); // |rfh_a| is now deleted, thanks to the bug fix. @@ -3097,7 +3098,7 @@ RenderProcessHost* process = rfh_a->GetProcess(); RenderProcessHostWatcher crash_observer( process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - process->Shutdown(0, false); + process->Shutdown(0); crash_observer.Wait(); // |rfh_a| is now deleted, thanks to the bug fix. @@ -3383,7 +3384,7 @@ popup->web_contents()->GetMainFrame()->GetProcess(); RenderProcessHostWatcher crash_observer( b_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - b_process->Shutdown(0, false); + b_process->Shutdown(0); crash_observer.Wait(); // The popup should now be showing the sad tab. Main tab should not be. @@ -3781,4 +3782,173 @@ EXPECT_TRUE(new_contents_observer.GetWebContents()); } +// Verify that cross-site main frame navigations will swap BrowsingInstances +// for certain browser-initiated navigations, such as user typing the URL into +// the address bar. This helps avoid unneeded process sharing and should +// happen even if the current frame has an opener. See +// https://crbug.com/803367. +IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, + BrowserInitiatedNavigationsSwapBrowsingInstance) { + ASSERT_TRUE(embedded_test_server()->Start()); + + // Start with a page on a.com. + GURL a_url(embedded_test_server()->GetURL("a.com", "/title1.html")); + EXPECT_TRUE(NavigateToURL(shell(), a_url)); + scoped_refptr<SiteInstance> a_site_instance( + shell()->web_contents()->GetSiteInstance()); + + // Open a popup for b.com. This should stay in the current BrowsingInstance. + GURL b_url(embedded_test_server()->GetURL("b.com", "/title1.html")); + Shell* popup = OpenPopup(shell(), b_url, "foo"); + EXPECT_TRUE(WaitForLoadStop(popup->web_contents())); + scoped_refptr<SiteInstance> b_site_instance( + popup->web_contents()->GetSiteInstance()); + EXPECT_TRUE(a_site_instance->IsRelatedSiteInstance(b_site_instance.get())); + + // Same-site browser-initiated navigations shouldn't swap BrowsingInstances + // or SiteInstances. + EXPECT_TRUE(NavigateToURL( + popup, embedded_test_server()->GetURL("b.com", "/title2.html"))); + EXPECT_EQ(b_site_instance, popup->web_contents()->GetSiteInstance()); + + // A cross-site browser-initiated navigation should swap BrowsingInstances, + // despite having an opener in the same site as the destination URL. + EXPECT_TRUE(NavigateToURL( + popup, embedded_test_server()->GetURL("a.com", "/title3.html"))); + EXPECT_NE(b_site_instance, popup->web_contents()->GetSiteInstance()); + EXPECT_NE(a_site_instance, popup->web_contents()->GetSiteInstance()); + EXPECT_FALSE(a_site_instance->IsRelatedSiteInstance( + popup->web_contents()->GetSiteInstance())); + EXPECT_FALSE(b_site_instance->IsRelatedSiteInstance( + popup->web_contents()->GetSiteInstance())); + + // Perform several cross-site browser-initiated navigations in the popup, all + // using page transitions that allow BrowsingInstance swaps: + auto transitions_that_swap_browsing_instances = { + ui::PAGE_TRANSITION_TYPED, /* user typing URL into address bar */ + ui::PAGE_TRANSITION_AUTO_BOOKMARK, /* user clicking on a bookmark */ + ui::PAGE_TRANSITION_GENERATED, /* search query */ + ui::PAGE_TRANSITION_KEYWORD, /* search within a site from address bar */ + }; + int current_site = 0; + for (auto transition : transitions_that_swap_browsing_instances) { + GURL cross_site_url(embedded_test_server()->GetURL( + base::StringPrintf("site%d.com", current_site++), "/title1.html")); + scoped_refptr<SiteInstance> prev_instance( + popup->web_contents()->GetSiteInstance()); + SCOPED_TRACE(base::StringPrintf( + "... expected BrowsingInstance swap for '%s' transition to %s", + ui::PageTransitionGetCoreTransitionString(transition), + cross_site_url.spec().c_str())); + + TestNavigationObserver observer(popup->web_contents()); + NavigationController::LoadURLParams params(cross_site_url); + params.transition_type = transition; + popup->web_contents()->GetController().LoadURLWithParams(params); + observer.Wait(); + + // This should swap BrowsingInstances. + scoped_refptr<SiteInstance> curr_instance( + popup->web_contents()->GetSiteInstance()); + EXPECT_NE(a_site_instance, curr_instance); + EXPECT_FALSE(a_site_instance->IsRelatedSiteInstance(curr_instance.get())); + EXPECT_NE(prev_instance, curr_instance); + EXPECT_FALSE(prev_instance->IsRelatedSiteInstance(curr_instance.get())); + } + + // Ensure that other page transitions don't cause a BrowsingInstance swap. + auto transitions_that_dont_swap_browsing_instances = { + ui::PAGE_TRANSITION_LINK, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, + ui::PAGE_TRANSITION_FORM_SUBMIT, + }; + scoped_refptr<SiteInstance> curr_instance( + popup->web_contents()->GetSiteInstance()); + for (auto transition : transitions_that_dont_swap_browsing_instances) { + GURL cross_site_url(embedded_test_server()->GetURL( + base::StringPrintf("site%d.com", current_site++), "/title1.html")); + SCOPED_TRACE(base::StringPrintf( + "... expected no BrowsingInstance swap for '%s' transition to %s", + ui::PageTransitionGetCoreTransitionString(transition), + cross_site_url.spec().c_str())); + + TestNavigationObserver observer(popup->web_contents()); + NavigationController::LoadURLParams params(cross_site_url); + params.transition_type = transition; + popup->web_contents()->GetController().LoadURLWithParams(params); + observer.Wait(); + + // This should stay in the current BrowsingInstance. + EXPECT_TRUE(curr_instance->IsRelatedSiteInstance( + popup->web_contents()->GetSiteInstance())); + } +} + +// Ensure that these two browser-initiated navigations: +// foo.com -> about:blank -> foo.com +// stay in the same SiteInstance. This isn't technically required for +// correctness, but some tests (e.g., testEnsureHotFromScratch from +// telemetry_unittests) currently depend on this behavior. +IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, + NavigateToAndFromAboutBlank) { + ASSERT_TRUE(embedded_test_server()->Start()); + GURL foo_url(embedded_test_server()->GetURL("foo.com", "/title1.html")); + EXPECT_TRUE(NavigateToURL(shell(), foo_url)); + scoped_refptr<SiteInstance> site_instance( + shell()->web_contents()->GetSiteInstance()); + + // Navigate to about:blank from address bar. This stays in the foo.com + // SiteInstance. + EXPECT_TRUE(NavigateToURL(shell(), GURL(url::kAboutBlankURL))); + EXPECT_EQ(site_instance, shell()->web_contents()->GetSiteInstance()); + + // Perform a browser-initiated navigation to foo.com. This should also stay + // in the original foo.com SiteInstance and BrowsingInstance. + EXPECT_TRUE(NavigateToURL(shell(), foo_url)); + EXPECT_EQ(site_instance, shell()->web_contents()->GetSiteInstance()); +} + +// Check that with the following sequence of navigations: +// foo.com -(1)-> bar.com -(2)-> about:blank -(3)-> foo.com +// where (1) is renderer-initiated and (2)+(3) are browser-initiated, the last +// navigation goes back to the first SiteInstance without --site-per-process, +// and to a new SiteInstance and BrowsingInstance with --site-per-process. +IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, + NavigateToFooThenBarThenAboutBlankThenFoo) { + ASSERT_TRUE(embedded_test_server()->Start()); + GURL foo_url(embedded_test_server()->GetURL("foo.com", "/title1.html")); + EXPECT_TRUE(NavigateToURL(shell(), foo_url)); + scoped_refptr<SiteInstance> site_instance( + shell()->web_contents()->GetSiteInstance()); + + // Do a renderer-initiated navigation to bar.com, then navigate to + // about:blank from address bar, then back to foo.com. + GURL bar_url(embedded_test_server()->GetURL("bar.com", "/title1.html")); + + EXPECT_TRUE(NavigateToURLFromRenderer(shell(), bar_url)); + EXPECT_TRUE(NavigateToURL(shell(), GURL(url::kAboutBlankURL))); + EXPECT_TRUE(NavigateToURL(shell(), foo_url)); + + // This should again go back to the original foo.com SiteInstance without + // --site-per-process, as in that case both the bar.com and + // about:blank navigation will stay in the foo.com SiteInstance, and the + // final navigation to foo.com will be considered same-site with the current + // SiteInstance. + // + // With --site-per-process, bar.com should get its own SiteInstance, the + // about:blank navigation will stay in it, and thus the final foo.com + // navigation should be considered cross-site from the current SiteInstance. + // Since this is a browser-initiated, cross-site navigation, it will swap + // BrowsingInstances, and create a new foo.com SiteInstance, distinct from + // the initial one. + if (!AreAllSitesIsolatedForTesting()) { + EXPECT_EQ(site_instance, shell()->web_contents()->GetSiteInstance()); + } else { + EXPECT_NE(site_instance, shell()->web_contents()->GetSiteInstance()); + EXPECT_FALSE(site_instance->IsRelatedSiteInstance( + shell()->web_contents()->GetSiteInstance())); + EXPECT_EQ(site_instance->GetSiteURL(), + shell()->web_contents()->GetSiteInstance()->GetSiteURL()); + } +} + } // namespace content
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc index 06218c1..e9bf8276 100644 --- a/content/browser/frame_host/render_frame_host_manager_unittest.cc +++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -3096,12 +3096,11 @@ EXPECT_EQ(kFooUrl, initial_instance->GetSiteURL()); // Simulate a browser-initiated navigation to an app URL, which should swap - // processes and create a new related SiteInstance in the same - // BrowsingInstance. This new SiteInstance should have correct site URL and - // |original_url()|. + // processes and create a new SiteInstance in a new BrowsingInstance. + // This new SiteInstance should have correct site URL and |original_url()|. NavigationSimulator::NavigateAndCommitFromBrowser(contents(), kOriginalUrl); EXPECT_NE(initial_instance.get(), main_test_rfh()->GetSiteInstance()); - EXPECT_TRUE(initial_instance->IsRelatedSiteInstance( + EXPECT_FALSE(initial_instance->IsRelatedSiteInstance( main_test_rfh()->GetSiteInstance())); EXPECT_EQ(kOriginalUrl, main_test_rfh()->GetSiteInstance()->original_url()); EXPECT_EQ(kTranslatedUrl, main_test_rfh()->GetSiteInstance()->GetSiteURL());
diff --git a/content/browser/image_capture/image_capture_impl.cc b/content/browser/image_capture/image_capture_impl.cc index 0c6afe4..9c3e01c 100644 --- a/content/browser/image_capture/image_capture_impl.cc +++ b/content/browser/image_capture/image_capture_impl.cc
@@ -15,7 +15,7 @@ #include "content/public/common/content_features.h" #include "content/public/common/media_stream_request.h" #include "media/base/bind_to_current_loop.h" -#include "media/capture/mojo/image_capture_types.h" +#include "media/capture/mojom/image_capture_types.h" #include "media/capture/video/video_capture_device.h" #include "mojo/public/cpp/bindings/callback_helpers.h" #include "mojo/public/cpp/bindings/strong_binding.h"
diff --git a/content/browser/image_capture/image_capture_impl.h b/content/browser/image_capture/image_capture_impl.h index b8c57e8..3a4342b 100644 --- a/content/browser/image_capture/image_capture_impl.h +++ b/content/browser/image_capture/image_capture_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_IMAGE_CAPTURE_IMAGE_CAPTURE_IMPL_H_ #define CONTENT_BROWSER_IMAGE_CAPTURE_IMAGE_CAPTURE_IMPL_H_ -#include "media/capture/mojo/image_capture.mojom.h" +#include "media/capture/mojom/image_capture.mojom.h" namespace content {
diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 820b524..860e36a 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc
@@ -828,7 +828,7 @@ base::string16 expected_title16(ASCIIToUTF16("setVersion(3) complete")); TitleWatcher title_watcher(new_shell->web_contents(), expected_title16); - shell()->web_contents()->GetMainFrame()->GetProcess()->Shutdown(0, true); + shell()->web_contents()->GetMainFrame()->GetProcess()->Shutdown(0); shell()->Close(); EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
diff --git a/content/browser/isolated_origin_browsertest.cc b/content/browser/isolated_origin_browsertest.cc index 44a51b9b..0df805d1 100644 --- a/content/browser/isolated_origin_browsertest.cc +++ b/content/browser/isolated_origin_browsertest.cc
@@ -67,7 +67,7 @@ // Check that navigating a main frame from an non-isolated origin to an // isolated origin and vice versa swaps processes and uses a new SiteInstance, -// both for browser-initiated and renderer-initiated navigations. +// both for renderer-initiated and browser-initiated navigations. IN_PROC_BROWSER_TEST_F(IsolatedOriginTest, MainFrameNavigation) { GURL unisolated_url( embedded_test_server()->GetURL("www.foo.com", "/title1.html")); @@ -83,42 +83,29 @@ RenderProcessHost* unisolated_process = popup->web_contents()->GetMainFrame()->GetProcess(); - // Perform a browser-initiated navigation to an isolated origin and ensure - // that this ends up in a new process and SiteInstance for isolated.foo.com. - EXPECT_TRUE(NavigateToURL(shell(), isolated_url)); - + // Go to isolated.foo.com with a renderer-initiated navigation. + EXPECT_TRUE(NavigateToURLFromRenderer(web_contents(), isolated_url)); scoped_refptr<SiteInstance> isolated_instance = web_contents()->GetSiteInstance(); - EXPECT_NE(isolated_instance, unisolated_instance); - EXPECT_NE(web_contents()->GetMainFrame()->GetProcess(), unisolated_process); + EXPECT_EQ(isolated_instance, web_contents()->GetSiteInstance()); + EXPECT_NE(unisolated_process, web_contents()->GetMainFrame()->GetProcess()); // The site URL for isolated.foo.com should be the full origin rather than // scheme and eTLD+1. EXPECT_EQ(isolated_url.GetOrigin(), isolated_instance->GetSiteURL()); - // Now perform a renderer-initiated navigation to an unisolated origin, - // www.foo.com. This should end up in the |popup|'s process. - { - TestNavigationObserver observer(web_contents()); - EXPECT_TRUE(ExecuteScript( - web_contents(), "location.href = '" + unisolated_url.spec() + "'")); - observer.Wait(); - } - + // Now use a renderer-initiated navigation to go to an unisolated origin, + // www.foo.com. This should end up back in the |popup|'s process. + EXPECT_TRUE(NavigateToURLFromRenderer(web_contents(), unisolated_url)); EXPECT_EQ(unisolated_instance, web_contents()->GetSiteInstance()); EXPECT_EQ(unisolated_process, web_contents()->GetMainFrame()->GetProcess()); - // Go to isolated.foo.com again, this time with a renderer-initiated - // navigation from the unisolated www.foo.com. - { - TestNavigationObserver observer(web_contents()); - EXPECT_TRUE(ExecuteScript(web_contents(), - "location.href = '" + isolated_url.spec() + "'")); - observer.Wait(); - } - - EXPECT_EQ(isolated_instance, web_contents()->GetSiteInstance()); - EXPECT_NE(unisolated_process, web_contents()->GetMainFrame()->GetProcess()); + // Now, perform a browser-initiated navigation to an isolated origin and + // ensure that this ends up in a new process and SiteInstance for + // isolated.foo.com. + EXPECT_TRUE(NavigateToURL(shell(), isolated_url)); + EXPECT_NE(web_contents()->GetSiteInstance(), unisolated_instance); + EXPECT_NE(web_contents()->GetMainFrame()->GetProcess(), unisolated_process); // Go back to www.foo.com: this should end up in the unisolated process. { @@ -144,14 +131,7 @@ // isolated origin and ensure there is a different isolated process. GURL second_isolated_url( embedded_test_server()->GetURL("isolated.bar.com", "/title3.html")); - { - TestNavigationObserver observer(web_contents()); - EXPECT_TRUE( - ExecuteScript(web_contents(), - "location.href = '" + second_isolated_url.spec() + "'")); - observer.Wait(); - } - + EXPECT_TRUE(NavigateToURLFromRenderer(web_contents(), second_isolated_url)); EXPECT_EQ(second_isolated_url.GetOrigin(), web_contents()->GetSiteInstance()->GetSiteURL()); EXPECT_NE(isolated_instance, web_contents()->GetSiteInstance());
diff --git a/content/browser/loader/cross_site_document_resource_handler.cc b/content/browser/loader/cross_site_document_resource_handler.cc index f5bd0bee..8c17837d 100644 --- a/content/browser/loader/cross_site_document_resource_handler.cc +++ b/content/browser/loader/cross_site_document_resource_handler.cc
@@ -36,6 +36,34 @@ namespace content { +// An interface to enable incremental content sniffing. These are instantiated +// for each each request; thus they can be stateful. +class CrossSiteDocumentResourceHandler::ConfirmationSniffer { + public: + virtual ~ConfirmationSniffer() = default; + + // Called after data is read from the network. |sniffing_buffer| contains the + // entire response body delivered thus far. To support streaming, + // |new_data_offset| gives the offset into |sniffing_buffer| at which new data + // was appended since the last read. + virtual void OnDataAvailable(base::StringPiece sniffing_buffer, + size_t new_data_offset) = 0; + + // Returns true if the return value of IsConfirmedContentType() might change + // with the addition of more data. Returns false if a final decision is + // available. + virtual bool WantsMoreData() const = 0; + + // Returns true if the data has been confirmed to be of the CORB-protected + // content type that this sniffer is intended to detect. + virtual bool IsConfirmedContentType() const = 0; + + // Called when this sniffer's decision was used to block a response. This will + // only be invoked when an earlier call to IsConfirmedContentType() returned + // true. + virtual void LogBlockedResponse(ResourceType resource_type) const {} +}; + namespace { void LogCrossSiteDocumentAction( @@ -44,6 +72,72 @@ CrossSiteDocumentResourceHandler::Action::kCount); } +// A ConfirmationSniffer that wraps one of the sniffing functions from +// CrossSiteDocumentClassifier. +class SimpleConfirmationSniffer + : public CrossSiteDocumentResourceHandler::ConfirmationSniffer { + public: + // The function pointer type corresponding to one of the available sniffing + // functions from CrossSiteDocumentClassifier. + using SnifferFunction = decltype(&CrossSiteDocumentClassifier::SniffForHTML); + + explicit SimpleConfirmationSniffer(SnifferFunction sniffer_function) + : sniffer_function_(sniffer_function) {} + ~SimpleConfirmationSniffer() override = default; + + void OnDataAvailable(base::StringPiece sniffing_buffer, + size_t new_data_offset) final { + DCHECK_LE(new_data_offset, sniffing_buffer.length()); + if (new_data_offset == sniffing_buffer.length()) { + // No new data -- do nothing. This happens at end-of-stream. + return; + } + // The sniffing functions don't support streaming, so with each new chunk of + // data, call the sniffer on the whole buffer. + last_sniff_result_ = (*sniffer_function_)(sniffing_buffer); + } + + bool WantsMoreData() const final { + // kNo and kYes results are final, meaning that sniffing can stop once they + // occur. A kMaybe result corresponds to an indeterminate state, that could + // change to kYes or kNo with more data. + return last_sniff_result_ == CrossSiteDocumentClassifier::kMaybe; + } + + bool IsConfirmedContentType() const final { + // Only confirm the mime type if an affirmative pattern (e.g. an HTML tag, + // if using the HTML sniffer) was detected. + // + // Note that if the stream ends (or net::kMaxBytesToSniff has been reached) + // and |last_sniff_result_| is kMaybe, the response is allowed to go + // through. + return last_sniff_result_ == CrossSiteDocumentClassifier::kYes; + } + + private: + // The function that actually knows how to sniff for a content type. + SnifferFunction sniffer_function_; + + // Result of sniffing the data available thus far. + CrossSiteDocumentClassifier::Result last_sniff_result_ = + CrossSiteDocumentClassifier::kMaybe; +}; + +// A ConfirmationSniffer for parser breakers (fetch-only resources). This logs +// to an UMA histogram whenever it is the reason for a response being blocked. +class FetchOnlyResourceSniffer : public SimpleConfirmationSniffer { + public: + FetchOnlyResourceSniffer() + : SimpleConfirmationSniffer( + &CrossSiteDocumentClassifier::SniffForFetchOnlyResource) {} + + void LogBlockedResponse(ResourceType resource_type) const final { + UMA_HISTOGRAM_ENUMERATION( + "SiteIsolation.XSD.Browser.BlockedForParserBreaker", resource_type, + content::RESOURCE_TYPE_LAST_TYPE); + } +}; + // An IOBuffer to enable writing into a existing IOBuffer at a given offset. class LocalIoBufferWithOffset : public net::WrappedIOBuffer { public: @@ -56,19 +150,6 @@ scoped_refptr<net::IOBuffer> buf_; }; -// Helper for the text/plain case. -CrossSiteDocumentClassifier::Result SniffForHtmlXmlOrJson( - base::StringPiece data) { - DCHECK_LT(CrossSiteDocumentClassifier::kNo, - CrossSiteDocumentClassifier::kMaybe); - auto result = CrossSiteDocumentClassifier::SniffForHTML(data); - if (result != CrossSiteDocumentClassifier::kYes) - result = std::max(CrossSiteDocumentClassifier::SniffForXML(data), result); - if (result != CrossSiteDocumentClassifier::kYes) - result = std::max(CrossSiteDocumentClassifier::SniffForJSON(data), result); - return result; -} - // Headers from // https://fetch.spec.whatwg.org/#cors-safelisted-response-header-name. // @@ -155,7 +236,6 @@ void CrossSiteDocumentResourceHandler::LogBlockedResponse( ResourceRequestInfoImpl* resource_request_info, bool needed_sniffing, - bool found_parser_breaker, CrossSiteDocumentMimeType canonical_mime_type, int http_response_code, int64_t content_length) { @@ -176,11 +256,6 @@ ResourceType resource_type = resource_request_info->GetResourceType(); UMA_HISTOGRAM_ENUMERATION("SiteIsolation.XSD.Browser.Blocked", resource_type, content::RESOURCE_TYPE_LAST_TYPE); - if (found_parser_breaker) { - UMA_HISTOGRAM_ENUMERATION( - "SiteIsolation.XSD.Browser.BlockedForParserBreaker", resource_type, - content::RESOURCE_TYPE_LAST_TYPE); - } switch (canonical_mime_type) { case CROSS_SITE_DOCUMENT_MIME_TYPE_HTML: UMA_HISTOGRAM_ENUMERATION("SiteIsolation.XSD.Browser.Blocked.HTML", @@ -443,26 +518,26 @@ // buffer and either report that zero bytes were read (to indicate the // response is empty and complete), or copy the sniffed data to the next // handler's buffer and resume the response without blocking. - bool found_parser_breaker = false; - auto confirmed_blockable = CrossSiteDocumentClassifier::kNo; + bool confirmed_blockable = false; + ResourceRequestInfoImpl* info = GetRequestInfo(); if (!needs_sniffing_) { // If sniffing is impossible (e.g., because this is a range request), or // if sniffing is disabled due to a nosniff header AND the server returned // a protected mime type, then we have enough information to block // immediately. - confirmed_blockable = CrossSiteDocumentClassifier::kYes; - } else if (bytes_read == 0) { - // We haven't blocked the response yet (because previous reads yielded a - // kMaybe result), and there is no more data. Allow the response. - confirmed_blockable = CrossSiteDocumentClassifier::kNo; + confirmed_blockable = true; } else { // Sniff the data to see if it likely matches the MIME type that caused us // to decide to block it. If it doesn't match, it may be JavaScript, // JSONP, or another allowable data type and we should let it through. // Record how many bytes were read to see how often it's too small. (This // will typically be under 100,000.) + const size_t new_data_offset = local_buffer_bytes_read_; local_buffer_bytes_read_ += bytes_read; DCHECK_LE(local_buffer_bytes_read_, next_handler_buffer_size_); + const bool more_data_possible = + bytes_read != 0 && local_buffer_bytes_read_ < net::kMaxBytesToSniff && + local_buffer_bytes_read_ < next_handler_buffer_size_; // To ensure determinism with respect to network packet ordering and // sizing, never examine more than kMaxBytesToSniff bytes, even if more @@ -471,38 +546,33 @@ std::min(local_buffer_bytes_read_, net::kMaxBytesToSniff); base::StringPiece data(local_buffer_->data(), bytes_to_sniff); - // If the server returned a protected mime type, sniff the response to - // confirm it. - if (canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_HTML) { - confirmed_blockable = CrossSiteDocumentClassifier::SniffForHTML(data); - } else if (canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_XML) { - confirmed_blockable = CrossSiteDocumentClassifier::SniffForXML(data); - } else if (canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_JSON) { - confirmed_blockable = CrossSiteDocumentClassifier::SniffForJSON(data); - } else if (canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_PLAIN) { - // For responses labeled as plain text, only block them if the data - // sniffs as one of the formats we would block in the first place. - confirmed_blockable = SniffForHtmlXmlOrJson(data); + for (size_t i = 0; i < sniffers_.size();) { + sniffers_[i]->OnDataAvailable(data, new_data_offset); + + if (!more_data_possible || !sniffers_[i]->WantsMoreData()) { + if (sniffers_[i]->IsConfirmedContentType()) { + // We're done sniffing; this response is CORB-protected. + confirmed_blockable = true; + sniffers_[i]->LogBlockedResponse(info->GetResourceType()); + break; + } + + // This response is CORB-exempt as far as this sniffer is concerned; + // remove it from the list. + sniffers_.erase(sniffers_.begin() + i); + } else { + i++; + } } - // Additionally, on all mime types (including _OTHERS), look for - // Javascript parser breakers. These are affirmative patterns that - // indicate this resource should only be consumed by XHR/fetch (and we've - // already verified that this response isn't a permissable cross-origin - // XHR/fetch). - if (confirmed_blockable != CrossSiteDocumentClassifier::kYes && - non_stylesheet_mime_type_ /* see https://crbug.com/809259 */) { - auto result = - CrossSiteDocumentClassifier::SniffForFetchOnlyResource(data); - found_parser_breaker = (result == CrossSiteDocumentClassifier::kYes); - confirmed_blockable = std::max(confirmed_blockable, result); - } + // When there are no sniffers left, the response is allowed. + const bool confirmed_allowed = sniffers_.empty(); + DCHECK(!(confirmed_blockable && confirmed_allowed)); + DCHECK(confirmed_blockable || confirmed_allowed || more_data_possible); // If sniffing didn't yield a conclusive response, and we haven't read too - // many bytes yet, buffer up some more data. - if (confirmed_blockable == CrossSiteDocumentClassifier::kMaybe && - local_buffer_bytes_read_ < net::kMaxBytesToSniff && - local_buffer_bytes_read_ < next_handler_buffer_size_) { + // many bytes yet or hit the end of the stream, buffer up some more data. + if (!(confirmed_blockable || confirmed_allowed) && more_data_possible) { controller->Resume(); return; } @@ -527,7 +597,7 @@ base::BindOnce(&CrossSiteDocumentResourceHandler::Resume, weak_this_.GetWeakPtr())); - if (confirmed_blockable == CrossSiteDocumentClassifier::kYes) { + if (confirmed_blockable) { // Log the blocking event. Inline the Serialize call to avoid it when // tracing is disabled. TRACE_EVENT2("navigation", @@ -538,13 +608,11 @@ : "null", "url", request()->url().spec()); - LogBlockedResponse(GetRequestInfo(), needs_sniffing_, found_parser_breaker, - canonical_mime_type_, http_response_code_, - content_length_); + LogBlockedResponse(info, needs_sniffing_, canonical_mime_type_, + http_response_code_, content_length_); // Block the response and throw away the data. Report zero bytes read. blocked_read_completed_ = true; - ResourceRequestInfoImpl* info = GetRequestInfo(); info->set_blocked_cross_site_document(true); SanitizeResourceResponse(pending_response_start_); @@ -802,9 +870,47 @@ // Stylesheets shouldn't be sniffed for JSON parser breakers - see // https://crbug.com/809259. - non_stylesheet_mime_type_ = - !response->head.mime_type.empty() && - !base::LowerCaseEqualsASCII(response->head.mime_type, "text/css"); + if (response->head.mime_type.empty() || + base::LowerCaseEqualsASCII(response->head.mime_type, "text/css")) { + return false; + } + + // Create one or more |sniffers_| to confirm that the body is actually the + // MIME type advertised in the Content-Type header. + if (needs_sniffing_) { + // When the MIME type is "text/plain", create sniffers for HTML, XML and + // JSON. If any of these sniffers match, the response will be blocked. + const bool use_all = + canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_PLAIN; + + // HTML sniffer. + if (use_all || canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_HTML) { + sniffers_.push_back(std::make_unique<SimpleConfirmationSniffer>( + &CrossSiteDocumentClassifier::SniffForHTML)); + } + + // XML sniffer. + if (use_all || canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_XML) { + sniffers_.push_back(std::make_unique<SimpleConfirmationSniffer>( + &CrossSiteDocumentClassifier::SniffForXML)); + } + + // JSON sniffer. + if (use_all || canonical_mime_type_ == CROSS_SITE_DOCUMENT_MIME_TYPE_JSON) { + sniffers_.push_back(std::make_unique<SimpleConfirmationSniffer>( + &CrossSiteDocumentClassifier::SniffForJSON)); + } + + // Parser-breaker sniffer. + // + // Because these prefixes are an XSSI-defeating mechanism, CORB considers + // them distinctive enough to be worth blocking no matter the Content-Type + // header. So this sniffer is created unconditionally. + // + // For CROSS_SITE_DOCUMENT_MIME_TYPE_OTHERS, this will be the only sniffer + // that's active. + sniffers_.push_back(std::make_unique<FetchOnlyResourceSniffer>()); + } return true; }
diff --git a/content/browser/loader/cross_site_document_resource_handler.h b/content/browser/loader/cross_site_document_resource_handler.h index 02dba00..c68f8507 100644 --- a/content/browser/loader/cross_site_document_resource_handler.h +++ b/content/browser/loader/cross_site_document_resource_handler.h
@@ -55,6 +55,8 @@ class CONTENT_EXPORT CrossSiteDocumentResourceHandler : public LayeredResourceHandler { public: + class ConfirmationSniffer; + // This enum backs a histogram, so do not change the order of entries or // remove entries. Put new entries before |kCount| and update enums.xml (see // the SiteIsolationResponseAction enum). @@ -140,7 +142,6 @@ int64_t content_length); static void LogBlockedResponse(ResourceRequestInfoImpl* resource_request_info, bool needed_sniffing, - bool found_parser_breaker, CrossSiteDocumentMimeType canonical_mime_type, int http_response_code, int64_t content_length); @@ -172,9 +173,6 @@ CrossSiteDocumentMimeType canonical_mime_type_ = CROSS_SITE_DOCUMENT_MIME_TYPE_OTHERS; - // True if the response had a non-empty Content-Type other than text/css. - bool non_stylesheet_mime_type_ = false; - // Indicates whether this request was made by a plugin and was not using CORS. // Such requests are exempt from blocking, while other plugin requests must be // blocked if the CORS check fails. @@ -214,6 +212,9 @@ // Content length if available. -1 if not available. int64_t content_length_ = -1; + // The sniffers to be used. + std::vector<std::unique_ptr<ConfirmationSniffer>> sniffers_; + base::WeakPtrFactory<CrossSiteDocumentResourceHandler> weak_this_; DISALLOW_COPY_AND_ASSIGN(CrossSiteDocumentResourceHandler);
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index e56c4ff..fd267df 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -48,6 +48,7 @@ #include "net/test/url_request/url_request_failed_job.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "net/url_request/url_request.h" +#include "services/network/public/cpp/features.h" #include "testing/gmock/include/gmock/gmock.h" #include "url/gurl.h" @@ -140,6 +141,10 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SniffHTMLWithNoContentType) { + // Covered by URLLoaderTest.SniffMimeType. + if (base::FeatureList::IsEnabled(network::features::kNetworkService)) + return; + CheckTitleTest( net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test0.html"), "Content Sniffer Test 0"); @@ -147,12 +152,20 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, RespectNoSniffDirective) { + // Covered by URLLoaderTest.RespectNoSniff. + if (base::FeatureList::IsEnabled(network::features::kNetworkService)) + return; + CheckTitleTest(net::URLRequestMockHTTPJob::GetMockUrl("nosniff-test.html"), "mock.http/nosniff-test.html"); } IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DoNotSniffHTMLFromTextPlain) { + // Covered by URLLoaderTest.DoNotSniffHTMLFromTextPlain. + if (base::FeatureList::IsEnabled(network::features::kNetworkService)) + return; + CheckTitleTest( net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test1.html"), "mock.http/content-sniffer-test1.html"); @@ -160,6 +173,10 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DoNotSniffHTMLFromImageGIF) { + // Covered by URLLoaderTest.DoNotSniffHTMLFromImageGIF. + if (base::FeatureList::IsEnabled(network::features::kNetworkService)) + return; + CheckTitleTest( net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test2.html"), "mock.http/content-sniffer-test2.html");
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index a7279994..ee88379 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -75,10 +75,10 @@ #include "content/public/browser/child_process_data.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/global_request_id.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/navigation_ui_data.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/resource_dispatcher_host_delegate.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" #include "content/public/browser/resource_throttle.h" #include "content/public/browser/stream_handle.h" #include "content/public/browser/stream_info.h" @@ -556,8 +556,7 @@ return std::move(handler); } -scoped_refptr<ResourceDispatcherHostLoginDelegate> -ResourceDispatcherHostImpl::CreateLoginDelegate( +scoped_refptr<LoginDelegate> ResourceDispatcherHostImpl::CreateLoginDelegate( ResourceLoader* loader, net::AuthChallengeInfo* auth_info) { if (!delegate_) @@ -569,15 +568,16 @@ ResourceRequestInfoImpl::ForRequest(request); DCHECK(resource_request_info); bool is_main_frame = resource_request_info->IsMainFrame(); + GlobalRequestID request_id = resource_request_info->GetGlobalRequestID(); GURL url = request->url(); - scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate = + scoped_refptr<LoginDelegate> login_delegate = GetContentClient()->browser()->CreateLoginDelegate( auth_info, resource_request_info->GetWebContentsGetterForRequest(), is_main_frame, url, resource_request_info->first_auth_attempt(), base::Bind(&ResourceDispatcherHostImpl::RunAuthRequiredCallback, - base::Unretained(this), request)); + base::Unretained(this), request_id)); resource_request_info->set_first_auth_attempt(false); @@ -2609,24 +2609,26 @@ } void ResourceDispatcherHostImpl::RunAuthRequiredCallback( - net::URLRequest* url_request, + GlobalRequestID request_id, const base::Optional<net::AuthCredentials>& credentials) { DCHECK_CURRENTLY_ON(BrowserThread::IO); + ResourceLoader* loader = GetLoader(request_id); + if (!loader) + return; + + net::URLRequest* url_request = loader->request(); + if (!url_request) + return; + if (!credentials.has_value()) { url_request->CancelAuth(); } else { url_request->SetAuth(credentials.value()); } - // Clears the ResourceDispatcherHostLoginDelegate associated with the request. - ResourceRequestInfoImpl* info = - ResourceRequestInfoImpl::ForRequest(url_request); - if (info) { - ResourceLoader* loader = GetLoader(info->GetGlobalRequestID()); - if (loader) - loader->ClearLoginDelegate(); - } + // Clears the LoginDelegate associated with the request. + loader->ClearLoginDelegate(); } // static
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h index c4caea6..a595aa1c 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.h +++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -403,7 +403,7 @@ typedef std::map<std::string, HeaderInterceptorInfo> HeaderInterceptorMap; // ResourceLoaderDelegate implementation: - scoped_refptr<ResourceDispatcherHostLoginDelegate> CreateLoginDelegate( + scoped_refptr<LoginDelegate> CreateLoginDelegate( ResourceLoader* loader, net::AuthChallengeInfo* auth_info) override; bool HandleExternalProtocol(ResourceLoader* loader, const GURL& url) override; @@ -687,7 +687,7 @@ bool is_new_request); void RunAuthRequiredCallback( - net::URLRequest* url_request, + GlobalRequestID request_id, const base::Optional<net::AuthCredentials>& credentials); // Returns true if there are two or more tabs that are not network 2-quiet
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc index 12e44ac..547488f 100644 --- a/content/browser/loader/resource_loader.cc +++ b/content/browser/loader/resource_loader.cc
@@ -26,7 +26,7 @@ #include "content/browser/ssl/ssl_client_auth_handler.h" #include "content/browser/ssl/ssl_manager.h" #include "content/public/browser/content_browser_client.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" +#include "content/public/browser/login_delegate.h" #include "content/public/common/appcache_info.h" #include "content/public/common/browser_side_navigation_policy.h" #include "content/public/common/content_client.h"
diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h index 78975c9..e5276077 100644 --- a/content/browser/loader/resource_loader.h +++ b/content/browser/loader/resource_loader.h
@@ -27,7 +27,7 @@ } namespace content { -class ResourceDispatcherHostLoginDelegate; +class LoginDelegate; class ResourceHandler; class ResourceLoaderDelegate; class ResourceRequestInfoImpl; @@ -158,7 +158,7 @@ std::unique_ptr<ResourceHandler> handler_; ResourceLoaderDelegate* delegate_; - scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_; + scoped_refptr<LoginDelegate> login_delegate_; std::unique_ptr<SSLClientAuthHandler> ssl_client_auth_handler_; base::TimeTicks read_deferral_start_time_;
diff --git a/content/browser/loader/resource_loader_delegate.h b/content/browser/loader/resource_loader_delegate.h index 45d6ec8..f2f448c 100644 --- a/content/browser/loader/resource_loader_delegate.h +++ b/content/browser/loader/resource_loader_delegate.h
@@ -19,14 +19,14 @@ } namespace content { -class ResourceDispatcherHostLoginDelegate; +class LoginDelegate; class ResourceLoader; class CONTENT_EXPORT ResourceLoaderDelegate { public: - virtual scoped_refptr<ResourceDispatcherHostLoginDelegate> - CreateLoginDelegate(ResourceLoader* loader, - net::AuthChallengeInfo* auth_info) = 0; + virtual scoped_refptr<LoginDelegate> CreateLoginDelegate( + ResourceLoader* loader, + net::AuthChallengeInfo* auth_info) = 0; virtual bool HandleExternalProtocol(ResourceLoader* loader, const GURL& url) = 0;
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc index a494995..3b81480 100644 --- a/content/browser/loader/resource_loader_unittest.cc +++ b/content/browser/loader/resource_loader_unittest.cc
@@ -24,7 +24,7 @@ #include "content/browser/loader/resource_loader_delegate.h" #include "content/browser/loader/test_resource_handler.h" #include "content/public/browser/client_certificate_delegate.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/resource_request_info.h" #include "content/public/common/content_paths.h" #include "content/public/common/resource_type.h" @@ -490,7 +490,7 @@ } // ResourceLoaderDelegate: - scoped_refptr<ResourceDispatcherHostLoginDelegate> CreateLoginDelegate( + scoped_refptr<LoginDelegate> CreateLoginDelegate( ResourceLoader* loader, net::AuthChallengeInfo* auth_info) override { return nullptr;
diff --git a/content/browser/media/capture/frame_sink_video_capture_device.cc b/content/browser/media/capture/frame_sink_video_capture_device.cc index 5a8651c..d466626 100644 --- a/content/browser/media/capture/frame_sink_video_capture_device.cc +++ b/content/browser/media/capture/frame_sink_video_capture_device.cc
@@ -18,7 +18,7 @@ #include "components/viz/host/host_frame_sink_manager.h" #include "content/browser/compositor/surface_utils.h" #include "media/base/bind_to_current_loop.h" -#include "media/capture/mojo/video_capture_types.mojom.h" +#include "media/capture/mojom/video_capture_types.mojom.h" #include "mojo/public/cpp/system/buffer.h" namespace content {
diff --git a/content/browser/network_service_client.cc b/content/browser/network_service_client.cc index 0afe203..310022a 100644 --- a/content/browser/network_service_client.cc +++ b/content/browser/network_service_client.cc
@@ -11,8 +11,8 @@ #include "content/browser/ssl_private_key_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_context.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/render_frame_host.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" #include "content/public/browser/resource_request_info.h" #include "mojo/public/cpp/bindings/strong_binding.h" #include "net/ssl/client_cert_store.h" @@ -207,7 +207,7 @@ GURL url_; bool first_auth_attempt_; ResourceRequestInfo::WebContentsGetter web_contents_getter_; - scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_; + scoped_refptr<LoginDelegate> login_delegate_; }; } // namespace
diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc index 8545020..80ce3306 100644 --- a/content/browser/renderer_host/delegated_frame_host.cc +++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -13,6 +13,7 @@ #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "base/time/default_tick_clock.h" +#include "build/build_config.h" #include "cc/base/switches.h" #include "components/viz/common/frame_sinks/copy_output_request.h" #include "components/viz/common/quads/compositor_frame.h" @@ -265,7 +266,7 @@ void DelegatedFrameHost::WasResized( const viz::LocalSurfaceId& new_pending_local_surface_id, const gfx::Size& new_pending_dip_size, - const cc::DeadlinePolicy& deadline_policy) { + cc::DeadlinePolicy deadline_policy) { const viz::SurfaceId* primary_surface_id = client_->DelegatedFrameHostGetLayer()->GetPrimarySurfaceId(); @@ -286,6 +287,13 @@ current_frame_size_in_dip_ = pending_surface_dip_size_; viz::SurfaceId surface_id(frame_sink_id_, pending_local_surface_id_); +#if defined(OS_WIN) || defined(OS_LINUX) + // On Windows and Linux, we would like to produce new content as soon as + // possible or the OS will create an additional black gutter. Until we can + // block resize on surface synchronization on these platforms, we will not + // block UI on the top-level renderer. + deadline_policy = cc::DeadlinePolicy::UseSpecifiedDeadline(0u); +#endif client_->DelegatedFrameHostGetLayer()->SetShowPrimarySurface( surface_id, current_frame_size_in_dip_, GetGutterColor(), deadline_policy);
diff --git a/content/browser/renderer_host/delegated_frame_host.h b/content/browser/renderer_host/delegated_frame_host.h index e498d9e..6009c04 100644 --- a/content/browser/renderer_host/delegated_frame_host.h +++ b/content/browser/renderer_host/delegated_frame_host.h
@@ -135,7 +135,7 @@ const ui::LatencyInfo& latency_info); void WasResized(const viz::LocalSurfaceId& local_surface_id, const gfx::Size& dip_size, - const cc::DeadlinePolicy& deadline_policy); + cc::DeadlinePolicy deadline_policy); bool HasSavedFrame() const; gfx::Size GetRequestedRendererSize() const; void SetCompositor(ui::Compositor* compositor);
diff --git a/content/browser/renderer_host/direct_manipulation_browsertest.cc b/content/browser/renderer_host/direct_manipulation_browsertest.cc new file mode 100644 index 0000000..1af0260 --- /dev/null +++ b/content/browser/renderer_host/direct_manipulation_browsertest.cc
@@ -0,0 +1,93 @@ +// Copyright 2018 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 "ui/base/win/direct_manipulation.h" + +#include "base/macros.h" +#include "base/test/scoped_feature_list.h" +#include "base/win/windows_version.h" +#include "content/browser/renderer_host/legacy_render_widget_host_win.h" +#include "content/browser/renderer_host/render_widget_host_view_aura.h" +#include "content/browser/web_contents/web_contents_impl.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" +#include "content/shell/browser/shell.h" +#include "ui/aura/window.h" +#include "ui/aura/window_tree_host.h" +#include "ui/base/ui_base_features.h" +#include "url/gurl.h" + +namespace content { + +class DirectManipulationBrowserTest : public ContentBrowserTest { + public: + DirectManipulationBrowserTest() { + scoped_feature_list_.InitAndEnableFeature(features::kPrecisionTouchpad); + } + + ~DirectManipulationBrowserTest() override {} + + LegacyRenderWidgetHostHWND* GetLegacyRenderWidgetHostHWND() { + RenderWidgetHostViewAura* rwhva = static_cast<RenderWidgetHostViewAura*>( + shell()->web_contents()->GetRenderWidgetHostView()); + return rwhva->legacy_render_widget_host_HWND_; + } + + void SimulatePointerHitTest() { + LegacyRenderWidgetHostHWND* lrwhh = GetLegacyRenderWidgetHostHWND(); + ASSERT_TRUE(lrwhh); + + lrwhh->direct_manipulation_helper_->need_poll_events_ = true; + lrwhh->CreateAnimationObserver(); + } + + void UpdateParent(HWND hwnd) { + LegacyRenderWidgetHostHWND* lrwhh = GetLegacyRenderWidgetHostHWND(); + ASSERT_TRUE(lrwhh); + + lrwhh->UpdateParent(hwnd); + } + + bool HasCompositorAnimationObserver(LegacyRenderWidgetHostHWND* lrwhh) { + return lrwhh->compositor_animation_observer_ != nullptr; + } + + private: + base::test::ScopedFeatureList scoped_feature_list_; + + DISALLOW_COPY_AND_ASSIGN(DirectManipulationBrowserTest); +}; + +// Ensure the AnimationObserver destroy when hwnd reparent to other hwnd. +IN_PROC_BROWSER_TEST_F(DirectManipulationBrowserTest, HWNDReparent) { + if (base::win::GetVersion() < base::win::VERSION_WIN10) + return; + + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); + + LegacyRenderWidgetHostHWND* lrwhh = GetLegacyRenderWidgetHostHWND(); + ASSERT_TRUE(lrwhh); + + // The observer should not create before it needed. + ASSERT_TRUE(!HasCompositorAnimationObserver(lrwhh)); + + // Add AnimationObserver to tab to simulate direct manipulation start. + SimulatePointerHitTest(); + ASSERT_TRUE(HasCompositorAnimationObserver(lrwhh)); + + // Create another browser. + Shell* shell2 = CreateBrowser(); + NavigateToURL(shell2, GURL(url::kAboutBlankURL)); + + // Move to the tab to browser2. + UpdateParent( + shell2->window()->GetRootWindow()->GetHost()->GetAcceleratedWidget()); + + shell()->Close(); + + // The animation observer should be removed. + EXPECT_FALSE(HasCompositorAnimationObserver(lrwhh)); +} + +} // namespace content
diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.cc b/content/browser/renderer_host/legacy_render_widget_host_win.cc index 7b880c4b..c0a0411 100644 --- a/content/browser/renderer_host/legacy_render_widget_host_win.cc +++ b/content/browser/renderer_host/legacy_render_widget_host_win.cc
@@ -18,11 +18,14 @@ #include "content/browser/renderer_host/render_widget_host_view_aura.h" #include "content/public/common/content_switches.h" #include "ui/accessibility/platform/ax_system_caret_win.h" +#include "ui/aura/window.h" +#include "ui/aura/window_tree_host.h" #include "ui/base/ui_base_features.h" #include "ui/base/view_prop.h" #include "ui/base/win/direct_manipulation.h" #include "ui/base/win/internal_constants.h" #include "ui/base/win/window_event_target.h" +#include "ui/compositor/compositor.h" #include "ui/display/win/screen_win.h" #include "ui/gfx/geometry/rect.h" @@ -33,6 +36,43 @@ // accessibility support. const int kIdScreenReaderHoneyPot = 1; +// DirectManipulation needs to poll for new events every frame while finger +// gesturing on touchpad. +class CompositorAnimationObserverForDirectManipulation + : public ui::CompositorAnimationObserver { + public: + CompositorAnimationObserverForDirectManipulation( + LegacyRenderWidgetHostHWND* render_widget_host_hwnd, + ui::Compositor* compositor) + : render_widget_host_hwnd_(render_widget_host_hwnd), + compositor_(compositor) { + DCHECK(compositor_); + compositor_->AddAnimationObserver(this); + } + + ~CompositorAnimationObserverForDirectManipulation() override { + if (compositor_) + compositor_->RemoveAnimationObserver(this); + } + + // ui::CompositorAnimationObserver + void OnAnimationStep(base::TimeTicks timestamp) override { + render_widget_host_hwnd_->PollForNextEvent(); + } + + // ui::CompositorAnimationObserver + void OnCompositingShuttingDown(ui::Compositor* compositor) override { + compositor->RemoveAnimationObserver(this); + compositor_ = nullptr; + } + + private: + LegacyRenderWidgetHostHWND* render_widget_host_hwnd_; + ui::Compositor* compositor_; + + DISALLOW_COPY_AND_ASSIGN(CompositorAnimationObserverForDirectManipulation); +}; + // static LegacyRenderWidgetHostHWND* LegacyRenderWidgetHostHWND::Create( HWND parent) { @@ -57,6 +97,9 @@ } void LegacyRenderWidgetHostHWND::Destroy() { + // Stop the AnimationObserver when window close. + DestroyAnimationObserver(); + host_ = nullptr; if (::IsWindow(hwnd())) ::DestroyWindow(hwnd()); } @@ -64,6 +107,9 @@ void LegacyRenderWidgetHostHWND::UpdateParent(HWND parent) { if (GetWindowEventTarget(GetParent())) GetWindowEventTarget(GetParent())->HandleParentChanged(); + // Stop the AnimationObserver when window hide. eg. tab switch, move tab to + // another window. + DestroyAnimationObserver(); ::SetParent(hwnd(), parent); } @@ -73,10 +119,14 @@ void LegacyRenderWidgetHostHWND::Show() { ::ShowWindow(hwnd(), SW_SHOW); + if (direct_manipulation_helper_) + direct_manipulation_helper_->Activate(); } void LegacyRenderWidgetHostHWND::Hide() { ::ShowWindow(hwnd(), SW_HIDE); + if (direct_manipulation_helper_) + direct_manipulation_helper_->Deactivate(); } void LegacyRenderWidgetHostHWND::SetBounds(const gfx::Rect& bounds) { @@ -85,8 +135,6 @@ ::SetWindowPos(hwnd(), NULL, bounds_in_pixel.x(), bounds_in_pixel.y(), bounds_in_pixel.width(), bounds_in_pixel.height(), SWP_NOREDRAW); - if (direct_manipulation_helper_) - direct_manipulation_helper_->SetBounds(bounds_in_pixel); } void LegacyRenderWidgetHostHWND::MoveCaretTo(const gfx::Rect& bounds) { @@ -143,9 +191,7 @@ // Direct Manipulation is enabled on Windows 10+. The CreateInstance function // returns NULL if Direct Manipulation is not available. direct_manipulation_helper_ = - ui::win::DirectManipulationHelper::CreateInstance(); - if (direct_manipulation_helper_) - direct_manipulation_helper_->Initialize(hwnd()); + ui::win::DirectManipulationHelper::CreateInstance(hwnd()); // Disable pen flicks (http://crbug.com/506977) base::win::DisableFlicks(hwnd()); @@ -280,12 +326,6 @@ handled = TRUE; } } - - if (direct_manipulation_helper_ && - (message == WM_MOUSEWHEEL || message == WM_MOUSEHWHEEL)) { - direct_manipulation_helper_->HandleMouseWheel(hwnd(), message, w_param, - l_param); - } return ret; } @@ -442,13 +482,57 @@ WINDOWPOS* window_pos = reinterpret_cast<WINDOWPOS*>(l_param); if (direct_manipulation_helper_) { if (window_pos->flags & SWP_SHOWWINDOW) { - direct_manipulation_helper_->Activate(hwnd()); + direct_manipulation_helper_->Activate(); } else if (window_pos->flags & SWP_HIDEWINDOW) { - direct_manipulation_helper_->Deactivate(hwnd()); + direct_manipulation_helper_->Deactivate(); } } SetMsgHandled(FALSE); return 0; } +LRESULT LegacyRenderWidgetHostHWND::OnPointerHitTest(UINT message, + WPARAM w_param, + LPARAM l_param) { + if (!direct_manipulation_helper_) + return 0; + + // Update window event target for each DM_POINTERHITTEST. + if (direct_manipulation_helper_->OnPointerHitTest( + w_param, GetWindowEventTarget(GetParent()))) { + if (compositor_animation_observer_) { + // This is reach if Windows send a DM_POINTERHITTEST before the last + // DM_POINTERHITTEST receive READY status. We never see this but still + // worth to handle it. + return 0; + } + + CreateAnimationObserver(); + } + + return 0; +} + +void LegacyRenderWidgetHostHWND::PollForNextEvent() { + DCHECK(direct_manipulation_helper_); + + if (!direct_manipulation_helper_->PollForNextEvent()) + DestroyAnimationObserver(); +} + +void LegacyRenderWidgetHostHWND::CreateAnimationObserver() { + DCHECK(!compositor_animation_observer_); + DCHECK(host_); + DCHECK(host_->GetNativeView()->GetHost()); + DCHECK(host_->GetNativeView()->GetHost()->compositor()); + + compositor_animation_observer_ = + std::make_unique<CompositorAnimationObserverForDirectManipulation>( + this, host_->GetNativeView()->GetHost()->compositor()); +} + +void LegacyRenderWidgetHostHWND::DestroyAnimationObserver() { + compositor_animation_observer_.reset(); +} + } // namespace content
diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.h b/content/browser/renderer_host/legacy_render_widget_host_win.h index c3d6141..79bad95 100644 --- a/content/browser/renderer_host/legacy_render_widget_host_win.h +++ b/content/browser/renderer_host/legacy_render_widget_host_win.h
@@ -15,10 +15,12 @@ #include "base/macros.h" #include "content/common/content_export.h" +#include "ui/compositor/compositor_animation_observer.h" #include "ui/gfx/geometry/rect.h" namespace ui { class AXSystemCaretWin; +class DirectManipulationHelper; class WindowEventTarget; namespace win { class DirectManipulationHelper; @@ -28,6 +30,8 @@ namespace content { class RenderWidgetHostViewAura; +class DirectManipulationBrowserTest; + // Reasons for the existence of this class outlined below:- // 1. Some screen readers expect every tab / every unique web content container // to be in its own HWND with class name Chrome_RenderWidgetHostHWND. @@ -95,6 +99,7 @@ MESSAGE_HANDLER_EX(WM_NCCALCSIZE, OnNCCalcSize) MESSAGE_HANDLER_EX(WM_SIZE, OnSize) MESSAGE_HANDLER_EX(WM_WINDOWPOSCHANGED, OnWindowPosChanged) + MESSAGE_HANDLER_EX(DM_POINTERHITTEST, OnPointerHitTest) END_MSG_MAP() HWND hwnd() { return m_hWnd; } @@ -122,10 +127,16 @@ // Changes the position of the system caret used for accessibility. void MoveCaretTo(const gfx::Rect& bounds); + // DirectManipulation needs to poll for new events every frame while finger + // gesturing on touchpad. + void PollForNextEvent(); + protected: void OnFinalMessage(HWND hwnd) override; private: + friend class DirectManipulationBrowserTest; + explicit LegacyRenderWidgetHostHWND(HWND parent); ~LegacyRenderWidgetHostHWND() override; @@ -154,6 +165,12 @@ LRESULT OnSize(UINT message, WPARAM w_param, LPARAM l_param); LRESULT OnWindowPosChanged(UINT message, WPARAM w_param, LPARAM l_param); + LRESULT OnPointerHitTest(UINT message, WPARAM w_param, LPARAM l_param); + + void CreateAnimationObserver(); + + void DestroyAnimationObserver(); + Microsoft::WRL::ComPtr<IAccessible> window_accessible_; // Set to true if we turned on mouse tracking. @@ -170,6 +187,9 @@ std::unique_ptr<ui::win::DirectManipulationHelper> direct_manipulation_helper_; + std::unique_ptr<ui::CompositorAnimationObserver> + compositor_animation_observer_; + DISALLOW_COPY_AND_ASSIGN(LegacyRenderWidgetHostHWND); };
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc index f132e622..74dabd3 100644 --- a/content/browser/renderer_host/media/video_capture_controller.cc +++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -22,7 +22,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "media/base/video_frame.h" -#include "media/capture/mojo/video_capture_types.mojom.h" +#include "media/capture/mojom/video_capture_types.mojom.h" #include "media/capture/video/video_capture_buffer_pool.h" #include "media/capture/video/video_capture_buffer_tracker_factory_impl.h" #include "media/capture/video/video_capture_device_client.h"
diff --git a/content/browser/renderer_host/media/video_capture_controller_event_handler.h b/content/browser/renderer_host/media/video_capture_controller_event_handler.h index a11d54fe..674a8b5 100644 --- a/content/browser/renderer_host/media/video_capture_controller_event_handler.h +++ b/content/browser/renderer_host/media/video_capture_controller_event_handler.h
@@ -9,7 +9,7 @@ #include "base/memory/shared_memory.h" #include "content/common/content_export.h" -#include "media/capture/mojo/video_capture_types.mojom.h" +#include "media/capture/mojom/video_capture_types.mojom.h" #include "mojo/public/cpp/system/buffer.h" #include "ui/gfx/geometry/size.h"
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h index 5c422624..6a9fe20 100644 --- a/content/browser/renderer_host/media/video_capture_host.h +++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -14,7 +14,7 @@ #include "content/browser/renderer_host/media/video_capture_controller.h" #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h" #include "content/common/content_export.h" -#include "media/capture/mojo/video_capture.mojom.h" +#include "media/capture/mojom/video_capture.mojom.h" namespace content { class MediaStreamManager;
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 980a0d3..5379142 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2223,7 +2223,7 @@ // We kill the renderer but don't include a NOTREACHED, because we want the // browser to try to survive when it gets illegal messages from the renderer. - Shutdown(RESULT_CODE_KILLED_BAD_MESSAGE, false); + Shutdown(RESULT_CODE_KILLED_BAD_MESSAGE); if (crash_report_mode == CrashReportMode::GENERATE_CRASH_DUMP) { // Set crash keys to understand renderer kills related to site isolation. @@ -2539,6 +2539,7 @@ switches::kDisableFileSystem, switches::kDisableGpuMemoryBufferVideoFrames, switches::kDisableGpuVsync, + switches::kDisableImageAnimationResync, switches::kDisableLowResTiling, switches::kDisableHistogramCustomizer, switches::kDisableLCDText, @@ -2790,14 +2791,14 @@ return GetHandle() && channel_connected_; } -bool RenderProcessHostImpl::Shutdown(int exit_code, bool wait) { +bool RenderProcessHostImpl::Shutdown(int exit_code) { if (run_renderer_in_process()) return false; // Single process mode never shuts down the renderer. if (!child_process_launcher_.get()) return false; - return child_process_launcher_->Terminate(exit_code, wait); + return child_process_launcher_->Terminate(exit_code); } bool RenderProcessHostImpl::FastShutdownIfPossible(size_t page_count, @@ -3066,12 +3067,9 @@ base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); deleting_soon_ = true; - // It's important not to wait for the DeleteTask to delete the channel - // proxy. Kill it off now. That way, in case the profile is going away, the - // rest of the objects attached to this RenderProcessHost start going - // away first, since deleting the channel proxy will post a - // OnChannelClosed() to IPC::ChannelProxy::Context on the IO thread. - ResetChannelProxy(); + // Destroy all mojo bindings and IPC channels that can cause calls to this + // object, to avoid method invocations that trigger usages of profile. + ResetIPC(); // Its important to remove the kSessionStorageHolder after the channel // has been reset to avoid deleting the underlying namespaces prior @@ -3671,11 +3669,10 @@ child_process_launcher_.reset(); is_dead_ = true; - if (route_provider_binding_.is_bound()) - route_provider_binding_.Close(); - associated_interfaces_.reset(); + // Make sure no IPCs or mojo calls from the old process get dispatched after + // it has died. + ResetIPC(); process_resource_coordinator_.reset(); - ResetChannelProxy(); UpdateProcessPriority(); @@ -3708,13 +3705,6 @@ if (delayed_cleanup_needed_) Cleanup(); - // If RenderProcessHostImpl is reused, the next renderer will send a new - // request for FrameSinkProvider so make sure frame_sink_provider_ is ready - // for that. - frame_sink_provider_.Unbind(); - if (renderer_host_binding_.is_bound()) - renderer_host_binding_.Unbind(); - compositing_mode_reporter_.reset(); shared_bitmap_allocation_notifier_impl_.ChildDied(); @@ -3724,6 +3714,27 @@ // TODO(darin): clean this up } +void RenderProcessHostImpl::ResetIPC() { + if (renderer_host_binding_.is_bound()) + renderer_host_binding_.Unbind(); + if (route_provider_binding_.is_bound()) + route_provider_binding_.Close(); + associated_interface_provider_bindings_.CloseAllBindings(); + associated_interfaces_.reset(); + + // If RenderProcessHostImpl is reused, the next renderer will send a new + // request for FrameSinkProvider so make sure frame_sink_provider_ is ready + // for that. + frame_sink_provider_.Unbind(); + + // It's important not to wait for the DeleteTask to delete the channel + // proxy. Kill it off now. That way, in case the profile is going away, the + // rest of the objects attached to this RenderProcessHost start going + // away first, since deleting the channel proxy will post a + // OnChannelClosed() to IPC::ChannelProxy::Context on the IO thread. + ResetChannelProxy(); +} + size_t RenderProcessHost::GetActiveViewCount() { size_t num_active_views = 0; std::unique_ptr<RenderWidgetHostIterator> widgets(
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 8510da6..43d42b0 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -159,7 +159,7 @@ int VisibleWidgetCount() const override; bool IsForGuestsOnly() const override; StoragePartition* GetStoragePartition() const override; - bool Shutdown(int exit_code, bool wait) override; + bool Shutdown(int exit_code) override; bool FastShutdownIfPossible(size_t page_count = 0, bool skip_unload_handlers = false) override; base::ProcessHandle GetHandle() const override; @@ -500,6 +500,10 @@ // Handle termination of our process. void ProcessDied(bool already_dead, RendererClosedDetails* known_details); + // Destroy all objects that can cause methods to be invoked on this object or + // any other that hang off it. + void ResetIPC(); + // GpuSwitchingObserver implementation. void OnGpuSwitched() override;
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index d8ff8d5..d1c06adf 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -248,8 +248,6 @@ } bool handled = true; IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAndroid, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_ShowUnhandledTapUIIfNeeded, - OnShowUnhandledTapUIIfNeeded) IPC_MESSAGE_HANDLER(ViewHostMsg_SelectWordAroundCaretAck, OnSelectWordAroundCaretAck) IPC_MESSAGE_UNHANDLED(handled = false) @@ -382,13 +380,6 @@ return is_showing_ && content_view_core_; } -void RenderWidgetHostViewAndroid::OnShowUnhandledTapUIIfNeeded(int x_px, - int y_px) { - if (!selection_popup_controller_ || !content_view_core_) - return; - selection_popup_controller_->OnShowUnhandledTapUIIfNeeded(x_px, y_px); -} - void RenderWidgetHostViewAndroid::OnSelectWordAroundCaretAck(bool did_select, int start_adjust, int end_adjust) {
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h index 908ea65..94f1c32 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.h +++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -295,8 +295,6 @@ void ShowContextMenuAtPoint(const gfx::Point& point, ui::MenuSourceType); void DismissTextHandles(); void SetTextHandlesTemporarilyHidden(bool hidden); - // |x_px| and |y_px| are in physical pixel scale. - void OnShowUnhandledTapUIIfNeeded(int x_px, int y_px); void OnSelectWordAroundCaretAck(bool did_select, int start_adjust, int end_adjust);
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index f476f45..a016a43 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1601,7 +1601,6 @@ // RenderWidgetHostViewAura instance goes away etc. To avoid that we // destroy the LegacyRenderWidgetHostHWND instance here. if (legacy_render_widget_host_HWND_) { - legacy_render_widget_host_HWND_->set_host(NULL); legacy_render_widget_host_HWND_->Destroy(); // The Destroy call above will delete the LegacyRenderWidgetHostHWND // instance.
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 655fc78..54b286d1 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -67,6 +67,7 @@ namespace content { #if defined(OS_WIN) class LegacyRenderWidgetHostHWND; +class DirectManipulationBrowserTest; #endif class CursorManager; @@ -358,6 +359,9 @@ friend class RenderWidgetHostViewAuraTest; friend class RenderWidgetHostViewAuraCopyRequestTest; friend class TestInputMethodObserver; +#if defined(OS_WIN) + friend class DirectManipulationBrowserTest; +#endif FRIEND_TEST_ALL_PREFIXES(InputMethodResultAuraTest, FinishImeCompositionSession); FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 0d7a6c42..01b382df 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -2452,7 +2452,7 @@ RunOnIOThread(base::Bind(&ServiceWorkerVersion::AddListener, base::Unretained(version_.get()), &observer)); shell()->web_contents()->GetMainFrame()->GetProcess()->Shutdown( - content::RESULT_CODE_KILLED, false /* wait */); + content::RESULT_CODE_KILLED); run_loop.Run(); EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, version_->running_status());
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index e0d1c9e9..f0bc2c3 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc
@@ -2222,7 +2222,7 @@ RenderProcessHost* child_process = node2->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); // Now navigate the second iframe (node3) to the same site as the node2. @@ -2258,7 +2258,7 @@ RenderProcessHost* child_process = node2->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); // Try to focus the root's owning WebContents. @@ -2335,7 +2335,7 @@ root->child_at(0)->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process_b, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process_b->Shutdown(0, false); + child_process_b->Shutdown(0); crash_observer.Wait(); // The Site C frame (a child of the crashed Site B frame) should go away, @@ -2560,7 +2560,7 @@ root->child_at(0)->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); // Navigate the second subframe to b.com to recreate the b.com process. @@ -2624,7 +2624,7 @@ root->child_at(0)->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); // Add a new child frame to the third subframe. @@ -2689,7 +2689,7 @@ EXPECT_TRUE(ExecuteScript(root, "popup = window.open('about:blank');")); Shell* popup = new_shell_observer.GetShell(); GURL popup_url(embedded_test_server()->GetURL("b.com", "/title2.html")); - EXPECT_TRUE(NavigateToURL(popup, popup_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup, popup_url)); // Verify that each top-level frame has proxies in the other's SiteInstance. FrameTreeNode* popup_root = @@ -2711,7 +2711,7 @@ RenderProcessHost* child_process = root->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(root->current_frame_host()->IsRenderFrameLive()); @@ -2811,7 +2811,7 @@ root->child_at(0)->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process_b, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process_b->Shutdown(0, false); + child_process_b->Shutdown(0); crash_observer.Wait(); // Make sure proxy C has gone from root. @@ -2854,7 +2854,7 @@ { RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); } @@ -2878,7 +2878,7 @@ { RenderProcessHostWatcher crash_observer( root_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - root_process->Shutdown(0, false); + root_process->Shutdown(0); crash_observer.Wait(); } EXPECT_EQ(0U, root->child_count()); @@ -4429,8 +4429,9 @@ ShellAddedObserver new_shell_observer; EXPECT_TRUE(ExecuteScript(web_contents(), "window.open('about:blank');")); Shell* popup = new_shell_observer.GetShell(); - EXPECT_TRUE(NavigateToURL(popup, embedded_test_server()->GetURL( - "bar.com", "/navigate_opener.html"))); + EXPECT_TRUE(NavigateToURLFromRenderer( + popup, + embedded_test_server()->GetURL("bar.com", "/navigate_opener.html"))); // Show an interstitial in the opener. TestInterstitialDelegate* delegate = new TestInterstitialDelegate; @@ -4480,7 +4481,7 @@ Shell* popup = new_shell_observer.GetShell(); GURL popup_url( embedded_test_server()->GetURL("bar.com", "/post_message.html")); - EXPECT_TRUE(NavigateToURL(popup, popup_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup, popup_url)); // From the popup, open another popup for baz.com. This will be used to // check that the whole opener chain is processed when creating proxies and @@ -4490,7 +4491,7 @@ Shell* popup2 = new_shell_observer2.GetShell(); GURL popup2_url( embedded_test_server()->GetURL("baz.com", "/post_message.html")); - EXPECT_TRUE(NavigateToURL(popup2, popup2_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup2, popup2_url)); // Ensure that we've created proxies for SiteInstances of both popups (C, D) // in the main window's frame tree. @@ -4788,7 +4789,7 @@ popup->web_contents()->GetLastCommittedURL()); // Navigate popup back to a cross-site URL. - EXPECT_TRUE(NavigateToURL(popup, popup_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup, popup_url)); EXPECT_NE(popup->web_contents()->GetSiteInstance(), shell()->web_contents()->GetSiteInstance()); @@ -4842,7 +4843,7 @@ // Navigate the popup cross-site and ensure it's still reachable via // window.open from the main frame. GURL d_url(embedded_test_server()->GetURL("d.com", "/title3.html")); - EXPECT_TRUE(NavigateToURL(foo_shell, d_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(foo_shell, d_url)); EXPECT_EQ(d_url, foo_root->current_url()); NavigateNamedFrame(shell(), named_frame_url, "foo"); EXPECT_TRUE(WaitForLoadStop(foo_shell->web_contents())); @@ -4927,7 +4928,7 @@ EXPECT_TRUE(popup_shell); GURL popup_url(embedded_test_server()->GetURL( "bar.com", "/frame_tree/page_with_post_message_frames.html")); - EXPECT_TRUE(NavigateToURL(popup_shell, popup_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup_shell, popup_url)); FrameTreeNode* popup_root = static_cast<WebContentsImpl*>(popup_shell->web_contents()) @@ -5196,7 +5197,7 @@ // destroy |rfh| and |rvh| before they are checked in the test. GURL b_url(embedded_test_server()->GetURL("b.com", "/title2.html")); TestFrameNavigationObserver commit_observer(root); - shell()->LoadURL(b_url); + EXPECT_TRUE(ExecuteScript(shell(), "location = '" + b_url.spec() + "'")); commit_observer.WaitForCommit(); EXPECT_FALSE(deleted_observer.deleted()); @@ -5222,10 +5223,11 @@ EXPECT_FALSE(root->frame_tree()->GetRenderViewHost(site_instance)); EXPECT_TRUE(deleted_observer.deleted()); - // Start a navigation back to A and check that the RenderViewHost wasn't - // reused. + // Start a navigation back to A, being careful to stay in the same + // BrowsingInstance, and check that the RenderViewHost wasn't reused. TestNavigationObserver navigation_observer(shell()->web_contents()); - shell()->LoadURL(a_url); + shell()->LoadURLForFrame(a_url, std::string(), + ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK)); RenderViewHostImpl* pending_rvh = root->render_manager()->speculative_frame_host()->render_view_host(); EXPECT_EQ(site_instance, pending_rvh->GetSiteInstance()); @@ -7587,7 +7589,7 @@ // Navigate main tab to a b.com URL that will not commit. GURL stall_url(embedded_test_server()->GetURL("b.com", "/title2.html")); TestNavigationManager delayer(shell()->web_contents(), stall_url); - shell()->LoadURL(stall_url); + EXPECT_TRUE(ExecuteScript(shell(), "location = '" + stall_url.spec() + "'")); EXPECT_TRUE(delayer.WaitForRequestStart()); // The pending RFH should be in the same process as the popup. @@ -7601,7 +7603,7 @@ // and the popup. RenderProcessHostWatcher crash_observer( pending_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - EXPECT_TRUE(pending_process->Shutdown(0, false)); + EXPECT_TRUE(pending_process->Shutdown(0)); crash_observer.Wait(); // The pending RFH should have been canceled and destroyed, so that it won't @@ -7614,7 +7616,7 @@ // Navigate main tab to b.com again. This should not crash. GURL b_url(embedded_test_server()->GetURL("b.com", "/title3.html")); - EXPECT_TRUE(NavigateToURL(shell(), b_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(shell(), b_url)); // The b.com RVH in the main tab should become active. EXPECT_TRUE(rvh->is_active()); @@ -7646,7 +7648,7 @@ GURL stall_url(embedded_test_server()->GetURL("b.com", "/title2.html")); NavigationHandleObserver handle_observer(shell()->web_contents(), stall_url); TestNavigationManager delayer(shell()->web_contents(), stall_url); - shell()->LoadURL(stall_url); + EXPECT_TRUE(ExecuteScript(shell(), "location = '" + stall_url.spec() + "'")); EXPECT_TRUE(delayer.WaitForRequestStart()); // Kill the b.com process, currently in use by the pending RenderFrameHost @@ -7655,7 +7657,7 @@ popup_shell->web_contents()->GetMainFrame()->GetProcess(); RenderProcessHostWatcher crash_observer( pending_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - EXPECT_TRUE(pending_process->Shutdown(0, false)); + EXPECT_TRUE(pending_process->Shutdown(0)); crash_observer.Wait(); // Since the navigation above didn't commit, the b.com RenderViewHost in the @@ -7670,7 +7672,7 @@ // RenderViewHost was brought into an active state by the navigation to // |stall_url| above, even though it never committed. GURL b_url(embedded_test_server()->GetURL("b.com", "/title3.html")); - EXPECT_TRUE(NavigateToURL(popup_shell, b_url)); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(popup_shell, b_url)); EXPECT_FALSE(rvh->is_active()); } @@ -7694,7 +7696,7 @@ RenderProcessHost* child_process = child->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); EXPECT_FALSE(child->current_frame_host()->IsRenderFrameLive()); @@ -8023,18 +8025,18 @@ // Open a popup and navigate it to b.com. Shell* popup = OpenPopup(shell(), a_url, "popup"); - EXPECT_TRUE(NavigateToURL(popup, b_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup, b_url)); // Open a second popup and navigate it to b.com, which redirects to c.com. // The navigation to b.com will create a pending RenderFrameHost, which will - // be canceled during the redirect to c.com. Note that NavigateToURL will - // return false because the committed URL won't match the requested URL due - // to the redirect. + // be canceled during the redirect to c.com. Note that + // NavigateToURLFromRenderer will return false because the committed URL + // won't match the requested URL due to the redirect. Shell* popup2 = OpenPopup(shell(), a_url, "popup2"); TestNavigationObserver observer(popup2->web_contents()); GURL redirect_url(embedded_test_server()->GetURL( "b.com", "/server-redirect?" + c_url.spec())); - EXPECT_FALSE(NavigateToURL(popup2, redirect_url)); + EXPECT_FALSE(NavigateToURLFromRenderer(popup2, redirect_url)); EXPECT_EQ(c_url, observer.last_navigation_url()); EXPECT_TRUE(observer.last_navigation_succeeded()); @@ -8045,14 +8047,14 @@ popup->web_contents()->GetMainFrame()->GetProcess(); RenderProcessHostWatcher crash_observer( b_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - b_process->Shutdown(0, false); + b_process->Shutdown(0); crash_observer.Wait(); // Navigate the second popup to b.com. This used to crash when creating the // RenderView, because it reused the RenderViewHost created by the canceled // navigation to b.com, and that RenderViewHost had a stale main frame // routing ID and active state. - EXPECT_TRUE(NavigateToURL(popup2, b_url)); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(popup2, b_url)); } // Check that after a pending RFH is canceled and replaced with a proxy (which @@ -8070,7 +8072,7 @@ // Open a popup and navigate it to b.com. Shell* popup = OpenPopup(shell(), a_url, "popup"); - EXPECT_TRUE(NavigateToURL(popup, b_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup, b_url)); // Open a second popup and navigate it to b.com, which redirects to c.com. // The navigation to b.com will create a pending RenderFrameHost, which will @@ -8081,14 +8083,14 @@ TestNavigationObserver observer(popup2->web_contents()); GURL redirect_url(embedded_test_server()->GetURL( "b.com", "/server-redirect?" + c_url.spec())); - EXPECT_FALSE(NavigateToURL(popup2, redirect_url)); + EXPECT_FALSE(NavigateToURLFromRenderer(popup2, redirect_url)); EXPECT_EQ(c_url, observer.last_navigation_url()); EXPECT_TRUE(observer.last_navigation_succeeded()); // Navigate the second popup to b.com. This used to crash the b.com renderer // because it failed to delete the canceled RFH's RenderFrame, so this caused // it to try to create a frame widget which already existed. - EXPECT_TRUE(NavigateToURL(popup2, b_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup2, b_url)); } // Check that when a pending RFH is canceled and a proxy needs to be created in @@ -8104,7 +8106,7 @@ // Open a popup and navigate it to b.com. Shell* popup = OpenPopup(shell(), a_url, "popup"); - EXPECT_TRUE(NavigateToURL(popup, b_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup, b_url)); // Open a second popup and navigate it to b.com, which redirects to c.com. // The navigation to b.com will create a pending RenderFrameHost, which will @@ -8115,7 +8117,7 @@ TestNavigationObserver observer(popup2->web_contents()); GURL redirect_url(embedded_test_server()->GetURL( "b.com", "/server-redirect?" + c_url.spec())); - EXPECT_FALSE(NavigateToURL(popup2, redirect_url)); + EXPECT_FALSE(NavigateToURLFromRenderer(popup2, redirect_url)); EXPECT_EQ(c_url, observer.last_navigation_url()); EXPECT_TRUE(observer.last_navigation_succeeded()); @@ -8144,7 +8146,7 @@ // reach the window reference for |popup2| due to a security restriction in // Blink. So, navigate the main tab to b.com and then send a postMessage to // |popup2|. This is allowed since the main tab is |popup2|'s opener. - EXPECT_TRUE(NavigateToURL(shell(), b_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(shell(), b_url)); base::string16 expected_title(base::UTF8ToUTF16("foo")); TitleWatcher title_watcher(popup2->web_contents(), expected_title); @@ -8370,7 +8372,7 @@ { RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); } EXPECT_FALSE(child->current_frame_host()->IsRenderFrameLive()); @@ -9057,8 +9059,8 @@ OpenPopup(shell(), GURL(url::kAboutBlankURL), "foo"); // Navigate foo -> bar -> foo. - EXPECT_TRUE(NavigateToURL(shell(), bar_url)); - EXPECT_TRUE(NavigateToURL(shell(), foo_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(shell(), bar_url)); + EXPECT_TRUE(NavigateToURLFromRenderer(shell(), foo_url)); // There should be three history entries. EXPECT_EQ(3, web_contents()->GetController().GetEntryCount()); @@ -9539,7 +9541,7 @@ // Before it commits, start and commit a navigation to b.com in the second // tab. GURL new_url_2(embedded_test_server()->GetURL("b.com", "/title2.html")); - EXPECT_TRUE(NavigateToURL(popup_shell, new_url_2)); + EXPECT_TRUE(NavigateToURLFromRenderer(popup_shell, new_url_2)); // Check that the opener still has a speculative RenderFrameHost and a // corresponding proxy for b.com. @@ -10437,6 +10439,60 @@ EXPECT_NE(third_shell_instance->GetProcess(), bar_process); } +// Check that when a subframe reuses an existing process for the same site +// across BrowsingInstances, a browser-initiated navigation in that subframe's +// tab doesn't unnecessarily share the reused process. See +// https://crbug.com/803367. +IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, + NoProcessSharingAfterSubframeReusesExistingProcess) { + GURL foo_url(embedded_test_server()->GetURL("foo.com", "/title1.html")); + EXPECT_TRUE(NavigateToURL(shell(), foo_url)); + FrameTreeNode* root = web_contents()->GetFrameTree()->root(); + SiteInstanceImpl* foo_instance = + root->current_frame_host()->GetSiteInstance(); + + // Open an unrelated tab in a separate BrowsingInstance, and navigate it to + // to bar.com. + GURL bar_url( + embedded_test_server()->GetURL("bar.com", "/page_with_iframe.html")); + Shell* second_shell = CreateBrowser(); + EXPECT_TRUE(NavigateToURL(second_shell, bar_url)); + FrameTreeNode* second_root = + static_cast<WebContentsImpl*>(second_shell->web_contents()) + ->GetFrameTree() + ->root(); + FrameTreeNode* second_child = second_root->child_at(0); + scoped_refptr<SiteInstanceImpl> bar_instance = + second_root->current_frame_host()->GetSiteInstance(); + EXPECT_FALSE(bar_instance->IsRelatedSiteInstance(foo_instance)); + + // Navigate the second tab's subframe to foo.com. Confirm that it reuses + // first tab's process. + NavigateIframeToURL(second_shell->web_contents(), "test_iframe", foo_url); + EXPECT_EQ(foo_url, second_child->current_url()); + scoped_refptr<SiteInstanceImpl> second_child_foo_instance = + second_child->current_frame_host()->GetSiteInstance(); + EXPECT_EQ( + SiteInstanceImpl::ProcessReusePolicy::REUSE_PENDING_OR_COMMITTED_SITE, + second_child_foo_instance->process_reuse_policy()); + EXPECT_NE(foo_instance, second_child_foo_instance); + EXPECT_EQ(foo_instance->GetProcess(), + second_child_foo_instance->GetProcess()); + + // Perform a browser-initiated address bar navigation in the second tab to + // foo.com. This should swap BrowsingInstances and end up in a separate + // process from the first tab. + EXPECT_TRUE(NavigateToURL(second_shell, foo_url)); + SiteInstanceImpl* new_instance = + second_root->current_frame_host()->GetSiteInstance(); + EXPECT_NE(second_child_foo_instance, new_instance); + EXPECT_FALSE(second_child_foo_instance->IsRelatedSiteInstance(new_instance)); + EXPECT_FALSE(bar_instance->IsRelatedSiteInstance(new_instance)); + EXPECT_FALSE(foo_instance->IsRelatedSiteInstance(new_instance)); + EXPECT_NE(new_instance->GetProcess(), foo_instance->GetProcess()); + EXPECT_NE(new_instance->GetProcess(), bar_instance->GetProcess()); +} + namespace { // Intercepts the next DidCommitProvisionalLoad message for |deferred_url| in
diff --git a/content/browser/site_per_process_hit_test_browsertest.cc b/content/browser/site_per_process_hit_test_browsertest.cc index 0d7e146..b10a727 100644 --- a/content/browser/site_per_process_hit_test_browsertest.cc +++ b/content/browser/site_per_process_hit_test_browsertest.cc
@@ -897,7 +897,7 @@ iframe_node->current_frame_host()->GetSiteInstance()->GetProcess(); RenderProcessHostWatcher crash_observer( rph, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - EXPECT_TRUE(rph->Shutdown(0, false)); + EXPECT_TRUE(rph->Shutdown(0)); crash_observer.Wait(); scroll_event.delta_y = 0.0f; scroll_event.phase = blink::WebMouseWheelEvent::kPhaseEnded; @@ -2018,7 +2018,7 @@ root->child_at(0)->current_frame_host()->GetProcess(); RenderProcessHostWatcher crash_observer( child_process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - child_process->Shutdown(0, false); + child_process->Shutdown(0); crash_observer.Wait(); EXPECT_EQ(nullptr, router->wheel_target_.target); }
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc index 24f48701..49edb02 100644 --- a/content/browser/speech/speech_recognition_dispatcher_host.cc +++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -4,15 +4,20 @@ #include "content/browser/speech/speech_recognition_dispatcher_host.h" +#include <memory> + #include "base/bind.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "content/browser/browser_plugin/browser_plugin_guest.h" #include "content/browser/child_process_security_policy_impl.h" -#include "content/browser/renderer_host/render_view_host_impl.h" +#include "content/browser/frame_host/frame_tree_node.h" +#include "content/browser/frame_host/render_frame_host_manager.h" #include "content/browser/speech/speech_recognition_manager_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/speech_recognition_messages.h" +#include "content/public/browser/browser_context.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/speech_recognition_manager_delegate.h" #include "content/public/browser/speech_recognition_session_config.h" @@ -34,8 +39,6 @@ } SpeechRecognitionDispatcherHost::~SpeechRecognitionDispatcherHost() { - SpeechRecognitionManager::GetInstance()->AbortAllSessionsForRenderProcess( - render_process_id_); } base::WeakPtr<SpeechRecognitionDispatcherHost> @@ -77,7 +80,7 @@ void SpeechRecognitionDispatcherHost::OnStartRequest( const SpeechRecognitionHostMsg_StartRequest_Params& params) { - SpeechRecognitionHostMsg_StartRequest_Params input_params(params); + DCHECK_CURRENTLY_ON(BrowserThread::UI); // Check that the origin specified by the renderer process is one // that it is allowed to access. @@ -90,69 +93,66 @@ } int embedder_render_process_id = 0; - int embedder_render_view_id = MSG_ROUTING_NONE; - RenderViewHostImpl* render_view_host = - RenderViewHostImpl::FromID(render_process_id_, params.render_view_id); - if (!render_view_host) { - // RVH can be null if the tab was closed while continuous mode speech - // recognition was running. This seems to happen on mac. - LOG(WARNING) << "SRDH::OnStartRequest, RenderViewHost does not exist"; - return; - } + int embedder_render_frame_id = MSG_ROUTING_NONE; - WebContentsImpl* web_contents = static_cast<WebContentsImpl*>( - WebContents::FromRenderViewHost(render_view_host)); - WebContentsImpl* outer_web_contents = web_contents->GetOuterWebContents(); + WebContentsImpl* web_contents = + static_cast<WebContentsImpl*>(WebContentsImpl::FromRenderFrameHostID( + render_process_id_, params.render_frame_id)); + DCHECK(web_contents); + + // If the speech API request was from an inner WebContents or a guest, save + // the context of the outer WebContents or the embedder since we will use it + // to decide permission. + WebContents* outer_web_contents = web_contents->GetOuterWebContents(); if (outer_web_contents) { - // If the speech API request was from an inner WebContents or a guest, save - // the context of the outer WebContents or the embedder since we will use it - // to decide permission. - embedder_render_process_id = - outer_web_contents->GetRenderViewHost()->GetProcess()->GetID(); + RenderFrameHost* embedder_frame = nullptr; + + FrameTreeNode* embedder_frame_node = web_contents->GetMainFrame() + ->frame_tree_node() + ->render_manager() + ->GetOuterDelegateNode(); + if (embedder_frame_node) { + embedder_frame = embedder_frame_node->current_frame_host(); + } else { + // The outer web contents is embedded using the browser plugin. Fall back + // to a simple lookup of the main frame. TODO(avi): When the browser + // plugin is retired, remove this code. + embedder_frame = outer_web_contents->GetMainFrame(); + } + + embedder_render_process_id = embedder_frame->GetProcess()->GetID(); DCHECK_NE(embedder_render_process_id, 0); - embedder_render_view_id = - outer_web_contents->GetRenderViewHost()->GetRoutingID(); - DCHECK_NE(embedder_render_view_id, MSG_ROUTING_NONE); + embedder_render_frame_id = embedder_frame->GetRoutingID(); + DCHECK_NE(embedder_render_frame_id, MSG_ROUTING_NONE); } - // TODO(lazyboy): Check if filter_profanities should use |render_process_id| - // instead of |render_process_id_|. bool filter_profanities = SpeechRecognitionManagerImpl::GetInstance() && SpeechRecognitionManagerImpl::GetInstance()->delegate() && SpeechRecognitionManagerImpl::GetInstance()->delegate()-> FilterProfanities(render_process_id_); - // TODO(miu): This is a hack to allow SpeechRecognition to operate with the - // MediaStreamManager, which partitions requests per RenderFrame, not per - // RenderView. http://crbug.com/390749 - const int params_render_frame_id = render_view_host ? - render_view_host->GetMainFrame()->GetRoutingID() : MSG_ROUTING_NONE; - - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - base::BindOnce(&SpeechRecognitionDispatcherHost::OnStartRequestOnIO, this, - embedder_render_process_id, embedder_render_view_id, - input_params, params_render_frame_id, filter_profanities)); -} - -void SpeechRecognitionDispatcherHost::OnStartRequestOnIO( - int embedder_render_process_id, - int embedder_render_view_id, - const SpeechRecognitionHostMsg_StartRequest_Params& params, - int params_render_frame_id, - bool filter_profanities) { SpeechRecognitionSessionContext context; context.context_name = params.origin_url; context.render_process_id = render_process_id_; - context.render_view_id = params.render_view_id; - context.render_frame_id = params_render_frame_id; + context.render_frame_id = params.render_frame_id; context.embedder_render_process_id = embedder_render_process_id; - context.embedder_render_view_id = embedder_render_view_id; - if (embedder_render_process_id) - context.guest_render_view_id = params.render_view_id; + context.embedder_render_frame_id = embedder_render_frame_id; context.request_id = params.request_id; + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, + base::BindOnce(&SpeechRecognitionDispatcherHost::StartSession, + base::Unretained(this), params, context, + filter_profanities)); +} + +void SpeechRecognitionDispatcherHost::StartSession( + const SpeechRecognitionHostMsg_StartRequest_Params& params, + const SpeechRecognitionSessionContext& context, + bool filter_profanities) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + SpeechRecognitionSessionConfig config; config.language = params.language; config.grammars = params.grammars; @@ -171,10 +171,12 @@ SpeechRecognitionManager::GetInstance()->StartSession(session_id); } -void SpeechRecognitionDispatcherHost::OnAbortRequest(int render_view_id, +void SpeechRecognitionDispatcherHost::OnAbortRequest(int render_frame_id, int request_id) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + int session_id = SpeechRecognitionManager::GetInstance()->GetSession( - render_process_id_, render_view_id, request_id); + render_process_id_, render_frame_id, request_id); // The renderer might provide an invalid |request_id| if the session was not // started as expected, e.g., due to unsatisfied security requirements. @@ -182,15 +184,19 @@ SpeechRecognitionManager::GetInstance()->AbortSession(session_id); } -void SpeechRecognitionDispatcherHost::OnAbortAllRequests(int render_view_id) { - SpeechRecognitionManager::GetInstance()->AbortAllSessionsForRenderView( - render_process_id_, render_view_id); +void SpeechRecognitionDispatcherHost::OnAbortAllRequests(int render_frame_id) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + + SpeechRecognitionManager::GetInstance()->AbortAllSessionsForRenderFrame( + render_process_id_, render_frame_id); } -void SpeechRecognitionDispatcherHost::OnStopCaptureRequest( - int render_view_id, int request_id) { +void SpeechRecognitionDispatcherHost::OnStopCaptureRequest(int render_frame_id, + int request_id) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + int session_id = SpeechRecognitionManager::GetInstance()->GetSession( - render_process_id_, render_view_id, request_id); + render_process_id_, render_frame_id, request_id); // The renderer might provide an invalid |request_id| if the session was not // started as expected, e.g., due to unsatisfied security requirements. @@ -205,42 +211,42 @@ void SpeechRecognitionDispatcherHost::OnRecognitionStart(int session_id) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_Started(context.render_view_id, + Send(new SpeechRecognitionMsg_Started(context.render_frame_id, context.request_id)); } void SpeechRecognitionDispatcherHost::OnAudioStart(int session_id) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_AudioStarted(context.render_view_id, + Send(new SpeechRecognitionMsg_AudioStarted(context.render_frame_id, context.request_id)); } void SpeechRecognitionDispatcherHost::OnSoundStart(int session_id) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_SoundStarted(context.render_view_id, + Send(new SpeechRecognitionMsg_SoundStarted(context.render_frame_id, context.request_id)); } void SpeechRecognitionDispatcherHost::OnSoundEnd(int session_id) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_SoundEnded(context.render_view_id, + Send(new SpeechRecognitionMsg_SoundEnded(context.render_frame_id, context.request_id)); } void SpeechRecognitionDispatcherHost::OnAudioEnd(int session_id) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_AudioEnded(context.render_view_id, + Send(new SpeechRecognitionMsg_AudioEnded(context.render_frame_id, context.request_id)); } void SpeechRecognitionDispatcherHost::OnRecognitionEnd(int session_id) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_Ended(context.render_view_id, + Send(new SpeechRecognitionMsg_Ended(context.render_frame_id, context.request_id)); } @@ -249,9 +255,8 @@ const SpeechRecognitionResults& results) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_ResultRetrieved(context.render_view_id, - context.request_id, - results)); + Send(new SpeechRecognitionMsg_ResultRetrieved(context.render_frame_id, + context.request_id, results)); } void SpeechRecognitionDispatcherHost::OnRecognitionError( @@ -259,9 +264,8 @@ const SpeechRecognitionError& error) { const SpeechRecognitionSessionContext& context = SpeechRecognitionManager::GetInstance()->GetSessionContext(session_id); - Send(new SpeechRecognitionMsg_ErrorOccurred(context.render_view_id, - context.request_id, - error)); + Send(new SpeechRecognitionMsg_ErrorOccurred(context.render_frame_id, + context.request_id, error)); } // The events below are currently not used by speech JS APIs implementation.
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.h b/content/browser/speech/speech_recognition_dispatcher_host.h index 08d09d0..107a90b 100644 --- a/content/browser/speech/speech_recognition_dispatcher_host.h +++ b/content/browser/speech/speech_recognition_dispatcher_host.h
@@ -19,11 +19,12 @@ namespace content { class SpeechRecognitionManager; +struct SpeechRecognitionSessionContext; // SpeechRecognitionDispatcherHost is a delegate for Speech API messages used by // RenderMessageFilter. Basically it acts as a proxy, relaying the events coming // from the SpeechRecognitionManager to IPC messages (and vice versa). -// It's the complement of SpeechRecognitionDispatcher (owned by RenderView). +// It's the complement of SpeechRecognitionDispatcher (owned by RenderFrame). class CONTENT_EXPORT SpeechRecognitionDispatcherHost : public BrowserMessageFilter, public SpeechRecognitionEventListener { @@ -66,15 +67,12 @@ void OnStartRequest( const SpeechRecognitionHostMsg_StartRequest_Params& params); - void OnStartRequestOnIO( - int embedder_render_process_id, - int embedder_render_view_id, - const SpeechRecognitionHostMsg_StartRequest_Params& params, - int params_render_frame_id, - bool filter_profanities); - void OnAbortRequest(int render_view_id, int request_id); - void OnStopCaptureRequest(int render_view_id, int request_id); - void OnAbortAllRequests(int render_view_id); + void StartSession(const SpeechRecognitionHostMsg_StartRequest_Params& params, + const SpeechRecognitionSessionContext& context, + bool filter_profanities); + void OnAbortRequest(int render_frame_id, int request_id); + void OnStopCaptureRequest(int render_frame_id, int request_id); + void OnAbortAllRequests(int render_frame_id); int render_process_id_; scoped_refptr<net::URLRequestContextGetter> context_getter_;
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index 46b84d72..b197c9c 100644 --- a/content/browser/speech/speech_recognition_manager_impl.cc +++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -4,10 +4,15 @@ #include "content/browser/speech/speech_recognition_manager_impl.h" +#include <algorithm> +#include <map> #include <utility> #include "base/bind.h" +#include "base/callback.h" #include "base/location.h" +#include "base/memory/ref_counted_delete_on_sequence.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" @@ -16,13 +21,15 @@ #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" #include "content/browser/speech/speech_recognition_engine.h" #include "content/browser/speech/speech_recognizer_impl.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/resource_context.h" #include "content/public/browser/speech_recognition_event_listener.h" #include "content/public/browser/speech_recognition_manager_delegate.h" #include "content/public/browser/speech_recognition_session_config.h" #include "content/public/browser/speech_recognition_session_context.h" +#include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_observer.h" #include "content/public/common/speech_recognition_error.h" #include "content/public/common/speech_recognition_result.h" #include "media/audio/audio_device_description.h" @@ -45,6 +52,155 @@ } // namespace +class SpeechRecognitionManagerImpl::FrameDeletionObserver { + public: + using FrameDeletedCallback = + base::RepeatingCallback<void(int /* session_id */)>; + explicit FrameDeletionObserver(FrameDeletedCallback frame_deleted_callback); + + void CreateObserverForSession(int render_process_id, + int render_frame_id, + int session_id); + + void RemoveObserverForSession(int render_process_id, + int render_frame_id, + int session_id); + + private: + class ContentsObserver; + friend class ContentsObserver; + + friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>; + friend class base::DeleteHelper<FrameDeletionObserver>; + + ~FrameDeletionObserver(); + + FrameDeletedCallback frame_deleted_callback_; + std::map<WebContents*, std::unique_ptr<ContentsObserver>> contents_observers_; +}; + +class SpeechRecognitionManagerImpl::FrameDeletionObserver::ContentsObserver + : public WebContentsObserver { + public: + ContentsObserver(WebContents* web_contents, + FrameDeletionObserver* parent_observer) + : WebContentsObserver(web_contents), parent_observer_(parent_observer) {} + + void AddObservedFrame(RenderFrameHost* render_frame_host, int session_id); + void RemoveObservedFrame(RenderFrameHost* render_frame_host, int session_id); + + void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; + + private: + FrameDeletionObserver* parent_observer_; + + // A multimap from the frame to the session_ids started by that frame. + // Although a rare case, theoretically a frame can start multiple sessions. + std::multimap<RenderFrameHost*, int> observed_frames_; +}; + +SpeechRecognitionManagerImpl::FrameDeletionObserver::FrameDeletionObserver( + FrameDeletedCallback frame_deleted_callback) + : frame_deleted_callback_(std::move(frame_deleted_callback)) {} + +void SpeechRecognitionManagerImpl::FrameDeletionObserver:: + CreateObserverForSession(int render_process_id, + int render_frame_id, + int session_id) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + RenderFrameHost* render_frame_host = + RenderFrameHost::FromID(render_process_id, render_frame_id); + if (!render_frame_host) + return; + + WebContents* web_contents = + WebContents::FromRenderFrameHost(render_frame_host); + if (!web_contents) + return; + + auto& observer = contents_observers_[web_contents]; + if (!observer) + observer = std::make_unique<ContentsObserver>(web_contents, this); + + observer->AddObservedFrame(render_frame_host, session_id); +} + +void SpeechRecognitionManagerImpl::FrameDeletionObserver:: + RemoveObserverForSession(int render_process_id, + int render_frame_id, + int session_id) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + RenderFrameHost* render_frame_host = + RenderFrameHost::FromID(render_process_id, render_frame_id); + if (!render_frame_host) + return; + + WebContents* web_contents = + WebContents::FromRenderFrameHost(render_frame_host); + if (!web_contents) + return; + + auto it = contents_observers_.find(web_contents); + if (it == contents_observers_.end()) + return; + + it->second->RemoveObservedFrame(render_frame_host, session_id); +} + +SpeechRecognitionManagerImpl::FrameDeletionObserver::~FrameDeletionObserver() { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + DCHECK_EQ(0u, contents_observers_.size()); +} + +void SpeechRecognitionManagerImpl::FrameDeletionObserver::ContentsObserver:: + AddObservedFrame(RenderFrameHost* render_frame_host, int session_id) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + observed_frames_.emplace(render_frame_host, session_id); +} + +void SpeechRecognitionManagerImpl::FrameDeletionObserver::ContentsObserver:: + RemoveObservedFrame(RenderFrameHost* render_frame_host, int session_id) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + auto iters = observed_frames_.equal_range(render_frame_host); + auto it = std::find_if(iters.first, iters.second, + [render_frame_host, session_id]( + std::pair<RenderFrameHost* const, int>& map_pair) { + return map_pair.first == render_frame_host && + map_pair.second == session_id; + }); + + if (it == iters.second) + return; + + observed_frames_.erase(it); + if (!observed_frames_.size()) + parent_observer_->contents_observers_.erase(web_contents()); + + // |this| may be deleted. +} + +void SpeechRecognitionManagerImpl::FrameDeletionObserver::ContentsObserver:: + RenderFrameDeleted(RenderFrameHost* render_frame_host) { + auto iters = observed_frames_.equal_range(render_frame_host); + for (auto it = iters.first; it != iters.second; ++it) { + BrowserThread::GetTaskRunnerForThread(BrowserThread::IO) + ->PostTask(FROM_HERE, + base::BindOnce(parent_observer_->frame_deleted_callback_, + it->second)); + } + + observed_frames_.erase(iters.first, iters.second); + if (!observed_frames_.size()) + parent_observer_->contents_observers_.erase(web_contents()); + + // |this| is likely deleted. +} + SpeechRecognitionManager* SpeechRecognitionManager::GetInstance() { if (manager_for_tests_) return manager_for_tests_; @@ -76,6 +232,10 @@ weak_factory_(this) { DCHECK(!g_speech_recognition_manager_impl); g_speech_recognition_manager_impl = this; + + frame_deletion_observer_.reset(new FrameDeletionObserver( + base::BindRepeating(&SpeechRecognitionManagerImpl::AbortSessionImpl, + weak_factory_.GetWeakPtr()))); } SpeechRecognitionManagerImpl::~SpeechRecognitionManagerImpl() { @@ -135,6 +295,17 @@ sessions_[session_id] = std::move(session); + // The deletion observer is owned by this class, so it's safe to use + // Unretained. + BrowserThread::GetTaskRunnerForThread(BrowserThread::UI) + ->PostTask( + FROM_HERE, + base::BindOnce(&SpeechRecognitionManagerImpl::FrameDeletionObserver:: + CreateObserverForSession, + base::Unretained(frame_deletion_observer_.get()), + config.initial_context.render_process_id, + config.initial_context.render_frame_id, session_id)); + return session_id; } @@ -164,11 +335,11 @@ bool ask_user, bool is_allowed) { DCHECK_CURRENTLY_ON(BrowserThread::IO); - if (!SessionExists(session_id)) - return; auto iter = sessions_.find(session_id); - DCHECK(iter != sessions_.end()); + if (iter == sessions_.end()) + return; + Session* session = iter->second.get(); if (session->abort_requested) @@ -229,10 +400,32 @@ void SpeechRecognitionManagerImpl::AbortSession(int session_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); - if (!SessionExists(session_id)) + auto iter = sessions_.find(session_id); + if (iter == sessions_.end()) return; + // The deletion observer is owned by this class, so it's safe to use + // Unretained. + BrowserThread::GetTaskRunnerForThread(BrowserThread::UI) + ->PostTask( + FROM_HERE, + base::BindOnce(&SpeechRecognitionManagerImpl::FrameDeletionObserver:: + RemoveObserverForSession, + base::Unretained(frame_deletion_observer_.get()), + iter->second->config.initial_context.render_process_id, + iter->second->config.initial_context.render_frame_id, + session_id)); + + AbortSessionImpl(session_id); +} + +void SpeechRecognitionManagerImpl::AbortSessionImpl(int session_id) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); + auto iter = sessions_.find(session_id); + if (iter == sessions_.end()) + return; + iter->second->ui.reset(); if (iter->second->abort_requested) @@ -248,10 +441,11 @@ void SpeechRecognitionManagerImpl::StopAudioCaptureForSession(int session_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); - if (!SessionExists(session_id)) - return; auto iter = sessions_.find(session_id); + if (iter == sessions_.end()) + return; + iter->second->ui.reset(); base::ThreadTaskRunnerHandle::Get()->PostTask( @@ -398,17 +592,18 @@ EVENT_RECOGNITION_ENDED)); } -int SpeechRecognitionManagerImpl::GetSession( - int render_process_id, int render_view_id, int request_id) const { +int SpeechRecognitionManagerImpl::GetSession(int render_process_id, + int render_frame_id, + int request_id) const { DCHECK_CURRENTLY_ON(BrowserThread::IO); auto iter = std::find_if( sessions_.begin(), sessions_.end(), - [render_process_id, render_view_id, request_id]( + [render_process_id, render_frame_id, request_id]( const std::pair<int, std::unique_ptr<Session>>& session_pair) { const SpeechRecognitionSessionContext& context = session_pair.second->context; return context.render_process_id == render_process_id && - context.render_view_id == render_view_id && + context.render_frame_id == render_frame_id && context.request_id == request_id; }); if (iter == sessions_.end()) @@ -422,29 +617,15 @@ return GetSession(session_id)->context; } -void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderProcess( - int render_process_id) { - // This method gracefully destroys sessions for the listener. However, since - // the listener itself is likely to be destroyed after this call, we avoid - // dispatching further events to it, marking the |listener_is_active| flag. - DCHECK_CURRENTLY_ON(BrowserThread::IO); - for (const auto& session_pair : sessions_) { - Session* session = session_pair.second.get(); - if (session->context.render_process_id == render_process_id) { - AbortSession(session->id); - session->listener_is_active = false; - } - } -} - -void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderView( +void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderFrame( int render_process_id, - int render_view_id) { + int render_frame_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); + for (const auto& session_pair : sessions_) { Session* session = session_pair.second.get(); if (session->context.render_process_id == render_process_id && - session->context.render_view_id == render_view_id) { + session->context.render_frame_id == render_frame_id) { AbortSession(session->id); } } @@ -475,7 +656,7 @@ // This FSM handles the evolution of each session, from the viewpoint of the // interaction with the user (that may be either the browser end-user which -// interacts with UI bubbles, or JS developer intracting with JS methods). +// interacts with UI bubbles, or JS developer interacting with JS methods). // All the events received by the SpeechRecognizer instances (one for each // session) are always routed to the SpeechRecognitionEventListener(s) // regardless the choices taken in this FSM. @@ -626,7 +807,7 @@ SpeechRecognitionEventListener* SpeechRecognitionManagerImpl::GetListener( int session_id) const { Session* session = GetSession(session_id); - if (session->listener_is_active && session->config.event_listener) + if (session->config.event_listener) return session->config.event_listener.get(); return nullptr; } @@ -642,10 +823,7 @@ } SpeechRecognitionManagerImpl::Session::Session() - : id(kSessionIDInvalid), - abort_requested(false), - listener_is_active(true) { -} + : id(kSessionIDInvalid), abort_requested(false) {} SpeechRecognitionManagerImpl::Session::~Session() { }
diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h index 167714a..89a8f048a 100644 --- a/content/browser/speech/speech_recognition_manager_impl.h +++ b/content/browser/speech/speech_recognition_manager_impl.h
@@ -8,10 +8,10 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/speech_recognition_event_listener.h" #include "content/public/browser/speech_recognition_manager.h" #include "content/public/browser/speech_recognition_session_config.h" @@ -41,7 +41,7 @@ // are waiting for results but not recording audio. // // The SpeechRecognitionManager has the following responsibilities: -// - Handles requests received from various render views and makes sure only +// - Handles requests received from various render frames and makes sure only // one of them accesses the audio device at any given time. // - Handles the instantiation of SpeechRecognitionEngine objects when // requested by SpeechRecognitionSessions. @@ -61,16 +61,15 @@ int CreateSession(const SpeechRecognitionSessionConfig& config) override; void StartSession(int session_id) override; void AbortSession(int session_id) override; - void AbortAllSessionsForRenderProcess(int render_process_id) override; - void AbortAllSessionsForRenderView(int render_process_id, - int render_view_id) override; + void AbortAllSessionsForRenderFrame(int render_process_id, + int render_frame_id) override; void StopAudioCaptureForSession(int session_id) override; const SpeechRecognitionSessionConfig& GetSessionConfig( int session_id) const override; SpeechRecognitionSessionContext GetSessionContext( int session_id) const override; int GetSession(int render_process_id, - int render_view_id, + int render_frame_id, int request_id) const override; // SpeechRecognitionEventListener methods. @@ -105,6 +104,8 @@ ~SpeechRecognitionManagerImpl() override; private: + class FrameDeletionObserver; + // Data types for the internal Finite State Machine (FSM). enum FSMState { SESSION_STATE_IDLE = 0, @@ -128,13 +129,14 @@ int id; bool abort_requested; - bool listener_is_active; SpeechRecognitionSessionConfig config; SpeechRecognitionSessionContext context; scoped_refptr<SpeechRecognizer> recognizer; std::unique_ptr<MediaStreamUIProxy> ui; }; + void AbortSessionImpl(int session_id); + // Callback issued by the SpeechRecognitionManagerDelegate for reporting // asynchronously the result of the CheckRecognitionIsAllowed call. void RecognitionAllowedCallback(int session_id, @@ -175,6 +177,11 @@ SpeechRecognitionEventListener* GetDelegateListener() const; int GetNextSessionID(); + // This class lives on the UI thread; all access to it must be done on that + // thread. + std::unique_ptr<FrameDeletionObserver, BrowserThread::DeleteOnUIThread> + frame_deletion_observer_; + media::AudioSystem* audio_system_; media::AudioManager* audio_manager_; MediaStreamManager* media_stream_manager_;
diff --git a/content/browser/top_document_isolation_browsertest.cc b/content/browser/top_document_isolation_browsertest.cc index de9288e4..6f6e7be 100644 --- a/content/browser/top_document_isolation_browsertest.cc +++ b/content/browser/top_document_isolation_browsertest.cc
@@ -233,7 +233,7 @@ GURL ba_url(embedded_test_server()->GetURL( "b.com", "/cross_site_iframe_factory.html?b(a, c)")); - NavigateToURL(shell(), ba_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(shell(), ba_url)); // This navigation destroys the popup's opener, so we allow the main frame to // commit in a top level process for b.com, in spite of the b.com popup in the @@ -254,7 +254,7 @@ // Navigate the popup to a new site. GURL c_url(embedded_test_server()->GetURL( "c.com", "/cross_site_iframe_factory.html?c(c, c, c, c)")); - NavigateToURL(popup, c_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(popup, c_url)); EXPECT_EQ( " Site D ------------ proxies for B\n" " |--Site D ------- proxies for B\n" @@ -264,7 +264,7 @@ "Where B = default subframe process\n" " D = http://c.com/", DepictFrameTree(popup_root)); - NavigateToURL(shell(), c_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(shell(), c_url)); EXPECT_EQ( " Site D\n" " |--Site D\n" @@ -348,7 +348,7 @@ "c.com", "/cross_site_iframe_factory.html?c(a, b)")); { RenderFrameDeletedObserver deleted_observer(root()->current_frame_host()); - NavigateToURL(shell(), cab_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(shell(), cab_url)); deleted_observer.WaitUntilDeleted(); } @@ -376,7 +376,7 @@ { RenderFrameDeletedObserver deleted_observer( popup_root->current_frame_host()); - NavigateToURL(popup, d_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(popup, d_url)); deleted_observer.WaitUntilDeleted(); } EXPECT_EQ( @@ -386,7 +386,7 @@ DepictFrameTree(popup_root)); { RenderFrameDeletedObserver deleted_observer(root()->current_frame_host()); - NavigateToURL(shell(), d_url); + EXPECT_TRUE(NavigateToURLInSameBrowsingInstance(shell(), d_url)); deleted_observer.WaitUntilDeleted(); } EXPECT_EQ(
diff --git a/content/browser/wake_lock/wake_lock_browsertest.cc b/content/browser/wake_lock/wake_lock_browsertest.cc index 013fdfd..0b87944e 100644 --- a/content/browser/wake_lock/wake_lock_browsertest.cc +++ b/content/browser/wake_lock/wake_lock_browsertest.cc
@@ -378,7 +378,7 @@ RenderProcessHostWatcher watcher( GetNestedFrame()->GetProcess(), RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - GetNestedFrame()->GetProcess()->Shutdown(0, false); + GetNestedFrame()->GetProcess()->Shutdown(0); watcher.Wait(); // Screen wake lock should be released.
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc index a79cd30..cdcaa68f 100644 --- a/content/browser/web_contents/web_contents_impl_unittest.cc +++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -691,33 +691,35 @@ // Navigate first contents to a new site. const GURL url2a("http://www.yahoo.com"); - controller().LoadURL( - url2a, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); + controller().LoadURL(url2a, Referrer(), ui::PAGE_TRANSITION_LINK, + std::string()); entry_id = controller().GetPendingEntry()->GetUniqueID(); orig_rfh->PrepareForCommit(); TestRenderFrameHost* pending_rfh_a = contents()->GetPendingMainFrame(); + if (AreAllSitesIsolatedForTesting()) + EXPECT_TRUE(contents()->CrossProcessNavigationPending()); contents()->TestDidNavigate(pending_rfh_a, entry_id, true, url2a, - ui::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_LINK); SiteInstance* instance2a = contents()->GetSiteInstance(); EXPECT_NE(instance1, instance2a); // Navigate second contents to the same site as the first tab. const GURL url2b("http://mail.yahoo.com"); contents2->GetController().LoadURL(url2b, Referrer(), - ui::PAGE_TRANSITION_TYPED, - std::string()); + ui::PAGE_TRANSITION_LINK, std::string()); entry_id = contents2->GetController().GetPendingEntry()->GetUniqueID(); TestRenderFrameHost* rfh2 = contents2->GetMainFrame(); rfh2->PrepareForCommit(); TestRenderFrameHost* pending_rfh_b = contents2->GetPendingMainFrame(); EXPECT_NE(nullptr, pending_rfh_b); - EXPECT_TRUE(contents2->CrossProcessNavigationPending()); + if (AreAllSitesIsolatedForTesting()) + EXPECT_TRUE(contents2->CrossProcessNavigationPending()); // NOTE(creis): We used to be in danger of showing a crash page here if the // second contents hadn't navigated somewhere first (bug 1145430). That case // is now covered by the CrossSiteBoundariesAfterCrash test. contents2->TestDidNavigate(pending_rfh_b, entry_id, true, url2b, - ui::PAGE_TRANSITION_TYPED); + ui::PAGE_TRANSITION_LINK); SiteInstance* instance2b = contents2->GetSiteInstance(); EXPECT_NE(instance1, instance2b); @@ -3012,21 +3014,36 @@ contents->CommitPendingNavigation(); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); - // Navigate to a URL in a different site. - const GURL kUrl = GURL("http://b.com"); - contents->GetController().LoadURL(kUrl, - Referrer(), - ui::PAGE_TRANSITION_TYPED, + // Navigate to a URL in a different site in the same BrowsingInstance. + const GURL kUrl2("http://b.com"); + contents->GetController().LoadURL(kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); int entry_id = contents->GetController().GetPendingEntry()->GetUniqueID(); contents->GetMainFrame()->PrepareForCommit(); - EXPECT_TRUE(contents->CrossProcessNavigationPending()); + if (AreAllSitesIsolatedForTesting()) + EXPECT_TRUE(contents->CrossProcessNavigationPending()); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); - contents->GetPendingMainFrame()->SendNavigate(entry_id, true, kUrl); + contents->GetPendingMainFrame()->SendNavigate(entry_id, true, kUrl2); EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); - contents.reset(); + // Navigate to a URL in a different site and different BrowsingInstance, by + // using a TYPED page transition instead of LINK. + const GURL kUrl3("http://c.com"); + contents->GetController().LoadURL(kUrl3, Referrer(), + ui::PAGE_TRANSITION_TYPED, std::string()); + entry_id = contents->GetController().GetPendingEntry()->GetUniqueID(); + contents->GetMainFrame()->PrepareForCommit(); + EXPECT_TRUE(contents->CrossProcessNavigationPending()); + EXPECT_EQ(1u, instance->GetRelatedActiveContentsCount()); + scoped_refptr<SiteInstance> new_instance = + contents->GetPendingMainFrame()->GetSiteInstance(); + contents->GetPendingMainFrame()->SendNavigate(entry_id, true, kUrl3); EXPECT_EQ(0u, instance->GetRelatedActiveContentsCount()); + EXPECT_EQ(1u, new_instance->GetRelatedActiveContentsCount()); + EXPECT_FALSE(new_instance->IsRelatedSiteInstance(instance.get())); + + contents.reset(); + EXPECT_EQ(0u, new_instance->GetRelatedActiveContentsCount()); } // Tests that GetRelatedActiveContentsCount tracks BrowsingInstance changes
diff --git a/content/browser/webauth/authenticator_impl.cc b/content/browser/webauth/authenticator_impl.cc index 3c53a60..26da4381 100644 --- a/content/browser/webauth/authenticator_impl.cc +++ b/content/browser/webauth/authenticator_impl.cc
@@ -333,8 +333,7 @@ webauth::mojom::PublicKeyCredentialCreationOptionsPtr options, MakeCredentialCallback callback) { if (u2f_request_) { - InvokeCallbackAndCleanup( - std::move(callback), + std::move(callback).Run( webauth::mojom::AuthenticatorStatus::PENDING_REQUEST, nullptr); return; } @@ -419,8 +418,7 @@ webauth::mojom::PublicKeyCredentialRequestOptionsPtr options, GetAssertionCallback callback) { if (u2f_request_) { - InvokeCallbackAndCleanup( - std::move(callback), + std::move(callback).Run( webauth::mojom::AuthenticatorStatus::PENDING_REQUEST, nullptr); return; }
diff --git a/content/browser/webauth/webauth_browsertest.cc b/content/browser/webauth/webauth_browsertest.cc index f24e46e8..41ca4ea6d 100644 --- a/content/browser/webauth/webauth_browsertest.cc +++ b/content/browser/webauth/webauth_browsertest.cc
@@ -227,4 +227,27 @@ ResetAuthenticatorImplAndWaitForConnectionError(); } +// Regression test for https://crbug.com/818219. +IN_PROC_BROWSER_TEST_F(WebAuthBrowserTest, + CreatePublicKeyCredentialTwiceInARow) { + MockCreateCallback callback_1; + MockCreateCallback callback_2; + EXPECT_CALL(callback_1, Run(::testing::_)).Times(0); + EXPECT_CALL(callback_2, Run(AuthenticatorStatus::PENDING_REQUEST)).Times(1); + authenticator()->MakeCredential(BuildBasicCreateOptions(), callback_1.Get()); + authenticator()->MakeCredential(BuildBasicCreateOptions(), callback_2.Get()); + authenticator().FlushForTesting(); +} + +// Regression test for https://crbug.com/818219. +IN_PROC_BROWSER_TEST_F(WebAuthBrowserTest, GetPublicKeyCredentialTwiceInARow) { + MockGetCallback callback_1; + MockGetCallback callback_2; + EXPECT_CALL(callback_1, Run(::testing::_)).Times(0); + EXPECT_CALL(callback_2, Run(AuthenticatorStatus::PENDING_REQUEST)).Times(1); + authenticator()->GetAssertion(BuildBasicGetOptions(), callback_1.Get()); + authenticator()->GetAssertion(BuildBasicGetOptions(), callback_2.Get()); + authenticator().FlushForTesting(); +} + } // namespace content
diff --git a/content/browser/webrtc/webrtc_event_log_manager_common.h b/content/browser/webrtc/webrtc_event_log_manager_common.h index 21e5ea8..a16ce51 100644 --- a/content/browser/webrtc/webrtc_event_log_manager_common.h +++ b/content/browser/webrtc/webrtc_event_log_manager_common.h
@@ -28,6 +28,9 @@ CONTENT_EXPORT extern const size_t kDefaultMaxLocalLogFileSizeBytes; CONTENT_EXPORT extern const size_t kMaxNumberLocalWebRtcEventLogFiles; +CONTENT_EXPORT extern const size_t kMaxRemoteLogFileMetadataSizeBytes; +CONTENT_EXPORT extern const size_t kMaxRemoteLogFileSizeBytes; + // Limit over the number of concurrently active (currently being written to // disk) remote-bound log files. This limits IO operations, and so it is // applied globally (all browser contexts are limited together).
diff --git a/content/browser/webrtc/webrtc_event_log_manager_unittest.cc b/content/browser/webrtc/webrtc_event_log_manager_unittest.cc index 4a6b0699..a004b6c1 100644 --- a/content/browser/webrtc/webrtc_event_log_manager_unittest.cc +++ b/content/browser/webrtc/webrtc_event_log_manager_unittest.cc
@@ -225,7 +225,7 @@ bool StartRemoteLogging(int render_process_id, int lid, - size_t max_size_bytes = kArbitraryVeryLargeFileSize, + size_t max_size_bytes = kMaxRemoteLogFileSizeBytes, const std::string& metadata = "") { bool result; manager_->StartRemoteLogging(render_process_id, lid, max_size_bytes, @@ -238,7 +238,7 @@ int lid, const std::string& metadata) { return StartRemoteLogging(render_process_id, lid, - kArbitraryVeryLargeFileSize, metadata); + kMaxRemoteLogFileSizeBytes, metadata); } void SetLocalLogsObserver(WebRtcLocalEventLogsObserver* observer) { @@ -396,8 +396,6 @@ EXPECT_EQ(event_log, expected_event_log); } - static const size_t kArbitraryVeryLargeFileSize = 1000 * 1000 * 1000; - // Testing utilities. content::TestBrowserThreadBundle test_browser_thread_bundle_; base::SimpleTestClock frozen_clock_; @@ -1303,6 +1301,38 @@ } TEST_F(WebRtcEventLogManagerTest, + StartRemoteLoggingReturnsTrueIfFileSizeAtOrBelowLimit) { + const auto key = GetPeerConnectionKey(rph_.get(), kPeerConnectionId); + ASSERT_TRUE(PeerConnectionAdded(key.render_process_id, key.lid)); + EXPECT_TRUE(StartRemoteLogging(key.render_process_id, key.lid, + kMaxRemoteLogFileSizeBytes)); +} + +TEST_F(WebRtcEventLogManagerTest, + StartRemoteLoggingReturnsFalseIfExcessivelyLargeFileSize) { + const auto key = GetPeerConnectionKey(rph_.get(), kPeerConnectionId); + ASSERT_TRUE(PeerConnectionAdded(key.render_process_id, key.lid)); + EXPECT_FALSE(StartRemoteLogging(key.render_process_id, key.lid, + kMaxRemoteLogFileSizeBytes + 1)); +} + +TEST_F(WebRtcEventLogManagerTest, + StartRemoteLoggingReturnsTrueIfMetadataDoesNotExceedMaximumLength) { + const auto key = GetPeerConnectionKey(rph_.get(), kPeerConnectionId); + ASSERT_TRUE(PeerConnectionAdded(key.render_process_id, key.lid)); + std::string metadata(kMaxRemoteLogFileMetadataSizeBytes, 'X'); + EXPECT_TRUE(StartRemoteLogging(key.render_process_id, key.lid, metadata)); +} + +TEST_F(WebRtcEventLogManagerTest, + StartRemoteLoggingReturnsFalseIfMetadataExceedsMaximumLength) { + const auto key = GetPeerConnectionKey(rph_.get(), kPeerConnectionId); + ASSERT_TRUE(PeerConnectionAdded(key.render_process_id, key.lid)); + std::string metadata(kMaxRemoteLogFileMetadataSizeBytes + 1, 'X'); + EXPECT_FALSE(StartRemoteLogging(key.render_process_id, key.lid, metadata)); +} + +TEST_F(WebRtcEventLogManagerTest, StartRemoteLoggingReturnsFalseIfPeerConnectionAlreadyClosed) { ASSERT_TRUE(PeerConnectionAdded(rph_->GetID(), kPeerConnectionId)); ASSERT_TRUE(PeerConnectionRemoved(rph_->GetID(), kPeerConnectionId));
diff --git a/content/browser/webrtc/webrtc_remote_event_log_manager.cc b/content/browser/webrtc/webrtc_remote_event_log_manager.cc index c650d5a..266da73 100644 --- a/content/browser/webrtc/webrtc_remote_event_log_manager.cc +++ b/content/browser/webrtc/webrtc_remote_event_log_manager.cc
@@ -24,6 +24,12 @@ // TODO(eladalon): Block remote-bound logging on mobile devices. // https://crbug.com/775415 +const size_t kMaxRemoteLogFileMetadataSizeBytes = 0xffffu; // 65535 +static_assert(kMaxRemoteLogFileMetadataSizeBytes <= 0xFFFFFFu, + "Only 24 bits available for encoding the metadata's length."); + +const size_t kMaxRemoteLogFileSizeBytes = (1u << 29); // ~500MBs + namespace { const base::FilePath::CharType kRemoteBoundLogSubDirectory[] = FILE_PATH_LITERAL("webrtc_event_logs"); @@ -37,17 +43,20 @@ } } -bool ValidLogParameters(size_t max_file_size_bytes, - const std::string& metadata) { - // TODO(eladalon): Set a tighter limit (following discussion with rschriebman - // and manj). https://crbug.com/775415 +bool AreLogParametersValid(size_t max_file_size_bytes, + const std::string& metadata) { if (max_file_size_bytes == kWebRtcEventLogManagerUnlimitedFileSize) { + LOG(WARNING) << "Unlimited file sizes not allowed for remote-bound logs."; return false; } - if (metadata.length() > 0xFFFFFFu) { - // We use three bytes to encode the length of the metadata. - LOG(ERROR) << "Metadata must be less than 2^24 bytes."; + if (max_file_size_bytes > kMaxRemoteLogFileSizeBytes) { + LOG(WARNING) << "File size exceeds maximum allowed."; + return false; + } + + if (metadata.length() > kMaxRemoteLogFileMetadataSizeBytes) { + LOG(ERROR) << "Excessively long metadata."; return false; } @@ -177,7 +186,7 @@ const std::string& metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(io_task_sequence_checker_); - if (!ValidLogParameters(max_file_size_bytes, metadata)) { + if (!AreLogParametersValid(max_file_size_bytes, metadata)) { return false; }
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h index f471b98..20fc1da5 100644 --- a/content/common/frame_messages.h +++ b/content/common/frame_messages.h
@@ -370,14 +370,14 @@ // successfully cleared. IPC_STRUCT_MEMBER(bool, history_list_was_cleared) - // The routing_id of the render view associated with the navigation. - // We need to track the RenderViewHost routing_id because of downstream - // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, - // ResourceDispatcherHostImpl, MediaStreamUIProxy, - // SpeechRecognitionDispatcherHost and possibly others). They look up the view - // based on the ID stored in the resource requests. Once those dependencies - // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the - // client to be based on the routing_id of the RenderFrameHost. + // The routing_id of the render view associated with the navigation. We need + // to track the RenderViewHost routing_id because of downstream dependencies + // (https://crbug.com/392171 DownloadRequestHandle, SaveFileManager, + // ResourceDispatcherHostImpl, MediaStreamUIProxy and possibly others). They + // look up the view based on the ID stored in the resource requests. Once + // those dependencies are unwound or moved to RenderFrameHost + // (https://crbug.com/304341) we can move the client to be based on the + // routing_id of the RenderFrameHost. IPC_STRUCT_MEMBER(int, render_view_routing_id) // Origin of the frame. This will be replicated to any associated
diff --git a/content/common/speech_recognition_messages.h b/content/common/speech_recognition_messages.h index e9d7f069..a784338 100644 --- a/content/common/speech_recognition_messages.h +++ b/content/common/speech_recognition_messages.h
@@ -49,8 +49,8 @@ // Used to start a speech recognition session. IPC_STRUCT_BEGIN(SpeechRecognitionHostMsg_StartRequest_Params) - // The render view requesting speech recognition. - IPC_STRUCT_MEMBER(int, render_view_id) + // The render frame requesting speech recognition. + IPC_STRUCT_MEMBER(int, render_frame_id) // Unique ID associated with the JS object making the calls. IPC_STRUCT_MEMBER(int, request_id) // Language to use for speech recognition. @@ -73,25 +73,25 @@ SpeechRecognitionHostMsg_StartRequest_Params) // Requests the speech recognition service to abort speech recognition on -// behalf of the given |render_view_id| and |request_id|. If there are no -// sessions associated with the |request_id| in the render view, this call +// behalf of the given |render_frame_id| and |request_id|. If there are no +// sessions associated with the |request_id| in the render frame, this call // does nothing. IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_AbortRequest, - int /* render_view_id */, + int /* render_frame_id */, int /* request_id */) // Requests the speech recognition service to abort all speech recognitions on -// behalf of the given |render_view_id|. If speech recognition is not happening -// or is happening on behalf of some other render view, this call does nothing. +// behalf of the given |render_frame_id|. If speech recognition is not happening +// or is happening on behalf of some other render frame, this call does nothing. IPC_MESSAGE_CONTROL1(SpeechRecognitionHostMsg_AbortAllRequests, - int /* render_view_id */) + int /* render_frame_id */) // Requests the speech recognition service to stop audio capture on behalf of -// the given |render_view_id|. Any audio recorded so far will be fed to the +// the given |render_frame_id|. Any audio recorded so far will be fed to the // speech recognizer. If speech recognition is not happening nor or is -// happening on behalf of some other render view, this call does nothing. +// happening on behalf of some other render frame, this call does nothing. IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_StopCaptureRequest, - int /* render_view_id */, + int /* render_frame_id */, int /* request_id */) // Browser -> Renderer messages.
diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 4d4d304a..faa5558 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h
@@ -760,14 +760,7 @@ int /* start_adjust */, int /* end_adjust */) -#if defined(OS_ANDROID) -// Notifies that an unhandled tap has occurred at the specified x,y position -// and that the UI may need to be triggered. -IPC_MESSAGE_ROUTED2(ViewHostMsg_ShowUnhandledTapUIIfNeeded, - int /* x */, - int /* y */) - -#elif defined(OS_MACOSX) +#if defined(OS_MACOSX) // Receives content of a web page as plain text. IPC_MESSAGE_ROUTED1(ViewMsg_GetRenderedTextCompleted, std::string) #endif
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index 14c6d6b..58c6f51 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn
@@ -38,7 +38,6 @@ "//components/download/public/common:public_java", "//device/bluetooth:java", "//device/gamepad:java", - "//device/sensors:java", "//device/usb:java", "//media/base/android:media_java", "//media/capture/content/android:screen_capture_java",
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java index d7275dc1..cf91254d 100644 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
@@ -1293,14 +1293,6 @@ } @CalledByNative - private void onShowUnhandledTapUIIfNeeded(int x, int y) { - if (x < 0 || y < 0 || mView.getWidth() < x || mView.getHeight() < y) return; - if (mSelectionClient != null) { - mSelectionClient.showUnhandledTapUIIfNeeded(x, y); - } - } - - @CalledByNative private void onSelectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) { if (mSelectionClient != null) { mSelectionClient.selectWordAroundCaretAck(didSelect, startAdjust, endAdjust);
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java index ba53a73..8c2aeb18 100644 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
@@ -84,9 +84,6 @@ public void onSelectionEvent(int eventType, float posXPix, float posYPix) {} @Override - public void showUnhandledTapUIIfNeeded(int x, int y) {} - - @Override public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) {} @Override
diff --git a/content/public/android/java/src/org/chromium/content_public/browser/SelectionClient.java b/content/public/android/java/src/org/chromium/content_public/browser/SelectionClient.java index 2ef0cafb..de94de6 100644 --- a/content/public/android/java/src/org/chromium/content_public/browser/SelectionClient.java +++ b/content/public/android/java/src/org/chromium/content_public/browser/SelectionClient.java
@@ -97,13 +97,6 @@ void onSelectionEvent(int eventType, float posXPix, float posYPix); /** - * Requests to show the UI for an unhandled tap, if needed. - * @param x The x coordinate of the tap. - * @param y The y coordinate of the tap. - */ - void showUnhandledTapUIIfNeeded(int x, int y); - - /** * Acknowledges that a selectWordAroundCaret action has completed with the given result. * @param didSelect Whether a word was actually selected or not. * @param startAdjust The adjustment to the selection start offset needed to select the word.
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java index 841f35d..7dd0c570 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
@@ -165,7 +165,6 @@ @Override public void onDestroy() { Assert.assertEquals(0, mOnDestroyHelper.getCallCount()); - mOnDestroyHelper.notifyCalled(); } public void waitForOnConnectionSetupCalled() throws InterruptedException, TimeoutException { @@ -183,10 +182,6 @@ public void waitOnRunMainCalled() throws InterruptedException, TimeoutException { mOnRunMainHelper.waitForCallback(0 /* currentCallCount */); } - - public void waitOnDestroyCalled() throws InterruptedException, TimeoutException { - mOnDestroyHelper.waitForCallback(0 /* currentCallCount */); - } }; /** @@ -306,8 +301,10 @@ processLauncher.stop(); } }); - // Wait for service to notify its onDestroy was called. - childProcessBinder.waitOnDestroyCalled(); + + // Note we don't wait for service to notify its onDestroy, as it may not + // always be called. + // The client should also get a notification that the connection was lost. onConnectionLostHelper.waitForCallback(0 /* currentCallback */); }
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java index ead7bd22..6016472 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java
@@ -74,9 +74,6 @@ public void onSelectionEvent(int eventType, float posXPix, float poxYPix) {} @Override - public void showUnhandledTapUIIfNeeded(int x, int y) {} - - @Override public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) {} @Override
diff --git a/content/public/android/junit/src/org/chromium/content/browser/selection/SelectionPopupControllerTest.java b/content/public/android/junit/src/org/chromium/content/browser/selection/SelectionPopupControllerTest.java index 0b089ab..e75a1686 100644 --- a/content/public/android/junit/src/org/chromium/content/browser/selection/SelectionPopupControllerTest.java +++ b/content/public/android/junit/src/org/chromium/content/browser/selection/SelectionPopupControllerTest.java
@@ -79,9 +79,6 @@ public void onSelectionEvent(int eventType, float posXPix, float poxYPix) {} @Override - public void showUnhandledTapUIIfNeeded(int x, int y) {} - - @Override public void selectWordAroundCaretAck(boolean didSelect, int startAdjust, int endAdjust) {} @Override
diff --git a/content/public/app/mojo/content_browser_manifest.json b/content/public/app/mojo/content_browser_manifest.json index ded026c..77af8b2 100644 --- a/content/public/app/mojo/content_browser_manifest.json +++ b/content/public/app/mojo/content_browser_manifest.json
@@ -148,6 +148,7 @@ "blink::mojom::PresentationService", "blink::mojom::QuotaDispatcherHost", "blink::mojom::TextSuggestionHost", + "blink::mojom::UnhandledTapNotifier", "blink::mojom::WebBluetoothService", "blink::mojom::WebSocket",
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn index 688b258d..c5defd4 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn
@@ -142,6 +142,7 @@ "keyboard_event_processing_result.h", "load_notification_details.h", "local_storage_usage_info.h", + "login_delegate.h", "manifest_icon_downloader.h", "manifest_icon_selector.h", "media_capture_devices.h", @@ -219,7 +220,6 @@ "resource_dispatcher_host.h", "resource_dispatcher_host_delegate.cc", "resource_dispatcher_host_delegate.h", - "resource_dispatcher_host_login_delegate.h", "resource_hints.h", "resource_request_info.h", "resource_throttle.cc",
diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc index 1b08c55..8f10336 100644 --- a/content/public/browser/browser_message_filter.cc +++ b/content/public/browser/browser_message_filter.cc
@@ -174,7 +174,7 @@ } ChildProcessLauncher::TerminateProcess( - peer_process_, content::RESULT_CODE_KILLED_BAD_MESSAGE, false); + peer_process_, content::RESULT_CODE_KILLED_BAD_MESSAGE); // Report a crash, since none will be generated by the killed renderer. base::debug::DumpWithoutCrashing();
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index a87ef46..c8e612e 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -12,11 +12,11 @@ #include "base/logging.h" #include "build/build_config.h" #include "content/public/browser/client_certificate_delegate.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/memory_coordinator_delegate.h" #include "content/public/browser/navigation_ui_data.h" #include "content/public/browser/network_service_instance.h" #include "content/public/browser/page_navigator.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" #include "content/public/browser/vpn_service_proxy.h" #include "content/public/common/url_loader_throttle.h" #include "device/geolocation/public/cpp/location_provider.h" @@ -677,8 +677,7 @@ return nullptr; } -scoped_refptr<ResourceDispatcherHostLoginDelegate> -ContentBrowserClient::CreateLoginDelegate( +scoped_refptr<LoginDelegate> ContentBrowserClient::CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter, bool is_main_frame,
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index f0294831..6646852 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -138,6 +138,7 @@ class ClientCertificateDelegate; class ControllerPresentationServiceDelegate; class DevToolsManagerDelegate; +class LoginDelegate; class MediaObserver; class MemoryCoordinatorDelegate; class NavigationHandle; @@ -149,7 +150,6 @@ class RenderProcessHost; class RenderViewHost; class ResourceContext; -class ResourceDispatcherHostLoginDelegate; class SiteInstance; class SpeechRecognitionManagerDelegate; class StoragePartition; @@ -1096,8 +1096,7 @@ virtual std::unique_ptr<net::ClientCertStore> CreateClientCertStore( ResourceContext* resource_context); - // Creates a ResourceDispatcherHostLoginDelegate that asks the user for a - // username and password. + // Creates a LoginDelegate that asks the user for a username and password. // Caller owns the returned pointer. // |first_auth_attempt| is needed by AwHttpAuthHandler constructor. // |auth_required_callback| is used to transfer auth credentials to @@ -1105,8 +1104,7 @@ // is base::nullopt if the request should be cancelled; otherwise // the credentials will be used to respond to the auth challenge. This // callback should be called on the IO thread task runner. - virtual scoped_refptr<ResourceDispatcherHostLoginDelegate> - CreateLoginDelegate( + virtual scoped_refptr<LoginDelegate> CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter, bool is_main_frame,
diff --git a/content/public/browser/resource_dispatcher_host_login_delegate.h b/content/public/browser/login_delegate.h similarity index 61% rename from content/public/browser/resource_dispatcher_host_login_delegate.h rename to content/public/browser/login_delegate.h index a6b3b2b..edda802 100644 --- a/content/public/browser/resource_dispatcher_host_login_delegate.h +++ b/content/public/browser/login_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_LOGIN_DELEGATE_H_ -#define CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_LOGIN_DELEGATE_H_ +#ifndef CONTENT_PUBLIC_BROWSER_LOGIN_DELEGATE_H_ +#define CONTENT_PUBLIC_BROWSER_LOGIN_DELEGATE_H_ #include "base/memory/ref_counted.h" #include "content/common/content_export.h" @@ -15,18 +15,18 @@ // method. If the user cancels, the login delegate should call the URLRequest's // CancelAuth instead. And in either case, it must make a call to // ResourceDispatcherHost::ClearLoginDelegateForRequest. -class CONTENT_EXPORT ResourceDispatcherHostLoginDelegate - : public base::RefCountedThreadSafe<ResourceDispatcherHostLoginDelegate> { +class CONTENT_EXPORT LoginDelegate + : public base::RefCountedThreadSafe<LoginDelegate> { public: // Notify the login delegate that the request was cancelled. // This function can only be called from the IO thread. virtual void OnRequestCancelled() = 0; protected: - friend class base::RefCountedThreadSafe<ResourceDispatcherHostLoginDelegate>; - virtual ~ResourceDispatcherHostLoginDelegate() {} + friend class base::RefCountedThreadSafe<LoginDelegate>; + virtual ~LoginDelegate() {} }; -} // public content +} // namespace content -#endif // CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_LOGIN_DELEGATE_H_ +#endif // CONTENT_PUBLIC_BROWSER_LOGIN_DELEGATE_H_
diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h index e63b5ac..945f26a 100644 --- a/content/public/browser/render_process_host.h +++ b/content/public/browser/render_process_host.h
@@ -150,12 +150,11 @@ virtual StoragePartition* GetStoragePartition() const = 0; // Try to shut down the associated renderer process without running unload - // handlers, etc, giving it the specified exit code. If |wait| is true, wait - // for the process to be actually terminated before returning. Returns true + // handlers, etc, giving it the specified exit code. Returns true // if it was able to shut down. On Windows, this must not be called before // RenderProcessReady was called on a RenderProcessHostObserver, otherwise // RenderProcessExited may never be called. - virtual bool Shutdown(int exit_code, bool wait) = 0; + virtual bool Shutdown(int exit_code) = 0; // Try to shut down the associated renderer process as fast as possible. // If a non-zero |page_count| value is provided, then a fast shutdown will
diff --git a/content/public/browser/speech_recognition_manager.h b/content/public/browser/speech_recognition_manager.h index 4e6e9b7..8c6040e 100644 --- a/content/public/browser/speech_recognition_manager.h +++ b/content/public/browser/speech_recognition_manager.h
@@ -42,19 +42,15 @@ virtual int CreateSession(const SpeechRecognitionSessionConfig& config) = 0; // Starts/restarts recognition for an existing session, after performing a - // premilinary check on the delegate (CheckRecognitionIsAllowed). + // preliminary check on the delegate (CheckRecognitionIsAllowed). virtual void StartSession(int session_id) = 0; // Aborts recognition for an existing session, without providing any result. virtual void AbortSession(int session_id) = 0; - // Aborts all sessions for a given render process, - // without providing any result. - virtual void AbortAllSessionsForRenderProcess(int render_process_id) = 0; - - // Aborts all sessions for a given RenderView, without providing any result. - virtual void AbortAllSessionsForRenderView(int render_process_id, - int render_view_id) = 0; + // Aborts all sessions for a given RenderFrame, without providing any result. + virtual void AbortAllSessionsForRenderFrame(int render_process_id, + int render_frame_id) = 0; // Stops audio capture for an existing session. The audio captured before the // call will be processed, possibly ending up with a result. @@ -69,10 +65,10 @@ virtual SpeechRecognitionSessionContext GetSessionContext( int session_id) const = 0; - // Looks-up an existing session from the context tuple - // {render_view_id, render_view_id, request_id}. + // Looks up an existing session from the context tuple + // {render_process_id, render_frame_id, request_id}. virtual int GetSession(int render_process_id, - int render_view_id, + int render_frame_id, int request_id) const = 0; protected:
diff --git a/content/public/browser/speech_recognition_session_context.cc b/content/public/browser/speech_recognition_session_context.cc index 1e4ae1c..ebcb190 100644 --- a/content/public/browser/speech_recognition_session_context.cc +++ b/content/public/browser/speech_recognition_session_context.cc
@@ -10,13 +10,10 @@ SpeechRecognitionSessionContext::SpeechRecognitionSessionContext() : render_process_id(0), - render_view_id(0), - render_frame_id(0), - guest_render_view_id(MSG_ROUTING_NONE), + render_frame_id(MSG_ROUTING_NONE), embedder_render_process_id(0), - embedder_render_view_id(MSG_ROUTING_NONE), - request_id(0) { -} + embedder_render_frame_id(MSG_ROUTING_NONE), + request_id(0) {} SpeechRecognitionSessionContext::SpeechRecognitionSessionContext( const SpeechRecognitionSessionContext& other) = default;
diff --git a/content/public/browser/speech_recognition_session_context.h b/content/public/browser/speech_recognition_session_context.h index 997d6b5..b0cfb8e6 100644 --- a/content/public/browser/speech_recognition_session_context.h +++ b/content/public/browser/speech_recognition_session_context.h
@@ -18,33 +18,21 @@ // elements involved with it (e.g., the page element that requested the // recognition). The manager keeps this struct attached to the recognition // session during all the session lifetime, making its contents available to -// clients (In this regard, see SpeechRecognitionManager::GetSessionContext and -// SpeechRecognitionManager::LookupSessionByContext methods). +// clients. (In this regard, see SpeechRecognitionManager::GetSessionContext().) struct CONTENT_EXPORT SpeechRecognitionSessionContext { SpeechRecognitionSessionContext(); SpeechRecognitionSessionContext(const SpeechRecognitionSessionContext& other); ~SpeechRecognitionSessionContext(); int render_process_id; - int render_view_id; int render_frame_id; - // Browser plugin guest's render view id, if this context represents a speech - // recognition request from an embedder on behalf of the guest. This is used - // for input tag where speech bubble is to be shown. - // - // TODO(lazyboy): Right now showing bubble from guest does not work, we fall - // back to embedder instead, fix this and use - // embedder_render_process_id/embedder_render_view_id similar to Web Speech - // API below. - int guest_render_view_id; - - // The pair (|embedder_render_process_id|, |embedder_render_view_id|) + // The pair (|embedder_render_process_id|, |embedder_render_frame_id|) // represents a Browser plugin guest's embedder. This is filled in if the // session is from a guest Web Speech API. We use these to check if the // embedder (app) is permitted to use audio. int embedder_render_process_id; - int embedder_render_view_id; + int embedder_render_frame_id; // The request id provided by the originating SpeechRecognitionDispatcher. int request_id;
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h index da03e97c2..7441224 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h
@@ -23,19 +23,19 @@ CONTENT_EXPORT extern const base::Feature kAsmJsToWebAssembly; CONTENT_EXPORT extern const base::Feature kAsyncWheelEvents; CONTENT_EXPORT extern const base::Feature kBlockCredentialedSubresources; -CONTENT_EXPORT extern const base::Feature kDataSaverHoldback; CONTENT_EXPORT extern const base::Feature kBrotliEncoding; -CONTENT_EXPORT extern const base::Feature kNavigationMojoResponse; CONTENT_EXPORT extern const base::Feature kCanvas2DImageChromium; CONTENT_EXPORT extern const base::Feature kCheckerImaging; +CONTENT_EXPORT extern const base::Feature kCodeCacheAfterExecute; CONTENT_EXPORT extern const base::Feature kCompositeOpaqueFixedPosition; CONTENT_EXPORT extern const base::Feature kCompositeOpaqueScrollers; CONTENT_EXPORT extern const base::Feature kCompositorImageAnimation; CONTENT_EXPORT extern const base::Feature kCompositorTouchAction; CONTENT_EXPORT extern const base::Feature kCrossSiteDocumentBlockingAlways; CONTENT_EXPORT extern const base::Feature kCrossSiteDocumentBlockingIfIsolating; -CONTENT_EXPORT extern const base::Feature kExtendedMouseButtons; +CONTENT_EXPORT extern const base::Feature kDataSaverHoldback; CONTENT_EXPORT extern const base::Feature kExpensiveBackgroundTimerThrottling; +CONTENT_EXPORT extern const base::Feature kExtendedMouseButtons; CONTENT_EXPORT extern const base::Feature kFontCacheScaling; CONTENT_EXPORT extern const base::Feature kFramebustingNeedsSameOriginOrUserGesture; @@ -51,16 +51,17 @@ CONTENT_EXPORT extern const base::Feature kLazyInitializeMediaControls; CONTENT_EXPORT extern const base::Feature kLazyParseCSS; CONTENT_EXPORT extern const base::Feature kLowPriorityIframes; +CONTENT_EXPORT extern const base::Feature kMainThreadBusyScrollIntervention; CONTENT_EXPORT extern const base::Feature kMediaDevicesSystemMonitorCache; CONTENT_EXPORT extern const base::Feature kMemoryCoordinator; -CONTENT_EXPORT extern const base::Feature kNetworkServiceInProcess; -CONTENT_EXPORT extern const base::Feature kNotificationContentImage; -CONTENT_EXPORT extern const base::Feature kMainThreadBusyScrollIntervention; +CONTENT_EXPORT extern const base::Feature kModuleScriptsDynamicImport; +CONTENT_EXPORT extern const base::Feature kModuleScriptsImportMetaUrl; CONTENT_EXPORT extern const base::Feature kMojoInputMessages; CONTENT_EXPORT extern const base::Feature kMojoSessionStorage; CONTENT_EXPORT extern const base::Feature kMojoVideoCapture; -CONTENT_EXPORT extern const base::Feature kModuleScriptsDynamicImport; -CONTENT_EXPORT extern const base::Feature kModuleScriptsImportMetaUrl; +CONTENT_EXPORT extern const base::Feature kNavigationMojoResponse; +CONTENT_EXPORT extern const base::Feature kNetworkServiceInProcess; +CONTENT_EXPORT extern const base::Feature kNotificationContentImage; CONTENT_EXPORT extern const base::Feature kNotificationsWithMojo; CONTENT_EXPORT extern const base::Feature kOriginManifest; CONTENT_EXPORT extern const base::Feature kOriginTrials; @@ -79,8 +80,8 @@ kRunVideoCaptureServiceInBrowserProcess; CONTENT_EXPORT extern const base::Feature kScrollAnchoring; CONTENT_EXPORT extern const base::Feature kScrollAnchorSerialization; -CONTENT_EXPORT -extern const base::Feature kSendBeaconThrowForBlobWithNonSimpleType; +CONTENT_EXPORT extern const base::Feature + kSendBeaconThrowForBlobWithNonSimpleType; CONTENT_EXPORT extern const base::Feature kServiceWorkerPaymentApps; CONTENT_EXPORT extern const base::Feature kServiceWorkerScriptFullCodeCache; CONTENT_EXPORT extern const base::Feature kServiceWorkerServicification; @@ -101,12 +102,11 @@ CONTENT_EXPORT extern const base::Feature kUseMojoAudioInputStreamFactory; CONTENT_EXPORT extern const base::Feature kUseMojoAudioOutputStreamFactory; CONTENT_EXPORT extern const base::Feature kUserActivationV2; -CONTENT_EXPORT extern const base::Feature kV8ContextSnapshot; CONTENT_EXPORT extern const base::Feature kV8BackgroundCompile; +CONTENT_EXPORT extern const base::Feature kV8ContextSnapshot; CONTENT_EXPORT extern const base::Feature kV8VmFuture; -CONTENT_EXPORT extern const base::Feature kVrWebInputEditing; -CONTENT_EXPORT extern const base::Feature kCodeCacheAfterExecute; CONTENT_EXPORT extern const base::Feature kVibrateRequiresUserGesture; +CONTENT_EXPORT extern const base::Feature kVrWebInputEditing; CONTENT_EXPORT extern const base::Feature kWebAssembly; CONTENT_EXPORT extern const base::Feature kWebAssemblyStreaming; CONTENT_EXPORT extern const base::Feature kWebAssemblyTrapHandler; @@ -126,12 +126,6 @@ CONTENT_EXPORT extern const base::Feature kWebVrVsyncAlign; CONTENT_EXPORT extern const base::Feature kWebXr; CONTENT_EXPORT extern const base::Feature kWebXrOrientationSensorDevice; -#if defined(OS_ANDROID) -CONTENT_EXPORT extern const base::Feature kWebXrRenderPath; -CONTENT_EXPORT extern const char kWebXrRenderPathParamName[]; -CONTENT_EXPORT extern const char kWebXrRenderPathParamValueClientWait[]; -CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[]; -#endif // defined(OS_ANDROID) CONTENT_EXPORT extern const base::Feature kWorkStealingInScriptRunner; #if defined(OS_ANDROID) @@ -139,6 +133,10 @@ CONTENT_EXPORT extern const base::Feature kHideIncorrectlySizedFullscreenFrames; CONTENT_EXPORT extern const base::Feature kImeThread; CONTENT_EXPORT extern const base::Feature kWebNfc; +CONTENT_EXPORT extern const base::Feature kWebXrRenderPath; +CONTENT_EXPORT extern const char kWebXrRenderPathParamName[]; +CONTENT_EXPORT extern const char kWebXrRenderPathParamValueClientWait[]; +CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[]; #endif // defined(OS_ANDROID) #if defined(OS_MACOSX)
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index d262071..0231c38 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc
@@ -176,6 +176,10 @@ // messages. const char kDisableGpuWatchdog[] = "disable-gpu-watchdog"; +// Disallow image animations to be reset to the beginning to avoid skipping +// many frames. Only effective if compositor image animations are enabled. +const char kDisableImageAnimationResync[] = "disable-image-animation-resync"; + // Suppresses hang monitor dialogs in renderer processes. This may allow slow // unload handlers on a page to prevent the tab from closing, but the Task // Manager can be used to terminate the offending process in this case.
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index e23ac27..04c0cc0 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h
@@ -61,6 +61,7 @@ extern const char kDisableGpuProcessCrashLimit[]; CONTENT_EXPORT extern const char kDisableGpuSandbox[]; CONTENT_EXPORT extern const char kDisableGpuWatchdog[]; +CONTENT_EXPORT extern const char kDisableImageAnimationResync[]; CONTENT_EXPORT extern const char kDisableJavaScriptHarmonyShipping[]; CONTENT_EXPORT extern const char kDisableLowLatencyDxva[]; CONTENT_EXPORT extern const char kDisableLowResTiling[];
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index f70362c1..85a6940 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc
@@ -89,6 +89,9 @@ return nullptr; } +void ContentRendererClient::PostIOThreadCreated( + base::SingleThreadTaskRunner* io_thread_task_runner) {} + void ContentRendererClient::PostCompositorThreadCreated( base::SingleThreadTaskRunner* compositor_thread_task_runner) {}
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 34aed4fd..5a64134d 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h
@@ -33,6 +33,7 @@ namespace base { class FilePath; +class SingleThreadTaskRunner; } namespace blink { @@ -179,6 +180,11 @@ virtual std::unique_ptr<blink::WebSpeechSynthesizer> OverrideSpeechSynthesizer(blink::WebSpeechSynthesizerClient* client); + // Called on the main-thread immediately after the io thread is + // created. + virtual void PostIOThreadCreated( + base::SingleThreadTaskRunner* io_thread_task_runner); + // Called on the main-thread immediately after the compositor thread is // created. virtual void PostCompositorThreadCreated(
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index 041c152..2947844 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc
@@ -623,7 +623,7 @@ RenderProcessHost* rph = web_contents->GetMainFrame()->GetProcess(); RenderProcessHostWatcher watcher( rph, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); - rph->Shutdown(0, false); + rph->Shutdown(0); watcher.Wait(); }
diff --git a/content/public/test/content_browser_test_utils.cc b/content/public/test/content_browser_test_utils.cc index be02bc4..6ee8659 100644 --- a/content/public/test/content_browser_test_utils.cc +++ b/content/public/test/content_browser_test_utils.cc
@@ -14,9 +14,11 @@ #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/test_frame_navigation_observer.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" @@ -85,9 +87,20 @@ NavigateToURLBlockUntilNavigationsComplete(window, url, 1); if (!IsLastCommittedEntryOfPageType(window->web_contents(), PAGE_TYPE_NORMAL)) return false; + return window->web_contents()->GetLastCommittedURL() == url; } +bool NavigateToURLFromRenderer(const ToRenderFrameHost& adapter, + const GURL& url) { + RenderFrameHost* rfh = adapter.render_frame_host(); + TestFrameNavigationObserver nav_observer(rfh); + if (!ExecuteScript(rfh, "location = '" + url.spec() + "';")) + return false; + nav_observer.Wait(); + return nav_observer.last_committed_url() == url; +} + bool NavigateToURLAndExpectNoCommit(Shell* window, const GURL& url) { NavigationEntry* old_entry = window->web_contents()->GetController().GetLastCommittedEntry();
diff --git a/content/public/test/content_browser_test_utils.h b/content/public/test/content_browser_test_utils.h index 45767727..6224927 100644 --- a/content/public/test/content_browser_test_utils.h +++ b/content/public/test/content_browser_test_utils.h
@@ -39,6 +39,7 @@ class RenderFrameHost; class RenderWidgetHost; class Shell; +class ToRenderFrameHost; class WebContents; // Generate the file path for testing a particular test. @@ -59,13 +60,23 @@ // content/test/data/<file> GURL GetTestUrl(const char* dir, const char* file); -// Navigates |window| to |url|, blocking until the navigation finishes. -// Returns true if the page was loaded successfully and the last committed -// URL matches |url|. +// Navigates |window| to |url|, blocking until the navigation finishes. Returns +// true if the page was loaded successfully and the last committed URL matches +// |url|. This is a browser-initiated navigation that simulates a user typing +// |url| into the address bar. +// // TODO(alexmos): any tests that use this function and expect successful // navigations should do EXPECT_TRUE(NavigateToURL()). bool NavigateToURL(Shell* window, const GURL& url); +// Performs a renderer-initiated navigation of |window| to |url|, blocking +// until the navigation finishes. The navigation is done by assigning +// location.href in the frame |adapter|. Returns true if the page was loaded +// successfully and the last committed URL matches |url|. +WARN_UNUSED_RESULT bool NavigateToURLFromRenderer( + const ToRenderFrameHost& adapter, + const GURL& url); + void LoadDataWithBaseURL(Shell* window, const GURL& url, const std::string& data,
diff --git a/content/public/test/fake_speech_recognition_manager.cc b/content/public/test/fake_speech_recognition_manager.cc index 0c641b3..8a71e55 100644 --- a/content/public/test/fake_speech_recognition_manager.cc +++ b/content/public/test/fake_speech_recognition_manager.cc
@@ -111,24 +111,21 @@ // Nothing to do here since we aren't really recording. } -void FakeSpeechRecognitionManager::AbortAllSessionsForRenderProcess( - int render_process_id) { +void FakeSpeechRecognitionManager::AbortAllSessionsForRenderFrame( + int render_process_id, + int render_frame_id) { VLOG(1) << "CancelAllRequestsWithDelegate invoked."; EXPECT_TRUE(should_send_fake_response_ || - session_ctx_.render_process_id == render_process_id); + (session_ctx_.render_process_id == render_process_id && + session_ctx_.render_frame_id == render_frame_id)); did_cancel_all_ = true; } -void FakeSpeechRecognitionManager::AbortAllSessionsForRenderView( - int render_process_id, int render_view_id) { - DCHECK(delegate_); // We only expect this to be called via |delegate_|. -} - int FakeSpeechRecognitionManager::GetSession(int render_process_id, - int render_view_id, + int render_frame_id, int request_id) const { return session_ctx_.render_process_id == render_process_id && - session_ctx_.render_view_id == render_view_id && + session_ctx_.render_frame_id == render_frame_id && session_ctx_.request_id == request_id; }
diff --git a/content/public/test/fake_speech_recognition_manager.h b/content/public/test/fake_speech_recognition_manager.h index 98a34b8..0481114 100644 --- a/content/public/test/fake_speech_recognition_manager.h +++ b/content/public/test/fake_speech_recognition_manager.h
@@ -51,11 +51,10 @@ void StartSession(int session_id) override; void AbortSession(int session_id) override; void StopAudioCaptureForSession(int session_id) override; - void AbortAllSessionsForRenderProcess(int render_process_id) override; - void AbortAllSessionsForRenderView(int render_process_id, - int render_view_id) override; + void AbortAllSessionsForRenderFrame(int render_process_id, + int render_frame_id) override; int GetSession(int render_process_id, - int render_view_id, + int render_frame_id, int request_id) const override; const SpeechRecognitionSessionConfig& GetSessionConfig( int session_id) const override;
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc index 63edd23..9bfcfd6 100644 --- a/content/public/test/mock_render_process_host.cc +++ b/content/public/test/mock_render_process_host.cc
@@ -183,7 +183,7 @@ void MockRenderProcessHost::AddWord(const base::string16& word) { } -bool MockRenderProcessHost::Shutdown(int exit_code, bool wait) { +bool MockRenderProcessHost::Shutdown(int exit_code) { return true; }
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h index 6d19cd2..fe2fc88 100644 --- a/content/public/test/mock_render_process_host.h +++ b/content/public/test/mock_render_process_host.h
@@ -77,7 +77,7 @@ void OnMediaStreamRemoved() override; StoragePartition* GetStoragePartition() const override; virtual void AddWord(const base::string16& word); - bool Shutdown(int exit_code, bool wait) override; + bool Shutdown(int exit_code) override; bool FastShutdownIfPossible(size_t page_count, bool skip_unload_handlers) override; bool FastShutdownStarted() const override;
diff --git a/content/public/test/test_frame_navigation_observer.cc b/content/public/test/test_frame_navigation_observer.cc index b149f3e..45e6f31 100644 --- a/content/public/test/test_frame_navigation_observer.cc +++ b/content/public/test/test_frame_navigation_observer.cc
@@ -70,6 +70,7 @@ } transition_type_ = navigation_handle->GetPageTransition(); + last_committed_url_ = navigation_handle->GetURL(); has_committed_ = true; if (wait_for_commit_)
diff --git a/content/public/test/test_frame_navigation_observer.h b/content/public/test/test_frame_navigation_observer.h index bbed41e..24fb4f5 100644 --- a/content/public/test/test_frame_navigation_observer.h +++ b/content/public/test/test_frame_navigation_observer.h
@@ -25,6 +25,7 @@ ~TestFrameNavigationObserver() override; ui::PageTransition transition_type() { return transition_type_.value(); } + const GURL& last_committed_url() { return last_committed_url_; } // Runs a nested run loop and blocks until the full load has // completed. @@ -55,6 +56,7 @@ // Saved parameters from NavigationHandle. base::Optional<ui::PageTransition> transition_type_; + GURL last_committed_url_; // The RunLoop used to spin the message loop. base::RunLoop run_loop_;
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index e18c0a3..b5c90ea4 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn
@@ -557,7 +557,6 @@ "//device/base/synchronization", "//device/gamepad/public/cpp:shared_with_blink", "//device/gamepad/public/mojom", - "//device/sensors/public/cpp:shared_with_blink", "//device/usb/public/mojom", "//gin", "//gpu",
diff --git a/content/renderer/DEPS b/content/renderer/DEPS index ff0dfefa..674415f 100644 --- a/content/renderer/DEPS +++ b/content/renderer/DEPS
@@ -15,7 +15,6 @@ "+device/base/synchronization", "+device/gamepad/public/cpp", "+device/gamepad/public/mojom", - "+device/sensors/public", "+device/usb/public", "+gin", "+jingle/glue",
diff --git a/content/renderer/device_sensors/device_motion_event_pump.cc b/content/renderer/device_sensors/device_motion_event_pump.cc index 6e26062..6eca0cd 100644 --- a/content/renderer/device_sensors/device_motion_event_pump.cc +++ b/content/renderer/device_sensors/device_motion_event_pump.cc
@@ -10,7 +10,7 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" #include "content/renderer/render_thread_impl.h" -#include "device/sensors/public/cpp/motion_data.h" +#include "services/device/public/cpp/generic_sensor/motion_data.h" #include "services/device/public/mojom/sensor.mojom.h" #include "services/service_manager/public/cpp/interface_provider.h" #include "ui/gfx/geometry/angle_conversions.h"
diff --git a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc index 9ec7c65..5d72c91 100644 --- a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
@@ -16,8 +16,8 @@ #include "base/time/time.h" #include "content/public/test/test_utils.h" #include "content/renderer/device_sensors/fake_sensor_and_provider.h" -#include "device/sensors/public/cpp/motion_data.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "services/device/public/cpp/generic_sensor/motion_data.h" #include "services/device/public/mojom/sensor.mojom.h" #include "services/device/public/mojom/sensor_provider.mojom.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/device_sensors/device_orientation_event_pump.h b/content/renderer/device_sensors/device_orientation_event_pump.h index 0b36df9..33a5e38f 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump.h +++ b/content/renderer/device_sensors/device_orientation_event_pump.h
@@ -7,7 +7,7 @@ #include "base/macros.h" #include "content/renderer/device_sensors/device_sensor_event_pump.h" -#include "device/sensors/public/cpp/orientation_data.h" +#include "services/device/public/cpp/generic_sensor/orientation_data.h" #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceOrientationListener.h" namespace content {
diff --git a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc index f3df8cc..836d5f1 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
@@ -13,8 +13,8 @@ #include "base/run_loop.h" #include "content/public/test/test_utils.h" #include "content/renderer/device_sensors/fake_sensor_and_provider.h" -#include "device/sensors/public/cpp/orientation_data.h" #include "mojo/public/cpp/bindings/interface_request.h" +#include "services/device/public/cpp/generic_sensor/orientation_data.h" #include "services/device/public/mojom/sensor.mojom.h" #include "services/device/public/mojom/sensor_provider.mojom.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index 044c431..961a617 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -597,6 +597,8 @@ settings.enable_image_animations = cmd.HasSwitch(switches::kEnableCompositorImageAnimations); + settings.enable_image_animation_resync = + !cmd.HasSwitch(switches::kDisableImageAnimationResync); settings.always_request_presentation_time = cmd.HasSwitch(cc::switches::kAlwaysRequestPresentationTime);
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h index eef1ecc..be95e4c 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h
@@ -16,7 +16,7 @@ #include "content/common/content_export.h" #include "content/common/media/video_capture.h" #include "media/base/video_frame.h" -#include "media/capture/mojo/video_capture.mojom.h" +#include "media/capture/mojom/video_capture.mojom.h" #include "media/capture/video_capture_types.h" #include "mojo/public/cpp/bindings/binding.h"
diff --git a/content/renderer/media/video_capture_impl_manager_unittest.cc b/content/renderer/media/video_capture_impl_manager_unittest.cc index fbd62cd..35fbd997 100644 --- a/content/renderer/media/video_capture_impl_manager_unittest.cc +++ b/content/renderer/media/video_capture_impl_manager_unittest.cc
@@ -15,7 +15,7 @@ #include "content/renderer/media/video_capture_impl.h" #include "content/renderer/media/video_capture_impl_manager.h" #include "media/base/bind_to_current_loop.h" -#include "media/capture/mojo/video_capture.mojom.h" +#include "media/capture/mojom/video_capture.mojom.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc index d48c841..3142291 100644 --- a/content/renderer/media/video_capture_impl_unittest.cc +++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -9,7 +9,7 @@ #include "base/test/scoped_task_environment.h" #include "content/child/child_process.h" #include "content/renderer/media/video_capture_impl.h" -#include "media/capture/mojo/video_capture.mojom.h" +#include "media/capture/mojom/video_capture.mojom.h" #include "mojo/public/cpp/system/platform_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index e72bf40c..8fed7e2 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc
@@ -144,6 +144,7 @@ #include "content/renderer/service_worker/worker_fetch_context_impl.h" #include "content/renderer/shared_worker/shared_worker_repository.h" #include "content/renderer/skia_benchmarking_extension.h" +#include "content/renderer/speech_recognition_dispatcher.h" #include "content/renderer/stats_collection_controller.h" #include "content/renderer/v8_value_converter_impl.h" #include "content/renderer/web_frame_utils.h" @@ -5342,12 +5343,12 @@ params->post_id = -1; params->nav_entry_id = navigation_state->request_params().nav_entry_id; // We need to track the RenderViewHost routing_id because of downstream - // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, - // ResourceDispatcherHostImpl, MediaStreamUIProxy, - // SpeechRecognitionDispatcherHost and possibly others). They look up the view - // based on the ID stored in the resource requests. Once those dependencies - // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the - // client to be based on the routing_id of the RenderFrameHost. + // dependencies (https://crbug.com/392171 DownloadRequestHandle, + // SaveFileManager, ResourceDispatcherHostImpl, MediaStreamUIProxy and + // possibly others). They look up the view based on the ID stored in the + // resource requests. Once those dependencies are unwound or moved to + // RenderFrameHost (https://crbug.com/304341) we can move the client to be + // based on the routing_id of the RenderFrameHost. params->render_view_routing_id = render_view_->routing_id(); // "Standard" commits from Blink create new NavigationEntries. We also treat @@ -7151,6 +7152,12 @@ .device_status()); } +blink::WebSpeechRecognizer* RenderFrameImpl::SpeechRecognizer() { + if (!speech_recognition_dispatcher_) + speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this); + return speech_recognition_dispatcher_; +} + blink::mojom::PageVisibilityState RenderFrameImpl::VisibilityState() const { const RenderFrameImpl* local_root = GetLocalRoot(); blink::mojom::PageVisibilityState current_state =
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index 5529f20..2e62aea 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h
@@ -110,17 +110,18 @@ namespace blink { class WebComputedAXTree; class WebContentDecryptionModule; +class WebLayerTreeView; class WebLocalFrame; class WebPresentationClient; class WebPushClient; +class WebRelatedAppsFetcher; class WebSecurityOrigin; -struct WebImeTextSpan; +class WebSpeechRecognizer; +struct FramePolicy; struct WebContextMenuData; struct WebCursorInfo; struct WebFindOptions; -class WebLayerTreeView; -class WebRelatedAppsFetcher; -struct FramePolicy; +struct WebImeTextSpan; struct WebScrollIntoViewParams; } // namespace blink @@ -168,6 +169,7 @@ class RenderWidget; class RenderWidgetFullscreenPepper; class SharedWorkerRepository; +class SpeechRecognitionDispatcher; class UserMediaClientImpl; struct CSPViolationParams; struct CommonNavigationParams; @@ -750,6 +752,7 @@ const blink::WebString& sink_id, const blink::WebSecurityOrigin& security_origin, blink::WebSetSinkIdCallbacks* web_callbacks) override; + blink::WebSpeechRecognizer* SpeechRecognizer() override; blink::mojom::PageVisibilityState VisibilityState() const override; std::unique_ptr<blink::WebURLLoaderFactory> CreateURLLoaderFactory() override; void DraggableRegionsChanged() override; @@ -1511,6 +1514,11 @@ // process. std::unique_ptr<ManifestManager> manifest_manager_; + // The speech recognition dispatcher attached to this frame, lazily + // initialized. It is an observer of this frame, owning itself and managing + // its own lifetime. + SpeechRecognitionDispatcher* speech_recognition_dispatcher_ = nullptr; + // The current accessibility mode. ui::AXMode accessibility_mode_;
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 0657a428..687f610 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -771,6 +771,8 @@ const scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) { TRACE_EVENT0("startup", "RenderThreadImpl::Init"); + GetContentClient()->renderer()->PostIOThreadCreated(GetIOTaskRunner().get()); + base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex( base::PlatformThread::CurrentId(), kTraceEventRendererMainThreadSortIndex);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 6e57733..f4dc9be 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc
@@ -93,7 +93,6 @@ #include "content/renderer/renderer_webapplicationcachehost_impl.h" #include "content/renderer/resizing_mode_selector.h" #include "content/renderer/savable_resources.h" -#include "content/renderer/speech_recognition_dispatcher.h" #include "content/renderer/v8_value_converter_impl.h" #include "content/renderer/web_ui_extension_data.h" #include "media/audio/audio_output_device.h" @@ -240,7 +239,6 @@ using blink::WebSettings; using blink::WebSize; using blink::WebString; -using blink::WebTappedInfo; using blink::WebTextDirection; using blink::WebTouchEvent; using blink::WebURL; @@ -494,7 +492,6 @@ page_zoom_level_(params.page_zoom_level), main_render_frame_(nullptr), frame_widget_(nullptr), - speech_recognition_dispatcher_(nullptr), #if defined(OS_ANDROID) was_created_by_renderer_(false), #endif @@ -1731,11 +1728,6 @@ RenderWidget::SetTouchAction(touchAction); } -void RenderViewImpl::ShowUnhandledTapUIIfNeeded( - const blink::WebTappedInfo& tappedInfo) { - RenderWidget::ShowUnhandledTapUIIfNeeded(tappedInfo); -} - blink::WebWidgetClient* RenderViewImpl::WidgetClient() { return static_cast<RenderWidget*>(this); } @@ -2141,10 +2133,6 @@ void RenderViewImpl::OnPageWasHidden() { #if defined(OS_ANDROID) SuspendVideoCaptureDevices(true); -#if BUILDFLAG(ENABLE_WEBRTC) - if (speech_recognition_dispatcher_) - speech_recognition_dispatcher_->AbortAllRecognitions(); -#endif #endif if (webview()) { @@ -2222,12 +2210,6 @@ } } -blink::WebSpeechRecognizer* RenderViewImpl::SpeechRecognizer() { - if (!speech_recognition_dispatcher_) - speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this); - return speech_recognition_dispatcher_; -} - void RenderViewImpl::ZoomLimitsChanged(double minimum_level, double maximum_level) { // Round the double to avoid returning incorrect minimum/maximum zoom
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 87d3dd89..b74e4d4 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h
@@ -72,8 +72,6 @@ class WebDateTimeChooserCompletion; class WebGestureEvent; class WebMouseEvent; -class WebSpeechRecognizer; -class WebTappedInfo; class WebURLRequest; struct WebDateTimeChooserParams; struct WebMediaPlayerAction; @@ -92,7 +90,6 @@ class RenderViewImplTest; class RenderViewObserver; class RenderViewTest; -class SpeechRecognitionDispatcher; struct FileChooserParams; struct ResizeParams; @@ -271,8 +268,6 @@ void SetToolTipText(const blink::WebString&, blink::WebTextDirection hint) override; void SetTouchAction(cc::TouchAction touchAction) override; - void ShowUnhandledTapUIIfNeeded( - const blink::WebTappedInfo& tappedInfo) override; blink::WebWidgetClient* WidgetClient() override; // blink::WebViewClient implementation -------------------------------------- @@ -315,7 +310,6 @@ void NavigateBackForwardSoon(int offset) override; int HistoryBackListCount() override; int HistoryForwardListCount() override; - blink::WebSpeechRecognizer* SpeechRecognizer() override; void ZoomLimitsChanged(double minimum_level, double maximum_level) override; void PageScaleFactorChanged() override; virtual double zoomLevelToZoomFactor(double zoom_level) const; @@ -744,14 +738,6 @@ // "view", but it's also the RenderWidget for the main frame. blink::WebFrameWidget* frame_widget_; - // The next group of objects all implement RenderViewObserver, so are deleted - // along with the RenderView automatically. This is why we just store - // weak references. - - // The speech recognition dispatcher attached to this view, lazily - // initialized. - SpeechRecognitionDispatcher* speech_recognition_dispatcher_; - #if defined(OS_ANDROID) // Android Specific ---------------------------------------------------------
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 8e92115..6979462 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc
@@ -93,7 +93,6 @@ #include "third_party/WebKit/public/web/WebPopupMenuInfo.h" #include "third_party/WebKit/public/web/WebRange.h" #include "third_party/WebKit/public/web/WebSettings.h" -#include "third_party/WebKit/public/web/WebTappedInfo.h" #include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebWidget.h" #include "third_party/skia/include/core/SkShader.h" @@ -149,7 +148,6 @@ using blink::WebRect; using blink::WebSize; using blink::WebString; -using blink::WebTappedInfo; using blink::WebTextDirection; using blink::WebTouchEvent; using blink::WebTouchPoint; @@ -2513,28 +2511,6 @@ return web_screen_info; } -#if defined(OS_ANDROID) -void RenderWidget::ShowUnhandledTapUIIfNeeded( - const WebTappedInfo& tapped_info) { - // Unpack tapped_info. TODO(donnd): inline unpacking. - bool page_changed = tapped_info.PageChanged(); - const WebNode& tapped_node = tapped_info.GetNode(); - const WebPoint& tapped_position = tapped_info.Position(); - bool should_trigger = !page_changed && tapped_node.IsTextNode() && - !tapped_node.IsContentEditable() && - !tapped_node.IsInsideFocusableElementOrARIAWidget(); - if (should_trigger) { - float x_px = IsUseZoomForDSFEnabled() - ? tapped_position.x - : tapped_position.x * device_scale_factor_; - float y_px = IsUseZoomForDSFEnabled() - ? tapped_position.y - : tapped_position.y * device_scale_factor_; - Send(new ViewHostMsg_ShowUnhandledTapUIIfNeeded(routing_id_, x_px, y_px)); - } -} -#endif - void RenderWidget::DidHandleGestureEvent(const WebGestureEvent& event, bool event_cancelled) { #if defined(OS_ANDROID) || defined(USE_AURA)
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 3e8c9df5..c3fe65d 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h
@@ -84,7 +84,6 @@ class WebInputMethodController; class WebLocalFrame; class WebMouseEvent; -class WebTappedInfo; struct WebPoint; } // namespace blink @@ -334,15 +333,6 @@ // position. virtual ui::TextInputType GetTextInputType(); -#if defined(OS_ANDROID) - // Notifies that a tap was not consumed, so showing a UI for the unhandled - // tap may be needed. - // Performs various checks on the given WebTappedInfo to apply heuristics to - // determine if triggering is appropriate. - void ShowUnhandledTapUIIfNeeded( - const blink::WebTappedInfo& tapped_info) override; -#endif - // Begins the compositor's scheduler to start producing frames. void StartCompositor();
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index 0affaca..ac0bcb3 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -79,7 +79,6 @@ #include "content/renderer/webpublicsuffixlist_impl.h" #include "content/renderer/worker_thread_registry.h" #include "device/gamepad/public/cpp/gamepads.h" -#include "device/sensors/public/cpp/motion_data.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "gpu/config/gpu_info.h" #include "gpu/ipc/client/gpu_channel_host.h" @@ -92,6 +91,7 @@ #include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/system/platform_handle.h" #include "ppapi/features/features.h" +#include "services/device/public/cpp/generic_sensor/motion_data.h" #include "services/network/public/cpp/features.h" #include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/interface_provider.h"
diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc index a542e88d..03a2f86e 100644 --- a/content/renderer/speech_recognition_dispatcher.cc +++ b/content/renderer/speech_recognition_dispatcher.cc
@@ -11,8 +11,9 @@ #include <utility> #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "content/common/speech_recognition_messages.h" -#include "content/renderer/render_view_impl.h" +#include "content/renderer/render_frame_impl.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/web/WebSpeechGrammar.h" @@ -31,17 +32,12 @@ namespace content { SpeechRecognitionDispatcher::SpeechRecognitionDispatcher( - RenderViewImpl* render_view) - : RenderViewObserver(render_view), + RenderFrame* render_frame) + : RenderFrameObserver(render_frame), recognizer_client_(nullptr), next_id_(1) {} -SpeechRecognitionDispatcher::~SpeechRecognitionDispatcher() {} - -void SpeechRecognitionDispatcher::AbortAllRecognitions() { - Send(new SpeechRecognitionHostMsg_AbortAllRequests( - routing_id())); -} +SpeechRecognitionDispatcher::~SpeechRecognitionDispatcher() = default; bool SpeechRecognitionDispatcher::OnMessageReceived( const IPC::Message& message) { @@ -65,6 +61,12 @@ delete this; } +void SpeechRecognitionDispatcher::WasHidden() { +#if defined(OS_ANDROID) && BUILDFLAG(ENABLE_WEBRTC) + Send(new SpeechRecognitionHostMsg_AbortAllRequests(routing_id())); +#endif +} + void SpeechRecognitionDispatcher::Start( const WebSpeechRecognitionHandle& handle, const WebSpeechRecognitionParams& params, @@ -82,7 +84,7 @@ msg_params.continuous = params.Continuous(); msg_params.interim_results = params.InterimResults(); msg_params.origin_url = params.Origin().ToString().Utf8(); - msg_params.render_view_id = routing_id(); + msg_params.render_frame_id = routing_id(); msg_params.request_id = GetOrCreateIDForHandle(handle); // The handle mapping will be removed in |OnRecognitionEnd|.
diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h index 8251b45..5ad475ce 100644 --- a/content/renderer/speech_recognition_dispatcher.h +++ b/content/renderer/speech_recognition_dispatcher.h
@@ -10,32 +10,29 @@ #include "base/macros.h" #include "content/public/common/speech_recognition_result.h" -#include "content/public/renderer/render_view_observer.h" +#include "content/public/renderer/render_frame_observer.h" #include "third_party/WebKit/public/web/WebSpeechRecognitionHandle.h" #include "third_party/WebKit/public/web/WebSpeechRecognizer.h" namespace content { -class RenderViewImpl; struct SpeechRecognitionError; // SpeechRecognitionDispatcher is a delegate for methods used by WebKit for // scripted JS speech APIs. It's the complement of -// SpeechRecognitionDispatcherHost (owned by RenderViewHost). -class SpeechRecognitionDispatcher : public RenderViewObserver, +// SpeechRecognitionDispatcherHost (owned by RenderFrameHost). +class SpeechRecognitionDispatcher : public RenderFrameObserver, public blink::WebSpeechRecognizer { public: - explicit SpeechRecognitionDispatcher(RenderViewImpl* render_view); + explicit SpeechRecognitionDispatcher(RenderFrame* render_frame); ~SpeechRecognitionDispatcher() override; - // Aborts all speech recognitions. - void AbortAllRecognitions(); - private: using HandleMap = std::map<int, blink::WebSpeechRecognitionHandle>; - // RenderViewObserver implementation. + // RenderFrameObserver implementation. bool OnMessageReceived(const IPC::Message& message) override; void OnDestruct() override; + void WasHidden() override; // blink::WebSpeechRecognizer implementation. void Start(const blink::WebSpeechRecognitionHandle&, @@ -62,7 +59,7 @@ const blink::WebSpeechRecognitionHandle& handle); const blink::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id); - // The WebKit client class that we use to send events back to the JS world. + // The Blink client class that we use to send events back to the JS world. blink::WebSpeechRecognizerClient* recognizer_client_; // This maps between request id values and the Blink handle values.
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index c52111a5..52b60701 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn
@@ -252,7 +252,6 @@ "//device/bluetooth:fake_bluetooth", "//device/bluetooth:mocks", "//device/geolocation/public/cpp:test_support", - "//device/sensors/public/cpp:full", "//gin", "//gpu", "//media",
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn index 277d949..bfb3df4f 100644 --- a/content/shell/android/BUILD.gn +++ b/content/shell/android/BUILD.gn
@@ -43,7 +43,6 @@ if (is_component_build) { deps += [ "//device/gamepad", - "//device/sensors", "//media/midi", ] } @@ -198,7 +197,6 @@ deps = [ "//base:base_javatests", "//content/public/android:content_javatests", - "//device/sensors:javatests", "//net/android:net_javatests", "//third_party/android_support_test_runner:runner_java", ] @@ -291,7 +289,6 @@ if (is_component_build) { deps += [ "//device/gamepad", - "//device/sensors", "//media/midi", ] }
diff --git a/content/shell/browser/layout_test/blink_test_controller.cc b/content/shell/browser/layout_test/blink_test_controller.cc index 04de6a9b..07c5af44 100644 --- a/content/shell/browser/layout_test/blink_test_controller.cc +++ b/content/shell/browser/layout_test/blink_test_controller.cc
@@ -451,8 +451,10 @@ LoadDevToolsJSTest(); } else { NavigationController::LoadURLParams params(test_url_); - params.transition_type = ui::PageTransitionFromInt( - ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); + // Using PAGE_TRANSITION_LINK avoids a BrowsingInstance/process swap + // between layout tests. + params.transition_type = + ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK); params.should_clear_history_list = true; main_window_->web_contents()->GetController().LoadURLWithParams(params); main_window_->web_contents()->Focus(); @@ -1009,7 +1011,7 @@ void BlinkTestController::OnLoadURLForFrame(const GURL& url, const std::string& frame_name) { - main_window_->LoadURLForFrame(url, frame_name); + main_window_->LoadURLForFrame(url, frame_name, ui::PAGE_TRANSITION_LINK); } void BlinkTestController::OnCloseRemainingWindows() {
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc index 0fac677..b25c2dc 100644 --- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -9,9 +9,9 @@ #include "base/strings/pattern.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/resource_dispatcher_host.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" #include "content/public/browser/storage_partition.h" #include "content/shell/browser/layout_test/blink_test_controller.h" #include "content/shell/browser/layout_test/layout_test_bluetooth_fake_adapter_setter_impl.h" @@ -189,7 +189,7 @@ registry->AddInterface(base::Bind(&BindLayoutTestHelper)); } -scoped_refptr<ResourceDispatcherHostLoginDelegate> +scoped_refptr<LoginDelegate> LayoutTestContentBrowserClient::CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h index b45f4dc7..bfaec7c 100644 --- a/content/shell/browser/layout_test/layout_test_content_browser_client.h +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
@@ -67,7 +67,7 @@ void ExposeInterfacesToFrame( service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>* registry) override; - scoped_refptr<ResourceDispatcherHostLoginDelegate> CreateLoginDelegate( + scoped_refptr<LoginDelegate> CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter, bool is_main_frame,
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index ee162d4d..371c3195 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc
@@ -216,14 +216,18 @@ } void Shell::LoadURL(const GURL& url) { - LoadURLForFrame(url, std::string()); + LoadURLForFrame( + url, std::string(), + ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); } -void Shell::LoadURLForFrame(const GURL& url, const std::string& frame_name) { +void Shell::LoadURLForFrame(const GURL& url, + const std::string& frame_name, + ui::PageTransition transition_type) { NavigationController::LoadURLParams params(url); - params.transition_type = ui::PageTransitionFromInt( - ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); params.frame_name = frame_name; + params.transition_type = transition_type; web_contents_->GetController().LoadURLWithParams(params); web_contents_->Focus(); }
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h index 6cda9f3b..65af9a78 100644 --- a/content/shell/browser/shell.h +++ b/content/shell/browser/shell.h
@@ -62,7 +62,9 @@ ~Shell() override; void LoadURL(const GURL& url); - void LoadURLForFrame(const GURL& url, const std::string& frame_name); + void LoadURLForFrame(const GURL& url, + const std::string& frame_name, + ui::PageTransition); void LoadDataWithBaseURL(const GURL& url, const std::string& data, const GURL& base_url);
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc index d6c72af3..47cf05f 100644 --- a/content/shell/browser/shell_content_browser_client.cc +++ b/content/shell/browser/shell_content_browser_client.cc
@@ -19,11 +19,11 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "content/public/browser/client_certificate_delegate.h" +#include "content/public/browser/login_delegate.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/resource_dispatcher_host_delegate.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" #include "content/public/common/service_names.mojom.h" @@ -350,8 +350,7 @@ gfx::Size())->web_contents()); } -scoped_refptr<ResourceDispatcherHostLoginDelegate> -ShellContentBrowserClient::CreateLoginDelegate( +scoped_refptr<LoginDelegate> ShellContentBrowserClient::CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter, bool is_main_frame,
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h index fa46e5c..6195b7f 100644 --- a/content/shell/browser/shell_content_browser_client.h +++ b/content/shell/browser/shell_content_browser_client.h
@@ -69,7 +69,7 @@ void OpenURL(BrowserContext* browser_context, const OpenURLParams& params, const base::Callback<void(WebContents*)>& callback) override; - scoped_refptr<ResourceDispatcherHostLoginDelegate> CreateLoginDelegate( + scoped_refptr<LoginDelegate> CreateLoginDelegate( net::AuthChallengeInfo* auth_info, content::ResourceRequestInfo::WebContentsGetter web_contents_getter, bool is_main_frame,
diff --git a/content/shell/browser/shell_login_dialog.h b/content/shell/browser/shell_login_dialog.h index 621bcde..01db5a0 100644 --- a/content/shell/browser/shell_login_dialog.h +++ b/content/shell/browser/shell_login_dialog.h
@@ -10,7 +10,7 @@ #include "base/optional.h" #include "base/strings/string16.h" #include "build/build_config.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" +#include "content/public/browser/login_delegate.h" #if defined(OS_MACOSX) #if __OBJC__ @@ -29,7 +29,7 @@ // This class provides a dialog box to ask the user for credentials. Useful in // ResourceDispatcherHostDelegate::CreateLoginDelegate. -class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate { +class ShellLoginDialog : public LoginDelegate { public: // Threading: IO thread. ShellLoginDialog( @@ -37,7 +37,7 @@ base::Callback<void(const base::Optional<net::AuthCredentials>&)> auth_required_callback); - // ResourceDispatcherHostLoginDelegate implementation: + // LoginDelegate implementation: // Threading: IO thread. void OnRequestCancelled() override;
diff --git a/content/shell/test_runner/BUILD.gn b/content/shell/test_runner/BUILD.gn index ca1e81aa..bbad433 100644 --- a/content/shell/test_runner/BUILD.gn +++ b/content/shell/test_runner/BUILD.gn
@@ -104,12 +104,12 @@ "//content/public/renderer", "//content/test:test_runner_support", "//device/gamepad/public/cpp:shared_with_blink", - "//device/sensors/public/cpp:full", "//gin", "//gpu", "//gpu/command_buffer/client:gles2_interface", "//media/midi:mojo", "//net", + "//services/device/public/cpp/generic_sensor:shared_with_blink", "//services/device/public/mojom", "//skia", "//third_party/WebKit/public:blink",
diff --git a/content/shell/test_runner/DEPS b/content/shell/test_runner/DEPS index 9b811c9..cf93d7b 100644 --- a/content/shell/test_runner/DEPS +++ b/content/shell/test_runner/DEPS
@@ -2,12 +2,12 @@ "+cc", "+content/public/test", "+device/gamepad/public/cpp", - "+device/sensors/public/cpp", "+gin", "+gpu/command_buffer/client", "+media/midi/midi_service.mojom.h", "+mojo/public", "+net/base", + "+services/device/public/cpp/generic_sensor", "+services/device/public/mojom", "+skia", "+third_party/khronos/GLES2/gl2.h",
diff --git a/content/shell/test_runner/test_runner.cc b/content/shell/test_runner/test_runner.cc index a198d0c..3b66518 100644 --- a/content/shell/test_runner/test_runner.cc +++ b/content/shell/test_runner/test_runner.cc
@@ -32,13 +32,13 @@ #include "content/shell/test_runner/test_runner_for_specific_view.h" #include "content/shell/test_runner/web_test_delegate.h" #include "content/shell/test_runner/web_view_test_proxy.h" -#include "device/sensors/public/cpp/motion_data.h" -#include "device/sensors/public/cpp/orientation_data.h" #include "gin/arguments.h" #include "gin/array_buffer.h" #include "gin/handle.h" #include "gin/object_template_builder.h" #include "gin/wrappable.h" +#include "services/device/public/cpp/generic_sensor/motion_data.h" +#include "services/device/public/cpp/generic_sensor/orientation_data.h" #include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebPoint.h"
diff --git a/content/shell/test_runner/test_runner_for_specific_view.cc b/content/shell/test_runner/test_runner_for_specific_view.cc index 0c9ece1..87cbdd95 100644 --- a/content/shell/test_runner/test_runner_for_specific_view.cc +++ b/content/shell/test_runner/test_runner_for_specific_view.cc
@@ -26,8 +26,6 @@ #include "content/shell/test_runner/test_runner.h" #include "content/shell/test_runner/web_test_delegate.h" #include "content/shell/test_runner/web_view_test_proxy.h" -#include "device/sensors/public/cpp/motion_data.h" -#include "device/sensors/public/cpp/orientation_data.h" #include "gin/arguments.h" #include "gin/array_buffer.h" #include "gin/handle.h"
diff --git a/content/shell/test_runner/web_frame_test_client.cc b/content/shell/test_runner/web_frame_test_client.cc index f922518..1c2d003 100644 --- a/content/shell/test_runner/web_frame_test_client.cc +++ b/content/shell/test_runner/web_frame_test_client.cc
@@ -14,6 +14,7 @@ #include "content/shell/test_runner/accessibility_controller.h" #include "content/shell/test_runner/event_sender.h" #include "content/shell/test_runner/mock_screen_orientation_client.h" +#include "content/shell/test_runner/mock_web_speech_recognizer.h" #include "content/shell/test_runner/test_common.h" #include "content/shell/test_runner/test_interfaces.h" #include "content/shell/test_runner/test_plugin.h" @@ -697,6 +698,10 @@ callback->OnError(blink::WebSetSinkIdError::kNotFound); } +blink::WebSpeechRecognizer* WebFrameTestClient::SpeechRecognizer() { + return test_runner()->getMockWebSpeechRecognizer(); +} + void WebFrameTestClient::DidClearWindowObject() { blink::WebLocalFrame* frame = web_frame_test_proxy_base_->web_frame(); web_view_test_proxy_base_->test_interfaces()->BindTo(frame);
diff --git a/content/shell/test_runner/web_frame_test_client.h b/content/shell/test_runner/web_frame_test_client.h index d05047b..881ba59 100644 --- a/content/shell/test_runner/web_frame_test_client.h +++ b/content/shell/test_runner/web_frame_test_client.h
@@ -84,6 +84,7 @@ const blink::WebString& sink_id, const blink::WebSecurityOrigin& security_origin, blink::WebSetSinkIdCallbacks* web_callbacks) override; + blink::WebSpeechRecognizer* SpeechRecognizer() override; void DidClearWindowObject() override; bool RunFileChooser(const blink::WebFileChooserParams& params, blink::WebFileChooserCompletion* completion) override;
diff --git a/content/shell/test_runner/web_frame_test_proxy.h b/content/shell/test_runner/web_frame_test_proxy.h index 7872030..200b7223 100644 --- a/content/shell/test_runner/web_frame_test_proxy.h +++ b/content/shell/test_runner/web_frame_test_proxy.h
@@ -258,6 +258,10 @@ sink_id, security_origin, web_callbacks); } + blink::WebSpeechRecognizer* SpeechRecognizer() override { + return test_client()->SpeechRecognizer(); + } + void DidClearWindowObject() override { test_client()->DidClearWindowObject(); Base::DidClearWindowObject();
diff --git a/content/shell/test_runner/web_view_test_client.cc b/content/shell/test_runner/web_view_test_client.cc index 96c3fb1..d35f751e 100644 --- a/content/shell/test_runner/web_view_test_client.cc +++ b/content/shell/test_runner/web_view_test_client.cc
@@ -11,7 +11,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "content/shell/test_runner/event_sender.h" -#include "content/shell/test_runner/mock_web_speech_recognizer.h" #include "content/shell/test_runner/test_common.h" #include "content/shell/test_runner/test_interfaces.h" #include "content/shell/test_runner/test_runner.h" @@ -77,10 +76,6 @@ frame->PrintEnd(); } -blink::WebSpeechRecognizer* WebViewTestClient::SpeechRecognizer() { - return test_runner()->getMockWebSpeechRecognizer(); -} - blink::WebString WebViewTestClient::AcceptLanguages() { return blink::WebString::FromUTF8(test_runner()->GetAcceptLanguages()); }
diff --git a/content/shell/test_runner/web_view_test_client.h b/content/shell/test_runner/web_view_test_client.h index 6cc6210..4ba373a2 100644 --- a/content/shell/test_runner/web_view_test_client.h +++ b/content/shell/test_runner/web_view_test_client.h
@@ -38,7 +38,6 @@ bool suppress_opener, blink::WebSandboxFlags) override; void PrintPage(blink::WebLocalFrame* frame) override; - blink::WebSpeechRecognizer* SpeechRecognizer() override; blink::WebString AcceptLanguages() override; void DidFocus(blink::WebLocalFrame* calling_frame) override; bool CanHandleGestureEvent() override;
diff --git a/content/shell/test_runner/web_view_test_proxy.h b/content/shell/test_runner/web_view_test_proxy.h index e69faca..05aeb68 100644 --- a/content/shell/test_runner/web_view_test_proxy.h +++ b/content/shell/test_runner/web_view_test_proxy.h
@@ -197,9 +197,6 @@ void PrintPage(blink::WebLocalFrame* frame) override { view_test_client()->PrintPage(frame); } - blink::WebSpeechRecognizer* SpeechRecognizer() override { - return view_test_client()->SpeechRecognizer(); - } blink::WebString AcceptLanguages() override { return view_test_client()->AcceptLanguages(); }
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 1517cec..0ce0d3f9 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -322,7 +322,7 @@ "//ipc:test_support", "//media", "//media/capture", - "//media/capture/mojo:image_capture", + "//media/capture/mojom:image_capture", "//mojo/edk/system", "//net:test_support", "//services/device/public/mojom", @@ -605,8 +605,8 @@ "//content/shell/test_runner:test_runner", "//device/bluetooth", "//device/gamepad/public/cpp:shared_with_blink", - "//device/sensors/public/cpp:full", "//gpu/ipc/service", + "//services/device/public/cpp/generic_sensor", "//services/ui/public/cpp/gpu", "//skia", "//ui/accessibility:ax_enums_mojo", @@ -885,8 +885,6 @@ "//content/shell:pak", "//content/test:test_support", "//device/base/synchronization", - "//device/sensors", - "//device/sensors/public/cpp:full", "//gin", "//gpu", "//gpu/ipc/host", @@ -981,7 +979,10 @@ } if (is_win) { - sources += [ "../browser/accessibility/accessibility_win_browsertest.cc" ] + sources += [ + "../browser/accessibility/accessibility_win_browsertest.cc", + "../browser/renderer_host/direct_manipulation_browsertest.cc", + ] deps += [ "//content/app/strings", @@ -1690,7 +1691,6 @@ "//device/gamepad:test_helpers", "//device/gamepad/public/cpp:shared_with_blink", "//device/geolocation/public/cpp:test_support", - "//device/sensors/public/cpp:shared_with_blink", "//gin", "//gpu", "//gpu:test_support",
diff --git a/content/test/DEPS b/content/test/DEPS index 24222fd..8b65cb3 100644 --- a/content/test/DEPS +++ b/content/test/DEPS
@@ -17,7 +17,6 @@ "+content", "+device/bluetooth", # For WebBluetooth tests "+device/gamepad/public/cpp", - "+device/sensors/public/cpp", # For loading V8's initial snapshot from external files. "+gin/v8_initializer.h", "+services/catalog",
diff --git a/content/test/content_browser_test_utils_internal.cc b/content/test/content_browser_test_utils_internal.cc index d35588c0..e304a56 100644 --- a/content/test/content_browser_test_utils_internal.cc +++ b/content/test/content_browser_test_utils_internal.cc
@@ -27,11 +27,13 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/resource_throttle.h" +#include "content/public/browser/web_contents.h" #include "content/public/common/file_chooser_file_info.h" #include "content/public/common/use_zoom_for_dsf_policy.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_frame_navigation_observer.h" +#include "content/public/test/test_navigation_observer.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_javascript_dialog_manager.h" #include "net/url_request/url_request.h" @@ -58,6 +60,20 @@ return frame_tree_node->current_frame_host(); } +bool NavigateToURLInSameBrowsingInstance(Shell* window, const GURL& url) { + TestNavigationObserver observer(window->web_contents()); + // Using a PAGE_TRANSITION_LINK transition with a browser-initiated + // navigation forces it to stay in the current BrowsingInstance, as normally + // that transition is used by renderer-initiated navigations. + window->LoadURLForFrame(url, std::string(), + ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK)); + observer.Wait(); + + if (!IsLastCommittedEntryOfPageType(window->web_contents(), PAGE_TYPE_NORMAL)) + return false; + return window->web_contents()->GetLastCommittedURL() == url; +} + FrameTreeVisualizer::FrameTreeVisualizer() { }
diff --git a/content/test/content_browser_test_utils_internal.h b/content/test/content_browser_test_utils_internal.h index 10ce0e4c..0480e2e 100644 --- a/content/test/content_browser_test_utils_internal.h +++ b/content/test/content_browser_test_utils_internal.h
@@ -48,6 +48,14 @@ // Extends the ToRenderFrameHost mechanism to FrameTreeNodes. RenderFrameHost* ConvertToRenderFrameHost(FrameTreeNode* frame_tree_node); +// Helper function to navigate a window to a |url|, using a browser-initiated +// navigation that will stay in the same BrowsingInstance. Most +// browser-initiated navigations swap BrowsingInstances, but some tests need a +// navigation to swap processes for cross-site URLs (even outside of +// --site-per-process) while staying in the same BrowsingInstance. +WARN_UNUSED_RESULT bool NavigateToURLInSameBrowsingInstance(Shell* window, + const GURL& url); + // Creates compact textual representations of the state of the frame tree that // is appropriate for use in assertions. //
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc index 4f00036..bec8b1f 100644 --- a/content/test/layouttest_support.cc +++ b/content/test/layouttest_support.cc
@@ -45,9 +45,9 @@ #include "content/shell/test_runner/web_frame_test_proxy.h" #include "content/shell/test_runner/web_view_test_proxy.h" #include "content/shell/test_runner/web_widget_test_proxy.h" -#include "device/sensors/public/cpp/motion_data.h" -#include "device/sensors/public/cpp/orientation_data.h" #include "gpu/ipc/service/image_transport_surface.h" +#include "services/device/public/cpp/generic_sensor/motion_data.h" +#include "services/device/public/cpp/generic_sensor/orientation_data.h" #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" #include "third_party/WebKit/public/platform/WebFloatRect.h" #include "third_party/WebKit/public/platform/WebInputEvent.h"
diff --git a/device/BUILD.gn b/device/BUILD.gn index 56b22b9..21af1e0 100644 --- a/device/BUILD.gn +++ b/device/BUILD.gn
@@ -79,9 +79,6 @@ "gamepad/gamepad_provider_unittest.cc", "gamepad/gamepad_service_unittest.cc", "gamepad/public/mojom/gamepad_mojom_traits_unittest.cc", - "sensors/data_fetcher_shared_memory_base_unittest.cc", - "sensors/sensor_manager_android_unittest.cc", - "sensors/sensor_manager_chromeos_unittest.cc", "test/run_all_unittests.cc", ] @@ -102,9 +99,6 @@ "//device/gamepad/public/mojom", "//device/gamepad/public/mojom:gamepad_mojom_traits_test", "//device/geolocation:unittests", - "//device/sensors", - "//device/sensors/public/cpp:full", - "//device/sensors/public/mojom", "//mojo/common", "//mojo/edk/system", "//mojo/public/cpp/bindings", @@ -188,7 +182,6 @@ ":bluetooth_test_jni_headers", "//device/geolocation:geolocation_java", "//device/geolocation:geolocation_java_test_support", - "//device/sensors:java", "//device/usb:java", ] }
diff --git a/device/fido/ctap_request_unittest.cc b/device/fido/ctap_request_unittest.cc index 1d1bd3fc..0fc7285 100644 --- a/device/fido/ctap_request_unittest.cc +++ b/device/fido/ctap_request_unittest.cc
@@ -124,7 +124,7 @@ auto serialized_data = make_credential_param.SetResidentKeySupported(true) .SetUserVerificationRequired(true) .EncodeAsCBOR(); - EXPECT_THAT(serialized_data, testing::ElementsAreArray(kSerializedRequest)); + EXPECT_THAT(serialized_data, ::testing::ElementsAreArray(kSerializedRequest)); } TEST(CTAPRequestTest, TestConstructGetAssertionRequest) { @@ -222,7 +222,7 @@ .SetUserVerificationRequired(true); auto serialized_data = get_assertion_req.EncodeAsCBOR(); - EXPECT_THAT(serialized_data, testing::ElementsAreArray(kSerializedRequest)); + EXPECT_THAT(serialized_data, ::testing::ElementsAreArray(kSerializedRequest)); } TEST(CTAPRequestTest, TestConstructCtapAuthenticatorRequestParam) { @@ -232,13 +232,13 @@ static constexpr uint8_t kSerializedResetCmd = 0x07; EXPECT_THAT(AuthenticatorGetInfoRequest().Serialize(), - testing::ElementsAre(kSerializedGetInfoCmd)); + ::testing::ElementsAre(kSerializedGetInfoCmd)); EXPECT_THAT(AuthenticatorGetNextAssertionRequest().Serialize(), - testing::ElementsAre(kSerializedGetNextAssertionCmd)); + ::testing::ElementsAre(kSerializedGetNextAssertionCmd)); EXPECT_THAT(AuthenticatorCancelRequest().Serialize(), - testing::ElementsAre(kSerializedCancelCmd)); + ::testing::ElementsAre(kSerializedCancelCmd)); EXPECT_THAT(AuthenticatorResetRequest().Serialize(), - testing::ElementsAre(kSerializedResetCmd)); + ::testing::ElementsAre(kSerializedResetCmd)); } } // namespace device
diff --git a/device/fido/ctap_response_unittest.cc b/device/fido/ctap_response_unittest.cc index c842da3..16feecd 100644 --- a/device/fido/ctap_response_unittest.cc +++ b/device/fido/ctap_response_unittest.cc
@@ -179,7 +179,8 @@ it = attestation_object_map.find(cbor::CBORValue("authData")); ASSERT_TRUE(it != attestation_object_map.end()); ASSERT_TRUE(it->second.is_bytestring()); - EXPECT_THAT(it->second.GetBytestring(), testing::ElementsAreArray(kAuthData)); + EXPECT_THAT(it->second.GetBytestring(), + ::testing::ElementsAreArray(kAuthData)); it = attestation_object_map.find(cbor::CBORValue("attStmt")); ASSERT_TRUE(it != attestation_object_map.end()); @@ -196,7 +197,7 @@ ASSERT_TRUE(attStmt_it != attestation_statement_map.end()); ASSERT_TRUE(attStmt_it->second.is_bytestring()); EXPECT_THAT(attStmt_it->second.GetBytestring(), - testing::ElementsAreArray(kSignature)); + ::testing::ElementsAreArray(kSignature)); attStmt_it = attestation_statement_map.find(cbor::CBORValue("x5c")); ASSERT_TRUE(attStmt_it != attestation_statement_map.end()); @@ -205,7 +206,7 @@ ASSERT_EQ(certificate.GetArray().size(), 1u); ASSERT_TRUE(certificate.GetArray()[0].is_bytestring()); EXPECT_THAT(certificate.GetArray()[0].GetBytestring(), - testing::ElementsAreArray(kCertificate)); + ::testing::ElementsAreArray(kCertificate)); } // Leveraging example 5 of section 6.1 of the spec https://fidoalliance.org @@ -311,9 +312,9 @@ EXPECT_EQ(*get_assertion_response->num_credentials(), 1u); EXPECT_THAT(get_assertion_response->auth_data(), - testing::ElementsAreArray(kAuthData)); + ::testing::ElementsAreArray(kAuthData)); EXPECT_THAT(get_assertion_response->signature(), - testing::ElementsAreArray(kSignature)); + ::testing::ElementsAreArray(kSignature)); } } // namespace device
diff --git a/device/fido/fido_hid_message_unittest.cc b/device/fido/fido_hid_message_unittest.cc index 940f98d..eec1611 100644 --- a/device/fido/fido_hid_message_unittest.cc +++ b/device/fido/fido_hid_message_unittest.cc
@@ -76,7 +76,7 @@ EXPECT_EQ(orig_packet->payload_length(), reconstructed_packet->payload_length()); EXPECT_THAT(orig_packet->GetPacketPayload(), - testing::ContainerEq(reconstructed_packet->GetPacketPayload())); + ::testing::ContainerEq(reconstructed_packet->GetPacketPayload())); EXPECT_EQ(channel_id, reconstructed_packet->channel_id()); @@ -119,7 +119,7 @@ new_msg_it != new_msg_packets.end(); ++orig_it, ++new_msg_it) { EXPECT_THAT((*orig_it)->GetPacketPayload(), - testing::ContainerEq((*new_msg_it)->GetPacketPayload())); + ::testing::ContainerEq((*new_msg_it)->GetPacketPayload())); EXPECT_EQ((*orig_it)->channel_id(), (*new_msg_it)->channel_id()); @@ -169,7 +169,8 @@ auto filled_message = FidoHidMessage::Create( channel_id, CtapHidDeviceCommand::kCtapHidPing, data); ASSERT_TRUE(filled_message); - EXPECT_THAT(data, testing::ContainerEq(filled_message->GetMessagePayload())); + EXPECT_THAT(data, + ::testing::ContainerEq(filled_message->GetMessagePayload())); } TEST(FidoHidMessageTest, TestDeserialize) {
diff --git a/device/fido/u2f_apdu_unittest.cc b/device/fido/u2f_apdu_unittest.cc index 4a717be..c601416 100644 --- a/device/fido/u2f_apdu_unittest.cc +++ b/device/fido/u2f_apdu_unittest.cc
@@ -10,7 +10,7 @@ namespace device { -class U2fApduTest : public testing::Test {}; +class U2fApduTest : public ::testing::Test {}; TEST_F(U2fApduTest, TestDeserializeBasic) { uint8_t cla = 0xAA; @@ -22,7 +22,7 @@ U2fApduCommand::CreateFromMessage(message); EXPECT_EQ(static_cast<size_t>(0), cmd->response_length_); - EXPECT_THAT(cmd->data_, testing::ContainerEq(std::vector<uint8_t>())); + EXPECT_THAT(cmd->data_, ::testing::ContainerEq(std::vector<uint8_t>())); EXPECT_EQ(cmd->cla_, cla); EXPECT_EQ(cmd->ins_, ins); EXPECT_EQ(cmd->p1_, p1); @@ -61,7 +61,7 @@ std::unique_ptr<U2fApduCommand> cmd_no_response = U2fApduCommand::CreateFromMessage(message); EXPECT_EQ(static_cast<size_t>(0), cmd_no_response->response_length_); - EXPECT_THAT(data, testing::ContainerEq(cmd_no_response->data_)); + EXPECT_THAT(data, ::testing::ContainerEq(cmd_no_response->data_)); EXPECT_EQ(cmd_no_response->cla_, cla); EXPECT_EQ(cmd_no_response->ins_, ins); EXPECT_EQ(cmd_no_response->p1_, p1); @@ -72,7 +72,7 @@ message.push_back(0xD0); std::unique_ptr<U2fApduCommand> cmd = U2fApduCommand::CreateFromMessage(message); - EXPECT_THAT(data, testing::ContainerEq(cmd->data_)); + EXPECT_THAT(data, ::testing::ContainerEq(cmd->data_)); EXPECT_EQ(cmd->cla_, cla); EXPECT_EQ(cmd->ins_, ins); EXPECT_EQ(cmd->p1_, p1); @@ -97,7 +97,7 @@ ASSERT_NE(nullptr, response); EXPECT_EQ(U2fApduResponse::Status::SW_CONDITIONS_NOT_SATISFIED, response->response_status_); - EXPECT_THAT(response->data_, testing::ContainerEq(std::vector<uint8_t>())); + EXPECT_THAT(response->data_, ::testing::ContainerEq(std::vector<uint8_t>())); // Valid length and status status = U2fApduResponse::Status::SW_NO_ERROR; @@ -108,7 +108,7 @@ response = U2fApduResponse::CreateFromMessage(message); ASSERT_NE(nullptr, response); EXPECT_EQ(U2fApduResponse::Status::SW_NO_ERROR, response->response_status_); - EXPECT_THAT(response->data_, testing::ContainerEq(test_vector)); + EXPECT_THAT(response->data_, ::testing::ContainerEq(test_vector)); } TEST_F(U2fApduTest, TestSerializeCommand) { @@ -121,19 +121,19 @@ // No data, no response expected std::vector<uint8_t> expected({0xA, 0xB, 0xC, 0xD}); - ASSERT_THAT(expected, testing::ContainerEq(cmd->GetEncodedCommand())); + ASSERT_THAT(expected, ::testing::ContainerEq(cmd->GetEncodedCommand())); EXPECT_THAT( expected, - testing::ContainerEq( + ::testing::ContainerEq( U2fApduCommand::CreateFromMessage(expected)->GetEncodedCommand())); // No data, response expected cmd->set_response_length(0xCAFE); expected = {0xA, 0xB, 0xC, 0xD, 0x0, 0xCA, 0xFE}; - EXPECT_THAT(expected, testing::ContainerEq(cmd->GetEncodedCommand())); + EXPECT_THAT(expected, ::testing::ContainerEq(cmd->GetEncodedCommand())); EXPECT_THAT( expected, - testing::ContainerEq( + ::testing::ContainerEq( U2fApduCommand::CreateFromMessage(expected)->GetEncodedCommand())); // Data exists, response expected @@ -141,19 +141,19 @@ cmd->set_data(data); expected = {0xA, 0xB, 0xC, 0xD, 0x0, 0x0, 0x4, 0x1, 0x2, 0x3, 0x4, 0xCA, 0xFE}; - EXPECT_THAT(expected, testing::ContainerEq(cmd->GetEncodedCommand())); + EXPECT_THAT(expected, ::testing::ContainerEq(cmd->GetEncodedCommand())); EXPECT_THAT( expected, - testing::ContainerEq( + ::testing::ContainerEq( U2fApduCommand::CreateFromMessage(expected)->GetEncodedCommand())); // Data exists, no response expected cmd->set_response_length(0); expected = {0xA, 0xB, 0xC, 0xD, 0x0, 0x0, 0x4, 0x1, 0x2, 0x3, 0x4}; - EXPECT_THAT(expected, testing::ContainerEq(cmd->GetEncodedCommand())); + EXPECT_THAT(expected, ::testing::ContainerEq(cmd->GetEncodedCommand())); EXPECT_THAT( expected, - testing::ContainerEq( + ::testing::ContainerEq( U2fApduCommand::CreateFromMessage(expected)->GetEncodedCommand())); } @@ -168,17 +168,17 @@ // Set response length to maximum, which should serialize to 0x0000 cmd->set_response_length(U2fApduCommand::kApduMaxResponseLength); std::vector<uint8_t> expected = {0xA, 0xB, 0xC, 0xD, 0x0, 0x0, 0x0}; - EXPECT_THAT(expected, testing::ContainerEq(cmd->GetEncodedCommand())); + EXPECT_THAT(expected, ::testing::ContainerEq(cmd->GetEncodedCommand())); EXPECT_THAT( expected, - testing::ContainerEq( + ::testing::ContainerEq( U2fApduCommand::CreateFromMessage(expected)->GetEncodedCommand())); // Maximum data size std::vector<uint8_t> oversized(U2fApduCommand::kApduMaxDataLength); cmd->set_data(oversized); EXPECT_THAT(cmd->GetEncodedCommand(), - testing::ContainerEq( + ::testing::ContainerEq( U2fApduCommand::CreateFromMessage(cmd->GetEncodedCommand()) ->GetEncodedCommand())); } @@ -193,7 +193,7 @@ ASSERT_NE(nullptr, cmd); EXPECT_THAT(U2fApduCommand::CreateFromMessage(cmd->GetEncodedCommand()) ->GetEncodedCommand(), - testing::ContainerEq(cmd->GetEncodedCommand())); + ::testing::ContainerEq(cmd->GetEncodedCommand())); // Expect null result with incorrectly sized key handle key_handle.push_back(0x0f); cmd = U2fApduCommand::CreateSign(appid, challenge, key_handle); @@ -224,7 +224,7 @@ EXPECT_EQ(0, encoded[2] & 0x80); EXPECT_THAT(U2fApduCommand::CreateFromMessage(cmd->GetEncodedCommand()) ->GetEncodedCommand(), - testing::ContainerEq(encoded)); + ::testing::ContainerEq(encoded)); cmd = U2fApduCommand::CreateRegister(appid, challenge, kIndividualAttestation); @@ -252,10 +252,10 @@ std::vector<uint8_t> expected = { 0x0, U2fApduCommand::kInsU2fVersion, 0x0, 0x0, 0x0, 0x0, 0x0}; - EXPECT_THAT(expected, testing::ContainerEq(cmd->GetEncodedCommand())); + EXPECT_THAT(expected, ::testing::ContainerEq(cmd->GetEncodedCommand())); EXPECT_THAT(U2fApduCommand::CreateFromMessage(cmd->GetEncodedCommand()) ->GetEncodedCommand(), - testing::ContainerEq(cmd->GetEncodedCommand())); + ::testing::ContainerEq(cmd->GetEncodedCommand())); } TEST_F(U2fApduTest, TestCreateLegacyVersion) { @@ -265,9 +265,9 @@ std::vector<uint8_t> expected = { 0x0, U2fApduCommand::kInsU2fVersion, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; - EXPECT_THAT(expected, testing::ContainerEq(cmd->GetEncodedCommand())); + EXPECT_THAT(expected, ::testing::ContainerEq(cmd->GetEncodedCommand())); EXPECT_THAT(U2fApduCommand::CreateFromMessage(cmd->GetEncodedCommand()) ->GetEncodedCommand(), - testing::ContainerEq(cmd->GetEncodedCommand())); + ::testing::ContainerEq(cmd->GetEncodedCommand())); } } // namespace device
diff --git a/device/fido/u2f_hid_device_unittest.cc b/device/fido/u2f_hid_device_unittest.cc index 97dba85..23258eace 100644 --- a/device/fido/u2f_hid_device_unittest.cc +++ b/device/fido/u2f_hid_device_unittest.cc
@@ -199,7 +199,7 @@ base::RunLoop run_loop_; }; -class U2fHidDeviceTest : public testing::Test { +class U2fHidDeviceTest : public ::testing::Test { public: U2fHidDeviceTest() : scoped_task_environment_(
diff --git a/device/fido/u2f_hid_discovery_unittest.cc b/device/fido/u2f_hid_discovery_unittest.cc index c401bba..d0e3896e 100644 --- a/device/fido/u2f_hid_discovery_unittest.cc +++ b/device/fido/u2f_hid_discovery_unittest.cc
@@ -54,7 +54,7 @@ } // namespace -class U2fHidDiscoveryTest : public testing::Test { +class U2fHidDiscoveryTest : public ::testing::Test { public: base::test::ScopedTaskEnvironment& scoped_task_environment() { return scoped_task_environment_;
diff --git a/device/fido/u2f_register_unittest.cc b/device/fido/u2f_register_unittest.cc index 48f7365a..2d182a8f 100644 --- a/device/fido/u2f_register_unittest.cc +++ b/device/fido/u2f_register_unittest.cc
@@ -298,7 +298,7 @@ } // namespace -class U2fRegisterTest : public testing::Test { +class U2fRegisterTest : public ::testing::Test { public: U2fRegisterTest() : scoped_task_environment_( @@ -364,7 +364,7 @@ ASSERT_TRUE(register_command_without_individual_attestation); EXPECT_THAT( register_command_without_individual_attestation->GetEncodedCommand(), - testing::ElementsAreArray(kRegisterApduCommandWithoutAttestation)); + ::testing::ElementsAreArray(kRegisterApduCommandWithoutAttestation)); constexpr uint8_t kRegisterApduCommandWithAttestation[] = { // clang-format off @@ -388,7 +388,7 @@ ASSERT_TRUE(register_command_with_individual_attestation); EXPECT_THAT(register_command_with_individual_attestation->GetEncodedCommand(), - testing::ElementsAreArray(kRegisterApduCommandWithAttestation)); + ::testing::ElementsAreArray(kRegisterApduCommandWithAttestation)); } TEST_F(U2fRegisterTest, TestRegisterSuccess) { @@ -404,15 +404,15 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); EXPECT_CALL(*device, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>& @@ -434,18 +434,18 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); // Go through the state machine twice before success. EXPECT_CALL(*device, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::NotSatisfied)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::NotSatisfied)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); EXPECT_CALL(*device, TryWinkRef(_)) .Times(2) - .WillRepeatedly(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillRepeatedly(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>& @@ -467,26 +467,26 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device0 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device0, GetId()).WillRepeatedly(testing::Return("device0")); + EXPECT_CALL(*device0, GetId()).WillRepeatedly(::testing::Return("device0")); EXPECT_CALL(*device0, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::NotSatisfied)); + .WillOnce(::testing::Invoke(MockU2fDevice::NotSatisfied)); // One wink per device. EXPECT_CALL(*device0, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device0)); // Second device will have a successful touch. auto device1 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device1, GetId()).WillRepeatedly(testing::Return("device1")); + EXPECT_CALL(*device1, GetId()).WillRepeatedly(::testing::Return("device1")); EXPECT_CALL(*device1, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); // One wink per device. EXPECT_CALL(*device1, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device1)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>& @@ -516,11 +516,11 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); // DeviceTransact() will be called four times including three check // only sign-in calls and one registration call. For the first three calls, // device will invoke MockU2fDevice::WrongData as the authenticator did not @@ -528,16 +528,16 @@ // call, MockU2fDevice::NoErrorRegister will be invoked after registration. EXPECT_CALL(*device.get(), DeviceTransactPtr(_, _)) .Times(4) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); // TryWink() will be called twice. First during the check only sign-in. After // check only sign operation is complete, request state is changed to IDLE, // and TryWink() is called again before Register() is called. EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)) + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>& @@ -566,42 +566,42 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device0 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device0, GetId()).WillRepeatedly(testing::Return("device0")); + EXPECT_CALL(*device0, GetId()).WillRepeatedly(::testing::Return("device0")); // DeviceTransact() will be called four times: three times to check for // duplicate key handles and once for registration. Since user // will register using "device1", the fourth call will invoke // MockU2fDevice::NotSatisfied. EXPECT_CALL(*device0, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NotSatisfied)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NotSatisfied)); // TryWink() will be called twice on both devices -- during check only // sign-in operation and during registration attempt. EXPECT_CALL(*device0, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)) + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device0)); auto device1 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device1, GetId()).WillRepeatedly(testing::Return("device1")); + EXPECT_CALL(*device1, GetId()).WillRepeatedly(::testing::Return("device1")); // We assume that user registers with second device. Therefore, the fourth // DeviceTransact() will invoke MockU2fDevice::NoErrorRegister after // successful registration. EXPECT_CALL(*device1, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); // TryWink() will be called twice on both devices -- during check only // sign-in operation and during registration attempt. EXPECT_CALL(*device1, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)) + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device1)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>& @@ -633,11 +633,11 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); // For four keys in exclude list, the first three keys will invoke // MockU2fDevice::WrongData and the final duplicate key handle will invoke // MockU2fDevice::NoErrorSign. Once duplicate key handle is found, bogus @@ -645,16 +645,16 @@ // MockU2fDevice::NoErrorRegister. EXPECT_CALL(*device, DeviceTransactPtr(_, _)) .Times(5) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorSign)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorSign)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); // Since duplicate key handle is found, registration process is terminated // before actual Register() is called on the device. Therefore, TryWink() is // invoked once. EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>& @@ -684,27 +684,27 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device0 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device0, GetId()).WillRepeatedly(testing::Return("device0")); + EXPECT_CALL(*device0, GetId()).WillRepeatedly(::testing::Return("device0")); // Since the first device did not create any of the key handles provided in // exclude list, we expect that check only sign() should be called // four times, and all the calls to DeviceTransact() invoke // MockU2fDevice::WrongData. EXPECT_CALL(*device0, DeviceTransactPtr(_, _)) .Times(4) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)); EXPECT_CALL(*device0, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device0)); auto device1 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device1, GetId()).WillRepeatedly(testing::Return("device1")); + EXPECT_CALL(*device1, GetId()).WillRepeatedly(::testing::Return("device1")); // Since the last key handle in exclude list is a duplicate key, we expect // that the first three calls to check only sign() invoke // MockU2fDevice::WrongData and that fourth sign() call invoke @@ -713,13 +713,13 @@ // invokes MockU2fDevice::NoErrorRegister. EXPECT_CALL(*device1, DeviceTransactPtr(_, _)) .Times(5) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorSign)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorSign)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); EXPECT_CALL(*device1, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device1)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>& @@ -850,17 +850,17 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); EXPECT_CALL(*device, DeviceTransactPtr( IndicatesIndividualAttestation(individual_attestation), _)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); const std::pair<U2fReturnCode, base::Optional<RegisterResponseData>>&
diff --git a/device/fido/u2f_request_unittest.cc b/device/fido/u2f_request_unittest.cc index e6dcefb..8d85e3f 100644 --- a/device/fido/u2f_request_unittest.cc +++ b/device/fido/u2f_request_unittest.cc
@@ -59,7 +59,7 @@ } // namespace -class U2fRequestTest : public testing::Test { +class U2fRequestTest : public ::testing::Test { protected: base::test::ScopedTaskEnvironment scoped_task_environment_{ base::test::ScopedTaskEnvironment::MainThreadType::MOCK_TIME}; @@ -71,8 +71,8 @@ SetMockDiscovery(&request, std::make_unique<MockU2fDiscovery>()); auto device0 = std::make_unique<MockU2fDevice>(); auto device1 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device0, GetId()).WillRepeatedly(testing::Return("device0")); - EXPECT_CALL(*device1, GetId()).WillRepeatedly(testing::Return("device1")); + EXPECT_CALL(*device0, GetId()).WillRepeatedly(::testing::Return("device0")); + EXPECT_CALL(*device1, GetId()).WillRepeatedly(::testing::Return("device1")); // Add two U2F devices discovery->AddDevice(std::move(device0)); discovery->AddDevice(std::move(device1)); @@ -111,14 +111,14 @@ auto* discovery = SetMockDiscovery(&request, std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) - .WillOnce(testing::Invoke(discovery, &MockU2fDiscovery::StartSuccess)); + .WillOnce(::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccess)); request.Start(); // Add one U2F device auto device = std::make_unique<MockU2fDevice>(); EXPECT_CALL(*device, GetId()); EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); EXPECT_EQ(U2fRequest::State::BUSY, request.state_); @@ -133,7 +133,7 @@ FakeU2fRequest request; EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery.get(), &MockU2fDiscovery::StartSuccess)); + ::testing::Invoke(discovery.get(), &MockU2fDiscovery::StartSuccess)); SetMockDiscovery(&request, std::move(discovery)); request.Start(); @@ -151,17 +151,17 @@ EXPECT_CALL(*discoveries[0], Start()) .WillOnce( - testing::Invoke(discoveries[0], &MockU2fDiscovery::StartSuccess)); + ::testing::Invoke(discoveries[0], &MockU2fDiscovery::StartSuccess)); EXPECT_CALL(*discoveries[1], Start()) .WillOnce( - testing::Invoke(discoveries[1], &MockU2fDiscovery::StartSuccess)); + ::testing::Invoke(discoveries[1], &MockU2fDiscovery::StartSuccess)); request.Start(); // Let each discovery find a device. auto device_1 = std::make_unique<MockU2fDevice>(); auto device_2 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device_1, GetId()).WillRepeatedly(testing::Return("device_1")); - EXPECT_CALL(*device_2, GetId()).WillRepeatedly(testing::Return("device_2")); + EXPECT_CALL(*device_1, GetId()).WillRepeatedly(::testing::Return("device_1")); + EXPECT_CALL(*device_2, GetId()).WillRepeatedly(::testing::Return("device_2")); auto* device_1_ptr = device_1.get(); auto* device_2_ptr = device_2.get(); discoveries[0]->AddDevice(std::move(device_1)); @@ -180,7 +180,7 @@ // Add a third device. auto device_3 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device_3, GetId()).WillRepeatedly(testing::Return("device_3")); + EXPECT_CALL(*device_3, GetId()).WillRepeatedly(::testing::Return("device_3")); auto* device_3_ptr = device_3.get(); discoveries[0]->AddDevice(std::move(device_3)); @@ -208,7 +208,7 @@ EXPECT_CALL(*fast_discovery, Start()) .WillOnce( - testing::Invoke(fast_discovery, &MockU2fDiscovery::StartSuccess)); + ::testing::Invoke(fast_discovery, &MockU2fDiscovery::StartSuccess)); // slow_discovery does not succeed immediately. EXPECT_CALL(*slow_discovery, Start()); @@ -216,19 +216,21 @@ auto fast_device = std::make_unique<MockU2fDevice>(); auto slow_device = std::make_unique<MockU2fDevice>(); EXPECT_CALL(*fast_device, GetId()) - .WillRepeatedly(testing::Return("fast_device")); + .WillRepeatedly(::testing::Return("fast_device")); EXPECT_CALL(*slow_device, GetId()) - .WillRepeatedly(testing::Return("slow_device")); + .WillRepeatedly(::testing::Return("slow_device")); bool fast_winked = false; EXPECT_CALL(*fast_device, TryWinkRef(_)) - .WillOnce(testing::DoAll(testing::Assign(&fast_winked, true), - testing::Invoke(MockU2fDevice::WinkDoNothing))) - .WillRepeatedly(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce( + ::testing::DoAll(::testing::Assign(&fast_winked, true), + ::testing::Invoke(MockU2fDevice::WinkDoNothing))) + .WillRepeatedly(::testing::Invoke(MockU2fDevice::WinkDoNothing)); bool slow_winked = false; EXPECT_CALL(*slow_device, TryWinkRef(_)) - .WillOnce(testing::DoAll(testing::Assign(&slow_winked, true), - testing::Invoke(MockU2fDevice::WinkDoNothing))); + .WillOnce( + ::testing::DoAll(::testing::Assign(&slow_winked, true), + ::testing::Invoke(MockU2fDevice::WinkDoNothing))); auto* fast_device_ptr = fast_device.get(); auto* slow_device_ptr = slow_device.get(); fast_discovery->AddDeviceWithoutNotification(std::move(fast_device)); @@ -288,10 +290,10 @@ EXPECT_CALL(*discoveries[0], Start()) .WillOnce( - testing::Invoke(discoveries[0], &MockU2fDiscovery::StartFailure)); + ::testing::Invoke(discoveries[0], &MockU2fDiscovery::StartFailure)); EXPECT_CALL(*discoveries[1], Start()) .WillOnce( - testing::Invoke(discoveries[1], &MockU2fDiscovery::StartFailure)); + ::testing::Invoke(discoveries[1], &MockU2fDiscovery::StartFailure)); request.Start(); EXPECT_EQ(U2fRequest::State::OFF, request.state_); } @@ -307,15 +309,16 @@ EXPECT_CALL(*discoveries[0], Start()) .WillOnce( - testing::Invoke(discoveries[0], &MockU2fDiscovery::StartSuccess)); + ::testing::Invoke(discoveries[0], &MockU2fDiscovery::StartSuccess)); EXPECT_CALL(*discoveries[1], Start()) .WillOnce( - testing::Invoke(discoveries[1], &MockU2fDiscovery::StartFailure)); + ::testing::Invoke(discoveries[1], &MockU2fDiscovery::StartFailure)); auto device0 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device0, GetId()).WillRepeatedly(testing::Return("device_0")); + EXPECT_CALL(*device0, GetId()) + .WillRepeatedly(::testing::Return("device_0")); EXPECT_CALL(*device0, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discoveries[0]->AddDevice(std::move(device0)); request.Start(); @@ -328,9 +331,10 @@ // Adding another device should trigger examination and a busy state. auto device1 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device1, GetId()).WillRepeatedly(testing::Return("device_1")); + EXPECT_CALL(*device1, GetId()) + .WillRepeatedly(::testing::Return("device_1")); EXPECT_CALL(*device1, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discoveries[0]->AddDevice(std::move(device1)); request.Transition(); @@ -342,14 +346,14 @@ constexpr uint8_t kEncodedU2fVersionRequest[] = {0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}; EXPECT_THAT(U2fRequest::GetU2fVersionApduCommand(false)->GetEncodedCommand(), - testing::ElementsAreArray(kEncodedU2fVersionRequest)); + ::testing::ElementsAreArray(kEncodedU2fVersionRequest)); // Legacy version command contains 2 extra null bytes compared to ISO 7816-4 // format. constexpr uint8_t kEncodedU2fLegacyVersionRequest[] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; EXPECT_THAT(U2fRequest::GetU2fVersionApduCommand(true)->GetEncodedCommand(), - testing::ElementsAreArray(kEncodedU2fLegacyVersionRequest)); + ::testing::ElementsAreArray(kEncodedU2fLegacyVersionRequest)); } } // namespace device
diff --git a/device/fido/u2f_sign_unittest.cc b/device/fido/u2f_sign_unittest.cc index 82847f2..cf8a4d0 100644 --- a/device/fido/u2f_sign_unittest.cc +++ b/device/fido/u2f_sign_unittest.cc
@@ -112,7 +112,7 @@ } // namespace -class U2fSignTest : public testing::Test { +class U2fSignTest : public ::testing::Test { public: U2fSignTest() : scoped_task_environment_( @@ -192,7 +192,7 @@ const auto encoded_sign = u2f_sign.GetU2fSignApduCommand(handles[0]); ASSERT_TRUE(encoded_sign); EXPECT_THAT(encoded_sign->GetEncodedCommand(), - testing::ElementsAreArray(kSignApduEncoded)); + ::testing::ElementsAreArray(kSignApduEncoded)); constexpr uint8_t kSignApduEncodedCheckOnly[] = { // clang-format off @@ -220,7 +220,7 @@ u2f_sign.GetU2fSignApduCommand(handles[0], true); ASSERT_TRUE(encoded_sign_check_only); EXPECT_THAT(encoded_sign_check_only->GetEncodedCommand(), - testing::ElementsAreArray(kSignApduEncodedCheckOnly)); + ::testing::ElementsAreArray(kSignApduEncodedCheckOnly)); } TEST_F(U2fSignTest, TestSignSuccess) { @@ -237,15 +237,15 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); EXPECT_CALL(*device, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorSign)); + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorSign)); EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); cb.WaitForCallback(); @@ -272,18 +272,18 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); // Go through the state machine twice before success. auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); EXPECT_CALL(*device, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::NotSatisfied)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorSign)); + .WillOnce(::testing::Invoke(MockU2fDevice::NotSatisfied)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorSign)); EXPECT_CALL(*device, TryWinkRef(_)) .Times(2) - .WillRepeatedly(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillRepeatedly(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); cb.WaitForCallback(); @@ -315,20 +315,20 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); // Wrong key would respond with SW_WRONG_DATA. - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); EXPECT_CALL(*device, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorSign)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorSign)); // Only one wink expected per device. EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); cb.WaitForCallback(); @@ -356,27 +356,27 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device0 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device0, GetId()).WillRepeatedly(testing::Return("device0")); + EXPECT_CALL(*device0, GetId()).WillRepeatedly(::testing::Return("device0")); EXPECT_CALL(*device0, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NotSatisfied)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NotSatisfied)); // One wink per device. EXPECT_CALL(*device0, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device0)); // Second device will have a successful touch. auto device1 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device1, GetId()).WillRepeatedly(testing::Return("device1")); + EXPECT_CALL(*device1, GetId()).WillRepeatedly(::testing::Return("device1")); EXPECT_CALL(*device1, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorSign)); + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorSign)); // One wink per device. EXPECT_CALL(*device1, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device1)); cb.WaitForCallback(); @@ -404,30 +404,30 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device0 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device0, GetId()).WillRepeatedly(testing::Return("device0")); + EXPECT_CALL(*device0, GetId()).WillRepeatedly(::testing::Return("device0")); EXPECT_CALL(*device0, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NotSatisfied)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NotSatisfied)); // One wink per device. EXPECT_CALL(*device0, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device0)); // Second device will be have a successful touch. auto device1 = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device1, GetId()).WillRepeatedly(testing::Return("device1")); + EXPECT_CALL(*device1, GetId()).WillRepeatedly(::testing::Return("device1")); // Both keys will be tried, when both fail, register is tried on that device. EXPECT_CALL(*device1, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorRegister)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)) + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorRegister)); // One wink per device. EXPECT_CALL(*device1, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device1)); cb.WaitForCallback(); @@ -513,15 +513,15 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); EXPECT_CALL(*device, DeviceTransactPtr(_, _)) - .WillOnce(testing::Invoke(MockU2fDevice::SignWithCorruptedResponse)); + .WillOnce(::testing::Invoke(MockU2fDevice::SignWithCorruptedResponse)); EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); cb.WaitForCallback(); @@ -561,21 +561,21 @@ SetMockDiscovery(request.get(), std::make_unique<MockU2fDiscovery>()); EXPECT_CALL(*discovery, Start()) .WillOnce( - testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); + ::testing::Invoke(discovery, &MockU2fDiscovery::StartSuccessAsync)); request->Start(); auto device = std::make_unique<MockU2fDevice>(); - EXPECT_CALL(*device, GetId()).WillRepeatedly(testing::Return("device")); + EXPECT_CALL(*device, GetId()).WillRepeatedly(::testing::Return("device")); // The first request will use the primary app_param, which will be rejected. EXPECT_CALL(*device, DeviceTransactPtr(WithApplicationParameter(primary_app_param), _)) - .WillOnce(testing::Invoke(MockU2fDevice::WrongData)); + .WillOnce(::testing::Invoke(MockU2fDevice::WrongData)); // After the rejection, the alternative should be tried. EXPECT_CALL(*device, DeviceTransactPtr(WithApplicationParameter(alt_app_param), _)) - .WillOnce(testing::Invoke(MockU2fDevice::NoErrorSign)); + .WillOnce(::testing::Invoke(MockU2fDevice::NoErrorSign)); EXPECT_CALL(*device, TryWinkRef(_)) - .WillOnce(testing::Invoke(MockU2fDevice::WinkDoNothing)); + .WillOnce(::testing::Invoke(MockU2fDevice::WinkDoNothing)); discovery->AddDevice(std::move(device)); cb.WaitForCallback();
diff --git a/device/gamepad/gamepad_standard_mappings_linux.cc b/device/gamepad/gamepad_standard_mappings_linux.cc index 9755456..7077b6cc 100644 --- a/device/gamepad/gamepad_standard_mappings_linux.cc +++ b/device/gamepad/gamepad_standard_mappings_linux.cc
@@ -491,6 +491,23 @@ mapped->axes_length = AXIS_INDEX_COUNT; } +void MapperLogitechDInput(const Gamepad& input, Gamepad* mapped) { + *mapped = input; + mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[1]; + mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[2]; + mapped->buttons[BUTTON_INDEX_TERTIARY] = input.buttons[0]; + mapped->buttons[BUTTON_INDEX_DPAD_UP] = AxisNegativeAsButton(input.axes[5]); + mapped->buttons[BUTTON_INDEX_DPAD_DOWN] = AxisPositiveAsButton(input.axes[5]); + mapped->buttons[BUTTON_INDEX_DPAD_LEFT] = AxisNegativeAsButton(input.axes[4]); + mapped->buttons[BUTTON_INDEX_DPAD_RIGHT] = + AxisPositiveAsButton(input.axes[4]); + + // The Logitech button (BUTTON_INDEX_META) is not accessible through the + // device's D-mode. + mapped->buttons_length = BUTTON_INDEX_COUNT - 1; + mapped->axes_length = AXIS_INDEX_COUNT; +} + struct MappingData { const char* const vendor_id; const char* const product_id; @@ -509,9 +526,12 @@ {"045e", "02ea", MapperXInputStyleGamepad}, // Xbox One S (USB) {"045e", "02fd", MapperXboxOneS}, // Xbox One S (Bluetooth) {"045e", "0719", MapperXInputStyleGamepad}, // Xbox 360 Wireless - {"046d", "c21d", MapperXInputStyleGamepad}, // Logitech F310 - {"046d", "c21e", MapperXInputStyleGamepad}, // Logitech F510 - {"046d", "c21f", MapperXInputStyleGamepad}, // Logitech F710 + {"046d", "c216", MapperLogitechDInput}, // Logitech F310 D-mode + {"046d", "c218", MapperLogitechDInput}, // Logitech F510 D-mode + {"046d", "c219", MapperLogitechDInput}, // Logitech F710 D-mode + {"046d", "c21d", MapperXInputStyleGamepad}, // Logitech F310 X-mode + {"046d", "c21e", MapperXInputStyleGamepad}, // Logitech F510 X-mode + {"046d", "c21f", MapperXInputStyleGamepad}, // Logitech F710 X-mode {"04e8", "a000", MapperSamsung_EI_GP20}, // Samsung Gamepad EI-GP20 {"054c", "0268", MapperDualshock3SixAxis}, // Dualshock 3 / SIXAXIS {"054c", "05c4", MapperDualshock4}, // Playstation Dualshock 4
diff --git a/device/gamepad/gamepad_standard_mappings_win.cc b/device/gamepad/gamepad_standard_mappings_win.cc index 54bbc5f..6d4a33e 100644 --- a/device/gamepad/gamepad_standard_mappings_win.cc +++ b/device/gamepad/gamepad_standard_mappings_win.cc
@@ -11,7 +11,7 @@ namespace { -void MapperLogitechDualAction(const Gamepad& input, Gamepad* mapped) { +void MapperLogitechDInput(const Gamepad& input, Gamepad* mapped) { *mapped = input; mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[1]; mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[2]; @@ -19,7 +19,9 @@ mapped->axes[AXIS_INDEX_RIGHT_STICK_Y] = input.axes[5]; DpadFromAxis(mapped, input.axes[9]); - mapped->buttons_length = BUTTON_INDEX_COUNT; + // The Logitech button (BUTTON_INDEX_META) is not accessible through the + // device's D-mode. + mapped->buttons_length = BUTTON_INDEX_COUNT - 1; mapped->axes_length = AXIS_INDEX_COUNT; } @@ -234,16 +236,18 @@ GamepadStandardMappingFunction function; } AvailableMappings[] = { // http://www.linux-usb.org/usb.ids - {"0079", "0011", Mapper2Axes8Keys}, // 2Axes 8Keys Game Pad - {"046d", "c216", MapperLogitechDualAction}, // Logitech DualAction - {"054c", "05c4", MapperDualshock4}, // Playstation Dualshock 4 - {"054c", "09cc", MapperDualshock4}, // Dualshock 4 (PS4 Slim) - {"054c", "0ba0", MapperDualshock4}, // Dualshock 4 USB receiver - {"0583", "2060", MapperIBuffalo}, // iBuffalo Classic - {"0955", "7210", MapperNvShield}, // Nvidia Shield gamepad - {"0b05", "4500", MapperADT1}, // Nexus Player Controller - {"1532", "0900", MapperRazerServal}, // Razer Serval Controller - {"18d1", "2c40", MapperADT1}, // ADT-1 Controller + {"0079", "0011", Mapper2Axes8Keys}, // 2Axes 8Keys Game Pad + {"046d", "c216", MapperLogitechDInput}, // Logitech F310, D-mode + {"046d", "c218", MapperLogitechDInput}, // Logitech F510, D-mode + {"046d", "c219", MapperLogitechDInput}, // Logitech F710, D-mode + {"054c", "05c4", MapperDualshock4}, // Playstation Dualshock 4 + {"054c", "09cc", MapperDualshock4}, // Dualshock 4 (PS4 Slim) + {"054c", "0ba0", MapperDualshock4}, // Dualshock 4 USB receiver + {"0583", "2060", MapperIBuffalo}, // iBuffalo Classic + {"0955", "7210", MapperNvShield}, // Nvidia Shield gamepad + {"0b05", "4500", MapperADT1}, // Nexus Player Controller + {"1532", "0900", MapperRazerServal}, // Razer Serval Controller + {"18d1", "2c40", MapperADT1}, // ADT-1 Controller {"20d6", "6271", MapperMogaPro}, // Moga Pro Controller (HID mode) {"2378", "1008", MapperOnLiveWireless}, // OnLive Controller (Bluetooth) {"2378", "100a", MapperOnLiveWireless}, // OnLive Controller (Wired)
diff --git a/device/sensors/BUILD.gn b/device/sensors/BUILD.gn deleted file mode 100644 index 2371a65..0000000 --- a/device/sensors/BUILD.gn +++ /dev/null
@@ -1,113 +0,0 @@ -# Copyright 2017 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. - -import("//build/config/features.gni") - -if (is_android) { - import("//build/config/android/rules.gni") # For generate_jni(). -} - -component("sensors") { - sources = [ - "data_fetcher_shared_memory.h", - "data_fetcher_shared_memory_android.cc", - "data_fetcher_shared_memory_base.cc", - "data_fetcher_shared_memory_base.h", - "data_fetcher_shared_memory_chromeos.cc", - "data_fetcher_shared_memory_default.cc", - "data_fetcher_shared_memory_mac.cc", - "data_fetcher_shared_memory_win.cc", - "device_sensor_export.h", - "device_sensor_host.cc", - "device_sensor_host.h", - "device_sensor_service.cc", - "device_sensor_service.h", - "device_sensors_consts.h", - "sensor_manager_android.cc", - "sensor_manager_android.h", - "sensor_manager_chromeos.cc", - "sensor_manager_chromeos.h", - ] - - defines = [ "DEVICE_SENSOR_IMPLEMENTATION" ] - - deps = [ - "//base", - "//device/sensors/public/cpp:full", - "//mojo/public/cpp/bindings", - "//ui/gfx/geometry:geometry", - ] - - public_deps = [ - "//device/sensors/public/mojom", - ] - - if (is_win) { - sources -= [ "data_fetcher_shared_memory_default.cc" ] - libs = [ - "sensorsapi.lib", - "portabledeviceguids.lib", - ] - } - if (is_android) { - sources -= [ "data_fetcher_shared_memory_default.cc" ] - deps += [ ":device_sensors_jni_headers" ] - } - if (is_mac) { - sources -= [ "data_fetcher_shared_memory_default.cc" ] - deps += [ "//third_party/sudden_motion_sensor" ] - libs = [ - "CoreFoundation.framework", - "IOKit.framework", - ] - } - if (is_chromeos) { - sources -= [ "data_fetcher_shared_memory_default.cc" ] - deps += [ - "//chromeos", - "//ui/gfx", - ] - } - if (is_fuchsia) { - sources += [ "data_fetcher_shared_memory_fuchsia.cc" ] - sources -= [ "data_fetcher_shared_memory_default.cc" ] - } -} - -if (is_android) { - generate_jni("device_sensors_jni_headers") { - sources = [ - "android/java/src/org/chromium/device/sensors/DeviceSensors.java", - ] - jni_package = "sensors" - } - - android_library("java") { - java_files = - [ "android/java/src/org/chromium/device/sensors/DeviceSensors.java" ] - deps = [ - "//base:base_java", - "//third_party/android_tools:android_support_annotations_java", - ] - srcjar_deps = [ ":device_sensors_android_java_enums_srcjar" ] - } - - android_library("javatests") { - testonly = true - java_files = [ "android/javatests/src/org/chromium/device/sensors/DeviceSensorsTest.java" ] - deps = [ - ":java", - "//base:base_java_test_support", - "//third_party/android_support_test_runner:runner_java", - "//third_party/junit", - ] - } - - java_cpp_enum("device_sensors_android_java_enums_srcjar") { - sources = [ - "device_sensors_consts.h", - "sensor_manager_android.h", - ] - } -}
diff --git a/device/sensors/DEPS b/device/sensors/DEPS deleted file mode 100644 index 7695ca6..0000000 --- a/device/sensors/DEPS +++ /dev/null
@@ -1,5 +0,0 @@ -include_rules = [ - "+jni", - "+third_party/sudden_motion_sensor", - "+ui/gfx", -]
diff --git a/device/sensors/OWNERS b/device/sensors/OWNERS deleted file mode 100644 index 7b1e4f2..0000000 --- a/device/sensors/OWNERS +++ /dev/null
@@ -1,4 +0,0 @@ -timvolodine@chromium.org - -# COMPONENT: Blink>Sensor>DeviceOrientation -# TEAM: device-dev@chromium.org
diff --git a/device/sensors/README.md b/device/sensors/README.md deleted file mode 100644 index d92152c..0000000 --- a/device/sensors/README.md +++ /dev/null
@@ -1,20 +0,0 @@ -# Sensors - -`device/sensors` contains the platform-specific parts of the [DeviceOrientation -Events](https://www.w3.org/TR/orientation-event/) implementation. - -* Sensor [Mojo](../../mojo/README.md) interfaces are defined in the - `public/mojom` subdirectory. -* The content renderer layer is located in `content/renderer/device_sensors`. -* The web exposed API is implemented in - `third_party/WebKit/Source/modules/device_orientation`. - -## Testing - -* Browser tests are located in `content/browser/device_sensors`. -* Layout tests are located in - `third_party/WebKit/LayoutTests/device_orientation`. -* Web platform tests are located in - `third_party/WebKit/LayoutTests/external/wpt/orientation-event` and are a - mirror of the [web-platform-tests GitHub - repository](https://github.com/w3c/web-platform-tests).
diff --git a/device/sensors/android/java/src/org/chromium/device/sensors/DeviceSensors.java b/device/sensors/android/java/src/org/chromium/device/sensors/DeviceSensors.java deleted file mode 100644 index bf63d2b..0000000 --- a/device/sensors/android/java/src/org/chromium/device/sensors/DeviceSensors.java +++ /dev/null
@@ -1,705 +0,0 @@ -// Copyright 2014 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. - -package org.chromium.device.sensors; - -import android.content.Context; -import android.hardware.Sensor; -import android.hardware.SensorEvent; -import android.hardware.SensorEventListener; -import android.hardware.SensorManager; -import android.os.Handler; -import android.os.HandlerThread; - -import org.chromium.base.CollectionUtil; -import org.chromium.base.ContextUtils; -import org.chromium.base.Log; -import org.chromium.base.ThreadUtils; -import org.chromium.base.VisibleForTesting; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -/** - * Android implementation of the device {motion|orientation} APIs. - */ -@JNINamespace("device") -class DeviceSensors implements SensorEventListener { - private static final String TAG = "DeviceSensors"; - - // Matches kEnableExperimentalWebPlatformFeatures. - private static final String EXPERIMENTAL_WEB_PLAFTORM_FEATURES = - "enable-experimental-web-platform-features"; - - // These fields are lazily initialized by getHandler(). - private Thread mThread; - private Handler mHandler; - - // The lock to access the mHandler. - private final Object mHandlerLock = new Object(); - - // Non-zero if and only if we're listening for events. - // To avoid race conditions on the C++ side, access must be synchronized. - private long mNativePtr; - - // The lock to access the mNativePtr. - private final Object mNativePtrLock = new Object(); - - // The geomagnetic vector expressed in the body frame. - private float[] mMagneticFieldVector; - - // Holds a shortened version of the rotation vector for compatibility purposes. - private float[] mTruncatedRotationVector; - - // Holds current rotation matrix for the device. - private float[] mDeviceRotationMatrix; - - // Holds Euler angles corresponding to the rotation matrix. - private double[] mRotationAngles; - - // Lazily initialized when registering for notifications. - private SensorManagerProxy mSensorManagerProxy; - - static final Set<Integer> DEVICE_ORIENTATION_SENSORS_A = - CollectionUtil.newHashSet(Sensor.TYPE_GAME_ROTATION_VECTOR); - static final Set<Integer> DEVICE_ORIENTATION_SENSORS_B = - CollectionUtil.newHashSet(Sensor.TYPE_ROTATION_VECTOR); - // Option C backup sensors are used when options A and B are not available. - static final Set<Integer> DEVICE_ORIENTATION_SENSORS_C = - CollectionUtil.newHashSet(Sensor.TYPE_ACCELEROMETER, Sensor.TYPE_MAGNETIC_FIELD); - - static final Set<Integer> DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A = - CollectionUtil.newHashSet(Sensor.TYPE_ROTATION_VECTOR); - static final Set<Integer> DEVICE_ORIENTATION_ABSOLUTE_SENSORS_B = - CollectionUtil.newHashSet(Sensor.TYPE_ACCELEROMETER, Sensor.TYPE_MAGNETIC_FIELD); - static final Set<Integer> DEVICE_MOTION_SENSORS = CollectionUtil.newHashSet( - Sensor.TYPE_ACCELEROMETER, Sensor.TYPE_LINEAR_ACCELERATION, Sensor.TYPE_GYROSCOPE); - - @VisibleForTesting - final Set<Integer> mActiveSensors = new HashSet<Integer>(); - final List<Set<Integer>> mOrientationSensorSets; - final List<Set<Integer>> mOrientationAbsoluteSensorSets; - Set<Integer> mDeviceOrientationSensors; - Set<Integer> mDeviceOrientationAbsoluteSensors; - boolean mDeviceMotionIsActive; - boolean mDeviceOrientationIsActive; - boolean mDeviceOrientationIsActiveWithBackupSensors; - boolean mDeviceOrientationAbsoluteIsActive; - boolean mDeviceOrientationAbsoluteIsActiveWithBackupSensors; - boolean mOrientationNotAvailable; - boolean mOrientationAbsoluteNotAvailable; - - protected DeviceSensors() { - mOrientationSensorSets = CollectionUtil.newArrayList(DEVICE_ORIENTATION_SENSORS_A, - DEVICE_ORIENTATION_SENSORS_B, DEVICE_ORIENTATION_SENSORS_C); - mOrientationAbsoluteSensorSets = CollectionUtil.newArrayList( - DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A, DEVICE_ORIENTATION_ABSOLUTE_SENSORS_B); - } - - // For orientation we use a 3-way fallback approach where up to 3 different sets of sensors - // are attempted if necessary. The sensors to be used for orientation are determined in the - // following order: - // A: GAME_ROTATION_VECTOR (relative) - // B: ROTATION_VECTOR (absolute) - // C: combination of ACCELEROMETER and MAGNETIC_FIELD (absolute) - // Some of the sensors may not be available depending on the device and Android version, so - // the 3-way fallback ensures selection of the best possible option. - // Examples: - // * Nexus 9, Android 5.0.2 --> option A - // * Nexus 10, Android 5.1 --> option B - // * Moto G, Android 4.4.4 --> option C - @VisibleForTesting - protected boolean registerOrientationSensorsWithFallback(int rateInMicroseconds) { - if (mOrientationNotAvailable) return false; - if (mDeviceOrientationSensors != null) { - return registerSensors(mDeviceOrientationSensors, rateInMicroseconds, true); - } - ensureRotationStructuresAllocated(); - - for (Set<Integer> sensors : mOrientationSensorSets) { - mDeviceOrientationSensors = sensors; - if (registerSensors(mDeviceOrientationSensors, rateInMicroseconds, true)) return true; - } - - mOrientationNotAvailable = true; - mDeviceOrientationSensors = null; - nullifyRotationStructures(); - return false; - } - - // For absolute orientation we use a 2-way fallback approach where up to 2 different sets - // of sensors are attempted if necessary. - // The sensors to be used for absolute orientation are determined in the following order: - // A: ROTATION_VECTOR (absolute) - // B: combination of ACCELEROMETER and MAGNETIC_FIELD (absolute) - // Some of the sensors may not be available depending on the device and Android version, so - // the 2-way fallback ensures selection of the best possible option. - // Examples: - // * Samsung Edge, Android 6.0.1 --> option A - // * Samsung Galaxy A7, Android 5.0.2 --> option B - @VisibleForTesting - protected boolean registerOrientationAbsoluteSensorsWithFallback(int rateInMicroseconds) { - if (mOrientationAbsoluteNotAvailable) return false; - if (mDeviceOrientationAbsoluteSensors != null) { - return registerSensors(mDeviceOrientationAbsoluteSensors, rateInMicroseconds, true); - } - ensureRotationStructuresAllocated(); - - for (Set<Integer> sensors : mOrientationAbsoluteSensorSets) { - mDeviceOrientationAbsoluteSensors = sensors; - if (registerSensors(mDeviceOrientationAbsoluteSensors, rateInMicroseconds, true)) { - return true; - } - } - - mOrientationAbsoluteNotAvailable = true; - mDeviceOrientationAbsoluteSensors = null; - nullifyRotationStructures(); - return false; - } - - /** - * Start listening for sensor events. If this object is already listening - * for events, the old callback is unregistered first. - * - * @param nativePtr Value to pass to nativeGotOrientation() for each event. - * @param rateInMicroseconds Requested callback rate in microseconds. The - * actual rate may be higher. Unwanted events should be ignored. - * @param eventType Type of event to listen to, can be either DEVICE_ORIENTATION, - * DEVICE_ORIENTATION_ABSOLUTE or DEVICE_MOTION. - * @return True on success. - */ - @CalledByNative - public boolean start(long nativePtr, int eventType, int rateInMicroseconds) { - boolean success = false; - synchronized (mNativePtrLock) { - switch (eventType) { - case ConsumerType.ORIENTATION: - success = registerOrientationSensorsWithFallback(rateInMicroseconds); - break; - case ConsumerType.ORIENTATION_ABSOLUTE: - success = registerOrientationAbsoluteSensorsWithFallback(rateInMicroseconds); - break; - case ConsumerType.MOTION: - // note: device motion spec does not require all sensors to be available - success = registerSensors(DEVICE_MOTION_SENSORS, rateInMicroseconds, false); - break; - default: - Log.e(TAG, "Unknown event type: %d", eventType); - return false; - } - if (success) { - mNativePtr = nativePtr; - setEventTypeActive(eventType, true); - } - return success; - } - } - - @CalledByNative - public int getNumberActiveDeviceMotionSensors() { - Set<Integer> deviceMotionSensors = new HashSet<Integer>(DEVICE_MOTION_SENSORS); - deviceMotionSensors.removeAll(mActiveSensors); - return DEVICE_MOTION_SENSORS.size() - deviceMotionSensors.size(); - } - - @CalledByNative - public int getOrientationSensorTypeUsed() { - if (mOrientationNotAvailable) { - return OrientationSensorType.NOT_AVAILABLE; - } - if (mDeviceOrientationSensors == DEVICE_ORIENTATION_SENSORS_A) { - return OrientationSensorType.GAME_ROTATION_VECTOR; - } - if (mDeviceOrientationSensors == DEVICE_ORIENTATION_SENSORS_B) { - return OrientationSensorType.ROTATION_VECTOR; - } - if (mDeviceOrientationSensors == DEVICE_ORIENTATION_SENSORS_C) { - return OrientationSensorType.ACCELEROMETER_MAGNETIC; - } - - assert false; // should never happen - return OrientationSensorType.NOT_AVAILABLE; - } - - /** - * Stop listening to sensors for a given event type. Ensures that sensors are not disabled - * if they are still in use by a different event type. - * - * @param eventType Type of event to listen to, can be either DEVICE_ORIENTATION or - * DEVICE_MOTION. - * We strictly guarantee that the corresponding native*() methods will not be called - * after this method returns. - */ - @CalledByNative - public void stop(int eventType) { - Set<Integer> sensorsToRemainActive = new HashSet<Integer>(); - - synchronized (mNativePtrLock) { - if (mDeviceOrientationIsActive && eventType != ConsumerType.ORIENTATION) { - sensorsToRemainActive.addAll(mDeviceOrientationSensors); - } - - if (mDeviceOrientationAbsoluteIsActive - && eventType != ConsumerType.ORIENTATION_ABSOLUTE) { - sensorsToRemainActive.addAll(mDeviceOrientationAbsoluteSensors); - } - - if (mDeviceMotionIsActive && eventType != ConsumerType.MOTION) { - sensorsToRemainActive.addAll(DEVICE_MOTION_SENSORS); - } - - Set<Integer> sensorsToDeactivate = new HashSet<Integer>(mActiveSensors); - sensorsToDeactivate.removeAll(sensorsToRemainActive); - unregisterSensors(sensorsToDeactivate); - setEventTypeActive(eventType, false); - if (mActiveSensors.isEmpty()) { - mNativePtr = 0; - } - } - } - - @Override - public void onAccuracyChanged(Sensor sensor, int accuracy) { - // Nothing - } - - @Override - public void onSensorChanged(SensorEvent event) { - sensorChanged(event.sensor.getType(), event.values); - } - - @VisibleForTesting - void sensorChanged(int type, float[] values) { - switch (type) { - case Sensor.TYPE_ACCELEROMETER: - if (mDeviceMotionIsActive) { - gotAccelerationIncludingGravity(values[0], values[1], values[2]); - } - if (mDeviceOrientationIsActiveWithBackupSensors - || mDeviceOrientationAbsoluteIsActiveWithBackupSensors) { - getOrientationFromGeomagneticVectors(values, mMagneticFieldVector); - } - break; - case Sensor.TYPE_LINEAR_ACCELERATION: - if (mDeviceMotionIsActive) { - gotAcceleration(values[0], values[1], values[2]); - } - break; - case Sensor.TYPE_GYROSCOPE: - if (mDeviceMotionIsActive) { - gotRotationRate(values[0], values[1], values[2]); - } - break; - case Sensor.TYPE_ROTATION_VECTOR: - boolean anglesComputed = false; - if (mDeviceOrientationAbsoluteIsActive - && mDeviceOrientationAbsoluteSensors - == DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A) { - convertRotationVectorToAngles(values, mRotationAngles); - anglesComputed = true; - gotOrientationAbsolute( - mRotationAngles[0], mRotationAngles[1], mRotationAngles[2]); - } - if (mDeviceOrientationIsActive - && mDeviceOrientationSensors == DEVICE_ORIENTATION_SENSORS_B) { - if (!anglesComputed) { - // only compute if not already computed for absolute orientation above. - convertRotationVectorToAngles(values, mRotationAngles); - } - gotOrientation(mRotationAngles[0], mRotationAngles[1], mRotationAngles[2]); - } - break; - case Sensor.TYPE_GAME_ROTATION_VECTOR: - if (mDeviceOrientationIsActive) { - convertRotationVectorToAngles(values, mRotationAngles); - gotOrientation(mRotationAngles[0], mRotationAngles[1], mRotationAngles[2]); - } - break; - case Sensor.TYPE_MAGNETIC_FIELD: - if (mDeviceOrientationIsActiveWithBackupSensors - || mDeviceOrientationAbsoluteIsActiveWithBackupSensors) { - if (mMagneticFieldVector == null) { - mMagneticFieldVector = new float[3]; - } - System.arraycopy( - values, 0, mMagneticFieldVector, 0, mMagneticFieldVector.length); - } - break; - default: - // Unexpected - return; - } - } - - /** - * Returns orientation angles from a rotation matrix, such that the angles are according - * to spec {@link http://dev.w3.org/geo/api/spec-source-orientation.html}. - * <p> - * It is assumed the rotation matrix transforms a 3D column vector from device coordinate system - * to the world's coordinate system, as e.g. computed by {@see SensorManager.getRotationMatrix}. - * <p> - * In particular we compute the decomposition of a given rotation matrix R such that <br> - * R = Rz(alpha) * Rx(beta) * Ry(gamma), <br> - * where Rz, Rx and Ry are rotation matrices around Z, X and Y axes in the world coordinate - * reference frame respectively. The reference frame consists of three orthogonal axes X, Y, Z - * where X points East, Y points north and Z points upwards perpendicular to the ground plane. - * The computed angles alpha, beta and gamma are in radians and clockwise-positive when viewed - * along the positive direction of the corresponding axis. Except for the special case when the - * beta angle is +-pi/2 these angles uniquely define the orientation of a mobile device in 3D - * space. The alpha-beta-gamma representation resembles the yaw-pitch-roll convention used in - * vehicle dynamics, however it does not exactly match it. One of the differences is that the - * 'pitch' angle beta is allowed to be within [-pi, pi). A mobile device with pitch angle - * greater than pi/2 could correspond to a user lying down and looking upward at the screen. - * - * <p> - * Upon return the array values is filled with the result, - * <ul> - * <li>values[0]: rotation around the Z axis, alpha in [0, 2*pi)</li> - * <li>values[1]: rotation around the X axis, beta in [-pi, pi)</li> - * <li>values[2]: rotation around the Y axis, gamma in [-pi/2, pi/2)</li> - * </ul> - * <p> - * - * @param matrixR - * a 3x3 rotation matrix {@see SensorManager.getRotationMatrix}. - * - * @param values - * an array of 3 doubles to hold the result. - * - * @return the array values passed as argument. - */ - @VisibleForTesting - public static double[] computeDeviceOrientationFromRotationMatrix( - float[] matrixR, double[] values) { - /* - * 3x3 (length=9) case: - * / R[ 0] R[ 1] R[ 2] \ - * | R[ 3] R[ 4] R[ 5] | - * \ R[ 6] R[ 7] R[ 8] / - * - */ - if (matrixR.length != 9) return values; - - if (matrixR[8] > 0) { // cos(beta) > 0 - values[0] = Math.atan2(-matrixR[1], matrixR[4]); - values[1] = Math.asin(matrixR[7]); // beta (-pi/2, pi/2) - values[2] = Math.atan2(-matrixR[6], matrixR[8]); // gamma (-pi/2, pi/2) - } else if (matrixR[8] < 0) { // cos(beta) < 0 - values[0] = Math.atan2(matrixR[1], -matrixR[4]); - values[1] = -Math.asin(matrixR[7]); - values[1] += (values[1] >= 0) ? -Math.PI : Math.PI; // beta [-pi,-pi/2) U (pi/2,pi) - values[2] = Math.atan2(matrixR[6], -matrixR[8]); // gamma (-pi/2, pi/2) - } else { // R[8] == 0 - if (matrixR[6] > 0) { // cos(gamma) == 0, cos(beta) > 0 - values[0] = Math.atan2(-matrixR[1], matrixR[4]); - values[1] = Math.asin(matrixR[7]); // beta [-pi/2, pi/2] - values[2] = -Math.PI / 2; // gamma = -pi/2 - } else if (matrixR[6] < 0) { // cos(gamma) == 0, cos(beta) < 0 - values[0] = Math.atan2(matrixR[1], -matrixR[4]); - values[1] = -Math.asin(matrixR[7]); - values[1] += (values[1] >= 0) ? -Math.PI : Math.PI; // beta [-pi,-pi/2) U (pi/2,pi) - values[2] = -Math.PI / 2; // gamma = -pi/2 - } else { // R[6] == 0, cos(beta) == 0 - // gimbal lock discontinuity - values[0] = Math.atan2(matrixR[3], matrixR[0]); - values[1] = (matrixR[7] > 0) ? Math.PI / 2 : -Math.PI / 2; // beta = +-pi/2 - values[2] = 0; // gamma = 0 - } - } - - // alpha is in [-pi, pi], make sure it is in [0, 2*pi). - if (values[0] < 0) { - values[0] += 2 * Math.PI; // alpha [0, 2*pi) - } - - return values; - } - - /* - * Converts a given rotation vector to its Euler angles representation. The angles - * are in degrees. - */ - public void convertRotationVectorToAngles(float[] rotationVector, double[] angles) { - if (rotationVector.length > 4) { - // On some Samsung devices SensorManager.getRotationMatrixFromVector - // appears to throw an exception if rotation vector has length > 4. - // For the purposes of this class the first 4 values of the - // rotation vector are sufficient (see crbug.com/335298 for details). - System.arraycopy(rotationVector, 0, mTruncatedRotationVector, 0, 4); - SensorManager.getRotationMatrixFromVector( - mDeviceRotationMatrix, mTruncatedRotationVector); - } else { - SensorManager.getRotationMatrixFromVector(mDeviceRotationMatrix, rotationVector); - } - computeDeviceOrientationFromRotationMatrix(mDeviceRotationMatrix, angles); - for (int i = 0; i < 3; i++) { - angles[i] = Math.toDegrees(angles[i]); - } - } - - private void getOrientationFromGeomagneticVectors(float[] acceleration, float[] magnetic) { - if (acceleration == null || magnetic == null) { - return; - } - if (!SensorManager.getRotationMatrix(mDeviceRotationMatrix, null, acceleration, magnetic)) { - return; - } - computeDeviceOrientationFromRotationMatrix(mDeviceRotationMatrix, mRotationAngles); - - double alpha = Math.toDegrees(mRotationAngles[0]); - double beta = Math.toDegrees(mRotationAngles[1]); - double gamma = Math.toDegrees(mRotationAngles[2]); - if (mDeviceOrientationIsActiveWithBackupSensors) { - gotOrientation(alpha, beta, gamma); - } - if (mDeviceOrientationAbsoluteIsActiveWithBackupSensors) { - gotOrientationAbsolute(alpha, beta, gamma); - } - } - - private SensorManagerProxy getSensorManagerProxy() { - if (mSensorManagerProxy != null) { - return mSensorManagerProxy; - } - - ThreadUtils.assertOnUiThread(); - SensorManager sensorManager = - (SensorManager) ContextUtils.getApplicationContext().getSystemService( - Context.SENSOR_SERVICE); - - if (sensorManager != null) { - mSensorManagerProxy = new SensorManagerProxyImpl(sensorManager); - } - return mSensorManagerProxy; - } - - @VisibleForTesting - void setSensorManagerProxy(SensorManagerProxy sensorManagerProxy) { - mSensorManagerProxy = sensorManagerProxy; - } - - private void setEventTypeActive(int eventType, boolean active) { - switch (eventType) { - case ConsumerType.ORIENTATION: - mDeviceOrientationIsActive = active; - mDeviceOrientationIsActiveWithBackupSensors = - active && (mDeviceOrientationSensors == DEVICE_ORIENTATION_SENSORS_C); - return; - case ConsumerType.ORIENTATION_ABSOLUTE: - mDeviceOrientationAbsoluteIsActive = active; - mDeviceOrientationAbsoluteIsActiveWithBackupSensors = active - && (mDeviceOrientationAbsoluteSensors - == DEVICE_ORIENTATION_ABSOLUTE_SENSORS_B); - return; - case ConsumerType.MOTION: - mDeviceMotionIsActive = active; - return; - } - } - - private void ensureRotationStructuresAllocated() { - if (mDeviceRotationMatrix == null) { - mDeviceRotationMatrix = new float[9]; - } - if (mRotationAngles == null) { - mRotationAngles = new double[3]; - } - if (mTruncatedRotationVector == null) { - mTruncatedRotationVector = new float[4]; - } - } - - private void nullifyRotationStructures() { - mDeviceRotationMatrix = null; - mRotationAngles = null; - mTruncatedRotationVector = null; - } - - /** - * @param sensorTypes List of sensors to activate. - * @param rateInMicroseconds Intended delay (in microseconds) between sensor readings. - * @param failOnMissingSensor If true the method returns true only if all sensors could be - * activated. When false the method return true if at least one - * sensor in sensorTypes could be activated. - */ - private boolean registerSensors( - Set<Integer> sensorTypes, int rateInMicroseconds, boolean failOnMissingSensor) { - Set<Integer> sensorsToActivate = new HashSet<Integer>(sensorTypes); - sensorsToActivate.removeAll(mActiveSensors); - if (sensorsToActivate.isEmpty()) return true; - - boolean success = false; - for (Integer sensorType : sensorsToActivate) { - boolean result = registerForSensorType(sensorType, rateInMicroseconds); - if (!result && failOnMissingSensor) { - // restore the previous state upon failure - unregisterSensors(sensorsToActivate); - return false; - } - if (result) { - mActiveSensors.add(sensorType); - success = true; - } - } - return success; - } - - private void unregisterSensors(Iterable<Integer> sensorTypes) { - for (Integer sensorType : sensorTypes) { - if (mActiveSensors.contains(sensorType)) { - getSensorManagerProxy().unregisterListener(this, sensorType); - mActiveSensors.remove(sensorType); - } - } - } - - private boolean registerForSensorType(int type, int rateInMicroseconds) { - SensorManagerProxy sensorManager = getSensorManagerProxy(); - if (sensorManager == null) { - return false; - } - return sensorManager.registerListener(this, type, rateInMicroseconds, getHandler()); - } - - protected void gotOrientation(double alpha, double beta, double gamma) { - synchronized (mNativePtrLock) { - if (mNativePtr != 0) { - nativeGotOrientation(mNativePtr, alpha, beta, gamma); - } - } - } - - protected void gotOrientationAbsolute(double alpha, double beta, double gamma) { - synchronized (mNativePtrLock) { - if (mNativePtr != 0) { - nativeGotOrientationAbsolute(mNativePtr, alpha, beta, gamma); - } - } - } - - protected void gotAcceleration(double x, double y, double z) { - synchronized (mNativePtrLock) { - if (mNativePtr != 0) { - nativeGotAcceleration(mNativePtr, x, y, z); - } - } - } - - protected void gotAccelerationIncludingGravity(double x, double y, double z) { - synchronized (mNativePtrLock) { - if (mNativePtr != 0) { - nativeGotAccelerationIncludingGravity(mNativePtr, x, y, z); - } - } - } - - protected void gotRotationRate(double alpha, double beta, double gamma) { - synchronized (mNativePtrLock) { - if (mNativePtr != 0) { - nativeGotRotationRate(mNativePtr, alpha, beta, gamma); - } - } - } - - private Handler getHandler() { - // TODO(timvolodine): Remove the mHandlerLock when sure that getHandler is not called - // from multiple threads. This will be the case when device motion and device orientation - // use the same polling thread (also see crbug/234282). - synchronized (mHandlerLock) { - if (mHandler == null) { - HandlerThread thread = new HandlerThread("DeviceMotionAndOrientation"); - thread.start(); - mHandler = new Handler(thread.getLooper()); // blocks on thread start - } - return mHandler; - } - } - - @CalledByNative - static DeviceSensors create() { - return new DeviceSensors(); - } - - /** - * Native JNI calls, - * see device/sensors/sensor_manager_android.cc - */ - - /** - * Orientation of the device with respect to its reference frame. - */ - private native void nativeGotOrientation( - long nativeSensorManagerAndroid, double alpha, double beta, double gamma); - - /** - * Absolute orientation of the device with respect to its reference frame. - */ - private native void nativeGotOrientationAbsolute( - long nativeSensorManagerAndroid, double alpha, double beta, double gamma); - - /** - * Linear acceleration without gravity of the device with respect to its body frame. - */ - private native void nativeGotAcceleration( - long nativeSensorManagerAndroid, double x, double y, double z); - - /** - * Acceleration including gravity of the device with respect to its body frame. - */ - private native void nativeGotAccelerationIncludingGravity( - long nativeSensorManagerAndroid, double x, double y, double z); - - /** - * Rotation rate of the device with respect to its body frame. - */ - private native void nativeGotRotationRate( - long nativeSensorManagerAndroid, double alpha, double beta, double gamma); - - /** - * Need the an interface for SensorManager for testing. - */ - interface SensorManagerProxy { - public boolean registerListener( - SensorEventListener listener, int sensorType, int rate, Handler handler); - public void unregisterListener(SensorEventListener listener, int sensorType); - } - - static class SensorManagerProxyImpl implements SensorManagerProxy { - private final SensorManager mSensorManager; - - SensorManagerProxyImpl(SensorManager sensorManager) { - mSensorManager = sensorManager; - } - - @Override - public boolean registerListener( - SensorEventListener listener, int sensorType, int rate, Handler handler) { - List<Sensor> sensors = mSensorManager.getSensorList(sensorType); - if (sensors.isEmpty()) { - return false; - } - return mSensorManager.registerListener(listener, sensors.get(0), rate, handler); - } - - @Override - public void unregisterListener(SensorEventListener listener, int sensorType) { - List<Sensor> sensors = mSensorManager.getSensorList(sensorType); - if (sensors.isEmpty()) { - return; - } - try { - mSensorManager.unregisterListener(listener, sensors.get(0)); - } catch (IllegalArgumentException e) { - // Suppress occasional exception on Digma iDxD* devices: - // Receiver not registered: android.hardware.SystemSensorManager$1 - // See crbug.com/596453. - Log.w(TAG, "Failed to unregister device sensor " + sensors.get(0).getName()); - } - } - } -}
diff --git a/device/sensors/android/javatests/src/org/chromium/device/sensors/DeviceSensorsTest.java b/device/sensors/android/javatests/src/org/chromium/device/sensors/DeviceSensorsTest.java deleted file mode 100644 index 54abde7..0000000 --- a/device/sensors/android/javatests/src/org/chromium/device/sensors/DeviceSensorsTest.java +++ /dev/null
@@ -1,654 +0,0 @@ -// Copyright 2014 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. - -package org.chromium.device.sensors; - -import android.content.Context; -import android.hardware.Sensor; -import android.hardware.SensorEventListener; -import android.hardware.SensorManager; -import android.os.Handler; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.chromium.base.test.BaseJUnit4ClassRunner; - -import java.util.HashSet; -import java.util.Set; - -/** - * Test suite for DeviceSensors. - */ -@RunWith(BaseJUnit4ClassRunner.class) -public class DeviceSensorsTest { - private DeviceSensorsForTests mDeviceSensors; - private MockSensorManager mMockSensorManager; - - @Before - public void setUp() throws Exception { - mMockSensorManager = new MockSensorManager(); - mDeviceSensors = DeviceSensorsForTests.getInstance(InstrumentationRegistry.getContext()); - mDeviceSensors.setSensorManagerProxy(mMockSensorManager); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceMotion() { - boolean start = mDeviceSensors.start(0, ConsumerType.MOTION, 100); - - Assert.assertTrue(start); - Assert.assertTrue("should contain all motion sensors", - mDeviceSensors.mActiveSensors.containsAll(DeviceSensors.DEVICE_MOTION_SENSORS)); - Assert.assertTrue(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActive); - - Assert.assertEquals( - DeviceSensors.DEVICE_MOTION_SENSORS.size(), mMockSensorManager.mNumRegistered); - Assert.assertEquals(0, mMockSensorManager.mNumUnRegistered); - Assert.assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(), - mDeviceSensors.getNumberActiveDeviceMotionSensors()); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceOrientation() { - boolean start = mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - - Assert.assertTrue(start); - Assert.assertTrue("should contain all orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_SENSORS_A)); - Assert.assertFalse(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActiveWithBackupSensors); - Assert.assertEquals(OrientationSensorType.GAME_ROTATION_VECTOR, - mDeviceSensors.getOrientationSensorTypeUsed()); - - Assert.assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS_A.size(), - mMockSensorManager.mNumRegistered); - Assert.assertEquals(0, mMockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceOrientationGameRotationVectorNotAvailable() { - MockSensorManager mockSensorManager = new MockSensorManager(); - mockSensorManager.setGameRotationVectorAvailable(false); - mDeviceSensors.setSensorManagerProxy(mockSensorManager); - boolean startOrientation = mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - - Assert.assertTrue(startOrientation); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActiveWithBackupSensors); - Assert.assertTrue("should contain option B orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_SENSORS_B)); - Assert.assertEquals(OrientationSensorType.ROTATION_VECTOR, - mDeviceSensors.getOrientationSensorTypeUsed()); - - Assert.assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS_B.size(), - mockSensorManager.mNumRegistered); - Assert.assertEquals(0, mockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceOrientationBothRotationVectorsNotAvailable() { - MockSensorManager mockSensorManager = new MockSensorManager(); - mockSensorManager.setGameRotationVectorAvailable(false); - mockSensorManager.setRotationVectorAvailable(false); - mDeviceSensors.setSensorManagerProxy(mockSensorManager); - boolean startOrientation = mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - - Assert.assertTrue(startOrientation); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationIsActiveWithBackupSensors); - Assert.assertTrue("should contain option C orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_SENSORS_C)); - Assert.assertEquals(OrientationSensorType.ACCELEROMETER_MAGNETIC, - mDeviceSensors.getOrientationSensorTypeUsed()); - - Assert.assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS_C.size(), - mockSensorManager.mNumRegistered); - Assert.assertEquals(0, mockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceOrientationNoSensorsAvailable() { - MockSensorManager mockSensorManager = new MockSensorManager(); - mockSensorManager.setGameRotationVectorAvailable(false); - mockSensorManager.setRotationVectorAvailable(false); - mockSensorManager.setAccelerometerAvailable(false); - mDeviceSensors.setSensorManagerProxy(mockSensorManager); - boolean startOrientation = mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - - Assert.assertFalse(startOrientation); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActiveWithBackupSensors); - Assert.assertTrue(mDeviceSensors.mActiveSensors.isEmpty()); - Assert.assertEquals( - OrientationSensorType.NOT_AVAILABLE, mDeviceSensors.getOrientationSensorTypeUsed()); - - Assert.assertEquals(0, mockSensorManager.mNumRegistered); - Assert.assertEquals(0, mockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceMotionAndOrientation() { - boolean startOrientation = mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - boolean startMotion = mDeviceSensors.start(0, ConsumerType.MOTION, 100); - - Assert.assertTrue(startOrientation); - Assert.assertTrue(startMotion); - Assert.assertTrue("should contain all motion sensors", - mDeviceSensors.mActiveSensors.containsAll(DeviceSensors.DEVICE_MOTION_SENSORS)); - Assert.assertTrue("should contain all orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_SENSORS_A)); - - Set<Integer> union = new HashSet<Integer>(DeviceSensors.DEVICE_ORIENTATION_SENSORS_A); - union.addAll(DeviceSensors.DEVICE_MOTION_SENSORS); - - Assert.assertEquals(union.size(), mDeviceSensors.mActiveSensors.size()); - Assert.assertTrue(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertEquals(union.size(), mMockSensorManager.mNumRegistered); - Assert.assertEquals(0, mMockSensorManager.mNumUnRegistered); - Assert.assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(), - mDeviceSensors.getNumberActiveDeviceMotionSensors()); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceOrientationAbsolute() { - boolean start = mDeviceSensors.start(0, ConsumerType.ORIENTATION_ABSOLUTE, 100); - - Assert.assertTrue(start); - Assert.assertTrue("should contain all absolute orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A)); - Assert.assertFalse(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActiveWithBackupSensors); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationAbsoluteIsActiveWithBackupSensors); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationAbsoluteIsActive); - - Assert.assertEquals(DeviceSensors.DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A.size(), - mMockSensorManager.mNumRegistered); - Assert.assertEquals(0, mMockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testUnregisterSensorsDeviceOrientationAbsolute() { - mDeviceSensors.start(0, ConsumerType.ORIENTATION_ABSOLUTE, 100); - mDeviceSensors.stop(ConsumerType.ORIENTATION_ABSOLUTE); - - Assert.assertTrue("should contain no sensors", mDeviceSensors.mActiveSensors.isEmpty()); - Assert.assertFalse(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationAbsoluteIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActiveWithBackupSensors); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationAbsoluteIsActiveWithBackupSensors); - Assert.assertEquals(DeviceSensors.DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A.size(), - mMockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceOrientationAbsoluteRotationVectorNotAvailable() { - MockSensorManager mockSensorManager = new MockSensorManager(); - mockSensorManager.setRotationVectorAvailable(false); - mDeviceSensors.setSensorManagerProxy(mockSensorManager); - boolean startOrientation = mDeviceSensors.start(0, ConsumerType.ORIENTATION_ABSOLUTE, 100); - - Assert.assertTrue(startOrientation); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationAbsoluteIsActive); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationAbsoluteIsActiveWithBackupSensors); - Assert.assertTrue("should contain option B orientation absolute sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_ABSOLUTE_SENSORS_B)); - Assert.assertEquals(DeviceSensors.DEVICE_ORIENTATION_ABSOLUTE_SENSORS_B.size(), - mockSensorManager.mNumRegistered); - Assert.assertEquals(0, mockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testRegisterSensorsDeviceOrientationAndOrientationAbsolute() { - boolean startOrientation = mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - boolean startOrientationAbsolute = - mDeviceSensors.start(0, ConsumerType.ORIENTATION_ABSOLUTE, 100); - - Assert.assertTrue(startOrientation); - Assert.assertTrue(startOrientationAbsolute); - Assert.assertTrue("should contain all orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_SENSORS_A)); - Assert.assertTrue("should contain all absolute orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A)); - - Set<Integer> union = new HashSet<Integer>(DeviceSensors.DEVICE_ORIENTATION_SENSORS_A); - union.addAll(DeviceSensors.DEVICE_ORIENTATION_ABSOLUTE_SENSORS_A); - - Assert.assertEquals(union.size(), mDeviceSensors.mActiveSensors.size()); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationAbsoluteIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertEquals(union.size(), mMockSensorManager.mNumRegistered); - Assert.assertEquals(0, mMockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testUnregisterSensorsDeviceMotion() { - mDeviceSensors.start(0, ConsumerType.MOTION, 100); - mDeviceSensors.stop(ConsumerType.MOTION); - - Assert.assertTrue("should contain no sensors", mDeviceSensors.mActiveSensors.isEmpty()); - Assert.assertFalse(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertEquals( - DeviceSensors.DEVICE_MOTION_SENSORS.size(), mMockSensorManager.mNumUnRegistered); - Assert.assertEquals(0, mDeviceSensors.getNumberActiveDeviceMotionSensors()); - } - - @Test - @SmallTest - public void testUnregisterSensorsDeviceOrientation() { - mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - mDeviceSensors.stop(ConsumerType.ORIENTATION); - - Assert.assertTrue("should contain no sensors", mDeviceSensors.mActiveSensors.isEmpty()); - Assert.assertFalse(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActive); - Assert.assertFalse(mDeviceSensors.mDeviceOrientationIsActiveWithBackupSensors); - Assert.assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS_A.size(), - mMockSensorManager.mNumUnRegistered); - } - - @Test - @SmallTest - public void testUnregisterSensorsDeviceMotionAndOrientation() { - mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - mDeviceSensors.start(0, ConsumerType.MOTION, 100); - mDeviceSensors.stop(ConsumerType.MOTION); - - Assert.assertTrue("should contain all orientation sensors", - mDeviceSensors.mActiveSensors.containsAll( - DeviceSensors.DEVICE_ORIENTATION_SENSORS_A)); - - Set<Integer> diff = new HashSet<Integer>(DeviceSensors.DEVICE_MOTION_SENSORS); - diff.removeAll(DeviceSensors.DEVICE_ORIENTATION_SENSORS_A); - - Assert.assertEquals(diff.size(), mMockSensorManager.mNumUnRegistered); - - mDeviceSensors.stop(ConsumerType.ORIENTATION); - - Assert.assertTrue("should contain no sensors", mDeviceSensors.mActiveSensors.isEmpty()); - Assert.assertEquals(diff.size() + DeviceSensors.DEVICE_ORIENTATION_SENSORS_A.size(), - mMockSensorManager.mNumUnRegistered); - Assert.assertEquals(0, mDeviceSensors.getNumberActiveDeviceMotionSensors()); - } - - /** - * Helper method to trigger an orientation change using the given sensorType. - */ - private void changeOrientation(int sensorType, boolean absolute, String expectedChange) { - boolean startOrientation = mDeviceSensors.start( - 0, absolute ? ConsumerType.ORIENTATION_ABSOLUTE : ConsumerType.ORIENTATION, 100); - - Assert.assertTrue(startOrientation); - Assert.assertTrue(absolute ? mDeviceSensors.mDeviceOrientationAbsoluteIsActive - : mDeviceSensors.mDeviceOrientationIsActive); - - float alpha = (float) Math.PI / 4; - float[] values = {0, 0, (float) Math.sin(alpha / 2), (float) Math.cos(alpha / 2), -1}; - mDeviceSensors.sensorChanged(sensorType, values); - - mDeviceSensors.verifyCalls(expectedChange); - if (!expectedChange.isEmpty()) { - mDeviceSensors.verifyValuesEpsilon(Math.toDegrees(alpha), 0, 0); - } - } - - @Test - @SmallTest - public void testSensorChangedGotOrientationViaRotationVector() { - changeOrientation(Sensor.TYPE_ROTATION_VECTOR, false /* absolute */, ""); - } - - @Test - @SmallTest - public void testSensorChangedGotOrientationViaGameRotationVector() { - changeOrientation(Sensor.TYPE_GAME_ROTATION_VECTOR, false /* absolute */, "gotOrientation"); - } - - @Test - @SmallTest - public void testSensorChangedGotOrientationAbsoluteViaRotationVector() { - changeOrientation( - Sensor.TYPE_ROTATION_VECTOR, true /* absolute */, "gotOrientationAbsolute"); - } - - @Test - @SmallTest - public void testSensorChangedGotOrientationAbsoluteViaGameRotationVector() { - changeOrientation(Sensor.TYPE_GAME_ROTATION_VECTOR, true /* absolute */, ""); - } - - @Test - @SmallTest - public void testSensorChangedGotOrientationAndOrientationAbsolute() { - changeOrientation(Sensor.TYPE_GAME_ROTATION_VECTOR, false /* absolute */, "gotOrientation"); - changeOrientation(Sensor.TYPE_ROTATION_VECTOR, true /* absolute */, "gotOrientation" - + "gotOrientationAbsolute"); - } - - @Test - @SmallTest - public void testSensorChangedGotOrientationViaRotationVectorAndOrientationAbsolute() { - MockSensorManager mockSensorManager = new MockSensorManager(); - mockSensorManager.setGameRotationVectorAvailable(false); - mDeviceSensors.setSensorManagerProxy(mockSensorManager); - - changeOrientation(Sensor.TYPE_ROTATION_VECTOR, false /* absolute */, "gotOrientation"); - changeOrientation(Sensor.TYPE_ROTATION_VECTOR, true /* absolute */, "gotOrientation" - + "gotOrientationAbsolute" - + "gotOrientation"); - } - - @Test - @SmallTest - public void testSensorChangedGotAccelerationIncludingGravity() { - mDeviceSensors.start(0, ConsumerType.MOTION, 100); - - float[] values = {1, 2, 3}; - mDeviceSensors.sensorChanged(Sensor.TYPE_ACCELEROMETER, values); - mDeviceSensors.verifyCalls("gotAccelerationIncludingGravity"); - mDeviceSensors.verifyValues(1, 2, 3); - } - - @Test - @SmallTest - public void testSensorChangedGotAcceleration() { - mDeviceSensors.start(0, ConsumerType.MOTION, 100); - - float[] values = {1, 2, 3}; - mDeviceSensors.sensorChanged(Sensor.TYPE_LINEAR_ACCELERATION, values); - mDeviceSensors.verifyCalls("gotAcceleration"); - mDeviceSensors.verifyValues(1, 2, 3); - } - - @Test - @SmallTest - public void testSensorChangedGotRotationRate() { - mDeviceSensors.start(0, ConsumerType.MOTION, 100); - - float[] values = {1, 2, 3}; - mDeviceSensors.sensorChanged(Sensor.TYPE_GYROSCOPE, values); - mDeviceSensors.verifyCalls("gotRotationRate"); - mDeviceSensors.verifyValues(1, 2, 3); - } - - @Test - @SmallTest - public void testSensorChangedGotOrientationAndAcceleration() { - boolean startOrientation = mDeviceSensors.start(0, ConsumerType.ORIENTATION, 100); - boolean startMotion = mDeviceSensors.start(0, ConsumerType.MOTION, 100); - - Assert.assertTrue(startOrientation); - Assert.assertTrue(startMotion); - Assert.assertTrue(mDeviceSensors.mDeviceMotionIsActive); - Assert.assertTrue(mDeviceSensors.mDeviceOrientationIsActive); - - float alpha = (float) Math.PI / 4; - float[] values = {0, 0, (float) Math.sin(alpha / 2), (float) Math.cos(alpha / 2), -1}; - mDeviceSensors.sensorChanged(Sensor.TYPE_GAME_ROTATION_VECTOR, values); - mDeviceSensors.verifyCalls("gotOrientation"); - mDeviceSensors.verifyValuesEpsilon(Math.toDegrees(alpha), 0, 0); - - float[] values2 = {1, 2, 3}; - mDeviceSensors.sensorChanged(Sensor.TYPE_ACCELEROMETER, values2); - mDeviceSensors.verifyCalls("gotOrientation" - + "gotAccelerationIncludingGravity"); - mDeviceSensors.verifyValues(1, 2, 3); - } - - // Tests for correct Device Orientation angles. - - @Test - @SmallTest - public void testOrientationAnglesFromRotationMatrixIdentity() { - float[] gravity = {0, 0, 1}; - float[] magnetic = {0, 1, 0}; - double[] expectedAngles = {0, 0, 0}; - - verifyOrientationAngles(gravity, magnetic, expectedAngles); - } - - @Test - @SmallTest - public void testOrientationAnglesFromRotationMatrix45DegreesX() { - float[] gravity = {0, (float) Math.sin(Math.PI / 4), (float) Math.cos(Math.PI / 4)}; - float[] magnetic = {0, 1, 0}; - double[] expectedAngles = {0, Math.PI / 4, 0}; - - verifyOrientationAngles(gravity, magnetic, expectedAngles); - } - - @Test - @SmallTest - public void testOrientationAnglesFromRotationMatrix45DegreesY() { - float[] gravity = {-(float) Math.sin(Math.PI / 4), 0, (float) Math.cos(Math.PI / 4)}; - float[] magnetic = {0, 1, 0}; - double[] expectedAngles = {0, 0, Math.PI / 4}; - - verifyOrientationAngles(gravity, magnetic, expectedAngles); - } - - @Test - @SmallTest - public void testOrientationAnglesFromRotationMatrix45DegreesZ() { - float[] gravity = {0, 0, 1}; - float[] magnetic = {(float) Math.sin(Math.PI / 4), (float) Math.cos(Math.PI / 4), 0}; - double[] expectedAngles = {Math.PI / 4, 0, 0}; - - verifyOrientationAngles(gravity, magnetic, expectedAngles); - } - - @Test - @SmallTest - public void testOrientationAnglesFromRotationMatrixGimbalLock() { - float[] gravity = {0, 1, 0}; - float[] magnetic = {(float) Math.sin(Math.PI / 4), 0, -(float) Math.cos(Math.PI / 4)}; - double[] expectedAngles = {Math.PI / 4, Math.PI / 2, 0}; // favor yaw instead of roll - - verifyOrientationAngles(gravity, magnetic, expectedAngles); - } - - @Test - @SmallTest - public void testOrientationAnglesFromRotationMatrixPitchGreaterThan90() { - final double largePitchAngle = Math.PI / 2 + Math.PI / 4; - float[] gravity = {0, (float) Math.cos(largePitchAngle - Math.PI / 2), - -(float) Math.sin(largePitchAngle - Math.PI / 2)}; - float[] magnetic = {0, 0, -1}; - double[] expectedAngles = {0, largePitchAngle, 0}; - - verifyOrientationAngles(gravity, magnetic, expectedAngles); - } - - @Test - @SmallTest - public void testOrientationAnglesFromRotationMatrixRoll90() { - float[] gravity = {-1, 0, 0}; - float[] magnetic = {0, 1, 0}; - double[] expectedAngles = {Math.PI, -Math.PI, -Math.PI / 2}; - - verifyOrientationAngles(gravity, magnetic, expectedAngles); - } - - /** - * Helper method for verifying angles obtained from rotation matrix. - * - * @param gravity - * gravity vector in the device frame - * @param magnetic - * magnetic field vector in the device frame - * @param expectedAngles - * expectedAngles[0] rotation angle in radians around the Z-axis - * expectedAngles[1] rotation angle in radians around the X-axis - * expectedAngles[2] rotation angle in radians around the Y-axis - */ - private void verifyOrientationAngles( - float[] gravity, float[] magnetic, double[] expectedAngles) { - float[] r = new float[9]; - double[] values = new double[3]; - SensorManager.getRotationMatrix(r, null, gravity, magnetic); - DeviceSensors.computeDeviceOrientationFromRotationMatrix(r, values); - - Assert.assertEquals(expectedAngles.length, values.length); - final double epsilon = 0.001; - for (int i = 0; i < expectedAngles.length; ++i) { - Assert.assertEquals(expectedAngles[i], values[i], epsilon); - } - } - - // -- End Tests for correct Device Orientation angles. - - private static class DeviceSensorsForTests extends DeviceSensors { - private double mValue1 = 0; - private double mValue2 = 0; - private double mValue3 = 0; - private String mCalls = ""; - - private DeviceSensorsForTests(Context context) { - super(); - } - - static DeviceSensorsForTests getInstance(Context context) { - return new DeviceSensorsForTests(context); - } - - private void verifyValue(double v1) { - Assert.assertEquals(v1, mValue1); - } - - private void verifyValues(double v1, double v2, double v3) { - Assert.assertEquals(v1, mValue1, 0); - Assert.assertEquals(v2, mValue2, 0); - Assert.assertEquals(v3, mValue3, 0); - } - - private void verifyValuesEpsilon(double v1, double v2, double v3) { - Assert.assertEquals(v1, mValue1, 0.1); - Assert.assertEquals(v2, mValue2, 0.1); - Assert.assertEquals(v3, mValue3, 0.1); - } - - private void verifyCalls(String names) { - Assert.assertEquals(mCalls, names); - } - - @Override - protected void gotOrientation(double alpha, double beta, double gamma) { - mValue1 = alpha; - mValue2 = beta; - mValue3 = gamma; - mCalls = mCalls.concat("gotOrientation"); - } - - @Override - protected void gotOrientationAbsolute(double alpha, double beta, double gamma) { - mValue1 = alpha; - mValue2 = beta; - mValue3 = gamma; - mCalls = mCalls.concat("gotOrientationAbsolute"); - } - - @Override - protected void gotAcceleration(double x, double y, double z) { - mValue1 = x; - mValue2 = y; - mValue3 = z; - mCalls = mCalls.concat("gotAcceleration"); - } - - @Override - protected void gotAccelerationIncludingGravity(double x, double y, double z) { - mValue1 = x; - mValue2 = y; - mValue3 = z; - mCalls = mCalls.concat("gotAccelerationIncludingGravity"); - } - - @Override - protected void gotRotationRate(double alpha, double beta, double gamma) { - mValue1 = alpha; - mValue2 = beta; - mValue3 = gamma; - mCalls = mCalls.concat("gotRotationRate"); - } - } - - private static class MockSensorManager implements DeviceSensors.SensorManagerProxy { - private int mNumRegistered = 0; - private int mNumUnRegistered = 0; - private boolean mRotationVectorAvailable = true; - private boolean mGameRotationVectorAvailable = true; - private boolean mAccelerometerAvailable = true; - - private MockSensorManager() {} - - public void setGameRotationVectorAvailable(boolean available) { - mGameRotationVectorAvailable = available; - } - - public void setRotationVectorAvailable(boolean available) { - mRotationVectorAvailable = available; - } - - public void setAccelerometerAvailable(boolean available) { - mAccelerometerAvailable = available; - } - - private boolean isSensorTypeAvailable(int sensorType) { - switch (sensorType) { - case Sensor.TYPE_ROTATION_VECTOR: - return mRotationVectorAvailable; - case Sensor.TYPE_GAME_ROTATION_VECTOR: - return mGameRotationVectorAvailable; - case Sensor.TYPE_ACCELEROMETER: - return mAccelerometerAvailable; - } - return true; - } - - @Override - public boolean registerListener( - SensorEventListener listener, int sensorType, int rate, Handler handler) { - if (isSensorTypeAvailable(sensorType)) { - mNumRegistered++; - return true; - } - return false; - } - - @Override - public void unregisterListener(SensorEventListener listener, int sensorType) { - mNumUnRegistered++; - } - } -}
diff --git a/device/sensors/data_fetcher_shared_memory.h b/device/sensors/data_fetcher_shared_memory.h deleted file mode 100644 index 9a1e132..0000000 --- a/device/sensors/data_fetcher_shared_memory.h +++ /dev/null
@@ -1,83 +0,0 @@ -// Copyright 2014 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 DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_H_ -#define DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_H_ - -#include "base/macros.h" -#include "build/build_config.h" -#include "device/sensors/data_fetcher_shared_memory_base.h" - -#if !defined(OS_ANDROID) -#include "device/sensors/public/cpp/device_motion_hardware_buffer.h" -#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h" -#endif - -#if defined(OS_MACOSX) -class SuddenMotionSensor; -#elif defined(OS_WIN) -#include <SensorsApi.h> -#include <wrl/client.h> -#endif - -namespace device { - -#if defined(OS_CHROMEOS) -class SensorManagerChromeOS; -#endif - -class DEVICE_SENSOR_EXPORT DataFetcherSharedMemory - : public DataFetcherSharedMemoryBase { - public: - DataFetcherSharedMemory(); - ~DataFetcherSharedMemory() override; - -#if defined(OS_ANDROID) - void Shutdown() override; -#endif - - private: - bool Start(ConsumerType consumer_type, void* buffer) override; - bool Stop(ConsumerType consumer_type) override; - -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -#if !defined(OS_CHROMEOS) - DeviceMotionHardwareBuffer* motion_buffer_ = nullptr; - DeviceOrientationHardwareBuffer* orientation_buffer_ = nullptr; -#endif - DeviceOrientationHardwareBuffer* orientation_absolute_buffer_ = nullptr; -#endif - -#if defined(OS_CHROMEOS) - std::unique_ptr<SensorManagerChromeOS> sensor_manager_; -#elif defined(OS_MACOSX) - void Fetch(unsigned consumer_bitmask) override; - FetcherType GetType() const override; - - std::unique_ptr<SuddenMotionSensor> sudden_motion_sensor_; -#elif defined(OS_WIN) - class SensorEventSink; - class SensorEventSinkMotion; - class SensorEventSinkOrientation; - - FetcherType GetType() const override; - - bool RegisterForSensor(REFSENSOR_TYPE_ID sensor_type, - ISensor** sensor, - scoped_refptr<SensorEventSink> event_sink); - void DisableSensors(ConsumerType consumer_type); - void SetBufferAvailableState(ConsumerType consumer_type, bool enabled); - - Microsoft::WRL::ComPtr<ISensor> sensor_inclinometer_; - Microsoft::WRL::ComPtr<ISensor> sensor_inclinometer_absolute_; - Microsoft::WRL::ComPtr<ISensor> sensor_accelerometer_; - Microsoft::WRL::ComPtr<ISensor> sensor_gyrometer_; -#endif - - DISALLOW_COPY_AND_ASSIGN(DataFetcherSharedMemory); -}; - -} // namespace device - -#endif // DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_H_
diff --git a/device/sensors/data_fetcher_shared_memory_android.cc b/device/sensors/data_fetcher_shared_memory_android.cc deleted file mode 100644 index 3e08690..0000000 --- a/device/sensors/data_fetcher_shared_memory_android.cc +++ /dev/null
@@ -1,64 +0,0 @@ -// Copyright 2014 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 "device/sensors/data_fetcher_shared_memory.h" - -#include "base/logging.h" -#include "device/sensors/public/cpp/device_motion_hardware_buffer.h" -#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h" -#include "device/sensors/sensor_manager_android.h" - -namespace device { - -DataFetcherSharedMemory::DataFetcherSharedMemory() {} - -DataFetcherSharedMemory::~DataFetcherSharedMemory() {} - -bool DataFetcherSharedMemory::Start(ConsumerType consumer_type, void* buffer) { - DCHECK(buffer); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - SensorManagerAndroid::GetInstance()->StartFetchingDeviceMotionData( - static_cast<DeviceMotionHardwareBuffer*>(buffer)); - return true; - case CONSUMER_TYPE_ORIENTATION: - SensorManagerAndroid::GetInstance()->StartFetchingDeviceOrientationData( - static_cast<DeviceOrientationHardwareBuffer*>(buffer)); - return true; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - SensorManagerAndroid::GetInstance() - ->StartFetchingDeviceOrientationAbsoluteData( - static_cast<DeviceOrientationHardwareBuffer*>(buffer)); - return true; - default: - NOTREACHED(); - } - return false; -} - -bool DataFetcherSharedMemory::Stop(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - SensorManagerAndroid::GetInstance()->StopFetchingDeviceMotionData(); - return true; - case CONSUMER_TYPE_ORIENTATION: - SensorManagerAndroid::GetInstance()->StopFetchingDeviceOrientationData(); - return true; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - SensorManagerAndroid::GetInstance() - ->StopFetchingDeviceOrientationAbsoluteData(); - return true; - default: - NOTREACHED(); - } - return false; -} - -void DataFetcherSharedMemory::Shutdown() { - DataFetcherSharedMemoryBase::Shutdown(); - SensorManagerAndroid::GetInstance()->Shutdown(); -} - -} // namespace device
diff --git a/device/sensors/data_fetcher_shared_memory_base.cc b/device/sensors/data_fetcher_shared_memory_base.cc deleted file mode 100644 index ff473d4..0000000 --- a/device/sensors/data_fetcher_shared_memory_base.cc +++ /dev/null
@@ -1,252 +0,0 @@ -// Copyright 2014 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 "device/sensors/data_fetcher_shared_memory_base.h" - -#include <stddef.h> -#include <string.h> - -#include "base/bind.h" -#include "base/location.h" -#include "base/logging.h" -#include "base/macros.h" -#include "base/single_thread_task_runner.h" -#include "base/stl_util.h" -#include "base/threading/thread.h" -#include "base/timer/timer.h" -#include "build/build_config.h" -#include "device/sensors/public/cpp/device_motion_hardware_buffer.h" -#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h" - -namespace device { - -namespace { - -size_t GetConsumerSharedMemoryBufferSize(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - return sizeof(DeviceMotionHardwareBuffer); - case CONSUMER_TYPE_ORIENTATION: - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - return sizeof(DeviceOrientationHardwareBuffer); - default: - NOTREACHED(); - } - return 0; -} - -} // namespace - -class DataFetcherSharedMemoryBase::PollingThread : public base::Thread { - public: - PollingThread(const char* name, DataFetcherSharedMemoryBase* fetcher); - ~PollingThread() override; - - void AddConsumer(ConsumerType consumer_type, void* buffer); - void RemoveConsumer(ConsumerType consumer_type); - - unsigned GetConsumersBitmask() const { return consumers_bitmask_; } - bool IsTimerRunning() const { return timer_ ? timer_->IsRunning() : false; } - - private: - void DoPoll(); - - unsigned consumers_bitmask_; - DataFetcherSharedMemoryBase* fetcher_; - std::unique_ptr<base::RepeatingTimer> timer_; - - DISALLOW_COPY_AND_ASSIGN(PollingThread); -}; - -// --- PollingThread methods - -DataFetcherSharedMemoryBase::PollingThread::PollingThread( - const char* name, - DataFetcherSharedMemoryBase* fetcher) - : base::Thread(name), consumers_bitmask_(0), fetcher_(fetcher) {} - -DataFetcherSharedMemoryBase::PollingThread::~PollingThread() = default; - -void DataFetcherSharedMemoryBase::PollingThread::AddConsumer( - ConsumerType consumer_type, - void* buffer) { - DCHECK(fetcher_); - if (!fetcher_->Start(consumer_type, buffer)) - return; - - consumers_bitmask_ |= consumer_type; - - if (!timer_ && fetcher_->GetType() == FETCHER_TYPE_POLLING_CALLBACK) { - timer_.reset(new base::RepeatingTimer()); - timer_->Start(FROM_HERE, fetcher_->GetInterval(), this, - &PollingThread::DoPoll); - } -} - -void DataFetcherSharedMemoryBase::PollingThread::RemoveConsumer( - ConsumerType consumer_type) { - DCHECK(fetcher_); - if (!fetcher_->Stop(consumer_type)) - return; - - consumers_bitmask_ &= ~consumer_type; - - if (!consumers_bitmask_) - timer_.reset(); // will also stop the timer. -} - -void DataFetcherSharedMemoryBase::PollingThread::DoPoll() { - DCHECK(fetcher_); - DCHECK(consumers_bitmask_); - fetcher_->Fetch(consumers_bitmask_); -} - -// --- end of PollingThread methods - -DataFetcherSharedMemoryBase::DataFetcherSharedMemoryBase() - : started_consumers_(0) {} - -DataFetcherSharedMemoryBase::~DataFetcherSharedMemoryBase() { - DCHECK_EQ(0u, started_consumers_); - - // By this point the polling thread should have already been stopped (it's not - // safe for it to be running in this class's destructor as tasks are posted to - // it that call virtual methods of this class). - DCHECK(!polling_thread_ || !polling_thread_->IsRunning()); -} - -bool DataFetcherSharedMemoryBase::StartFetchingDeviceData( - ConsumerType consumer_type) { - if (started_consumers_ & consumer_type) - return true; - - void* buffer = GetSharedMemoryBuffer(consumer_type); - if (!buffer) - return false; - - size_t buffer_size = GetConsumerSharedMemoryBufferSize(consumer_type); - // buffer size should be strictly positive because buffer is non-zero. - DCHECK(buffer_size > 0); - // make sure to clear any potentially stale values in the memory buffer. - memset(buffer, 0, buffer_size); - - if (GetType() != FETCHER_TYPE_DEFAULT) { - if (!InitAndStartPollingThreadIfNecessary()) - return false; - polling_thread_->task_runner()->PostTask( - FROM_HERE, base::Bind(&PollingThread::AddConsumer, - base::Unretained(polling_thread_.get()), - consumer_type, buffer)); - } else { - if (!Start(consumer_type, buffer)) - return false; - } - - started_consumers_ |= consumer_type; - - return true; -} - -bool DataFetcherSharedMemoryBase::StopFetchingDeviceData( - ConsumerType consumer_type) { - if (!(started_consumers_ & consumer_type)) - return true; - - if (GetType() != FETCHER_TYPE_DEFAULT) { - polling_thread_->task_runner()->PostTask( - FROM_HERE, - base::Bind(&PollingThread::RemoveConsumer, - base::Unretained(polling_thread_.get()), consumer_type)); - } else { - if (!Stop(consumer_type)) - return false; - } - - started_consumers_ ^= consumer_type; - - return true; -} - -void DataFetcherSharedMemoryBase::Shutdown() { - StopFetchingDeviceData(CONSUMER_TYPE_MOTION); - StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); - StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - - // Ensure that the polling thread stops before entering the destructor of the - // subclass, as the stopping of the polling thread causes tasks to execute - // that call virtual methods of this class, which can cause crashes if they - // execute while (or after) the subclass is being torn down. - if (polling_thread_) - polling_thread_->Stop(); -} - -mojo::ScopedSharedBufferHandle -DataFetcherSharedMemoryBase::GetSharedMemoryHandle(ConsumerType consumer_type) { - auto it = shared_memory_map_.find(consumer_type); - DCHECK(it != shared_memory_map_.end()); - return it->second.first->Clone( - mojo::SharedBufferHandle::AccessMode::READ_ONLY); -} - -bool DataFetcherSharedMemoryBase::InitAndStartPollingThreadIfNecessary() { - if (polling_thread_) - return true; - - polling_thread_.reset(new PollingThread("Device Sensor poller", this)); - -#if defined(OS_WIN) - polling_thread_->init_com_with_mta(true); -#endif - - if (!polling_thread_->Start()) { - LOG(ERROR) << "Failed to start sensor data polling thread"; - return false; - } - return true; -} - -void DataFetcherSharedMemoryBase::Fetch(unsigned consumer_bitmask) { - NOTIMPLEMENTED(); -} - -DataFetcherSharedMemoryBase::FetcherType DataFetcherSharedMemoryBase::GetType() - const { - return FETCHER_TYPE_DEFAULT; -} - -base::TimeDelta DataFetcherSharedMemoryBase::GetInterval() const { - return base::TimeDelta::FromMicroseconds(kDeviceSensorIntervalMicroseconds); -} - -void* DataFetcherSharedMemoryBase::GetSharedMemoryBuffer( - ConsumerType consumer_type) { - auto it = shared_memory_map_.find(consumer_type); - if (it != shared_memory_map_.end()) - return it->second.second.get(); - - size_t buffer_size = GetConsumerSharedMemoryBufferSize(consumer_type); - if (buffer_size == 0) - return nullptr; - - mojo::ScopedSharedBufferHandle buffer = - mojo::SharedBufferHandle::Create(buffer_size); - mojo::ScopedSharedBufferMapping mapping = buffer->Map(buffer_size); - if (!mapping) - return nullptr; - void* mem = mapping.get(); - memset(mem, 0, buffer_size); - shared_memory_map_[consumer_type] = - std::make_pair(std::move(buffer), std::move(mapping)); - return mem; -} - -base::MessageLoop* DataFetcherSharedMemoryBase::GetPollingMessageLoop() const { - return polling_thread_ ? polling_thread_->message_loop() : nullptr; -} - -bool DataFetcherSharedMemoryBase::IsPollingTimerRunningForTesting() const { - return polling_thread_ ? polling_thread_->IsTimerRunning() : false; -} - -} // namespace device
diff --git a/device/sensors/data_fetcher_shared_memory_base.h b/device/sensors/data_fetcher_shared_memory_base.h deleted file mode 100644 index 2fa3663c..0000000 --- a/device/sensors/data_fetcher_shared_memory_base.h +++ /dev/null
@@ -1,103 +0,0 @@ -// Copyright 2014 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 DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_BASE_H_ -#define DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_BASE_H_ - -#include <map> -#include <memory> - -#include "base/macros.h" -#include "base/memory/shared_memory.h" -#include "base/message_loop/message_loop.h" -#include "device/sensors/device_sensor_export.h" -#include "device/sensors/device_sensors_consts.h" -#include "mojo/public/cpp/system/buffer.h" - -namespace device { - -// Sensor data fetchers should derive from this base class and implement -// the abstract Start() and Stop() methods. -// If the fetcher requires polling it should also implement IsPolling() -// to return true and the Fetch() method which will be called from the -// polling thread to fetch data at regular intervals. -class DEVICE_SENSOR_EXPORT DataFetcherSharedMemoryBase { - public: - // Starts updating the shared memory buffer with sensor data at - // regular intervals. Returns true if the relevant sensors could - // be successfully activated. - bool StartFetchingDeviceData(ConsumerType consumer_type); - - // Stops updating the shared memory buffer. Returns true if the - // relevant sensors could be successfully deactivated. - bool StopFetchingDeviceData(ConsumerType consumer_type); - - // Should be called before destruction to make sure all active - // sensors are unregistered. - virtual void Shutdown(); - - // Returns the shared memory handle of the device sensor data. This method - // should only be called after a call to StartFetchingDeviceData method with - // corresponding |consumer_type| parameter. - mojo::ScopedSharedBufferHandle GetSharedMemoryHandle( - ConsumerType consumer_type); - - enum FetcherType { - // Fetcher runs on the same thread as its creator. - FETCHER_TYPE_DEFAULT, - // Fetcher runs on a separate thread calling |Fetch()| at regular intervals. - FETCHER_TYPE_POLLING_CALLBACK, - // Fetcher runs on a separate thread, but no callbacks are executed. - FETCHER_TYPE_SEPARATE_THREAD - }; - - protected: - class PollingThread; - - DataFetcherSharedMemoryBase(); - virtual ~DataFetcherSharedMemoryBase(); - - // Returns the message loop of the polling thread. - // Returns NULL if there is no polling thread. - base::MessageLoop* GetPollingMessageLoop() const; - - // If IsPolling() is true this method is called from the |polling_thread_| - // at regular intervals. - virtual void Fetch(unsigned consumer_bitmask); - - // Returns the type of thread this fetcher runs on. - virtual FetcherType GetType() const; - - // Returns the sensor sampling interval. In particular if this fetcher - // GetType() == FETCHER_TYPE_POLLING_CALLBACK the interval between - // successive calls to Fetch(). - virtual base::TimeDelta GetInterval() const; - - // Start() method should call InitSharedMemoryBuffer() to get the shared - // memory pointer. If IsPolling() is true both Start() and Stop() methods - // are called from the |polling_thread_|. - virtual bool Start(ConsumerType consumer_type, void* buffer) = 0; - virtual bool Stop(ConsumerType consumer_type) = 0; - - bool IsPollingTimerRunningForTesting() const; - - private: - bool InitAndStartPollingThreadIfNecessary(); - void* GetSharedMemoryBuffer(ConsumerType consumer_type); - - unsigned started_consumers_; - - std::unique_ptr<PollingThread> polling_thread_; - - using SharedMemoryMap = std::map<ConsumerType, - std::pair<mojo::ScopedSharedBufferHandle, - mojo::ScopedSharedBufferMapping>>; - SharedMemoryMap shared_memory_map_; - - DISALLOW_COPY_AND_ASSIGN(DataFetcherSharedMemoryBase); -}; - -} // namespace device - -#endif // DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_BASE_H_
diff --git a/device/sensors/data_fetcher_shared_memory_base_unittest.cc b/device/sensors/data_fetcher_shared_memory_base_unittest.cc deleted file mode 100644 index 3fe3f011..0000000 --- a/device/sensors/data_fetcher_shared_memory_base_unittest.cc +++ /dev/null
@@ -1,522 +0,0 @@ -// Copyright 2014 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 "device/sensors/data_fetcher_shared_memory_base.h" - -#include "base/logging.h" -#include "base/macros.h" -#include "base/process/process_handle.h" -#include "base/single_thread_task_runner.h" -#include "base/synchronization/waitable_event.h" -#include "base/threading/thread.h" -#include "device/sensors/public/cpp/device_motion_hardware_buffer.h" -#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace device { - -namespace { - -class FakeDataFetcher : public DataFetcherSharedMemoryBase { - public: - FakeDataFetcher() - : start_motion_(base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - start_orientation_(base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - start_orientation_absolute_( - base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - stop_motion_(base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - stop_orientation_(base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - stop_orientation_absolute_( - base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - updated_motion_(base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - updated_orientation_(base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - updated_orientation_absolute_( - base::WaitableEvent::ResetPolicy::AUTOMATIC, - base::WaitableEvent::InitialState::NOT_SIGNALED), - motion_buffer_(nullptr), - orientation_buffer_(nullptr), - orientation_absolute_buffer_(nullptr) {} - ~FakeDataFetcher() override { Shutdown(); } - - bool Init(ConsumerType consumer_type, void* buffer) { - EXPECT_TRUE(buffer); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - motion_buffer_ = static_cast<DeviceMotionHardwareBuffer*>(buffer); - break; - case CONSUMER_TYPE_ORIENTATION: - orientation_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - orientation_absolute_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - break; - default: - return false; - } - return true; - } - - void UpdateMotion() { - DeviceMotionHardwareBuffer* buffer = GetMotionBuffer(); - ASSERT_TRUE(buffer); - buffer->seqlock.WriteBegin(); - buffer->data.interval = kDeviceSensorIntervalMicroseconds / 1000.; - buffer->seqlock.WriteEnd(); - updated_motion_.Signal(); - } - - void UpdateOrientation() { - DeviceOrientationHardwareBuffer* buffer = GetOrientationBuffer(); - ASSERT_TRUE(buffer); - buffer->seqlock.WriteBegin(); - buffer->data.alpha = 1; - buffer->seqlock.WriteEnd(); - updated_orientation_.Signal(); - } - - void UpdateOrientationAbsolute() { - DeviceOrientationHardwareBuffer* buffer = GetOrientationAbsoluteBuffer(); - ASSERT_TRUE(buffer); - buffer->seqlock.WriteBegin(); - buffer->data.alpha = 1; - buffer->data.absolute = true; - buffer->seqlock.WriteEnd(); - updated_orientation_absolute_.Signal(); - } - - DeviceMotionHardwareBuffer* GetMotionBuffer() const { return motion_buffer_; } - - DeviceOrientationHardwareBuffer* GetOrientationBuffer() const { - return orientation_buffer_; - } - - DeviceOrientationHardwareBuffer* GetOrientationAbsoluteBuffer() const { - return orientation_absolute_buffer_; - } - - void WaitForStart(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - start_motion_.Wait(); - break; - case CONSUMER_TYPE_ORIENTATION: - start_orientation_.Wait(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - start_orientation_absolute_.Wait(); - break; - } - } - - void WaitForStop(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - stop_motion_.Wait(); - break; - case CONSUMER_TYPE_ORIENTATION: - stop_orientation_.Wait(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - stop_orientation_absolute_.Wait(); - break; - } - } - - void WaitForUpdate(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - updated_motion_.Wait(); - break; - case CONSUMER_TYPE_ORIENTATION: - updated_orientation_.Wait(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - updated_orientation_absolute_.Wait(); - break; - } - } - - protected: - base::WaitableEvent start_motion_; - base::WaitableEvent start_orientation_; - base::WaitableEvent start_orientation_absolute_; - base::WaitableEvent stop_motion_; - base::WaitableEvent stop_orientation_; - base::WaitableEvent stop_orientation_absolute_; - base::WaitableEvent updated_motion_; - base::WaitableEvent updated_orientation_; - base::WaitableEvent updated_orientation_absolute_; - - private: - DeviceMotionHardwareBuffer* motion_buffer_; - DeviceOrientationHardwareBuffer* orientation_buffer_; - DeviceOrientationHardwareBuffer* orientation_absolute_buffer_; - - DISALLOW_COPY_AND_ASSIGN(FakeDataFetcher); -}; - -class FakeNonPollingDataFetcher : public FakeDataFetcher { - public: - FakeNonPollingDataFetcher() : update_(true) {} - ~FakeNonPollingDataFetcher() override = default; - - bool Start(ConsumerType consumer_type, void* buffer) override { - Init(consumer_type, buffer); - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - if (update_) - UpdateMotion(); - start_motion_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION: - if (update_) - UpdateOrientation(); - start_orientation_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - if (update_) - UpdateOrientationAbsolute(); - start_orientation_absolute_.Signal(); - break; - default: - return false; - } - return true; - } - - bool Stop(ConsumerType consumer_type) override { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - stop_motion_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION: - stop_orientation_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - stop_orientation_absolute_.Signal(); - break; - default: - return false; - } - return true; - } - - void Fetch(unsigned consumer_bitmask) override { - FAIL() << "fetch should not be called, " - << "because this is a non-polling fetcher"; - } - - FetcherType GetType() const override { return FakeDataFetcher::GetType(); } - void set_update(bool update) { update_ = update; } - - private: - bool update_; - - DISALLOW_COPY_AND_ASSIGN(FakeNonPollingDataFetcher); -}; - -class FakePollingDataFetcher : public FakeDataFetcher { - public: - FakePollingDataFetcher() = default; - ~FakePollingDataFetcher() override = default; - - bool Start(ConsumerType consumer_type, void* buffer) override { - EXPECT_TRUE( - GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - - Init(consumer_type, buffer); - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - start_motion_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION: - start_orientation_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - start_orientation_absolute_.Signal(); - break; - default: - return false; - } - return true; - } - - bool Stop(ConsumerType consumer_type) override { - EXPECT_TRUE( - GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - stop_motion_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION: - stop_orientation_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - stop_orientation_absolute_.Signal(); - break; - default: - return false; - } - return true; - } - - void Fetch(unsigned consumer_bitmask) override { - EXPECT_TRUE( - GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - EXPECT_TRUE(consumer_bitmask & CONSUMER_TYPE_ORIENTATION || - consumer_bitmask & CONSUMER_TYPE_ORIENTATION_ABSOLUTE || - consumer_bitmask & CONSUMER_TYPE_MOTION); - - if (consumer_bitmask & CONSUMER_TYPE_ORIENTATION) - UpdateOrientation(); - if (consumer_bitmask & CONSUMER_TYPE_ORIENTATION_ABSOLUTE) - UpdateOrientationAbsolute(); - if (consumer_bitmask & CONSUMER_TYPE_MOTION) - UpdateMotion(); - } - - FetcherType GetType() const override { return FETCHER_TYPE_POLLING_CALLBACK; } - - private: - DISALLOW_COPY_AND_ASSIGN(FakePollingDataFetcher); -}; - -class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher { - public: - FakeZeroDelayPollingDataFetcher() = default; - ~FakeZeroDelayPollingDataFetcher() override = default; - - bool Start(ConsumerType consumer_type, void* buffer) override { - EXPECT_TRUE( - GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - - Init(consumer_type, buffer); - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - start_motion_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION: - start_orientation_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - start_orientation_absolute_.Signal(); - break; - default: - return false; - } - return true; - } - - bool Stop(ConsumerType consumer_type) override { - EXPECT_TRUE( - GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - stop_motion_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION: - stop_orientation_.Signal(); - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - stop_orientation_absolute_.Signal(); - break; - default: - return false; - } - return true; - } - - void Fetch(unsigned consumer_bitmask) override { - FAIL() << "fetch should not be called"; - } - - FetcherType GetType() const override { return FETCHER_TYPE_SEPARATE_THREAD; } - - bool IsPollingTimerRunningForTesting() const { - return FakeDataFetcher::IsPollingTimerRunningForTesting(); - } - - private: - DISALLOW_COPY_AND_ASSIGN(FakeZeroDelayPollingDataFetcher); -}; - -TEST(DataFetcherSharedMemoryBaseTest, DoesStartMotion) { - FakeNonPollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_DEFAULT, - fake_data_fetcher.GetType()); - - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_MOTION); - - EXPECT_EQ(kDeviceSensorIntervalMicroseconds / 1000., - fake_data_fetcher.GetMotionBuffer()->data.interval); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_MOTION); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesStartOrientation) { - FakeNonPollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_DEFAULT, - fake_data_fetcher.GetType()); - - EXPECT_TRUE( - fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION); - - EXPECT_EQ(1, fake_data_fetcher.GetOrientationBuffer()->data.alpha); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesStartOrientationAbsolute) { - FakeNonPollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_DEFAULT, - fake_data_fetcher.GetType()); - - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData( - CONSUMER_TYPE_ORIENTATION_ABSOLUTE)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - - EXPECT_EQ(1, fake_data_fetcher.GetOrientationAbsoluteBuffer()->data.alpha); - EXPECT_TRUE(fake_data_fetcher.GetOrientationAbsoluteBuffer()->data.absolute); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotion) { - FakePollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK, - fake_data_fetcher.GetType()); - - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_MOTION); - fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_MOTION); - - EXPECT_EQ(kDeviceSensorIntervalMicroseconds / 1000., - fake_data_fetcher.GetMotionBuffer()->data.interval); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_MOTION); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesPollOrientation) { - FakePollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK, - fake_data_fetcher.GetType()); - - EXPECT_TRUE( - fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_ORIENTATION); - - EXPECT_EQ(1, fake_data_fetcher.GetOrientationBuffer()->data.alpha); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesPollOrientationAbsolute) { - FakePollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK, - fake_data_fetcher.GetType()); - - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData( - CONSUMER_TYPE_ORIENTATION_ABSOLUTE)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - - EXPECT_EQ(1, fake_data_fetcher.GetOrientationAbsoluteBuffer()->data.alpha); - EXPECT_TRUE(fake_data_fetcher.GetOrientationAbsoluteBuffer()->data.absolute); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesPollMotionAndOrientation) { - FakePollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK, - fake_data_fetcher.GetType()); - - EXPECT_TRUE( - fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION)); - mojo::ScopedSharedBufferHandle handle_orientation = - fake_data_fetcher.GetSharedMemoryHandle(CONSUMER_TYPE_ORIENTATION); - EXPECT_TRUE(handle_orientation.is_valid()); - - EXPECT_TRUE(fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_MOTION)); - mojo::ScopedSharedBufferHandle handle_motion = - fake_data_fetcher.GetSharedMemoryHandle(CONSUMER_TYPE_MOTION); - EXPECT_TRUE(handle_motion.is_valid()); - - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_MOTION); - - fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForUpdate(CONSUMER_TYPE_MOTION); - - EXPECT_EQ(1, fake_data_fetcher.GetOrientationBuffer()->data.alpha); - EXPECT_EQ(kDeviceSensorIntervalMicroseconds / 1000., - fake_data_fetcher.GetMotionBuffer()->data.interval); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_MOTION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_MOTION); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesNotPollZeroDelay) { - FakeZeroDelayPollingDataFetcher fake_data_fetcher; - EXPECT_EQ(DataFetcherSharedMemoryBase::FETCHER_TYPE_SEPARATE_THREAD, - fake_data_fetcher.GetType()); - - EXPECT_TRUE( - fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION); - - EXPECT_FALSE(fake_data_fetcher.IsPollingTimerRunningForTesting()); - EXPECT_EQ(0, fake_data_fetcher.GetOrientationBuffer()->data.alpha); - - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION); -} - -TEST(DataFetcherSharedMemoryBaseTest, DoesClearBufferOnStart) { - FakeNonPollingDataFetcher fake_data_fetcher; - EXPECT_TRUE( - fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION); - EXPECT_EQ(1, fake_data_fetcher.GetOrientationBuffer()->data.alpha); - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION); - - // Restart orientation without updating the memory buffer and check that - // it has been cleared to its initial state. - fake_data_fetcher.set_update(false); - EXPECT_TRUE( - fake_data_fetcher.StartFetchingDeviceData(CONSUMER_TYPE_ORIENTATION)); - fake_data_fetcher.WaitForStart(CONSUMER_TYPE_ORIENTATION); - EXPECT_EQ(0, fake_data_fetcher.GetOrientationBuffer()->data.alpha); - fake_data_fetcher.StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION); - fake_data_fetcher.WaitForStop(CONSUMER_TYPE_ORIENTATION); -} - -} // namespace - -} // namespace device
diff --git a/device/sensors/data_fetcher_shared_memory_chromeos.cc b/device/sensors/data_fetcher_shared_memory_chromeos.cc deleted file mode 100644 index a0074f1..0000000 --- a/device/sensors/data_fetcher_shared_memory_chromeos.cc +++ /dev/null
@@ -1,66 +0,0 @@ -// Copyright 2015 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 "device/sensors/data_fetcher_shared_memory.h" - -#include "device/sensors/sensor_manager_chromeos.h" - -namespace device { - -DataFetcherSharedMemory::DataFetcherSharedMemory() = default; - -DataFetcherSharedMemory::~DataFetcherSharedMemory() = default; - -bool DataFetcherSharedMemory::Start(ConsumerType consumer_type, void* buffer) { - DCHECK(buffer); - if (!sensor_manager_) - sensor_manager_.reset(new SensorManagerChromeOS); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - sensor_manager_->StartFetchingDeviceMotionData( - static_cast<DeviceMotionHardwareBuffer*>(buffer)); - return true; - case CONSUMER_TYPE_ORIENTATION: - sensor_manager_->StartFetchingDeviceOrientationData( - static_cast<DeviceOrientationHardwareBuffer*>(buffer)); - return true; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: { - orientation_absolute_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - // Absolute device orientation not available on Chrome OS, let the - // implementation fire an all-null event to signal this to blink. - orientation_absolute_buffer_->seqlock.WriteBegin(); - orientation_absolute_buffer_->data.absolute = true; - orientation_absolute_buffer_->data.all_available_sensors_are_active = - true; - orientation_absolute_buffer_->seqlock.WriteEnd(); - return false; - } - } - NOTREACHED(); - return false; -} - -bool DataFetcherSharedMemory::Stop(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - return sensor_manager_->StopFetchingDeviceMotionData(); - case CONSUMER_TYPE_ORIENTATION: - return sensor_manager_->StopFetchingDeviceOrientationData(); - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - if (orientation_absolute_buffer_) { - orientation_absolute_buffer_->seqlock.WriteBegin(); - orientation_absolute_buffer_->data.all_available_sensors_are_active = - false; - orientation_absolute_buffer_->seqlock.WriteEnd(); - orientation_absolute_buffer_ = nullptr; - } - return true; - } - NOTREACHED(); - return false; -} - -} // namespace device
diff --git a/device/sensors/data_fetcher_shared_memory_default.cc b/device/sensors/data_fetcher_shared_memory_default.cc deleted file mode 100644 index 12eeaaf9..0000000 --- a/device/sensors/data_fetcher_shared_memory_default.cc +++ /dev/null
@@ -1,77 +0,0 @@ -// Copyright 2014 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 "device/sensors/data_fetcher_shared_memory.h" - -#include "base/logging.h" -#include "base/metrics/histogram_macros.h" - -namespace { - -bool SetMotionBuffer(device::DeviceMotionHardwareBuffer* buffer, bool enabled) { - if (!buffer) - return false; - buffer->seqlock.WriteBegin(); - buffer->data.all_available_sensors_are_active = enabled; - buffer->seqlock.WriteEnd(); - return true; -} - -bool SetOrientationBuffer(device::DeviceOrientationHardwareBuffer* buffer, - bool enabled) { - if (!buffer) - return false; - buffer->seqlock.WriteBegin(); - buffer->data.all_available_sensors_are_active = enabled; - buffer->seqlock.WriteEnd(); - return true; -} - -} // namespace - -namespace device { - -DataFetcherSharedMemory::DataFetcherSharedMemory() {} - -DataFetcherSharedMemory::~DataFetcherSharedMemory() {} - -bool DataFetcherSharedMemory::Start(ConsumerType consumer_type, void* buffer) { - DCHECK(buffer); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - motion_buffer_ = static_cast<DeviceMotionHardwareBuffer*>(buffer); - UMA_HISTOGRAM_BOOLEAN("InertialSensor.MotionDefaultAvailable", false); - return SetMotionBuffer(motion_buffer_, true); - case CONSUMER_TYPE_ORIENTATION: - orientation_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - UMA_HISTOGRAM_BOOLEAN("InertialSensor.OrientationDefaultAvailable", - false); - return SetOrientationBuffer(orientation_buffer_, true); - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - orientation_absolute_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - return SetOrientationBuffer(orientation_absolute_buffer_, true); - default: - NOTREACHED(); - } - return false; -} - -bool DataFetcherSharedMemory::Stop(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - return SetMotionBuffer(motion_buffer_, false); - case CONSUMER_TYPE_ORIENTATION: - return SetOrientationBuffer(orientation_buffer_, false); - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - return SetOrientationBuffer(orientation_absolute_buffer_, false); - default: - NOTREACHED(); - } - return false; -} - -} // namespace device
diff --git a/device/sensors/data_fetcher_shared_memory_fuchsia.cc b/device/sensors/data_fetcher_shared_memory_fuchsia.cc deleted file mode 100644 index ce1aee90..0000000 --- a/device/sensors/data_fetcher_shared_memory_fuchsia.cc +++ /dev/null
@@ -1,29 +0,0 @@ -// Copyright 2017 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 "device/sensors/data_fetcher_shared_memory.h" - -#include "base/logging.h" - -namespace device { - -DataFetcherSharedMemory::DataFetcherSharedMemory() {} - -DataFetcherSharedMemory::~DataFetcherSharedMemory() {} - -bool DataFetcherSharedMemory::Start(ConsumerType consumer_type, void* buffer) { - // TODO(fuchsia): Implement support for sensor consumer buffers. - // (crbug.com/750934) - NOTIMPLEMENTED(); - return false; -} - -bool DataFetcherSharedMemory::Stop(ConsumerType consumer_type) { - // TODO(fuchsia): Implement support for sensor consumer buffers. - // (crbug.com/750934) - NOTIMPLEMENTED(); - return false; -} - -} // namespace device
diff --git a/device/sensors/data_fetcher_shared_memory_mac.cc b/device/sensors/data_fetcher_shared_memory_mac.cc deleted file mode 100644 index ec46f69..0000000 --- a/device/sensors/data_fetcher_shared_memory_mac.cc +++ /dev/null
@@ -1,214 +0,0 @@ -// Copyright 2014 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 "device/sensors/data_fetcher_shared_memory.h" - -#include <stdint.h> - -#include "base/logging.h" -#include "base/metrics/histogram_macros.h" -#include "base/single_thread_task_runner.h" -#include "third_party/sudden_motion_sensor/sudden_motion_sensor_mac.h" -#include "ui/gfx/geometry/angle_conversions.h" - -namespace device { - -const double kMeanGravity = 9.80665; - -void FetchMotion(SuddenMotionSensor* sensor, - DeviceMotionHardwareBuffer* buffer) { - DCHECK(sensor); - DCHECK(buffer); - - float axis_value[3]; - if (!sensor->ReadSensorValues(axis_value)) - return; - - buffer->seqlock.WriteBegin(); - buffer->data.acceleration_including_gravity_x = axis_value[0] * kMeanGravity; - buffer->data.has_acceleration_including_gravity_x = true; - buffer->data.acceleration_including_gravity_y = axis_value[1] * kMeanGravity; - buffer->data.has_acceleration_including_gravity_y = true; - buffer->data.acceleration_including_gravity_z = axis_value[2] * kMeanGravity; - buffer->data.has_acceleration_including_gravity_z = true; - buffer->data.all_available_sensors_are_active = true; - buffer->seqlock.WriteEnd(); -} - -void FetchOrientation(SuddenMotionSensor* sensor, - DeviceOrientationHardwareBuffer* buffer) { - DCHECK(sensor); - DCHECK(buffer); - - // Retrieve per-axis calibrated values. - float axis_value[3]; - if (!sensor->ReadSensorValues(axis_value)) - return; - - // Transform the accelerometer values to W3C draft angles. - // - // Accelerometer values are just dot products of the sensor axes - // by the gravity vector 'g' with the result for the z axis inverted. - // - // To understand this transformation calculate the 3rd row of the z-x-y - // Euler angles rotation matrix (because of the 'g' vector, only 3rd row - // affects to the result). Note that z-x-y matrix means R = Ry * Rx * Rz. - // Then, assume alpha = 0 and you get this: - // - // x_acc = sin(gamma) - // y_acc = - cos(gamma) * sin(beta) - // z_acc = cos(beta) * cos(gamma) - // - // After that the rest is just a bit of trigonometry. - // - // Also note that alpha can't be provided but it's assumed to be always zero. - // This is necessary in order to provide enough information to solve - // the equations. - // - // TODO(timvolodine): crbug.com/765802 Check if cast-to-double is necessary. - double beta = - gfx::RadToDeg(static_cast<double>(atan2(-axis_value[1], axis_value[2]))); - double gamma = gfx::RadToDeg(static_cast<double>(asin(axis_value[0]))); - - // Make sure that the interval boundaries comply with the specification. At - // this point, beta is [-180, 180] and gamma is [-90, 90], but the spec has - // the upper bound open on both. - if (beta == 180.0) - beta = -180; // -180 == 180 (upside-down) - if (gamma == 90.0) - gamma = nextafter(90, 0); - - // At this point, DCHECKing is paranoia. Never hurts. - DCHECK_GE(beta, -180.0); - DCHECK_LT(beta, 180.0); - DCHECK_GE(gamma, -90.0); - DCHECK_LT(gamma, 90.0); - - buffer->seqlock.WriteBegin(); - buffer->data.beta = beta; - buffer->data.has_beta = true; - buffer->data.gamma = gamma; - buffer->data.has_gamma = true; - buffer->data.all_available_sensors_are_active = true; - buffer->seqlock.WriteEnd(); -} - -DataFetcherSharedMemory::DataFetcherSharedMemory() {} - -DataFetcherSharedMemory::~DataFetcherSharedMemory() {} - -void DataFetcherSharedMemory::Fetch(unsigned consumer_bitmask) { - DCHECK(GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - DCHECK(consumer_bitmask & CONSUMER_TYPE_ORIENTATION || - consumer_bitmask & CONSUMER_TYPE_MOTION); - - if (consumer_bitmask & CONSUMER_TYPE_ORIENTATION) - FetchOrientation(sudden_motion_sensor_.get(), orientation_buffer_); - if (consumer_bitmask & CONSUMER_TYPE_MOTION) - FetchMotion(sudden_motion_sensor_.get(), motion_buffer_); -} - -DataFetcherSharedMemory::FetcherType DataFetcherSharedMemory::GetType() const { - return FETCHER_TYPE_POLLING_CALLBACK; -} - -bool DataFetcherSharedMemory::Start(ConsumerType consumer_type, void* buffer) { - DCHECK(GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - DCHECK(buffer); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: { - if (!sudden_motion_sensor_) - sudden_motion_sensor_.reset(SuddenMotionSensor::Create()); - bool sudden_motion_sensor_available = - sudden_motion_sensor_.get() != nullptr; - - motion_buffer_ = static_cast<DeviceMotionHardwareBuffer*>(buffer); - UMA_HISTOGRAM_BOOLEAN("InertialSensor.MotionMacAvailable", - sudden_motion_sensor_available); - if (!sudden_motion_sensor_available) { - // No motion sensor available, fire an all-null event. - motion_buffer_->seqlock.WriteBegin(); - motion_buffer_->data.all_available_sensors_are_active = true; - motion_buffer_->seqlock.WriteEnd(); - } - return sudden_motion_sensor_available; - } - case CONSUMER_TYPE_ORIENTATION: { - if (!sudden_motion_sensor_) - sudden_motion_sensor_.reset(SuddenMotionSensor::Create()); - bool sudden_motion_sensor_available = - sudden_motion_sensor_.get() != nullptr; - - orientation_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - UMA_HISTOGRAM_BOOLEAN("InertialSensor.OrientationMacAvailable", - sudden_motion_sensor_available); - if (sudden_motion_sensor_available) { - // On Mac we cannot provide absolute orientation. - orientation_buffer_->seqlock.WriteBegin(); - orientation_buffer_->data.absolute = false; - orientation_buffer_->seqlock.WriteEnd(); - } else { - // No motion sensor available, fire an all-null event. - orientation_buffer_->seqlock.WriteBegin(); - orientation_buffer_->data.all_available_sensors_are_active = true; - orientation_buffer_->seqlock.WriteEnd(); - } - return sudden_motion_sensor_available; - } - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: { - orientation_absolute_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - // Absolute device orientation not available on Mac, let the - // implementation fire an all-null event to signal this to blink. - orientation_absolute_buffer_->seqlock.WriteBegin(); - orientation_absolute_buffer_->data.absolute = true; - orientation_absolute_buffer_->data.all_available_sensors_are_active = - true; - orientation_absolute_buffer_->seqlock.WriteEnd(); - return false; - } - default: - NOTREACHED(); - } - return false; -} - -bool DataFetcherSharedMemory::Stop(ConsumerType consumer_type) { - DCHECK(GetPollingMessageLoop()->task_runner()->BelongsToCurrentThread()); - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - if (motion_buffer_) { - motion_buffer_->seqlock.WriteBegin(); - motion_buffer_->data.all_available_sensors_are_active = false; - motion_buffer_->seqlock.WriteEnd(); - motion_buffer_ = nullptr; - } - return true; - case CONSUMER_TYPE_ORIENTATION: - if (orientation_buffer_) { - orientation_buffer_->seqlock.WriteBegin(); - orientation_buffer_->data.all_available_sensors_are_active = false; - orientation_buffer_->seqlock.WriteEnd(); - orientation_buffer_ = nullptr; - } - return true; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - if (orientation_absolute_buffer_) { - orientation_absolute_buffer_->seqlock.WriteBegin(); - orientation_absolute_buffer_->data.all_available_sensors_are_active = - false; - orientation_absolute_buffer_->seqlock.WriteEnd(); - orientation_absolute_buffer_ = nullptr; - } - return true; - default: - NOTREACHED(); - } - return false; -} - -} // namespace device
diff --git a/device/sensors/data_fetcher_shared_memory_win.cc b/device/sensors/data_fetcher_shared_memory_win.cc deleted file mode 100644 index fcea213..0000000 --- a/device/sensors/data_fetcher_shared_memory_win.cc +++ /dev/null
@@ -1,421 +0,0 @@ -// Copyright 2014 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 "device/sensors/data_fetcher_shared_memory.h" - -#include <GuidDef.h> -#include <InitGuid.h> -#include <PortableDeviceTypes.h> -#include <Sensors.h> -#include <objbase.h> - -#include "base/logging.h" -#include "base/macros.h" -#include "base/metrics/histogram_macros.h" -#include "base/win/iunknown_impl.h" - -namespace { - -const double kMeanGravity = 9.80665; - -} // namespace - -namespace device { - -class DataFetcherSharedMemory::SensorEventSink - : public ISensorEvents, - public base::win::IUnknownImpl { - public: - SensorEventSink() {} - ~SensorEventSink() override {} - - // IUnknown interface - ULONG STDMETHODCALLTYPE AddRef() override { return IUnknownImpl::AddRef(); } - - ULONG STDMETHODCALLTYPE Release() override { return IUnknownImpl::Release(); } - - STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override { - if (riid == __uuidof(ISensorEvents)) { - *ppv = static_cast<ISensorEvents*>(this); - AddRef(); - return S_OK; - } - return IUnknownImpl::QueryInterface(riid, ppv); - } - - // ISensorEvents interface - STDMETHODIMP OnEvent(ISensor* sensor, - REFGUID event_id, - IPortableDeviceValues* event_data) override { - return S_OK; - } - - STDMETHODIMP OnLeave(REFSENSOR_ID sensor_id) override { return S_OK; } - - STDMETHODIMP OnStateChanged(ISensor* sensor, SensorState state) override { - return S_OK; - } - - STDMETHODIMP OnDataUpdated(ISensor* sensor, - ISensorDataReport* new_data) override { - if (nullptr == new_data || nullptr == sensor) - return E_INVALIDARG; - return UpdateSharedMemoryBuffer(sensor, new_data) ? S_OK : E_FAIL; - } - - protected: - virtual bool UpdateSharedMemoryBuffer(ISensor* sensor, - ISensorDataReport* new_data) = 0; - - void GetSensorValue(REFPROPERTYKEY property, - ISensorDataReport* new_data, - double* value, - bool* has_value) { - PROPVARIANT variant_value = {}; - if (SUCCEEDED(new_data->GetSensorValue(property, &variant_value))) { - if (variant_value.vt == VT_R8) - *value = variant_value.dblVal; - else if (variant_value.vt == VT_R4) - *value = variant_value.fltVal; - *has_value = true; - } else { - *value = 0; - *has_value = false; - } - } - - private: - DISALLOW_COPY_AND_ASSIGN(SensorEventSink); -}; - -class DataFetcherSharedMemory::SensorEventSinkOrientation - : public DataFetcherSharedMemory::SensorEventSink { - public: - explicit SensorEventSinkOrientation( - DeviceOrientationHardwareBuffer* const buffer) - : buffer_(buffer) {} - ~SensorEventSinkOrientation() override {} - - protected: - bool UpdateSharedMemoryBuffer(ISensor* sensor, - ISensorDataReport* new_data) override { - double alpha, beta, gamma; - bool has_alpha, has_beta, has_gamma; - - GetSensorValue(SENSOR_DATA_TYPE_TILT_X_DEGREES, new_data, &beta, &has_beta); - GetSensorValue(SENSOR_DATA_TYPE_TILT_Y_DEGREES, new_data, &gamma, - &has_gamma); - GetSensorValue(SENSOR_DATA_TYPE_TILT_Z_DEGREES, new_data, &alpha, - &has_alpha); - - if (buffer_) { - buffer_->seqlock.WriteBegin(); - buffer_->data.alpha = alpha; - buffer_->data.has_alpha = has_alpha; - buffer_->data.beta = beta; - buffer_->data.has_beta = has_beta; - buffer_->data.gamma = gamma; - buffer_->data.has_gamma = has_gamma; - buffer_->data.absolute = has_alpha || has_beta || has_gamma; - buffer_->data.all_available_sensors_are_active = true; - buffer_->seqlock.WriteEnd(); - } - - return true; - } - - private: - DeviceOrientationHardwareBuffer* const buffer_; - - DISALLOW_COPY_AND_ASSIGN(SensorEventSinkOrientation); -}; - -class DataFetcherSharedMemory::SensorEventSinkMotion - : public DataFetcherSharedMemory::SensorEventSink { - public: - explicit SensorEventSinkMotion(DeviceMotionHardwareBuffer* const buffer) - : buffer_(buffer) {} - ~SensorEventSinkMotion() override {} - - protected: - bool UpdateSharedMemoryBuffer(ISensor* sensor, - ISensorDataReport* new_data) override { - SENSOR_TYPE_ID sensor_type = GUID_NULL; - if (!SUCCEEDED(sensor->GetType(&sensor_type))) - return false; - - if (IsEqualIID(sensor_type, SENSOR_TYPE_ACCELEROMETER_3D)) { - double acceleration_including_gravity_x; - double acceleration_including_gravity_y; - double acceleration_including_gravity_z; - bool has_acceleration_including_gravity_x; - bool has_acceleration_including_gravity_y; - bool has_acceleration_including_gravity_z; - - GetSensorValue(SENSOR_DATA_TYPE_ACCELERATION_X_G, new_data, - &acceleration_including_gravity_x, - &has_acceleration_including_gravity_x); - GetSensorValue(SENSOR_DATA_TYPE_ACCELERATION_Y_G, new_data, - &acceleration_including_gravity_y, - &has_acceleration_including_gravity_y); - GetSensorValue(SENSOR_DATA_TYPE_ACCELERATION_Z_G, new_data, - &acceleration_including_gravity_z, - &has_acceleration_including_gravity_z); - - if (buffer_) { - buffer_->seqlock.WriteBegin(); - buffer_->data.acceleration_including_gravity_x = - -acceleration_including_gravity_x * kMeanGravity; - buffer_->data.has_acceleration_including_gravity_x = - has_acceleration_including_gravity_x; - buffer_->data.acceleration_including_gravity_y = - -acceleration_including_gravity_y * kMeanGravity; - buffer_->data.has_acceleration_including_gravity_y = - has_acceleration_including_gravity_y; - buffer_->data.acceleration_including_gravity_z = - -acceleration_including_gravity_z * kMeanGravity; - buffer_->data.has_acceleration_including_gravity_z = - has_acceleration_including_gravity_z; - // TODO(timvolodine): consider setting this after all - // sensors have fired. - buffer_->data.all_available_sensors_are_active = true; - buffer_->seqlock.WriteEnd(); - } - - } else if (IsEqualIID(sensor_type, SENSOR_TYPE_GYROMETER_3D)) { - double alpha, beta, gamma; - bool has_alpha, has_beta, has_gamma; - - GetSensorValue(SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, - new_data, &alpha, &has_alpha); - GetSensorValue(SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, - new_data, &beta, &has_beta); - GetSensorValue(SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, - new_data, &gamma, &has_gamma); - - if (buffer_) { - buffer_->seqlock.WriteBegin(); - buffer_->data.rotation_rate_alpha = alpha; - buffer_->data.has_rotation_rate_alpha = has_alpha; - buffer_->data.rotation_rate_beta = beta; - buffer_->data.has_rotation_rate_beta = has_beta; - buffer_->data.rotation_rate_gamma = gamma; - buffer_->data.has_rotation_rate_gamma = has_gamma; - buffer_->data.all_available_sensors_are_active = true; - buffer_->seqlock.WriteEnd(); - } - } - - return true; - } - - private: - DeviceMotionHardwareBuffer* const buffer_; - - DISALLOW_COPY_AND_ASSIGN(SensorEventSinkMotion); -}; - -DataFetcherSharedMemory::DataFetcherSharedMemory() {} - -DataFetcherSharedMemory::~DataFetcherSharedMemory() {} - -DataFetcherSharedMemory::FetcherType DataFetcherSharedMemory::GetType() const { - return FETCHER_TYPE_SEPARATE_THREAD; -} - -bool DataFetcherSharedMemory::Start(ConsumerType consumer_type, void* buffer) { - DCHECK(buffer); - - switch (consumer_type) { - case CONSUMER_TYPE_ORIENTATION: { - orientation_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - scoped_refptr<SensorEventSink> sink( - new SensorEventSinkOrientation(orientation_buffer_)); - bool inclinometer_available = - RegisterForSensor(SENSOR_TYPE_INCLINOMETER_3D, - sensor_inclinometer_.GetAddressOf(), sink); - UMA_HISTOGRAM_BOOLEAN("InertialSensor.InclinometerWindowsAvailable", - inclinometer_available); - if (inclinometer_available) - return true; - // if no sensors are available set buffer to ready, to fire null-events. - SetBufferAvailableState(consumer_type, true); - } break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: { - orientation_absolute_buffer_ = - static_cast<DeviceOrientationHardwareBuffer*>(buffer); - scoped_refptr<SensorEventSink> sink( - new SensorEventSinkOrientation(orientation_absolute_buffer_)); - // Currently we use the same sensor as for orientation which provides - // absolute angles. - bool inclinometer_available = - RegisterForSensor(SENSOR_TYPE_INCLINOMETER_3D, - sensor_inclinometer_absolute_.GetAddressOf(), sink); - // TODO(timvolodine): consider adding UMA. - if (inclinometer_available) - return true; - // if no sensors are available set buffer to ready, to fire null-events. - SetBufferAvailableState(consumer_type, true); - } break; - case CONSUMER_TYPE_MOTION: { - motion_buffer_ = static_cast<DeviceMotionHardwareBuffer*>(buffer); - scoped_refptr<SensorEventSink> sink( - new SensorEventSinkMotion(motion_buffer_)); - bool accelerometer_available = - RegisterForSensor(SENSOR_TYPE_ACCELEROMETER_3D, - sensor_accelerometer_.GetAddressOf(), sink); - bool gyrometer_available = RegisterForSensor( - SENSOR_TYPE_GYROMETER_3D, sensor_gyrometer_.GetAddressOf(), sink); - UMA_HISTOGRAM_BOOLEAN("InertialSensor.AccelerometerWindowsAvailable", - accelerometer_available); - UMA_HISTOGRAM_BOOLEAN("InertialSensor.GyrometerWindowsAvailable", - gyrometer_available); - if (accelerometer_available || gyrometer_available) { - motion_buffer_->seqlock.WriteBegin(); - motion_buffer_->data.interval = GetInterval().InMilliseconds(); - motion_buffer_->seqlock.WriteEnd(); - return true; - } - // if no sensors are available set buffer to ready, to fire null-events. - SetBufferAvailableState(consumer_type, true); - } break; - default: - NOTREACHED(); - } - return false; -} - -bool DataFetcherSharedMemory::Stop(ConsumerType consumer_type) { - DisableSensors(consumer_type); - switch (consumer_type) { - case CONSUMER_TYPE_ORIENTATION: - SetBufferAvailableState(consumer_type, false); - orientation_buffer_ = nullptr; - return true; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - SetBufferAvailableState(consumer_type, false); - orientation_absolute_buffer_ = nullptr; - return true; - case CONSUMER_TYPE_MOTION: - SetBufferAvailableState(consumer_type, false); - motion_buffer_ = nullptr; - return true; - default: - NOTREACHED(); - } - return false; -} - -bool DataFetcherSharedMemory::RegisterForSensor( - REFSENSOR_TYPE_ID sensor_type, - ISensor** sensor, - scoped_refptr<SensorEventSink> event_sink) { - Microsoft::WRL::ComPtr<ISensorManager> sensor_manager; - HRESULT hr = ::CoCreateInstance(CLSID_SensorManager, nullptr, CLSCTX_ALL, - IID_PPV_ARGS(&sensor_manager)); - if (FAILED(hr) || !sensor_manager.Get()) - return false; - - Microsoft::WRL::ComPtr<ISensorCollection> sensor_collection; - hr = sensor_manager->GetSensorsByType(sensor_type, - sensor_collection.GetAddressOf()); - - if (FAILED(hr) || !sensor_collection.Get()) - return false; - - ULONG count = 0; - hr = sensor_collection->GetCount(&count); - if (FAILED(hr) || !count) - return false; - - hr = sensor_collection->GetAt(0, sensor); - if (FAILED(hr) || !(*sensor)) - return false; - - Microsoft::WRL::ComPtr<IPortableDeviceValues> device_values; - if (SUCCEEDED(::CoCreateInstance(CLSID_PortableDeviceValues, nullptr, - CLSCTX_ALL, IID_PPV_ARGS(&device_values)))) { - if (SUCCEEDED(device_values->SetUnsignedIntegerValue( - SENSOR_PROPERTY_CURRENT_REPORT_INTERVAL, - GetInterval().InMilliseconds()))) { - Microsoft::WRL::ComPtr<IPortableDeviceValues> return_values; - (*sensor)->SetProperties(device_values.Get(), - return_values.GetAddressOf()); - } - } - - Microsoft::WRL::ComPtr<ISensorEvents> sensor_events; - hr = event_sink->QueryInterface(IID_PPV_ARGS(&sensor_events)); - if (FAILED(hr) || !sensor_events.Get()) - return false; - - hr = (*sensor)->SetEventSink(sensor_events.Get()); - if (FAILED(hr)) - return false; - - return true; -} - -void DataFetcherSharedMemory::DisableSensors(ConsumerType consumer_type) { - switch (consumer_type) { - case CONSUMER_TYPE_ORIENTATION: - if (sensor_inclinometer_.Get()) { - sensor_inclinometer_->SetEventSink(nullptr); - sensor_inclinometer_.Reset(); - } - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - if (sensor_inclinometer_absolute_.Get()) { - sensor_inclinometer_absolute_->SetEventSink(nullptr); - sensor_inclinometer_absolute_.Reset(); - } - break; - case CONSUMER_TYPE_MOTION: - if (sensor_accelerometer_.Get()) { - sensor_accelerometer_->SetEventSink(nullptr); - sensor_accelerometer_.Reset(); - } - if (sensor_gyrometer_.Get()) { - sensor_gyrometer_->SetEventSink(nullptr); - sensor_gyrometer_.Reset(); - } - break; - default: - NOTREACHED(); - } -} - -void DataFetcherSharedMemory::SetBufferAvailableState( - ConsumerType consumer_type, - bool enabled) { - switch (consumer_type) { - case CONSUMER_TYPE_ORIENTATION: - if (orientation_buffer_) { - orientation_buffer_->seqlock.WriteBegin(); - orientation_buffer_->data.all_available_sensors_are_active = enabled; - orientation_buffer_->seqlock.WriteEnd(); - } - break; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - if (orientation_absolute_buffer_) { - orientation_absolute_buffer_->seqlock.WriteBegin(); - orientation_absolute_buffer_->data.all_available_sensors_are_active = - enabled; - orientation_absolute_buffer_->seqlock.WriteEnd(); - } - break; - case CONSUMER_TYPE_MOTION: - if (motion_buffer_) { - motion_buffer_->seqlock.WriteBegin(); - motion_buffer_->data.all_available_sensors_are_active = enabled; - motion_buffer_->seqlock.WriteEnd(); - } - break; - default: - NOTREACHED(); - } -} - -} // namespace device
diff --git a/device/sensors/device_sensor_export.h b/device/sensors/device_sensor_export.h deleted file mode 100644 index 2e31825..0000000 --- a/device/sensors/device_sensor_export.h +++ /dev/null
@@ -1,29 +0,0 @@ -// Copyright 2017 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 DEVICE_SENSORS_DEVICE_SENSOR_EXPORT_H_ -#define DEVICE_SENSORS_DEVICE_SENSOR_EXPORT_H_ - -#if defined(COMPONENT_BUILD) -#if defined(WIN32) - -#if defined(DEVICE_SENSOR_IMPLEMENTATION) -#define DEVICE_SENSOR_EXPORT __declspec(dllexport) -#else -#define DEVICE_SENSOR_EXPORT __declspec(dllimport) -#endif // defined(DEVICE_SENSOR_IMPLEMENTATION) - -#else // defined(WIN32) -#if defined(DEVICE_SENSOR_IMPLEMENTATION) -#define DEVICE_SENSOR_EXPORT __attribute__((visibility("default"))) -#else -#define DEVICE_SENSOR_EXPORT -#endif -#endif - -#else // defined(COMPONENT_BUILD) -#define DEVICE_SENSOR_EXPORT -#endif - -#endif // DEVICE_SENSORS_DEVICE_SENSOR_EXPORT_H_
diff --git a/device/sensors/device_sensor_host.cc b/device/sensors/device_sensor_host.cc deleted file mode 100644 index cd37326..0000000 --- a/device/sensors/device_sensor_host.cc +++ /dev/null
@@ -1,75 +0,0 @@ -// Copyright 2016 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 "device/sensors/device_sensor_host.h" - -#include <utility> - -#include "base/memory/ptr_util.h" -#include "base/message_loop/message_loop.h" -#include "device/sensors/device_sensor_export.h" -#include "device/sensors/device_sensor_service.h" -#include "mojo/public/cpp/bindings/strong_binding.h" - -namespace device { - -template <typename MojoInterface, ConsumerType consumer_type> -void DeviceSensorHost<MojoInterface, consumer_type>::Create( - mojo::InterfaceRequest<MojoInterface> request) { - mojo::MakeStrongBinding( - base::WrapUnique(new DeviceSensorHost<MojoInterface, consumer_type>), - std::move(request)); -} - -template <typename MojoInterface, ConsumerType consumer_type> -DeviceSensorHost<MojoInterface, consumer_type>::DeviceSensorHost() - : is_started_(false) { -#if defined(OS_ANDROID) - DCHECK(base::MessageLoopForUI::IsCurrent()); -#else - DCHECK(base::MessageLoopForIO::IsCurrent()); -#endif -} - -template <typename MojoInterface, ConsumerType consumer_type> -DeviceSensorHost<MojoInterface, consumer_type>::~DeviceSensorHost() { - DCHECK(thread_checker_.CalledOnValidThread()); - if (is_started_) - DeviceSensorService::GetInstance()->RemoveConsumer(consumer_type); -} - -template <typename MojoInterface, ConsumerType consumer_type> -void DeviceSensorHost<MojoInterface, consumer_type>::DeviceSensorHost:: - StartPolling(typename MojoInterface::StartPollingCallback callback) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(!is_started_); - if (is_started_) - return; - is_started_ = true; - DeviceSensorService::GetInstance()->AddConsumer(consumer_type); - std::move(callback).Run( - DeviceSensorService::GetInstance()->GetSharedMemoryHandle(consumer_type)); -} - -template <typename MojoInterface, ConsumerType consumer_type> -void DeviceSensorHost<MojoInterface, - consumer_type>::DeviceSensorHost::StopPolling() { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(is_started_); - if (!is_started_) - return; - is_started_ = false; - DeviceSensorService::GetInstance()->RemoveConsumer(consumer_type); -} - -template class DEVICE_SENSOR_EXPORT - DeviceSensorHost<device::mojom::MotionSensor, CONSUMER_TYPE_MOTION>; -template class DEVICE_SENSOR_EXPORT - DeviceSensorHost<device::mojom::OrientationSensor, - CONSUMER_TYPE_ORIENTATION>; -template class DEVICE_SENSOR_EXPORT - DeviceSensorHost<device::mojom::OrientationAbsoluteSensor, - CONSUMER_TYPE_ORIENTATION_ABSOLUTE>; - -} // namespace device
diff --git a/device/sensors/device_sensor_host.h b/device/sensors/device_sensor_host.h deleted file mode 100644 index a7ce8a8..0000000 --- a/device/sensors/device_sensor_host.h +++ /dev/null
@@ -1,51 +0,0 @@ -// Copyright 2016 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 DEVICE_SENSORS_DEVICE_SENSOR_HOST_H_ -#define DEVICE_SENSORS_DEVICE_SENSOR_HOST_H_ - -#include "base/macros.h" -#include "base/memory/shared_memory.h" -#include "base/threading/thread_checker.h" -#include "device/sensors/device_sensors_consts.h" -#include "device/sensors/public/mojom/motion.mojom.h" -#include "device/sensors/public/mojom/orientation.mojom.h" -#include "mojo/public/cpp/bindings/interface_request.h" - -namespace device { - -// A base class for device sensor related mojo interface implementations. -template <typename MojoInterface, ConsumerType consumer_type> -class DeviceSensorHost : public MojoInterface { - public: - static void Create(mojo::InterfaceRequest<MojoInterface> request); - - // All methods below to be called on the IO thread. - ~DeviceSensorHost() override; - - private: - DeviceSensorHost(); - - void StartPolling( - typename MojoInterface::StartPollingCallback callback) override; - void StopPolling() override; - - bool is_started_; - - base::ThreadChecker thread_checker_; - - DISALLOW_COPY_AND_ASSIGN(DeviceSensorHost); -}; - -using DeviceMotionHost = - DeviceSensorHost<device::mojom::MotionSensor, CONSUMER_TYPE_MOTION>; -using DeviceOrientationHost = DeviceSensorHost<device::mojom::OrientationSensor, - CONSUMER_TYPE_ORIENTATION>; -using DeviceOrientationAbsoluteHost = - DeviceSensorHost<device::mojom::OrientationAbsoluteSensor, - CONSUMER_TYPE_ORIENTATION_ABSOLUTE>; - -} // namespace device - -#endif // DEVICE_SENSORS_DEVICE_SENSOR_HOST_H_
diff --git a/device/sensors/device_sensor_service.cc b/device/sensors/device_sensor_service.cc deleted file mode 100644 index 1529aff..0000000 --- a/device/sensors/device_sensor_service.cc +++ /dev/null
@@ -1,115 +0,0 @@ -// Copyright 2014 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 "device/sensors/device_sensor_service.h" - -#include "base/bind.h" -#include "base/logging.h" -#include "base/memory/singleton.h" -#include "base/trace_event/trace_event.h" -#include "device/sensors/data_fetcher_shared_memory.h" - -namespace device { - -DeviceSensorService::DeviceSensorService() - : num_motion_readers_(0), - num_orientation_readers_(0), - num_orientation_absolute_readers_(0), - is_shutdown_(false) { - base::MessageLoop::current()->AddDestructionObserver(this); -} - -DeviceSensorService::~DeviceSensorService() = default; - -DeviceSensorService* DeviceSensorService::GetInstance() { - return base::Singleton<DeviceSensorService, base::LeakySingletonTraits< - DeviceSensorService>>::get(); -} - -void DeviceSensorService::AddConsumer(ConsumerType consumer_type) { - if (!ChangeNumberConsumers(consumer_type, 1)) - return; - - DCHECK(GetNumberConsumers(consumer_type)); - - if (!data_fetcher_) - data_fetcher_.reset(new DataFetcherSharedMemory); - data_fetcher_->StartFetchingDeviceData(consumer_type); -} - -void DeviceSensorService::RemoveConsumer(ConsumerType consumer_type) { - if (!ChangeNumberConsumers(consumer_type, -1)) - return; - - if (GetNumberConsumers(consumer_type) == 0) - data_fetcher_->StopFetchingDeviceData(consumer_type); -} - -bool DeviceSensorService::ChangeNumberConsumers(ConsumerType consumer_type, - int delta) { - DCHECK(thread_checker_.CalledOnValidThread()); - if (is_shutdown_) - return false; - - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - num_motion_readers_ += delta; - DCHECK_GE(num_motion_readers_, 0); - return true; - case CONSUMER_TYPE_ORIENTATION: - num_orientation_readers_ += delta; - DCHECK_GE(num_orientation_readers_, 0); - return true; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - num_orientation_absolute_readers_ += delta; - DCHECK_GE(num_orientation_absolute_readers_, 0); - return true; - default: - NOTREACHED(); - } - return false; -} - -int DeviceSensorService::GetNumberConsumers(ConsumerType consumer_type) const { - switch (consumer_type) { - case CONSUMER_TYPE_MOTION: - return num_motion_readers_; - case CONSUMER_TYPE_ORIENTATION: - return num_orientation_readers_; - case CONSUMER_TYPE_ORIENTATION_ABSOLUTE: - return num_orientation_absolute_readers_; - default: - NOTREACHED(); - } - return 0; -} - -mojo::ScopedSharedBufferHandle DeviceSensorService::GetSharedMemoryHandle( - ConsumerType consumer_type) { - DCHECK(thread_checker_.CalledOnValidThread()); - return data_fetcher_->GetSharedMemoryHandle(consumer_type); -} - -void DeviceSensorService::WillDestroyCurrentMessageLoop() { - base::MessageLoop::current()->RemoveDestructionObserver(this); - TRACE_EVENT0("shutdown", "DeviceSensorService::Subsystem:SensorService"); - Shutdown(); -} - -void DeviceSensorService::Shutdown() { - if (data_fetcher_) { - data_fetcher_->Shutdown(); - data_fetcher_.reset(); - } - is_shutdown_ = true; -} - -void DeviceSensorService::SetDataFetcherForTesting( - DataFetcherSharedMemory* test_data_fetcher) { - if (data_fetcher_) - data_fetcher_->Shutdown(); - data_fetcher_.reset(test_data_fetcher); -} - -} // namespace device
diff --git a/device/sensors/device_sensor_service.h b/device/sensors/device_sensor_service.h deleted file mode 100644 index 17b356c..0000000 --- a/device/sensors/device_sensor_service.h +++ /dev/null
@@ -1,77 +0,0 @@ -// Copyright 2014 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 DEVICE_SENSORS_DEVICE_SENSOR_SERVICE_H_ -#define DEVICE_SENSORS_DEVICE_SENSOR_SERVICE_H_ - -#include <memory> - -#include "base/callback_forward.h" -#include "base/macros.h" -#include "base/memory/shared_memory.h" -#include "base/memory/singleton.h" -#include "base/message_loop/message_loop.h" -#include "base/threading/thread_checker.h" -#include "device/sensors/device_sensor_export.h" -#include "device/sensors/device_sensors_consts.h" -#include "mojo/public/cpp/system/buffer.h" - -namespace device { - -class DataFetcherSharedMemory; - -// Owns the data fetcher for Device Motion and Orientation and keeps track of -// the number of consumers currently using the data. The data fetcher is stopped -// when there are no consumers. -class DEVICE_SENSOR_EXPORT DeviceSensorService - : public base::MessageLoop::DestructionObserver { - public: - // Returns the DeviceSensorService singleton. - static DeviceSensorService* GetInstance(); - - // Increments the number of users of the provider. The Provider is running - // when there's > 0 users, and is paused when the count drops to 0. - // Must be called on the I/O thread. - void AddConsumer(ConsumerType consumer_type); - - // Removes a consumer. Should be matched with an AddConsumer call. - // Must be called on the I/O thread. - void RemoveConsumer(ConsumerType cosumer_type); - - // Returns the shared memory handle of the device motion data. - mojo::ScopedSharedBufferHandle GetSharedMemoryHandle( - ConsumerType consumer_type); - - // base::MessageLoop::DestructionObserver: - void WillDestroyCurrentMessageLoop() override; - - // Stop/join with the background polling thread in |provider_|. - void Shutdown(); - - // Injects a custom data fetcher for testing purposes. This class takes - // ownership of the injected object. - void SetDataFetcherForTesting(DataFetcherSharedMemory* test_data_fetcher); - - private: - friend struct base::DefaultSingletonTraits<DeviceSensorService>; - - DeviceSensorService(); - ~DeviceSensorService() override; - - bool ChangeNumberConsumers(ConsumerType consumer_type, int delta); - int GetNumberConsumers(ConsumerType consumer_type) const; - - int num_motion_readers_; - int num_orientation_readers_; - int num_orientation_absolute_readers_; - bool is_shutdown_; - std::unique_ptr<DataFetcherSharedMemory> data_fetcher_; - base::ThreadChecker thread_checker_; - - DISALLOW_COPY_AND_ASSIGN(DeviceSensorService); -}; - -} // namespace device - -#endif // DEVICE_SENSORS_DEVICE_SENSOR_SERVICE_H_
diff --git a/device/sensors/device_sensors_consts.h b/device/sensors/device_sensors_consts.h deleted file mode 100644 index b128222b..0000000 --- a/device/sensors/device_sensors_consts.h +++ /dev/null
@@ -1,32 +0,0 @@ -// Copyright 2015 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 DEVICE_SENSORS_DEVICE_SENSORS_CONSTS_H_ -#define DEVICE_SENSORS_DEVICE_SENSORS_CONSTS_H_ - -#include "base/time/time.h" - -namespace device { - -// Constants related to the Device {Motion|Orientation} APIs. - -// A Java counterpart will be generated for this enum. -// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.device.sensors -enum ConsumerType { - CONSUMER_TYPE_MOTION = 1 << 0, - CONSUMER_TYPE_ORIENTATION = 1 << 1, - CONSUMER_TYPE_ORIENTATION_ABSOLUTE = 1 << 2, -}; - -// Specifies the sampling rate for sensor data updates. -// Note that when changing this value it is desirable to have an adequate -// matching value |DeviceSensorEventPump::kDefaultPumpFrequencyHz| in -// content/renderer/device_orientation/device_sensor_event_pump.cc. -const int kDeviceSensorSamplingRateHz = 60; -const int kDeviceSensorIntervalMicroseconds = - base::Time::kMicrosecondsPerSecond / kDeviceSensorSamplingRateHz; - -} // namespace device - -#endif // DEVICE_SENSORS_DEVICE_SENSORS_CONSTS_H_
diff --git a/device/sensors/public/cpp/BUILD.gn b/device/sensors/public/cpp/BUILD.gn deleted file mode 100644 index b0608af..0000000 --- a/device/sensors/public/cpp/BUILD.gn +++ /dev/null
@@ -1,43 +0,0 @@ -# Copyright 2016 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. - -# This target contains only those files that are shared by the Device Sensors -# implementation and all Device Sensors clients, including Blink. Add a file -# here only if it meets the following constraints: -# (1) It is *necessary* to use the file to consume Device Sensors (the -# current files define structs that are used as a consistent interpretation of -# shared memory by the Device Sensor and its clients). -# (2) The file has no dependencies on the STL or Chromium code and will not -# grow them over time (the current files are POD structs and will necessarily -# stay that way due to their above-described purpose). -# If a file does not meet these constraints, it cannot be used by the Blink -# client and should be placed in the "full" target below. Similarly, clients -# without Blink's constraints should depend on the "full" target below rather -# than this one. -# Consult {platform-architecture-dev, services-dev}@chromium.org in the case -# of any uncertainty. -source_set("shared_with_blink") { - sources = [ - "motion_data.cc", - "motion_data.h", - "orientation_data.cc", - "orientation_data.h", - ] - # Do not add deps here per the above comment. -} - -# This target is a superset of the above one that contains additional optional -# files available to Device Sensors clients. This target may bring in -# dependencies on the STL and Chromium code. -source_set("full") { - sources = [ - "device_motion_hardware_buffer.h", - "device_orientation_hardware_buffer.h", - ] - - public_deps = [ - ":shared_with_blink", - "//device/base/synchronization", - ] -}
diff --git a/device/sensors/public/cpp/device_motion_hardware_buffer.h b/device/sensors/public/cpp/device_motion_hardware_buffer.h deleted file mode 100644 index 79405d3..0000000 --- a/device/sensors/public/cpp/device_motion_hardware_buffer.h +++ /dev/null
@@ -1,17 +0,0 @@ -// Copyright 2014 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 DEVICE_SENSORS_PUBLIC_CPP_DEVICE_MOTION_HARDWARE_BUFFER_H_ -#define DEVICE_SENSORS_PUBLIC_CPP_DEVICE_MOTION_HARDWARE_BUFFER_H_ - -#include "device/base/synchronization/shared_memory_seqlock_buffer.h" -#include "device/sensors/public/cpp/motion_data.h" - -namespace device { - -typedef SharedMemorySeqLockBuffer<MotionData> DeviceMotionHardwareBuffer; - -} // namespace device - -#endif // DEVICE_SENSORS_PUBLIC_CPP_DEVICE_MOTION_HARDWARE_BUFFER_H_
diff --git a/device/sensors/public/cpp/device_orientation_hardware_buffer.h b/device/sensors/public/cpp/device_orientation_hardware_buffer.h deleted file mode 100644 index 20168f5..0000000 --- a/device/sensors/public/cpp/device_orientation_hardware_buffer.h +++ /dev/null
@@ -1,18 +0,0 @@ -// Copyright 2014 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 DEVICE_SENSORS_PUBLIC_CPP_DEVICE_ORIENTATION_HARDWARE_BUFFER_H_ -#define DEVICE_SENSORS_PUBLIC_CPP_DEVICE_ORIENTATION_HARDWARE_BUFFER_H_ - -#include "device/base/synchronization/shared_memory_seqlock_buffer.h" -#include "device/sensors/public/cpp/orientation_data.h" - -namespace device { - -typedef SharedMemorySeqLockBuffer<OrientationData> - DeviceOrientationHardwareBuffer; - -} // namespace device - -#endif // DEVICE_SENSORS_PUBLIC_CPP_DEVICE_ORIENTATION_HARDWARE_BUFFER_H_
diff --git a/device/sensors/public/mojom/BUILD.gn b/device/sensors/public/mojom/BUILD.gn deleted file mode 100644 index 111cbf20..0000000 --- a/device/sensors/public/mojom/BUILD.gn +++ /dev/null
@@ -1,12 +0,0 @@ -# Copyright 2016 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. - -import("//mojo/public/tools/bindings/mojom.gni") - -mojom("mojom") { - sources = [ - "motion.mojom", - "orientation.mojom", - ] -}
diff --git a/device/sensors/public/mojom/OWNERS b/device/sensors/public/mojom/OWNERS deleted file mode 100644 index 5e4aaef..0000000 --- a/device/sensors/public/mojom/OWNERS +++ /dev/null
@@ -1,4 +0,0 @@ -# Changes to Mojo interfaces require a security review to avoid -# introducing new sandbox escapes. -per-file *.mojom=set noparent -per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/device/sensors/public/mojom/motion.mojom b/device/sensors/public/mojom/motion.mojom deleted file mode 100644 index 7755344f..0000000 --- a/device/sensors/public/mojom/motion.mojom +++ /dev/null
@@ -1,10 +0,0 @@ -// Copyright 2016 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. - -module device.mojom; - -interface MotionSensor { - StartPolling() => (handle<shared_buffer> memory_handle); - StopPolling(); -};
diff --git a/device/sensors/public/mojom/orientation.mojom b/device/sensors/public/mojom/orientation.mojom deleted file mode 100644 index ce6d620..0000000 --- a/device/sensors/public/mojom/orientation.mojom +++ /dev/null
@@ -1,15 +0,0 @@ -// Copyright 2016 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. - -module device.mojom; - -interface OrientationAbsoluteSensor { - StartPolling() => (handle<shared_buffer> memory_handle); - StopPolling(); -}; - -interface OrientationSensor { - StartPolling() => (handle<shared_buffer> memory_handle); - StopPolling(); -};
diff --git a/device/sensors/sensor_manager_android.cc b/device/sensors/sensor_manager_android.cc deleted file mode 100644 index 6a5b4e1f..0000000 --- a/device/sensors/sensor_manager_android.cc +++ /dev/null
@@ -1,393 +0,0 @@ -// Copyright 2014 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 "device/sensors/sensor_manager_android.h" - -#include <string.h> - -#include "base/android/jni_android.h" -#include "base/bind.h" -#include "base/memory/singleton.h" -#include "base/message_loop/message_loop.h" -#include "base/metrics/histogram_macros.h" -#include "jni/DeviceSensors_jni.h" - -using base::android::AttachCurrentThread; -using base::android::JavaParamRef; - -namespace { - -void UpdateDeviceOrientationHistogram( - device::SensorManagerAndroid::OrientationSensorType type) { - UMA_HISTOGRAM_ENUMERATION( - "InertialSensor.DeviceOrientationSensorAndroid", type, - device::SensorManagerAndroid::ORIENTATION_SENSOR_MAX); -} - -void SetOrientation(device::DeviceOrientationHardwareBuffer* buffer, - double alpha, - double beta, - double gamma) { - buffer->seqlock.WriteBegin(); - buffer->data.alpha = alpha; - buffer->data.has_alpha = true; - buffer->data.beta = beta; - buffer->data.has_beta = true; - buffer->data.gamma = gamma; - buffer->data.has_gamma = true; - buffer->seqlock.WriteEnd(); -} - -void SetOrientationBufferStatus(device::DeviceOrientationHardwareBuffer* buffer, - bool ready, - bool absolute) { - buffer->seqlock.WriteBegin(); - buffer->data.absolute = absolute; - buffer->data.all_available_sensors_are_active = ready; - buffer->seqlock.WriteEnd(); -} - -} // namespace - -namespace device { - -SensorManagerAndroid::SensorManagerAndroid() - : number_active_device_motion_sensors_(0), - device_motion_buffer_(nullptr), - device_orientation_buffer_(nullptr), - motion_buffer_initialized_(false), - orientation_buffer_initialized_(false), - is_shutdown_(false) { - DCHECK(thread_checker_.CalledOnValidThread()); - memset(received_motion_data_, 0, sizeof(received_motion_data_)); - device_sensors_.Reset(Java_DeviceSensors_create(AttachCurrentThread())); -} - -SensorManagerAndroid::~SensorManagerAndroid() {} - -SensorManagerAndroid* SensorManagerAndroid::GetInstance() { - DCHECK(base::MessageLoopForUI::IsCurrent()); - return base::Singleton< - SensorManagerAndroid, - base::LeakySingletonTraits<SensorManagerAndroid>>::get(); -} - -void SensorManagerAndroid::GotOrientation(JNIEnv*, - const JavaParamRef<jobject>&, - double alpha, - double beta, - double gamma) { - base::AutoLock autolock(orientation_buffer_lock_); - - if (!device_orientation_buffer_) - return; - - SetOrientation(device_orientation_buffer_, alpha, beta, gamma); - - if (!orientation_buffer_initialized_) { - OrientationSensorType type = - static_cast<OrientationSensorType>(GetOrientationSensorTypeUsed()); - SetOrientationBufferStatus(device_orientation_buffer_, true, - type != GAME_ROTATION_VECTOR); - orientation_buffer_initialized_ = true; - UpdateDeviceOrientationHistogram(type); - } -} - -void SensorManagerAndroid::GotOrientationAbsolute(JNIEnv*, - const JavaParamRef<jobject>&, - double alpha, - double beta, - double gamma) { - base::AutoLock autolock(orientation_absolute_buffer_lock_); - - if (!device_orientation_absolute_buffer_) - return; - - SetOrientation(device_orientation_absolute_buffer_, alpha, beta, gamma); - - if (!orientation_absolute_buffer_initialized_) { - SetOrientationBufferStatus(device_orientation_absolute_buffer_, true, true); - orientation_absolute_buffer_initialized_ = true; - // TODO(timvolodine): Add UMA. - } -} - -void SensorManagerAndroid::GotAcceleration(JNIEnv*, - const JavaParamRef<jobject>&, - double x, - double y, - double z) { - base::AutoLock autolock(motion_buffer_lock_); - - if (!device_motion_buffer_) - return; - - device_motion_buffer_->seqlock.WriteBegin(); - device_motion_buffer_->data.acceleration_x = x; - device_motion_buffer_->data.has_acceleration_x = true; - device_motion_buffer_->data.acceleration_y = y; - device_motion_buffer_->data.has_acceleration_y = true; - device_motion_buffer_->data.acceleration_z = z; - device_motion_buffer_->data.has_acceleration_z = true; - device_motion_buffer_->seqlock.WriteEnd(); - - if (!motion_buffer_initialized_) { - received_motion_data_[RECEIVED_MOTION_DATA_ACCELERATION] = 1; - CheckMotionBufferReadyToRead(); - } -} - -void SensorManagerAndroid::GotAccelerationIncludingGravity( - JNIEnv*, - const JavaParamRef<jobject>&, - double x, - double y, - double z) { - base::AutoLock autolock(motion_buffer_lock_); - - if (!device_motion_buffer_) - return; - - device_motion_buffer_->seqlock.WriteBegin(); - device_motion_buffer_->data.acceleration_including_gravity_x = x; - device_motion_buffer_->data.has_acceleration_including_gravity_x = true; - device_motion_buffer_->data.acceleration_including_gravity_y = y; - device_motion_buffer_->data.has_acceleration_including_gravity_y = true; - device_motion_buffer_->data.acceleration_including_gravity_z = z; - device_motion_buffer_->data.has_acceleration_including_gravity_z = true; - device_motion_buffer_->seqlock.WriteEnd(); - - if (!motion_buffer_initialized_) { - received_motion_data_[RECEIVED_MOTION_DATA_ACCELERATION_INCL_GRAVITY] = 1; - CheckMotionBufferReadyToRead(); - } -} - -void SensorManagerAndroid::GotRotationRate(JNIEnv*, - const JavaParamRef<jobject>&, - double alpha, - double beta, - double gamma) { - base::AutoLock autolock(motion_buffer_lock_); - - if (!device_motion_buffer_) - return; - - device_motion_buffer_->seqlock.WriteBegin(); - device_motion_buffer_->data.rotation_rate_alpha = alpha; - device_motion_buffer_->data.has_rotation_rate_alpha = true; - device_motion_buffer_->data.rotation_rate_beta = beta; - device_motion_buffer_->data.has_rotation_rate_beta = true; - device_motion_buffer_->data.rotation_rate_gamma = gamma; - device_motion_buffer_->data.has_rotation_rate_gamma = true; - device_motion_buffer_->seqlock.WriteEnd(); - - if (!motion_buffer_initialized_) { - received_motion_data_[RECEIVED_MOTION_DATA_ROTATION_RATE] = 1; - CheckMotionBufferReadyToRead(); - } -} - -bool SensorManagerAndroid::Start(ConsumerType consumer_type) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(!device_sensors_.is_null()); - return Java_DeviceSensors_start( - AttachCurrentThread(), device_sensors_, reinterpret_cast<intptr_t>(this), - static_cast<jint>(consumer_type), kDeviceSensorIntervalMicroseconds); -} - -void SensorManagerAndroid::Stop(ConsumerType consumer_type) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(!device_sensors_.is_null()); - Java_DeviceSensors_stop(AttachCurrentThread(), device_sensors_, - static_cast<jint>(consumer_type)); -} - -int SensorManagerAndroid::GetNumberActiveDeviceMotionSensors() { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(!device_sensors_.is_null()); - return Java_DeviceSensors_getNumberActiveDeviceMotionSensors( - AttachCurrentThread(), device_sensors_); -} - -SensorManagerAndroid::OrientationSensorType -SensorManagerAndroid::GetOrientationSensorTypeUsed() { - DCHECK(!device_sensors_.is_null()); - return static_cast<SensorManagerAndroid::OrientationSensorType>( - Java_DeviceSensors_getOrientationSensorTypeUsed(AttachCurrentThread(), - device_sensors_)); -} - -// ----- Shared memory API methods - -// --- Device Motion - -void SensorManagerAndroid::StartFetchingDeviceMotionData( - DeviceMotionHardwareBuffer* buffer) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(buffer); - if (is_shutdown_) - return; - - { - base::AutoLock autolock(motion_buffer_lock_); - device_motion_buffer_ = buffer; - ClearInternalMotionBuffers(); - } - Start(CONSUMER_TYPE_MOTION); - - // If no motion data can ever be provided, the number of active device motion - // sensors will be zero. In that case flag the shared memory buffer - // as ready to read, as it will not change anyway. - number_active_device_motion_sensors_ = GetNumberActiveDeviceMotionSensors(); - { - base::AutoLock autolock(motion_buffer_lock_); - CheckMotionBufferReadyToRead(); - } -} - -void SensorManagerAndroid::StopFetchingDeviceMotionData() { - DCHECK(thread_checker_.CalledOnValidThread()); - if (is_shutdown_) - return; - - Stop(CONSUMER_TYPE_MOTION); - { - base::AutoLock autolock(motion_buffer_lock_); - if (device_motion_buffer_) { - ClearInternalMotionBuffers(); - device_motion_buffer_ = nullptr; - } - } -} - -void SensorManagerAndroid::CheckMotionBufferReadyToRead() { - if (received_motion_data_[RECEIVED_MOTION_DATA_ACCELERATION] + - received_motion_data_ - [RECEIVED_MOTION_DATA_ACCELERATION_INCL_GRAVITY] + - received_motion_data_[RECEIVED_MOTION_DATA_ROTATION_RATE] == - number_active_device_motion_sensors_) { - device_motion_buffer_->seqlock.WriteBegin(); - device_motion_buffer_->data.interval = - kDeviceSensorIntervalMicroseconds / 1000.; - device_motion_buffer_->seqlock.WriteEnd(); - SetMotionBufferReadyStatus(true); - - UMA_HISTOGRAM_BOOLEAN( - "InertialSensor.AccelerometerAndroidAvailable", - received_motion_data_[RECEIVED_MOTION_DATA_ACCELERATION] > 0); - UMA_HISTOGRAM_BOOLEAN( - "InertialSensor.AccelerometerIncGravityAndroidAvailable", - received_motion_data_[RECEIVED_MOTION_DATA_ACCELERATION_INCL_GRAVITY] > - 0); - UMA_HISTOGRAM_BOOLEAN( - "InertialSensor.GyroscopeAndroidAvailable", - received_motion_data_[RECEIVED_MOTION_DATA_ROTATION_RATE] > 0); - } -} - -void SensorManagerAndroid::SetMotionBufferReadyStatus(bool ready) { - device_motion_buffer_->seqlock.WriteBegin(); - device_motion_buffer_->data.all_available_sensors_are_active = ready; - device_motion_buffer_->seqlock.WriteEnd(); - motion_buffer_initialized_ = ready; -} - -void SensorManagerAndroid::ClearInternalMotionBuffers() { - memset(received_motion_data_, 0, sizeof(received_motion_data_)); - number_active_device_motion_sensors_ = 0; - SetMotionBufferReadyStatus(false); -} - -// --- Device Orientation - -void SensorManagerAndroid::StartFetchingDeviceOrientationData( - DeviceOrientationHardwareBuffer* buffer) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(buffer); - if (is_shutdown_) - return; - - { - base::AutoLock autolock(orientation_buffer_lock_); - device_orientation_buffer_ = buffer; - } - bool success = Start(CONSUMER_TYPE_ORIENTATION); - - { - base::AutoLock autolock(orientation_buffer_lock_); - // If Start() was unsuccessful then set the buffer ready flag to true - // to start firing all-null events. - SetOrientationBufferStatus(buffer, !success /* ready */, - false /* absolute */); - orientation_buffer_initialized_ = !success; - } - - if (!success) - UpdateDeviceOrientationHistogram(NOT_AVAILABLE); -} - -void SensorManagerAndroid::StopFetchingDeviceOrientationData() { - DCHECK(thread_checker_.CalledOnValidThread()); - if (is_shutdown_) - return; - - Stop(CONSUMER_TYPE_ORIENTATION); - { - base::AutoLock autolock(orientation_buffer_lock_); - if (device_orientation_buffer_) { - SetOrientationBufferStatus(device_orientation_buffer_, false, false); - orientation_buffer_initialized_ = false; - device_orientation_buffer_ = nullptr; - } - } -} - -void SensorManagerAndroid::StartFetchingDeviceOrientationAbsoluteData( - DeviceOrientationHardwareBuffer* buffer) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(buffer); - if (is_shutdown_) - return; - - { - base::AutoLock autolock(orientation_absolute_buffer_lock_); - device_orientation_absolute_buffer_ = buffer; - } - bool success = Start(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - - { - base::AutoLock autolock(orientation_absolute_buffer_lock_); - // If Start() was unsuccessful then set the buffer ready flag to true - // to start firing all-null events. - SetOrientationBufferStatus(buffer, !success /* ready */, - false /* absolute */); - orientation_absolute_buffer_initialized_ = !success; - } -} - -void SensorManagerAndroid::StopFetchingDeviceOrientationAbsoluteData() { - DCHECK(thread_checker_.CalledOnValidThread()); - if (is_shutdown_) - return; - - Stop(CONSUMER_TYPE_ORIENTATION_ABSOLUTE); - { - base::AutoLock autolock(orientation_absolute_buffer_lock_); - if (device_orientation_absolute_buffer_) { - SetOrientationBufferStatus(device_orientation_absolute_buffer_, false, - false); - orientation_absolute_buffer_initialized_ = false; - device_orientation_absolute_buffer_ = nullptr; - } - } -} - -void SensorManagerAndroid::Shutdown() { - DCHECK(thread_checker_.CalledOnValidThread()); - is_shutdown_ = true; -} - -} // namespace device
diff --git a/device/sensors/sensor_manager_android.h b/device/sensors/sensor_manager_android.h deleted file mode 100644 index 25d30a3..0000000 --- a/device/sensors/sensor_manager_android.h +++ /dev/null
@@ -1,145 +0,0 @@ -// Copyright 2014 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 DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_ -#define DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_ - -#include <memory> - -#include "base/android/scoped_java_ref.h" -#include "base/macros.h" -#include "base/synchronization/lock.h" -#include "base/threading/thread_checker.h" -#include "device/sensors/device_sensor_export.h" -#include "device/sensors/device_sensors_consts.h" -#include "device/sensors/public/cpp/device_motion_hardware_buffer.h" -#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h" - -namespace base { -template <typename T> -struct DefaultSingletonTraits; -} - -namespace device { - -// Android implementation of Device {Motion|Orientation} API. -// -// Android's SensorManager has a push API, so when Got*() methods are called -// by the system the browser process puts the received data into a shared -// memory buffer, which is read by the renderer processes. -class DEVICE_SENSOR_EXPORT SensorManagerAndroid { - public: - - // Should be called only on the UI thread. - static SensorManagerAndroid* GetInstance(); - - // Called from Java via JNI. - void GotOrientation(JNIEnv*, - const base::android::JavaParamRef<jobject>&, - double alpha, - double beta, - double gamma); - void GotOrientationAbsolute(JNIEnv*, - const base::android::JavaParamRef<jobject>&, - double alpha, - double beta, - double gamma); - void GotAcceleration(JNIEnv*, - const base::android::JavaParamRef<jobject>&, - double x, - double y, - double z); - void GotAccelerationIncludingGravity( - JNIEnv*, - const base::android::JavaParamRef<jobject>&, - double x, - double y, - double z); - void GotRotationRate(JNIEnv*, - const base::android::JavaParamRef<jobject>&, - double alpha, - double beta, - double gamma); - - // Shared memory related methods. - void StartFetchingDeviceMotionData(DeviceMotionHardwareBuffer* buffer); - void StopFetchingDeviceMotionData(); - - void StartFetchingDeviceOrientationData( - DeviceOrientationHardwareBuffer* buffer); - void StopFetchingDeviceOrientationData(); - - void StartFetchingDeviceOrientationAbsoluteData( - DeviceOrientationHardwareBuffer* buffer); - void StopFetchingDeviceOrientationAbsoluteData(); - - void Shutdown(); - - // A Java counterpart will be generated for this enum. - // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.device.sensors - // When adding new constants don't modify the order as they are used for UMA. - enum OrientationSensorType { - NOT_AVAILABLE = 0, - ROTATION_VECTOR = 1, - ACCELEROMETER_MAGNETIC = 2, - GAME_ROTATION_VECTOR = 3, - ORIENTATION_SENSOR_MAX = 4, - }; - - protected: - SensorManagerAndroid(); - virtual ~SensorManagerAndroid(); - - // Starts listening to the sensors corresponding to the consumer_type. - // Returns true if the registration with sensors was successful. - virtual bool Start(ConsumerType consumer_type); - // Stops listening to the sensors corresponding to the consumer_type. - virtual void Stop(ConsumerType consumer_type); - // Returns currently used sensor type for device orientation. - virtual OrientationSensorType GetOrientationSensorTypeUsed(); - // Returns the number of active sensors corresponding to - // ConsumerType.DEVICE_MOTION. - virtual int GetNumberActiveDeviceMotionSensors(); - - private: - friend struct base::DefaultSingletonTraits<SensorManagerAndroid>; - - enum { - RECEIVED_MOTION_DATA_ACCELERATION = 0, - RECEIVED_MOTION_DATA_ACCELERATION_INCL_GRAVITY = 1, - RECEIVED_MOTION_DATA_ROTATION_RATE = 2, - RECEIVED_MOTION_DATA_MAX = 3, - }; - - void CheckMotionBufferReadyToRead(); - void SetMotionBufferReadyStatus(bool ready); - void ClearInternalMotionBuffers(); - - // The Java provider of sensors info. - base::android::ScopedJavaGlobalRef<jobject> device_sensors_; - int number_active_device_motion_sensors_; - int received_motion_data_[RECEIVED_MOTION_DATA_MAX]; - - // Cached pointers to buffers, owned by DataFetcherSharedMemoryBase. - DeviceMotionHardwareBuffer* device_motion_buffer_; - DeviceOrientationHardwareBuffer* device_orientation_buffer_; - DeviceOrientationHardwareBuffer* device_orientation_absolute_buffer_; - - bool motion_buffer_initialized_; - bool orientation_buffer_initialized_; - bool orientation_absolute_buffer_initialized_; - - base::Lock motion_buffer_lock_; - base::Lock orientation_buffer_lock_; - base::Lock orientation_absolute_buffer_lock_; - - bool is_shutdown_; - base::ThreadChecker thread_checker_; - - DISALLOW_COPY_AND_ASSIGN(SensorManagerAndroid); -}; - -} // namespace device - -#endif // DEVICE_SENSORS_SENSOR_MANAGER_ANDROID_H_
diff --git a/device/sensors/sensor_manager_android_unittest.cc b/device/sensors/sensor_manager_android_unittest.cc deleted file mode 100644 index 9807d4c4..0000000 --- a/device/sensors/sensor_manager_android_unittest.cc +++ /dev/null
@@ -1,173 +0,0 @@ -// Copyright 2014 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 "device/sensors/sensor_manager_android.h" - -#include <memory> - -#include "base/android/jni_android.h" -#include "base/memory/weak_ptr.h" -#include "base/message_loop/message_loop.h" -#include "device/sensors/device_sensors_consts.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace device { - -namespace { - -class FakeSensorManagerAndroid : public SensorManagerAndroid { - public: - FakeSensorManagerAndroid() {} - ~FakeSensorManagerAndroid() override {} - - OrientationSensorType GetOrientationSensorTypeUsed() override { - return SensorManagerAndroid::ROTATION_VECTOR; - } - - int GetNumberActiveDeviceMotionSensors() override { - return number_active_sensors_; - } - - void SetNumberActiveDeviceMotionSensors(int number_active_sensors) { - number_active_sensors_ = number_active_sensors; - } - - protected: - bool Start(ConsumerType event_type) override { return true; } - void Stop(ConsumerType event_type) override {} - - private: - int number_active_sensors_; -}; - -class AndroidSensorManagerTest : public testing::Test { - protected: - AndroidSensorManagerTest() { - motion_buffer_.reset(new DeviceMotionHardwareBuffer); - orientation_buffer_.reset(new DeviceOrientationHardwareBuffer); - orientation_absolute_buffer_.reset(new DeviceOrientationHardwareBuffer); - } - - void VerifyOrientationBufferValues( - const DeviceOrientationHardwareBuffer* buffer, - double alpha, - double beta, - double gamma) { - ASSERT_TRUE(buffer->data.all_available_sensors_are_active); - ASSERT_EQ(alpha, buffer->data.alpha); - ASSERT_TRUE(buffer->data.has_alpha); - ASSERT_EQ(beta, buffer->data.beta); - ASSERT_TRUE(buffer->data.has_beta); - ASSERT_EQ(gamma, buffer->data.gamma); - ASSERT_TRUE(buffer->data.has_gamma); - } - - std::unique_ptr<DeviceMotionHardwareBuffer> motion_buffer_; - std::unique_ptr<DeviceOrientationHardwareBuffer> orientation_buffer_; - std::unique_ptr<DeviceOrientationHardwareBuffer> orientation_absolute_buffer_; - base::MessageLoop message_loop_; -}; - -TEST_F(AndroidSensorManagerTest, ThreeDeviceMotionSensorsActive) { - FakeSensorManagerAndroid sensorManager; - sensorManager.SetNumberActiveDeviceMotionSensors(3); - - sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get()); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); - - sensorManager.GotAcceleration(nullptr, nullptr, 1, 2, 3); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); - ASSERT_EQ(1, motion_buffer_->data.acceleration_x); - ASSERT_TRUE(motion_buffer_->data.has_acceleration_x); - ASSERT_EQ(2, motion_buffer_->data.acceleration_y); - ASSERT_TRUE(motion_buffer_->data.has_acceleration_y); - ASSERT_EQ(3, motion_buffer_->data.acceleration_z); - ASSERT_TRUE(motion_buffer_->data.has_acceleration_z); - - sensorManager.GotAccelerationIncludingGravity(nullptr, nullptr, 4, 5, 6); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); - ASSERT_EQ(4, motion_buffer_->data.acceleration_including_gravity_x); - ASSERT_TRUE(motion_buffer_->data.has_acceleration_including_gravity_x); - ASSERT_EQ(5, motion_buffer_->data.acceleration_including_gravity_y); - ASSERT_TRUE(motion_buffer_->data.has_acceleration_including_gravity_y); - ASSERT_EQ(6, motion_buffer_->data.acceleration_including_gravity_z); - ASSERT_TRUE(motion_buffer_->data.has_acceleration_including_gravity_z); - - sensorManager.GotRotationRate(nullptr, nullptr, 7, 8, 9); - ASSERT_TRUE(motion_buffer_->data.all_available_sensors_are_active); - ASSERT_EQ(7, motion_buffer_->data.rotation_rate_alpha); - ASSERT_TRUE(motion_buffer_->data.has_rotation_rate_alpha); - ASSERT_EQ(8, motion_buffer_->data.rotation_rate_beta); - ASSERT_TRUE(motion_buffer_->data.has_rotation_rate_beta); - ASSERT_EQ(9, motion_buffer_->data.rotation_rate_gamma); - ASSERT_TRUE(motion_buffer_->data.has_rotation_rate_gamma); - ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000., - motion_buffer_->data.interval); - - sensorManager.StopFetchingDeviceMotionData(); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); -} - -TEST_F(AndroidSensorManagerTest, TwoDeviceMotionSensorsActive) { - FakeSensorManagerAndroid sensorManager; - sensorManager.SetNumberActiveDeviceMotionSensors(2); - - sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get()); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); - - sensorManager.GotAcceleration(nullptr, nullptr, 1, 2, 3); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); - - sensorManager.GotAccelerationIncludingGravity(nullptr, nullptr, 1, 2, 3); - ASSERT_TRUE(motion_buffer_->data.all_available_sensors_are_active); - ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000., - motion_buffer_->data.interval); - - sensorManager.StopFetchingDeviceMotionData(); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); -} - -TEST_F(AndroidSensorManagerTest, ZeroDeviceMotionSensorsActive) { - FakeSensorManagerAndroid sensorManager; - sensorManager.SetNumberActiveDeviceMotionSensors(0); - - sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get()); - ASSERT_TRUE(motion_buffer_->data.all_available_sensors_are_active); - ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000., - motion_buffer_->data.interval); - - sensorManager.StopFetchingDeviceMotionData(); - ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active); -} - -TEST_F(AndroidSensorManagerTest, DeviceOrientationSensorsActive) { - FakeSensorManagerAndroid sensorManager; - - sensorManager.StartFetchingDeviceOrientationData(orientation_buffer_.get()); - ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active); - - sensorManager.GotOrientation(nullptr, nullptr, 1, 2, 3); - VerifyOrientationBufferValues(orientation_buffer_.get(), 1, 2, 3); - - sensorManager.StopFetchingDeviceOrientationData(); - ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active); -} - -TEST_F(AndroidSensorManagerTest, DeviceOrientationAbsoluteSensorsActive) { - FakeSensorManagerAndroid sensorManager; - - sensorManager.StartFetchingDeviceOrientationAbsoluteData( - orientation_absolute_buffer_.get()); - ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active); - - sensorManager.GotOrientationAbsolute(nullptr, nullptr, 4, 5, 6); - VerifyOrientationBufferValues(orientation_absolute_buffer_.get(), 4, 5, 6); - - sensorManager.StopFetchingDeviceOrientationData(); - ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active); -} - -} // namespace - -} // namespace device
diff --git a/device/sensors/sensor_manager_chromeos.cc b/device/sensors/sensor_manager_chromeos.cc deleted file mode 100644 index 7c998b9..0000000 --- a/device/sensors/sensor_manager_chromeos.cc +++ /dev/null
@@ -1,161 +0,0 @@ -// Copyright 2015 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 "device/sensors/sensor_manager_chromeos.h" - -#include "chromeos/accelerometer/accelerometer_reader.h" -#include "chromeos/accelerometer/accelerometer_types.h" -#include "device/sensors/device_sensors_consts.h" -#include "ui/gfx/geometry/angle_conversions.h" -#include "ui/gfx/geometry/vector3d_f.h" - -namespace device { - -SensorManagerChromeOS::SensorManagerChromeOS() - : motion_buffer_(nullptr), orientation_buffer_(nullptr) {} - -SensorManagerChromeOS::~SensorManagerChromeOS() = default; - -void SensorManagerChromeOS::StartFetchingDeviceMotionData( - DeviceMotionHardwareBuffer* buffer) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(!motion_buffer_); - motion_buffer_ = buffer; - - motion_buffer_->seqlock.WriteBegin(); - // The interval between updates is the longer of the rate set on the buffer, - // and the rate at which AccelerometerReader polls the sensor. - motion_buffer_->data.interval = - std::max(kDeviceSensorIntervalMicroseconds / 1000, - chromeos::AccelerometerReader::kDelayBetweenReadsMs); - motion_buffer_->seqlock.WriteEnd(); - - if (!orientation_buffer_) - StartObservingAccelerometer(); -} - -bool SensorManagerChromeOS::StopFetchingDeviceMotionData() { - DCHECK(thread_checker_.CalledOnValidThread()); - if (!motion_buffer_) - return false; - - // Make sure to indicate that the sensor data is no longer available. - motion_buffer_->seqlock.WriteBegin(); - motion_buffer_->data.all_available_sensors_are_active = false; - motion_buffer_->seqlock.WriteEnd(); - - motion_buffer_ = nullptr; - - if (!orientation_buffer_) - StopObservingAccelerometer(); - return true; -} - -void SensorManagerChromeOS::StartFetchingDeviceOrientationData( - DeviceOrientationHardwareBuffer* buffer) { - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(!orientation_buffer_); - orientation_buffer_ = buffer; - - // No compass information, so we cannot provide absolute orientation. - orientation_buffer_->seqlock.WriteBegin(); - orientation_buffer_->data.absolute = false; - orientation_buffer_->seqlock.WriteEnd(); - - if (!motion_buffer_) - StartObservingAccelerometer(); -} - -bool SensorManagerChromeOS::StopFetchingDeviceOrientationData() { - DCHECK(thread_checker_.CalledOnValidThread()); - if (!orientation_buffer_) - return false; - // Make sure to indicate that the sensor data is no longer available. - orientation_buffer_->seqlock.WriteBegin(); - orientation_buffer_->data.all_available_sensors_are_active = false; - orientation_buffer_->seqlock.WriteEnd(); - orientation_buffer_ = nullptr; - - if (!motion_buffer_) - StopObservingAccelerometer(); - return true; -} - -void SensorManagerChromeOS::OnAccelerometerUpdated( - scoped_refptr<const chromeos::AccelerometerUpdate> update) { - DCHECK(thread_checker_.CalledOnValidThread()); - chromeos::AccelerometerSource source; - if (update->has(chromeos::ACCELEROMETER_SOURCE_SCREEN)) - source = chromeos::ACCELEROMETER_SOURCE_SCREEN; - else if (update->has(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD)) - source = chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD; - else - return; - - double x = update->get(source).x; - double y = update->get(source).y; - double z = update->get(source).z; - - GenerateMotionEvent(x, y, z); - GenerateOrientationEvent(x, y, z); -} - -void SensorManagerChromeOS::StartObservingAccelerometer() { - chromeos::AccelerometerReader::GetInstance()->AddObserver(this); -} - -void SensorManagerChromeOS::StopObservingAccelerometer() { - chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this); -} - -void SensorManagerChromeOS::GenerateMotionEvent(double x, double y, double z) { - if (!motion_buffer_) - return; - - motion_buffer_->seqlock.WriteBegin(); - motion_buffer_->data.acceleration_including_gravity_x = x; - motion_buffer_->data.has_acceleration_including_gravity_x = true; - motion_buffer_->data.acceleration_including_gravity_y = y; - motion_buffer_->data.has_acceleration_including_gravity_y = true; - motion_buffer_->data.acceleration_including_gravity_z = z; - motion_buffer_->data.has_acceleration_including_gravity_z = true; - motion_buffer_->data.all_available_sensors_are_active = true; - motion_buffer_->seqlock.WriteEnd(); -} - -void SensorManagerChromeOS::GenerateOrientationEvent(double x, - double y, - double z) { - if (!orientation_buffer_) - return; - - // Create a unit vector for trigonometry - gfx::Vector3dF data(x, y, z); - data.Scale(1.0f / data.Length()); - - // Transform accelerometer to W3C angles, using the Z-X-Y Eulerangles matrix. - // x = sin(gamma) - // y = -cos(gamma) * sin(beta) - // z = cos(beta) * cos(gamma) - // With only accelerometer alpha cannot be provided. - // TODO(timvolodine): crbug.com/765802 Check if cast-to-double is necessary. - double beta = gfx::RadToDeg(static_cast<double>(atan2(data.y(), data.z()))); - double gamma = gfx::RadToDeg(static_cast<double>(asin(-data.x()))); - - // Convert beta and gamma to fit the intervals in the specification. Beta is - // [-180, 180) and gamma is [-90, 90). - if (beta >= 180.0f) - beta = -180.0f; - if (gamma >= 90.0f) - gamma = -90.0f; - orientation_buffer_->seqlock.WriteBegin(); - orientation_buffer_->data.beta = beta; - orientation_buffer_->data.has_beta = true; - orientation_buffer_->data.gamma = gamma; - orientation_buffer_->data.has_gamma = true; - orientation_buffer_->data.all_available_sensors_are_active = true; - orientation_buffer_->seqlock.WriteEnd(); -} - -} // namespace device
diff --git a/device/sensors/sensor_manager_chromeos.h b/device/sensors/sensor_manager_chromeos.h deleted file mode 100644 index 8557a9b1..0000000 --- a/device/sensors/sensor_manager_chromeos.h +++ /dev/null
@@ -1,69 +0,0 @@ -// Copyright 2015 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 DEVICE_SENSORS_SENSOR_MANAGER_CHROMEOS_H_ -#define DEVICE_SENSORS_SENSOR_MANAGER_CHROMEOS_H_ - -#include "base/macros.h" -#include "base/threading/thread_checker.h" -#include "chromeos/accelerometer/accelerometer_reader.h" -#include "chromeos/accelerometer/accelerometer_types.h" -#include "device/sensors/device_sensor_export.h" -#include "device/sensors/public/cpp/device_motion_hardware_buffer.h" -#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h" - -namespace device { - -// Observes Chrome OS accelerometer sensors, and provides updated device -// orientation information. -class DEVICE_SENSOR_EXPORT SensorManagerChromeOS - : public chromeos::AccelerometerReader::Observer { - public: - SensorManagerChromeOS(); - ~SensorManagerChromeOS() override; - - // Begins monitoring of motion events, the shared memory of |buffer| will be - // updated upon subsequent events. - void StartFetchingDeviceMotionData(DeviceMotionHardwareBuffer* buffer); - - // Stops monitoring motion events. Returns true if there is an active - // |motion_buffer_| and fetching stops. Otherwise returns false. - bool StopFetchingDeviceMotionData(); - - // Begins monitoring of orientation events, the shared memory of |buffer| will - // be updated upon subsequent events. - void StartFetchingDeviceOrientationData( - DeviceOrientationHardwareBuffer* buffer); - - // Stops monitoring orientation events. Returns true if there is an active - // |orientation_buffer_| and fetching stops. Otherwise returns false. - bool StopFetchingDeviceOrientationData(); - - // chromeos::AccelerometerReader::Observer: - void OnAccelerometerUpdated( - scoped_refptr<const chromeos::AccelerometerUpdate> update) override; - - protected: - // Begins/ends the observation of accelerometer events. - virtual void StartObservingAccelerometer(); - virtual void StopObservingAccelerometer(); - - private: - // Updates |motion_buffer_| or |orientation_buffer_| accordingly. - void GenerateMotionEvent(double x, double y, double z); - void GenerateOrientationEvent(double x, double y, double z); - - // Shared memory to update. - DeviceMotionHardwareBuffer* motion_buffer_; - DeviceOrientationHardwareBuffer* orientation_buffer_; - - // Verify all work is done on the same thread. - base::ThreadChecker thread_checker_; - - DISALLOW_COPY_AND_ASSIGN(SensorManagerChromeOS); -}; - -} // namespace device - -#endif // DEVICE_SENSORS_SENSOR_MANAGER_CHROMEOS_H_
diff --git a/device/sensors/sensor_manager_chromeos_unittest.cc b/device/sensors/sensor_manager_chromeos_unittest.cc deleted file mode 100644 index b3a2a5f..0000000 --- a/device/sensors/sensor_manager_chromeos_unittest.cc +++ /dev/null
@@ -1,229 +0,0 @@ -// Copyright 2015 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 "device/sensors/sensor_manager_chromeos.h" - -#include <memory> - -#include "base/macros.h" -#include "chromeos/accelerometer/accelerometer_types.h" -#include "device/sensors/public/cpp/device_motion_hardware_buffer.h" -#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace { - -const double kMeanGravity = -9.80665; - -// Isolated device::SensorManagerChromeOS from the active -// chromeos::AccelerometerReader. This allows for direct control over which -// accelerometer events are provided to the sensor manager. -class TestSensorManagerChromeOS : public device::SensorManagerChromeOS { - public: - TestSensorManagerChromeOS() = default; - ~TestSensorManagerChromeOS() override = default; - - protected: - void StartObservingAccelerometer() override {} - void StopObservingAccelerometer() override {} - - private: - DISALLOW_COPY_AND_ASSIGN(TestSensorManagerChromeOS); -}; - -} // namespace - -namespace device { - -class SensorManagerChromeOSTest : public testing::Test { - public: - SensorManagerChromeOSTest() { - motion_buffer_.reset(new DeviceMotionHardwareBuffer); - orientation_buffer_.reset(new DeviceOrientationHardwareBuffer); - } - - ~SensorManagerChromeOSTest() override = default; - - void OnAccelerationIncludingGravity(double x, double y, double z) { - scoped_refptr<chromeos::AccelerometerUpdate> update( - new chromeos::AccelerometerUpdate()); - update->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, x, y, z); - sensor_manager_->OnAccelerometerUpdated(update); - } - - DeviceMotionHardwareBuffer* motion_buffer() { return motion_buffer_.get(); } - - DeviceOrientationHardwareBuffer* orientation_buffer() { - return orientation_buffer_.get(); - } - - SensorManagerChromeOS* sensor_manager() { return sensor_manager_.get(); } - - // testing::Test: - void SetUp() override { - testing::Test::SetUp(); - sensor_manager_.reset(new TestSensorManagerChromeOS); - sensor_manager_->StartFetchingDeviceMotionData(motion_buffer_.get()); - sensor_manager_->StartFetchingDeviceOrientationData( - orientation_buffer_.get()); - } - - void TearDown() override { - sensor_manager_->StopFetchingDeviceMotionData(); - sensor_manager_->StopFetchingDeviceOrientationData(); - testing::Test::TearDown(); - } - - private: - std::unique_ptr<TestSensorManagerChromeOS> sensor_manager_; - std::unique_ptr<DeviceMotionHardwareBuffer> motion_buffer_; - std::unique_ptr<DeviceOrientationHardwareBuffer> orientation_buffer_; - - DISALLOW_COPY_AND_ASSIGN(SensorManagerChromeOSTest); -}; - -// Tests that starting to process motion data will update the associated buffer. -TEST_F(SensorManagerChromeOSTest, MotionBuffer) { - DeviceMotionHardwareBuffer* buffer = motion_buffer(); - EXPECT_FLOAT_EQ(100.0f, buffer->data.interval); - EXPECT_FALSE(buffer->data.has_acceleration_including_gravity_x); - EXPECT_FALSE(buffer->data.has_acceleration_including_gravity_y); - EXPECT_FALSE(buffer->data.has_acceleration_including_gravity_z); - EXPECT_FALSE(buffer->data.has_acceleration_x); - EXPECT_FALSE(buffer->data.has_acceleration_y); - EXPECT_FALSE(buffer->data.has_acceleration_z); - EXPECT_FALSE(buffer->data.has_rotation_rate_alpha); - EXPECT_FALSE(buffer->data.has_rotation_rate_beta); - EXPECT_FALSE(buffer->data.has_rotation_rate_gamma); - - OnAccelerationIncludingGravity(0.0f, 0.0f, 1.0f); - EXPECT_TRUE(buffer->data.has_acceleration_including_gravity_x); - EXPECT_TRUE(buffer->data.has_acceleration_including_gravity_y); - EXPECT_TRUE(buffer->data.has_acceleration_including_gravity_z); - EXPECT_FALSE(buffer->data.has_acceleration_x); - EXPECT_FALSE(buffer->data.has_acceleration_y); - EXPECT_FALSE(buffer->data.has_acceleration_z); - EXPECT_FALSE(buffer->data.has_rotation_rate_alpha); - EXPECT_FALSE(buffer->data.has_rotation_rate_beta); - EXPECT_FALSE(buffer->data.has_rotation_rate_gamma); - EXPECT_TRUE(buffer->data.all_available_sensors_are_active); - - sensor_manager()->StopFetchingDeviceMotionData(); - EXPECT_FALSE(buffer->data.all_available_sensors_are_active); -} - -// Tests that starting to process orientation data will update the associated -// buffer. -TEST_F(SensorManagerChromeOSTest, OrientationBuffer) { - DeviceOrientationHardwareBuffer* buffer = orientation_buffer(); - EXPECT_FALSE(buffer->data.has_alpha); - EXPECT_FALSE(buffer->data.has_beta); - EXPECT_FALSE(buffer->data.has_gamma); - EXPECT_FALSE(buffer->data.all_available_sensors_are_active); - - OnAccelerationIncludingGravity(0.0f, 0.0f, 1.0f); - EXPECT_FLOAT_EQ(0.0f, buffer->data.alpha); - EXPECT_FALSE(buffer->data.has_alpha); - EXPECT_TRUE(buffer->data.has_beta); - EXPECT_TRUE(buffer->data.has_gamma); - EXPECT_TRUE(buffer->data.all_available_sensors_are_active); - - sensor_manager()->StopFetchingDeviceOrientationData(); - EXPECT_FALSE(buffer->data.all_available_sensors_are_active); -} - -// Tests a device resting flat. -TEST_F(SensorManagerChromeOSTest, NeutralOrientation) { - OnAccelerationIncludingGravity(0.0f, 0.0f, -kMeanGravity); - - DeviceMotionHardwareBuffer* motion = motion_buffer(); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_x); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_y); - EXPECT_FLOAT_EQ(-kMeanGravity, motion->data.acceleration_including_gravity_z); - - DeviceOrientationHardwareBuffer* orientation = orientation_buffer(); - EXPECT_FLOAT_EQ(0.0f, orientation->data.beta); - EXPECT_FLOAT_EQ(0.0f, orientation->data.gamma); -} - -// Tests an upside-down device, such that the W3C boundary [-180,180) causes the -// beta value to become negative. -TEST_F(SensorManagerChromeOSTest, UpsideDown) { - OnAccelerationIncludingGravity(0.0f, 0.0f, kMeanGravity); - - DeviceMotionHardwareBuffer* motion = motion_buffer(); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_x); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_y); - EXPECT_FLOAT_EQ(kMeanGravity, motion->data.acceleration_including_gravity_z); - - DeviceOrientationHardwareBuffer* orientation = orientation_buffer(); - EXPECT_FLOAT_EQ(-180.0f, orientation->data.beta); - EXPECT_FLOAT_EQ(0.0f, orientation->data.gamma); -} - -// Tests for positive beta value before the device is completely upside-down -TEST_F(SensorManagerChromeOSTest, BeforeUpsideDownBoundary) { - OnAccelerationIncludingGravity(0.0f, -kMeanGravity / 2.0f, - kMeanGravity / 2.0f); - - DeviceMotionHardwareBuffer* motion = motion_buffer(); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_x); - EXPECT_FLOAT_EQ(-kMeanGravity / 2.0f, - motion->data.acceleration_including_gravity_y); - EXPECT_FLOAT_EQ(kMeanGravity / 2.0f, - motion->data.acceleration_including_gravity_z); - - DeviceOrientationHardwareBuffer* orientation = orientation_buffer(); - EXPECT_FLOAT_EQ(135.0f, orientation->data.beta); - EXPECT_FLOAT_EQ(0.0f, orientation->data.gamma); -} - -// Tests a device lying on its left-edge. -TEST_F(SensorManagerChromeOSTest, LeftEdge) { - OnAccelerationIncludingGravity(-kMeanGravity, 0.0f, 0.0f); - - DeviceMotionHardwareBuffer* motion = motion_buffer(); - EXPECT_FLOAT_EQ(-kMeanGravity, motion->data.acceleration_including_gravity_x); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_y); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_z); - - DeviceOrientationHardwareBuffer* orientation = orientation_buffer(); - EXPECT_FLOAT_EQ(0.0f, orientation->data.beta); - EXPECT_FLOAT_EQ(-90.0f, orientation->data.gamma); -} - -// Tests a device lying on its right-edge, such that the W3C boundary [-90,90) -// causes the gamma value to become negative. -TEST_F(SensorManagerChromeOSTest, RightEdge) { - OnAccelerationIncludingGravity(kMeanGravity, 0.0f, 0.0f); - - DeviceMotionHardwareBuffer* motion = motion_buffer(); - EXPECT_FLOAT_EQ(kMeanGravity, motion->data.acceleration_including_gravity_x); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_y); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_z); - - DeviceOrientationHardwareBuffer* orientation = orientation_buffer(); - EXPECT_FLOAT_EQ(0.0f, orientation->data.beta); - EXPECT_FLOAT_EQ(-90.0f, orientation->data.gamma); -} - -// Tests for positive gamma value before the device is completely on its right -// side. -TEST_F(SensorManagerChromeOSTest, BeforeRightEdgeBoundary) { - OnAccelerationIncludingGravity(kMeanGravity / 2.0f, 0.0f, - -kMeanGravity / 2.0f); - - DeviceMotionHardwareBuffer* motion = motion_buffer(); - EXPECT_FLOAT_EQ(kMeanGravity / 2.0f, - motion->data.acceleration_including_gravity_x); - EXPECT_FLOAT_EQ(0.0f, motion->data.acceleration_including_gravity_y); - EXPECT_FLOAT_EQ(-kMeanGravity / 2.0f, - motion->data.acceleration_including_gravity_z); - - DeviceOrientationHardwareBuffer* orientation = orientation_buffer(); - EXPECT_FLOAT_EQ(0.0f, orientation->data.beta); - EXPECT_FLOAT_EQ(45.0f, orientation->data.gamma); -} - -} // namespace device
diff --git a/docs/windows_build_instructions.md b/docs/windows_build_instructions.md index 1b5c389e..af4f4699 100644 --- a/docs/windows_build_instructions.md +++ b/docs/windows_build_instructions.md
@@ -23,25 +23,28 @@ ### Visual Studio -As of September, 2017 (R503915) Chromium requires Visual Studio 2017 update 3.2 -with the 15063 (Creators Update) Windows SDK or later to build. Visual Studio -Community Edition should work if its license is appropriate for you. You must -install the "Desktop development with C++" component and the "MFC and ATL -support" sub-component. This can be done from the command line by passing these -arguments to the Visual Studio installer that you download: +As of September, 2017 (R503915) Chromium requires Visual Studio 2017 update 3.x +to build. The clang-cl compiler is used but Visual Studio's header files, +libraries, and some tools are required. Visual Studio Community Edition should +work if its license is appropriate for you. You must install the "Desktop +development with C++" component and the "MFC and ATL support" sub-component. +This can be done from the command line by passing these arguments to the Visual +Studio installer that you download: ```shell --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended ``` -You must have the Windows 10 SDK installed, version 10.0.15063 or later. -The 10.0.15063 SDK initially had errors but the 10.0.15063.468 version works -well. Most of this will be installed by Visual Studio. -If the Windows 10 SDK was installed via the Visual Studio installer, the Debugging -Tools can be installed by going to: Control Panel → Programs → -Programs and Features → Select the "Windows Software Development Kit" → -Change → Change → Check "Debugging Tools For Windows" → Change. Or, you can -download the standalone SDK installer and use it to install the Debugging Tools. +You must have the version 10.0.15063 Windows 10 SDK installed. This can be +installed separately or by checking the appropriate box in the Visual Studio +Installer. + +The SDK Debugging Tools must also be installed. If the Windows 10 SDK was +installed via the Visual Studio installer, then they can be installed by going +to: Control Panel → Programs → Programs and Features → Select the "Windows +Software Development Kit" → Change → Change → Check "Debugging Tools For +Windows" → Change. Or, you can download the standalone SDK installer and use it +to install the Debugging Tools. ## Install `depot_tools` @@ -199,7 +202,7 @@ (`gn args out/Default`) or on the gn gen command line (`gn gen out/Default --args="is_component_build = true is_debug = true"`). Some helpful settings to consider using include: -* `use_jumbo_build = true` - *Experimental* [Jumbo/unity](jumbo.md) builds. +* `use_jumbo_build = true` - *experimental* [Jumbo/unity](jumbo.md) builds. * `is_component_build = true` - this uses more, smaller DLLs, and incremental linking. * `enable_nacl = false` - this disables Native Client which is usually not @@ -210,31 +213,107 @@ * `remove_webcore_debug_symbols = true` - turn off source-level debugging for blink to reduce build times, appropriate if you don't plan to debug blink. -In addition, Google employees should consider using goma, a distributed -compilation system. Detailed information is available internally but the -relevant gn args are: -* `use_goma = true` -* `symbol_level = 2` - by default goma builds change symbol_level from 2 to 1 -which disables source-level debugging. This turns it back on. This actually -makes builds slower, but it makes goma more usable. -* `is_win_fastlink = true` - this is required if you have goma enabled and -symbol_level set to 2. +In order to ensure that linking is fast enough we recommend that you use one of +these settings - they all have tradeoffs: +* `use_lld = true` - this linker is very fast on full links but does not support +incremental linking. +* `is_win_fastlink = true` - this option makes the Visual Studio linker run much +faster, and incremental linking is supported, but it can lead to debugger +slowdowns or out-of-memory crashes. +* `symbol_level = 1` - this option reduces the work the linker has to do but +when this option is set you cannot do source-level debugging. -Note that debugging of is_win_fastlink built binaries is unreliable prior to -VS 2017 Update 3 and may crash Visual Studio. +In addition, Google employees should use goma, a distributed compilation system. +Detailed information is available internally but the relevant gn arg is: +* `use_goma = true` To get any benefit from goma it is important to pass a large -j value to ninja. -A good default is 10\*numCores to 20\*numCores. If you run autoninja.bat then it -will pass an appropriate -j value to ninja for goma or not, automatically. +A good default is 10\*numCores to 20\*numCores. If you run autoninja then it +will automatically pass an appropriate -j value to ninja for goma or not. + +```shell +$ autoninja -C out\Default chrome +``` When invoking ninja specify 'chrome' as the target to avoid building all test binaries as well. Still, builds will take many hours on many machines. +### Why is my build slow? + +Many things can make builds slow, with Windows Defender slowing process startups +being a frequent culprit. Have you ensured that the entire Chromium src +directory is excluded from anti-virus scanning (on Google machines this means +putting it in a ``src`` directory in the root of a drive)? Have you tried the +different settings listed above, including different link settings and -j +values? Have you asked on the chromium-dev mailing list to see if your build is +slower than expected for your machine's specifications? + +The next step is to gather some data. There are several options. Setting +[NINJA_STATUS](https://ninja-build.org/manual.html#_environment_variables) lets +you configure Ninja's output so that, for instance, you can see how many +processes are running at any given time, how long the build has been running, +etc., as shown here: + +```shell +$ set NINJA_STATUS=[%r processes, %f/%t @ %o/s : %es ] +$ autoninja -C out\Default base +ninja: Entering directory `out\Default' +[1 processes, 86/86 @ 2.7/s : 31.785s ] LINK(DLL) base.dll base.dll.lib base.dll.pdb +``` + +In addition, if you set the ``NINJA_SUMMARIZE_BUILD`` environment variable to 1 then +autoninja will print a build performance summary when the build completes, +showing the slowest build steps and build-step types, as shown here: + +```shell +$ set NINJA_SUMMARIZE_BUILD=1 +$ autoninja -C out\Default base + Longest build steps: +... + 1.2 weighted s to build base.dll, base.dll.lib, base.dll.pdb (1.2 s CPU time) + 8.5 weighted s to build obj/base/base/base_jumbo_38.obj (30.1 s CPU time) + Time by build-step type: +... + 1.2 s weighted time to generate 1 PEFile (linking) files (1.2 s CPU time) + 30.3 s weighted time to generate 45 .obj files (688.8 s CPU time) + 31.8 s weighted time (693.8 s CPU time, 21.8x parallelism) + 86 build steps completed, average of 2.71/s +``` + +You can also get a visual report of the build performance with +[ninjatracing](https://github.com/nico/ninjatracing). This converts the +.ninja_log file into a .json file which can be loaded into chrome://tracing: + +```shell +$ python ninjatracing out\Default\.ninja_log >build.json +``` + +Finally, Ninja can report on its own overhead which can be helpful if, for +instance, process creation is making builds slow, perhaps due to anti-virus +interference due to clang-cl not being in an excluded directory: + +```shell +$ autoninja -d stats -C out\Default base +metric count avg (us) total (ms) +.ninja parse 3555 1539.4 5472.6 +canonicalize str 1383032 0.0 12.7 +canonicalize path 1402349 0.0 11.2 +lookup node 1398245 0.0 8.1 +.ninja_log load 2 118.0 0.2 +.ninja_deps load 2 67.5 0.1 +node stat 2516 29.6 74.4 +depfile load 2 1132.0 2.3 +StartEdge 88 3508.1 308.7 +FinishCommand 87 1670.9 145.4 +CLParser::Parse 45 1889.1 85.0 +``` + ## Build Chromium -Build Chromium (the "chrome" target) with Ninja using the command: +Build Chromium (the "chrome" target) with Ninja (or autoninja) using the +command: ```shell $ ninja -C out\Default chrome
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc index 964cde2..450475e 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.cc +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -735,9 +735,10 @@ base::RecordAction(UserMetricsAction("WebView.Guest.Terminate")); base::ProcessHandle process_handle = web_contents()->GetMainFrame()->GetProcess()->GetHandle(); - if (process_handle) + if (process_handle) { web_contents()->GetMainFrame()->GetProcess()->Shutdown( - content::RESULT_CODE_KILLED, false); + content::RESULT_CODE_KILLED); + } } bool WebViewGuest::ClearData(base::Time remove_since,
diff --git a/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc b/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc index 759d67af..d2079774 100644 --- a/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc +++ b/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
@@ -6,7 +6,7 @@ #include "base/bind.h" #include "content/public/browser/browser_thread.h" -#include "content/public/browser/render_view_host.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/speech_recognition_manager.h" #include "content/public/browser/speech_recognition_session_context.h" #include "content/public/browser/web_contents.h" @@ -78,8 +78,8 @@ BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - base::BindOnce(&CheckRenderViewType, std::move(callback), - context.render_process_id, context.render_view_id)); + base::BindOnce(&CheckRenderFrameType, std::move(callback), + context.render_process_id, context.render_frame_id)); } content::SpeechRecognitionEventListener* @@ -94,19 +94,20 @@ } // static -void ShellSpeechRecognitionManagerDelegate::CheckRenderViewType( +void ShellSpeechRecognitionManagerDelegate::CheckRenderFrameType( base::OnceCallback<void(bool ask_user, bool is_allowed)> callback, int render_process_id, - int render_view_id) { + int render_frame_id) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - content::RenderViewHost* render_view_host = - content::RenderViewHost::FromID(render_process_id, render_view_id); + + content::RenderFrameHost* render_frame_host = + content::RenderFrameHost::FromID(render_process_id, render_frame_id); bool allowed = false; bool check_permission = false; - if (render_view_host) { + if (render_frame_host) { WebContents* web_contents = - WebContents::FromRenderViewHost(render_view_host); + WebContents::FromRenderFrameHost(render_frame_host); extensions::ViewType view_type = extensions::GetViewType(web_contents); if (view_type == extensions::VIEW_TYPE_APP_WINDOW ||
diff --git a/extensions/shell/browser/shell_speech_recognition_manager_delegate.h b/extensions/shell/browser/shell_speech_recognition_manager_delegate.h index 0a0577f2..b041bef0f 100644 --- a/extensions/shell/browser/shell_speech_recognition_manager_delegate.h +++ b/extensions/shell/browser/shell_speech_recognition_manager_delegate.h
@@ -46,10 +46,10 @@ content::SpeechRecognitionEventListener* GetEventListener() override; bool FilterProfanities(int render_process_id) override; - static void CheckRenderViewType( + static void CheckRenderFrameType( base::OnceCallback<void(bool ask_user, bool is_allowed)> callback, int render_process_id, - int render_view_id); + int render_frame_id); DISALLOW_COPY_AND_ASSIGN(ShellSpeechRecognitionManagerDelegate); };
diff --git a/headless/lib/headless_web_contents_browsertest.cc b/headless/lib/headless_web_contents_browsertest.cc index 88aa241..eae951bd 100644 --- a/headless/lib/headless_web_contents_browsertest.cc +++ b/headless/lib/headless_web_contents_browsertest.cc
@@ -1326,31 +1326,18 @@ void SetDeviceMetricsOverrideDone( std::unique_ptr<emulation::SetDeviceMetricsOverrideResult> result) { EXPECT_TRUE(result); - // TODO(crbug.com/817364): Due to recent changes in CopyOutputRequests, it - // is not possible to take a screenshot directly after resize as it would be - // taken from the old surface. Thus, we have to send an intermediate - // BeginFrame here, which will replace the surface first. Replace this with - // a screenshotting BeginFrame and remove the need for the third BeginFrame - // once above problem is resolved. - BeginFrame(false); + // Take a screenshot in the second BeginFrame. + BeginFrame(true); } void OnFrameFinished(std::unique_ptr<headless_experimental::BeginFrameResult> result) override { if (num_begin_frames_ == 1) { - EXPECT_TRUE(result->GetHasDamage()); - EXPECT_FALSE(result->HasScreenshotData()); SetUpViewport(); return; - } else if (num_begin_frames_ == 2) { - EXPECT_TRUE(result->GetHasDamage()); - EXPECT_FALSE(result->HasScreenshotData()); - // Capture screenshot in third BeginFrame. - BeginFrame(true); - return; } - DCHECK_EQ(3, num_begin_frames_); + DCHECK_EQ(2, num_begin_frames_); // Second BeginFrame should have a screenshot of the configured viewport and // of the correct size. EXPECT_TRUE(result->GetHasDamage());
diff --git a/headless/public/util/compositor_controller_browsertest.cc b/headless/public/util/compositor_controller_browsertest.cc index 5e80a11..dca8a62 100644 --- a/headless/public/util/compositor_controller_browsertest.cc +++ b/headless/public/util/compositor_controller_browsertest.cc
@@ -29,6 +29,12 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/codec/png_codec.h" +#define EXPECT_SCOPED(statements) \ + { \ + SCOPED_TRACE(""); \ + statements; \ + } + namespace headless { // BeginFrameControl is not supported on Mac. @@ -145,6 +151,7 @@ command_line->AppendSwitch(switches::kDisableNewContentRenderingTimeout); command_line->AppendSwitch(cc::switches::kDisableCheckerImaging); command_line->AppendSwitch(cc::switches::kDisableThreadedAnimation); + command_line->AppendSwitch(switches::kDisableImageAnimationResync); command_line->AppendSwitch(switches::kDisableThreadedScrolling); scoped_feature_list_.InitAndEnableFeature( @@ -226,8 +233,7 @@ virtual void OnFirstBeginFrameComplete() { // With surface sync enabled, we should have waited for the renderer's // CompositorFrame in the first BeginFrame. - EXPECT_EQ(1, begin_frame_counter_->begin_frame_count()); - EXPECT_EQ(1, render_frame_submission_observer_->render_frame_count()); + EXPECT_SCOPED(ExpectAdditionalFrameCounts(1, 1)); } void CaptureDoubleScreenshot( @@ -256,6 +262,16 @@ FinishAsynchronousTest(); } + void ExpectAdditionalFrameCounts(int additional_begin_frame_count, + int additional_render_frame_count) { + expected_begin_frame_count_ += additional_begin_frame_count; + expected_render_frame_count_ += additional_render_frame_count; + EXPECT_EQ(expected_begin_frame_count_, + begin_frame_counter_->begin_frame_count()); + EXPECT_EQ(expected_render_frame_count_, + render_frame_submission_observer_->render_frame_count()); + } + base::test::ScopedFeatureList scoped_feature_list_; std::unique_ptr<VirtualTimeController> virtual_time_controller_; @@ -264,6 +280,9 @@ std::unique_ptr<BeginFrameCounter> begin_frame_counter_; std::unique_ptr<content::RenderFrameSubmissionObserver> render_frame_submission_observer_; + + int expected_begin_frame_count_ = 0; + int expected_render_frame_count_ = 0; }; // Runs requestAnimationFrame three times without updating display for @@ -305,8 +324,7 @@ // Even though the rAF made a change to the frame's background color, no // further CompositorFrames should have been produced for animations, // because update_display_for_animations is false. - EXPECT_EQ(1 + kNumFrames, begin_frame_counter_->begin_frame_count()); - EXPECT_EQ(1, render_frame_submission_observer_->render_frame_count()); + EXPECT_SCOPED(ExpectAdditionalFrameCounts(kNumFrames, 0)); // Get animation frame count. devtools_client_->GetRuntime()->Evaluate( @@ -328,9 +346,7 @@ void OnScreenshot(const std::string& screenshot_data) { // Screenshot should have incurred two new CompositorFrames from renderer. - EXPECT_EQ(3 + kNumFrames, begin_frame_counter_->begin_frame_count()); - EXPECT_EQ(3, render_frame_submission_observer_->render_frame_count()); - + EXPECT_SCOPED(ExpectAdditionalFrameCounts(2, 2)); EXPECT_LT(0U, screenshot_data.length()); if (screenshot_data.length()) { @@ -408,9 +424,7 @@ // The GIF should not have started animating yet, even though we advanced // virtual time. It only starts animating when first painted, i.e. when the // first screenshot is taken. - EXPECT_EQ(1 + kNumFramesFirstIteration, - begin_frame_counter_->begin_frame_count()); - EXPECT_EQ(1, render_frame_submission_observer_->render_frame_count()); + EXPECT_SCOPED(ExpectAdditionalFrameCounts(kNumFramesFirstIteration, 0)); CaptureDoubleScreenshot( base::BindRepeating(&CompositorControllerImageAnimationBrowserTest:: @@ -421,10 +435,7 @@ void OnScreenshotAfterFirstIteration(const std::string& screenshot_data) { // Screenshot should have incurred one new CompositorFrame from renderer, // but two new BeginFrames. - EXPECT_EQ(3 + kNumFramesFirstIteration, - begin_frame_counter_->begin_frame_count()); - EXPECT_EQ(2, render_frame_submission_observer_->render_frame_count()); - + EXPECT_SCOPED(ExpectAdditionalFrameCounts(2, 1)); EXPECT_LT(0U, screenshot_data.length()); if (screenshot_data.length()) { @@ -453,11 +464,10 @@ void OnSecondBudgetExpired() { // Even though the GIF animated, no further CompositorFrames should have // been produced, because update_display_for_animations is false. The second - // animation only produces kNumFramesSecondIteration - 1 BeginFrames since + // iteration only produces kNumFramesSecondIteration - 1 BeginFrames since // the first animation frame is skipped because of the prior screenshot. - EXPECT_EQ(2 + kNumFramesFirstIteration + kNumFramesSecondIteration, - begin_frame_counter_->begin_frame_count()); - EXPECT_EQ(2, render_frame_submission_observer_->render_frame_count()); + EXPECT_SCOPED( + ExpectAdditionalFrameCounts(kNumFramesSecondIteration - 1, 0)); CaptureDoubleScreenshot( base::BindRepeating(&CompositorControllerImageAnimationBrowserTest:: @@ -468,9 +478,7 @@ void OnScreenshotAfterSecondIteration(const std::string& screenshot_data) { // Screenshot should have incurred one new CompositorFrame from renderer, // but two new BeginFrames. - EXPECT_EQ(4 + kNumFramesFirstIteration + kNumFramesSecondIteration, - begin_frame_counter_->begin_frame_count()); - EXPECT_EQ(3, render_frame_submission_observer_->render_frame_count()); + EXPECT_SCOPED(ExpectAdditionalFrameCounts(2, 1)); EXPECT_LT(0U, screenshot_data.length()); @@ -486,6 +494,48 @@ EXPECT_EQ(expected_color, actual_color); } + // Advance a full animation iteration and check that animation doesn't reset + // to the beginning, because of kDisableImageAnimationResync. + new AdditionalVirtualTimeBudget( + virtual_time_controller_.get(), + AdditionalVirtualTimeBudget::StartPolicy::START_IMMEDIATELY, + kNumFramesThirdIteration * GetAnimationFrameInterval(), + base::BindOnce(&CompositorControllerImageAnimationBrowserTest:: + OnThirdBudgetExpired, + base::Unretained(this))); + } + + void OnThirdBudgetExpired() { + // Even though the GIF animated, no further CompositorFrames should have + // been produced, because update_display_for_animations is false. The third + // iteration only produces kNumFramesThirdIteration - 1 BeginFrames since + // the first animation frame is skipped because of the prior screenshot. + EXPECT_SCOPED(ExpectAdditionalFrameCounts(kNumFramesThirdIteration - 1, 0)); + + CaptureDoubleScreenshot( + base::BindRepeating(&CompositorControllerImageAnimationBrowserTest:: + OnScreenshotAfterThirdIteration, + base::Unretained(this))); + } + + void OnScreenshotAfterThirdIteration(const std::string& screenshot_data) { + // Screenshot should have incurred no new CompositorFrame from renderer + // since animation frame didn't change, but two new BeginFrames. + EXPECT_SCOPED(ExpectAdditionalFrameCounts(2, 0)); + EXPECT_LT(0U, screenshot_data.length()); + + if (screenshot_data.length()) { + SkBitmap result_bitmap; + EXPECT_TRUE(DecodePNG(screenshot_data, &result_bitmap)); + + EXPECT_EQ(800, result_bitmap.width()); + EXPECT_EQ(600, result_bitmap.height()); + SkColor actual_color = result_bitmap.getColor(50, 50); + // We advanced a full iteration, so animation should be yellow again. + SkColor expected_color = SkColorSetRGB(0xff, 0xff, 0x00); + EXPECT_EQ(expected_color, actual_color); + } + FinishCompositorControllerTest(); } @@ -493,6 +543,8 @@ static constexpr int kNumFramesFirstIteration = 7; // Advances two animation frames only. static constexpr int kNumFramesSecondIteration = 5; + // Advances a full animation iteration. + static constexpr int kNumFramesThirdIteration = 6; }; /* static */ @@ -501,6 +553,9 @@ /* static */ constexpr int CompositorControllerImageAnimationBrowserTest::kNumFramesSecondIteration; +/* static */ +constexpr int + CompositorControllerImageAnimationBrowserTest::kNumFramesThirdIteration; HEADLESS_ASYNC_DEVTOOLED_TEST_P(CompositorControllerImageAnimationBrowserTest);
diff --git a/infra/config/branch/cq.cfg b/infra/config/branch/cq.cfg index ec77beb..2127568 100644 --- a/infra/config/branch/cq.cfg +++ b/infra/config/branch/cq.cfg
@@ -141,22 +141,12 @@ } builders { name: "mac_chromium_compile_dbg_ng" - equivalent_to { bucket: "luci.chromium.try" percentage: 0 } + equivalent_to { bucket: "luci.chromium.try" percentage: 100 } } builders { name: "mac_chromium_rel_ng" equivalent_to { bucket: "luci.chromium.try" percentage: 0 } } - builders { - # The only purpose of this builder here is get data for migrating this - # builder to LUCI, see https://crbug.com/731476. - # 1% of ~90 cq runs/peak hour => builds per peak hour, which currently - # is fine given shared 5 VMs with another optional CQ builder. - # TODO(tandrii): remove this builder once enough data has been - # collected. - name: "mac_chromium_dbg_ng" - experiment_percentage: 3 - } } buckets { name: "master.tryserver.chromium.win"
diff --git a/ios/chrome/app/resources/Info.plist b/ios/chrome/app/resources/Info.plist index 27882cf..c6a4950 100644 --- a/ios/chrome/app/resources/Info.plist +++ b/ios/chrome/app/resources/Info.plist
@@ -28,8 +28,7 @@ <key>CFBundlePrimaryIcon</key> <dict> <key>CFBundleIconFiles</key> - <array> - </array> + <array/> <key>UIPrerenderedIcon</key> <true/> </dict> @@ -39,8 +38,7 @@ <key>CFBundlePrimaryIcon</key> <dict> <key>CFBundleIconFiles</key> - <array> - </array> + <array/> <key>UIPrerenderedIcon</key> <true/> </dict> @@ -167,6 +165,10 @@ </array> <key>UILaunchStoryboardName</key> <string>LaunchScreen</string> + <key>LSApplicationQueriesSchemes</key> + <array> + <string>googledrive</string> + </array> <key>SSOAuthURLScheme</key> <string>${SSOAUTH_URL_SCHEME}</string> <key>KSChannelChromeScheme</key>
diff --git a/ios/chrome/browser/download/BUILD.gn b/ios/chrome/browser/download/BUILD.gn index 837b8272..da58770 100644 --- a/ios/chrome/browser/download/BUILD.gn +++ b/ios/chrome/browser/download/BUILD.gn
@@ -13,8 +13,8 @@ "download_manager_tab_helper.h", "download_manager_tab_helper.mm", "download_manager_tab_helper_delegate.h", - "google_drive_app_constants.h", - "google_drive_app_constants.mm", + "google_drive_app_util.h", + "google_drive_app_util.mm", "pass_kit_mime_type.cc", "pass_kit_mime_type.h", "pass_kit_tab_helper.h", @@ -33,7 +33,7 @@ ] libs = [ - "Foundation.framework", + "UIKit.framework", "PassKit.framework", ] @@ -48,6 +48,7 @@ "browser_download_service_unittest.mm", "download_directory_util_unittest.mm", "download_manager_tab_helper_unittest.mm", + "google_drive_app_util_unittest.mm", "pass_kit_tab_helper_unittest.mm", ] deps = [ @@ -64,6 +65,7 @@ "//ios/web/public/test/fakes", "//net", "//testing/gtest", + "//third_party/ocmock", ] }
diff --git a/ios/chrome/browser/download/google_drive_app_constants.h b/ios/chrome/browser/download/google_drive_app_constants.h deleted file mode 100644 index 4887861..0000000 --- a/ios/chrome/browser/download/google_drive_app_constants.h +++ /dev/null
@@ -1,14 +0,0 @@ -// Copyright 2018 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_CHROME_BROWSER_DOWNLOAD_GOOGLE_DRIVE_APP_CONSTANTS_H_ -#define IOS_CHROME_BROWSER_DOWNLOAD_GOOGLE_DRIVE_APP_CONSTANTS_H_ - -@class NSString; - -// iTunes Store item identifier for Google Drive app. Can be used with -// StoreKitCoordinator. -extern NSString* const kGoogleDriveITunesItemIdentifier; - -#endif // IOS_CHROME_BROWSER_DOWNLOAD_GOOGLE_DRIVE_APP_CONSTANTS_H_
diff --git a/ios/chrome/browser/download/google_drive_app_constants.mm b/ios/chrome/browser/download/google_drive_app_constants.mm deleted file mode 100644 index 5db79bd..0000000 --- a/ios/chrome/browser/download/google_drive_app_constants.mm +++ /dev/null
@@ -1,13 +0,0 @@ -// Copyright 2018 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. - -#import "ios/chrome/browser/download/google_drive_app_constants.h" - -#import <Foundation/Foundation.h> - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -NSString* const kGoogleDriveITunesItemIdentifier = @"507874739";
diff --git a/ios/chrome/browser/download/google_drive_app_util.h b/ios/chrome/browser/download/google_drive_app_util.h new file mode 100644 index 0000000..561e660 --- /dev/null +++ b/ios/chrome/browser/download/google_drive_app_util.h
@@ -0,0 +1,26 @@ +// Copyright 2018 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_CHROME_BROWSER_DOWNLOAD_GOOGLE_DRIVE_APP_UTIL_H_ +#define IOS_CHROME_BROWSER_DOWNLOAD_GOOGLE_DRIVE_APP_UTIL_H_ + +@class NSString; +@class NSURL; + +// iTunes Store item identifier for Google Drive app. Can be used with +// StoreKitCoordinator. +extern NSString* const kGoogleDriveITunesItemIdentifier; + +// Custom URL scheme for Google Drive app. Can be used to check if Google Drive +// app is installed. +extern NSString* const kGoogleDriveAppURLScheme; + +// Returns URL which can be used to check if Google Drive app is installed via +// -[UIApplication canOpenURL:] call. +NSURL* GetGoogleDriveAppUrl(); + +// Returns true if Google Drive app is installed. +bool IsGoogleDriveAppInstalled(); + +#endif // IOS_CHROME_BROWSER_DOWNLOAD_GOOGLE_DRIVE_APP_UTIL_H_
diff --git a/ios/chrome/browser/download/google_drive_app_util.mm b/ios/chrome/browser/download/google_drive_app_util.mm new file mode 100644 index 0000000..eadc37a --- /dev/null +++ b/ios/chrome/browser/download/google_drive_app_util.mm
@@ -0,0 +1,24 @@ +// Copyright 2018 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. + +#import "ios/chrome/browser/download/google_drive_app_util.h" + +#import <UIKit/UIKit.h> + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +NSString* const kGoogleDriveITunesItemIdentifier = @"507874739"; +NSString* const kGoogleDriveAppURLScheme = @"googledrive"; + +NSURL* GetGoogleDriveAppUrl() { + NSURLComponents* google_drive_url = [[NSURLComponents alloc] init]; + google_drive_url.scheme = kGoogleDriveAppURLScheme; + return google_drive_url.URL; +} + +bool IsGoogleDriveAppInstalled() { + return [[UIApplication sharedApplication] canOpenURL:GetGoogleDriveAppUrl()]; +}
diff --git a/ios/chrome/browser/download/google_drive_app_util_unittest.mm b/ios/chrome/browser/download/google_drive_app_util_unittest.mm new file mode 100644 index 0000000..69109f4c --- /dev/null +++ b/ios/chrome/browser/download/google_drive_app_util_unittest.mm
@@ -0,0 +1,46 @@ +// Copyright 2018 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. + +#import "ios/chrome/browser/download/google_drive_app_util.h" + +#import <UIKit/UIKit.h> + +#include "testing/gtest_mac.h" +#include "testing/platform_test.h" +#import "third_party/ocmock/OCMock/OCMock.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +using GoogleDriveAppUtilTest = PlatformTest; + +// Tests GetGoogleDriveAppUrl() function. +TEST_F(GoogleDriveAppUtilTest, GetGoogleDriveAppUrl) { + NSURL* url = GetGoogleDriveAppUrl(); + ASSERT_TRUE(url); + ASSERT_NSEQ(kGoogleDriveAppURLScheme, url.scheme); +} + +// Tests IsGoogleDriveAppInstalled() function returning true. +TEST_F(GoogleDriveAppUtilTest, IsGoogleDriveAppInstalledTrue) { + id application = OCMClassMock([UIApplication class]); + OCMStub([application sharedApplication]).andReturn(application); + + OCMStub([application canOpenURL:GetGoogleDriveAppUrl()]).andReturn(YES); + EXPECT_TRUE(IsGoogleDriveAppInstalled()); + + [application stopMocking]; +} + +// Tests IsGoogleDriveAppInstalled() function returning false. +TEST_F(GoogleDriveAppUtilTest, IsGoogleDriveAppInstalledFalse) { + id application = OCMClassMock([UIApplication class]); + OCMStub([application sharedApplication]).andReturn(application); + + OCMStub([application canOpenURL:GetGoogleDriveAppUrl()]).andReturn(NO); + EXPECT_FALSE(IsGoogleDriveAppInstalled()); + + [application stopMocking]; +}
diff --git a/ios/chrome/browser/passwords/credential_manager_unittest.mm b/ios/chrome/browser/passwords/credential_manager_unittest.mm index b52c89dd..873df7c18 100644 --- a/ios/chrome/browser/passwords/credential_manager_unittest.mm +++ b/ios/chrome/browser/passwords/credential_manager_unittest.mm
@@ -65,9 +65,10 @@ : last_committed_url_(kHttpsWebOrigin), password_manager_(this) { store_ = base::MakeRefCounted<TestPasswordStore>(); store_->Init(syncer::SyncableService::StartSyncFlare(), nullptr); - prefs_.registry()->RegisterBooleanPref( + prefs_ = std::make_unique<TestingPrefServiceSimple>(); + prefs_->registry()->RegisterBooleanPref( password_manager::prefs::kCredentialsEnableAutosignin, true); - prefs_.registry()->RegisterBooleanPref( + prefs_->registry()->RegisterBooleanPref( password_manager::prefs::kWasAutoSignInFirstRunExperienceShown, true); } @@ -95,7 +96,7 @@ private: // PasswordManagerClient: - PrefService* GetPrefs() override { return &prefs_; } + PrefService* GetPrefs() const override { return prefs_.get(); } PasswordStore* GetPasswordStore() const override { return store_.get(); } const PasswordManager* GetPasswordManager() const override { return &password_manager_; @@ -116,7 +117,7 @@ const GURL& origin, const CredentialsCallback& callback) override; - TestingPrefServiceSimple prefs_; + std::unique_ptr<TestingPrefServiceSimple> prefs_; GURL last_committed_url_; PasswordManager password_manager_; std::unique_ptr<PasswordFormManager> manager_;
diff --git a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h index 59396510..2cf7526 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h +++ b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.h
@@ -72,7 +72,7 @@ override; bool IsIncognito() const override; const password_manager::PasswordManager* GetPasswordManager() const override; - PrefService* GetPrefs() override; + PrefService* GetPrefs() const override; password_manager::PasswordStore* GetPasswordStore() const override; void NotifyUserAutoSignin( std::vector<std::unique_ptr<autofill::PasswordForm>> local_forms,
diff --git a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm index e08813b..0c32a16 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm +++ b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm
@@ -126,7 +126,7 @@ return delegate_.passwordManager; } -PrefService* IOSChromePasswordManagerClient::GetPrefs() { +PrefService* IOSChromePasswordManagerClient::GetPrefs() const { return (delegate_.browserState)->GetPrefs(); }
diff --git a/ios/chrome/browser/passwords/password_controller_unittest.mm b/ios/chrome/browser/passwords/password_controller_unittest.mm index 9c3aa4e..9e2e4a6 100644 --- a/ios/chrome/browser/passwords/password_controller_unittest.mm +++ b/ios/chrome/browser/passwords/password_controller_unittest.mm
@@ -75,20 +75,22 @@ : public password_manager::StubPasswordManagerClient { public: explicit MockPasswordManagerClient(password_manager::PasswordStore* store) - : store_(store) {} + : store_(store) { + prefs_ = std::make_unique<TestingPrefServiceSimple>(); + } ~MockPasswordManagerClient() override = default; MOCK_CONST_METHOD0(GetLogManager, password_manager::LogManager*(void)); - PrefService* GetPrefs() override { return &prefs_; } + PrefService* GetPrefs() const override { return prefs_.get(); } password_manager::PasswordStore* GetPasswordStore() const override { return store_; } private: - TestingPrefServiceSimple prefs_; + std::unique_ptr<TestingPrefServiceSimple> prefs_; password_manager::PasswordStore* const store_; };
diff --git a/ios/chrome/browser/prerender/preload_controller.h b/ios/chrome/browser/prerender/preload_controller.h index 779f2d53..935a0fc 100644 --- a/ios/chrome/browser/prerender/preload_controller.h +++ b/ios/chrome/browser/prerender/preload_controller.h
@@ -12,7 +12,6 @@ #include "components/prefs/pref_change_registrar.h" #import "ios/chrome/browser/net/connection_type_observer_bridge.h" #import "ios/chrome/browser/prefs/pref_observer_bridge.h" -#import "ios/chrome/browser/tabs/tab_delegate.h" #include "ios/web/public/referrer.h" #import "ios/web/public/web_state/ui/crw_native_content_provider.h" #import "ios/web/public/web_state/web_state_delegate_bridge.h" @@ -36,7 +35,6 @@ @interface PreloadController : NSObject<CRWNativeContentProvider, CRWWebStateDelegate, PrefObserverDelegate, - TabDelegate, CRConnectionTypeObserverBridge> // The URL of the currently prerendered Tab. Empty if there is no prerendered // Tab.
diff --git a/ios/chrome/browser/prerender/preload_controller.mm b/ios/chrome/browser/prerender/preload_controller.mm index 8e4dd02..2449b41 100644 --- a/ios/chrome/browser/prerender/preload_controller.mm +++ b/ios/chrome/browser/prerender/preload_controller.mm
@@ -27,7 +27,9 @@ #import "ios/web/public/navigation_item.h" #import "ios/web/public/navigation_manager.h" #import "ios/web/public/web_state/ui/crw_native_content.h" +#include "ios/web/public/web_state/ui/crw_web_delegate.h" #import "ios/web/public/web_state/web_state.h" +#include "ios/web/public/web_state/web_state_observer_bridge.h" #include "ios/web/public/web_thread.h" #import "ios/web/web_state/ui/crw_web_controller.h" #import "net/base/mac/url_conversions.h" @@ -61,7 +63,7 @@ } // namespace -@interface PreloadController (PrivateMethods)<ManageAccountsDelegate> +@interface PreloadController (PrivateMethods) // Returns YES if prerendering is enabled. - (BOOL)isPrerenderingEnabled; @@ -85,6 +87,11 @@ @end +@interface PreloadController ()<CRWWebDelegate, + CRWWebStateObserver, + ManageAccountsDelegate> +@end + @implementation PreloadController { ios::ChromeBrowserState* browserState_; // Weak. @@ -95,6 +102,10 @@ // with the pre-rendered WebState. std::unique_ptr<web::WebStateDelegateBridge> webStateDelegate_; + // The WebStateObserverBridge used to register self as a WebStateObserver + // with the pre-rendered WebState. + std::unique_ptr<web::WebStateObserverBridge> webStateObserver_; + // The URL that is prerendered in |webState_|. This can be different from // the value returned by WebState last committed navigation item, for example // in cases where there was a redirect. @@ -147,16 +158,17 @@ prefs::kNetworkPredictionWifiOnly); usingWWAN_ = net::NetworkChangeNotifier::IsConnectionCellular( net::NetworkChangeNotifier::GetConnectionType()); - webStateDelegate_.reset(new web::WebStateDelegateBridge(self)); - observerBridge_.reset(new PrefObserverBridge(self)); + webStateDelegate_ = std::make_unique<web::WebStateDelegateBridge>(self); + webStateObserver_ = std::make_unique<web::WebStateObserverBridge>(self); + observerBridge_ = std::make_unique<PrefObserverBridge>(self); prefChangeRegistrar_.Init(browserState_->GetPrefs()); observerBridge_->ObserveChangesForPreference( prefs::kNetworkPredictionEnabled, &prefChangeRegistrar_); observerBridge_->ObserveChangesForPreference( prefs::kNetworkPredictionWifiOnly, &prefChangeRegistrar_); if (enabled_ && wifiOnly_) { - connectionTypeObserverBridge_.reset( - new ConnectionTypeObserverBridge(self)); + connectionTypeObserverBridge_ = + std::make_unique<ConnectionTypeObserverBridge>(self); } [[NSNotificationCenter defaultCenter] @@ -239,7 +251,10 @@ Tab* tab = LegacyTabHelper::GetTabForWebState(webState.get()); [[tab webController] setNativeProvider:nil]; + [[tab webController] setDelegate:tab]; + webState->SetShouldSuppressDialogs(false); + webState->RemoveObserver(webStateObserver_.get()); webState->SetDelegate(nullptr); HistoryTabHelper::FromWebState(webState.get()) @@ -256,8 +271,6 @@ loadSuccess:YES]; } - [tab setDelegate:nil]; - return webState; } @@ -371,10 +384,13 @@ DCHECK(tab); [[tab webController] setNativeProvider:self]; + [[tab webController] setDelegate:self]; + webState_->SetDelegate(webStateDelegate_.get()); + webState_->AddObserver(webStateObserver_.get()); webState_->SetShouldSuppressDialogs(true); webState_->SetWebUsageEnabled(true); - [tab setDelegate:self]; + if (AccountConsistencyService* accountConsistencyService = ios::AccountConsistencyServiceFactory::GetForBrowserState( browserState_)) { @@ -411,6 +427,8 @@ Tab* tab = LegacyTabHelper::GetTabForWebState(webState_.get()); [[tab webController] setNativeProvider:nil]; + [[tab webController] setDelegate:tab]; + webState_->RemoveObserver(webStateObserver_.get()); webState_->SetDelegate(nullptr); webState_.reset(); @@ -444,24 +462,86 @@ } } -#pragma mark - TabDelegate +#pragma mark - CRWWebStateObserver -- (void)discardPrerender { +- (void)webState:(web::WebState*)webState + didLoadPageWithSuccess:(BOOL)loadSuccess { + DCHECK_EQ(webState, webState_.get()); + // Cancel prerendering if response is "application/octet-stream". It can be a + // video file which should not be played from preload tab. See issue at + // http://crbug.com/436813 for more details. + const std::string& mimeType = webState->GetContentsMimeType(); + if (mimeType == "application/octet-stream") + [self schedulePrerenderCancel]; +} + +- (void)webStateDidSuppressDialog:(web::WebState*)webState { + DCHECK_EQ(webState, webState_.get()); [self schedulePrerenderCancel]; } +#pragma mark - CRWWebDelegate protocol + +- (BOOL)openExternalURL:(const GURL&)URL + sourceURL:(const GURL&)sourceURL + linkClicked:(BOOL)linkClicked { + DCHECK(webState_); + Tab* tab = LegacyTabHelper::GetTabForWebState(webState_.get()); + return [tab openExternalURL:URL sourceURL:sourceURL linkClicked:linkClicked]; +} + +- (BOOL)webController:(CRWWebController*)webController + shouldOpenURL:(const GURL&)URL + mainDocumentURL:(const GURL&)mainDocumentURL { + DCHECK(webState_); + Tab* tab = LegacyTabHelper::GetTabForWebState(webState_.get()); + SEL selector = @selector(webController:shouldOpenURL:mainDocumentURL:); + if ([tab respondsToSelector:selector]) { + return [tab webController:webController + shouldOpenURL:URL + mainDocumentURL:mainDocumentURL]; + } + return NO; +} + +- (BOOL)webController:(CRWWebController*)webController + shouldOpenExternalURL:(const GURL&)URL { + [self schedulePrerenderCancel]; + return NO; +} + +- (CGFloat)headerHeightForWebController:(CRWWebController*)webController { + DCHECK(webState_); + Tab* tab = LegacyTabHelper::GetTabForWebState(webState_.get()); + SEL selector = @selector(headerHeightForWebController:); + if ([tab respondsToSelector:selector]) { + return [tab headerHeightForWebController:webController]; + } + return 0; +} + +- (void)webController:(CRWWebController*)webController + didLoadPassKitObject:(NSData*)data { + DCHECK(webState_); + Tab* tab = LegacyTabHelper::GetTabForWebState(webState_.get()); + SEL selector = @selector(webController:didLoadPassKitObject:); + if ([tab respondsToSelector:selector]) { + [tab webController:webController didLoadPassKitObject:data]; + } +} + #pragma mark - ManageAccountsDelegate - (void)onManageAccounts { - [self discardPrerender]; + [self schedulePrerenderCancel]; } - (void)onAddAccount { - [self discardPrerender]; + [self schedulePrerenderCancel]; } - (void)onGoIncognito:(const GURL&)url { - [self discardPrerender]; + [self schedulePrerenderCancel]; } @end
diff --git a/ios/chrome/browser/tabs/BUILD.gn b/ios/chrome/browser/tabs/BUILD.gn index 158f3a40..dbb73d4 100644 --- a/ios/chrome/browser/tabs/BUILD.gn +++ b/ios/chrome/browser/tabs/BUILD.gn
@@ -6,7 +6,6 @@ sources = [ "legacy_tab_helper.h", "tab.h", - "tab_delegate.h", "tab_dialog_delegate.h", "tab_headers_delegate.h", "tab_helper_util.h",
diff --git a/ios/chrome/browser/tabs/tab.h b/ios/chrome/browser/tabs/tab.h index 16d596a..92c699ed 100644 --- a/ios/chrome/browser/tabs/tab.h +++ b/ios/chrome/browser/tabs/tab.h
@@ -26,7 +26,6 @@ @class PasswordController; @class SnapshotManager; @class FormSuggestionController; -@protocol TabDelegate; @protocol TabDialogDelegate; @class Tab; @protocol TabHeadersDelegate; @@ -95,7 +94,6 @@ @property(nonatomic, readonly) BOOL canGoBack; @property(nonatomic, readonly) BOOL canGoForward; -@property(nonatomic, weak) id<TabDelegate> delegate; @property(nonatomic, weak) id<TabHeadersDelegate> tabHeadersDelegate; @property(nonatomic, readonly)
diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm index a16c4b7..0738f31d 100644 --- a/ios/chrome/browser/tabs/tab.mm +++ b/ios/chrome/browser/tabs/tab.mm
@@ -53,15 +53,12 @@ #include "ios/chrome/browser/infobars/infobar_manager_impl.h" #import "ios/chrome/browser/metrics/tab_usage_recorder.h" #include "ios/chrome/browser/pref_names.h" -#import "ios/chrome/browser/prerender/prerender_service.h" -#import "ios/chrome/browser/prerender/prerender_service_factory.h" #include "ios/chrome/browser/reading_list/reading_list_model_factory.h" #include "ios/chrome/browser/search_engines/template_url_service_factory.h" #import "ios/chrome/browser/snapshots/snapshot_cache.h" #import "ios/chrome/browser/snapshots/snapshot_cache_factory.h" #import "ios/chrome/browser/snapshots/snapshot_tab_helper.h" #import "ios/chrome/browser/tabs/legacy_tab_helper.h" -#import "ios/chrome/browser/tabs/tab_delegate.h" #import "ios/chrome/browser/tabs/tab_dialog_delegate.h" #import "ios/chrome/browser/tabs/tab_headers_delegate.h" #import "ios/chrome/browser/tabs/tab_helper_util.h" @@ -169,7 +166,6 @@ @synthesize overscrollActionsControllerDelegate = overscrollActionsControllerDelegate_; @synthesize passKitDialogProvider = passKitDialogProvider_; -@synthesize delegate = delegate_; @synthesize dialogDelegate = dialogDelegate_; @synthesize tabHeadersDelegate = tabHeadersDelegate_; @@ -406,13 +402,6 @@ didLoadPageWithSuccess:(BOOL)loadSuccess { DCHECK([self loadFinished]); - // Cancel prerendering if response is "application/octet-stream". It can be a - // video file which should not be played from preload tab (crbug.com/436813). - if (self.isPrerenderTab && - self.webState->GetContentsMimeType() == "application/octet-stream") { - [self discardPrerender]; - } - if (loadSuccess) { scoped_refptr<net::HttpResponseHeaders> headers = _webStateImpl->GetHttpResponseHeaders(); @@ -420,11 +409,6 @@ } } -- (void)webStateDidSuppressDialog:(web::WebState*)webState { - DCHECK(self.isPrerenderTab); - [self discardPrerender]; -} - - (void)renderProcessGoneForWebState:(web::WebState*)webState { DCHECK(webState == _webStateImpl); [self.dialogDelegate cancelDialogForTab:self]; @@ -541,10 +525,6 @@ - (BOOL)webController:(CRWWebController*)webController shouldOpenExternalURL:(const GURL&)URL { - if (self.isPrerenderTab) { - [self discardPrerender]; - return NO; - } return YES; } @@ -559,19 +539,6 @@ #pragma mark - Private methods -- (void)discardPrerender { - DCHECK(self.isPrerenderTab); - [delegate_ discardPrerender]; -} - -- (BOOL)isPrerenderTab { - DCHECK(_browserState); - PrerenderService* prerenderService = - PrerenderServiceFactory::GetForBrowserState(_browserState); - return prerenderService && - prerenderService->IsWebStatePrerendered(self.webState); -} - - (OpenInController*)openInController { if (!_openInController) { _openInController = [[OpenInController alloc]
diff --git a/ios/chrome/browser/tabs/tab_delegate.h b/ios/chrome/browser/tabs/tab_delegate.h deleted file mode 100644 index 23a3044..0000000 --- a/ios/chrome/browser/tabs/tab_delegate.h +++ /dev/null
@@ -1,18 +0,0 @@ -// Copyright 2012 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_CHROME_BROWSER_TABS_TAB_DELEGATE_H_ -#define IOS_CHROME_BROWSER_TABS_TAB_DELEGATE_H_ - -#import <UIKit/UIKit.h> - -// A protocol implemented by a delegate of Tab. -@protocol TabDelegate - -// Discard prerenderer (e.g. when dialog was suppressed). -- (void)discardPrerender; - -@end - -#endif // IOS_CHROME_BROWSER_TABS_TAB_DELEGATE_H_
diff --git a/ios/chrome/browser/ui/download/download_manager_coordinator.mm b/ios/chrome/browser/ui/download/download_manager_coordinator.mm index 09a138b30..13144709 100644 --- a/ios/chrome/browser/ui/download/download_manager_coordinator.mm +++ b/ios/chrome/browser/ui/download/download_manager_coordinator.mm
@@ -10,7 +10,7 @@ #include "base/strings/sys_string_conversions.h" #include "components/strings/grit/components_strings.h" #import "ios/chrome/browser/download/download_manager_tab_helper.h" -#import "ios/chrome/browser/download/google_drive_app_constants.h" +#import "ios/chrome/browser/download/google_drive_app_util.h" #import "ios/chrome/browser/store_kit/store_kit_coordinator.h" #import "ios/chrome/browser/ui/download/download_manager_mediator.h" #import "ios/chrome/browser/ui/download/download_manager_view_controller.h"
diff --git a/ios/chrome/browser/ui/download/download_manager_mediator.mm b/ios/chrome/browser/ui/download/download_manager_mediator.mm index 914ff6c..015ab6e4 100644 --- a/ios/chrome/browser/ui/download/download_manager_mediator.mm +++ b/ios/chrome/browser/ui/download/download_manager_mediator.mm
@@ -10,6 +10,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task_scheduler/post_task.h" #include "ios/chrome/browser/download/download_directory_util.h" +#import "ios/chrome/browser/download/google_drive_app_util.h" #import "ios/web/public/download/download_task.h" #include "net/base/net_errors.h" #include "net/url_request/url_fetcher_response_writer.h" @@ -90,7 +91,12 @@ } void DownloadManagerMediator::UpdateConsumer() { - [consumer_ setState:GetDownloadManagerState()]; + DownloadManagerState state = GetDownloadManagerState(); + if (state == kDownloadManagerStateSucceeded && !IsGoogleDriveAppInstalled()) { + [consumer_ setInstallDriveButtonVisible:YES animated:YES]; + } + + [consumer_ setState:state]; [consumer_ setCountOfBytesReceived:task_->GetReceivedBytes()]; [consumer_ setCountOfBytesExpectedToReceive:task_->GetTotalBytes()]; [consumer_
diff --git a/ios/chrome/browser/ui/download/download_manager_mediator_unittest.mm b/ios/chrome/browser/ui/download/download_manager_mediator_unittest.mm index b212e358..21af01f 100644 --- a/ios/chrome/browser/ui/download/download_manager_mediator_unittest.mm +++ b/ios/chrome/browser/ui/download/download_manager_mediator_unittest.mm
@@ -4,9 +4,12 @@ #import "ios/chrome/browser/ui/download/download_manager_mediator.h" +#import <UIKit/UIKit.h> + #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" #include "ios/chrome/browser/download/download_directory_util.h" +#import "ios/chrome/browser/download/google_drive_app_util.h" #import "ios/chrome/test/fakes/fake_download_manager_consumer.h" #import "ios/testing/wait_util.h" #import "ios/web/public/test/fakes/fake_download_task.h" @@ -15,6 +18,7 @@ #include "net/url_request/url_fetcher_response_writer.h" #include "testing/gtest_mac.h" #include "testing/platform_test.h" +#import "third_party/ocmock/OCMock/OCMock.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." @@ -38,12 +42,17 @@ protected: DownloadManagerMediatorTest() : consumer_([[FakeDownloadManagerConsumer alloc] init]), - task_(GURL(kTestUrl), kTestMimeType) {} + application_(OCMClassMock([UIApplication class])), + task_(GURL(kTestUrl), kTestMimeType) { + OCMStub([application_ sharedApplication]).andReturn(application_); + } + ~DownloadManagerMediatorTest() override { [application_ stopMocking]; } web::FakeDownloadTask* task() { return &task_; } DownloadManagerMediator mediator_; FakeDownloadManagerConsumer* consumer_; + id application_; private: web::TestWebThreadBundle thread_bundle_; @@ -61,6 +70,7 @@ // Starting download is async for task and sync for consumer. EXPECT_EQ(kDownloadManagerStateInProgress, consumer_.state); + EXPECT_FALSE(consumer_.installDriveButtonVisible); ASSERT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForDownloadTimeout, ^{ base::RunLoop().RunUntilIdle(); return task()->GetState() == web::DownloadTask::State::kInProgress; @@ -89,12 +99,15 @@ base::RunLoop().RunUntilIdle(); return consumer_.state == kDownloadManagerStateFailed; })); + EXPECT_FALSE(consumer_.installDriveButtonVisible); mediator_.SetDownloadTask(nullptr); } // Tests that consumer is updated right after it's set. TEST_F(DownloadManagerMediatorTest, ConsumerInstantUpdate) { + OCMStub([application_ canOpenURL:GetGoogleDriveAppUrl()]).andReturn(YES); + task()->SetDone(true); task()->SetSuggestedFilename( base::SysNSStringToUTF16(kTestSuggestedFileName)); @@ -105,6 +118,7 @@ mediator_.SetConsumer(consumer_); EXPECT_EQ(kDownloadManagerStateSucceeded, consumer_.state); + EXPECT_FALSE(consumer_.installDriveButtonVisible); EXPECT_NSEQ(kTestSuggestedFileName, consumer_.fileName); EXPECT_EQ(kTestTotalBytes, consumer_.countOfBytesExpectedToReceive); EXPECT_EQ(kTestReceivedBytes, consumer_.countOfBytesReceived); @@ -121,6 +135,7 @@ task()->SetErrorCode(net::ERR_INTERNET_DISCONNECTED); task()->SetDone(true); EXPECT_EQ(kDownloadManagerStateFailed, consumer_.state); + EXPECT_FALSE(consumer_.installDriveButtonVisible); mediator_.SetDownloadTask(nullptr); } @@ -128,11 +143,30 @@ // Tests that consumer changes the state to kDownloadManagerStateSucceeded if // task competed without an error. TEST_F(DownloadManagerMediatorTest, ConsumerSuceededStateUpdate) { + OCMStub([application_ canOpenURL:GetGoogleDriveAppUrl()]).andReturn(YES); + mediator_.SetDownloadTask(task()); mediator_.SetConsumer(consumer_); task()->SetDone(true); EXPECT_EQ(kDownloadManagerStateSucceeded, consumer_.state); + EXPECT_FALSE(consumer_.installDriveButtonVisible); + + mediator_.SetDownloadTask(nullptr); +} + +// Tests that consumer changes the state to kDownloadManagerStateSucceeded if +// task competed without an error and Google Drive app is not installed. +TEST_F(DownloadManagerMediatorTest, + ConsumerSuceededStateUpdateWithoutDriveAppInstalled) { + OCMStub([application_ canOpenURL:GetGoogleDriveAppUrl()]).andReturn(NO); + + mediator_.SetDownloadTask(task()); + mediator_.SetConsumer(consumer_); + + task()->SetDone(true); + EXPECT_EQ(kDownloadManagerStateSucceeded, consumer_.state); + EXPECT_TRUE(consumer_.installDriveButtonVisible); mediator_.SetDownloadTask(nullptr); } @@ -145,6 +179,7 @@ task()->Start(std::make_unique<net::URLFetcherStringWriter>()); EXPECT_EQ(kDownloadManagerStateInProgress, consumer_.state); + EXPECT_FALSE(consumer_.installDriveButtonVisible); mediator_.SetDownloadTask(nullptr); }
diff --git a/ios/chrome/browser/ui/settings/BUILD.gn b/ios/chrome/browser/ui/settings/BUILD.gn index 6b873b19..54b9e11 100644 --- a/ios/chrome/browser/ui/settings/BUILD.gn +++ b/ios/chrome/browser/ui/settings/BUILD.gn
@@ -283,6 +283,7 @@ "//ios/chrome/browser/browsing_data", "//ios/chrome/browser/browsing_data:counters", "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/mailto:features", "//ios/chrome/browser/passwords", "//ios/chrome/browser/prefs:browser_prefs", "//ios/chrome/browser/search_engines",
diff --git a/ios/chrome/browser/ui/settings/content_settings_collection_view_controller.mm b/ios/chrome/browser/ui/settings/content_settings_collection_view_controller.mm index 4b1c7496..cf5bb9e 100644 --- a/ios/chrome/browser/ui/settings/content_settings_collection_view_controller.mm +++ b/ios/chrome/browser/ui/settings/content_settings_collection_view_controller.mm
@@ -139,9 +139,8 @@ if (base::FeatureList::IsEnabled(kMailtoHandledWithGoogleUI)) { MailtoHandlerProvider* provider = ios::GetChromeBrowserProvider()->GetMailtoHandlerProvider(); - UIViewController* settingsController = - provider->MailtoHandlerSettingsController(); - if (settingsController) { + NSString* settingsTitle = provider->MailtoHandlerSettingsTitle(); + if (settingsTitle) { [model addItem:[self composeEmailItem] toSectionWithIdentifier:SectionIdentifierSettings]; } @@ -183,9 +182,18 @@ - (CollectionViewItem*)composeEmailItem { _composeEmailDetailItem = [[CollectionViewDetailItem alloc] initWithType:ItemTypeSettingsComposeEmail]; - _composeEmailDetailItem.text = - l10n_util::GetNSString(IDS_IOS_COMPOSE_EMAIL_SETTING); - if (!base::FeatureList::IsEnabled(kMailtoHandledWithGoogleUI)) { + if (base::FeatureList::IsEnabled(kMailtoHandledWithGoogleUI)) { + // Use the handler's preferred title string for the compose email item. + MailtoHandlerProvider* provider = + ios::GetChromeBrowserProvider()->GetMailtoHandlerProvider(); + NSString* settingsTitle = provider->MailtoHandlerSettingsTitle(); + DCHECK([settingsTitle length]); + _composeEmailDetailItem.text = settingsTitle; + } else { + // Use the default Chrome string when mailto handling with Google UI is not + // available. + _composeEmailDetailItem.text = + l10n_util::GetNSString(IDS_IOS_COMPOSE_EMAIL_SETTING); // Displaying the selected app name is only supported in the Chrome // implementation of mailto content settings. // The Google UI version of mailto handling does not expose the name of the
diff --git a/ios/chrome/browser/ui/settings/content_settings_collection_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/content_settings_collection_view_controller_unittest.mm index 4ce23d1..8fb9d0a 100644 --- a/ios/chrome/browser/ui/settings/content_settings_collection_view_controller_unittest.mm +++ b/ios/chrome/browser/ui/settings/content_settings_collection_view_controller_unittest.mm
@@ -4,7 +4,9 @@ #import "ios/chrome/browser/ui/settings/content_settings_collection_view_controller.h" +#include "base/test/scoped_feature_list.h" #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h" +#include "ios/chrome/browser/mailto/features.h" #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h" #import "ios/chrome/browser/ui/collection_view/collection_view_controller_test.h" #include "ios/chrome/grit/ios_strings.h" @@ -38,9 +40,32 @@ }; // Tests that there are 3 sections in Content Settings if mailto: URL +// rewriting feature is enabled and mailto handling with Google UI is enabled. +TEST_F(ContentSettingsCollectionViewControllerTest, + TestModelWithMailToUrlRewritingAndGoogleUI) { + // Turn on mailto handling with Google UI feature flag. + base::test::ScopedFeatureList scoped_feature_list_; + scoped_feature_list_.InitAndEnableFeature(kMailtoHandledWithGoogleUI); + + CreateController(); + CheckController(); + CheckTitleWithId(IDS_IOS_CONTENT_SETTINGS_TITLE); + + ASSERT_EQ(1, NumberOfSections()); + ASSERT_EQ(3, NumberOfItemsInSection(0)); + CheckDetailItemTextWithIds(IDS_IOS_BLOCK_POPUPS, IDS_IOS_SETTING_ON, 0, 0); + CheckDetailItemTextWithIds(IDS_IOS_TRANSLATE_SETTING, IDS_IOS_SETTING_ON, 0, + 1); +} + +// Tests that there are 3 sections in Content Settings if mailto: URL // rewriting feature is enabled. TEST_F(ContentSettingsCollectionViewControllerTest, TestModelWithMailToUrlRewriting) { + // Turn off mailto handling with Google UI feature flag. + base::test::ScopedFeatureList scoped_feature_list_; + scoped_feature_list_.InitAndDisableFeature(kMailtoHandledWithGoogleUI); + CreateController(); CheckController(); CheckTitleWithId(IDS_IOS_CONTENT_SETTINGS_TITLE);
diff --git a/ios/chrome/browser/ui/tab_grid/tab_grid_adaptor.mm b/ios/chrome/browser/ui/tab_grid/tab_grid_adaptor.mm index 681a35ad..2aa1a431 100644 --- a/ios/chrome/browser/ui/tab_grid/tab_grid_adaptor.mm +++ b/ios/chrome/browser/ui/tab_grid/tab_grid_adaptor.mm
@@ -84,4 +84,8 @@ self.incognitoMediator.tabModel = otrModel; } +- (void)setTransitionContext:(TabSwitcherTransitionContext*)transitionContext { + // No-op. Tab grid will not use this iPad TabSwitcher-specific mechanism. +} + @end
diff --git a/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.h b/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.h index aabb1e9c..1c148dfb 100644 --- a/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.h +++ b/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.h
@@ -30,6 +30,11 @@ SignedInIdentityBlock signed_in_identity_block, SignedInIdentitiesBlock signed_in_identities_block); + // Returns a properly localized title for the menu item or button used to open + // the settings for this handler. Returns nil if mailto handling is not + // supported by the provider. + virtual NSString* MailtoHandlerSettingsTitle() const; + // Creates and returns a view controller for presenting the settings for // mailto handling to the user. Returns nil if mailto handling is not // supported by the provider.
diff --git a/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.mm b/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.mm index 4c28f7b..5ce1b47 100644 --- a/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.mm +++ b/ios/public/provider/chrome/browser/mailto/mailto_handler_provider.mm
@@ -17,6 +17,10 @@ SignedInIdentityBlock signed_in_identity_block, SignedInIdentitiesBlock signed_in_identities_block) {} +NSString* MailtoHandlerProvider::MailtoHandlerSettingsTitle() const { + return nil; +} + UIViewController* MailtoHandlerProvider::MailtoHandlerSettingsController() const { return nil;
diff --git a/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.h b/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.h index 2c93934..69f052d 100644 --- a/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.h +++ b/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.h
@@ -13,7 +13,7 @@ TestMailtoHandlerProvider(); ~TestMailtoHandlerProvider() override; - UIViewController* MailtoHandlerSettingsController() const override; + NSString* MailtoHandlerSettingsTitle() const override; private: DISALLOW_COPY_AND_ASSIGN(TestMailtoHandlerProvider);
diff --git a/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.mm b/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.mm index 17c09f6..56a4f6b 100644 --- a/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.mm +++ b/ios/public/provider/chrome/browser/mailto/test_mailto_handler_provider.mm
@@ -12,8 +12,7 @@ TestMailtoHandlerProvider::~TestMailtoHandlerProvider() {} -UIViewController* TestMailtoHandlerProvider::MailtoHandlerSettingsController() - const { +NSString* TestMailtoHandlerProvider::MailtoHandlerSettingsTitle() const { // Return something other than nil. - return [[UIViewController alloc] init]; + return @"Test Mailto Settings"; }
diff --git a/ios/web/shell/shell_url_request_context_getter.mm b/ios/web/shell/shell_url_request_context_getter.mm index 77374c2..d8cdd89 100644 --- a/ios/web/shell/shell_url_request_context_getter.mm +++ b/ios/web/shell/shell_url_request_context_getter.mm
@@ -28,6 +28,7 @@ #include "net/http/http_server_properties_impl.h" #include "net/http/transport_security_persister.h" #include "net/http/transport_security_state.h" +#include "net/log/net_log.h" #include "net/proxy_resolution/proxy_config_service_ios.h" #include "net/proxy_resolution/proxy_service.h" #include "net/ssl/channel_id_service.h"
diff --git a/ios/web_view/internal/web_view_url_request_context_getter.mm b/ios/web_view/internal/web_view_url_request_context_getter.mm index d97e741..a1b2f06c 100644 --- a/ios/web_view/internal/web_view_url_request_context_getter.mm +++ b/ios/web_view/internal/web_view_url_request_context_getter.mm
@@ -27,6 +27,7 @@ #include "net/http/http_server_properties_impl.h" #include "net/http/transport_security_persister.h" #include "net/http/transport_security_state.h" +#include "net/log/net_log.h" #include "net/proxy_resolution/proxy_config_service_ios.h" #include "net/proxy_resolution/proxy_service.h" #include "net/ssl/channel_id_service.h"
diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn index 9b68d54c..940bad6d 100644 --- a/media/capture/BUILD.gn +++ b/media/capture/BUILD.gn
@@ -9,14 +9,14 @@ group("capture") { public_deps = [ ":capture_lib", - "//media/capture/mojo:image_capture", - "//media/capture/mojo:image_capture_types", - "//media/capture/mojo:video_capture", + "//media/capture/mojom:image_capture", + "//media/capture/mojom:image_capture_types", + "//media/capture/mojom:video_capture", "//services/service_manager/public/cpp", ] } -# Things needed by //media/capture/mojo/video_capture_types.mojom. +# Things needed by //media/capture/mojom/video_capture_types.mojom. component("capture_base") { defines = [ "CAPTURE_IMPLEMENTATION" ] sources = [ @@ -86,8 +86,8 @@ "//base:i18n", "//gpu/command_buffer/client", "//media", - "//media/capture/mojo:image_capture", - "//media/capture/mojo:image_capture_types", + "//media/capture/mojom:image_capture", + "//media/capture/mojom:image_capture_types", "//media/mojo/interfaces:interfaces", "//third_party/libyuv", "//ui/gfx", @@ -170,9 +170,9 @@ "//base", "//base:i18n", "//media", - "//media/capture/mojo:image_capture", - "//media/capture/mojo:image_capture_types", - "//media/capture/mojo:video_capture", + "//media/capture/mojom:image_capture", + "//media/capture/mojom:image_capture_types", + "//media/capture/mojom:video_capture", "//media/mojo/interfaces:interfaces", "//services/service_manager/public/cpp", "//third_party/libyuv", @@ -254,8 +254,8 @@ ":capture_lib", "//base/test:test_support", "//media:test_support", - "//media/capture/mojo:image_capture", - "//media/capture/mojo:image_capture_types", + "//media/capture/mojom:image_capture", + "//media/capture/mojom:image_capture_types", "//testing/gmock", "//ui/gfx:test_support", ] @@ -290,8 +290,8 @@ ":test_support", "//base/test:test_support", "//media:test_support", - "//media/capture/mojo:image_capture", - "//media/capture/mojo:image_capture_types", + "//media/capture/mojom:image_capture", + "//media/capture/mojom:image_capture_types", "//mojo/edk/system", "//testing/gmock", "//testing/gtest",
diff --git a/media/capture/content/android/BUILD.gn b/media/capture/content/android/BUILD.gn index a3daf27..92ff80e 100644 --- a/media/capture/content/android/BUILD.gn +++ b/media/capture/content/android/BUILD.gn
@@ -19,7 +19,7 @@ deps = [ ":screen_capture_jni_headers", "//media/capture:capture_device_specific", - "//media/capture/mojo:image_capture", + "//media/capture/mojom:image_capture", "//third_party/libyuv", "//ui/gfx:color_space", ]
diff --git a/media/capture/mojo/image_capture_types.h b/media/capture/mojo/image_capture_types.h deleted file mode 100644 index 4f030f63..0000000 --- a/media/capture/mojo/image_capture_types.h +++ /dev/null
@@ -1,16 +0,0 @@ -// Copyright 2018 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 MEDIA_CAPTURE_MOJO_IMAGE_CAPTURE_TYPES_H_ -#define MEDIA_CAPTURE_MOJO_IMAGE_CAPTURE_TYPES_H_ - -#include "media/capture/mojo/image_capture.mojom.h" - -namespace mojo { - -media::mojom::PhotoStatePtr CreateEmptyPhotoState(); - -} // namespace mojo - -#endif // MEDIA_CAPTURE_MOJO_IMAGE_CAPTURE_TYPES_H_ \ No newline at end of file
diff --git a/media/capture/mojo/BUILD.gn b/media/capture/mojom/BUILD.gn similarity index 93% rename from media/capture/mojo/BUILD.gn rename to media/capture/mojom/BUILD.gn index 1d8d221..0cd5b67 100644 --- a/media/capture/mojo/BUILD.gn +++ b/media/capture/mojom/BUILD.gn
@@ -30,6 +30,6 @@ ] deps = [ - "//media/capture/mojo:image_capture", + ":image_capture", ] }
diff --git a/media/capture/mojo/OWNERS b/media/capture/mojom/OWNERS similarity index 61% rename from media/capture/mojo/OWNERS rename to media/capture/mojom/OWNERS index 2c44a46..ae29a36aa 100644 --- a/media/capture/mojo/OWNERS +++ b/media/capture/mojom/OWNERS
@@ -1,6 +1,6 @@ per-file *.mojom=set noparent per-file *.mojom=file://ipc/SECURITY_OWNERS -per-file *_struct_traits*.*=set noparent -per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS +per-file *_mojom_traits*.*=set noparent +per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS per-file *.typemap=set noparent per-file *.typemap=file://ipc/SECURITY_OWNERS
diff --git a/media/capture/mojo/image_capture.mojom b/media/capture/mojom/image_capture.mojom similarity index 100% rename from media/capture/mojo/image_capture.mojom rename to media/capture/mojom/image_capture.mojom
diff --git a/media/capture/mojo/image_capture_types.cc b/media/capture/mojom/image_capture_types.cc similarity index 95% rename from media/capture/mojo/image_capture_types.cc rename to media/capture/mojom/image_capture_types.cc index daec7bc..e4e5cb6f 100644 --- a/media/capture/mojo/image_capture_types.cc +++ b/media/capture/mojom/image_capture_types.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/capture/mojo/image_capture_types.h" +#include "media/capture/mojom/image_capture_types.h" namespace mojo {
diff --git a/media/capture/mojom/image_capture_types.h b/media/capture/mojom/image_capture_types.h new file mode 100644 index 0000000..af83ff59 --- /dev/null +++ b/media/capture/mojom/image_capture_types.h
@@ -0,0 +1,16 @@ +// Copyright 2018 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 MEDIA_CAPTURE_MOJOM_IMAGE_CAPTURE_TYPES_H_ +#define MEDIA_CAPTURE_MOJOM_IMAGE_CAPTURE_TYPES_H_ + +#include "media/capture/mojom/image_capture.mojom.h" + +namespace mojo { + +media::mojom::PhotoStatePtr CreateEmptyPhotoState(); + +} // namespace mojo + +#endif // MEDIA_CAPTURE_MOJOM_IMAGE_CAPTURE_TYPES_H_
diff --git a/media/capture/mojo/typemaps.gni b/media/capture/mojom/typemaps.gni similarity index 70% rename from media/capture/mojo/typemaps.gni rename to media/capture/mojom/typemaps.gni index 1b6f86c9..2de7da3 100644 --- a/media/capture/mojo/typemaps.gni +++ b/media/capture/mojom/typemaps.gni
@@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -typemaps = [ "//media/capture/mojo/video_capture_types.typemap" ] +typemaps = [ "//media/capture/mojom/video_capture_types.typemap" ]
diff --git a/media/capture/mojo/video_capture.mojom b/media/capture/mojom/video_capture.mojom similarity index 98% rename from media/capture/mojo/video_capture.mojom rename to media/capture/mojom/video_capture.mojom index 41531c5..3d7d80ea 100644 --- a/media/capture/mojo/video_capture.mojom +++ b/media/capture/mojom/video_capture.mojom
@@ -5,7 +5,7 @@ module media.mojom; import "media/mojo/interfaces/media_types.mojom"; -import "media/capture/mojo/video_capture_types.mojom"; +import "media/capture/mojom/video_capture_types.mojom"; import "ui/gfx/geometry/mojo/geometry.mojom"; // This file decribes the communication between a given Renderer Host interface
diff --git a/media/capture/mojo/video_capture_types.mojom b/media/capture/mojom/video_capture_types.mojom similarity index 100% rename from media/capture/mojo/video_capture_types.mojom rename to media/capture/mojom/video_capture_types.mojom
diff --git a/media/capture/mojo/video_capture_types.typemap b/media/capture/mojom/video_capture_types.typemap similarity index 87% rename from media/capture/mojo/video_capture_types.typemap rename to media/capture/mojom/video_capture_types.typemap index 60c46651..d0a97c0e3 100644 --- a/media/capture/mojo/video_capture_types.typemap +++ b/media/capture/mojom/video_capture_types.typemap
@@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -mojom = "//media/capture/mojo/video_capture_types.mojom" +mojom = "//media/capture/mojom/video_capture_types.mojom" public_headers = [ "//media/capture/video_capture_types.h", @@ -13,11 +13,11 @@ traits_headers = [ "//media/capture/ipc/capture_param_traits_macros.h", "//media/capture/ipc/capture_param_traits.h", - "//media/capture/mojo/video_capture_types_struct_traits.h", + "//media/capture/mojom/video_capture_types_mojom_traits.h", ] sources = [ - "//media/capture/mojo/video_capture_types_struct_traits.cc", + "//media/capture/mojom/video_capture_types_mojom_traits.cc", ] deps = [
diff --git a/media/capture/mojo/video_capture_types_struct_traits.cc b/media/capture/mojom/video_capture_types_mojom_traits.cc similarity index 98% rename from media/capture/mojo/video_capture_types_struct_traits.cc rename to media/capture/mojom/video_capture_types_mojom_traits.cc index 2849a81..eceebb8 100644 --- a/media/capture/mojo/video_capture_types_struct_traits.cc +++ b/media/capture/mojom/video_capture_types_mojom_traits.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/capture/mojo/video_capture_types_struct_traits.h" +#include "media/capture/mojom/video_capture_types_mojom_traits.h" #include "media/base/ipc/media_param_traits_macros.h" #include "ui/gfx/geometry/mojo/geometry.mojom.h"
diff --git a/media/capture/mojo/video_capture_types_struct_traits.h b/media/capture/mojom/video_capture_types_mojom_traits.h similarity index 95% rename from media/capture/mojo/video_capture_types_struct_traits.h rename to media/capture/mojom/video_capture_types_mojom_traits.h index e85bbc7..3eeb6eb 100644 --- a/media/capture/mojo/video_capture_types_struct_traits.h +++ b/media/capture/mojom/video_capture_types_mojom_traits.h
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MEDIA_CAPTURE_MOJO_VIDEO_CAPTURE_TYPES_STRUCT_TRAITS_H_ -#define MEDIA_CAPTURE_MOJO_VIDEO_CAPTURE_TYPES_STRUCT_TRAITS_H_ +#ifndef MEDIA_CAPTURE_MOJOM_VIDEO_CAPTURE_TYPES_MOJOM_TRAITS_H_ +#define MEDIA_CAPTURE_MOJOM_VIDEO_CAPTURE_TYPES_MOJOM_TRAITS_H_ -#include "media/capture/mojo/video_capture_types.mojom.h" +#include "media/capture/mojom/video_capture_types.mojom.h" #include "media/capture/video/video_capture_device_descriptor.h" #include "media/capture/video/video_capture_device_info.h" #include "media/capture/video_capture_types.h" @@ -187,4 +187,4 @@ }; } // namespace mojo -#endif // MEDIA_CAPTURE_MOJO_VIDEO_CAPTURE_TYPES_STRUCT_TRAITS_H_ +#endif // MEDIA_CAPTURE_MOJOM_VIDEO_CAPTURE_TYPES_MOJOM_TRAITS_H_
diff --git a/media/capture/video/android/BUILD.gn b/media/capture/video/android/BUILD.gn index 7dcb5a86..c967486 100644 --- a/media/capture/video/android/BUILD.gn +++ b/media/capture/video/android/BUILD.gn
@@ -23,7 +23,7 @@ deps = [ ":capture_jni_headers", "//media/capture:capture_device_specific", - "//media/capture/mojo:image_capture", + "//media/capture/mojom:image_capture", "//third_party/libyuv", "//ui/gfx:color_space", "//ui/gfx/geometry",
diff --git a/media/capture/video/blob_utils.h b/media/capture/video/blob_utils.h index 2f715358..fa9cdb2 100644 --- a/media/capture/video/blob_utils.h +++ b/media/capture/video/blob_utils.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAPTURE_VIDEO_BLOB_UTILS_H_ #define MEDIA_CAPTURE_VIDEO_BLOB_UTILS_H_ -#include "media/capture/mojo/image_capture.mojom.h" +#include "media/capture/mojom/image_capture.mojom.h" namespace media {
diff --git a/media/capture/video/file_video_capture_device.cc b/media/capture/video/file_video_capture_device.cc index b047113..c942ac87 100644 --- a/media/capture/video/file_video_capture_device.cc +++ b/media/capture/video/file_video_capture_device.cc
@@ -15,7 +15,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/threading/thread_task_runner_handle.h" -#include "media/capture/mojo/image_capture_types.h" +#include "media/capture/mojom/image_capture_types.h" #include "media/capture/video/blob_utils.h" #include "media/capture/video_capture_types.h" #include "media/filters/jpeg_parser.h"
diff --git a/media/capture/video/mac/video_capture_device_mac.mm b/media/capture/video/mac/video_capture_device_mac.mm index f79ff50..8e805dc 100644 --- a/media/capture/video/mac/video_capture_device_mac.mm +++ b/media/capture/video/mac/video_capture_device_mac.mm
@@ -25,7 +25,7 @@ #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "media/base/timestamp_constants.h" -#include "media/capture/mojo/image_capture_types.h" +#include "media/capture/mojom/image_capture_types.h" #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h" #include "ui/gfx/geometry/size.h"
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h index e0855d32..fda9768 100644 --- a/media/capture/video/video_capture_device.h +++ b/media/capture/video/video_capture_device.h
@@ -28,7 +28,7 @@ #include "build/build_config.h" #include "media/base/video_frame.h" #include "media/capture/capture_export.h" -#include "media/capture/mojo/image_capture.mojom.h" +#include "media/capture/mojom/image_capture.mojom.h" #include "media/capture/video/video_capture_buffer_handle.h" #include "media/capture/video/video_capture_device_descriptor.h" #include "media/capture/video_capture_types.h"
diff --git a/media/capture/video/video_capture_jpeg_decoder.h b/media/capture/video/video_capture_jpeg_decoder.h index 54a0113..c5b32cf 100644 --- a/media/capture/video/video_capture_jpeg_decoder.h +++ b/media/capture/video/video_capture_jpeg_decoder.h
@@ -7,7 +7,7 @@ #include "base/callback.h" #include "media/capture/capture_export.h" -#include "media/capture/mojo/video_capture_types.mojom.h" +#include "media/capture/mojom/video_capture_types.mojom.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video/video_frame_receiver.h"
diff --git a/media/capture/video/video_frame_receiver.h b/media/capture/video/video_frame_receiver.h index 5d8354ae..3d140ca 100644 --- a/media/capture/video/video_frame_receiver.h +++ b/media/capture/video/video_frame_receiver.h
@@ -6,7 +6,7 @@ #define MEDIA_CAPTURE_VIDEO_VIDEO_FRAME_RECEIVER_H_ #include "media/capture/capture_export.h" -#include "media/capture/mojo/video_capture_types.mojom.h" +#include "media/capture/mojom/video_capture_types.mojom.h" #include "media/capture/video/video_capture_buffer_handle.h" #include "media/capture/video/video_capture_device.h"
diff --git a/media/capture/video/win/video_capture_device_mf_win.cc b/media/capture/video/win/video_capture_device_mf_win.cc index 9ddff6f..59f6314 100644 --- a/media/capture/video/win/video_capture_device_mf_win.cc +++ b/media/capture/video/win/video_capture_device_mf_win.cc
@@ -19,7 +19,7 @@ #include "base/synchronization/waitable_event.h" #include "base/win/scoped_co_mem.h" #include "base/win/windows_version.h" -#include "media/capture/mojo/image_capture_types.h" +#include "media/capture/mojom/image_capture_types.h" #include "media/capture/video/blob_utils.h" #include "media/capture/video/win/capability_list_win.h" #include "media/capture/video/win/sink_filter_win.h"
diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni index c9a3ab5..13e1ef5 100644 --- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni +++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -20,7 +20,7 @@ "//device/bluetooth/public/mojom/typemaps.gni", "//device/gamepad/public/mojom/typemaps.gni", "//gpu/ipc/common/typemaps.gni", - "//media/capture/mojo/typemaps.gni", + "//media/capture/mojom/typemaps.gni", "//media/mojo/interfaces/typemaps.gni", "//mojo/common/typemaps.gni", "//mojo/public/cpp/base/typemaps.gni",
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index 1485e486..9e8571b6 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc
@@ -36,6 +36,7 @@ #include "net/http/http_stream_factory.h" #include "net/http/http_stream_factory_impl_request.h" #include "net/http/proxy_fallback.h" +#include "net/log/net_log.h" #include "net/log/net_log_capture_mode.h" #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h"
diff --git a/net/http/http_stream_factory_impl_job_controller.cc b/net/http/http_stream_factory_impl_job_controller.cc index 14e494d..e05b3ee 100644 --- a/net/http/http_stream_factory_impl_job_controller.cc +++ b/net/http/http_stream_factory_impl_job_controller.cc
@@ -17,6 +17,7 @@ #include "net/base/host_mapping_rules.h" #include "net/http/bidirectional_stream_impl.h" #include "net/http/transport_security_state.h" +#include "net/log/net_log.h" #include "net/log/net_log_capture_mode.h" #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h"
diff --git a/net/log/net_log_event_type_list.h b/net/log/net_log_event_type_list.h index e23f2e6..d8d6ab6c 100644 --- a/net/log/net_log_event_type_list.h +++ b/net/log/net_log_event_type_list.h
@@ -3219,3 +3219,55 @@ // This event is created when the HostCachePersistenceManager starts the timer // for writing a cache change to prefs. EVENT_TYPE(HOST_CACHE_PERSISTENCE_START_TIMER) + +// ----------------------------------------------------------------------------- +// DHCP-based WPAD (Windows) +// ----------------------------------------------------------------------------- + +// The start/end of running DHCP based WPAD. +// +// The start event contains no parameters, whereas the END event describes +// which of the "adapter fetchers" was used: +// { +// "fetcher_index": <Index of the fetcher that "won" the race, or -1 if no +// fetcher won>, +// "net_error": <The network error code for the overall result of DHCP +// based auto-discovery>, +// } +EVENT_TYPE(WPAD_DHCP_WIN_FETCH) + +// The start/end of getting the list of network adapters. +// +// The END event describes all the adapters that were enumerated, as well +// as how long it took to do the various thread-hops (from origin to worker +// thread, and then worker thread back to origin thread): +// { +// "adapters": <List describing each adapter (its name, flags, and +// status)>, +// "origin_to_worker_thread_hop_dt": <The time in milliseconds it took +// for the worker thread task to get +// scheduled>, +// "worker_to_origin_thread_hop_dt": <The time in milliseconds it took +// for the reply task from worker +// thread to get scheduled>, +// "worker_dt": <The time in milliseconds it took to enumerate network +// adapters on the worker thread>, +// "error": <The result code returned by iphlpapi!GetAdaptersAddresses> +// } +EVENT_TYPE(WPAD_DHCP_WIN_GET_ADAPTERS) + +// This event logs when one of the "adapter fetchers" completed. (Fetchers +// may not complete in the order that they were started): +// { +// "fetcher_index": <Index of the fetcher that completed>, +// "net_error": <The network error code returned by the fetcher>, +// } +EVENT_TYPE(WPAD_DHCP_WIN_ON_FETCHER_DONE) + +// This event is logged when a timer is started to timeout remaining +// adapter fetchers. The event has no parameters. +EVENT_TYPE(WPAD_DHCP_WIN_START_WAIT_TIMER) + +// This event is emitted if the wait timer for remaining fetchers fires. It +// has no parameters. +EVENT_TYPE(WPAD_DHCP_WIN_ON_WAIT_TIMER)
diff --git a/net/proxy_resolution/dhcp_pac_file_fetcher.cc b/net/proxy_resolution/dhcp_pac_file_fetcher.cc index eda798de..9a77cef 100644 --- a/net/proxy_resolution/dhcp_pac_file_fetcher.cc +++ b/net/proxy_resolution/dhcp_pac_file_fetcher.cc
@@ -20,8 +20,9 @@ DoNothingDhcpProxyScriptFetcher::~DoNothingDhcpProxyScriptFetcher() = default; -int DoNothingDhcpProxyScriptFetcher::Fetch( - base::string16* utf16_text, const CompletionCallback& callback) { +int DoNothingDhcpProxyScriptFetcher::Fetch(base::string16* utf16_text, + const CompletionCallback& callback, + const NetLogWithSource& net_log) { return ERR_NOT_IMPLEMENTED; }
diff --git a/net/proxy_resolution/dhcp_pac_file_fetcher.h b/net/proxy_resolution/dhcp_pac_file_fetcher.h index afd9793e..c8ef3d7 100644 --- a/net/proxy_resolution/dhcp_pac_file_fetcher.h +++ b/net/proxy_resolution/dhcp_pac_file_fetcher.h
@@ -15,6 +15,8 @@ namespace net { +class NetLogWithSource; + // Interface for classes that can fetch a proxy script as configured via DHCP. // // The Fetch method on this interface tries to retrieve the most appropriate @@ -57,7 +59,8 @@ // // Only one fetch is allowed to be outstanding at a time. virtual int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) = 0; + const CompletionCallback& callback, + const NetLogWithSource& net_log) = 0; // Aborts the in-progress fetch (if any). virtual void Cancel() = 0; @@ -91,7 +94,8 @@ ~DoNothingDhcpProxyScriptFetcher() override; int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) override; + const CompletionCallback& callback, + const NetLogWithSource& net_log) override; void Cancel() override; void OnShutdown() override; const GURL& GetPacURL() const override;
diff --git a/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc b/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc index f80f9ef..6f6a899 100644 --- a/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc +++ b/net/proxy_resolution/dhcp_pac_file_fetcher_win.cc
@@ -15,12 +15,47 @@ #include "base/task_runner.h" #include "base/task_scheduler/post_task.h" #include "base/threading/scoped_blocking_call.h" +#include "base/values.h" #include "net/base/net_errors.h" +#include "net/log/net_log.h" #include "net/proxy_resolution/dhcp_pac_file_adapter_fetcher_win.h" #include <winsock2.h> #include <iphlpapi.h> +namespace net { + +// This struct contains logging information describing how +// GetCandidateAdapterNames() performed, for output to NetLog. +struct DhcpAdapterNamesLoggingInfo { + DhcpAdapterNamesLoggingInfo() = default; + ~DhcpAdapterNamesLoggingInfo() = default; + + // The error that iphlpapi!GetAdaptersAddresses returned. + ULONG error; + + // The adapters list that iphlpapi!GetAdaptersAddresses returned. + std::unique_ptr<IP_ADAPTER_ADDRESSES, base::FreeDeleter> adapters; + + // The time immediately before GetCandidateAdapterNames was posted to a worker + // thread from the origin thread. + base::TimeTicks origin_thread_start_time; + + // The time when GetCandidateAdapterNames began running on the worker thread. + base::TimeTicks worker_thread_start_time; + + // The time when GetCandidateAdapterNames completed running on the worker + // thread. + base::TimeTicks worker_thread_end_time; + + // The time when control returned to the origin thread + // (OnGetCandidateAdapterNamesDone) + base::TimeTicks origin_thread_end_time; + + private: + DISALLOW_COPY_AND_ASSIGN(DhcpAdapterNamesLoggingInfo); +}; + namespace { // Maximum number of DHCP lookup tasks running concurrently. This is chosen @@ -140,9 +175,75 @@ DISALLOW_COPY_AND_ASSIGN(TaskRunnerWithCap); }; -} // namespace +// Helper to set an integer value into a base::DictionaryValue. Because of +// C++'s implicit narrowing casts to |int|, this can be called with int64_t and +// ULONG too. +void SetInt(base::StringPiece key, int value, base::DictionaryValue* dict) { + dict->SetKey(key, base::Value(value)); +} -namespace net { +std::unique_ptr<base::Value> NetLogGetAdaptersDoneCallback( + DhcpAdapterNamesLoggingInfo* info, + NetLogCaptureMode /* capture_mode */) { + std::unique_ptr<base::DictionaryValue> result = + std::make_unique<base::DictionaryValue>(); + + // Add information on each of the adapters enumerated (including those that + // were subsequently skipped). + base::ListValue adapters_value; + for (IP_ADAPTER_ADDRESSES* adapter = info->adapters.get(); adapter; + adapter = adapter->Next) { + base::DictionaryValue adapter_value; + + adapter_value.SetKey("AdapterName", base::Value(adapter->AdapterName)); + SetInt("IfType", adapter->IfType, &adapter_value); + SetInt("Flags", adapter->Flags, &adapter_value); + SetInt("OperStatus", adapter->OperStatus, &adapter_value); + SetInt("TunnelType", adapter->TunnelType, &adapter_value); + + // "skipped" means the adapter was not ultimately chosen as a candidate for + // testing WPAD. This replicates the logic in GetAdapterNames(). + bool skipped = (adapter->IfType == IF_TYPE_SOFTWARE_LOOPBACK) || + ((adapter->Flags & IP_ADAPTER_DHCP_ENABLED) == 0); + adapter_value.SetKey("skipped", base::Value(skipped)); + + adapters_value.GetList().push_back(std::move(adapter_value)); + } + result->SetKey("adapters", std::move(adapters_value)); + + SetInt("origin_to_worker_thread_hop_dt", + (info->worker_thread_start_time - info->origin_thread_start_time) + .InMilliseconds(), + result.get()); + SetInt("worker_to_origin_thread_hop_dt", + (info->origin_thread_end_time - info->worker_thread_end_time) + .InMilliseconds(), + result.get()); + SetInt("worker_dt", + (info->worker_thread_end_time - info->worker_thread_start_time) + .InMilliseconds(), + result.get()); + + if (info->error != ERROR_SUCCESS) + SetInt("error", info->error, result.get()); + + return result; +} + +std::unique_ptr<base::Value> NetLogFetcherDoneCallback( + int fetcher_index, + int net_error, + NetLogCaptureMode /* capture_mode */) { + std::unique_ptr<base::DictionaryValue> result = + std::make_unique<base::DictionaryValue>(); + + result->SetKey("fetcher_index", base::Value(fetcher_index)); + result->SetKey("net_error", base::Value(net_error)); + + return result; +} + +} // namespace DhcpProxyScriptFetcherWin::DhcpProxyScriptFetcherWin( URLRequestContext* url_request_context) @@ -161,13 +262,16 @@ } int DhcpProxyScriptFetcherWin::Fetch(base::string16* utf16_text, - const CompletionCallback& callback) { + const CompletionCallback& callback, + const NetLogWithSource& net_log) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); if (state_ != STATE_START && state_ != STATE_DONE) { NOTREACHED(); return ERR_UNEXPECTED; } + net_log_ = net_log; + if (!url_request_context_) return ERR_CONTEXT_SHUT_DOWN; @@ -175,7 +279,15 @@ callback_ = callback; destination_string_ = utf16_text; + net_log.BeginEvent(NetLogEventType::WPAD_DHCP_WIN_FETCH); + + // TODO(eroman): This event is not ended in the case of cancellation. + net_log.BeginEvent(NetLogEventType::WPAD_DHCP_WIN_GET_ADAPTERS); + last_query_ = ImplCreateAdapterQuery(); + last_query_->logging_info()->origin_thread_start_time = + base::TimeTicks::Now(); + task_runner_->PostTaskAndReply( FROM_HERE, base::Bind( @@ -238,6 +350,13 @@ return; last_query_ = NULL; + DhcpAdapterNamesLoggingInfo* logging_info = query->logging_info(); + logging_info->origin_thread_end_time = base::TimeTicks::Now(); + + net_log_.EndEvent(NetLogEventType::WPAD_DHCP_WIN_GET_ADAPTERS, + base::Bind(&NetLogGetAdaptersDoneCallback, + base::Unretained(logging_info))); + // Enable unit tests to wait for this to happen; in production this function // call is a no-op. ImplOnGetCandidateAdapterNamesDone(); @@ -255,14 +374,13 @@ return; } - for (std::set<std::string>::const_iterator it = adapter_names.begin(); - it != adapter_names.end(); - ++it) { + for (const std::string& adapter_name : adapter_names) { std::unique_ptr<DhcpProxyScriptAdapterFetcher> fetcher( ImplCreateAdapterFetcher()); - fetcher->Fetch( - *it, base::Bind(&DhcpProxyScriptFetcherWin::OnFetcherDone, - base::Unretained(this))); + size_t fetcher_index = fetchers_.size(); + fetcher->Fetch(adapter_name, + base::Bind(&DhcpProxyScriptFetcherWin::OnFetcherDone, + base::Unretained(this), fetcher_index)); fetchers_.push_back(std::move(fetcher)); } num_pending_fetchers_ = fetchers_.size(); @@ -280,9 +398,14 @@ return pac_url_; } -void DhcpProxyScriptFetcherWin::OnFetcherDone(int result) { +void DhcpProxyScriptFetcherWin::OnFetcherDone(size_t fetcher_index, + int result) { DCHECK(state_ == STATE_NO_RESULTS || state_ == STATE_SOME_RESULTS); + net_log_.AddEvent( + NetLogEventType::WPAD_DHCP_WIN_ON_FETCHER_DONE, + base::Bind(&NetLogFetcherDoneCallback, fetcher_index, result)); + if (--num_pending_fetchers_ == 0) { TransitionToDone(); return; @@ -308,6 +431,7 @@ // for the rest of the results. if (state_ == STATE_NO_RESULTS) { state_ = STATE_SOME_RESULTS; + net_log_.AddEvent(NetLogEventType::WPAD_DHCP_WIN_START_WAIT_TIMER); wait_timer_.Start(FROM_HERE, ImplGetMaxWait(), this, &DhcpProxyScriptFetcherWin::OnWaitTimer); } @@ -316,12 +440,14 @@ void DhcpProxyScriptFetcherWin::OnWaitTimer() { DCHECK_EQ(state_, STATE_SOME_RESULTS); + net_log_.AddEvent(NetLogEventType::WPAD_DHCP_WIN_ON_WAIT_TIMER); TransitionToDone(); } void DhcpProxyScriptFetcherWin::TransitionToDone() { DCHECK(state_ == STATE_NO_RESULTS || state_ == STATE_SOME_RESULTS); + int used_fetcher_index = -1; int result = ERR_PAC_NOT_IN_DHCP; // Default if no fetchers. if (!fetchers_.empty()) { // Scan twice for the result; once through the whole list for success, @@ -329,23 +455,23 @@ // preferring "real" network errors to the ERR_PAC_NOT_IN_DHCP error. // Default to ERR_ABORTED if no fetcher completed. result = ERR_ABORTED; - for (FetcherVector::iterator it = fetchers_.begin(); - it != fetchers_.end(); - ++it) { - if ((*it)->DidFinish() && (*it)->GetResult() == OK) { + for (size_t i = 0; i < fetchers_.size(); ++i) { + const auto& fetcher = fetchers_[i]; + if (fetcher->DidFinish() && fetcher->GetResult() == OK) { result = OK; - *destination_string_ = (*it)->GetPacScript(); - pac_url_ = (*it)->GetPacURL(); + *destination_string_ = fetcher->GetPacScript(); + pac_url_ = fetcher->GetPacURL(); + used_fetcher_index = i; break; } } if (result != OK) { destination_string_->clear(); - for (FetcherVector::iterator it = fetchers_.begin(); - it != fetchers_.end(); - ++it) { - if ((*it)->DidFinish()) { - result = (*it)->GetResult(); + for (size_t i = 0; i < fetchers_.size(); ++i) { + const auto& fetcher = fetchers_[i]; + if (fetcher->DidFinish()) { + result = fetcher->GetResult(); + used_fetcher_index = i; if (result != ERR_PAC_NOT_IN_DHCP) { break; } @@ -360,6 +486,10 @@ DCHECK(fetchers_.empty()); DCHECK(callback_.is_null()); // Invariant of data. + net_log_.EndEvent( + NetLogEventType::WPAD_DHCP_WIN_FETCH, + base::Bind(&NetLogFetcherDoneCallback, used_fetcher_index, result)); + // We may be deleted re-entrantly within this outcall. callback.Run(result); } @@ -391,7 +521,8 @@ } bool DhcpProxyScriptFetcherWin::GetCandidateAdapterNames( - std::set<std::string>* adapter_names) { + std::set<std::string>* adapter_names, + DhcpAdapterNamesLoggingInfo* info) { DCHECK(adapter_names); adapter_names->clear(); @@ -418,6 +549,9 @@ ++num_tries; } while (error == ERROR_BUFFER_OVERFLOW && num_tries <= 3); + if (info) + info->error = error; + if (error == ERROR_NO_DATA) { // There are no adapters that we care about. return true; @@ -439,14 +573,24 @@ adapter_names->insert(adapter->AdapterName); } + // Transfer the buffer containing the adapters, so it can be used later for + // emitting NetLog parameters from the origin thread. + if (info) + info->adapters = std::move(adapters); return true; } -DhcpProxyScriptFetcherWin::AdapterQuery::AdapterQuery() { -} +DhcpProxyScriptFetcherWin::AdapterQuery::AdapterQuery() + : logging_info_(new DhcpAdapterNamesLoggingInfo()) {} void DhcpProxyScriptFetcherWin::AdapterQuery::GetCandidateAdapterNames() { - ImplGetCandidateAdapterNames(&adapter_names_); + logging_info_->error = ERROR_NO_DATA; + logging_info_->adapters.reset(); + logging_info_->worker_thread_start_time = base::TimeTicks::Now(); + + ImplGetCandidateAdapterNames(&adapter_names_, logging_info_.get()); + + logging_info_->worker_thread_end_time = base::TimeTicks::Now(); } const std::set<std::string>& @@ -455,8 +599,10 @@ } bool DhcpProxyScriptFetcherWin::AdapterQuery::ImplGetCandidateAdapterNames( - std::set<std::string>* adapter_names) { - return DhcpProxyScriptFetcherWin::GetCandidateAdapterNames(adapter_names); + std::set<std::string>* adapter_names, + DhcpAdapterNamesLoggingInfo* info) { + return DhcpProxyScriptFetcherWin::GetCandidateAdapterNames(adapter_names, + info); } DhcpProxyScriptFetcherWin::AdapterQuery::~AdapterQuery() {
diff --git a/net/proxy_resolution/dhcp_pac_file_fetcher_win.h b/net/proxy_resolution/dhcp_pac_file_fetcher_win.h index 3cc1658..a4d33fe 100644 --- a/net/proxy_resolution/dhcp_pac_file_fetcher_win.h +++ b/net/proxy_resolution/dhcp_pac_file_fetcher_win.h
@@ -16,6 +16,7 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "net/base/net_export.h" +#include "net/log/net_log_with_source.h" #include "net/proxy_resolution/dhcp_pac_file_fetcher.h" namespace base { @@ -24,6 +25,7 @@ namespace net { +struct DhcpAdapterNamesLoggingInfo; class DhcpProxyScriptAdapterFetcher; class URLRequestContext; @@ -40,16 +42,19 @@ // DhcpProxyScriptFetcher implementation. int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) override; + const CompletionCallback& callback, + const NetLogWithSource& net_log) override; void Cancel() override; void OnShutdown() override; const GURL& GetPacURL() const override; std::string GetFetcherName() const override; // Sets |adapter_names| to contain the name of each network adapter on - // this machine that has DHCP enabled and is not a loop-back adapter. Returns - // false on error. - static bool GetCandidateAdapterNames(std::set<std::string>* adapter_names); + // this machine that has DHCP enabled and is not a loop-back adapter. May + // optionally update |info| (if non-null) with information for logging. + // Returns false on error. + static bool GetCandidateAdapterNames(std::set<std::string>* adapter_names, + DhcpAdapterNamesLoggingInfo* info); protected: int num_pending_fetchers() const; @@ -73,19 +78,23 @@ // been run. Its lifetime is scoped by this object. const std::set<std::string>& adapter_names() const; + DhcpAdapterNamesLoggingInfo* logging_info() { return logging_info_.get(); } + protected: // Virtual method introduced to allow unit testing. virtual bool ImplGetCandidateAdapterNames( - std::set<std::string>* adapter_names); + std::set<std::string>* adapter_names, + DhcpAdapterNamesLoggingInfo* info); friend class base::RefCountedThreadSafe<AdapterQuery>; virtual ~AdapterQuery(); private: - // This is constructed on the originating thread, then used on the + // These are constructed on the originating thread, then used on the // worker thread, then used again on the originating thread only when // the task has completed on the worker thread. No locking required. std::set<std::string> adapter_names_; + std::unique_ptr<DhcpAdapterNamesLoggingInfo> logging_info_; DISALLOW_COPY_AND_ASSIGN(AdapterQuery); }; @@ -100,7 +109,7 @@ // Event/state transition handlers void CancelImpl(); void OnGetCandidateAdapterNamesDone(scoped_refptr<AdapterQuery> query); - void OnFetcherDone(int result); + void OnFetcherDone(size_t fetcher_i, int result); void OnWaitTimer(); void TransitionToDone(); @@ -139,9 +148,6 @@ STATE_DONE, }; - // Current state of this state machine. - State state_; - // Vector, in Windows' network adapter preference order, of // DhcpProxyScriptAdapterFetcher objects that are or were attempting // to fetch a PAC file based on DHCP configuration. @@ -149,12 +155,20 @@ std::vector<std::unique_ptr<DhcpProxyScriptAdapterFetcher>>; FetcherVector fetchers_; + // Current state of this state machine. + State state_; + + // The following members are associated with the latest call to Fetch(). + // Number of fetchers we are waiting for. int num_pending_fetchers_; // Lets our client know we're done. Not valid in states START or DONE. CompletionCallback callback_; + // The NetLog to use for the current Fetch(). + NetLogWithSource net_log_; + // Pointer to string we will write results to. Not valid in states // START and DONE. base::string16* destination_string_; @@ -170,9 +184,6 @@ // NULL or the AdapterQuery currently in flight. scoped_refptr<AdapterQuery> last_query_; - // Time |Fetch()| was last called, 0 if never. - base::TimeTicks fetch_start_time_; - // TaskRunner used for all DHCP lookup tasks. const scoped_refptr<base::TaskRunner> task_runner_;
diff --git a/net/proxy_resolution/dhcp_pac_file_fetcher_win_unittest.cc b/net/proxy_resolution/dhcp_pac_file_fetcher_win_unittest.cc index 3490ef3..68dd9782 100644 --- a/net/proxy_resolution/dhcp_pac_file_fetcher_win_unittest.cc +++ b/net/proxy_resolution/dhcp_pac_file_fetcher_win_unittest.cc
@@ -36,11 +36,8 @@ // is no crash and no error returned, but does not assert on the number // of interfaces or the information returned via DHCP. std::set<std::string> adapter_names; - DhcpProxyScriptFetcherWin::GetCandidateAdapterNames(&adapter_names); - for (std::set<std::string>::const_iterator it = adapter_names.begin(); - it != adapter_names.end(); - ++it) { - const std::string& adapter_name = *it; + DhcpProxyScriptFetcherWin::GetCandidateAdapterNames(&adapter_names, nullptr); + for (const std::string& adapter_name : adapter_names) { DhcpProxyScriptAdapterFetcher::GetPacURLFromDhcp(adapter_name); } } @@ -61,7 +58,8 @@ void RunTest() { int result = fetcher_->Fetch( &pac_text_, - base::Bind(&RealFetchTester::OnCompletion, base::Unretained(this))); + base::Bind(&RealFetchTester::OnCompletion, base::Unretained(this)), + NetLogWithSource()); if (result != ERR_IO_PENDING) finished_ = true; } @@ -276,9 +274,10 @@ } bool ImplGetCandidateAdapterNames( - std::set<std::string>* adapter_names) override { - adapter_names->insert( - mock_adapter_names_.begin(), mock_adapter_names_.end()); + std::set<std::string>* adapter_names, + DhcpAdapterNamesLoggingInfo* logging) override { + adapter_names->insert(mock_adapter_names_.begin(), + mock_adapter_names_.end()); return true; } @@ -388,14 +387,16 @@ void RunTest() { int result = fetcher_.Fetch( &pac_text_, - base::Bind(&FetcherClient::OnCompletion, base::Unretained(this))); + base::Bind(&FetcherClient::OnCompletion, base::Unretained(this)), + NetLogWithSource()); ASSERT_THAT(result, IsError(ERR_IO_PENDING)); } int RunTestThatMayFailSync() { int result = fetcher_.Fetch( &pac_text_, - base::Bind(&FetcherClient::OnCompletion, base::Unretained(this))); + base::Bind(&FetcherClient::OnCompletion, base::Unretained(this)), + NetLogWithSource()); if (result != ERR_IO_PENDING) result_ = result; return result;
diff --git a/net/proxy_resolution/pac_file_decider.cc b/net/proxy_resolution/pac_file_decider.cc index 29e8413..544129f 100644 --- a/net/proxy_resolution/pac_file_decider.cc +++ b/net/proxy_resolution/pac_file_decider.cc
@@ -327,8 +327,9 @@ } return dhcp_proxy_script_fetcher_->Fetch( - &pac_script_, base::Bind(&ProxyScriptDecider::OnIOCompletion, - base::Unretained(this))); + &pac_script_, + base::Bind(&ProxyScriptDecider::OnIOCompletion, base::Unretained(this)), + net_log_); } if (!proxy_script_fetcher_) {
diff --git a/net/proxy_resolution/pac_file_decider_unittest.cc b/net/proxy_resolution/pac_file_decider_unittest.cc index 4d7a392..4cafec3a 100644 --- a/net/proxy_resolution/pac_file_decider_unittest.cc +++ b/net/proxy_resolution/pac_file_decider_unittest.cc
@@ -145,7 +145,8 @@ ~MockDhcpProxyScriptFetcher() override; int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) override; + const CompletionCallback& callback, + const NetLogWithSource& net_log) override; void Cancel() override; void OnShutdown() override; const GURL& GetPacURL() const override; @@ -166,7 +167,8 @@ MockDhcpProxyScriptFetcher::~MockDhcpProxyScriptFetcher() = default; int MockDhcpProxyScriptFetcher::Fetch(base::string16* utf16_text, - const CompletionCallback& callback) { + const CompletionCallback& callback, + const NetLogWithSource& net_log) { utf16_text_ = utf16_text; callback_ = callback; return ERR_IO_PENDING; @@ -673,7 +675,8 @@ : gurl_("http://dhcppac/"), expected_text_(expected_text) {} int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) override { + const CompletionCallback& callback, + const NetLogWithSource& net_log) override { *utf16_text = expected_text_; return OK; } @@ -751,7 +754,8 @@ ~AsyncFailDhcpFetcher() override = default; int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) override { + const CompletionCallback& callback, + const NetLogWithSource& net_log) override { callback_ = callback; base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE,
diff --git a/net/proxy_resolution/proxy_service.cc b/net/proxy_resolution/proxy_service.cc index 6b63306..4efd88a50 100644 --- a/net/proxy_resolution/proxy_service.cc +++ b/net/proxy_resolution/proxy_service.cc
@@ -24,6 +24,7 @@ #include "net/base/net_errors.h" #include "net/base/proxy_delegate.h" #include "net/base/url_util.h" +#include "net/log/net_log.h" #include "net/log/net_log_capture_mode.h" #include "net/log/net_log_event_type.h" #include "net/log/net_log_with_source.h"
diff --git a/net/quic/chromium/quic_chromium_client_session.cc b/net/quic/chromium/quic_chromium_client_session.cc index 2fe5b32..f091f24 100644 --- a/net/quic/chromium/quic_chromium_client_session.cc +++ b/net/quic/chromium/quic_chromium_client_session.cc
@@ -130,26 +130,6 @@ return std::move(dict); } -void HistogramAndLogMigrationFailure(const NetLogWithSource& net_log, - enum QuicConnectionMigrationStatus status, - QuicConnectionId connection_id, - std::string reason) { - UMA_HISTOGRAM_ENUMERATION("Net.QuicSession.ConnectionMigration", status, - MIGRATION_STATUS_MAX); - net_log.AddEvent(NetLogEventType::QUIC_CONNECTION_MIGRATION_FAILURE, - base::Bind(&NetLogQuicConnectionMigrationFailureCallback, - connection_id, reason)); -} - -void HistogramAndLogMigrationSuccess(const NetLogWithSource& net_log, - QuicConnectionId connection_id) { - UMA_HISTOGRAM_ENUMERATION("Net.QuicSession.ConnectionMigration", - MIGRATION_STATUS_SUCCESS, MIGRATION_STATUS_MAX); - net_log.AddEvent( - NetLogEventType::QUIC_CONNECTION_MIGRATION_SUCCESS, - base::Bind(&NetLogQuicConnectionMigrationSuccessCallback, connection_id)); -} - // Histogram for recording the different reasons that a QUIC session is unable // to complete the handshake. enum HandshakeFailureReason { @@ -180,6 +160,26 @@ NUM_HANDSHAKE_STATES); } +std::string ConnectionMigrationCauseToString(ConnectionMigrationCause cause) { + switch (cause) { + case UNKNOWN: + return "Unknown"; + case ON_NETWORK_CONNECTED: + return "OnNetworkConnected"; + case ON_NETWORK_DISCONNECTED: + return "OnNetworkDisconnected"; + case ON_WRITE_ERROR: + return "OnWriteError"; + case ON_NETWORK_MADE_DEFAULT: + return "OnNetworkMadeDefault"; + case ON_MIGRATE_BACK_TO_DEFAULT_NETWORK: + return "OnMigrateBackToDefaultNetwork"; + case ON_PATH_DEGRADING: + return "OnPathDegrading"; + } + return "InvalidCause"; +} + std::unique_ptr<base::Value> NetLogQuicClientSessionCallback( const QuicServerId* server_id, int cert_verify_flags, @@ -721,6 +721,7 @@ bytes_pushed_and_unclaimed_count_(0), probing_manager_(this, task_runner_), retry_migrate_back_count_(0), + current_connection_migration_cause_(UNKNOWN), migration_pending_(false), headers_include_h2_stream_dependency_( headers_include_h2_stream_dependency && @@ -1619,6 +1620,8 @@ if (!migration_pending_) return; + current_connection_migration_cause_ = ON_WRITE_ERROR; + MigrationResult result = MigrationResult::FAILURE; if (stream_factory_ != nullptr) { const NetLogWithSource migration_net_log = NetLogWithSource::Make( @@ -1700,9 +1703,8 @@ // If number of sockets has changed, this migration task is stale. if (num_sockets != sockets_.size()) return; - UMA_HISTOGRAM_ENUMERATION("Net.QuicSession.ConnectionMigration", - MIGRATION_STATUS_NO_ALTERNATE_NETWORK, - MIGRATION_STATUS_MAX); + + LogConnectionMigrationResultToHistogram(MIGRATION_STATUS_TIMEOUT); CloseSessionOnError(ERR_NETWORK_CHANGED, QUIC_CONNECTION_MIGRATION_NO_NEW_NETWORK); } @@ -1745,6 +1747,7 @@ << "successful probing network: " << network << "."; current_migrations_to_non_default_network_on_path_degrading_++; if (!migrate_back_to_default_timer_.IsRunning()) { + current_connection_migration_cause_ = ON_MIGRATE_BACK_TO_DEFAULT_NETWORK; // Session gets off the |default_network|, stay on |network| for now but // try to migrate back to default network after 1 second. StartMigrateBackToDefaultNetworkTimer( @@ -1782,6 +1785,7 @@ if (!migration_pending_) return; + current_connection_migration_cause_ = ON_NETWORK_CONNECTED; // |migration_pending_| is true, there was no working network previously. // |network| is now the only possible candidate, migrate immediately. if (migrate_session_on_network_change_v2_) { @@ -1806,6 +1810,7 @@ if (!migrate_session_on_network_change_) return; + current_connection_migration_cause_ = ON_NETWORK_DISCONNECTED; MaybeMigrateOrCloseSession( alternate_network, /*close_if_cannot_migrate*/ true, migration_net_log); } @@ -1829,6 +1834,7 @@ return; } + current_connection_migration_cause_ = ON_NETWORK_DISCONNECTED; // Attempt to find alternative network. NetworkChangeNotifier::NetworkHandle new_network = stream_factory_->FindAlternateNetwork(disconnected_network); @@ -1837,6 +1843,7 @@ OnNoNewNetwork(); return; } + // Current network is being disconnected, migrate immediately to the // alternative network. MigrateImmediately(new_network); @@ -1855,6 +1862,7 @@ DCHECK_NE(NetworkChangeNotifier::kInvalidNetworkHandle, new_network); default_network_ = new_network; + current_connection_migration_cause_ = ON_NETWORK_MADE_DEFAULT; if (!migrate_session_on_network_change_v2_) { MaybeMigrateOrCloseSession(new_network, /*close_if_cannot_migrate*/ false, @@ -1943,6 +1951,7 @@ NetworkChangeNotifier::NetworkHandle alternate_network = stream_factory_->FindAlternateNetwork( GetDefaultSocket()->GetBoundNetwork()); + current_connection_migration_cause_ = ON_PATH_DEGRADING; if (alternate_network != NetworkChangeNotifier::kInvalidNetworkHandle) { if (GetDefaultSocket()->GetBoundNetwork() == default_network_ && current_migrations_to_non_default_network_on_path_degrading_ >= @@ -1970,8 +1979,8 @@ migration_net_log); } else { HistogramAndLogMigrationFailure( - migration_net_log, MIGRATION_STATUS_NOT_ENABLED, connection_id(), - "Migration on path degrading not enabled"); + migration_net_log, MIGRATION_STATUS_PATH_DEGRADING_NOT_ENABLED, + connection_id(), "Migration on path degrading not enabled"); } migration_net_log.EndEvent( NetLogEventType::QUIC_CONNECTION_MIGRATION_TRIGGERED); @@ -2193,6 +2202,9 @@ void QuicChromiumClientSession::StartMigrateBackToDefaultNetworkTimer( base::TimeDelta delay) { + if (current_connection_migration_cause_ != ON_NETWORK_MADE_DEFAULT) + current_connection_migration_cause_ = ON_MIGRATE_BACK_TO_DEFAULT_NETWORK; + CancelMigrateBackToDefaultNetworkTimer(); // Post a task to try migrate back to default network after |delay|. migrate_back_to_default_timer_.Start( @@ -2364,6 +2376,40 @@ } } +void QuicChromiumClientSession::LogConnectionMigrationResultToHistogram( + QuicConnectionMigrationStatus status) { + UMA_HISTOGRAM_ENUMERATION("Net.QuicSession.ConnectionMigration", status, + MIGRATION_STATUS_MAX); + + // Log the connection migraiton result to different histograms based on the + // cause of the connection migration. + std::string histogram_name = + "Net.QuicSession.ConnectionMigration." + + ConnectionMigrationCauseToString(current_connection_migration_cause_); + base::UmaHistogramEnumeration(histogram_name, status, MIGRATION_STATUS_MAX); + current_connection_migration_cause_ = UNKNOWN; +} + +void QuicChromiumClientSession::HistogramAndLogMigrationFailure( + const NetLogWithSource& net_log, + QuicConnectionMigrationStatus status, + QuicConnectionId connection_id, + const std::string& reason) { + LogConnectionMigrationResultToHistogram(status); + net_log.AddEvent(NetLogEventType::QUIC_CONNECTION_MIGRATION_FAILURE, + base::Bind(&NetLogQuicConnectionMigrationFailureCallback, + connection_id, reason)); +} + +void QuicChromiumClientSession::HistogramAndLogMigrationSuccess( + const NetLogWithSource& net_log, + QuicConnectionId connection_id) { + LogConnectionMigrationResultToHistogram(MIGRATION_STATUS_SUCCESS); + net_log.AddEvent( + NetLogEventType::QUIC_CONNECTION_MIGRATION_SUCCESS, + base::Bind(&NetLogQuicConnectionMigrationSuccessCallback, connection_id)); +} + std::unique_ptr<base::Value> QuicChromiumClientSession::GetInfoAsValue( const std::set<HostPortPair>& aliases) { std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
diff --git a/net/quic/chromium/quic_chromium_client_session.h b/net/quic/chromium/quic_chromium_client_session.h index 21b4cb4..8c080f1 100644 --- a/net/quic/chromium/quic_chromium_client_session.h +++ b/net/quic/chromium/quic_chromium_client_session.h
@@ -81,6 +81,34 @@ FULL_MIGRATION_V2 }; +// Cause of connection migration. +enum ConnectionMigrationCause { + UNKNOWN, + ON_NETWORK_CONNECTED, // No probing. + ON_NETWORK_DISCONNECTED, // No probing. + ON_WRITE_ERROR, // No probing. + ON_NETWORK_MADE_DEFAULT, // With probing. + ON_MIGRATE_BACK_TO_DEFAULT_NETWORK, // With probing. + ON_PATH_DEGRADING, // With probing. +}; + +// Result of connection migration. +enum QuicConnectionMigrationStatus { + MIGRATION_STATUS_NO_MIGRATABLE_STREAMS, + MIGRATION_STATUS_ALREADY_MIGRATED, + MIGRATION_STATUS_INTERNAL_ERROR, + MIGRATION_STATUS_TOO_MANY_CHANGES, + MIGRATION_STATUS_SUCCESS, + MIGRATION_STATUS_NON_MIGRATABLE_STREAM, + MIGRATION_STATUS_NOT_ENABLED, + MIGRATION_STATUS_NO_ALTERNATE_NETWORK, + MIGRATION_STATUS_ON_PATH_DEGRADING_DISABLED, + MIGRATION_STATUS_DISABLED_BY_CONFIG, + MIGRATION_STATUS_PATH_DEGRADING_NOT_ENABLED, + MIGRATION_STATUS_TIMEOUT, + MIGRATION_STATUS_MAX +}; + // Result of a connectivity probing attempt. enum class ProbingResult { PENDING, // Probing started, pending result. @@ -687,6 +715,14 @@ const NetLogWithSource& migration_net_log); void LogMetricsOnNetworkDisconnected(); void LogMetricsOnNetworkMadeDefault(); + void LogConnectionMigrationResultToHistogram( + QuicConnectionMigrationStatus status); + void HistogramAndLogMigrationFailure(const NetLogWithSource& net_log, + QuicConnectionMigrationStatus status, + QuicConnectionId connection_id, + const std::string& reason); + void HistogramAndLogMigrationSuccess(const NetLogWithSource& net_log, + QuicConnectionId connection_id); // Notifies the factory that this session is going away and no more streams // should be created from it. This needs to be called before closing any @@ -763,6 +799,7 @@ QuicConnectivityProbingManager probing_manager_; int retry_migrate_back_count_; base::OneShotTimer migrate_back_to_default_timer_; + ConnectionMigrationCause current_connection_migration_cause_; // TODO(jri): Replace use of migration_pending_ sockets_.size(). // When a task is posted for MigrateSessionOnError, pass in // sockets_.size(). Then in MigrateSessionOnError, check to see if
diff --git a/net/quic/chromium/quic_chromium_client_session_test.cc b/net/quic/chromium/quic_chromium_client_session_test.cc index 88e20fb..b2d2b7f2 100644 --- a/net/quic/chromium/quic_chromium_client_session_test.cc +++ b/net/quic/chromium/quic_chromium_client_session_test.cc
@@ -44,6 +44,7 @@ #include "net/quic/test_tools/simple_quic_framer.h" #include "net/socket/datagram_client_socket.h" #include "net/socket/socket_test_util.h" +#include "net/spdy/chromium/spdy_test_util_common.h" #include "net/spdy/core/spdy_test_utils.h" #include "net/test/cert_test_util.h" #include "net/test/gtest_util.h"
diff --git a/net/quic/chromium/quic_chromium_client_stream.cc b/net/quic/chromium/quic_chromium_client_stream.cc index 4db1630d..bb37e9a 100644 --- a/net/quic/chromium/quic_chromium_client_stream.cc +++ b/net/quic/chromium/quic_chromium_client_stream.cc
@@ -18,6 +18,7 @@ #include "net/quic/core/quic_spdy_session.h" #include "net/quic/core/quic_write_blocked_list.h" #include "net/quic/core/spdy_utils.h" +#include "net/spdy/chromium/spdy_log_util.h" namespace net { namespace {
diff --git a/net/quic/chromium/quic_http_stream.cc b/net/quic/chromium/quic_http_stream.cc index bd1f159..68f82ed 100644 --- a/net/quic/chromium/quic_http_stream.cc +++ b/net/quic/chromium/quic_http_stream.cc
@@ -15,6 +15,7 @@ #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" +#include "net/log/net_log.h" #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h" #include "net/quic/chromium/quic_http_utils.h"
diff --git a/net/quic/chromium/quic_http_utils.cc b/net/quic/chromium/quic_http_utils.cc index 664ab42..a0b52a2 100644 --- a/net/quic/chromium/quic_http_utils.cc +++ b/net/quic/chromium/quic_http_utils.cc
@@ -8,6 +8,7 @@ #include "base/metrics/histogram_macros.h" #include "net/quic/platform/api/quic_endian.h" +#include "net/spdy/chromium/spdy_log_util.h" namespace net {
diff --git a/net/quic/chromium/quic_http_utils.h b/net/quic/chromium/quic_http_utils.h index f2839b8..1c2d484 100644 --- a/net/quic/chromium/quic_http_utils.h +++ b/net/quic/chromium/quic_http_utils.h
@@ -8,6 +8,7 @@ #include "base/values.h" #include "net/base/net_export.h" #include "net/base/request_priority.h" +#include "net/log/net_log_capture_mode.h" #include "net/quic/core/quic_packets.h" #include "net/spdy/core/spdy_header_block.h" #include "net/spdy/core/spdy_protocol.h"
diff --git a/net/quic/chromium/quic_stream_factory.cc b/net/quic/chromium/quic_stream_factory.cc index 6e816ad9..584f3737 100644 --- a/net/quic/chromium/quic_stream_factory.cc +++ b/net/quic/chromium/quic_stream_factory.cc
@@ -32,6 +32,7 @@ #include "net/cert/cert_verifier.h" #include "net/cert/ct_verifier.h" #include "net/dns/host_resolver.h" +#include "net/log/net_log.h" #include "net/log/net_log_capture_mode.h" #include "net/log/net_log_event_type.h" #include "net/log/net_log_source_type.h"
diff --git a/net/quic/chromium/quic_stream_factory.h b/net/quic/chromium/quic_stream_factory.h index 92dab824..706c7199 100644 --- a/net/quic/chromium/quic_stream_factory.h +++ b/net/quic/chromium/quic_stream_factory.h
@@ -77,20 +77,6 @@ // When a connection is idle for 30 seconds it will be closed. const int kIdleConnectionTimeoutSeconds = 30; -enum QuicConnectionMigrationStatus { - MIGRATION_STATUS_NO_MIGRATABLE_STREAMS, - MIGRATION_STATUS_ALREADY_MIGRATED, - MIGRATION_STATUS_INTERNAL_ERROR, - MIGRATION_STATUS_TOO_MANY_CHANGES, - MIGRATION_STATUS_SUCCESS, - MIGRATION_STATUS_NON_MIGRATABLE_STREAM, - MIGRATION_STATUS_NOT_ENABLED, - MIGRATION_STATUS_NO_ALTERNATE_NETWORK, - MIGRATION_STATUS_ON_PATH_DEGRADING_DISABLED, - MIGRATION_STATUS_DISABLED_BY_CONFIG, - MIGRATION_STATUS_MAX -}; - enum QuicPlatformNotification { NETWORK_CONNECTED, NETWORK_MADE_DEFAULT,
diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc index 0122d1f6..eaf756a 100644 --- a/net/quic/chromium/quic_stream_factory_test.cc +++ b/net/quic/chromium/quic_stream_factory_test.cc
@@ -49,6 +49,7 @@ #include "net/socket/next_proto.h" #include "net/socket/socket_test_util.h" #include "net/spdy/chromium/spdy_session_test_util.h" +#include "net/spdy/chromium/spdy_test_util_common.h" #include "net/spdy/core/spdy_test_utils.h" #include "net/ssl/channel_id_service.h" #include "net/ssl/default_channel_id_store.h"
diff --git a/net/quic/chromium/quic_test_packet_maker.cc b/net/quic/chromium/quic_test_packet_maker.cc index 9676a5900..b50f826 100644 --- a/net/quic/chromium/quic_test_packet_maker.cc +++ b/net/quic/chromium/quic_test_packet_maker.cc
@@ -439,8 +439,9 @@ size_t* spdy_headers_frame_length, const std::vector<std::string>& data_writes) { InitializeHeader(packet_number, should_include_version); - SpdySerializedFrame spdy_frame = MakeSpdyHeadersFrame( - stream_id, fin, priority, std::move(headers), parent_stream_id); + SpdySerializedFrame spdy_frame = + MakeSpdyHeadersFrame(stream_id, fin && data_writes.empty(), priority, + std::move(headers), parent_stream_id); if (spdy_headers_frame_length) { *spdy_headers_frame_length = spdy_frame.size();
diff --git a/net/quic/core/quic_sent_packet_manager.cc b/net/quic/core/quic_sent_packet_manager.cc index 5b61f6d..12c16c7 100644 --- a/net/quic/core/quic_sent_packet_manager.cc +++ b/net/quic/core/quic_sent_packet_manager.cc
@@ -241,7 +241,8 @@ QuicTime ack_receive_time) { DCHECK_LE(LargestAcked(ack_frame), unacked_packets_.largest_sent_packet()); QuicByteCount prior_in_flight = unacked_packets_.bytes_in_flight(); - bool rtt_updated = MaybeUpdateRTT(ack_frame, ack_receive_time); + bool rtt_updated = MaybeUpdateRTT(LargestAcked(ack_frame), + ack_frame.ack_delay_time, ack_receive_time); DCHECK_GE(LargestAcked(ack_frame), unacked_packets_.largest_observed()); unacked_packets_.IncreaseLargestObserved(LargestAcked(ack_frame)); @@ -809,26 +810,27 @@ } } -bool QuicSentPacketManager::MaybeUpdateRTT(const QuicAckFrame& ack_frame, +bool QuicSentPacketManager::MaybeUpdateRTT(QuicPacketNumber largest_acked, + QuicTime::Delta ack_delay_time, QuicTime ack_receive_time) { // We rely on ack_delay_time to compute an RTT estimate, so we // only update rtt when the largest observed gets acked. - if (!unacked_packets_.IsUnacked(LargestAcked(ack_frame))) { + if (!unacked_packets_.IsUnacked(largest_acked)) { return false; } // We calculate the RTT based on the highest ACKed packet number, the lower // packet numbers will include the ACK aggregation delay. const QuicTransmissionInfo& transmission_info = - unacked_packets_.GetTransmissionInfo(LargestAcked(ack_frame)); + unacked_packets_.GetTransmissionInfo(largest_acked); // Ensure the packet has a valid sent time. if (transmission_info.sent_time == QuicTime::Zero()) { QUIC_BUG << "Acked packet has zero sent time, largest_observed:" - << LargestAcked(ack_frame); + << largest_acked; return false; } QuicTime::Delta send_delta = ack_receive_time - transmission_info.sent_time; - rtt_stats_.UpdateRtt(send_delta, ack_frame.ack_delay_time, ack_receive_time); + rtt_stats_.UpdateRtt(send_delta, ack_delay_time, ack_receive_time); return true; }
diff --git a/net/quic/core/quic_sent_packet_manager.h b/net/quic/core/quic_sent_packet_manager.h index d067950c7..0daf0da 100644 --- a/net/quic/core/quic_sent_packet_manager.h +++ b/net/quic/core/quic_sent_packet_manager.h
@@ -317,7 +317,9 @@ // Update the RTT if the ack is for the largest acked packet number. // Returns true if the rtt was updated. - bool MaybeUpdateRTT(const QuicAckFrame& ack_frame, QuicTime ack_receive_time); + bool MaybeUpdateRTT(QuicPacketNumber largest_acked, + QuicTime::Delta ack_delay_time, + QuicTime ack_receive_time); // Invokes the loss detection algorithm and loses and retransmits packets if // necessary.
diff --git a/net/spdy/chromium/spdy_http_stream.cc b/net/spdy/chromium/spdy_http_stream.cc index df05b4f..1ac4f93 100644 --- a/net/spdy/chromium/spdy_http_stream.cc +++ b/net/spdy/chromium/spdy_http_stream.cc
@@ -23,6 +23,7 @@ #include "net/log/net_log_event_type.h" #include "net/log/net_log_with_source.h" #include "net/spdy/chromium/spdy_http_utils.h" +#include "net/spdy/chromium/spdy_log_util.h" #include "net/spdy/chromium/spdy_session.h" #include "net/spdy/core/spdy_header_block.h" #include "net/spdy/core/spdy_protocol.h"
diff --git a/net/spdy/chromium/spdy_log_util.cc b/net/spdy/chromium/spdy_log_util.cc index 4ef8e06e..b1d20b7 100644 --- a/net/spdy/chromium/spdy_log_util.cc +++ b/net/spdy/chromium/spdy_log_util.cc
@@ -36,4 +36,20 @@ return headers_list; } +std::unique_ptr<base::Value> SpdyHeaderBlockNetLogCallback( + const SpdyHeaderBlock* headers, + NetLogCaptureMode capture_mode) { + auto dict = std::make_unique<base::DictionaryValue>(); + auto headers_dict = std::make_unique<base::DictionaryValue>(); + for (SpdyHeaderBlock::const_iterator it = headers->begin(); + it != headers->end(); ++it) { + headers_dict->SetKey( + it->first.as_string(), + base::Value(ElideHeaderValueForNetLog( + capture_mode, it->first.as_string(), it->second.as_string()))); + } + dict->Set("headers", std::move(headers_dict)); + return std::move(dict); +} + } // namespace net
diff --git a/net/spdy/chromium/spdy_log_util.h b/net/spdy/chromium/spdy_log_util.h index 86635ea..92b8bee 100644 --- a/net/spdy/chromium/spdy_log_util.h +++ b/net/spdy/chromium/spdy_log_util.h
@@ -9,6 +9,8 @@ #include "base/strings/string_piece.h" #include "net/base/net_export.h" +#include "net/http/http_log_util.h" +#include "net/log/net_log.h" #include "net/log/net_log_capture_mode.h" #include "net/spdy/core/spdy_header_block.h" #include "net/spdy/platform/api/spdy_string.h" @@ -30,6 +32,11 @@ ElideSpdyHeaderBlockForNetLog(const SpdyHeaderBlock& headers, NetLogCaptureMode capture_mode); +// Converts a SpdyHeaderBlock into NetLog event parameters. +NET_EXPORT_PRIVATE std::unique_ptr<base::Value> SpdyHeaderBlockNetLogCallback( + const SpdyHeaderBlock* headers, + NetLogCaptureMode capture_mode); + } // namespace net #endif // NET_SPDY_CHROMIUM_SPDY_LOG_UTIL_H_
diff --git a/net/spdy/chromium/spdy_test_util_common.cc b/net/spdy/chromium/spdy_test_util_common.cc index 23320ce6..759e5f66 100644 --- a/net/spdy/chromium/spdy_test_util_common.cc +++ b/net/spdy/chromium/spdy_test_util_common.cc
@@ -7,6 +7,7 @@ #include <cstddef> #include <utility> +#include "base/base64.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" @@ -1058,4 +1059,55 @@ return headers; } +namespace test { +HashValue GetTestHashValue(uint8_t label) { + HashValue hash_value(HASH_VALUE_SHA256); + memset(hash_value.data(), label, hash_value.size()); + return hash_value; +} + +SpdyString GetTestPin(uint8_t label) { + HashValue hash_value = GetTestHashValue(label); + SpdyString base64; + base::Base64Encode(SpdyStringPiece(reinterpret_cast<char*>(hash_value.data()), + hash_value.size()), + &base64); + + return SpdyString("pin-sha256=\"") + base64 + "\""; +} + +void AddPin(TransportSecurityState* state, + const SpdyString& host, + uint8_t primary_label, + uint8_t backup_label) { + SpdyString primary_pin = GetTestPin(primary_label); + SpdyString backup_pin = GetTestPin(backup_label); + SpdyString header = "max-age = 10000; " + primary_pin + "; " + backup_pin; + + // Construct a fake SSLInfo that will pass AddHPKPHeader's checks. + SSLInfo ssl_info; + ssl_info.is_issued_by_known_root = true; + ssl_info.public_key_hashes.push_back(GetTestHashValue(primary_label)); + EXPECT_TRUE(state->AddHPKPHeader(host, header, ssl_info)); +} + +TestServerPushDelegate::TestServerPushDelegate() = default; + +TestServerPushDelegate::~TestServerPushDelegate() = default; + +void TestServerPushDelegate::OnPush( + std::unique_ptr<ServerPushHelper> push_helper, + const NetLogWithSource& session_net_log) { + push_helpers[push_helper->GetURL()] = std::move(push_helper); +} + +bool TestServerPushDelegate::CancelPush(GURL url) { + auto itr = push_helpers.find(url); + DCHECK(itr != push_helpers.end()); + itr->second->Cancel(); + push_helpers.erase(itr); + return true; +} + +} // namespace test } // namespace net
diff --git a/net/spdy/chromium/spdy_test_util_common.h b/net/spdy/chromium/spdy_test_util_common.h index c7187b3..c494d9e 100644 --- a/net/spdy/chromium/spdy_test_util_common.h +++ b/net/spdy/chromium/spdy_test_util_common.h
@@ -46,12 +46,14 @@ class CTVerifier; class CTPolicyEnforcer; +class HashValue; class HostPortPair; class NetLogWithSource; class SpdySessionKey; class SpdySessionPool; class SpdyStream; class SpdyStreamRequest; +class TransportSecurityState; // Default upload data used by both, mock objects and framer when creating // data frames. @@ -495,6 +497,38 @@ std::map<int, std::vector<int>> priority_to_stream_id_list_; }; +namespace test { + +// Returns a SHA1 HashValue in which each byte has the value |label|. +HashValue GetTestHashValue(uint8_t label); + +// Returns SHA1 pinning header for the of the base64 encoding of +// GetTestHashValue(|label|). +SpdyString GetTestPin(uint8_t label); + +// Adds a pin for |host| to |state|. +void AddPin(TransportSecurityState* state, + const SpdyString& host, + uint8_t primary_label, + uint8_t backup_label); + +// A test implementation of ServerPushDelegate that caches all the pushed +// request and provides a interface to cancel the push given url. +class TestServerPushDelegate : public ServerPushDelegate { + public: + TestServerPushDelegate(); + ~TestServerPushDelegate() override; + + void OnPush(std::unique_ptr<ServerPushHelper> push_helper, + const NetLogWithSource& session_net_log) override; + + bool CancelPush(GURL url); + + private: + std::map<GURL, std::unique_ptr<ServerPushHelper>> push_helpers; +}; + +} // namespace test } // namespace net #endif // NET_SPDY_CHROMIUM_SPDY_TEST_UTIL_COMMON_H_
diff --git a/net/spdy/core/spdy_framer.cc b/net/spdy/core/spdy_framer.cc index 1943fb4..484ce25b 100644 --- a/net/spdy/core/spdy_framer.cc +++ b/net/spdy/core/spdy_framer.cc
@@ -15,7 +15,6 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" -#include "net/quic/platform/api/quic_flags.h" #include "net/spdy/core/hpack/hpack_constants.h" #include "net/spdy/core/spdy_bitmasks.h" #include "net/spdy/core/spdy_bug_tracker.h"
diff --git a/net/spdy/core/spdy_framer_test.cc b/net/spdy/core/spdy_framer_test.cc index 4b7cf59..071e451 100644 --- a/net/spdy/core/spdy_framer_test.cc +++ b/net/spdy/core/spdy_framer_test.cc
@@ -15,7 +15,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/strings/string_number_conversions.h" -#include "net/quic/platform/api/quic_flags.h" #include "net/spdy/core/array_output_buffer.h" #include "net/spdy/core/hpack/hpack_constants.h" #include "net/spdy/core/mock_spdy_framer_visitor.h"
diff --git a/net/spdy/core/spdy_header_block.cc b/net/spdy/core/spdy_header_block.cc index fb2c4cb..a182c9c 100644 --- a/net/spdy/core/spdy_header_block.cc +++ b/net/spdy/core/spdy_header_block.cc
@@ -11,10 +11,7 @@ #include "base/logging.h" #include "base/macros.h" -#include "base/values.h" #include "net/base/arena.h" -#include "net/http/http_log_util.h" -#include "net/log/net_log_capture_mode.h" #include "net/spdy/platform/api/spdy_estimate_memory_usage.h" #include "net/spdy/platform/api/spdy_ptr_util.h" #include "net/spdy/platform/api/spdy_string_utils.h" @@ -363,22 +360,6 @@ return storage_.get(); } -std::unique_ptr<base::Value> SpdyHeaderBlockNetLogCallback( - const SpdyHeaderBlock* headers, - NetLogCaptureMode capture_mode) { - auto dict = std::make_unique<base::DictionaryValue>(); - auto headers_dict = std::make_unique<base::DictionaryValue>(); - for (SpdyHeaderBlock::const_iterator it = headers->begin(); - it != headers->end(); ++it) { - headers_dict->SetKey( - it->first.as_string(), - base::Value(ElideHeaderValueForNetLog( - capture_mode, it->first.as_string(), it->second.as_string()))); - } - dict->Set("headers", std::move(headers_dict)); - return std::move(dict); -} - SpdyStringPiece SpdyHeaderBlock::WriteKey(const SpdyStringPiece key) { key_size_ += key.size(); return GetStorage()->Write(key);
diff --git a/net/spdy/core/spdy_header_block.h b/net/spdy/core/spdy_header_block.h index 248ec73..e5a934fb 100644 --- a/net/spdy/core/spdy_header_block.h +++ b/net/spdy/core/spdy_header_block.h
@@ -15,19 +15,12 @@ #include "base/macros.h" #include "net/base/linked_hash_map.h" -#include "net/log/net_log.h" #include "net/spdy/platform/api/spdy_export.h" #include "net/spdy/platform/api/spdy_string.h" #include "net/spdy/platform/api/spdy_string_piece.h" -namespace base { -class Value; -} - namespace net { -class NetLogCaptureMode; - namespace test { class SpdyHeaderBlockPeer; class ValueProxyPeer; @@ -256,11 +249,6 @@ const std::vector<SpdyStringPiece>& fragments, SpdyStringPiece separator); -// Converts a SpdyHeaderBlock into NetLog event parameters. -SPDY_EXPORT_PRIVATE std::unique_ptr<base::Value> SpdyHeaderBlockNetLogCallback( - const SpdyHeaderBlock* headers, - NetLogCaptureMode capture_mode); - } // namespace net #endif // NET_SPDY_CORE_SPDY_HEADER_BLOCK_H_
diff --git a/net/spdy/core/spdy_header_block_test.cc b/net/spdy/core/spdy_header_block_test.cc index da0eb7d6..07d05234 100644 --- a/net/spdy/core/spdy_header_block_test.cc +++ b/net/spdy/core/spdy_header_block_test.cc
@@ -8,7 +8,6 @@ #include <utility> #include "base/values.h" -#include "net/log/net_log_capture_mode.h" #include "net/spdy/core/spdy_test_utils.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/spdy/core/spdy_test_utils.cc b/net/spdy/core/spdy_test_utils.cc index e8e29f7..050eaf2 100644 --- a/net/spdy/core/spdy_test_utils.cc +++ b/net/spdy/core/spdy_test_utils.cc
@@ -11,11 +11,8 @@ #include <utility> #include <vector> -#include "base/base64.h" #include "base/logging.h" #include "base/sys_byteorder.h" -#include "net/http/transport_security_state.h" -#include "net/ssl/ssl_info.h" #include "testing/gtest/include/gtest/gtest.h" namespace net { @@ -103,37 +100,6 @@ } } -HashValue GetTestHashValue(uint8_t label) { - HashValue hash_value(HASH_VALUE_SHA256); - memset(hash_value.data(), label, hash_value.size()); - return hash_value; -} - -SpdyString GetTestPin(uint8_t label) { - HashValue hash_value = GetTestHashValue(label); - SpdyString base64; - base::Base64Encode(SpdyStringPiece(reinterpret_cast<char*>(hash_value.data()), - hash_value.size()), - &base64); - - return SpdyString("pin-sha256=\"") + base64 + "\""; -} - -void AddPin(TransportSecurityState* state, - const SpdyString& host, - uint8_t primary_label, - uint8_t backup_label) { - SpdyString primary_pin = GetTestPin(primary_label); - SpdyString backup_pin = GetTestPin(backup_label); - SpdyString header = "max-age = 10000; " + primary_pin + "; " + backup_pin; - - // Construct a fake SSLInfo that will pass AddHPKPHeader's checks. - SSLInfo ssl_info; - ssl_info.is_issued_by_known_root = true; - ssl_info.public_key_hashes.push_back(GetTestHashValue(primary_label)); - EXPECT_TRUE(state->AddHPKPHeader(host, header, ssl_info)); -} - void TestHeadersHandler::OnHeaderBlockStart() { block_.clear(); } @@ -149,23 +115,5 @@ compressed_header_bytes_parsed_ = compressed_header_bytes_parsed; } -TestServerPushDelegate::TestServerPushDelegate() = default; - -TestServerPushDelegate::~TestServerPushDelegate() = default; - -void TestServerPushDelegate::OnPush( - std::unique_ptr<ServerPushHelper> push_helper, - const NetLogWithSource& session_net_log) { - push_helpers[push_helper->GetURL()] = std::move(push_helper); -} - -bool TestServerPushDelegate::CancelPush(GURL url) { - auto itr = push_helpers.find(url); - DCHECK(itr != push_helpers.end()); - itr->second->Cancel(); - push_helpers.erase(itr); - return true; -} - } // namespace test } // namespace net
diff --git a/net/spdy/core/spdy_test_utils.h b/net/spdy/core/spdy_test_utils.h index 6e6c2e0..7afd261 100644 --- a/net/spdy/core/spdy_test_utils.h +++ b/net/spdy/core/spdy_test_utils.h
@@ -24,9 +24,6 @@ namespace net { -class HashValue; -class TransportSecurityState; - inline bool operator==(SpdyStringPiece x, const SpdyHeaderBlock::ValueProxy& y) { return x == y.as_string(); @@ -49,19 +46,6 @@ void SetFrameLength(SpdySerializedFrame* frame, size_t length); -// Returns a SHA1 HashValue in which each byte has the value |label|. -HashValue GetTestHashValue(uint8_t label); - -// Returns SHA1 pinning header for the of the base64 encoding of -// GetTestHashValue(|label|). -SpdyString GetTestPin(uint8_t label); - -// Adds a pin for |host| to |state|. -void AddPin(TransportSecurityState* state, - const SpdyString& host, - uint8_t primary_label, - uint8_t backup_label); - // A test implementation of SpdyHeadersHandlerInterface that correctly // reconstructs multiple header values for the same name. class TestHeadersHandler : public SpdyHeadersHandlerInterface { @@ -89,22 +73,6 @@ DISALLOW_COPY_AND_ASSIGN(TestHeadersHandler); }; -// A test implementation of ServerPushDelegate that caches all the pushed -// request and provides a interface to cancel the push given url. -class TestServerPushDelegate : public ServerPushDelegate { - public: - TestServerPushDelegate(); - ~TestServerPushDelegate() override; - - void OnPush(std::unique_ptr<ServerPushHelper> push_helper, - const NetLogWithSource& session_net_log) override; - - bool CancelPush(GURL url); - - private: - std::map<GURL, std::unique_ptr<ServerPushHelper>> push_helpers; -}; - } // namespace test } // namespace net
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index 442addd2..a356f27 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc
@@ -33,6 +33,7 @@ #include "net/http/http_server_properties_manager.h" #include "net/http/transport_security_persister.h" #include "net/http/transport_security_state.h" +#include "net/log/net_log.h" #include "net/net_features.h" #include "net/nqe/network_quality_estimator.h" #include "net/quic/chromium/quic_stream_factory.h"
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index c7408ebc..066b015 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc
@@ -51,6 +51,7 @@ #include "net/http/http_transaction.h" #include "net/http/http_transaction_factory.h" #include "net/http/http_util.h" +#include "net/log/net_log.h" #include "net/log/net_log_event_type.h" #include "net/log/net_log_with_source.h" #include "net/net_features.h"
diff --git a/notification_helper/notification_helper_process_unittest.cc b/notification_helper/notification_helper_process_unittest.cc index bad2965..e82c4165 100644 --- a/notification_helper/notification_helper_process_unittest.cc +++ b/notification_helper/notification_helper_process_unittest.cc
@@ -57,7 +57,7 @@ class NotificationHelperTest : public testing::Test { protected: NotificationHelperTest() - : toast_activator_reg_path_(installer::GetToastActivatorRegistryPath()), + : toast_activator_reg_path_(InstallUtil::GetToastActivatorRegistryPath()), root_(HKEY_CURRENT_USER) {} void SetUp() override {
diff --git a/remoting/base/buffered_socket_writer_unittest.cc b/remoting/base/buffered_socket_writer_unittest.cc index b86cb877..a94827c 100644 --- a/remoting/base/buffered_socket_writer_unittest.cc +++ b/remoting/base/buffered_socket_writer_unittest.cc
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" +#include "net/log/net_log.h" #include "net/socket/socket_test_util.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/sandbox/win/src/process_mitigations_imageload_unittest.cc b/sandbox/win/src/process_mitigations_imageload_unittest.cc index e5d8ce01..ba99dd8 100644 --- a/sandbox/win/src/process_mitigations_imageload_unittest.cc +++ b/sandbox/win/src/process_mitigations_imageload_unittest.cc
@@ -389,13 +389,16 @@ //--------------------------------- // 1) Test setting pre-startup. + // ** Currently disabled. All PreferSys32 tests start to explode on + // >= Win10 1703/RS2 when this mitigation is set pre-startup. + // Child process creation works fine, but when ::ResumeThread() is called, + // there is a fatal error: "Entry point ucnv_convertEx_60 could not be + // located in the DLL ... sbox_integration_tests.exe." + // This is a character conversion function in a ucnv (unicode) DLL. + // Potentially the loader is finding a different version of this DLL that + // we have a dependency on in System32... but it doesn't match up with + // what we build against???! //--------------------------------- - TestRunner runner; - sandbox::TargetPolicy* policy = runner.GetPolicy(); - - EXPECT_EQ(policy->SetProcessMitigations(MITIGATION_IMAGE_LOAD_PREFER_SYS32), - SBOX_ALL_OK); - EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(test_command.c_str())); //--------------------------------- // 2) Test setting post-startup.
diff --git a/services/BUILD.gn b/services/BUILD.gn index 69475e1..edd4b46 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn
@@ -23,10 +23,6 @@ "//services/network/public/cpp:tests", ] - data_deps = [ - "//testing/buildbot/filters:services_unittests_filters", - ] - if (!is_ios) { deps += [ "//services/audio:tests",
diff --git a/services/device/generic_sensor/BUILD.gn b/services/device/generic_sensor/BUILD.gn index 4b81ba01..812509a 100644 --- a/services/device/generic_sensor/BUILD.gn +++ b/services/device/generic_sensor/BUILD.gn
@@ -80,10 +80,7 @@ } if (is_mac) { - deps += [ - "//device/sensors/public/cpp:full", - "//third_party/sudden_motion_sensor", - ] + deps += [ "//third_party/sudden_motion_sensor" ] libs = [ "CoreFoundation.framework", "IOKit.framework",
diff --git a/services/device/generic_sensor/README.md b/services/device/generic_sensor/README.md index bdf8a07..583d858 100644 --- a/services/device/generic_sensor/README.md +++ b/services/device/generic_sensor/README.md
@@ -7,7 +7,7 @@ ## Web-exposed Interfaces -### Generic Sensors +### [Generic Sensors](https://www.w3.org/TR/generic-sensor/) The Generic Sensors API is implemented in `third_party/WebKit/Source/modules/sensor` and exposes the following sensor types as JavaScript objects: @@ -27,7 +27,7 @@ [Magnetometer]: ../../../third_party/WebKit/Source/modules/sensor/Magnetometer.idl [RelativeOrientationSensor]: ../../../third_party/WebKit/Source/modules/sensor/RelativeOrientationSensor.idl -### DeviceOrientation Events +### [DeviceOrientation Events](https://www.w3.org/TR/orientation-event/) The DeviceOrientation Events API is implemented in `third_party/WebKit/Source/modules/device_orientation` and exposes two events based on the following sensors: @@ -42,6 +42,13 @@ [DeviceMotionEvent]: ../../../third_party/WebKit/Source/modules/device_orientation/DeviceMotionEvent.idl [DeviceOrientationEvent]: ../../../third_party/WebKit/Source/modules/device_orientation/DeviceOrientationEvent.idl +The content renderer layer is located in `content/renderer/device_sensors`. + +Testing: + +* Browser tests are located in `content/browser/device_sensors`. +* Layout tests are located in `third_party/WebKit/LayoutTests/device_orientation`. +* Web platform tests are located in `third_party/WebKit/LayoutTests/external/wpt/orientation-event` and are a mirror of the [web-platform-tests GitHub repository](https://github.com/w3c/web-platform-tests). ## Permissions
diff --git a/services/device/public/cpp/generic_sensor/BUILD.gn b/services/device/public/cpp/generic_sensor/BUILD.gn index 3c503b1..b5a26e3c 100644 --- a/services/device/public/cpp/generic_sensor/BUILD.gn +++ b/services/device/public/cpp/generic_sensor/BUILD.gn
@@ -2,6 +2,31 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# This target contains only those files that are shared by the Device Sensors +# implementation and all Device Sensors clients, including Blink. Add a file +# here only if it meets the following constraints: +# (1) It is *necessary* to use the file to consume Device Sensors (the +# current files define structs that are used as a consistent interpretation of +# shared memory by the Device Sensor and its clients). +# (2) The file has no dependencies on the STL or Chromium code and will not +# grow them over time (the current files are POD structs and will necessarily +# stay that way due to their above-described purpose). +# If a file does not meet these constraints, it cannot be used by the Blink +# client and should be placed in the "generic_sensor" target below. Similarly, +# clients without Blink's constraints should depend on the "generic_sensor" +# target below rather than this one. +# Consult {platform-architecture-dev, services-dev}@chromium.org in the case +# of any uncertainty. +source_set("shared_with_blink") { + sources = [ + "motion_data.cc", + "motion_data.h", + "orientation_data.cc", + "orientation_data.h", + ] + # Do not add deps here per the above comment. +} + source_set("generic_sensor") { sources = [ "platform_sensor_configuration.cc", @@ -15,6 +40,7 @@ ] public_deps = [ + ":shared_with_blink", "//services/device/public/mojom:generic_sensor", ]
diff --git a/device/sensors/public/cpp/motion_data.cc b/services/device/public/cpp/generic_sensor/motion_data.cc similarity index 89% rename from device/sensors/public/cpp/motion_data.cc rename to services/device/public/cpp/generic_sensor/motion_data.cc index 2fb4580..b736f6c 100644 --- a/device/sensors/public/cpp/motion_data.cc +++ b/services/device/public/cpp/generic_sensor/motion_data.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "device/sensors/public/cpp/motion_data.h" +#include "services/device/public/cpp/generic_sensor/motion_data.h" #include <string.h>
diff --git a/device/sensors/public/cpp/motion_data.h b/services/device/public/cpp/generic_sensor/motion_data.h similarity index 85% rename from device/sensors/public/cpp/motion_data.h rename to services/device/public/cpp/generic_sensor/motion_data.h index 6b5d5abe..ba5fd8c 100644 --- a/device/sensors/public/cpp/motion_data.h +++ b/services/device/public/cpp/generic_sensor/motion_data.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef DEVICE_SENSORS_PUBLIC_CPP_MOTION_DATA_H_ -#define DEVICE_SENSORS_PUBLIC_CPP_MOTION_DATA_H_ +#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_MOTION_DATA_H_ +#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_MOTION_DATA_H_ namespace device { @@ -51,4 +51,4 @@ } // namespace device -#endif // DEVICE_SENSORS_PUBLIC_CPP_MOTION_DATA_H_ +#endif // SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_MOTION_DATA_H_
diff --git a/device/sensors/public/cpp/orientation_data.cc b/services/device/public/cpp/generic_sensor/orientation_data.cc similarity index 88% rename from device/sensors/public/cpp/orientation_data.cc rename to services/device/public/cpp/generic_sensor/orientation_data.cc index 7e0239b..e9398edb2 100644 --- a/device/sensors/public/cpp/orientation_data.cc +++ b/services/device/public/cpp/generic_sensor/orientation_data.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "device/sensors/public/cpp/orientation_data.h" +#include "services/device/public/cpp/generic_sensor/orientation_data.h" #include <string.h>
diff --git a/device/sensors/public/cpp/orientation_data.h b/services/device/public/cpp/generic_sensor/orientation_data.h similarity index 75% rename from device/sensors/public/cpp/orientation_data.h rename to services/device/public/cpp/generic_sensor/orientation_data.h index 22cc965..3552ade 100644 --- a/device/sensors/public/cpp/orientation_data.h +++ b/services/device/public/cpp/generic_sensor/orientation_data.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef DEVICE_SENSORS_PUBLIC_CPP_ORIENTATION_DATA_H_ -#define DEVICE_SENSORS_PUBLIC_CPP_ORIENTATION_DATA_H_ +#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_ORIENTATION_DATA_H_ +#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_ORIENTATION_DATA_H_ namespace device { @@ -35,4 +35,4 @@ } // namespace device -#endif // DEVICE_SENSORS_PUBLIC_CPP_ORIENTATION_DATA_H_ +#endif // SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_ORIENTATION_DATA_H_
diff --git a/services/network/public/cpp/simple_url_loader.cc b/services/network/public/cpp/simple_url_loader.cc index 4a8192b..b1ec6da 100644 --- a/services/network/public/cpp/simple_url_loader.cc +++ b/services/network/public/cpp/simple_url_loader.cc
@@ -1376,7 +1376,7 @@ void SimpleURLLoaderImpl::OnReceiveCachedMetadata( const std::vector<uint8_t>& data) { - NOTREACHED(); + // Ignored. } void SimpleURLLoaderImpl::OnTransferSizeUpdated(int32_t transfer_size_diff) {}
diff --git a/services/network/resource_scheduler.cc b/services/network/resource_scheduler.cc index 54f5305..dbc2d13a 100644 --- a/services/network/resource_scheduler.cc +++ b/services/network/resource_scheduler.cc
@@ -25,6 +25,7 @@ #include "net/base/load_flags.h" #include "net/base/request_priority.h" #include "net/http/http_server_properties.h" +#include "net/log/net_log.h" #include "net/nqe/network_quality_estimator.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h"
diff --git a/services/service_manager/sandbox/win/sandbox_win.cc b/services/service_manager/sandbox/win/sandbox_win.cc index 6c7356ea..8042380 100644 --- a/services/service_manager/sandbox/win/sandbox_win.cc +++ b/services/service_manager/sandbox/win/sandbox_win.cc
@@ -844,12 +844,16 @@ // Pre-startup mitigations. sandbox::MitigationFlags mitigations = - sandbox::MITIGATION_HEAP_TERMINATE | sandbox::MITIGATION_BOTTOM_UP_ASLR | - sandbox::MITIGATION_DEP | sandbox::MITIGATION_DEP_NO_ATL_THUNK | - sandbox::MITIGATION_EXTENSION_POINT_DISABLE | sandbox::MITIGATION_SEHOP | + sandbox::MITIGATION_HEAP_TERMINATE | + sandbox::MITIGATION_BOTTOM_UP_ASLR | + sandbox::MITIGATION_DEP | + sandbox::MITIGATION_DEP_NO_ATL_THUNK | + sandbox::MITIGATION_EXTENSION_POINT_DISABLE | + sandbox::MITIGATION_SEHOP | sandbox::MITIGATION_NONSYSTEM_FONT_DISABLE | sandbox::MITIGATION_IMAGE_LOAD_NO_REMOTE | - sandbox::MITIGATION_IMAGE_LOAD_NO_LOW_LABEL; + sandbox::MITIGATION_IMAGE_LOAD_NO_LOW_LABEL | + sandbox::MITIGATION_RESTRICT_INDIRECT_BRANCH_PREDICTION; sandbox::ResultCode result = policy->SetProcessMitigations(mitigations); if (result != sandbox::SBOX_ALL_OK) @@ -866,7 +870,8 @@ // Post-startup mitigations. mitigations = sandbox::MITIGATION_STRICT_HANDLE_CHECKS | - sandbox::MITIGATION_DLL_SEARCH_ORDER; + sandbox::MITIGATION_DLL_SEARCH_ORDER | + sandbox::MITIGATION_IMAGE_LOAD_PREFER_SYS32; if (base::FeatureList::IsEnabled( service_manager::features::kWinSboxForceMsSigned) && !cmd_line->HasSwitch(switches::kAllowThirdPartyModules)) {
diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn index da01593..0d2efcf4 100644 --- a/services/video_capture/BUILD.gn +++ b/services/video_capture/BUILD.gn
@@ -51,7 +51,7 @@ "//base", "//media", "//media/capture:capture", - "//media/capture/mojo:image_capture", + "//media/capture/mojom:image_capture", "//media/mojo/common:common", "//mojo/common:common_base", "//services/service_manager/public/cpp", @@ -95,7 +95,7 @@ ":lib", ":video_capture", "//base/test:test_support", - "//media/capture/mojo:video_capture", + "//media/capture/mojom:video_capture", "//services/service_manager/public/cpp", "//services/service_manager/public/cpp:service_test_support", "//services/service_manager/public/cpp/test:test_support",
diff --git a/services/video_capture/public/mojom/BUILD.gn b/services/video_capture/public/mojom/BUILD.gn index 7ba15755..934ab39 100644 --- a/services/video_capture/public/mojom/BUILD.gn +++ b/services/video_capture/public/mojom/BUILD.gn
@@ -16,8 +16,8 @@ ] deps = [ - "//media/capture/mojo:image_capture", - "//media/capture/mojo:video_capture", + "//media/capture/mojom:image_capture", + "//media/capture/mojom:video_capture", "//media/mojo/interfaces", "//ui/gfx/geometry/mojo", ]
diff --git a/services/video_capture/public/mojom/device.mojom b/services/video_capture/public/mojom/device.mojom index 6d0bc1b..c4113fe 100644 --- a/services/video_capture/public/mojom/device.mojom +++ b/services/video_capture/public/mojom/device.mojom
@@ -4,8 +4,8 @@ module video_capture.mojom; -import "media/capture/mojo/video_capture_types.mojom"; -import "media/capture/mojo/image_capture.mojom"; +import "media/capture/mojom/video_capture_types.mojom"; +import "media/capture/mojom/image_capture.mojom"; import "services/video_capture/public/mojom/receiver.mojom"; // Represents access to a video capture device available on the machine.
diff --git a/services/video_capture/public/mojom/device_factory.mojom b/services/video_capture/public/mojom/device_factory.mojom index 2858c4f5..73f548b 100644 --- a/services/video_capture/public/mojom/device_factory.mojom +++ b/services/video_capture/public/mojom/device_factory.mojom
@@ -4,7 +4,7 @@ module video_capture.mojom; -import "media/capture/mojo/video_capture_types.mojom"; +import "media/capture/mojom/video_capture_types.mojom"; import "services/video_capture/public/mojom/device.mojom"; import "services/video_capture/public/mojom/producer.mojom"; import "services/video_capture/public/mojom/virtual_device.mojom";
diff --git a/services/video_capture/public/mojom/receiver.mojom b/services/video_capture/public/mojom/receiver.mojom index 6ec99df..c3bd85a3 100644 --- a/services/video_capture/public/mojom/receiver.mojom +++ b/services/video_capture/public/mojom/receiver.mojom
@@ -4,7 +4,7 @@ module video_capture.mojom; -import "media/capture/mojo/video_capture_types.mojom"; +import "media/capture/mojom/video_capture_types.mojom"; import "media/mojo/interfaces/media_types.mojom"; // Empty interface for encapsulating scoped access permission to a Buffer.
diff --git a/services/video_capture/public/mojom/virtual_device.mojom b/services/video_capture/public/mojom/virtual_device.mojom index 78bb758f..3b6029c 100644 --- a/services/video_capture/public/mojom/virtual_device.mojom +++ b/services/video_capture/public/mojom/virtual_device.mojom
@@ -4,7 +4,7 @@ module video_capture.mojom; -import "media/capture/mojo/video_capture_types.mojom"; +import "media/capture/mojom/video_capture_types.mojom"; import "media/mojo/interfaces/media_types.mojom"; import "services/video_capture/public/mojom/producer.mojom"; import "ui/gfx/geometry/mojo/geometry.mojom";
diff --git a/services/viz/privileged/interfaces/BUILD.gn b/services/viz/privileged/interfaces/BUILD.gn index 667962a..3add225 100644 --- a/services/viz/privileged/interfaces/BUILD.gn +++ b/services/viz/privileged/interfaces/BUILD.gn
@@ -27,7 +27,7 @@ deps = [ "//base/test:test_support", "//components/viz/common:common", - "//media/capture/mojo:video_capture", + "//media/capture/mojom:video_capture", "//services/service_manager/public/cpp", "//services/service_manager/public/cpp:service_test_support", "//services/viz/privileged/interfaces/compositing",
diff --git a/services/viz/privileged/interfaces/compositing/BUILD.gn b/services/viz/privileged/interfaces/compositing/BUILD.gn index 6ea4fe9..843f111 100644 --- a/services/viz/privileged/interfaces/compositing/BUILD.gn +++ b/services/viz/privileged/interfaces/compositing/BUILD.gn
@@ -15,7 +15,7 @@ public_deps = [ "//gpu/ipc/common:interfaces", - "//media/capture/mojo:video_capture", + "//media/capture/mojom:video_capture", "//media/mojo/interfaces:interfaces", "//mojo/common:common_custom_types", "//services/viz/public/interfaces",
diff --git a/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom b/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom index 66e2bf9..23a35f8c 100644 --- a/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom +++ b/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom
@@ -4,7 +4,7 @@ module viz.mojom; -import "media/capture/mojo/video_capture_types.mojom"; +import "media/capture/mojom/video_capture_types.mojom"; import "media/mojo/interfaces/media_types.mojom"; import "mojo/common/time.mojom"; import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
diff --git a/services/viz/public/cpp/compositing/BUILD.gn b/services/viz/public/cpp/compositing/BUILD.gn index 9aa6fa5a..5a7e9a06 100644 --- a/services/viz/public/cpp/compositing/BUILD.gn +++ b/services/viz/public/cpp/compositing/BUILD.gn
@@ -14,7 +14,7 @@ "//components/viz/common:common", "//components/viz/test:test_support", "//gpu/ipc/common:struct_traits", - "//media/capture/mojo:video_capture", + "//media/capture/mojom:video_capture", "//services/service_manager/public/cpp", "//services/service_manager/public/cpp:service_test_support", "//services/viz/public/interfaces",
diff --git a/styleguide/web/web.md b/styleguide/web/web.md index 05ea2f7..1724838 100644 --- a/styleguide/web/web.md +++ b/styleguide/web/web.md
@@ -400,6 +400,22 @@ }, ``` +* Make good use of the [`dom-if` template]( +https://www.polymer-project.org/2.0/docs/devguide/templates#dom-if): + * Consider using `dom-if` to lazily render parts of the DOM that are hidden by + default. Also consider using [`cr-lazy-render`]( + https://cs.chromium.org/chromium/src/ui/webui/resources/cr_elements/cr_lazy_render/cr_lazy_render.js) + instead. + * **Only use`dom-if`** if the DOM subtree is non-trivial, defined as: + * Contains more than 10 native elements, OR + * Contain **any** custom elements, OR + * Has many data bindings, OR + * Includes non-text content (e.g images). + + For trivial DOM subtrees using the HTML [`hidden` attribute]( + https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/hidden) + yields better performance, than adding a custom `dom-if` element. + ## Grit processing Grit is a tool that runs at compile time to pack resources together into
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index c31744e..17590844 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json
@@ -2934,9 +2934,6 @@ "test": "sbox_validation_tests" }, { - "args": [ - "--test-launcher-filter-file=../../testing/buildbot/filters/win10.services_unittests.filter" - ], "swarming": { "can_use_on_swarming_builders": true },
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 2c1806c0c..7983f73 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json
@@ -1349,1431 +1349,377 @@ "gtest_tests": [ { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "accessibility_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "accessibility_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "base_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "battor_agent_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "blink_heap_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "blink_platform_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "boringssl_crypto_tests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "boringssl_ssl_tests" }, { "swarming": { "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "test": "base_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "test": "battor_agent_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "test": "blink_heap_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "test": "blink_platform_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "test": "boringssl_crypto_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "test": "boringssl_ssl_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ], "shards": 10 }, - "test": "browser_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "browser_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "cacheinvalidation_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "cacheinvalidation_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "capture_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "capture_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "cast_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "cast_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "cc_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "cc_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "chrome_app_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "chrome_app_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "chromedriver_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "chromedriver_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "components_browsertests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "components_browsertests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "components_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "components_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "content_browsertests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "content_browsertests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "content_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "content_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "crashpad_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "crashpad_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "crypto_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "crypto_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "device_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "device_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "display_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "display_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "extensions_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "extensions_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "gcm_unit_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "gcm_unit_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "gfx_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "gfx_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "gn_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "gn_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "google_apis_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "google_apis_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "gpu_ipc_service_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "gpu_ipc_service_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "gpu_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "gpu_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "headless_browsertests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "headless_browsertests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "headless_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "headless_unittests" }, { "swarming": { "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ], "shards": 2 }, - "test": "interactive_ui_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "interactive_ui_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "ipc_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "ipc_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "jingle_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "jingle_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "libjingle_xmpp_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "libjingle_xmpp_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "mac_installer_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "mac_installer_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "media_blink_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "media_blink_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "media_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "media_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "midi_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "midi_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "mojo_common_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "mojo_common_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "mojo_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "mojo_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "nacl_loader_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "nacl_loader_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "native_theme_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "native_theme_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "net_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "net_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "pdf_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "pdf_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "ppapi_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "ppapi_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "printing_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "printing_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "remoting_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "remoting_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "sandbox_mac_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "sandbox_mac_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "services_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "services_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "skia_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "skia_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "snapshot_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "snapshot_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "sql_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "sql_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "storage_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "storage_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "sync_integration_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "sync_integration_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "ui_base_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "ui_base_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "unit_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "unit_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "url_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "url_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "views_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "views_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "viz_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "viz_unittests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "webkit_unit_tests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "webkit_unit_tests" }, { "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] + "can_use_on_swarming_builders": true }, - "test": "wtf_unittests", - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" - } + "test": "wtf_unittests" } ], "isolated_scripts": [ @@ -2784,24 +1730,7 @@ "isolate_name": "chromedriver_py_tests", "name": "chromedriver_py_tests", "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" + "can_use_on_swarming_builders": true } }, { @@ -2809,72 +1738,21 @@ "isolate_name": "content_shell_crash_test", "name": "content_shell_crash_test", "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" + "can_use_on_swarming_builders": true } }, { "isolate_name": "metrics_python_tests", "name": "metrics_python_tests", "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" + "can_use_on_swarming_builders": true } }, { "isolate_name": "telemetry_gpu_unittests", "name": "telemetry_gpu_unittests", "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" + "can_use_on_swarming_builders": true } }, { @@ -2885,72 +1763,21 @@ "name": "telemetry_unittests", "swarming": { "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ], "shards": 4 - }, - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" } }, { "isolate_name": "views_perftests", "name": "views_perftests", "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" + "can_use_on_swarming_builders": true } }, { "isolate_name": "webkit_python_tests", "name": "webkit_python_tests", "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "x86-64", - "gpu": "none", - "os": "Mac-10.9", - "pool": "Chrome" - } - ] - }, - "trigger_script": { - "args": [ - "--multiple-trigger-configs", - "[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]", - "--multiple-dimension-script-verbose", - "True" - ], - "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" + "can_use_on_swarming_builders": true } } ],
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index 2d4bdcc6..52972a6 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json
@@ -109,18 +109,6 @@ } ] }, - "test": "chrome_public_test_vr_apk" - }, - { - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "device_os": "MMB29Q", - "device_type": "bullhead" - } - ] - }, "test": "chrome_sync_shell_test_apk" }, {
diff --git a/testing/buildbot/chromium.perf.fyi.json b/testing/buildbot/chromium.perf.fyi.json index 4006de7..fc41f01 100644 --- a/testing/buildbot/chromium.perf.fyi.json +++ b/testing/buildbot/chromium.perf.fyi.json
@@ -463,7 +463,7 @@ } ], "expiration": 36000, - "hard_timeout": 10800, + "hard_timeout": 36000, "ignore_task_failure": false, "io_timeout": 3600, "shards": 2,
diff --git a/testing/buildbot/chromium.swarm.json b/testing/buildbot/chromium.swarm.json index 91b7027..98a7de2 100644 --- a/testing/buildbot/chromium.swarm.json +++ b/testing/buildbot/chromium.swarm.json
@@ -623,6 +623,59 @@ } ] }, + "ChromeOS Swarm": { + "additional_compile_targets": [ + "chromiumos_preflight" + ], + "isolated_scripts": [ + { + "args": [ + "--browser=exact", + "--browser-executable=./test_chrome", + "--xvfb", + "--skip=benchmarks.benchmark_smoke_unittest.BenchmarkSmokeTest.v8.runtime_stats.top_25", + "--skip=scripts_smoke_unittest.ScriptsSmokeTest.testRunTelemetryBenchmarkAsGoogletest" + ], + "isolate_name": "telemetry_perf_unittests", + "name": "telemetry_perf_unittests", + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "device_type": "kevin-signed-mpkeys", + "os": "ChromeOS" + } + ], + "hard_timeout": 960, + "shards": 12 + } + }, + { + "args": [ + "--browser=exact", + "--browser-executable=./test_chrome", + "--jobs=1", + "--skip=telemetry.internal.actions.action_runner_unittest.ActionRunnerTest.testWaitForElement", + "--skip=telemetry.internal.actions.action_runner_unittest.ActionRunnerTest.testWaitForElementWithWrongText", + "--skip=telemetry.internal.actions.action_runner_unittest.ActionRunnerTest.testWaitForJavaScriptCondition", + "--skip=telemetry.internal.actions.key_event_unittest.KeyPressActionTest.testPressEndAndHome", + "--skip=telemetry.page.page_run_end_to_end_unittest.ActualPageRunEndToEndTests.testTrafficSettings" + ], + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "device_type": "kevin-signed-mpkeys", + "os": "ChromeOS" + } + ], + "shards": 4 + } + } + ] + }, "Linux Swarm": { "gtest_tests": [ {
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 1b9c157..8ee59549 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json
@@ -1018,9 +1018,6 @@ "test": "sbox_validation_tests" }, { - "args": [ - "--test-launcher-filter-file=../../testing/buildbot/filters/win10.services_unittests.filter" - ], "swarming": { "can_use_on_swarming_builders": true },
diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn index 578dab935..4b8350d 100644 --- a/testing/buildbot/filters/BUILD.gn +++ b/testing/buildbot/filters/BUILD.gn
@@ -64,14 +64,6 @@ ] } -source_set("services_unittests_filters") { - testonly = true - - data = [ - "//testing/buildbot/filters/win10.services_unittests.filter", - ] -} - source_set("unit_tests_filters") { testonly = true
diff --git a/testing/buildbot/filters/mojo.fyi.network_browser_tests.filter b/testing/buildbot/filters/mojo.fyi.network_browser_tests.filter index 2de991d..62de146 100644 --- a/testing/buildbot/filters/mojo.fyi.network_browser_tests.filter +++ b/testing/buildbot/filters/mojo.fyi.network_browser_tests.filter
@@ -62,11 +62,7 @@ -ProfileWindowBrowserTest.GuestClearsCookies -ProxySettingsApiTest.ProxyEventsInvalidProxy -RegisterProtocolHandlerBrowserTest.CustomHandler --ResourcePrefetchPredictorPrefetchingBrowserTest.Redirect --ResourcePrefetchPredictorPrefetchingBrowserTest.Simple -SafeBrowsingTriggeredPopupBlockerBrowserTest.NoFeature_NoMessages --SecurityStateTabHelperTest.PasswordSecurityLevelDowngradedOnFilesystemUrl --SiteDetailsBrowserTest.PlatformAppsNotIsolated -SubresourceFilterBrowserTest.FailedProvisionalLoadInMainframe -TabManagerTest.DiscardTabsWithMinimizedAndOccludedWindows -TaskManagerBrowserTest.SentDataObserved @@ -176,10 +172,6 @@ # crbug.com/778860 SecurityStyleExplanations::info_explanations is empty. -BrowserTestNonsecureURLRequest.DidChangeVisibleSecurityStateObserverObsoleteTLSSettings -# crbug.com/779210 NOTREACHED() reached at SaveFileManager::OnSaveURL(). --SavePageBrowserTest.SavePageBrowserTest_NonMHTML --SavePageBrowserTest.SaveUnauthorizedResource - # crbug.com/779217 The NetworkContext is not created when the network service is enabled. -SpellingMenuObserverTest.SuggestionsForceTopSeparator @@ -207,8 +199,6 @@ # https://bugs.chromium.org/p/chromium/issues/detail?id=755309 -SSLUITest.SHA1IsDefaultDisabled/0 -SSLUITest.SHA1IsDefaultDisabled/1 --SSLUITest.CommonNameIsDefaultDisabled/0 --SSLUITest.CommonNameIsDefaultDisabled/1 -SSLUITest.TestBadHTTPSDownload/0 -SSLUITest.TestBadHTTPSDownload/1 -SSLUITest.TestHTTPSOCSPOk/0 @@ -309,25 +299,6 @@ -PredictorBrowserTest.SubframeInitiatesPreconnects -PredictorBrowserTest.SubframeLearning -# This feature currently hooks in using ChromeResourceDispatcherHostDelegate and -# ResourceThrottles. Need to convert PredictorResourceThrottle and -# LoadingDataCollector to gather their data from WebContentsObserver navigation -# callbacks instead. --ResourcePrefetchPredictorBrowserTest.AlwaysRevalidate --ResourcePrefetchPredictorBrowserTest.CrossSiteNavigation --ResourcePrefetchPredictorBrowserTest.HttpToHttpsRedirect --ResourcePrefetchPredictorBrowserTest.IframeShouldBeIgnored --ResourcePrefetchPredictorBrowserTest.JavascriptAppendChild --ResourcePrefetchPredictorBrowserTest.JavascriptDocumentWrite --ResourcePrefetchPredictorBrowserTest.JavascriptInnerHtml --ResourcePrefetchPredictorBrowserTest.JavascriptRedirectsAreNotHandled --ResourcePrefetchPredictorBrowserTest.JavascriptXHR --ResourcePrefetchPredictorBrowserTest.Redirect --ResourcePrefetchPredictorBrowserTest.RedirectChain --ResourcePrefetchPredictorBrowserTest.Simple --ResourcePrefetchPredictorBrowserTest.SubresourceFcpOrder --ResourcePrefetchPredictorBrowserTest.TabIdBehavingAsExpected - # Finish ServiceWorker networking glue rewrite. # http://crbug.com/715640 -ServiceWorkerAppTest.RegisterAndPostMessage @@ -434,9 +405,6 @@ # Flakes https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.linux%2FLinux_Tests%2F65817%2F%2B%2Frecipes%2Fsteps%2Fnetwork_service_browser_tests%2F0%2Flogs%2FRestartTest.CookiesClearedOnExit%2F0 -RestartTest.CookiesClearedOnExit -# Flakes https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.linux%2FLinux_Tests__dbg__1_%2F69105%2F%2B%2Frecipes%2Fsteps%2Fnetwork_service_browser_tests%2F0%2Flogs%2FPopupsOnlyUiDelegateTest.ManyPopupNotifications%2F0 --PopupsOnlyUiDelegateTest.ManyPopupNotifications - # Flakes https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.linux%2FLinux_Tests%2F65814%2F%2B%2Frecipes%2Fsteps%2Fnetwork_service_browser_tests%2F0%2Flogs%2FDeclarativeContentApiTest.NotBookmarkedRulesEvaluatedOnBookmarkEvents%2F0 -DeclarativeContentApiTest.NotBookmarkedRulesEvaluatedOnBookmarkEvents
diff --git a/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter b/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter index 5548b389..3e037ce 100644 --- a/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter +++ b/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter
@@ -95,10 +95,6 @@ -ResourceDispatcherHostBrowserTest.CrossOriginRedirectBlocked -ResourceDispatcherHostBrowserTest.CrossSiteAfterCrash -ResourceDispatcherHostBrowserTest.CrossSiteNavigationNonBuffered --ResourceDispatcherHostBrowserTest.DoNotSniffHTMLFromImageGIF --ResourceDispatcherHostBrowserTest.DoNotSniffHTMLFromTextPlain --ResourceDispatcherHostBrowserTest.RespectNoSniffDirective --ResourceDispatcherHostBrowserTest.SniffHTMLWithNoContentType -ResourceDispatcherHostBrowserTest.SniffNoContentTypeNoData # Cross-origin read blocking (CORB) needs to be implemented in the network
diff --git a/testing/buildbot/filters/win10.services_unittests.filter b/testing/buildbot/filters/win10.services_unittests.filter deleted file mode 100644 index 4eabb52..0000000 --- a/testing/buildbot/filters/win10.services_unittests.filter +++ /dev/null
@@ -1,10 +0,0 @@ -# Failing on Windows 10 on GCE. https://crbug.com/756986. --PlatformSensorAndProviderTestWin.CheckAccelerometerReadingConversion --PlatformSensorAndProviderTestWin.CheckDeviceOrientationEulerAnglesReadingConversion --PlatformSensorAndProviderTestWin.CheckDeviceOrientationQuaternionReadingConversion --PlatformSensorAndProviderTestWin.CheckGyroscopeReadingConversion --PlatformSensorAndProviderTestWin.CheckMagnetometerReadingConversion --PlatformSensorAndProviderTestWin.SensorRemoved --PlatformSensorAndProviderTestWin.SensorStarted --PlatformSensorAndProviderTestWin.SensorStateChangedToReady --PlatformSensorAndProviderTestWin.SensorStateChangedToError
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl index d0a4467..e30a794 100644 --- a/testing/buildbot/test_suite_exceptions.pyl +++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -718,6 +718,8 @@ 'ToTAndroid x64', # chromium.fyi 'Out of Process Profiling Android', + # chromium.memory + 'Android CFI', ], 'modifications': { 'Lollipop Phone Tester': { @@ -2864,18 +2866,6 @@ 'hard_timeout': 300, }, }, - # chromium.fyi - 'Chromium Win 10 GCE Tests': { - 'args': [ - '--test-launcher-filter-file=../../testing/buildbot/filters/win10.services_unittests.filter', - ], - }, - # chromium.win - 'Win10 Tests x64': { - 'args': [ - '--test-launcher-filter-file=../../testing/buildbot/filters/win10.services_unittests.filter', - ], - }, }, }, 'site_per_process_browser_tests': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl index 03fbb15..4cccb8f4 100644 --- a/testing/buildbot/waterfalls.pyl +++ b/testing/buildbot/waterfalls.pyl
@@ -1627,24 +1627,6 @@ 'isolated_scripts': 'chromium_rel_isolated_scripts', 'scripts': 'chromium_scripts', }, - 'swarming': { - 'dimension_sets': [ - { - "gpu": "none", - "cpu": "x86-64", - "os": "Mac-10.9", - "pool": "Chrome", - }, - ], - }, - 'use_multi_dimension_trigger_script': True, - 'alternate_swarming_dimensions': [ - { - "cpu": "x86-64", - "os": "Mac-10.13", - "pool": "Chrome", - }, - ], }, 'Mac10.9 Tests (dbg)': { 'test_suites': { @@ -1749,6 +1731,22 @@ }, 'os_type': 'android', }, + 'ChromeOS Swarm': { + 'additional_compile_targets': [ + 'chromiumos_preflight', + ], + 'test_suites': { + 'isolated_scripts': 'linux_chromeos_rel_isolated_scripts', + }, + 'swarming': { + 'dimension_sets': [ + { + 'device_type': 'kevin-signed-mpkeys', + 'os': 'ChromeOS', + } + ], + }, + }, 'Linux Swarm': { 'test_suites': { 'gtest_tests': 'chromium_swarm_linux_gtests',
diff --git a/testing/scripts/run_gtest_perf_test.py b/testing/scripts/run_gtest_perf_test.py index f2923c48..83198f5c 100755 --- a/testing/scripts/run_gtest_perf_test.py +++ b/testing/scripts/run_gtest_perf_test.py
@@ -82,6 +82,25 @@ args, rest_args = parser.parse_known_args() + rc, charts, output_json = execute_perf_test(args, rest_args) + + # TODO(eakuefner): Make isolated_script_test_perf_output mandatory after + # flipping flag in swarming. + if args.isolated_script_test_perf_output: + filename = args.isolated_script_test_perf_output + else: + filename = args.isolated_script_test_chartjson_output + # Write the returned encoded json to a the charts output file + with open(filename, 'w') as f: + f.write(charts) + + with open(args.isolated_script_test_output, 'w') as fp: + json.dump(output_json, fp) + + return rc + + +def execute_perf_test(args, rest_args): env = os.environ.copy() # Assume we want to set up the sandbox environment variables all the # time; doing so is harmless on non-Linux platforms and is needed @@ -124,28 +143,17 @@ results_processor = ( generate_legacy_perf_dashboard_json.LegacyResultsProcessor()) charts = results_processor.GenerateJsonResults(tempfile_path) - # TODO(eakuefner): Make isolated_script_test_perf_output mandatory after - # flipping flag in swarming. - if args.isolated_script_test_perf_output: - filename = args.isolated_script_test_perf_output - else: - filename = args.isolated_script_test_chartjson_output - # Write the returned encoded json to a the charts output file - with open(filename, 'w') as f: - f.write(charts) except Exception: traceback.print_exc() rc = 1 valid = (rc == 0) failures = [] if valid else ['(entire test suite)'] - with open(args.isolated_script_test_output, 'w') as fp: - json.dump({ - 'valid': valid, - 'failures': failures, - }, fp) - - return rc + output_json = { + 'valid': valid, + 'failures': failures, + } + return rc, charts, output_json # This is not really a "script test" so does not need to manually add # any additional compile targets.
diff --git a/testing/scripts/run_performance_tests.py b/testing/scripts/run_performance_tests.py index f19dbb09..6c328e6 100755 --- a/testing/scripts/run_performance_tests.py +++ b/testing/scripts/run_performance_tests.py
@@ -27,7 +27,11 @@ invoke an arbitrary executable. It currently runs several benchmarks. The benchmarks it will execute are -based on the shard it is running on and the sharding_map_path( +based on the shard it is running on and the sharding_map_path. + +If this is executed with a non-telemetry perf test, the flag --non-telemetry +has to be passed in to the script so the script knows it is running +an executable and not the run_benchmark command. The results of running the benchmark are put in separate directories per benchmark. Two files will be present in each directory; perf_results.json, which @@ -51,6 +55,7 @@ import common import run_telemetry_benchmark_as_googletest +import run_gtest_perf_test # Current whitelist of benchmarks outputting histograms BENCHMARKS_TO_OUTPUT_HISTOGRAMS = [ @@ -81,6 +86,21 @@ 'benchmark_bot_map.json') +def write_results( + perf_test_name, perf_results, json_test_results, isolated_out_dir, encoded): + benchmark_path = os.path.join(isolated_out_dir, perf_test_name) + + os.makedirs(benchmark_path) + with open(os.path.join(benchmark_path, 'perf_results.json'), 'w') as f: + # non telemetry perf results are already json encoded + if encoded: + f.write(perf_results) + else: + json.dump(perf_results, f) + with open(os.path.join(benchmark_path, 'test_results.json'), 'w') as f: + json.dump(json_test_results, f) + + def execute_benchmark(benchmark, isolated_out_dir, args, rest_args, is_reference): # While we are between chartjson and histogram set we need @@ -100,7 +120,7 @@ # Need to append output format. per_benchmark_args = (rest_args[:1] + [benchmark] + rest_args[1:] + [output_format]) - benchmark_path = None + benchmark_name = benchmark if is_reference: # Need to parse out the browser to replace browser flag with # reference build so we run it reference build as well @@ -113,9 +133,7 @@ # Now we need to add in the rest of the reference build args per_benchmark_args.append('--max-failures=5') per_benchmark_args.append('--output-trace-tag=_ref') - benchmark_path = os.path.join(isolated_out_dir, benchmark + '.reference') - else: - benchmark_path = os.path.join(isolated_out_dir, benchmark) + benchmark_name = benchmark + '.reference' # We don't care exactly what these are. In particular, the perf results # could be any format (chartjson, legacy, histogram). We just pass these @@ -124,11 +142,8 @@ run_telemetry_benchmark_as_googletest.run_benchmark( args, per_benchmark_args, is_histograms)) - os.makedirs(benchmark_path) - with open(os.path.join(benchmark_path, 'perf_results.json'), 'w') as f: - json.dump(perf_results, f) - with open(os.path.join(benchmark_path, 'test_results.json'), 'w') as f: - json.dump(json_test_results, f) + write_results( + benchmark_name, perf_results, json_test_results, isolated_out_dir, False) return rc @@ -148,38 +163,52 @@ parser.add_argument( '--isolated-script-test-filter', type=str, required=False) parser.add_argument('--xvfb', help='Start xvfb.', action='store_true') + # TODO(eyaich) We could potentially assume this based on shards == 1 since + # benchmarks will always have multiple shards. + parser.add_argument('--non-telemetry', + help='Type of perf test', type=bool, default=False) parser.add_argument('--testing', help='Testing instance', type=bool, default=False) args, rest_args = parser.parse_known_args() isolated_out_dir = os.path.dirname(args.isolated_script_test_output) - # First determine what shard we are running on to know how to - # index into the bot map to get list of benchmarks to run. - total_shards = None - shard_index = None + if args.non_telemetry: + # For non telemetry tests the benchmark name is the name of the executable. + benchmark_name = rest_args[0] + return_code, charts, output_json = run_gtest_perf_test.execute_perf_test( + args, rest_args) - env = os.environ.copy() - if 'GTEST_TOTAL_SHARDS' in env: - total_shards = env['GTEST_TOTAL_SHARDS'] - if 'GTEST_SHARD_INDEX' in env: - shard_index = env['GTEST_SHARD_INDEX'] + write_results(benchmark_name, charts, output_json, isolated_out_dir, True) + else: + # First determine what shard we are running on to know how to + # index into the bot map to get list of benchmarks to run. + total_shards = None + shard_index = None - if not (total_shards or shard_index): - raise Exception('Shard indicators must be present for perf tests') + env = os.environ.copy() + if 'GTEST_TOTAL_SHARDS' in env: + total_shards = env['GTEST_TOTAL_SHARDS'] + if 'GTEST_SHARD_INDEX' in env: + shard_index = env['GTEST_SHARD_INDEX'] - sharding_map_path = get_sharding_map_path(total_shards, args.testing or False) - with open(sharding_map_path) as f: - sharding_map = json.load(f) - sharding = None - sharding = sharding_map[shard_index]['benchmarks'] - return_code = 0 + if not (total_shards or shard_index): + raise Exception('Shard indicators must be present for perf tests') - for benchmark in sharding: - return_code = (execute_benchmark( - benchmark, isolated_out_dir, args, rest_args, False) or return_code) - return_code = (execute_benchmark( - benchmark, isolated_out_dir, args, rest_args, True) or return_code) + sharding_map_path = get_sharding_map_path( + total_shards, args.testing or False) + with open(sharding_map_path) as f: + sharding_map = json.load(f) + sharding = None + sharding = sharding_map[shard_index]['benchmarks'] + return_code = 0 + + for benchmark in sharding: + return_code = (execute_benchmark( + benchmark, isolated_out_dir, args, rest_args, False) or return_code) + return_code = (execute_benchmark( + benchmark, isolated_out_dir, args, rest_args, True) or return_code) + return return_code # This is not really a "script test" so does not need to manually add
diff --git a/third_party/WebKit/LayoutTests/NeverFixTests b/third_party/WebKit/LayoutTests/NeverFixTests index 5bc6964e..ef453e9b 100644 --- a/third_party/WebKit/LayoutTests/NeverFixTests +++ b/third_party/WebKit/LayoutTests/NeverFixTests
@@ -312,6 +312,8 @@ external/wpt/encrypted-media/drm-mp4-playback-temporary-multikey-sequential.https.html [ WontFix ] external/wpt/encrypted-media/drm-mp4-playback-temporary-multikey-sequential-readyState.https.html [ WontFix ] external/wpt/encrypted-media/drm-mp4-playback-temporary-multisession.https.html [ WontFix ] +external/wpt/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html [ WontFix ] +external/wpt/encrypted-media/drm-mp4-playback-temporary-playduration.html [ WontFix ] external/wpt/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-src.https.html [ WontFix ] external/wpt/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-after-update.https.html [ WontFix ] external/wpt/encrypted-media/drm-mp4-playback-temporary-setMediaKeys-immediately.https.html [ WontFix ]
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 25d429a..21c89cdc 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -2899,7 +2899,6 @@ crbug.com/755405 [ Android ] tables/mozilla_expected_failures/bugs/bug1055-2.html [ Failure ] crbug.com/755405 [ Android ] tables/mozilla_expected_failures/bugs/bug2479-5.html [ Failure ] crbug.com/755405 [ Android ] virtual/layout_ng/fast/block/margin-collapse/019.html [ Failure Crash ] -crbug.com/755405 [ Android ] fast/scrolling/scrollable-area-overflow-auto-display-none-in-parent.html [ Failure ] crbug.com/755405 [ Android ] compositing/sibling-positioning.html [ Failure ] crbug.com/755405 [ Android ] css3/selectors3/html/css3-modsel-18.html [ Failure Crash ] crbug.com/755405 [ Android ] css3/selectors3/html/css3-modsel-61.html [ Failure Crash ] @@ -3357,12 +3356,8 @@ ################################################################################ # Root Layer Scrolling expectations -crbug.com/417782 [ Android ] fast/scrolling/scrollable-area-overflow-auto-display-none.html [ Failure Pass ] -crbug.com/417782 [ Android ] fast/scrolling/scrollable-area-overflow-not-set.html [ Failure Crash Pass ] crbug.com/417782 paint/invalidation/window-resize/window-resize-vertical-writing-mode.html [ Crash ] crbug.com/417782 virtual/disable-spv175/paint/invalidation/window-resize/window-resize-vertical-writing-mode.html [ Skip ] -crbug.com/417782 [ Linux ] virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html [ Failure ] -crbug.com/417782 virtual/scroll_customization/fast/events/touch/compositor-touch-hit-rects-iframes.html [ Failure ] # End of Root Layer Scrolling expectations ################################################################################
diff --git a/third_party/WebKit/LayoutTests/animations/composition/clip-path-composition.html b/third_party/WebKit/LayoutTests/animations/composition/clip-path-composition.html new file mode 100644 index 0000000..5b6b0f8 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/composition/clip-path-composition.html
@@ -0,0 +1,182 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<body> +<script src="../interpolation/resources/interpolation-test.js"></script> +<script> +assertComposition({ + property: 'clip-path', + underlying: 'circle(100px at 25px 25%)', + addFrom: 'circle(10px at 25px 75%)', + addTo: 'circle(50px at 50px center)', +}, [ + {at: -0.3, is: 'circle(98px at 42.5px 107.5%)'}, + {at: 0, is: 'circle(110px at 50px 100%)'}, + {at: 0.3, is: 'circle(122px at 57.5px 92.5%)'}, + {at: 0.6, is: 'circle(134px at 65px 85%)'}, + {at: 1, is: 'circle(150px at 75px 75%)'}, + {at: 1.5, is: 'circle(170px at 87.5px 62.5%)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'circle(100px at 20px 20%)', + addFrom: 'circle(50px at 50px 50%)', + replaceTo: 'circle(50% at 150px 150%)', +}, [ + {at: -0.3, is: 'circle(calc(195px + -15%) at 46px 46%)'}, + {at: 0, is: 'circle(150px at 70px 70%)'}, + {at: 0.3, is: 'circle(calc(105px + 15%) at 94px 94%)'}, + {at: 0.6, is: 'circle(calc(60px + 30%) at 118px 118%)'}, + {at: 1, is: 'circle(50% at 150px 150%)'}, + {at: 1.5, is: 'circle(calc(-75px + 75%) at 190px 190%)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'circle(farthest-side at 25px 75%)', + addFrom: 'circle(farthest-side at 25px 75%)', + addTo: 'circle(farthest-side at 50px center)', +}, [ + {at: 0.25, is: 'circle(farthest-side at 25px 75%)'}, + {at: 0.75, is: 'circle(farthest-side at 50px 50%)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'circle(50px at 10px 20px)', + addFrom: 'circle(50px at 10px 20px)', + addTo: 'circle(farthest-side at 30px 40px)', +}, [ + {at: 0.25, is: 'circle(100px at 20px 40px)'}, + {at: 0.75, is: 'circle(farthest-side at 30px 40px)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'ellipse(10px 20px at 30px 40px)', + addFrom: 'ellipse(40px 30px at 20px 10px)', + addTo: 'ellipse(140px 130px at 120px 110px)', +}, [ + {at: -0.3, is: 'ellipse(20px 20px at 20px 20px)'}, + {at: 0, is: 'ellipse(50px 50px at 50px 50px)'}, + {at: 0.3, is: 'ellipse(80px 80px at 80px 80px)'}, + {at: 0.6, is: 'ellipse(110px 110px at 110px 110px)'}, + {at: 1, is: 'ellipse(150px 150px at 150px 150px)'}, + {at: 1.5, is: 'ellipse(200px 200px at 200px 200px)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'ellipse(10px 20px at 30px 40px)', + replaceFrom: 'ellipse(40px 30px at 20px 10px)', + addTo: 'ellipse(40px 30px at 20px 10px)', +}, [ + {at: -0.3, is: 'ellipse(37px 24px at 11px -2px)'}, + {at: 0, is: 'ellipse(40px 30px at 20px 10px)'}, + {at: 0.3, is: 'ellipse(43px 36px at 29px 22px)'}, + {at: 0.6, is: 'ellipse(46px 42px at 38px 34px)'}, + {at: 1, is: 'ellipse(50px 50px at 50px 50px)'}, + {at: 1.5, is: 'ellipse(55px 60px at 65px 70px)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'ellipse(25px 75%)', + addFrom: 'ellipse()', + addTo: 'ellipse(closest-side farthest-side)', +}, [ + {at: 0.25, is: 'ellipse(at 50% 50%)'}, + {at: 0.75, is: 'ellipse(closest-side farthest-side at 50% 50%)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'inset(20px)', + addFrom: 'inset(20px)', + addTo: 'inset(40%)', +}, [ + {at: -0.3, is: 'inset(calc(46px + -12%))'}, + {at: 0, is: 'inset(40px)'}, + {at: 0.3, is: 'inset(calc(34px + 12%))'}, + {at: 0.6, is: 'inset(calc(28px + 24%))'}, + {at: 1, is: 'inset(calc(20px + 40%))'}, + {at: 1.5, is: 'inset(calc(10px + 60%))'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'inset(1px 2px 3px 4px round 10px 20px 30px 40px / 50px 60px 70px 80px)', + addFrom: 'inset(1px 2px 3px 4px round 10px 20px 30px 40px / 50px 60px 70px 80px)', + replaceTo: 'inset(102px 104px 106px 108px round 120px 140px 160px 180px / 200px 220px 240px 260px)', +}, [ + {at: -0.3, is: 'inset(-28px -26px -24px -22px round 0px 10px 30px 50px / 70px 90px 110px 130px)'}, + {at: 0, is: 'inset(2px 4px 6px 8px round 20px 40px 60px 80px / 100px 120px 140px 160px)'}, + {at: 0.25, is: 'inset(27px 29px 31px 33px round 45px 65px 85px 105px / 125px 145px 165px 185px)'}, + {at: 0.75, is: 'inset(77px 79px 81px 83px round 95px 115px 135px 155px / 175px 195px 215px 235px)'}, + {at: 1, is: 'inset(102px 104px 106px 108px round 120px 140px 160px 180px / 200px 220px 240px 260px)'}, + {at: 1.5, is: 'inset(152px 154px 156px 158px round 170px 190px 210px 230px / 250px 270px 290px 310px)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'inset(1px 2px round 100px 200px)', + addFrom: 'inset(1px 2px round 100px 200px)', + addTo: 'inset(101px 102px 101px 102px)', +}, [ + {at: -0.3, is: 'inset(-28px -26px round 230px 460px)'}, + {at: 0, is: 'inset(2px 4px round 200px 400px)'}, + {at: 0.3, is: 'inset(32px 34px round 170px 340px)'}, + {at: 0.6, is: 'inset(62px 64px round 140px 280px)'}, + {at: 1, is: 'inset(102px 104px round 100px 200px)'}, + {at: 1.5, is: 'inset(152px 154px round 50px 100px)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'polygon(10px 20%, 30px 40%)', + addFrom: 'polygon(10px 20%, 30px 40%)', + addTo: 'polygon(110px 120%, 130px 140%)', +}, [ + {at: -0.3, is: 'polygon(-10px 10%, 30px 50%)'}, + {at: 0, is: 'polygon(20px 40%, 60px 80%)'}, + {at: 0.3, is: 'polygon(50px 70%, 90px 110%)'}, + {at: 0.6, is: 'polygon(80px 100%, 120px 140%)'}, + {at: 1, is: 'polygon(120px 140%, 160px 180%)'}, + {at: 1.5, is: 'polygon(170px 190%, 210px 230%)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'polygon(evenodd, 10px 20px)', + addFrom: 'polygon(evenodd, 10px 20px)', + addTo: 'polygon(evenodd, 110px 120px)', +}, [ + {at: -0.3, is: 'polygon(evenodd, -10px 10px)'}, + {at: 0, is: 'polygon(evenodd, 20px 40px)'}, + {at: 0.3, is: 'polygon(evenodd, 50px 70px)'}, + {at: 0.6, is: 'polygon(evenodd, 80px 100px)'}, + {at: 1, is: 'polygon(evenodd, 120px 140px)'}, + {at: 1.5, is: 'polygon(evenodd, 170px 190px)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'polygon(evenodd, 10px 20px)', + addFrom: 'polygon(evenodd, 10px 20px)', + addTo: 'polygon(nonzero, 30px 40px)', +}, [ + {at: 0.25, is: 'polygon(evenodd, 20px 40px)'}, + {at: 0.75, is: 'polygon(30px 40px)'}, +]); + +assertComposition({ + property: 'clip-path', + underlying: 'polygon(10px 20px, 30px 40px)', + addFrom: 'polygon(10px 20px, 30px 40px)', + addTo: 'polygon(30px 40px)', +}, [ + {at: 0.25, is: 'polygon(20px 40px, 60px 80px)'}, + {at: 0.75, is: 'polygon(30px 40px)'}, +]); +</script> +</body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/background-position-x-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/background-position-x-interpolation.html new file mode 100644 index 0000000..e279dcc --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/interpolation/background-position-x-interpolation.html
@@ -0,0 +1,70 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<style> +.parent { + background-position-x: 60px; +} +.target { + background-position-x: 40px; +} +</style> +<body> +<script src="resources/interpolation-test.js"></script> +<script> +assertInterpolation({ + property: 'background-position-x', + from: neutralKeyframe, + to: '80px', +}, [ + {at: -0.25, is: '30px'}, + {at: 0, is: '40px'}, + {at: 0.25, is: '50px'}, + {at: 0.5, is: '60px'}, + {at: 0.75, is: '70px'}, + {at: 1, is: '80px'}, + {at: 1.25, is: '90px'}, +]); + +assertInterpolation({ + property: 'background-position-x', + from: 'initial', + to: 'right', +}, [ + {at: -0.25, is: '-25%'}, + {at: 0, is: '0%'}, + {at: 0.25, is: '25%'}, + {at: 0.5, is: '50%'}, + {at: 0.75, is: '75%'}, + {at: 1, is: '100%'}, + {at: 1.25, is: '125%'}, +]); + +assertInterpolation({ + property: 'background-position-x', + from: 'inherit', + to: '80px', +}, [ + {at: -0.25, is: '55px'}, + {at: 0, is: '60px'}, + {at: 0.25, is: '65px'}, + {at: 0.5, is: '70px'}, + {at: 0.75, is: '75px'}, + {at: 1, is: '80px'}, + {at: 1.25, is: '85px'}, +]); + +assertInterpolation({ + property: 'background-position-x', + from: '300px, 400px', + to: '500px, 600px, 700px', +}, [ + {at: -0.25, is: '250px'}, + {at: 0, is: '300px'}, + {at: 0.25, is: '350px'}, + {at: 0.5, is: '400px'}, + {at: 0.75, is: '450px'}, + {at: 1, is: '500px'}, + {at: 1.25, is: '550px'}, +]); +</script> +</body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/background-position-y-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/background-position-y-interpolation.html new file mode 100644 index 0000000..2d516b4 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/interpolation/background-position-y-interpolation.html
@@ -0,0 +1,70 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<style> +.parent { + background-position-y: 60px; +} +.target { + background-position-y: 40px; +} +</style> +<body> +<script src="resources/interpolation-test.js"></script> +<script> +assertInterpolation({ + property: 'background-position-y', + from: neutralKeyframe, + to: '80px', +}, [ + {at: -0.25, is: '30px'}, + {at: 0, is: '40px'}, + {at: 0.25, is: '50px'}, + {at: 0.5, is: '60px'}, + {at: 0.75, is: '70px'}, + {at: 1, is: '80px'}, + {at: 1.25, is: '90px'}, +]); + +assertInterpolation({ + property: 'background-position-y', + from: 'initial', + to: 'bottom', +}, [ + {at: -0.25, is: '-25%'}, + {at: 0, is: '0%'}, + {at: 0.25, is: '25%'}, + {at: 0.5, is: '50%'}, + {at: 0.75, is: '75%'}, + {at: 1, is: '100%'}, + {at: 1.25, is: '125%'}, +]); + +assertInterpolation({ + property: 'background-position-y', + from: 'inherit', + to: '80px', +}, [ + {at: -0.25, is: '55px'}, + {at: 0, is: '60px'}, + {at: 0.25, is: '65px'}, + {at: 0.5, is: '70px'}, + {at: 0.75, is: '75px'}, + {at: 1, is: '80px'}, + {at: 1.25, is: '85px'}, +]); + +assertInterpolation({ + property: 'background-position-y', + from: '300px, 400px', + to: '500px, 600px, 700px', +}, [ + {at: -0.25, is: '250px'}, + {at: 0, is: '300px'}, + {at: 0.25, is: '350px'}, + {at: 0.5, is: '400px'}, + {at: 0.75, is: '450px'}, + {at: 1, is: '500px'}, + {at: 1.25, is: '550px'}, +]); +</script> +</body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/border-color-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/border-color-interpolation.html index ddc7cf8..de75b9f 100644 --- a/third_party/WebKit/LayoutTests/animations/interpolation/border-color-interpolation.html +++ b/third_party/WebKit/LayoutTests/animations/interpolation/border-color-interpolation.html
@@ -84,5 +84,18 @@ {at: 1, is: 'orange'}, {at: 1.5, is: 'rgb(255, 120, 0)'}, ]); + +assertInterpolation({ + property: 'border-color', + from: 'rgb(20, 30, 40) rgb(40, 50, 60)', + to: 'rgb(10, 20, 30) rgb(40, 50, 60) rgb(30, 40, 50) rgb(50, 60, 70)' +}, [ + {at: -0.3, is: 'rgb(23, 33, 43) rgb(40, 50, 60) rgb(17, 27, 37) rgb(37, 47, 57)'}, + {at: 0, is: 'rgb(20, 30, 40) rgb(40, 50, 60)'}, + {at: 0.3, is: 'rgb(17, 27, 37) rgb(40, 50, 60) rgb(23, 33, 43) rgb(43, 53, 63)'}, + {at: 0.6, is: 'rgb(14, 24, 34) rgb(40, 50, 60) rgb(26, 36, 46) rgb(46, 56, 66)'}, + {at: 1, is: 'rgb(10, 20, 30) rgb(40, 50, 60) rgb(30, 40, 50) rgb(50, 60, 70)'}, + {at: 1.5, is: 'rgb(5, 15, 25) rgb(40, 50, 60) rgb(35, 45, 55) rgb(55, 65, 75)'}, +]); </script> </body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/border-radius-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/border-radius-interpolation.html index 0da4ecd3..89a30ddb 100644 --- a/third_party/WebKit/LayoutTests/animations/interpolation/border-radius-interpolation.html +++ b/third_party/WebKit/LayoutTests/animations/interpolation/border-radius-interpolation.html
@@ -94,5 +94,32 @@ {at: 1, is: '100%'}, {at: 1.5, is: 'calc(-5px + 150%)'}, ]); + +assertInterpolation({ + property: 'border-top-left-radius', + from: '20px', + to: '10px 30px' +}, [ + {at: -2, is: '40px 0px'}, + {at: -0.3, is: '23px 17px'}, + {at: 0, is: '20px'}, + {at: 0.3, is: '17px 23px'}, + {at: 0.6, is: '14px 26px'}, + {at: 1, is: '10px 30px'}, + {at: 1.5, is: '5px 35px'} +]); + +assertInterpolation({ + property: 'border-radius', + from: '20px 40px 60px 80px / 120px 140px 160px 180px', + to: '30px 50px 70px 90px / 130px 150px 170px 190px' +}, [ + {at: -0.3, is: '17px 37px 57px 77px / 117px 137px 157px 177px'}, + {at: 0, is: '20px 40px 60px 80px / 120px 140px 160px 180px'}, + {at: 0.3, is: '23px 43px 63px 83px / 123px 143px 163px 183px'}, + {at: 0.6, is: '26px 46px 66px 86px / 126px 146px 166px 186px'}, + {at: 1, is: '30px 50px 70px 90px / 130px 150px 170px 190px'}, + {at: 1.5, is: '35px 55px 75px 95px / 135px 155px 175px 195px'} +]); </script> </body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/border-width-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/border-width-interpolation.html index 92f75d5..03aba3b 100644 --- a/third_party/WebKit/LayoutTests/animations/interpolation/border-width-interpolation.html +++ b/third_party/WebKit/LayoutTests/animations/interpolation/border-width-interpolation.html
@@ -140,5 +140,18 @@ {at: 1, is: '5px'}, {at: 1.5, is: '0px'} ]); + +assertInterpolation({ + property: 'border-width', + from: '20px 40px 60px 80px', + to: '30px 50px 70px 90px' +}, [ + {at: -0.3, is: '17px 37px 57px 77px'}, + {at: 0, is: '20px 40px 60px 80px'}, + {at: 0.3, is: '23px 43px 63px 83px'}, + {at: 0.6, is: '26px 46px 66px 86px'}, + {at: 1, is: '30px 50px 70px 90px'}, + {at: 1.5, is: '35px 55px 75px 95px'} +]); </script> </body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/clip-path-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/clip-path-interpolation.html new file mode 100644 index 0000000..90466d44 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/interpolation/clip-path-interpolation.html
@@ -0,0 +1,138 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<style> +.parent { + clip-path: circle(80% at 30% 10%); +} +.target { + clip-path: circle(60% at 10% 30%); +} +</style> +<body> +<script src="resources/interpolation-test.js"></script> +<script> +/* TODO: add inset test once blend() works for it */ + +assertInterpolation({ + property: 'clip-path', + from: neutralKeyframe, + to: 'circle(40% at 20% 20%)', +}, [ + {at: -0.3, is: 'circle(66% at 7% 33%)'}, + {at: 0, is: 'circle(60% at 10% 30%)'}, + {at: 0.3, is: 'circle(54% at 13% 27%)'}, + {at: 0.6, is: 'circle(48% at 16% 24%)'}, + {at: 1, is: 'circle(40% at 20% 20%)'}, + {at: 1.5, is: 'circle(30% at 25% 15%)'}, +]); + +assertNoInterpolation({ + property: 'clip-path', + from: 'initial', + to: 'circle(40% at 20% 20%)', +}); + +assertInterpolation({ + property: 'clip-path', + from: 'inherit', + to: 'circle(40% at 20% 20%)', +}, [ + {at: -0.3, is: 'circle(92% at 33% 7%)'}, + {at: 0, is: 'circle(80% at 30% 10%)'}, + {at: 0.3, is: 'circle(68% at 27% 13%)'}, + {at: 0.6, is: 'circle(56% at 24% 16%)'}, + {at: 1, is: 'circle(40% at 20% 20%)'}, + {at: 1.5, is: 'circle(20% at 15% 25%)'}, +]); + +assertNoInterpolation({ + property: 'clip-path', + from: 'unset', + to: 'circle(40% at 20% 20%)', +}); + +assertInterpolation({ + property: 'clip-path', + from: 'circle(100% at 0% 0%)', + to: 'circle(50% at 25% 25%)', +}, [ + {at: -0.3, is: 'circle(115% at -7.5% -7.5%)'}, + {at: 0, is: 'circle(100% at 0% 0%)'}, + {at: 0.3, is: 'circle(85% at 7.5% 7.5%)'}, + {at: 0.6, is: 'circle(70% at 15% 15%)'}, + {at: 1, is: 'circle(50% at 25% 25%)'}, + {at: 1.5, is: 'circle(25% at 37.5% 37.5%)'} +]); + +assertInterpolation({ + property: 'clip-path', + from: 'ellipse(100% 100% at 0% 0%)', + to: 'ellipse(50% 50% at 25% 25%)', +}, [ + {at: -0.3, is: 'ellipse(115% 115% at -7.5% -7.5%)'}, + {at: 0, is: 'ellipse(100% 100% at 0% 0%)'}, + {at: 0.3, is: 'ellipse(85% 85% at 7.5% 7.5%)'}, + {at: 0.6, is: 'ellipse(70% 70% at 15% 15%)'}, + {at: 1, is: 'ellipse(50% 50% at 25% 25%)'}, + {at: 1.5, is: 'ellipse(25% 25% at 37.5% 37.5%)'} +]); + +assertInterpolation({ + property: 'clip-path', + from: 'polygon(nonzero, 0px 0px, 25px 25px, 50px 50px)', + to: 'polygon(nonzero, 25px 25px, 50px 50px, 75px 75px)', +}, [ + {at: -0.3, is: 'polygon(nonzero, -7.5px -7.5px, 17.5px 17.5px, 42.5px 42.5px)'}, + {at: 0, is: 'polygon(nonzero, 0px 0px, 25px 25px, 50px 50px)'}, + {at: 0.3, is: 'polygon(nonzero, 7.5px 7.5px, 32.5px 32.5px, 57.5px 57.5px)'}, + {at: 0.6, is: 'polygon(nonzero, 15px 15px, 40px 40px, 65px 65px)'}, + {at: 1, is: 'polygon(nonzero, 25px 25px, 50px 50px, 75px 75px)'}, + {at: 1.5, is: 'polygon(nonzero, 37.5px 37.5px, 62.5px 62.5px, 87.5px 87.5px)'} +]); + +assertNoInterpolation({ + property: 'clip-path', + from: 'polygon(evenodd, 0px 0px, 25px 25px, 50px 50px)', + to: 'polygon(nonzero, 25px 25px, 50px 50px, 75px 75px)', +}); + +assertInterpolation({ + property: 'clip-path', + from: 'inset(100%)', + to: 'inset(120%)', +}, [ + {at: -0.3, is: 'inset(94%)'}, + {at: 0, is: 'inset(100%)'}, + {at: 0.3, is: 'inset(106%)'}, + {at: 0.6, is: 'inset(112%)'}, + {at: 1, is: 'inset(120%)'}, + {at: 1.5, is: 'inset(130%)'}, +]); + +assertNoInterpolation({ + property: 'clip-path', + from: 'none', + to: 'ellipse(100% 100% at 0% 0%)', +}); + +assertInterpolation({ + property: 'clip-path', + from: 'circle(25% at right 5% bottom 15px)', + to: 'circle(45% at right 25% bottom 35px)', +}, [ + {at: 0.25, is: 'circle(30% at 90% calc(-20px + 100%))'}, + {at: 0.5, is: 'circle(35% at 85% calc(-25px + 100%))'}, + {at: 0.75, is: 'circle(40% at 80% calc(-30px + 100%))'}, +]); + +assertNoInterpolation({ + property: 'clip-path', + from: 'url("/clip-source")', + to: 'ellipse(100% 100% at 0% 0%)', +}); + +// clip-path <geometry-box> support is not yet implemented in Blink. +// crbug.com/694218 + +</script> +</body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/column-rule-color-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/column-rule-color-interpolation.html new file mode 100644 index 0000000..534bfbe9 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/interpolation/column-rule-color-interpolation.html
@@ -0,0 +1,69 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<style> +.parent { + column-count: 2; + column-rule-color: rgb(70, 70, 170); +} +.target { + column-count: 2; + color: rgb(70, 170, 70); + column-rule-color: rgb(170, 70, 70); +} +</style> +<body> +<script src="resources/interpolation-test.js"></script> +<script> +assertInterpolation({ + property: 'column-rule-color', + from: neutralKeyframe, + to: 'rgb(70, 170, 70)', +}, [ + {at: -0.5, is: 'rgb(220, 20, 70)'}, + {at: 0, is: 'rgb(170, 70, 70)'}, + {at: 0.3, is: 'rgb(140, 100, 70)'}, + {at: 0.6, is: 'rgb(110, 130, 70)'}, + {at: 1, is: 'rgb(70, 170, 70)'}, + {at: 1.5, is: 'rgb(20, 220, 70)'}, +]); + +assertInterpolation({ + property: 'column-rule-color', + from: 'initial', + to: 'rgb(70, 70, 170)', +}, [ + {at: -0.5, is: 'rgb(70, 220, 20)'}, + {at: 0, is: 'rgb(70, 170, 70)'}, + {at: 0.3, is: 'rgb(70, 140, 100)'}, + {at: 0.6, is: 'rgb(70, 110, 130)'}, + {at: 1, is: 'rgb(70, 70, 170)'}, + {at: 1.5, is: 'rgb(70, 20, 220)'}, +]); + +assertInterpolation({ + property: 'column-rule-color', + from: 'inherit', + to: 'rgb(70, 170, 70)', +}, [ + {at: -0.5, is: 'rgb(70, 20, 220)'}, + {at: 0, is: 'rgb(70, 70, 170)'}, + {at: 0.3, is: 'rgb(70, 100, 140)'}, + {at: 0.6, is: 'rgb(70, 130, 110)'}, + {at: 1, is: 'rgb(70, 170, 70)'}, + {at: 1.5, is: 'rgb(70, 220, 20)'}, +]); + +assertInterpolation({ + property: 'column-rule-color', + from: 'currentcolor', + to: 'rgb(170, 70, 70)', +}, [ + {at: -0.5, is: 'rgb(20, 220, 70)'}, + {at: 0, is: 'rgb(70, 170, 70)'}, + {at: 0.3, is: 'rgb(100, 140, 70)'}, + {at: 0.6, is: 'rgb(130, 110, 70)'}, + {at: 1, is: 'rgb(170, 70, 70)'}, + {at: 1.5, is: 'rgb(220, 20, 70)'}, +]); +</script> +</body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/column-rule-width.html b/third_party/WebKit/LayoutTests/animations/interpolation/column-rule-width.html new file mode 100644 index 0000000..9e536ab --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/interpolation/column-rule-width.html
@@ -0,0 +1,93 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<style> +.parent { + column-rule-width: 30px; +} +.target { + column-rule-width: 10px; +} +</style> +<body> +<script src="resources/interpolation-test.js"></script> +<script> +assertInterpolation({ + property: 'column-rule-width', + from: neutralKeyframe, + to: '20px', +}, [ + {at: -0.3, is: '7px'}, + {at: 0, is: '10px'}, + {at: 0.3, is: '13px'}, + {at: 0.6, is: '16px'}, + {at: 1, is: '20px'}, + {at: 1.5, is: '25px'}, +]); + +assertInterpolation({ + property: 'column-rule-width', + from: 'initial', + to: '20px', +}, [ + {at: -0.3, is: '0px'}, + {at: 0, is: '3px'}, + {at: 0.3, is: '8.1px'}, + {at: 0.6, is: '13.2px'}, + {at: 1, is: '20px'}, + {at: 1.5, is: '28.5px'}, +]); + +assertInterpolation({ + property: 'column-rule-width', + from: 'inherit', + to: '20px', +}, [ + {at: -0.3, is: '0px'}, + {at: 0, is: '0px'}, + {at: 0.3, is: '6px'}, + {at: 0.6, is: '12px'}, + {at: 1, is: '20px'}, + {at: 1.5, is: '30px'}, +]); + +assertInterpolation({ + property: 'column-rule-width', + from: 'unset', + to: '20px', +}, [ + {at: -0.3, is: '0px'}, + {at: 0, is: '3px'}, + {at: 0.3, is: '8.1px'}, + {at: 0.6, is: '13.2px'}, + {at: 1, is: '20px'}, + {at: 1.5, is: '28.5px'}, +]); + +assertInterpolation({ + property: 'column-rule-width', + from: '0px', + to: '10px' +}, [ + {at: -0.3, is: '0px'}, // CSS column-rule-width can't be negative. + {at: 0, is: '0px'}, + {at: 0.3, is: '3px'}, + {at: 0.6, is: '6px'}, + {at: 1, is: '10px'}, + {at: 1.5, is: '15px'} +]); + +assertInterpolation({ + property: 'column-rule-width', + from: '15px', + to: 'thick' +}, [ + {at: -2, is: '35px'}, + {at: -0.3, is: '18px'}, + {at: 0, is: '15px'}, + {at: 0.3, is: '12px'}, + {at: 0.6, is: '9px'}, + {at: 1, is: '5px'}, + {at: 1.5, is: '0px'} +]); +</script> +</body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/column-width-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/column-width-interpolation.html new file mode 100644 index 0000000..2dcb54f --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/interpolation/column-width-interpolation.html
@@ -0,0 +1,82 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<style> +.parent { + column-width: 30px; +} +.target { + font-size: 0px; // column-width "specified values must be greater than 0", so use font-size to achieve 0px computed value. + display: inline-block; + column-width: 10px; +} +</style> +<body> +<template id="target-template"> +<div><div class="transformed"></div></div> +</template> +<script src="resources/interpolation-test.js"></script> +<script> +assertInterpolation({ + property: 'column-width', + from: neutralKeyframe, + to: '20px', +}, [ + {at: -20, is: '1em'}, // column-width does not accept negative values + {at: -1, is: '1em'}, // column-width does not accept negative values + {at: -0.3, is: '7px'}, + {at: 0, is: '10px'}, + {at: 0.3, is: '13px'}, + {at: 0.6, is: '16px'}, + {at: 1, is: '20px'}, + {at: 1.5, is: '25px'}, +]); + +assertNoInterpolation({ + property: 'column-width', + from: 'initial', + to: '20px', +}); + +assertInterpolation({ + property: 'column-width', + from: 'inherit', + to: '20px', +}, [ + {at: -20, is: '230px'}, + {at: -1, is: '40px'}, + {at: -0.3, is: '33px'}, + {at: 0, is: '30px'}, + {at: 0.3, is: '27px'}, + {at: 0.6, is: '24px'}, + {at: 1, is: '20px'}, + {at: 1.5, is: '15px'}, +]); + +assertNoInterpolation({ + property: 'column-width', + from: 'unset', + to: '20px', +}); + +assertInterpolation({ + property: 'column-width', + from: '50px', + to: '100px', +}, [ + {at: -20, is: '1em'}, // column-width does not accept negative values + {at: -1, is: '1em'}, // column-width does not accept negative values + {at: -0.3, is: '35px'}, + {at: 0, is: '50px'}, + {at: 0.3, is: '65px'}, + {at: 0.6, is: '80px'}, + {at: 1, is: '100px'}, + {at: 1.5, is: '125px'}, +]); + +assertNoInterpolation({ + property: 'column-width', + from: '50px', + to: 'auto', +}); +</script> +</body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/margin-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/margin-interpolation.html index b6cc630..bbd849e 100644 --- a/third_party/WebKit/LayoutTests/animations/interpolation/margin-interpolation.html +++ b/third_party/WebKit/LayoutTests/animations/interpolation/margin-interpolation.html
@@ -90,5 +90,18 @@ {at: 1, is: '10px'}, {at: 1.5, is: '15px'} ]); + +assertInterpolation({ + property: 'margin', + from: '20px 40px 60px 80px', + to: '30px 50px 70px 90px' +}, [ + {at: -0.3, is: '17px 37px 57px 77px'}, + {at: 0, is: '20px 40px 60px 80px'}, + {at: 0.3, is: '23px 43px 63px 83px'}, + {at: 0.6, is: '26px 46px 66px 86px'}, + {at: 1, is: '30px 50px 70px 90px'}, + {at: 1.5, is: '35px 55px 75px 95px'} +]); </script> </body>
diff --git a/third_party/WebKit/LayoutTests/animations/interpolation/padding-interpolation.html b/third_party/WebKit/LayoutTests/animations/interpolation/padding-interpolation.html index 70d5c54..30fa440 100644 --- a/third_party/WebKit/LayoutTests/animations/interpolation/padding-interpolation.html +++ b/third_party/WebKit/LayoutTests/animations/interpolation/padding-interpolation.html
@@ -83,6 +83,19 @@ {at: 1, is: '10px'}, {at: 1.5, is: '15px'} ]); + +assertInterpolation({ + property: 'padding', + from: '20px 40px 60px 80px', + to: '30px 50px 70px 90px' +}, [ + {at: -0.3, is: '17px 37px 57px 77px'}, + {at: 0, is: '20px 40px 60px 80px'}, + {at: 0.3, is: '23px 43px 63px 83px'}, + {at: 0.6, is: '26px 46px 66px 86px'}, + {at: 1, is: '30px 50px 70px 90px'}, + {at: 1.5, is: '35px 55px 75px 95px'} +]); </script> </body>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-baselineShift.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-baselineShift.html new file mode 100644 index 0000000..4c2e6f0 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-baselineShift.html
@@ -0,0 +1,43 @@ +<!DOCTYPE html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> + +<svg> + <text> + <tspan id='container'> + <tspan id='element'></tspan> + </tspan> + </text> +</svg> + +<script> +var element = document.getElementById('element'); +var container = document.getElementById('container'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{baselineShift: '3em'}, {baselineShift: '5em'}], 10); + player.pause(); + player.currentTime = 5; + element.style.fontSize = '20px'; + assert_equals(getComputedStyle(element).baselineShift, '80px'); +}, 'baselineShift responsive to style changes'); + +test(function() { + container.style.baselineShift = 'sub'; + var player = element.animate([{baselineShift: 'inherit'}, {baselineShift: '20px'}], 4000); + player.pause(); + + player.currentTime = 1000; + assert_equals(getComputedStyle(element).baselineShift, 'sub'); + + container.style.baselineShift = 'super'; + assert_equals(getComputedStyle(element).baselineShift, 'super'); + + container.style.baselineShift = '100px'; + assert_equals(getComputedStyle(element).baselineShift, '80px'); + + container.style.baselineShift = 'sub'; + assert_equals(getComputedStyle(element).baselineShift, 'sub'); +}, 'baselineShift responsive to inherited changes'); +</script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-clip.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-clip.html new file mode 100644 index 0000000..fb92a2f --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-clip.html
@@ -0,0 +1,45 @@ +<!DOCTYPE html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> +<div id='container'> + <div id='element'></div> +</div> +<script> + +var container = document.getElementById('container'); +var element = document.getElementById('element'); + +test(function() { + var keyframes = [ + {clip: 'inherit'}, + {clip: 'rect(10px, 20px, 30px, 40px)'} + ]; + + container.style.clip = 'rect(10px, 20px, 30px, 40px)'; + var player = element.animate(keyframes, 20); + + player.pause(); + player.currentTime = 5; + assert_equals(getComputedStyle(element).clip, 'rect(10px, 20px, 30px, 40px)'); + + container.style.clip = 'rect(10px, 20px, 430px, 440px)'; + assert_equals(getComputedStyle(element).clip, 'rect(10px, 20px, 330px, 340px)'); +}, 'clip responsive to inherited clip changes'); + +test(function() { + var keyframes = [ + {clip: 'inherit'}, + {clip: 'rect(10px, 20px, 30px, auto)'} + ]; + + container.style.clip = 'auto'; + var player = element.animate(keyframes, 20); + + player.pause(); + player.currentTime = 5; + assert_equals(getComputedStyle(element).clip, 'auto'); + + container.style.clip = 'rect(410px, 420px, 30px, auto)'; + assert_equals(getComputedStyle(element).clip, 'rect(310px, 320px, 30px, auto)'); +}, 'clip responsive to inherited clip changes from auto'); +</script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-columnGap.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-columnGap.html new file mode 100644 index 0000000..ccc5c053 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-columnGap.html
@@ -0,0 +1,49 @@ +<!DOCTYPE html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> + +<div id='container'> +<div id='element'></div> +</div> + +<script> +var element = document.getElementById('element'); +var container = document.getElementById('container'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{columnGap: '3em'}, {columnGap: '5em'}], 10); + player.pause(); + player.currentTime = 5; + element.style.fontSize = '20px'; + assert_equals(getComputedStyle(element).columnGap, '80px'); +}, 'column-gap responsive to style changes'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{columnGap: '40px'}, {columnGap: 'calc(40px - 2em)'}], 10); + player.pause(); + + player.currentTime = 5; + element.style.fontSize = '40px'; + assert_equals(getComputedStyle(element).columnGap, '0px'); + + player.currentTime = 7.5; + assert_equals(getComputedStyle(element).columnGap, '0px'); +}, 'column-gap clamped to 0px'); + +test(function() { + container.style.columnGap = 'normal'; + var player = element.animate([{columnGap: 'inherit'}, {columnGap: '20px'}], 4000); + player.pause(); + + player.currentTime = 1000; + assert_equals(getComputedStyle(element).columnGap, 'normal'); + + container.style.columnGap = '100px'; + assert_equals(getComputedStyle(element).columnGap, '80px'); + + container.style.columnGap = 'normal'; + assert_equals(getComputedStyle(element).columnGap, 'normal'); +}, 'column-gap responsive to inherited changes'); +</script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-columnWidth.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-columnWidth.html new file mode 100644 index 0000000..10c598a --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-columnWidth.html
@@ -0,0 +1,49 @@ +<!DOCTYPE html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> + +<div id='container'> +<div id='element'></div> +</div> + +<script> +var element = document.getElementById('element'); +var container = document.getElementById('container'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{columnWidth: '3em'}, {columnWidth: '5em'}], 10); + player.pause(); + player.currentTime = 5; + element.style.fontSize = '20px'; + assert_equals(getComputedStyle(element).columnWidth, '80px'); +}, 'column-width responsive to style changes'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{columnWidth: '40px'}, {columnWidth: 'calc(40px - 2em)'}], 10); + player.pause(); + + player.currentTime = 5; + element.style.fontSize = '40px'; + assert_equals(getComputedStyle(element).columnWidth, '0px'); + + player.currentTime = 7.5; + assert_equals(getComputedStyle(element).columnWidth, '0px'); +}, 'column-width clamped to 0px'); + +test(function() { + container.style.columnWidth = 'auto'; + var player = element.animate([{columnWidth: 'inherit'}, {columnWidth: '20px'}], 4000); + player.pause(); + + player.currentTime = 1000; + assert_equals(getComputedStyle(element).columnWidth, 'auto'); + + container.style.columnWidth = '100px'; + assert_equals(getComputedStyle(element).columnWidth, '80px'); + + container.style.columnWidth = 'auto'; + assert_equals(getComputedStyle(element).columnWidth, 'auto'); +}, 'column-width responsive to inherited changes'); +</script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-lineHeight.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-lineHeight.html new file mode 100644 index 0000000..4c63b32 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-lineHeight.html
@@ -0,0 +1,80 @@ +<!DOCTYPE html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> + +<div id='container'> +<div id='element'></div> +</div> + +<script> +var element = document.getElementById('element'); +var container = document.getElementById('container'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{lineHeight: '3em'}, {lineHeight: '5em'}], 10); + player.pause(); + player.currentTime = 5; + element.style.fontSize = '20px'; + assert_equals(getComputedStyle(element).lineHeight, '80px'); +}, 'lineHeight responsive to style changes'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{lineHeight: '40px'}, {lineHeight: 'calc(40px - 2em)'}], 10); + player.pause(); + + player.currentTime = 5; + element.style.fontSize = '40px'; + assert_equals(getComputedStyle(element).lineHeight, '0px'); + + player.currentTime = 7.5; + assert_equals(getComputedStyle(element).lineHeight, '0px'); +}, 'lineHeight clamped to 0px'); + +test(function() { + container.style.lineHeight = 'normal'; + var player = element.animate([{lineHeight: 'inherit'}, {lineHeight: '20px'}], 4000); + player.pause(); + + player.currentTime = 1000; + assert_equals(getComputedStyle(element).lineHeight, 'normal'); + + container.style.lineHeight = '100px'; + assert_equals(getComputedStyle(element).lineHeight, '80px'); + + container.style.lineHeight = 'normal'; + assert_equals(getComputedStyle(element).lineHeight, 'normal'); +}, 'lineHeight responsive to inherited changes from keyword'); + +test(function() { + container.style.fontSize = '10px'; + container.style.lineHeight = '1.0'; + const expected = getComputedStyle(container).lineHeight; + var player = element.animate([{lineHeight: 'inherit'}, {lineHeight: '20px'}], 4000); + player.pause(); + + player.currentTime = 1000; + getComputedStyle(element).lineHeight; + + container.style.lineHeight = '100px'; + assert_equals(getComputedStyle(element).lineHeight, '80px'); +}, 'lineHeight responsive to inherited changes from number'); + +test(function() { + container.style.fontSize = '10px'; + container.style.lineHeight = '1'; + var player = element.animate([{lineHeight: 'inherit'}, {lineHeight: '2'}], 4000); + player.pause(); + + player.currentTime = 1000; + const expected = getComputedStyle(element).lineHeight; + + container.style.lineHeight = '97px'; + assert_equals(getComputedStyle(element).lineHeight, '97px'); + + container.style.lineHeight = '1'; + assert_equals(getComputedStyle(element).lineHeight, expected); +}, 'lineHeight responsive to inherited changes from length'); + +</script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-perspective.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-perspective.html index 7b79f49..6f45c9e9 100644 --- a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-perspective.html +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-perspective.html
@@ -32,4 +32,18 @@ assert_equals(getComputedStyle(element).perspective, 'none'); }, 'perspective clamped to none'); +test(function() { + container.style.perspective = 'none'; + var player = element.animate([{perspective: 'inherit'}, {perspective: '20px'}], 4000); + player.pause(); + + player.currentTime = 1000; + assert_equals(getComputedStyle(element).perspective, 'none'); + + container.style.perspective = '100px'; + assert_equals(getComputedStyle(element).perspective, '80px'); + + container.style.perspective = 'none'; + assert_equals(getComputedStyle(element).perspective, 'none'); +}, 'perspective responsive to inherited changes'); </script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-rowGap.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-rowGap.html new file mode 100644 index 0000000..1c9ba12e --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-rowGap.html
@@ -0,0 +1,49 @@ +<!DOCTYPE html> +<script src="../../resources/testharness.js"></script> +<script src="../../resources/testharnessreport.js"></script> + +<div id='container'> +<div id='element'></div> +</div> + +<script> +var element = document.getElementById('element'); +var container = document.getElementById('container'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{rowGap: '3em'}, {rowGap: '5em'}], 10); + player.pause(); + player.currentTime = 5; + element.style.fontSize = '20px'; + assert_equals(getComputedStyle(element).rowGap, '80px'); +}, 'row-gap responsive to style changes'); + +test(function() { + element.style.fontSize = '10px'; + var player = element.animate([{rowGap: '40px'}, {rowGap: 'calc(40px - 2em)'}], 10); + player.pause(); + + player.currentTime = 5; + element.style.fontSize = '40px'; + assert_equals(getComputedStyle(element).rowGap, '0px'); + + player.currentTime = 7.5; + assert_equals(getComputedStyle(element).rowGap, '0px'); +}, 'row-gap clamped to 0px'); + +test(function() { + container.style.rowGap = 'normal'; + var player = element.animate([{rowGap: 'inherit'}, {rowGap: '20px'}], 4000); + player.pause(); + + player.currentTime = 1000; + assert_equals(getComputedStyle(element).rowGap, 'normal'); + + container.style.rowGap = '100px'; + assert_equals(getComputedStyle(element).rowGap, '80px'); + + container.style.rowGap = 'normal'; + assert_equals(getComputedStyle(element).rowGap, 'normal'); +}, 'row-gap responsive to inherited changes'); +</script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-to-color-change.html b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-to-color-change.html index 959581b..ed09de8 100644 --- a/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-to-color-change.html +++ b/third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-to-color-change.html
@@ -17,7 +17,7 @@ <a href='' id='visited'><div id='visitedchild'>Visited</div></a> <script> - +'use strict'; var container = document.getElementById('container'); var child = document.getElementById('child'); var element = document.getElementById('element'); @@ -234,4 +234,20 @@ assert_equals(getComputedStyle(unvisitedChild).color, getComputedStyle(visitedChild).color); }, 'Color animations do not expose parent visited status'); +test(function() { + var keyframes = [ + {columnRuleColor: 'inherit'}, + {columnRuleColor: 'rgb(70, 70, 170)'} + ]; + + container.style.columnRuleColor = 'rgb(170, 70, 70)'; + var player = child.animate(keyframes, 10); + + player.pause(); + player.currentTime = 5; + assert_equals(getComputedStyle(child).columnRuleColor, 'rgb(120, 70, 120)'); + + container.style.columnRuleColor = 'rgb(70, 170, 70)'; + assert_equals(getComputedStyle(child).columnRuleColor, 'rgb(70, 120, 120)'); +}, 'Color animations respond to inherited changes'); </script>
diff --git a/third_party/WebKit/LayoutTests/animations/responsive/interpolation/clip-path-responsive.html b/third_party/WebKit/LayoutTests/animations/responsive/interpolation/clip-path-responsive.html new file mode 100644 index 0000000..e9dbef16 --- /dev/null +++ b/third_party/WebKit/LayoutTests/animations/responsive/interpolation/clip-path-responsive.html
@@ -0,0 +1,59 @@ +<!DOCTYPE html> +<script src="resources/responsive-test.js"></script> +<script> +assertCSSResponsive({ + property: 'clip-path', + from: neutralKeyframe, + to: 'circle(100px at 200px 300px)', + configurations: [{ + state: {underlying: 'inset(50px)'}, + expect: [ + {at: 0.25, is: 'inset(50px)'}, + {at: 0.75, is: 'circle(100px at 200px 300px)'}, + ], + }, { + state: {underlying: 'circle(200px at 0px 0px)'}, + expect: [ + {at: 0.25, is: 'circle(175px at 50px 75px)'}, + {at: 0.75, is: 'circle(125px at 150px 225px)'}, + ], + }], +}); + +assertCSSResponsive({ + property: 'clip-path', + from: 'inherit', + to: 'polygon(140px 240px, 340px 440px)', + configurations: [{ + state: {inherited: 'polygon(100px 200px, 300px 400px, 500px 600px)'}, + expect: [ + {at: 0.25, is: 'polygon(100px 200px, 300px 400px, 500px 600px)'}, + {at: 0.75, is: 'polygon(140px 240px, 340px 440px)'}, + ], + }, { + state: {inherited: 'polygon(100px 200px, 300px 400px)'}, + expect: [ + {at: 0.25, is: 'polygon(110px 210px, 310px 410px)'}, + {at: 0.75, is: 'polygon(130px 230px, 330px 430px)'}, + ], + }, { + state: {inherited: 'url("/clip-source")'}, + expect: [ + {at: 0.25, is: 'url("/clip-source")'}, + {at: 0.75, is: 'polygon(140px 240px, 340px 440px)'}, + ], + }, { + state: {inherited: 'none'}, + expect: [ + {at: 0.25, is: 'none'}, + {at: 0.75, is: 'polygon(140px 240px, 340px 440px)'}, + ], + }, { + state: {inherited: 'polygon(100px 200px, 300px 480px)'}, + expect: [ + {at: 0.25, is: 'polygon(110px 210px, 310px 470px)'}, + {at: 0.75, is: 'polygon(130px 230px, 330px 450px)'}, + ], + }], +}); +</script>
diff --git a/third_party/WebKit/LayoutTests/compositing/iframe-graphics-tree-changes-parents-does-not-expected.html b/third_party/WebKit/LayoutTests/compositing/iframe-graphics-tree-changes-parents-does-not-expected.html new file mode 100644 index 0000000..32318dd --- /dev/null +++ b/third_party/WebKit/LayoutTests/compositing/iframe-graphics-tree-changes-parents-does-not-expected.html
@@ -0,0 +1,27 @@ +<!doctype HTML> + +<style> +#frame { + width: 200px; + height: 200px; + overflow-y: scroll; +} +#parent { + width: 100px; + height: 500px; + background-color: lightblue; +} +#child { + width: 50px; + height: 50px; + background-color: blue; + will-change: transform; +} +</style> + +<div id="frame"> + <div id="parent"> + <div id="child"></div> + </div> +</div> +
diff --git a/third_party/WebKit/LayoutTests/compositing/iframe-graphics-tree-changes-parents-does-not.html b/third_party/WebKit/LayoutTests/compositing/iframe-graphics-tree-changes-parents-does-not.html new file mode 100644 index 0000000..a85916e3 --- /dev/null +++ b/third_party/WebKit/LayoutTests/compositing/iframe-graphics-tree-changes-parents-does-not.html
@@ -0,0 +1,20 @@ +<!doctype HTML> + +<script> +if (window.testRunner) { + testRunner.waitUntilDone(); + window.onmessage = function() { + testRunner.notifyDone(); + }; +} +</script> + +<style> +iframe { + width: 200px; + height: 200px; +} +</style> + +<iframe marginwidth=0 marginheight=0 frameborder=0 src="resources/iframe-graphics-tree-changes-parents-does-not-frame.html"></iframe> +
diff --git a/third_party/WebKit/LayoutTests/compositing/resources/iframe-graphics-tree-changes-parents-does-not-frame.html b/third_party/WebKit/LayoutTests/compositing/resources/iframe-graphics-tree-changes-parents-does-not-frame.html new file mode 100644 index 0000000..f8161c4 --- /dev/null +++ b/third_party/WebKit/LayoutTests/compositing/resources/iframe-graphics-tree-changes-parents-does-not-frame.html
@@ -0,0 +1,28 @@ +<!doctype HTML> + +<style> +#parent { + width: 100px; + height: 100px; + background-color: lightblue; +} +#child { + width: 50px; + height: 50px; + background-color: blue; + will-change: transform; +} +</style> + +<div id="parent"> + <div id="child"></div> +</div> + +<script src="../../resources/run-after-layout-and-paint.js"></script> +<script> +runAfterLayoutAndPaint(function() { + document.getElementById("parent").style = "height: 500px;"; + parent.postMessage('done', '*'); +}); +</script> +
diff --git a/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt b/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt index 3d17af6..af01bdf 100644 --- a/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt
@@ -1,13 +1,13 @@ This tests verifies the hit test regions given to the compositor when non-composited iframes are involved. It can only be run in DumpRenderTree. The outputted rects should cover the hit test regions of all the listed elements. Enable visualize mode to quickly validate graphically. -iframe: #document (23, 123, 290, 22) +iframe: #document scrolling (23, 123, 290, 22) -iframe-nested: #document (33, 161, 290, 22) +iframe-nested: #document scrolling (33, 161, 290, 22) -iframe-transform: #document (34, 199, 320, 31) +iframe-transform: #document scrolling (34, 199, 320, 31) -iframe-fixed: #document (31, 262, 332, 22) +iframe-fixed: #document scrolling (31, 262, 332, 22) -iframe-doc: #document (10, 284, 385, 58) +iframe-doc: #document scrolling (10, 284, 400, 25)
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-dynamic-overflow.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-dynamic-overflow.html index 6c136cf3..657056b 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-dynamic-overflow.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-dynamic-overflow.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overflow-hidden.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overflow-hidden.html index f1a2714..d7d6c38b9 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overflow-hidden.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overflow-hidden.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overried-inherited-visibility-hidden.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overried-inherited-visibility-hidden.html index 4f5bc8b1..690ac4e 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overried-inherited-visibility-hidden.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-overried-inherited-visibility-hidden.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-overried-inherited-visibility-hidden.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-overried-inherited-visibility-hidden.html index 97c8ab47..4ddd8076 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-overried-inherited-visibility-hidden.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-overried-inherited-visibility-hidden.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-visibility-hidden-child.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-visibility-hidden-child.html index 33a74ce..6b873b67 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-visibility-hidden-child.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no-visibility-hidden-child.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no.html index a311f5b..68bbf73 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-no.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-yes.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-yes.html index 6358434..c1e8c1a 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-yes.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-scrolling-yes.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-visibility-hidden-child.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-visibility-hidden-child.html index c125131..64c1880 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-visibility-hidden-child.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-visibility-hidden-child.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-zero-size-and-border.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-zero-size-and-border.html index a51fa805..6721e29 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-zero-size-and-border.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame-zero-size-and-border.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame.html index b7e4d95..35932671 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-frame.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none-in-parent.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none-in-parent.html index b188ae2..8df0f30 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none-in-parent.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none-in-parent.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none.html index 3943698..6174d5b 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-display-none.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden-in-parent.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden-in-parent.html index 841e5ab..5233f365 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden-in-parent.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden-in-parent.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden.html index a6986b5..7ba925d 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-hidden.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-override.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-override.html index e362bd5..893c4c8 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-override.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-override.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-visible.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-visible.html index 3c85bf1..22b3899 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-visible.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto-visibility-visible.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto.html index 47e9523..7328838 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-auto.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-not-set.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-not-set.html index 5d75eb0..d973fc1 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-not-set.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-not-set.html
@@ -1,6 +1,6 @@ - <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-visible.html b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-visible.html index 01f3fd1..f6a2c7bd 100644 --- a/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-visible.html +++ b/third_party/WebKit/LayoutTests/fast/scrolling/scrollable-area-overflow-visible.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <head> + <meta name="viewport" content="width=device-width"> <style type="text/css"> @import "resources/scrollable-style.css"; </style> <script src="../../resources/js-test.js"></script> <script src="resources/scrollable-area.js"></script>
diff --git a/third_party/WebKit/LayoutTests/flag-specific/disable-blink-features=RootLayerScrolling/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt b/third_party/WebKit/LayoutTests/flag-specific/disable-blink-features=RootLayerScrolling/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt new file mode 100644 index 0000000..3d17af6 --- /dev/null +++ b/third_party/WebKit/LayoutTests/flag-specific/disable-blink-features=RootLayerScrolling/fast/events/touch/compositor-touch-hit-rects-iframes-expected.txt
@@ -0,0 +1,13 @@ +This tests verifies the hit test regions given to the compositor when non-composited iframes are involved. It can only be run in DumpRenderTree. The outputted rects should cover the hit test regions of all the listed elements. Enable visualize mode to quickly validate graphically. + +iframe: #document (23, 123, 290, 22) + +iframe-nested: #document (33, 161, 290, 22) + +iframe-transform: #document (34, 199, 320, 31) + +iframe-fixed: #document (31, 262, 332, 22) + +iframe-doc: #document (10, 284, 385, 58) + +
diff --git a/third_party/WebKit/LayoutTests/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html b/third_party/WebKit/LayoutTests/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html index c81fdcb..e65bf6b 100644 --- a/third_party/WebKit/LayoutTests/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html +++ b/third_party/WebKit/LayoutTests/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html
@@ -26,7 +26,7 @@ waitForEvent(document, 'webkitfullscreenchange', function() { if (window.internals.runtimeFlags.forceOverlayFullscreenVideoEnabled) - consoleWrite("Should report another rect which is not on the document"); + consoleWrite("Should report no rect or another rect which is not on the document"); else consoleWrite("Should keep rect on document"); window.internals.forceCompositingUpdate(document);
diff --git a/third_party/WebKit/LayoutTests/http/tests/locks/interfaces-serviceworker.html b/third_party/WebKit/LayoutTests/http/tests/locks/interfaces-serviceworker.html new file mode 100644 index 0000000..dd479f97 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/locks/interfaces-serviceworker.html
@@ -0,0 +1,17 @@ +<!DOCTYPE html> +<meta charset=utf-8> +<title>Web Locks API: WebIDL tests in service worker</title> +<link rel=help href="https://github.com/inexorabletash/web-locks"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<script src="/resources/get-host-info.js"></script> +<script src="/serviceworker/resources/test-helpers.js"></script> +<script> +// TODO(jsbell): When migrated to WPT: remove block, rename with .https infix. +if (location.origin != get_host_info().AUTHENTICATED_ORIGIN) { + location = get_host_info().AUTHENTICATED_ORIGIN + location.pathname; + throw new Error('Reloading with appropriate origin for desired context...'); +} + +service_worker_test('resources/interfaces-worker.js'); +</script>
diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/README.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/README.md similarity index 100% rename from third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/README.txt rename to third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/README.md
diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-serviceworker-disabled.js b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-serviceworker-disabled.js new file mode 100644 index 0000000..fb931a76 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-serviceworker-disabled.js
@@ -0,0 +1,15 @@ +importScripts('/resources/testharness.js', + '/resources/origin-trials-helper.js'); + +test(t => { + OriginTrialsHelper.check_interfaces_missing( + self, + ['LockManager', 'Lock']); +}, 'Web Locks API interfaces in Origin-Trial disabled worker.'); + +test(t => { + assert_false('locks' in self.navigator, + 'locks property does not exist on navigator'); +}, 'Web Locks API entry point in Origin-Trial disabled worker.'); + +done();
diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-serviceworker-enabled.php b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-serviceworker-enabled.php new file mode 100644 index 0000000..6fccca8e5 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-serviceworker-enabled.php
@@ -0,0 +1,21 @@ +<?php +// Generate token with the command: +// generate_token.py http://127.0.0.1:8000 WebLocksAPI --expire-timestamp=2000000000 +header("Origin-Trial: Aq40kr/ZTqxmfeh35cvBQcwBrmiL7pSDR6PrUZaVC7xxGe3ff4fECD/TdP+w+Ic9cXZ1ek6N4kg6oR876PQd/QoAAABTeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViTG9ja3NBUEkiLCAiZXhwaXJ5IjogMjAwMDAwMDAwMH0="); +header('Content-Type: application/javascript'); +?> +importScripts('/resources/testharness.js', + '/resources/origin-trials-helper.js'); + +test(t => { + OriginTrialsHelper.check_properties(this, + {'LockManager': ['request', 'query'], + 'Lock': ['name', 'mode'], + }); +}, 'Web Locks API interfaces and properties in Origin-Trial enabled serviceworker.'); + +test(t => { + assert_true('locks' in self.navigator, 'locks property exists on navigator'); +}, 'Web Locks API entry point in Origin-Trial enabled serviceworker.'); + +done();
diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-worker.js b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-worker.js new file mode 100644 index 0000000..69b1248 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/weblocksapi-origin-trial-interfaces-worker.js
@@ -0,0 +1,15 @@ +importScripts('/resources/testharness.js', + '/resources/origin-trials-helper.js'); + +test(t => { + OriginTrialsHelper.check_properties(this, + {'LockManager': ['request', 'query'], + 'Lock': ['name', 'mode'], + }); +}, 'Web Locks API interfaces and properties in Origin-Trial enabled worker.'); + +test(t => { + assert_true('locks' in self.navigator, 'locks property exists on navigator'); +}, 'Web Locks API entry point in Origin-Trial enabled worker.'); + +done();
diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/weblocksapi-origin-trial-interfaces.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/weblocksapi-origin-trial-interfaces.html index f570ed58..e4a5472 100644 --- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/weblocksapi-origin-trial-interfaces.html +++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/weblocksapi-origin-trial-interfaces.html
@@ -5,16 +5,29 @@ -- --> <meta http-equiv="origin-trial" content="Aq40kr/ZTqxmfeh35cvBQcwBrmiL7pSDR6PrUZaVC7xxGe3ff4fECD/TdP+w+Ic9cXZ1ek6N4kg6oR876PQd/QoAAABTeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViTG9ja3NBUEkiLCAiZXhwaXJ5IjogMjAwMDAwMDAwMH0=" /> <title>Web Locks API - interfaces exposed by origin trial</title> -<script src="../../resources/testharness.js"></script> -<script src="../../resources/testharnessreport.js"></script> -<script src="../../resources/origin-trials-helper.js"></script> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<script src="/resources/origin-trials-helper.js"></script> +<script src="/serviceworker/resources/test-helpers.js"></script> <script> test(t => { OriginTrialsHelper.check_properties(this, {'LockManager': ['request', 'query'], 'Lock': ['name', 'mode'], }); - assert_true('locks' in self.navigator, 'locks property exists on navigator'); }, 'Web Locks API interfaces and properties in Origin-Trial enabled document.'); +test(t => { + assert_true('locks' in self.navigator, 'locks property exists on navigator'); +}, 'Web Locks API entry point in Origin-Trial enabled document.'); + +fetch_tests_from_worker(new Worker('resources/weblocksapi-origin-trial-interfaces-worker.js')); + +// Only run "disabled" tests if the feature is not enabled via runtime flags. +if (!self.internals.runtimeFlags.webLocksAPIEnabled) { + service_worker_test('resources/weblocksapi-origin-trial-interfaces-serviceworker-disabled.js'); +} + +service_worker_test('resources/weblocksapi-origin-trial-interfaces-serviceworker-enabled.php'); + </script>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html index 504c4d0..f7bdaa71 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html +++ b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/imagecapture-helpers.js"></script> <script src="resources/mock-imagecapture.js"></script> <body>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-reject.html b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-reject.html index c9a83efc..b3206210 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-reject.html +++ b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-reject.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/mock-imagecapture.js"></script> <body> <canvas id='canvas' width=10 height=10/>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints.html b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints.html index 52f20804..05e321ce 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints.html +++ b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/imagecapture-helpers.js"></script> <script src="resources/mock-imagecapture.js"></script> <body>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html index 1cf88ce..a218c168 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html +++ b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/mock-imagecapture.js"></script> <body> <canvas id='canvas' width=10 height=10/>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getSettings.html b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getSettings.html index a88991ca..76fff96 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getSettings.html +++ b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getSettings.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/imagecapture-helpers.js"></script> <script src="resources/mock-imagecapture.js"></script> <body>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/getPhotoCapabilities.html b/third_party/WebKit/LayoutTests/imagecapture/getPhotoCapabilities.html index 41e2c775..8baf19e 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/getPhotoCapabilities.html +++ b/third_party/WebKit/LayoutTests/imagecapture/getPhotoCapabilities.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/mock-imagecapture.js"></script> <body> <canvas id='canvas' width=10 height=10/>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/getPhotoSettings.html b/third_party/WebKit/LayoutTests/imagecapture/getPhotoSettings.html index 1d5f335b..e91c1e70 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/getPhotoSettings.html +++ b/third_party/WebKit/LayoutTests/imagecapture/getPhotoSettings.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/mock-imagecapture.js"></script> <body> <canvas id='canvas' width=10 height=10/>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/setOptions-reject.html b/third_party/WebKit/LayoutTests/imagecapture/setOptions-reject.html index 28d8e34..40a0e0b 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/setOptions-reject.html +++ b/third_party/WebKit/LayoutTests/imagecapture/setOptions-reject.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/mock-imagecapture.js"></script> <body> <canvas id='canvas' width=10 height=10/>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/takePhoto-with-PhotoSettings.html b/third_party/WebKit/LayoutTests/imagecapture/takePhoto-with-PhotoSettings.html index 7ddefeaf8..0ea9ea5 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/takePhoto-with-PhotoSettings.html +++ b/third_party/WebKit/LayoutTests/imagecapture/takePhoto-with-PhotoSettings.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/mock-imagecapture.js"></script> <body> <canvas id='canvas' width=10 height=10/>
diff --git a/third_party/WebKit/LayoutTests/imagecapture/takePhoto.html b/third_party/WebKit/LayoutTests/imagecapture/takePhoto.html index 38d95dfa2..51104d4 100644 --- a/third_party/WebKit/LayoutTests/imagecapture/takePhoto.html +++ b/third_party/WebKit/LayoutTests/imagecapture/takePhoto.html
@@ -2,7 +2,7 @@ <script src="../resources/testharness.js"></script> <script src="../resources/testharnessreport.js"></script> <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> -<script src="file:///gen/media/capture/mojo/image_capture.mojom.js"></script> +<script src="file:///gen/media/capture/mojom/image_capture.mojom.js"></script> <script src="resources/mock-imagecapture.js"></script> <body> <canvas id='canvas' width=10 height=10/>
diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt index 74218e8f..bdd2f7af 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt
@@ -4,7 +4,7 @@ handler: #document (0, 0, 800, 600) EVENT(webkitfullscreenchange) -Should report another rect which is not on the document +Should report no rect or another rect which is not on the document handler: no rects END OF TEST
diff --git a/third_party/WebKit/LayoutTests/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt b/third_party/WebKit/LayoutTests/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt index 06ddd02..9e76d0b 100644 --- a/third_party/WebKit/LayoutTests/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls-expected.txt
@@ -4,7 +4,7 @@ handler: #document (0, 0, 800, 600) EVENT(webkitfullscreenchange) -Should report another rect which is not on the document +Should report no rect or another rect which is not on the document handler: DIV (42, 3, 637, 24) END OF TEST
diff --git a/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn b/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn index 68f4b95f8..7d41c3f 100644 --- a/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn +++ b/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn
@@ -107,7 +107,7 @@ "//device/gamepad/public/mojom:mojom_blink__generator", "//device/usb/public/mojom:mojom_blink__generator", "//device/vr/public/mojom:mojom_blink__generator", - "//media//capture/mojo:image_capture_blink__generator", + "//media/capture/mojom:image_capture_blink__generator", "//services/device/public/mojom:generic_sensor__generator", "//services/device/public/mojom:mojom_blink__generator", "//services/shape_detection/public/mojom:mojom_blink__generator",
diff --git a/third_party/WebKit/Source/core/DEPS b/third_party/WebKit/Source/core/DEPS index 44bc5784..af0b8cd 100644 --- a/third_party/WebKit/Source/core/DEPS +++ b/third_party/WebKit/Source/core/DEPS
@@ -17,6 +17,7 @@ "+public/common", "+public/mojom", "+public/platform", + "+public/public_features.h", "+public/web", "+services/metrics/public", "+services/network/public/cpp/features.h",
diff --git a/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp index 58f560d..da0e6d4 100644 --- a/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSClipInterpolationType.cpp
@@ -52,31 +52,38 @@ bool is_left_auto; }; -static ClipAutos GetClipAutos(const ComputedStyle& style) { - if (style.HasAutoClip()) - return ClipAutos(); - return ClipAutos(style.ClipTop().IsAuto(), style.ClipRight().IsAuto(), - style.ClipBottom().IsAuto(), style.ClipLeft().IsAuto()); -} - -class InheritedAutosChecker - : public CSSInterpolationType::CSSConversionChecker { +class InheritedClipChecker : public CSSInterpolationType::CSSConversionChecker { public: - static std::unique_ptr<InheritedAutosChecker> Create( - const ClipAutos& inherited_autos) { - return WTF::WrapUnique(new InheritedAutosChecker(inherited_autos)); + static std::unique_ptr<InheritedClipChecker> Create( + const ComputedStyle& parent_style) { + Vector<Length> inherited_length_list; + GetClipLengthList(parent_style, inherited_length_list); + return WTF::WrapUnique( + new InheritedClipChecker(std::move(inherited_length_list))); } private: - InheritedAutosChecker(const ClipAutos& inherited_autos) - : inherited_autos_(inherited_autos) {} + InheritedClipChecker(const Vector<Length>&& inherited_length_list) + : inherited_length_list_(std::move(inherited_length_list)) {} bool IsValid(const StyleResolverState& state, const InterpolationValue& underlying) const final { - return inherited_autos_ == GetClipAutos(*state.ParentStyle()); + Vector<Length> inherited_length_list; + GetClipLengthList(*state.ParentStyle(), inherited_length_list); + return inherited_length_list_ == inherited_length_list; } - const ClipAutos inherited_autos_; + static void GetClipLengthList(const ComputedStyle& style, + Vector<Length>& length_list) { + if (style.HasAutoClip()) + return; + length_list.push_back(style.ClipTop()); + length_list.push_back(style.ClipRight()); + length_list.push_back(style.ClipBottom()); + length_list.push_back(style.ClipLeft()); + } + + const Vector<Length> inherited_length_list_; }; class CSSClipNonInterpolableValue : public NonInterpolableValue { @@ -187,9 +194,9 @@ InterpolationValue CSSClipInterpolationType::MaybeConvertInherit( const StyleResolverState& state, ConversionCheckers& conversion_checkers) const { - ClipAutos inherited_autos = GetClipAutos(*state.ParentStyle()); - conversion_checkers.push_back(InheritedAutosChecker::Create(inherited_autos)); - if (inherited_autos.is_auto) + conversion_checkers.push_back( + InheritedClipChecker::Create(*state.ParentStyle())); + if (state.ParentStyle()->HasAutoClip()) return nullptr; return CreateClipValue(state.ParentStyle()->Clip(), state.ParentStyle()->EffectiveZoom());
diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp index f09d699..e5e866d 100644 --- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp +++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
@@ -47,9 +47,8 @@ bool IsValid(const StyleResolverState& state, const InterpolationValue& underlying) const final { Length parent_length; - if (!LengthPropertyFunctions::GetLength(property_, *state.ParentStyle(), - parent_length)) - return false; + LengthPropertyFunctions::GetLength(property_, *state.ParentStyle(), + parent_length); return parent_length == length_; } @@ -79,11 +78,15 @@ if (!state.ParentStyle()) return nullptr; Length inherited_length; - if (!LengthPropertyFunctions::GetLength(CssProperty(), *state.ParentStyle(), - inherited_length)) - return nullptr; + LengthPropertyFunctions::GetLength(CssProperty(), *state.ParentStyle(), + inherited_length); conversion_checkers.push_back( InheritedLengthChecker::Create(CssProperty(), inherited_length)); + if (inherited_length.IsAuto()) { + // If the inherited value changes to a length, the InheritedLengthChecker + // will invalidate the interpolation's cache. + return nullptr; + } return LengthInterpolationFunctions::MaybeConvertLength( inherited_length, EffectiveZoom(*state.ParentStyle())); }
diff --git a/third_party/WebKit/Source/core/exported/BUILD.gn b/third_party/WebKit/Source/core/exported/BUILD.gn index 2881e10..648eb273 100644 --- a/third_party/WebKit/Source/core/exported/BUILD.gn +++ b/third_party/WebKit/Source/core/exported/BUILD.gn
@@ -82,7 +82,6 @@ "WebSharedWorkerImpl.cpp", "WebSharedWorkerImpl.h", "WebSurroundingText.cpp", - "WebTappedInfo.cpp", "WebTextCheckingResult.cpp", "WebUserGestureIndicator.cpp", "WebUserGestureToken.cpp",
diff --git a/third_party/WebKit/Source/core/exported/WebTappedInfo.cpp b/third_party/WebKit/Source/core/exported/WebTappedInfo.cpp deleted file mode 100644 index 7e027b2e..0000000 --- a/third_party/WebKit/Source/core/exported/WebTappedInfo.cpp +++ /dev/null
@@ -1,32 +0,0 @@ -// Copyright 2017 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 "public/web/WebTappedInfo.h" - -#include "core/dom/Node.h" - -namespace blink { - -WebTappedInfo::WebTappedInfo(bool dom_tree_changed, - bool style_changed, - Node* tapped_node, - IntPoint tapped_position_in_viewport) - : point_(WebPoint(tapped_position_in_viewport.X(), - tapped_position_in_viewport.Y())), - web_node_(tapped_node), - page_changed_(dom_tree_changed || style_changed) {} - -const WebPoint& WebTappedInfo::Position() const { - return point_; -} - -const WebNode& WebTappedInfo::GetNode() const { - return web_node_; -} - -bool WebTappedInfo::PageChanged() const { - return page_changed_; -} - -} // namespace blink
diff --git a/third_party/WebKit/Source/core/exported/WebViewTest.cpp b/third_party/WebKit/Source/core/exported/WebViewTest.cpp index 55aebc5..81f929f6 100644 --- a/third_party/WebKit/Source/core/exported/WebViewTest.cpp +++ b/third_party/WebKit/Source/core/exported/WebViewTest.cpp
@@ -102,6 +102,7 @@ #include "public/platform/WebSize.h" #include "public/platform/WebThread.h" #include "public/platform/WebURLLoaderMockFactory.h" +#include "public/public_features.h" #include "public/web/WebAutofillClient.h" #include "public/web/WebConsoleMessage.h" #include "public/web/WebDateTimeChooserCompletion.h" @@ -116,7 +117,6 @@ #include "public/web/WebPrintParams.h" #include "public/web/WebScriptSource.h" #include "public/web/WebSettings.h" -#include "public/web/WebTappedInfo.h" #include "public/web/WebTreeScopeType.h" #include "public/web/WebViewClient.h" #include "public/web/WebWidget.h" @@ -131,6 +131,12 @@ #include "public/web/mac/WebSubstringUtil.h" #endif +#if BUILDFLAG(ENABLE_UNHANDLED_TAP) +#include "mojo/public/cpp/bindings/strong_binding.h" +#include "platform/testing/TestingPlatformSupport.h" +#include "public/platform/unhandled_tap_notifier.mojom-blink.h" +#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) + using blink::FrameTestHelpers::LoadFrame; using blink::URLTestHelpers::ToKURL; using blink::URLTestHelpers::RegisterMockedURLLoad; @@ -4324,187 +4330,199 @@ EXPECT_EQ(200, size.width); } -class UnhandledTapWebViewClient : public FrameTestHelpers::TestWebViewClient { +#if BUILDFLAG(ENABLE_UNHANDLED_TAP) + +// Helps set up any test that uses a mock Mojo implementation. +class MojoTestHelper { public: - void ShowUnhandledTapUIIfNeeded(const WebTappedInfo& tapped_info) override { - was_called_ = true; - tapped_position_ = tapped_info.Position(); - tapped_node_ = tapped_info.GetNode(); - page_changed_ = tapped_info.PageChanged(); + MojoTestHelper(const String& test_file, + FrameTestHelpers::WebViewHelper& web_view_helper) + : web_view_helper_(web_view_helper) { + web_view_ = web_view_helper.InitializeAndLoad( + WebString(test_file).Utf8(), &web_frame_client_, &web_view_client_); } - bool GetWasCalled() const { return was_called_; } + ~MojoTestHelper() { + web_view_helper_.Reset(); // Remove dependency on locally scoped client. + } + // Bind the test API to a service with the given |name| and repeating Bind + // method given by |callback|. + void BindTestApi( + const String& name, + base::RepeatingCallback<void(mojo::ScopedMessagePipeHandle)> callback) { + // Set up our Mock Mojo API. + test_api_.reset(new service_manager::InterfaceProvider::TestApi( + web_frame_client_.GetInterfaceProvider())); + test_api_->SetBinderForName(WebString(name).Utf8(), callback); + } + WebViewImpl* WebView() const { return web_view_; } + + private: + WebViewImpl* web_view_; + FrameTestHelpers::WebViewHelper& web_view_helper_; + FrameTestHelpers::TestWebFrameClient web_frame_client_; + FrameTestHelpers::TestWebViewClient web_view_client_; + std::unique_ptr<service_manager::InterfaceProvider::TestApi> test_api_; +}; + +// Mock implementation of the UnhandledTapNotifier Mojo receiver, for testing +// the ShowUnhandledTapUIIfNeeded notification. +class MockUnhandledTapNotifierImpl : public mojom::blink::UnhandledTapNotifier { + public: + MockUnhandledTapNotifierImpl() : binding_(this) {} + ~MockUnhandledTapNotifierImpl() = default; + + void Bind(mojo::ScopedMessagePipeHandle handle) { + binding_.Bind(mojom::blink::UnhandledTapNotifierRequest(std::move(handle))); + } + + void ShowUnhandledTapUIIfNeeded( + mojom::blink::UnhandledTapInfoPtr unhandled_tap_info) override { + was_unhandled_tap_ = true; + tapped_position_ = unhandled_tap_info->tapped_position_in_viewport; + } + bool WasUnhandledTap() const { return was_unhandled_tap_; } int GetTappedXPos() const { return tapped_position_.X(); } int GetTappedYPos() const { return tapped_position_.Y(); } - bool IsTappedNodeNull() const { return tapped_node_.IsNull(); } - const WebNode& GetWebNode() const { return tapped_node_; } - bool GetPageChanged() const { return page_changed_; } void Reset() { - was_called_ = false; + was_unhandled_tap_ = false; tapped_position_ = IntPoint(); - tapped_node_ = WebNode(); - page_changed_ = false; + binding_.Close(); } private: - bool was_called_ = false; + bool was_unhandled_tap_ = false; IntPoint tapped_position_; - WebNode tapped_node_; - bool page_changed_ = false; + + mojo::Binding<mojom::blink::UnhandledTapNotifier> binding_; }; -TEST_P(WebViewTest, ShowUnhandledTapUIIfNeeded) { - std::string test_file = "show_unhandled_tap.html"; - RegisterMockedHttpURLLoad("Ahem.ttf"); - RegisterMockedHttpURLLoad(test_file); - UnhandledTapWebViewClient client; - WebViewImpl* web_view = web_view_helper_.InitializeAndLoad( - base_url_ + test_file, nullptr, &client); - web_view->Resize(WebSize(500, 300)); - web_view->UpdateAllLifecyclePhases(); - RunPendingTasks(); +// A Test Fixture for testing ShowUnhandledTapUIIfNeeded usages. +class ShowUnhandledTapTest : public WebViewTest { + public: + void SetUp() override { + WebViewTest::SetUp(); + std::string test_file = "show_unhandled_tap.html"; + RegisterMockedHttpURLLoad("Ahem.ttf"); + RegisterMockedHttpURLLoad(test_file); + mojo_test_helper_.reset(new MojoTestHelper( + WebString::FromUTF8(base_url_ + test_file), web_view_helper_)); + + web_view_ = mojo_test_helper_->WebView(); + web_view_->Resize(WebSize(500, 300)); + web_view_->UpdateAllLifecyclePhases(); + RunPendingTasks(); + + mojo_test_helper_->BindTestApi( + mojom::blink::UnhandledTapNotifier::Name_, + WTF::BindRepeating(&MockUnhandledTapNotifierImpl::Bind, + WTF::Unretained(&mock_notifier_))); + } + + protected: + // Tap on the given element by ID. + void Tap(const String& element_id) { + mock_notifier_.Reset(); + EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, element_id)); + } + + // Set up a test script for the given |operation| with the given |handler|. + void SetTestScript(const String& operation, const String& handler) { + String test_key = operation + "-" + handler; + web_view_->MainFrameImpl()->ExecuteScript( + WebScriptSource(String("setTest('" + test_key + "');"))); + } + + // Test each mouse event combination with the given |handler|, and verify the + // |expected| outcome. + void TestEachMouseEvent(const String& handler, bool expected) { + SetTestScript("mousedown", handler); + Tap("target"); + EXPECT_EQ(expected, mock_notifier_.WasUnhandledTap()); + + SetTestScript("mouseup", handler); + Tap("target"); + EXPECT_EQ(expected, mock_notifier_.WasUnhandledTap()); + + SetTestScript("click", handler); + Tap("target"); + EXPECT_EQ(expected, mock_notifier_.WasUnhandledTap()); + } + + WebViewImpl* web_view_; + MockUnhandledTapNotifierImpl mock_notifier_; + + private: + std::unique_ptr<MojoTestHelper> mojo_test_helper_; +}; + +INSTANTIATE_TEST_CASE_P(All, ShowUnhandledTapTest, ::testing::Bool()); + +TEST_P(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeeded) { // Scroll the bottom into view so we can distinguish window coordinates from // document coordinates. - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, - WebString::FromUTF8("bottom"))); - EXPECT_TRUE(client.GetWasCalled()); - EXPECT_EQ(64, client.GetTappedXPos()); - EXPECT_EQ(278, client.GetTappedYPos()); - EXPECT_FALSE(client.IsTappedNodeNull()); - EXPECT_TRUE(client.GetWebNode().IsTextNode()); + Tap("bottom"); + EXPECT_TRUE(mock_notifier_.WasUnhandledTap()); + EXPECT_EQ(64, mock_notifier_.GetTappedXPos()); + EXPECT_EQ(278, mock_notifier_.GetTappedYPos()); // Test basic tap handling and notification. - client.Reset(); - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, - WebString::FromUTF8("target"))); - EXPECT_TRUE(client.GetWasCalled()); - EXPECT_EQ(144, client.GetTappedXPos()); - EXPECT_EQ(82, client.GetTappedYPos()); - EXPECT_FALSE(client.IsTappedNodeNull()); - EXPECT_TRUE(client.GetWebNode().IsTextNode()); - // Make sure the returned text node has the parent element that was our - // target. - EXPECT_EQ(web_view->MainFrameImpl()->GetDocument().GetElementById("target"), - client.GetWebNode().ParentNode()); + Tap("target"); + EXPECT_TRUE(mock_notifier_.WasUnhandledTap()); + EXPECT_EQ(144, mock_notifier_.GetTappedXPos()); + EXPECT_EQ(82, mock_notifier_.GetTappedYPos()); // Test correct conversion of coordinates to viewport space under pinch-zoom. - web_view->SetPageScaleFactor(2); - web_view->SetVisualViewportOffset(WebFloatPoint(50, 20)); - client.Reset(); - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, - WebString::FromUTF8("target"))); - EXPECT_TRUE(client.GetWasCalled()); - EXPECT_EQ(188, client.GetTappedXPos()); - EXPECT_EQ(124, client.GetTappedYPos()); + web_view_->SetPageScaleFactor(2); + web_view_->SetVisualViewportOffset(WebFloatPoint(50, 20)); - web_view_helper_.Reset(); // Remove dependency on locally scoped client. + Tap("target"); + EXPECT_TRUE(mock_notifier_.WasUnhandledTap()); + EXPECT_EQ(188, mock_notifier_.GetTappedXPos()); + EXPECT_EQ(124, mock_notifier_.GetTappedYPos()); } -#define TEST_EACH_MOUSEEVENT(handler, EXPECT) \ - frame->ExecuteScript(WebScriptSource("setTest('mousedown-" handler "');")); \ - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, \ - WebString::FromUTF8("target"))); \ - EXPECT_##EXPECT(client.GetPageChanged()); \ - client.Reset(); \ - frame->ExecuteScript(WebScriptSource("setTest('mouseup-" handler "');")); \ - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, \ - WebString::FromUTF8("target"))); \ - EXPECT_##EXPECT(client.GetPageChanged()); \ - client.Reset(); \ - frame->ExecuteScript(WebScriptSource("setTest('mousemove-" handler "');")); \ - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, \ - WebString::FromUTF8("target"))); \ - EXPECT_##EXPECT(client.GetPageChanged()); \ - client.Reset(); \ - frame->ExecuteScript(WebScriptSource("setTest('click-" handler "');")); \ - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, \ - WebString::FromUTF8("target"))); \ - EXPECT_##EXPECT(client.GetPageChanged()); - -TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithMutateDom) { - std::string test_file = "show_unhandled_tap.html"; - RegisterMockedHttpURLLoad("Ahem.ttf"); - RegisterMockedHttpURLLoad(test_file); - UnhandledTapWebViewClient client; - WebViewImpl* web_view = web_view_helper_.InitializeAndLoad( - base_url_ + test_file, nullptr, &client); - web_view->Resize(WebSize(500, 300)); - web_view->UpdateAllLifecyclePhases(); - RunPendingTasks(); - WebLocalFrameImpl* frame = web_view->MainFrameImpl(); - +TEST_P(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithMutateDom) { // Test dom mutation. - TEST_EACH_MOUSEEVENT("mutateDom", TRUE); + TestEachMouseEvent("mutateDom", FALSE); // Test without any DOM mutation. - client.Reset(); - frame->ExecuteScript(WebScriptSource("setTest('none');")); - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, - WebString::FromUTF8("target"))); - EXPECT_FALSE(client.GetPageChanged()); - - web_view_helper_.Reset(); // Remove dependency on locally scoped client. + TestEachMouseEvent("none", TRUE); } -TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithMutateStyle) { - std::string test_file = "show_unhandled_tap.html"; - RegisterMockedHttpURLLoad("Ahem.ttf"); - RegisterMockedHttpURLLoad(test_file); - UnhandledTapWebViewClient client; - WebViewImpl* web_view = web_view_helper_.InitializeAndLoad( - base_url_ + test_file, nullptr, &client); - web_view->Resize(WebSize(500, 300)); - web_view->UpdateAllLifecyclePhases(); - RunPendingTasks(); - WebLocalFrameImpl* frame = web_view->MainFrameImpl(); - +TEST_P(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithMutateStyle) { // Test style mutation. - TEST_EACH_MOUSEEVENT("mutateStyle", TRUE); + TestEachMouseEvent("mutateStyle", FALSE); // Test checkbox:indeterminate style mutation. - TEST_EACH_MOUSEEVENT("mutateIndeterminate", TRUE); + TestEachMouseEvent("mutateIndeterminate", FALSE); - // Test click div with :active style but it is not covered for now. - client.Reset(); - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, - WebString::FromUTF8("style_active"))); - EXPECT_FALSE(client.GetPageChanged()); - - // Test without any style mutation. - client.Reset(); - frame->ExecuteScript(WebScriptSource("setTest('none');")); - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, - WebString::FromUTF8("target"))); - EXPECT_FALSE(client.GetPageChanged()); - - web_view_helper_.Reset(); // Remove dependency on locally scoped client. + // Test click div with :active style. + Tap("style_active"); + EXPECT_FALSE(mock_notifier_.WasUnhandledTap()); } -TEST_P(WebViewTest, ShowUnhandledTapUIIfNeededWithPreventDefault) { - std::string test_file = "show_unhandled_tap.html"; - RegisterMockedHttpURLLoad("Ahem.ttf"); - RegisterMockedHttpURLLoad(test_file); - UnhandledTapWebViewClient client; - WebViewImpl* web_view = web_view_helper_.InitializeAndLoad( - base_url_ + test_file, nullptr, &client); - web_view->Resize(WebSize(500, 300)); - web_view->UpdateAllLifecyclePhases(); - RunPendingTasks(); - WebLocalFrameImpl* frame = web_view->MainFrameImpl(); - - // Testswallowing. - TEST_EACH_MOUSEEVENT("preventDefault", FALSE); +TEST_P(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithPreventDefault) { + // Test swallowing. + TestEachMouseEvent("preventDefault", FALSE); // Test without any preventDefault. - client.Reset(); - frame->ExecuteScript(WebScriptSource("setTest('none');")); - EXPECT_TRUE(TapElementById(WebInputEvent::kGestureTap, - WebString::FromUTF8("target"))); - EXPECT_TRUE(client.GetWasCalled()); - - web_view_helper_.Reset(); // Remove dependency on locally scoped client. + TestEachMouseEvent("none", TRUE); } +TEST_P(ShowUnhandledTapTest, ShowUnhandledTapUIIfNeededWithNonTriggeringNodes) { + Tap("checkbox"); + EXPECT_FALSE(mock_notifier_.WasUnhandledTap()); + + Tap("editable"); + EXPECT_FALSE(mock_notifier_.WasUnhandledTap()); + + Tap("focusable"); + EXPECT_FALSE(mock_notifier_.WasUnhandledTap()); +} + +#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) + TEST_P(WebViewTest, StopLoadingIfJavaScriptURLReturnsNoStringResult) { ViewCreatingWebViewClient client; FrameTestHelpers::WebViewHelper main_web_view;
diff --git a/third_party/WebKit/Source/core/input/GestureManager.cpp b/third_party/WebKit/Source/core/input/GestureManager.cpp index 830072a..7d88b7b6 100644 --- a/third_party/WebKit/Source/core/input/GestureManager.cpp +++ b/third_party/WebKit/Source/core/input/GestureManager.cpp
@@ -18,7 +18,14 @@ #include "core/input/InputDeviceCapabilities.h" #include "core/page/ChromeClient.h" #include "core/page/Page.h" -#include "public/web/WebTappedInfo.h" +#include "public/public_features.h" + +#if BUILDFLAG(ENABLE_UNHANDLED_TAP) +#include "core/frame/LocalFrameClient.h" +#include "public/platform/unhandled_tap_notifier.mojom-blink.h" +#include "public/web/WebNode.h" +#include "services/service_manager/public/cpp/interface_provider.h" +#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) namespace blink { @@ -302,9 +309,8 @@ IntPoint tapped_position_in_viewport = frame_->GetPage()->GetVisualViewport().RootFrameToViewport( tapped_position); - WebTappedInfo tapped_info(dom_tree_changed, style_changed, tapped_node, - tapped_position_in_viewport); - frame_->GetChromeClient().ShowUnhandledTapUIIfNeeded(tapped_info); + ShowUnhandledTapUIIfNeeded(dom_tree_changed, style_changed, tapped_node, + tapped_position_in_viewport); } return event_result; } @@ -437,4 +443,29 @@ return last_show_press_timestamp_; } +void GestureManager::ShowUnhandledTapUIIfNeeded( + bool dom_tree_changed, + bool style_changed, + Node* tapped_node, + const IntPoint& tapped_position_in_viewport) { +#if BUILDFLAG(ENABLE_UNHANDLED_TAP) + WebNode web_node(tapped_node); + bool should_trigger = !dom_tree_changed && !style_changed && + tapped_node->IsTextNode() && + !web_node.IsContentEditable() && + !web_node.IsInsideFocusableElementOrARIAWidget(); + // Renderer-side trigger-filtering to minimize messaging. + // The Browser may do additional trigger-filtering. + if (should_trigger) { + WebPoint point(tapped_position_in_viewport.X(), + tapped_position_in_viewport.Y()); + auto tapped_info = mojom::blink::UnhandledTapInfo::New(point); + mojom::blink::UnhandledTapNotifierPtr provider; + frame_->Client()->GetInterfaceProvider()->GetInterface( + mojo::MakeRequest(&provider)); + provider->ShowUnhandledTapUIIfNeeded(std::move(tapped_info)); + } +#endif // BUILDFLAG(ENABLE_UNHANDLED_TAP) +} + } // namespace blink
diff --git a/third_party/WebKit/Source/core/input/GestureManager.h b/third_party/WebKit/Source/core/input/GestureManager.h index b4f5b84..e14889d7 100644 --- a/third_party/WebKit/Source/core/input/GestureManager.h +++ b/third_party/WebKit/Source/core/input/GestureManager.h
@@ -16,6 +16,7 @@ namespace blink { +class IntPoint; class ScrollManager; class SelectionController; class PointerEventManager; @@ -59,6 +60,11 @@ WebInputEventResult SendContextMenuEventForGesture( const GestureEventWithHitTestResults&); + // Shows the Unhandled Tap UI if needed. + void ShowUnhandledTapUIIfNeeded(bool dom_tree_changed, + bool style_changed, + Node* tapped_node, + const IntPoint& tapped_position_in_viewport); // NOTE: If adding a new field to this class please ensure that it is // cleared if needed in |GestureManager::clear()|.
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp index f51d5ce2..ef1e801 100644 --- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -470,12 +470,14 @@ std::make_unique<PaintLayer>(*this)); SetHasLayer(true); Layer()->InsertOnlyThisLayerAfterStyleChange(); + SetNeedsPaintPropertyUpdate(); } void LayoutBoxModelObject::DestroyLayer() { DCHECK(HasLayer() && Layer()); SetHasLayer(false); GetMutableForPainting().FirstFragment().SetLayer(nullptr); + SetNeedsPaintPropertyUpdate(); } bool LayoutBoxModelObject::HasSelfPaintingLayer() const {
diff --git a/third_party/WebKit/Source/core/page/ChromeClient.h b/third_party/WebKit/Source/core/page/ChromeClient.h index 45368d7..a0a9686 100644 --- a/third_party/WebKit/Source/core/page/ChromeClient.h +++ b/third_party/WebKit/Source/core/page/ChromeClient.h
@@ -80,7 +80,6 @@ class WebImage; class WebLayer; class WebLayerTreeView; -class WebTappedInfo; class WebViewImpl; struct CompositedSelection; @@ -324,8 +323,6 @@ virtual void RegisterViewportLayers() const {} - virtual void ShowUnhandledTapUIIfNeeded(WebTappedInfo&) {} - virtual void OnMouseDown(Node&) {} virtual void DidUpdateBrowserControls() const {}
diff --git a/third_party/WebKit/Source/core/page/ChromeClientImpl.cpp b/third_party/WebKit/Source/core/page/ChromeClientImpl.cpp index 75f7320..3aa220ca 100644 --- a/third_party/WebKit/Source/core/page/ChromeClientImpl.cpp +++ b/third_party/WebKit/Source/core/page/ChromeClientImpl.cpp
@@ -993,15 +993,6 @@ ->ShowVirtualKeyboardOnElementFocus(); } -void ChromeClientImpl::ShowUnhandledTapUIIfNeeded(WebTappedInfo& tapped_info) { - // Node* node = tapped_info.RawNode(); - // web_node(WebNode(node)); - // tapped_info.SetNode(web_node); - if (web_view_->Client()) { - web_view_->Client()->ShowUnhandledTapUIIfNeeded(tapped_info); - } -} - void ChromeClientImpl::OnMouseDown(Node& mouse_down_node) { if (auto* fill_client = AutofillClientFromFrame(mouse_down_node.GetDocument().GetFrame())) {
diff --git a/third_party/WebKit/Source/core/page/ChromeClientImpl.h b/third_party/WebKit/Source/core/page/ChromeClientImpl.h index 1a67569..ccafeb4e 100644 --- a/third_party/WebKit/Source/core/page/ChromeClientImpl.h +++ b/third_party/WebKit/Source/core/page/ChromeClientImpl.h
@@ -213,7 +213,6 @@ void RegisterViewportLayers() const override; - void ShowUnhandledTapUIIfNeeded(WebTappedInfo&) override; void OnMouseDown(Node&) override; void DidUpdateBrowserControls() const override; void SetOverscrollBehavior(const WebOverscrollBehavior&) override;
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp index 5ca1f8e..4aa217e 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -585,26 +585,29 @@ child->ClearPaginationRecursive(); } +const PaintLayer& PaintLayer::TransformAncestorOrRoot() const { + return TransformAncestor() ? *TransformAncestor() + : *GetLayoutObject().View()->Layer(); +} + void PaintLayer::MapPointInPaintInvalidationContainerToBacking( const LayoutBoxModelObject& paint_invalidation_container, FloatPoint& point) { - // TODO(chrishtr): this should be - // PaintLayer* transformedAncestorPaintLayer = - // paintInvalidationLayer->enclosingTransformedAncestor(); - // if (!transformedAncestorPaintLayer) - // return; PaintLayer* paint_invalidation_layer = paint_invalidation_container.Layer(); if (!paint_invalidation_layer->GroupedMapping()) return; LayoutBoxModelObject& transformed_ancestor = - paint_invalidation_layer->EnclosingTransformedAncestor() - ->GetLayoutObject(); + paint_invalidation_layer->TransformAncestorOrRoot().GetLayoutObject(); // |paintInvalidationContainer| may have a local 2D transform on it, so take // that into account when mapping into the space of the transformed ancestor. point = paint_invalidation_container.LocalToAncestorPoint( point, &transformed_ancestor); + // Don't include composited scroll offsets, since + // SquashingOffsetFromTransformedAncestor does not. + if (transformed_ancestor.UsesCompositedScrolling()) + point.Move(ToLayoutBox(transformed_ancestor).ScrolledContentOffset()); point.MoveBy(-paint_invalidation_layer->GroupedMapping() ->SquashingOffsetFromTransformedAncestor()); @@ -613,18 +616,12 @@ void PaintLayer::MapRectInPaintInvalidationContainerToBacking( const LayoutBoxModelObject& paint_invalidation_container, LayoutRect& rect) { - // TODO(chrishtr): this should be - // PaintLayer* transformedAncestorPaintLayer = - // paintInvalidationLayer->enclosingTransformedAncestor(); - // if (!transformedAncestorPaintLayer) - // return; PaintLayer* paint_invalidation_layer = paint_invalidation_container.Layer(); if (!paint_invalidation_layer->GroupedMapping()) return; LayoutBoxModelObject& transformed_ancestor = - paint_invalidation_layer->EnclosingTransformedAncestor() - ->GetLayoutObject(); + paint_invalidation_layer->TransformAncestorOrRoot().GetLayoutObject(); // |paintInvalidationContainer| may have a local 2D transform on it, so take // that into account when mapping into the space of the transformed ancestor. @@ -632,6 +629,10 @@ paint_invalidation_container .LocalToAncestorQuad(FloatRect(rect), &transformed_ancestor) .BoundingBox()); + // Don't include composited scroll offsets, since + // SquashingOffsetFromTransformedAncestor does not. + if (transformed_ancestor.UsesCompositedScrolling()) + rect.Move(ToLayoutBox(transformed_ancestor).ScrolledContentOffset()); rect.MoveBy(-paint_invalidation_layer->GroupedMapping() ->SquashingOffsetFromTransformedAncestor()); @@ -972,20 +973,15 @@ return nullptr; } -PaintLayer* PaintLayer::EnclosingTransformedAncestor() const { - PaintLayer* curr = Parent(); - while (curr && !curr->IsRootLayer() && !curr->Transform()) - curr = curr->Parent(); - - return curr; -} - LayoutPoint PaintLayer::ComputeOffsetFromTransformedAncestor() const { TransformState transform_state(TransformState::kApplyTransformDirection, FloatPoint()); - GetLayoutObject().MapLocalToAncestor( - TransformAncestor() ? &TransformAncestor()->GetLayoutObject() : nullptr, - transform_state, 0); + const LayoutBoxModelObject& ancestor = + TransformAncestorOrRoot().GetLayoutObject(); + + GetLayoutObject().MapLocalToAncestor(&ancestor, transform_state, 0); + if (ancestor.UsesCompositedScrolling()) + transform_state.Move(ToLayoutBox(ancestor).ScrolledContentOffset()); transform_state.Flatten(); return LayoutPoint(transform_state.LastPlanarPoint()); }
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.h b/third_party/WebKit/Source/core/paint/PaintLayer.h index 4b3692f..71725623 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayer.h +++ b/third_party/WebKit/Source/core/paint/PaintLayer.h
@@ -779,6 +779,7 @@ ? ancestor_dependent_compositing_inputs_->transform_ancestor : nullptr; } + const PaintLayer& TransformAncestorOrRoot() const; const PaintLayer* FilterAncestor() const { DCHECK(!needs_ancestor_dependent_compositing_inputs_update_); return ancestor_dependent_compositing_inputs_ @@ -884,7 +885,8 @@ // like those in PaintInvalidatorContext. PaintLayer* EnclosingSelfPaintingLayer(); - PaintLayer* EnclosingTransformedAncestor() const; + // Returned value does not include any composited scroll offset of + // the transform ancestor. LayoutPoint ComputeOffsetFromTransformedAncestor() const; void DidUpdateScrollsOverflow();
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp index c08f27f6..6206cde 100644 --- a/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp +++ b/third_party/WebKit/Source/core/paint/PaintLayerTest.cpp
@@ -17,6 +17,11 @@ public: PaintLayerTest() : RenderingTest(SingleChildLocalFrameClient::Create()) {} + void SetUp() override { + RenderingTest::SetUp(); + EnableCompositing(); + } + protected: PaintLayer* GetPaintLayerByElementId(const char* id) { return ToLayoutBoxModelObject(GetLayoutObjectByElementId(id))->Layer(); @@ -1219,6 +1224,52 @@ EXPECT_EQ(body, GetDocument().ElementFromPoint(60, 151)); } +TEST_P(PaintLayerTest, SquashingOffsets) { + if (RuntimeEnabledFeatures::SlimmingPaintV2Enabled()) + return; + SetHtmlInnerHTML(R"HTML( + <style> + * { margin: 0 } + </style> + <div id=target + style='width: 200px; height: 200px; position: relative; will-change: transform'></div> + <div id=squashed + style='width: 200px; height: 200px; top: -200px; position: relative;'></div> + <div style='width: 10px; height: 3000px'></div> + )HTML"); + + auto* squashed = + ToLayoutBoxModelObject(GetLayoutObjectByElementId("squashed"))->Layer(); + EXPECT_EQ(kPaintsIntoGroupedBacking, squashed->GetCompositingState()); + FloatPoint point; + LayoutRect rect(0, 0, 200, 200); + PaintLayer::MapPointInPaintInvalidationContainerToBacking( + squashed->GetLayoutObject(), point); + EXPECT_EQ(FloatPoint(), point); + + PaintLayer::MapRectInPaintInvalidationContainerToBacking( + squashed->GetLayoutObject(), rect); + EXPECT_EQ(LayoutRect(0, 0, 200, 200), rect); + + EXPECT_EQ(LayoutPoint(0, 0), + squashed->ComputeOffsetFromTransformedAncestor()); + + GetDocument().View()->LayoutViewportScrollableArea()->ScrollBy( + ScrollOffset(0, 25), kUserScroll); + GetDocument().View()->UpdateAllLifecyclePhases(); + + PaintLayer::MapPointInPaintInvalidationContainerToBacking( + squashed->GetLayoutObject(), point); + EXPECT_EQ(FloatPoint(), point); + + PaintLayer::MapRectInPaintInvalidationContainerToBacking( + squashed->GetLayoutObject(), rect); + EXPECT_EQ(LayoutRect(0, 0, 200, 200), rect); + + EXPECT_EQ(LayoutPoint(0, 0), + squashed->ComputeOffsetFromTransformedAncestor()); +} + TEST_P(PaintLayerTest, HitTestWithIgnoreClipping) { SetBodyInnerHTML("<div id='hit' style='width: 90px; height: 9000px;'></div>");
diff --git a/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.cpp index 253815c..c9f117f 100644 --- a/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.cpp +++ b/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.cpp
@@ -3352,7 +3352,7 @@ // bounds into viewport space, with offsetFromAnchorLayoutObject to // translate squashing layer's bounds into the first squashed layer's space. anchor_layout_object = - &owning_layer_.EnclosingTransformedAncestor()->GetLayoutObject(); + &owning_layer_.TransformAncestorOrRoot().GetLayoutObject(); offset_from_anchor_layout_object = ToFloatSize(FloatPoint(SquashingOffsetFromTransformedAncestor())); } else {
diff --git a/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.h b/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.h index 18f8e9bde..9ef91c24 100644 --- a/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.h +++ b/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMapping.h
@@ -291,6 +291,8 @@ LayoutSize ContentOffsetInCompositingLayer() const; + // Returned value does not include any composited scroll offset of + // the transform ancestor. LayoutPoint SquashingOffsetFromTransformedAncestor() const { return squashing_layer_offset_from_transformed_ancestor_; }
diff --git a/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMappingTest.cpp b/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMappingTest.cpp index 6751ced..23966829 100644 --- a/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMappingTest.cpp +++ b/third_party/WebKit/Source/core/paint/compositing/CompositedLayerMappingTest.cpp
@@ -2553,4 +2553,34 @@ mapping->ScrollingContentsLayer()->Size().Height()); } +TEST_P(CompositedLayerMappingTest, SquashingScroll) { + if (RuntimeEnabledFeatures::SlimmingPaintV2Enabled()) + return; + SetHtmlInnerHTML(R"HTML( + <style> + * { margin: 0 } + </style> + <div id=target + style='width: 200px; height: 200px; position: relative; will-change: transform'></div> + <div id=squashed + style='width: 200px; height: 200px; top: -200px; position: relative;'></div> + <div style='width: 10px; height: 3000px'></div> + )HTML"); + + auto* squashed = + ToLayoutBoxModelObject(GetLayoutObjectByElementId("squashed"))->Layer(); + EXPECT_EQ(kPaintsIntoGroupedBacking, squashed->GetCompositingState()); + EXPECT_EQ( + LayoutPoint(), + squashed->GroupedMapping()->SquashingOffsetFromTransformedAncestor()); + + GetDocument().View()->LayoutViewportScrollableArea()->ScrollBy( + ScrollOffset(0, 25), kUserScroll); + GetDocument().View()->UpdateAllLifecyclePhases(); + + EXPECT_EQ( + LayoutPoint(), + squashed->GroupedMapping()->SquashingOffsetFromTransformedAncestor()); +} + } // namespace blink
diff --git a/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.cpp index 49f0b37e5..b41e263 100644 --- a/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.cpp +++ b/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.cpp
@@ -388,16 +388,18 @@ } } -GraphicsLayer* PaintLayerCompositor::ParentForContentLayers() const { +GraphicsLayer* PaintLayerCompositor::ParentForContentLayers( + GraphicsLayer* child_frame_parent_candidate) const { if (root_content_layer_) return root_content_layer_.get(); DCHECK(RuntimeEnabledFeatures::RootLayerScrollingEnabled()); - // Iframe content layers will be connected by the parent frame using - // attachFrameContentLayersToIframeLayer. + // Iframe content layers were connected by the parent frame using + // AttachFrameContentLayersToIframeLayer. Return whatever candidate was given + // to us as the child frame parent. if (!IsMainFrame()) - return nullptr; + return child_frame_parent_candidate; // If this is a popup, don't hook into the VisualViewport layers. if (!layout_view_.GetDocument() @@ -495,6 +497,24 @@ } } + GraphicsLayer* current_parent = nullptr; + if (RuntimeEnabledFeatures::RootLayerScrollingEnabled()) { + // Save off our current parent. We need this in subframes, because our + // parent attached us to itself via AttachFrameContentLayersToIframeLayer(). + // However, if we're about to update our layer structure in + // GraphicsLayerUpdater, we will sometimes remove our root graphics layer + // from its parent. If there are no further tree updates, this means that + // our root graphics layer will not be attached to anything. Below, we would + // normally get the ParentForContentLayer to fix up this situation. However, + // in RLS non-main frames don't have this parent. So, instead use this + // saved-off parent. + if (!IsMainFrame() && update_root->GetCompositedLayerMapping()) { + current_parent = update_root->GetCompositedLayerMapping() + ->ChildForSuperlayers() + ->Parent(); + } + } + GraphicsLayerUpdater updater; updater.Update(*update_root, layers_needing_paint_invalidation); @@ -516,8 +536,10 @@ if (!child_list.IsEmpty()) { CHECK(compositing_); - if (GraphicsLayer* content_parent = ParentForContentLayers()) + if (GraphicsLayer* content_parent = + ParentForContentLayers(current_parent)) { content_parent->SetChildren(child_list); + } } ApplyOverlayFullscreenVideoAdjustmentIfNeeded();
diff --git a/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.h b/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.h index 5ac10fd..a194ab75 100644 --- a/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.h +++ b/third_party/WebKit/Source/core/paint/compositing/PaintLayerCompositor.h
@@ -260,7 +260,8 @@ bool IsMainFrame() const; VisualViewport& GetVisualViewport() const; - GraphicsLayer* ParentForContentLayers() const; + GraphicsLayer* ParentForContentLayers( + GraphicsLayer* child_frame_parent_candidate = nullptr) const; LayoutView& layout_view_;
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp index b377c83..0100a7ea 100644 --- a/third_party/WebKit/Source/core/testing/Internals.cpp +++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -1976,7 +1976,10 @@ if (auto* view = document->GetLayoutView()) { if (PaintLayerCompositor* compositor = view->Compositor()) { - if (GraphicsLayer* root_layer = compositor->RootGraphicsLayer()) { + // Use the paint-root since we sometimes want to know about touch rects + // on layers outside the document hierarchy (e.g. when we replace the + // document with a video layer). + if (GraphicsLayer* root_layer = compositor->PaintRootGraphicsLayer()) { LayerRectList* rects = LayerRectList::Create(); AccumulateLayerRectList(compositor, root_layer, rects); return rects;
diff --git a/third_party/WebKit/Source/core/testing/data/show_unhandled_tap.html b/third_party/WebKit/Source/core/testing/data/show_unhandled_tap.html index 9ca6c0f..fca4d227432 100644 --- a/third_party/WebKit/Source/core/testing/data/show_unhandled_tap.html +++ b/third_party/WebKit/Source/core/testing/data/show_unhandled_tap.html
@@ -24,6 +24,8 @@ <div id="mutate">This block gets mutated to change the DOM.</div> <div id="style_active">This block gets red if active</div> <input id="checkbox" type="checkbox"><span>indeterminate checkbox</span> +<input id="editable" type="text" value="editable"> +<div id="focusable" tabindex="1">focusable</div> </div> <p style="position: absolute; left: 8px; top: 400px; width: 400px; height: 30px;"><span id="bottom">Bottom.</span></p> @@ -55,7 +57,6 @@ var t = document.getElementById('target'); t.addEventListener('mousedown', handle); t.addEventListener('mouseup', handle); -t.addEventListener('mousemove', handle); t.addEventListener('click', handle); </script> </body>
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js index 525bf7c..0e07b1e 100644 --- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js +++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
@@ -1032,11 +1032,11 @@ */ function onResourceContent(content) { let imageSrc = Common.ContentProvider.contentAsDataURL(content, this._mimeType, true); - if (imageSrc === null) + const cacheControl = this.responseHeaderValue('cache-control'); + if (imageSrc === null && (!cacheControl || !cacheControl.includes('no-cache'))) imageSrc = this._url; image.src = imageSrc; } - this.requestContent().then(onResourceContent.bind(this)); }
diff --git a/third_party/WebKit/Source/modules/ModulesInitializer.cpp b/third_party/WebKit/Source/modules/ModulesInitializer.cpp index 084ebbd..98b7e05bf 100644 --- a/third_party/WebKit/Source/modules/ModulesInitializer.cpp +++ b/third_party/WebKit/Source/modules/ModulesInitializer.cpp
@@ -176,6 +176,8 @@ new AudioOutputDeviceClientImpl(frame)); } InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); + ::blink::ProvideSpeechRecognitionTo( + frame, SpeechRecognitionClientProxy::Create(client->SpeechRecognizer())); } void ModulesInitializer::ProvideLocalFileSystemToWorker( @@ -257,9 +259,6 @@ ::blink::ProvideContextFeaturesTo(page, ContextFeaturesClientImpl::Create()); ::blink::ProvideDatabaseClientTo(page, new DatabaseClient); StorageNamespaceController::ProvideStorageNamespaceTo(page, client); - ::blink::ProvideSpeechRecognitionTo( - page, SpeechRecognitionClientProxy::Create( - client ? client->SpeechRecognizer() : nullptr)); } void ModulesInitializer::ForceNextWebGLContextCreationToFail() const {
diff --git a/third_party/WebKit/Source/modules/device_orientation/BUILD.gn b/third_party/WebKit/Source/modules/device_orientation/BUILD.gn index f0f24e8b..f7caac9 100644 --- a/third_party/WebKit/Source/modules/device_orientation/BUILD.gn +++ b/third_party/WebKit/Source/modules/device_orientation/BUILD.gn
@@ -35,6 +35,6 @@ ] deps = [ - "//device/sensors/public/cpp:shared_with_blink", + "//services/device/public/cpp/generic_sensor:shared_with_blink", ] }
diff --git a/third_party/WebKit/Source/modules/device_orientation/DEPS b/third_party/WebKit/Source/modules/device_orientation/DEPS index 86aef404..58c6221 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DEPS +++ b/third_party/WebKit/Source/modules/device_orientation/DEPS
@@ -1,8 +1,8 @@ include_rules = [ # NOTE: These files are POD structs used to interpret shared memory across # the Device Sensors implementation and the Blink client. - "+device/sensors/public/cpp/motion_data.h", - "+device/sensors/public/cpp/orientation_data.h", + "+services/device/public/cpp/generic_sensor/motion_data.h", + "+services/device/public/cpp/generic_sensor/orientation_data.h", "-modules", "+modules/EventModules.h",
diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp index 4c31c49c2..625d00d 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceMotionData.cpp
@@ -25,10 +25,10 @@ #include "modules/device_orientation/DeviceMotionData.h" -#include "device/sensors/public/cpp/motion_data.h" #include "modules/device_orientation/DeviceAccelerationInit.h" #include "modules/device_orientation/DeviceMotionEventInit.h" #include "modules/device_orientation/DeviceRotationRateInit.h" +#include "services/device/public/cpp/generic_sensor/motion_data.h" namespace blink {
diff --git a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp index 3425d2fc..769308c5 100644 --- a/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp +++ b/third_party/WebKit/Source/modules/device_orientation/DeviceOrientationData.cpp
@@ -25,8 +25,8 @@ #include "modules/device_orientation/DeviceOrientationData.h" -#include "device/sensors/public/cpp/orientation_data.h" #include "modules/device_orientation/DeviceOrientationEventInit.h" +#include "services/device/public/cpp/generic_sensor/orientation_data.h" namespace blink {
diff --git a/third_party/WebKit/Source/modules/imagecapture/BUILD.gn b/third_party/WebKit/Source/modules/imagecapture/BUILD.gn index 92625497..930e3475 100644 --- a/third_party/WebKit/Source/modules/imagecapture/BUILD.gn +++ b/third_party/WebKit/Source/modules/imagecapture/BUILD.gn
@@ -14,6 +14,6 @@ ] deps = [ - "//media/capture/mojo:image_capture_blink", + "//media/capture/mojom:image_capture_blink", ] }
diff --git a/third_party/WebKit/Source/modules/imagecapture/DEPS b/third_party/WebKit/Source/modules/imagecapture/DEPS index f874cfc..1307c6dd 100644 --- a/third_party/WebKit/Source/modules/imagecapture/DEPS +++ b/third_party/WebKit/Source/modules/imagecapture/DEPS
@@ -1,3 +1,3 @@ include_rules = [ - "+media/capture/mojo/image_capture.mojom-blink.h", + "+media/capture/mojom/image_capture.mojom-blink.h", ]
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h index a54c1e9..b647b09 100644 --- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h +++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
@@ -10,7 +10,7 @@ #include "bindings/core/v8/ScriptPromise.h" #include "core/dom/ContextLifecycleObserver.h" #include "core/dom/events/EventTarget.h" -#include "media/capture/mojo/image_capture.mojom-blink.h" +#include "media/capture/mojom/image_capture.mojom-blink.h" #include "modules/EventTargetModules.h" #include "modules/ModulesExport.h" #include "modules/imagecapture/PhotoSettings.h"
diff --git a/third_party/WebKit/Source/modules/imagecapture/MediaSettingsRange.h b/third_party/WebKit/Source/modules/imagecapture/MediaSettingsRange.h index 98b5a41..1b8cc4e 100644 --- a/third_party/WebKit/Source/modules/imagecapture/MediaSettingsRange.h +++ b/third_party/WebKit/Source/modules/imagecapture/MediaSettingsRange.h
@@ -5,7 +5,7 @@ #ifndef MediaSettingsRange_h #define MediaSettingsRange_h -#include "media/capture/mojo/image_capture.mojom-blink.h" +#include "media/capture/mojom/image_capture.mojom-blink.h" #include "platform/bindings/ScriptWrappable.h" namespace blink {
diff --git a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h index 9e879747..2b5e880 100644 --- a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h +++ b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
@@ -5,7 +5,7 @@ #ifndef PhotoCapabilities_h #define PhotoCapabilities_h -#include "media/capture/mojo/image_capture.mojom-blink.h" +#include "media/capture/mojom/image_capture.mojom-blink.h" #include "modules/imagecapture/MediaSettingsRange.h" #include "platform/bindings/ScriptWrappable.h" #include "platform/wtf/Vector.h"
diff --git a/third_party/WebKit/Source/modules/speech/SpeechRecognition.cpp b/third_party/WebKit/Source/modules/speech/SpeechRecognition.cpp index 9ba59d1..4beec14 100644 --- a/third_party/WebKit/Source/modules/speech/SpeechRecognition.cpp +++ b/third_party/WebKit/Source/modules/speech/SpeechRecognition.cpp
@@ -28,7 +28,7 @@ #include "bindings/core/v8/ExceptionState.h" #include "core/dom/Document.h" #include "core/dom/ExceptionCode.h" -#include "core/page/Page.h" +#include "core/frame/LocalFrame.h" #include "modules/speech/SpeechRecognitionController.h" #include "modules/speech/SpeechRecognitionError.h" #include "modules/speech/SpeechRecognitionEvent.h" @@ -40,7 +40,7 @@ DCHECK(context->IsDocument()); Document* document = ToDocument(context); DCHECK(document); - return new SpeechRecognition(document->GetPage(), context); + return new SpeechRecognition(document->GetFrame(), context); } void SpeechRecognition::start(ExceptionState& exception_state) { @@ -159,7 +159,8 @@ return started_; } -SpeechRecognition::SpeechRecognition(Page* page, ExecutionContext* context) +SpeechRecognition::SpeechRecognition(LocalFrame* frame, + ExecutionContext* context) : ContextLifecycleObserver(context), grammars_(SpeechGrammarList::Create()), // FIXME: The spec is not clear // on the default value for the @@ -167,11 +168,10 @@ continuous_(false), interim_results_(false), max_alternatives_(1), - controller_(SpeechRecognitionController::From(page)), + controller_(SpeechRecognitionController::From(frame)), started_(false), stopping_(false) { - // FIXME: Need to hook up with Page to get notified when the visibility - // changes. + // FIXME: Need to hook up to get notified when the visibility changes. } SpeechRecognition::~SpeechRecognition() = default;
diff --git a/third_party/WebKit/Source/modules/speech/SpeechRecognition.h b/third_party/WebKit/Source/modules/speech/SpeechRecognition.h index 626e1006..6fe4065 100644 --- a/third_party/WebKit/Source/modules/speech/SpeechRecognition.h +++ b/third_party/WebKit/Source/modules/speech/SpeechRecognition.h
@@ -41,7 +41,7 @@ class ExceptionState; class ExecutionContext; -class Page; +class LocalFrame; class SpeechRecognitionController; class SpeechRecognitionError; @@ -119,7 +119,7 @@ virtual void Trace(blink::Visitor*); private: - SpeechRecognition(Page*, ExecutionContext*); + SpeechRecognition(LocalFrame*, ExecutionContext*); Member<SpeechGrammarList> grammars_; String lang_;
diff --git a/third_party/WebKit/Source/modules/speech/SpeechRecognitionClient.h b/third_party/WebKit/Source/modules/speech/SpeechRecognitionClient.h index cd210c6..171b827b 100644 --- a/third_party/WebKit/Source/modules/speech/SpeechRecognitionClient.h +++ b/third_party/WebKit/Source/modules/speech/SpeechRecognitionClient.h
@@ -27,12 +27,13 @@ #define SpeechRecognitionClient_h #include <memory> + #include "modules/ModulesExport.h" #include "platform/wtf/text/WTFString.h" namespace blink { -class Page; +class LocalFrame; class SpeechGrammarList; class SpeechRecognition; @@ -51,7 +52,7 @@ }; MODULES_EXPORT void ProvideSpeechRecognitionTo( - Page&, + LocalFrame&, std::unique_ptr<SpeechRecognitionClient>); } // namespace blink
diff --git a/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.cpp b/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.cpp index dd9a30e810a..690cca43 100644 --- a/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.cpp +++ b/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.cpp
@@ -46,10 +46,10 @@ } void ProvideSpeechRecognitionTo( - Page& page, + LocalFrame& frame, std::unique_ptr<SpeechRecognitionClient> client) { SpeechRecognitionController::ProvideTo( - page, SpeechRecognitionController::Create(std::move(client))); + frame, SpeechRecognitionController::Create(std::move(client))); } } // namespace blink
diff --git a/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h b/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h index feb3e71..c12fd0ec 100644 --- a/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h +++ b/third_party/WebKit/Source/modules/speech/SpeechRecognitionController.h
@@ -28,14 +28,14 @@ #include <memory> -#include "core/page/Page.h" +#include "core/frame/LocalFrame.h" #include "modules/speech/SpeechRecognitionClient.h" namespace blink { class SpeechRecognitionController final : public GarbageCollectedFinalized<SpeechRecognitionController>, - public Supplement<Page> { + public Supplement<LocalFrame> { USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognitionController); public: @@ -58,12 +58,12 @@ static SpeechRecognitionController* Create( std::unique_ptr<SpeechRecognitionClient>); - static SpeechRecognitionController* From(Page* page) { - return Supplement<Page>::From<SpeechRecognitionController>(page); + static SpeechRecognitionController* From(LocalFrame* frame) { + return Supplement<LocalFrame>::From<SpeechRecognitionController>(frame); } virtual void Trace(blink::Visitor* visitor) { - Supplement<Page>::Trace(visitor); + Supplement<LocalFrame>::Trace(visitor); } private:
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp index 7667890..f0271e8 100644 --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
@@ -751,13 +751,9 @@ if (!GetDrawingBuffer()) return nullptr; - if (CreationAttributes().preserve_drawing_buffer) { - int width = GetDrawingBuffer()->Size().Width(); - int height = GetDrawingBuffer()->Size().Height(); - SkImageInfo image_info = SkImageInfo::Make( - width, height, kRGBA_8888_SkColorType, ColorParams().GetSkAlphaType()); - return MakeImageSnapshot(image_info); - } + if (CreationAttributes().preserve_drawing_buffer) + return GetImage(); + return GetDrawingBuffer()->TransferToStaticBitmapImage(out_release_callback); } @@ -784,34 +780,6 @@ return resource_provider->Snapshot(); } -scoped_refptr<StaticBitmapImage> WebGLRenderingContextBase::MakeImageSnapshot( - SkImageInfo& image_info) const { - GetDrawingBuffer()->ResolveAndBindForReadAndDraw(); - base::WeakPtr<WebGraphicsContext3DProviderWrapper> shared_context_wrapper = - SharedGpuContext::ContextProviderWrapper(); - if (!shared_context_wrapper) - return nullptr; - gpu::gles2::GLES2Interface* gl = - shared_context_wrapper->ContextProvider()->ContextGL(); - - SkSurfaceProps disable_lcd_props(0, kUnknown_SkPixelGeometry); - sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget( - shared_context_wrapper->ContextProvider()->GetGrContext(), - SkBudgeted::kYes, image_info, 0, - image_info.alphaType() == kOpaque_SkAlphaType ? nullptr - : &disable_lcd_props); - const GrGLTextureInfo* texture_info = skia::GrBackendObjectToGrGLTextureInfo( - surface->getTextureHandle(SkSurface::kDiscardWrite_TextureHandleAccess)); - GLuint texture_id = texture_info->fID; - GLenum texture_target = texture_info->fTarget; - - GetDrawingBuffer()->CopyToPlatformTexture( - gl, texture_target, texture_id, true, false, IntPoint(0, 0), - IntRect(IntPoint(0, 0), GetDrawingBuffer()->Size()), kBackBuffer); - return AcceleratedStaticBitmapImage::CreateFromSkImage( - surface->makeImageSnapshot(), std::move(shared_context_wrapper)); -} - ScriptPromise WebGLRenderingContextBase::setCompatibleXRDevice( ScriptState* script_state, XRDevice* xr_device) {
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h index 5947464..5af4eb1 100644 --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
@@ -592,7 +592,8 @@ // object. }; - scoped_refptr<StaticBitmapImage> GetImage(AccelerationHint) const override; + scoped_refptr<StaticBitmapImage> GetImage( + AccelerationHint = kPreferAcceleration) const override; void SetFilterQuality(SkFilterQuality) override; bool IsWebGL2OrHigher() { return Version() >= 2; } @@ -1698,7 +1699,6 @@ GLint, const IntRect&); - scoped_refptr<StaticBitmapImage> MakeImageSnapshot(SkImageInfo&) const; const unsigned version_; bool IsPaintable() const final { return GetDrawingBuffer(); }
diff --git a/third_party/WebKit/Source/modules/webusb/USBDevice.cpp b/third_party/WebKit/Source/modules/webusb/USBDevice.cpp index eeed32f..6cde994 100644 --- a/third_party/WebKit/Source/modules/webusb/USBDevice.cpp +++ b/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
@@ -49,7 +49,7 @@ switch (status) { case UsbTransferStatus::TRANSFER_ERROR: return DOMException::Create(kNetworkError, - "A transfer error has occured."); + "A transfer error has occurred."); case UsbTransferStatus::PERMISSION_DENIED: return DOMException::Create(kSecurityError, "The transfer was not allowed.");
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp index eca14f33..2836416f 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
@@ -1058,8 +1058,10 @@ draws_content_ = draws_content; UpdateLayerIsDrawable(); - if (!draws_content && paint_controller_) + if (!draws_content) { paint_controller_.reset(); + raster_invalidator_.reset(); + } } void GraphicsLayer::SetContentsVisible(bool contents_visible) {
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp index 9b7f3db3..24dee0c 100644 --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
@@ -102,6 +102,21 @@ return layer.PaintWithoutCommit(interest_rect); } + const CompositedLayerRasterInvalidator* GetInternalRasterInvalidator( + const GraphicsLayer& layer) { + return layer.raster_invalidator_.get(); + } + + CompositedLayerRasterInvalidator& EnsureRasterInvalidator( + GraphicsLayer& layer) { + return layer.EnsureRasterInvalidator(); + } + + const PaintController* GetInternalPaintController( + const GraphicsLayer& layer) { + return layer.paint_controller_.get(); + } + WebLayer* platform_layer_; std::unique_ptr<FakeGraphicsLayer> graphics_layer_; std::unique_ptr<FakeGraphicsLayer> page_scale_layer_; @@ -248,4 +263,16 @@ EXPECT_FALSE(transform2->Changed(*transform_root)); } +TEST_P(GraphicsLayerTest, SetDrawsContentFalse) { + EXPECT_TRUE(graphics_layer_->DrawsContent()); + graphics_layer_->GetPaintController(); + EXPECT_NE(nullptr, GetInternalPaintController(*graphics_layer_)); + EnsureRasterInvalidator(*graphics_layer_); + EXPECT_NE(nullptr, GetInternalRasterInvalidator(*graphics_layer_)); + + graphics_layer_->SetDrawsContent(false); + EXPECT_EQ(nullptr, GetInternalPaintController(*graphics_layer_)); + EXPECT_EQ(nullptr, GetInternalRasterInvalidator(*graphics_layer_)); +} + } // namespace blink
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc index b76bd64..cc562ee9 100644 --- a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc +++ b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
@@ -353,7 +353,9 @@ base::Optional<base::TimeTicks> next_wake_up = queue->GetNextScheduledWakeUp(); - if (next_wake_up && next_wake_up.value() > unblock_until.value()) { + // TODO(altimin, crbug.com/813218): Find a testcase to repro freezes + // mentioned in the bug. + if (next_wake_up) { MaybeSchedulePumpThrottledTasks( FROM_HERE, now, GetNextAllowedRunTime(queue, next_wake_up.value())); }
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn index d9faaf8..023132e 100644 --- a/third_party/WebKit/public/BUILD.gn +++ b/third_party/WebKit/public/BUILD.gn
@@ -67,6 +67,7 @@ "DEBUG_DEVTOOLS=$debug_devtools", "USE_DEFAULT_RENDER_THEME=$use_default_render_theme", "USE_MINIKIN_HYPHENATION=$use_minikin_hyphenation", + "ENABLE_UNHANDLED_TAP=$enable_unhandled_tap", ] } @@ -841,6 +842,11 @@ "//url/mojom:url_mojom_gurl", ] + # This Android unhandled-tap feature uses another mojo source, add it in. + if (enable_unhandled_tap) { + sources += [ "platform/unhandled_tap_notifier.mojom" ] + } + component_output_prefix = "blink_android_mojo_bindings" # See comment above. @@ -858,7 +864,7 @@ ] public_deps = [ - "//media/capture/mojo:video_capture", + "//media/capture/mojom:video_capture", "//media/mojo/interfaces", "//ui/gfx/geometry/mojo", ]
diff --git a/third_party/WebKit/public/platform/modules/mediastream/media_devices.mojom b/third_party/WebKit/public/platform/modules/mediastream/media_devices.mojom index 23222fd0..198c65a 100644 --- a/third_party/WebKit/public/platform/modules/mediastream/media_devices.mojom +++ b/third_party/WebKit/public/platform/modules/mediastream/media_devices.mojom
@@ -4,7 +4,7 @@ module blink.mojom; -import "media/capture/mojo/video_capture_types.mojom"; +import "media/capture/mojom/video_capture_types.mojom"; import "media/mojo/interfaces/audio_parameters.mojom"; enum MediaDeviceType {
diff --git a/third_party/WebKit/public/platform/unhandled_tap_notifier.mojom b/third_party/WebKit/public/platform/unhandled_tap_notifier.mojom new file mode 100644 index 0000000..d1d852f --- /dev/null +++ b/third_party/WebKit/public/platform/unhandled_tap_notifier.mojom
@@ -0,0 +1,18 @@ +// Copyright 2018 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. + +[JavaPackage="org.chromium.blink.mojom"] +module blink.mojom; + +import "ui/gfx/geometry/mojo/geometry.mojom"; + +// Mojom representation of some information about a recent unhandled tap in text. +// This data is used to notifying the Browser to show UI for an unhandled tap if needed. +struct UnhandledTapInfo { + gfx.mojom.Point tapped_position_in_viewport; +}; + +interface UnhandledTapNotifier { + ShowUnhandledTapUIIfNeeded(UnhandledTapInfo unhandled_tap_info); +};
diff --git a/third_party/WebKit/public/public_features.gni b/third_party/WebKit/public/public_features.gni index 8dbec604..31312dd8 100644 --- a/third_party/WebKit/public/public_features.gni +++ b/third_party/WebKit/public/public_features.gni
@@ -12,6 +12,9 @@ debug_devtools = false } +# Unhandled Tap enable means Contextual Search aka Touch to Search. +enable_unhandled_tap = is_android + use_default_render_theme = use_aura # Use Minikin hyphenation engine.
diff --git a/third_party/WebKit/public/web/WebFrameClient.h b/third_party/WebKit/public/web/WebFrameClient.h index 7863d87..2f2be1f 100644 --- a/third_party/WebKit/public/web/WebFrameClient.h +++ b/third_party/WebKit/public/web/WebFrameClient.h
@@ -109,6 +109,7 @@ class WebPushClient; class WebRTCPeerConnectionHandler; class WebRelatedAppsFetcher; +class WebSpeechRecognizer; class WebString; class WebURL; class WebURLResponse; @@ -809,6 +810,11 @@ } } + // Speech -------------------------------------------------------------- + + // Access the embedder API for speech recognition services. + virtual WebSpeechRecognizer* SpeechRecognizer() { return nullptr; } + // Visibility ---------------------------------------------------------- // Returns the current visibility of the WebFrame.
diff --git a/third_party/WebKit/public/web/WebTappedInfo.h b/third_party/WebKit/public/web/WebTappedInfo.h deleted file mode 100644 index 7366273..0000000 --- a/third_party/WebKit/public/web/WebTappedInfo.h +++ /dev/null
@@ -1,48 +0,0 @@ -// Copyright 2017 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 WebTappedInfo_h -#define WebTappedInfo_h - -#ifdef INSIDE_BLINK -#include "platform/geometry/IntPoint.h" -#endif // INSIDE_BLINK -#include "public/platform/WebCommon.h" -#include "public/platform/WebPoint.h" -#include "public/web/WebNode.h" - -namespace blink { - -struct WebPoint; - -#ifdef INSIDE_BLINK -class Node; -#endif // INSIDE_BLINK - -/* - * Encapsulates information needed by ShowUnhandledTapUIIfNeeded to describe - * the tap. - */ -class WebTappedInfo { - public: -#ifdef INSIDE_BLINK - WebTappedInfo(bool dom_tree_changed, - bool style_changed, - Node* tapped_node, - IntPoint tapped_position_in_viewport); -#endif // INSIDE_BLINK - - BLINK_EXPORT const WebPoint& Position() const; - BLINK_EXPORT const WebNode& GetNode() const; - BLINK_EXPORT bool PageChanged() const; - - private: - const WebPoint point_; - const WebNode web_node_; - bool page_changed_; -}; - -} // namespace blink - -#endif
diff --git a/third_party/WebKit/public/web/WebViewClient.h b/third_party/WebKit/public/web/WebViewClient.h index fc710d7..298c9467 100644 --- a/third_party/WebKit/public/web/WebViewClient.h +++ b/third_party/WebKit/public/web/WebViewClient.h
@@ -45,7 +45,6 @@ class WebDateTimeChooserCompletion; class WebFileChooserCompletion; class WebNode; -class WebSpeechRecognizer; class WebURL; class WebURLRequest; class WebView; @@ -197,11 +196,6 @@ virtual void DidUpdateInspectorSetting(const WebString& key, const WebString& value) {} - // Speech -------------------------------------------------------------- - - // Access the embedder API for speech recognition services. - virtual WebSpeechRecognizer* SpeechRecognizer() { return nullptr; } - // Zoom ---------------------------------------------------------------- // Informs the browser that the zoom levels for this frame have changed from @@ -232,7 +226,6 @@ WebLayerTreeView* InitializeLayerTreeView() override { return nullptr; } WebScreenInfo GetScreenInfo() override { return WebScreenInfo(); } void SetTouchAction(WebTouchAction touch_action) override {} - void ShowUnhandledTapUIIfNeeded(const WebTappedInfo& tapped_info) override {} void Show(WebNavigationPolicy) override {} virtual WebWidgetClient* WidgetClient() { return this; }
diff --git a/third_party/WebKit/public/web/WebWidgetClient.h b/third_party/WebKit/public/web/WebWidgetClient.h index 8efdb2a5..971ffcb3 100644 --- a/third_party/WebKit/public/web/WebWidgetClient.h +++ b/third_party/WebKit/public/web/WebWidgetClient.h
@@ -50,7 +50,6 @@ class WebGestureEvent; class WebImage; class WebString; -class WebTappedInfo; class WebWidget; struct WebCursorInfo; struct WebFloatPoint; @@ -161,13 +160,6 @@ // Request the browser to show virtual keyboard for current input type. virtual void ShowVirtualKeyboardOnElementFocus() {} - // Request that the browser show a UI for an unhandled tap, if needed. - // Invoked during the handling of a GestureTap input event whenever the - // event is not consumed. - // |tappedInfo| has all the details about what was tapped and where the tap - // occurred. - virtual void ShowUnhandledTapUIIfNeeded(const WebTappedInfo& tappedInfo) {} - // Converts the |rect| from Blink's Viewport coordinates to the // coordinates in the native window used to display the content, in // DIP. They're identical in tradional world, but will differ when
diff --git a/third_party/boringssl/crypto_test_data.cc b/third_party/boringssl/crypto_test_data.cc index a2bef1b..abd3656a 100644 --- a/third_party/boringssl/crypto_test_data.cc +++ b/third_party/boringssl/crypto_test_data.cc
@@ -19,6 +19,7 @@ * crypto/cipher_extra/test/aes_128_cbc_sha1_tls_tests.txt \ * crypto/cipher_extra/test/aes_128_cbc_sha256_tls_tests.txt \ * crypto/cipher_extra/test/aes_128_ccm_bluetooth_tests.txt \ + * crypto/cipher_extra/test/aes_128_ccm_bluetooth_8_tests.txt \ * crypto/cipher_extra/test/aes_128_ctr_hmac_sha256.txt \ * crypto/cipher_extra/test/aes_128_gcm_siv_tests.txt \ * crypto/cipher_extra/test/aes_128_gcm_tests.txt \ @@ -282,18 +283,23 @@ static const size_t kLen3 = 393910; static const char *kData4[] = { - "KEY: 404142434445464748494a4b4c4d4e4f\nNONCE: 101112131415161718191a1b1c\nIN: 20212223\nAD: 0001020304050607\nCT: 69915dad\nTAG: 064617ca\n\nKEY: 404142434445464748494a4b4c4d4e4f\nNONCE: 101112131415161718191a1b1c\nIN: 202122232425262728292a2b2c2d2e2f\nAD: 0001020304050607\nCT: 69915dad1e84c6376a68c2967e4dab61\nTAG: 99763ebb\n\nKEY: 404142434445464748494a4b4c4d4e4f\nNONCE: 101112131415161718191a1b1c\nIN: 202122232425262728292a2b2c2d2e2f\nAD:\nCT: 69915dad1e84c6376a68c2967e4dab61\nTAG: c4630026\n", + "KEY: 404142434445464748494a4b4c4d4e4f\nNONCE: 101112131415161718191a1b1c\nIN: 20212223\nAD: 0001020304050607\nCT: 69915dad\nTAG: 064617ca\n\nKEY: 404142434445464748494a4b4c4d4e4f\nNONCE: 101112131415161718191a1b1c\nIN: 202122232425262728292a2b2c2d2e2f\nAD: 0001020304050607\nCT: 69915dad1e84c6376a68c2967e4dab61\nTAG: 99763ebb\n\nKEY: 404142434445464748494a4b4c4d4e4f\nNONCE: 101112131415161718191a1b1c\nIN: 202122232425262728292a2b2c2d2e2f\nAD:\nCT: 69915dad1e84c6376a68c2967e4dab61\nTAG: c4630026\n\n# From the Bluetooth Mesh Profile Specification v1.0.\n#\n# The relevant AES-CCM calls are:\n#\n# KEY: EncryptionKey\n# NONCE: Network Nonce\n# IN: DST || TransportPDU\n# AD: (none)\n# CT: EncTransportPDU\n# TAG: NetMIC\n#\n# KEY: DevKey if present, otherwise AppKey\n# NONCE: Application Nonce\n# IN: Access Payload\n# AD: Label UUID, if present\n# CT: EncAccessPayload\n# TAG: TransMIC\n\n# Section 8.3.6.\nKEY: 9d6dd0e96eb25dc19a40ed9914f8f03f\nNONCE: 02003129ab0003120112345678\nIN: 0056341263964771734fbd76e3b40519d1d94a48\nAD:\nCT: ee9dddfd2169326d23f3afdfcfdc18c52fdef772\nTAG: e0e17308\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00043129ab0003000012345678\nIN: 12018026ac01ee9dddfd2169326d23f3afdf\nAD:\nCT: 0afba8c63d4e686364979deaf4fd40961145\nTAG: 939cda0e\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00043129ac0003000012345678\nIN: 12018026ac21cfdc18c52fdef772e0e17308\nAD:\nCT: 6cae0c032bf0746f44f1b8cc8ce5edc57e55\nTAG: beed49c0\n\n# Section 8.3.8.\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00043129ad0003000012345678\nIN: 12018026ac01ee9dddfd2169326d23f3afdf\nAD:\nCT: 0e2f91add6f06e66006844cec97f973105ae\nTAG: 2534f958\n\n# Section 8.3.11.\nKEY: be635105434859f484fc798e043ce40e\nNONCE: 00033129ad0003000012345678\nIN: 1201c026ac01ee9dddfd2169326d23f3afdf\nAD:\nCT: d5e748a20ecfd98ddfd32de80befb400213d\nTAG: 113813b5\n\n# Section 8.3.13's test vector is identical to 8.3.11.\n\n# Section 8.3.15.\nKEY: be635105434859f484fc798e043ce40e\nNONCE: 00033129ac0003000012345678\nIN: 12018026ac21cfdc18c52fdef772e0e17308\nAD:\nCT: f1d29805664d235eacd707217dedfe78497f\nTAG: efec7391\n\n# Section 8.3.16.\nKEY: 9d6dd0e96eb25dc19a40ed9914f8f03f\nNONCE: 02000000061201000312345678\nIN: 800300563412\nAD:\nCT: 89511bf1d1a8\nTAG: 1c11dcef\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 000b0000061201000012345678\nIN: 00030089511bf1d1a81c11dcef\nAD:\nCT: 6b9be7f5a642f2f98680e61c3a\nTAG: 8b47f228\n\n# Section 8.3.17's test vector is identical to 8.3.16.\n\n# Section 8.3.18.\nKEY: 63964771734fbd76e3b40519d1d94a48\nNONCE: 01000000071201ffff12345678\nIN: 0400000000\nAD:\nCT: 5a8bde6d91\nTAG: 06ea078a\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00030000071201000012345678\nIN: ffff665a8bde6d9106ea078a\nAD:\nCT: 5673728a627fb938535508e2\nTAG: 1a6baf57\n\n# Section 8.3.19.\nKEY: 63964771734fbd76e3b40519d1d94a48\nNONCE: 01000000091201ffff12345678\nIN: 04000000010703\nAD:\nCT: ca6cd88e698d12\nTAG: 65f43fc5\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00030000091201000012345678\nIN: ffff66ca6cd88e698d1265f43fc5\nAD:\nCT: 3010a05e1b23a926023da75d25ba\nTAG: 91793736\n\n# Section 8.3.20.\nKEY: 63964771734fbd76e3b40519d1d94a48\nNONCE: 01000708091234ffff12345677\nIN: 04000000010703\nAD:\nCT: 9c9803e110fea9\nTAG: 29e9542d\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00030708091234000012345677\nIN: ffff669c9803e110fea929e9542d\nAD:\nCT: 8c3dc87344a16c787f6b08cc897c\nTAG: 941a5368\n\n# Section 8.3.21.\nKEY: 63964771734fbd76e3b40519d1d94a48\nNONCE: 010007080a1234810512345677\nIN: d50a0048656c6c6f\nAD:\nCT: 2fa730fd98f6e4bd\nTAG: 120ea9d6\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 000307080a1234000012345677\nIN: 8105662fa730fd98f6e4bd120ea9d6\nAD:\nCT: e4d611358eaf17796a6c98977f69e5\nTAG: 872c4620\n\n# Section 8.3.22.\nKEY: 63964771734fbd76e3b40519d1d94a48\nNONCE: 010007080b1234b52912345677\nIN: d50a0048656c6c6f\nAD: 0073e7e4d8b9440faf8415df4c56c0e1\nCT: 3871b904d4315263\nTAG: 16ca48a0\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 000307080b1234000012345677\nIN: b529663871b904d431526316ca48a0\nAD:\nCT: ed31f3fdcf88a411135fea55df730b\nTAG: 6b28e255\n\n# Section 8.3.23.\nKEY: 63964771734fbd76e3b40519d1d94a48\nNONCE: 010007080c1234973612345677\nIN: d50a0048656c6c6f\nAD: f4a002c7fb1e4ca0a469a021de0db875\nCT: 2456db5e3100eef6\nTAG: 5daa7a38\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 000307080c1234000012345677\nIN: 9736662456db5e3100eef65daa7a38\nAD:\nCT: 7a9d696d3dd16a75489696f0b70c71\nTAG: 1b881385\n\n# Section 8.3.24.\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 000307080d1234000012345677\nIN: 9736e6a03401de1547118463123e5f6a17b9\nAD:\nCT: 94e998b4081f5a7308ce3edbb3b06cdecd02\nTAG: 8e307f1c\n\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 000307080e1234000012345677\nIN: 9736e6a034219dbca387\nAD:\nCT: dc2f4dd6fb4d32870129\nTAG: 1be4aafe\n", }; -static const size_t kLen4 = 480; +static const size_t kLen4 = 4607; static const char *kData5[] = { + "# From the Bluetooth Mesh Profile Specification v1.0.\n#\n# The relevant AES-CCM calls are:\n#\n# KEY: EncryptionKey\n# NONCE: Network Nonce\n# IN: DST || TransportPDU\n# AD: (none)\n# CT: EncTransportPDU\n# TAG: NetMIC\n#\n# KEY: DevKey if present, otherwise AppKey\n# NONCE: Application Nonce\n# IN: Access Payload\n# AD: Label UUID, if present\n# CT: EncAccessPayload\n# TAG: TransMIC\n\n# Section 8.3.1.\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00800000011201000012345678\nIN: fffd034b50057e400000010000\nAD:\nCT: b5e5bfdacbaf6cb7fb6bff871f\nTAG: 035444ce83a670df\n\n# Section 8.3.2\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00800148202345000012345678\nIN: 120104320308ba072f\nAD:\nCT: 79d7dbc0c9b4d43eeb\nTAG: ec129d20a620d01e\n\n# Section 8.3.3.\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 00802b38322fe3000012345678\nIN: 120104fa0205a6000a\nAD:\nCT: 53273086b8c5ee00bd\nTAG: d9cfcc62a2ddf572\n\n# Section 8.3.4.\nKEY: be635105434859f484fc798e043ce40e\nNONCE: 00800000021201000012345678\nIN: 23450100\nAD:\nCT: b0e5d0ad\nTAG: 970d579a4e88051c\n\n# Section 8.3.5.\nKEY: be635105434859f484fc798e043ce40e\nNONCE: 00800148342345000012345678\nIN: 120102001234567800\nAD:\nCT: 5c39da1792b1fee9ec\nTAG: 74b786c56d3a9dee\n\n# Section 8.3.7.\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 008b0148352345000012345678\nIN: 000300a6ac00000002\nAD:\nCT: 0d0d730f94d7f3509d\nTAG: f987bb417eb7c05f\n\n# Section 8.3.9.\nKEY: 0953fa93e7caac9638f58820220a398e\nNONCE: 008b0148362345000012345678\nIN: 000300a6ac00000003\nAD:\nCT: d85d806bbed248614f\nTAG: 938067b0d983bb7b\n\n# Section 8.3.10.\nKEY: be635105434859f484fc798e043ce40e\nNONCE: 00800000031201000012345678\nIN: 23450101\nAD:\nCT: 7777ed35\nTAG: 5afaf66d899c1e3d\n\n# Section 8.3.12.\nKEY: be635105434859f484fc798e043ce40e\nNONCE: 00800000041201000012345678\nIN: 23450101\nAD:\nCT: ae214660\nTAG: 87599c2426ce9a35\n\n# Section 8.3.14.\nKEY: be635105434859f484fc798e043ce40e\nNONCE: 00800000051201000012345678\nIN: 23450100\nAD:\nCT: 7d3ae62a\nTAG: 3c75dff683dce24e\n\n# Section 8.3.24.\nKEY: 63964771734fbd76e3b40519d1d94a48\nNONCE: 010007080d1234973612345677\nIN: ea0a00576f726c64\nAD: f4a002c7fb1e4ca0a469a021de0db875\nCT: de1547118463123e\nTAG: 5f6a17b99dbca387\n", +}; +static const size_t kLen5 = 2122; + +static const char *kData6[] = { "KEY: 067b841a2540cb467b75f2188f5da4b5aeb7e0e44582a2b668b5b1ff39e21c4e65745470fb1be1aa909c62fabcf0e6ac\nNONCE: 10e0ecb00da5345127407150\nIN: \nAD: \nCT: \nTAG: a82a891565e466957ad5a499d45b579d31acaf582f54d518f8f9c128936dac4c\n\nKEY: c9d9ef2c808c3f8b22f659c12147104b08cec2390a84f0c4b887ca4c247c8c9dd45e72f48b30b67a8545750387232344\nNONCE: 58bddf96158a3a588bf3ec05\nIN: \nAD: 5d\nCT: \nTAG: 3580c1601d1c9a5b1595d3dee35b0cd9e1b115d8b0abee557b2c207b8d0df5ee\n\nKEY: f755dc6786e21f39b595389a51d36673e1ffb94ffc066c03873eb31839be6fa319fd31c8bea29f03ff28831861e60b6e\nNONCE: bd6c80797f1f4c563b06fd3b\nIN: \nAD: 78d88005136e312639572343a2d0daf7483d8235291ee3ac002469456b075243dc03380c387030d546c2b1\nCT: \nTAG: dede80d810fc449a769c79a5ecd2c0d68e9e0fae567781e623ab2098c88d8a86\n\nKEY: 43a0a28fef8b89b8fb0f76de01d802935ad561e27ca9c9fa629347be676a6af758501b6a652f369045da5fef751b56bb\nNONCE: 0f6472f1e589c16ca5ad45b2\nIN: \nAD: 78e4eafccfc87631f0314c442ba4c07bca36f996a5b3408f9e445d6009a87ded16b33a4af9537a4619cab70d\nCT: \nTAG: 11fa62dd8374aabe728ebf7e9aa1c02cf8f2dbc29f9aaf1940313f0b7c3e0301\n\nKEY: acf8e5f1bd64e6289370650b5b3fd773320025c8b229fd335d9461768cd0a17b4bcc946919932efdc9fc84a7f50768bf\nNONCE: 1aecfc90d28bcdcc5a8e3578\nIN: \nAD: 6daedbdc69133b56f6a8f098f9f70cdb7e129e51115df385a6d86204a53412cd999cf2e69f45e168efed4742b6\nCT: \nTAG: fbe0511ba0ec5709def9966a9b05facf171cddd81ee2cd56e7afc867af465f31\n\nKEY: 2773c92e6cddc9a5e5dcaf3893080fd2153f009d807df0b175c76615645f2087539e299d8411b27badb749a9845c5e29\nNONCE: 6d04ed129299651aec0465f8\nIN: \nAD: 44219577e361a7a4681172d120a2d653a53ec74bc487ccde4954835943bca413d55c65dc665310148654d8c1e2e6bc2f06ec344473120ad1f95739b993a57f9ec0b3299cc088f385894fff876fc2ce8ce6b77ca253f177ba615101e84e17ad0e60704cff195dcd50eb48c77de409797e0b1c8c4c5b9215a4a0399954a008267b\nCT: \nTAG: 6ab61ac4493e58e48d071d994a000f1c1f498d22f83c8d2af56b03c155afc57e\n\nKEY: 23189bf23bc4b734410d1c7ae321c42e144a25347a8029bb925e3d8ac1b92f4eb97227c1dece86ae9dea7d127eb33f9b\nNONCE: 30681944cd5d78f46d36ed8a\nIN: 59\nAD: \nCT: 92\nTAG: 986aa8438da3cf4a98f478f90d24908c6a4e848f299873e649b256f5499d89d9\n\nKEY: 463d1148325c5f57af670877068a78203571b8b19f40e9f0373156b7448ab315df86c77d7c85ba6e54b9bc329399f687\nNONCE: cc9d015a4b5a888b36b14d05\nIN: 28\nAD: 6a\nCT: 05\nTAG: f66e8dc794b142944fa46d5c04a3e3fe00291668374846d763f2beeffd4ca4a0\n\nKEY: 937eaab44e7c7d2cd5bbb053c12e6255e0aaa42cbe7d83025b7a2887eff8f098d019c80af849b0ed7da54a5ba5b39200\nNONCE: 2b160d24df579836e1572ea2\nIN: 9a\nAD: 35841a33ba3a6ed3d89a1f76d06c61613d09834847e5a41f8616748e30c14335e5baa43d49fceaf85aeb22\nCT: 80\nTAG: 5e5799c147be0329dbcabf7ecdba6ac595ebc2d06b9d757426fbb31e8b39f62a\n\nKEY: 68a746f382fcc11c02af7b352b9d710c137a9f59bc5886dc374ca88cdc01b86fe5678fde16cfa846846539f67a429276\nNONCE: b94346c033ac1a3d709c4f09\nIN: ad\nAD: ad61c9168debf9974e19759088944e888346aff99f3e2e4522549c8ae332a0f41922972fb7c1d5ff24e7ae4b\nCT: 46\nTAG: 62ae92ff64710a9f260da2562e246356e9d749c3584fb9f40d9572307ccbbd31\n\nKEY: 6622579d1d6350fd5dff432b69d172cc51f99bdaff50b0a1c0f4cda8d5904581ba8657ba61c6936407243d7fb64b00da\nNONCE: a880caa7157a13540d2b724f\nIN: 2a\nAD: 95a23eafcff892deecaf093109d30290d819851ad5c91061510e54baa2b039b114c815da20f0e3ba2ba4875bdd\nCT: ce\nTAG: 33f09666f9fd1d92f137d9f3f7092b47b2bd71a7e3139dcd19a803a6b17f2a3a\n\nKEY: 91ce9dd87c7d11d2c4da41863b6851c40fba786a612e0fbf0d1956a71286dfc61fa10bf7d148cecd72b6ceeb82b68d3f\nNONCE: a50dc3d8fd63d3076cc70ff6\nIN: da\nAD: 9ce8e1a777c159ec775abbd67d85e84f3550c3296e848dec18b61bbd713a98a033805bfe6e2f2a011dd7fd754708e524168142aeee579cae19c7eab78fa7c42fa335f0c725baf556160beef9e4afd1050a2c8813be6bd14cc6982116d0229d53e9b4de923abf6ba99bdffe1d5f21748ae74caddb077d9f7488b394436222beca\nCT: 2b\nTAG: 1541cd745bc0259dd72a212474f5c7b8c121dd0289d674e5ba8d56a220d1f1d0\n\nKEY: 1ad577d3b47e3fff8528e336a43a7ffef72f811e05b5c69ccfe777b10f29061e289178e394a1c87ba483c7f98ea5431d\nNONCE: 1fcaa4757a9e48ed2cb3be62\nIN: 46d30dac550103006c292a9ac05d31\nAD: \nCT: 37616eba30c55595fa0ad5d50f91ca\nTAG: 5c3ac4010f75adf90f81e775b07ab939e7551a9b8e0486ba33766728ed498245\n\nKEY: 6df310dc1847b42c68e50b03d154b73d7f3823354b32759c5369bce1a1b4cd63ccdb911c2dc792acf84b8b8f3fdfb89d\nNONCE: 92e6759a31dd556ff9124d73\nIN: 6daba76658db642209e276ff7c8d46\nAD: 32\nCT: ce1814c03037078b6be3252460af48\nTAG: 46e61913f2a1ff6e77faade9a7cd37a82eff3ebec4276fbddff9266b9c9bd873\n\nKEY: f848c2300995f5c98dcd0db24574d7c61459ca64c084421c6ad156e80e398904417ee745245ddae91be20fb07e66bdb6\nNONCE: 3b177e11063445717f417d14\nIN: bbf225131c821a6a60817cc65bf699\nAD: 4c5ab4fdbe0018344629349feed5d8c3ae0c5b64f2b093576a2aaa1225e7a50eca01a9962c9b4f8fc5c12a\nCT: 1538957e78f3ab0fed77906153d715\nTAG: 2c7760d47407ad7b0d5b85fa4967eaa7b6c0bb6eb16619adde7a191abfdf3da3\n\nKEY: d406cac07630ce2c071732a0ec95f55123486d2677465768dc7db13f90902cf172f92e19f57f5cf7c68cd7bde7ee4b4b\nNONCE: 766aede0120b634a4be6fa12\nIN: 3804d40090a38d4c97a5fff631068c\nAD: 7707b7d0f266284e84c2ecdd5a18832650c3e27d66697616c9e9bb2f8a09a3295de0119582ca3614b9608548\nCT: 91e96462a5dfbe8b7af201158a36dc\nTAG: 56623e5813070a0e2f5184aed83b9863301ca02e3108f7afc478d48305e397f8\n\nKEY: 42bb22a317ed9f9df8119746e9a1257217e5b0144051ca56f39587021d969bc0acc02795f3bd201031e8c05af08ad079\nNONCE: 0a9f6bace71a1ab21f4917df\nIN: 013f7b8c75307158f4f300450e7a78\nAD: cd95a649ae215fe73442a6991e157232cbcabecff6042b87d41557e35b97606d606c3ded54f5d3db7aa2773f67\nCT: e588dbcecbdb7667dccf7fe34f8387\nTAG: b04461748109ed9068c7e9c0446528ef09b01613c3b3aa1ffeed6685ebb550f5\n\nKEY: e1cfcbaba3a04b5108ce2a87099a6aae936ee38acd92b7e6b7df0e3bcb9ad18fc579b5d470ef3e04c23459f509852458\nNONCE: 112dd267174bcd81e6fbd924\nIN: 288a1e44b406aebec7b418674f81e7\nAD: 7809d8011c5a963df14fb8981e874119c60b7a9d897d13a05651759db5835deffdd991fbf98b9aa71c79e48bd701b228ba248b6bed874b02da7fcf28a04c38b81c0ff628846015258af30dbf28ea4f3283f664f888fca545f5fc57dccc4ad1dd476c52fba341182ecf783706c5c458bf0ee5ec83454afba78eb8b5ca17af88ec\nCT: 80f4e1012d76f6180ca00fd32c8fec\nTAG: 6de00bf2fd3c88ab34ca9390f7e559875e43e0f938303816a3a75a35729bc453\n\nKEY: 84172547d8608bd9e788a7bb60df2982963716e45f8e63f0c5033327d85c920c5e3776e314246b1694b739c39abfa29f\nNONCE: a3f1643bb504b7ce9e5b43c2\nIN: 7e76323eb13e64da9b240a57c95c855b\nAD: \nCT: 966487c18f025d67b42a04c30d3ff4c3\nTAG: 8bb03d893f0ce8ea4a6a47245bc7f20c72acf8caa466edd01365d0f74c929463\n\nKEY: 02dee8f2e63b37fe3cbae9101fed0946e05e5090510bef3324a82e3f27456a45ab1b6cdeddb1fe515ad07aefeee6ccbc\nNONCE: 64723d21365d62926d5c2262\nIN: 4f1f132c50a01ad48882ce88655b33f7\nAD: d8\nCT: b102082e14cd9ecc0895f7a6f08ab522\nTAG: 2c09651c1a51cb8a375746236fe258a36e725936ccedbc4dfafee6c3084a4716\n\nKEY: 5db57cf6301bab815d38879b35c9db72fd40ac576d259ad5074d0828364050554e9fc08335b5f2bf066b09e50fbe6ba4\nNONCE: 36e5340d844de213c312177a\nIN: 41a6e910b14388740ea351eb1df980c9\nAD: 8316a6b9b155b2de5e724f7593ecdcee442eaef7b9ad204eda4744a5e648c2dd84f48ee81397e485953465\nCT: ee21d4d47042415ca27d2ecb11b13d79\nTAG: 5015da5a3339389d39d0fcafb56ef4005b342e69ba47930e84408d33aadf5f2a\n\nKEY: a493dd6de6fd6584599096442dd9345f6f2d8fc2d426c78eee2b992b4071aba4ce463f3ca293c84b2faf3e8644b6ec25\nNONCE: 4f9be6f788ee960adc650d86\nIN: 4de6e244251091cf13762d20685e9085\nAD: d15da312b7522c18384acdbf6348b5e105557f1790a6a203a65acd73397524681666743f3145048775ad84e3\nCT: bb1296457daa39d889c8f986938d6a39\nTAG: b93548cea90c34d03d6f5683ae2cc78814531b803d42cfe57623fd4bdc8f084c\n\nKEY: 8cc59ebe2c7375a70915c48d2978a1f720bc0aa2775ce9189ae7b3d5dda9a81e56cde0e0a29939599409b71f0b65f346\nNONCE: b0ab041f37ea1e594f1eddb3\nIN: cd0aeaf6806cb99e6bc1c8c5d830de8c\nAD: 8f4b5a9609df757826dbe7e51bb6a2c6f45f601263cf668836193513cf008ab6b36a7d5447039f1268821ec37e\nCT: 5d5375b9d9cff6d0c1dbd14221509a0d\nTAG: d8850bbc838e068b817c24d018f8f1e1cb8aac0a68392a700f48099f81b6c37c\n\nKEY: f3e9c507478d3f99dbf3e2421e45929b096ab3f3d4aa4ef9c338c5a1a2425c9936b7df602502d33cbafcf781350da77e\nNONCE: d4872a30c9d1fa9001a25afe\nIN: 25e05ea69a956b12a9be4ef03ae9d30c\nAD: 8b346c20e7c64b805d9c8d325829201753069c60b3f221f31474f55cb20315373ccd7c2a8f215e9efc407ae91b05d8b6d693a3780fdd65d7715cdded86c3d6204055812f3fce897f829d1df9ffaaf48885291701ac1765090c383162dd13d6bac88baa0cb2d748363bbb79843a1594ec6d8778854a63b7c9ffeb6d1fb17e90f1\nCT: 61325c7e0d29e9ad50b9c0fec02d7ef4\nTAG: 4b2d0caece46ce2496445883c03234e900189c22b54390b399d78ee4ebfbb7d4\n\nKEY: 3d9b651e65e9239c9e33aafb091b348161ab797901fd0468aed", "d014e4d5683c8f3f54f20ea6bb07bb25dd258df7bcd5e\nNONCE: 32bcf856a14437114e7814cc\nIN: 08a667c2923f87a7db6502478d32280bdc\nAD: \nCT: 5e8e02cc91c732356bb9f1fc599426a379\nTAG: 5449e878d558beff4bc7dfbb5f0195444705cfb259773b4faec524fbaca37ea0\n\nKEY: 2124cedb5f3f2558f8b9a2304a29c0df6102333cb4aa10625aa82cd76ab645c73f3b7cbf7c96cacdcb9e0b738e40c042\nNONCE: 7ae419446a3a105beb2fbcc5\nIN: a305dc4a2e50cc8e7a65a4b10b73849636\nAD: 70\nCT: fcaea620f7e9ed1337214c4b432d9869d2\nTAG: bfc739c8504a4d9033ab1915f46c1bf65c5382fe9ed1c134026ba32c63ca131e\n\nKEY: b027feb1aced8fb3af27a9fd7f531c30991ec1abd9f230a3e5d6ee9fc6a77747013f8e14dcdbd07b0083d0ce23dfa711\nNONCE: a30a6520f933ff5265e6e305\nIN: a705f842d542cb6957fbce21854755c6dc\nAD: 447bdaf34dfab9cc3dd7777ebaf80077f391093bac9817bf02ad98db9d3f271282ecaf0ff19652f92076d1\nCT: 3ddcb07c121b498f1abb73bedb527d4df4\nTAG: 55957a0e884dea22d6ace10e5936cdac891f5b54225349ede5c44715f1064b5e\n\nKEY: ffefb7770a7cf125395703985823f3e926f3722ca0764518fd2b8996577bec03648c8d542af1c6e36b51174b0ba88316\nNONCE: 4c31394b4b24f6251a839891\nIN: f026a1d352c37b204c6c1138abee9a9a75\nAD: 1e7c0f71a3aacd87ea785521ea31f93b1efd0bdf97952e0b84ecd50c706806deffc19caea312b5a9988454d2\nCT: 23c8bae37db93ed9f55f2903e04b7c6a8e\nTAG: 89d0a7e7d921dea5bb54c28e79b612688e42506aa69b141de830c8d63bdefcee\n\nKEY: 453cf5e4f48ce5a961c94af0e1639c156965970f561ac17fe08d5b75975abe3db87412640972e463290800666be80441\nNONCE: b3e3f9708a86c7cdf139e496\nIN: 53f1b11de497cc6ecb411a777dc3d60197\nAD: afe29e074dcce850ac6640230e6b9f66a64587c5fbe8679144e065d3b1700c721833ba8f918e926c9142f5f362\nCT: 15d5f597be46a19566a72c5e843b77f70c\nTAG: a561c3375c096a116a721e9404e555a2deaf3f677a8611694281663274708f58\n\nKEY: 3d497f81d0652d475bcd85cf53bda13f79ef0afeaec09dd679a6e5ea58f87ba6576269f836096d5ac034594b17073331\nNONCE: 3fb1664830821e2b524890c8\nIN: bd75c313f5c8f6007a2185bc39d0af01bb\nAD: 50744ed959e2b8ba5b5f4807e2997ea0b96ebfcdeaa1c6b33853219844592e82ad67abf6ccbb272cfdba6a3e45c07fec4d4a0ebe4235f11d916771a764d9a129d39f6b84f0b5fb4cdf789ca2f5ea306b25d047a9b1a1e2e90905b6fba472e70b2fa25c96602cfa0031f31c68954d7487507081b8e70f8aa1342cb8b4a98ce9c2\nCT: abe3869ac43fd8b429ee8b8539c970bc86\nTAG: 33fcd301c2bf624bccb92a986c2dd5f2ecafc32649ff550eb5312fc81cbce46e\n\nKEY: 353c3e9f87b40fc0281869c68d9d9bee5c95771dd79998c059bc5ceda71f139fe447cfdf340e9eac57f232b9d230e45d\nNONCE: cc7a4b46b02f4e7f96fd34e3\nIN: 44bcb61332930f606276268ddbf3287bcaedb5b25704489cbee63ec839d7a69533dbfb6e95fe5b4694eb485beb1437f0777774868ecf45c8a5b3edafa1d62a\nAD: \nCT: d038d67b8b690519fafa7467c9fb94135f9bf0bcd8247cd2c30da62ddf37a6d9a3a9bdcf8ec081fb4469c0fc2798e2e30afede7cda384438fd01e5d672dcb8\nTAG: db2c685a59cdf304c1fb57b66966a5ca1cc3536fe21eb1113c25868428640c7d\n\nKEY: 3b3786e38e110ec0c8b05fbdb3d9b6d117d1ebcdc0e7d942249fea6baafa31fe5caac227979fc833b104641e8e9ed01e\nNONCE: 53bf31912a3ededc01c91f84\nIN: 6de5890028382aafb186042864c5cca1a77ff80ba4f7f0942dcffa1579711093fb652c8d475dfca81a976be8ca77eb9c7a6b49dca1425610c945bf404ba65b\nAD: a9\nCT: 886939354fa117139f5e077baa186825ee7e2955c3a74f88af3a86b260ee9f9959a90409e7d602e36cea31e606aeaa8b9229e28f7fa58ace6fd217e5cce1e7\nTAG: 91a769003ec900dbb40ea9c9b959882d822421b510ba85ca826bc4af3b5c42e0\n\nKEY: 5a75c97f3583983bbc5eee4a882b766a6708d798a46f71e63b7509af69afd7cf86f9b42df04b626940914007078a8b9b\nNONCE: 426e8bcbcffb6b425706dae0\nIN: c24fa29a66197cad518c5a1a76abd9446a8f24c2dd81e953bfc5c00544c119d67986781a1c754224af234b0ec5e44e78610a4420eb78c283e9a56637c35c24\nAD: 6376835513967e4ccaff9a0c56b4d27a2bd0d013cd54abf95fe9a162d036af285ebc9567a16ed5abfa69aa\nCT: bc4daeef3ccdf9abdaa75591781685eee3fd7825bfe63132817a7e0f93817f22bfca30ed775a773f5bb290aac3a381a01085e861cab7b9fe4c5143138e17a5\nTAG: 79c779bfcb974ad9a8ac88dce5027df5691a3a1163a5d5893b4cdb1663b17aa1\n\nKEY: d1b301c029fe3b81e4b97e08e84dbc03b138f422161c0e74ccbda3172c034b99610f09a9e611f0e9a3ca40af4fcb3c56\nNONCE: 4032c79eb3ee4b63e44fa932\nIN: 71bcf5a5198787b85a66221c22e7bdb9d038dd3e10000555ec9271e54bfefc460ef4e71729ff7ae52859015b49f45df89ddf183fe1e19de3acb032dbaa4d57\nAD: f1cd18ff1e5ad2b65de41e083b5175966625ebebb3031e1027761e407dae4e8e193ffe7dea52ff61147f1b4e\nCT: 7c521a703b7d1cbd086bdc316d4f2ff0852c462eeaa1d7a586c561354be9ed412d9d9bd1f78cc85468750f1af09b7b17dc1ee84c926760d63504cd3a1dfa3a\nTAG: 831f3552890d997f0a8f2d832b6e92e26f6e865424699f0364a82d86ab7734d0\n\nKEY: fdd24bf37b36666a4f641115581ab4bd6b896dd3017006031b3675beed33f21a314363e3a07bbbf4359d9ac02eec847f\nNONCE: 7767cff1a096a9f7d8a9b32c\nIN: e62b7695dd41baf49d1b356e64c6d5504784380b75724b86f5f3185d1a530664aea0e5f9aeef347e1ea4754acaa7f3c233638db234c0e93db02e0bf988e7ab\nAD: 2d650f3daed2564b0df86fa23ed0343634663adfae2c422f80f9d5674bbb63e824f01ad3994834f889133bbc0e\nCT: a51f50a6ce77a22ec472bc18c37d08fb28e77efe55065b600e3edbd9ac97f0fd0eec93cd312ec7ef886cb04e1849526f0a38b14d862bcd578b99bf9a007c2e\nTAG: 89d83264364c9c84ba705e5549abcd496abed3900f65e3daa012275fed18a7da\n\nKEY: 0f88e2d00d2c4bd682f1591ea5f4c1a1090180e1195809cb363b27c863360a85b27814e6a724effa44f298430d6c9628\nNONCE: 6e2e62ecb2aa47c7e5921d25\nIN: 91efc710a57adb57017725cfa26d17d3e2993c5ee66942ca42e770a83763e9df8a455bd408dc1e2661cf301f1dd669cd6d5b4d92a886be0f54527779bae8f9\nAD: d060cbe84271e85f25a3dcb6dbf299551f0dcd5783e3df80468636e491c0100f3ec8316f24240482a88bc430a398b0ecaee5c48a274ffb2d835e200bc39ec0aa86a1c90c9e2dcb4217595d48826a81de90eb949846a33fc26bf8886ca0554e1b8f12cbeee36e65e33cbbf610c2d24264619fa93c44c88e0e3d9d368fdece461b\nCT: 10d99b98ed67d85a44fa57e706a8b028c61ef17f35f6713613d158cad90e826f90ef036a2190ba123f9b68b352ca94fbebf8ea947e569ad45f00e6a36975f8\nTAG: e345bebcc4a8ac01528bc5f317e5c378236b292c2baab6ae8654245da35d90d6\n\nKEY: 1ccec52c77239bdf6ca50e5b702943b23015d08cb1d9bac592b3dec4c96be904110713e52e114a8bc294df26530a758a\nNONCE: 38554b7c40027afe9721e14a\nIN: dac91fcdb3768df8d5ae9ddba1fe5917c084a5d9e6b14eee9a609cab2da34ec9f95cf2d10fff77108477e694c76f362e29b9a9287d8b190a748ed0a929967ff8\nAD: \nCT: e6bcb38b3bfd0b428a14bb3aca01a4a9e54b0853f10bd7750f5bb58d0e7dd18006f8929d7d862e5d6601ef63be8442334b4d51a99219cfedaa31f7ab19028459\nTAG: c4f05d9415840c2325dabbcd12dbeda31e47637437514c606dedfb8ce622edd0\n\nKEY: c82ad4c6f248bc51d3a51b958ecc2460a3c64d669f6c485c2309d26abb3fa84644a0d8c28da8091f90184b53cd556413\nNONCE: 35a29938fb7a31225b08d0e4\nIN: bb0045cec5587e50b148b140b6969612425243ed1412e812aa9f4b471ed34ced6dfa9e0acf3e31455893e4ee7e66b4661c6e1f80b7d6f1159c11387ce579b80f\nAD: 12\nCT: 5f1854fc2fb11fd721755445a1efa5a28607a725ad71cda9a3464860a6a0efe3f58727c0e0cd315f867611232abd72034dfc2b9deace8cf6cb507b1cd4032b59\nTAG: e40429ca19a88da73a7654d7ed8e0621ac2e504b0245615e262ac70bd05a3f47\n\nKEY: b01bec74fe97e5af7db2a0b1432f8b4c069447d2b56dc2668371387f753b03465412213999d2394a4b79873db06c590a\nNONCE: fec7de97d54dec8d36c9f253\nIN: 88ab078d03ffacd128edbceea7ace2e6465f4076097445a5db7f0e61ed817b6e24f22874489049bee0c58d0aa2b42b4db0bbef6ec88d032da9c82ebef57c424d\nAD: cf0ceb3e80a76d1a75f6e070f5d3fee1cd1e2699434f96e7cb3adce12d4a3148dd433b08c68b9d66962f24\nCT: 8aa3c7478b0cd86fa30870957fb5307345f89346a869d508da9d3a4fe36fb3d6a9b0c3c1bc2d44c8ea31ec028012098d6032085af0b54603dc2fa65ff091fdd6\nTAG: acb670172ec3754064b366566bdccf5056eae132e2041f1a285c5883e7eff4f3\n\nKEY: 699a94f6e6eb457b186af58c25118fcea81c8f0ad265e7c16bd6cdca15c9db64bb9a537580ca0474a4b4d54d47412d88\nNONCE: ac3fb6525f4357d831529407\nIN: a7300aa94f3d357cdb272f0a739979e08aad9551dd3bfcd0b5aca6a0972a71b502639e79e1b9e0d22db2f3220b982800d9cebbac3d10d9bf86ea25d3d417fc57\nAD: 19c3d34bb9d57d0f63f14bdd3da06a43a5afe6a8c505f038cb403515876a2765c2d61aa7e4c84e11c999b81d\nCT: 8b472f1069ace78172611369b03073f751e5206dcd2ce3b45c431095f303e70c59bfad3af8006e66e4a68f8fa2ffa534bd76bdef089d07dd38988cbf723393c6\nTAG: 8e7c3c2c41b1117928ca1cd0cd48c25c319c18e009804c007d1aab0967c0d0d4\n\nKEY: f3a7b8c2a39531d5fb3c97bc9224168aa835973f48243d6f046d00937ed428e5d672e22af26e734f0c24f989fe62621a\nNONCE: 65c61af60769672f0eeda005\nIN: 59667fceb2594e002c844a47d2b3935d2c99570b1639f0887fb082499e1d36f9699ff9ef53be3b4236136aa9e441abdc63dfe536e6fc9fa8f332baa1dad577ad\nAD: f79036742501f1ac19dbb2984e09cf5000bc4bc0424082376c307b8f1e5bf74dd29c802139d7ea93d55d336464\nCT: 9375a81f016c2dc59a8e99dc33fc0db7ef99ab2f9ade4b0ba000a614ff2bd13bfbee2d4a2338109c98c1147edca6023cea43570adc503da98379326ace89d796\nTAG: f563869420699dfa0aa84751526bd75af1473bd88311001e49230b09b8ef2797", "\n\nKEY: 27611a8f11cb57d08648ec816b5f3c45882dae394200cdfc803d1a52bb03f225206574ea63b63423da6972bf5a994332\nNONCE: a7f617fe7a52dd76ee443dff\nIN: d6ccb950515a4a2de7c3cf5a73b568f32fe30567bb22b3b46feb7ef07205d3215a3d689b96d4b9dbaac5a5bd6ecac6ba50314b19b37179fff2557c869950e162\nAD: 777282a98b2f262ed9456fed3610a2028bcc4433eb8f028597d3bfa220bdb0c04882de03a276d0191cd1a125270ce1630c1b94e2ec0021ce5c494d2e0bdb8745e6e94a387cbb31a0898965174bcff8bba105f94dbf080059b49dee71c3194fefe679ef6c00065154ea809293b088c0c3f2ed7824aac72319a4c4ad85ea990844\nCT: 41eacc31aa3c3a282ae7638d48fc7541d2f129e4cb3455df7e60259be9a814c8e1642ea826ac1ec7ed1fcc216a6624e79845521e7a8b16702566f27f7a7f3317\nTAG: b959992feb7005410f9ea6963525e3d9244f038731ffab8da8c4ebc72489f17a\n\nKEY: 0d9322713cd132c339c38ec7a75862860de304c70486b89b0f587095c66bfd1abe56f0b34f9ca0dac577fd4262616600\nNONCE: 3298d02dd4eb85a98cb935e3\nIN: 5dfedb1d168fe262d35f78d797560b2634f71d40f438c21cdcb8e73cf9884c11570554f55a6abd23d0e7775a9ab385ae6c9bbd67f08d1aec57347a8fad5a4b8c7b042b03c25facbffc76f0b1ce2e6c07d427eaebe71255d661ac8e8bfe8867e2d947d496ce2318a601d0beed02426311ca678d036deb3b4c65b1f89bd644a410\nAD: \nCT: ff09fe27f12a87d5208bf246378ee0740e848262442b8b9c7670c8a73fe6732192cde43c1a1246743ed49e15ec63c87dc06eb3e0c92c1f286108b2c7e0754dcf1b9c3fc87efe3683289daabf2db71d8742061f93098788c3c6f26328b86e358507a03af296d2c29009562cad3763399e0e2b89ed440f756c16214c8ab7ddfb84\nTAG: 5076c80fc76c67d6e4f9b9d470cc184db62ea7da49cae44cb3ce9e46c2f2ca9e\n\nKEY: 2695671fe86f1658d8b01ec856fb4c9d09a0c51a1b994fc87a3f72bec12052537b7429f11f7eb4aef0b128302ec8f336\nNONCE: 9739e577595418c47b9c10b7\nIN: c723c39be334a0761db795076e81e3dd85e37a57258c7e0e10fe0f48dc31bd5e683430aa70531b7c8e3a904e49bec838e760d07afa9f86b2cf78ae90f612c4560632acb7ea2d89fb1fd5396d0337111c429cdba99c6a52e863e8603aac24a83302ebf86ae69a212cb938e12085cbf73a28f75e4422995a5ec8705b12d4aa8b6d\nAD: 31\nCT: 1569b20732ee6395e605217e1cb419ce57496ba6f6e889bdfa3c93575e969eb7a0410c7930b7ea146e88577376d84f0e824b62890eb84bfe768a1513a12c2958ad1835bc1eabe602cf40f7812c7dd7da955567242cd7512090fca685fdd7306bd98a908b09464961114abbdcd610c153637400a1f81825cfdf06505947fe54ee\nTAG: d07e14a62a32ef1933abc2127cc5bfc1e43bbca663e460409c6faa3a4ccf99f3\n\nKEY: 1785ef6e7016733dd1952b3268639f231e7afa973c0a3db8780b81084c67a1783200149a1ed849ca8b5c14c7b1798b4b\nNONCE: cdf48b73c3c8d8625e52fe11\nIN: 14002f17e056d7f5524537cee6c2061e2741c01a6f9a82e2cb1747887875860d51bebf8d9b63950a051f6b228ad7567227f8a45b9fa7c4ab47eab410125303defa7e3141bd9bc5bf4ed56550801ff3bfc2dfaaf499c192b1e18879b2f59e1230778132818df8f6ad8a3dce9a1d11c98075b8b4e560edd9b5ea180f0424ab3706\nAD: a35e86e22e9a3df65e4c08e5175b4216fa9895a1be6252de911cf98349841494617eefaa007759dad7f337\nCT: 99eae989435578cb57715a7457da31b807b8078a59c2332a0a866eee9da5188baed3f517b6808095f0067e9b4b91cc1424a464f0a09fc946adbe4135a17b0e8e545d2046f81cdfdb233aa3520797319c0884ccbade8235c32d195e7b802017f88ddd86fb630de19eb97f4bf91029c001fc8f1cd2189a8ee6c120e9f1682a8703\nTAG: 1848f0b163e7b0d270e2a0ced288ea6525697170aae15038f3dcbb4ea49ef843\n\nKEY: ba9aed2bfa90eaed9b27a697bb44c715c0209cae6b2c4ddffc684bcf07ab51b0e096dbcfa26c18fc24b63408317da567\nNONCE: 4b850d6bfa64520f1aa1e79e\nIN: 5bcc2ea4d729c84340c5ceb827f239578971c595e915f0bd9d49ed51d723f8d0e8362e69fd11466230bda0dad57ad724307edcc621ebde1e57fa91fee206d81d2bb6ead94b4a804f74b6cae979f66bdfa4ad93d107ccf114c59cd3d261aa6e2fc0dfbd0df5f7c18e80d0699cc1712abbefab5029e35549d2919d0f937d444051\nAD: f80c759062e9ed0ee597406aedbcda9a14261d66a9546f1c939d20cb1d0d0974fe7a9b33d8c93287a6a8d60a\nCT: dae4fc873d302c51e55910e67482bb80ac68e9bc6ef77cb3e57a31d85fe75f9071d0b64026ba16d0b68fa9c0b7e958cf7682bcd329c4174ea0e3f3f9d2e65d82aae1350a53ea7cdcf9ab848b85cd731751f0e2917628e5066f5b1ddebc7dbda5d2d37e46a7a7ee62bb49c4431af730f9cd3da4c1d0e5f8593d8c99803f781bee\nTAG: 58b42e9117fc8cc2ba5cff74b0d92e8b381a444fa837018b15e9514fc4319fb4\n\nKEY: 37235623acb0d650f905f106dc3bfe6fd83192e53056de8795ed8d20c6e58e5efd84584007ecb17de9e76b392e12fcd7\nNONCE: dc441f1c743a92c4b975c6b6\nIN: 960ceb8d80774bd88b7c5f17042ad2e4baac71b4021c548458cffcd9a049291cb0df93076c115b54f9af878745acebc6e8f04666d053b1ed980728043c4fe7f67b2bcb0341d8a4973ed126342f9add14279f8402cbbffcecfc847379dca8a68ba4f2f26141acfca7f3ef558dbaf04629f0f46e43246b19d875be452f14e7bf56\nAD: 32579218062560f15ff966932838460f99099782e79f1f8c41cd9f6eb59b4c2c3d2dae9cd199fe66d74c7a9940\nCT: 49ad8e24a31e90ab1f8dc37dc51dff0f93f1420e79eb108f90f800274a5aa573f64e274cd52f1dbfdee363e4f86e1457bfb8f87ce57aefd34c3a5a3a93db4ebde3f73a3b4c202c993903ab378ae71042ad238e94f400c7ac1891a9890b19d445eb1db60773a3ea165f7c4b2bb2071faaf588daebac7ce09ebfc88f4d9232d9ca\nTAG: 82f908b837a5768598982f860ecea16aee84427371c4de1f1314749b70ffc173\n\nKEY: e7fc36c9fe87a38f9bb4ca67723267e80e16bf39740eb1090234a473d68aed9c96fe2f96e539795eb042276aec5d7505\nNONCE: 83d768746d40dcd695e49ff4\nIN: e61f0e02a70249b62ec9a8fdbaf6622c9c6316599daff421f1b19815707b67587d196b7e1452c7d7609f108ea946675ac5d97ed215b92a451aa6a11717ab7819f84848151007f37e2cdc8aa99969c3d5652aeeb65fc21b621865f47f44eb2c528ee1142d11f513761a6bb2d169126503db5b263a410cadd2773ff931a032a885\nAD: 59114e9f21b380ae6068609ac36688e6aa7c2533cbfe07013ad1b6663bfa42e39f20e62b45c0faa256c1d33caa9f59b1e30d8502bb7148d051451b3d0265cb9fd0d82e4f4e0489ac606956762d8e7b70abd7eca413ddb708f119c342b3d0d5df673769d8df281656d909b68b6f6438edd60339fd84ff69918b6036ad12a0a588\nCT: 4f12807736c9ab32a2be2e00c9a0236394a8bcfcec6037e7582af462a73bf10aa73bd90e2bc24b97f7001ccf653574aea294bc7b30b77540f475e0e846ab78ffcfa1fef28058e540fea43d9017d4efa05c837611b2eacf0034f26cb7903eff7874973c6da7843892bfc676170a75f839e297dc7f04c74b40f4bda20a45b2a352\nTAG: 9b05aab44ba4d1451f14e087be626232ed11c4ed04081f0d4d47ab593fc619b1\n\n", }; -static const size_t kLen5 = 22032; +static const size_t kLen6 = 22032; -static const char *kData6[] = { +static const char *kData7[] = { "# This is the example from\n# https://tools.ietf.org/html/draft-irtf-cfrg-gcmsiv-04#section-8\n\nKEY: ee8e1ed9ff2540ae8f2ba9f50bc2f27c\nNONCE: 752abad3e0afb5f434dc4310\nIN: \"Hello world\"\nAD: \"example\"\nCT: 5d349ead175ef6b1def6fd\nTAG: 4fbcdeb7e4793f4a1d7e4faa70100af1\n\n# Test vectors from\n# https://tools.ietf.org/html/draft-irtf-cfrg-gcmsiv-04#appendix-C\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: \nAD: \nCT: \nTAG: dc20e2d83f25705bb49e439eca56de25\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0100000000000000\nAD: \nCT: b5d839330ac7b786\nTAG: 578782fff6013b815b287c22493a364c\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 010000000000000000000000\nAD: \nCT: 7323ea61d05932260047d942\nTAG: a4978db357391a0bc4fdec8b0d106639\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 01000000000000000000000000000000\nAD: \nCT: 743f7c8077ab25f8624e2e948579cf77\nTAG: 303aaf90f6fe21199c6068577437a0c4\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0100000000000000000000000000000002000000000000000000000000000000\nAD: \nCT: 84e07e62ba83a6585417245d7ec413a9fe427d6315c09b57ce45f2e3936a9445\nTAG: 1a8e45dcd4578c667cd86847bf6155ff\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 010000000000000000000000000000000200000000000000000000000000000003000000000000000000000000000000\nAD: \nCT: 3fd24ce1f5a67b75bf2351f181a475c7b800a5b4d3dcf70106b1eea82fa1d64df42bf7226122fa92e17a40eeaac1201b\nTAG: 5e6e311dbf395d35b0fe39c2714388f8\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 01000000000000000000000000000000020000000000000000000000000000000300000000000000000000000000000004000000000000000000000000000000\nAD: \nCT: 2433668f1058190f6d43e360f4f35cd8e475127cfca7028ea8ab5c20f7ab2af02516a2bdcbc08d521be37ff28c152bba36697f25b4cd169c6590d1dd39566d3f\nTAG: 8a263dd317aa88d56bdf3936dba75bb8\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0200000000000000\nAD: 01\nCT: 1e6daba35669f427\nTAG: 3b0a1a2560969cdf790d99759abd1508\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 020000000000000000000000\nAD: 01\nCT: 296c7889fd99f41917f44620\nTAG: 08299c5102745aaa3a0c469fad9e075a\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 02000000000000000000000000000000\nAD: 01\nCT: e2b0c5da79a901c1745f700525cb335b\nTAG: 8f8936ec039e4e4bb97ebd8c4457441f\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0200000000000000000000000000000003000000000000000000000000000000\nAD: 01\nCT: 620048ef3c1e73e57e02bb8562c416a319e73e4caac8e96a1ecb2933145a1d71\nTAG: e6af6a7f87287da059a71684ed3498e1\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 020000000000000000000000000000000300000000000000000000000000000004000000000000000000000000000000\nAD: 01\nCT: 50c8303ea93925d64090d07bd109dfd9515a5a33431019c17d93465999a8b0053201d723120a8562b838cdff25bf9d1e\nTAG: 6a8cc3865f76897c2e4b245cf31c51f2\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 02000000000000000000000000000000030000000000000000000000000000000400000000000000000000000000000005000000000000000000000000000000\nAD: 01\nCT: 2f5c64059db55ee0fb847ed513003746aca4e61c711b5de2e7a77ffd02da42feec601910d3467bb8b36ebbaebce5fba30d36c95f48a3e7980f0e7ac299332a80\nTAG: cdc46ae475563de037001ef84ae21744\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 02000000\nAD: 010000000000000000000000\nCT: a8fe3e87\nTAG: 07eb1f84fb28f8cb73de8e99e2f48a14\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0300000000000000000000000000000004000000\nAD: 010000000000000000000000000000000200\nCT: 6bb0fecf5ded9b77f902c7d5da236a4391dd0297\nTAG: 24afc9805e976f451e6d87f6fe106514\n\nKEY: 01000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 030000000000000000000000000000000400\nAD: 0100000000000000000000000000000002000000\nCT: 44d0aaf6fb2f1f34add5e8064e83e12a2ada\nTAG: bff9b2ef00fb47920cc72a0c0f13b9fd\n\n# Random vectors generated by the reference code.\n\nKEY: e66021d5eb8e4f4066d4adb9c33560e4\nNONCE: f46e44bb3da0015c94f70887\nIN: \nAD: \nCT: \nTAG: a4194b79071b01a87d65f706e3949578\n\nKEY: 36864200e0eaf5284d884a0e77d31646\nNONCE: bae8e37fc83441b16034566b\nIN: 7a806c46bb91c3c5aedb64a6c590bc84d1\nAD: a5e269e4b47801afc0\nCT: 8092e6d6d729f5ee7e808d77f3b7a89647\nTAG: dec23ae31e3e97bb364fa18ad85cae0b\n\nKEY: 577e34699b9e671fdd4fbdc66f146545\nNONCE: fc880c94a95198874296d5cc\nIN: 1fd161320b6920ce07787f86743b275d1ab32f6d1f0434d8848c1177441f19549586\nAD: 0f046787f3ea22c127aaf195d1894728b3fe\nCT: 7520668ef1b845aabf245e66ca687ca7c5b4f00de71afea392cda124893746ddd4e6\nTAG: db5ad3b398513fe5c8d868e68becd5a8\n\nKEY: d1473c528b8426a582995929a1499e9a\nNONCE: d8780c8d63d0ab4149c09f57\nIN: 2c614b4745914474e7c7c9882e5386fd9f92ec489c8fde2be2cf97e74e932d4ed87da44102952ef94b02b805249bac80e6f614\nAD: 55bfac8308a2d40d8c8451178082355c9e940fea2f582950a70d5a\nCT: bdbec524ca37355074899f01b7247b1abc24565b997e000f231f0664be655d8cb75f18112cfaa722e1b2e261710036ff919014\nTAG: 45b9ece29df0dd93941f9454404c8d87\n\nKEY: 1db2316fd568378da107b52b0da55210\nNONCE: cc1c1b0abde3b2f204d1e9f8\nIN: b06bc47f9745b3d1ae06556fb6aa7890bebc18fe6b3db4da3d57aa94842b9803a96e07fb6de71860f762ebfbd08284e421702de0de18baa9c9596291b08466f37de21c7f\nAD: f901cfe8a69615a93fdf7a98cad481796245709fb18853f68d833640e42a3c02c25b6486\nCT: d75a5a40ae0ac4343f1a52ee16108332b3563616c207c2b22be277a219e497b7e5bbd5bdecaed87a5216e3e49149ac50a7959957264c222577a07c73fc81f0e579a0fa93\nTAG: b70c26c56e34c7740824f9dfcb8ae6e4\n\nKEY: 9e146d7b233987bddfc240871d7576f7\nNONCE: 028ec6eb5ea7e298342a94d4\nIN: b202b370ef9768ec6561c4fe6b7e7296fa859c2159058b1f0fe91433a5bdc20e214eab7fecef4454a10ef0657df21ac73c535de192eaed3822a2fbbe2ca9dfc88255e14a661b8aa82cc54236093bbc23688089e555\nAD: 40db1872504e1cced532ce4159b035277d4dfbb7db62968b13cd4eec734320ccc9d9bbbb19cb81b2af4ecbc3e7\nCT: 23dea4fb871ab1df6cfb674d2e7efbc969033a11d694c6580aa3e780e4d1db5f1145924b974ce98ea041ecca53c36207fa644b0ae789965084d1ef845cae33aff734113b3eb4d9f1863b780b0f97fb5e3c5ea991cf\nTAG: 81da1dfc98517d4cee3ee885a266e814\n\nKEY: 2834321f7aa0f70b7282b4f33df23f16\nNONCE: 7541ac15c8417abaf17a282a\nIN: c7a57252ff224ae7911a905b8c699b20e40c1e9569a6b2aa0232d4b10bb6f20406135861c19795b95f9597f9b72c20931c41164f1b469b0901f2b5da3a956a6e278c940e82593eb58f56f6d3681fb00dedf7f612c4cb3193b73ab35f9a5a9cc8d13aa27ff1de\nAD: a3b2a7d832ed8ab959d82ee795df8e1ef530cc6fd9a1f10543b44c49383921d74fe0c71d50da4adb9e9c7e5491a488ceb5c384ebafad\nCT: 06d3e558b2f7f8e225d76a41a11122aa29eef02c226616f5264c9c1b821748a8115dd4868dfeacc5d167ceedc824f1f7136e7d7fae783bad83dec468c98747524fc2fcd7b86cbfd1c07078fd1b4b9caaae970c729ee3f2ecfebf048c5aba174fc4eab117bacf\nTAG: 5ece142ce1074a09ab8ce810222a471d\n\nKEY: f0f484fae982019a8ea22efd1358adf7\nNONCE: ad4f5fa0d2acd2f1ee095cdf\nIN: c13310241243fa53b8c2610d1924b1d55cb6d9cb6a5b98a72127255967b8ff23623c5453e61cecf9e624e5c803250c382481d3c10febfa54d03894ba8f9ed72637fcf5631f7b7312cc74e6ff63ecb240349a575f2cd817f2afbaaf21815bf08ac1e8f87520244b4a3fc492c7120296607ef64d0adb4c74\nAD: b73839e13455fd91ddf7f81d460034b9c41eaf0cc6040a84e17e6108372f1ca50656793554ea1d05181310711d0e60d4d556b2bedb24d7b622c01fe8025119\nCT: 90046c5ca4a6db850c5cddb14227b5902257e7ed8bc55f85ca24f51558f95037a0567d485b7606d2ec1802de069926e4f69e5ade9453080f84c045438d890290ed69b5e140788d07ed3d38b067900c222ad55b298e240590cb816d90a43ec52203f11ff9496b3dc32d7ac316ac8465496e41b4be5200dd\nTAG: 76ae0503f7b43b1d2db24817f2b61ee7\n\nKEY: ae0c8a20b679dc40c9908f88fecfafd6\nNONCE: 88b0ebec6a2ac13421012874\nIN: c80685c481b41323a1724ea96c1df644a595e8cc73955e6f661e0fa30737d78e7cec11629b8f1fa4bbd8e8e655f50019859514dbc4cbcf944f95084e45337d9d9d8972bd8da92b4eb5a75c0b284305601de859f8d1fac6d6b3fdd42210fdcf696119e436006a5a863859d5b70806197fdb9f0da3e4c31b0c7545809808bf7683757cd11b9d0f8621\nAD: 664df31eb95b5e17567d680b1a26980772e8ad3e9b2e2de537414368c4f97adff1408d36c1dfee65b78375c7361c91452e7d463338474a400ef9efcaa648e93f\nCT: f729ca77733cca181ba8801e001924e20a1d164cc4440a6217a1178dd6b1210837367cf84aa41f92f4123d6740910586f819389d5c750ab15768aed1b163bde5b1fe8862d1621b11485b47182d32bd304ddbf275524c4ece4cfb1361db53dd63e21ac62bb54", "a77bb5063c869b5f5de1f1b4356845aac79ee6f66d21ff271e02e8bbbae1372b4b8ff\nTAG: 52856b3369ecbb7201b1b0f75872e5e2\n\nKEY: 38f8784a1598bca461211195d7844de5\nNONCE: 6b91cccc96d89e6471bca6b7\nIN: 374aa5ec4b2f5fba66c17a435970411f2af3d6e33c0d094f74fcb77beb6cbbac1f3a8a19f69ca087f94a5b80d5e3692e0d10ec34aa67269c824b382d6238bcfaaed586177b852f816c31e9966744188f02647d881990d98c3eabd477557a739262bb3f682f64d2208faf98097586053a32cbf37e78413a2d89613a81966e8d654cac0aa34107947a036f403bda53e74bc524e7bc2d2c51dc42\nAD: 6b38c308cc574839129e5e6251f41dec9cff7ccf256c38e4994e15ca976d3185ae17030ad3751e56367f86886acc32e27fe04d0b89cc89b0206f281aa2d80f9be19928dabf07417e76\nCT: 350bc8baf35cad823df06eadbb0e30e1e4b5bb8171d14c330e8c488f1076d94b8cb7baa3268a5bf164e23563180b9793ed06bb80079288cd348eeaa8eb33cf31ccf89dec998408baae4c3a7b3d3bd14aa76e99d645da0fba0c29a7ea4baeed741de3a5df5ff4044d9b057c4f3ef1825dd0a47aa0b5e92cfe0321c07333479dc86bed7b7b91e6ef368401392d973404e2914b7d2cb49448c55e\nTAG: c974e989ae2b86e92c5da9b0c9b068e0\n\nKEY: 59b17f09c56d170ed1ef10d2fadf01e0\nNONCE: c78473d06a1685ef0bb112e4\nIN: ec7e6ce0cbc601fc8a2dd64045c8fada4a28c0c6f0ec98542e365279d00ffdf5e2eae3b663c4b79342f2f265db30a86d6e1b325318d7f7a622b36e746875b71165defd5ca1afc0a92db6ef4fb9e20b81018a5293899f1e0d06b18a2e65f7616638f79a0db3f2cfdcc0eac2ee1e2e454958e2e6d214a20ad13156f97d0f2cf4276b09f5945c11f6b20b7bede26d6c2f0e5cf2786eea66e18d6ece02156f9233bdfc57c75b1a8a8b1f4ab8\nAD: 5be5a4a089f0ac762060a336aa502f5a1df1e0a647fb9d5d932dc0654e0725122f6a567681a7d1cb7625ed0404d540d8b3145c911280d2a0ff9d1c53e27677be0436faeb39009fe5751c0b37c7a5f1137a26\nCT: 6b07754b096556462756de94e5941610f1bfd93e6222899516e00eb1830f557d6f629bc61abe0c247ab6aa0f4f816f79544ceb034b5d9e86ab8679ad67f6dbef521f6180a07b0bbbcf174cd9234848f18b8ebba7d6ae3d607e027cb220c7582eb6d496a980ae3883fab88a1dd9e5312842450fcf68640546b49c24a3ffc0c8c4f539e8f9a34a3bbff44b1bb4cdb339d8879fa4e0c2145954e34fbede7483d25a0494c1b9e5b1f70aee7e\nTAG: 064c9d25f8795d8151b33f9d32d3ac6d\n\nKEY: 995577faa109071bee1c87d5e6772ca5\nNONCE: 5fdec02348a625b49c3c881a\nIN: ab162f20ba0b834e8159d9bf20ee0c5d14da0221961c4fc7d9b44c7822f32298d30775cf974172ebfdb36cfb2881ccb15e5f69ed27880b920f4a092815357e03d982f75590af08b447f0f8466b031ed2409e9f5eb479affd9e18017a369486914c63a7494168d91df157f5e56fbc4ab6ee5a8f3af1fbe1bf9324338a1f4acad45fc7137676797c89620b15feb8512544771f280f322cbaac9c4d7cfb4c326824825ba5b5f5190fcde0d399ef1f52b82abb5a8b1e5f2eea2c79702d\nAD: ec4cfbee3d1f5cc11e085d2254f8b37f8030bd285d6aa1cc53868d18ecfdd963153485dce5a3e3e8cb0a3cf8074571f7a2e9e841229466463f506a2bc90f2d6413128efee043e01eccb930fbc002563510e499457161083ed7997e\nCT: 0610980d938c2f2619bb8b4408156fb53f595d857feae649a6700af296d0411cbb80a6c0b7e2447cc54c3bd3bcfae38b7bb10fa5b91e25686d4482b14a2b62d386175f9f247e48fc3b2215b2da1c065bb00f9f59e8afafc9ef205f5245d27085021f41b9e40c00abaea48286fd914e558f822659207e965855eabf52723148d84b0a2692c48d76f30f3cb530b1beb58ffc4824517cb6772e957bd56394c1d8b70c9fa2b70a670f3fe36d8802b2043905e469b558575c75012901dc\nTAG: cb51baaa4672b8ae9745ecee08784d3b\n\nKEY: 58ebf03ce7ed2f8d5487936311922884\nNONCE: bfd31cf828f3d0ce78f3c698\nIN: 1932268108a369048cdc0a75c062c0ed02e27bbd11754e621ff67c511ed98c6fadc3e95e7100644ebe1aa147a7e99f25ce5c2edb8ab6446749441027a211b8d04a6247299dfea9d75eab257a625aeb51f74e0b47b302fb5c0475ab23e99f4d93ecf07694497ff6b27c9848805af93a5615bc71486b26fc9da67cf60c8d3a396bc0164985fab2c64bbaa4dd0fdc22c9d9e433e8c70dcdeeebf230c7a3cb3e5d0d48573a64b068daf90f56b15579767ecdd420c0858fabe23abc0b313b97a9c1ceddcb59d5322e47a85cc58e75\nAD: 3f00d6f0d032d4c5110c8f22e98895279a30a86da0ef71cea6ef2738fe3e747ee54d2e96e3afb8916281f6369ab1a397ca0a18c6c0e9a0c4edeaa4190ce6422bd116ac254a12235eb66fb5cc7ef55b721d3d2db4c67c38bbbb0bcac9234ea7d733f200e6\nCT: b741fd48fa7634435db2cb05392004d0b588bc7e9ddf79526706e575415c8b3d48a606c5f155130deb77ec7aff93719396797bf6628531d9d061727bcea2b348060b64122cd1a94f999ad1f681847e57c05da0deabd2fe010212dc60ec980ed0ba78ee9160b3776ae9174c6f8b7231d6754a4143c8af129411063315c6517134ca26d5a94a2e8c6e8b7ad9b8e78b694d5251deb34dabc455dd9f2a2b3fb6f67222de61e917a645d366462d6d94cd265f919f237f06f1986fac17bfaf3a97c24b99af884d0fca5d3307caf9bd\nTAG: 35777ae50d32c572cb0cd778cbaf55e1\n\nKEY: b86fc55f4abb9b65ee1897c262533ccc\nNONCE: d118b0f493c849a7aa7f35d2\nIN: 43f9438f1858da62bdd03fd5a8c7b01d8097d7ce319a41f80104968a46599e9a3289a29a16b245877898f345f92fa70d3e613c38e6e4ebbf0bcb64c1c41f8b83ec8e9f159d4b830d9a1b79f2ad90db067856eb8621e52ab3060e8d72dfe782b62364c163fa00b49aa6fbe4210fb7208c642b7a6735b1a8b2f1dbc4b3d4952985ef207a3eb0a07b1341700762e9f9d1c3438fc6633da2fbade15844cb1813d258aa5bfa4ac129d693792a89622a0c686f05d87019a266f91387d96bf2baae0262782b9c23162f5271cfa3144265deefe2c569e82911e842e5c9ae8fb79b\nAD: ecf42c3afe389acfdc9a34bec7b45705ba68e205b83b33f50b7852fbb7f4ae5dfdfdfb3cfee8a03c96a036388aa8f7809bd47eaa073f92905d0d5f199d466cc0ebd9bceb207f4209bf9925c6109973194742dc8d813f3cb212bbd8d92d7eef645fb0f8245811876dee5f241763\nCT: 87454e6cefc24ba38f01bb791333dd0006cfce165a4247833b182efcdb484b0818aa80f70f29d0ec093455344b8f169262f17be2d1635293bdcca90e21f2c210146f90398f44b35e3f2203c7b5bfecdbd973b568d8ed8444d43cba08d44984a295f62c174ca9ca69c173bb7c43f103ff53a886284af46fde5cbe07b391f9c0b82eec218faecb43dc75372478f2ee1bb267602672a4ff5989ec7251034dd2cfb49677fc82c8b209820be1ed2c429a0491beedbe8c1fc78bd62590ba71fd5da363d6da000e8b7e5bae223c0cf8397d3b5ce7141e8b301ea5a737ae480dc9\nTAG: ad696ab700dd5b71d79f4f6f69034185\n\nKEY: edaf7d79c1b83d973f9ba3b29a9b9408\nNONCE: 418f73743ff0546f0d929001\nIN: 0cf3a665c443b85255759ec6248021e4b6eb825c398b5af7b5257efb7afc481abc20d90249bed5b30d44f725c78ad0ce2821f86838874dceb6b6207ad6fa34579126de720ce34bdfd2058d92b8bbbb3f1bec607de3f0a028d8f6e13d0d4d2d3861e1a26d79cb68d3fef68127e8458eb599915022da751e271cd047cc712fae5b0459ae7815a24f4edf806889fc462c83181111f4de5bbb7e66a701460f508eaf73798c3ca9c08cc1a046472f4b18c69b7ed249a96f9bfa05a276499a5f499c586027c64ad6a68dcb52a50aa6d1b1d4d202e6f184f01daa08fbd643523f4f73ae6b8d764a7f567087a5fec5ad1ee3\nAD: e4be5b677b87109e69eae9a635ac2ea185ba08ebce3ba4be06d53b2da081c5030f5a746fea7bbdda340e10eccd47238340b9244b9442c0efae7644cff53c7abd8445163e891cf30bc8e26eea01f0c461b4796c2106e1ffdfdd1bac29f7d3c72c8ca7f625008d8d333d2a2092c08ef83c8002ed90e2ad\nCT: 9372586624f9a52a91e7ce12f380ca13840f11fad8d9edf10c869042c29514515673b3dfcfe956e8d3550baae1815bb4cd41ed27c7485c723354e557d18119b27431d7527f0d84c6e76baf9afa35a215624c339ad888f27c338240e603b232cd247e77eb1475adcb87d0443265ac0de45b16c67fdab07a0c0dd203d97ac2e19248492c561912e9087cd5fb73445695b43b8dd8c7515f9c958dc64068e31d3cb615038f5eea84a74b5d0c3415b6b1309ea8092614f2bd944a6c3a9e002a95e524efa497c9d3cbdaa764f8cf8aa9fcc7f7d68a623930bebb74e5c234322651edda21e20eb12c16a76839f31f3b30d6\nTAG: 33a31cae0292d0185aa10ba1c2288cda\n\nKEY: 01dadfe4cc0681384b489f38d25e83c2\nNONCE: c563485fb361f81d44aea205\nIN: e5bb4c1912d00d8f99f8d7a931e55ae72f749147fbd97699ec730bfb01b8261f1f94696278fc703263cc789b283460af9d74647a8c039ad2184674e78f6a355a26eefc6fcd4cd32d96d245d583836312652fd9e6694ac5644eeb4c2bd667b52e5af14bcb108c8e277728d6d6116e8ed1981993771b8bb783bb351982f9f8c2a0e7c20a5a863c6d71b7145b73d7e6d84d47780d66847244d0b8ef559f2297f39e26501d8a2aae8c36189580292da842c4d0d06a21d21ab175e34589e3b814d8a00ac1d8a3b2eca2a91b21e36c55fc6dad8c0a1b2cc7bcb2108b2e21fafeaa26a2d4881b183b899210b474bdc43a8f0b8464075d86a2ba1e9cd195a8ecadd315\nAD: 870d5740c4e22eab0783de87d541fa834647c3fc6543c60d5df31c19c6ca38707649fa8dcfc3c0ccc16b1bb60283d7ae2778a8f83ba07b905e23cb06d5656f614f1efcb346f34e190bcc636cdca229b64af9ae4b1f05b58f1ffd1a077a51bbf9ede69ac3954de7daf569cc8de12282cac09b9a49dfb92dcc409b8c63f2ae4a\nCT: 119f74936eaffdc3e5e7e072ce81e0e1ca91054cbfca127b8c4a94ada042a2452b39cdd02ab897da765cc0f8d84089a8cc5af662c1c96aefafeead785ad042b506fc72556182566263e90009a86503595dca0924d87ea6ac61d4e931025420436a8716d0ce379c5e3437b26a12531c0a1abb3a693f3202f5770f1dd7ec1eada8c2d6c747a7161d19ffbb897710a17e7740fc232fcc244f456e962ebe71f7ded8ca73e07dd44f00fbd023b8a72f9005f9bd4d0d44135294258ec14665309e9edcc82d98227474a9202552d31f1d2e7374d49929c2885696e5e3edc1983432f1dbad351f9cae3cd56855878d9a076c6d3a27f2718e32658f2392215915c020db\nTAG: 5689d9a73d52266977bfe5c1bb1bca09\n\nKEY: 34091633f4aaf225aa02ba9c57b910a7\nNONCE: 6535f0cba67fbab0e6fa0bc8\nIN: 76217fc9a546a97dabc9be41209bd", "b582d8d8a62865df7398d4f7e9ac681bcd102e31bfd40cfb8e9352b1e8ff7a7b81cfe2a62849e8b77dcfb645d2046404a83442133e245bd1df35d69dba9ee097dbc867cde7b431565c72fec31719318dd27c3e47dc5f8729ea794668d8724a1d4115adcee0725e4c1e3ce16ed9e31bd5a409cd074c0277e21a0b431d3b30ddd361ecd176a8d86927c2f6693105d7d3c47d9be8bd90d0b2fb20587623b2e838624b590a5c9f0e6d519b35eb5332b16bd2c2f9534e376ba68316efdb963d63e2c87cb0716973297d986bbd885a7306e2bdca0855447b57817285801341c10baf67bb5f71b75a11856d2551eb47e60025a0021\nAD: b9948afd8818888585a6957eb59680a55a5c42458f2d0e0f39bcbada0ba0b6e72340193500e22d243e32be0e7d7bc5c632ef3dc7e79ad5acc895cbba3111d8d1faa69bfe2ce634fc0d7b12242dd8bb105c6ce54cc9718921378c906ff5e61f48fa259b25bd10fee96856a206a928b450a0098089d5cb7378c2935c4537172076\nCT: 3260de6acddb17f93ff06dc7a8955f5d363bcee255bfd40fe5e92e13c7a1c682c6385736284c5cd858ce6ed251b92f5eb10f83970525f56a1ba0b8edba790ddb015307cce877c53a831aaf56f375fb20e58199f6ddb91efdf9983f263c9a746fa2d66bd4790531f85e7ad9a07cbcc00e9c122ddba77b1cc2b37b734a0ffbc29188685227ff42bf33c2e912eb592de1a45381cf6c5c9a36af93af26168c376e8902299e810e07a8ba2e23670c5221110ad4296a581151185553fe366bb4057e61b7a788f12cdfa635d9d6b8ca47a5596a765d58bb7f877242c2e0145d47c300175d7af62a29846830922308b6b69cce8413810184b27a8184bca2d8ef16316f13\nTAG: 7dc47ef9283971e1745fa3ff698c6a04\n\nKEY: d829975798d4f24ad243e4aad474fd5e\nNONCE: 59e25a6dd133944918709e33\nIN: f84b4daf4bc6d3ba1e0b9e364dcad5834024066ab5c8e672a999bbf23a83956623943e0011e3a2883d23a767b280ad84e2d7fe5811099395edd269077162310481ff304128271d4ce5c84ea738fde318cb2528bc5cd448c67837cb7dedb632d47e8f90e351b0a8942da2f78e2065cdf827a85f510e22156bfd971ab3f123e9774bf3ff7c224af19bc79e812839eeb3f1c14f89e5666c16c44a5483efbe449237508ab2436939098640931fe3b928cb3a9378b6b9fc2a54c6bf59f34b16f06d5ef132ae2a7161034f26a6e07badc61ea51a94a20e4692a0a0525726f3de9bd1d6151fa6a0ea3acef3634847cfbc98d2e0bb9ae89e4f91a78c56558ac92b4f33fb1d96b1ade26cf4b2fec779bfbf6709e531\nAD: ce0e6219f75c4c31873d4915b1af3a51c2ef5e89218ac4060dd12be216654eff2991e8d7bce6f6a437966f80c59c527679b8983e75c617c917fa9b63bc60748f5ca179645afdfe6a126a73d3fbcd41a9df6d734e8783aff3a5134ecacbb289f93febbd8eb493693264026f8678e9fdb779038ac13199459caf9c4e86f4cf8306af6dc04d9dbb678d3c\nCT: 98bfa05d1dc27d721378bcc25af4899c9c88fcd54d56662282f9b820e540444dbdc57bdc63b60680262aaeb8387e149fc2a759c0246f771dd9a13209c4eaae9f8c7e43439535afd85c9b12fbfc10f8f9f417079857b9e061cd24b7099726528f4ef529d14097239bafdce4d9b51860ad091c8a7d1faf39d44523973cd1df0377339485a89036d62cad090ffb9d05c7c7d79b01a22b7ee5e485e76ca9be9f037a94366968003b73915b027b161ab90fbc6ab78f6ef261ec5789d668fa2b28b1b1937da1d2337507997fd0d80387495d6953b08ac0a3fcd24f1fbea3df9218a9f0f1112d7bd4bb03ffb9dc790306db5e03d67201ab904df0e4ae283ab3d62bf48a6d79a5faac2ab33aa0599c0a6de5677ca0\nTAG: 767e68b063ed300e63df9933d6e10f2e\n\nKEY: e9e41d154c4c1bca018bbc4d744655af\nNONCE: 04ee2cd524db41170f0946df\nIN: 225d156dcdca3e52139561b61c26bfc56bc90c21cffa69468863afb66c3e1524303f8f42103e435fa2fe2c2956feffe5b06ed20bdba730d675166f13118a193b06d7985d54d46e4150468df1252d7cd144afc99ce99b93ce9526ea4dec2cde1d0d72fb82f55db65ec2035e387e7923d98490cacc793046afaa2e49bed34cd7e4eaa52e75bac5e86f9e9eb81028cbe8a515870edb9a151334e1f961949855565abc51af9a1bbac0222e9bd217d3e3a642b0f3df8e7c47c2c9d5a801cc8028c425b3becbe31df39d30637c38f981d268017da818010189c93d2d135024f239407623496c5435f04f9cae86e63ef46fcf9787c946b400249d8476f82dee274cc0cd3714973f1b6e0ebc443d681af25ee26a8ed475136ed8bfaeaa8315a4cd198961518c\nAD: 7bc7b15c68437005a4973a06818738adcaa250949af910aeb807096595b3af54bacbedd966f83f784f651f7a2044461a94f1a6925e6d2064e72319dae75d3883a50afb6be1395d429f24029dc9b8cc021f15e305e5418d844aa4a89ddd299bf2e8c698a8f6a6cf0165c37bcf2e5885d73bb81ca15a33ea75da5946678dfcd546d475149dd1a2dab0e11cc8b07c0b06105a49\nCT: e3a3521e3e99ec595a3d9d0839d8d0cb4c0929e44f693df016da34e0d8a1f3f6aae28fa0ac0f38d46ef06a683adb04df301ebcd6ef0abf9ae3cc220cfdbf36ce8c023714d203ba785e9abb05095c4bf7f07a13f9409a5759428e6c97cd4a8b2e1a471676807cf76131ae471fa4e8d15225e9996ce4c7630c4b0a5ebd85db4bcbd79bdcb641a626773560b591adae5bf582f3e92299a60d081aacac117235d6d8094e97b034d120c6759394ede2a8b67e47864e1f50669e8e926ab6fc5cc696e70bb016de92707d4800b25ad14f9c457baa1e21b4bfef0dfa6d849e0951c81583a711242ba2383efc85381ec7228b8e7950a375df405f820ab5dec8b37572897c6af443667e09d48a18c9bca0322efa409e04f57741305ea7d51ed9018cb5d0f00b5d\nTAG: 8aa9505e89a01281f033e9658ddb35c1\n\nKEY: 7b1fdb1a720b9510d7d8819b6d946dd8\nNONCE: 5c73be515c6ec00a10a69661\nIN: c59fcd7a005dd08f3cad722bf3560f356c624404f3be55a02b3301ed756f557a51593ba90d18a1c13e227c8d5180fefdde4957484dcb81d08ee3331a6fa74c9c549ae13b2dc2a80ca0435710eb9f0dc2c908d896957b87325180d397c37ea7cf65db45960c4d791bf8cf798bd7626b13bc5e6b45b45be1a8ff687572ece86d1f5361abaedc1a7f9d9ff8003bca97af7dcc42b4399f9da4a0e7e829c0e12f4d41607303f60d1df5949fca0dd9ef171678e013b88789ac1f51a8160687d842c273a2dda93c5fba1eb5bed7476ba96a12e70cabba43d509b311e9d000212c81c483b7e9e7bae1d9869a125558b2c7ef8f838bdfe97af413b460bd9dc5e372afcb105832ee4c406d74781d3e9f2aa581ba4fe458989a03679744edb73ba31c7d9d37920d4d57a766104afc9c96650e5a602ba885d2\nAD: 078f1c67d44d6e86eff0c96a146bad3420c7dd0c64d800ea5ab7ff472d0f61bdf2e5634e06cb4f3c022dff8c4b46f2a47fdca2d04572b67f24125c66a551a1f150a02f635e1e99895807efa8001f46388365c48e4afe49c04f6681510f7e4cdfa02deb3e60eed745cf6d7ca6b773e1537d057a043cf517e5388dbbc44ff4bd68d2a7243587f8929ef07df5d001a6099bebedf8f26f49323209496d\nCT: db79e91f4458befa47953312aeaf6aad01c3fb6e2cfa19b0ba21ce6698896e62e7ad2cef344cd324b3f0d317d9fe7ce713d4cf1743adcbfefb65e61ab6b323c5f16762ac527882f214539e034719047f9d3c0bc80480b7f76481e2fa26262b0bf426f1599d3d0947492769ccd65433fe70340d8f74fe31540b48c053eab97984f5f670651746b68617f603ef23117e9a8df0266851ef895b58b847e911508dcdc590f6188aabf37be430bbc72746ed7f5f47f45c90e2400d5be0e323824c5b86a2a0ea7c2156f482f7e0ff42923d6f7efc7f4f2cc77915bf85091216bb0f8c35f5274c0c8469ef03ee78b82cb6a5b510e16793f38fa2582ce249370ddf480e212f1cbcd77f89810b41effc9c87b0a80e5a22059b36e1dad294cd158f03d80ef3ed31b5f3b095cacbe5782986a69d5ff7621609\nTAG: 221274b4be8a4fcc765c2ac319b5186e\n\nKEY: 50109c383071e4a61ce18f495d98b6c4\nNONCE: bcffd0fc2496b7eb0ba612e2\nIN: a4cca8eee2a3daa0c21d854d49ca73cf5b24b38940dc2b44a2a6623e8404fc30c4e3aaf759425ebff85cb1c661744adf34c6c5d538f3210dcd0270a3d12784effc48734b53c1a228db291e2e5573b6ba2aed0a7296c1bbfdd1f4a86d6057d5534675a3f4897fe3a1200c54af7e09b97b0a2ab9f25d5ed375e7bac921f28f7b6983a41580362dcf0820a2dfe82989ccf0a998286623617453722bea0b6e8fba504b93cd043c7e6c7cccfbccea43f7e87502026f94cc7035c5e84cc14a5fef9bf2be53dc379053725a9a29c4e86252369bf6dfd3cf2801af7447fd0529e94beba961ed65dcfd492398123faa55346edfc3ecff720966b74fd0ff28f443ca67f88b8f5a4a73007f79ef782bef601a0827888c4c74f7777279c625de8a4b51db94f94f846474f8563001339afb3db339ab997cd1eb1eb7b03b228162a480e129c66ad47dbd18\nAD: b4c98f6d51fee205805a50c163beb176b754366e13c57c18433228a81089be18b534ee5f9567d529c802d34bbca36807bf845a9d14dd141c5de85607a4b4c5521e5aa717f78fe78612b770a4677cacd77a425e2496ae50ab2e559526c37ea723f2b8d14bd8314e4cc3727bfb835ea4062e87870b13d94d52c25f0c631668292f184fc048dfeed7a9d1a88cc5c4662030700cd8c257784009b4da9039909f73840b600eaf\nCT: e7a4a201f58f66ddc0b8dfdf95c859879144dfa896406f43cbdc6adc148e0ea8f9a82170c5ab54c77dd0fa6dc209b623f0f5cd4ae358af96ec27c78e7245855e94ed1a1182f9d26d45e0872da3fab9fa9ee3e58aa168925d7f779feb77608067ff45b7ec7f2ef7a48a06ee22747ab96e1b485ce144bb3cf97d1e3cd28823628a2f8e3785d9af28b76c53c3d4c741d1ec56f2bd10939f6c79578c308c5e509ba8b13c820f5912d4ae169da4e04f86ff9b1cb9faa432545f7999ca1014f77c08ae9033712dbbc0e99db6eb604e774d5df8f6b928a0bb59e4c662d778d195aa95194a0cdf7688b309abe223048937691440e5a78cfe0cb75d229634aa49ee54a81fc9a6478c8fa310d524bb15ee8f54f572dee30e44eeb9603c8593f8a7007a1b0dcf2e301becf300f20d2e868b104154651446316414b5b5e9432134c0eba97b4cefb90c32\nTAG: f304266924eef673246b3c14389a82a9\n\nKEY: 670cd4d988845b1d41cfeeb1ea740db1\nNONCE: 29c12f66a74e6234ebccf4df\nIN: 706ed30fc736cb5cc0db17ed108229e87d6b039da5c4f0568a4cbef9d513dfbc0af9313f02d5129cf616487934f741a0a60bf11fdc8d29ec81eb37577726f54f3e35bb10ef98b1d15bd5726fe501a9249e409eccae128df61762447962ba2a63f30b59ea25e18895d2fd11431606caf6b45b908b08cf2e150c031e20e6cc649699fed5785cfc6a0e22bd8bd8c6d25221e9c9a8d2869d236388fdcdcff990cc940ddefd06da0524a351ae6", @@ -317,9 +323,9 @@ "1b96616e31be24c7a13e62b04646ce0a68791e0e1a099b862435065cf7d3203fb32d7d7d8ac4a77642d69f7c27a46973b6bedd5e840f887209d19cbe50504c0a251056c8a83100092a627f73edb421a3f1aa12edfc78d3fc474cd2583808e38d63baf1c5b4b5cb34665e10d4af806bf3abbcf4432df6c9caa76cf0e17a5e0e9af7c8868daff22d84b7b6eb4f299b750ff18b9b17d7412ccafe3e55e5b02af9ad87c03799c2282a9c6377ba42e840440d8c1b19bcd1c8fc35f02fc505a3ce97562b9e660fd488b53c30edb98b91949188903ba2078193c2de05e61c9da7bc056624104471a8231b7fcfdfda4d804b8819888a2c9bde680bae59e438d89778c5a04dff214e9b14ac5b031c378c8beee5ba9b1f91dba760d7621c24c30aee28c4b49e183632d8b450ee6895a47b96cc3c1917af685905691d1ca588db5a21674391238d76ae101c3e83d94dfee4a0656baf4d6cf277e0c7b0512e4ec13d12a5af44c7d19820fe7a74f5d5875321d528976f35a5634e15dcb35a54836370569d5609de0360ea4d2f1937dcb2d68b20cc5a04c13c04d5379a7dcbcb6b711712d7b3b20d255156b7e61e99803a4d767f0438c4fcb166920744c20a08e48dcf5de4ec325439485b51e4c0f08cd22ecf60ace34b93844c2c12bc7b46a8f6b8dbf4de311f1039504a46d9616b41fd58388f458bdb8bb9821a33379cba4f36b416c2eae02f42b736c1cb6e673b9b9dbd230b6a23d944124469bbd2c545f5ab72fa4b3a47b4d0bb0271d615de6c7f182cc92165a84032f59c14f181c093b017a1c7e5887db249b5ea2db39faf7a3cfba08538b91520fc1f3af697c5f4dea7274cd86dc073920280b488a3f66969cfea020a312be1fd111c7847296ec5f5cc91f00188c07c05e4e49cd0667ee16345f794219ed3a80602cc11940aaf9a927805a040419abd20ad8ba0a05c7ca9936997549ed5a3c7e7d9f582c735a424895c5f1aed9a3a2ad3cf7d9f32d3e\nTAG: aa69fb97b939fb73703ad4cec6c24fd6\n\nKEY: 714f39851c1fe09297c8c69dff0e62be\nNONCE: 3383bb6aceea0cbc71cc7783\nIN: cd1fac364236fecd9fd8aaf59de7680afcf90de01e9adeae58c034c25c8ed25b58e82e4fdcdcc2e69d1054dc753425e98cd50644eb74b1b6d62c769b61bf74d41a319eb35878bc837bac60af425c0a36b150655ac82f8e8fd61121790a3bb9389e121ed0fbb061cd593603a763e0b8ecb357b5c453b20239ad2e44ee0ef0e4cb717db95613c3be18aab77c708f5e91af8006e11b6ddebb8b0ef98c06dc3c97d008e058bf3e534582c24a1485f68214cdd88167814802c89d5c07a7453aff1010d6db0b778d9d8fc64b5bf3bb84cb97cef38a4b30a7deee12f0af806833c8c6d35a7f995b414eb0d9a900e3e56afaf2dd0d162063c4dd52bc6ffa56cfece2ed90bc7c9f4276459c9bd128ee40a5aa514de786ec15d04a16adddd64c7613ec9eed738fd36e24fbcbdcd0d3318fab948f47314a5400d71c5ee07a8c1fa17e4a4c08f4a467291cec1e8266342a42646d138331b08498f2dc3fda0374ef736d05c2a363fe08dc71ec799f0256ac9114743f40641ed8d9a039c57cd409bff29bde518657cb305a875cc6c0a58fe9ea3452df3e3802cf316a0c1f477179f6cdcb39c7c9424c07997500989a600887dd9f04c92226df10e9a8301818a5ec2f0b7b06b6d1443dec46f478a9271498b956b72060dd2b3021b004358b7eb6a083ff2facc3e9500278352790ccb6f9df67dccf7a03c33a34c6f33c1b4dc4ced2d5f69e5f68e79c582bf0db7751b774019d9399329f1a6692c5c527a646c9bb866e69d4f1ba4e6065cf0c5b09e941c5bb6e96d7edcb19a5cc02411507701b65987dc206ffbfaba4f06cf394976bdde1ac343e368ec1083813417cd0a325aa0e88913958974fcc911478a460b79b9978e33b21064ffdc1fc4df1e314948df71af9a6e0a40907e6b35ec6304bcaada85b456298637b6fa582ef331e2815fef135dcb66870107b2149c5aaa790f7127c0f0819b83bec46c0f6d30edb61b6fdf4f35f4b5345f1c684f41eed8088aa2f1d42c920a06092058e7c225d10fe1e5befb4dc593badee754fa12b843a6e9f67ea0e0616eaca697b22f526fb79a2ec259076971185678aaebc6449ba3bd284230ee621bc02ef1f5ff23651a6116cbb7770ec7385a44f4d54e7cb04aecd59a99660a1021eb6abb5d2cffd76e6e7380c22d0224e499e0c7b69aa0e7dd6deb47b22b1f1fb882dc35eb944a495fc3f6345b08da8f7185c3be95952bd7c982d9c8b2410a1cf1f5164961f6d1db6160d252e631f77b02d4e23dcd655e7e875b9b703fd27c57008184772c73fb5dc626ba43f54cbdc2937de7b4c470235098cb0a3e699baaa8e2adc09f8182ae1f168aa86a790688795003c3598293ca269a94494f159c5d19a22469924c5fbfd198b8add28b37cf7bc3258fb4b906f2ecd672f4fe1fd1359a433240225\nAD: 1d90b2e081fc4457b3387c1033affd15747b79dad1d6d3b69c076d4dc5c209ba1cdd383a5196fc21fbc49fc65c69b85ec299b1daa26a4bd2e5ec2559cb230b21c3bb62e2831830a2b86da2abaa289d98eb04eaf3cf8d583ffc7291c3201df2c09b7d900a4bce0972e390fc980eb67cfe654ba3b9c579f997e319496b57819b36dd2b4484b88ea3cc1ba777b10ecaf526a08afd9e2b3b32b2bc02932af5d09c2ee3fdcfa18d6261808e418c4bb80be4315a5581d405841341bf2775d8d0adc21c10b9ffdc0ea4b22e22f61b46f844d8caeda0aeb7e1c3f84d337898af24fa68d60e2f19ff815713e1587e0d6e68d64cd088ed432c45637e1767913343d899b2f8c01bdb83253219878a5b3a4e6166e02387124e711a56e49da1893b4f72198c6339943262cdfccba33428009dff70a0c8c79af248d081ca04edb2ad4f35ed1819f0846dfade107c7e9f4094c014087c719517d943e524b86047d24aef8b901a7b1ec4e839400b717e758520cfc7a2dbced0ef491eef6aa2695b2ab9a92296b6e75251f124168c36a6555c4a465cf84a7b36f3277859dd5bb0f10f84cbc944b87e37b6b8ff6958bf1f0546839effd30995853c734a11c062414fe841113d0ae62597cd12ef80dbd4dc4f72e065171c8394e45dc6f87c86154e9846c1eb58f560b8c503848eacf05107c445a6a06420e67e2297a9975d23\nCT: cc11a071e11cf36750fad572fdfefa377b8f0ed6cc47bb8015cb51f0eeb531e5779d233ed224022c5f7ff3181ad1d6a9f7564f41ee919f0435fe49b4266157a68061a1c5d06d8a8075b55efab8c9530266955c179f0a57684459835931cfb2eb1244a730797dcfcd31e7a414ed42990e9a55d439fbb803f2828f92cffb247f8d96896f9b37ce2d029aa15873bf13144cf35eb70d8e27a013513774ede1d37e4aa007a48a12f37385842cb716f60401f638efd2841db6165819eb3c2c58708d92a454344fa64c2d740cb34d4b7dbbc1d86d9e0083432e0e90c074b617402b68e3199d6fc43c454a842da725b49eabf8459b4db90e6553e17f979fc8d6bd03ac382f3a85eb40b64e21787e8e8170372eb0202fd4d78b39fb940829e11270bf6ccce0fb28adcfa8b60659e54a03c7b22491c62982e5673d66791bf6db75edf3836449e918b0c9059de644039063d78b66769d8358349acbaa7f1bef02fbfe49be375f652952f66665df26964b8b8b327683731cf825ad45118fb98f119db977828d96618a4a2fe82105eba7d1c3bca35775dc57a207b5b07c24305829d911bd7d30e3c19b030f6d34f6858593f3a0dbd928fca4b1ca21ce9ea8b63b149aa444bc696864fe2bdcbfdfca33a656db422cd007649d3a3e895b909fac7f9f0d9b15920b1d9dbcb343a2a0fd9382154430f818a9b347dda83e1c1038eb5259ca8714e2f8d3ec13c8c7a96c537fe599b30fe8780c82242f674817e815d56c92e765f3c67bb9591e27640d4880e04fc6afe5f1482422b0de4282df77df798ab7d32372f22dd3dfb0035182fdfd524dc315b0c7607639fcee3b1e12421025964a27bb5926f28c97cd7d74cdb26a779b656491f057eeb3be3eea0097b787ca5d1b1d5abf42fe76b16e565b2c1d15579e761efdcaf04fb18e7a97215e4dd53a164b336921390fed9c4fc1cd0cb0825d4b5c7061db0f4f1cdd950f13646c662bc6837ce2e455bee1758a59fec54d758eb49f040384f27ab6abfbeb7ec52a1a1b3ce63f6b4ded32a41a64b8cade579db95b7d90dcb875e83424d03e9f3bcc2dc45952860f1845632c7550802c957657c9342dc32c64c558944fbaf5f2b6a04b5d48794d140bf4f9de2fcdb1b77a0602f1c97fabb0f2b92b05b6894e665a8fad01dfb2764f673f61b9c6cae68272a5b12a9a8347782c69f5f9c3d4ff932cd713a1e2a49759114563d94261ebd7c0a723a5837a1912cbcc98b6481f6d7bebaf29276bbbd6d0a83bdefe2a0f3d4d60d88d4575e3cff73eba09aa290c2060434f85955597a3431c376f64489f50dd9d1be65b72158b1d6875649da95579b5c88e3d445c7bb95a4ed9452e18ef33bd7dbcd25c5ad6c769a651204e082026742b15b49554133e1539fc516089ce27940c89eb1a68846f13f3\nTAG: 26c14eb5587ec540185a067635e64c29\n\nKEY: a406f8b8ee46d958d10d8724d90bb26e\nNONCE: 2b38be1c0e8258de3a095418\nIN: 26486ad28af8f2fa8c7befc95510589baf81a88f3823e87eaa8e40759cf0853547301de1e87b2eeccd76967bb364278174823c1cb1963f34fab537915031cead844dbb1c614eda56e9952b1eb4cb153d06c59c8da3b10af499b1c15ab0f03559fea13b81bd35fa5eb9a5431e12ab87c3c094861154d3d8eda448af7e15017103ad3dc7e9991b10cbe61cb33d2ff90121f4e40bd5d9e9c34b89679b6e1b54e38f00b128093af3e4ca9830a1a4d7a5e9db067c9c51fa26232945fa3e1e31e28c5000e1965cc7aa11a051305e68be9d60fb92f46eb2b701b3f959819f525ebefd5339bebfb64636d680a2a4f32afce85e287f8936bf62676c37ba810754186e30b812b1196e8661e345fb5b09b8dbe5f96e0010c5e3dd0a4e983149f4a058437cd46e3b32ca04c51ae3a4a39a7e15768a8fc379563450c616a5c7d7d98c46c0b934c894727532a9e713d330d294a2753f0f46049c88eed68711e9c49632144d5cb14d76848a6f7741d36c969edecdde52cbfb57a628678d31befa7ae3198343deae760d5c92c31f3c045b3e932e9051cd201d2dae66ca0368b94445d662acd6442c39eb945c8a4b46129a8cf5bbb2b27927729406f9b081695ce148a10226bc345c648fe557b7f8db4604fd0704831e5bdef6694afe716ddc3a8d69ccad4113ebe1684346b493db264417cde9c0e48db46aed1984f72903e94b72cc2b2f151fec80b32523f96f61485f026d63734ff80015a1cad4b21ed1ba057627b387eaecdfc6d7a195b7d46e485bc137726d96c4ba51e1656c3f234174759ad922f3493077d65c149d1e871855490b6fa5924f6270cf15920838b66e3250a99ff7a55ecc9944cf3fd204081a61ce05bb989e5abeae4b2f24801e7f2223d5ce05c2b61f32344a0370c22751293bb898061ff50d6364ea0275bece795be21c9dc0b2749ff68a6d15896d4692474bd46fb256d1d012e45e7a58d880fba240ac6b89d2087da1ff7d41df44c768fee5bdf51f36b090bbf85e7ecb69f61312463eb0b4b1a04a153f593f8d43f62ac96f76e13ab5928147c5e6378", "8bba4f076d12eb6dd15842e2c40fc9f1ad5dcb80bd95d9d41222953776b3304badd650afc783b7342196ab551a474579d95f826f53d15b96ac98a10c2c6d50a7b9b947cda9fb8d8d7dc7def72c5283a93112d2b58487a25debc9ca06946bb0a52a1e4ed3bcf0fb8decae49fa6607c55501f01b7441671f08c814023f7d46f4bc596d709d305ce320b1b0160bf35c8f17622c65b8e5c97b3fe7327e8e22384f6c400e551dd438d6d3d0f9ba6101abd1bc2486ba249b4cc83c47982c1210328968f2b28e4a7c4880d598d5b47aca2093965622ba7b4e4062c86d81070ecaad93d5e47ece22480e24a29b2910b227930344f6a00916bb215e57e1f3155fa9437603fabc6a4c6732e0887f40b5017de\nAD: 54e46035c45b6ebf14c5088c5f15f552a4d233de7d3750d7736838a5cd4a7b41df1b71e6c5e6a7dc63519ec43bcb4fc603168352b8b8e261c15e76e73556aaffa32193c1f5641b2eab29497c80eb06543c1b0f1787bc616a4e6618f751dd0a2b28a87fcabf405e97efa91becc8ac1b036a2ca244e13dcbae589f0d6bf8e19bf91caff673f2a80de93a6fd5da1e63516e2760ca12a64c8175071de22b26ce72ff9e15e5c55fb253cae55a3f48c0b507bfd423f66ebdecd0b6227d0e67c4347f2a4819a6825dfc2651e97c1da629e92bed3827a15dec0f0c8743731baef8035fb0a790f49e5b2a7339485df313a9633496fd9e7a9904ec566bf20b8dbc0e3c1e4572411da7835b5eb5cd51313b78a1d6ed96bd9aff2fba37e86d475d95fd7e14c6fe8ab23645b15e7823b7bc9d0a02fbd9a43c05a6c660b6690891c4d055af21b50a5500d72c91695536eb1a3852caceae05803486c64535747df691ebc62e888bce8a5c820569b3d80edb4e29027e737fcdc4f49f6eae43b4bf68a5731fbd09778d6b205bd8b3ab4cf251ff31dd94f2033118ff0c4154c78af27570d12def873fcf4de7ccb6b6cc8924dc63f8104e9a3323ddd32006d8ec3aa530818e299490dfa0a9d811fb3bbb5f624f26dd7d0d7a87a7e7748af5ee4f4bbeb150ea4078b504aadaf92b8f9edfb701c6df7ca615416f61bd770d5fc6675db01394a26f585f\nCT: 4f90cb1e30d5c2c97f46ec00cd8203ca8dc808dc0e862cfdb35b1e92a24f0093fb6b68eea43f04ff1332f942b03aa2dcbe03aafd18b292cbec3cd66d7ab26af3f274a97e599f520a6bb59f5c56fbe858821eaecc297e0cca632addaa5aee071a6cf84910006f158cd1e8a38f185e95dd7f6ad09303636bb6356e400ae70338a8eeae7c22440babe6d9595b2ca008c2e7a471e70e66c49548bab632e87ed36894c6eb97c7de858382cb060277edc91e19b288870b2a472df769393accb07f34a8cd94922582ce351da199a8c5c426b2884bba07fe38da6289ee55537952d53ffced29cf053a9e1b9b37d2e0e3c219f48fe885410e6bf78fea15719f20091e654d44c786f9494e4a71b20f968bbab6f5305af7b8668867cae10eb93904a0e3ec3478fca8d6a231c9b4b84cfc3394716b366c0b1a1bbb8012a298e3a00831791e489b7a2dac6c26ca9e5ad4ab58c4cd71215cdfa2422f49a7b30698ece44972a6dc7dcf9ac40f241085599e71957bc719dc51555312fff4e963832017371980b5087d0f6373e5b52d66d7003525cabcd56bfcc00041bb9f0522a4dc86ecb444497b97d882d122dd8ca1806f1e0c8ed3b1b4810dcfee9b2803d08f43151f5a968c18266d0b956ce26005628780a1c4fe0e25b7dd55e6d4cb6b1427fc56afb278a8cf91d83b952908c295947a5cbfa183816a9fc4400db94a5990e53d99da1694de5941364e7828515544b1074de41c253a3b7bc4b72a3a0173138a025fe758f8d834c7c814f1440407cd1a98aaf15f7f8d5055aa8237c6d93beb53dc84cd4712d0535fd90c180a40ba6cf9880d5104480c18cd9734354c9321eb3ad583caa5eb05edcf288ca5793e288436c175e56c001b473c1486bf36f9d75d71461339f1e063035ded3246166644761816559ba9cc9c26f61f6d02adaa3b4b398fb80906ddbfca2fdfbe57df724adf1f76f995ef7d52468ee2f89785d59c0c8557ab45f07e0da644c0fa9b5a9e1a2280d34a0f65b463e53d09146bd629134b12262f18471eda27ebb5ace095864abe17b95f238c0823dbd11245d89c195eb9ee65f6f97819def971189e43354d4fd811fce3c430cbd4686e50e562ab1e8de214832db1a09a64f9339b8f6dcfd53280a33071e89616148914de8b456408fc18a9f46f61a782857b1e11dfb5f956a5889d60c53dc826ab92153cdad4d935ccd978516c383371352f63edb7211c3da54cf2eafb7ee65f6aa98aa7813de42ec43a4e3c91bc2eac8cbd27fd0a39f109dcc94365bb223f9be11120a9767cfc73e2c315846b675f5e1eabad4e7a970aada798993fb2b11248be37b451a6f8be3ab93dbb0b3a181c49f0b43b402f05221bc97a6c2b5ba9d1e5860a234cbd2c7dcac97ff395ea8ad34229c3b0624eef42f611f90449476d76e816fe391edb539f9adbccd9628dac1e8925\nTAG: d4c3aab4d275dca02cd7912eb71daca0\n", }; -static const size_t kLen6 = 175688; +static const size_t kLen7 = 175688; -static const char *kData7[] = { +static const char *kData8[] = { "# The AES-128-GCM test cases from cipher_tests.txt have been merged into this\n# file.\n\nKEY: d480429666d48b400633921c5407d1d1\nNONCE: 3388c676dc754acfa66e172a\nIN: \nAD: \nCT: \nTAG: 7d7daf44850921a34e636b01adeb104f\n\nKEY: 3881e7be1bb3bbcaff20bdb78e5d1b67\nNONCE: dcf5b7ae2d7552e2297fcfa9\nIN: 0a2714aa7d\nAD: c60c64bbf7\nCT: 5626f96ecb\nTAG: ff4c4f1d92b0abb1d0820833d9eb83c7\n\nKEY: ea4f6f3c2fed2b9dd9708c2e721ae00f\nNONCE: f975809ddb5172382745634f\nIN: 8d6c08446cb10d9a2075\nAD: 5c65d4f261d2c54ffe6a\nCT: 0f51f7a83c5b5aa796b9\nTAG: 70259cddfe8f9a15a5c5eb485af578fb\n\nKEY: cdbc90e60aab7905bdffdfd8d13c0138\nNONCE: 9d987184c4b4e873d4774931\nIN: cb75a0f9134c579bebbd27fe4a3011\nAD: 7dc79f38e1df9383e5d3a1378b56ef\nCT: c6a899758b6c11208241627c8a0096\nTAG: 7525125e650d397d0e176fa21315f09a\n\nKEY: 819bc8d2f41996baca697441f982ad37\nNONCE: 08b7a15f388fafb16711ce19\nIN: 9b1ddd177d2842a701b794450e3c81f151f195a1\nAD: 277c372784559784b0e047c6f8b7e9efb6f7491e\nCT: de9b9c8fe09f705f558c62dc6d40b75e3aa625b6\nTAG: 52e2d2f153a4235eb6fac87ff6b96926\n\nKEY: 682769d52fa0bfeaebe0d0c898d3cda7\nNONCE: 6af0738b249d09547837883c\nIN: 3461523cd98a6e8bdddd01150812e6c58d5cfa25d385cdbbc4\nAD: abe8302d7d5595698d9f31011c24d4d180a637597098361354\nCT: aa3ecb46b9330554b36d0cf6f6ac4cf5e27bfd5f602da1b3c9\nTAG: 0ba547961eba5c58726c418f51d31311\n\nKEY: e2b30b9b040bce7902c54ca7eec00d09\nNONCE: 28ccf218e8de56ea91422a25\nIN: 483080d7e2fb42580dfb862d2d266fad9fdce7cdcdb1158d415f84b6e269\nAD: 9f06fbe67eb2ace15c8011032feeaf72fdf6d316e1e08ef4cc0a176588af\nCT: 67e1980ced4cd232ce893938e40b0798b17a1692476342e520b480a18570\nTAG: 9994185d4329cfa5f4bbeb170ef3a54b\n\nKEY: eaafa992ef6dbcc29cc58b6b8684f7c7\nNONCE: 1ded022dbc56e9ad733e880f\nIN: 900951f487221c7125aa140104b776ba77e7b656194933fa4b94a6d7f9722aad51b2fe\nAD: 863ceb297cb90c445dbcf2fcffe85b71db88d8c935158f697023e2cea103ec39766679\nCT: e0b3aaa890e45f1c39ad4f13ba7592f5251d6a02ca40fe3633651b35fba74a579f48c5\nTAG: 5c95fd941b272bafbd757553f394991b\n\nKEY: a43859049b2702e8807ac55b0ad27b0e\nNONCE: bbe8c571342cac7fcc5d66cd\nIN: 8673d6ee2903265c92446ce110d5bb30aa2dd1b1ac5558029f23974acb8a2fbf4c74858fc73d6104\nAD: f77c998ad3ace0839a8657e350bed15ffbd58f152a0dc04ffc227d6beb5738ad061d0f83c2a26999\nCT: 40e201a513979b093637445275b2db5ed4cb1fa050af0e20e43b21af6bc56dec654541e55b295b72\nTAG: 41bbef45727d19ee544fba5b360312f0\n\nKEY: 68fd608c8697243d30bd3f1f028c5b74\nNONCE: 319a210b33c523d8bc39fbea\nIN: 2c088f38f7a58e68bdd92632da84770303cd1ff115d6364479fb0aa706571f68d51be745f5c1d1b44fa1501cd5\nAD: 1417a65249b85a918622472a49df50bdb2766aae7bc74a6230b056549851b3c2f0cef727dc805ba2160727fbb2\nCT: 9d376b147620c2ac6a5eaa8ee44f82f179f61c9bc8acdd21680a7ff03acec953437a3cc9660c7ecb1204563944\nTAG: 05a4fb5be11e3edd89e34d0b7132d0fa\n\nKEY: 6edd3bd2aa318f78b4a51103cb08d489\nNONCE: ef0027b144691bc9716fbeca\nIN: e98f2f99680dc748fe0b57390df38a99950faaf555a888d463d005ef4e4b1c22663d3d3daa812b20ae35ac934c2e187cbba7\nAD: 97337902507391de0f15c88462aa5ffc5e4760543850719ccd8a0cfef89484d8095c23ff8c1d06eae4ff6d758c95e65cc3b5\nCT: 3c54842c2099b73daa9c3f1cb64bb913c0527955d923510f3f3046df471c1365db97333bc5a86dc7c5f23047e938fac976c0\nTAG: 375b2a25421434e5e3a021d434fb2d04\n\nKEY: f70482d53d3ef70cdc3cd3c4a37aeb2b\nNONCE: e69d3de363e225749cb1666f\nIN: 4cb68874e69125e1a6f6e68669b48317e1b361d0f7f95ec4cf613b7da2c835832010e8f95eaef4e6800b79bd86cd7cda869d2df258c267\nAD: d72975f15721bd0957f5cb1edecaad2d1ef047afb0e779035f777f94cd7ed1bdf8ca9d4f357d2a1e195f195e7483dea1476133235f7e6b\nCT: caa1e48decbda18e314057c5ec32f8733a5cf03ed0d05c3654531bf56faa70751a6c7f70fbd7d39f7e9775a772aba8fe7731cd0230beab\nTAG: 47d909cbdd1c7f8b485fc3232bb7185f\n\nKEY: 98a12fe16a02ec2a4b3a45c82138ae82\nNONCE: 4b3404684825dfcf81966e96\nIN: 899710fc8333c0d2d87f4496436349259cf57c592e98ec1e3c54c037bc7ef24d039a8c573ec7868e8ce9610b0404ea1b553ae10cc8cec26468cc975c\nAD: ea1a99cee666bf56c8c3667ef4c73c2e1e6534800d6e39a97de3bd5d39068bb3e2f74f96c03463afa18f1ee88c21209bae87f37e5d0269b68db370fe\nCT: 0431b7fc4889ae401eab5edba07a60f9682fe58419d4140cbf4f20c62d79d8a3cc1f23fabead0e96e1c8c90929756ea1efab508336e1d0ed552eafd0\nTAG: 01053ceeb4f9c797eef9426930573d23\n\nKEY: 6538e8c8753928960ffc9356d43306b6\nNONCE: eee386a2b1e310665e335746\nIN: a92eb9a93a90fdbb2c74dea91d273a48efe9582f8af7a4e3a377b114770a69ca45421959fcf36107815e53dc61b7bf018fc42965fb71d1eafce0961d7698fabbd4\nAD: c5e572e464718398374c8b45ff8749cd9f517bbd97767f77a96cd021176c49c0acec8b055ef761f49aa6d910375a45b2f572cd5420b99153971a682b377ac88f09\nCT: f36353de609d0b5246f64a519d89a4dfcd9d53325a2d2cf910e7692e68391b0357b056b944e0b53e41568f304bea8822f9ff7a0375a5a8087509799226862f707f\nTAG: f7f9b891089d02cac1181337d95b6725\n\nKEY: cabdcf541aebf917bac019f13925d267\nNONCE: 2c34c00c42dae382279d7974\nIN: 88cc1e07dfde8e08082e6766e0a88103384742af378d7b6b8a87fce036af7441c13961c25afea7f6e56193f54bee0011cb78642c3ab9e6d5b2e35833ec16cd355515af1a190f\nAD: dd10e371b22e15671c31afee552bf1dea07cbbf685e2caa0e0363716a276e120c6c0eb4acb1a4d1ba73fde6615f708aaa46bc76c7ff345a4f76bda117fe56f0dc9b939040ddd\nCT: 049453baf1578787d68ed5478726c0b8a636337a0b8a82b86836f91cde25e6e44c345940e819a0c505751e603cb8f8c4fe98719185562794a185e5dec415c81f2f162cdcd650\nTAG: dce7198728bfc1b5f949b9b5374199c6\n\nKEY: fd1dd6a237a12d7f64f68eb96890c872\nNONCE: 459ced97ebc385ab3a8da8d5\nIN: 04a9709fdc0a4edb423fe8cf61c33a40043f1a585d5458c7512ec8e4e066a0f95e2e6609abf3c95a5d3ae2c738269533855daedd92eca20bdedbbd5677cd4eee84b7a1efae0904364f1e54\nAD: d253b829a2fbc5877b0fbe92e7b79f38886a49ca889ae72b91f2c3aebe257a3ffe0d390b5d320bea22d6a5536cd9213612f5ed6e3b0ea33ac91cfee284cb25eaaf6b85b15f7ca894317182\nCT: 4a565d3ba4f2ec461c9bd8dd0f96bc00d2a561bfb56443c8cf47681bdf1c61f55854bea060c4219696cac79c09aa9400a7e5c59c6b6ca556f38c619a662905fc5f0e8437b906af6138e3fb\nTAG: be5f93201d7980af4c5bceb24ac1d238\n\nKEY: b09a4d99112e1637d7f89a058988b417\nNONCE: 74348f7126c0cac836e9de5d\nIN: 6b3c4cfd1eb139b62d91ed5d1d8b0f3b52278d5c48787ce46f12b9f026e3eed1bfbc8c6684c6662f06614c69440b3d7cff7c46b2e4aebaa4b5b89236a3cc75535bc600104f240d01de91e0fb3bcad02c\nAD: 7883ad259fa5d856ce283419f6da371b444b9b64ea0ddb371b17ec0a9ada27b0eb61b53bd3605f21a848b1e7ed91162f3d51f25481f32d61ec902a7f2cbd6938a7ce466a37e4467e4ec2b2c82b4e66ca\nCT: 5e1b783b20fd740310333eddde99a06b5740428cb1a910812219fabd394b72a22a6e3ca31df0afae0a965f0bc0ae631feeaa5ce4c9a38cd5233140b8557bde9f878e65e8932b9e3c3f6e57a73cda36cc\nTAG: 784b73ee7824adf7279c0a18e46d9a2b\n\nKEY: 284bd8c4b5d7b16aebce1b12988fa1d3\nNONCE: 7ff05007c5d018b17562f803\nIN: 903416331583dcbd31420906c64dc76e14d0c5044d728cd9b605b531ddc350fdaadeabe67d08f0b4c7179f82a1044696716cd96459506453141e9ec3130e893d8c2ff9b8b4c241b73866ca4fc1f712d17d7a88bf4a\nAD: d0a1f92f80094c1fad630ca584edd953bf44cdde404f22c8e476df8708a97a0712e7fbd8054caa7d65144d0be3b30442d0dfa5469ba720afe1d00aa6bb53c79c1c178ed42fce596eeb6c638c8a8dedf76a431976c5\nCT: 9bc3708f70a68fc16bcc33099325c821a0ae9a2fd0a6a98382fa21b42ddb3a9ac6c34a13c4805d3beb92586cdf0f4dce3885793d49abce33190685e7009a79242dd93594722a1ceaa44886371c30bcc8312fa2bf67\nTAG: 3fd8a4d760d5b878852b1ca2d34dde6e\n\nKEY: 6d76dd7dea607a5cf5c21cd44c21a315\nNONCE: c1d13e56b080a500f1cb80bd\nIN: cb959b92e777f835afc4ae4149b190638851238b7b13c9bf65343adb3130e8ad2356101037f30997d4a5fcc0a1d6415210179fdec881236a799f6e90dd43ea3817819b432611eaafd072368b9c7036c7a88c8b7774a8ed986134\nAD: 92a2bc3b6b6ca9de0cef10d8bdeaadf6f54782cdb2b09e66cce8cb5b56895636e982f7a3c7bd9d221ade62c9ecf68bde70becf683804386606ab1c48ac764c4e11620064545c5beaa5911c118856dfc5cdb8df50052b01762c6c\nCT: 522ba9bfb47efc624cd8933fc9e17784919d2b3ccfaeec46af414c1b316355f65b9f9fd7f0be6ac3064b4016e43b8fb2028459f0fa0d81fb6656be0ab8fd841d05d24682b4a57c7c59d89af384db22c2f77ce10abc4d1c352a1a\nTAG: 5ea4a77381679876e0e272b53519d533\n\nKEY: 1dbcbe45a47e527e3b6f9c5c9c89e675\nNONCE: 98f2da8ed8aa23e137148913\nIN: bb23b884c897103b7850b83f65b2fea85264784737d40f93ecf867bfdba1052f41f10d2c5607127da2c10c23b1fbd3a05ce378a9583b1a29c0efbf78a84b382698346e27469330a898b341ec1554d7bf408cf979d81807c0cc78260afdb214\nAD: 46f1bde51f6c97a9dae712e653fcac4da639d93a10b39350956681e121fb9ea969d9dc8ef6ddfb2203fad7ab7e3ef7b71eb90b5089844d60d666e8b55388d8afb261f92b6252f4d56240fe8c6c48bfde63e54bd994ff17e0bf9380ebfb653b\nCT: 0d90e869d2f4c85b511fdf85b947ba3ab75c6b1845d8191634770413d7574a6fbd9d86897cb3d3b5d3d8e6f74fac3bd2a9b783cb16cfbec55dd7d2f7fc5c39fe85d39bf186a3fdd3564bc27d86f", "4019ae0cb73f5f516b602331433689c1b08\nTAG: 8777f2002d5a5214a7bd8ef5a3ccfbbb\n\nKEY: fe33f47136506e5cc14114eb62d26d64\nNONCE: 9534a10af0c96d8981eaf6b3\nIN: 3ca38385513eaf1fcd03ac837e4db95c0ed1a2528b7ab3ac8e09ecc95698d52b7d90bf974bf96d8f791aa595965e2527aa466fb76da53b5743eda30bb3ebd9f6a8a7721fbfe71fe637d99a7b4b622e6da89e0824ac8aea299ea15e43250d2eccb0d4d553\nAD: 50b7bd342df76bea99b2e9118a525c0f7041c7acdf4a3b17912b5cbb9650900246ed945cfc7db2b34a988af822c763451ac2e769ec67361eded9bcab37ac41f04cdb1d2471c9520a02db9673daaf07001570f9d9f4ac38f09da03ff1c56fdefe16a855ac\nCT: 927fe3c924d914a7aae6695ddad54961142b7dd5ff4c0ba5ca3e0cf3d73bdb576afd59bd2b54d820d2a5da03286c124507a48008c571c28a0ce76f0ed68dbac3a61848e7e2162be8e0bee8147b9bf60da625cdab8601bfb37dfcd165f533e94a32c26952\nTAG: 9bd47a4a2acaf865a8a260179aabf8ad\n\nKEY: dec1b34b7b81fb19586c6ec948ecf462\nNONCE: d9faf07e72e3c39a0165fecd\nIN: f7b0bbe9f0ff4dcf162792e9ee14d1ed286114f411c834ad06b143cadbbe10a6fbc86f6664e0e07ff7c6876d4543e5b01ff5ddb629f896c30c8cefd56c15d9f24dfd2ed590304a6aae24caac5870ddafc0e672ac3aacae1867891942998c712d45efbfa4d99a8a6f03\nAD: d3c4fc4838cb3cda3937455229ddaf1cb9102e815cb9f519a5434677c68b11a0bae1280faee82f1a5bee593e669e6f81d5ece3675b8af63f1491bb298531aacc940f53678ba56ae96fc66be92b904bc35f2d5b68b3ed98569a4d04e8f8a9689ad9fa4b51db0938a9f3\nCT: 2f44ecf549077b98ba551819538097bb80304a55c48ef853e20ed8c3f808dc8cb5eb41c2463d19fed2606b59cee4b458958ea75715f7654146df4519dc63524a0569a00d7bbc4b32a372f82d955be5f190d09d35c267da1017e8b16096ae84f8a671b45aaf0d1ca59c\nTAG: bc3af80cf9388d35deadecff5455d515\n\nKEY: 021add6030bd9f3fed8b0d1f16f83783\nNONCE: 4e460f51fe6b5eb9558c4571\nIN: d9aa1d0db5de536cfbacb59bb75c592ae3f34a5f9c5ff4f22d14e8e4bd0754af19570221893797f60c89a251cd6a19c2953662dca51264afc21099ed5c80077b0e10a5295b3c4c6fe47d3c1c84fee69ebf7d8a7d9b1b338dae162e657e6cf5277ca70d47b9290aa7efe67b0ce574\nAD: 38d99cfd7578d40ffa1749d5fe83500362ceee76c5af38935806837b2f2d1b3422a5057bf617b07868dd95d8e5f4a24e74f96177d53a0275450b429a2b1f364805030765e376151ae35001d6a4872200142fdce82017f3e976ab0edac1a08d2649d297648320e7dd9143b554fa3d\nCT: 8863ad51578fd1c9dc40702e34236adee885955f0478ad9a094a6941f95f900e466882dcd5b86e1563ba89aa105f56f3ba5ed860ec3338ee1b750a2f9332acb3f0f61718de7e40fb80442d046b35f147f178bd05362f0559a20a53ebbf78e920fe14c9d80d1c9fb21bee152f8ab2\nTAG: 614539247fdcf1a2aa851102d25bb3bc\n\nKEY: 311c2045d5486bfadd698e5e14faa58a\nNONCE: f1cd8b373cec6451ae405618\nIN: bd154e428369aac5c13128d29bd3031364939abd071c34bacac6ea7292b657b794b2e717d9bcb5d7d01496d805283fffd8f7de6a3493ddd8d1dd7f58835a44d43ea22d95468d1239ca5567d6c80bdf432fce2afc544a731a2852ef733667b9f8f4f8923eaa9de3aa32addddf99b607efce966f\nAD: f70cb7e67b2842207df55fc7582013bbddff8c7f3bd9ebbaf43827aa40f8490e65397934ee6a412de6272cd568566ea172789a006a92e5920140ca5f93f292b47dc262cefc66b75543f94365c08795b7c5e9c6c29b7dc67b2532fbf8a6487d40a3eff504e75c3f2bb2cc3969621028e2112e67\nCT: f88f4ef0431d0f23911aaa38a4022e700d3a33c31e0c7bdebe00f62ca3b55d358385de25ceb0538242871eb9c24530e557d7981fa0182436e1e49272d52689541f09517fd147a8da0f0d2bb32d54911a36eded0b87bcba54d6842edf461b45839df1cab5176e2c82c871b3be4ec1bced67ec5d\nTAG: ae8d847f106e914ffadbdfe7cb57beba\n\nKEY: ceab57de6220b2c80e67f0c088e97b36\nNONCE: 8cf438aeb0cb29dd67506b9c\nIN: ce2a7a5663449cf6e0068085e3c373c5ca6f027544e327bbc09ac00f1571268bee186d51a00bbc16da7429e4d3d5235d8d54ac96b6ecb2fb7d77a6e5b9e70d431dd4dce78ceb972e9e4b63059e350efaff841c2c42bc29c139b7fd070097556b6281b58e074d5271d9f66c6744ec6dd3b9db2f4a21aeeb7d\nAD: 03e464d111ac9228d39d22a00120c6ee671fe5bbf462b1ee3fdf348b34999518998ac4e175ed48189c29b49b5527c27c43094eecbeaeacd3cdb48cd15aa82573e884a7b97bbcdad610a6955f7d8b04f6f98a13a907bc2bec4c940b77582b248f5fced1771f810977b2d0a4fa48bd4d78e4bc383bb92743fd\nCT: 1fa9c379c78b92fa3c1e478443ae38d7b4b50235448ce2a88467514bc9db95844ec1baf4dbdbd1b0720e377d05d82c3b58b52af8c9c50417b39ad225e373c7ff18ac5a6ea5d182b255f1c8a2766e31e3e4e3d55dc08dfc64b818ead40a0e824b06ab24f0dc9f4f0c383db7cd4d40016b31701bb401b126dd\nTAG: a9a885578467430504731d1a8f537e3c\n\nKEY: 585bbac0ab4508afb8b72d84167551aa\nNONCE: 774c82af194277a5506e45ba\nIN: d788112213d2b8b5b66b056e8b3e344a7876f6193b59a480c51fc04d3ec2e5166344c833187b14117276fd671a20937a4553181c29d3d85afe385dd86093708226f082a2ea4ec3288f372c772ca7ceae86b746ff428e8add17b0f34f8553e3db63f55224c39edf41f138a2c28be49d56aa8b4c93502b9794a16310f78b\nAD: a29665261a8eb58c88803bcf623dd1a14e76af49ec5db72a267f2ebcbc479385fb6b32bafcb1239515d74a8282b228e83daf282d1ab228099b315bbed0f0e6b3427e029cc28c025460a8bf0914bd584c13e7de7830ab77fb4a9258dfdc9fdaa96ca941546477f04cea19a365a27de34e23e154e7419aefb0be0e871bbe\nCT: 24f2856e4e40c0b2b8b47e43d94c1faba498884f59d2ae1cdf58c73770279c96feeee3025ec698cd8f0ae25bf0c9fbf2b350674c317e52bad50aa6ed9845e194f294eb71ff192604af50ac7192f308583a3edaf6c7aeb588990be81b801dc916ffd621dd4016e2b76e9078c89fac9da39f3a88f6548006a48b0199a732\nTAG: a5c8f9daa30b045bd3e1c1b01f438518\n\nKEY: c5d727d159dd328b4160ff45a183226b\nNONCE: 881c0802db519ce1595573ff\nIN: 88b4be77bb8a2f37bc5e84ef9da92a4b8c3777dbcccfed13b97e93c19674c8c3f13119363ace377a14e5f36501ba9a3898fc09340886d91bf0a17ef0d028f2a92ec150071623a4a5db8e56e99e764629679943ea879ec7634fad1480e8617fe834c26210276d7db208b13f9b4c2060f2867aacb1b47c8e110830beff721dd8d120de\nAD: 5f6513ad3d490f784dd68ca1df41e8c8e1ab9a240ea8e9bc22d0b1d7353da94d5d37c94f0dcd1a2dedd6d8e1c79a383e7e214cbb6ee2ccb7c6d894ffce5d01b6cf13876ae2648d36adccd88710d7d2ab6d43826d37ee0ee3b434972a2cb8f4db1c3304cee0a352bbef76f05de0e6f55a410eea5e697afb197f2483f0200d0abee224\nCT: 66bbee209eb11c675ecd3303c38cf1087b010c532e1357732c4911ca9db78c67805c95c829194cd413b635a900a08454c6eb9cfa3597ab531fc9ddfdc5b02b290be2a618df7d03b1ab465d6d03e8b87a430bf4e80d8cb9916145cf2d2342a91fc79defa151b1f3c695608e76ca2abc4c0383897f1cbb9d4bd9969b2f33813e2b5502\nTAG: 43daa08e6eac70e3238ce655adb65005\n\nKEY: 16af56326046c92afca49fe173d643ad\nNONCE: d32a935b4e56472d92d9f2ce\nIN: c49c8e5769670384d23d9af9834026395d3f3bd32d88e61ed06b2e00e52a5ae4fe3867993c2af95203cd4006470a89677864431fb9edbed17412913bad4bb3eaff0fccaa150c9b13f83b9bf06698af844841a640d6f94d845296638ac27fb5ed87c310dbbd36415161310b284b8f84b4e025267906e0a4c822b76a682d44a70f9afde9bcf48ac2\nAD: f713886f4086026779a7e479fa646cb33574e6c977d70b8da49c8fdbb395dc7c149a59e219db8e4fff053cb00e2a1df9850fce94e52fd34661fd3d4cd8ad3ffe0b4bc7ccfbbf42eeef3e30ce13cdfd77dbd067ae9f5aebfa068f6b7ae2c17ad956dc03511dfcc38eac9fa3c0c0e9a340f5c58e39d868b77dede54fea1173216c0bb8f0a6c2990f\nCT: d5d7d1ed0ae3e3481e2ccee201857ce1f427734fbb4fbe82a2b90601104008b8ad4daf74514b8ab3e42b6f6b509159ca04489b1175ce1e3fe33d36ea521e0aedff8c69fd00aa588d7a2eb9d2d551e2b8fea321f573e2a1df147535a873d540a3169d3ebc099ea6c33cefc04a2d55dc2d47237b95ad269fcdcd3c3750af426beb4edfe7837b413f\nTAG: cbe0fb9509c224bb0e8e33f7ef9b49e6\n\nKEY: b3df227e6dc2c846095e2a3b825d7645\nNONCE: 578bc24ca3845e23204df661\nIN: bf69be81cf0b340b006badc9f644d10376f4f9a7a78c997edb8729e3786447f21e97e4c1e0c0c74e01ef655d0a84ffc04ff7c6712ad65adc9a0da2e3078d4c9e796c9bcd71e7a9da26b987990d366b5e00a23a93652e10942e07a6aa01375af27080c9cbab5f554497abc48260937a6fe895361e79cd3d5e78c1a65c6723d4a4fbe9b3dcae3c05699cf6d3fb\nAD: 00898eedad307fc017917a3296bcedabaad8a505edd34e93d92f3b61797ddccf3fc31144ef70f255be3b0c165c97eb8706f14c495f4aa9b3f15d2dafd65bf6741d67fe240967efbf0e75e610db9a8f722035e039b5e9246d258084a04c12ee8ad1668032f8caec737481fd894dba2ef702d3e6089acbb0fe0bdd6daa2a5cd47fc62603499fe3ea37365072e5\nCT: cfeb249551a695ddfec5f789e7f0a9f916abc8ee01d6233c32744c10a09b5b19ff9ed15e9f10de8f93c8ca1ae3c34e26fdbbb7f3b0f5f8b064501830d3cc982da99b294ce51bd33085c98b0ac0bfe44a8f4a5a26511afa3461aa88b770f076fe119ec90f33d8c9e7777f30b8cc95864f06e04dd8e328ad7a2c7dab83b03abfdde065bcd0c7d6dd47389108c4\nTAG: 3dedd1054f1a29286a51817264317b83\n\nKEY: 58a57f04d1d5cbdd1bfbe01dd5f7e915\nNONCE: 47affabd7dbb4cce76661081\nIN: 5f82d481a6a3856c6f0be2aca54d666f16de88294a4d763134dd51ef03661bab45da94b9871d94e5b574a52214b22c92cf9690ecbffca9b108fe796abed9e608778c0b99d7bea1daec08dae89d5f7229c04fd52cc906b5f5b9fc0f0fc1e0b2272dcf4865286ee22bd9edcce1afadb579ec72cdf6038cfc75c2dbab5a1fd64b6f8e200d1ad0afcf25863293fdb7276648de\nAD: 4b662822b48005fbd85bb99e6a946eaa74403909f646d914a236eecc5f4558b60b2efb1584b1f32d936b90428dda6568515801d21d24d6fb622e6463897c70be01f81fef741d6dd5c6556d16", "3c3f048abe49f21817b41850ce79d7ec1fdfeba32935b58d898e964fa4b36f79c0f1f560b0afec3887ab325e1a025fa7662f9baf8e08a9ee714b8369621a2f1e6d2e96896a\nCT: 31ab08ce0aaa883628f4b33369e5f6e5a54ee4a6596f25ecd54eeea30e81b41d357cb6c671adb6acd3d4e6654feb2ab1f3259692502efb33c5121e0852cbcb2dc5d9a4c65752debe9c4bf5e995fc909a2881621d46cc220806703795e61c0fe74c99e3c1230521b1f97bcbf4e95326e2d581f0cc879a2fc06ef88226a4413f9e9985edc913c418cc198c4df13cd46afc24\nTAG: 1e54066c6cc37f35c62b47426b609457\n\nKEY: 64011470970333b7b677d4ad8ebf3ea2\nNONCE: 17031c5133a426d96de93123\nIN: 882cac1ece2d22a1db7f8339332379eb68516c8b7dcb3c089a5bfecceb49f48a169215313686eb5708135f379d89962af478cae865841e0c97ab47a57a456f634282c4e03c99abf7f7cc4e8360deb48160288f06e96cb09114877f9d91dae98828285626a1528aac87f39cfb8ad3db344fe4318aeef6f6ba14bd1edf9caab548c09f8eea091229a90dbc4b0fa34fda2bf13d300a1f9c\nAD: 0394bb920cf58806b909d90c046402c745f6876af85d8a281081e22a1908f8475126594b39a0e191a070bda7c78d30dc4867e69ea522cfc962fa5f9915daea9133e998eab22f32a18957a3cf7d91c6f3d54cea94875d60be694ee841fef01e69bf5997ba4f25e846558431eb592605265f235211c2bb2d4807278f4b9c314039d0768df24e9c098c6a01c689d6a143073fb1a29f4400\nCT: dd347d6a3d4a71b2bcae0a0c690ca311f012c6ceda4f7fc054b8f9b59bad54237b64b93331b99f1305801640a68e7d50cef581a57ff2564c90995a8dbf57fa8cff046d0b946af5f68e0aa3d73262965622fe6d35c78f949a6cf9e4f62ba71accbf403b690e31f610305faa6737a19efba1e1ee97084cff2d125bd69a5a4ff99aa399df650452daa835b3e54114b295f00d94fc60e2f8\nTAG: e5e72cda6755bfb3a44377945adb5ca1\n\nKEY: 4852e546fdea545d7dd12493a687e895\nNONCE: 7a3e136cd961191570c1b0b7\nIN: 30c10d7a63b614bcae1b79b07c252dc55f322554ac34ca664910fe4a0c9a33e30698e124d91cbb55cf34e931807cbe591a87667f2284c1c18dacd108163aa7a82e274ae659c4ea144191e3fc0f82d4cac929969a50b98ed9fbee52cdf465a1f0535d7d7df15a9a6eff3f4a14e254571cc47f82716d7a835dfa839213677c4da8c8623517244891993ad5956f65d318d9bba16f1eb54d2974a741ac\nAD: c5ded7f545d2eaccbc2cf5cbd1b38b0ec3b6bbc054ba25a16efdd448e5a47b0085974e469c1b0df22441340170d6677f5158e4ccd71446d7ac73dcf5fcfe4ad7248c4ddcfab4c8ccab0968d74d66d9c9561650eb98c088d87766440fc9967e8463febcd12ed07f7e44fef47cabf05274002d0014c4e31f230a41171868db68bf5a83c902724397ed181dd8c6768a898e0c78f6aeb886df95442e99\nCT: f798de4998683da7fa9ca030a23dbc493f36c48bb52cd1113c3ea97ef2b67433c00195000777fa3b75a3f689a66b148159524a1fe9576587948760b279cda56164a23748564ec66ea51368ba2a900c97169eb33cf1e557f46100193575737dba670175035f0d921675d45415c6591cae079698e6b1f74e82d4b9216c20e907b148a1d514b2cf653d2e4994f7f668dcfe88dc49c29c544de96d8dd0\nTAG: 3663fb2672223154981b4c580ed3d2d9\n\nKEY: a65b520a2ab67a24fb8fc669c41f2753\nNONCE: 3bd6c7e8d29242abecc4c108\nIN: 9d1559d283f7a38847088116f2156b19a8feab0731f04d0d499c6b0d21b8563a89a9c284230c1298b28a622cbdd38dbceb098ab896a7259caaabfcc7b0d9ea797178c18aaaa351c7f516342dcb9d3e91405882c8faa9a28f7c67f3db8913b31c0dcd56472d8ebbfb20cda2896a66bff2706b12ae0d9bc8c6c123c02f1f0bbaa418c1806482423eac72d718cad0dbccd208eb81663a9d9043d6ae7a52cf32b1fa\nAD: 2538529cc6eec03f70df2ab085027ce015279484981422f31e58aeee31e79703d72752af2b8822dce9b385f1530f19e692e00e20ef973d333f4bd585ecf122bd4ed9b0626cef46baff0302c71411d27e372361f36c7245096faff21f0236f3dd675646760d5687b3cf1544dbcaa863f1267bce04bca976616b890c7c6ff3448d16072c3938f9b62377609950ff7818cbdd21fba2560bf1954a93517962181b18\nCT: c3194fbb5c319a94c0f61c432a730ce7611a005cfc78266ac4e5d7c95351e71d613f06f52d9d008b9d886f4d9a57bcc232d47e0c75ab755dfccc057a9c7558d7fb696a8c29843a8b9199e2406d23cd6507d35a872fa54cb95e2cb9af45405ebc6b6ee353e8a80debc393329bb9499c61c6344a6380c118f30fcd76376a9765517652e1b21ecafa63c0d19c1875658f1eda89c15ac2daf1a6f526ca72ee792a4f\nTAG: fc16cd532c926ba01e2e6b15327bfb3a\n\nKEY: 84215d2c8f86e5b7bf93cb0620da6bb7\nNONCE: b35e99ce89dffd1ec616ed92\nIN: dfe500919f97713f6d9c4f53913175b162b8b7587d85d5b63f0cd5f51def23119e2e02c224142ecfba7f0a519aaea3c28be20b9c2a9c98eb145afd4db523b7f0b822e67dad630846b2a192bb146dcbeae00198c81b80c290d881125c24a6b01ec901b8912bad5b081ec7d97d6997b33052ec287f692489df928ce36cba1e3d6a41cf10c697a9e1f4aaf75dc5be054b98965ec3ce173be7e127c4c5387048ae6ab5a8d247f3\nAD: 6bf6222e64a46c90f83f47305554d090bc8d3838b7a856f0e5e1d92c4e7231eda6af1d9eb7ff6ce914f2256a3b0c853453b9bc75e46109cf8d7e8a9dca224e022d3d1a139d00476775622799541edf9d53eb645a40f6d98ea559e181d96e4df0141e51fe067542300581c0424f534d2c2e3b1b27153c0cd496a1c03301226beeed2b5cce0710d1f485e68b44a918b63fd8db610c7ff894514e272b6ed7ae33a38907e0698b\nCT: 6c6faa54df62ba5659d45f64a5f014684138c93bf152da8a495e9d067b13a30b9fb84847f56231b2da4d87e6cd509a3e38a9ff47589c627e5b5a1196e27fc7afaa14a8432c2d10d8fbfd5d6d394e4b947c456420708a76c2aa638df7de119c160636fc8dfba32227c5de12e5ef429da933ab04e77b489f2eb761d0c753738647ad6793cad64b8942f621ac67b13bd0cab106ffeff21f24c79de69424e50ae550f2241d4029\nTAG: 202b232472d050b9bbc68b59a0c02040\n\nKEY: 7c02b6bc3db61e23736c5f36faddd942\nNONCE: b958decc680d5f79ea7b8632\nIN: 7e5992ed0474f4224b8da1d038eeb78413fc2f9614fab7120043e75986a4bf1114a80703780a149fcc8dfd115b768f45917065c85176a3f00be40b427fe3765d3919a5b741708624e29bcae876d251fd46dd8d36a8ef66f671c25f984761cf7f75f4329de7093937cdabe32f130b77531ab1aa0a1bc38fbe2758c2664eded828b2589fc5c34d9a0d57a5a4463163736f419b65f0543f50207fff4cf1065a551bc00ffe9466538b673b2a\nAD: 76e430fce1a7d8340104e6001f1c2048d457ac335c5453e48727244b75c3c4f04f55afbb5ce55ba6f8632dbc168ed715b83968a32e5b8e91cb24abc9efee6dcb7a8bed9394a546f0b9efc5823ecaa192df061eb41c671bd863498c2130f322074a711ee43791a1cc02b5cacccf25119ecdd99233abf3b131c83ddb8c62c93a0d653e91499e7481303adc8dbac615ec464eb8640ea138f6236b0ee31cea060f97ea9145a22d15e28eaf6b\nCT: 14cfd190ae0521f94ee6b36bfcc403139782bfac3d33fe95c81f53e83c7d0c9a8fdebbddd79746b550a383ece1b5c93316b2fdf5aa36b4e97f739f78ccd2de9963ee7fb4d77b581cf676bb679b2dc4a48d977b45564f21181dc60ecee84d736f2324196c20327495d18973660ccb5dae69b79853d12e48ee0706c8ed821b7f722e46f35c8dee2b7b55ebee01dd3ea1e8ef80493cab6b27c264a67596cee06c15062e3a96b140d0d9ba38\nTAG: b6c47410e6f4a2f2b172c6a4490732f8\n\nKEY: 1f58ccb33649d0dc91c50f2aedc95cbc\nNONCE: b3a392b1fff0157e95f82a44\nIN: 738e04dc5a8188d775262c2cdaa04468844755dc912a4edf9db308efb3c229b8e46b2b34aee2c6330219bcd29d3493e3cead142cef5f192b043502b8a4cf0419f9b3f5e001a640541c84141e36d585b05a2f702356bd39bda518c42b461564326969983d22c3ac5a2aa214807ede803d57a61c9547505dd7e08402cc43e6ed1574a48366cf5b5573afcc7aa3c4d4721b362d20a58cbf251315f2b5f9e2c97c5ef6bff44beaa5004e5b7c7f28295df2\nAD: 93f7f5054605edc769efc30b35018ee6c929a83bc6454352c69ba9c72e4b4ea6f51c9ed06f314b5682be6a701c719087765d0a7022e5c9d495f28a9053bd435b8b834045c3670856149b08dae742b372a15a0184375d50eb09877bf94f63859e64228606791c516e76c5695a4e529b9dc5f76eff1d4641a22597e4460aea4eff107348077d4ed2d6262744b0a2d6610f25264d905133309ace10bb52f7138674c25e5d43ededbd87c13dc8fd9d3b1b\nCT: a002b47b18d1febaf64842fe9011484d618a2e855c4efcccc7d08f02dc9b53d0bd4fc8013e01e21fbf2d9bc7fdda69e68be0c06d32003d045dca6bd251c0bb8c2cbe3693b252265c8694295772b767f83661ecefd57353f6f1c442f9d21ed98c55cbe1db8171ef7b54fe3e3a1a253b4dd48416b5fbc7c18d73692e9fc90dc75d4b88de1fa47c9ad33ddfa4e582d3fc61ca2a8b1eab898b9992c8e56d170730454ca50cd4f28d2759388cb8e302be10\nTAG: ac502a9a52fb3a68a7e90dc639c7ad42\n\nKEY: c67510714f556ea1744af9207917eb60\nNONCE: 71b347a21653cec3d113087a\nIN: 7040fde3513cf7f1886d7be9c0f371a3b75415e94c3bdfbef485081199bec4494beeee76dcea05b6601ebd4c8fe231fa16d3b0f046eb3e9c9ed8baef25bb0ff6bc85469b2eb41b929fe904735f819b241b01230c68c0b61577899426bf0dd30e085cccb4ac290244d8c1cd7514412a3ebc51aecb6bb4be1a5a4a8d2ff3fc99191f7d7d0b44fe2cc4ec34deccf901f54e3dbe19d2dfe663855fa9d93a01ab14faed7f00c14834f63e1d153441c6fabb3cf22506e8\nAD: 6d28b410c788dba025c387f5b94c0bc392c69ef646b9cdce53dc169326359de26a721703d9a7c5017631a469da13b2d9ad9115de7d06922ed6f093792ac25ae2e27993ad6be5217dc4f6c51e18f230d4eabb01a474704b71b1407d9cff921bd98e28bb60c4fc019b4d609667c747e83eef779ee62000b6800ba2666f415dccb12d43af4f585d3185d66ba2ecf0b0fcddf762445dd1b6154591dd069f03977243b45b113b6f9b110f9fdd96f0b74e2c9843a45c6a\nCT: f2a2cdb4f890241f44e00b3373769542cc3dd24c3d07502ed162dfa10be9906871051b991f36b2d5c4240df483c2ad704be14b9efe79ca704e8eeb9dc250e75a92ebf5800c59fb9a6a32228fa1121d21e0b423b77e20010d36b9e6c68dbc000f69bddbd521a1f7bbc9d7e431e4e46e5094be96a928c6729293d2d805c468a3993fb7439f192b1142272a78585e3b7fcedd2f7cced52ab2bc42e2521603b89ba76", @@ -330,9 +336,9 @@ "397440f1a4a0c7c9c2773c0a0cd3b890effb010dbcc00237dbed1177b86bf60913309bfda9376b4192da59a360afc5bcfaf8be16ea8313de97b417aaddceadc63a1c3a355693616413ed4101ad68f6e6aaa99c839dd2a9ff536\nAD: 18e3195358bae4ccf43ff8daa34902fe48f99fc1371d34060aaa442a43016a1d756f795fa5c9c4a828525554571e18c27134f46094790dd1e68471ee40c17bfa02f175b2c2f7f2aef20f00e4d71926560b58f015de19c871d808acdd341675d8fc19d1e6d4028e1e8926df500c4685c14729c6a056898cf919bf3ae429fa3ca8746495716d78c9a8f2ecde596f985b1c25ad0e73aa305a86259319176b4c4f3bb231fdaa478a856f46416ddb10a14ed23c96dcb86f5bea3114568a44d8fc6ff4bb47fd0e2538b70d964842910a682e7bc7c7263249832c21b7083a1e8b143828de0f3dea8b404cbd82efb19a11e4d60aeef13abd86621ccbc3d8f220715730eabbe04a6bf0e11a4f78cd2c4369ce2447a76f4fa48ef8d322a8a28a67039c24c4bfbf\nCT: 6beeb306c71318cedabe3877ec916ce2074b2c3f1df887cc3a3e8019c10d353854b6b65c947359138d5decc62a42d50921dc8f6cf63a16062af47aa8cd50d0b2dcbc3300ba0d7d069a5e4b4fe03bbf7062c6001e276be116fdd00d15a6399d1b0db71c58f396f8bc7e51c2b1f47430d4ebd6c5d05328b29aa79bcb26927ea5a40c82715aa0e36cc83ca6d250812c1305c02ed4291a25762cd709cb3d808031b5f918ce253f622c1afcb83c43707edc493d18ec6f0dba4353a1cde7184db65654088fa13baf45f7643f0dfedf4058e6095156b791ed30827c556a7721658314356e7a3f3c62cd62fe938b008cda56ceca71442fa0ffeb78b13c5847a3ee9668bcd2a01c753bd797c240378505d1e8f2b8905428b23bf589de9af390f94f21630d1826\nTAG: df5a21a399354b2b3346a9eb6820b81f\n\nKEY: 06a4c6a8aa189134f5784a525d46ff10\nNONCE: 0f765d3893af99f5c3e6d9e1\nIN: 706b754094869313523493089e591d34868b708cbde9bd8b42cba8175d1fdb6a8769bb9ec156d44bcb8f9cbf2685a0dc18b5a802dcf7a12570bb9042a0aa53dfb19af8c0f13763f388d9626a480d6d435dd90fbdbb4292d9015a5633252aa0583498d6f7ec54460d8589c1d6a6d16a349d10ec6070e1cc52e5fb996f810d333675a7130e4f3db9f4db0e3fd3541d32e0b2efbd40ba70cd59295bc8d08481f0f137832b01bac1778ffd7450376e174067b3ec23d0495cbf936bdc176cabc3f42e2991947a4fa87dd8343c32fa3d7ac0e2d22660a0c128a00e1b51a8742fdb2aff44540e39e588c5920ea16293aaa522513c944d3b77f3a0e90bd9105319c170886202e336893d100b0a25aa609a49a8255f78233561f7b88256386d1c3c002c3ee68f2775585c65\nAD: 18e2ed6d500b176e49f7e1b5074c0b7dbfdefdf00a63d9fa2fea8c5e78a1c4ae00f17b23442933543ac864097629e112a099f3dce6d5beb1e3f3c8e19522c6b8f615cbe23444bc91a802edf8a08995a55125da805ebb073fd89863996ef708f7293069a744ad95db8c17cbcfedc331119e85020df8852d74b8092fd38ad424f3da41b4775beac19536ed801ac1069925b12303d8ad2c52c36ca5b4ec95e96f02ebc5725ee6cdc099e666d9055b789e39ded77a8fdca0fe2d94b8039be55b6a75209cbee4fc7864957402b50427db71bc75a0b1e3d2ed6ea20f12a980c5ee916067d0dde7d686570d075da4df7088fe5dccf0d440064a96998da6f318b603d513104c723f27484780bdad586ee358d821b480f9569e4dbdd1a45ab9056f8d8e5a879789a0d65338\nCT: 5f3627bd53f8da0bbe6f3c9246d6f96fe9abb91cdecf66ddd42f833d98f4d4634c2e1e1ad4088c84c22191bdb9d99ef227320e455dd112c4a9e9cca95724fcc9ae024ed12bf60a802d0b87b99d9bf22590786567c2962171d2b05bec9754c627608e9eba7bccc70540aa4da72e1e04b26d8f968b10230f707501c0091a8ac118f86e87aae1ac00257aee29c3345bd3839154977acd378fc1b2197f5c1fd8e12262f9c2974fb92dc481eeb51aadd44a8851f61b93a84ba57f2870df0423d289bfdcfe634f9ecb7d7c6110a95b49418a2dd6663377690275c205b3efa79a0a77c92567fb429d8ee437312a39df7516dc238f7b9414938223d7ec24d256d3fb3a5954a7c75dbd79486d49ba6bb38a7ccce0f58700260b71319adf98ab8684e34913abe2d9d97193e2\nTAG: e690e89af39ff367f5d40a1b7c7ccd4f\n\nKEY: 31323334353637383930313233343536\nNONCE: 31323334353637383930313233343536\nIN: 48656c6c6f2c20576f726c64\nAD:\nCT: cec189d0e8419b90fb16d555\nTAG: 32893832a8d609224d77c2e56a922282\n\n# AES GCM test vectors from http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-spec.pdf\n\nKEY: 00000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: \"\"\nCT: \"\"\nAD: \"\"\nTAG: 58e2fccefa7e3061367f1d57a4e7455a\n\nKEY: 00000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: 00000000000000000000000000000000\nCT: 0388dace60b6a392f328c2b971b2fe78\nAD: \"\"\nTAG: ab6e47d42cec13bdf53a67b21257bddf\n\nKEY: feffe9928665731c6d6a8f9467308308\nNONCE: cafebabefacedbaddecaf888\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255\nCT: 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985\nAD: \"\"\nTAG: 4d5c2af327cd64a62cf35abd2ba6fab4\n\nKEY: feffe9928665731c6d6a8f9467308308\nNONCE: cafebabefacedbaddecaf888\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCT: 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091\nAD: feedfacedeadbeeffeedfacedeadbeefabaddad2\nTAG: 5bc94fbc3221a5db94fae95ae7121a47\n\nKEY: feffe9928665731c6d6a8f9467308308\nNONCE: cafebabefacedbad\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCT: 61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598\nAD: feedfacedeadbeeffeedfacedeadbeefabaddad2\nTAG: 3612d2e79e3b0785561be14aaca2fccb\n\nKEY: feffe9928665731c6d6a8f9467308308\nNONCE: 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCT: 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5\nAD: feedfacedeadbeeffeedfacedeadbeefabaddad2\nTAG: 619cc5aefffe0bfa462af43c1699d050\n\n# local add-ons, primarily streaming ghash tests\n\n# 128 bytes AD\nKEY: 00000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: \"\"\nCT: \"\"\nAD: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad\nTAG: 5fea793a2d6f974d37e68e0cb8ff9492\n\n# 48 bytes plaintext\nKEY: 00000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nCT: 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0\nAD: \"\"\nTAG: 9dd0a376b08e40eb00c35f29f9ea61a4\n\n# 80 bytes plaintext\nKEY: 00000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nCT: 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d5270291\nAD: \"\"\nTAG: 98885a3a22bd4742fe7b72172193b163\n\n# 128 bytes plaintext\nKEY: 00000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nCT: 0388dace60b6a392f328c2b971b2fe78f795aaab494b5923f7fd89ff948bc1e0200211214e7394da2089b6acd093abe0c94da219118e297d7b7ebcbcc9c388f28ade7d85a8ee35616f7124a9d527029195b84d1b96c690ff2f2de30bf2ec89e00253786e126504f0dab90c48a30321de3345e6b0461e7c9e6c6b7afedde83f40\nAD: \"\"\nTAG: cac45f60e31efd3b5a43b98a22ce1aa1\n\n# 192 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF\nKEY: 00000000000000000000000000000000\nNONCE: ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nIN: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nCT: 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af", "24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606\nAD: \"\"\nTAG: 566f8ef683078bfdeeffa869d751a017\n\n# 288 bytes plaintext, iv is chosen so that initial counter LSB is 0xFF\nKEY: 00000000000000000000000000000000\nNONCE: ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nIN: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nCT: 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606872ca10dee15b3249b1a1b958f23134c4bccb7d03200bce420a2f8eb66dcf3644d1423c1b5699003c13ecef4bf38a3b60eedc34033bac1902783dc6d89e2e774188a439c7ebcc0672dbda4ddcfb2794613b0be41315ef778708a70ee7d75165c\nAD: \"\"\nTAG: 8b307f6b33286d0ab026a9ed3fe1e85f\n\n# 80 bytes plaintext, submitted by Intel\nKEY: 843ffcf5d2b72694d19ed01d01249412\nNONCE: dbcca32ebf9b804617c3aa9e\nIN: 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f\nAD: 00000000000000000000000000000000101112131415161718191a1b1c1d1e1f\nCT: 6268c6fa2a80b2d137467f092f657ac04d89be2beaa623d61b5a868c8f03ff95d3dcee23ad2f1ab3a6c80eaf4b140eb05de3457f0fbc111a6b43d0763aa422a3013cf1dc37fe417d1fbfc449b75d4cc5\nTAG: 3b629ccfbc1119b7319e1dce2cd6fd6d\n", }; -static const size_t kLen7 = 67908; +static const size_t kLen8 = 67908; -static const char *kData8[] = { +static const char *kData9[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher aes256 -mac sha1 -ssl3\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 4a7464217ea94d95668d31736693ae851eb0e39a\nKEY: 171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77d\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c6\nCT: c38859c091\nTAG: 50f4c2dcbd409a6ff0d4d748ec14027a3a88c8117b119c2fbbebe4693c8fa8e966cac88a81834c0d8ff6ff\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with bad padding values.\n# DIGEST: 4a7464217ea94d95668d31736693ae851eb0e39a\nKEY: 171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77d\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c6\nCT: c38859c091\nTAG: 50f4c2dcbd409a6ff0d4d79db071e54d654ad6d2781978de4e88d0\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test with no padding.\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140cf70cba3bd2fca99aea70d195e0beaa8526cab8e0c0974e8d740415efa40204c9dbaa299c612ffd92be07f0dd4c548963dd5744703dd47a8a30a7ef46297401e4bdfcd23c932635d9f51cb0cfa717bc0a991703d4c318af09a04c664126e4018daacd226a92252899615554d964730755cd267d679f17dd192be9cff2f59317a22e2cb22410db7c19a3d94bb941e837274d31fb35f602a123ee0e2ea0e4e5418f87ea165b4c53651156fcfe645e6f0feda51988c82d2ec5d145f7e378977ce551e32ad75dd81d22185a6818703841411a4f8ad2cfceec3703d4cb0591df6964b496c6cf7d5499209352e513f64d5d3ece8d68423655f04792c0d0e9d10ecca8b7\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: 095a8f557f75cba8e2452ddf97c053904b48827f\nKEY: 18cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e03744\nNONCE: \nIN: \nAD: 936a91d0b5d2c02672\nCT: \nTAG: 01cb4c7831eafe39321af304205409516797a424e14c144784645a6d67aea6e8185f5ef2f93fb6022900e885795e8af770cdd182fd5b56fff96f8b567575573a62f78c40d0553c2f00ea97bad8320813753365d10ee7fde79a7a99279acfcd974083cc8138ff704341f2fbdf1c3e5cfc81874e9e47ff457828fa0a399ea5eff04926eea2bb8f722bbf771189ac0aa317e1815abb63759eba9793151183ad599a89a08de1a2e2b8e679774f646270bd84122ac771b7261e3d9d60bc997c88a2afcc75c9abf697f1da0d71007214819d6d53e43b94e088729cdff13aa99da234cedbd107c1fdcf04c4437400965e3d9bd635a180ca154797679253ae4586fb5c5c\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c4261b78aba87b8de2f7b806c27b840dfdddd9d1b7bea5174b5e3d5d4d25fc03def5221839970193f31cfe2aaed4dac3ac776b884c0f777898826a60f457361d6f8278bc9ab0b1d7d78d657a21a56d7cf3bd585a35cda0aa69a6dd4d1b2a146cc285a3c91dbc768445ea52ec523ced412797adbef21c2332914d9034ae32e2861a915f7470f7b53a39be3402b1f52b51e591171180a4bb2ba86d5b3845e3871c82e0231ec2b663d8c6511cab50bb1e14f3611ba22b7e0315839fa6e69ca764c27d03ee5ccfd9ab7974c031af682a6805d477c9508922b1edd4f23824c96e17d520ed7f4d02aeb8b07ef72911dc83251be15086646c8b8091ed08feeec8ea62c64\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c1aca8db430b065919ffd1c460420e20d2dc49a469e762c608ef318536414438d8ece5e6840ce3d0e3403a1f0d0a133a1b4a513a83fbb1a40977ce17609f9e87b3f272e1d91e0ae563a448c297734409c09190ca68e08104f35d3934b8da8eac4658bc0aa972784b821dc313c91d3d9d84936da3e3e38587617381e69c6440fb35285a673efc015cb408a2dde4da9c9c3530a8ac4731e70bbd0eea475bbcc609184e6d046c2d22c2df7a65c2234e6928babeb3e0872034617c4874be64870b2056350f2024d19e8c1c11355d937ff7f6eef244ec2c3cb945c2cdac31de38f6b401a66d978447daeefcaf720abec96c998ef148da5e9c95c3869347e52ab84866f\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c993303ba86787591db5a2c50f621b30bf214c922d24182ebca64b0c9498fa95e20b0148f9b95ca04c147e7d58607eeeba8487eb2871c2d75eb9179e79058a5fad294319ac2f59394bcf56d54a6c7630424e0449bccead5adaff2ec272f67e0c461101a76789a839d14d8dc2d3754a232b210a858f7b588b985df75f61f224347951dec2553018dab94fedff927ebec354fee5aa549f30b5057f987b7635e47ef87f6e24adf9ff1313c9f4b8829318623cd6a74d9e9ac2bdc8b1a183dfb2f66115b04d403dddde68bbde2877cc9cb83a35d950b1b4aa194f3d34b863a6b41d52cbfcf57eddad2a57bd10eda61018c8e3ff575441c55725d3020073508df5f962a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c3868d6d42a5b7662ab0fae8f412d5cf262737850ce1b9689bdac524f56af5d3a0840170a5e4e95a12edd6eeb36c94b0ac3b271cceaa11af8626af6241ec8fcdacc0505b148dfa83181b8fff2d99417008f3752d7b144543d4042c44612039f5c65c9646bd75f8007e5f867c0a28f74796591a47193ea7dcf885080f4a5c378b70ad9c86cabb24216f505d66cf4973d525ff535c40070a38df42935920e2a5c5b414cef6902046dff4f8a06a549286b59946673fe399a21f8760f18d2c08ed95b96552f81043412b2a5349a099bf7eba9846d888dcc044de910f92a4cbf8e02c7b3946d35b2821be41ff56ac70f0d5c3e91f94165353d4f3cd61491e468efc91d\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c3c5960ed36272494da48efd35b1656093e76bd156ea761a931355914ed6c0", "a390d97072ff71ae5d8c8a4f28a0c507f5332daab12b7a0ae0744ec71b53fd9c58c29f9452f15e1adc21b6af38f9ad7d87a79ac6b2823e6530691118af5ae0cf255db7d3c3b05bf9059419c09eb11692679adbc5beb000ef7af9dfc4c429dc052fe7df1d7c7d24aa520d783ee8bbe55b6314d1c8118818eeb97957d19d022e3d7b10c10af13c58ffbb5cf76fe6a2f198a73337954d90ccf7371021958addb62351bef2f733a410f0819246c32fd88d674cdfa994d144a2603a4a92cb1b6e0ff23d9ff067c02fd43f872fa80e232377f6fb3471d6282cda5686076bc45fd8a62ce99\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c4cc0f30647410a22b8830e1fb76c5167d215e8c2d411df537b743d482cc939413dffc60c720b373d4e16097a545b7b988b2182884b0f5ef963f67574be4dac8de88fa0686f484fede78f8b67c8bae64972f37c65bd40855387e0c5571efacd88b3bddb445302f6564afef4a31854418b75ca04146a53c2e2853d4849b3cb45ab2ea3bdccca6c307734753e168d57cef80ff85c994686b305abf582047ced51428f5e4645f2de1874f14cf0aac7050f9db71cbbf85f87440ce95a4027ee2095e5996fdbe9fed378ffcc1c1b60cadb7f330a612a13ac0267ece5888bf2aa346a338cce9560f8f224e2b2fc5e0d17949d11cf58c2ed613d9421d4b34a312d92cee6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c71e759906fbb3f487805c414abb50edd923cc7aaa494473e97643afbdc143ad968e0e4213654fa5952be0ed1dbc64fe2ae1d75e47f3e6824ab44b13dcf720b37b11e32226a5a15dd12e5b13fa0d9b8080eafb1543d8dc40fa5af0bd036606ace855bf08a6014fd9a28f936b08c6a19e6968fbb6ca9ccf69364da8b7a5bcf3e8366abb8ebccbf870dca228339cf4677683034ff73e87e4b8f35fe0a5f46d188378df4d93f635160328d008a16cf3316fb94bba76f15a3a84103a249311d1a80e4311935ee847d9dce3337b0778da2366167d12f7e750e886d7e95dedd6ab38f9f101411d853b75fe895af4001cb6db0ed6895e62fcdf3f31004563ce22a2bd02a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c83983b0af789af16cfa705338595e83f924a4f02e233eb7b0dea0f4800604104bc5c76247f67fa513d112ae88699769269e7b4060b6566aa4493a754655c4d944c147b9ff139ae32159d80ff6c371b968f36d52e696c926a720ac12c3384e0fad91b2fceff69c290b2236e2de35964b38c9ac2c3c63d02e596a775c184a51340a99f326cf2fc64f9ab94081736aacf0e5311042c5bd8e2edc20bce0c8852b198928400da0939e556e59a00457e00f07a06023152a4cadb48af08949dd2a29e90de7356a4a53d88586899b9eba224553330eec05affbe4fb52c28bd2fd40593882c643e6eaa83265c8f2c923126945eeb7189e1c8205baff8b9a1c9dd6272b3b2\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140ca0f7c239089bd9506395bd67c86840d32707980db6ec04de3c6dc23ce99f5561fe1fe404b85370f151cf740253fcf4c89ac3d7b62403dfda272ac83ed3f590aab6b1feda1a1a40440bbb705473420b015df8bc06cd2c45d6b02918bac2774428c9c53fe144cf84cabd0df25546b4bd6fba72eb5fab9705c6b34c3118555a001b20f1c273557e2515ec973730f2928693d542e54503e895892657966238e21aede773d45f2f0ee76827ba11b75979e36aac5bb47e9d473b247659405ee7410ff3fa0ede51128d62f398ce36c81372440e5d55d9c5ec3c6c6320ff276b8338e99422ea7a4e154867b9df014fc18c785098e411d1699b5870c034825bc0aa01dfcb\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c6df47061b17a3937c36e21118d48929eda865dd66ad5694644385289d90b1d53bff71af62473af8c8cb0d2f6ecbee14c881b54127e8d1bbb2ac72bb3d63f2fc1d3564e44eb2c7877eec6a917b2edc517380a402a7d37c737a3bfd5cf05d35e16730df821d283876e40c4b2839efb2f23a28e099755a98bf942d1ac2a2f2787a1cf3e1c585ff3bc2e0bf40f10b41f4cfa872b20a1b72ec749c3587dad0133f9d2ab8422d999adf086cb4d31b69849861f65eda2771522cea3876b8b8ba1ffa1f1872dda4a9d7a21cfa7381e05673445a6ecad072a66a1126e8d62899bfe59063762961c6a5f4c4ae3d029d3c05933785908efde6d9b6e2ee9449ca15ac434a238\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c2bc0da1adba8ca306e8f6eed79e8910d79d2bd15e2f56d66354e7d238c9240f0a25618a976c374b8d443add76c3efaf1b8c6d3befced354fc46dc07ce2b1a4954615d904968fe9ba94589e10696a63ecdb90f06ec458c303dc6dd8d256a8f50d0261713eec1fa4a5e7e2846024a00d7ace23a38bbc9fb5ce127f86725dc1ff7ebb88b5222e919ec461c963d86ae3768a8dc9d62a69af51d4ea85ad378317b800e9532b9f6e8e6af1a21988f1e45a96e43bd387caece181a44f0a83f17535f016ebba301a0a78f4042713278e936f092028429779d47bd23fff9fbe38828c4e013da33d2efeaa91c8cc888866d721f287b4ddfcaa60da436f8eb677c2a6ae615d\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c424e200a6800c3020c9728eaf7483e31769360fb1f5c299e2473234bb9b4d4e2e63bfa39ac273fb3ef2cfd4fa8ff634b03c9948698e9c69c9d92e35c2dcb4282121809b0f9ac0a8a393603b77531c7fdc9d43a8c2747c36c2137ad59d44a4d515c176bca985c8b482e484a6d815935fa057faf144ae52e361f1e1e86a1b4ed997ba071a049f8dfc62fe55e98bcfb4beab27ba64f17a3ac80c7679fd6e156cbb28233f4439a96223c1ade6d1d31c69ec3da94f4c966fcde28d6520aebc4421c0be3ea263256c8ccbd1ea900ec3414ca2caa9388478db0317b18f1c2c5f4fd748f3b31d9dda7fa81a35f2833012679621568a9f627685c1f19af05b733c9b08ae5\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c638ff6eea0408a9d7f7d7ee0faa4f730246b7b92869e13e40947a514ddc29c267732d1366aba12145718e70a07ea06e22e43e815c04c449b5313f3bb5ab0d1e2eca42ce029c34f69ebbcc4c3708cae4b2279f20225b816b3a891f4dec8d9d11fcefa71594b577be389589ca2f6e3414a4e520", "2c97ecc4b702a847c8d333cac376bc0509d9b3970249f42263726f2c36cf16c30c5850c08d79bdda35b504097b790d9141202f07f0aee1e26c8d36cb7ccd84b761e4c823a9800fe978b36d94b54afe911ccbfb178cf5394905e6c2bf02554eee0fb8d512dec96b5262c9671326b7e1010dca2048575b1496f6016747463ebf264bfafb9662473d6a824003885c8\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c40c637eefee4a3dfe7e01aa2369987d6b5990c0388343b44f7135624dd92e5bb2e61be13ea2c1dd3c56b9c4cb8304092268a6c9913ad0d80ad7516f14548b32dbd64593a1899f8b9fe4309d71b1c163e249e43ac7cbe1414d289c9ff74516c6684e63e25030f9c0a60852f0864ef270d91491d834699e5e2892860df6a685089dd578463f7af0917ca2959803256027f166553707242d0eba0861bfca7d34003fe99e6d86b6755906f9e608bbf23086a4599fcf5062f693079e5ff2b8dc0558c8d744e479ec07a975c20fc6fad584579bece0089e10dc1cbf918def720d95ff94435a34d8eb14f1f162a2b1819f13dd3bfa64d562a5685ff6909c1583068e076\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140cc9903b53737d2c75fbe2e97eff446afd6af51acc48a56178e32115da223f52c5ed4e571945036a18d798e75e3d1679c5c646497fd685992db71cfc3ffdaead5e7debc370cd694f8e05501b7db4fe71804474323a93bbf75770c41d902688a4abc638c17f2de41c7e7bda7279e2cf20836b0b0767eb237a726be5c8b8f5d71918eee8e7810876c10346dd5f827048ff5294ccf329e8ec17b70f3453c4963586852458dfc7330ff38eddf188ee8135242fc767d898a6bd91874af2955ba41eed563047f4f9e740b04d6ef26e06c6aa0f375534359d3a1b8cc0ea0c1fe55a86d6f6c76bdeadb263edcd4e524bc7bfcf006b3e5364d18556e6ccbec833f8888f962f\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140c5ee8d13d439b3b1d269e1d5879d1bd2fe19d8c15b54e5c910b5bc2cb9be4aa75e02c3648fd28fcfa87b698025e282902c3018b1743fdac8ca4c0b4fc359c717b47b7ead54880c603fe6973721036cc1844f96cdb7777a1890dfdda95aa5fa75868fb40aebebfa05def06bc52443cea0f02da1cb7f32fec6102b213488d84e4dd1e5f21d01b7de35cf768793bf807d725285d89d9522f534bffe3dfb545be8e2793e93b581ec5135c67f5f7254bf496d722a96f4747b6fcfb436fc98dfd7141f11b20856a7e01514c5a029239860dc358872f5d090f1cbf462f45e41aa93e333c3141c491232f2e59e41fc4343ddec2c9a2473e6a696d782e436fa1a2484b12bb\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140cf70cba3bd2fca99aea70d195e0beaa85abfededb19cb8c09a8498080c2d8d98d69bf38d7b4a9767bc20da14b0c95671f589a40170acfb26a0800b4e0b8bc507206a22ee505a8f4410c91a373e775f8fd1b6a5b7dca8900dabb653efaa8391166b436768cd79f9983962b3a76c94e0aff8f0b91408dd429b86668506e55c34dcf453027eb36d91655dce1a416ec340fc263381228edb7de4093b76e0ef6fb73a82919a93d7eaf6754fd0be54a7f164dcd208aeac9a39fdc5a1a61d5d36af83e84ae4764e2a1fcdd1aeaf267dcdee61964ccd74a8b537e8f6d0a428cb26d4be016ca2c3255b8e1972e66facb90aa9c24a714f329a1802bd3fa5adef23639f2b7f2\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140cf70cba3bd2fca99aea70d195e0beaa8539f062e12c26b23c954b3f013f9980358a953fb5abe2269b253a99a28597706713fc3917638a8ce20e9a167aa43f1464d04e8d44a27596f8fa98d7cef518b89122faf38d5ebed188bb69e9c3c05626a8a5f509ea8568b5c4b89bd7cf2ba9b55aec8bf68d1ce09359ed549e5969aa53f52b57aff688a87af913e692b104da9ab1c82719693a9bd75c8e0dfac6994d1d548ce946c9f584f552c5394d949f70ad46f94c0b3536cb471ea818ff7a929eb211319f261f967861cab37c51815f4f8df5e9137e84d63be04aaa02bf9a3515a731050ced79ab4b27d9d9f694fce0daccfe144fa006545a0ad2fe145c6b09cb2260\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140cf70cba3bd2fca99aea70d195e0beaa853c74886a342a11f2af7833849a71f4b8e88487f8f8be7e0c0f2cb1ffc430146d8973240f22a44d49f24f669c59d19d1a3036dad4e346fbf3c85101476650c55c859bd6e9e3c76637f3038e36def46a1a1dbbea0649cc04a124c44625e6448d029f9da63f1c00501bda23b58742e914c6336beb3aca2383371e4a590fd040aac505cd64b06a6e786f6f5cb7a968d3011b5415f173777f80095e54b858e174432e35367d49a91dd319411090271d18ce5fa91f21a5e69315f006821796d0112030f21c79936b877dcf5183e825bcb1faef4359f09c6e7eb2c66ea3459a668d94993176d39f3503d46e2a21a6be5db5b761\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140cf70cba3bd2fca99aea70d195e0beaa857749eafd062802585c441d226448c673d184ca45915ea1d4f0008f59b2ffbdcfaa215f481c178e9ab3514cc816cd6cbdb9c6d46c59ab5da9969d8f11f7bda6d8ad0bda48600f75bc6c8ccebf80be3ac92403bce6b11b448dbc9c2b92aac98104b3ca000c292a670a9b581912bed743cc7d451c506a7fae57b37b4cd1930e81b9d90cabcb4e6c90e92e753fe629f4f5a030a45ab8d3556f5f31ae5b18b6e91bce3c07e12f8168d62f096a29c940c87ced3fe8506c99e35c0d1f8e30278c719d30871fdc2b4bafc1041dd91351e06974b341925a7f9812d4274ba57e3c140affad33fdbee1418eb783df61ce4c4ad62993\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: c24738f07b81998c80b1c66a0d4e9c4c2f6c80c13eb9e557e70768f86382a300724998cfc1b0850270e9b4c4\nTAG: 25ab146e770a444418e57b6ab4bbcb78b2f1140cf70cba3bd2fca99aea70d195e0beaa853a302896d8441516d105271da0c8c366cf56cd7d3f015c0bec4faef4e37bd2b99603f4a73c25a921cb53d8b922034e175802b3559a6669bb2bb65d0159e1c6e7ca32cdf3d1b3a6f0ee700240abbec6ee701c07cdc730185d1b93c8dfef1ede6c773fb6139674649f3d0e15dde76f63b067289cbcd12ad023ec0af959bbca308548602401ef3b477cb0dee2d29bfa5ad81d2e1dbe176a856feacc536234a664087c714ec8967f3836986f4e153fec38efbf40f03882720", @@ -382,9 +388,9 @@ "2e78aa4a809ddb47fc92ad21a76cc358167b152a92f66e89eb967c35fdc129ae309e4c5d6d8cb8f96a5f9272593fd1f2e2\nTAG: 871367b1bcf057c83c54747b48a800b0c78cb0026c5f1f1ef85b3564785775\nTAG_LEN: 20\n\n# DIGEST: ba36e689ce5c9e3dbeba5ed1cb00b265c7b30d79\nKEY: 0974454879c41de9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e\nAD: 6da12dd4c27f437248\nCT: 41e1a02a53b81e3d916b0f7ab52fdf917459dd672a60f366a46112cb26007fb5b2b38f3ca9dc32c116d9c73119061a5c9b1cc421bc63359439dfa4a02891711f858b8206e1b02731b8fd7b40921ebf02c4cc9349978b3c1589c1c81217d19556c33b9f1d45e6afe2f8aa753d13393bd3556f60b71e58a57bec31c828bd3d2c20b148eae0ebedbc7654a080d0aae0766ad0be0b08906ebeb2dc68670815ee91aa0f2ad302d0e28662cd84d83031917f85296fd706028b0c11d41efd8814f22b8c665181b905d1a690394fbfd3317a077b10637e4dce89d85aa54643053d04a0c179aae0498d91130fd1aef5af0f5e12c7fc02bbc6f425995437c24cc59f45f005647f7035e494ae1bb4aad4372f62794bc33bce0b58459a8c32b0986405c2697dfec246e2d74bca42535f424be5d9404b7998695405987f5de3df233ace70be7722e4e36097b1f6f0aa58e6dbb211f4f820e81a697082671bc717259511e2e790b56001fb1d9c1451a729a9d435ee9d4ff2d57225f28c48c20a5ca984597ea5b221e4fdb83f9c7eb3a7fdc16c1fb6851380afd0c2c20c4c555f60c7563a42c4287cf9e62f93508a8d9eb3d21491b4dec3ea042e8a3a9453cb8a6c6d0b74661b0ef667aec6e11799c635932c6fbb31f87d01e6fc66828a\nTAG: 8e8fc61cf5bf178fc270ae283bf1914e5de1cf1c1b82fa896d27\nTAG_LEN: 20\n\n# DIGEST: 2f9b29467c1e54888b4d4db41fe3a943887e305e\nKEY: c41de9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0c\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c2\nAD: 7f4372480974454879\nCT: 54b7b878731dee0ed7e52959582a4ac1c0c112ccc1c92b12f3e5bcf9391161aa48badac21a27051a423f7ce8d346486b347b2ceec45ceda308183bce1add943c6d85031327d5e27fd9cbe28bb7b18ffef443b778858fb60359540aaf62e74e750115a8dba069817d0c324ea6a3a23475997ed851e9a299afc2bf0ac7f653dc5362e846efe9392a720b24b64fa9d446321fd0ef2d54e39737dea22cf94764743522cb67cf21ed9a8ca698dac845fd37fe1beaa3732de61faef354df0e04f8e8ec0fd60e86fab12965e95b8e0b82dd3bd35991c74314cc34c13a9ccfe627520b3a9ed9266bce8bf4b340607e8b0b7d2d2548690ada448d5203963d363f425fcd0fc681f0eec748273127f8f0e366ca10e7f024f82dcc763e587c053a05f49a09c9962617aad3fa6f600ab4081f19de809b431453ea6236afecb5688a5b1a3ac3bc205341a80666c602ade7298969cfb322ef26e154d16b88700ffbea28185f9aa1c109fb0357071e3d8c5655c304095660779c3731ca4f5ff53d577490db2e44a03a8283dcca422eabee388f2f2b2d53d774c0928d5b6e7191aeded5fd2c24ee9c92e5cea9af6b20818b7033464d8cb199513af1b582c36ccef51a1093da9123d7aee836f37f3bda6a6457f0d9bdef8d2dc6212753f182d75c6a9d4f\nTAG: a61047dcd2893003c5abbe59e6838305107ee46052\nTAG_LEN: 20\n\n# DIGEST: 070f23e02cb53f55b0127fd3fddbab83e5682275\nKEY: 98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd558\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f\nCT: 7b61fdc182df0b0f3e1ef36e99bafb954b295ab39b2aa67f0cbfa848dbbc6ddea6e762e103216e814340b92a539deb7f8aed37a258c993381635b0d00e9fa912abcab37e135e0d88befe38d172c9331376cd541e279dfbed6b7a04fee4f8a4cb9f9f4cafef5d1da9ec104c8eb1eef2fbf79fcac547bcdb6589c03323bf95af0c5e3b3f297467bd40d1c2b11ad38ed396460945ab9cdbf807367fbdc0257519aadb8dc6cb46cc9fe2fc09782a475ecd870e6325f8c42abab69be453aee523c2fcd729b4cece57d82b72c4b4a3d4715f73e1612a894527c1e214f0ff0cba5bcdc5ce830bb1db12f70159d90db8b454b8a19f7d2d14137f64a11ec93886be20dd58af01c6649010158c88fd5b3e19d492977e0ec991832142f5f78361acb243b9419b7a928261cef944f9fa8f00c8bb76ef7b9ce257738da2331cd4504eaf0dc0f61ad2027654c0cbd590f99210243eec65a776faebac13e96f00a03837cceef450fb997c39b1aa680645b8a8bf31afcc05e07ccf0f39fa45d779ccca69dce520cb15717ef4dfad98fc5bf2776a4635edceceb71e99f0278ad0dad826c5dc8b186873de60030c9336d41e877394b3c5a3d8af97927e62351d3ff8879cd8f0bba12993d61b3c1542d275896ad0d841fdc86f1a86e80960be9216eefdc1eb93e3844b\nTAG: 9da671229732bd10f61e1d5a2a1fc9670df5fdf20e9cbf479f9f9e7fdebebc16\nTAG_LEN: 20\n\n# DIGEST: a09f0450fec556fbb3a1f869c9780c3d12547311\nKEY: 79a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d45481\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a73\nCT: 4a8618bb21c8b2a26a50d5efde0f4adfef21664419951e96c0ce5b3776c693d49a2cde406ffb23f212c293a60f1884c8be12c902bc24fb52cdbe41e225d3782f62cf2d9d5ad31ff210ab35d07a5fe395b168f575aee5a75b405f7b15dde886f3", "9e34cc038f4bf075764dd9a1ae448e16e64c6538d36f621c10763482961d99ecc1476898d26bfade04cd796ca59b4c6ce92ddecc91109a0bb37b0fc0b08daad10d8c6bc86eb22f3a354d943dfb4d8f3c3805ecb39c645eaac13ecfed6457e254b1bcd2f589d2032e7221a7e179445c5fc063fe1d08e828b03abbfe92ffb95eb442a30f7a469f89f3515455dc647324679bf4df189b8624861a2a17c021ed11ceecbe1a247133d8739b88b93280b2c9279fc967675539f61e1163fb2b64e9eac8219f2ea1faad49a1c77c8246c41c62bac5fe6554fe6d3c6b4e46ab3c305244dbd1e8975bf73dbf8039ad6db23c356bd9865dca873076cdd8b3f6baf659613305dbbc2d04560f2fef872da55e1994d7fbb14320e51b7711354e7edbb9e7709766fadf0c6c44ffadbad87609eccc2b70d4cee87db79efd515de9065d69c24e7b40782d7548e789ebb7c6946989224a3701e02e28e355724f140198aea804fb2dbee5f0507ef3579b5c0acdbdeff7d16c667205bb0677b9e5bb33234d481aef7bba0e491d142b\nTAG: 6b75ac4687bc4e93d80b0efb1d74b9e869f280b487e386280be7d8\nTAG_LEN: 20\n\n# DIGEST: 32559b69ebdbf4f1fe7c6e5ada9a4117836eaf4e\nKEY: 0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a00\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c\nCT: 40867ea63f638c79bb33c4defbf8e35be3a632c60b1bce1eb70f4ecb80c0ec31dfc873bfec82ef82fe170e30cc2ebe3b1dbe341d5b49781a00f2e2b2cf1a5cdada3409c341b141b6ce3c7ea4a6d92c98bc3288297c0cdf11975337b6f03be152bb7917387a3b2b50de49d501e57a06c78e04167d9ed058a6770699e43797ab4b1e51e3c5e622f237ae9e1f99def71a67466db2d957e1ac80b856813337d0969dc3b788c68973fd2b58792a5bb570b8d113fe88763c58d17951c345f5c13fcade97e3c0124c5be3e979f64796746b5667950ac0f0fd43c1930e9e1e90d3598d8c15daa463aa42a46995b21c9d2046814a8a0cf2583a0f21c87755bc340c0270692909b6969d2cabaed1e801bcacfa3218ca1043f5e94fb2935ec55ea7b43f5e47fb9267cf887c2a81d023987ab41b26d4d00e8cdfff7aa486298a97fdaa939e0b0b5a880ccbae8ca68b3f0fa9c6914fa702e87e412b6b5e3e673dfcba087c5f98fe203973b98561aeca0fa33856cfd16cc37cd0f1373575b6badc2163f565e8ce2765cbfe9264076388f431161b652e9fa5547529b9e6c3c7e848d97d9253005609654975c17d1d5fc600c803d8108b9ecfcadd354bdfb96edc46607d41556c44c1d5c981dd38e2b7e72b00f7eb4e52462c0323522794b3791ddbb272547b038362623d5dc4312960c60c\nTAG: 67e5b3e5650300957899dd1a39ae3d5e725736729b8d\nTAG_LEN: 20\n\n# DIGEST: bcdc01526c7b0248abf3a41ac893bb72adf422eb\nKEY: 8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be26e063\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e\nCT: 02c169fa50f4bbbe70f9fa2193ad1e2abe20477b7f0bc3a966819d04b65892d1159154c703219632c7a3c9ad3129de230c3d3cc3e88517712531583dfd6b7f57ddfffe8b7eb4d0ac81ed3be7fc80f6d71d82a322f890e071dd210d1726bc1cc1f6abd78d044b65036dd7cfb728589fbffe26b7b954578ac0036c5e9f7eacbff13ab98201f1e894f57304bce324ff5bc61f5850f1048f30f302086a5804f366bf58ce61d949465ba2ba7d31cc3ac7f5952356ab3de8e7844a6f2c197b67e32ecc2b8480f8e81af75e6d1019e11f7ee0b9338de462871910783faff9eaa1f0fbca258f6872a7ca2dd708b1c059d41e4cdcd7fa1eb616f817b53bb3d4f6820fa87ae44c65bc5dd74e0e922bf4ff540221424568bfe74feb139e1af8a540a5e8431532f7332ef924af01922070da6c14f3ae784a18790368a1f1a0e4295fa6ce0a686641de77fa91a615dce62a0eda98c9ef252eff58280243bace254db39b09025491dfb8ffccfd8f7396caab122446f74f6847016b390f0163ff1b30786e8883607d74c3fef78cf63be2c0acf04830be0f8afc9412f08a6d5d8e9c985d8d6571e4d69f037940625a91f6ad518c5b5d956b1a4e7f4b7a300babd8ebb190cb170b51991119d8d33cac92872936e9b563d4c58274af6da172cfc41c5bb527d77010a3803573f69e3030ee5b1095e01f47ca\nTAG: d2120e30faa448cccfdd408ebc30a902f3ddb7c666d3a62de3c641db01ff0100a1\nTAG_LEN: 20\n\n", }; -static const size_t kLen8 = 390432; +static const size_t kLen9 = 390432; -static const char *kData9[] = { +static const char *kData10[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher aes256 -mac sha1 -implicit-iv\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: d88861dcbb\nTAG: 181ebd603365ed262b8f2faf5b86ab90a8930bfc0c55cb9f1c88defe20893b2d5eb8ee6809c2452f302315\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test with bad padding values.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: d88861dcbb\nTAG: 181ebd603365ed262b8f2f9292c597b813c031f09b7a7144e557dd\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with no padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908ba5f2df0f04dd0635c047cbe52069d85fcfabe53ceb43dc71c46e51c0e3a9ff435840d62bdcb93341a1624b69397fa1bbd9229814a2788b91a107534b41ed488f4ce95fd2ab46963e4f1a3096c74acc8466d034eeaa7c0f1fe46a4eee7abb740367266cd36fba96dc74e520f64b9605c067bef516f517f99ec73c1104b43bf3e94eadd7dd6b9b7db847d6ff4c03dc454d8edbf8f694f09754f249fd1dc0bb4b130b2e43ddc1d24a0cc14edc8e7328515cc8498ae89beec66127508676fb04db92055abf2be22e0c2a7a3d9664e17d919f655ffaaaa7246a0ea29f9c42f72b6edd0dfb4867802d6992ce25efd8fe0dd0cb\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: f0f82752a691ef5866413f2b2e5c1d0ebb41ccc8\nKEY: 7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f58\nNONCE: \nIN: \nAD: 936a91d0b5d2c0267218cb\nCT: \nTAG: 49947d4111e2880431519d4eec862e01643017ee6ef66b6a13061d1098bfdfec397f13b9909128ab6199382f4fff85b6c67ff7ec8914dbe3ec72ef7265a11436e0536715bc446d514a6d79e21073f3308fd350650ab11a3b31f8b9fcd97e3bb57c9652d661167571417095ef938c82d7b5ec85d99e7cd579aaac8b13fd2f3cf42a1041df75d5108f3207e481e631b43121ad62e0baa5730333a3eaf05e736f61b68a7f6989990c06a05fd1d7bf553cf057caabe1f87a55a64fccaf2b2492c03acf077b017d0c9a383d9bf9544ac508a5ea683045ab08991a702cd5149c94923d7d1b5c93ab8ec965a4ff995d13c793be2c114d497df5e65ad3a77e6e5f637ec5\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2376eeb9a7e692756e4db7e851b919f73133cfe5e1460fc1a8139978d37bc825f760428eb82978ee0f8a2fe8c7a0e1484ff83eab47a04eeceadbc061281baeff699d376d35a65b51d9f08d3c89b1640e78353d2b903e520b2dfbfa6dca4e789fc3432a678d84b0ed6c4d4db42c2840526e73eedb7f37bed9321afb88fe0c80c7d9d6a612e3b1e8d197af5c067e9749f07f329a14108cc285aa2221d33fd21d0aa0a1f9d135bf65147452a65f98158f180e9247f09453bb15ddb0feabe498acfa4c98c7ce197f929456594cbd2199a268998c846921eb5c5b4b10f74558204dc7330b1d3d06a0d21fdb1e38d273f8adcac196132811986ca577503420ee3ac141a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae214f5e3f4806bc1242583ade88f5547a46f5a0c3b49a6c4259bf02de4ae4528b40459fb12e815f8d56b75f60f2ad546cec10977556db9b1ad12b0d1a2b4c93a2c3508c6e20ee20cd84943af89fe5ae6232d1e927aeae422e14382d41eaeb6edd1b44f6eabf3b4d91210b405723e6296a7cfa013574cc5ceb9f047e528b98e3d9b6fb90366a778ef69ea1ba215cd1f144a9c269663209774e74c6bd43159ff11ed53b8e20f998508a9586e11b5d0661f9f3f2349132eecc9762e1c3667b16f178701b1e9e8d0bae95fbbac4b86bf8ca93cb610e7d47cd7243921b26dd1cb42c850b0193eb4e2eb6fa4c22a41e33759d040baf047a7585c26db9c098eae69f6f424\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2a91ff92427eed66c0a5eb6b2c01ace3cd408d93e0fd7749110477c2d1221ba303d8055123c57b24f0ee0f9a68d581da88953c37fb66f7f6d6bef0482566fe0c2309e4bf1204b907d6b5492d33e762a39fc2b19400f2b5d9e02af076026adb6d76885a07dc8caedc9a59e452b30b5d8b3ad745c27cdba3564982efe738f611d55053da28772417d8fd173e3da9e87eeb2f9eb8476b77456323e2dacc2142e13f1b0c09d97c67fe1ca90178fbed6f6fdbb1c6de9dec4079594d1a2efa1d5b2cb9e76da6cb75c1acd991d94c9308f24863afbf077cfd0fb997bf20c3b9584470d9f5a7fb52e96f3ac38958871441b120a56cf834446cb531404a041abf80b088448\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae28b1064ca19a9f583ba483aea3b29aea24f45cb20128ac8d2df8b7ca7dfe13821cb8c48e22aa1d555674e3ce9958cb1b4eb1b5564bb7d468cf155c1603557cd49c27d0d280b3f118ddcc5bffb775819b9a58e13c10da0b8c41e9aaf668167afc4e0f7480c313f0a9fd79b0522e9584e6084570c84f874e4ada88f051a80301099b29ea1793f2824acfcd42da0126b489f2da94daab9f303e5891cbda6356530b870fad3ab5b4b2c5bf0278ba829516af4a86829921281d5e51a5268533933750e2ab4b4270322ea2603034b187bb5de76d5d10ed269722144f944b6a990652ac29aaf52bb66c70b8747744bb8c6eb53e39d97c19fe5fb6f2da1f4320c439db1ed\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2c8cdc4a9d292616e92b4f348", "dbc0107f46720b8c31a186736c19a9d24c5f4d756bd001b2e61519eaecc1a2840aa5029d0a8ed36e08c0bcdddae378b49d965ccec9614bb02f97aeba637ab1a1c242cea7b9dc11a8957c4d2f48c934aacbe7443e3a9906bda33a1d9b6b830b6f58f5c6b180394b34da96f7fbfb780e1b2953570cf9c41b933f7a005e596891e69b736750149e61f39c744a69cf3de10919da7b6f4e04be0f8040636720a18f56cca83752d38d4a803eb1576e64ad8578ca022153b179714c42c213b78d77783327b650138928bca8ae60bccdd3b574c9d845c51faaf9cfb6057cc5cb9800c93594471cb05c53252a6a3bfbd0d36f4417a993c640\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae21e5bfe40e2e6987661962d60bab52438a003fe0128d4c9fe2d787c3dde5451217b54ead7329eb06a0b6e953df8aed54322ef3aed9a1af4d995ca710f2119ef832e97705a82101a70aae63356c117df27ddb64fcd38581ef1b19360d0e3cc7316cb7c427ed0aa7af31416e1ff78570729eeb4535301b664d51c4e958b03ab2ad27e2999d0777f231b9908ba0a659a6cea7241971c7e1a2401c4814fb6d2c639092fe87cd492e30ba4d27bd2086bd7a8514b8796c6ce214ba0723f5994551f6008e1c7853568bc424512f3bca811f979c0d8c03b8ae38321a7b4e15b43b2391fe2c9160eadfe43e12a73c4cb9bce5fe34546c31b71815b59f9175d937cc3fb49a8\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2fbbc80805613c1d3130394c50781c841c3895cbe90d3b1436206cd46fa61bd4065b813de24338040f836e86108d042d304809f421a1ebe1ac4d1d14530fbdad1b28eabcabcc528c68846ab80c3cc7126346c7cbfe912c91dc21f47d3bd615a93bf7a94b76c705e68a0eb1ac428f0c33913529fed50cbed95d09781ef0a74158c5750a8a37cdd81dcddd66a58548636f4be8f06403655f2426e5770cc2d47662078d9b40a248df20db4daff789eaf58200d038c36f471e6875e4ad008dbe928a034ab4452fe2ff4e08d5b1e77e02e98c6620410c323a043317df9df806d16fb15f57dbd2b4dcef7fa46e3893c4c2874ad3e03802f6c523247a588ba56ead49c55\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2bac2df31ecf9c3304318bd366d09f27d363e586dbb6e229dd5978d7978927fb6d3409efcd9906e6d6ba6d1b334820ce7e108d92f14a3776ef5b5a34e951d691f8709aacee46c852ad315afa7d30536623b750f4cbd278974da67004582f48e75bc943e76a09cb6869fbcad40b7a00ccb584349c5736b2047adbcfd13e31f8313660239aca3855fa658f6731ef37384e7517f3d38f1a48b9cc6bd698a27e8c71841b35ecbc45b8852cabcae8871a949726df96c0c3d2d13080972be12581e6cdcac172c7d46050e94965e662ed2ba9836a652fdbb116e2d0fff659b33a1003ee1f6337f4e4f31d7ef14ddd5b6cf6f2f81317bb2f4e37252ccd7786559e614f2b2\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2cfe7d97bb82dd71abb553ba81854a2d274e4c028d0415ea635350d0dcd0f1e780435bc604d3b51995e27eb4062a2cec754d75302199021283979f5acc427fe753f3638553cadd4069127b2f3ca3009d46130cd095e9366dbbe455104f606b0566bd3b9e019edaecea4953700edcd88eefb7fdaa399eb87c6233b2e909579576da612a7ba2117b4436aef66a013046c8ec674ce8d136e48e1cf358d30a595445b946658b3ba41b05c669337e5ed06b2ed799c6760d24c3c59fb29a67e04244113e4617359957b53ae6cf4ec6a7a2867d87f03497a7baa9a11a5e1e2ac926843ffef8a8b146934089ac090252b7d136e2ce3f533b8b42fdb44ccff4fb0f92c92a6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae29682687730a499a61db7ce9c741cde420cb7de33ac6fc67b8221368dd6b897d622423c083e7c7f9d0d34b8b67681186a14125f4a6254ff565f4fee00b9c64d6262ac8629ad8f4c47def6dfab3bf3fb2975652043afabd50aca77a62e48bf846f873a21539f616c80ace059f7aff1cee676a923bda797c9857ad419fb328a86583a2d787b00c263ce7e0908e0d9e2d7beaef8a665d0db8fc1eff43fd2a1428769335abead876304953627e12d21b53b85e7d26a622deec5e3240431d26e67c86fd992daadfcda046d57eb22e45eb11e050d6b804fba6c9ae6d061d47ae5aa4cb6789001838f9b22169ba807ecd5a84c6f80ae4a4df5907960f884594e8543f7dd\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2b6e682a778dbfd9e22473c054d1f68ed3405ea5b855700af6359afcb9ca837a43d476de2915b8ac46f1fcc277cfcf1a727da061075ec8ab91f632b308019cf2fecec2378e84244f94753a957fd82c7780908256d4228b1bf8cef9cadadb539b953e1bb5c38bf3d7ad376985ea97ae61e45daeba548748dd1dc9a534f694cbd5098c168527f0fc7e108cadf8646eb01bd32114f8e1d9745d2b8b8070e075e2ad9d40840c57357b3054e9f6dd11ed35c4af4acf29e27e48b9c7747fcd622bafa7a9c43cc68db0a5c10c0400f612a6d80e0afd6c3e5077f7d4693944a93e705f7122379949f53761a9d785ce11dda57b697de5f69f896326dc2bef69f9de997f8b6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae27fd12bb6478344295e2e0196dd3f9b879086cf10d1abcc01dd7e5566a732248cff96cbabc8742801b1ecba1835b05d75e50294dd3b188324bd6cbb6e6470f7218b04afdd16fd82fc3df0279345c6249aabe62e3c30df33f927360a03e73a730cffdcbfa3670552fc6f93183899aa8d5065ba35cc390191d949d9f0f666c4588234f98e5c5d6b66da8717f501875eaeb08d8478fe6e09bc25a50be2ff2c774897b806e5293426aa81caa3740b75845d75dbbf21fb29e820cb53b6aa314e313c49901c0e93304569a1f9e5aa65a6419f9ae465193fd38abe0ddb80e89491e071b27fce54c76455357edab72d8bc4fbd3e2149482e72d2ddd6994be15d6f721c4d0\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae28401792e4c2cfb8e4da9edabd685d2852fbefe3bb93f4b3db81abac0e245d40504afb7a84349d8003ecb3814e51fb254cc26827559db0f10738de25f74d05589deb56e15fb04cdef397dcbc6feba871c", "d5d6291f8d1e51f7b997f44b782e568badca0459cdc947c68e1b062430dd9a7f15728d7183d023505623694fab003f94fb928d9bbe8054a5681d932612b6b1658ce9627ee9293e4001724f609f30c8e56ff009240c2c540ae0846975b47c7de127ed47bc9e53be7b01824f98eca2cc5f8e87f3282446d01e9cf3534dc0d7f44b69f5644dc08365f5cc80cb5c3f8c6d859ec00b5a4192e12dc1e593d1b7c51eee6ce39172068f86ea8d566c49086e793a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae236ffdbfc1d0bf54bb3e0d435d7b5e683f4fe2f03c754ea8c71bbca6f992f63a671d0e54ea51168faa810cc079a20b30492cf93178a053811099876249590b22a7c8b475beee956d95a63ef9f61f670f813e63315bce63a525bdc886bb6aaf782313aa5c8086f1f245edf750b52749b913ccb0951e86257df5b54ef9d259f1caac8c9225c65473211d906a6931226e4c68d794067e5f0ae3e8e1202582d45e18e51ff85fbc955507f2d238d9b7a121a468c0166cb862aece6ce84907bd49412a92abc6b8904814f15f6b353dd0c0545a14c8c7b768bdd891be676b16c9263363eb096b49c0395483f9c3c3744df2b42339ac151efa615be74c0ec74ae559a1772\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2834e1e14f5d7b4a7276bfb4532523af1242288e7015e3ff00e38681a37df89b470da6a3385840e9336187bc02b7b9794400f7fe6a97b3b18eeca67027dbe1c8fde3d34fa6847d6f67b8e76100b7cf7cfffaccf90e44a3bd96607f08c7a31f172b7262ed7459a15a14fc010e277b9ab2c524c169af761acd2dd0ffff4b5c0f52f71e3f6ab485f612e6f68b2f809e0dd46b620dafd51d34e198540dc35fbc83ff746c03f138478cdec00f3e824959d4840665da8b3912f047e3debeba8f4dd60564fbc9c898223d19f27330a1799de5dca2abfb8ed1e799ff5cad571ddff16b58c83dc92a84504499666a5b4f256d377bdd1262bc50ea538d295f5afd99e73cd54\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae25b782c3dead0a771825c9e3ad7cbd6f3482922b065aa32015af98a2cfc1a06419988be03b298321c571eb7d56d909abd0a4a502dc229564beabe5571824239ab29c1e5b5b93eb53527a07a33fcda134c80c6faf590b7b13ee32ff055fa1aaf4d7b9dea4961a71ef11e47f393a4f34bdf32ceda7be8e88a907f4dd0ec2a043d0bfa38e60b9afeee8d9cd7b9d52bfa5e5d5df348855da608cbe6ee13990569701d7232ec2713a6281accbe2f9ce7dc0af2493ed3398dfda1eea0b221bd1bf8bc0a77350524ec0b9e37002a6a40b04d04a4cadb1f425a145b16aa2c201115dcb8bf74d3ba19dcebe6c84fdaa4156b66eb9e74936880aa9ab1bfd5363dacd4b10b56\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908bdda0ed3efade2cd8be68fa064c9d465d0be925be6f8f9193ceb80db80354448e7c0029a68bdb91a33bc862e9750bf942b4dfd3f1532773e5c754e1046f81227b91f4cf0d707ef8fbfdcbbf1024e433f8c7b3a1b93012cb4cec8ce9a2f2014d035c858e27c776388500a67ec0bc5b82707ba64525f713efa9268418f508e65a3ef15cbbb377b6519b8dda6fa3fd6ae8a69f6f5d7e772be51fa650acb1d3dd2642dbd3854b1ab6dc611a3a2ad2446bef02842b843cf6248941d619a44cc10955848ded132400eca6a5bc0db7a316345f068ea051bda750523c288ee2b1e75ba0f6eb95a117696e9481eed36672fdc0e0e1\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b58088a040452d08093c6ccfea1f78c98be15bbeb3114d64ced884097bf0af26ab01c622ad7e9ad0bca71f992fce5e8246f0edb546dfeb83540ff0fa84f64c96c4ff65d7b732d896f7815b712d1954549fc05ec7b3cb7dbfb592205fab2d35df981fb2353ad5dc843e9263df5b607a6f58f45b6ab91ba4ebe50ca50b636bd43cb5189ac4f1e6e840d152169b8c4e22d31f36ed392bdd4ec5ac739adb584d12a140f4035863a0beaf41682959124d6a7b29d0a0280e88bc633f0c51aa82c15407e9e2a896c090c9ba62631a377f3c7c3450cc074764fbdbc8b57109035d57f29c8a43584218a5a87e6af3fce2bc4137024\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b55b7a3e62365ca8e57c4b8fe8256a214632a24ac63cb4cb6d98c7ee6eaee5768ea4f24aa460912da168c25f7be031260a86c26396b4183352964bbc2cb285cd7e39278ec3bb9ab4da8ef8aab01f147656d875c4feb4e8059740b683d8340389286b5fdcb3a584d7fa363ade2dc5da7939547ccdc4f47879f2db940503b6c9ccf7c9b83ab25c67725d0f5d39c3d9dc335737cd55f77faaab9419090f5ace169d49cc1f1898bbc41b1c0d32e48760c9b89c8d775f95421715d922a8e6a8893ba763384f99a56d67be9b18c3638bff368b3d68c3a2a45e648e61a29ef1bad0905ba94202f95769c526e4fad346e88ec795d\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b41d61629348d2aa49cd8391d114ff7795d591c7ed7d9505ea5a8a7991f1f92451acdef0ec6d5dccc98b9bd6b6456aa02ae57d2cbca60d76212a01c6ff854ee527e9ee78415b0d35f711f684fa5153f3ee4cf955150e9b0ab1f4076d3cf6b82e554950df41d6f731a242ca56bfe0a9034240d59d04b1428a5a69fea811af6706f586581f7959c0c709ad2734ad06e180ab20e1a3847ce01ec57ac4cc9d4c7a75f0b949cd5dbdeb18318652accad0bd9454065ea2e8f79000f803367f13d018765de45c5846611d2cc09e674a3d0fd63c7aa416cddf8083e744927b5e2e7c52ad607da437185dbcfcf0f0c9ea3f3a1071f\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f0\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b544360f3ffc9df7a6599bb35b4ff64ff5f5df3b00cb6062cc19afec69f3bdb3b784d8a5ca0ab88140fdf85d7c04f2aa732a13b11de5d6465450b571508248d266bec8772fd803cdd296cc3d41ae38aeb7f99d217c22564328c3cb74a2ecae1e265007ec83cda14f9e1a4b6c826db6c912445409894539a3d7095e89f19abad7ce1905f2f", @@ -434,9 +440,9 @@ "8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460b\nAD: fd24ba022e6da12dd4c27f\nCT: 49c8529d90530d74ec84089b8936fcf772bbd205dc1cb2fd7d623a9f995b61d20b7bed5e432bf8f283dff639855e81196099ae224900cce32e751de9d8be60350a22f8c5871095fe6ea0899a193711cf6309fdbc89f68bcec9941cb4d6ed121e9cf2d362b1396f353152d783ca897e81276bbd02f2423cfb6ae0172ece1ae9b9ab8c352144e145305daa975634fb1db85d4318433f01cb150f5a1bfa9c233d05ffcac991a4e217339a015a4441da79e06977e0ef3d5dea040cee1611dff24f4ee0fc75b6ab57c1158c2306c873ddb9cf93005c12de1202f0c2d056faf51f34b0e544fcf16276d55ac7bb71a02fe33723069b76235d6796b759235df1c67a1cf86c3fafaa11bbc704fe27fa92524f8629cb80e197bb0e4e2a7920afcf9f11f6caf2fa7529411375a5e19e030072e7e65e185f042b5df62b91f1b0355a71aea9354fe629dc0c163e72d98d5c4fe8e90fe7f16a7b45c98ced5e715a3ddbb465f956973d38da213e2c106385bd2990f0a9f94043908f183fb2b638e372419ddabe64317fecbb02875276284900072d58ddf3607832616fd6f60c14f4b44d758bf2c99fbbd5df8a632b97cec0d7e8ed570d7949929f19fa3655808b97e38942435b6817b9b50b2dbaf1ed01355dfe3ba0766417\nTAG: 218d8f3c97c6c71f6eda619167fffc2ffcabdf64082f265b31052c240d03d0\nTAG_LEN: 20\n\n# DIGEST: 6b7295febce7fba8d79d1e7ab8fdfc452191e2ba\nKEY: 454879c41de9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e\nAD: 6da12dd4c27f4372480974\nCT: 1fe976a4efa5debb0d17032940d4d95335d66d02bf4f57be78ccdc3e8a81eab2f7dbef2db83d0442238598c2976cd693dbdfc2ff936062f2e99bc7c0036052f8ddb2c86dfb181166e04a01e0c1764b35e408be6f2013f668a6ff07bd27092370186e7b2180e36e9fb9f3ec90a36539d0f181f0b5b8c5991bb4ce9ce09815597559f61ce460ba2b236f9955b75c114af0869627a49a2de946072d8dde11f20c1afcdd5c979c28a4102b9ca4e6e0cf709673768fc1f4dbb90f3447be2384dbce69b12108a6b35b5389e2c79e4e398c5b9f0c1b665049ba76e7249f4ac2d9c36c647dbf30021da94cbf3eabd07f1954fcdc7d7798041edeb5a909e7b27f149cf8d9cc6df30c064df1c5dd4e8af6adfc9d9e4124bcb19d1a5ee8162a9d645d77184cd92bacd8f89fefef2125259fdc9cf8a0a2310dc631f1c96b681428819a73dca987fe74e6c6c5ccb8db201b3493e3f13f9d5d2a3bea0cd2675ca8f6945eaca741eee15774527cacb9a8169e5e3250cf318de6f8d7f0f3ab777b110c12413a97df8d446ca06e6330234498d58b93a4ad75e7c782f9eedaec1988d314a06366afd4de3b061ca49855c22f12f0d38ccf19f97b0825402429709d74e75c3602e573249fde601f393c945d281d380aa7008148be4ebc041f86\nTAG: 97944671004841aa89ee180786907e87dc87a8d552e1dae5f9a6\nTAG_LEN: 20\n\n# DIGEST: 1dadffba439570155af2509a548764a93042d23a\nKEY: e9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c2\nAD: 7f4372480974454879c41d\nCT: fcbf4939de59426da2002fcb8e3a4d07604a168e9ffb5f13afcfbdc45325e3ecf0659ea736f9dbf61cec1dbed1024eff9e3bcb721c28d004549fd84e2cdeae36dc5e5abba4f0102835740bb877858814fa38290344addefb47ae583171a510719d9aa18c8f8a5e01396fecf1a982e162edf1047f56e8e4a839c5560473f389a4c7ea8fd5e03c7f2d31ccbc094f04e2a510aa57fe30f37cda765ddcd2bec89ab3f1f5f2ca423c68664c3303520c71439230116409dd84b4a26c1a102e521253ccd455793b0d883b1569b5013653b1c606143fcba7252a70d2a2026b989d1f67fdd594d2b33bde1bf7ee9bcb6c013ea8886e0ec1341039b8d8fbb4d865754a62d0e2a1151c917368e93fed0cb29e2d63ae176cbd95991db0a2864b27b6cf5782093bbe0ae117c7b2931f678bcb07aaae3d955b61e7ebbab8e84442295700cebf1a8f7d846fe788baa0660608bcbfa59c4bc9e5d163654aea99635f9bb63b8074478fc97b4981f5e5d35430b1e18332370dc5f4e94616b0270112dc446335d10a169e8a6923765647607ba9ad65c6f6f008cdf041af2e136b398bd1d1f67044f8360d9c1e90012e594a353d8e45aefac62173fd1b03ee5e4aa6961d83cbf1096dfa02f36ef62ceea5bf88f95301464d0046cc8ae3bfa611caa0c63d07\nTAG: 850f8608529bdc90c222092bfab0239a3b07b9cb1f\nTAG_LEN: 20\n\n# DIGEST: e654b4c78e1c0061eea2996fc126c9bfd41eb6d9\nKEY: 3b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f9823\nCT: 3a35e98cfbeeabc993af7e952b148ceb87a110d851bf2d036e5eed8482b39b881b3180dc50ce782a8cbe2c586863c5d038fc4f37d4a96ce8732abb984ae90bbccb86f7766e9712e43d3ec40fdd7a1c88cfbf14743908c78dd4c19d449db7557e0c30127d35a49503d8dce6c9a9e6f07e1c86d7e365162ec05a8b4ed301645f8274999a6c5beafc5b27dd68608aeb2efdd9cb00c6236bb143e7d91709a3fea0e865330680a854d47ae3b6067002a01aec6bdab9e60c19ca66cc39d4a44ada1e21720bd5bd87cdfb31b8a9bfac77feeafc9f8e92c4131d73a3cfb64efae2e8d14fed99c2bc88f63f88079d30b78df18ac03db855338986c0fd1614dc6afaea71130290bf52270999f3392128bc48fb0a6d6425c383b637f4c293e177f479f6a2d6323ed545bbd564f743850a121da96256a8daf163fd80835558b21e0286cf008e7cd87bab94222fd7faa395ee2ba19aa3abf5d000e7514a35357941b97e4ef433c30972e995b0991c862cefdf79712cbd3655ceb43e1e5f5b0d3f5e275bfad98a667d997333d704e4d70acc488b6829d18d1263b841307d592f760a66761e800b4676d64546a1d8630d97218a7c5f555d4a90cf58eee4bd1e1fc0e15f8f64d336edf9ca00183169f237a924e7efd5a339f3cc1bb90b4c513bb9969ecdc9beb5c5\nTAG: b24af9f27ebc204aace6315a197550907bf6079b848e", "b1dca1a96192ee7c8107\nTAG_LEN: 20\n\n# DIGEST: 654b8591c7f0506261713e9ce7a6fd24a6b9357e\nKEY: 61792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c21\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a7379a5\nCT: 7e1b59c791aeef6577c7ac69f8624352b7c2c7d1c8b14a7a0daf8240cc9d71ff1298eebf18ab6d469e1a327bbc3bb539df445ddcf7dccacb54f0a4ce6cf18bec20101bcd62bb2b30d8426a1e3ba949dcb69767aab5b8d2228267d784bde55bf887403188cd39453d32d50428bb9846212e4bbd3843161dc830646ba6e251ffad5d1b382101c7a3c87163867391fe44a58639e8a29fbd34cce657d321d004f842e0efa9d4cf03f557bf07a1201ac36258a4810dc101c427e19bb79f0800f27732094ee1dbab2abfc061fd4a1e84b2d36e560a38465cd4c8bc04bc27ffe90f1ce5999fc78d9432ed98c8dac4047a61547b6205bebe2191782ca63e50bb29c9bea553f5de0e9051cef35e3122c00e0d3a2468ecb2a898225c5f65fae573b17a15e013655a2ddc62adfe61ce5a7e352539c6d27c9726d2ca5492ee25b6d8233e32383100d131abce97b33dfe18a415156917ead8fe854c53bde97c0202e782679ac46f05afe1b9ad6b41bcb65bc8a80682ea8092bba0c47a9a03d08004a11756d9274ff83d5d468475c8a4a56f81cd1367040a3f75fd998b5fb3380cf8c1630fdb948fa2d0930fa5b009abc755f4bf70a59847969500d43e2db40ee517c9a6826e8e3746b3d40f9a6e7b35362550cabfa601a887bfabfd28476b3d7eb8917d66bbe9d21bfebb5a\nTAG: 22e74d37769a86785c57bb760e8a28de7a7ca3207fef4e80c284b4\nTAG_LEN: 20\n\n# DIGEST: 1eaad32c8d0cefaa5e2c503bb2185a73e6387fac\nKEY: 16430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c0f31\nCT: 26234359615c88fbbf5fddd43d4832a57bda2037e2177b264309e2e50c28efc28c5ed5cbf6dea046a14caa64d499352ecba0eb2d4bd376c6b1e14048033e21b9ec63f500a70c53be60099d9c9e46ea8f250d3d20c834c3c0638a9245377fe2b76b74ea14bca6b4bdc7e8d86ca59f397fe72b8c4cbb8edc3dca7f9f234529034fe5f1441210a8ad9b4694fe013f7e4a906fc400a27279f2a1a31700750e2209f6296ed808c893a42214b46f765c9d01cee46df18b02d5493c3a1da3a6258e89e47934ade4da2fa9eef7f5b1887a60585684b1c5c2ac60d94a62d79694b063444fa36674ecde12095e9203d281da3118d058f547ede5e4b67a11ab55c1b42fe01a94a601ba031c5b0b4088563344cc28d640bf2e7c81a259211b130bb9ba9ad93090c0e11cc939b99046fe7f25132672c3714f9973513af628f21942da6b459a60e31fe1bb9bf4f6259d8c9fa07d796a264f94d64122d186a0220d9f44b040396c9c187d5ad1d806ca613a4d0f5038a8b77177f39361f9107bea7700ba835dcd38cb48a6c5af0bfbb07b7a2543f1c661f1dec06acadf8860fa2220c67bbc9c97c44cb7cc58831563153149713ca2db85af46932a8de891da1d4662e52ed5b7c1c15d5557a0930c7177c2046b50aaf14874512cd9ed62efabe5704573a4f44a4ddf71202a6ea8c706842299\nTAG: 8eb60165231c67e88b0abd1d7c1c3dcab1b7006d4d3f\nTAG_LEN: 20\n\n# DIGEST: 862c0517b3658e9b9cd27db608d49e24e9b4667d\nKEY: a058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be26e0636617\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e8b6e\nCT: 6f2cea3b4aa1b3ae78d31e47c0c1e03df944352b9bd5483cfc09577aab2095a0a7e977e9c1c6451625d85d162c1653423609f141aac93123b2a0bd093c5bcdd9a49b27ace4dbe6acb486446f437c27e619a0f69405afc83240f087feb029fdf8f3f25a8a262b4a3efc4bc80512a96a45cca61d46e42132abd34c2821e7ff588c742062c01eacf9d1689f11648ebe326a91fe79275b5b1fb2af4d1440ff4a9ad35381daf2a2c0aa928216351c5b89ea33bf225d34efd7ec2c81c5af325b138a5f4ac50c5aca196d1b32ce8352431a8f08cb3b59d2f8de5c850e2a06d00c1d7f7027b4aa6757eb0c9fd3035063669a5ff8db2402818c88a7137ee309ef2735dd575e43b7508c81306dc50da65aa2276dbcd98537636ef06d1736f14e2babbc39457dc8d101d22e5516d652151c2092812814e9f73dd6cc805e670ca36e62799b42bc07fa1d93b9332c43a4b759e53ae138fd2b2b419b21a332ea304fb7db57e860509855b2a540cc909aff57e1433f295e8052c7609a88170feb7623cee8ee651ae1dca4b1afa427e2e43569d5b7f2ea688d2e2afb33f1dc0666c4b0df8aee281cbcbf5e964beb3851f7b929e5a4e06766746f22d4fa1a32913c0f449b4da8aac6294348f711d4d75bca509516668944d2a162a53a31229528e54e4bfbe13cef013efcd6687e890d292e42119529c92c\nTAG: 76c80a678b6cd735a2d01acc18dbd90bc3997f57efc2c5c78c22fe4dd13f06fb91\nTAG_LEN: 20\n\n", }; -static const size_t kLen9 = 391873; +static const size_t kLen10 = 391873; -static const char *kData10[] = { +static const char *kData11[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher aes256 -mac sha1\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e\nNONCE: 0d0c302a5f47e037446f5891d77df660\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: d88861dcbb\nTAG: 181ebd603365ed262b8f2faf5b86ab90a8930bfc0c55cb9f1c88defe20893b2d5eb8ee6809c2452f302315\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test with bad padding values.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e\nNONCE: 0d0c302a5f47e037446f5891d77df660\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: d88861dcbb\nTAG: 181ebd603365ed262b8f2f9292c597b813c031f09b7a7144e557dd\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with no padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908ba5f2df0f04dd0635c047cbe52069d85fcfabe53ceb43dc71c46e51c0e3a9ff435840d62bdcb93341a1624b69397fa1bbd9229814a2788b91a107534b41ed488f4ce95fd2ab46963e4f1a3096c74acc8466d034eeaa7c0f1fe46a4eee7abb740367266cd36fba96dc74e520f64b9605c067bef516f517f99ec73c1104b43bf3e94eadd7dd6b9b7db847d6ff4c03dc454d8edbf8f694f09754f249fd1dc0bb4b130b2e43ddc1d24a0cc14edc8e7328515cc8498ae89beec66127508676fb04db92055abf2be22e0c2a7a3d9664e17d919f655ffaaaa7246a0ea29f9c42f72b6edd0dfb4867802d6992ce25efd8fe0dd0cb\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: f0f82752a691ef5866413f2b2e5c1d0ebb41ccc8\nKEY: 7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9\nNONCE: ba2fd6773e0d0c302a5f47e037446f58\nIN: \nAD: 936a91d0b5d2c0267218cb\nCT: \nTAG: 49947d4111e2880431519d4eec862e01643017ee6ef66b6a13061d1098bfdfec397f13b9909128ab6199382f4fff85b6c67ff7ec8914dbe3ec72ef7265a11436e0536715bc446d514a6d79e21073f3308fd350650ab11a3b31f8b9fcd97e3bb57c9652d661167571417095ef938c82d7b5ec85d99e7cd579aaac8b13fd2f3cf42a1041df75d5108f3207e481e631b43121ad62e0baa5730333a3eaf05e736f61b68a7f6989990c06a05fd1d7bf553cf057caabe1f87a55a64fccaf2b2492c03acf077b017d0c9a383d9bf9544ac508a5ea683045ab08991a702cd5149c94923d7d1b5c93ab8ec965a4ff995d13c793be2c114d497df5e65ad3a77e6e5f637ec5\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2376eeb9a7e692756e4db7e851b919f73133cfe5e1460fc1a8139978d37bc825f760428eb82978ee0f8a2fe8c7a0e1484ff83eab47a04eeceadbc061281baeff699d376d35a65b51d9f08d3c89b1640e78353d2b903e520b2dfbfa6dca4e789fc3432a678d84b0ed6c4d4db42c2840526e73eedb7f37bed9321afb88fe0c80c7d9d6a612e3b1e8d197af5c067e9749f07f329a14108cc285aa2221d33fd21d0aa0a1f9d135bf65147452a65f98158f180e9247f09453bb15ddb0feabe498acfa4c98c7ce197f929456594cbd2199a268998c846921eb5c5b4b10f74558204dc7330b1d3d06a0d21fdb1e38d273f8adcac196132811986ca577503420ee3ac141a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae214f5e3f4806bc1242583ade88f5547a46f5a0c3b49a6c4259bf02de4ae4528b40459fb12e815f8d56b75f60f2ad546cec10977556db9b1ad12b0d1a2b4c93a2c3508c6e20ee20cd84943af89fe5ae6232d1e927aeae422e14382d41eaeb6edd1b44f6eabf3b4d91210b405723e6296a7cfa013574cc5ceb9f047e528b98e3d9b6fb90366a778ef69ea1ba215cd1f144a9c269663209774e74c6bd43159ff11ed53b8e20f998508a9586e11b5d0661f9f3f2349132eecc9762e1c3667b16f178701b1e9e8d0bae95fbbac4b86bf8ca93cb610e7d47cd7243921b26dd1cb42c850b0193eb4e2eb6fa4c22a41e33759d040baf047a7585c26db9c098eae69f6f424\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2a91ff92427eed66c0a5eb6b2c01ace3cd408d93e0fd7749110477c2d1221ba303d8055123c57b24f0ee0f9a68d581da88953c37fb66f7f6d6bef0482566fe0c2309e4bf1204b907d6b5492d33e762a39fc2b19400f2b5d9e02af076026adb6d76885a07dc8caedc9a59e452b30b5d8b3ad745c27cdba3564982efe738f611d55053da28772417d8fd173e3da9e87eeb2f9eb8476b77456323e2dacc2142e13f1b0c09d97c67fe1ca90178fbed6f6fdbb1c6de9dec4079594d1a2efa1d5b2cb9e76da6cb75c1acd991d94c9308f24863afbf077cfd0fb997bf20c3b9584470d9f5a7fb52e96f3ac38958871441b120a56cf834446cb531404a041abf80b088448\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae28b1064ca19a9f583ba483aea3b29aea24f45cb20128ac8d2df8b7ca7dfe13821cb8c48e22aa1d555674e3ce9958cb1b4eb1b5564bb7d468cf155c1603557cd49c27d0d280b3f118ddcc5bffb775819b9a58e13c10da0b8c41e9aaf668167afc4e0f7480c313f0a9fd79b0522e9584e6084570c84f874e4ada88f051a80301099b29ea1793f2824acfcd42da0126b489f2da94daab9f303e5891cbda6356530b870fad3ab5b4b2c5bf0278ba829516af4a86829921281d5e51a5268533933750e2ab4b4270322ea2603034b187bb5de76d5d10ed269722144f944b6a990652ac29aaf52bb66c70b8747744bb8c6eb53e39d97c19fe5fb6f2da1f4320c439db1ed\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2c8cdc4a9d292616e92b4f348dbc0107f46720", "b8c31a186736c19a9d24c5f4d756bd001b2e61519eaecc1a2840aa5029d0a8ed36e08c0bcdddae378b49d965ccec9614bb02f97aeba637ab1a1c242cea7b9dc11a8957c4d2f48c934aacbe7443e3a9906bda33a1d9b6b830b6f58f5c6b180394b34da96f7fbfb780e1b2953570cf9c41b933f7a005e596891e69b736750149e61f39c744a69cf3de10919da7b6f4e04be0f8040636720a18f56cca83752d38d4a803eb1576e64ad8578ca022153b179714c42c213b78d77783327b650138928bca8ae60bccdd3b574c9d845c51faaf9cfb6057cc5cb9800c93594471cb05c53252a6a3bfbd0d36f4417a993c640\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae21e5bfe40e2e6987661962d60bab52438a003fe0128d4c9fe2d787c3dde5451217b54ead7329eb06a0b6e953df8aed54322ef3aed9a1af4d995ca710f2119ef832e97705a82101a70aae63356c117df27ddb64fcd38581ef1b19360d0e3cc7316cb7c427ed0aa7af31416e1ff78570729eeb4535301b664d51c4e958b03ab2ad27e2999d0777f231b9908ba0a659a6cea7241971c7e1a2401c4814fb6d2c639092fe87cd492e30ba4d27bd2086bd7a8514b8796c6ce214ba0723f5994551f6008e1c7853568bc424512f3bca811f979c0d8c03b8ae38321a7b4e15b43b2391fe2c9160eadfe43e12a73c4cb9bce5fe34546c31b71815b59f9175d937cc3fb49a8\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2fbbc80805613c1d3130394c50781c841c3895cbe90d3b1436206cd46fa61bd4065b813de24338040f836e86108d042d304809f421a1ebe1ac4d1d14530fbdad1b28eabcabcc528c68846ab80c3cc7126346c7cbfe912c91dc21f47d3bd615a93bf7a94b76c705e68a0eb1ac428f0c33913529fed50cbed95d09781ef0a74158c5750a8a37cdd81dcddd66a58548636f4be8f06403655f2426e5770cc2d47662078d9b40a248df20db4daff789eaf58200d038c36f471e6875e4ad008dbe928a034ab4452fe2ff4e08d5b1e77e02e98c6620410c323a043317df9df806d16fb15f57dbd2b4dcef7fa46e3893c4c2874ad3e03802f6c523247a588ba56ead49c55\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2bac2df31ecf9c3304318bd366d09f27d363e586dbb6e229dd5978d7978927fb6d3409efcd9906e6d6ba6d1b334820ce7e108d92f14a3776ef5b5a34e951d691f8709aacee46c852ad315afa7d30536623b750f4cbd278974da67004582f48e75bc943e76a09cb6869fbcad40b7a00ccb584349c5736b2047adbcfd13e31f8313660239aca3855fa658f6731ef37384e7517f3d38f1a48b9cc6bd698a27e8c71841b35ecbc45b8852cabcae8871a949726df96c0c3d2d13080972be12581e6cdcac172c7d46050e94965e662ed2ba9836a652fdbb116e2d0fff659b33a1003ee1f6337f4e4f31d7ef14ddd5b6cf6f2f81317bb2f4e37252ccd7786559e614f2b2\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2cfe7d97bb82dd71abb553ba81854a2d274e4c028d0415ea635350d0dcd0f1e780435bc604d3b51995e27eb4062a2cec754d75302199021283979f5acc427fe753f3638553cadd4069127b2f3ca3009d46130cd095e9366dbbe455104f606b0566bd3b9e019edaecea4953700edcd88eefb7fdaa399eb87c6233b2e909579576da612a7ba2117b4436aef66a013046c8ec674ce8d136e48e1cf358d30a595445b946658b3ba41b05c669337e5ed06b2ed799c6760d24c3c59fb29a67e04244113e4617359957b53ae6cf4ec6a7a2867d87f03497a7baa9a11a5e1e2ac926843ffef8a8b146934089ac090252b7d136e2ce3f533b8b42fdb44ccff4fb0f92c92a6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae29682687730a499a61db7ce9c741cde420cb7de33ac6fc67b8221368dd6b897d622423c083e7c7f9d0d34b8b67681186a14125f4a6254ff565f4fee00b9c64d6262ac8629ad8f4c47def6dfab3bf3fb2975652043afabd50aca77a62e48bf846f873a21539f616c80ace059f7aff1cee676a923bda797c9857ad419fb328a86583a2d787b00c263ce7e0908e0d9e2d7beaef8a665d0db8fc1eff43fd2a1428769335abead876304953627e12d21b53b85e7d26a622deec5e3240431d26e67c86fd992daadfcda046d57eb22e45eb11e050d6b804fba6c9ae6d061d47ae5aa4cb6789001838f9b22169ba807ecd5a84c6f80ae4a4df5907960f884594e8543f7dd\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2b6e682a778dbfd9e22473c054d1f68ed3405ea5b855700af6359afcb9ca837a43d476de2915b8ac46f1fcc277cfcf1a727da061075ec8ab91f632b308019cf2fecec2378e84244f94753a957fd82c7780908256d4228b1bf8cef9cadadb539b953e1bb5c38bf3d7ad376985ea97ae61e45daeba548748dd1dc9a534f694cbd5098c168527f0fc7e108cadf8646eb01bd32114f8e1d9745d2b8b8070e075e2ad9d40840c57357b3054e9f6dd11ed35c4af4acf29e27e48b9c7747fcd622bafa7a9c43cc68db0a5c10c0400f612a6d80e0afd6c3e5077f7d4693944a93e705f7122379949f53761a9d785ce11dda57b697de5f69f896326dc2bef69f9de997f8b6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae27fd12bb6478344295e2e0196dd3f9b879086cf10d1abcc01dd7e5566a732248cff96cbabc8742801b1ecba1835b05d75e50294dd3b188324bd6cbb6e6470f7218b04afdd16fd82fc3df0279345c6249aabe62e3c30df33f927360a03e73a730cffdcbfa3670552fc6f93183899aa8d5065ba35cc390191d949d9f0f666c4588234f98e5c5d6b66da8717f501875eaeb08d8478fe6e09bc25a50be2ff2c774897b806e5293426aa81caa3740b75845d75dbbf21fb29e820cb53b6aa314e313c49901c0e93304569a1f9e5aa65a6419f9ae465193fd38abe0ddb80e89491e071b27fce54c76455357edab72d8bc4fbd3e2149482e72d2ddd6994be15d6f721c4d0\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae28401792e4c2cfb8e4da9edabd685d2852fbefe3bb93f4b3db81abac0e245d40504afb7a84349d8003ecb3814e51fb254cc26827559db0f10738de25f74d05589deb56e15fb04cdef397dcbc6feba871cd5d6291f8d1e5", "1f7b997f44b782e568badca0459cdc947c68e1b062430dd9a7f15728d7183d023505623694fab003f94fb928d9bbe8054a5681d932612b6b1658ce9627ee9293e4001724f609f30c8e56ff009240c2c540ae0846975b47c7de127ed47bc9e53be7b01824f98eca2cc5f8e87f3282446d01e9cf3534dc0d7f44b69f5644dc08365f5cc80cb5c3f8c6d859ec00b5a4192e12dc1e593d1b7c51eee6ce39172068f86ea8d566c49086e793a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae236ffdbfc1d0bf54bb3e0d435d7b5e683f4fe2f03c754ea8c71bbca6f992f63a671d0e54ea51168faa810cc079a20b30492cf93178a053811099876249590b22a7c8b475beee956d95a63ef9f61f670f813e63315bce63a525bdc886bb6aaf782313aa5c8086f1f245edf750b52749b913ccb0951e86257df5b54ef9d259f1caac8c9225c65473211d906a6931226e4c68d794067e5f0ae3e8e1202582d45e18e51ff85fbc955507f2d238d9b7a121a468c0166cb862aece6ce84907bd49412a92abc6b8904814f15f6b353dd0c0545a14c8c7b768bdd891be676b16c9263363eb096b49c0395483f9c3c3744df2b42339ac151efa615be74c0ec74ae559a1772\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2834e1e14f5d7b4a7276bfb4532523af1242288e7015e3ff00e38681a37df89b470da6a3385840e9336187bc02b7b9794400f7fe6a97b3b18eeca67027dbe1c8fde3d34fa6847d6f67b8e76100b7cf7cfffaccf90e44a3bd96607f08c7a31f172b7262ed7459a15a14fc010e277b9ab2c524c169af761acd2dd0ffff4b5c0f52f71e3f6ab485f612e6f68b2f809e0dd46b620dafd51d34e198540dc35fbc83ff746c03f138478cdec00f3e824959d4840665da8b3912f047e3debeba8f4dd60564fbc9c898223d19f27330a1799de5dca2abfb8ed1e799ff5cad571ddff16b58c83dc92a84504499666a5b4f256d377bdd1262bc50ea538d295f5afd99e73cd54\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae25b782c3dead0a771825c9e3ad7cbd6f3482922b065aa32015af98a2cfc1a06419988be03b298321c571eb7d56d909abd0a4a502dc229564beabe5571824239ab29c1e5b5b93eb53527a07a33fcda134c80c6faf590b7b13ee32ff055fa1aaf4d7b9dea4961a71ef11e47f393a4f34bdf32ceda7be8e88a907f4dd0ec2a043d0bfa38e60b9afeee8d9cd7b9d52bfa5e5d5df348855da608cbe6ee13990569701d7232ec2713a6281accbe2f9ce7dc0af2493ed3398dfda1eea0b221bd1bf8bc0a77350524ec0b9e37002a6a40b04d04a4cadb1f425a145b16aa2c201115dcb8bf74d3ba19dcebe6c84fdaa4156b66eb9e74936880aa9ab1bfd5363dacd4b10b56\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908bdda0ed3efade2cd8be68fa064c9d465d0be925be6f8f9193ceb80db80354448e7c0029a68bdb91a33bc862e9750bf942b4dfd3f1532773e5c754e1046f81227b91f4cf0d707ef8fbfdcbbf1024e433f8c7b3a1b93012cb4cec8ce9a2f2014d035c858e27c776388500a67ec0bc5b82707ba64525f713efa9268418f508e65a3ef15cbbb377b6519b8dda6fa3fd6ae8a69f6f5d7e772be51fa650acb1d3dd2642dbd3854b1ab6dc611a3a2ad2446bef02842b843cf6248941d619a44cc10955848ded132400eca6a5bc0db7a316345f068ea051bda750523c288ee2b1e75ba0f6eb95a117696e9481eed36672fdc0e0e1\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b58088a040452d08093c6ccfea1f78c98be15bbeb3114d64ced884097bf0af26ab01c622ad7e9ad0bca71f992fce5e8246f0edb546dfeb83540ff0fa84f64c96c4ff65d7b732d896f7815b712d1954549fc05ec7b3cb7dbfb592205fab2d35df981fb2353ad5dc843e9263df5b607a6f58f45b6ab91ba4ebe50ca50b636bd43cb5189ac4f1e6e840d152169b8c4e22d31f36ed392bdd4ec5ac739adb584d12a140f4035863a0beaf41682959124d6a7b29d0a0280e88bc633f0c51aa82c15407e9e2a896c090c9ba62631a377f3c7c3450cc074764fbdbc8b57109035d57f29c8a43584218a5a87e6af3fce2bc4137024\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b55b7a3e62365ca8e57c4b8fe8256a214632a24ac63cb4cb6d98c7ee6eaee5768ea4f24aa460912da168c25f7be031260a86c26396b4183352964bbc2cb285cd7e39278ec3bb9ab4da8ef8aab01f147656d875c4feb4e8059740b683d8340389286b5fdcb3a584d7fa363ade2dc5da7939547ccdc4f47879f2db940503b6c9ccf7c9b83ab25c67725d0f5d39c3d9dc335737cd55f77faaab9419090f5ace169d49cc1f1898bbc41b1c0d32e48760c9b89c8d775f95421715d922a8e6a8893ba763384f99a56d67be9b18c3638bff368b3d68c3a2a45e648e61a29ef1bad0905ba94202f95769c526e4fad346e88ec795d\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b41d61629348d2aa49cd8391d114ff7795d591c7ed7d9505ea5a8a7991f1f92451acdef0ec6d5dccc98b9bd6b6456aa02ae57d2cbca60d76212a01c6ff854ee527e9ee78415b0d35f711f684fa5153f3ee4cf955150e9b0ab1f4076d3cf6b82e554950df41d6f731a242ca56bfe0a9034240d59d04b1428a5a69fea811af6706f586581f7959c0c709ad2734ad06e180ab20e1a3847ce01ec57ac4cc9d4c7a75f0b949cd5dbdeb18318652accad0bd9454065ea2e8f79000f803367f13d018765de45c5846611d2cc09e674a3d0fd63c7aa416cddf8083e744927b5e2e7c52ad607da437185dbcfcf0f0c9ea3f3a1071f\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae14b500b94927f24ff6a4f7b07\nTAG: ec90d128ef465f4a3645fd0b2601fbe2b0bceae2f890f0700c7a15c82fcbee6ab492908b544360f3ffc9df7a6599bb35b4ff64ff5f5df3b00cb6062cc19afec69f3bdb3b784d8a5ca0ab88140fdf85d7c04f2aa732a13b11de5d6465450b571508248d266bec8772fd803cdd296cc3d41ae38aeb7f99d217c22564328c3cb74a2ecae1e265007ec83cda14f9e1a4b6c826db6c912445409894539a3d7095e89f19abad7ce1905f2f596884ee3fde0", @@ -486,9 +492,9 @@ "741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460b\nAD: fd24ba022e6da12dd4c27f\nCT: 49c8529d90530d74ec84089b8936fcf772bbd205dc1cb2fd7d623a9f995b61d20b7bed5e432bf8f283dff639855e81196099ae224900cce32e751de9d8be60350a22f8c5871095fe6ea0899a193711cf6309fdbc89f68bcec9941cb4d6ed121e9cf2d362b1396f353152d783ca897e81276bbd02f2423cfb6ae0172ece1ae9b9ab8c352144e145305daa975634fb1db85d4318433f01cb150f5a1bfa9c233d05ffcac991a4e217339a015a4441da79e06977e0ef3d5dea040cee1611dff24f4ee0fc75b6ab57c1158c2306c873ddb9cf93005c12de1202f0c2d056faf51f34b0e544fcf16276d55ac7bb71a02fe33723069b76235d6796b759235df1c67a1cf86c3fafaa11bbc704fe27fa92524f8629cb80e197bb0e4e2a7920afcf9f11f6caf2fa7529411375a5e19e030072e7e65e185f042b5df62b91f1b0355a71aea9354fe629dc0c163e72d98d5c4fe8e90fe7f16a7b45c98ced5e715a3ddbb465f956973d38da213e2c106385bd2990f0a9f94043908f183fb2b638e372419ddabe64317fecbb02875276284900072d58ddf3607832616fd6f60c14f4b44d758bf2c99fbbd5df8a632b97cec0d7e8ed570d7949929f19fa3655808b97e38942435b6817b9b50b2dbaf1ed01355dfe3ba0766417\nTAG: 218d8f3c97c6c71f6eda619167fffc2ffcabdf64082f265b31052c240d03d0\nTAG_LEN: 20\n\n# DIGEST: 6b7295febce7fba8d79d1e7ab8fdfc452191e2ba\nKEY: 454879c41de9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233\nNONCE: a825264e977045318c9b66262c0f0368\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e\nAD: 6da12dd4c27f4372480974\nCT: 1fe976a4efa5debb0d17032940d4d95335d66d02bf4f57be78ccdc3e8a81eab2f7dbef2db83d0442238598c2976cd693dbdfc2ff936062f2e99bc7c0036052f8ddb2c86dfb181166e04a01e0c1764b35e408be6f2013f668a6ff07bd27092370186e7b2180e36e9fb9f3ec90a36539d0f181f0b5b8c5991bb4ce9ce09815597559f61ce460ba2b236f9955b75c114af0869627a49a2de946072d8dde11f20c1afcdd5c979c28a4102b9ca4e6e0cf709673768fc1f4dbb90f3447be2384dbce69b12108a6b35b5389e2c79e4e398c5b9f0c1b665049ba76e7249f4ac2d9c36c647dbf30021da94cbf3eabd07f1954fcdc7d7798041edeb5a909e7b27f149cf8d9cc6df30c064df1c5dd4e8af6adfc9d9e4124bcb19d1a5ee8162a9d645d77184cd92bacd8f89fefef2125259fdc9cf8a0a2310dc631f1c96b681428819a73dca987fe74e6c6c5ccb8db201b3493e3f13f9d5d2a3bea0cd2675ca8f6945eaca741eee15774527cacb9a8169e5e3250cf318de6f8d7f0f3ab777b110c12413a97df8d446ca06e6330234498d58b93a4ad75e7c782f9eedaec1988d314a06366afd4de3b061ca49855c22f12f0d38ccf19f97b0825402429709d74e75c3602e573249fde601f393c945d281d380aa7008148be4ebc041f86\nTAG: 97944671004841aa89ee180786907e87dc87a8d552e1dae5f9a6\nTAG_LEN: 20\n\n# DIGEST: 1dadffba439570155af2509a548764a93042d23a\nKEY: e9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e97\nNONCE: 7045318c9b66262c0f0368fe9d0cb746\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c2\nAD: 7f4372480974454879c41d\nCT: fcbf4939de59426da2002fcb8e3a4d07604a168e9ffb5f13afcfbdc45325e3ecf0659ea736f9dbf61cec1dbed1024eff9e3bcb721c28d004549fd84e2cdeae36dc5e5abba4f0102835740bb877858814fa38290344addefb47ae583171a510719d9aa18c8f8a5e01396fecf1a982e162edf1047f56e8e4a839c5560473f389a4c7ea8fd5e03c7f2d31ccbc094f04e2a510aa57fe30f37cda765ddcd2bec89ab3f1f5f2ca423c68664c3303520c71439230116409dd84b4a26c1a102e521253ccd455793b0d883b1569b5013653b1c606143fcba7252a70d2a2026b989d1f67fdd594d2b33bde1bf7ee9bcb6c013ea8886e0ec1341039b8d8fbb4d865754a62d0e2a1151c917368e93fed0cb29e2d63ae176cbd95991db0a2864b27b6cf5782093bbe0ae117c7b2931f678bcb07aaae3d955b61e7ebbab8e84442295700cebf1a8f7d846fe788baa0660608bcbfa59c4bc9e5d163654aea99635f9bb63b8074478fc97b4981f5e5d35430b1e18332370dc5f4e94616b0270112dc446335d10a169e8a6923765647607ba9ad65c6f6f008cdf041af2e136b398bd1d1f67044f8360d9c1e90012e594a353d8e45aefac62173fd1b03ee5e4aa6961d83cbf1096dfa02f36ef62ceea5bf88f95301464d0046cc8ae3bfa611caa0c63d07\nTAG: 850f8608529bdc90c222092bfab0239a3b07b9cb1f\nTAG_LEN: 20\n\n# DIGEST: e654b4c78e1c0061eea2996fc126c9bfd41eb6d9\nKEY: 3b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b\nNONCE: 66262c0f0368fe9d0cb746bbd55813e8\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f9823\nCT: 3a35e98cfbeeabc993af7e952b148ceb87a110d851bf2d036e5eed8482b39b881b3180dc50ce782a8cbe2c586863c5d038fc4f37d4a96ce8732abb984ae90bbccb86f7766e9712e43d3ec40fdd7a1c88cfbf14743908c78dd4c19d449db7557e0c30127d35a49503d8dce6c9a9e6f07e1c86d7e365162ec05a8b4ed301645f8274999a6c5beafc5b27dd68608aeb2efdd9cb00c6236bb143e7d91709a3fea0e865330680a854d47ae3b6067002a01aec6bdab9e60c19ca66cc39d4a44ada1e21720bd5bd87cdfb31b8a9bfac77feeafc9f8e92c4131d73a3cfb64efae2e8d14fed99c2bc88f63f88079d30b78df18ac03db855338986c0fd1614dc6afaea71130290bf52270999f3392128bc48fb0a6d6425c383b637f4c293e177f479f6a2d6323ed545bbd564f743850a121da96256a8daf163fd80835558b21e0286cf008e7cd87bab94222fd7faa395ee2ba19aa3abf5d000e7514a35357941b97e4ef433c30972e995b0991c862cefdf79712cbd3655ceb43e1e5f5b0d3f5e275bfad98a667d997333d704e4d70acc488b6829d18d1263b841307d592f760a66761e800b4676d64546a1d8630d97218a7c5f555d4a90cf58eee4bd1e1fc0e15f8f64d336edf9ca00183169f237a924e7efd5a339f3cc1bb90b4c513bb9969ecdc9beb5c5\nTAG: b24af9f27ebc204aace6315a197550907bf6079b848eb1dca1a96192e", "e7c8107\nTAG_LEN: 20\n\n# DIGEST: 654b8591c7f0506261713e9ce7a6fd24a6b9357e\nKEY: 61792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f03\nNONCE: 68fe9d0cb746bbd55813e8d454817c21\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a7379a5\nCT: 7e1b59c791aeef6577c7ac69f8624352b7c2c7d1c8b14a7a0daf8240cc9d71ff1298eebf18ab6d469e1a327bbc3bb539df445ddcf7dccacb54f0a4ce6cf18bec20101bcd62bb2b30d8426a1e3ba949dcb69767aab5b8d2228267d784bde55bf887403188cd39453d32d50428bb9846212e4bbd3843161dc830646ba6e251ffad5d1b382101c7a3c87163867391fe44a58639e8a29fbd34cce657d321d004f842e0efa9d4cf03f557bf07a1201ac36258a4810dc101c427e19bb79f0800f27732094ee1dbab2abfc061fd4a1e84b2d36e560a38465cd4c8bc04bc27ffe90f1ce5999fc78d9432ed98c8dac4047a61547b6205bebe2191782ca63e50bb29c9bea553f5de0e9051cef35e3122c00e0d3a2468ecb2a898225c5f65fae573b17a15e013655a2ddc62adfe61ce5a7e352539c6d27c9726d2ca5492ee25b6d8233e32383100d131abce97b33dfe18a415156917ead8fe854c53bde97c0202e782679ac46f05afe1b9ad6b41bcb65bc8a80682ea8092bba0c47a9a03d08004a11756d9274ff83d5d468475c8a4a56f81cd1367040a3f75fd998b5fb3380cf8c1630fdb948fa2d0930fa5b009abc755f4bf70a59847969500d43e2db40ee517c9a6826e8e3746b3d40f9a6e7b35362550cabfa601a887bfabfd28476b3d7eb8917d66bbe9d21bfebb5a\nTAG: 22e74d37769a86785c57bb760e8a28de7a7ca3207fef4e80c284b4\nTAG_LEN: 20\n\n# DIGEST: 1eaad32c8d0cefaa5e2c503bb2185a73e6387fac\nKEY: 16430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb7\nNONCE: 46bbd55813e8d454817c212d3a0063be\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c0f31\nCT: 26234359615c88fbbf5fddd43d4832a57bda2037e2177b264309e2e50c28efc28c5ed5cbf6dea046a14caa64d499352ecba0eb2d4bd376c6b1e14048033e21b9ec63f500a70c53be60099d9c9e46ea8f250d3d20c834c3c0638a9245377fe2b76b74ea14bca6b4bdc7e8d86ca59f397fe72b8c4cbb8edc3dca7f9f234529034fe5f1441210a8ad9b4694fe013f7e4a906fc400a27279f2a1a31700750e2209f6296ed808c893a42214b46f765c9d01cee46df18b02d5493c3a1da3a6258e89e47934ade4da2fa9eef7f5b1887a60585684b1c5c2ac60d94a62d79694b063444fa36674ecde12095e9203d281da3118d058f547ede5e4b67a11ab55c1b42fe01a94a601ba031c5b0b4088563344cc28d640bf2e7c81a259211b130bb9ba9ad93090c0e11cc939b99046fe7f25132672c3714f9973513af628f21942da6b459a60e31fe1bb9bf4f6259d8c9fa07d796a264f94d64122d186a0220d9f44b040396c9c187d5ad1d806ca613a4d0f5038a8b77177f39361f9107bea7700ba835dcd38cb48a6c5af0bfbb07b7a2543f1c661f1dec06acadf8860fa2220c67bbc9c97c44cb7cc58831563153149713ca2db85af46932a8de891da1d4662e52ed5b7c1c15d5557a0930c7177c2046b50aaf14874512cd9ed62efabe5704573a4f44a4ddf71202a6ea8c706842299\nTAG: 8eb60165231c67e88b0abd1d7c1c3dcab1b7006d4d3f\nTAG_LEN: 20\n\n# DIGEST: 862c0517b3658e9b9cd27db608d49e24e9b4667d\nKEY: a058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813\nNONCE: e8d454817c212d3a0063be26e0636617\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e8b6e\nCT: 6f2cea3b4aa1b3ae78d31e47c0c1e03df944352b9bd5483cfc09577aab2095a0a7e977e9c1c6451625d85d162c1653423609f141aac93123b2a0bd093c5bcdd9a49b27ace4dbe6acb486446f437c27e619a0f69405afc83240f087feb029fdf8f3f25a8a262b4a3efc4bc80512a96a45cca61d46e42132abd34c2821e7ff588c742062c01eacf9d1689f11648ebe326a91fe79275b5b1fb2af4d1440ff4a9ad35381daf2a2c0aa928216351c5b89ea33bf225d34efd7ec2c81c5af325b138a5f4ac50c5aca196d1b32ce8352431a8f08cb3b59d2f8de5c850e2a06d00c1d7f7027b4aa6757eb0c9fd3035063669a5ff8db2402818c88a7137ee309ef2735dd575e43b7508c81306dc50da65aa2276dbcd98537636ef06d1736f14e2babbc39457dc8d101d22e5516d652151c2092812814e9f73dd6cc805e670ca36e62799b42bc07fa1d93b9332c43a4b759e53ae138fd2b2b419b21a332ea304fb7db57e860509855b2a540cc909aff57e1433f295e8052c7609a88170feb7623cee8ee651ae1dca4b1afa427e2e43569d5b7f2ea688d2e2afb33f1dc0666c4b0df8aee281cbcbf5e964beb3851f7b929e5a4e06766746f22d4fa1a32913c0f449b4da8aac6294348f711d4d75bca509516668944d2a162a53a31229528e54e4bfbe13cef013efcd6687e890d292e42119529c92c\nTAG: 76c80a678b6cd735a2d01acc18dbd90bc3997f57efc2c5c78c22fe4dd13f06fb91\nTAG_LEN: 20\n\n", }; -static const size_t kLen10 = 391860; +static const size_t kLen11 = 391860; -static const char *kData11[] = { +static const char *kData12[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher aes256 -mac sha256\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 9c95dd31953799bae5073105f0694f1a0e48afce9277fe009ff26b28ca9ce072\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891\nNONCE: d77df660ed82933f62be8dc55b436965\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: 5485a38963\nTAG: 7bd49a1ea251ed03f3478129a62964bc26d5d16c69be13c2e657f10e971352bae57fd40d369aa902d9e8d365c498a4f4829af1a7e0da1bbd913e36\nTAG_LEN: 32\nNO_SEAL: 01\n\n# Test with bad padding values.\n# DIGEST: 9c95dd31953799bae5073105f0694f1a0e48afce9277fe009ff26b28ca9ce072\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891\nNONCE: d77df660ed82933f62be8dc55b436965\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: 5485a38963\nTAG: 7bd49a1ea251ed03f3478129a62964bc26d5d16c69be13c2e657f1ae0fe30a3006727ffecf985f1a015f16\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# Test with no padding.\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9eb9045fddd9fab64fd564959daf731fd95181a79f4e1d5e98ad446d8a625b68a1185d14f4d17a90a23e9f63e3470c37a367efe6765da9174fcdef198cc90d4acfe1ea34b2a38776fba7dfaca92b99ec5be216e7c196f1a615c787f8a11dac7259b3b6982d1415fe53c5e37c428099f6aef8a13b20d77e482c0900528b10b0a008e5ecd673762de36b1ad38fc33fc5ec70cfb963c62a8f3d8e471e2cc863fc65ce54dccdd3d95fa449378784f4e39a24c3cdfbe74fd352b74fccfde6dc777fafd3dca970e63f5b07e8c53d7ea0f77c26f80c9a62b7d1ab8a5f2b6707ea4efbefd2bd04e535587a7e13ae0005e1e3401935f424c2eb7e27e4137135997e26957d6\nTAG_LEN: 32\nNO_SEAL: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: f1402641d69b3d67d63e5bd137ba006c70582fc0ac760c7cc005f22b69aead4b\nKEY: 7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e0\nNONCE: 37446f5891d77df660ed82933f62be8d\nIN: \nAD: 936a91d0b5d2c0267218cb\nCT: \nTAG: 38cfca742f83fb066e7dc876b8eabe3f00c490a64e481d2c27584581e60afe513de900d7f621c74d6bc2d9c1e7167cb059b92c23169af02cd28eec3a26e35dc2595b4f0730e7bbcbac320907dad9a365f274f2c8bb60069a5d7c88ff81a5f1c2d320160b639ec8c9140112a3b93da0bb9b0869457b9bedf603453cb27ccefd6b0a17ffdb4651ed2cc893f0eeb718ab91fe045d3a081d72ccb95993968cc216b5d6ca80408e96cbd6725b27bcddebf6d1a008dd8abf5ac82090d027dc1bc00b2da5448a031318a404d0abc2013da87388aeb8e9c574582dfbd791030d0259d087c6076469cad196ac83c588c9a2fe79a5144167e1960291e84589991522b2d93e\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc917a6180879a92fd56e6fe812fd87c8654297c65f3da5a76a75a36a053143ae08042eb2ab6b5b85f671d7393885e9524e09e2f9ce7593b6b7ab6887a7074e20d7c3466b038133777ad54c901031582066ed9868ad3f86fb3eb2708162e10c8551f50c00eb379daa47a904f3523c71e94cf7e0138cff860172c59e7520949a301fb732329fa6eaf6ef71c335c4b4f0437da8c5ab70e429c454debb3cc406f7c8880791b8793a154938ae47687424a6ecb1c23bac05d30192b6aeabdd69a8a7fe635e46187b2035b253b8fdf59c01cc2b88d1e166ac5f3aa417bf64e8d7a426d2c81cb725c9132b6518ed220383b41fd75851287c1241c0cf85908f1422c8dd4f83\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9323075edc5ff8b59b7a2a1f8edb3cbb76932e60429a0dd48f3bbd9b3bd554132b8fa5c52021e2143bb516f7d926f4664c4620522fb6d4d7347fa85dd57b441b4233ef363e602a04196ef78da6016d89e1d7fb55f825f6c7655d560269159b6aa5752367f4756899939f7892dc9cffe43e9dbd388478e5d3f53e5df97c9772e5366c4e389e7f89cbf651a76f82f5eaeaaaf68c0bb7543d3e9a478f0983000a3f0825777da874b545ec14a3565e101da9e7e0d18fbf4eb2282dc6a103535c2cee7178177d4448d516e7b120f9316549373421dd967b91b4566aed2655a767af3049d88aa45fe31174536423d43401992c702ebd91b168864e6dd0e621f7ae94a2f\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9ab3d5d0ac427251b020416b89634ea06a8a72ae283e5d44a7cfd1b93295222117d9d704d39e9989448094f0381ba0b61fff8f73a0d20b24202d7a0f63657109a13acbbf710187b61c4faace569153e84b8ae0c1f0d97755b69337866ba361f6970de6338fe30a3747a6b0f87eec609b7a601509474271ae14118eb52170c447e832119326df679e2041c8876702b0a941c5c6a72a0331ef5dc9fda6f05964f4c1ecef88b3a42d1a7f7f254bd26c08e464c42536bcbff248a21f89f5cbf4dc2b6c4ad5440914e3ff348d57961647d0f0784d4ecd8f9f1d37422f1b45ac9afa5f7f3559f12ae43f4bea013368bbd7e729c33916d81db8146560a296548a81736ed\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9882e3df031b128300de14ee15b44d5aca34eb42cc2dcccf8edceaa80eaca2a78e9e1c55f28dcd881e52e8c49d314b2264496426f3341deca30c4761a0264030acc18e2150054b294b84f22ea75bf07b48cbcfadddee7c8b0c44a9a8ab169b55f7980c420d3ff86ae81e26e50d32b6fbea1a62ee91c625eb3a4d35a1963391d4ac91bff58507e1adbaafba5ccc09c342c16fd6c222ca7d63d358b3e31fca2c86b274dc5362c20559bca62c921d6466703b82e4c98d018804f47660c40ea3eb2729e9e89a6df1e386a19be846f003bced63e85c6f6f2c6a807667909c383b16a2d063b3718958f2e03fce950ef13eda7c67b9a5be2e5e5e1fc80fe97751eae9176\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47", "e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9b769468968785c725181f201bae8cb30dcfe83e6a23d74223ab73614ee123aa027cfaa303f71b08191c37b2ee009a10b3ce6f88b5f9d3525d926261937501322a2d5a02ed1cbdf3af78b12cd42c72d2c4bfc56e9f6b5647c1366e7b10985c0c0abf14baa101c8998e0be1a0a79d48bf8eb66165a98a872b8297384c9c4c5cd5112d59b240bf3165e2514fc581713638dcc31ced7971199e3e06aa6885394b8f8bfe9fb8caaf32880b09153275b6ad9459ca63ece75b2e6443ab219208bd86f6cd7c7c99e4fea638f1940b698991e8c1debef816b89043f3a3b24d2a5e022f819bda3025ba41e7674934fbae362c558f64acadc94e8f4a253209c38d29f1c73b6\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9b82054e6ea71a0de5405c3564aea7c2e9273fdb79606e8379e38ab4d75733185153fdffbf8a666dc47a6794d1f198ff1947f56f39d37e233eb69639f1656f25672e2177b6e583b3fb99146ceddbb02c0d33e273c0fccaff79c4bc0092a262401b96213cb8bdc2ee13ce0f69cee9f2ed76123fcd01e2f7a588daede98d3550b8ceaf2bd14edb1b407f3d54dad1a9827b82566ef52f2ef6d160b628fac6eb76236f102db9b77050ef951d4de4ed495a214416bb21672c842494ea6b1254471241a7d5547e921c2179b1b3a89219b76f8205a5eebc5f72d8c2821464b801fe4a38da96efeadc06028a20e0c043ca15241d28c71fdfaa94f945ca1f8fea03f61c490\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9babc6452a7dee3cef67062c396538a9efec6789beb3f639a2d456392344e764f02328f3489687cc4f4959b1af011b1c0fa55bea01522874d9bec3fb4c1f42bf44e0c3239193fe54402e12a7cd11a1874857ccdd857c95701ea25a8961155f7452d7c494f229fb5a1d2f22404d668a1e7caad97c969b14c160d1fab50d6b35c4efc86eef948c2c7a89e8f8c31151081c1be7f76b804c34c9f9243c477fda43a4ea46ab375a19a85e3570885feebcb59f6d74d10338b8555095e9f8b70394ed84e0d26704bcfbe19c9943a0665293abab55ee5b7c9314d36c43ed2fc6e6c7b7036ded1e929fb49150b4c0c365f312b800083e9ea0f617196e11fd8e5f80349fd30\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc907e973f1e24f3b63904a6790ceb0052aa3a512b524003267bbcf625dea0b0efab26c2eb35ce583151299aed15eccfbf263cbce9b7f8d8c19cd4665010e8c2eea911d20cac99b9c869314560a03345c7b39577f15e3bb44bfcb45f1956c234dddf3aadc06befa8872dd7bc22bcd8fd1fb3416f2b83d585c78c3ebeca423b1e424be7ff77bf619a7e7c3866656f71056329cec17f918f5515853b626489d203581ca3ae673a8205e44d70e4f49f02a8d6d44b799be36fe473b5c6afacec88a94f17d0408cb41b94192ad48c634914249a5b1a8310679e3ecfc1d7a968536abdb75b42f9d873e66b0135b11d55a7b3ccbe9918e6ada2ef01e41503dc99e4f7e5a58\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9580a623d8c40bfb803943f7afaf2bc1c715e68ffa24c3cf7a3a0beccbbcd2a7ad3ed46caf1584862ff2725bc5c8d4a5adac4d277ccbcf22bea228b9d0a003913250764ee192c5cae96903c3eee5ec9168836222d91e855902408bdc9dad1d6519066cc3d1b1f7ff8366bb263357fd8917ab1cabb948285c765ba4717b2d5c8fce467ba5676203ac8d4bb0e7e0065a414d3b45e3e9a855940045d122f7bff770f538b5c7a739b3f28042a3fc5eb8570e0be08405a3b29f3b609d6bf27979e8658dc24de2096688b5688c63b1cd842d003150c29c0fa7e39ac6c4f2058a9346e5368db5d841f59c16b38ffb5f77e91fa1eda42342d9e2392decf474056c8bbcda0\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc91b97d0eb129bda9b69187ccb2d17c0604a9c7b2e23e4d10de0dd676485b16f8b371ea961e7ce029a25f596dec5171ccd7279feac323f8c753a895b5eac50521bb5aad180401e5047f005d23959db3a3d8cba3bf424b7a39835c694a0c8d59e8488e7f2b8c3b7ae53584420a92051f39b5deb36bc32a9bbab1ce796aea96e5c0ee6d7aeeb1cf49ab4d4f8b95e01624be498a9a29e8f7731056d2357787ed4f810627962e73381b788d9dd0c37fcfe70387138394356b5fbf96b3dd96b0bfc8d376fbe915a6764c5ccf0b07be67e59e0f4c07a7068187e6b72d5094c1b30eed2801762500e5a03cf16fa875e1eabd755bc351ded0418a479bf09a313605cf1e7ed\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9de39494765a6219ce699571a186ec25e33c1e9678fc398a7225beded3d7e3edcfba218e3a5a5ecc2d00e4369af16f13b79c933d8221ee94240a542d64d29586d6ea07092399879238ca03ac9a0decd0e6b96ce6c1e40440d11aabdaa70b3b0b9e8357533d1e4bc996cd75b6e8530dd5ed17ade5b2563df7c032df529b420543af78f61cb27b75db0504106032bd570581daba567a6404c371ed921c5198130ce518d69081189250b9609e1b7cef30faac1065fbf939139c424cb61b06a3c091bb6bcdf9868183f318e13ae3686236dcd80e6f5664a337204da100ff1e5e09f4c5ed18b1fb9e2145baab7b25f527ebc260ff5d3f2eeea9c80fec998517a6050db\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc910fc53d1c97a3fb1f1169dfc395923d794b681c0d7f40cc9887a9c06e39dbd51d7f38776036f2c67ad7edf44429dc32bd0222e43142417395b4fd0db73f8b684e4237b91f093302a457873bfb676cd377f35504a515e0b2477a4958e387100eca6816bbaff2400ed029dca27f90c4073a836c57f5a5fc0568882732a8773873681850cf5f39830a7dab9759844c4f623336f7724e1aa0c7b710dd88b2b3689b02aefd02ba94b89b60d1ac94186ed787cecadb39925ffe349d8665fc297f2d3a094a07db73c64b7edd2831ccd01fa041b0f004c48fee0c2a58058088babe13d05dc52ec31bf5030095e64326494f964f4a97c798112502d794d5d751a0eca2bb5\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3", "f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9d7ca2e9b03428f898c60a9ed0bead617baa7879af99cdbdf7c54bca1dee3241afe1037c090ab1c1c9cf4c760e30dc759147fc4683e23dc96a2fa183eba25811c635703782f878d7b534f089349435d270b72cab2fe481b45211e8e46f9f76c12e77029db6f44dd02eccefe07b174b57a5cac6cedfb80e2682489b3d8188af49548ceb084952acbc1ca15f425cddff6fcaebfee356f0280ebb36478531099fa155a39f0e8b1fd1be475490fe1989a15867ee31396a6750e71d26e379a0fa645a588fa50a166a4f73beb1ddc80303fc58a7d8412c711959dcc824c3d8dc2d499d1bd0e2c7cec0a6ae71edb20049e6c8e96c1148f027aa2e2f52a2068408af7c494\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc91389363709a5b80baf8dfed51a178ed2fd7f52ba7846aca85b262a2567a4b2a5a24a76b205ae432313b337f5a109f70ea786ae117f046e6bb0ab332f75d7c9d1aac795069e61522a54c5cec1500c8ab24c48f425d68e5398a076a4804581f87b0d043e67a3cc63b6ebd7e24248ca41863ed9d3e5e7492c43fc5b0f50d9f021c762073d5d1c9530722e29d31b4de04bcdf59bde104166901d13d75b43e392a5473b46325112ebec02d09f60cb89835f6db4683f49fa88385855f611a7df704236be932628c0004548ea3adbb08ff0bca61fbf291d0456b4c711c6bbbff2c6164972ab77a3fe7fe6834fbcae26807f04254f6d184b5c33e606f2fe76100b9d2391\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9a0cd713e40f34e15aa6faf0eda672b65028545725295d6853558332f3aef86a914354b586f1590b4d935ae2f13325c8f25e50e1379cb5ffd10b641518e8b3f1f875122ca85fb7ac1fc21ca06a4c644e3175f32f5c5dae67951f0bb5aa2a925a48013d992a1961104e349e4fe75dcfc6d27ae7612e6bf04474154ca06c266f5cd5e5c36b005dd59fc2ba24e2f4125e32fbbeddbcabb9bfdd4e401a0e5d36a6c35e7a8ad6b3efc72a8621d5e8fa7531aebea41cacf14907ce38dfd11172d0fcbd8343fe0d11ec6ec0c8f332a6ba15aedd36fd7fb2ed890f8a72574efedd144f6546780df6e68303aed0928627b2b8d78f3d46ff179cea462d79504c2c074f80169\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9ecba9d99960b326c04452e11cae5709b9d0b7a73045a2a0fecd2061507731e6ed390c75fad87347076788b7bc0220019696ec5d0a4ae4d54992cf770dcca4b4cb836dfa132dd35a7180e069e48d716eda490ac7c5b65aa282aff4bf58c7379ddd82be67f7d0cec543aea0df51a95da1923dad84a78f5a17f04fb4e69a3f90d5c0fc8fca2dbba3f38764df1a40c7bba8d6bf5ee550a042c3b6051d860a5ac84febeaabfdf8c53ebef3524de23e7e412abd9b3b7de1747b71ca90436bcd998436071e756ea63c117c873fe43c438c6e9085a08e4cf7acb8e06517e9d0da6fa4110aa728733b9bfdcab3a0417d9eb41ad114ad7f13c0328281414b980d866185e4f\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9eb9045fddd9fab64fd564959daf731fdbd8224c0c77c669258f34a280e3e2a4b65f456e81e7eefea5dfa4553d5fd5146e6584e6468d9e7212a2f56414ae939791f3c853d6003ed0dc85d2d494ee73253ffc1842950d38b9f27bc659ddd624a27c652edecc761f693be00bc4e3901c2d83ca25dfb50d735f21b629cd1292071eb792e4a27d639981a2806cbbad47b220abb41480ead0927dd6b7f3d2aa14cfffb4c9fef810f27308de44e82893e26f831f9e509cd2545ea79052ab4b640e974a8c7c771d31bfaf61fd587078b5c9220c70e10264646e02d9f54a270dbc9d9252d37cc83231a20a9e40b257ca67de70a95f4083a62d4bad32a1f55967f9df1c80e\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9eb9045fddd9fab64fd564959daf731fd0a266acfb5a43cbcea297e47e03151ed95797671df0d1a4e8d3c35d0875e7487052f19bd1d5af48a930d98474676304ed9276a18e5092a5fbd289be359a35caa43fcd5c6e53cdab3ce6ae808dc2f494d14adbb277aa1b2e801823c7f5ca0017e6fcae75dede4b34ef99570035f8d00befb3895a3e32505469d599f2b5cb7bd7b8710bf76e055416360204d54068216e0492d060d9a23768de6052cda77964b0428684ea19f6ddae78851043b975fc493f31e1f3efa540069af67a0a058147685064242cd84cdfb480ddb456ab7cb0e8f77d3d283e8253621b177168ea383efcab5a2e98ed3dffd075fe332fe3a9dfb88\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9eb9045fddd9fab64fd564959daf731fd557a1ea12df9dee66f74163b4e01004bba8582d52623abee5cc6342c833b230081cf5e4fffec8d097f022e1f201bc28baa24e48f6d35e11951187c709605e32ffe8638c7c42fa759561a2df26bd12bcff6425ae819fcc6493ac1f0d85435cc655059aee4e1bdf1e588a2954afae3d7d15f0adf6b91d89b728bee01950e9c9d61c7833274777512246d05bf6bdce5e025f9ba0fb526c211fd6555c811d3b02ef47c4398f5eea1f6c0386c68134d895a7480cb95ffae0a5880fea57e2e6b85a0af56fa6336a8a24af6c4d13ab8f0d1a4d05162bebe83ed5119fd4fa65ecc6c35ed493661b5df6e6081455e047ef4f97df1\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996628f6c26bea29f84c95af4c128cc3af012bb358ee9f7\nKEY: 481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8\nAD: afa22993a340b9b3c589c7\nCT: c90e0c2567341ea7e9d968dbde46ecb46ad78dc8be7d47672068de66d6e7eae1\nTAG: bc33ca235ae35aad13e540cc9f0714dab00678652cc476d57c543967c39dddc9eb9045fddd9fab64fd564959daf731fd0218af529843e9b2548ca2aee73f3e61cb8589d0c67096390c54833c19fec8452c8d6ae07e6248da358b7fd99884cc804a1079e5daee3f58a4df6ab0bd9214ed5f55b9a7410b8f44d3258e3b195a04e9c09d3ae288c7bb3f224fd0889a9a111cf0228d167163a7339e82e9df5d51feb13665cbcf8faa650b21218727d8f73173643f6af60e7f89b28d783dffed32f6d935f85010f472e4f09d4cc2f0a6886afd66704249f8c12bc4ab45aad9d3470483e85ca0140903aa2bcdffe2e29a0825c21baafcb42b4689e2406dc932b9d6b3efff27b9009c761b16c60878ca83bc5c26b36e23c562ae8db6c13cd5e45ccd35a5\nTAG_LEN: 32\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 3519ab2b2943d2a50996", @@ -540,9 +546,9 @@ "4f6a6c0d3e1773e6900c8e4d18e6ee0785d651f465fc629e4228cf0c56bad63a74f1f4146f1e411996199ecc7058ef56eeb9e04803bf6751bb544f79a9414a4e23ec1ad6fc998a64ceb4d6649946980be065aa274434c1244045bf6494c38d41c2527e7bcfefd97b56e02a88714517ce9e8bc09bd95bcfce333d8365af3ae81a7f925a18af9dfc3d66a3de394fb3126d596edbd85e17d9de30e70adc2049df16d73b7ec3a5034cc6e3a909e08dbc863d69cecff8035f49cce01fe284e5f52245f1ef8bb27f46939372c5d4f7cb5089b3bedf3eb7940442994081f6413716e831362acc732e8f0ad1670251a664ce3db8a32f87a172e77df3ad3722b56d0a40da18139a6\nTAG: f64196334f9a8a0ec08819927d2ba1e0796124f4d752f084f1c58725b45930fd2d873c4126c8c9019d95\nTAG_LEN: 32\n\n# DIGEST: ff2a290f638f41038a81fe1e1e9bf3835c0423886d264bc60adbdfc38e7441f1\nKEY: e9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe\nNONCE: 9d0cb746bbd55813e8d454817c212d3a\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c2\nAD: 7f4372480974454879c41d\nCT: aca825e4559f40de2808ef65930926da912bfe99aec6688bfe17727cf5518ecf004cd88dd52a9a8657924068c7651c64378b763909e06cd3c60fe97c75ea15ec3dcc043588f17ca9cc59b7e85f7fa3bb10bdf28437e9bdc37207c79789033cc97a37bc9fbf31d7084b59a2b47918a9dd331bcb3431cb8a76de859ebced78927ef0d1871674312671dd99aa03a68df7fd62b0d6e3bb96434ddad5361670b38004e1e70e85b4a67912f93f69996c571e0deab051b1ffad32e16b7a5f93092d3f11b32df90de0405eedbcc122f97066e8455e1ac186c37634478e2a1d9ce9b3f17209bfe611ac69efd50ee698f9749d095d36edbe03e7ba5e28dc69a44cbc06bf3e3841400f3ca60bf8032e0d4d09b6d68156ade78a488932a6f44af7394b148e0f5420594ed37eab06f53e1cb266fdd16ce53ad4b012e341f99cfc78d25dec223b30f78b672ccceb034f3f5e0168f5a6287e7d6880ce00f3fb968fc3f101697a126d9e1b39d03bb064bf52ddde36acc2be4e6d753dfa767230f942dcdbed8fe360a9d3e2120459c24274f64761ddeb7934632d900ac60e5f78bbc31c94606173cddf966f86c45d51b69b9bff5fbbf8a7a94baf284713876be230a959347dcc4e1da5a326a78c9c28af0dba48877d0ea0cdcec88cae74ece4ffaa89a9\nTAG: abb6640954263403c1e8aa601023bc08e4e56e0876908ff7c7ba5c5effeadee6b98fe24dde\nTAG_LEN: 32\n\n# DIGEST: 989e0d1b57528f06473357bb0001d552849b928083a8bd2a4642e72be7dd71d6\nKEY: 3b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bb\nNONCE: d55813e8d454817c212d3a0063be26e0\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f9823\nCT: 8d0aa9d329e5b0dada9bf8d38ee8a980f7dce1ddc16eb9efd3d41006b2df5d3daba48f09736f75d8abce242dd2911cf80b233530e8d70905e26984b9e392063117f20e92c0cf0f3a7a50c8ee839fd18549ba2db16f724dd3d03a2b8e79877c8b4a213150338e0b1a4e57042886f3982579362fdf5204416bb0edbb8be587a4a2c4ca64ae03cb7306785d2eec45eabee789321ef52b8aadd397aee9acb996da928f5fd2e6f44118a50f0bf044a316f954c45e2b6c17120e873c15cb80eb44d2565609e08644b561219f0c343e1d0b01904db4c69a03a4c00479ccd4f8696579aa601fddc12dc61bc72a40e084df39621e0726b1dab7894c68b4182f3b0ff8c4e0d46bec9744d95e27646904ebfbfa7a8b58de71fece8908a14ddb9157aec0c97327f760519594cf8d0720040e7e27c570dba60febd7e3f289e1f583e721d67ff0d8d5b31e3a51ab68a008abc80febade9cc2023b35a7b001bd5196d9785789b8dc1ffa1fc69c6c10f0eb3eef9e764c1e1a40d26310c567ea8d98cbdd29dbec0df6bcb7b222d4b86941270bebbb0be0535eb15903afb3c5148372e1e616c16f300a6698c983e5eb8fd42dd6816007afe1f42f0d86cdd2ce4cdf0c0ee2fee29ce6cc326f91686e670050ee76b5f6897639d5d30df19e4aa15ae3d0b73d6bad3e870\nTAG: ad95c5e3840e677351b30d88f11a43bd8e30261054a605d54ad1777b82804210c251870d9a6cce9b3dc5b21a7b7b3f77\nTAG_LEN: 32\n\n# DIGEST: a6924d514c1b926c930a9da2091f42787d1e8111ae5ce12a0292e9d25d906c8e\nKEY: 61792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d4\nNONCE: 54817c212d3a0063be26e0636617781e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a7379a5\nCT: f1848c2b876ebd13f307d4a98d2834e994bc7b884b767aaab9e59ea5893a8dfd82d05c3fa9a0a59b8720c29c5ebb01293a30372c05dab5eb3c3d2427915289ab212a882128f584e62e201d10df90bce4202e48511fe41c8f1cf03dd2a843016802b489a10b3b3b0282a684b2162ddb2f9dbb23d0ebdc6820dc87263547eb00a8e54dc9193f3e1c2fdfce901fb36c982865c76b6a49cc2d6132a825c645be6ecc30af67d1b5738f69a4b8e6299440a3c396dcdf70d36079239f5a4f9a7ee28e4765a009324a9091472091864e7773708c1d0610d521a8634e1a6c1505ce79cf8c012caf3d6578782fc374c52dd6b78a5c7fee68ab99872ec8dd4b55858bd48df1ef39d2ef8c6fda201371a41d086946ce3d8daf107cdb5a5aceed9530b40e27a274a31de3688e0bb2fa89b6b3dc8bc5bc146d4fe0b7e565556cb9be1575e7661c43d4f385d571439fd3400841b96723277edea50154b6ae2b93f9040e4c5613690f690f3330fe06b293386de70d3c313985eda63f7f2ea35053b53d9bf8de93703bc5a43930e44a0ea6ac82a102f957ff13a19f42a328e9b5b586433d421b520c55fb6e2f9eaef264931679866a88731d716eb513236b44661b3d186d7273320a6fef5140ec5e6ff32da365ff9d393143a3e4f7e62b9a065313738d437b550cd1694c1b9900\nTAG: 5ffebc8724d29794a04cd2157479f16efc49829ad7b25b7a97b0e216c4092711d833e82d4152bbe1965398\nTAG_LEN: 32\n\n# DIGEST: eac0a728eea929714da1c2a7934747811313b16a918363bd291d7eeeb8082047\nKEY: 16430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d\nNONCE: 3a0063be26e0636617781e8591a6c6a1\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433", "a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c0f31\nCT: 9ce57bbeec62f4bb724c36bc2fc4da15d2f371e09f9de5cd436f99f39ba84a07959c002ec82006a69f5624333abf264dc93ab263d4202e8a078890927212f68fcbc2850dd569498db53b7a8e24921fa186b1575e6150b1785cc649aa6728ad08a57e6eb1aa1eb95635fee0ed3a689b3131c939e4de3aa8ff479784b10fae712c9d94708a8a4095acae2ac4ffe2685a3d1b654aa3a879683c54df1aaf42ae496d911789707c2b7598e418a8bb4b3ce767fa7d9f970691b010b529d770cc3fb9e5dfb840a9c815e09f47a5f8178e91af1ff10c1112c0e7f70cb9d31391dd7e7002a80774d101e18407d514bb28d5cf7db5a7c694c1cca10b447689ecc00aebde49652f8d8d65368a2f2e8039a06d7660c7f0743cb5e3144e3301509c003e803ca47587afc081b58799952cd17a53a891c6530797e288ff8543955c3011ec924024f7e2a1dd539285075783ddd478d4d06e7c20bb2037a5e9ffdfb5359d85a066f0d23aaf762996d97c15f7e42659395b7130945b62f6ed8c31996ecef0c5ce098c0530fed5a012540a3c4f5b1aa821a5c2a3e25c07d61d95de4d124d64cfeedbc8d1925a1d75a01e9e870005156786181e7c606ba058e29374a45f066cdf3f5b4acb607e6e5cc56c95931438f4f8973b7124cc176ed66b83d398b7c7507cfee916818a34c4627560f525a0\nTAG: 87f23cb98be68f9ce0a655e72b55443984e2db06b61f29cbca726534113013f257f403766ddd\nTAG_LEN: 32\n\n# DIGEST: 8ad5314b867b5272f447c02f6666e53ceb37d99aaf1ee5833e3827cd1725b5b7\nKEY: a058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be26\nNONCE: e0636617781e8591a6c6a196868dee0c\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e8b6e\nCT: 02c37207bdef46b95ac29c1f55c4068c5ac406490ed3843c9d507fc562a05bd2e8f6dfa6446b927ee18944d2e6e87521332e0e4d01ec2e1927e89c367e465579b0b7a9b37e32b57d0389e1d313ea25223f4b2d93fda46c87ad9c5fdc180c031df2c43cc53458322ba003c3502cc4eb19ac388e75f2eed8e2d071a678fb9d23a187644ac6e7e1ba36af68225950fda501a403bcb8d54619f4bff98e5b10d68dd74ee86944974d1142b87fec029d34a2e7c35c02b14b17c396f60a07f6a9676430a7745a90a223243bef3fe7ff6b555c40c93aee082f0285837a3abe8afe704b80862f59884e1fb71d3e7906dd33e951d93b6827c787d6c8666d0a56520f9d1bd78620ad0d806d03ce996e5b84e019877a320508ecb30088a09abe023a92b0956ea61020370f8df95c78ab2d136e18877892e7ed1da39a40550f561ba041b5c35bb82631dff76e8f5c4d3cdd2c8b3dd3d49874219ffdd6c9441190d71e2bb52af177a0961c120a68c81bdacc4766d7c0cef8bcaf2cae6906571d3bdc5c332a2bc81528a1529d0158af7e78fea2023f3b69134f54490a7a27cf1a6239e99fddd09d01f11f6d3e11a9a67d4233d9e4f6f26c3e065096276b59904006353edaf40efdf9bb77112c5952ad0bfc8cce42a2e4348b41530dfa12bb993fc19f40766f843d3428f60be569faeafead6a412187b3\nTAG: 2007b01b5ebc9c9b6aa3ca1db3b26e6e3df8db6b41f774220ec075286a7e894dbe\nTAG_LEN: 32\n\n", }; -static const size_t kLen11 = 405462; +static const size_t kLen12 = 405462; -static const char *kData12[] = { +static const char *kData13[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher aes256 -mac sha384\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 2e661c639db0b3d4e89d27c55e03361e12fab46ed2e8c795f131ead30d185257790e87bcaf3af7fa0399583386f12648\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965\nNONCE: aabe477e0cdd46be99371eb8da7dac99\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: f6f8de8547\nTAG: cadb667c8c823a2ff44444bdc80dc7de80e5faffb40880dcf4d20f706109ef1d8fb6bed697545eeb0060e7f680d30dd70e8ecd3135b7e01e895983de56fb0889a4ab0856040dba57e94dcb\nTAG_LEN: 48\nNO_SEAL: 01\n\n# Test with bad padding values.\n# DIGEST: 2e661c639db0b3d4e89d27c55e03361e12fab46ed2e8c795f131ead30d185257790e87bcaf3af7fa0399583386f12648\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965\nNONCE: aabe477e0cdd46be99371eb8da7dac99\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: f6f8de8547\nTAG: cadb667c8c823a2ff44444bdc80dc7de80e5faffb40880dcf4d20f706109ef1d8fb6bed697545eeb0060e723a2dc7485b3546d50b6ba7fab863b28\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# Test with no padding.\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21ecf5ecb1fbf535c5e6495a6d7682953e19eeeeb70b8258de6b5cdbc0b91ecc2f7d7a555da8ef2953161857f57e7d79a5dabd5d6faa78c72764fa8c6331d963fdf001721eadf3e94694cec40bb1458c9e1468d25a326f26d28732a9837f334eae69b35647b83d2c1daf303e4aa64f1ad96706199b4fa5cc40019b84ed5fd0b23c038d7d74d85eb0a2eaa81d0029b2f578890f488d502309a5c9ab1be818a98a8aa09c47dfeee07dd4ea879bc2101f7dcd0e9964761dff1e276f088ff8220f79c2a8633567a46f751e75665f0d843500696911d133cf637fd05357d538ebcc6081b8907e8e94e5ecec315d055c80f948a82f4c14e1295b7acaf2c74661cc41fef86\nTAG_LEN: 48\nNO_SEAL: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: 2e6894abd3cfac4d4020094d02c6db6450cb7367b405443de9b5f2ab444b281848ef5da3aed9ebfc054ae89af094ddd6\nKEY: 7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8d\nNONCE: c55b436965aabe477e0cdd46be99371e\nIN: \nAD: 936a91d0b5d2c0267218cb\nCT: \nTAG: 19c5729c83b0d6f8a120a33dfc5ea4872d2916a5c75fd2e16caf8b09b4674c40ccf5be816e9dca5768c126937051203ba63c6db5fd58d79ea8556dbc44da8da3fad14be20fb3eee5f150b85f2c738d9da8f128a00aef3157768fde594679c0b8ee998006fd5a88e535a95888011c60e63706441f6838d4e8ac252631f17d1211b917ac36957bda3d4937c463485e0eb4e94fd6afa67395c1baea194b494651ed88bdafcfda411fc15d0b03426fa2a15cd92ffc7bef9bb50b63420409a33a0e5fa494635f9ee36b7ad27bfe44c6470ce77216d0b493b0a0316502c09f60c040143dabc909747dd0916a8c74df15bab85a19152db1388d20a9710b0caa832e30fc\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21eb1103394d6c20f66e3ef30fd881b03cec92510c8007d91f913ab27cba90cf87fe2c0ff592985d29f2885bd434b14dbb5d79e5af098fb8a55cf582ae3b011c201e18be26428850e55b06141885c522172900b66f69ecfaf6aef1c4279e00bbb085ae590a67aaaea7ac9b250f7f1393a576678c3d6f18e4bfeaa38a1ddc3da051fcadfc7f7a625ca43987e4368eec351ffa8f1039424ca58e20bcf2d03a4f6ec65e2aacf6bd3eb27aa9e701a845f4d2786faa06bb86c05ba2b15e059402c11745e187b83d42d17eaa0a4fb85279ee629b5fb00c239911055142272c0498c475046b2e2cf715a233629e4bcf9a078397b76f87326b6d0fc07eb4f629d78e09f1492\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e01fe17807178a0df51974663962208c1ba1270baaf992fd88c052dbdabfa44192374b683b098d400e37955844ab3908718977abc7fe8a65399742d29921a2dae2952e698253b2d669532c9b4bc4c59dc15f08a581b8fecf882a60897558f62ac2582e4d9526a0591083abff8c225859a5f0754a702094dc01e7584577c09275f58916194325df46a8343445bbbf1dd2311c750bfd97211ff5aa2d239dba05dc0863016050b317e40df5239a4baa79e11f2eba21d6467b89136e83338e99bc176009045248d3d791a16d68d9297d535608c4822f4d7eb6c2ee08e9588f365a78eaba1fdb94fc4d3c13a69bd8509881242b290be463ea82a4f93875d07a25e2519\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21eae4d4548797c0aa1a37c4bb53ce0814b8690fbc4705088db32992b5f7919c760d607f538c5619061f6d3e833080fbbbf99bcb217254497a3e45d2a3022b78e4e0fb8c97ec3aefbc9e57c401978d89d354dfd3b0ecadafccf9372231eab25f8e493fc30c8c15f345690becd5ed3a29980af216ab1d08f8466703b3aa073fb528e412b029ab9dce6c47860704da44b1bfd1c8fa6250d930653b134463e163728cecdb48a9fd4341cc546d5b9739766116f5a502cacdaf5f6940d227d7f5e2904cceb4ec82097100a129c2c9baf08bb56138765a1c2a337b214ac835711c74f1e3cb7716ab1826d0410ff77a0c765dd7b6fb45e6060bc4b914f2da3ff3a0dc62748\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e998a6baa8e2913ede9326e76e26b60392521c48655be437422578479b6b8d752ffe38044900335543604055c131db58a4569b69a2e8cd51fdaa6e52c862fed8ca0245052ea5fcb0af1f161d70a9989c53185bf3b928b3b5a6881bc28a8c6b997999d83481546be05eb5e1c577039035a2f6dfc3fe8b222f451", "aeba7d0bafc6150efe9f5a2b8a30784e5b2162dcfe3a047e9c69b4da13dab893a12a13b18a1f630eed843510e1621d71e079331ff164e71971da32e12b93236d119d28bfad495b4cea68e94fa47a385cc258a6e0ac7580b60479028bb567dff9665ddd143bb5a5367354a9e7c86d3d85652820fc1e7fdf57d7ce73f5b9cb61872b59e1a4eb6719\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e153f16574e19aa533db209d4d58aa70e0c2ce2b52d9f5eedcca3f63038cb1a1ce4580efb8bf2e7f6ab0cabacca83ec2adab9431ff530bc8e595b8c606e08da90c182000a84c1b1594e27f32d256495ec90e5dd88b0ebfa77b213925aa523f9a578ac242ba561529448d18310a0c6ed8fece89718a8c28421ca93e26c1f461d4ec34968cafe12032e8fd0cfdbdb44198a4e5f3a1809ab5daf3ffb144f61e6c9f8e70df160e671e50007569f5110785856bd0523bf2da54d5031a13a661e73248808e20bb85a14fe9a91d10b45c8dda373c9de0c1c231e7955f74d72b07a0d0831c1798d22b36fc570e15f011d9d487c9d87359761d0663be18451745b3ae89354\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e9a27f99c2f905cb3adbb1dbfb2c93c98fe9239acd2a26d3d678af1fbd686f1d2a700143c401bff03868b5f6abc877f26ea0be72f5cec78fc1a963f8cd4b07b3a300a10d93cb9fc47f84d544b315ca63c092d51c9a9450ca16491ffec6bdcb25ee00d0505dd4a159bb02d0935d4b42d54cec9d987b9e20a3bdd2cf374d20ee991ed65ca77b1fec37b74084181b0ae6c61fad604002b1d9370addb1bfda0a660ccd1e6d99be3e11e5deea9221fd879670e8dd7b5f6d7d64742daafda3c83ad079a8723f42e0b67eb2ce7f5aa641239c0efed52de2984c80d90cb02a7bbfd307ba284e24fcc0d53516a110457eeed82fa9bf6d8d9a73ab1c1d392e5b6747ab3df4c\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e72d25bd0737c87458ad056c57bcdce99251e197b862a048080974a98fd4f3d1b7bcd403eba809709e9aa5572008f6da687a6fde624ce3ed7a1f314857a3e7039eb22a62cc8bc1a2c2a5bd7d5309a1ae1fb54cb536c9a6336e3c16d7ab555e0869fc76fa46f1042727640ad8cd5b16789321ea52f767c84dca21239c09f938e902ba4ace37a4f274b6835154d46fa54af05eb53a0b39384506948bff079551aeb4bbb5c4aa85982e02220eaa99cbd06fb09c4e20c25d74ae4ef184de14b627b1f28117064f71d1cf3cdc287051d1042c254f6eabef996d059014e08dbdcb603686fb1252cf18d4a276e7e9810b873b7324c1d8883b61372d408de973313888aa7\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e0baa8dc7ad61bfaa8ff40278e99200054dd3842f440cd98af9de08607293c9ce1294fc6e3e1a766ccab6cc44797760b42948838d78c2ecfbbf2f0b6d0e114c8bae14131b290bf530141412e609bbcaaa05fd629488ea02598c3ac9f28ff9a8c9e675bb04f210209a49789fcdd2603a6890f2376fc33fcef2bd3c238e7aee4d4690c74c482849549651aaee9469022da79b3144432b21d83f4cd137a2bf01e4ee25badb5fb03c7237abd8af82459e2d767f09862e0ce19f09e9d9740e38a564df15e741b5c8f972731cfdaf66ce59323b76147fc56a0920c87407767f36f989b3de9e56c681376e221a4e8d50a89f63ba72b23b510480f35692770e1cc197a14f\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21ed3f275eb755496a78214b857ab6c9fdb71c61560bd3be5927c6c4a6dd110aea8176dfe91e22df5f0865ca1c0e95b7aec2d1df1c98dd5e7fc763e6e2a259d0eceec49c4b0c9d4122dc86d5eddeebb4fd8a7ec48fe80e17b95b83f21890373da5ba57e6d0fc06037e4d794e0f84c6c300cdb7ac342d9a94448050580d655de0e161810747702d5e5a999f519cb1065b627a15cf3beb1c8d9c30359bb4ddc96a99329bffb7ac2b56a9dca45204d5bbec0fd3ebf698c5cffce8b209785378b1d317e34449cb1ce406919cc59be5b27f6b0b3f5e47d0f303a5713b1322731d7cbe4a01355be0b1f20e4307163304786d63245996a463f3674518bb2c1c7895330fce4\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e076df49cd51c5b172f601f060b03a8bb61fc7deec13b0f821214ac4246d58f5e9c9049cd126bbbb9d3b11519db0e6465b424475338872e93dabfac2d188490662e72e49286ede26750999c4e4742e044c017ac81edcc40971fbe0cb2524818679e934eab3921484cce8c70e01fb56eace974494239bef8e7020709d6b78ed714661dcf70d9103ab61a291ed502e99cb23c607177f5961cec5838fdea2b37102f7c298bd1c137b47a1909b76162b04df4730c35c46ab8b32bbfe0c3f7aae32f8f1f08c653cd1fb505435ce4cf0d48828ee54d3eff517e9ebf8cdb044679849f3ab264bd0604a5b1013ed840df5c629b32bb181c59401f3a5baa8b7cb3cfe02c6d\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e784d93b4fcee8a8e0fed17f50e701b29d54f1ecc13d0ab6272acf73badfa4a554a49efe014644c6e4dfc59285abf6e56ccd6300817e1ce6fbddf6c7f68ccf14ff1f0fcbb5fed2452b61fe59a555efa6bc00586d365dd449f0d1682c0bc31271f16e154b309f5d24b0ccf227245aa5e2421a0a6d92dbe45f9ab9ae65e90d7bed4e8d1c1ab01be3117115971a496cf63b1e33f5650be634e6f3c89cfe49b981743eb31fb0de9b441608484a6f7ee7cda3337a77d25d96bc456a827926a4163ab02d6589fc0da7567825175b3220526e20b263621f1ca35b5ea17f32b0d5ecacb8e0df6cb9533ed206ca568aff70e6e7a3c87369778d4045d4e2bd6267dd3f4af22\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed", "10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21ebd0f25a074e0154728d1df70275186f35d22d31b9948fe7c56e760cae151ccfa8d332c0269790c5351fe30589005500e36448faf01d3b664a61243618814b5d15c8b324435ec1d88737e34bd44a80d728c6c99823c666e8b474d94cd20df7d65e01b5b740243956973991d9e4cf55359b8effd5dacc87cf45c3e05122746e93771c8f62a294cfa90339ceaec83ec9b0cc5594161876d685fe5b6f4ee13ab9f023c3597557cbe2aae219328466b9c527d2c8d178d2cfe7c0dba5ea8bee27bb893e3199e1b3f0426c2bec57cc0c0780e675734c830aaf1ff9bef15e0005a759512d307499b439acb5209facde61e641bf6da386e91e173914f9b989d7c6f910913\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21e574843178c8cceffaada0e047155cb49866fc4d51e26a0a20dab8b78a02e2be901e0f10b0da38cc272c334c2f3dfd02d136adf200a93951d88149ac7f9aa593acdc18377599b3dcf6a33f7089b06f48899dd37016e0968d679b8aa8c3638cbd0c0f565c409b0ac30f962342d6cc780de8d047916ca4b38214e0cc1f1eff4f5cf9cf59c11d51db7c1bbe692251ef48570e0cb7f7fc8842b13a918c2fd681bf0ecfb90f267a6d40cc4a2b1322f613e9335f8455a153d435eeaccc9ed806509a6f34a773a2151c6352dc25999a0f12a7cd6e67ef58074f8778f7e931cc0876d29a427cbe2293c66a6ec6f2ea77d3f18e9b2bb8c61c1fc2a88ec47efb8f9eeb72856\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21ea09920a6d82e0a6a39ce1f67633166ce032e4900c22940fd7eedc8756fa24ed0000dd4371e72138dbc6dabba6da21040aa05c5ab34285b10278cb8ff0362d5bd5a7ed17dfbe6c2671ac9deb97500dd135e2aedda0ff351748a0b31482786abe4b3f1f94b5a2ca3adfe1580dd9e55e9a261d18c235a69bff42e33a1d0506226e51fcac944ea4d7ed66482294c799a3b9f41f959219ebed1c509dbc4f7e3f6e9f089002e65ae96cfca63ea847b0f53549a5c98b2f728bcc48b797a776f71e321647393284de8990437ab55b24209e6f513e355ab66d9d99422b86207f072cd64e118faddae568b14bede5824f56bdc8a8e4ec4206e6668ecbbe12719f11e4309ca\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21eaa444155ac1e211767a48f14a17434003b25ca3b4729dac1ce285e079efba7d9db0bb5c5f9411dcd18ff952002950caf42ac599a56eab51813d662564d09fb1d2822dd01e1d048be5759b4bda1ed37e96d9489ac190e5bbf97b92c07f9d38cf517970bcaf15d4228c9e7b2379142fc1ded9e42551b94c904e49dfe06810150953e61510460ba331d8194db052d753685514a7a3f65c13dbfe8a9f8abdc55cbbd278bf5707b8bc855d01d37abea0e64a6dd9ceeedc48bb53ecfadd3d5825a1b374d2fa313c6430f08da29e792eeadd8f3656edb97ce82abdd15ad0102f10274eed3fce7469d3d1ed9ad7bf79a4730d3c7cefb4caacd6c65e4ebc82eb8239b62fa\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21eb4be0ee08bd6895cf91f221cdf9c8c8b27bc8ec03b62e23f4bf3ab4ca2ff8445e1414edde5f6ec2da50062cb1104ffbb9964146050df7c2feb14c9b5da22593128b6ca9253a5e29b0608be0c24a23ecdcd7e80e27a2c23e0163125cb04c6c0bd4087fcd53daaec3f1980c2a09eb0448e91d08d50349a522eace7744af6cb928c0d587b2039d3f6af992c53777e9ca285ae7e193372a0bd6dec60a2b696debd4277842f83227abbddfd5679bc5ee658da889869b65831ddf3e753bca6249642673e2aeacfa3735578462b56a35e660dc48086a75abe177cc05cbb7ff204f9f4dbc7df5f0402594f8cac784a4e9a61dc6ff299501d09357b80d2e8d792e1f592d3\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21ecf5ecb1fbf535c5e6495a6d7682953e1af19eab57980f65ff17f4766ce3e1a75d648c5b75a524ed3ddb78ce224dc9d1d25fcd3ab498bae9416b7383fb1749e2e17db9eae79278f5ad805b429dc2b776766e56e1b9fa54fe55f09656015aba067c6e21a10abaa873f8fc3711b7fb865b8b77266ef169178e64a0c31796ecdc8efe20ce6db011d86cecc86af63742c4101733f50bc6fa2cf32e74259320767a65077e2ea5a214c45becf92a0d76c92e33c786dddadf994af73e120f6b00a0a72705c32f0507ffad6181ffa2643e3269988000f9e00e028321755bb68893ead2c389cffa93a683b7b06415404ff1042edf6b605d8388e51e02011f0e9f0fe8b4bed\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21ecf5ecb1fbf535c5e6495a6d7682953e1070e8a1123db78c488335fb25848eea3b59f54b2c3efb36ba411158063d661fc78ea24fe776550921a57504a30c1b4a6e1628ef3044f6ebf5901cf087cd438a3292af0fa5e0540f63c2f6a30e31b25ad016196c56d724356dae0ce84590169b78dd3f162eecfbe9f3e925d235e84ccfd8119b0370fa6590ba980e9ab7b0b0005cd17937a66b2bd357378bd4af24808e2a99957b58a88c4e42648a992202cb77ef5d6975b6f99a6a178e103155dac58c7fce159ccd49165095736f7e9f6f89158320ed9f9ef34fcef41178328e1d8b7e5950e642bc96ccc2216fed8d2f79a9b67ffc7a8b15405a806844ef323952c80ef\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: b8da7dac997deafd64b1fc65de39f4f0\nIN: 936a91d0b5d2c0267218cb7090c61713\nAD: 86d641b87797b684e0fb56\nCT: c90e0c2567341ea7e9d968dbde46ecb4\nTAG: 8b4323f68c2cb1882cff4dd9ed10f49aa406481275509633d33028a0b510a77e780d4297ab8ad09b60445146ce85b21ecf5ecb1fbf535c5e6495a6d7682953e1183e21c4c4b3a1949b25212a6e25ab444b51742e7252842c99066e5d40ff6cbd768ac1474faa57994cbd7573115bc1e32901db9c9ee221b44bee08a2e5bddcb2dc3b344ba11a20ffdf6e85436f8ea8a630bba4baecb3dd8becc13e43e1119f7506e486006b7d30c88e53c628ac4f5036d27e78a48d1569e17dc810653146f0935462c32839414960e386f14d6c2aba23b7c8cfb3ef552527290f761be91dbeb4ae334a7fc2172f0df6ea40add363d13fc0ae89a6adbdf8b5e572f0986b03fd6e0c6c693ff80c742f25c15112c1f2d8ffb1ac59ebff6f62af439dcfcc0bc26fc2a1a0ebd1278f14dadc4c83a88d596a9d\nTAG_LEN: 48\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: 43a413967bf0fc76201e7b4427191338c74b86300fbb5a193e01a1a4c743a36168ec2f52433b8ad4075186e5c7fed1c0\nKEY: f97c3961d8afa22993a34", @@ -596,16 +602,16 @@ "2be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e\nAD: 6da12dd4c27f4372480974\nCT: 2b54aa2f9adcb4109a34cccdb246b73eb2f97df4da95bf9ddd0b85c53382b957cd344514455c2de03173cdd5441f783d1a0673ece4654282e3cb90a79acd53ce4f9da316f2958b01b791e70d9a9379fe87db63ea95710be3b89f4411366971650680a5e46133b3258491c2c68c6abfd53b3aff803ec0b2ca2f3dc1168f8a8deab7bcab3ac5afc7df939259d50236b241699f4cd3e8fb9d84e5e8e178ad1e39fd5b37addb846eae3baba35d7266e3720d5cb4498b0affbe24fea46e254462227d16ba181248aff05e1415cc4ee81b51756be206ef3ecdc4a709b591375a2758137514fed5d954d9d661a0fba7f1238b06ed32515afbefcc296c467371b1df69dd34eb4c1a25feb20f9c77052eb02d2fbd90b3fc81256e30d1fc54c731b4987f089857bd6674428e01d7a2247aac43fc1ee55def21faf3c7cee4cad9c9205288b5d4b52cce55889fb3800ab7efd9a9c8dcf13199c687d70e306c364fcfc67b8decd24033dff056be0c7454b8c991aecf380da7b12c1332c7b63f32716089168e548bb92168307b97081a4b46fd56d85505f1dba460b83fbf0ef8155668fc62f1938a5a2e2c1989d5ff58435e3a3c8202ff4e5209e6d04f0a00e6a283bbbec8ae88fd7b52f3e7ea0df93e0f0c80fade89b9d521fe8a761a\nTAG: 617fc459c1b23f56070c0b8526a621c052774153225a30ec6d9cd1541be00c3c0f190892da6ae4ea368c2c5a3723f0b59b89ec27f4d4ed4d1a00\nTAG_LEN: 48\n\n# DIGEST: 80dc411121ed974cb7c835fa89f4118eabfcf42e5bc720b82b57dd6f9d0e82dbe1cc7f9940c24989ebf16d6cdc56018b\nKEY: e9ac9f98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a\nNONCE: 0063be26e0636617781e8591a6c6a196\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c2\nAD: 7f4372480974454879c41d\nCT: 2b71c8e3167dc7f9af0b0262a21fb3a0c96e4d718746e696727ea6ad66f7025da2068763234fc0145f4bfd1fd72823a561765b7deb09d94e450a7900d9bbc043fc357b4b0b7a3c58c9296ddf24cdb1e512f21c7a985149ecd8ced6c37b8e978478e375493c6d4d8a6370200364bd475bf3ea057c027f0fdc943eb995437420672ac97605c32646aef8a041b24c7161c8d9442630e4969f03ff0496f76df605d074de57c2fcd0148b3775e17f33a732b6b98ddc859aeffee95be88d82394e1f1afefdc8495c24dabf73b8c6c6cbcac255bc72269778bade183be2fba30b7689ed9517fa5defaf515826ee20144f870efff3d78d34c66c61a87f1b0d9376fc0da7bd0cfdcb7393d36d1c4bfa21840cd06aa097655ae5aa2902c6ffed0cb1065d24664e5cc28188bb72f0a056a6ab451e6a6eb030533a9111c3744a4845807c7282e85a24daa3a06943e8bf0471328025995fa15ec0164810405bee5175211bce9fe27d321e4536dd3d6e15469ff370d1c400f29bae50441c085ce78f91fcab367c15a0b9e3b01f741b067709e684d607154875f34f4bdf03fb29ead4687310349b1501b3afeea224bbb95a26c25622e40e244214af2bbf3907905ecd88f46c89a5061f27b19adbc6c788fbc9ccaf9fa6ffb101c4dc2c06efb3cab8f0\nTAG: 04126d789d9b5d62a77353e22bdd46652a8619c7b3001789a7ef746fe37afaf8a509c1662da515b4a8c4e8292e1e07e977ded352f9\nTAG_LEN: 48\n\n# DIGEST: 9e5fa1cdd02e7db7705cfe6107db39192c778c1ec2f6c58116e4159394858791effea9245bf0ddb0c6982cf91df5d9b2\nKEY: 3b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be26e0\nNONCE: 636617781e8591a6c6a196868dee0c1c\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f9823\nCT: f29d253023b7c21c9ba097e4110101081b3d6af8d9d3b785c4c3a0e47a152cf7eecb33b5717e7f0a7d78c447aab987a70bc9c972f6b7cb4f43e8ca5001870cd306df554c70b3c327215634ad992c6d5b33f759a22123b4e376132656f9913b3b87bcac24fad0f123dfbf546ee71292c282c1c4bb21b6f4d6a56dda5d8968da822c2f6e45e7cb9284bb6f84eb64fa50d418104e966f488828cbd6f312f05c188b68b8aa824d7df75b4a2edfff1d67c0c6fe708dcae42ce7f1e11164e5ada8babfdb81f3ec54a8735ecac4afa54360b2fe766c7a7a1a4e037d77e5d4e5017399282ed1fcb8cb1b234f9565261449b32edbdbf01208cf573512cbd8155af6e00c4ffa98e2f4dd3acbecc132f92226db83fdc28f6532b143a8c25625b759a50b27aeef92bf840b77aba3103aef102b4750c752ca422ff6654ede8341306fb7a1d4251e753bf19d26a8637287634c2ca6baca7d3fe0edf5fc913808976006391f9f16657958374e2e0715b28e1bb1446845674c88c24f369969de33fad62118e24be11f8db058b27aa15bdde4e3ff803ba4a264eada9d69f3157551b4f2a728f223dd986708c9f9763fc2d02101a40a0648b1c211f48c0d720645fd18beb6137b2a7cd0ff20a445e99d66a872c3714e52a553d2e66ae3033778ed2837b3dc540b50b7\nTAG: 0e2608bc3483bf8e9db8a2abbe288655e130f0459c4dfde80d3ca84b598695e2e678735157258dc238b6457f5e464473352e019cb4bac880e72332581d5aca03\nTAG_LEN: 48\n\n# DIGEST: 703473db66fec69eb1310c49e13b6a10777d97c5239fdd4a32449f2b5c32bdf1d08dddeaedc0251cc0bfb87da2030de6\nKEY: 61792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be26e0636617781e\nNONCE: 8591a6c6a196868dee0c1c0781065055\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a7379a5\nCT: 74683b4d9443a715d1783e37f9f33d37c8c7d47d628204abaa590cf604ff88070045f76f8027875c1ad708b601200fc8f181757f8270a2d146b22a388c015de42b2b271d754ef89b6e4c3ab1244ad81d9978bb9f43bb0fd99ed601ea0c14ed1127bda4b0960c500663", "bc4f34ee9d1ff105f857934fb04793a22208a51f13905410538ee56df3111e6a55776582a6c927b95c2b6e3c1a91355fbba474046a26a6480138be5dcee13215edb98ee28b75ce567ccf5de3d8767078d1f9f755cbd0d19911cfa6b2a6fa97636c9984f2e4b86276a860e49ed2a1ce47fa5572d80b384c37c091698778a52c6e1c87ac73f26443803ba2945f8ebf35f3ab9f2f0136869f6acae5eea4ebacc674679a2c58858452ae86e064242183cff9306a3874925af99fbc4b919cd5f949c692a83786d9d4063a10598acfe0fedc863330b45a4a2d9eaee3a2ed8fdcc848feb6008f14f88e6e110c9f2491a83f6e216ac034dc1319d63739df19b5607001195ed45feb35dbb47ea38cba7a5051db17119631a40cc99f7f956e4b9adf05ff111faad50e5ca78167ba37dda6019e3786b042aa57d328f639e12b782743d0f94a45a4ecabb72fce616c416ee77d8031542a4e59638696c71640e09717fe9ee248097c27c86fee64806624d9540990410dac0cbd06330568bbcc303d10\nTAG: 70a48c36b93a775550a2cbb4789c75916cdf2df8a1ad1095e327f46e91a05b4ca26e01fe51a51af3a5d73f2b653e76eef70a3ca290b1482f3279c7\nTAG_LEN: 48\n\n# DIGEST: e96830967214251621bbf449099c3333ce8b37d4417d13943955d1d56ce43fab845de9e38405f6cc4fba07b8f238f80c\nKEY: 16430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be26e0636617781e8591a6c6a1\nNONCE: 96868dee0c1c07810650555861d449dd\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c0f31\nCT: 57878ab87bdc04e3c96214d485d14caa3f65c7d0b7ce5a03b7ab53ee501e21b91d227423dcb5a8f4629c01561bb17ba56d433ae648f2886ec087b9f6a2beff3a079ee25809a12534bfb65e94e0c2f7ff74497db708219840266102371609564e7dbc476bcd1d00866bef78a7f96843478760c2ae7338f789e73a2bb8b1a3e604b6c38cc0134bcfda72da30c5de221390099396709ced02a0312e6f86d29852878a6cb1fcf966d62b72d2099bd22007dcb1d42a8903bd70b5ca5610a8a4112837474963d1e6ce105b8c58e548e553b60ab5e1bbb9f1df31f4518b40bc6d69078a62013bbd78c9786881c4c53a75a710787d15a9ff0a4f0bd355cabc7df781702fbe124232331e0d0260f9810190245e346ab086ee986c7c9c0c84a1d531fa6900aaefd0a8b9b9c0e0372751f6d23cfe9f98294fa114da2f52409bd6ed73069f0dabbc7571ec10161cf07f1fa60c2901a05fefb88632e3e88b62a799b80ad6ed506c3442f064712dbebe893ff034620c0fce4a2d89b3a101c6652cdd46cf98073f7de3e1c3efa8211a9ec8ef7273ed0e1333eda03b8a3c57381175dc7495ca799b419f72169534dc8995fb0f63d396f5c5bbfd86f9e1822fe8590b24ccb11f7b66ff5c515bc7e9654238dfdaa70bdd6b7236954914dd332886ef2840c5aaace8c39968ad277303d78cbe2f\nTAG: 7e02b3d7d2f5af4901d32845aa5d64289a40ca03a2235c8801c7d4adb18a8c3a4e84af83c2842e973483d5cff6a1a6050aff512cc7b9\nTAG_LEN: 48\n\n# DIGEST: 5e69338cb47e83dc76efcd3d20ebb4a9c9e8288b709c554a39f344dfdc691b58fe2234ec740167f6976d1e9f2775cca6\nKEY: a058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813e8d454817c212d3a0063be26e0636617781e8591a6c6a196868dee0c\nNONCE: 1c07810650555861d449dd43726a4e03\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e8b6e\nCT: 7082642b0cc17e3ef8cadb87d81d3e973dd92e18a45e72833b34e6c4a2d24a77a1048b96e6c19a82732eb355438d577ef8e33ac646d374d99ad15c633bfccbea5e31ca27aff9e1e9b335708bbd62e3ceb7db34178a9111fc2a395957fde085b7c17645d7a473326919e7c24206a332ed8db0ac372aba510c72f1e3d480197b6811fe9bdaaad328bea365a8e732911be04a7e4bf8adb9f7d2d2e2b436287b5a5eee1dc11f43b7e12d83f83c1d928d1ace7c625abdb704745c4e2d5575aa4f0eface8bddb22c9db6aa9a32f5fe879b8210ee78c09c0be83e039ca7d64bef8dadf89bb966966e0306fc138a57d6a3f208e987c643d80b2bdb8a71eaf8b2e8ca33eadd49e422c99dafe511fbdcbfaa39aa6170d57d1107f9ccc80caee2bf0b3d3928628694e3d42b49d69c02c13685a2175493771fcf93704b95b621b491f4cd3231c1736a5abcc41d0b20722c21b23c4631a0e13134c36be19bd8a8ddcac189518facf810688cf69b28d9548621357ad635b40c253a1af855b896395db2e5ffa2f1388b3860dd5997ab42e329c6beb926db93899a7daec7b408a86f848d7db34374fcfac9fe8a875622947fa067954b47946dff7d042bbde8e64fe5e3bf894bd632a80c63581c26935abf19a944989568511983c6e3839a0f4f5c521671da973f756da87e146a3db56314254d95172f19\nTAG: 640c5cc64d87084321fc1707667d2c39e6186e9690aa90bc2ba26007fbac8878ac9f769b29375119c5d6cac500eba86cab\nTAG_LEN: 48\n\n", }; -static const size_t kLen12 = 423574; +static const size_t kLen13 = 423574; -static const char *kData13[] = { +static const char *kData14[] = { "KEY: a5060fecb0a738d8ff6dd50009a757c6e58db73228534d03f32c26baa1c209f402c3e03a6947c1d9421d63ce43f6df26d30ce783f5ed0d6b88edd389d9f92d8d\nNONCE: b52227e92203630a79ec7f5c\nIN: \nAD: \nCT: \nTAG: e61a28f5df7061b4236834d2034d2b62cb63c660b7de696c26b345e66b34d222\n\nKEY: d676047046bd5be9263ae39caaa0f688abb1bc67c083658894da6aeeff80b6d58ffc7ca1a1c88f49e629bf5544b2cc7669367202b158fce83fc4a4826dd90a7c\nNONCE: eabef87a00fd99ebb6ed6d25\nIN: \nAD: 83\nCT: \nTAG: 473cf728899cd5fdd54f18d6f934c3901f7ca118fc5ab2cbb837feefa7852a67\n\nKEY: 5eaef3b8e068fbb652bd37df4dfad6490095642cd49761a35476dffc2b5b5f75236d0351d96a9028660788893323a777ea8a2ac88bb5e500b334af02b1c2a648\nNONCE: 34d049342b9db5ffa039eac0\nIN: \nAD: 7578949699d44dec9188a7f7e14b0a23637cddb9107dbb1f8e2a968aad0443356d7eeceff4316ba7b2e8fe\nCT: \nTAG: 4d2612c21357638bada9290d2a272f10fb5f070337bf87bae396a1e7253633ae\n\nKEY: eb7b3d7eeb5f26010915a36837dc83da2bad07eba714566584bf1ce62fa9b61210b0ead7182bc28c8f0427699bf04786583fa32f3c3a8a6582cdc254930043bc\nNONCE: 3bee5ebcdfc72f4ab0023211\nIN: \nAD: efecb57e79a326c6b2ce0ae74d7656992a005fbb8da5a55b9595fc5348a5489ee2e69541ec0e8a727a560625\nCT: \nTAG: f457db1e274adabe5fc898fb1eb7c4a5a8e9a2b66f964d0958aa058c1f9e15ba\n\nKEY: 1c1abffa8a2667a8c1ab347860528162d316d58e3966050dc140fd360e6ff7c557520a8982aae97c5db5495d8951eaa485e1cac4cd8f448a13d071d759885474\nNONCE: 4fdce4e59bfdf5d9b57c78e9\nIN: \nAD: 55125cefc919379b3b4b2a24ee1794f44ac66fd99b8b68f98d4abd45ba50a5b76e5375d08abe3b8b8d3c576bc8\nCT: \nTAG: c021d2c73737e54ac6e7f61f9bb44818e5bdbf8d81d43842fd25a535790fafba\n\nKEY: 366cf53bc185473acf62610b74231e53aace84e9c5d6fbf71fc24db4f42956065d3eec01ecc72a6c89266565ff530075f4532c860e3192e866b41aee98c5c42a\nNONCE: 9ff54bd7b10f4fdfd8db76c7\nIN: \nAD: 853ef59ae873bf0bfe1465e9dd8c2cddfcf123d213ba4f599d984e4ea69d3c85a23508ec7941ca740a9157ca2a788e9b519291240b307d6c5a8c6860a96b4be698659d19e31ab0ac7ae6ba31dcd609c1db67ad580fe4422e42d368c3e93a56f2a087b0d587188462310c2ebe58ecfcf7178412223808eeb2eda76446168730fe\nCT: \nTAG: 12d869dc4bd4ac4ce9ed643cccda9e11a1ade65c76f7c1535fa4ec2bcc5eb4c3\n\nKEY: 147b41369bed390f0a9561586fd975474e3b3bbf7f7ebb7a35e5cc43b516c044dce93e154ac790a109709ac5299bb17b709a913d33fd57ebfef2b48ed66393b3\nNONCE: 85b81732d2863b41d2551763\nIN: 73\nAD: \nCT: bc\nTAG: 47fd81f6eed8d3c66afe06d788ffe40717847785f4b4c617d75a11171690a60c\n\nKEY: 9bf35c1194659c1da634eab6707c55b853c8f61d087187162e926adbae02f8bd4d15bae5b05865d0e2236d64715fc39f32e4e3679a0309396c37eab13d1c637b\nNONCE: 8da14a98ee741a5fce0de732\nIN: 10\nAD: 8e\nCT: 17\nTAG: b76af41002a946af4947f98f42a873b7da0871f482990a70bda8f005274ca179\n\nKEY: 0befac10caec674c9f23676d121f065dbcc8c91852dd5eb4e80c41076995a2138077592fec665954d21fd6787234d32d3d54bf9c220cf2bf018b374bde29926e\nNONCE: a96bfb49f3a136840a0e32ff\nIN: 59\nAD: 236adab55e1bb8a8db384c01bb2afd30ff35da71f955fb217b8305a45ee075e7f8d863d4c0e5dbe36e297c\nCT: ac\nTAG: 7bb634357e0835b02a0642352a834ff6598c2ded1af8e8ab60b9ef0641fe863d\n\nKEY: acc672aecf6f10119ee77070abbc2b4fade7e910efd1f93a5716161f88606469a49df05b40332b390d3ac289abfdf6bf7c37c033b1671082922d939139de0d42\nNONCE: af0f57b55f1a73794b3ce5cc\nIN: ee\nAD: f385a50ef027e532635878a4df0deb23369774be47c42f17cbd44925b668f628338ea5f8256c5ad8219c13cf\nCT: 71\nTAG: 13a5296075ef23216c2f2e83b940d24e8e1e6a01967af96599360f11499ac0a6\n\nKEY: 6195ef5ce3ee01188c48b04ce7a28b3ddd04b78711a6d1233121fc8ec3db3a7a0e496d1b6a416675b1e666b9a3df167efb8ade29e4f22fc77111f32ba8bd1ec2\nNONCE: 092070b2f8b65fcfe646f6bc\nIN: 26\nAD: 98526dba4437d88f657c0b7ce2a2be44ef4951711a40747a7d14b195e4c0eae97247256bba7dbd93d6a8f738c1\nCT: 83\nTAG: b6aad3f91a26a38245031d6a7eb97be0d386939d4536b2a27c90a2ddb891de73\n\nKEY: 40335487f9958dfc00b76ff06dfec162ae5c6be4e26918bd12e3f21760cb0bd364521a11f5bfae11dee989627525ab5295ee404bce476c280d13d238dea1bd40\nNONCE: ecf77c7c827a34efd8cdf79d\nIN: 34\nAD: f6e661254bf235c7d5b8ee330cb754087480dec5fe4c31dee65d1ab4479642101404bb563522937fb2e41d3aa8a4d269a222e6e0bcfd07ec4b29c1185f99fff7cb5bd2ca8c5b38742270e586c8db19138b446833f2ee07a11dae5b6a1a4c28657f3380e84bffe1bafeccad57d9cfea3da7f728119ec5bb18b79e002954f4379c\nCT: 5c\nTAG: f3420d4cecae2c1ad79d977abbe408045bd87525c0da2b93e0af3e6c53ba7d74\n\nKEY: bf32ef44c7ca9851f397e70df736d7e0e6243cfd875ebb81d76ad7612dbcfd084cab6b0d67c6a6e8b567c93fd0c3abb78ae121fdb3051a62ccfa045692d3453c\nNONCE: 46e0cc64d6e431c1efc2bd2d\nIN: 959348a8ad6912d7d6c8eae52f19b1\nAD: \nCT: 55e8cb6fd958f18b3c19451c5c79a7\nTAG: af09194071cb0ed4488d27e79700f938ce77386e5d772f9853b17b719f2b1ebc\n\nKEY: a6b5b8b051edf5cea0353ead88ea887fab048ef32f8303275e93d8f926da0d4b0e34b9447cf44fa70c24c9ab964380065398336bbb20be167fc6cd5e591ef50e\nNONCE: 371363612c4675a2e59ebd39\nIN: 443d16621b0cf9a12552216f9558ca\nAD: 32\nCT: b7f432eeda8e4b8a25f0445f17ca7c\nTAG: 649934922826febab4d59dfb52a7558e6d30d56e273602b98f3c55fd8e24f4da\n\nKEY: 075b75434269a3fcc57922ee8cc55b5bbe1b90516a3b71838ade73d41ed1d1f33ae1e0e86f88f6ed7e091cae3ccb05144b3ef239831554d6e79ff97c4d8f150e\nNONCE: 754d5c4ccbfb291133859de3\nIN: 62a151add825077c59459fbf82b708\nAD: c8db27487de71124a95eb6359270a8363908159200333b46ee74e2709b308878779686bd43c24e9ecabfc3\nCT: 2ffb9a9f65c9fe3daad13768ab56bf\nTAG: 4430a90fed7d4b5b2adf5a60d6854956be4feef497781ac7d864a04259e99516\n\nKEY: e787fdeca1095f2f2760a1c5e0f302e07d6b08de39ce31fe6a0db2f76e4626eb0968768ae04d37082c114573c307699707630b8c7ceef60abe3b7831d2adcd6e\nNONCE: 9dc9bcfe8b4e2ea059e349bb\nIN: 3ad57105144e544f95b82d485f80bb\nAD: 96bce5dcaf4a90f6638a7e30cfd840a1e8dbc60cb70ab9592803f8799f909cafe71a83c2d884e1e289cc61e7\nCT: e504109cdbf57b0e8a87080379e00d\nTAG: 1798a64b5261761ecd88f36eaf7f86ed3db62100aed20dc6e337bc93c459487e\n\nKEY: b43ab650bdd201cf05e0436afe89ac54867383f04c5ed2faea5db8e6784c720d905234f1f5443c550ca14edd8d697fa2d9e288aa58c9a337b30e6d41cfa56545\nNONCE: 4e3dd3efe527902b9de45a5f\nIN: e386663e249b241fb8249cfec33ac2\nAD: 3cf7a396e1bd034ea77a54ffca789f206f94263d90d98bf3e69cb42205fc5c95cfbd0481b0ec490ea447299159\nCT: 94aacf00092723e778d25ba78e9d27\nTAG: bd5fcf90b9532e7abfa858aed90d5170f08edcdd28ff2c673e0ab45b8c0a0f39\n\nKEY: b22a7c5bb38715025cd59cc0feed9ad8e51101200000168052b294fb1ead545a517dee636a7acd22b8283afb33d30adbe02c1c8557715eea7147f3d98a97cbb9\nNONCE: 3b4244c9ad9fedd3f10fdf7a\nIN: da79e1ed131856cec3250fde7bda4b\nAD: 4b77472ade3f06500169405b86a793d63cfa58f57bde0dd706f369b391142c2fa8a3e6345ccf0a9c29b2182f578e22f55c576f155a05be5e81997fbe06410034ecddd871e5ed94b5eeffc6dbd90a8e66449da01f8ef47d28a4a4bd253ffc427f868867c73b5c709b01732bd8035b1a23ff0a903def1eb136fc90d8b3c8279769\nCT: 5d8ad7abc047bfdf9d9cd0b0aaa53e\nTAG: 41d050d518d0e51ce16bc2920aa6c76eb8eabd4ed76373c59618c6354885f47a\n\nKEY: 04b3fd8126d65f851f47b3dea22cd6e32506f21effaa3e29820ac7825e01b51c5a2816f0298154f2d8addefa2fdc34c0635d4d6b80ad23eb320c4d4f2aa1de1c\nNONCE: fae1b1da40471dbdcec64d4e\nIN: 509f116ef7435b0640cf141d5b958aaf\nAD: \nCT: ecf553eba80e6dd1fae2eab24d772a89\nTAG: 11473566e80cff5d7421f65949c34301f34de378e91ad50928cf2caeadc466d4\n\nKEY: 413d154dadc7d8869e9e0f24b3320019a04b7a37620dd9e7aa40b5c08d70dea03c12ccf7faad7009e972680e81544b647650c6ff033f56e5bcdac9a35bd7f804\nNONCE: 6a4404adae3f4a7bd2bef95c\nIN: 3539fe02b75981fad4f8762772b3c11f\nAD: eb\nCT: 3f8a96905609a4ef1a95fdb87337503d\nTAG: 8ee076fd624d90e1f6336a92165e80408ca6f0e165b201547d351177c95e8d51\n\nKEY: ddc10df673e720c00f28fdfb69f1b8fba99696f23b6f29704a0114444cc0c8a6c8606e8d37fa95aabfd65b29c655678fcec50966c8758a3fb15332a1854a8eac\nNONCE: 06331613842b4af86c13f8a2\nIN: 55d74bcfc3d1cfc716c6e6b7153c6369\nAD: acc264344ae79959f9dd5130664273ba6f345c3fc7bc33c6c1ce33312bfbd5f181a3c7a24f15e7acf72ccf\nCT: 20650d9e846eb42854692d438b21d5e8\nTAG: 973857523e7ff600cf9bcfcc98403b34ab38d939a6d76716beac42678ca5f5bd\n\nKEY: be0c884db54cf761fc24ff3dd572362910dedacece5e1d93a916df277f923f78e7dcd908e60beb0043503c5b4877a9d962a7de37cacc7387a7553949b52894ec\nNONCE: 3f027a93e2716668c7634195\nIN: 1ba8f3a87ac6738167aac1491b602ddd\nAD: d06dd1b9360a68afa3de5d239b6d91d212c5c555567545a4f133bf5a3b0f26addb9379e1cc1cd690cd427c57\nCT: 3596cc50ae72db932dd83bbc8661641d\nTAG: 44a1834b1587d0f88e34137dcebbca059dfb8f65ddab18f338a8a30152167be0\n\nKEY: 2ee848726730c64332877a4f88ad7fb241a73b71fbee8eeb4d9d6485855ea32b487e03968e1a7b9e8ac8ab7fbd84257efbce0aa207aeefa67302d5847e0d9c05\nNONCE: 526b0a79b6359d133ad51011\nIN: a0c0477e8a9ebfd275b674ed33230d42\nAD: ded2f0f3f28aea28b17aa58d4b906c6a9b3078f97ffe95b7e161b0c3dbf", "66879bea7603a046da4945c802ac8b3\nCT: b1691c8275f12f7d9af85e71dde9dd5d\nTAG: 65a5742dcbc49295c4805387e0a15f986ae47e51add9389dfabb6468a6e83013\n\nKEY: f4a7c0e29ff510c034778e47bb30a468a92140a707936d381b1554d421af107c578e74c53ea08c7f7d93cf67612061359ae458408a9c79250f776ca4192016c0\nNONCE: 025bc10dc99346c4d0766a7d\nIN: d449a2e812429beb5c466d344f5b5eec\nAD: 304dbf9a59bfd33b777d8dec9dddce4c365e72aed851210eb964c1da18119bd13248266a67408e88ac2eadfc54def0fb57f23743d376b11293377565d253d2bffe0309f2946cb78d4e9536dde4691fe1eef9ce2dc916a773d06b42fe2b014e7974d4aeffce25a0902c9b44265e5d6d26809b5f24875e80cc13f1f8872b04a237\nCT: f366e7b66683f52586e1c363c15b7fb1\nTAG: e0e1bb733471f150ddce1b83f3fc2d88589d286ca052574b7f0735bb598362d2\n\nKEY: eb78ea626b219e12937057155884547cb7578718f569dc8f2b370c0fea80e7f0d0f5cb590f0b7341d20c775bcd6a3c818e23b6cea949cf99eb94a23a81cd2249\nNONCE: 75a10f16d429b809cf12b9ef\nIN: 6b0203316e8108ff01b12df91ba6644382\nAD: \nCT: 7ee07054f76471115be159259340c24391\nTAG: ab970669d1603767d588a93cf215673ad307244f9179f46fca56e97f64a5fbac\n\nKEY: 3221167926be262b7bd0591f56be6bf030365d45ab84a93a94ea41a5e07735b17245ad43787e8791e7ceaa0472b562ed17e3b609c66c868c9b08304c8bb328b1\nNONCE: a94d8417d2bb0323bcfd354d\nIN: cec81bac7b85c441b6261163d67921eb49\nAD: dd\nCT: ddd8860fa9e2e8087db30c9da1ec9f9487\nTAG: 26a3b9bc4d4cd802cc22e7647a19fc2a5092293c9f5b1c84bdab7245a6d8f4ab\n\nKEY: 4b16e2d62294f76cd2a6c8e0928279d9de40f0b169ef9465738cbfa064c520128ee89cf657da27e4e532d8c4709d992970bfc9daab2f31b3a67e53200d3d6710\nNONCE: e746d498b9031007332447f7\nIN: 16841e3fc1f53990d33f7ba525dab121a0\nAD: a785917bc9f3aaadfd170abe83bb30c0c5d595fc8b491d983131aeab1a7b8d8771f1a963c251976152dd63\nCT: 6bcf5eac15ef74cb8a706856f62eb5e8c7\nTAG: 9dc84b06e8ec8921be4bc7762e8cebb61a95ac5660022520f9438e8f77b45796\n\nKEY: ff2f5944111226df1d9a300533d3e871694fe15a418b2090265cd8c0111b249dfb7ee86bd9228f7ea5d89d8afcf10bf69942ee4c29bfa8409b63c00c2213629e\nNONCE: 477060f0c61555873bbeb225\nIN: f091891c43e2374c2755a88a11b04beb4a\nAD: f1323fd1ac4de9719dc5966dae45dd7b8ddbee3f8da4f4f4d5f25d06bdb8ebf57328dde76d0bdb9bdc5f6b12\nCT: e0d96f6f3ed0493a289d4c3b79238b9ed6\nTAG: 71276c05b52bab0063108dbf4e8ff57cf3e15079055a309d725f14bb86671ce1\n\nKEY: 1ce841bcf2ad8accc458a2d94774c3aa53a99e7dbec587376212101303ca2b42272a23fe28514be190b82e503e7772a3713800f4360fdb767e85ea5e1f7b8eca\nNONCE: a2f8afc5ceb5382882907630\nIN: 620fece1e843d1d0b5c5a541a6f615a81d\nAD: ded910647464d0fbb0a5d93ffb9839de3360c675179c5991ad3470285d79071436025111153628c563ad1b595e\nCT: 34431c3422e009373c50f3ee6c5b3fcc2d\nTAG: 6e4e8a3967307f47e233a36ce05a4826a698fada2ac19543bab7c9ac4f79451b\n\nKEY: 6bafd28a32690851fda667eb2d3c5993f13df52b2e97630527f26c498fd5019f26177a78f27c0c41616d2a4a73757fcaf9cd92a7da8498f90315d41e7479d90a\nNONCE: 75166c506c8e1d10da4da8b9\nIN: 697bea4d6eed5e6ed243cf01cc79bfd3a5\nAD: c0fa663961c3f7e09a8c7bc73e252a232977dd6c9483f02067b34fe695f341d05338ea2002952439ce08295ee5c12f38dafffeb5716908d3f1d4bfbf9eb0e4077bf8e534f19568ed04fca3bbff95da9088cb939f7a20cc97cc0994f9308e184219bf12c8af0d66df436c296ad39832d661b88c98cbb168c751719ac1383c9124\nCT: 8f37885b9602725385fd9a244ab2a156ea\nTAG: 7fa5cedd330887900f4a44d098e04d5eca16cf94e21f897fa54b0fc116b711b6\n\nKEY: 815786c7744d15afe1d6ab452cb6696fead8b88269ba3eb35c458f6248bad77b404acc744ebb74612c4f97deaccb99a7bcc6ad41917d61057c05b30c581dc4a0\nNONCE: 12342e4704f02336ebfc91df\nIN: 7f15e696b49ae5104ced5bebbf58a9d8ddcfaf46ddce9df88fe0d58a2f8546feeb83b975c66e4dafddb7fd9d17e80127e70af06b3b8b13c3390f1f50a227e7\nAD: \nCT: 22e7c5d54a7b622c47a9edb77cfe7c094e500b0ef9595bc346de736e0088e5934dc07160aea34f24d3ab21440878213d28059551cbfdaa418af40d344674f7\nTAG: 8c271ea5c15aa771c900388267efb2f435f001c2e83f4ec297e77c608de2d579\n\nKEY: 66d87d2b18e46257476456a1f87123424477decf196b88b09acfd3ca74bdebef4c98f1b93803098a141e0acc3ce8eede065417a0c1eda9b4614558d2383762b6\nNONCE: 1ec0ca1d3b09ef186ac4bb1a\nIN: cbb59e14098c2a8ab7e84ace913515c74e056e0fb272c7b88d0dddfb62e395afb695647d97d1071eb09cc1e1776b609fceaf4e30e92640379bb8f0e762ca9c\nAD: ec\nCT: 832804b8003b0ca1b4eff1dc4da6f6a9649e5a582854bb72cd74357476bf38d81ea3bc8ac0463f21fe37683bcbe07360d0ec2d7ab90b588adf669099303ac1\nTAG: 9fecafc768fca71ffe7d640dbb7a052d97d6c8e2fc86001d71feaf284ab609f0\n\nKEY: fbff97085351f4500e73190ac139dd3ac91e268042b5926b57e0394c750b10348b47641d195d5fb5b0846256ab229f102538b81e209db5d93b4d55f30c453d9c\nNONCE: d4868c918de2af7d3e3f57d3\nIN: 4f14aa5a680d66ae15ce0ce4739888f64d827def862572f9a6cd620badbe4ee9d75f4f9bc1f73d409f519a657f53a50d50e68e22f33a8ef5aa08b1212889e5\nAD: c41253e96696a948ce500030af27086842aacb79c04cc02a42b858a65c630065a5292bb9b2e69ea5fe5a7a\nCT: 08596ac0550574e352edc13d7e390d8fd0a57406dd61e1543066b4aa0ea06670f356e26ada0d6c61c1e41de1b4fd7a251c961fae44b23523ce227eec99a338\nTAG: 72f58de3e6697c8419ef518748fe0bb3cb930907c71b6d682c5e61068206d991\n\nKEY: c78c550aba82b571d39ce21d6ecf5e5f7c2a7bf921c6162c64ec1fdff4d0b8c41bfcea0e2486cc86b9ed9e9ceb73c4ec228a2ecbcfa0379174e76475cc21ae31\nNONCE: b5adf4de19980a71cb8ae8e6\nIN: 3d5e43ce95ff9d7f797f27b904c07291a35678fe76a9c57f0c0cba724f38acbb22c6c185db864a2a17b7ef2d67a04810ee5a45fd5a4e28a15a1ae16971451d\nAD: b5eeb9a18d436ada7bd5601944784f50fb0a989397b5c781a2cdf29337315dc7664f3c1cbf17f37fd0cc8b30\nCT: f91f1f20d06ad4480ff233480228994cfa052f9bf3038d06d997d31eb68bffa4960341b93eb5ed2260341e6816519c47bf231db2a41ad8a9719f4de6a33de5\nTAG: 6e5eabda421961e26dc17a7e1f750425235df4eaf9a97934c1e1b4439fc22791\n\nKEY: 17b90dec44546d9dbc489e55a01f2cc64452a9b0e50506a8ad7c81bc6fb21328285cafed901a7204048866ff3bd543003fdcbeb3e9e2f3d580f9062362879633\nNONCE: f0c0cb247d210031f9b233bc\nIN: 75b9b524cbfd1287259da116f536aff56112a406f069aa08f545b5372d45b66d7a5d05e02728c4bc2c779609dfe251386f78c5f48b9dad90b363d324826cd6\nAD: 8a604a9b06ad595ce0b9ad1644a596c7d3cde81490abc80840c764c40d6df08fc71d1e8196eae0802f8c8dfc24\nCT: 23ad62a668f942e613c3b5a7828142048f1f6a67f7f0e0cc8bf3fffb2d1dd967da472d080353dc9c23b900a566f20afb850e4a47688ee507faa6178fef2afd\nTAG: e9e82d3221f964d9e6c09d761afa3f05d1316d39c82618a82dafa23607bb40a3\n\nKEY: d5c09fe24201fcc3ad4c9a9c4b759345f643e930301c3714f62c8dd4974bb15a026b217ac637b4f0e8d6ef40f36be967c50aaea83b2e72df18eeb9576865f1d8\nNONCE: 9cfa0df1fe0910b33ee9849d\nIN: bfeb3d86ce3f4c5ccd0c3945e1da0e75dd057aa5b4e1f070593394f4a0227abedac0b77478e04d498506245b162e909cb711d8b875d33f9c4578e80a0e2113\nAD: b874a8523799554436a1174ab124677dc2ae2042a436c85065c50d5b5e7519623379ffed9a9c2b84b9626214b13c1806b65a432ba79066ff28ed94d17628f5ff84618593954389181e997ebd245d31f520539e250b31c86b99992983820f79e74aeaacb3a95e690e2841aba5a384d0333ebaa5d1fde06b4b8e3e1cabc6639459\nCT: afa649ea47db94936f89612ece681bb175664a97aa6faae5745f49ac9fcbfd4287b73cb58e8d8aa12eccf309182f075098f339db697fc60540481dad0cd82e\nTAG: 9909335130df0326650823de5a4f5b6f45e6941a6a72ceaf80ef32fe67363944\n\nKEY: a13c4654606f532a8df47c367dab1b214166e4f7188c20560831ac30ba5e58d316d29764e4c716ec0126657c926ba2e4541da062447228ae61340a951101b4a0\nNONCE: a2df3417ebb86bbb2f954939\nIN: f1954e59a319547d32e81f846e0c79db41c681166b43eb9c10458948606ced50a44df26fad5654a7c25d3fb52539cf25fcc1c11707c4b5aca7910a76e2374740\nAD: \nCT: 374726a4691f178a4c0a6f96108ba30c4ca8a30242c14e84380969473879d4a5de580fab4cf6ef6e465560a15028ba78a1a88f9e62322cb698b15ccce6ba83a8\nTAG: 683e5a3e61d9d9c8b170f1d4eaa4f74dcbecb1a4cb1551dc364bbb336d4e4109\n\nKEY: 0c1751677a9b7373e0c2ceab2c8e4dab50af22e2230be3187c21ed46069168d173c28a7474d8f7c3cab39401663405aebdcc474ce136e1fff9cfc520bfe17ca6\nNONCE: 38bc2efcd97998de1528b064\nIN: 8a3c6212240bdcb86da98f0e3ab3e9e78f7f61f0627ea088ab283e739a0bed5c360eeed26cea43ec09b4f3556049a1d7f8ef86abfd1118f9c0e34cc6eea4544a\nAD: 20\nCT: a1a9f7f4750be3d89fc4f25917f8ffa7dd462ce712ddf61792a01b1840bc8e428000372252f1b41055416a961db3be8fbe774f0a0a71a82e79e74927522703a0\nTAG: ae24708df0d5893a902765f6c6c2eebae0c11312936cd415bf4a74bb8498a367\n\nKEY: 154c21eb43d8d556e5f782ddd64d577ac8066fa172c2936fc2b2e875aa437f941819d9ecfaefa2e388fdeea81a0ece8dcb7647f2c68da48884aeb1315b577c09\nNONCE: e14d1bd8681373d41702a762\nIN: a2c880fcda87d9d4681a735a6790d93a1c9c68e55b87d5f7b3146665a6b2051398eb9895e1f5d522841668b9915633aa8cb40048c619baf6d63ca2da486cdeb8\nAD: b0b725cf634349ce1d3ac49d48313a09697efd9996cc5afd06b1d0817181d0374db05825dc2f08207bfb3b\nCT: 1cc0db5980863df7a40c78e323a78be6c6d556d4e3b5f930d8d0f2c6a10c6477e31c000d3f0563b4", "6e1a4aa566a4ef4b433e17e94c43338b51a7a3f862739b6e\nTAG: fe005424112de2a5ca6e68ada40984df1ae5ac666cf5fee19e9a0f203dd69f52\n\nKEY: c34482341724ee431b5272ee2964b245d7657778f7927cad4b5a1bc30a176b1eb88a83ac9faf58215a72855edf94f8e86fade58c5b5907994bb8381c9f21b753\nNONCE: 4934d9afc32fc7e2d8851594\nIN: aa3d32adc47b0b84d1b038ddcaeb007a7d5c96cc06a943eba5da6d0d367625330556e67da099c84086b3f46bb4b72986e076eb426913e415cd20bee34e434bd0\nAD: 076a7bc587b306f3da3ba88e66a55cb8125bbf8aa000dda266e950f381e35ac938ac86f8a15a83022a25f28b\nCT: cf017d87da8927e42c1f10fd3d73cf483bae43f4e110363159a9fbb7cba363930a0364cd42a5de2c70171edc4caf15bfc7238f7087bf1402b32c7bdb1f493393\nTAG: 3961efea656aab1b83082522b801fafdae346f7d4be70db1981283f323e5b5dd\n\nKEY: 363e10d8b3fe349014d6222761bba7af86545dcd1812fe2e5ada564c5008f8ea1850f374208e87362afa135f20f9e79dd0ad32f86448263416086d3afc5d37c0\nNONCE: cc545928edd3b21c0e8bc0f1\nIN: b68e3a54d17dab6eb41b03de2df14e792201d78a9c1cbf341da421da82b026ff471d4305ede5c6baae162a098c73da5cab93f30d6d540b4eaa0ee772448dade8\nAD: e21498edf4e25ada2dd6a382eceaf737623e501db34f5c5bd5c963f45818b146a6e45aa92db2a2069e55d46a4c\nCT: e4920c1fddb5dfed2268781fbb17e9ad2ea88bf2a0f116fbb7b309b25a5b9f989e1abc334999ab175b65f87e874d8ba80792044b458dc27d2b24c989d24385e1\nTAG: f0dcfa064cdf042e0b9a0443d634c38695dd09b99dadc647195fc2ad53dde547\n\nKEY: ae93f58aefa94e4e0622f2e962529fd2efdab840fd0bce62e163ca0fb004ec3b22e246073614203d9b63fe2842ef5903ed08b3e52abf7ea18acbe16fa8f66368\nNONCE: c9ac237c87270f2d88b91b64\nIN: a75f49778a6c03b0f8915f5d09efe99c5f4e9cd928713882e6b9b78bab3541812db41792b893c7e2259debc6c660ce708851912a5b9eaf91416d86b5de114ce1\nAD: a4b198a329e9c5bb6d9f31a6415811eb33c79422b0db130b78d788c38c0b9a5122688cbc50fea811afa20789465f9ee4362336cc3701ece701179af96eb7c86d5a00ed8582f24364393287d5dbc3e83a82b7a585cee5b152b5da40aa45ccd46dc841004778998c7efe9eb43c9762d1c8581eee64e18c5a961bda5aafdd5cfec8\nCT: 453fad9395106a703ccbfe811bf775f1827ea960c71d79242d2ea0e3e31b14baa76eb6d107dfc6e484f4e5146f8cad5b389e4c0fa18260c96a193edbc8091a36\nTAG: b67082c21557b31392a9821fbce4b93706f96856d2581c92e7fb65dd2166624f\n\nKEY: a145adafac46280e1cee8696903c5f3866540f27f17a519637373d95dca4ac5ac0bfd85ca6e1f8df8ae3fcfc9158421581669db52c20a3e19c5d251952f63218\nNONCE: 90bd43611f235ff225b23208\nIN: cbe5f3a5b7a94b8665cac1a4d173a225679e1a3926d8596b5adc0ef4fd00f7d93a432ff141cc04f877be60b6a17fff40ac845a91bcee3b483862f67d9a76ef498ce5e49c361bfc018e401aff47b397e96b2982d4fdcd043ca09905be9634e83dc22a667c955bc992ec96ca1b76f73631767f64fc7151284d5aa81c1aa42eb3aa\nAD: \nCT: 604f718dbce17dfca1fc5e0f400151cb65bea9d7d8f26d56687a76a23f89201aab01ef928006d15493f5b1501bb99c517cf123acd956ab575e687298488a88d5739c266e67ca6a20a5dbe5f5f27ac778816f04e7b1764cb716477f3aa01482cb6b25fe034ab5d942013164aa124608cacf13d6cc9487446cfba54315fc6bfc42\nTAG: 8e3e1a01945bfd9e1aa4eff1cdd0a6da6d8fdd5446e6d732a673effe8e44d76a\n\nKEY: 63ac8e2561341587bc066c87cd23f7f33e6023bdc1521a91d6ce63d3ab213825d95d674928b56da1741aad8e85a8b703239ad74e0304ad555eeadebf4ae30aa6\nNONCE: 4f3073c3b780ebb146e136c7\nIN: 7f9a05b1aead29b4d5361c2606e5db8a48122858842679cd46f8386ef9359f998cd2c6c266791429624ff634a160d08faf1523b650c30b2fcd71517da5f377000251ef23cfd2510a0630215ad45fa6d2313f9add040a07df8259b82d3f29cf1ab8477cd114c9ee579d3e2ce60c5da2f3375b68b4d6e0913d39dac9399c00bd32\nAD: 22\nCT: d4ed811c8db932348e0c311e9278ef22f22cec8af88b3ac0cef77f13bbd9b8cca037c1ea87590a0ce3f3e7b3ffe1dcc4c7cd9e721baa5f126a3e0afb26dcfa02bf44428846c0f1e07ba0e026c23a39877de1e69e16a2766ff4fa3d4e8d3a97ba28f407f459ae3520dd840e8f9e149ea582048dc6e3d0227bd86a9c26ddd59895\nTAG: 0abc9111229bcb725953d139a2dcb1aa0cb9d3d6c01ef4733482dc5edcc88958\n\nKEY: 355454fbe12f125edbc13550a7494f37efbe12b843058d29f892e1524289c2868ef0050a75a232d3083c381289e4950e352d68d64bf05f0608d694763c36641c\nNONCE: 0a344bb3da1c4260f2daf256\nIN: 362e97f8ef09f30e5db2f21d40568d347d9bc42d4c94a563484b12eb109886ccfd2c61c40dfe93eb836bb6aa4f828e77c137485da2df494cbeb6a9a0192c3777b4d7a927fba11a8eaf604b85a81ac4719ce8b595a74656286fd0b80d1ad3f3393e6038b258af97af9a77f6760d486d9caf5a451ba26dee51bda0f76d75bfc26e\nAD: c7c2e8196f37185b44515480d5d9451d79d07df4c1256bff6382f942727ce9b3a4f81ae964d8af2cd9f638\nCT: 32a67922947fd6b1c1bfaf3e1d41397173b97095e55307cae1c574daca275778d4aa4313fb1fe5b3997ff18800903ce044c7d0976abbb03b6cc1f7498d8b56d00672bd74f7cb152b677c632ef7a6f6fc13e95e82b6e35d663eb47f27c229c81174fd7c62c94c414e47216af2580fe822643e54907af77ae18e903fe856a02173\nTAG: 72d0fe5baee8090c5f8e79890b77f6d72a4213a7d1a81e0d1f1c9e6731e44d54\n\nKEY: 664478c9d30d2cbc39351ec3b3494f3edb81e32e48bd4ef05969da07e770e4181a9ada3b2f83b46f40fc2d9ad35fd8ee6864ff3d70436d6cca3f8e0563cc3b06\nNONCE: 7313df9679181ffad2972a6b\nIN: 142f073f2ce443c68822f120b5009e39bea3453017dc04c1b091adfddcb2a7e361c2b79eab1bf0818bc86e9d7964834d3775698b56a11ee07a0c9c03cb7bb895bf1a1dde3975c3662d233052824f1539f58cd6ad5cadb58fecaf2b34935ff711c45a639d642fb8fc3a52929b1296683bb13e67f2cc8ed9090126cdf28a4395c6\nAD: d0d78b94505793af546912f3780699dd72e288c775bfc75da6e306defcd868f6d40c6d6ce34fab9c11574ef5\nCT: cb913e40ea5dfe76beae612e9732d23ce352789987134822b2324db585179bf90d0ee20bee102e93a49a55fc978d19e99ba316cf8d9a10d2f2bcb75da4b135d1fcb8057edc33a180586015d8829a128f8fdc87b72497016c280f54f4d974c2c7e9d32ae137eaa1bcb670be237269fa73c3a0f273da9e70d89600ae7c231fc9d4\nTAG: dcc158c254ff7e131ad854a2158d51c643c281dfd7df342d5481384ab236a685\n\nKEY: 409d1b4e1c187c8b1c053e999f2af648583e1045d56d553cce9270d08c5643ef365eb35e3bdeaedcd164b0122ad185e71c75146a9807104d9b65b56d9bc1dc55\nNONCE: 1cce3f08a5aa5824d063a6f2\nIN: a255239e4065f3effe6aa5e88814d516236d016c51cd8eb35af7cee86418966559802f8ff7ac39c6a45acc1f1b18cc28d7cc32ae66dff43289fe44c3a2a72fbadf3a7249d76c1ba9671dfc420ddf513539f2da5f31030f2b6775c57432c2c3486621d841e80dd4894229debc12ef47d74716838f2d807e208f0fdaf733bce76e\nAD: 8f34f8b676e71844841c6a7b63fef1ad3061f2449c1044e1a281595da2d9e9fd141aea7350bd8cf9774d375e67\nCT: 969fc2c64261db415e51eee8cc5e0cf5185b8e3325dea516a70e32115a5b72233a44458c40f2daff3594d71e42ca2e3fc1c444ce171d22ef40009d798456613fa4b76beaa6d469e235997a302ac468c8bcfb8ef5de5cda58d7e554a9eab6cb568945dc37f28b0dbd674c083dfbd2e42fda1b42d0c1966e9652a21b32af71e2d5\nTAG: fa0789a83c255412501944a67bdceaff3f01d9a23b0c749be38abc956e2acae6\n\nKEY: e6fd8144cdb305bf9e62a2c901764c62902f354409d8c5b9c8cbfc0ba8ac7d0859ff8994e573e46784395d89c355a91a313f601b56e86ed3fd10ba428a5481ce\nNONCE: bae080718d3e5c5998542f15\nIN: 2258ffcd6fcf91b1723f8db0047525d61cc8ffc440acf3290690685d16384292493807312b7dfc23ac9d9c3ee1405baab21a3770a05875cfe325268b65fc877463e3208c842ea4a32cf144cc46d57afd91f6b6b5d85fb2dedb0702f0c4e7f742cf4c9b4aec02f07267ec1f7b96a5a3ef25f6c1b4c27bd829e86583e239cd854b\nAD: 51ae57749b7757718aef9b9c47da5794659516e7f98bc80e6c18c89253f8617963331f54d4f009f087d1d2bd69a083f3a4b98f2a51ce24ffc6079774f7c7b01638b6131bfccebe21fea67bc839c259a50fcc0a16a69ada3c5adee4097d9e053a03266cb9b4b39ee2a465ec1aa058e61a0b9888b93bfcfd103f91ca3a7b274a10\nCT: 5b2fe8eea3313cc04d5ec75d75d05b3242b6e3b65c6fa1761716780c9529ff8ca523096dd037c5bda27984aa93c702ce9c01c63569a90657cc6373ad5d4473028b7eef69dd79c44c38d0063e8a8b7f1aa2bf6b646711ecd4eea3fa27408e089d9c4c4aceedff29a25baa6a9069eb7eac83a53212c0b387d700547c46cdc525e3\nTAG: 60319de093aec5c0bb8d5f17e950b0f4df0dfd20ad96490f6f12db461b2a4a84\n\n", }; -static const size_t kLen13 = 23568; +static const size_t kLen14 = 23568; -static const char *kData14[] = { +static const char *kData15[] = { "# Test vectors from\n# https://tools.ietf.org/html/draft-irtf-cfrg-gcmsiv-04#appendix-C\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: \nAD: \nCT: \nTAG: 07f5f4169bbf55a8400cd47ea6fd400f\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0100000000000000\nAD: \nCT: c2ef328e5c71c83b\nTAG: 843122130f7364b761e0b97427e3df28\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 010000000000000000000000\nAD: \nCT: 9aab2aeb3faa0a34aea8e2b1\nTAG: 8ca50da9ae6559e48fd10f6e5c9ca17e\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 01000000000000000000000000000000\nAD: \nCT: 85a01b63025ba19b7fd3ddfc033b3e76\nTAG: c9eac6fa700942702e90862383c6c366\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0100000000000000000000000000000002000000000000000000000000000000\nAD: \nCT: 4a6a9db4c8c6549201b9edb53006cba821ec9cf850948a7c86c68ac7539d027f\nTAG: e819e63abcd020b006a976397632eb5d\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 010000000000000000000000000000000200000000000000000000000000000003000000000000000000000000000000\nAD: \nCT: c00d121893a9fa603f48ccc1ca3c57ce7499245ea0046db16c53c7c66fe717e39cf6c748837b61f6ee3adcee17534ed5\nTAG: 790bc96880a99ba804bd12c0e6a22cc4\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 01000000000000000000000000000000020000000000000000000000000000000300000000000000000000000000000004000000000000000000000000000000\nAD: \nCT: c2d5160a1f8683834910acdafc41fbb1632d4a353e8b905ec9a5499ac34f96c7e1049eb080883891a4db8caaa1f99dd004d80487540735234e3744512c6f90ce\nTAG: 112864c269fc0d9d88c61fa47e39aa08\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0200000000000000\nAD: 01\nCT: 1de22967237a8132\nTAG: 91213f267e3b452f02d01ae33e4ec854\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 020000000000000000000000\nAD: 01\nCT: 163d6f9cc1b346cd453a2e4c\nTAG: c1a4a19ae800941ccdc57cc8413c277f\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 02000000000000000000000000000000\nAD: 01\nCT: c91545823cc24f17dbb0e9e807d5ec17\nTAG: b292d28ff61189e8e49f3875ef91aff7\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0200000000000000000000000000000003000000000000000000000000000000\nAD: 01\nCT: 07dad364bfc2b9da89116d7bef6daaaf6f255510aa654f920ac81b94e8bad365\nTAG: aea1bad12702e1965604374aab96dbbc\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 020000000000000000000000000000000300000000000000000000000000000004000000000000000000000000000000\nAD: 01\nCT: c67a1f0f567a5198aa1fcc8e3f21314336f7f51ca8b1af61feac35a86416fa47fbca3b5f749cdf564527f2314f42fe25\nTAG: 03332742b228c647173616cfd44c54eb\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 02000000000000000000000000000000030000000000000000000000000000000400000000000000000000000000000005000000000000000000000000000000\nAD: 01\nCT: 67fd45e126bfb9a79930c43aad2d36967d3f0e4d217c1e551f59727870beefc98cb933a8fce9de887b1e40799988db1fc3f91880ed405b2dd298318858467c89\nTAG: 5bde0285037c5de81e5b570a049b62a0\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 02000000\nAD: 010000000000000000000000\nCT: 22b3f4cd\nTAG: 1835e517741dfddccfa07fa4661b74cf\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 0300000000000000000000000000000004000000\nAD: 010000000000000000000000000000000200\nCT: 43dd0163cdb48f9fe3212bf61b201976067f342b\nTAG: b879ad976d8242acc188ab59cabfe307\n\nKEY: 0100000000000000000000000000000000000000000000000000000000000000\nNONCE: 030000000000000000000000\nIN: 030000000000000000000000000000000400\nAD: 0100000000000000000000000000000002000000\nCT: 462401724b5ce6588d5a54aae5375513a075\nTAG: cfcdf5042112aa29685c912fc2056543\n\n# Random vectors generated by the reference code.\n\nKEY: e66021d5eb8e4f4066d4adb9c33560e4f46e44bb3da0015c94f7088736864200\nNONCE: e0eaf5284d884a0e77d31646\nIN: \nAD: \nCT: \nTAG: 169fbb2fbf389a995f6390af22228a62\n\nKEY: bae8e37fc83441b16034566b7a806c46bb91c3c5aedb64a6c590bc84d1a5e269\nNONCE: e4b47801afc0577e34699b9e\nIN: 671fdd4fbdc66f146545fc880c94a95198\nAD: 874296d5cc1fd16132\nCT: 9209cfae7372e0a3ec2e5d072d5e26b7b9\nTAG: f3acb73908e54cddf7be1864914e13cf\n\nKEY: 0b6920ce07787f86743b275d1ab32f6d1f0434d8848c1177441f195495860f04\nNONCE: 6787f3ea22c127aaf195d189\nIN: 4728b3fed1473c528b8426a582995929a1499e9ad8780c8d63d0ab4149c09f572c61\nAD: 4b4745914474e7c7c9882e5386fd9f92ec48\nCT: 8ad7deb4be91cdc4e75c77de1c746d816212b109c5a485c6cb79e3005d2e94355104\nTAG: d71002b6a9de0addb173f49e34edab61\n\nKEY: 9c8fde2be2cf97e74e932d4ed87da44102952ef94b02b805249bac80e6f61455\nNONCE: bfac8308a2d40d8c84511780\nIN: 82355c9e940fea2f582950a70d5a1db2316fd568378da107b52b0da55210cc1c1b0abde3b2f204d1e9f8b06bc47f9745b3d1ae\nAD: 06556fb6aa7890bebc18fe6b3db4da3d57aa94842b9803a96e07fb\nCT: ced477a00135f16006e100b9d7521f9e1bddbc7d339cc41333abe3cc79dd8e3a18e310dd1dd53ac664673ab9090d5dc07b4859\nTAG: fdfb01ef873060efc7c3c32adf3b46cc\n\nKEY: 6de71860f762ebfbd08284e421702de0de18baa9c9596291b08466f37de21c7f\nNONCE: f901cfe8a69615a93fdf7a98\nIN: cad481796245709fb18853f68d833640e42a3c02c25b64869e146d7b233987bddfc240871d7576f7028ec6eb5ea7e298342a94d4b202b370ef9768ec6561c4fe6b7e7296\nAD: fa859c2159058b1f0fe91433a5bdc20e214eab7fecef4454a10ef0657df21ac73c535de1\nCT: 01fcded8e89997d446236c8e3a77ba755b85b9b5ab8fa8f355be587a3954c4a4231a7c8c198b72525ce4304125a4dabd1574453437f6584790d8cd90d5957b0d5c804a6e\nTAG: ecb5e6b6e75d241c221a2f4dbd7d0448\n\nKEY: 92eaed3822a2fbbe2ca9dfc88255e14a661b8aa82cc54236093bbc23688089e5\nNONCE: 5540db1872504e1cced532ce\nIN: 4159b035277d4dfbb7db62968b13cd4eec734320ccc9d9bbbb19cb81b2af4ecbc3e72834321f7aa0f70b7282b4f33df23f167541ac15c8417abaf17a282ac7a57252ff224ae7911a905b8c699b20e40c1e9569a6b2\nAD: aa0232d4b10bb6f20406135861c19795b95f9597f9b72c20931c41164f1b469b0901f2b5da3a956a6e278c940e\nCT: c49082d9a1bb49356f1a9b75b443832a56387066b617b939b60381db47711bfd174324e8d20c9713d562fb8f5c698dab02b5c00ecb652c182ac5544648599fd7fdd042009ed44961efd975972ae3c9aed8a4f58ddb\nTAG: 75639e5472bec58e96b358cbe429c4ac\n\nKEY: 82593eb58f56f6d3681fb00dedf7f612c4cb3193b73ab35f9a5a9cc8d13aa27f\nNONCE: f1dea3b2a7d832ed8ab959d8\nIN: 2ee795df8e1ef530cc6fd9a1f10543b44c49383921d74fe0c71d50da4adb9e9c7e5491a488ceb5c384ebafadf0f484fae982019a8ea22efd1358adf7ad4f5fa0d2acd2f1ee095cdfc13310241243fa53b8c2610d1924b1d55cb6d9cb6a5b98a72127255967b8\nAD: ff23623c5453e61cecf9e624e5c803250c382481d3c10febfa54d03894ba8f9ed72637fcf5631f7b7312cc74e6ff63ecb240349a575f\nCT: 6841f9ffed11d165b18917ed0aeed507bfdbea3a57beac2f2e08625e9929d3f2d84373ac3b21813f7dde1b25c93129b541fc640e09f5233cd9f0587edad70b73c423011cccae55a9deff9f29308fbdfc9a73f5fff4a7b0ad308ca9b545223adcf724d3d8b127\nTAG: 479bf5015121d25bf2346429a5c569b4\n\nKEY: 2cd817f2afbaaf21815bf08ac1e8f87520244b4a3fc492c7120296607ef64d0a\nNONCE: db4c74b73839e13455fd91dd\nIN: f7f81d460034b9c41eaf0cc6040a84e17e6108372f1ca50656793554ea1d05181310711d0e60d4d556b2bedb24d7b622c01fe8025119ae0c8a20b679dc40c9908f88fecfafd688b0ebec6a2ac13421012874c80685c481b41323a1724ea96c1df644a595e8cc73955e6f661e0fa30737d78e7cec11629b\nAD: 8f1fa4bbd8e8e655f50019859514dbc4cbcf944f95084e45337d9d9d8972bd8da92b4eb5a75c0b284305601de859f8d1fac6d6b3fdd42210fdcf696119e436\nCT: 97d729cde56ec1f95bfbc16ca5dec6a208543c3255f7a2b97fbf5fcbbb34908ace9ce13bd9e90474ed620715a5e9e43c34802b85feebc4d4a23d1bc8b4b5a6c11da7158765c40d2c863185c5551cb2b10eb0b45c61b939f8274ad84fe0a74e163bfd6afc5759946362adc74b4a7f705827323f8291ec38\nTAG: ea1c9094241c5b75ea880723ccb17ca7\n\nKEY: 006a5a863859d5b70806197fdb9f0da3e4c31b0c7545809808bf7683757cd11b\nNONCE: 9d0f8621664df31eb95b5e17\nIN: 567d680b1a26980772e8ad3e9b2e2de537414368c4f97adff1408d36c1dfee65b78375c7361", "c91452e7d463338474a400ef9efcaa648e93f38f8784a1598bca461211195d7844de56b91cccc96d89e6471bca6b7374aa5ec4b2f5fba66c17a435970411f2af3d6e33c0d094f74fcb77beb6cbbac1f3a8a19f69ca087f94a5b80d5e3692e0d10ec34\nAD: aa67269c824b382d6238bcfaaed586177b852f816c31e9966744188f02647d881990d98c3eabd477557a739262bb3f682f64d2208faf98097586053a32cbf37e\nCT: 85f7411a7f8ab505a7c10c5c1fb9bdabcd9a7826465de96e3b7c762830ce133b33d8956756ec29c00b429d30047040043cd5b3bd87dff60e09e4d7c3a95bcbfa2603ac964be32a82250741e19b6786638be28709ddeae496cba7558b7acbc5545b259e6a1b2ac1f5135f5719987dc547f97f68ffb7b9eac892527a4bf0ffbf59f77327ee763c54d6\nTAG: 3a8cb8fdab2c79aceaef6680daaf3ecc\n\nKEY: 78413a2d89613a81966e8d654cac0aa34107947a036f403bda53e74bc524e7bc\nNONCE: 2d2c51dc426b38c308cc5748\nIN: 39129e5e6251f41dec9cff7ccf256c38e4994e15ca976d3185ae17030ad3751e56367f86886acc32e27fe04d0b89cc89b0206f281aa2d80f9be19928dabf07417e7659b17f09c56d170ed1ef10d2fadf01e0c78473d06a1685ef0bb112e4ec7e6ce0cbc601fc8a2dd64045c8fada4a28c0c6f0ec98542e365279d00ffdf5e2eae3b663c4b79342f2f265db30a86d6e1b325318d7f7a622b36e\nAD: 746875b71165defd5ca1afc0a92db6ef4fb9e20b81018a5293899f1e0d06b18a2e65f7616638f79a0db3f2cfdcc0eac2ee1e2e454958e2e6d214a20ad13156f97d0f2cf4276b09f594\nCT: 142722bf554b8c70e8e76e52b9c0e0bb19b618f7bbc7ffbc91a66031f418d031d3c111eddb9f1ff7c2e64191be8dad4f8cd175079d2ada20c8880d0565c56afe5c9742753cbd50b93620b081f0877f045d0be91ff05a603fdc87e1940ac1e1f0c9aa96d5aaf4a58e0393ced4fad8e83171fa71c397817cd48ce6991e3b73d3356ef0448be1bd8114feff5f23db3b9cacdcfb4d25fd4dbfcae7\nTAG: e489f6c52120c8cfdc0f164b3440de99\n\nKEY: 5c11f6b20b7bede26d6c2f0e5cf2786eea66e18d6ece02156f9233bdfc57c75b\nNONCE: 1a8a8b1f4ab85be5a4a089f0\nIN: ac762060a336aa502f5a1df1e0a647fb9d5d932dc0654e0725122f6a567681a7d1cb7625ed0404d540d8b3145c911280d2a0ff9d1c53e27677be0436faeb39009fe5751c0b37c7a5f1137a26995577faa109071bee1c87d5e6772ca55fdec02348a625b49c3c881aab162f20ba0b834e8159d9bf20ee0c5d14da0221961c4fc7d9b44c7822f32298d30775cf974172ebfdb36cfb2881ccb15e5f69ed27880b920f4a092815357e03d982\nAD: f75590af08b447f0f8466b031ed2409e9f5eb479affd9e18017a369486914c63a7494168d91df157f5e56fbc4ab6ee5a8f3af1fbe1bf9324338a1f4acad45fc7137676797c89620b15feb8512544771f280f\nCT: d8355d51bcd69356ec74b9b8657cec57335731cebfe83202c1557fd208480a2c25747625bcc70533d1ef75d2bfbeb9354066a8650f59a575e836339dd45d0d8a5cac221954b77cabba5e95da7437665fe9b48257148b7e8a88cb2cc4e0912f511aba0a013aaaf09255ec13b27cd9cd05ea11fe2ff21c9ab8a3fe86090dfe13166b172ba08e76d30ad48bef0e2325da08835ecc468cc40222db0552834ae94458366f28f6ba63b3e656bf\nTAG: 0c7f16d3294d5ef185c2d06ed719ed8d\n\nKEY: 322cbaac9c4d7cfb4c326824825ba5b5f5190fcde0d399ef1f52b82abb5a8b1e\nNONCE: 5f2eea2c79702dec4cfbee3d\nIN: 1f5cc11e085d2254f8b37f8030bd285d6aa1cc53868d18ecfdd963153485dce5a3e3e8cb0a3cf8074571f7a2e9e841229466463f506a2bc90f2d6413128efee043e01eccb930fbc002563510e499457161083ed7997e58ebf03ce7ed2f8d5487936311922884bfd31cf828f3d0ce78f3c6981932268108a369048cdc0a75c062c0ed02e27bbd11754e621ff67c511ed98c6fadc3e95e7100644ebe1aa147a7e99f25ce5c2edb8ab6446749441027a211b8d04a6247299dfea9d75e\nAD: ab257a625aeb51f74e0b47b302fb5c0475ab23e99f4d93ecf07694497ff6b27c9848805af93a5615bc71486b26fc9da67cf60c8d3a396bc0164985fab2c64bbaa4dd0fdc22c9d9e433e8c70dcdeeebf230c7a3cb3e5d0d48573a64\nCT: e8d083e25f9332d30bfe60ac071f502909b26393440a848d1f81c3f5fd521de98cd9ad1fc3e806724f5b3732582853cf280f1b99cffdc6b46874d42adb8784cf9ab8e158531b4dbbd76391d48727b585fca0610777fa8ec6a2a7f070627f1ed254e430e55472622289f44089ff22f02b7f3c5e45e228b7b03a5d1e1abdc18b154124f8cdd3b2229e4720cbc1bd3cc3f86f3a6a745de0bffa2536027ee03d447b306ae69b1232e964ca27a6d252c1582422c99373ca2b9541a27081\nTAG: f6b8a72d4235589f7811ee1c6f8d2167\n\nKEY: b068daf90f56b15579767ecdd420c0858fabe23abc0b313b97a9c1ceddcb59d5\nNONCE: 322e47a85cc58e753f00d6f0\nIN: d032d4c5110c8f22e98895279a30a86da0ef71cea6ef2738fe3e747ee54d2e96e3afb8916281f6369ab1a397ca0a18c6c0e9a0c4edeaa4190ce6422bd116ac254a12235eb66fb5cc7ef55b721d3d2db4c67c38bbbb0bcac9234ea7d733f200e6b86fc55f4abb9b65ee1897c262533cccd118b0f493c849a7aa7f35d243f9438f1858da62bdd03fd5a8c7b01d8097d7ce319a41f80104968a46599e9a3289a29a16b245877898f345f92fa70d3e613c38e6e4ebbf0bcb64c1c41f8b83ec8e9f159d4b830d9a1b79f2ad90db06\nAD: 7856eb8621e52ab3060e8d72dfe782b62364c163fa00b49aa6fbe4210fb7208c642b7a6735b1a8b2f1dbc4b3d4952985ef207a3eb0a07b1341700762e9f9d1c3438fc6633da2fbade15844cb1813d258aa5bfa4ac129d693792a89622a0c686f05d87019\nCT: 00d34f899f0a8b40fdfe9fcec98a96c5995b4524b144545026aaa55f629c3befbb8ff794b726e759e18b7198bb2fd2a866379418e6dc4f9fa9e4edc84d21454a5cd212f68a7df321b18e9eb2c537e0cf2e0bf65e80218b841ae8a994ea3f6832d667430dc314567267d7f31519fd856d73eaa1d3bfca419abc5001b25cc1fdf860812b077fda4b01abbe8f8a81a16ad2ab5d9299ea9a0d81aa26e1a573504d5fbdf29e6b2098ce975f2f3c8c212939569c8ea8ed63c4847f2d0fd16f47bcb30bd7e00956ab8a9deddc54e009\nTAG: 6152a0401a33257c8148e65440601d5c\n\nKEY: a266f91387d96bf2baae0262782b9c23162f5271cfa3144265deefe2c569e829\nNONCE: 11e842e5c9ae8fb79becf42c\nIN: 3afe389acfdc9a34bec7b45705ba68e205b83b33f50b7852fbb7f4ae5dfdfdfb3cfee8a03c96a036388aa8f7809bd47eaa073f92905d0d5f199d466cc0ebd9bceb207f4209bf9925c6109973194742dc8d813f3cb212bbd8d92d7eef645fb0f8245811876dee5f241763edaf7d79c1b83d973f9ba3b29a9b9408418f73743ff0546f0d9290010cf3a665c443b85255759ec6248021e4b6eb825c398b5af7b5257efb7afc481abc20d90249bed5b30d44f725c78ad0ce2821f86838874dceb6b6207ad6fa34579126de720ce34bdfd2058d92b8bbbb3f1bec607de3f0a0\nAD: 28d8f6e13d0d4d2d3861e1a26d79cb68d3fef68127e8458eb599915022da751e271cd047cc712fae5b0459ae7815a24f4edf806889fc462c83181111f4de5bbb7e66a701460f508eaf73798c3ca9c08cc1a046472f4b18c69b7ed249a96f9bfa05a276499a5f499c586027c64a\nCT: 11bd92445b4e43dca339491c8100cf933795ef7cf4c3c4d6c42ae5b729ca22869d443505fbb49ccd29b44046569da104f7ddaf325e71e7f30487e83acd012bd492cb4e98342ac7d64843eb499744b3d17db402d51b5bf8cbcb8995fad4a81dad4221ca30ceb3590df41e124c327fd31aa53c86514a12e22c477489871bfeb38cf71cb3a959f4167402576f142bd88b1221281a94661c8d643f89fc92dffef322ce97f8c19b133e55f8020232dbdf42e4527d9f133b8a5934bf0a2df3754d6455a9d765182691ab94ec7a2e68f3ff59805c7457428ee4af8388f91e88b3\nTAG: 8f1bd0ef9d08299f494054ab9409f663\n\nKEY: d6a68dcb52a50aa6d1b1d4d202e6f184f01daa08fbd643523f4f73ae6b8d764a\nNONCE: 7f567087a5fec5ad1ee3e4be\nIN: 5b677b87109e69eae9a635ac2ea185ba08ebce3ba4be06d53b2da081c5030f5a746fea7bbdda340e10eccd47238340b9244b9442c0efae7644cff53c7abd8445163e891cf30bc8e26eea01f0c461b4796c2106e1ffdfdd1bac29f7d3c72c8ca7f625008d8d333d2a2092c08ef83c8002ed90e2ad01dadfe4cc0681384b489f38d25e83c2c563485fb361f81d44aea205e5bb4c1912d00d8f99f8d7a931e55ae72f749147fbd97699ec730bfb01b8261f1f94696278fc703263cc789b283460af9d74647a8c039ad2184674e78f6a355a26eefc6fcd4cd32d96d245d583836312652fd9e6694ac5644eeb4c2bd667\nAD: b52e5af14bcb108c8e277728d6d6116e8ed1981993771b8bb783bb351982f9f8c2a0e7c20a5a863c6d71b7145b73d7e6d84d47780d66847244d0b8ef559f2297f39e26501d8a2aae8c36189580292da842c4d0d06a21d21ab175e34589e3b814d8a00ac1d8a3b2eca2a91b21e36c55fc6dad8c0a1b2c\nCT: ddc900dd582d322c567e3fd7eb23069b9e559bb16639cc79ffc6f3deb6e92cbf71ee66c839b4115e883390646245a42480ae6c638fe7fa04b575b4a8341050e2f3de075f2f19ad9b24d9cc1c39a659b0ffc362d46354da6bee0e41319221cf7cb160017d589413e5c1f07e5f626c2a1f8ae9e8b9ba0320a2de9e1b5f7baa4d551c090521d8ee0b30c8c709fbc00f1fdce999f1f96883e3b83b363cc47665e5a21fcf25afb6aa2bbcd0a374618c3dd8b8f97f21037946dde9bfdc7e907ac39e64f1a5ec8dda60a47148bd066f907a25b9caeb3804c0423836a8d9c35bc58c57882c5b23e00c7f4e3b1743cb14f102\nTAG: 8ac7e104a0165df543c7454223a01f90\n\nKEY: c7bcb2108b2e21fafeaa26a2d4881b183b899210b474bdc43a8f0b8464075d86\nNONCE: a2ba1e9cd195a8ecadd31587\nIN: 0d5740c4e22eab0783de87d541fa834647c3fc6543c60d5df31c19c6ca38707649fa8dcfc3c0ccc16b1bb60283d7ae2778a8f83ba07b905e23cb06d5656f614f1efcb346f34e190bcc636cdca229b64af9ae4b1f05b58f1ffd1a077a51bbf9ede69ac3954de7daf569cc8de12282cac09b9a49dfb92dcc409b8c63f2ae4a34091633f4aaf225aa02ba9c57b910a76535f0cba67fbab0e6fa0bc876217fc9a546a97dabc9be41209bdb582d8d8a62865df7398d4f7e9ac681bcd102e31bfd40cfb8e9352b1e8ff7a7b81cfe2a62849e8b77dcfb645d2046404a83442133e245bd1df35d69dba9ee097dbc867cde7b431565c72fec31719318dd27c3e47dc5f8\nAD: 729ea794668d8724a1d4115adcee0725e4c1e3ce16ed9e31bd5a409cd074c0277e21a0b431d3b30ddd361ecd176a8d86927c2f6693105d7d3c47d9be8bd90d0b2fb20587623b2e838624b5", "90a5c9f0e6d519b35eb5332b16bd2c2f9534e376ba68316efdb963d63e2c87cb0716973297d986bbd885a7306e2bdca0855447b5\nCT: d0e58d936c8b83c253ae9bd29f45afaaba9712647b3da6c6ffd40a9390a4476a0e74a2f2d458c88056bcc0a57fb64597a7c8a5e2be39669dec53c6bf0f7b4a2bacaff9aef36b43fe37b80cccc7d42cc283ba1c1eca739167c07754edec14375d86e88668b156d04c989bcf3fdc70e8a25aa3e6052d6befe3072ec0993d6b520c722dda62b6879324eb4ae016e54d139d816be7fb1bf9c0168d8f7225bc8ed9b7509b45cdb2c8a1db4b3619120c824d0bad7deb7fd0dfdb3674ab15a712f6196a5a840ee8895670cf3b20b8a5e43caa41c5524bf47c2ed4ae7027c2b566dc3e2548244057b880da2a3f1abe5e4eff090f9358970da6568bdb5f8288f9d25829\nTAG: 057ab8d811b5c3819781752230badd5c\n\nKEY: 7817285801341c10baf67bb5f71b75a11856d2551eb47e60025a0021b9948afd\nNONCE: 8818888585a6957eb59680a5\nIN: 5a5c42458f2d0e0f39bcbada0ba0b6e72340193500e22d243e32be0e7d7bc5c632ef3dc7e79ad5acc895cbba3111d8d1faa69bfe2ce634fc0d7b12242dd8bb105c6ce54cc9718921378c906ff5e61f48fa259b25bd10fee96856a206a928b450a0098089d5cb7378c2935c4537172076d829975798d4f24ad243e4aad474fd5e59e25a6dd133944918709e33f84b4daf4bc6d3ba1e0b9e364dcad5834024066ab5c8e672a999bbf23a83956623943e0011e3a2883d23a767b280ad84e2d7fe5811099395edd269077162310481ff304128271d4ce5c84ea738fde318cb2528bc5cd448c67837cb7dedb632d47e8f90e351b0a8942da2f78e2065cdf827a85f51\nAD: 0e22156bfd971ab3f123e9774bf3ff7c224af19bc79e812839eeb3f1c14f89e5666c16c44a5483efbe449237508ab2436939098640931fe3b928cb3a9378b6b9fc2a54c6bf59f34b16f06d5ef132ae2a7161034f26a6e07badc61ea51a94a20e4692a0a0525726f3de9bd1d6151fa6a0ea3acef3634847cfbc98d2e0bb9ae89e\nCT: 5eb6120cae6df4766b40ffb4d204ade5ae08aa2cda263b39ec7b47756ed7e6b7837fdcde8d01a2bf01367e9398e25991f9da11bc9f8de8e6c1b4e922af05d20d683edb4a245e22eb6cc4fec2375e8d81f9f27af5f118a16fde654b4ceabe770fb3a00bc7a88763b670b5e3a6ca06aea1824e20b9c1a304c4bdb62643fea73030ef6d18ee2e22095b4c73abc51abc4883f2bcce14033608ff7e1ce72ab3382c29069eb75426d283a4a71348123be19f480dba1d1677055de9e82d683c2d6413a6a4e0c6d58f7f2188ca5c8b916aa49975b80630d27a89ac284b971478376ad6e55dc64098951bec2ca7d77ebe790b1ed7fe7f33fe571d8613f143e3d3ab6bc613\nTAG: 6f3f79c6231d7e45ebc1ccbe5d110a0b\n\nKEY: 4f91a78c56558ac92b4f33fb1d96b1ade26cf4b2fec779bfbf6709e531ce0e62\nNONCE: 19f75c4c31873d4915b1af3a\nIN: 51c2ef5e89218ac4060dd12be216654eff2991e8d7bce6f6a437966f80c59c527679b8983e75c617c917fa9b63bc60748f5ca179645afdfe6a126a73d3fbcd41a9df6d734e8783aff3a5134ecacbb289f93febbd8eb493693264026f8678e9fdb779038ac13199459caf9c4e86f4cf8306af6dc04d9dbb678d3ce9e41d154c4c1bca018bbc4d744655af04ee2cd524db41170f0946df225d156dcdca3e52139561b61c26bfc56bc90c21cffa69468863afb66c3e1524303f8f42103e435fa2fe2c2956feffe5b06ed20bdba730d675166f13118a193b06d7985d54d46e4150468df1252d7cd144afc99ce99b93ce9526ea4dec2cde1d0d72fb82f55db65ec2035e387e7923d98490cacc793046afaa2e49\nAD: bed34cd7e4eaa52e75bac5e86f9e9eb81028cbe8a515870edb9a151334e1f961949855565abc51af9a1bbac0222e9bd217d3e3a642b0f3df8e7c47c2c9d5a801cc8028c425b3becbe31df39d30637c38f981d268017da818010189c93d2d135024f239407623496c5435f04f9cae86e63ef46fcf9787c946b400249d8476f82dee274cc0cd3714973f\nCT: 27bf7ffbf2c9733c3da8947db11ac8801475451b0a65c96a2a3934bf45ff54fd5fb21ff0d51c83ddf0f49b005d424620b04d0c731cb214f4beb6d353a6d6b7bf1a706b070faf5146b562c9f4e6c0ba5dc9ef9ccde79cd162bcdd887dc02bc95e29dd606d22845f35d0cd6d5eb1f1b154607c0c5c2e8c7dac005eeb17c238e3d4d1e1caab72b20a9d7b2676e6491eb84e9cab903bb0c05751a33642e145de8391ca9e598ffe2e579486ce32d5d76a35d440836ede088267e8cecf4b660fc5eaf05f68872b6cd9427607b146e15fae406ae7089ae446cc2172b8ac9e42cbc27d4e5ee38c21d3fd6d4d52b2d43462756d93995b9333a079dc1f2bea9ac4248c448d932c5c0f6b76da4698d15a64f761a7380b\nTAG: 7efb02056e18e98960cc5718edd07cb2\n\nKEY: 1b6e0ebc443d681af25ee26a8ed475136ed8bfaeaa8315a4cd198961518c7bc7\nNONCE: b15c68437005a4973a068187\nIN: 38adcaa250949af910aeb807096595b3af54bacbedd966f83f784f651f7a2044461a94f1a6925e6d2064e72319dae75d3883a50afb6be1395d429f24029dc9b8cc021f15e305e5418d844aa4a89ddd299bf2e8c698a8f6a6cf0165c37bcf2e5885d73bb81ca15a33ea75da5946678dfcd546d475149dd1a2dab0e11cc8b07c0b06105a497b1fdb1a720b9510d7d8819b6d946dd85c73be515c6ec00a10a69661c59fcd7a005dd08f3cad722bf3560f356c624404f3be55a02b3301ed756f557a51593ba90d18a1c13e227c8d5180fefdde4957484dcb81d08ee3331a6fa74c9c549ae13b2dc2a80ca0435710eb9f0dc2c908d896957b87325180d397c37ea7cf65db45960c4d791bf8cf798bd7626b13bc5e6b45b45be1a8ff687572ece86d1f5361\nAD: abaedc1a7f9d9ff8003bca97af7dcc42b4399f9da4a0e7e829c0e12f4d41607303f60d1df5949fca0dd9ef171678e013b88789ac1f51a8160687d842c273a2dda93c5fba1eb5bed7476ba96a12e70cabba43d509b311e9d000212c81c483b7e9e7bae1d9869a125558b2c7ef8f838bdfe97af413b460bd9dc5e372afcb105832ee4c406d74781d3e9f2aa581ba4fe458989a\nCT: 92aa5661d04af60245f6f56153cd86c6a61d5584473979eef596d6d0c205db9e4d928ba4827dbb08d5b34946b8f3e58ff62a976461ea5639fe2ee79839f99f83cde00e3fa3258e21754fa91a17e0d1fa22cc76fbce0bebb7adad09f99bd12e70e519048d96c1f97a183d8ae66445e63a4a1f936821fa7b58f569a16e25a0d0b202231a79eca0e8a2ed21755f496d8b7a9f59f6bfcf47ee4bf35788935cfb1b5ec2af2ce11c002b2843090e2267d5fc5e26f927e8836d6a97dea2a7e508f82a4cb7df375110217f88f4376782626039af166b080e181d8a310ea7fbb4fb11d5b24367f63ae83475269281aa09b7bd259a348fca28f2e1d7938127c888c68bad2608f89a2440add0c644de2b5f08d3477641675cdb428393758317c273536942caad42\nTAG: 4a43c15d469378383e9a9a26dca7083a\n\nKEY: 03679744edb73ba31c7d9d37920d4d57a766104afc9c96650e5a602ba885d207\nNONCE: 8f1c67d44d6e86eff0c96a14\nIN: 6bad3420c7dd0c64d800ea5ab7ff472d0f61bdf2e5634e06cb4f3c022dff8c4b46f2a47fdca2d04572b67f24125c66a551a1f150a02f635e1e99895807efa8001f46388365c48e4afe49c04f6681510f7e4cdfa02deb3e60eed745cf6d7ca6b773e1537d057a043cf517e5388dbbc44ff4bd68d2a7243587f8929ef07df5d001a6099bebedf8f26f49323209496d50109c383071e4a61ce18f495d98b6c4bcffd0fc2496b7eb0ba612e2a4cca8eee2a3daa0c21d854d49ca73cf5b24b38940dc2b44a2a6623e8404fc30c4e3aaf759425ebff85cb1c661744adf34c6c5d538f3210dcd0270a3d12784effc48734b53c1a228db291e2e5573b6ba2aed0a7296c1bbfdd1f4a86d6057d5534675a3f4897fe3a1200c54af7e09b97b0a2ab9f25d5ed375e7bac921f28f7b6983a41580362dcf0820\nAD: a2dfe82989ccf0a998286623617453722bea0b6e8fba504b93cd043c7e6c7cccfbccea43f7e87502026f94cc7035c5e84cc14a5fef9bf2be53dc379053725a9a29c4e86252369bf6dfd3cf2801af7447fd0529e94beba961ed65dcfd492398123faa55346edfc3ecff720966b74fd0ff28f443ca67f88b8f5a4a73007f79ef782bef601a0827888c4c74f7777279c625de8a4b51db94f94f846474\nCT: d64a6980718a5fe833da2e6c1a119f2f16a5bf3cc5089168520603d37998d5fab07a9e18ebdc0b8417cb6a4d34357f8d598753affd51e93b451269dc24354d197885ce9a3b2f575fdc9c572b05bd7bc8df091a6675185ac15bd1c4f2cc0a8a412ff72baa6fbe95065bf2111910f4f004f6c39cd8e7ff5bab5f86abdb231406763233354734807fe0346ff6ad23a1c9c81b9942b370e02bd79eacf703ebcd53a54a5782f13ad3591801d1ece15c6deb56bb5e32d959ed1363875c57cd9d42881dc1799e652bd554059ce059a9d00a126de35f0285d5d82bfdc383b1b37d77cc1180184b2180aa35d46f816fcf125c9e8e3bbdd67c8770da26b89c7e406f02ec515edca3910de72fc76ddad8344ae36fec1d72315e1a568ee69a08154696e4545ec5ca53b3c0f5ec9cfe82792380c1b9a151a8d6\nTAG: a258557d32e1924b3eafceb7b73e43d2\n\nKEY: f8563001339afb3db339ab997cd1eb1eb7b03b228162a480e129c66ad47dbd18\nNONCE: b4c98f6d51fee205805a50c1\nIN: 63beb176b754366e13c57c18433228a81089be18b534ee5f9567d529c802d34bbca36807bf845a9d14dd141c5de85607a4b4c5521e5aa717f78fe78612b770a4677cacd77a425e2496ae50ab2e559526c37ea723f2b8d14bd8314e4cc3727bfb835ea4062e87870b13d94d52c25f0c631668292f184fc048dfeed7a9d1a88cc5c4662030700cd8c257784009b4da9039909f73840b600eaf670cd4d988845b1d41cfeeb1ea740db129c12f66a74e6234ebccf4df706ed30fc736cb5cc0db17ed108229e87d6b039da5c4f0568a4cbef9d513dfbc0af9313f02d5129cf616487934f741a0a60bf11fdc8d29ec81eb37577726f54f3e35bb10ef98b1d15bd5726fe501a9249e409eccae128df61762447962ba2a63f30b59ea25e18895d2fd11431606caf6b45b908b08cf2e150c031e20e6cc649699fed5785cfc6a0e22bd8bd8c6d25221\nAD: e9c9a8d2869d236388fdcdcff990cc940ddefd06da0524a351ae6113b29db9822adf9cb548d92f23e3951ae8522ab113579232e58578e80bd2fe3e1d06414a27ce0ae2e40d87745a8991dd5bd2e8ecbcad8b903195c15ac2eaf9bfe0104bae32f772a7d7416c5671350524419a6df6ed5e1df32b961ea39b164eb7e1353b046100998ba6853674ebd5ba011691a270c046096143daa84752f872e1ae32ac07c4f0d2a048\nCT: 2ac34bf9d0d909a32322cbfb765875297c50110ad859857c641ffba8efd60ca003b8f32d157b6fd8fcfb1c6037b13285be884ae2dbcbc9194e8757560807a14b2219b9f2dac11af7dbbb2f504e3d8ad47ff73657a4d1283c78bcd", @@ -629,9 +635,9 @@ "613c3be18aab77c708f5e91af8006e11b6ddebb8b0ef98c06dc3c97d008e058bf3e534582c24a1485f68214cdd88167814802c89d5c07a7453aff1010d6db0b778d9d8fc64b5bf3bb84cb97cef38a4b30a7deee12f0af806833c8c6d35a7f995b414eb0d9a900e3e56afaf2dd0d162063c4dd52bc6ffa56cfece2ed90bc7c9f4276459c9bd128ee40a5aa514de786ec15d04a16adddd64c7613ec9eed738fd36e24fbcbdcd0d3318fab948f47314a5400d71c5ee07a8c1fa17e4a4c08f4a467291cec1e8266342a42646d138331b08498f2dc3fda0374ef736d05c2a363fe08dc71ec799f0256ac9114743f40641ed8d9a039c57cd409bff29bde518657cb305a875cc6c0a58fe9ea3452df3e3802cf316a0c1f477179f6cdcb39c7c9424c07997500989a600887dd9f04c92226df10e9a8301818a5ec2f0b7b06b6d1443dec46f478a9271498b956b72060dd2b3021b004358b\nAD: 7eb6a083ff2facc3e9500278352790ccb6f9df67dccf7a03c33a34c6f33c1b4dc4ced2d5f69e5f68e79c582bf0db7751b774019d9399329f1a6692c5c527a646c9bb866e69d4f1ba4e6065cf0c5b09e941c5bb6e96d7edcb19a5cc02411507701b65987dc206ffbfaba4f06cf394976bdde1ac343e368ec1083813417cd0a325aa0e88913958974fcc911478a460b79b9978e33b21064ffdc1fc4df1e314948df71af9a6e0a40907e6b35ec6304bcaada85b456298637b6fa582ef331e2815fef135dcb66870107b2149c5aaa790f7127c0f0819b83bec46c0f6d30edb61b6fdf4f35f4b5345f1c684f41eed8088aa2f1d42c920a06092058e7c225d10fe1e5befb4dc593badee754fa12b843a6e9f67ea0e0616eaca697b22f526fb79a2ec259076971185678aaebc6449ba3bd284230ee621bc02ef1f5ff23651a6116cbb7770ec7385a44f4d54e7cb04aecd59a99660a1021eb6abb5d2cffd76e6e7380c22d0224e499e0c7b69aa0e7dd6deb47b22b1f1fb882dc35eb944a495fc3f6345b08da8f7185c3be95952bd7c982d9c8b2410a1cf1f5164961f6d1db6160d252e631f77b02d4e23dcd655e7e875b9b703fd27c57008184772c73fb5dc626ba43f54cbdc2937de7b4c470235098cb0a3e699baaa8e2adc09f8182ae1f168aa86a790688795003c3598293ca269a944\nCT: ac837bdf77bb97a1bac4cdde49ef8d6c7024f5f25a7bdcf924fa87b0c77ddd66bdb67c9b8798922f5378c0405be67d5da47f7c245c5f7330accaf74d5bec6a8667c911384d9c77e9d3ca38d88bf87deaca62b58d092bbabe64895b944fa9f6bca0aa17a55031fa19ab0c324948816c57f67adf84077b277e71a7db9a6ac537a95e54d3cd4c9517bcdb7e9e1ccc8e7dc252c27c89b9c20c9876ce7c01b17b80a05c6f75006cdd1e081ade6f9353c66f7113613a5f72d82dd28a65efb74d0d1c92793d652edf23bf7c70f6dcfd5d40b2799b60c2a6fb53beb02571c78001381fc97d4a9292a0eb7a4a0a67cdf20b4810aebe5aa4a6d20fc30e2971924a09f106d0b5b7fcf181321b6f8442f91fb7ff3b5610353500b9d6f8a36301e7cb12d94d1aab6ec0f797fdb57232c02d5fb4b2ffc7d0cd2336ff96a4a811cd1aa02248f4a48c7646591507f9e02f8f441cacee92b5bb3cfcb7a5dbb02993d0fb1818e0ec4cb719a6b43d82e15ce576f95912ebeac7a7aa377a50d1190799b00a6da2fe7cd7231c3fecfd4e6913df0b46887ae8412cd2c9de49ad7a4e8f55e7f53239649b566c4940db50e0ba9a915acbdf0ed97905b0c70930d49c5c31cb398fa4f52222d3cdbd9374ae9d7d979991fa50a2cefeee88b3943578f99b9a46e58900378ef22880c862103ab7e0c2066685571b28c3407cfef5bc0c9b176be8dacf6130bbc44389aac32cd0011aaedcb752e16a1f99838030f7364c17441de87d5ec670a25a2b55a77a57f2304233b3d9d1f4c7b145e7e145eb8607f2d9b6159e954f14b02609830fe54ce1a7dab775b49d77a0ed503773c81e3c53f50e0cb676387dec6e506494ea7843fe533aa7f09dd1d4c960dca585a1590035a9c36cc9f821b4a8aaff6548fddce5250efc4211b0ad0ad4dbc3dc5038218e58851da4848f399f8d7938da211484139000dbf8b6c6314312586311ca1d8639fcdbb20b6a6a608c23027eb46938cd6bb869ea2d3b327728f31012de124a9b57dc96d5d98154b98045943a24e4f788e48bbcf0dc20598fb91627f09495c8fd5bce762b1193fdcf9c45174005d589ba6ad971b5d7ee13e1aab89447a14f9d750621184cdf55ef4ac2f7fedd7b8fe89e0fefb4382ea18cc4feb62e9650e9ba5a12f9366584ec774f5aa09793293b558293991de7fd1793bc44341a5b59cdb45095d5b53a4b847512dd2ea621f9778b4c0f33cb7bdbee1061505f08f1f2919cafc5d6e45206cc35e89e1d366b7abfff3da64f6cfc0d0b855bf5d425a85d93ecb01186697f60a7a47870ee2a6a50cdf134a67a51565d28974dbaa9c62ffc960b70fcdadf79dc489741095ef3052df69c55b99c95a44728d30e267a02922c7a6ef2523ec379239a5148eef6\nTAG: 09a43ea9d67cec2b3f35d401141af9a8\n\nKEY: 94f159c5d19a22469924c5fbfd198b8add28b37cf7bc3258fb4b906f2ecd672f\nNONCE: 4fe1fd1359a4332402251d90\nIN: b2e081fc4457b3387c1033affd15747b79dad1d6d3b69c076d4dc5c209ba1cdd383a5196fc21fbc49fc65c69b85ec299b1daa26a4bd2e5ec2559cb230b21c3bb62e2831830a2b86da2abaa289d98eb04eaf3cf8d583ffc7291c3201df2c09b7d900a4bce0972e390fc980eb67cfe654ba3b9c579f997e319496b57819b36dd2b4484b88ea3cc1ba777b10ecaf526a08afd9e2b3b32b2bc02932af5d09c2ee3fdcfa18d6261808e418c4bb80be4315a5581d405841341bf2775d8d0adc21c10b9ffdc0ea4b22e22f61b46f844d8caeda0aeb7e1c3f84d337898af24fa68d60e2f19ff815713e1587e0d6e68d64cd088ed432c45637e1767913343d899b2f8c01bdb83253219878a5b3a4e6166e02387124e711a56e49da1893b4f72198c6339943262cdfccba33428009dff70a0c8c79af248d081ca04edb2ad4f35ed1819f0846dfade107c7e9f4094c014087c719517d943e524b86047d24aef8b901a7b1ec4e839400b717e758520cfc7a2dbced0ef491eef6aa2695b2ab9a92296b6e75251f124168c36a6555c4a465cf84a7b36f3277859dd5bb0f10f84cbc944b87e37b6b8ff6958bf1f0546839effd30995853c734a11c062414fe841113d0ae62597cd12ef80dbd4dc4f72e065171c8394e45dc6f87c86154e9846c1eb58f560b8c503848eacf05107c445a6a06420e67e2297a9975d23a406f8b8ee46d958d10d8724d90bb26e2b38be1c0e8258de3a09541826486ad28af8f2fa8c7befc95510589baf81a88f3823e87eaa8e40759cf0853547301de1e87b2eeccd76967bb364278174823c1cb1963f34fab537915031cead844dbb1c614eda56e9952b1eb4cb153d06c59c8da3b10af499b1c15ab0f03559fea13b81bd35fa5eb9a5431e12ab87c3c094861154d3d8eda448af7e15017103ad3dc7e9991b10cbe61cb33d2ff90121f4e40bd5d9e9c34b89679b6e1b54e38f00b128093af3e4ca9830a1a4d7a5e9db067c9c51fa26232945fa3e1e31e28c5000e1965cc7aa11a051305e68be9d60fb92f46eb2b701b3f959819f525ebefd5339bebfb64636d680a2a4f32afce85e287f8936bf62676c37ba810754186e30b812b1196e8661e345fb5b09b8dbe5f96e0010c5e3dd0a4e983149f4a058437cd46e3b32ca04c51ae3a4a39a7e15768a8fc379563450c616a5c7d7d98c46c0b934c894727532a9e713d330d294a2753f0f46049c88eed68711e9c49632144d5cb14d76848a6f7741d36c969edecdde52cbfb57a628678d31befa7ae3198343deae760d5c92c31f3c045b3e932e9051cd201d2dae66ca0368b94445d662acd6442c39eb945c8a4b46129a8cf5bbb2b27927729406f9b081695ce148a10226bc345c648fe557b7f8db4604fd0704831e5bdef6694afe716ddc3a8d69ccad4113\nAD: ebe1684346b493db264417cde9c0e48db46aed1984f72903e94b72cc2b2f151fec80b32523f96f61485f026d63734ff80015a1cad4b21ed1ba057627b387eaecdfc6d7a195b7d46e485bc137726d96c4ba51e1656c3f234174759ad922f3493077d65c149d1e871855490b6fa5924f6270cf15920838b66e3250a99ff7a55ecc9944cf3fd204081a61ce05bb989e5abeae4b2f24801e7f2223d5ce05c2b61f32344a0370c22751293bb898061ff50d6364ea0275bece795be21c9dc0b2749ff68a6d15896d4692474bd46fb256d1d012e45e7a58d880fba240ac6b89d2087da1ff7d41df44c768fee5bdf51f36b090bbf85e7ecb69f61312463eb0b4b1a04a153f593f8d43f62ac96f76e13ab5928147c5e63788bba4f076d12eb6dd15842e2c40fc9f1ad5dcb80bd95d9d41222953776b3304badd650afc783b7342196ab551a474579d95f826f53d15b96ac98a10c2c6d50a7b9b947cda9fb8d8d7dc7def72c5283a93112d2b58487a25debc9ca06946bb0a52a1e4ed3bcf0fb8decae49fa6607c55501f01b7441671f08c814023f7d46f4bc596d709d305ce320b1b0160bf35c8f17622c65b8e5c97b3fe7327e8e22384f6c400e551dd438d6d3d0f9ba6101abd1bc2486ba249b4cc83c47982c1210328968f2b28e4a7c4880d598d5b47aca2093965622ba7b4e4062c86d81070ecaad93d5e47ec\nCT: c5311b1a6e3d93da070ee0fc2c1007558db64bfdabdc23c832d151472513482314e7d9385918abe772970c7d8b3ae4eb0d12965e6d7f6d01f6c97d06b51d3be812dfb290592578713ed6342a690ac115c29d471826f37f7f7b46936ab9f431cc0e4029579036bc6311574205810fecd3a17ebccd0f15752152276d5169b48b0a4fa93613fde13997517956f84500edd7eac1082ab6b69bf43f56fb9046cefe8425140db5f6bd3bb201b3345b2138c7f42120a3009ccc19e2d95ddb2b4384205d2aecb47c89cb43fab6c353f781caafae280e93dff5bd213640c41cfcd81b9dfd1be05ce21758c5474c38bd24819e5d085241dd54c8d2cbb5b21a616e47c05d4c64c0f397fc16d52d008fe4e83c040a6304c41a448784fb0c54f8a66fb00b240b9d66e8db234d14534dcdd6b3ba78db0403cf0219406ca858fef6bcb259fb69c53c6f964f450bcd12997955d0190ccbb2d9ae6b3562d85dc7de2bf1bd5a8d49651fe5de73243d7f89ac8796387e0a04c74d5834e47afb6b7444df7d27592fbfdeca72428582703ae52aab48c1b587b12fad6c887e451a54ef81481e3d8b4da1e3fc09404a7c209db8c880c40b3fedc579fdf19f956bfb36d5b2d1affa0a3631681084ae4e41e3a0fed84e056bc72b6c0eb1f5449935f7c2d3de07a2a5fb65af65f91d2c1d730edb80b437cba66fea779449b68c557c5f8bc6a2581b6808a98a1acb9e6de414377f5b08fd5cfeb4806e8699e50236dc8100a88f4f55d887caaa6ae8ca09c23019126b62b5c3186b459c39ee397076c825b6e28ab62d8286743f9d07182cfc634eb4512ec3beb04ba81bc20294b16fb6d42301a74fa95f95510155a15eb953eaa51d82fc363c0c63d1cf401a3ccc0c577474f99f7c4f187316fb85e1db38dac1df4b5e7c710be5b5949dbb1925723d042944eac09dbfd74d7e876f5931f619bfba1ea9580bf4e", "6c2540fd68d5aa9cd21203ba207f0f62e325c1e054271933563063acb4d932eef201bf3312763dddf6992fbd128cb8fc8b7936acbe8712ad398c5a8719b9efbe0927b9f637f323c4bea80901091608ab76e483b5ef666560937705bff96d430e6e17b0b24c755de19bb88aa81077852c92a96e902d538b4e11b78a4b5d1f5669aacdfe5125d806a21c06ccf4980edee24e41b7e17672fed0ace9b19e4d55415d097f0b5874d60dbe311871abaf47220893c398d5595ee16275eecc6d15f39aa5e2181ad1448345406a4c77a34c3fac77b4c506cf393791d69e113270adf0393cad689a07056e388ea3bbd00ee5878e1120c869531a8b4745ca2debc1e008493d17bb3777992cfcaa165188b4801122af5422acfa0a1807a2a35e793ebdd95aa9e025edc065cf9ae85972a5f42da193cd9b653373a6e15d647b8d26207f3230e50bb49\nTAG: e2df8917d70683fb6e6ea67db55367b0\n\nKEY: e22480e24a29b2910b227930344f6a00916bb215e57e1f3155fa9437603fabc6\nNONCE: a4c6732e0887f40b5017de54\nIN: e46035c45b6ebf14c5088c5f15f552a4d233de7d3750d7736838a5cd4a7b41df1b71e6c5e6a7dc63519ec43bcb4fc603168352b8b8e261c15e76e73556aaffa32193c1f5641b2eab29497c80eb06543c1b0f1787bc616a4e6618f751dd0a2b28a87fcabf405e97efa91becc8ac1b036a2ca244e13dcbae589f0d6bf8e19bf91caff673f2a80de93a6fd5da1e63516e2760ca12a64c8175071de22b26ce72ff9e15e5c55fb253cae55a3f48c0b507bfd423f66ebdecd0b6227d0e67c4347f2a4819a6825dfc2651e97c1da629e92bed3827a15dec0f0c8743731baef8035fb0a790f49e5b2a7339485df313a9633496fd9e7a9904ec566bf20b8dbc0e3c1e4572411da7835b5eb5cd51313b78a1d6ed96bd9aff2fba37e86d475d95fd7e14c6fe8ab23645b15e7823b7bc9d0a02fbd9a43c05a6c660b6690891c4d055af21b50a5500d72c91695536eb1a3852caceae05803486c64535747df691ebc62e888bce8a5c820569b3d80edb4e29027e737fcdc4f49f6eae43b4bf68a5731fbd09778d6b205bd8b3ab4cf251ff31dd94f2033118ff0c4154c78af27570d12def873fcf4de7ccb6b6cc8924dc63f8104e9a3323ddd32006d8ec3aa530818e299490dfa0a9d811fb3bbb5f624f26dd7d0d7a87a7e7748af5ee4f4bbeb150ea4078b504aadaf92b8f9edfb701c6df7ca615416f61bd770d5fc6675db01394a26f585ffb8f86b254d0e08d0a0f5a499ef1b2bb0216e486229f5deb16d1e95332b8673652a86a6e3fa0e479987b2bdb1909fb772c6836d15cc57d97f29acf335ec1873c1bc6e714b689db855c8ba59289fe792d93774dd83313e3fdf11bfd6a40d6c8b57a5989e844cdf2fb38c239f6116c1c3aafb9356ad4b07ab37f7fb089cd424a8c1f19e5a13f085ec8cd74c3c9f0aefccd6fe5340eb1e419d15285b6b0d3b57a5545f6e28b75bf4795d995a20dc7a618f0f77a174e3eaafe221f8da0cb071473c507054243a7f9eee7d5c77b071602936fd5bc411e9923fc82016cf5345454285e9c1396696e05d984649a2955d7446a1d3966adda11bddbf3dbc11e093c15b7d4fa2a7a0c33fa28dd3242738d7a77775cbeb8176a6e9a4e4e58e03f631a67c3229d57302fe5967c7e3362ff926fd584edc32905a350b390391f7fc3343f22498bd198ad56cc2827926b0c4700cc352bb990876db7c17e2d32b5b0af617554a1f76c32b94cf7728e89bc208f22e986e7d2faef190f820918afa4e08cc46adf0704aab761cbb9791aa12eb31a7785d7716c3f0a46afbe2a44a52e5d0944fbe207ac78d54c407679814cc03d9c9ea28f1e518a10e0cf034d1ffa27b67c9f027d738e0a96a381571bb52afe2e983b34f9159f05d4ac9973d996c4612b7c60407a66925068fd98ba6b7742a219d8bed4ceb720a8541f4cd9eb990384f8f8698515ed3692\nAD: 8eb26d00d61388ca0f06d45cd697e36f11e25f618eaee0562dbba21d10abfd0bbfe232e6efca4947adfa7fc59de529652d11847d3cca84ad147f8905bfd0743be43cd21a9ece92d2d7397f74b1632ec2b1e398565e3f37039f1e147c061b51d59eb31bd16bf830b7824d1ec5e79441e5c5e5131062171467a037c350fd16f58854e3dfd9c1224d26fd600b006d4bcae123a7a9d4e98c47b9e9e3fdbc22abce09b3c24a5a060e371ee70110227c9a8b6049f194dc4f74cc97d01247d76b460774acf7c5d4a8fb4f01888e29ffc517839c234836cf513951435f226e635ff8b02b18225402b026566e951449023fcf7f6bc2285dac1b7dd83028697dac70927db01c22921f6a7a6304052e58c8e87819bbb75de9cbe6239cb1ae8fd4849eb4f48759aed59d5a0ec3108b3131b0b74a4f860e37d02e04b9501e5e3c306cb25820abc50cdfbb05f8e5e2d2b94c58190c5d950f804786fb2ef97eb013f6f049b38fc57561b9cdfce5ae30516050d13d0ad8c1d750b51a552520785a9dd03c68203d91e72e3bab17cd67989bd103532071676718e889b94ee12856547a6d0a6c88c236d7fc7b0d8f222592d00aad4e813f8c738bc10c0b1fbf23bdb2baa56b1047348ed172a15dffd0bab088e2b406f040ef81d3362d0f86d129fde70ffaf87ef3c4554fa43850d1816407b4d5b0459bc622414a2d9cf2809e60e467fde6ecb7f4d9\nCT: 98763c2423882eb5a1e9075920b2245f2243341f6dd2dceae7780aa738fab65c7d86f41dd4a64283752db5e86cecaed0ac1afe966171e94f2c30d63a93ff11343ce15ff3bf464d88a6912fbba42c08e6225cfaa63c6da17a6354a34362fda3d993920050dfb99c84a235726aa4cbd66260b0e5675bfe89078e33e76ef537d2071d5801758c6cf07557c0e8bfe0a49aa6e212d69617d1a22ff15a26ae28f4d724d6b537ed34af62672cc9d48836f284cbc7eaae8cd15b46b8e233c94bf3036713f2679e23e0bd829dde5b3a5d7a2d65193f55a45def3d52830cfb1ce3f8208c1425d8171a053ab076c2377f7c26b37970bc3c937db75181a47467b9735be331a0f30a7f3ae135a533153ecd0a5e0cc1568e303a6ba6065c0dca8162a33df7c5b69542938c88e2141e2aa697c48e72ec0573065e9d9a9945cfd070d45218f646e5cf0c0ba145ed1fc7b7cf96c64e3a4671eb6b51ac8eb79bf0b4abd56fffa2ad8a93c001e2baf0b65e257782d7b7e3a837cbae16d40183a8b629467f77f2c7f8640da57904ab75a642e99fe4b45ba7ee488f889b07ce7a4e74540c3e0e0e67f88d473509295a66e27d4ebda1d4d3313add2555477aebf7fb84edbfdba18afc6f04c4af6a90730518a8ce28c12ab90921c413bb822e63cae113e5254039cdcad2dbfecfd97c183679c6c4691c99ba771b1389384259b966f358f871343b4bc5f9a92d8f27588202ae1269658ed91bae33deec6a6a35b9fbc523cc11cbc15024f4dd386b8f41c3fc7097d717099e722e6243a13bc475d5f2b1b2569f14cae6710c8650bfd78520caeceb035f58adae811c0fe9857c8cec59a01123e5eb2774190943c2cc7d535af77ea1f79cdce94e23de21004c73fb8469c230e25fe245c8a5a6314736166a7fe4e1bb0f91ee8d60daa0e576b9b7c6b5957d4bd8d8b928d36aa46fbdf742dd602f9cda2ed1608255d6dc962cc6d3f270d6a42f5185b38e6f0085f39dd17260f0580b62d49cdb668e3e5f76d47dd1deaba0db5b315ed6deb62e6e4388a74ff21903d7bed3c3e87585675a608668bc031aa83e7546cee77bacf9d3f5cbcf00ca71d6f6c86751a5db0d7f7065324d33458b7fe66e2b63bf9d8b514006d14da70f0d64f171a7bc11b2fa5955b85090701260a13cb52b930681e10e9daf89bdffacb9c13b9b60319e3be0ed29f7b7d4723ac5af888375c9e23bc97d3b189ec778eaefb3e4649d1b1ea96979c8f004064abefdfb3479e924dd974ff6478beb1034124b1cf27fc739872bd24bf257df2068475f0b144e61411481a48739e2691e535b64066acce2e0fee9c239c4015014dd38570b01646bbe97a389a3604312f06bcf7ae288790b73434288ba0c90d7015bc1bbcd5a0fe84564cd6a692df04d53716bb96d769074d758bf1199f716cfe5c4c542f9852435fc9675a80b4d\nTAG: 9f62d794a54433e79c71a5a5cc8d282e\n\n# Counter wrapping tests\nKEY: 0000000000000000000000000000000000000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: 000000000000000000000000000000004db923dc793ee6497c76dcc03a98e108\nAD:\nCT: f3f80f2cf0cb2dd9c5984fcda908456cc537703b5ba70324a6793a7bf218d3ea\nTAG: ffffffff000000000000000000000000\n\nKEY: 0000000000000000000000000000000000000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: eb3640277c7ffd1303c7a542d02d3e4c0000000000000000\nAD:\nCT: 18ce4f0b8cb4d0cac65fea8f79257b20888e53e72299e56d\nTAG: ffffffff000000000000000000000000\n", }; -static const size_t kLen14 = 178545; +static const size_t kLen15 = 178545; -static const char *kData15[] = { +static const char *kData16[] = { "# The AES-256-GCM test cases from cipher_tests.txt have been merged into this\n# file.\n\nKEY: e5ac4a32c67e425ac4b143c83c6f161312a97d88d634afdf9f4da5bd35223f01\nNONCE: 5bf11a0951f0bfc7ea5c9e58\nIN: \nAD: \nCT: \nTAG: d7cba289d6d19a5af45dc13857016bac\n\nKEY: 73ad7bbbbc640c845a150f67d058b279849370cd2c1f3c67c4dd6c869213e13a\nNONCE: a330a184fc245812f4820caa\nIN: f0535fe211\nAD: e91428be04\nCT: e9b8a896da\nTAG: 9115ed79f26a030c14947b3e454db9e7\n\nKEY: 80e2e561886eb2a953cf923aaac1653ed2db0111ee62e09cb20d9e2652bd3476\nNONCE: 5daf201589654da8884c3c68\nIN: 96669d2d3542a4d49c7c\nAD: e51e5bce7cbceb660399\nCT: 4521953e7d39497e4563\nTAG: 2083e3c0d84d663066bbe2961b08dcf7\n\nKEY: 881cca012ef9d6f1241b88e4364084d8c95470c6022e59b62732a1afcc02e657\nNONCE: 172ec639be736062bba5c32f\nIN: 8ed8ef4c09360ef70bb22c716554ef\nAD: 98c115f2c3bbe22e3a0c562e8e67ff\nCT: 06a761987a7eb0e57a31979043747d\nTAG: cf07239b9d40a759e0f4f8ef088f016a\n\nKEY: a6efd2e2b0056d0f955e008ca88ca59fb21a8f5fc0e9aa6d730fbfc5a28b5f90\nNONCE: f6775dca7cd8674c16fdb4ee\nIN: 5dc495d949f4b2c8a709092b120ac8078cdfd104\nAD: 86a597f5e2c398fff963fcfe126eae1bc13f097f\nCT: 04416e23586ee364b1cf3fb75405f8ef28fddbde\nTAG: e7b9d5ecb2cf30162a28c8f645f62f87\n\nKEY: 8d6ed9a6d410989e3bd37874edb5a89f9ab355fa395967dcbbfa216ec9ce3f45\nNONCE: 55debbb289b9439eb47834ab\nIN: 52939c7416220822a77435a46687f134cebc70a2f1a4c33d37\nAD: 7790af913d84a04c1b72d4484ea2e09fdaa802d8b1733b8470\nCT: d7bddae8929ed6bbc9ac077e2415d9fbafae4a0432f8f7eb6b\nTAG: e6383b16ed9c32521dcaeef3a7b9b67f\n\nKEY: 525429d45a66b9d860c83860111cc65324ab91ff77938bbc30a654220bb3e526\nNONCE: 31535d82b9b46f5ad75a1629\nIN: 677eca74660499acf2e2fd6c7800fd6da2d0273a31906a691205b5765b85\nAD: 513bc218acee89848e73ab108401bfc4f9c2aa70310a4e543644c37dd2f3\nCT: f1e6032ee3ce224b2e8f17f91055c81a480398e07fd9366ad69d84dca712\nTAG: e39da5658f1d2994a529646d692c55d8\n\nKEY: 630b506aa4b15c555cf279dc4a7ee9add213219d2c68163ceaeda903fb892c30\nNONCE: 79eca200a5cdf92b28be5a7a\nIN: b12e6f1f8160cd65278c48f68ad53c8c82fd17c2c39bbb109f077c17fdcb8a0b3a5dbf\nAD: 46cb18593b3b26ba75e4cb20a252caef31d00be31093d2369e93572a393d650c68313f\nCT: 9a9ad1f78b4d411afe450d2e46347a7df98f39daa4fd478b9ab6e6b417878bcd52743a\nTAG: 55453a003b021c8a247379cdc4fa6da6\n\nKEY: d10bb6641e9ba0a3f1b016317831ad4232f81c2137adac0940ecd7fa36de0563\nNONCE: 99c922d37c95ebeda8e81ae8\nIN: 8b9089df5bb048cebbe709cb61e178ec768515a0031288d95b7cc4dfffeb51b836e126a237ec50cc\nAD: f1cbf6c83493b2087d9f88e02121a114f45ed51817e46ffc0b66a783350eae89c6700db3f3be5f4a\nCT: 8a838c51a8ef8134481e9951033295ae686624aa4df72f869d140980347a5e69a6d7cb3d7119b303\nTAG: 9152bef766579a3e9a1e36abd7ebb64c\n\nKEY: ca665229adcc7554f1b1c8f50e7444c6d4059c525f9c0da1406ffb35d50cae97\nNONCE: 8e2df19123ce0ad41df416d4\nIN: 12365eaac86b270e9c61b3ae7702a6f3583ef4accb80a98454c56e34e2ab97d8afa23ddee34e7e3a522497f985\nAD: bf539d8e9e3a02f3e5834970e7efd40cc7cb340a075041428d6a69ed9fa5105e4bc63720be9a7040ce5b4af6e1\nCT: 96027efdcd4433df8e7f6181c05be365cdce550b09d45cfc96fe258eab6d55976a9306a0070c9589ef08cf7a42\nTAG: ec9fb5e79cdf8ad4c8a79c900975159d\n\nKEY: 5033338bf7526cca0425f4a620424662ebc58364c8d985d130e525fd1f598f3f\nNONCE: b40842b30758aa3eef7cda62\nIN: 69a62b8c5f9b81cebee3a9345f4e49ea089b0d9c1cc57b4ef707956d0287de83fcca6d8f5270a9393e00693075028189bda7\nAD: 3efe0ed6fbafa61070388abc59c0d06589309736b02418df5534c8c594d61a2afefbee17af8283d01634b6ca3e8e2aeadff8\nCT: d6184677a21978b6443d99d7de1fd01c6b6334cf01b7e7d58456267453f4de96708b62301172c8c87e970f91c5301e0ff61e\nTAG: f8ac7aef208712845d137b8b176c89f1\n\nKEY: f33c39140999a2cb69e43129cb5df18fffeb3513ec3560792e9909784daee43b\nNONCE: 70608463f1dfabb1fc4451e9\nIN: e2802c4d290468177fdb031a717345753cd7c3028ed07dea428db84e7c50c3eb7b24f7381a167b4ee31bf88dcaf5251fdb90ecbb74ac2f\nAD: 10a6f463dc59d4791b3c2b4c93cbe2dec579a154962cb2c4cc77664e8c2b106c574fe115fd43dad94b8b1bf2f74820e28435b4444b2b82\nCT: a27419a46037323c033d7cf2a716777fedc02a5ddd8bfbdbca82ffbdea3037bc1cc80df7c5e502b32276ae88ad6fd0f0cfe72604648812\nTAG: b1ae330d47fd399aaaa687e141e23fc7\n\nKEY: 2121056225a7b2316a93c4bfeb970486fa9c586c14ba8b40be5844a31e9449c0\nNONCE: b4b7d1e8fa7d0e2334c92315\nIN: 2038e2c6cdf5282f081292448f8febbb60a1520fa3771cbfef387f48c5915a1438ab709628e8d4c81623ddbc2f6f159c3c9a8922905c4994269898b8\nAD: b07f66508a39c4932b04c16172d6462d78273cd9463e52284bb73e3b8b8e7047bdf10c5ace1f903e5a5eacbf67c9351f82c74bda140df2fe0480c80a\nCT: 7b54618ae09b37ee72e51873c82cdd20b6dca37c334af89548f52f34df3a757e632cc0d453fc97270898eb50ce2f2a98c4cbd4cbb22a5b7c7564406b\nTAG: de3a9e2aab2439675c4f7f0b61216d5a\n\nKEY: efb15235bc91771aa32d51472877b0eb364de2f88766908eebc6e6b57a702099\nNONCE: 1a510b42dc20d1d0fb34fb52\nIN: 4eff604dd4bba67f143dab0728b8597e269d4e0ecb4ce80c9850afc645d96da239d9db360605bb4268d74e1fe3431a44242ae862fa2340c076db13315f615b85f0\nAD: e8dad34f727e77444a96cf06425640f1fc80fe3b01dafd1d91476140afe8204286d01b0ebdadc0270a3d218516ff5f08a69a7ba251ac325983caccbe0d9e1de359\nCT: 989fef0145e2fe93b9f99fd90123632d83d9df8f37d8e1f80dac329dbe0c214c2191009e31232538fec63a29665f0fc1c77dc86b2f5f2050b86b3ae48e85d63116\nTAG: 6816304faeb45da4e4772f5c35730f8a\n\nKEY: 998c22912d5687fc3faac262a902783fcb0c738520b5c4135a8dd2cdbd7b0dfb\nNONCE: eeb535c5bd6edfd696655b60\nIN: 1f6ae10d425923c882b7d2f556571acfc10333ec665b07bfad9f8948a3b8c5e5f163a4e99d4726da1a35359c657c848f327b7fd9b5f61987440ab12b9399db24715715a2d1c8\nAD: 9a3c76dbaeb69a6481a89318caeb6358267ef51a1a364a48387bf77526837c9c70afb6f105cd47d2b976dbda7d2b6bfea7b76b135810c53437472f7b80ffc8ce4dc95c7e5045\nCT: 87f4e2c80a4f15f92a8e94f468e70fe7f0e0f83c0a7799a1d465043d25210ac6f0f39a5e9765b4daca637864d1bcc090d2ef33ddfccded2d2dad61dab443b3cfcc683147c490\nTAG: 0744d928a5b5ec95f3087cc2623f0031\n\nKEY: e12effa8da2c90a5d35d257c07d1b467991bd5f75fecd7129aea4e26b9e27ff1\nNONCE: 4edd0b4cc349d37eb77f5576\nIN: 21dc87984edca46a629ed95ffb04471397da8806c525a781d9a71818422e344e4af577f38e7cdbc556d4766770a9a3c95bea59ad497fe0127816ec4dcecb6b999486719b0b86cdb2c9d09e\nAD: bc158e6570fb0a08d73367dba65b80a8c8e57ba6c7b99493ebdaef0424e18d8ab1f7c88670cf51c4d91b77eb9ce0f89a46ed1316141e4299ec6c3d6e712ec9e92d3db44640402aa4ac00ba\nCT: 07ab8c623d683ff83030392e2864edd4b8e3d296d60579a226a8d2aff6bc5af3c4598a18cc1e8d7db4ac8eb56a082af864ac52a324851dd29af51a0945cee4bf303ea111b9b627aabf5ff8\nTAG: 53e69b7be969c39560c016c6bc1aa4e1\n\nKEY: 3d9723c9235939df8647529b7e4a57b8536476d5b71b424e2c27ba4d0b82b0e8\nNONCE: 60163d2eb7822af7fad64c04\nIN: b44face0f45e4a8da19aa0c5cbe3aa960ed6b74fe3d3d9201f52523dfe7651756b2ce482e759c87bde4ec670a0e808fb4883e437c7cbcf2f6470352174327824200cb0897edc4def1736f51e229addaa\nAD: a4b2b7bf36a70a5246feee52c474058100bc618fb0e3d32e8c1f76153edec47fab3045dcc7eed9ca1886bb2593703c9ffb8883c45386d2f4e3fbb0b7c722d19f2eca94767174d9127450549e8993ae33\nCT: 66fa63ded066ac67bf218af7bc21169a875f4bd695f44fbdff906f0a9b8a067be721fd260571c53a8b51661c8d49fe178dcb28c31deb3fa71b096b387f9fc8f3657d280404c05d2b6443eba7e60b562e\nTAG: 59d5450872510c4bfb590d9497524331\n\nKEY: 75b0a20935c4a5e2126ac7420d632bfda8d41bc947c2402bed4759b6e617ff92\nNONCE: 0c3edf0dcd1125d7e263b897\nIN: 8edc98e70030e40bea1548f6f56b4561272be0c333f3b7ae53ff3e27c35a91b1aa42d39e6305ec4811e75931e5cae2261d88a6f7d6c5b05bfb48802264e9cac782411f1de579e29d464ba56840b126a3fad07f01c4\nAD: 7e35081ef652424da6304852243ce43ff711da17f7881d5e0433b1ad7535e755a8531b93d67ce99ffe66e59fbb24f6b42655524b39f2c84daa5cdacb5e7916266c05711a118b2128930b95de83ff1a67e53337474a\nCT: 858dc74dbec6fdbe4ef15a3596ff7201c8f4fcca765bf5452f678b1493a66ed9852a6fa174a73099acf951a35699f33289ec50625538c01eaa456dc658013a29e4d133b856eb969c1f221f99e11fadc98b0ee08243\nTAG: 3d8f17838c4fc69f04d7e2b76eebbc0b\n\nKEY: 7a3823191abcebadb7970d1b65c2a8dab8a908151737bd5400b3b6c0d59e3b08\nNONCE: e32eb00e5106097e2ef0e8ba\nIN: 220db5400dce604adee4cb698cdc02d2ca61622bbdeebe347b0bfef55cc45319b940f93773a9878725c5f55485d7a26363251b9ce0d3da1f8f6e34ad5329dc9f752ec7dc12b2d259ac89a8059085996a431a56cc2dc2400a26b4\nAD: a83b6dc78931cb7500eddcf77792e810c1edbd5f4e33f85018807a8539a3cace094fb794fa9ea058e82c830d42d5a6b3e22b7785698774aec5c73edd92731c51106a23c569c0c0fef18d13da1562a9a42aa435b243c4fbc9fe42\nCT: 5ce6ec0e1d67ced5a6aa46c909b9b8907b372be03331dd0940ceb6d87e928c14a1a1e8ef9096c9b63ab4cd93242ec7be7e38b80643f9c52e7e90ffa06b8f2d238fa63dcd97af74ae37802d124623b8a272e68ca18b3432b7c017\nTAG: e21c61d604253bc5b5d58283756b9eb3\n\nKEY: 53ff6d", "c0af3e89fc2de7370caa433f539d068609fcfed6400a5b9fda4c83e3aa\nNONCE: 91a824c5e023283959858062\nIN: fc23e07b4018460279f8392e86423ecfe465b25b60382f58995ef5fa1f9ca235e4bf87112554aa0e72836831d7b5f39125df11518b8aeb1809d804419beb05ae013482213012e4ce980ddd1c58e11608b775d12b450ecace83e678c69d2c5d\nAD: b3a1db2d467780480f166859e0e7aab212738b85e88237c2782496c9c503347de02f3dad6bfc671fda71a04ff1e4661767c11303daa0c36d944346d39e3e29ec63d695cdcd83b2b57181582c5ac692b13e4299ab5e86c59d09c2dc6194ebe9\nCT: 88af588ec33bdac2cc748a01ee3eec97e5bbfdf69de1d66176f42b66383bbffa8b185cdedc25b11a62237d334d68120fccfd68c2f9447b3b8e1f623f33f7f97ad8815d29bf11bc0c65641ba8fca4a087783f4694fb1d574450191825f84402\nTAG: 2c4973323e635a885f78ee106eddf19e\n\nKEY: ca2b4d335598f26d3d3607e62b9ef853d3543e741350f92f3050894721d3d450\nNONCE: 2431b5cee8c3ecec4caad278\nIN: 75e29e46350d1fa99403b1e5baa414e41a8e714910f313f8e850cf3076508ff650011af766b51283fbd5626166d775fd4b4cb7124d26d77b41eb17bf642bf67a34c1caf0fa9b43eec12103f864e56c5ccdc81b89c1a35e394362688d05dd94eda3d05dd2\nAD: 31c3ce532bc1bae65b5ced69449129b112019cc6078268b853dd17c41832ecae07f9c6b068ef6cba2b55f352904afd6096ff8432081aed408d9340c319fd8e2029c389b6e3a4bdc38853444c3f7be9385ff1ca27e59c43b542e99799bb4ce56b8e26d6c1\nCT: 90c13ec26d01b7b96bdd6816d3ee57df57efeabdb15ba602229ff71d71793fe8081eb1b462e8b2967bc4af96fd6dc72cee3d2b6495c7f04c9068b2ad0b073e11cd5999df541ad705c6315eefa8da49c5dbc258f7ba922908489c1ce672971c3bfb6e8482\nTAG: 3a7741a094be92b838850c32e4b06c6d\n\nKEY: 49fbbdb5ae21cd955be7f7603cb8563ea0b02b77a9ea14016baa5cffc55d20c9\nNONCE: c0a4463350506d2af9e35d8f\nIN: f31003aaf5d8fd6261c01c5bb1e7bf6af248e0be3cf8aac67ccaeb0b7468a40d98be526a8e4f692dd23763563e601915ebcb59ecbf03bf9c665c4c5313c318939a911888fd427d5297b9b2fd91dd33eb7ed38e2f0f6ab74ec263989cdd9915811a022d4a46ed35eef0\nAD: 17e01af2386531ce67d5bc3325d8f83b53a87b38f1c305f99c0798380a7e59d3ecddf33a5ad23a82e33f0fa34eb2438b17e958451439774ab642fafd3794f80a0ee1b9bc165f32df705a6175310670ba54af3a204e446db35170ab02670086c47a475c22d1f14cbe44\nCT: bd661836d1b74244baca62d7d1cb6717e17e2fb0bcbc8d36b3265a983d557c562b0be60708499d0e7e9626825bc049db79a0ef4d2393fef6024d849089455e55693fd4da3d910eac11496492a645e4376855732765e1b3580461a2a2533cebb482736ac928cba175bb\nTAG: 4596e3802109c899f27f6cfcbdceac5d\n\nKEY: 30d0e4f6425e38c92ac34dcaa06a815166f301289ca9cb0ed08156617d87bdf4\nNONCE: 525618ac9e317405c7d44367\nIN: 06f2204ca864dd3f7c9d0290f6fe3d0337eb9442cd5d2b586d1d5c30e58951fc2f4e99831ac7bca4356db4609a0428c482f2580b9e8cf5fd00d86d474fd88ac3b2413f44c1ff66e59e7538c090b2444396f02004ff636aca05ec40439f4e3f470a24916fa4033cb60127223addc1\nAD: 23c1a3e1083904f7226be7242027abb7af9d62f1115340cd4a57611be88303955cbcbeba44eab5488c80aed3e063c70cb7bbdd9ac289c8c8977868c3702be63d0358836838a97b31f6aee148f2b8615ad7c5dc0de7c48db7752e5f1ae8637f8c70335bbecf1313ae1b972ffb9442\nCT: afe3e71953bad46ad28113b7c8f2092fdebaeb81626bf94bd7e9dd59e000e8ba31c1ce7f728fe19dbbb42322e54aab278e3c29beb59b2d085e65cb8e54ea45d6a9fb1f561bac0bb74afe18cc8de51abf962c2fbc974c7ed54ccf2c063ff148b3e6cccdaa65cc89ab19fcd9cd0436\nTAG: e9f5edea1fdfc31cd5da693b50b72094\n\nKEY: 661309741227606892db13ab553070b456c5e421cca59087144873ae6d59e590\nNONCE: 9f07692c017e1391a981e70e\nIN: 40b5f8081b5dd173203e02e90a6c171fc41f804b2903ea18109edcf77c03dba687b47ca389c55389bd7b0ac59bfaefaf43b5f97065df6a5375c1fbb95d95cad589c2a45cd9e1e7960b1d13622440f7180aa565863b4f9dfe26ed336ff4318653e1a520bdb830e01db78a7e598f251834d0c9bb\nAD: e8540d084f24b80414af554f470048b29a5af8adb2f9d55c9759e5ff1595ca74884af67027324587131d90c77ca72b2d15b66564549ce93df7f667d0218a6e874848563a33886c6a0c5a9d00fa435dfabaa9053243b4c8c25779a4dbf79eb4b8530a7c7bf4263ea824713a90cee92dec78c449\nCT: d543f49e6cbe26f1d8a6e058769d5b16e6f8255a28b4d73ba2cbdf664bbc5ded73f9dea12a11b86b6a6acd578f685afabc232dbe9ff8431a5318ec7f0202959a310595b147353a7ca89c9d1fc2d2b92ea610cf6d9ad2716df2dfed70f5b74d498edab114058c22c96873a2a64abc254c82af46\nTAG: 31a8441886d0e4c6bfcd6d74f6a5ee5e\n\nKEY: a248b0d683973d205ef2d3f86468cf5a343d6ad7c5aaac0b9b6b2a412eed3552\nNONCE: 8f62ffac4027f4dfeacf3df2\nIN: c2d7d29256832def577392acb9fe4f249eb4859025ea55cc0c4a67806caba3e1cb81bc7f5717d94e1c91ff06607b23c238daafcb0fa96905616f02205b702508970fe3bfca87270ed1102a9ab96df57ebdcfd86ef6e9c4c4242b4febd82b0220b0d6f76d8c2d0fba33ca49279907f6bcf7e8401d1419ed58\nAD: c738cdbde6dc277ab81dae20fbbb4a50d71bcf0ac1ee0ec6a39747ccd87be40b1f0f2c37f2c6b32ea99722979fcfddd0ddc2e4ff34a2e6113b591cbfda317c6f4b021ad30325276f8d8dd78f757618b53297fec091f029f9b00850b35f3863a3801c882422b318b4a1bdd89002f928371ea05c6fabcb1792\nCT: 7a837df292ad2e58f21b89da43a74de411e1746556fe47db55a136757513bd249384bf67887a5c1f605e7f7e3057596e17039701ea351e5ccaf0fd4882559e87197144632977cf07cf9e86784a959fa7399476a4fd196d7c507fe3876d759e2b37bd37edb3c12b89716f29ddc8b64974263a1ec1b6364b0e\nTAG: 291098a2376a0faa5da6fb2606b4f2a4\n\nKEY: 80634a8baea1c4fe5dedb664c9b5d714422dd1726d642e60d15e02364195206e\nNONCE: 725ee5023ae08fece15d621a\nIN: 4d1d8855b4d155e77bd1bf34b3d049ef09b2b94f4e604306406b015a2d520e8772b084ed668b868e32c7563085f2a82e7d99219da549e507aff9515e45a045c7cd5292c0e09a3a38c769acfd0a11826b27d8bf05184971670200e79c49754debbfc57d9ebc661b25f22f241c4d143bd922f7b0981a48c6a63462cb5cfd\nAD: 12b3fa94a64454dc5b47433df1ce0a7dd5e8066d05b2433c6cbcb83087bb7d22d153a19c05aeb76141431c5f9801cb13531691655939c0c812611c6a30083ed3ec27e63e6868f186be559c48367a00b18085ffb8c7727638e833a7b907ff8465e3a01d654b52432767b18b855c05a9cfb5d4aabae19164f0dc2ca6346c\nCT: 6b01e934916823f391cd0d2829c224a12eeddc79f18351d2484ef6cb5d492ec9ec4d8c4bd3354f01d538bbd81327f6360a7d157feee64b539489bfdd1be4d7f724d2a6dfa1af91e4108dbfffd529afa71388b07e5079236644da289ae236100b2fbeda0c17bf2a01e76cd1f88081682c2d074223fb8a41d59e70a37870\nTAG: 55762e95d897a33c4c75106449112986\n\nKEY: 4f2edc967b11983f05ef5ee2a4364039ac02dbcccef3f3719913ae2719c8217c\nNONCE: 255f8209b0c67a6277bdb42e\nIN: f8217163bcaf77c1383089e396b271e22c517e8ccda244256cc39315fab7d0c291078d90e9b6e336992f015282caa1ec0ea858a179c9735b7a2f0d50f6f1eecaf3b9308772279ebb95f8aa53826e9dd60fb354de0c50c10001c98812b59d7c0f36daa1aecda6782ca36130fbb559363fe07704b0b91ea85be319ada027e47840c764\nAD: 1dc7065f1585384b88be47598ca484782716c78f49b3b6bf5d24a5b0d24fbd7831f18d77d80951d2c4fafb6f939d46362a69b558afadb3bb4d8aa27f7fcf3dd9624e1e075fce9bb239926d51ea9dff03619d64d5828103a414e360adcda8fd864fca55c21df86c76972c3765ab1d68ce89f708e7e5a3e06cd4de08573cf750c6f5f9\nCT: 6719849b7cea3f7f2a8e4de13d7a864d581b7c638f49fb06378a768d2034548179963c33f0ad099254c2edda9ef771daf5d299f58850033e2e449d7bc21ca3f7d3b7408429b596da615c8582886a6d8c1a9ba81fec4a41a38b7cbf1a80ee0ec8bd71451e727051fbf2a1d1e3c6ca98ee113e47650ba4fe80451e79b04abc8bb99a2a\nTAG: 2ac7f962553a8007de3369c7795bc876\n\nKEY: 51c5cf1f0c76ec96f4a5f9aa50a36185521f3ba259145ac6cb4da3cd12467696\nNONCE: c751e5e7e3d75874acfd2bfa\nIN: fcda42cd098b7936f4bebaa37d5850cb0fdd6526966b1b5734f23d5050ee44466627576e1144957929123198e40b64eaef74476870afecd7b70f7583208603a1b5247074c6c77e10b9bbd41a3d468ff41db89895b0e9ca95be77526ddb30d4c5eb0796ba97d7d5c56d0eece344dde3ebd7de586226c00da224b04e74d9abe832686797df067c52\nAD: 343ae5e73fd1da48dce92ba7b86d21de0a203ba8587536fbaf4646bc45051a7feb343e38916f6c4c75b65f940045e830857c7b62b34a44622a36b34268b8a397892ed3e4de5df3fa7384d4ca50202b5b0833f921349c877931f4b735cec45db6b95410c8042ba49c1a39870276e0165f09c73b14bdf7f36d19084f958695c7ad2cc56f0487eae9\nCT: 04192659d6a2f1b7be472372c8f969a7de388c97d37b4a89653593e48b630947d2160b569379698e94de49b21572ef0b4dd330487a8be814a84e959a1a8e3cf33dcc9f7464fd44814d0cd7ab85e4c01c9d015f42ce3723c8ef8c311222b0c78eb83d81696c217992be725faf27701b4922c6e6099442787ddde2b7572500a5320a4d0c787b786e\nTAG: 23c7a866574976dca8f401c4b5b58292\n\nKEY: 1cec3efc0311d623f34b6853b3dc97e470fa728cdfd65993d9d48fdc192b28e9\nNONCE: 320fe742ef171b7b8cb615cc\nIN: 722e503a97166a07974dcbf136fbaec6c03668fa52495b040383433ca59f6311103f2fc6a95ba4c925f8637167537321eff6949aa3051269fc094393a7b17d1ac8d29af052760835665b0ee89adda5dae7738656af9e8513c96e8a532a46ef34cd7430832d2be51c586a14e9aaec2458c1911bbc0f90b496737e838a12ff37d3db058bda9360d7d33e11629a\nAD: fd5ccf6b6948c3eb96543aa40f107fafe94e5206c326dd8900ea510c6b61d1bcf746151a75404e31406c8e991fbf6e660db7c18e243fd2608aa22dd7ca9de88f277037661ce6dea4ff0a86809dbfe1708cd47d3061a34657cad143e6577549c9944e08", "1f79c276300bb406378b26f349a91fa87de02a1405d712c516ae11b4bcf30ac9d56e677d03eb33e3be\nCT: 363c1d6b806a6d97e2fddf53b242378e1d2b818828863fbb3f856f7737d63998a84e02d6c91e1df5f5eb6cf89f7ef53e16d10ad52f82362292d3acafaa02c23be7da7616a8b8daf8ee3ae74ee1078742c4ddc3e5a110e510417b9f43fbcbb00e17af3301b2fbcb784fb0a05b66469e771fbd78114fce3c4352c42928bf5a0ecc49228a3c930b0790bde7ad7b\nTAG: 669482999be99149f9b723b60fec62d3\n\nKEY: d3465cdecaecbf25943b7bbf8084ccabc15474a4228c46cbe652a99be24a861b\nNONCE: 04fc836de3a1420b8e7136ca\nIN: 81e0e984ce0a4074a44524f93e375eabc650a847a42393f5c524c65523368d38a7e2b677fe08502dd3bc42311775016b5689c660cc0ca8cb33a09b89f3ed3d02fa0fb75ca5bf0dc3c27c546b369ab5e7731f93bc074d37ee50d6f8366f6c8a45f73ac92b05c4aa552ecc5266041dc122a0df69a36ad625a26edb57bfff43a84e527ea0d9d3cf076f8de9eda28eb09de3ff\nAD: e4adc14ac4bbf3ae7ec7d97f5c0e6090bf8127a75e8b70e9b86496a62a759dba5a4eef64a8c679c362785501260d29b58e1af647782564947950428dbf14edab8e6841c7afaf9e7949b560419c44bae30315c597f6f6e02204da7ec605a4d9a8753de1268bb0b1c84c972b4e7296da5c969781feeb35a44d2aef799ed228aa399ea04e21cf9f7d5600a2c07b047aa78388\nCT: d7995e7b610eede708526c05c584039d48b9b4356fc71b0c37ec2559309a688a7c69ac9655f94e178cd2311db58587863b0fbb990554dc9a6aa849571f945c61e5611ae7e1a96903be725a1aa75adc381b86e43fbc68a36f44e0e0cb8fe5c494caa91f758597b6ef3b80a879154cd8a7e5f570893b4f768105b24b58efb67c5f07c6db60e0f48eba9563f17d38aaf0847e\nTAG: cc3fe61642c2d7fcbd579048fdfb19ec\n\nKEY: 1a0dfe2a6bc6a69659c68942ad0858e1df905890f47dab728ab9c73f742f469f\nNONCE: f8f76b014116ba61392597de\nIN: d93eead436e835a061ca061e3a53c3f9c66c6f011b21682b8a6fed098bde2018a2462aa5ab542c69bfa2805612cf6146c9150888b9720db1dcd0f359c1fa3416df4cd225dd0b0d949e917adfb3e83bf5ba2b967d48908e6b6d8aabc545335014d951a67390d7b5c7cd7dcbcf66e4e3f02aa4e5e9cccaf73e75622bad006c63433d36cb1c6aa4aa253dd1b2eacac75c548aa6648ecf9d\nAD: 56ca2d5340629ca75de4e98921da352941559bd79f47ef0ab42d1d5857059352f96ee877f5458f090ca237e4eef5b08a53311c8dfd4c4582f18a93aaa8cf75080734cb2ea3389c9c74d2b04ead614eb54512ea93f0e3434e9a9366454b303a8129d6ce6cf96b1d6dd4f751311c736b517dcb50a6f6e0962c46637b4f5aaf0f34bff518cbd551a7aad3fa615708b17cf6d8fbc864f580\nCT: 8dc4d8483dc665b174ba32d6b6244da5f2a8fcc4b1865d662ec23057838b332a07ff073ecc893d413696f3fffc6dca5d107a5673f14abe8e0457a02e61138380d25e269686cbbd23cb7da3060f482f62bf80a40dcc2e711ecf5f7836ca14e456c4b73a48bef90749024393f5f8af01b73302e81bc37c4110dc26174702231d831cd14231905d2dd3f375cf2bef0425084d5b19f1039f\nTAG: 825e7b7e195f65c454ce9fdd637138c1\n\nKEY: 03cec87d0a947822493b5b67b918b5c6a6bbdebe45d016ec5cb6779c3ddfb35d\nNONCE: eb7d261a6b56a179c88e88ad\nIN: 2326102c58524326759ad399222c5b5a563cd01a29809d6aed4d49772a4723cfdf30c9f85f031063e838f543c201412d6f085a8f5435b0b2fe94659aaf70cf7bde99309239ed5b815b48342d4f81011f5aefe10ba105ac15601c64a91076c29c3cdafaa12bdd5706dd7305b48e923873cf06944b5027b210c59d79856f602bd6481980ea909152216756d77362c59d57673cedb91ee6f56a40061e\nAD: 4d0fbeb69c1869d2d23198ec49b3dc23149005a84aace7025293c3afb8cb2e38c167a822e25c2fdf667d3677f4e94ed6574529c987de506d26b7ffccf3b7a36d9adac48bca76084710338eeb5bfca9df1bf6b403e33e90761a0b3152afac333071a5ef4f54010b945d03b51f123865673e8877f41ca23359e60518f076cc64232b306bd858634417e92e546ede4ac6231635c9cfcf43aab1f8fc1e\nCT: 06746f993843901ce72f2fcd4af7d15e64b3102d2f9bec0fe72cdd0b97e43177a1a2238c9c1dfc3311f701196653249e767a73dbe819b660cee07a5f3bb8f25823875fb4b4d34a5a3a212d2e166311bbe11fb1d36f4e725c3b74054ed7fffb7082203ccb5e9d65873cb8a1ce28d5c6e2b6555c1a864a725e6c7d5555d37dcaf1d0884264be72d38cc4b65bc2f0d039d542c5055da56c57e084b804\nTAG: d36a4b6d2f592d4f0d347d906fc319cc\n\nKEY: 7f4b4bfa26719d9610c80ba3f474c43127f4aa3414fb070fc2f389e5219886e1\nNONCE: b144d4df961d4f1c25342d12\nIN: 638982b95d66ddb689b7b92e3adb683ac0ac19480148bac9db550be034cd18dbd10f2459c915e99c385cd8dc4dc6ec48b75f97e818030fc2d8fcdf66d66b80df64f0ca4af91bba83a74f3946b17af405bbbc6e216435641f5633ad3ee24c1a2ed1b39f649acce59ee56c282a3aebaee6e97f96b34cfc63d5b0482fec20d755f399dd5f61688fe55878713cc55d562c2d72236eb674a340d1a64932cdd8534a06\nAD: f2fe3d27bfc278cdcf16fffc541846d428b31534ec5cf51c30c8b6d988dc36cd6c0d41a4485a3f4469e92ea0fc7e694065bd8130c2854c95549630bd9cbaab2205f27a6efdc2c918c3be53f2d12f8f7cc8e6a81dc8be7cccd217be1fa2e6887cea7d637d2e2a390f50d2c5be10a32a9b380a400cddbdd40eac67f1fe9ba6033d4bfa88c563eaf57272c8a7052916cf4460f31ad026a0ac2588a45d082fbb5c0e\nCT: 0d4de3489e09c7239972b675063579e409acbb663bea76bee8fb3f7e8785158ebe1c26db9219a9b97ea29e74762999518613249c3a87fbcd0128f651e2db8e2167f10ab532eced3464b56bcaa09780e5ece18182a6e092477ad933bd8de015c80e67c6802257a97a647fe2b1e9ab6a76c1cbf7d905deeb824aba2a34095f84b276d55ff940d6ab788c16cd63d9b16e0908d718c851a3230b0a37257751df5a38\nTAG: 9f0a882d4456847f44c7287c8ff3ba04\n\nKEY: 9799ae8045d58250e4d9c3b0ccc8897a04b5b9fb164e54019dc58d7d77b65459\nNONCE: 0f20d002dbcd06528a23d5e0\nIN: 8f323018b1b636617c935791e1c8023f887da67974080af07378b533a7573424f1de9193c5d38f55e9af870f6c60ab49c80d7d1ad1f18f1a34893fd2892d49c315ee668c431f5f35e3f60ecfd534b4b09b64cc77cd16b0e1b8882872cd109a5ca377518e5b660d75052e9a4228e3935705b6bf6b4f4249346b7bf4afb891641a76621cd315cd75de391c898959be945ccca7a96073f2569f217617b08502f7d569bd2f80e0\nAD: 3f1e297bd91a276a4a4b613add617b0488414a57ede2ac75d10934e03be58ec518a418e98a4dbb39d2365889db7c5f389b2a16d8c702cf21b888a4cbf77b356df48a30298c825fb86128de45d7fa0e5f4b0b7bf82a2c4cad2470f33c231802263901fbda54a6edbf2df638716492157ec1407e7fc2eb6c663d9a215afbec3612778b8115e78a5fd68cf6ce66c12c0ca26e5c1f7ab079bc09c3bc7b673d21835671a13dd2a0\nCT: 9a5758dad7997a766db05d698b43fd491bdcec21352032cc023bcf10e136523219745a56f0360efee75a37de55da23cc7d8184a50ccebb110bcb960dcf6b25fe731e21f26290281d9c1c7715c4e6ff3dc0026cce52929163ba222f123d4f50e1d3cf67725fb4737f4010ee2b5b163ca6251c50efe05c5ab0b1ff57b97ffa24c98653f5c82690d40c791047a3d5e553a0142fa2f4346cfcd1c849a9647885c0daaac9efe222\nTAG: 5b85501a476217f100be680b2f5882cb\n\nKEY: a26c0e3864a7dd3b589d17a74a7c9c1f7e8f9adb4aafa0e75c083d10956b6bf6\nNONCE: b54a2a43ca3f84aef3824375\nIN: 6fd4ec60613646490791d82de30ded1a12e61fd270f1642d2221272dbb150ef63ef2604213e203b740dfc9c4bcdf722b3c85aa20abb1197949de710d7e8311956c8649524afc72a9bf5eddf0b284c7fc6d48a741b82c215a0dcd73bb8afd08d5532a6f7f99b5c6beb2ad793d6da53a81e6523b2240729924ddac996a723421f57125f928990daa7a55a5b6b53d7361d9728f66590d969659aacd9aa5c0ec627d991b55e9fd0bf9c3210f\nAD: d6d8b570eca29a48a4d408d5b27ec6aec291d70cfefcd02bbfe8d8ba8aeb6db770bfd723d2c3a4859f1992767d24e7b33e3e241874292af640e2bd22a5b77e0e9e1e0d5e485041cac41d4694ac929ae1fbc08e7591e1cef689028f5db26f95fc9e0868887fb9c635579fc6335757697f63b4f2b46664ae338eafdd827988c8f2ebad80ea9787871ed8d6b302d5dbf7e8019f2e139c59036cb5964a3701ec049b839e19e33e68b83539c8\nCT: 2420e09adb24098038b2750c946551a5f6a5bdf23b126947348ddb5e938b3fcb874b33fbac6407095e05ce62df999e7234cd2b4e413009c71d855b23993cd58c1e26ba0deed891dc88f099fdf852cec0aab45f488a90edd8feb6f4c837036945bd304edbf7a2737921a2f8c1b00a1daaf9e25b908a65a8f69963fc767bc975b5b7bcc215ce37009009dc90b5c7edb1a1174a10ad28f4c1d1a2241e7ffc215edef4f847ceedf7b64f2d15\nTAG: 20521b35310385ae66557740b435d204\n\nKEY: 53ef3dc7a10e435650dd20550cf3ec2b997afc8d9e79cca8f7062622afac3496\nNONCE: 257a205ed0f84016183f4613\nIN: 081e2769935f945419aa06fb5fa7d8412efd1f9b52a45863808022850836c1974d53d2b2c5c0cd420711a71e6d1a09e984366b8b677e6c61bbce8f3adf9f5a9fb5860887617a08c923171d681c4fbc6d569690f6a183d42b52a80ef0693862efd22bf83b7b4014a7008424c356b5022df1842309b3a4a2caee0fd3f4d3fc52a17d53959daccf8e0ca889578ee2905dd8c17d52e76712dc104344148e8184c82af8165ea8386f91de585b54fc8535c3\nAD: 5b73ae02bf4a70e57f5d48fbf45f85b8496ae8514c8aeb779c184f9cf823d8c1883c9e5a42b2c099d959c2298ace2d86c4479059256d6a4325e109fa4b6c4ce90f84a8228316e80aa86de9b5e111d88b2be447a29297b35ca90a8eb280d4c0fe92a1d593cb966cb0010bc06831efb0c72c1e222b031e900ef06ab8da542a5abe2870a0efbe92351d5915ab545b14900e41a27c5ca9d75d6277afafe7ae861131c2767eb314c0c3da5c264f8f2b4ac7\nCT: 20ecb6cda861b660656d692c626436227bd4ac17a9bc71f6c84a1917ef3b5a0f6ba370f00fa2e7f1bd5aa8d6c15032572090482c23e4ab7376ef1f4dfb77f79d5dc065792fe3476c9c37614e32f493e461981b519dd7d10234c2c69264ffe5be06a8e14c81022b652c8cfa24adcc7c7536a55a2fc41e9ffcd09e1c483541cba814eafd5e09e9e44477018a41b073e387c9257c07d97e40f0761fe295d015e1f2df5be65b13f34b6ef0fe1b109ad109\nTAG: c129ba4", @@ -641,9 +647,9 @@ "2d59740c9b9d4b97075b874015251ad55483068b00f87502b18182b140db07c70a80fd884fd79b7b5fef1d307ca4db0ff046494443e1cae83478d275c31402035f1fc24e26214b78d9a4dac78d074150012f9fee810a121d87a16d8e1eec5700e9facba350029788480a259d9f30df1c2b8df7691629314391719853c0b68614134f6028865700b1fc4e7f34ff28f449c6abc3027f38d7a7f6d84b8f27f7cc5afa09478c809eec346bb58244ab42a3bef61a14ae7640d76591343983de9fe5f1b985ce56c9fcfb2e3f6220779ca6f92a6b8aa726573b38ed7663ebe4c85066ae3f488ea3309593fa41dba8efd2b8f44b9fa8f7a427823c1228093a3\nTAG: f1832022e06228c36181856325d4eb68\n\nKEY: 3828b138f72f8fe793d46c55ad413bab31a51e7a9093cdd10fddb4739e28e678\nNONCE: a60413c0ab529ccf3de58468\nIN: fec017c1c51da5ce9dcd8e84cdc03a43145b31edfd039c7c85d8811a2f58efe7a2d7590149a98cf0b5af82d3e0a325223bc9d5585ceb1afc4cdd96024be6c8064c2abac14f68e65de49e25e3e967500ce5b4504d00a9cbad1e86bbdcf65c01a7a92de27583b7b92122b6a4923b7192994a1edf00b75d14a982f92559dbc2d5e427a75ad29715375d90193ddbb39b9a52c1a23d75629c539e0a6ce822c7c08fc77dcd3adc357893215df4694673a16d34513de21217ce86897c8f0575d213ce0c66eb1d1985fe73dd86da3ab5e89df4243e1be9dd95af94f878995d02929ee42a062100d6d4d3884730f54593d5ff7b7ae53e03d4f0e10f6f4c3077206499ab7d4de1e825d532d0918f\nAD: e2b16ff2b6c73c9374704ffb4cdfe7bad9eeee32157f2eedf427f99c2cce80c5aa4d9145e85af0cb08e6ed477cbe79ee168ded5c0895f9f4f939c21916b3dd5c9d268b3aabdefb85d953bce9b70732fc9acf6c7b727f78d8c9aaca9e022d7cf0f95583e81744227d87fa34ae19de44d202ba01e3d03993f38c9b2fb00b54dfb677d67e6f5a15f46c29eb5597ae3d5384b37bbeca3f3d825e2b7cceaaeb36a8c1273062259608956dd0c79877cc460d0268de27355e34b9d8d1188c062ac5e10a73f2d70fd0636304b3de06cffeedd246e2db19b8b66785f9f9c62b8f0198f29d37a4ab5280f4aa0320559810f89a1618844d0ad5f3a4f5a0e834ab31e56798b7158217f834d372c36f\nCT: 88ea11ef6b6ee6fb0be77bcbf227e77508922550ef0d7534bf05668ae5fcab2f4defe643747716e7e000950e36c6cb24b79987389a150382c091d39ddf841b0a5e31d763d9c59753a3ef36a23b81f38e6e715357395ce715d30c14d6ab5b7454804ecf633daa39b6107f562fae6a646efb25c1119dd17955bb9e640105a21566345408f72f2acc8f2726a0be465551f9ae566da559fc0b92c36764c5ca20a18a316c02e606030a53450e7ae1146050a48a64c600d33cb84389b0bdac7ff45d3d1f2f669a6e365ef722d76d2fe9bef2df93c58bbdd6965e18111b5de0f4a62dbb874161bf8adfa61e9cdecd97b4fff668b3efeb3e32eeb929cf58d94ad8077c0a2ca79e80877c5d9329\nTAG: 9b47afc5816b7229213cd3c9135545ed\n\nKEY: 91ea63dc27d9d6bbc279ec6cecdce6c45ff0b247cfb8e26b6ab15f9b63b031a4\nNONCE: 80a134fac73eca30459d5964\nIN: a848e41c77ac8c733370435b5b6a9960af36031e96260d5703ce15b003606875a7901cd11e4571bf88dda29a627c0b98065a8b4e6d382852dfa4f47d86fa08e48ad8f5a98e55c305900b83200d44029f304abd21e0264115192a3fd7b0eb69b9f8ca7865b3be93f4ba5a28468fd7bbb584c32ae867f5146efbeb1412d3ac36c30cb308c327a6f207e30f561d6efe0a535446c693e14176e9e714ffb5a5b1075812909a362a6c4bbe18322e15690c2c9cf5a18e0120c11551cb7055b5aee97e7a56d7c24fdf1214641c8eacb196d74f3d96a7fbecdd4fe52dc7b6ead9041cafd5a3fdf91fd3614e63189b488d4d7c1ea3c6351d112a2223b29d390ac3ab7f09a60bbd3df6e0d606d902aa44244334\nAD: 47940a0694183b2fcb5e760c9ef6dbe4cbff6ccf33208337a981138f9d35c03f8adbd810e94636acaebef6791b531a65e99b03fc78e7eb48036615874e97cf762fa6ca5d880bb2c2f644f1aed70c667880f98834d501caa277cb8ef1095ff882e79c3a92ea8982abebf63ea9ed7e9a24d32cb81d5d98e891974e3d636a59e165984e00f05a040d33f07b39eccb924fb24780a422a6b2b7bddb5b316beddcf6fad20e4cee7d0141c2f7c4e4f759db8691dc7b8525ccbc3ee6071a2ead63e750d6d92dde7eb1303d5b1194702b6c3e0c2e6f9649e60eeddec9c1f71cf309af0672cd2ffcf94ba7e6c3d7cee020a224a9a956274d1d36ba16030e215d90a165756666eff066a8e51bf7d4babe8b7d8d\nCT: b90449af99327afb1124bb24f1c8b5cb878423b0370d5f7cd297b28cc4135ee77d6f1913a221cfeee119bafa873072bfa79e303fe377bbed05add41ce3a42ca4632b98f40a36227de1a9ba84d6176c01eca9d33d954d0ebdf4e40f136e0f6a56156fbb33b344a8a433941fd6e08774bd00075aedb0e396c2bc37d1250541248dbeb899e1b5170cdfeaf7b89995b049428bb277c501354f8cd48fb58f6f04f956dfd099c48778dbdbb4c95b7c9d6797cf6d3bcd1d00e88cea885ee4a10d94356509e148990a0e10dd89103a9d5c8434a7bdbed6c0ac1271e0709eba144abf3cf075c020e9f7835d5a98fb2439b399e377ae6e19fc5f32df9ddfb9e936190d3e9c62de99835249d1f32ca3f92ecd44\nTAG: 6ccaf7c142d86b83e4d0b4289b49c4d4\n\nKEY: 1344db082889367fd48c5f06bc39f9cb9e3ad4b92fa484ccf49418dd4caa2e19\nNONCE: c04a98e7e29326b5330818d4\nIN: b0e12e3122c1ebfdcadded5a45163a6208548e9bdf95cfd18ea504e5d2e97372e58dbfe460a57b724d38f3bc0ce02a54015779bcf127343474d7d4c1402d598bee56897203b903da5b819e2218bd0d1a2af11c542544f02c46969cd2bfac683b76a8de61698ccba63361a1a0b570adf69d24e9a7e466873c8c12e25e0bcead7828386179a4d65d5bbdb800eb52fc01b67498d7b5f9864270162158a8572eccf541b07833f001848672098c57708eb479855799567c318b1aa097efa70db0d8a8d36fe0ac22ebcc2870baacac690a79e07ab286acad9f7a877939cf2989cd6200eb86dfa7a41e969a3683ceacc7c97d1cd5487f13c439a9777a67770687657d38267a347a0b6d3aa3cf64e7f31017246e4369da\nAD: c96db14dbc2aa0ce3ac63794f75c7e78037dac6763282edb307821a7938de4baa3d2e35a8cfe0c8724c2a8d870d0a462ea157e15aacc69a3c881d9c819225ea8be479872d55e655c897936c95b9ab340820264567495fc5e4e3354f42b84e191b470ca9f4d8fc25d011bf9c9e73e1590e1bb919dd2f288b26935fbfb8c93e54331dc8edad5e1cc4aec103c2f3320d59870c1770319f105ee790b704ed655be423e63ab040f1153f41e7070ae3a0f34d217c4649c180c84814463902d99a9396f8c7c85a3a4c8ae2f01737649fae478a40fc72303a108822775e9c421f945cc0eea992730790a9aa0c0d014518dab371b52d30b5a560f34946a9344cfb8a19b09ee9b123bcb8f642780697508f04983b790dd2d\nCT: ffda075dbde7b874995230e1324f17894689baaa7f1354e26100befb546ea23dc74807818e43a3cee00ec1bbb95c82180489ae5f3a1c482dec28f96ecaf5ca4655ff7f33c814197cb1973cf02a0b720a5c44068d8ddff0789fc1e7f20ef408c1a438133fce4f7a3e8c85d95a381b94e949ce47a85895c4be7cbfad468e52a160dee34b8ddeef2ab280eaaed4990ecec790ac16de3c74aac6fe2d5e28ea2b66a921c894a3971cee4a2158054c3567e0d941f867ded5ed1d21d8ab090848fb3eddfb1559bf11815db52b8eed871cfc117980f297da79da31da32de3f162a03d95090d3329da3662df29e6ec9b236e0f7c1d7d957cfd54d5efc99c694b9dece989912388254798513d881e5943ce830729a8e2ddf\nTAG: 81c55fe9aa2de0d63efe3f74a3d8096f\n\nKEY: 31dbefe589b661af00a6fbad426e013f30f448c763f957bbcbaf9c09764f4a95\nNONCE: 147fe99bba0f606c57242314\nIN: 908bd801b70d85085dd480e1207a4a4b7ef179dac495a9befb16afe5adf7cb6f6d734882e6e96f587d38bfc080341dc8d5428a5fe3498b9d5faa497f60646bcb1155d2342f6b26381795daeb261d4ab1415f35c6c8ac9c8e90ea34823122df25c6ddae365cc66d92fc2fe2941f60895e00233b2e5968b01e2811c8c6f7a0a229f1c301a72715bd5c35234c1be81ef7d5cc2779e146314d3783a7aa72d87a8f107654b93cb66e3648c26fc9e4a2f0378fa178c586d096092f6a80e2e03708da72d6e4d7316c2384a522459a4ad369c82d192f6f695b0d90fcc47c6f86b8bbc6f2f4ea303aa64f5ce8b8710da62482147bcc29c8238116549256a7a011fd9c78bbb8c40e278740dc156c2cc99c3591fec2918cdeb5240fb428\nAD: 5a32d7044f003b2ffefffe5896933f4d8d64909fa03e321a1bdf063099b9f89752d72e877291d8da12340c5dd570d7d42984ffab5177824fc5483b4faf488504e6822e371dca9af541c6a97312b9cbf341b4198b0902cd2985ac10a8b5b5fe9691bb29a88344f863c980e4e871a72a8b74f92eef68c176e9d2ef037898ff567298e186af52ec62eb7429a8004ac46b945678b82859396d36d388ec3d67653aec35cf1da2684bbc6c78a5f9e3ce1b355af3b207f64e0fa73501c5d48a14638d0906c87eaa876debcf1a532c1475d80ed3d4b96458d2236eb9f67988863bc6d5c16b96b93d898683d248d7bc601b5035fc365481b89465e37a8f7dd64635e19a0282639cecde72c6b1638e0aa6e56f9c00d031cdadc59ce37e\nCT: aeab9db30a579ca54195e54a9e6c787f40100c6d12ceee35643f36ae45f618cc9bb66aa4c0fae0ec2686cb4101a5b23a46877460c7e020b38b0d8d1f533ecfa99df03d346bc854a578276d7d5685ad1fb03655683a64aae4159c9efa6781f053057e0811226c7c533967a94587f4025353b28cc3a2ce5763783b4c31e7818b8ad9195bc03be8f294f9f6ceac578f9d30b22b1f5a68d647d46cf6db4a9c3a8a5c06fa97c9efb4578f501ea96db1f40942e3f24c44a7e4070a6b931c39947d9692930b67767357015de51a39e46fff94b6019e4bc1ad9d216a571ba0dc88859c49d2c487ca657384e49b4d382d86a60c8d5195320909c4e82fc077a3b22bd4eccf0f067e66ec78eed642b2d16f0f304f60f1d9ba69e205c982\nTAG: 17ca09e3084504fc22e914ee28312c8e\n\nKEY: 0ecc44c9036961fba57c841ace4ca3c547c51d9f126567bf41626765cfcbd53b\nNONCE: aa98b6ddff7e4b2041f29d70\nIN: e49a2a5713f507bfa00c140dfbefc0c43e37bcb932e0741db03f0055da61cd837b6e2d8f99115d70750fb23685a17121b52e98a37c87204e0207729fd9219d11a48e57970d790338793cf329f7b239512a44dd4409fe9d157f92123dfc5cba24af106442644dedda87e1d9e95fd395f2f0ad8f7d27f313e6ce1a07d9845dec5ad732e6e4749b3a161527c8ce42331f5de1d700650072fb68e9c7645a0e0e529d0563d2727e3fb38ed341f74ef1ad95a0216a440e1384d0e7ef71cde38ce", "cdc9e2b2d563f19014c40c1f92ea0af3b4f6da9146d433ae85f647153db326a28ef6ea2e0ebac0cc1aff157067c7dba7cc4317d56920ee9deab5764368e7e5b3ce8bebd0fa129f869b15897c09659c53188bf8efb7b6ac7d265c9b85fe96166\nAD: df41db4ef5350d4afcaa88b4a577b3370b96699bbd73e59aeebca6ea856cf22694a9399ae7f97a3bec226d82f5598f8949dfb92530dcfe77770f066f2af988fba5543b8ba7655bc43f8dca032981a34a1beff695c6908169d475c55b2119fe5578623f68a9dd85b653656881b0db4006d3336fdfc784d1805e48ff478fdc196601f044c9d33fca3ddde2db0102f90fff0b370f520e00e3786c2a9b0b4a9a7ea6f9d866f77d870c8ef0f3a8bedef17949a32598512af665679dfbe71e1c3efc3dee8f5d4499e20dc63281191751f67e51f201973a6675896484527d66bed94d6aaceff65fbc4192cec19452b8873f22d72bf2f4981fe656285cb24be5c58e77dafd3e096166b230f18d3f4197fe16f6ec84c060ce0793ae6848311a18b7\nCT: b15b2bc4b9e8ecc5d9c4a6359a805b7590bdb4bfaa9b3fc4d7676d721edc4b3b1ef71b18a3d78f1b31a477cf25e55b278eb3ed774805ae8e5a2a0204f7291d9587663c4d8b1b744154f3b7cef796e0b91590161f3bde82f1d8139cb8d017606ae6d0552ba144788fd8caf435ab09a43a1f4057776af49bad98fc35cefefb159cfebfed76f2e4d18b7be143677ff8b3d6e2b440fe68475b5a1193bcd19ab157d0d2257f33de8e50091ea3388648c3410aa68c830566a0413d92454e4eff433c3edc74e8f7516ec17b2c01cf57a2d7c48db97b706b8d7da0b68051f2d6a87c417f46cf217a48611980890f669d39b478c35d834ed2c79299df2381a1215d6db303cb63e2795fe517649874226e0a6dbfe2c86370b9fbdd8c5de349bfa25f\nTAG: 7082c7ef72c82d23e0ba524132acd208\n\nKEY: c05dc14b5def43f2e8f86c3008ef44e4dc6513768812e9218b2b216818c4cec6\nNONCE: 5cfe0dca6e599ed9aa89ba97\nIN: 8a06e2997b8e5f8040b22e07978c83c48d0f90bd2b2f8b426b43feea0b614d3b0681745ea4224cabcaa25ca45c3053a6300c47ffa4f72e838db135ae35c27939aad4cf7f75fb61daa3148d869057598e4e8b44c6fb19b0d9281e18676d8bc137489bb77a51a3a8f807a896d558f00040e8729ea9bbdc7db6102c8b99c8a1eacb0735577bc6533cd1d8147013935b6344116090a1bdef1f2e38a877a50c8fc0f394bafede31375c57476ba06d95ae734e6dae771a32e5091dff71d845c5f7385b9b9069ced12fcfea34a510880b088bb0016e94a5932c89baee038cbafbf06b3d09426afd2d5dd5e392636362e9ffa9186b5c753eb84f82f68fb1286ed06c58a5a936cad018ebc4269037b49f2ea0349373adea99f06062e5dbb0bf94f2883f5c0556\nAD: f2a3f7af8ea984bbd85953f14202c6e478f98d0bcaacd414329ec480d0c29fb4c1a052d3228c883928448f0bef12cee5b69829b4a3eb4680084131867cfc3d3af84fcc0d80c2292d3fe02405634f6cfb20b0fb90345da3a557fb30582175c32e432be66ad096f9425ff4060df54d6741fd6567a1e2fc5f6f3ed95cefc806ff64ae91ae82920b5c829ea026f83fd90d760e240da3c9ddaafe4d08507f4af1049056dc6d09657779a3dbd889d851e97d4ac60dc66df2d24979ba8947a7890a304bb301d0d42b67824e0c68fc882e90cb6deee50c2e3d9f0da59ab23c997b05635a0d56c71fc39aa0e6b19c43a7fe12d4e4145453cd7fbd8a3f33bf5451addf05052df7ef044a33513bc5f1a4cfc8b68015664bb5c8e4bf54a85efff109ee96af75d4a5\nCT: 2cf630548d6f2b449057c7861920308958199f77b123a142c6b7c89c4982f4ed0efa2fe899914ddbf4543e70865a5e683b0721d6c8443df2e697acf31e11c8809aba94196409020a7c64d396fe136826455aec973af23a6c7733cb567f5ea550e50e0b796623a97807d042855568e3c568990cfc818c31a1bf415337f43e9baed57fada2fb2ad3c3543f2b7f2777e03f84040c1c854c310ab1cc5dc7f2a5fb213af79ac068b46c7d9475bea126adf079e2100bb57904a931faf248e0f7d5832ca83ea8a283e0136979737132afb1f4ab38d307ac0774814f4d5ecdc4aad79185c05f8a706f579b78f2c1c7004cb38e6cd22c2080735b34c3f6134955ed3bc36b1ad5c8e33209c9f3c658fb07b59b6002b2526cd8d853a5c624b7108573d7df60c827\nTAG: 3dcdabcd1c82002a551cea41921570e5\n\nKEY: b33f449deccc2ef0d7616f22b4a00fcd84c51a8383782f66f1696bc6405005ee\nNONCE: 6afa8baf923f986b5779ac6a\nIN: b0af85a6deae5fcaa94778bce015ce2da7400ab768f3e114cc1b645fb2716789e2aeb96894fda6da5bc24fcf2466124720d6ba99e5475d77e5bcf2c2f8c8e5becf5eb73ad650861bbdeb51ba5ee789c227478934200fc18f36e4fe392c99d4c3fe0b38b40d2e84f831b8ef9bce9ac1362c755943521ecf5b5cf8fbcdf08f2d47ff7cd62838597dd342695a1b037bcede69500bf70bf1edbb40a17b44695bd8ff8bc8664b3211a6bbfdcbd1bffbfb1a2ea0141cfbc6ac841c803b137be5eeb2666c46c09cc1c4fa82be43bfd56e7a2b8ceeecb6efc1933a90213a0e1bc7aca2af35f2d1dad5f0d9002561064a699f1ce76c39d9c2224ae596e88a1517e19c2115370768d50107f3f2a55051838ae5897acf2ac0814ccd864eee2f6b5d7a6728c6ac6e6a57327102\nAD: 2134f74e882a44e457c38b6580cd58ce20e81267baeb4a9d50c41ababc2a91ddf300c39963643d3c0797b628c75a5fc39c058d319e7d6deb836334dbe8e1fe3cc5704b90c712e1fb60a3c8b58d474a73d65fae886394f8b2c029e420b923f2af4d54c9de3c7fa2bccaa1e96664ccf681cacbbf9845069a4bfd6c135c4392d7d6be338eca414e3a45f50510718e2a5a3e5815eafa0c50172cf5f147510645d2269929843bbbab682deb5823d4cdf42bd250bdbd20c43e2919d7a6e48973f43a4cab73454b97cdca96721ebd83b6dbaaec7e12cf0dae678a57c431b81421657037dd47dccbee73a41f56495fd7c25c75744fe8f55cbd1eac4a174d8f7dd6f6ba57b3e53449a9ce7806517e3e07cf6546a0fa62c7b1fa244d42eee64a3182461792edb628e567b23a\nCT: 0fe35823610ea698aeb5b571f3ebbaf0ac3586ecb3b24fcc7c56943d4426f7fdf4e4a53fb430751456d41551f8e5502faa0e1ac5f452b27b13c1dc63e9231c6b192f8dd2978300293298acb6293459d3204429e374881085d49ed6ad76f1d85e3f6dd5455a7a5a9d7127386a30f80658395dc8eb158e5ca052a7137feef28aa247e176cceb9c031f73fb8d48139e3bdb30e2e19627f7fc3501a6d6287e2fb89ad184cefa1774585aa663586f289c778462eee3cd88071140274770e4ed98b9b83cd4fa659fcdd2d1fde7e58333c6cf7f83fe285b97ad8f276a375fafa15f88e6167f5f2bfb95af1aefee80b0620a9bc09402ab79036e716f0c8d518ae2fa15094f6ea4c5e8b283f97cc27f2f1d0b6367b4b508c7bad16f1539325751bd785e9e08cd508bdb3b84\nTAG: 1976d7e121704ce463a8d4fe1b93d90f\n\n# AES GCM test vectors from http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-spec.pdf\n\nKEY: 0000000000000000000000000000000000000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: \"\"\nCT: \"\"\nAD: \"\"\nTAG: 530f8afbc74536b9a963b4f1c4cb738b\n\nKEY: 0000000000000000000000000000000000000000000000000000000000000000\nNONCE: 000000000000000000000000\nIN: 00000000000000000000000000000000\nCT: cea7403d4d606b6e074ec5d3baf39d18\nAD: \"\"\nTAG: d0d1c8a799996bf0265b98b5d48ab919\n\nKEY: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nNONCE: cafebabefacedbaddecaf888\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255\nCT: 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad\nAD: \"\"\nTAG: b094dac5d93471bdec1a502270e3cc6c\n\nKEY: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nNONCE: cafebabefacedbaddecaf888\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCT: 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662\nAD: feedfacedeadbeeffeedfacedeadbeefabaddad2\nTAG: 76fc6ece0f4e1768cddf8853bb2d551b\n\nKEY: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nNONCE: cafebabefacedbad\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCT: c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f\nAD: feedfacedeadbeeffeedfacedeadbeefabaddad2\nTAG: 3a337dbf46a792c45e454913fe2ea8f2\n\nKEY: feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nNONCE: 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b\nIN: d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCT: 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f\nAD: feedfacedeadbeeffeedfacedeadbeefabaddad2\nTAG: a44a8266ee1c8eb0c8b5d4cf5ae9f19a\n", }; -static const size_t kLen15 = 64853; +static const size_t kLen16 = 64853; -static const char *kData16[] = { +static const char *kData17[] = { "# Test vector from RFC 7539 Section 2.8.1.\n\nKEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f\nNONCE: 070000004041424344454647\nIN: \"Ladies and Gentlemen of the class of '99: If I could offer you only one tip for the future, sunscreen would be it.\"\nAD: 50515253c0c1c2c3c4c5c6c7\nCT: d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b6116\nTAG: 1ae10b594f09e26a7e902ecbd0600691\n\n# Test padding AD with 15 zeros in the tag calculation.\nKEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f\nNONCE: 070000004041424344454647\nIN: \"123456789abcdef0\"\nAD: \"1\"\nCT: ae49da6934cb77822c83ed9852e46c9e\nTAG: dac9c841c168379dcf8f2bb8e22d6da2\n\n# Test padding IN with 15 zeros in the tag calculation.\nKEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f\nNONCE: 070000004041424344454647\nIN: \"1\"\nAD: \"123456789abcdef0\"\nCT: ae\nTAG: 3ed2f824f901a8994052f852127c196a\n\n# Test padding AD with 1 zero in the tag calculation.\nKEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f\nNONCE: 070000004041424344454647\nIN: \"123456789abcdef0\"\nAD: \"123456789abcdef\"\nCT: ae49da6934cb77822c83ed9852e46c9e\nTAG: 2e9c9b1689adb5ec444002eb920efb66\n\n# Test padding IN with 1 zero in the tag calculation.\nKEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f\nNONCE: 070000004041424344454647\nIN: \"123456789abcdef\"\nAD: \"123456789abcdef0\"\nCT: ae49da6934cb77822c83ed9852e46c\nTAG: 05b2937f8bbc64fed21f0fb74cd7147c\n\n# Test maximal nonce value.\nKEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f\nNONCE: ffffffffffffffffffffffff\nIN: \"123456789abcdef0\"\nAD: \"123456789abcdef0\"\nCT: e275aeb341e1fc9a70c4fd4496fc7cdb\nTAG: 41acd0560ea6843d3e5d4e5babf6e946\n\nKEY: 9a97f65b9b4c721b960a672145fca8d4e32e67f9111ea979ce9c4826806aeee6\nNONCE: 000000003de9c0da2bd7f91e\nIN: \"\"\nAD: \"\"\nCT: \"\"\nTAG: 5a6e21f4ba6dbee57380e79e79c30def\n\nKEY: bcb2639bf989c6251b29bf38d39a9bdce7c55f4b2ac12a39c8a37b5d0a5cc2b5\nNONCE: 000000001e8b4c510f5ca083\nIN: 8c8419bc27\nAD: 34ab88c265\nCT: 1a7c2f33f5\nTAG: 2a63876a887f4f080c9df418813fc1fd\n\nKEY: 4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd1100a1007\nNONCE: 00000000cd7cf67be39c794a\nIN: 86d09974840bded2a5ca\nAD: 87e229d4500845a079c0\nCT: e3e446f7ede9a19b62a4\nTAG: 356d9eda66d08016b853d87c08b5c1b3\n\nKEY: 422a5355b56dcf2b436aa8152858106a88d9ba23cdfe087b5e74e817a52388b3\nNONCE: 000000001d12d6d91848f2ea\nIN: 537a645387f22d6f6dbbea568d3feb\nAD: bef267c99aec8af56bc238612bfea6\nCT: 281a366705c5a24b94e56146681e44\nTAG: 59143dab187449060a3ec2a1681613cc\n\nKEY: ec7b864a078c3d05d970b6ea3ba6d33d6bb73dfa64c622a4727a96ede876f685\nNONCE: 000000002bca0e59e39508d3\nIN: b76733895c871edd728a45ed1a21f15a9597d49d\nAD: cc1243ea54272db602fb0853c8e7027c56338b6c\nCT: 1fb9b2958fce47a5cada9d895fbb0c00d3569858\nTAG: 219b4252deb16a43b292165aabc5d5ce\n\nKEY: 2c4c0fdb611df2d4d5e7898c6af0022795364adb8749155e2c68776a090e7d5c\nNONCE: 0000000013ce7382734c4a71\nIN: 0dc6ff21a346e1337dd0db81d8f7d9f6fd1864418b98aadcdb\nAD: 0115edcb176ab8bfa947d1f7c3a86a845d310bf6706c59a8f9\nCT: dad65e4244a1a17ce59d88b00af4f7434bd7830ffdd4c5558f\nTAG: 7ae32f186cf9ec59b41b764b34307d4f\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a84138648a5919a\n\nKEY: a8b9766f404dea8cf7d7dfaf5822f53df9ccd092e332a57f007b301b507d5e14\nNONCE: 00000000c7f2f7a233104a2d\nIN: 4d6faeaee39179a7c892faae3719656cc614c7e6ecd8fcb570a3b82c4dace969090338\nAD: c6d83b6a56408a356e68d0494d4eff150530b09551d008373d6dee2b8d6b5619d67fdb\nCT: a15443f083316eef627a371f4c9ac654d0dd75255d8a303125e9f51af4233ff4ceb7fe\nTAG: 63c2b4e0973096299488b0a66ffa54c1\n\nKEY: 5e8d0e5f1467f7a750c55144d0c670f7d91075f386795b230c9bf1c04ba250bc\nNONCE: 0000000088049f44ba61b88f\nIN: 51a1eebcc348e0582196a0bce16ed1f8ac2e91c3e8a690e04a9f4b5cf63313d7ad08d1efbff85c89\nAD: 5d09bf0be90026f9fc51f73418d6d864b6d197ea030b3de072bd2c2f5cab5860a342abbd29dba9dc\nCT: 35aa4bd4537aa611fd7578fc227df50ebcb00c692a1cf6f02e50ed9270bd93af3bc68f4c75b96638\nTAG: 4461139c4055333106cf7f7556fd4171\n\nKEY: 21a9f07ec891d488805e9b92bb1b2286f3f0410c323b07fee1dc6f7379e22e48\nNONCE: 00000000066215be6567377a\nIN: c1b0affaf2b8d7ef51cca9aacf7969f92f928c2e3cc7db2e15f47ee1f65023910d09f209d007b7436ee898133d\nAD: dfdfdf4d3a68b47ad0d48828dc17b2585da9c81c3a8d71d826b5fa8020fee002397e91fc9658e9d61d728b93eb\nCT: 8ff4ceb600e7d45696d02467f8e30df0d33864a040a41ffb9e4c2da09b92e88b6f6b850e9f7258d827b9aaf346\nTAG: b2ad07b86aca1b3ab34033c12d6a08cc\n\nKEY: 54c93db9aa0e00d10b45041c7a7e41ee9f90ab78ae4c1bba18d673c3b370abde\nNONCE: 000000003f2d44e7b352360f\nIN: 1241e7d6fbe5eef5d8af9c2fb8b516e0f1dd49aa4ebe5491205194fe5aea3704efaf30d392f44cc99e0925b84460d4873344\nAD: f1d1b08dd6fe96c46578c1d1ad38881840b10cb5eae41e5f05fe5287223fa72242aea48cb374a80be937b541f9381efa66bb\nCT: 027b86865b80b4c4da823a7d3dbcf5845bf57d58ee334eb357e82369cc628979e2947830d9d4817efd3d0bc4779f0b388943\nTAG: 6de01091d749f189c4e25aa315b31495\n\nKEY: 808e0e73e9bcd274d4c6f65df2fe957822a602f039d4752616ba29a28926ef4a\nNONCE: 000000001b9cd73d2fc3cb8e\nIN: 3436c7b5be2394af7e88320c82326a6db37887ff9de41961c7d654dd22dd1f7d40444d48f5c663b86ff41f3e15b5c8ca1337f97635858f\nAD: d57cfbe5f2538044282e53b2f0bb4e86ea2233041fb36adb8338ded092148f8c2e894ef8766a7ec2dd02c6ac5dbab0c3703c5e9119e37c\nCT: 9b950b3caf7d25eaf5fca6fa3fe12ed077d80dcd5579851233c766bb8bb613ec91d925a939bb52fb88d5eda803cfe2a8cda2e055b962fd\nTAG: 0887ec7d5e1a4e532746ec247a30825a\n\nKEY: 4adfe1a26c5636536cd7cb72aa5bded0b1aa64487ad0e4078f311e8782768e97\nNONCE: 00000000d69e54badec11560\nIN: 19b3f9411ce875fcb684cbdc07938c4c1347e164f9640d37b22f975b4b9a373c4302ae0e7dfdeba1e0d00ced446e338f4c5bc01b4becef5115825276\nAD: bda1b0f6c2f4eb8121dcbd2eebd91a03ae1d6e0523b9b6f34b6f16ceca0d086654fb0552bfd5c8e1887730e1449ea02d7f647ae835bc2dab4bbc65b9\nCT: ea765a829d961e08bacaed801237ef4067df38ad3737b7c6de4db587a102a86fc4abbaabea0ee97c95ca7f571c7bab6f38cbae60cd6e6a4ce3c7a320\nTAG: a27f18846f5a4f7fcc724656c91cf4f3\n\nKEY: eb3db86c14b7cc2e494345d0dfb4841bbd3aa1e2bc640cca0c6c405520685639\nNONCE: 0000000088b54b28d6da8c81\nIN: f75c0a357271430b1ecff07a307b6c29325c6e66935046704a19845e629f87a9e3b8aa6c1df55dd426a487d533bb333e46f0d3418464ac1bef059231f8e87e6284\nAD: 34b08bb0df821c573dcb56f5b8b4a9920465067f3b5bf3e3254ea1da1a7fc9847fd38bdfe6b30927945263a91fa288c7cf1bee0fddb0fadf5948c5d83eb4623575\nCT: 146ec84f5dc1c9fe9de3307a9182dbaa75965bf85f5e64563e68d039a5b659aa8863b89228edb93ff3d8c3323ab0d03300476aa4aca206d4626a6b269b2078912d\nTAG: 854cbb42bade86a09597482c8604681a\n\nKEY: dd5b49b5953e04d926d664da3b65ebcffbbf06abbe93a3819dfc1abbecbaab13\nNONCE: 00000000c5c8009459b9e31a\nIN: f21f6706a4dc33a361362c214defd56d353bcb29811e5819ab3c5c2c13950c7aa0000b9d1fe69bb46454514dcce88a4a5eda097c281b81e51d6a4dba47c80326ba6cea8e2bab\nAD: fe6f4cbb00794adea59e9de8b03c7fdf482e46f6c47a35f96997669c735ed5e729a49416b42468777e6a8d7aa173c18b8177418ded600124a98cbb65489f9c24a04f1e7127ce\nCT: 911ead61b2aa81d00c5eff53aeea3ab713709ed571765890d558fb59d3993b45f598a39e5eff4be844c4d4bd1ef9622e60412b21140007d54dcf31b2c0e3e98cf33a00fd27f0\nTAG: 2865d2a26f413cc92416340f9491e1be\n\nKEY: 3b319e40148a67dc0bb19271d9272b327bc5eee087173d3d134ad56c8c7dc020\nNONCE: 00000000ce5cf6fef84d0010\nIN: 27b5627b17a2de31ad00fc2ecb347da0a399bb75cc6eadd4d6ee02de8fbd6a2168d4763ba9368ba982e97a2db8126df0343cdad06d2bc7d7e12eec731d130f8b8745c1954bfd1d717b4ea2\nAD: a026b6638f2939ec9cc28d935fb7113157f3b5b7e26c12f8f25b36412b0cd560b7f11b62788a76bd171342e2ae858bcecb8266ff8482bbaed593afe818b9829e05e8e2b281ae7799580142\nCT: 368fb69892447b75778f1c5236e1e9d5d89255c3d68d565a5bba4f524d6ad27de13087f301e2ef4c08f5e2c6128b1d3e26de845c4ac4869e4c8bd8858ad0d26dec3b5d61a9e3666a3911ba\nTAG: 1414f1b91966340417c38226ccca9d3d\n\nKEY: 43bf97407a82d0f684bb85342380d66b85fcc81c3e22f1c0d972cd5bfdf407f4\nNONCE: 000000008b6ba494c540fba4\nIN: 4b4c7e292a357f56fdf567c32fc0f33608110d7ce5c69112987d7b5a0bd46d8627a721b0aed070b54ea9726084188c518cba829f3920365a", "fc9382c6a5eb0dd332b84612366735be2479b63c9efc7ff5\nAD: 1e0acf4070e8d6758b60d81b6d289a4ecdc30e3de4f9090c13691d5b93d5bbcef984f90956de53c5cf44be6c70440661fa58e65dec2734ff51d6d03f57bddda1f47807247e3194e2f7ddd5f3cafd250f\nCT: d0076c88ad4bc12d77eb8ae8d9b5bf3a2c5888a8d4c15297b38ece5d64f673191dc81547240a0cbe066c9c563f5c3424809971b5a07dcc70b107305561ce85aecb0b0ea0e8b4ff4d1e4f84836955a945\nTAG: c5ca34599c6a8b357c6723ee12b24da8\n\nKEY: 12fc0bc94104ed8150bde1e56856ce3c57cd1cf633954d22552140e1f4e7c65d\nNONCE: 00000000d3875d1b6c808353\nIN: 24592082d6e73eb65c409b26ceae032e57f6877514947fc45eb007b8a6034494dde5563ac586ea081dc12fa6cda32266be858e4748be40bb20f71320711bf84c3f0e2783a63ad6e25a63b44c373a99af845cdf452c\nAD: b8be08463e84a909d071f5ff87213391b7da889dc56fd2f1e3cf86a0a03e2c8eaa2f539bf73f90f5298c26f27ef4a673a12784833acb4d0861562142c974ee37b09ae7708a19f14d1ad8c402bd1ecf5ea280fab280\nCT: 9d9ae6328711fb897a88462d20b8aa1b278134cdf7b23e1f1c809fa408b68a7bfc2be61a790008edaa98823381f45ae65f71042689d88acfa5f63332f0fba737c4772c972eba266640056452903d6522cefd3f264e\nTAG: e84211b6cfd43543f8b1b4db07a494d1\n\nKEY: 7b6300f7dc21c9fddeaa71f439d53b553a7bf3e69ff515b5cb6495d652a0f99c\nNONCE: 0000000040b32e3fdc646453\nIN: 572f60d98c8becc8ba80dd6b8d2d0f7b7bbfd7e4abc235f374abd44d9035c7650a79d1dd545fa2f6fb0b5eba271779913e5c5eb450528e4128909a96d11a652bf3f7ae9d0d17adbf612ec9ca32e73ef6e87d7f4e21fe3412ce14\nAD: 9ff377545a35cf1bfb77c734ad900c703aee6c3174fdb3736664863036a3a9d09163c2992f093e2408911b8751f001e493decc41e4eeeed04f698b6daed48452a7e1a74ec3b4f3dcf2151ca249fa568aa084c8428a41f20be5fd\nCT: 229da76844426639e2fd3ef253a195e0a93f08452ba37219b6773f103134f3f87b1345f9b4bf8cfc11277c311780a2b6e19a363b6ac2efe6c4cc54a39b144e29c94b9ebbde6fd094c30f59d1b770ebf9fcad2a5c695dc003bf51\nTAG: 55e025a1eb87bc84d4be00c775c92ad2\n\nKEY: 4aeb62f024e187606ee7cc9f5865c391c43df1963f459c87ba00e44bb163a866\nNONCE: 000000009559bd08718b75af\nIN: c5d586ceece6f41812c969bcf1e727fe6ff8d1ae8c8c52367c612caa7cdf50e0662f5dffc5ea7d3cc39400dfe3dc1897905f6490fd7747b5f5f9842739c67d07ce7c339a5b3997a7fb4cd0d8e4817ff8916b251c11ef919167f858e41504b9\nAD: 51f5b503b73a5de8b96534c2a3f2d859ece0bd063ea6dfa486a7eec99f6c020983f7148cccb86202cf9685cc1cc266930f04e536ad8bc26094252baa4606d883bd2aeed6b430152202e9b6cc797ff24fc365315ed67391374c1357c9a845f2\nCT: 252ea42b6e5740306816974a4fe67b66e793ebe0914778ef485d55288eb6c9c45fa34ac853dc7a39252520514c3cb34c72b973b14b32bc257687d398f36f64cc2a668faffa7305ab240171343b5f9f49b6c2197e4fbe187b10540d7cdcfa37\nTAG: ab1d8a5a1f3eda9b5609c0028737477f\n\nKEY: 9a19e72f005cae1ae78b8e350d7aabe59fc8845999e8c52fad545b942c225eaf\nNONCE: 00000000d9dae2ea8d2ffc31\nIN: 2110378d856ded07eb2be8e8f43308e0c75bc8a3fcc7b1773b0725b7de49f6a166c4528e64120bdf7c9776615d3ce6feeb03de964a7b919206a77392f80437faceb6745845cafc166e1c13b68e70ca2a1d00c71737b8fcbbbd50902565c32159e05fcd23\nAD: 1cd73b72c4e103afbefd7c777e0480f3f5e68c60b85bd2e71ef5caebb175d7fc6535d39f38f92c24f2eb0fe97d878ed3d5967c0bb4394a5d41f7d34cda6e1523d3848f049cde554a7d31e1afeab5d3e6150f85858335cbd28c8a7f87d528058df50eea06\nCT: 5f009fbce4ec8e4ca9d8d42258b1a3e4e920b2fbad33d5e9f07557d9595e841025193b521ba440110dd83958e8ee30219d952b418e98a6c624894aa248aedc0678f2d263e7bfaf54ca379fef6c5d2f7ac422ea4b4369408b82d6225a7a2cf9a9f46fd4ef\nTAG: 1c6bdff7d8b9554dc7bf40e50b37d352\n\nKEY: ba1d0b3329ecc009f1da0fab4c854b00ad944870fdca561838e38bad364da507\nNONCE: 000000008a81c92b37221f2f\nIN: 6289944ffa3ccea4bf25cd601b271f64e6deb0eba77d65efb4d69ca93e01996e4727168b6f74f3ccf17bd44715f23ceb8fc030c0e035e77f53263db025021fd2d04b87a1b54b12229c5e860481452a80a125cb0693a2ba1b47e28ee7cbaf9e683c178232c7f6d34f97\nAD: e57883961b8d041d9b9eeaddcfd61fa9f59213f66571fadffffdd1498b9b014f1ef2e7e56c3044d7f9fa7a1403a1169e86430a2a782137093f5456e142aad03a5f7a66d38009dd01b7fc02c9cf61642dedaf7cc8d46066c281ee17780674c3a36eae66c58d2d765075\nCT: 9c44d9135db0dbf81c862c1f69bec55a279794cdd29a58e61909aa29ec4c120c9c5a508d856b9e56138095714a4bb58402a1ad06774cf4ecdf2273839c0007cb88b5444b25c76f6d2424281101d043fc6369ebb3b2ff63cdb0f11a6ea1b8a7dafc80cdaef2813fa661\nTAG: 689a141bc11159d306dad7a4ecf6ad9d\n\nKEY: 0cf8c73a6cffc1b8b2f5d320da1d859d314374e4a9468db7fd42c8d270b7613a\nNONCE: 000000003c4c6f0281841aff\nIN: 4434728d234603c916e2faa06b25d83bad3348990ecde2344368d1a7af1309bd04251bb2e0b72044948f8dea33cce2618283b6af742073a9586b26c1089335fe735141e099785a1235810a3a67ff309e2f0ce68220ba0077ad1a5dc1a4aef898a3b9ff8f5ad7fe60149bd0bd6d83\nAD: a38d09a4f1c9241623c639b7688d8d35345ea5824080c9d74e4352919db63c74d318f19e1cbb9b14eebd7c74b0ad0119247651911f3551583e749ea50ff648858dcaaa789b7419d9e93a5bf6c8167188dbac2f36804380db325201982b8b06597efeb7684546b272642941591e92\nCT: bdfbfea261b1f4c134445321db9e6e40476e2dd2f4e4dbe86e31d6a116d25830762e065b07b11a3799aab93a94b4f98c31c0faeb77ec52c02048e9579257e67f5a6bae9bc65210c25b37fc16ee93bda88fd5f30a533e470b6188c6ce5739fa3e90f77120b490fc1027964f277f40\nTAG: 780cc54bb6f1c9b78545c1562cd9d550\n\nKEY: 69f4e5788d486a75adf9207df1bd262dd2fe3dd3a0236420390d16e2a3040466\nNONCE: 000000006255bf5c71bb27d1\nIN: c15048ca2941ef9600e767a5045aa98ac615225b805a9fbda3ac6301cd5a66aef611400fa3bc04838ead9924d382bef8251a47f1e487d2f3ca4bccd3476a6ca7f13e94fd639a259ef23cc2f8b8d248a471d30ac9219631c3e6985100dc45e0b59b8fc62046309165ddb6f092da3a4f067c8a44\nAD: 0c83039504c8464b49d63b7f944802f0d39c85e9f3745e250f10119fa2c960490f75ae4dced8503b156d072a69f20400e9494ab2fa58446c255d82ff0be4b7e43046580bc1cf34060c6f076c72ea455c3687381a3b908e152b10c95c7b94155b0b4b303b7764a8a27d1db0a885f1040d5dbcc3\nCT: f0bb2b73d94f2a7cef70fe77e054f206998eacf2b86c05c4fa3f40f2b8cebf034fe17bcbee4dea821f51c18c0aa85b160f8508bd1dc455cc7f49668b1fb25557cdae147bf2399e07fcacaca18eccded741e026ef25365a6b0f44a6b3dd975ee6bb580f5fccd040b73c18b0fbf8f63199ba10fe\nTAG: 2ecccea4607d14dbb2d2475792aeb468\n\nKEY: ad7b9409147a896648a2a2fe2128f79022a70d96dc482730cd85c70db492b638\nNONCE: 00000000a28a6dedf3f2b01a\nIN: 791d293ff0a3b8510b4d494b30f50b38a01638bf130e58c7601904f12cb8900871e8cf3d50abd4d34fda122c76dfee5b7f82cd6e8590647535c915ae08714e427da52f80aef09f40040036034ca52718ea68313c534e7a045cd51745ec52f2e1b59463db07de7ca401c6f6453841d247f370341b2dbc1212\nAD: 9a6defddb9b8d5c24a26dd8096f5b8c3af7a89e1f7d886f560fabbe64f14db838d6eb9d6879f4f0b769fe1f9eebf67fcd47b6f9ceb4840b2dba7587e98dc5cae186ef2a0f8601060e8058d9dda812d91387c583da701d2ba3347f285c5d44385a2b0bf07150cbc95e7fcfa8ae07132849a023c98817c03d2\nCT: c2f109d6d94f77a7289c8a2ab33bc6a98d976554721b0c726cbf4121069473e62ba36e7090e02414f3edc25c5d83ac80b49ad528cda1e3ad815b5a8c8ae9ad0753de725319df236983abd3f69ab4465d9b806c075b1896d40bdba72d73ba84c4a530896eb94ffccf5fb67eb59119e66a1861872218f928cf\nTAG: 17ec6cf2b172f01e3c456ad047196805\n\nKEY: 48470da98228c9b53f58747673504f74ca1737d7d4bb6dbf7c0cba6ca42f80b9\nNONCE: 0000000056fb4923a97e9320\nIN: bc6626d651e2b237f22ee51608ddcffeba5f31c26df72f443f701f2b085d6f34f806e29673584cb21522179edb62a82427d946acabce065b88b2878e9eb87ed1004e55ef58f51ec46375ac542c5782725ff013136cb506fcf99496e13fcd224b8a74a971cc8ddb8b393ccc6ac910bd1906ea9f2ed8a5d066dc639c20cd\nAD: df8ab634d3dca14e2e091b15ecc78f91e229a1a13cba5edd6526d182525ec575aa45bc70fb6193ffcd59bad3c347159099c4f139c323c30a230753d070018786b2e59b758dd4a97d1a88e8f672092bef780b451fd66ba7431cbb5660ea7816cdf26e19a6ebb9aadc3088e6923f29f53f877a6758068f79a6f2a182b4bf\nCT: a62e313ecf258cc9087cbb94fcc12643eb722d255c3f98c39f130e10058a375f0809662442c7b18044feb1602d89be40facae8e89ca967015f0b7f8c2e4e4a3855dbb46a066e49abf9cef67e6036400c8ff46b241fc99ba1974ba3ba6ea20dc52ec6753f6fc7697adbccd02b0bbea1df8352629b03b43cc3d632576787\nTAG: d29a8968067aeb457ffc114c3a9efb95\n\nKEY: b62fb85c1decd0faf242ce662140ad1b82975e99a3fa01666cac2385ab91da54\nNONCE: 000000002f4a5ca096a4faf8\nIN: 03b14f13c0065e4a4421de62ab1d842bffb80f3da30bf47d115c09857f5bdd5756fd7c9ac3d9af1c9fb94f2640f7f4386cfba74db468e5288dbe4dd78bfe4f69e41480ca6138e8beacc6eaa3374157c713cfa900c07dd836eaecc8827fa3e70e052ae09e8473e2ae1a10b1bb669ef60a8dd957f6553daa8114918e17371f2ac327bd\nAD: cfe3b7ab7550b0e8e2e8235fa0dcef95647ce6814abd3dc3f5a3bd7d6d282504660c34ad8341e4d11402c7d46c83a494d7ddb105e1002979023e0e3dc2978c9ae53e10eb8567e7a02b60e51e945c7040d832ca900d132b4205a35034fed939a1b7965183c25654931a9b744401c4649c945710b0d9733b87451348b32ba81de30ea7\nCT: 8965db3d3ae4fb483208f147276e7d81b71a86e7202ffc9b1eaade009bc01683", "8dc09ca4bcf30887b2f4243fbd652cd90ebed1ceef8151ff17ea70518d03b0f2a24960aa7de9b30fa65c2e2d57360061aae6d9376e984e9fcd5e5dd0911a4bc8deca832ffb76f252bd7da523076593ba6b174f7d9fb0377e066ecbb6638036241e86\nTAG: 28a5284696ed82714eaa94c9ebe6e815\n\nKEY: de9c657258774d4ebc09d109a0fc79d66493ae578797cac4eb8830a6a4b547e0\nNONCE: 00000000b5e35fe3398efa34\nIN: 4d68fb683aa4f4c7a16ba1114fc0b1b8d8898610fa2763e435ded8771b3651078bef73d4dfd14e76a34cd5eb9ef4db4ead4da9e83f4ce50fe059977b2d17d687c29335a04d87389d211f8215449749969f7652dc1935a0f9a94538dc81dc9a39af63446a6517609076987920547d0098a9c6766cf5e704883ea32feaea1889b1554b5eb0ce5ecc\nAD: 436ea5a5fee8293b93e4e8488116c94d3269c19f1d5050def23d280515457b931bbed64a542b317cc5023d648330a4b7adca14dd6f3783207b94f86ccaa0a0ac39b7db00ac87a99e3cd8a764ed9c75da8454479636ab2b29e770b166a5b75cacc425c919bf1ce9ac34afe6b4425c3d9fd2e48bc81e7d15516d60e592bfcc2ebefb660f0995f2b5\nCT: 97a97b8f0f5420845ae8d57567f9bba693d30e6db916fad0b971f553ad7d993f806f27ab8b458d8046062ced4778c004b4f958a4436141637c6039963308dea2f54008b7feab79650295ed41bf9e65e1a2d75ab1c7b2a70ebb9e9f38d07a9a672d3e95ea78afe9ac02f2566b48b0251aef6eeeca8bd15bd8d43b559426aa9d15d960ee35cb3edf\nTAG: 4ef49e8a0c2ef85826d7f03e81c577f2\n\nKEY: 6885bd333c336c7672db8ebdf24c1a1b605c5a4ae279f0f698162f47e6c73401\nNONCE: 00000000f0c4a213a6168aab\nIN: fa905a2bfa5b5bad767239fb070a7bc0b303d1503ecd2b429418cc8feba843e5444ed89022fdb379c3b155a0f9ceab2979000a0f60292a631771f2fde4ef065aa746426609082969530a9c70ad145308c30ba389ea122fd766081511a031ce3a0bd9f9f583c7000b333b79ac004fbde6ec3eb2d905977ff95dcff77858e3c424fe8932a6a12139e6ec8d5e98\nAD: 8ded368f919efb522bb6a9ad009e02ffbc6a16536e34d95cdb34f1153d7cb7b0f3c2b13dd05cedae27cfe68ec3aca8047e0930a29c9d0770c1b83c234dcb0385deae7ae85da73a5f8de3dfb28612a001f4e552c4f67ae0e2ec53853289b7017a58591fd6f70b0e954876bb2f7ec33001e298856a64bb16181017ba924648c09fc63c62eff262c80d614679bd\nCT: 0cb3d6c31e0f4029eca5524f951244df042fc637c4162511fea512a52d3f7581af097eb642e79e48666cb1086edbd38c4777c535a20945fabc23e7c9277e2b960aac46865f1026eb6da82759108b9baece5da930ccfc1052b1656b0eadaa120ed0c45ad04b24ae8cdb22ceab76c5f180b46a392ab45b1b99c612546e6b947f4d5c06ad5abee92ff96345ad43\nTAG: fad7d5a5193dfb121c68529ba8c0c35d\n\nKEY: fbc978abb1240a6937ccc16735b8d6ed5411cdbc1897214165a174e16f4e699b\nNONCE: 000000007968379a8ce88117\nIN: 1a8196cd4a1389ec916ef8b7da5078a2afa8e9f1081223fa72f6524ac0a1a8019e44a09563a953615587429295052cc904b89f778ef446ed341430d7d8f747cf2db4308478524639f44457253ae5a4451c7efca8ae0b6c5c051aaa781e9c505489b381a6dcba87b157edc7f820a8fbaf2a52e484dc121f33d9d8b9ac59d4901d6ed8996ed4f62d9d4d82274c449cd74efa\nAD: 3913cd01299b8a4e507f067d887d7e9a6ded16dd9f9bb3115c5779aa14239fd33ee9f25756d45262dc3011069356425b5c81a4729594e17c9747119f81463e85625d5603d05e00f568b0c800bb181eb717be8d7a93166a504ce1bc817e15530c5bd2b3df1d4222245ea78a38bc10f66c5cf68d661503131f11af885c8a910b6dce70bc3a7448dfae00595beb707fe054d3\nCT: d152bcb4c24c3711b0fad28548dc4db605bbc89237cdbea7dbf956b8855d1161a0781f27bd56d798141e2ace339955efb98fe05d9b44cd011e645106bf47726183958cb6df34ce5766695f60bc70b6fe0fabb9afa009a8ef043dbf75f861881368fa07726625448fe608d578cdc48277f2dc53eaaf1bdc075269a42f9302a57cad387a82c6969608acacda20e1cac4596c\nTAG: 96ae06cd7c72456e5568a42317046158\n\nKEY: 77d1a857fbadfe01aba7974eea2dfb3dc7bf41de73686aece403993e5016c714\nNONCE: 00000000fdd913a321c40eb0\nIN: db8915bfe651e2ecb3ce0b27d99a6bfa7a7c507cfcb2987293018636c365a459c6a138b4428be538413db15bda69e697cbb92b154b7f4d2cbb07965225aa6865d7dcd1ba2c17c484b00b1986fed63e889f25a4966dc3ed4273f1577768f665362d7d3e824484f0dded7f82b8be8797ad951719719365e45abbf76324bc7d657799d4d4f4bb1dba67d96ab1c88519a5bee704f7214814\nAD: 3cb2c06c20cb0832bbacebfc205d77393ca1816346ea2681de4d3ab1fadb774ad273e4713290454496f5281ebc65e04cfe84ed37cd0aedc4bbe3decbd8d79d04a4e434876650e0d64309e336bfb10e924066a64acb92260b2dbd96735d03af03909aa6a80a6e89fda81037257aec21fe9be7e91a64e88e0a58fa38ecba4c4c4cffb61958f3c486cbb0b1d0b0014a2d1d3df248eec1ca\nCT: acb825e6023b44b03b2efc265603e887954e8612b2ee134bdcb61501cfb9492952bf67be597c3a005b09af74d9e421a576d2c65e98104780feab838d8cb1bd135452ea39dc8907a4c1a6a9161805e4fa3e16989e6a418a7eea2582bf895da967028eab7c95d846a6de4b9980785814cf00484baa2f6de609912fff689bce6e854261ffe866bd8e63274605c7c5ad677bd7897ade543e\nTAG: bcf523a9bcf772e157941753c6d7401e\n\nKEY: b7e9b90dc02b5cd6df5df7283ef293ed4dc07513d9e67331b606f4d42dec7d29\nNONCE: 00000000a6c191f6d1818f8e\nIN: 2ada0e3c7ca6db1f780ce8c79472af4e8e951ddc828e0d6e8a67df520638ff5f14a2f95a5e5931749ae2c4e9946ae4d5eb5de42fb5b77d2236e2e2bd817df51be40b1b8a6c21015a7c79fe06dba4a08b34013dfa02747b5f03930268404c455dc54a74d9c6e35485e10026da573cb41cd50b64cfafe4cfcdf3c9684ef877e45d84e22bd5e15fa6c8fd5be921366ff0dc6fe2df45f7252972c9b303\nAD: 0f4269ed5ef0bfff7be39946a4e86e8bf79f84b70cd0b14fecb7be3c071316ce86de3d99d6871e0ba5667d9d7bba7dcaba10cb2a36668b6c3e2fb6c102938b75008bb9c213ebf9b85b5e91a802df0d31d7f11d764b2289f6225212694ab6b7c0e3ff36e84245d9f4f43fc5f98e654dea7ba9bd918658879c5bb4a1642af0d83113e3cf935d3c0d5208318f66f654eb17d8c28a602543e77ad3e815\nCT: 22586fe7338e99cdaad9f85bd724ba4cfe6249b8a71399f9a3707b5c4323b8d96679568dfc8d230aefb453df596e13eb3e8a439249bd64bc93a58f95089a62b94f6562b821c83d91f56c55147381e9de4beb4ae81bd6fe7caef7e7e9a2078f2fba8f3e70d4910da9accc92b8e81a61b0fefbece4bd89443e66e8ddda8e47a66a62f17fd0e7d0a4852ce1a4d43d72a0b5e8914bbec698f060f2b092\nTAG: bd05336ed6426de412aac37661953052\n\nKEY: 6b2cb2678d1102f2fbbd028794a79f14585c223d405e1ae904c0361e9b241e99\nNONCE: 000000007b3ae31f8f938251\nIN: b3cb745930e05f3ab8c926c0a343a6eb14809fd21b8390a6fcc58adb5579e5432021765b2d249a0ecf6ba678634c4f53f71495865f031ee97aa159f9ead3a3fcb823ee5238bdf12706a9c6137d236e2e7110ce650c321e41daf0afd62bab2a8fe55d7018de49a14efe6d83a15b2f256d595e998d25309f23633360f5745c50c4e5af8ccc9a8a2cb47064105a023e919c7795d2dc331d3f2afb8c42e5c0bcc26d\nAD: 1c32fd3df22b3e440e2a3c7a7624990194cb16a5f74af36f87fd6ca7d410ce9064316a2d091945deef7d9b35ceec8396069307caced2b80afd7d53ec479c35cedf2dfd4c95c3dd8400f71ad34028c6e4f8681d93d0774064ba38f3fb9b0c1dfa1f5f0c7d20676a5911d999fb6a1d41367a8e99d852bf3d3b7b3f4c233249ed1ca135389a674ff48232ded3f6800a97b6d409c40e6cd70d09bf9d2ad25d9b9485\nCT: ef70c7de98ab1d4ad817024a970be463443640eb0cd7ff234bdd00e653074a77a1d5749e698bd526dc709f82df06f4c0e64046b3dc5f3c7044aef53aebb807d32239d0652dd990362c44ec25bf5aeae641e27bf716e0c4a1c9fbd37bbf602bb0d0c35b0638be20dd5d5891d446137e842f92c0ee075c68225e4dbacb63cc6fb32442b4bcda5e62cb500a4df2741a4059034d2ccb71b0b8b0112bf1c4ca6eec74\nTAG: d48657033095db3f873c33445fec8d35\n\nKEY: 4dbc80a402c9fceaa755e1105dc49ef6489016776883e06fcf3aed93bf7f6af7\nNONCE: 000000002358ae0ce3fb8e9f\nIN: 197c06403eb896d2fa6465e4d64426d24cc7476aa1ae4127cd2bd8a48ce2c99c16b1cbf3064856e84073b6cf12e7406698ef3dd1240c026cbd1ab04ee603e1e6e735c9b7551fd0d355202b4f64b482dd4a7c7d82c4fe2eb494d0d5e17788982d704c1356c41a94655530deda23118cba281d0f717e149fbeb2c59b22d0c0574c1a2e640afad1a6ceb92e1bf1dde71752a1c991e9a5517fe98688a16b073dbf6884cfde61ac\nAD: cf6ce7b899fb700a90d2a5466d54d31358ecf0562e02b330a27ba0138006b342b7ed6349d73c4c5c6d29bde75a25089b11dac5b27adea7e7640ca1a7ceb050e3aae84a47e11640a6e485bd54ae9fdb547edc7313d24a0328429fcffd8b18f39880edd616447344ebeec9eadb2dcb1fa7e67179e7f913c194ebd8f5a58aea73b0c5d1133561245b6d9c5cfd8bb0c25b38ffb37db5e2de5cdded6b57355e9d215cb095b8731f\nCT: aa87f9a83048b6919c8f2b050315db4e2adae4a9c2ca0109b81961b520e63299dcb028cec0b9d3249a945ee67dd029b40f361245c740f004f8cf0d2214fcfa65e6124a3e74b78aa94345c46fdc158d34823ed249ee550431eaae9218367321cdd6e6a477650469bb3cc137a8f48d9cf27934b16703608b383d2145659922fb83bb2e7ee2ef938a90f2ff846a4a949129b1fb74dde55c5ae013c2f285de84f7dac7d1662f23\nTAG: 298f84c8312029a7b1f38c5ea6021f57\n\nKEY: 9e4a62016dae4b3223fed1d01d0787e31d30694f79e8142224fe4c4735248a83\nNONCE: 00000000263a2fc06a2872e7\nIN: 5a46946601f93a0cee5993c69575e599cc24f51aafa2d7c28d816a5b9b4decda2e59c111075fb60a903d701ad2680bb14aeda14af2ae9c07a759d8388b30446f28b85f0a05cd150050bd2e715ff550ebbd24da3ebb1eac15aba23d448659de34be962ab3ab31cb1758db76c468b5bb8ce44b06c4e4db9bd2f0615b1e727f053f6b4ffb6358d248f022bcad6ca973044bed23d3920906a89a9a9c5d8024ec67d7f061f64529a955ce16b3\nAD: 4cd65f68f9f88c0516231f2a425c8f8a287de47d409d5ecde3ad151e906b3839fb01bb91a456f20ea9d394d4b06604ab1f9009ef29019af79", @@ -654,9 +660,9 @@ "16b39afee75e53602de319484db89a51e844f38c361634e474f8f1f01c340f3f3594860d671346449c6d08ee38de22d246309bc7e4a252a29c86aa6d94b5b4fa58904c70\nAD: 1c2503d5aa1aad193f0da12874074ea0432bb76a61cd43a3017061514da0759846a0f3ae3a49fdb0b6d29f713de665beacb6568f2694112ca380d13f3c1698316866a7a7f87f1d7503a92176ab84fc08977b46ba664508a858e7525753c45511b3d2f407d5e993c6ede77f13d12975707e5195704970a89f71fc30828049f92f944f3aa93d6a5297e678e08952919beb7eac5919df1919cab3c3da6aa696a1eeab6371f310f7e81143e7d240b0213ae554524b52000306160dd4877bf13ba0f13bbe867da7c7d707f31335eef4cd942938ac890a0829ec66bd30ae01a2188a6e5ea0f17cd7dc875e17f03c0ab5dd18e36db8a1fc1f72859ee046b62368f168b3bea2234e0432c07b7d8e1b9277f21e692c513b9e816e6860\nCT: 7d35cfe4be56bd6e0e09dedcd01735b915bc1891a4d1f6a541abc4bcd0ebe89dcb8e365e5813742e8ec65777b6159422fada747da99394252baf8a046fc1b60ad79755f545f4448627b7acaf403000894f5641e78d3f946dfca29ec617f0660dcd6e8d8827e67e1022a245c595d86e60fbd176bf721b171bbe5ecaf4ae671b9f3dd3920146e6ad431bd8fc431820e19454b6ca209723d80fdbee187fca9c937c979206ae97be55f6ba7366a5608770a11d537396485eb0a66586385f4d4cf3905d1fc90831c3e136d5d513fa22be285193142994a3ed477145bacdcbdd791e8b3b88b0d4f1d18b27382550a818c4fd8884bf36f677c6c3ff5677406e510911e696af75e5b3f859bef699bdd16e6215fdb98d874025eada50\nTAG: 0fa4cb2bab84336409aa4349ab99a8bd\n\nKEY: 923d4b086b9e43b986f7b65e4cea6113a3d8aabefa89323c5e4d5b6f158bb7e0\nNONCE: 00000000a0f73297b87f5deb\nIN: 21435e8d5c8edf0684f58c2cba4070c10b4801adf46b6c4d322eb3990a38a9ad338ad704b9df6597f3e68d66cd5b56290c8466db2231e56d6bcb9c44e1bd081f42ca2a894dad369df2bd0d2c63d6c881732d6ea22bb22b5bc9a62eaffa1b094d0845f6b966d2cb095e7b3b8bcbc15e707449d35c8df4aea30c3b7243e977fffd59c80f1c5c9af4bb5a54b9c786fbbe8d21b2b906a87a786caed841a34a3e0cc0ac3209d83c58afba19edd63622dd261532d2cfb0b49d527d8eaa0887a087f5129d897f665264b229f860363d71a88b7d49c8dc6360182b357b0662391bb41337f46010ac32b9fada2d60a2efcb99365d3b27b7ac396900d1c821d0df8b86cc9cc1f2673259a33efea610bf8e1d00d7e9db2afea21da8f58c55f799999d\nAD: c853a8b39c0dc597d562f123cd221e4104b65423a062a4f4ba890ba344feb84290f61817e23330c365f58c3583ce08360d3c1171982ead5496d525ac878f23a57480a6ee39d4e65afd6268245bb982a2545fa1195427cdbbcd404cdad5198f55cce2a5a028fae435f71b15921d066e8d43766c32b2f2c3f57c0674e129607dcd3703eca529414adaee79d81fed432153cceb6f3fc53404810d8ec878f7d94be5d379d0e0e1aa9bc404b4b5d396038a9d76a5ce53c9f3759b8e50fb331858ca58cee81bfc3ee58baef5d19c402a3dc8b36370ec1ace5a4aa2527fb94b4f933a4ab8ccaaf6a5af5a779eae5667c2a24ab027e781c8d4f30c377aa5885a2fdaf6507d18cd824a847c35368b4ea984d2c3c3824a5b8ba3042e1852504a21a3\nCT: f2e21052eebbb86a4f5e803360855d8632aa727dca6f5e79dd74d7aff106e442001928d113005b030f8446f8eff2ee951db663978abe43090dd5ad2c51ba97a0ecf988c607d95e486d02524f690fa3c28d5c48c1f75c1f555e7b43fe7e46f2ca2b9fdb408ec4ba18b6cdde2af673183cb7b1a3c23ae77eddd4cac75e1ea14743fc571f8d31ce2e96787524cd48aadaa474181c096a032184574ddc25a6e0ac8441c212bc36298708e33c963ae931e6c6241d1affeef7b6ef759495df44b6ab647447693cf703569e69aa72f1def9a342b8978c1edea9703a421ca75b92cac4de14b88c693200022b8a2ed22b1c4678b99f4d695e080dd1196d7168e14f0d0f8ff880d742e97b9f6d00af1f7118e10b77c5ef3ea6c52f84a20fd6ea46dc\nTAG: 9bd8b7743c056bb2334833afd6143e18\n\nKEY: df73adab2768559ea983cce85453fe81d79be3b3c57f202b31b94d6635cf2e4b\nNONCE: 00000000e7a87e6bf6b5a354\nIN: 0032a37abf661faa18c587fd2aa88885c061deeba81105dd221969bed5d59c7204b09b1a8c4c8de3b9f748c7fc70626ebeaca060233a57b102221b1bf0f3d9fdaaad3d2b1439c24d08f9c67f49f3c47128f92ee530abf4c4f4573bc60ae4b38109f55bca3ca9e1ba9f9fd6e34ba0d174892977a53356e1f5c88c614fe3ff3b3dd0818e7a2285412e3b37444bbe8a80942efcfd03958809a6966cda9430b2f0c9e552f4bced6e19eb3e85fc5758bd7b588297ccbed37ed94c3adc8c08ea8b058462aac9d57a939ec711bc4ecfec944d2b653b7cfc7b02a65d7057c9fdadd51b9da8cc4a3c68dae9da8b9c5319c1a2baa3d6c891c5ac4a39461484b5a01abc64df447ada24c04a4363e605eaccf339a9aa515e724206206da6d22bbd2f52e64cd7c895\nAD: f833e5ab4f8bc89167f80f576b1d6b22cdd0e30721f5f735799746cf645b6eff531d4c7b03584f3dfcb73cbd35ac42736216dc7f0de098a4f42c61ceb4b227ee288e47d697a0a76afc762f084e8fdbf9351c28340c324771c109a469341ab10ca10483ed2af5e878d7d3dc2bced2f72da3d1a25852b103ee9878e8158eb4309c1ce528f3a178ace153b6d3ae0af0d577cb3cb1540489e80427f792217ad8a09b84f027fca7ceb651b4264e98e94b4cb8a37b133390897233e8ba9103628d05b9609e8552c4a4b11e3f2fa8d56af36957390e88cba44656be3edace798cf8cdf7771bac338a256bc3cba6df97728f222f423ca7c6d149c9372d66163a98f79a234b00d4b75fb2ec860dcc2d1998105e4b9c01d68f079f3e0aa21cc534047fc7b858f8\nCT: b842eadfdf431c135bd6581d3eccae54e2267d8890036aa33dfe2d2d9715c44625441210a3a0d666d708d30588fe851ec36e10d8fa3584ed77b095149494b7c54379d62c8935e1d2b9a8f47e4759ad0b3437fdf2cc2fb6c5ea25ad10e0bdc9dc5b0517fc237eb783cc461c46665e2b1d1a5b8008dbf409ea2a63fea0276de23a32c99d92a498807a0f95e208fc6262321a78aafaf0cc3f833fff37bd4efa66f6023a25cdc6702cee3912799563d908a5183c9956a06aa71085d855dc7c809ed6e2889592b361ab3ab39060f8e419152187a794a19c2a1128882201900ea2cd597860674bf78d9720643df8701676718fd201baed4935a88e50558daf86edd08a9ab227ac7afae55c974b68de8dacad4a4d79b13ed6dfe74017a4cb9148e033436fb6\nTAG: ee1ec36804e1d5cdbddb52608c711fd8\n\nKEY: 55a4be2448b464c2ea52a2f2664ed6aba865c14ea1fea77f4689331fd105c8d4\nNONCE: 00000000db37c0a405b4626d\nIN: d266e66272e5d3462081b004cb42429c8b9741e9f678153754d726f6f9aa513464763c5e793b482fe512fece97585f1426120d4cefb3d0a8cc0a8db4bde93fc72c78f44d4fecca14650c660d3e285b327e7cdd813063e7e867b8a2d059a41bab70432b7f857199894da90dca3fe5272bae1ec694a1a07b60b05df275784d4975637e4673109f3ba846dfd1a048b202ed8e89973be608b91ee4743b1e759900f1443038951fe6189e806638985f3c16338c3c60695df58e621154d79bb973859c4558e9dca90470f77c73f004443ad5db0717abbe43266f90e57397b83ac34d1fef2e897e2483d5bcdcb627abd64b0d1aef525835f25e76d6e9158232cdde6dce970b59f58de8a98e653be32fb58edabbcefa5065d73afdf1c9c4fbf50c1022bd22bfcb98e4b422\nAD: fd6a3fdd879f8880843eac20ae01c1b9dc3487d270a806572088ef2ddc1f1e0de495e71d4813bf5c501ad31e5d791c4b5b3a0a71b63fdddcc8de4b056064ef467989ecccc5d0160d403bf3a025d4892b3b1de3e062bc3581d4410f273338311eb4637529e4a680a6e4a5e26e308630a5b6d49ead6d543f8f2bf9050aa94ce091318721e1d8b96e279f34b9759b65037bec4bf6ccda6929705aeeeebe49e327e4d7a916620c9faf3765120658af34c53fbb97ec07657b3f088fcbdc401aa7949ddeda34d885018c2c23f4f0bb8218bf0d4fc90643658b4d8834f4a8c08e590c2a790995baa9e77627c342d283e454f84fcc05be15e9627a2d9be340c9d72f222bbdfc47905f56616cd9f936d49e4732f319f020513340fb8b22828db251b102b6b137c9533936d6\nCT: bd11ed07b7b4b30eeaf25d6a41a549cca0a5aee71f990ac566a37265d7af2ce3c03703427ee0b2755c2bdfc29f9d826aec6ee4ad28af48079ac23db16580b97424f3a4e35cc23625d39f95699d9ff5143e9a2bc26fcfee4f125f5aa2d968ccfc2faaf9db3c28850f6757f735cbc50c94c498bcde4f23bffafa8dd5f70d1a011e35eb26e905d4e68848fedebeb197be595c085ba33f11ba8398258445051751888e9bba111f800f31b37c447074ca6dce6d54b4dfad6cee5138643d4f6ac045e8047248924e88ea4294c7878bc22c9b41924ce301f22693c33733107bf1ba85e34806c5e4366ea66fc52a5f89dd9bf213239158b3d4d2600dde696c61d76c398b9bf10de9118e812e891c8f3355c0ecc6405f79bc32a58905e37888a1d8395fbedc3ac54eca569f\nTAG: 296a397d280d026fc3627f4718971be9\n\n# Tag truncation tests.\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19", "ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c2\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f3\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f37465\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a84\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a8413\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a841386\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a84138648\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a84138648a5\n\nKEY: c66e89fbab01208f6a60847f4f34b38d27b554c119cf8d9e0b118aa7266ab865\nNONCE: 000000005d9856060c54ab06\nIN: f9e3e9b5ed07b2080db8c1ffc37e4a6cb3cd544608921e18610d00b17c6e\nAD: 85c112a1efe0a20ef3a550526a7afbc98f6367ebbede4e703099abd78f51\nCT: b5cc754f6dd19ef2d66f90e6bc9a322ddf216ef248cbe76b5ab6dd53bc36\nTAG: d3f7b9c295f374651a84138648a591\n", }; -static const size_t kLen16 = 69162; +static const size_t kLen17 = 69162; -static const char *kData17[] = { +static const char *kData18[] = { "# RC4 tests (from rc4test)\nCipher = RC4\nKey = 0123456789abcdef0123456789abcdef\nPlaintext = 0123456789abcdef\nCiphertext = 75b7878099e0c596\n\nCipher = RC4\nKey = 0123456789abcdef0123456789abcdef\nPlaintext = 0000000000000000\nCiphertext = 7494c2e7104b0879\n\nCipher = RC4\nKey = 00000000000000000000000000000000\nPlaintext = 0000000000000000\nCiphertext = de188941a3375d3a\n\nCipher = RC4\nKey = ef012345ef012345ef012345ef012345\nPlaintext = 0000000000000000000000000000000000000000\nCiphertext = d6a141a7ec3c38dfbd615a1162e1c7ba36b67858\n\nCipher = RC4\nKey = 0123456789abcdef0123456789abcdef\nPlaintext = 123456789ABCDEF0123456789ABCDEF0123456789ABCDEF012345678\nCiphertext = 66a0949f8af7d6891f7f832ba833c00c892ebe30143ce28740011ecf\n\nCipher = RC4\nKey = ef012345ef012345ef012345ef012345\nPlaintext = 00000000000000000000\nCiphertext = d6a141a7ec3c38dfbd61\n\n\n# DES EDE3 ECB tests\nCipher = DES-EDE3\nKey = 2eaf97304cfaeb822c04a7b7bef328c7b82fef2ae81b06b5\nPlaintext = b3ed255d4f5e2d6d9a1aa2bc03489064d28fe1431eceee183b7231fad3273140\nCiphertext = 629d608789e51dff699343d061ec01d94c0681c7698ab617ea0145f37304c8e2\n\nCipher = DES-EDE3\nKey = 72f52e1ded0a88eac6c88d2901b27c2fd6e9f3f3387432ee\nPlaintext = 60de7b5667a1ad5995f178553d695d9b0fb537562876faa9b6cc50d05a1271ac\nCiphertext = 09875b215ed2499318c2d99c48209ca5f288830cc6edb9538190fa3ca31fa175\n\nCipher = DES-EDE3\nKey = 4cd30f1e14d485dbc05c69b65ebf44e556056a2261c9e714\nPlaintext = 7ae59441bbd665d8867273386fc72a8cd62cc5bc6bb7cbd57fc1f5dcdc73adfd\nCiphertext = 004d0daad970bfee944c8779927867b964dd0afaae7a830c2b8e7fdcaeac2158\n\nCipher = DES-EDE3\nKey = 7a07ac63adfaf1b26860ce39edfc402758bc4d1edda156ab\nPlaintext = ed4f18cf10bfcbd4354710df053d3e2b776860137349471b8dcf526b8eea8b22\nCiphertext = a1fc1014abda7e198ac8e096a368f65d9b59e1eddf5d97715015a2408dd8e799\n\nCipher = DES-EDE3\nKey = 37c443ab336fed59b0efae51ea7f5d07b7040868beefcd99\nPlaintext = a10a180cc94b75fc9d6556dfc0a816b71020dc3906f9d59d9dd4c839dfc1c1d3\nCiphertext = 0a874652b621618635138a7d4b33bb624f91a39ef1422b3e0490311ac6df3602\n\nCipher = DES-EDE3\nKey = 1ff1a7f4839d484e308d9b8c2c052b126def413d5fb8e0c5\nPlaintext = 4f28ef6683d36c80556ff240b247a3967aec23f859e3afb93aefad93b1e9964b\nCiphertext = 87a8f3fb4c51b3caf19c4ac51363d92025acc053e538c1502d347a618314a4bd\n\nCipher = DES-EDE3\nKey = 5642c4d1859a85b342e3f253fd8bd835e856c451e63673e5\nPlaintext = 687af9b298db752b47982f64ad9bff52a9ae487aa5e5c08f902035b0633225bf\nCiphertext = ca2ed48392ba5d70879ac8772180c3028ef946b6ac1df0348f206ce16bc449bd\n\nCipher = DES-EDE3\nKey = 30f9d27472f9deee309dbca76ba29ca174c39d0631084735\nPlaintext = 85db2c266902932c8e46d0207459b203f90955adcd7506b49bc82e2796de764f\nCiphertext = bbb5940b45add7c587cc9fcfc40674bac7e081baf71285891c65ed9573947a07\n\nCipher = DES-EDE3\nKey = ebc5a73005b77a812c3f4f61669ba859939852580fa61cbc\nPlaintext = 808d22c60b883a986dcb0860e8d92a75441cca0a2a4b06dd78dbcbec198b38d9\nCiphertext = 75d39d30862431ab07227e22b4c8218f1fbc2a3816daebc555c1b999c86d15c9\n\nCipher = DES-EDE3\nKey = 2e8eb05dd8a2b7a5a61a6b8a3830b12da2c4b1bea1e884d5\nPlaintext = cc7569d005afd1a365f5c5836c14475fc15091199902af4a78460d56c16f91ca\nCiphertext = 64db8af7a30363051a017cc92ed67ac6c0e2e1ffda0c94bbf0eeb803ba6b3d22\n\n\n# DES EDE3 CBC tests (from destest)\nCipher = DES-EDE3-CBC\nKey = 0123456789abcdeff1e0d3c2b5a49786fedcba9876543210\nIV = fedcba9876543210\nPlaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000\nCiphertext = 3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675\n\n\n# DES EDE CBC tests\nCipher = DES-EDE-CBC\nKey = 0123456789abcdeff1e0d3c2b5a49786\nIV = fedcba9876543210\nPlaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000\nCiphertext = 7948C0DA4FE91CD815DCA96DBC9B60A857EB954F4DEB08EB98722642AE69257B\n\n\n# DES EDE tests\nCipher = DES-EDE\nKey = 0123456789abcdeff1e0d3c2b5a49786\nIV = fedcba9876543210\nPlaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000\nCiphertext = 22E889402E28422F8167AD279D90A566DA75B734E12C671FC2669AECB3E4FE8F\n\n\n# AES 128 ECB tests (from FIPS-197 test vectors, encrypt)\nCipher = AES-128-ECB\nKey = 000102030405060708090A0B0C0D0E0F\nOperation = ENCRYPT\nPlaintext = 00112233445566778899AABBCCDDEEFF\nCiphertext = 69C4E0D86A7B0430D8CDB78070B4C55A\n\n\n# AES 256 ECB tests (from FIPS-197 test vectors, encrypt)\nCipher = AES-256-ECB\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\nOperation = ENCRYPT\nPlaintext = 00112233445566778899AABBCCDDEEFF\nCiphertext = 8EA2B7CA516745BFEAFC49904B496089\n\n\n# AES tests from NIST document SP800-38A\n# For all ECB encrypts and decrypts, the transformed sequence is\n# AES-bits-ECB:key::plaintext:ciphertext:encdec\n# ECB-AES128.Encrypt and ECB-AES128.Decrypt\nCipher = AES-128-ECB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = 3AD77BB40D7A3660A89ECAF32466EF97\n\nCipher = AES-128-ECB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = F5D3D58503B9699DE785895A96FDBAAF\n\nCipher = AES-128-ECB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 43B1CD7F598ECE23881B00E3ED030688\n\nCipher = AES-128-ECB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 7B0C785E27E8AD3F8223207104725DD4\n\n\n# ECB-AES256.Encrypt and ECB-AES256.Decrypt\nCipher = AES-256-ECB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = F3EED1BDB5D2A03C064B5A7E3DB181F8\n\nCipher = AES-256-ECB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 591CCB10D410ED26DC5BA74A31362870\n\nCipher = AES-256-ECB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = B6ED21B99CA6F4F9F153E7B1BEAFED1D\n\nCipher = AES-256-ECB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 23304B7A39F9F3FF067D8D8F9E24ECC7\n\n\n# For all CBC encrypts and decrypts, the transformed sequence is\n# AES-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec\n# CBC-AES128.Encrypt and CBC-AES128.Decrypt\nCipher = AES-128-CBC\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 000102030405060708090A0B0C0D0E0F\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = 7649ABAC8119B246CEE98E9B12E9197D\n\nCipher = AES-128-CBC\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 7649ABAC8119B246CEE98E9B12E9197D\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 5086CB9B507219EE95DB113A917678B2\n\nCipher = AES-128-CBC\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 5086CB9B507219EE95DB113A917678B2\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 73BED6B8E3C1743B7116E69E22229516\n\nCipher = AES-128-CBC\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 73BED6B8E3C1743B7116E69E22229516\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 3FF1CAA1681FAC09120ECA307586E1A7\n\n\n# CBC-AES256.Encrypt and CBC-AES256.Decrypt\nCipher = AES-256-CBC\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = 000102030405060708090A0B0C0D0E0F\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = F58C4C04D6E5F1BA779EABFB5F7BFBD6\n\nCipher = AES-256-CBC\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = F58C4C04D6E5F1BA779EABFB5F7BFBD6\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 9CFC4E967EDB808D679F777BC6702C7D\n\nCipher = AES-256-CBC\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = 9CFC4E967EDB808D679F777BC6702C7D\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 39F23369A9D9BACFA530E26304231461\n\nCipher = AES-256-CBC\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = 39F23369A9D9BACFA530E26304231461\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = B2EB05E2C39BE9FCDA6C19078C6A9D1B\n\n\n# AES Counter test vectors from RFC3686\nCipher = AES-128-CTR\nKey = AE6852F8121067CC4BF7A5765577F39E\nIV = 00000030000000000000000000000001\nOperation = ENCRYPT\nPlaintext = 53696E676C6520626C6F636B206D7367\nCiphertext = E4095D4FB7A7B3792D6175A3261311B8\n\nCipher = AES-128-CTR\nKey = 7E24067817FAE0", "D743D6CE1F32539163\nIV = 006CB6DBC0543B59DA48D90B00000001\nOperation = ENCRYPT\nPlaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\nCiphertext = 5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28\n\nCipher = AES-128-CTR\nKey = 7691BE035E5020A8AC6E618529F9A0DC\nIV = 00E0017B27777F3F4A1786F000000001\nOperation = ENCRYPT\nPlaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223\nCiphertext = C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F\n\nCipher = AES-256-CTR\nKey = 776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104\nIV = 00000060DB5672C97AA8F0B200000001\nOperation = ENCRYPT\nPlaintext = 53696E676C6520626C6F636B206D7367\nCiphertext = 145AD01DBF824EC7560863DC71E3E0C0\n\nCipher = AES-256-CTR\nKey = F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884\nIV = 00FAAC24C1585EF15A43D87500000001\nOperation = ENCRYPT\nPlaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\nCiphertext = F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C\n\nCipher = AES-256-CTR\nKey = FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D\nIV = 001CC5B751A51D70A1C1114800000001\nOperation = ENCRYPT\nPlaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223\nCiphertext = EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8\n\n# Regression test for https://github.com/openssl/openssl/issues/1916.\nCipher = AES-128-CTR\nKey = 7E24067817FAE0D743D6CE1F32539163\nIV = 00000000000000007FFFFFFFFFFFFFFF\nOperation = ENCRYPT\nPlaintext = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\nCiphertext = A2D459477E6432BD74184B1B5370D2243CDC202BC43583B2A55D288CDBBD1E03\n\n\n# AES GCM test vectors from http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-spec.pdf\nCipher = AES-128-GCM\nKey = 00000000000000000000000000000000\nIV = 000000000000000000000000\nPlaintext =\nCiphertext =\nAAD =\nTag = 58e2fccefa7e3061367f1d57a4e7455a\n\nCipher = AES-128-GCM\nKey = 00000000000000000000000000000000\nIV = 000000000000000000000000\nPlaintext = 00000000000000000000000000000000\nCiphertext = 0388dace60b6a392f328c2b971b2fe78\nAAD =\nTag = ab6e47d42cec13bdf53a67b21257bddf\n\nCipher = AES-128-GCM\nKey = feffe9928665731c6d6a8f9467308308\nIV = cafebabefacedbaddecaf888\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255\nCiphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985\nAAD =\nTag = 4d5c2af327cd64a62cf35abd2ba6fab4\n\nCipher = AES-128-GCM\nKey = feffe9928665731c6d6a8f9467308308\nIV = cafebabefacedbaddecaf888\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCiphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091\nAAD = feedfacedeadbeeffeedfacedeadbeefabaddad2\nTag = 5bc94fbc3221a5db94fae95ae7121a47\n\nCipher = AES-128-GCM\nKey = feffe9928665731c6d6a8f9467308308\nIV = cafebabefacedbad\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCiphertext = 61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598\nAAD = feedfacedeadbeeffeedfacedeadbeefabaddad2\nTag = 3612d2e79e3b0785561be14aaca2fccb\n\nCipher = AES-128-GCM\nKey = feffe9928665731c6d6a8f9467308308\nIV = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nCiphertext = 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5\nAAD = feedfacedeadbeeffeedfacedeadbeefabaddad2\nTag = 619cc5aefffe0bfa462af43c1699d050\n\nCipher = AES-128-GCM\nKey = 3de7b368783bd7287f2b9b731814c876\nIV = 90dedcfff100eb1f1db9d935\nPlaintext = 8d766795cadc0961c0f448c62df3827eef3a8664599b3adbaab0cfd63875bceb8f992b4f7447dca10ddd716aa0bc4fe925e1aa3e3fd1d5c430c650fe3546d6b9a24d576a857c5f04e8c0a3b149df277aa19cfa64ee235891d3b8ec0e840d268b1e70dd8a4bf97628a0c7aea38aa21eeb8fb1a8437f2abfee05e0d2c30659e312ec03d30da51b7c19073a2341c17df806e27e796d581143d39e4de8d3f8d46aa6d6fc1a98d94fa69b92dab751d930cc12de21fb1a7468af09e3c12ff6c3db3967d10cf140bc46f17a16e24b010b6cba5ebf777341c52042596ee53008389c48d9690ab9f5625795c3e588f72f7a1670b2b25a9f4eee1c8845ac90f1bf47ae4ea4b607a50aca88ed304cbb700d02d5486139b0bc81ec042e574abf986972fa008b83ef22dbfe720c2f2f6355c87c975932cec545ebed657e5e7570c503e9aa7f0b87d0b2648e421ed1d34749637c95d1e931af8925236387e50454f0ba2e22ed05f90450fad46f4eb7ddb08656511dd065c0f852a7e42f618a961a6c6bec42226c6b6043580b009ec9837cf99844cb74794a82c269ff648e0bae9ae50256a0ad98ad9f5a35057b3004ac96f469f9ee966dadc16dc47616586cf242706df96bb2f7ee43d3bd1c65d2eac7b82ef242e77ab509afb9639e5f3995380e926305729ca762c487f4411ec2a9c688b8347e5287216dbb38c3fe2281a89fcb47ee2ee7ddf79bfa3ab61cd56a00981019bbcea8aa0444eb75958e5fa56ea0036d2de4950a7db886f4a318b433bd41e00905ab158171e0ef13172293bdf70064b9dc7b243bf9dc927589bf9e99468d1cb330639dbff1850cc51929b8971b0b2ede9d06bc5f6ba39d4551b587f09bf6f8206e8f1524f55714612581d6aa45d8fb83425f84a736576deeecafdcbfbb8670d14cd2ab2a7f8b7f374c07881b7bac2605fd5ff7ff7cf43e30cf49910961a9079c0343b8601be8c3e9fe38f49fdab0b7e1a8c1536cf84e4d80d26ae5ec37570839b5cda02929221898d611525c3a88fc444167ffc532b256cdd0a8f31ff08097d75b629fab99c9e1062d1d9962b211e15ec8709934029c4934e64db8d7a2f32e23dc541be306e9a57a3419115994cbc3a8f8d5ea2a6f45b9ea9ac0e51ed0c6680fa029f4552a6c8665aab00ab77928342e7284c321e9500ad4774ef1fed0f596d5aea371fe1793271aef38cde55547f34701a525526e83a72673385a85f44db511bc87ce1f831fc6ccf8204ca4f4a20eac09897aae93684f14ede21bcaf40a09c08012b92600d6a839ebdf8bdca7b34192c6c50bad8796b3be3c375dbae6217815d2c75cc878d39b4e842d4eaa5f5df2242cf230e44a240e18e47827f089b18bf880fd41a2516eac8e6ba3fc2db64a4bc28789860d7b18d9edeae8b3059f4d945b15d0ee27b1f74842dd1df117fe83a8fdade23a47c93902eedc4d33f2dbfcd1996e6dc1458409fde2302830e8d44c58c5ae67486b9950dd938f14c38bc4c9484fdc4ded93a0f90875773453fc14d428cd6e7beb0c705d61229d2b3df09632ebb30b325fefe2aebbf2a7aa8e4ad46277ca4b8b078818b63d04e7652057f6cbbab7c43ac355537e0d3918b4a73c00dbe6b30a27ee7a6fa213d3347ae478e8edc323404b8322b9c7b0173ed61c38ed25f3576a675d527d22edd51d6dfa5767560d3a50a91226338e8c4e6436eedbcd3d2efe9dc1e686b15d2f57d553abcfda57dc316ca453a690f20148f0dfa20c1c4a58240aaf7195095fedfa56d839d0230d55ce9a8ca1b9d1acd6fe98d583148ba0f4a4e3413c76e6ec57ddb79428d3a90079f64d3321c791f60d501c3fd02c8403f0f5e6c6836bbc96430c1b48e83350c3a3cfd017f15bee3e4bb1295d821dc98b85ab3145555cce2c34a8142fe50f8db19918b514a165d12ff6301fb2296788760ac0b6d9e3a57770ad5111cde5d24b6321918cb0b0887a282b827a8749733171914b000e7d3c0edad1d42ca60da37f0698554bb2a1749f73b3120dbeaa32951f8217a781a200467d5b569d16f56fc9b7dff0ac524f03fee0617f4c692d94613b1e13b18075dc9f0d32811d4a8949a95f6b5fa46aeb83597adb409e68b2a0177c36dcc95dcb2e7dd4fb7337ff97c013364fe139e185014948fa698741d822044fa3f6978b16afd18138c845587c405ebf7a6cd1c28610ce67e992ed49e406658a0a202feed9709500d064b6f53eecfca57dd4b38363ce3aae9d59126d8ae7e140a373851188ae28c909181d0ac64770df70dd2475809350cb367825b59d521d5e457b4e36aea6dedd90a2266898b753b57fa359d43cd388e7d6c7ed90bc4c2af34ceafe88a3af6ac376fec35f1240f08af4f3eb30bc53dd68e5762e6d39e6b16f63003fbe0bee828d0d7adc58c41e857c2c44702215b202701fc696eae021af19c79e59c3e32627cd571f5db99b17f1772b5d746196befabb0b7446687827f3315b391d5dff069b1c39c00bb143218ef458e3b397e1c99640d57fc8db2e0083d3d22ed4111a8fc9e0e6f55fe6a56e946dbee43909bdd7d516fdf756ed8099ba80b1e17a5e279119345104379a36962ca9c8b2a53c414d79eb09fe79862ca749a9eabd9185ad1df57215945882f5894868a134bfc35c835e040e77ecf077d6a98a73ee022963d70b036be3fe5718280ae52c5d751211b22950c0597aaedd35af41f7dd5999e5f7ee34a37edcf97df54a46742b0252b196eaee454ff0c30685b15f8de087de208906be1d971f0fd89f7cdff2af0bdc96759d6889fba9ef092ad1c8deab0404562a7f3977d211c28dfd1573aebd5427a8773f03986101703fa", "19cd4ab96a381c76a747f63b63f7a9a3a08e251cdc593a024f63b443b76d17dd9e151809da3c582fbd334fa6dd0221b6d410c6a78ba95bb0154bb8999f619f2e084a6b9755ceee4ca3c7e0481a47776c8814f13054e627e37630d593bd09d5f10a049c66c9999f4b0b037e81ef70615d674c7c7975972994a053c069675fad3fae5ae3e779233b70254fb87f25d44c104afc3d5911b8b695173f9337130e39a02cf97356cb817f6cd23f55ef74dd06bd24ce5887a7001ef576262ffaa99f9bb5e3f55bda2aa0f199115909af48bb4d6b1a0a0847774515302cafebe75aad1f63362b1f38141e8721851c3ef1a247931b3b450581eb5d09027b9e3ba60ae9801d629b74991b7fd65520eac561d47115a85141d9a757bc75710bedff1630561ae05254ea541a7ff1846ed5e164834417556dd562c45543c88d8030bb56451fd5b3cbf10fb0164c5288789d2aac7e7a836e79bc3dd401a8e3e05aa6714ffb2dfddb3037c35fa1ebed62a073b2da42133f2620ae88de5e3f46cc69f2b9b3c9b88e39b8b108059ac6bd493be5f7a39f6b53ee825f4593b77ec9238f5ab804d533f48803e7d8187291ee25cfac4da5d8c9279517adfb09c422f6d704711726c73828a5082b4c7b3d85611b8f496d3e0f78c5c4f1dd1c722b1b11d55861f232beee6aaef8a00fd2eeeb45f182af191ca6de8eaa25ceda5451416fbf6d1abc0670b8c10e2815076f271044c690bdcb64856b91265bac202043a28f6bbeb807535aad4bd89e572a9427c826b170d3862f4cca70ddffb4769d6593a1cc6c42fd06cf68642835fe474a23e6f63df316f8361bab959b768d78e20c03c2a99913c162a9662bd9981eee55922f36792de0af68da04ab49dca72e3d9b0de79df828b433bcf6be073f851a36418c03a717d54d48c1014ccb793577c8393b7cb53cad6bc7060a54cc6363734f6ad388763519ca09b533078d3cfa61d7bdd4c4dd0ffe64d68d501b55903d3f4a1f310a3826ac2ca700de01d656188dcf577fd1b63e305614b8d13471f6f84a5d4b12c5e119870a63d1e3dbd39d3b5c26b09f9d80f8a59ce836b20bc933496923d278a022c00f3aac204d07d2e5075bbcef1e4820d633a3a2b35974f72a033484a91a1d6a9913239c93e5783b01833073c98f358e3465efd5087af37ad60b7285550e776d67ea7019e788776c5a456102358c32eb4e7c28096af88b9a20d8ce379ba3928a10ffd539c106f4927e7ac0f382c74017d6e4438fb128c660affd45e9bb68452de72b574eeffe3ce239d0718908c3800bc7e8ecd2fc7d9754171506017fd7868594c9373a96579fed475a28811649ce5dc8a3107bd0d8578748878ce4998684620931dc3981a2499568c2f61174c3b3fc46a7010468e8ff75c08cd43ac764d95e2ad1659f9db62e9554f811e0f43bb74779d923c8c243d12a5314d3c0c6ec84fe60e1d2b2e2b20d3e64054d62049ef9233ff55223a319c285e4e3f4c98dc95b2ca81230d7fed9bb99fd7d97430eb32c9c11647992bd85dcb47cfd58ea3e221d095bcf9374a6baa7c8333581f62b9e489282483023fdd18451f09bec764146b587209160b3d1d7a3d2e145fdb640c4bc382541e0d84255122d51a710887ebe1ccf29d41b4dd7fd7368d68ada250d3968d6f0971f0849c13c09abadb9db8b08960a18f84f0346ea0aa71227afa55b90cabc062d549b616400d36450b19adb67d7358e48c043fa1135abfca89374c906f8d1a6a845debf6b37f055d390b029c7f4524958bdf8d7e2755dde3b957f0926f9d3b8821ba96044d3cad2d637b973bfb657fcc06ff44c17965acf572ab7a0c87604c7dd1cfd136a0ad02b22e8ef320e101ea09772588e8c5b4d88f40fe1be18d27146a2b9559491949671700cebff9a709f297c2621ca9d5d1749623abc20a326ff5be55cb9435c03bf49b147b1e0a4a918bfdc3642df90b396a474f81d75c953d87b3f3b4e31fced630bd7c481c63acbb84dd31249101ac5277a36dcdfc80d8d9a2e928e9b2d65bb257bce97ccda83b187da8a7886dc96eab93d0864d88c358105f9cfe1ad0f0a8508b5b3985ff95de652e684da970b57669aa3fdfbe590a631522abe8246393639709a9a6cd549e78e3c2d1acf84643e9f554c5e076f75a5c1dce1be20a66722d0b896837b7036509ab8d473d5d2b7a8374d6a575f69d54afe3e7e18f4faf4e917be8a74e55c271b96d966e0c0b883f84b3ef2e4f278daeda2efd3ce770801d2c4bda5eb9b646deeab9fa55324e917e63e4eb6aeb4176cb4e43af3db61aea1546fbf16e76a12fcdbe726b565710e3f9866551023e5fbac0038678717e6ab4d3e92dcc53049e8cb65c00216d31a8869ff4d3539313fe2fd7ce0f53b255e3659e7dfc5f92b7627dd9ba42972f0ba72b888932d870ab97226040c4c0f4826be131fe1d2cdc21005ec2addd7796f0927501251ab26b0e5f3f9d2a1cb346a774e18bc233cc89aa69f5f70e3d5c17098eed350ec419c82837153b5c7f5813bf5918defc8df143063f3fe45125deded2b15892d5cebce589b60f2ada0f9d608983e8d107d8e6482b5f542c6650b014445e8c055aac142f16cfc59229fc9626f7aaa40cefacef777e494e13dfa93d27c201788ca9f60e572af8d65ffb513473dade5fe494cbf7377bd1ed03db2571d65af3be4b0bf27c1f069797bfb67ef0bd8a88c6286af6712c106df9c418d88054e3b46c88296a2e63894d6bee0dda8833c373d6a1b27637e1510fea3eb2fb34ae27354571369653a282a8d19f2c34f9e5ec34555b4ed24327dc5d246df13736bd41021697104f80c85bd0ae920e9aeb4e628fb8aec269d55858df149af298b06d61250b043c8a14a15f0646d0aaa18109d031c449e66dd7336044dbdec912b1bb615fae2a3df480bd64cbed74be65c8f1acac247e80bbaeb6f9dab38c6addf4f3b094d5934ef5c9749053b9159e280034e601731a12d6688ff27ee3581ae289de424d16676fb750d2ccd5b3f964dd77bdefc15bb204e2350632822384cc194cf9130f1ee81bfc3887d3366ec0b48cbbe0fe674281ae7445f03791887873659825680448f162452cef57d783821a73047078a8cf94c416850092ac772ef0b2e48517ef101ee0681b5259aa27fd56edf3c01e6dba6298ccc91b09bb304b637eccf8c673b816e74bd7f8ceffa6b17ab03df7ee9ca4098d24d044015a07df782a309cb6761528272632a6e1323c4e18284b463dfcabed708e4fc95cef133865cdbec8bfdde100621c65a92762cc3141ff37b66dea8fa6e3aad61dcbf3b512467c4773d36e58989e12a636389c1678c191137a5f7f59668c8a527dddcdd0c3fbb14cf48b8f3ea306850a5eda76c57aad06312d7bbfc18969d7b611f512358a7bdf959cc2f41de1c408133ef02b1fb2cdf8efe9973c27536434e56fc1bb4880db7fe901087b53ef3c0de18aafa47c25f1cd62c362f2e5da41c2dbff0e13adaba26c1e0829f027dc0320442e851eaed9507b70ac17180725349f6ea7b59bf39c095a9d10790e87221c7c2d24b8bca184ee95a3ef7449aad6c1d905f688498ae7a0cd1b01f76dabc342fb2be0295ca1484bece3c9b8a1b91e53de2d2587f3607a7f348f5cbefaa7a6dcf61bbbcae9444e2d25a77b016cbd1508c8cd319e9812b43b0bbca52df155d418dacb6ab1360a9e605fb53c6e20588a10bef42d884989e836b2ff16fbcdd2c1704f75dc8c1ac2cc6aeb92726f5d46e4784c70e1e249c102be6da506e5e3c2cef6a8bc4a60dac7adf3cacca8679f8f792ddc27613e44a70fd849b7617e042da46d65a3e6cf425f59b83cbae5b6e911142abd13a0a8cdf06d041435ee20e2ca417e905d2dc49c15b863ae5920ff7f9380a86bb0c86b69a000c157cd35245bf71f9dfdefbd1760af90ec3e554ebc511aebf650633221ca9157226f613f41406872765f8d7b916ff3877266f017b8d840dca0697ec3dffce7912ea9eafb62cc2f2d0a112c9bc0727444b47b62766bddf5b5f26d391f653b6894b069069979d0cf8cc7fc4143626a8420bc0a3866db3860096cc128d620ceff059d1614487004adbdf6b0c4428ac8897dcf16e6b11a692a6b465a92b40010f3480b444d4d2e24b0af8467666905c2a6233bdd6502521b621d3cdd4a5e1f268d65bf6a1879608ffd3abf635c5f0948f3cec7e087485c72b00258ba69783cfe7d611bc41c27814ef5674185791dbe626e1f276cf2c399a4eb264f19c77ee95d94252f546528f629188318e9ede65a927aafd2f2af56ff32c0ef39862d2f92268bc9400afa8ddeff591f3ef99681263a33b873bd9e01a59c8b281da30875245cbffee5268563c7f6f20b9e22d998934131dd219624d3cef6df2f3d2d6401833f72c619d6f763837141dbf93179d0f01375581ebe227185166aa7988eb9fd453d510ca6616cc013d551d23a33a4241e85aac3201284344977d496d768f5d920c5670b1d8bb608efc1b99abd261afb0a4ebe191605cc5c2e20523a13b3b94dd1fb24a27009d9a5b6329336f3516a327642386ba64c8769da1324a8a3d1f304cf0700df2b3e38215a954523e1d40ae96d0046e2929a815bf70785e94bc9b89246ab6aded60d65170eeb49b0ee0a57ee2e57db92409105c25f2d0c1a17b5556d06511bd0991a426258372c7f2b402dd533a75aa175524eb5d6b9575300b81fdb2258bd74429add8aa477bd1182db57107d411d16147defc3582861c68f5ce82e0a0316edd5d0f3cf36825a2c79a33e376cce2e63274b3b41bcbdd755845ad9ed2a3bdacb6fa3fa9484b7b60edeb1d9ef84772e78e39adca14c9fa0bb3ad1f1c17fb9449270e9b4c97b5b320839947fc73853fc58304ee9c9e86f3775f5469554d5006eb7ce9d02d5f900c771806c275ee7022e2b55d111338dd93ad51d14008df4c13d8c03fd9bb3689607e5cbdd499c3a372b487af74cb140f6300cd2dc2acda07277ea3dab57ecf09f1a8f2d6abf7c44fcdaa6dcb1f6e791164004b20b3b4c860f409c1483c7044b6fa445f7224606894e386ba08057a387b48920d4de203b1acc4dbe2b0b4cbdc3f7d7bbb097abbf81e01db09e120eab83def925a059cdb513efe6bc93f0579ebf75638df3c3d7f9eba3c36a169e9d88495c452888853640d93ee70f254f86e2d2d3fbb5e8883b36fbd2da105cf3a75cfe998068203186bb37f1d1ebead8ce1f9383b816f1da2fd0a9e01377b6ebfed4f05bec08b4ff9b90e385736fd13a3af7980c21b0dab58decea8e9545af5d0fb11bb51aeda2c8616960e8f6f84e6c2fc4f50d7e413afe030f75475509fbcf49cbe14445d267994fd3f38f41a1339f2895c0b2969a9bf9c59b85e629486c7bb5107c7a6b069793be7690f7a7c96c93b09a9d610594a156ab27a32d5557a5b1ec8920761cd2f559ad808dff3da64717ea5f10fba87b8ff2712ce322eb3c288939e0007f779a3920f45fdd533369f6f85a8cce21f91552fe03702ef81a926af0e402b418fbb25a6a3dad0ec18ec663126b3f48c341e2725abfeae865352d5ad275a9e3ca20393c64d118968023daac84bdc724a3c522d97a5878ed788cf8e44f80f8803d57584d8c8688cff24dd8c0e881b62d16ea30104d62007a4bec051da7fdc95d1df8556ebdf607383a0825ae503e24661ceb8ba773b793360c3f4ed3b761bd372570cb17e7c2030f07b0b45a7974e45ee6fcf5bd7ae9e9abde5421b42cff6af0c6eb7fc73f4deb67bb4e0b3dc9b4008da30c67071243cda649091a14b89bdacf2ae98dd230e", @@ -670,9 +676,9 @@ "6d417de31eb5dba123e3ce9e2269867d9a94fdcd8ccac40a9451953085109f5ae0c3e04daadb4a2a47b0e176917660eb3c9f1aae0ec6b00635fa387e056623947c0621f0a12e86fac1881ed1dc1b9f523388d6b6596a152b3e732c561972879dcd3f0232ef0773a4fb195a90c3186c4688ea58967ce7f18386b80bd38e90cfd4cb899337ab27cba8db6523e979b4c449645bb2f320ccd28578bc7ec38f47225273fa61a2e5df97c4d76c556fbe2b0fd30e615f5fc82c3de7194caed9f5946c151c22b7a0c48f4a7cf78aa153414f2913c5eb95e3dbcea7ca544272cd13a1c52fa87759aeb430aab144fab418c835344605df3a044825965ca15de6ba0e59b2080f5844b2d110d71587e19acf14264cec2de5b8c77d18893215d1c1da0a940e7c2ee429a99e2633c216aecb7675a2314a09044951ca5a8eac798f8878fb5ea65f4ddccac53ee0c786e597169079fb6e8ceb37a71580b0904a97450909ca454a690821e249aebb75449e582fe1b30f1fa9f6464bdef654daa5ede6d4f223f4589ea25a25f4672cfbe974d51008bce296628556f55d26646e40b59f40e3149273760b40806ace3b5171e0b79865c6adb53513da2f24c4115de243150cec76107b48ca8da19117f00b5870e67eb8357e43c1b7b593c9875795d46ede26a109e05406b69fda988947e49ab195f22454c3c743c2ec51b91370b4df8d38653b353e51bb83215d122bcfa591009c007bbb6124bc590fed3f9c5699180b3b1424ad02f7c90a149b77d22dea5c996aba675c2a1a20e206d9c25d9446247d495a26486c0d0bfb09d0b5a1a177a09fa749dc36cee73af0116a6b779c2b827512a04ff0f60b483edbcdb33d2a18339463c498ae67ffa9da0aa3f3beb6bc99212f9e6961afde89045520b1f3f2e2761666a333d76030f443f53322f099035584a60978ef8b49f46d7d4d8c5c758ea52a04b59c1a3a1c2f9df3f3b6f5c45cf4b3547043b18c1d615a2c965c3918d090cc72946e8fd0b938e60e03464f4bc71fb719a1d173b0931930e58bf7f6d4403971d36b40f83be6b57244a7029e1d41dc908764d57a5442557218b509faeda4e9fcf31debbc54ae671ef636871233f29e0013c0e33933543f4b59df1978ec89b109c3977b0cf938b7f6166d6c93be5e87684a703c8b7b5fe1a8bfe153a179b55575ff05e599b39e32ed10d958699a1ffe07136081f0719b18c69dc74f66f211103e9c544f3c81a88ba9f66a9bc7017d9ca9e2cd97634052694a598476b99daf1cdfb6122869375ca5873d32d5c1e07d9b5b380b4f09dbe04478cfb1a13853eafacfed70c8abcd444ed095f78d07c0e8b4093be95c3aa24b2e5b6bfe3a06e9d2d9fedfcfeac4cea2490627e6da6a5cca383351952f654ce2b0ad359c0f7f4ad3f8d1d4a030a947d4a2e417bb79102729115cc8b6558c3362b1d805fb48ce4858deff97677e60375ed13e150a12ee7dcc8ccc64d9710c7f516555c1f7a1a08f0d7c6fd21f864fcf28c8f748c40494e01fc32006f977a5100577f86a484d11b82c90cfe6b4d6b1902fef486cc6f3e033904e150e67283e49a5382961dabd244412ca9657b48796e476a82443167e277d5a65c0c563a6abca77d316e5d3ab639a1ecfb1110af2d29f146508bd9874486dbb56328d6f59479e2766692821660462aa60b6bc8a710707ceeb0ea6429e5113e03c9f41ce0d69c7589deb547527673e8a9f9a9a74e9e4bbcabf2e306b35504c1da99730ae86e94cd047b2e6ea5e97e63a492430d37ec446434fb3b066adde08b17d7d903ad194a4a863d6cfe181a45c8c97b5062bf7c4e44d69c0d1a7e1f5029b805b7c21d1b5e56e697999a32557870ebaae8d87dcb5ca5eea2c5547a16b3f30ef9df8df821028c106f86e091050ff8b6ea4171e59dc2592d405073bea53f8ea62edf112dfbc7ca69809db8005783d63557d3d90d123a944be395c1dc3b5e1476dff188346327769fea65f3cf9363e88ed67335870ec8ef13eb9d9ff5317c4e24dfce9d11699e5f47b4233cc8f9d1b915e716a5730a5898ee65d30b1628b484a5e82eda95a590964a8d8bc89dd3c5cf6c4f9137b8c6ee9d6a692e0c0d1d858dd5b3c12de48badade4d01bff312c56ce3ddb34b0fdde3b0c2706fc292b9fac7e1a0dcd0b6534c968117f7de15eba84d2754e4bcb8093a5440297605598659f686075e2b1b464b6b3ec68abb13cde263b1c607545c45746338b9b207b5c381da690f653b35e363e1249551ad938b9fd7b0a944151cda07127bf9ba76958e926472f4aa1de8512ce834cfcae5414b226f23acdb1fe5cf685d2201b78167ad35fc1da282744c2a43cc49d49242f968f7e06de14455e7ef5adedc5b33184346018114e2d1fc7a5349e378da9b2af5b328c213888652aca9f1145363809eca7c1fd8e64a5cc3255418736e048a731f3053db77971f67014e6121a8e464833e5dbd02ea6caf385e43e9f378bfba657986bf852b32adb55e35a2675bfc8d70d43a902032a61f59f57dad2dd7d7963322136233200cb9a90c952074e9ba0fc0654f1b6fd6f7f0eb77c0fa6d8143213ce6e8b0c178f73e17a7c64839f9bebca2fc955ea8ae406a13b80a9045fa8d129fd859faa46fd27c48bde7b890f98ee938c0d78889f84181ae2f5711304fe554d4251bbc6437ced59d577a2a1f26da736193c3674adb13cef9f4cb4aa6585c4d6874b0309ecde300493b1642c595746f09e03977c8902f3a4a877db1153b248f295a0ca2f1e437d15fcab8fd77c5f967304efb5c4920b990674ae61b954af40be17a8559dc377c591b68067fdcaf2d27bd9a22041b981a84be3de50d5962b58f8c4a22fa05192c5ac99a0a9423284fe62a3a59f085136cec72cda2a53af106a2eb5bda28b6e02c299118cd91714c2e7d045346c78d9ed1b41c73231a21e42c298949f70122277f4134ed5c56639edbf3c3e717310e3d1f03dc5a94e64c4ce148bc5c6bde64eb80b17d5979892786a31225eb89bf9f5a582bcf65b83ff7aa361ccd9238d144f6a22a3f77dd8a01382df4ee90a2057dd310a6b0c4b81dfc92a2cc0c606d3be8b18fbe64ddfdf2004eeabea892be2f914edd1edd8e8829dc7704d71bbaaf08c41824dd0f4b34c9eedead9e10e53bfc6fc0bd37417de0c5c71cff0754d672f29c262d8e27b524427e12bc4e4705ab311d3bedcb1ddd09a3ca0c268c05c64951b7d724a9dafe4d249aaabda91d68633aaab845bf78f9a22d467c7e0c5fc70fc9a318b01d7492efea7fffd329d70692e76647ae665c62b280da0d62f870a52e4dc4cd92c9150c96aab16f8c23475e3152d4debb41b6756f000c3d8aceef18b49e295be7a71da1eeadf4eb96509d45d7cc42af4b7013d8bb445f577e8d4cff92770b8ba0e451f3e24c6d981efdb68c7f2dfafee40b8a425955796e369f0d4da3e998c1626ae0fa583334475f1fdde68ca211c3f2e9afb003f553191702e11f8b731c89ea26059ea4466f2bd0a1a5601025ca9417006bca5c9a57dfdba44c603ef9ad38922623b40feda036d84425c47fa42973e348a180a7570e1215044c375313ab08d6f521052dda415707ebb74d6c4774e039bb04cadc2799224bde1802e2ee2a018032e3a341700c0fa2aa28bf93cc479231efe7da0e9f68e572415348c08cf648117e9b6d1267fef6617f5927252c86cc087775db3e30180feb5ce7e1ac9c3761161e07a4853aa6d97e525aa88302954cf9390fde81f8e11d97a11c79e3bad261364c18890dd1f8fc71127edefe3571518a42be611a46a0426a33221aa25a0ae6514daaf96038cb59aaba898de49e3b215a4464e0af614e638c2d9b6e676ec427fc906bc516331a18121f306a5246d179e2d3d0f38ab8393f7ea5a2d24585e7cca649637b9983924a15483c167e8780f8dd7aa1154cbf731745a8d8d54a8c4f8d854371bb8172303f9ba3c8c7cfe8c378ee56bc35c6376aafe907d3294ee9a8786281b7deff78ff125761f1a31d0e8fffe04a52a7574eeb8679670ca3bfb740167a559488d4337819613d32752d8a89013622f6a8d70f3c64b84a4215f4b7bb282a2d17c36a326167e3270757b8f1d9a0137bfc5ec278e8ca35a69e49779cfc25b95a89cc18732b5b9d1986b18878c57e118506909207207ad0b4edf32fb2b35b6e70546f45d0849bd139ffff9d8ae547787e7b51403b54f110e2ac65468cd0910d80a4e321deafd46e9af19609bee1efa41b762b8ace989dd681503539e7d9948664cf7a73ffac9ce2a34b514253c4f21bbccd38057a6d68732930dcdfc9a32219b53339d100db0037a8bbd101e71f5054f3\nAAD = 7b3b9c07148fcd897f657ecfcc87e530191536b8e77f9309e8d7323888b3b21477f2ab7c885c105d9c29ac96aed23b366f9fde4177401b7038c6770c7bd2ee8b4335105cc0eab9e367f0cea90d6f1ae3fa76cd21ceb9f3500ce7fb4b2a3f9e90f900a231ec693aeced7afb6821391d1f5b1b957895777aa7a2b71d9571c00336f26d54d756392cdb74bfb67d5a621d517db20441f74d0940180baf613b09452f64224f8af7bbc864ab4a8434ff624d0c0646ee07132fd376506951899bde975df8c836ab4ed9cc084f1f6d500ad56345d2f250a0d6991b9e458c62b6023191f341c8659e8a38c878cfac12b032674503df9c9bb01c4340c709eb6dd7c74907d769a317f4dd7317843c47bdb4c5e1f07f2380d464b0c47269389cc8a43a09adba86f6aa8f44c8fe514e73b5fe8d344769c1aa20a4538ecfbf47562ca79fa497b0f02f103f75522db9ead50d56dbe86997d6085f1b5aa7a4cab9e51a1247ce4f724a14983b6bafd17369fac973c6be268e20d800de870928e100990ebb0d3bedfceda36c64be3a729b603bce677a49e8caf282c9159b6e3e1e775129bd30dc3f5c9849535d86a27474be03bb5749b4c0115e2614f8feaa7405cc69b1de479b3b57e551f876a9c8c57ab9879cc68bb2ea110b2e77e59dd6a65eaa67cc4d4b2f4d6e646b2a298d3c80fb43969275d4414734e74726145dab06124c040656c39a94846e8fd58d326f4f9eafe5b95d85254765a21993f55070fcb9e85db5d42ab6b9464ce66de3f236dd2a0a26c4e5535dbdcd6eb350209a65aee785c6647ad4103d092a8ac932470880eb314f7c98cdff34fdf35ee2d36f09bd443b5defad7a5acb9df55965421fd043def6f4771e1bb27385b30ba22c0d8972aead6b654085a7dd3b60c4004a0dae22e25100e54e0badd0cadf909799329ddff699de8066dd6c3822d80c73c52d87e6fcbdb2dbbf852e37804b1256e23e76dbe43f30be4a577bc23c7941a3d708d1e1f579e9c6eebc219c74768168f6790a41f883790e08cd1e88ad09a544eb97b3d1d5af67eea666b9c027e5c7c976921189b955a9e605f6cc9c012c1c2e197c5b02504cb9ffbcb0f3ed778d540d5194fdf5d38dba6340c93da7c5501a082689616f337d8b59c2a92c25e777515726e1d7f6cc9552693cc7c30f1294b37f97d49814250d6c1e3eb335c5d214ef3641739d508b87106eaaf367902433a148ca962ec694409acb82d7749e1c88938ad382d0ca6e6cbe8255746832fe737c3e71dae8397f260c98d4a292a126ec21935c24096d2f91ae114194af659455d8a4206197495a28474dd2809debf5f550d77ffac2b0db521559910c352f23472d7aa9f4dbbdb158f40aa36912cbd918ae4c642e76d78d57ade1075c4fe1086ddee3d554353b4693bbcef1cfa87e49890838c36156af0edf384b0413d6d7aa\nTag = ", "51cbcf4a2fd82f221de1bfebf86a8c24\n\n# OFB tests from OpenSSL upstream.\n\n# OFB-AES128.Encrypt\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 000102030405060708090A0B0C0D0E0F\nOperation = ENCRYPT\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = 3B3FD92EB72DAD20333449F8E83CFB4A\n\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 50FE67CC996D32B6DA0937E99BAFEC60\nOperation = ENCRYPT\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 7789508D16918F03F53C52DAC54ED825\n\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = D9A4DADA0892239F6B8B3D7680E15674\nOperation = ENCRYPT\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 9740051E9C5FECF64344F7A82260EDCC\n\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = A78819583F0308E7A6BF36B1386ABF23\nOperation = ENCRYPT\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 304C6528F659C77866A510D9C1D6AE5E\n\n# OFB-AES128.Decrypt\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 000102030405060708090A0B0C0D0E0F\nOperation = DECRYPT\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = 3B3FD92EB72DAD20333449F8E83CFB4A\n\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = 50FE67CC996D32B6DA0937E99BAFEC60\nOperation = DECRYPT\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 7789508D16918F03F53C52DAC54ED825\n\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = D9A4DADA0892239F6B8B3D7680E15674\nOperation = DECRYPT\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 9740051E9C5FECF64344F7A82260EDCC\n\nCipher = AES-128-OFB\nKey = 2B7E151628AED2A6ABF7158809CF4F3C\nIV = A78819583F0308E7A6BF36B1386ABF23\nOperation = DECRYPT\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 304C6528F659C77866A510D9C1D6AE5E\n\n# OFB-AES256.Encrypt\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = 000102030405060708090A0B0C0D0E0F\nOperation = ENCRYPT\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = DC7E84BFDA79164B7ECD8486985D3860\n\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = B7BF3A5DF43989DD97F0FA97EBCE2F4A\nOperation = ENCRYPT\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D\n\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = E1C656305ED1A7A6563805746FE03EDC\nOperation = ENCRYPT\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 71AB47A086E86EEDF39D1C5BBA97C408\n\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = 41635BE625B48AFC1666DD42A09D96E7\nOperation = ENCRYPT\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 0126141D67F37BE8538F5A8BE740E484\n\n\n# OFB-AES256.Decrypt\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = 000102030405060708090A0B0C0D0E0F\nOperation = DECRYPT\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = DC7E84BFDA79164B7ECD8486985D3860\n\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = B7BF3A5DF43989DD97F0FA97EBCE2F4A\nOperation = DECRYPT\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D\n\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = E1C656305ED1A7A6563805746FE03EDC\nOperation = DECRYPT\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 71AB47A086E86EEDF39D1C5BBA97C408\n\nCipher = AES-256-OFB\nKey = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4\nIV = 41635BE625B48AFC1666DD42A09D96E7\nOperation = DECRYPT\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 0126141D67F37BE8538F5A8BE740E484\n\n\n# AES-192 CBC-mode test from upstream OpenSSL.\nCipher = AES-192-CBC\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nIV = 000102030405060708090A0B0C0D0E0F\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = 4F021DB243BC633D7178183A9FA071E8\n\nCipher = AES-192-CBC\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nIV = 4F021DB243BC633D7178183A9FA071E8\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = B4D9ADA9AD7DEDF4E5E738763F69145A\n\nCipher = AES-192-CBC\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nIV = B4D9ADA9AD7DEDF4E5E738763F69145A\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = 571B242012FB7AE07FA9BAAC3DF102E0\n\nCipher = AES-192-CBC\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nIV = 571B242012FB7AE07FA9BAAC3DF102E0\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 08B0E27988598881D920A9E64F5615CD\n\n\n# AES-192-ECB tests from FIPS-197\nCipher = AES-192-ECB\nKey = 000102030405060708090A0B0C0D0E0F1011121314151617\nOperation = ENCRYPT\nPlaintext = 00112233445566778899AABBCCDDEEFF\nCiphertext = DDA97CA4864CDFE06EAF70A0EC0D7191\n\n\n# AES-192-ECB tests from NIST document SP800-38A\nCipher = AES-192-ECB\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nPlaintext = 6BC1BEE22E409F96E93D7E117393172A\nCiphertext = BD334F1D6E45F25FF712A214571FA5CC\n\nCipher = AES-192-ECB\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nPlaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51\nCiphertext = 974104846D0AD3AD7734ECB3ECEE4EEF\n\nCipher = AES-192-ECB\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nPlaintext = 30C81C46A35CE411E5FBC1191A0A52EF\nCiphertext = EF7AFD2270E2E60ADCE0BA2FACE6444E\n\nCipher = AES-192-ECB\nKey = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B\nPlaintext = F69F2445DF4F9B17AD2B417BE66C3710\nCiphertext = 9A4B41BA738D6C72FB16691603C18E0E\n\n# DES ECB tests\n\nCipher = DES-ECB\nKey = 0000000000000000\nPlaintext = 0000000000000000\nCiphertext = 8CA64DE9C1B123A7\n\nCipher = DES-ECB\nKey = FFFFFFFFFFFFFFFF\nPlaintext = FFFFFFFFFFFFFFFF\nCiphertext = 7359B2163E4EDC58\n\nCipher = DES-ECB\nKey = 3000000000000000\nPlaintext = 1000000000000001\nCiphertext = 958E6E627A05557B\n\nCipher = DES-ECB\nKey = 1111111111111111\nPlaintext = 1111111111111111\nCiphertext = F40379AB9E0EC533\n\nCipher = DES-ECB\nKey = 0123456789ABCDEF\nPlaintext = 1111111111111111\nCiphertext = 17668DFC7292532D\n\nCipher = DES-ECB\nKey = 1111111111111111\nPlaintext = 0123456789ABCDEF\nCiphertext = 8A5AE1F81AB8F2DD\n\nCipher = DES-ECB\nKey = FEDCBA9876543210\nPlaintext = 0123456789ABCDEF\nCiphertext = ED39D950FA74BCC4\n", }; -static const size_t kLen17 = 96416; +static const size_t kLen18 = 96416; -static const char *kData18[] = { +static const char *kData19[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher 3des -mac sha1 -ssl3\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 4a7464217ea94d95668d31736693ae851eb0e39a\nKEY: 171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c6\nCT: 267abdc1b9\nTAG: 83e49bc0b906878f32d6a4c8181e7d5acf3fc5024062031c33e0801c44319a66c01882\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with bad padding values.\n# DIGEST: 4a7464217ea94d95668d31736693ae851eb0e39a\nKEY: 171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c6\nCT: 267abdc1b9\nTAG: 83e49bc0b906878f32d6a4c8181e7d5acf3fc55a4d0a66772185f8\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test with no padding.\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb897922a48034338511c537e5fb5dc02e5f3c2926e3f62b16a0f496d76d169fd5c2faf3925842d2f164d8e8c2d576a44d2e63b651c1a7be8759cef481ca11a2c4048527c475a77e5d3fb56c6320007b24c784f03bd089f25db6d6b6259e353ed66cd93d7bbb5796cb890ad88fa6a74e8740e13337206910ecd1908939173997673f57dfe83baeb37f38715e7fe18be32833e8a464222ac258211a3044b2605b449098ff46177c989ea695184d189ba3d54379e5a3a2c92c326ec6c2b0cd67b1380d26afed782905eaec805ff1f340de80ebf919d04657440c33fd034626e8a417b9b97d8bd0557791a3e8547c39955dab18f0144a62762fb196\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: 095a8f557f75cba8e2452ddf97c053904b48827f\nKEY: 18cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1\nNONCE: \nIN: \nAD: 936a91d0b5d2c02672\nCT: \nTAG: a76d7e313217b0efa96b0958b078ec9883a0ab2bebb3d63ee7b6b7da7b0d8c0fade2a17aaf35b3aca88c3869da6c1ba966a216a60cec36f7e55a3daeef7d0ff5185f83c478647ce21bca0582224b72bf4eec23b467e0fdf087c2fbeee1c03361886d6d01b3c7b5e379b820b1a8e30dc1dc37c5906b28cb818a194edbb53b63d5d0724a92016783a5d66d1f53341d18be09e31c708ac3ac926daddcdfb1809a710a452c1dadc45ddcd6042c2860a1bee293ef51f63f25bff7ed5f9cced815f8a85faeca14f8f284ef8acac07095d52ec4bc1870cf1102265b7b8c772ae6c1f494f1866f97d906a7dae2ef65c3722dcef381547f3b97ccfc6c5660438c3cc41216\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6aca9607ff5628c16d9c49e4f9753053120fa9a106fa7ecd7ffb008e61197598ef608b6e3e594e13fe041e3eca9686c355861b7e3d60920e4d260f7ae9c8d181de1bdbc20e6661bf7941f9ef612ccdcce8911429c2acf9dd0c199d631416695ccd7e1cbf116c2491833682e79ee30dead21c762dab1b4dd3e47303faf285a305ff2e871a5411e1be9716c1cf8a9d77d01a25032cf622a5bfe36132fea99403357fda3d66466c9c9a5b1b75f760b1f1964120590b9eb2ec3acf2ce826fa34cb07a1da83621d2b98e9f98b847f9034c59e2ae4847934aaffd2c2d0be99481fb4ec633a7109f045541ad62973cbe30ce5a567d84bfc7428301e2ffbbff0227f1c34a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6903175199caca0041acec1efff1f08c32787a3c6a888f5e04dd8aec7316cf00dcad42b9216a2cc204696334ec8da3cef7c774ba743d272501e9cf598b5807ce676a7ad688f2ec4a398d469d873596ffc4a0954dfa1cdc99910a7d37d17180cb553e79a18efbb02bcd42a06832c129261235c777692f9facb983ff8f6c4f82b900904887060f7d4c82aa3bafde655b9a3b2356cbb43cd39cee164dbd2b612bbd4362b0202268193754121466629c108f274b0210760a0ffeb9fe0767a0341cb493593b5e22f9b1b6dc3d519036b1f093da0abfd73fa4813b58f4feb7369c1eb87ea772b1b9c26695f2bfe32ab5758d075ed2f916300c1fcfffde81ad1197c9266\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6108410f4f75ecbc9d5eaa8bbcd94cf5cd402390207bf53b7221f78a53d39f3571153a43979a2f2da35bbe408e25ba43f069f5bb06677d81e15a6ebc24a9d0d711bff232488e2ee5fb8bd55514c550b85d024744dcdf179ebe9f73dac725bc0d27eaf158e2a7a61ddf3e9271511b24f4457d18c99c327a6182847683f2a68df44698dfa084e0110731408400769eaa1366c87c0bf21d3d8fc4c3558d9349de5a6deee7bcd3ea8afa336993b07f53765e777e4ae55ac9e612d32d942467f9090bbcf41d1703a30c990822558d6e37c07d8f95fecb2886a85361d0ca3f473ccef3ac4c43a250c1426081e999e75840bba72000e4f61b5f99620ab3603a3bca328f9\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6e8c71386f15c7afabdf4c13b6063bccb4ba67a9c8f15c88d1344ca76b2bc18154cbd22de30d2779dd483025604bce1c1188612a3055d3745d62d2246445b13fc7be0e02dd864964f50572bf631d1a37546d07399136e43635debe50a3e1d2d2d54730b7d32fb12d8c4b5056913eea61968de3b2dc66f78d567ef508d7fe8186ced053d444d63dc319c97b01d75b0a6e6843c3f2c3a65ba8a07256ff3b1b00e5e5ec30d5aeb01e0a3311477fdefaff5a963ee319bc53c1e80337e95136755d3afcec2a7ca23df27a08526c17b9489591e7f2cecb03f43722334e349950e642ea4f9af9ac41bb0df3d28575a3e2acf3bc73acd5b1e0c6d5fa962b2b6243a41b798\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b62e8a8b25f1156777edeaefc99495a2ddbeac8ee78f3d59f6f3a6f80259dca201b1fc07b15160fa2f45ac75853b5e2c71b0125aaa9d6e4906d0a20e5824abdd7d3dbf6416877386786afecb2da23302dc086867bee4dc063e7f2b3f8a72e8564f4dc6072337d68d4b15f94af9dec3366c3ffc52a2e6e82407a1de715617ed535f8c9e94f491f6618cd2defca93ae876fb72079fdcf3f22adefd70759e21a79fdaabc4717a2de329a24dca7909b4b4fa69cdce8515325316bfa208fb6aa257b3a9c9f1cc92353dc48", "b3e4a4c56f02cd8345634abd0f2f8c030c2311029f0b5cbcaf363ee89a5fbe4f45fef9d0f4f6c40e05a91abcf385a0f5b28fb3ed3c3180ff3\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b69123f67bc17ef843b405b69cfa29847f22b4774a672b765bcedd0eb712d22bc222a1fe87f590e014d6824fa1527c8bdbd0386063f2b4a60b49f2f7c47ff2aa2bc1110eedc569e9e20866b7497303678bc88be8c1aa43c2b5f00004c941dfb7f89d5762802b82285495a0fb391ef1f31f29a20a6aedee47116384e44952d33144540489c763a91ac964e95b97e80f6918c5742d33b7ef897c06978753e6cb2e70a7f83d98ac2a0a9c002cb94d76f7c67a1a6c7fc1ec1699be9e5dd29f0eceb1d44fc30acdf8dd5e3311d3371303f89d6cc2117756a757df38e204cc964f890793f8ac18860102c837e4f4fb885e6b4e0bc5fe7b237453dbec9d1e2b47ceb042b9\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6c2b7d0845cd1b597206a7a95b6c565c0c94bed1e0a6029f37e9e2083ad1bf123e996c141e412d13a8d419178348737ae1fd20ca4732bfeccd454fa124552fda20a2e28712176d9833263bc628734e11add37faab3733c492e77e10b58a243558c71423c1af3300eea55b3f0665a5930e996140455d8e951730e76354a467bab2475970c375d9980d9c0e5cfcab193d1b14c9a4ab0894f28df45c760ba6b64826d8c3495ae94b4a8eda583efabd8c18b1c15c8bae2bab52bcbf4b98db666e639349fdeae37ecfbee7e2583a82bb8f36b5370066fd8443a9b0db607d6293a3dadd1308f1a6b2c2a0f7d42dcf50b4e1a0d08cc632f2b8b43f6c4d91c34c8c00a428\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6170b60848358077a5e29c1e20aeff7428f6a6e1504c9607afb51e335a5d5c816e9c452cf7dab010fc44fc94cff4cbe6e2a1e1bad22f4db709bd4f9fbc2f91c8b6c350ef958796d48d353aef992383f02f54ccc8b56f96a2035302a89b7f3814128724121b54413e169be90078bee5047074c9c3011a01ac0ab9dc20206dac372957ecbebbb495959d35ddf469453f48d6d31a56a17e8f3ba233416c81cc5dd0539f22546efa94726b433f30d0a38b68bb3d2ecae9f46b70f8219768073bf91055554e06e6459314dfefcf136357989e9674fd1c5f3dc3fc60962160dda7587e150919343f01452a3f1402872eca060ca321c5b2eae7d2db60c49ec4d1cb615a0\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb8983cb68ce7c10f95c5ce17358706f5c5775e3ec531934b7547578f7e8584a0f4251db3987a48aa81c4495ac3879ad93a310fb85411f331d79a77d16e62184b9b197ec5e85949f51453edeeba0355a383e3360f3e086598c660b254aaffdc11f65f7185b2cbdac73d388ff28e481b3b62307ef4f009cba26759aa22173db0391ef2faed096897798c7717e7dad9314268bac06d4f500d594da41fba4019a8c6a62914ee4404c48ad3663702604f5122683df00dd9a1ad1e0061e15ab99735521c1011a5389e6159aeddf370fac9d3d662397d3439257d5bded32061801468232f91ff9a507a6021060219e181ea622e0c78bf034b785b09a34\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb89587236559639661a312a094778344e802b0234294a854e938400c4381ef3be5dd023502e0a5e3b0c38a35c986ad6f43c7108532b0c4ae8fad66282fbe946ddff831b20f8a60e28a1f5f74a85dda8a4abb9264d38ac4580a28cbe9ae132139171ff86c6dca0ae5fe0721896333ea0c4582e2328f4427fc1063d6a82c20c9e41aebc17b67d7be22bbca11416fb580508c93ee3e3a18845eb42d3b0d60769c10208f32dec6315a2bc9562a00067db5d62deee9bb7db94c4b1bc82a955f2700c1cfd422c04cc4c3705fba43b749165101d32c7217b691505fcdf86d09abcbc02da7e007c5682728968f4d796c946c1ad4eda79cc3951c937a5ea\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb894cec352f22d89c3a8305aacc073b089e0241259c688277dd37ef438a2de00810e9ae9ad3b9ab4f073ca36ff8921e0f0ea0b8db71dd3bcb0f81568b5c7d2ff5a84163a05a520a430a6dc1a92fdbda12fbc6ec66b22c593caa2292a15ae9c892433cacd007b506b7b205dffbc1b2a1cc6a9484bcff9873935989c2ed959dfecb17b166948cbcb5bc47470525b01b3863fa5c580f414da10936c8ec571a37a1218fdcd1c40ea3e3728bc80d48ce3cd4044d2c9dfe9e15970e30ee3088fcd11044b47a554cae0441ac814659a90bd0963722182763043b3816d4fefb7464003947fe4a0aa3959cd1fd972818452ffbc041e5edfe62ffbad08cb5\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb89131650e1dedc7243d27cafe32a586fe4be28f5c3943e4d1392bac6b5c26f074bd037cc0be9e5d9478f86266e4a79f1138168f9e4d17c7a7ebf7183ec4a7c2f14a7e84114ae94b76418e361da09fcba62d8750ad8096ce2452f2b34c18d3b67d2c1e2716efcbd71b2e3eb63e8dd46897dbc75f7f69b947d9e9fdc840d6a0754faa661e62cd178765b5f0023ebcc63633e90f0a2b135a9b0785fcefb34c297c6f74b30f51bd96c0b6a220b21afd32767907ddf9a2e801a6c0a5cfeb16e85b7433ea70908fc8620c8fb79004d2883aba90de16ab26eb30bf25e9b38ffd7413e2f7eb69ec1d93f828a500e6c502076a55d73acc0a85839fd872a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb8928128f29a5a2d553b2475f1c901a6c9a635b8e8e6b98b302b92d52f493993beaea11a804c941c44acc8c4658b1c832a2e4608fc2556a23dabfddccfc741e944967621a1fdc94784749259df170750e9770e81d59aed228ed2e3d1ef919d84848d8c9e36c1694d01a5df18e7155b63c7185da81782de3d6e4939ccf526103d298e090317b19252d8a81e22d26fae95422dab77a05d00a34310e01d6c11905928cec752235139f41163c4bcc1719889071b0974ae1007c93a30e7d9c45e91e05a90624559b4e69710aee8752e54b1a34eb4b56c71c63ca09d420603b34090f2977a472dcf8f4c170c430010e32dc0341efde2c6345e228d0f2\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183", "aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb892792154b79e8dc9f1c72a9e7240fce384ba3c9cb0715651187fa635fb2c9bf73c1b1e24604082ce6abe30aa86c6b9c0288518943dc5d60c7ee481dc899f69d71ebba31ec46d42969571b8f32e077aee3f238aa43c266ba71ec229b31547ae4cc2a238c8cf107f22a663c7ac803af29b693b6c942f2e09949c8091b9b4f139bde40ae6445277e8a4b90c24517ae87800e263ee36daebe615ab69e1f322d8d2eaca3757b4a3a4d2c756385584f46269cbc75fd9da36949dee27598a3e20ccc931057606d3c25eac14fa9b2c1c5d669a0803fd5bef216f8e008157443a11593f965a4ef0e530a972903789a84840418a012afb44bb7e0d607fd\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb899c1bc5433112e40d12ab6f772a62700d7368c7ba6a42799390fc05896d42b475a777b00294f92c0064f5f988114ad591561b963840c540521630ab5141b18581b74a6a52dcde7e9ac2bc12e876eaeec39d05b56a3a3d5b240dd0dc81dcfdf9099bad8d7c0c699822a6a7dfc2f71f344c263e7920c4cf7f6f8057ab3e30f9db03b4f6504be2dbc41690d41f667557361fcd8f9ecff1c5db42f5f1ae582e4eb7254981b26d6536a77b654b2e9d3ffa8fd7d8a6955bd1ea691db927022ad64ff680230fd9eeb0791f70e7418639f87a098ecf6371405096a067c1d04cabb3de5b5c40108c4ded020dbd749f08e1099e5c89bdfcb220db1d3560\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb89193acec78116fe3ce6707dc8b64f8b6ba67d81c6f0dca0f5f4ee5c57af8ef93dc7e88514be7cd906a7b8cec9419a625dbf1d5d43ce1be9e63a17c7fec802a13e0d77349f3a8c6245254b03f112b15a6323c61d54fe5212e8049ca9aff3402d99273a8f11fd7545ad32b7da3b8dcc69a49159a7b3ffbedcf49bab8a0d97ab95dafcb7142c85586407bdfd47031931d7a514e92e22f8294d39b72005a0dd211a188a1bdc760b000ffea4959b6bf1950483a3a3ceb20d9a24b6cfe41dd8382385b4f52a07ef0cdb07aa3e339e6e5f8e26d269c7e8aac0609a1a78a462f2f14c961d6a2fde032d4bdfe974e6dac134f11aee0846472daa609f56\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb897922a48034338511807f4ed582183c36c08361389878e2f51a25ca3c845380970f7aba1e7b7993325502e388b6fcd9880b5a64b80cd271f874dcca5bb85b1f1ef0062416fbe6db73b6f9217b63de2097cb90a8e5a331a871781b34611542a533aa5f8c59fd14b8241ac2b19a08b94124be10e6ae7c2365904fb30fd74ed16858d5c06af820ff88ec6f2b5180d1992ad49f63de732607c08453f2cc70791f102de85a8a5f07651202270efe3e2030466f89db7f6757718654ba63a680d7f1f14e260a07fd31c23129eb0a44bc638d180fd0534a978ebc06523d9bfea887c38acea8dab92f3ad40460160e380d7b93cb97a3e2cadc571a081d\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb897922a48034338511f87ea536db2b9a63b3e142075e482d69b39f327f500844d287164120f58b8fe5d9cf2c327cd62e0a327232b53c901661fafac972f9b599ff18cba6479edf20dbebca867c3b0e22b5399269c8bfc6f4cf2d3efb00fdf62f5b1c826d24fa2e29ee7488e8d990105aa9fbf2a1b80a98de99349b7a7c3db571f9a68a26032fafd36500a33dec19b0bae67d42a89f27122904f89403e5f0e3baf4718a98721b7108862bdc093a075d4372bf704384b545ded4fc7578e5f96b2074291364bd06e75b2d435d8df47eafd05326add43a5e68cb0e7df7acb547c37ff01dfaa7b29f37d2f1dcbf06e2388fd3209af262d9f4c09c6b\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb897922a48034338511aaaeb557cdc5f7e0f73dcad3c2248b82f9fc3923caa84e5f866d6f2cd9d1790a2914410622e1869dca3311e986d1e69e540d0def5cc608a7cab4f07efd454296e1428df7f2f95fe5f830e4e19cd8889c0e6f3b17b5939c2cc08442532b7dbf70f49c424443cd161ebe6e1fc3066b6e21d960e8e6c61eece9f84858298327ab35391891d392cd9681a881b85b5d85495a173b6dba7aee7bb1ce79b74d4cdb4c724de01b0794625858cc53deb2cd6a25192bf9326032f065c88728b8037d4fa8cd246da2a627419a24fc5442f5f4b76ce86197ec9863772476ff57643a3df54a6e3ae9cf48f33fd97b97facaeace482b13\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb897922a48034338511c1c5be45c2ee1c11d5cfb5b6033bda50ef1013d244502c9765c92d38b02e910d089b366a09b3758a061b9e1a3f69a6b4627badc27bfc284ea23bc72758246d259e83eccb82e119d4ddc8c72afa3f9c8f0eb9ca318d0fb69f4fe0d61b84a901bc6f020691ce145314f428aef552fd29be185e7446b8e2cbfc8b47ac74403b9f7d4f1c860ded2358e4625edf77e7504158d47471ad1fa04ad3dc67c048476ddd75f21130c891fa08ea5a485d5a0a1c2a13a457474454f3d46af9b77c816468d04e576daf19b75f035ca81e4ba39d63a529408370ea68c7a72bc1e3cb06a741e71f2cc769073ed4ffabe34e8c59d9c7f56a\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb897922a480343385111b660e85761e5f2721ae4ebc26761218c5ff082cfea20298001801ee8ff3549028c94ca45b381ced0b123bef1f0f9120a6a5ca8d99c512cbc4baba29caf66c8ff22cf64c471d22fe94174ee6fb473636afba85870cfa5764e85c9c77e1b7ffa40c5e0860e13cc172f979beeea73bd842c8b6d1306810ef9adba6836d281594e3599bf628c08a4f0f4f2b95e07d1d6d290c55dbb91e2f72e93a05e13c4031e9a8b42189833070da54fc5e3929a36a685b05b4ded81ac5a1ceb05067f4656235c0df03476645b01fb62c28f5f8555161e494dd3acc6674a6c98059bf46c6c60d31b8ca3ea8cc1c1b2c13e3cca4cc591dd4\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: eef6209c94b929218349114d6ef8d5c1fb3f7107\nKEY: efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7\nCT: 66bbceb66b6010154b427f3a425cb4002071d7237093a9f29612e09cf241bcf9dbba5b5ef26c5f468763ee11\nTAG: 997c66a777945bb051934aa50dc6b8e3e58cd0b6ecb92f3176eafb897922a48034338511f9a4ee6c6d9c1a2e8594e62bbc40d63d86168c0596bcb1544e8f7a280c290a2cf3d1d45cf357f316e6e8cc3969f0ba7aea1d5424bc49db02033dd88eb122ba88e922cd0c350990b371fb78b4d74a3ddf6ae5ec5999c79aa1dfe634a1018b115a9111772942e64fa7ca72eb542bbd839b0fbb9d9645da1b78490c", @@ -721,9 +727,9 @@ "ab156342d49c0fd05e02981b2852b61dd311afdf696535839b86b2eb6776b7b117d249a2adc1a4a4260f3e42a0b7cff6f17a3465087f0870bd5c678662e5fd509aa2a53cd49a99ad18d7f35b9d68307cd2a6a146c1dfee5428ea3fe0b0ae02ecbf5819576d0094ae0e80773c4ebf7a27d6a74a703ba98c4681a648dd20a7ef8540432db9a3b186d3cefebdcf4557ca70087fe4412f9a14f84ad3e5ec6668692be195a7db3c9deefb89fdd3972c07a4274c075cbdd2d92ca62b409dd2bd095e5d59590f7376359aea46f69e06dd77629c0c90a9d18b3605f2fac518e2d448550e371ca88f3943eb63a3a2c93043ecb0d1\nTAG: fd5473022e135093d1b4dd56529a341b3894da36e7\nTAG_LEN: 20\n\n# DIGEST: 070f23e02cb53f55b0127fd3fddbab83e5682275\nKEY: 98233b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e97704531\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f\nCT: 6e115446599543bce17fa824852055880348dd98bc8241db1d62a76e599d4b9f3c2ea4f27c1e928ff84b480ad3d8bbeeec758366fb3ebb3e8e8f15906e219e768bcd285268b6347596f31240e345464c7316836a28753f6ad0e22c68ee74c41a3af8ceaf29f3a28fd1eb847602386cf37b57fbd8e52f90415a084800f05cd7a1e0040f69a06ffbdb82c5beaf66f69a17830f94dba00e4a574db348f9f0125ba656da5821b19a7294cd57ef4ea3a2435866554b705c0518445a156240151520e4f61ce4ea7f57af81a5a32056f9ab44102dd70735cf9875d12191dcea96ae8d5319a19cf291b1487f8281e61c634e7b46c2c28400cb437187a0de78c025cde3a7be6c5dea6927d404176c2dd79329929aeeae88a03298041eb728dbb18b5d0086d73813f48fe7eab4248efc38df06dda783a1d9d9ae8fe5fcd50f2173405b4fd35911ae775085c04a0c0b296a10b4ac3f1407ee613ed627567fbfa47dda3e6b151d4fe736f9ee0f1a3148178b483e74d251a5a050caa9df0a6a5d9740653bc5f6b269426ba9ed391eb475fcf0b5b773bfaef15c6c634d2ad22b314b20bf7ee767e9a0abeba61e909ee90c1e433d834610bbbc3cba4989777e0511f8a08bab823c2544c5ee7b1c57992a40c3829fb8bc43e7d102e4d14ef990451f835eb5255c14\nTAG: 3e52fd15c88ae6b348c5097fbf9aa9185a3c141e9ce6e541\nTAG_LEN: 20\n\n# DIGEST: a09f0450fec556fbb3a1f869c9780c3d12547311\nKEY: 79a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a73\nCT: 7512a3cae0bfc465c4d9ea0456ea81065b0903d57498f148b5b183c25b0cfcdf005d331c01c14df2990220940bda53515fd055ce885d197b0eb7c66daf15c1d60ac88ba4f8d0f38df81041a1be3a54e500b5e24ba3818361f2594322b12f3fadb67be436b590a30209619bf8e288b86e24ed702a4c351dd441f048568521c6c1c77f97b1e12317bc83a2469c244be18b2962ebd250ea520609fb3ad24ff562a65ab01eb6ffafeee625090c9d2196afd8666c260117280d369a083892cd8efae9e986c925e02108f013a332f4a8bedc7ebdfae2ad2669b694ed7f1870dcb08e69cce507648665498bd572df38b691ebba62726db33f13f84d831669d3a825f10da1d557a40bee0de82546dfc28e30b6a1042d7d9874799f62596a827f7f9675977946e829ef7bdea5e7aa3c0b386c50dbe73fbf8e28c21e935045ad6d8125af3905550b8780e1147bf54db77c2de58cff48601e9f720ee686443c22691fb8bd6ce6769626e7152b551c3c1df01c7f8b41d383c782a1c9fe4d370c49e1df71de1b62a7626dd485502476473c5e32a9fc420e6693ce80152613e37b73041834d0900f5258a5181801f41384e2a73b5d61e2cd442073ee1ef22a366f67f3eb655cd6d5891aaf7192e651eb5ccc0fea3c12f2f0255a62d1709cf785f524e0339911dbe33c342f0c\nTAG: 88c400d376ca7ebe9b117006329af96d21c9cdb240de73731b1d6c\nTAG_LEN: 20\n\n# DIGEST: 32559b69ebdbf4f1fe7c6e5ada9a4117836eaf4e\nKEY: 0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c\nCT: 0cb288e69981e771486fa83463c402cf6dccfe4b913ac4cba832933d3596c67d7b5ae39a123dc3ccb12942b78d2229841996ebcf3bcf508ab909d714eacdfb6d635a8a925ce15e7c8b13b4c821937114eadfc23e240ca06a001a118cd9b9894616f1eec3a2bedeb88c3bd0fc9548c42c9b7a9ca710f94fd9d638b7adcd758c9fe27afa89106f81653f0722f41bf9560296bd0492d8e084e83474e77632c11a89fc3960cd75e3d0e704cec1c4f53caf468f49364ade315f83a836d54f259d3dbbcdc9a9adae1181261b0ac5aa3a6e7e3d7e78f2cec0afa64185d548ce45ef620dec97ca51dde09052789e896e07859468bcc0dd5b007bdb73942677241360c2ecb4d75700fb1de196a6dbfa778200605de9ee0a8683fc6e89f19ba852db7359cc7d42803fec50b5d123b73c6383aeeff387544122fa64ed7b15d23cb43bba9a9ca8e58a2e28f555d970f7c83fe396d4c2c207fba13512bc60868361369896778744e41a82e874b2f51277c6a5b1d3e5052c87cf58b05425b396fde61fd92b480a6fb5b3052183c880a9fa04dcd2082753bb748125695f6df801d9bd4803fc3d5e76599db0b91bf76c9f4186f76a4f919df7376bf314814b28012483717d357da61492940ab3bbfd0091d19899bacc5bd0fba72ea4005a55dd99f0e9be91256b93239aadf66c4d803e5d32\nTAG: 0c36b6205a04ba2c348c86ac1c5dd66881e3bb6b369a\nTAG_LEN: 20\n\n# DIGEST: bcdc01526c7b0248abf3a41ac893bb72adf422eb\nKEY: 8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd5\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253be", "e6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e\nCT: efb869db3a0ba8e9c1d4a0ef6404bcc10eaf089340ae938e87f1d17d3b7e3ff65c4ff6972c6f404e6d71b5dcb90fee0c9baffdf26de5a4c01220321babcaae4ed55f8766d70c14b58abd1826b90a121e5b9d13d8a41101ed5b8a3b73a4c6cfec8ff46946c5414bb5ba70b615d19be6181e52e0ed6d1ac9cf4bbbb29d67a213a7cf07af21743f0e107ae580a924c43b9a8120373619de0b8996d675d90a1aa9d17aabe9a85997372d4d2b1a1ef6055fe3339fcdc8256fb2f085898d83b609dfa6ad79b3ba260892563a00a1b1f5af69b94cd500449f20abda617250cdd7615cec3f1d75d4a66ca7c9ac8822e945c7ce30be6e6d0897c2faba38141c4aa4684f0cf890ce4c57660a166e32c6e0b7fe9981eff7a9025f9318e142c9fc71a7b52f3646e7ba41fe8c9a20d0b25c8b6f3827bc067d6f6962ad4faac0aecffe54a1f37d20ba08b7bc648551fcb93cbedc728bebee5189c80e715d3b8df3e5a891b0fc555921e2af871b01356c2c049361df495691b9383fc1f2ba55f023e8d1f4649ada0de9bb02764890f2f1efe9e11f131abdc35f1aec108aa532eb54060a77777384476a994aa156d452ce2a6f2eb92b3bbe63f84dbc5385bfcb3331b4f4df3b8bb2d94b22029090bd9c0b6dd41084beeebad804f133b3317d5529b237adf8cf463da32dba799c255ca3f157dbb1dc4588\nTAG: bfa1bb6571ea7450159ea6b00ec46d57c3117ba4b6879008fe\nTAG_LEN: 20\n\n", }; -static const size_t kLen18 = 378062; +static const size_t kLen19 = 378062; -static const char *kData19[] = { +static const char *kData20[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher 3des -mac sha1 -implicit-iv\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: 144c98ca1f\nTAG: 4a40ffe530b338e5173a8e62c8530b0c14b15046d12f2ca3158ad71effd0f46b29b3ae\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test with bad padding values.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e\nNONCE: \nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: 144c98ca1f\nTAG: 4a40ffe530b338e5173a8e62c8530b0c14b1508045d58f4bdae400\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with no padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421efafca4455b5af6174cb0e6f929031086aa7b85a073705fa3718a2a9b595e32a725ccb0b3328ea913edf6a42dad4c44585fbbb9a500b0c938c78d4fa17b2e52b479aba6921b376bec72ff6d66a5854180afedb8edb06c919016d19f252ab39d05c3c4f297038badb09ad7f23c88d5cdba7e793f1e4f2d107571eb9807efb3009187e1415e5d0d3c6110ff77f26da9605955843b9cc60875e60c3181ed0da4e5ad390e1d3c0fb942b618d1015716c4606030a40f0a554c4929764da415d773d386b3bb018a4ce72e85f28cfa3e08f0659464c0e0cf3215996c6a769894023e4fbd5377f387bd914c1d64db1ee5f88627b59\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: f0f82752a691ef5866413f2b2e5c1d0ebb41ccc8\nKEY: 7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9\nNONCE: \nIN: \nAD: 936a91d0b5d2c0267218cb\nCT: \nTAG: ecd3c8f44675494e8815d0b2d8bcc125612d9ed52657c54c6c2cbbbfe3aa21a0ba23efb64cadbf6a81f0ad53d21bb5b536b10bd2173fe415b8623e24d4dea3db4305c847709b8c489a5d14ae35935e7143f4681798e30cec3dd97b304391d440a4d50f558cf9555faeff343612471935f5e4fbe25776739d7e36e36cd35bffe8c3b582a856cb9175b240338e4de9aa993add7c3d9c0f55aef162ede99acecd45dffa501cd44378f18c0bb9f21541ca639087a208f0a3926bf73766c2b77c50d8dba9ec0374688b733f0abe376387bf02e07089a9a58654fd1957b23758795b6ab9ae20e9ae45d032b99c200dfb9b92af0a7e8ca58fca1a0c2a964df39b1ca348\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82fffa4ca54c3a0ffd6e6fff942e7ec33d0d9e6ab8c9ae4b1ef0423b7f7ad15be0b8553a4bd66e7534a3f357071ec070341241592d5865585b277d2f60e220087b1d943a35cf2a72ea91ca1c57f481663cfb4608f23ab8a452a9b4a92b4f34010a7f74e607e2c0751404afd722fe989227915d260720cb3d80c02ea6ed190b832c1bd06037de68b55f9b0d2cc452378f1cd8d3c77665597441b4c0c38fb7f152ff1abacd61de5b25b494e752685e907f3e9112befbfdb722e7fa77b27bf9d8622d3545380938f9f0ab3a71bc3b97ba9033361d20605ebe1af42aabbf4c1dd0bd26e9cb9c21384ede090e23f41cb340291c471efdf1a9d86f4a9443adeae2e1573f7\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f97a5f38e6e3413efdef26233be485092b7a543065c741dc557d9fa7a796edda67a93bfe4edce2d1c525f19d5f3575e81a9b3900e4ba9c58d41e1ec10cd6ed617dd17d7b7a3c49164cd2b37b2d1df52f2b805b3f28dbb1f43adb8e1eb72b1d2b3ac51e96d60622657406dbc3fad9d34535a760fea0955811518b60cc164d46dfb7043e6faf4d29ace04fdbe5a7a559fa1e01e52e2b69009441c1efab68cdefd4eeb1695d882cde48f6c591fdb9ca4225b6d9beb90aba7725fcdf1ee118c1543549f1dbb2b165596bbbefb36b6b849d6495b8f59a22182f594ae273c3934d42d7c5ed300dd0cf5b25ba6d703d4391d8381b2471d4a04685a1e8fefd934de35b001\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f5092a16f7df9a7114296b5902b1f07030cdf3da0211fd57971f07c765f0210c98ff2639bfd44292b2b7f7fd711a6d026965abbec67a9dd1632781a447de10432499d0c59e645b15be76ffffed3a434b5ea50512c15938f63a57fa0383b9158cb3151215b924a8cab60ee1ad486dd2fe4077e3bbd050c7df52e2e494618dafd5e0b4d7cefea7bae185615b72d51326e2cd4ac10405c1855a500750e4d3ce5591aeb5acce164474cfdecc97ead9562940f9729bfa1415c6b439d53bccd43acb54de78b4777418ff6cbfe8fae10d748b519f589b55bf7b472f3eeb1c576dbbcd17597806fbc6d996bfd0fa0d42ab021be068664a6e44095b51346609295efaad9ee\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82fcc48172be151a13a6999f4f5c476f40968887568c3201e8260d59e3a3b58643195c32c9d49ca9deeb40ecae4afd3b3464c7b175ca26ecae12cce7ffa3b9a2d5b4f73083d4d4c8188bbbd65d7e95aa269cd4ce4488fb136d115cba8f3fbd42122e848b26a8717d4da46854ad45d62700ade577503e790670b1aebf87afe9d1438fb3fdaa029f93f53422bc368b9344d0be16e67deb9cafde9492f39601a87199863277eb36aeaceca693549b23254fb80f7512ea36c896b70f41ec3a515b220cf0b053480182d5fc8e6ae7cee4f781186b9d8c50ca82e848dcce420a2b861b970a1915d6393e9e57479dc464f1e3f3761c54fbfe087491adede031a2833229bc1\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f5b571bf3981be2300d5412ed491b112dcc74e9dd8fe8558efe0d167efb1e9c5808b7de72db6c853b9845201707717795255de40f3bf8d5dab2b6be53b937f7bb67ec8b23205a166802a3641e0b2eea459baff12e6eda2b2d064d5d30c33e80ce6e467fad6d34eb89e2b996a9ef737b4e2067a583750497eb4b32285bf9fcb8590a629a9d186e9eb17265298a485dedc609a43bf1b0ec5f4ee55304164bd180625e518aa013763be1a94736b56844c9c31266e0e721", "7c324f13e7ce0950d5961ca40762e45f42e080eed79521c124e0d96dfc43964413622dc893a845e16bbb9a681397a42747a9085eca7cac43778ab01acc71676991abbea0e7734ee6784e7d\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f5a172605f496e4ffacb111b8b5482636b093d29285fed444069c9555cc3ef6c67441aad437c94e39f5d3a541de0418f207eadaffe0149ec779eabbb9ad3c35ead995603aeb18bfa1321363bfda10cf0922598d74a5a83be08e9142fb614d33cf8306ca6519c353370ec2c9a68d37f50e852afc190294f8d9af7918ecfce38616eb5ca70cf3710da6f8d224f9d961a59e444aa484ef3d79ce8d8f5d0f0fdf026527f5ef4df2767cc94b97ea442b5b5c4e6eef6d236488b5ba07801f6e425f580738722f065cf2a6e8f5534a0c2e7843ecc510b82955d83e5f4a2864638d0f42041cc16499f42321e05af94c7cb075eb0315f1c3cef99ee88e7388a22eff3a7a44\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82ff2d2004cca0722013e6808ed9bc99b0c4a80991525fea38db2b37fed5ed8632c969deb474122360b1ee810e47117cc1f8286aa8bdce347cbdade770f337deb84d2d0b55bf99a9d2b1bcb929e1391e1b601441145316e8e7663795b581b8807b2bc70a2709337e2480a5c6a3933e0634cb5d5c0376a8c7f05860f66a196ac71bf2b158c9a2f3e6635396de344c58d422a8ac86fab38f28eb908980a012532839e2af2b6984c59eea0c0f49dabf617988e6e8f96931bed6aa1519387bad1fe1a0e1a1b42351d6479aa96fbec4e3f6cddfca229b89b680c22e11869101df2095b24b5b33051a21125d6702fafc4e5d1196a9723a343946473a89ccd2e24b15b1d31\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f7300822f214448a904ccce467c43825a828a1f89dc9841aed04d06f22394a81a8250ed3080d52a096325a3e28f55c93b32296f7393905c99011154f7fcbd9d3b24108687e291eacb5f54e1edc9eb91305b6c3b97d5f4817a294979fd4d9bab2e9262fe59a464da24e8c7a4d5fdeaa4c01633d537f863f798a247f2682cf1066041c63f2490ac903118b54ed11d66071b0bb050296be27c96b0f07e64ef7154055b67ff0bc9c7fd6909e23e6cad9d2aaa57a7eee5b12dbd9d26de530f2d37dd0c1863568b1fac3bcea411d1464ca8a44172e7eb719930db001a0d9c1b2be3502986e635374fdb54d7a68f213599e057f6e1efa20d3d423db993d7a66bad349d90\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129cc6cfd68eaef7096800257ec20a080188f2190804aa0c48221422ab3cc20f687b5945cf0b95de2b60411746cb20353911ba96934973b2ecbbe781fe91931b6521bd212b7bca681d261fc702adf8ac6eb81eed22dd1d76b71ef6fb91a82aebb6eafa0bed1207bf7f27d7864182c89aaf7de10045ce964ae7721df433698b3b0c957d5c65739375d699087bb26474fa50efc8455931513e040e04a49c6ce5b3cce36fc36ad9ffde2040c1e50602d39382d1ddbc10ef74b19022f96384d8e3f9963db95e5c75b4a5f050a658d25489e5ae51b1df7bdcb060eb49c9f7be73b15a54c7ffdcb7799c4b999b4a9a80fd98b8f87572ee3607324ccfb\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129ec5f9e459a831e5fc0c8fc19c7da28f638f8cd35f59c6436707cd742818493dcba9576d26ef484e7a86309dce93127e795601aec1c2f445ad93e95a8b2e50b16b63cbf802288ac64d89df9612662a009b7fd563491d744f6483c2c683e02966c509a1d3ebec71014a4bcb705f1ee849d7e81bc0e003ef2052f61820787f3fd80467de1adb3511c15a2fc32f935c81bd3eb5e909ab875bf793ce7ab549ea5eabf31a90eb51a533790e2956437221bf8fda72c79ef0f9ff9d010adc0452a679f786ed06e8a76845ef1ad2a2ae74c0bad5c16b43013ad675b4b14879311f0be9cb5c376b40d761cb73c6fcf0e98219efbdfabafdd81dd1b8def\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129fbb04f98a0935e7ab3705d26e0eb67478a01e7d9f5b438130d4dacc02200fbd3daf1ead6cdcf635070bfd51adfc13e11b49928d1941cd040938676652e26cec8151d99b41a7b33b2e88bfb9f7df417527c36a374de95c9fe49e72342e6cd593e3d2a07473e1031fa370e0fc21e8e66fa2da83be78498a4ed80d7252b79419392ef9b7abffa81b3b262bffd33644aa1de8b4ceab86c43ead92b5ea47dc1925a08b0604fddc2afeb5bdc5cad76820e8162e65ce9eabd387a843c7023f8d48542845b26390a8de80086444712767e1ec94df27f1c79b04f3c1e266be29f983fbfe060168a21fef35dbbb49213d4836eaceaae02fb5ef74d133e\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f1294d5a43724866710b205e90abf4c79e27b695b9bbf3e6448dfc7209a75acc30888ef1c476f1f3e58828690d7ed0edc79e009847d7c5b55359a3a614727c802116b63dff0f17b66815ff79bb6471f8adcbb47791f09c4a4d4cc217baa987506c4b209dc34e9e76218ce8be27982b3176f82642a4ae4fd652d56917366314b63d149827cb560403b9da9760389318a8ca0e3360aebbfb6d73416f9aec61cefc6027299d4babac671b6f1b14472cca56a2fb72a922418d9706a980c139b7291bf648189f0400247ad758a213e936f6a9589414018f83b53a045f19554e8d57e3577d09b2d48e5e4b0f72792ae1030da5ba463e3e13f9bce65202\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f1299747276563ca0a14fc8039bfa3b8142a481e32af7ae8ad1b7996a12fc423ea9edb5b54169f944ae0be9670401d178700a880b13b025d903035fa1ff0d6aca681c3a0fb486816ded99b090a4e3e02fcc320834b9e3f48704c2eedf42e385db06b3a6cb4a917824c340e1d3f1f4e23445dbc159fad9a184b7692e42c011633f1ffc7d4a13fbc207d5a524321c9721e7323b9f3b44c11a170b88c09140cadb056247bf1194cbffe7f814ff4ed65e12fc495ff082b18ad695b110e5ffefb5babb14e6b67f3142d76178eb8fb1201d672457013c7a418c24d2a8a7a7468792c105387ba55a89a57c4509dd98914e9370bb464c67aaf21039196b0\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c617138", "6d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129a0aa04aa6f5001c4b81ff6178b687b310a5839e5b785baa7c21ac7a0827a3ff5df6a145cc33ef346d59dca09674659833f4ffe2ff0611baf5361a781621db8e4df54740a6e2fee4f8058f54d2bde252b9d3b82509b6bb267cf1cc3aa588eb3a71a57843f980d6f72a794fd8c3a3f6f5073965d731222046613999f43e47d1144f4f81973af9196cfb21e27bdd33610d282a7b710e40fdb43014e2f2b4e7fc0c9312a09d41ff87d698e28ce1dc327290aa145f9e24c709fda55c144d418e5cd4e2198e8f6670cab5ce20b80cf9e1081faddc26e1254ea1ede940f819abd27f6df49de76e39cf918eb9ce5c18a2bb958082905cd379636b3b8\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129ecd39f87baf0961d75cbb7b862b9111b266712e129f5cc2320ef8f47603b30e67e323d6a93732994140fd5152f7621b75857ccab0c8f95c1562dc671abe69565871bdc42153745125b1c205dbcaeb535fb994608c8f998aec2e49b8c7953ed0adbe34dde0e7f8445f20bf20282ce03391b0f5bbca37d38ab8f93b1b32e92d6c30ab782a1437ac3e1e175216aae74595b98cfbec8ed0341c25370c86815d68e3d7692a75ed487e7dc9b3dde45dcf0d37cad8fbb8f0df52b0af97e028646bfb7c0a3e967a49d2d0f8412272b416da2d20643776aed03c2089c6a8a12263118caa701cb2fb71efdad18595b089e3dd9a8494df17ae2d5e90311\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129c1d716c203b5fb64a76805a473c7ba4fc527e21bf4d049f898645f103dc6d0895fc383022d9474a6ffbc2404d5f4849fd6e1663f27ed114a2d696bd165af078a7319f748d16b433522a3248e474e88145331da4663dc665d6d82ae20ed0c57933d089efff5b42a01a7a96ae737ffcb6db4043392d16a0433a8a4ac59e2807bb47dcffe1173afe6ab1b51e9c0eebc2e5f4cb6a99fb03a450d75b514da9cd02847d0be55c448beaa359cbada849fc5618a3c93e471c228a84ea6d75d57975c555409a704c758388ec55e8e446046ca9cf90e0f89ef5891f9aba75db4e163d2e508ce098a9c146d8b913759c8a4eaf63edca37345bb350768f6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421ef3b87ea1d7abc315fe960893a0fc8c64e748f976907f46ee28cddd349068ee906f1e227d4e61dab0e56ad2c77056ab7abea02ec4f272e691c393c13f8c84dd33dd9f0577c60ba60cafff4c0995a011b53a9db5e7a7253c4f52cf419ab211a7bb5848cc0d0214d7e04a650172a010abb378efc38576bc8417bdbf3b07d6bca17a81f70280c6c9e71a1cd4d32fc3f7239dff76b0d9dba8b35e5e928369b487bbd0ae71edcf7dae262693cd8bea5c17b298a16ad2156db535cca82ec767974dbc37af39eca5cd92deada63493d3a7db57b5431c91a88d89f3f82931d749a8608eda1843f40ba0bfb5b5fb0c67df35c7bcae8\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421efb3364bec4d41a6981013ed7e07e776382d02a3f6f060d488b250ce580c60756e3c10df972122d33baa773ea1066622a9a3714ca8685bf796b11a46b8534cb2309f6fc0656544c3d7b4190e31a4258d5760560545b79cc8b0d5ee9e8bbe0deb15178c7d4c64b4f284dd70e254291e8e36aa2dc9f6deaeea13581259eede25c589fa8a19463fc22781543d33b45800359670ad825b05a82c2d683d00d93a027c0712f9edf2a36eaec7dc7fc12182f7a67aee50846429738d29f7aaf11d09a2bdd8363cd01bae9d15d949e27ce96c3a4f2b34296e1736fd67255a722486e02c9edf65ad422063715ca5c3fbb95409353124\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421ef2f4c94c53e857543dccb7859990090a1843caeac57cb755f7f92486eee4201a66818dbebc47a9e3135df4e0830a6c233eb1254e1d272c40057dfbfabfb07b838260bcce046d6faf71acf3a7e049bd7fea164b0cbc2809c3ad0752af027dc4f976d31c9aa05fc348f1c14a803b59c1c90856a2f32af78a89574badb056b16d856605ed0c217593b3cff969e6466b32c1119705e47085b6f9b2a76ce52831acccf3e9ea8651b3d520e6820a208e20a15c71427d29db3f0bf34066b53978c402a87d39dd972720fea895bc868247aeb90103098efdd27488ea83701a302b6afb8c97cce78b08d82c22343e403b89c2c14de\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421eff906afae2e433a5760fd55862cacc6d48a7dbafe28054dfb27dbdf143cc62c89d2f803aec795097fb15ef43eae56c292849499e401080ef1866345b3c4c9260d78a284bec85e7aa8e73d293009cbb204b119f2099b44eedb155dc269f0fac35a1b5c65ea0688bd4429bfe29907182070631d3f302b86520c02593b843d52dbdb2eb2504df4bc8d4ab4587c627604dc521c8538757ce8ab547ed509ca013f709bd99dc34a85808c4358465270c88c442079e8d0e38c745647b5a2efbde553662930f61bb6321124925f66d5263e1f7b1b2d995f7a0125775c0b11b40f717afe257cadd23b5fa9d2dd130d252e91bb2798\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421eff24819532092ec210db7f3ff075244a61fe0f5b39f33985ae99f7439960e297c947466b65ef94302e32055e84fc3a4182568df26736173a19672b6ee47819a534e20e2d0c5736b32d57628b4a09770e28fd28941ab1a21b4b8ad1eb8411acee9bebd8fd5104f7b4d0a1358ad814ab742f4051c82ee82974ccf570d23f87cec9558de8276e18fd34d74a9032b950080fa0ca4da66519026a581cb0237bdbfee747e2389635de3f98d0a6faf2b350f1b20bdcb2e73134ff5ed63416b440f439b551964bd7df0df4f99345bac2414fcef7a836005c1d3c7a89d1f4ff87022ddb81eafc3e09f8a3ff5107ae99398c2c4f014\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371e\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421ef71d70fb138ddc82dea24731c40c6753e55c14e36c580f0d0bbb83555db95eddb0c0f127463239f4e5295fffeabfd760be950750c5a840201bb0998bd61532248e31cc531490", @@ -772,9 +778,9 @@ "6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c2\nAD: 7f4372480974454879c41d\nCT: 98c951eccacf8dcba5b819312f0ed234ea1cc06abee5f70888558000c2857de7411feffdf379c187d327943c63ab697675557a62c68c13f48d3970531225d5fb6c1434a126cfd6ba80b8f6dda08b3e3629ed12f7bbb45f45148f8544f0a8eb70c849260916eb62baa1bd850e082ad69ca5817594e8f26f63a1909ff03f5696b7a52f146af246c0c6485ea5826c89471c04fd6c373e9d0fef06f4a7b01400962ebfa4ef4166dc895619864accfef9a4be874111cb333518b33a3a2565d032a2434931a16e000d01e35317338ddbc48317517367603697a225d81fc63fcc7d4b8463bbd24910b4972375a995e13baa148b644993b9a7bd706ae64da00f898599957e406c1ab15fd44b6e85b41d47ffaec8136a5dadab324cb0ce95c738a1f8d246af90d98a68b8ab7003d74aa29591b58ca7b2dc38f21f4cfbc04f2e239728e1350b0f074293a13970b264bee368ff98c6960a805346c19702983d3ddfb6306f24cc7f8224e553b0668180787e48ca8e5d851f84df71d5ce6fd7815d39d7e3941b8e0562af98e6e244216bf418d7ca2d9e29ecd3997573b2c4d92aea1a5a82f2272af1218b379ca40a28cc7ce09ad60028a5a6aac6ce145cc3936f89a5d34ba54aeec8d99f84ebf7367fa5fdc12def2294fd3fa3299ba1a59aacc0d7\nTAG: f65b77267d53b2dfc87a936ae08ef7a3f630176553\nTAG_LEN: 20\n\n# DIGEST: e654b4c78e1c0061eea2996fc126c9bfd41eb6d9\nKEY: 3b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f9823\nCT: 5a1c2b7a8d5bc74901521e1300567f30e2b7755f004ddcfd8fe64f471cbaec4bc6d445ea931bafe6ad78034d0ac1d3916f1e0405c2f2aa4b193c2cd599d34b86029840ad379b136aea5c2a74ea70e22e8c8d1e017a2f7d47f8ebac7b85087075c28d6d2846e357ce031abe09e03629a32cef0b205d631f36ec9a1c9c4e90a80900e01688c7298b99be65f204ebaf312364bfdf57d9e16b0142e879a47b9ae0e96fc62e90883624ee2dc110f3a83ab341f4558f360df399170bbae57cb2eb377a87aaed9755e8057d76609d447a33a8255450504b71439fc0d03e0fffb775019ebf921325b42ef56e1b454b5c87ba5daa1f0d0920e860eea43c913d417cd9e9b6676759a4e2c71b0180b432fe2aab4e4fcffb51b4198ffbedbfcdb4dd4e105847f5a5832e85744f34bf3b9929ffeb177ceb4c5e68585a3ff8fda6569921b3d093a2f1d77e710f78245eacd471af88da8ff8f268293845a9a8550ef34e2bbff9d6cf55b18987c71eb98803bac42b0e6c062015fafb754c6a75f927cac4a8adfcfa8ee05a3f115f1f90d734f78180aec2aa621fa7908d350b0cd8550895cf4b5c3cc75eb95fa574f9a91c1f5efa61f054bedd9267f10a08a21b19e63754de10a1bb0c4ffd8c5c08558882a2f98f1175920a71b981affffde44ae1c9281eee161c4c\nTAG: 28f3243632b13692a2f175644a0e192d8102dd9e2affc5c1\nTAG_LEN: 20\n\n# DIGEST: 654b8591c7f0506261713e9ce7a6fd24a6b9357e\nKEY: 61792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f03\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a7379a5\nCT: 62d0c56ae3e695bafc3cfa3c2d8b9d17ac8ff3b84ccac28d568c1ac84e1574ea06f31605caf86d4e809e39e9c275eed4a8f27eb00dc78e1c10dae719519d949dbc22e00d8644bc3806e54e6531864ae4cb5694002e2a3d7146b39b0b38acadbf1651401805f6394831c608b0478d496cc939b24aa3d3e6d445faceb798a69ae1308a593244645e242829f64f7945d0af8af0eeb6d391c69c2d5bf7b00e42092b36c23362bdd627af43ca7336d88cc36e95ede07b83afb54c8758678d19e0ea7956d8f26776b0f4b6b637c1152853651b6c130f436ffa2d4fd0c344e7583c5e56d6262f43767a1011d8398311dd6e3d7f9ea89d3eb3f6a1a9cb98905c0761fc5be1d83005fb9ca039b877c30b402743bdf0109ee5de42eef860be676a399a206c08dca8e757f059f7d9611137039b9053430e7d6406abcbf7aed645110aae84f758fcf0d225738cc7c90ace5d83eb9fe65d1e65efa4f6c9d808060cb0f72605e3d7c70e0d13d84689aa1e44aa4dcb152f230d456eb6cf520898bb249262d30c64fde02d6894f72ddff201e4bc41c5fc1f394f2620f764d40098292b04aee45e26812f3abf9a020b5215beb7938e2c121e809ab825d22a2d560bb9bde47572ecb891dd49b38f41af9649dfbdc83ab9bceb444bacdfca2fcbefd623364d4e255e2c0f3164ad92\nTAG: 42174887a9a11a8ac5d1d13e83f8502a3cb0310bbf46b24ff42e3d\nTAG_LEN: 20\n\n# DIGEST: 1eaad32c8d0cefaa5e2c503bb2185a73e6387fac\nKEY: 16430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb7\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c0f31\nCT: cc269c9aed42c9ba90c768710fa03985372a219f391327e438b1593af29aaf2b66cf8fd60f137d8ce8438a7bcbf7c1c7010c06636f191802daa26fe12ac1c1458baefb2a51fc7361b2d98311c2eaa27e046fffbb76fc855ac01a1321672658e394043367e89478a789d662c88e91642af53824097326d991abd62d1ab818452fc152aa1bd05032027fbb691886d9269937f7f57e214a2186a191b2249ba6fe79b69a94623d85ef0db6b5c2363627ea15a614e6ee42ce0a26a90faaa3ec45451c69c7d472d98b0376a95503b16c6f17eeeb42e0ad5c8775584819aa01309e6071e6b9494da6ddcf992ec6bfc81e0031d74353afa042abfe62fae02792bb6dcae82694cb651689e4039208bf677c90ed6245606cae81732d9d32043e5435f8c40cb76b55a03593dda1271aaccdbc24f18c9a881c77e1dca0e62bfd", "d36208ee94370b166d66203dfb90c8602dfb48159410840c669c47e7514bf91ef603834bc213173458a87909979b3b77aaa77262e1a634fcb40241818f544f9d207e91ca1f46f77c5c4f606398938f764080dda0978c6b76ce76830a15098870e72b5c9f4975b495d2c5d969688b555773601ad8c857ca8c38565674539fa71a8acadac5415b563f55811b0c010ca1e6793ad08e6c830a0ec2b385402fb8af3b6f0ea0b70b458667953207e4d44f1959\nTAG: ecd2bdb2e683ff8bc7d20482e698ce2b608032094cc2\nTAG_LEN: 20\n\n# DIGEST: 862c0517b3658e9b9cd27db608d49e24e9b4667d\nKEY: a058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe9d0cb746bbd55813\nNONCE: \nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e8b6e\nCT: def7eba4397065d05a7a1b742179c1d8eff65e7e4ac18bec49ed020a95497a58af4ce62679a36b77f95f72913c2a58184ea0c3b59b60784bdf63893a2a84f76ab2b6324a218361316971ebb1e2850b6c7baaf9130715580626bf298f60d862cc4b9c4f353a9e4c7536fd697ece9407eb8ad434c97e325cebd5aa0cf4a5342724f2950c8623aa3a5322f2e06a6b1d71a57b22a2f85ed1acacbeba192cb29ced37983e4231bb930c07f7266728c54e8fa9a0b7195975095fd714440e07d63aa87778061a361b4d44f0241a504089b738cdf3a6323b7a709d39637a2c61677c1f034214a4da6471a89425a5cc6040f37261b9a8e55589b2c24a01b4379dfe00ce758e9e617b6d15abcf0974be46d151c5d26e69c50d3fe68d1854b788d6a43e72a00b1602bb9e7557c4c298b99cccaa17fd950123d672978cd359e115eceb88480d59f5496a920949e09d0590283280d78df0ee068c475706701034b5b8686c60e2c4c4d4bafb2dd25c86293d472d195186f3fbaaaa000cf678295143aa290b011ec35e1eb2dcc6ad12593a934b60af7b570bc59569df2e99bf618aaa60e533265e2bfcfe3e01dd1620cd7d6df8b70726b5fa1191b0cdbe627f714744b2bf2abaddf800cc091ce5ee447f2a61ad36094743182ebbe236745bbeb27a946c8d8dba54dd3597fc4328bb3fa5f43371b531bb\nTAG: bcb4795a551fa0b1d147e2c8f70c31f20a60228963076b32bb\nTAG_LEN: 20\n\n", }; -static const size_t kLen19 = 379503; +static const size_t kLen20 = 379503; -static const char *kData20[] = { +static const char *kData21[] = { "# Generated by\n# go run make_legacy_aead_tests.go -cipher 3des -mac sha1\n#\n# Note: aead_test's input format splits the ciphertext and tag positions of the\n# sealed input. But these legacy AEADs are MAC-then-encrypt and so the 'TAG' may\n# also include padding. We write the byte length of the MAC to 'TAG_LEN' and\n# include the unencrypted MAC in the 'DIGEST' tag above # each test case.\n# each test case.\n\n# Test with non-minimal padding.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8e\nNONCE: d1c8e9ba2fd6773e\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: 144c98ca1f\nTAG: 4a40ffe530b338e5173a8e62c8530b0c14b15046d12f2ca3158ad71effd0f46b29b3ae\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test with bad padding values.\n# DIGEST: 7f3a0e20bde700d3c5596909282e5c3e764c99e7\nKEY: 86d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8e\nNONCE: d1c8e9ba2fd6773e\nIN: 936a91d0b5\nAD: d2c0267218cb7090c61713\nCT: 144c98ca1f\nTAG: 4a40ffe530b338e5173a8e62c8530b0c14b1508045d58f4bdae400\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with no padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test with maximal padding.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421efafca4455b5af6174cb0e6f929031086aa7b85a073705fa3718a2a9b595e32a725ccb0b3328ea913edf6a42dad4c44585fbbb9a500b0c938c78d4fa17b2e52b479aba6921b376bec72ff6d66a5854180afedb8edb06c919016d19f252ab39d05c3c4f297038badb09ad7f23c88d5cdba7e793f1e4f2d107571eb9807efb3009187e1415e5d0d3c6110ff77f26da9605955843b9cc60875e60c3181ed0da4e5ad390e1d3c0fb942b618d1015716c4606030a40f0a554c4929764da415d773d386b3bb018a4ce72e85f28cfa3e08f0659464c0e0cf3215996c6a769894023e4fbd5377f387bd914c1d64db1ee5f88627b59\nTAG_LEN: 20\nNO_SEAL: 01\n\n# Test if the unpadded input is too short for a MAC, but not publicly so.\n# DIGEST: f0f82752a691ef5866413f2b2e5c1d0ebb41ccc8\nKEY: 7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd8\nNONCE: 8503f78b8ed1c8e9\nIN: \nAD: 936a91d0b5d2c0267218cb\nCT: \nTAG: ecd3c8f44675494e8815d0b2d8bcc125612d9ed52657c54c6c2cbbbfe3aa21a0ba23efb64cadbf6a81f0ad53d21bb5b536b10bd2173fe415b8623e24d4dea3db4305c847709b8c489a5d14ae35935e7143f4681798e30cec3dd97b304391d440a4d50f558cf9555faeff343612471935f5e4fbe25776739d7e36e36cd35bffe8c3b582a856cb9175b240338e4de9aa993add7c3d9c0f55aef162ede99acecd45dffa501cd44378f18c0bb9f21541ca639087a208f0a3926bf73766c2b77c50d8dba9ec0374688b733f0abe376387bf02e07089a9a58654fd1957b23758795b6ab9ae20e9ae45d032b99c200dfb9b92af0a7e8ca58fca1a0c2a964df39b1ca348\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# Test that each byte of incorrect padding is noticed.\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82fffa4ca54c3a0ffd6e6fff942e7ec33d0d9e6ab8c9ae4b1ef0423b7f7ad15be0b8553a4bd66e7534a3f357071ec070341241592d5865585b277d2f60e220087b1d943a35cf2a72ea91ca1c57f481663cfb4608f23ab8a452a9b4a92b4f34010a7f74e607e2c0751404afd722fe989227915d260720cb3d80c02ea6ed190b832c1bd06037de68b55f9b0d2cc452378f1cd8d3c77665597441b4c0c38fb7f152ff1abacd61de5b25b494e752685e907f3e9112befbfdb722e7fa77b27bf9d8622d3545380938f9f0ab3a71bc3b97ba9033361d20605ebe1af42aabbf4c1dd0bd26e9cb9c21384ede090e23f41cb340291c471efdf1a9d86f4a9443adeae2e1573f7\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f97a5f38e6e3413efdef26233be485092b7a543065c741dc557d9fa7a796edda67a93bfe4edce2d1c525f19d5f3575e81a9b3900e4ba9c58d41e1ec10cd6ed617dd17d7b7a3c49164cd2b37b2d1df52f2b805b3f28dbb1f43adb8e1eb72b1d2b3ac51e96d60622657406dbc3fad9d34535a760fea0955811518b60cc164d46dfb7043e6faf4d29ace04fdbe5a7a559fa1e01e52e2b69009441c1efab68cdefd4eeb1695d882cde48f6c591fdb9ca4225b6d9beb90aba7725fcdf1ee118c1543549f1dbb2b165596bbbefb36b6b849d6495b8f59a22182f594ae273c3934d42d7c5ed300dd0cf5b25ba6d703d4391d8381b2471d4a04685a1e8fefd934de35b001\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f5092a16f7df9a7114296b5902b1f07030cdf3da0211fd57971f07c765f0210c98ff2639bfd44292b2b7f7fd711a6d026965abbec67a9dd1632781a447de10432499d0c59e645b15be76ffffed3a434b5ea50512c15938f63a57fa0383b9158cb3151215b924a8cab60ee1ad486dd2fe4077e3bbd050c7df52e2e494618dafd5e0b4d7cefea7bae185615b72d51326e2cd4ac10405c1855a500750e4d3ce5591aeb5acce164474cfdecc97ead9562940f9729bfa1415c6b439d53bccd43acb54de78b4777418ff6cbfe8fae10d748b519f589b55bf7b472f3eeb1c576dbbcd17597806fbc6d996bfd0fa0d42ab021be068664a6e44095b51346609295efaad9ee\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82fcc48172be151a13a6999f4f5c476f40968887568c3201e8260d59e3a3b58643195c32c9d49ca9deeb40ecae4afd3b3464c7b175ca26ecae12cce7ffa3b9a2d5b4f73083d4d4c8188bbbd65d7e95aa269cd4ce4488fb136d115cba8f3fbd42122e848b26a8717d4da46854ad45d62700ade577503e790670b1aebf87afe9d1438fb3fdaa029f93f53422bc368b9344d0be16e67deb9cafde9492f39601a87199863277eb36aeaceca693549b23254fb80f7512ea36c896b70f41ec3a515b220cf0b053480182d5fc8e6ae7cee4f781186b9d8c50ca82e848dcce420a2b861b970a1915d6393e9e57479dc464f1e3f3761c54fbfe087491adede031a2833229bc1\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f5b571bf3981be2300d5412ed491b112dcc74e9dd8fe8558efe0d167efb1e9c5808b7de72db6c853b9845201707717795255de40f3bf8d5dab2b6be53b937f7bb67ec8b23205a166802a3641e0b2eea459baff12e6eda2b2d064d5d30c33e80ce6e467fad6d34eb89e2b996a9ef737b4e2067a583750497eb4b32285bf9fcb8590a629a9d186e9eb17265298a485dedc609a43bf1b0ec5f4ee55304164bd180625e518aa013763be1a94736b56844c9c31266e0e7217c324f13e7ce0", "950d5961ca40762e45f42e080eed79521c124e0d96dfc43964413622dc893a845e16bbb9a681397a42747a9085eca7cac43778ab01acc71676991abbea0e7734ee6784e7d\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f5a172605f496e4ffacb111b8b5482636b093d29285fed444069c9555cc3ef6c67441aad437c94e39f5d3a541de0418f207eadaffe0149ec779eabbb9ad3c35ead995603aeb18bfa1321363bfda10cf0922598d74a5a83be08e9142fb614d33cf8306ca6519c353370ec2c9a68d37f50e852afc190294f8d9af7918ecfce38616eb5ca70cf3710da6f8d224f9d961a59e444aa484ef3d79ce8d8f5d0f0fdf026527f5ef4df2767cc94b97ea442b5b5c4e6eef6d236488b5ba07801f6e425f580738722f065cf2a6e8f5534a0c2e7843ecc510b82955d83e5f4a2864638d0f42041cc16499f42321e05af94c7cb075eb0315f1c3cef99ee88e7388a22eff3a7a44\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82ff2d2004cca0722013e6808ed9bc99b0c4a80991525fea38db2b37fed5ed8632c969deb474122360b1ee810e47117cc1f8286aa8bdce347cbdade770f337deb84d2d0b55bf99a9d2b1bcb929e1391e1b601441145316e8e7663795b581b8807b2bc70a2709337e2480a5c6a3933e0634cb5d5c0376a8c7f05860f66a196ac71bf2b158c9a2f3e6635396de344c58d422a8ac86fab38f28eb908980a012532839e2af2b6984c59eea0c0f49dabf617988e6e8f96931bed6aa1519387bad1fe1a0e1a1b42351d6479aa96fbec4e3f6cddfca229b89b680c22e11869101df2095b24b5b33051a21125d6702fafc4e5d1196a9723a343946473a89ccd2e24b15b1d31\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f7300822f214448a904ccce467c43825a828a1f89dc9841aed04d06f22394a81a8250ed3080d52a096325a3e28f55c93b32296f7393905c99011154f7fcbd9d3b24108687e291eacb5f54e1edc9eb91305b6c3b97d5f4817a294979fd4d9bab2e9262fe59a464da24e8c7a4d5fdeaa4c01633d537f863f798a247f2682cf1066041c63f2490ac903118b54ed11d66071b0bb050296be27c96b0f07e64ef7154055b67ff0bc9c7fd6909e23e6cad9d2aaa57a7eee5b12dbd9d26de530f2d37dd0c1863568b1fac3bcea411d1464ca8a44172e7eb719930db001a0d9c1b2be3502986e635374fdb54d7a68f213599e057f6e1efa20d3d423db993d7a66bad349d90\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129cc6cfd68eaef7096800257ec20a080188f2190804aa0c48221422ab3cc20f687b5945cf0b95de2b60411746cb20353911ba96934973b2ecbbe781fe91931b6521bd212b7bca681d261fc702adf8ac6eb81eed22dd1d76b71ef6fb91a82aebb6eafa0bed1207bf7f27d7864182c89aaf7de10045ce964ae7721df433698b3b0c957d5c65739375d699087bb26474fa50efc8455931513e040e04a49c6ce5b3cce36fc36ad9ffde2040c1e50602d39382d1ddbc10ef74b19022f96384d8e3f9963db95e5c75b4a5f050a658d25489e5ae51b1df7bdcb060eb49c9f7be73b15a54c7ffdcb7799c4b999b4a9a80fd98b8f87572ee3607324ccfb\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129ec5f9e459a831e5fc0c8fc19c7da28f638f8cd35f59c6436707cd742818493dcba9576d26ef484e7a86309dce93127e795601aec1c2f445ad93e95a8b2e50b16b63cbf802288ac64d89df9612662a009b7fd563491d744f6483c2c683e02966c509a1d3ebec71014a4bcb705f1ee849d7e81bc0e003ef2052f61820787f3fd80467de1adb3511c15a2fc32f935c81bd3eb5e909ab875bf793ce7ab549ea5eabf31a90eb51a533790e2956437221bf8fda72c79ef0f9ff9d010adc0452a679f786ed06e8a76845ef1ad2a2ae74c0bad5c16b43013ad675b4b14879311f0be9cb5c376b40d761cb73c6fcf0e98219efbdfabafdd81dd1b8def\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129fbb04f98a0935e7ab3705d26e0eb67478a01e7d9f5b438130d4dacc02200fbd3daf1ead6cdcf635070bfd51adfc13e11b49928d1941cd040938676652e26cec8151d99b41a7b33b2e88bfb9f7df417527c36a374de95c9fe49e72342e6cd593e3d2a07473e1031fa370e0fc21e8e66fa2da83be78498a4ed80d7252b79419392ef9b7abffa81b3b262bffd33644aa1de8b4ceab86c43ead92b5ea47dc1925a08b0604fddc2afeb5bdc5cad76820e8162e65ce9eabd387a843c7023f8d48542845b26390a8de80086444712767e1ec94df27f1c79b04f3c1e266be29f983fbfe060168a21fef35dbbb49213d4836eaceaae02fb5ef74d133e\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f1294d5a43724866710b205e90abf4c79e27b695b9bbf3e6448dfc7209a75acc30888ef1c476f1f3e58828690d7ed0edc79e009847d7c5b55359a3a614727c802116b63dff0f17b66815ff79bb6471f8adcbb47791f09c4a4d4cc217baa987506c4b209dc34e9e76218ce8be27982b3176f82642a4ae4fd652d56917366314b63d149827cb560403b9da9760389318a8ca0e3360aebbfb6d73416f9aec61cefc6027299d4babac671b6f1b14472cca56a2fb72a922418d9706a980c139b7291bf648189f0400247ad758a213e936f6a9589414018f83b53a045f19554e8d57e3577d09b2d48e5e4b0f72792ae1030da5ba463e3e13f9bce65202\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f1299747276563ca0a14fc8039bfa3b8142a481e32af7ae8ad1b7996a12fc423ea9edb5b54169f944ae0be9670401d178700a880b13b025d903035fa1ff0d6aca681c3a0fb486816ded99b090a4e3e02fcc320834b9e3f48704c2eedf42e385db06b3a6cb4a917824c340e1d3f1f4e23445dbc159fad9a184b7692e42c011633f1ffc7d4a13fbc207d5a524321c9721e7323b9f3b44c11a170b88c09140cadb056247bf1194cbffe7f814ff4ed65e12fc495ff082b18ad695b110e5ffefb5babb14e6b67f3142d76178eb8fb1201d672457013c7a418c24d2a8a7a7468792c105387ba55a89a57c4509dd98914e9370bb464c67aaf21039196b0\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b6", "84e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129a0aa04aa6f5001c4b81ff6178b687b310a5839e5b785baa7c21ac7a0827a3ff5df6a145cc33ef346d59dca09674659833f4ffe2ff0611baf5361a781621db8e4df54740a6e2fee4f8058f54d2bde252b9d3b82509b6bb267cf1cc3aa588eb3a71a57843f980d6f72a794fd8c3a3f6f5073965d731222046613999f43e47d1144f4f81973af9196cfb21e27bdd33610d282a7b710e40fdb43014e2f2b4e7fc0c9312a09d41ff87d698e28ce1dc327290aa145f9e24c709fda55c144d418e5cd4e2198e8f6670cab5ce20b80cf9e1081faddc26e1254ea1ede940f819abd27f6df49de76e39cf918eb9ce5c18a2bb958082905cd379636b3b8\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129ecd39f87baf0961d75cbb7b862b9111b266712e129f5cc2320ef8f47603b30e67e323d6a93732994140fd5152f7621b75857ccab0c8f95c1562dc671abe69565871bdc42153745125b1c205dbcaeb535fb994608c8f998aec2e49b8c7953ed0adbe34dde0e7f8445f20bf20282ce03391b0f5bbca37d38ab8f93b1b32e92d6c30ab782a1437ac3e1e175216aae74595b98cfbec8ed0341c25370c86815d68e3d7692a75ed487e7dc9b3dde45dcf0d37cad8fbb8f0df52b0af97e028646bfb7c0a3e967a49d2d0f8412272b416da2d20643776aed03c2089c6a8a12263118caa701cb2fb71efdad18595b089e3dd9a8494df17ae2d5e90311\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f129c1d716c203b5fb64a76805a473c7ba4fc527e21bf4d049f898645f103dc6d0895fc383022d9474a6ffbc2404d5f4849fd6e1663f27ed114a2d696bd165af078a7319f748d16b433522a3248e474e88145331da4663dc665d6d82ae20ed0c57933d089efff5b42a01a7a96ae737ffcb6db4043392d16a0433a8a4ac59e2807bb47dcffe1173afe6ab1b51e9c0eebc2e5f4cb6a99fb03a450d75b514da9cd02847d0be55c448beaa359cbada849fc5618a3c93e471c228a84ea6d75d57975c555409a704c758388ec55e8e446046ca9cf90e0f89ef5891f9aba75db4e163d2e508ce098a9c146d8b913759c8a4eaf63edca37345bb350768f6\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421ef3b87ea1d7abc315fe960893a0fc8c64e748f976907f46ee28cddd349068ee906f1e227d4e61dab0e56ad2c77056ab7abea02ec4f272e691c393c13f8c84dd33dd9f0577c60ba60cafff4c0995a011b53a9db5e7a7253c4f52cf419ab211a7bb5848cc0d0214d7e04a650172a010abb378efc38576bc8417bdbf3b07d6bca17a81f70280c6c9e71a1cd4d32fc3f7239dff76b0d9dba8b35e5e928369b487bbd0ae71edcf7dae262693cd8bea5c17b298a16ad2156db535cca82ec767974dbc37af39eca5cd92deada63493d3a7db57b5431c91a88d89f3f82931d749a8608eda1843f40ba0bfb5b5fb0c67df35c7bcae8\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421efb3364bec4d41a6981013ed7e07e776382d02a3f6f060d488b250ce580c60756e3c10df972122d33baa773ea1066622a9a3714ca8685bf796b11a46b8534cb2309f6fc0656544c3d7b4190e31a4258d5760560545b79cc8b0d5ee9e8bbe0deb15178c7d4c64b4f284dd70e254291e8e36aa2dc9f6deaeea13581259eede25c589fa8a19463fc22781543d33b45800359670ad825b05a82c2d683d00d93a027c0712f9edf2a36eaec7dc7fc12182f7a67aee50846429738d29f7aaf11d09a2bdd8363cd01bae9d15d949e27ce96c3a4f2b34296e1736fd67255a722486e02c9edf65ad422063715ca5c3fbb95409353124\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421ef2f4c94c53e857543dccb7859990090a1843caeac57cb755f7f92486eee4201a66818dbebc47a9e3135df4e0830a6c233eb1254e1d272c40057dfbfabfb07b838260bcce046d6faf71acf3a7e049bd7fea164b0cbc2809c3ad0752af027dc4f976d31c9aa05fc348f1c14a803b59c1c90856a2f32af78a89574badb056b16d856605ed0c217593b3cff969e6466b32c1119705e47085b6f9b2a76ce52831acccf3e9ea8651b3d520e6820a208e20a15c71427d29db3f0bf34066b53978c402a87d39dd972720fea895bc868247aeb90103098efdd27488ea83701a302b6afb8c97cce78b08d82c22343e403b89c2c14de\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421eff906afae2e433a5760fd55862cacc6d48a7dbafe28054dfb27dbdf143cc62c89d2f803aec795097fb15ef43eae56c292849499e401080ef1866345b3c4c9260d78a284bec85e7aa8e73d293009cbb204b119f2099b44eedb155dc269f0fac35a1b5c65ea0688bd4429bfe29907182070631d3f302b86520c02593b843d52dbdb2eb2504df4bc8d4ab4587c627604dc521c8538757ce8ab547ed509ca013f709bd99dc34a85808c4358465270c88c442079e8d0e38c745647b5a2efbde553662930f61bb6321124925f66d5263e1f7b1b2d995f7a0125775c0b11b40f717afe257cadd23b5fa9d2dd130d252e91bb2798\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421eff24819532092ec210db7f3ff075244a61fe0f5b39f33985ae99f7439960e297c947466b65ef94302e32055e84fc3a4182568df26736173a19672b6ee47819a534e20e2d0c5736b32d57628b4a09770e28fd28941ab1a21b4b8ad1eb8411acee9bebd8fd5104f7b4d0a1358ad814ab742f4051c82ee82974ccf570d23f87cec9558de8276e18fd34d74a9032b950080fa0ca4da66519026a581cb0237bdbfee747e2389635de3f98d0a6faf2b350f1b20bdcb2e73134ff5ed63416b440f439b551964bd7df0df4f99345bac2414fcef7a836005c1d3c7a89d1f4ff87022ddb81eafc3e09f8a3ff5107ae99398c2c4f014\nTAG_LEN: 20\nNO_SEAL: 01\nFAILS: 01\n\n# DIGEST: c6105cc86e18eb8376c16ea37693db5c07b77137\nKEY: 8503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe47\nNONCE: 7e0cdd46be99371e\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c748\nAD: 1df3f4183aa23fd8d7efd8\nCT: 17944422f667bf1356c234189f9c6cf7af52b2832b2fbaa990ccef4e7f9bc3841e59e25c00e3686d5bd5c29f\nTAG: 3ebd1b0bee840e8a6e992421c62de5a8fda3a82f0af0de2c6be5f12937267befe9b421ef71d70fb138ddc82dea24731c40c6753e55c14e36c580f0d0bbb83555db95eddb0c0f127463239f4e5295fffeabfd760be950750c5a840201bb0998bd61532248e31cc531490201d88867c31b", @@ -823,9 +829,9 @@ "7797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c2\nAD: 7f4372480974454879c41d\nCT: 98c951eccacf8dcba5b819312f0ed234ea1cc06abee5f70888558000c2857de7411feffdf379c187d327943c63ab697675557a62c68c13f48d3970531225d5fb6c1434a126cfd6ba80b8f6dda08b3e3629ed12f7bbb45f45148f8544f0a8eb70c849260916eb62baa1bd850e082ad69ca5817594e8f26f63a1909ff03f5696b7a52f146af246c0c6485ea5826c89471c04fd6c373e9d0fef06f4a7b01400962ebfa4ef4166dc895619864accfef9a4be874111cb333518b33a3a2565d032a2434931a16e000d01e35317338ddbc48317517367603697a225d81fc63fcc7d4b8463bbd24910b4972375a995e13baa148b644993b9a7bd706ae64da00f898599957e406c1ab15fd44b6e85b41d47ffaec8136a5dadab324cb0ce95c738a1f8d246af90d98a68b8ab7003d74aa29591b58ca7b2dc38f21f4cfbc04f2e239728e1350b0f074293a13970b264bee368ff98c6960a805346c19702983d3ddfb6306f24cc7f8224e553b0668180787e48ca8e5d851f84df71d5ce6fd7815d39d7e3941b8e0562af98e6e244216bf418d7ca2d9e29ecd3997573b2c4d92aea1a5a82f2272af1218b379ca40a28cc7ce09ad60028a5a6aac6ce145cc3936f89a5d34ba54aeec8d99f84ebf7367fa5fdc12def2294fd3fa3299ba1a59aacc0d7\nTAG: f65b77267d53b2dfc87a936ae08ef7a3f630176553\nTAG_LEN: 20\n\n# DIGEST: e654b4c78e1c0061eea2996fc126c9bfd41eb6d9\nKEY: 3b5a7379a561792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825\nNONCE: 264e977045318c9b\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f43724809\nAD: 74454879c41de9ac9f9823\nCT: 5a1c2b7a8d5bc74901521e1300567f30e2b7755f004ddcfd8fe64f471cbaec4bc6d445ea931bafe6ad78034d0ac1d3916f1e0405c2f2aa4b193c2cd599d34b86029840ad379b136aea5c2a74ea70e22e8c8d1e017a2f7d47f8ebac7b85087075c28d6d2846e357ce031abe09e03629a32cef0b205d631f36ec9a1c9c4e90a80900e01688c7298b99be65f204ebaf312364bfdf57d9e16b0142e879a47b9ae0e96fc62e90883624ee2dc110f3a83ab341f4558f360df399170bbae57cb2eb377a87aaed9755e8057d76609d447a33a8255450504b71439fc0d03e0fffb775019ebf921325b42ef56e1b454b5c87ba5daa1f0d0920e860eea43c913d417cd9e9b6676759a4e2c71b0180b432fe2aab4e4fcffb51b4198ffbedbfcdb4dd4e105847f5a5832e85744f34bf3b9929ffeb177ceb4c5e68585a3ff8fda6569921b3d093a2f1d77e710f78245eacd471af88da8ff8f268293845a9a8550ef34e2bbff9d6cf55b18987c71eb98803bac42b0e6c062015fafb754c6a75f927cac4a8adfcfa8ee05a3f115f1f90d734f78180aec2aa621fa7908d350b0cd8550895cf4b5c3cc75eb95fa574f9a91c1f5efa61f054bedd9267f10a08a21b19e63754de10a1bb0c4ffd8c5c08558882a2f98f1175920a71b981affffde44ae1c9281eee161c4c\nTAG: 28f3243632b13692a2f175644a0e192d8102dd9e2affc5c1\nTAG_LEN: 20\n\n# DIGEST: 654b8591c7f0506261713e9ce7a6fd24a6b9357e\nKEY: 61792c0f3116430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045\nNONCE: 318c9b66262c0f03\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c4\nAD: 1de9ac9f98233b5a7379a5\nCT: 62d0c56ae3e695bafc3cfa3c2d8b9d17ac8ff3b84ccac28d568c1ac84e1574ea06f31605caf86d4e809e39e9c275eed4a8f27eb00dc78e1c10dae719519d949dbc22e00d8644bc3806e54e6531864ae4cb5694002e2a3d7146b39b0b38acadbf1651401805f6394831c608b0478d496cc939b24aa3d3e6d445faceb798a69ae1308a593244645e242829f64f7945d0af8af0eeb6d391c69c2d5bf7b00e42092b36c23362bdd627af43ca7336d88cc36e95ede07b83afb54c8758678d19e0ea7956d8f26776b0f4b6b637c1152853651b6c130f436ffa2d4fd0c344e7583c5e56d6262f43767a1011d8398311dd6e3d7f9ea89d3eb3f6a1a9cb98905c0761fc5be1d83005fb9ca039b877c30b402743bdf0109ee5de42eef860be676a399a206c08dca8e757f059f7d9611137039b9053430e7d6406abcbf7aed645110aae84f758fcf0d225738cc7c90ace5d83eb9fe65d1e65efa4f6c9d808060cb0f72605e3d7c70e0d13d84689aa1e44aa4dcb152f230d456eb6cf520898bb249262d30c64fde02d6894f72ddff201e4bc41c5fc1f394f2620f764d40098292b04aee45e26812f3abf9a020b5215beb7938e2c121e809ab825d22a2d560bb9bde47572ecb891dd49b38f41af9649dfbdc83ab9bceb444bacdfca2fcbefd623364d4e255e2c0f3164ad92\nTAG: 42174887a9a11a8ac5d1d13e83f8502a3cb0310bbf46b24ff42e3d\nTAG_LEN: 20\n\n# DIGEST: 1eaad32c8d0cefaa5e2c503bb2185a73e6387fac\nKEY: 16430e8b6ea058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b6626\nNONCE: 2c0f0368fe9d0cb7\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98\nAD: 233b5a7379a561792c0f31\nCT: cc269c9aed42c9ba90c768710fa03985372a219f391327e438b1593af29aaf2b66cf8fd60f137d8ce8438a7bcbf7c1c7010c06636f191802daa26fe12ac1c1458baefb2a51fc7361b2d98311c2eaa27e046fffbb76fc855ac01a1321672658e394043367e89478a789d662c88e91642af53824097326d991abd62d1ab818452fc152aa1bd05032027fbb691886d9269937f7f57e214a2186a191b2249ba6fe79b69a94623d85ef0db6b5c2363627ea15a614e6ee42ce0a26a90faaa3ec45451c69c7d472d98b0376a95503b16c6f17eeeb42e0ad5c8775584819aa01309e6071e6b9494da6ddcf992ec6bfc81e0031d74353afa042abfe62fae02792bb6dcae82694cb651689e4039208bf677c90ed6245606cae81732d9d32043e5435f8c40cb76b55a03593dda1271aaccdbc24f18c9a881c77e1dca0e62bfdd36208ee94370", "b166d66203dfb90c8602dfb48159410840c669c47e7514bf91ef603834bc213173458a87909979b3b77aaa77262e1a634fcb40241818f544f9d207e91ca1f46f77c5c4f606398938f764080dda0978c6b76ce76830a15098870e72b5c9f4975b495d2c5d969688b555773601ad8c857ca8c38565674539fa71a8acadac5415b563f55811b0c010ca1e6793ad08e6c830a0ec2b385402fb8af3b6f0ea0b70b458667953207e4d44f1959\nTAG: ecd2bdb2e683ff8bc7d20482e698ce2b608032094cc2\nTAG_LEN: 20\n\n# DIGEST: 862c0517b3658e9b9cd27db608d49e24e9b4667d\nKEY: a058c4799eea80abde04ee1de13e937af8f1a6944f44d722271233a825264e977045318c9b66262c0f0368fe\nNONCE: 9d0cb746bbd55813\nIN: 936a91d0b5d2c0267218cb7090c6171386d641b87797b684e0fb56f97c3961d8afa22993a340b9b3c589c7481df3f4183aa23fd8d7efd88503f78b8ed1c8e9ba2fd6773e0d0c302a5f47e037446f5891d77df660ed82933f62be8dc55b436965aabe477e0cdd46be99371eb8da7dac997deafd64b1fc65de39f4f03541a11be112a72933c7b54ed4fad0be905d41203f5dce998f8fb2eaad409ae02116417dae0cef457b9e5e16dcc5b6f25607f00d033fb95fb09e4d00d6172e780ab8b700433a957a741c9eb80f2b021b1444769da00fcfab0f5f93b511060c9c5f3aacefe61b184ad2463939ed518ce97c3fdd293d72afc09ffdd4f41963249cd299b92e55ca24d8c078c49f78c7e713710a025cb8b9d71d2989ab33e978c4451e3be585a29a2af12feef71e1063b0b4e6e899200304bd3508132a027d1ff4c047b3ef4f57a74706de4b381c692ef164101b89b476f72b27f06f520c9267cf71408a41729bacb5877e72cdfcfa76aed06707a07c3dab699719fe882eee2fee55ed8b11534c870dc695b814bdf1a87bb1052c6755a7a116bfc9095da49db3d71f4b975c5d503f478b22dc8253bee6fd1b174c307f01be95abaa9bee5857772305daa4b550d75f05d8089850fea3711265bf782610460bfd24ba022e6da12dd4c27f4372480974454879c41de9ac9f98233b5a7379\nAD: a561792c0f3116430e8b6e\nCT: def7eba4397065d05a7a1b742179c1d8eff65e7e4ac18bec49ed020a95497a58af4ce62679a36b77f95f72913c2a58184ea0c3b59b60784bdf63893a2a84f76ab2b6324a218361316971ebb1e2850b6c7baaf9130715580626bf298f60d862cc4b9c4f353a9e4c7536fd697ece9407eb8ad434c97e325cebd5aa0cf4a5342724f2950c8623aa3a5322f2e06a6b1d71a57b22a2f85ed1acacbeba192cb29ced37983e4231bb930c07f7266728c54e8fa9a0b7195975095fd714440e07d63aa87778061a361b4d44f0241a504089b738cdf3a6323b7a709d39637a2c61677c1f034214a4da6471a89425a5cc6040f37261b9a8e55589b2c24a01b4379dfe00ce758e9e617b6d15abcf0974be46d151c5d26e69c50d3fe68d1854b788d6a43e72a00b1602bb9e7557c4c298b99cccaa17fd950123d672978cd359e115eceb88480d59f5496a920949e09d0590283280d78df0ee068c475706701034b5b8686c60e2c4c4d4bafb2dd25c86293d472d195186f3fbaaaa000cf678295143aa290b011ec35e1eb2dcc6ad12593a934b60af7b570bc59569df2e99bf618aaa60e533265e2bfcfe3e01dd1620cd7d6df8b70726b5fa1191b0cdbe627f714744b2bf2abaddf800cc091ce5ee447f2a61ad36094743182ebbe236745bbeb27a946c8d8dba54dd3597fc4328bb3fa5f43371b531bb\nTAG: bcb4795a551fa0b1d147e2c8f70c31f20a60228963076b32bb\nTAG_LEN: 20\n\n", }; -static const size_t kLen20 = 379490; +static const size_t kLen21 = 379490; -static const char *kData21[] = { +static const char *kData22[] = { "# Generated by \"make_cavp -cipher=aes -extra-labels=Cipher=AES-128-CBC kat_aes/CBCGFSbox128.rsp kat_aes/CBCKeySbox128.rsp kat_aes/CBCVarKey128.rsp kat_aes/CBCVarTxt128.rsp\"\n\n# File 1: kat_aes/CBCGFSbox128.rsp\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: f34481ec3cc627bacd5dc3fb08f273e6\nCiphertext: 0336763e966d92595a567cc9ce537f5e\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 9798c4640bad75c7c3227db910174e72\nCiphertext: a9a1631bf4996954ebc093957b234589\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 96ab5c2ff612d9dfaae8c31f30c42168\nCiphertext: ff4f8391a6a40ca5b25d23bedd44a597\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 6a118a874519e64e9963798a503f1d35\nCiphertext: dc43be40be0e53712f7e2bf5ca707209\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: cb9fceec81286ca3e989bd979b0cb284\nCiphertext: 92beedab1895a94faa69b632e5cc47ce\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: b26aeb1874e47ca8358ff22378f09144\nCiphertext: 459264f4798f6a78bacb89c15ed3d601\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 58c8e00b2631686d54eab84b91f0aca1\nCiphertext: 08a4e2efec8a8e3312ca7460b9040bbf\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0336763e966d92595a567cc9ce537f5e\nPlaintext: f34481ec3cc627bacd5dc3fb08f273e6\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a9a1631bf4996954ebc093957b234589\nPlaintext: 9798c4640bad75c7c3227db910174e72\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ff4f8391a6a40ca5b25d23bedd44a597\nPlaintext: 96ab5c2ff612d9dfaae8c31f30c42168\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: dc43be40be0e53712f7e2bf5ca707209\nPlaintext: 6a118a874519e64e9963798a503f1d35\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 92beedab1895a94faa69b632e5cc47ce\nPlaintext: cb9fceec81286ca3e989bd979b0cb284\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 459264f4798f6a78bacb89c15ed3d601\nPlaintext: b26aeb1874e47ca8358ff22378f09144\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 08a4e2efec8a8e3312ca7460b9040bbf\nPlaintext: 58c8e00b2631686d54eab84b91f0aca1\n\n# File 2: kat_aes/CBCKeySbox128.rsp\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 10a58869d74be5a374cf867cfb473859\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6d251e6944b051e04eaa6fb4dbf78465\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: caea65cdbb75e9169ecd22ebe6e54675\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6e29201190152df4ee058139def610bb\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: a2e2fa9baf7d20822ca9f0542f764a41\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c3b44b95d9d2f25670eee9a0de099fa3\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: b6364ac4e1de1e285eaf144a2415f7a0\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5d9b05578fc944b3cf1ccf0e746cd581\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 64cf9c7abc50b888af65f49d521944b2\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f7efc89d5dba578104016ce5ad659c05\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 47d6742eefcc0465dc96355e851b64d9\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0306194f666d183624aa230a8b264ae7\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 3eb39790678c56bee34bbcdeccf6cdb5\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 858075d536d79ccee571f7d7204b1f67\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 64110a924f0743d500ccadae72c13427\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 35870c6a57e9e92314bcb8087cde72ce\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 18d8126516f8a12ab1a36d9f04d68e51\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6c68e9be5ec41e22c825b7c7affb4363\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: f530357968578480b398a3c251cd1093\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f5df39990fc688f1b07224cc03e86cea\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: da84367f325d42d601b4326964802e8e\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: bba071bcb470f8f6586e5d3add18bc66\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: e37b1c6aa2846f6fdb413f238b089f23\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 43c9f7e62f5d288bb27aa40ef8fe1ea8\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 6c002b682483e0cabcc731c253be5674\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3580d19cff44f1014a7c966a69059de5\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 143ae8ed6555aba96110ab58893a8ae1\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 806da864dd29d48deafbe764f8202aef\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: b69418a85332240dc82492353956ae0c\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a303d940ded8f0baff6f75414cac5243\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 71b5c08a1993e1362e4d0ce9b22b78d5\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c2dabd117f8a3ecabfbb11d12194d9d0\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: e234cdca2606b81f29408d5f6da21206\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: fff60a4740086b3b9c56195b98d91a7b\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 13237c49074a3da078dc1d828bb78c6f\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8146a08e2357f0caa30ca8c94d1a0544\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 3071a2a48fe6cbd04f1a129098e308f8\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4b98e06d356deb07ebb824e5713f7be3\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 90f42ec0f68385f2ffc5dfc03a654dce\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7a20a53d460fc9ce0423a7a0764c6cf2\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: febd9a24d8b65c1c787d50a4ed3619a9\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f4a70d8af877f9b02b4c40df57d45b17\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 10a58869d74be5a374cf867cfb473859\nIV: 00000000000000000000000000000000\nCiphertext: 6d251e6944b051e04eaa6fb4dbf78465\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: caea65cdbb75e9169ecd22ebe6e54675\nIV: 00000000000000000000000000000000\nCiphertext: 6e29201190152df4ee058139def610bb\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: a2e2fa9baf7d20822ca9f0542f764a41\nIV: 00000000000000000000000000000000\nCiphertext: c3b44b95d9d2f25670eee9a0de099fa3\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: b6364ac4e1de1e285eaf144a2415f7a0\nIV: 00000000000000000000000000000000\nCiphertext: 5d9b05578fc944b3cf1ccf0e746cd581\nPlaintext: 00000000000000000000000", "000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 64cf9c7abc50b888af65f49d521944b2\nIV: 00000000000000000000000000000000\nCiphertext: f7efc89d5dba578104016ce5ad659c05\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 47d6742eefcc0465dc96355e851b64d9\nIV: 00000000000000000000000000000000\nCiphertext: 0306194f666d183624aa230a8b264ae7\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 3eb39790678c56bee34bbcdeccf6cdb5\nIV: 00000000000000000000000000000000\nCiphertext: 858075d536d79ccee571f7d7204b1f67\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 64110a924f0743d500ccadae72c13427\nIV: 00000000000000000000000000000000\nCiphertext: 35870c6a57e9e92314bcb8087cde72ce\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 18d8126516f8a12ab1a36d9f04d68e51\nIV: 00000000000000000000000000000000\nCiphertext: 6c68e9be5ec41e22c825b7c7affb4363\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: f530357968578480b398a3c251cd1093\nIV: 00000000000000000000000000000000\nCiphertext: f5df39990fc688f1b07224cc03e86cea\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: da84367f325d42d601b4326964802e8e\nIV: 00000000000000000000000000000000\nCiphertext: bba071bcb470f8f6586e5d3add18bc66\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: e37b1c6aa2846f6fdb413f238b089f23\nIV: 00000000000000000000000000000000\nCiphertext: 43c9f7e62f5d288bb27aa40ef8fe1ea8\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 6c002b682483e0cabcc731c253be5674\nIV: 00000000000000000000000000000000\nCiphertext: 3580d19cff44f1014a7c966a69059de5\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 143ae8ed6555aba96110ab58893a8ae1\nIV: 00000000000000000000000000000000\nCiphertext: 806da864dd29d48deafbe764f8202aef\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: b69418a85332240dc82492353956ae0c\nIV: 00000000000000000000000000000000\nCiphertext: a303d940ded8f0baff6f75414cac5243\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 71b5c08a1993e1362e4d0ce9b22b78d5\nIV: 00000000000000000000000000000000\nCiphertext: c2dabd117f8a3ecabfbb11d12194d9d0\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: e234cdca2606b81f29408d5f6da21206\nIV: 00000000000000000000000000000000\nCiphertext: fff60a4740086b3b9c56195b98d91a7b\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 13237c49074a3da078dc1d828bb78c6f\nIV: 00000000000000000000000000000000\nCiphertext: 8146a08e2357f0caa30ca8c94d1a0544\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 3071a2a48fe6cbd04f1a129098e308f8\nIV: 00000000000000000000000000000000\nCiphertext: 4b98e06d356deb07ebb824e5713f7be3\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 90f42ec0f68385f2ffc5dfc03a654dce\nIV: 00000000000000000000000000000000\nCiphertext: 7a20a53d460fc9ce0423a7a0764c6cf2\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: febd9a24d8b65c1c787d50a4ed3619a9\nIV: 00000000000000000000000000000000\nCiphertext: f4a70d8af877f9b02b4c40df57d45b17\nPlaintext: 00000000000000000000000000000000\n\n# File 3: kat_aes/CBCVarKey128.rsp\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: 80000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0edd33d3c621e546455bd8ba1418bec8\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: c0000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4bc3f883450c113c64ca42e1112a9e87\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: e0000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 72a1da770f5d7ac4c9ef94d822affd97\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: f0000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 970014d634e2b7650777e8e84d03ccd8\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: f8000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f17e79aed0db7e279e955b5f493875a7\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fc000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9ed5a75136a940d0963da379db4af26a\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fe000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c4295f83465c7755e8fa364bac6a7ea5\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ff000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b1d758256b28fd850ad4944208cf1155\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ff800000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 42ffb34c743de4d88ca38011c990890b\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffc00000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9958f0ecea8b2172c0c1995f9182c0f3\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffe00000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 956d7798fac20f82a8823f984d06f7f5\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fff00000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a01bf44f2d16be928ca44aaf7b9b106b\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fff80000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b5f1a33e50d40d103764c76bd4c6b6f8\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffc0000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2637050c9fc0d4817e2d69de878aee8d\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffe0000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 113ecbe4a453269a0dd26069467fb5b5\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffff0000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 97d0754fe68f11b9e375d070a608c884\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffff8000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c6a0b3e998d05068a5399778405200b4\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffc000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: df556a33438db87bc41b1752c55e5e49\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffe000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 90fb128d3a1af6e548521bb962bf1f05\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffff000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 26298e9c1db517c215fadfb7d2a8d691\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffff800000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a6cb761d61f8292d0df393a279ad0380\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffc00000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 12acd89b13cd5f8726e34d44fd486108\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffe00000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 95b1703fc57ba09fe0c", "3580febdd7ed4\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffff00000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: de11722d893e9f9121c381becc1da59a\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffff80000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6d114ccb27bf391012e8974c546d9bf2\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffc0000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5ce37e17eb4646ecfac29b9cc38d9340\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffe0000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 18c1b6e2157122056d0243d8a165cddb\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffff0000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 99693e6a59d1366c74d823562d7e1431\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffff8000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6c7c64dc84a8bba758ed17eb025a57e3\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffc000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e17bc79f30eaab2fac2cbbe3458d687a\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffe000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1114bc2028009b923f0b01915ce5e7c4\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffff000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9c28524a16a1e1c1452971caa8d13476\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffff800000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ed62e16363638360fdd6ad62112794f0\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffc00000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5a8688f0b2a2c16224c161658ffd4044\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffe00000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 23f710842b9bb9c32f26648c786807ca\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffff00000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 44a98bf11e163f632c47ec6a49683a89\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffff80000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0f18aff94274696d9b61848bd50ac5e5\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffc0000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 82408571c3e2424540207f833b6dda69\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffe0000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 303ff996947f0c7d1f43c8f3027b9b75\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffff0000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7df4daf4ad29a3615a9b6ece5c99518a\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffff8000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c72954a48d0774db0b4971c526260415\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffc000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1df9b76112dc6531e07d2cfda04411f0\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffe000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8e4d8e699119e1fc87545a647fb1d34f\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffff000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e6c4807ae11f36f091c57d9fb68548d1\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffff800000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8ebf73aad49c82007f77a5c1ccec6ab4\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffc00000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4fb288cc2040049001d2c7585ad123fc\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffe00000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 04497110efb9dceb13e2b13fb4465564\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffff00000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 75550e6cb5a88e49634c9ab69eda0430\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffff80000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b6768473ce9843ea66a81405dd50b345\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffffc0000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: cb2f430383f9084e03a653571e065de6\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffffe0000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ff4e66c07bae3e79fb7d210847a3b0ba\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffff0000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7b90785125505fad59b13c186dd66ce3\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffff8000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8b527a6aebdaec9eaef8eda2cb7783e5\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffffc000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 43fdaf53ebbc9880c228617d6a9b548b\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffffe000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 53786104b9744b98f052c46f1c850d0b\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffffff000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b5ab3013dd1e61df06cbaf34ca2aee78\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffffff800000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7470469be9723030fdcc73a8cd4fbb10\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffffffc00000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a35a63f5343ebe9ef8167bcb48ad122e\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: ffffffffffffffe00000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: fd8687f0757a210e9fdf181204c30863\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffffff00000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7a181e84bd5457d26a88fbae96018fb0\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffffff80000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 653317b9362b6f9b9e1a580e68d494b5\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffffffc0000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 995c9dc0b689f03c45867b5faa5c18d1\n\nCipher: AES-128-CBC\nOperation: ENCRYPT\nKey: fffffffffffffffe0000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 77a4d96d56dda398b9aabecfc75729fd\n\nCipher: AES-128-C", @@ -842,9 +848,9 @@ "0000000000000000\nCiphertext: b87c921b91829ef3b13ca541ee1130a6\nPlaintext: ffffffffffffffffffff800000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2e65eb6b6ea383e109accce8326b0393\nPlaintext: ffffffffffffffffffffc00000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9ca547f7439edc3e255c0f4d49aa8990\nPlaintext: ffffffffffffffffffffe00000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a5e652614c9300f37816b1f9fd0c87f9\nPlaintext: fffffffffffffffffffff00000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 14954f0b4697776f44494fe458d814ed\nPlaintext: fffffffffffffffffffff80000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7c8d9ab6c2761723fe42f8bb506cbcf7\nPlaintext: fffffffffffffffffffffc0000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: db7e1932679fdd99742aab04aa0d5a80\nPlaintext: fffffffffffffffffffffe0000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4c6a1c83e568cd10f27c2d73ded19c28\nPlaintext: ffffffffffffffffffffff0000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 90ecbe6177e674c98de412413f7ac915\nPlaintext: ffffffffffffffffffffff8000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 90684a2ac55fe1ec2b8ebd5622520b73\nPlaintext: ffffffffffffffffffffffc000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7472f9a7988607ca79707795991035e6\nPlaintext: ffffffffffffffffffffffe000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 56aff089878bf3352f8df172a3ae47d8\nPlaintext: fffffffffffffffffffffff000000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 65c0526cbe40161b8019a2a3171abd23\nPlaintext: fffffffffffffffffffffff800000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 377be0be33b4e3e310b4aabda173f84f\nPlaintext: fffffffffffffffffffffffc00000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9402e9aa6f69de6504da8d20c4fcaa2f\nPlaintext: fffffffffffffffffffffffe00000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 123c1f4af313ad8c2ce648b2e71fb6e1\nPlaintext: ffffffffffffffffffffffff00000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1ffc626d30203dcdb0019fb80f726cf4\nPlaintext: ffffffffffffffffffffffff80000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 76da1fbe3a50728c50fd2e621b5ad885\nPlaintext: ffffffffffffffffffffffffc0000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 082eb8be35f442fb52668e16a591d1d6\nPlaintext: ffffffffffffffffffffffffe0000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e656f9ecf5fe27ec3e4a73d00c282fb3\nPlaintext: fffffffffffffffffffffffff0000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2ca8209d63274cd9a29bb74bcd77683a\nPlaintext: fffffffffffffffffffffffff8000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 79bf5dce14bb7dd73a8e3611de7ce026\nPlaintext: fffffffffffffffffffffffffc000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3c849939a5d29399f344c4a0eca8a576\nPlaintext: fffffffffffffffffffffffffe000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ed3c0a94d59bece98835da7aa4f07ca2\nPlaintext: ffffffffffffffffffffffffff000000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 63919ed4ce10196438b6ad09d99cd795\nPlaintext: ffffffffffffffffffffffffff800000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7678f3a833f19fea95f3c6029e2bc610\nPlaintext: ffffffffffffffffffffffffffc00000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3aa426831067d36b92be7c5f81c13c56\nPlaintext: ffffffffffffffffffffffffffe00000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9272e2d2cdd11050998c845077a30ea0\nPlaintext: fffffffffffffffffffffffffff00000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 088c4b53f5ec0ff814c19adae7f6246c\nPlaintext: fffffffffffffffffffffffffff80000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4010a5e401fdf0a0354ddbcc0d012b17\nPlaintext: fffffffffffffffffffffffffffc0000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a87a385736c0a6189bd6589bd8445a93\nPlaintext: fffffffffffffffffffffffffffe0000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 545f2b83d9616dccf60fa9830e9cd287\nPlaintext: ffffffffffffffffffffffffffff0000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4b706f7f92406352394037a6d4f4688d\nPlaintext: ffffffffffffffffffffffffffff8000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b7972b3941c44b90afa7b264bfba7387\nPlaintext: ffffffffffffffffffffffffffffc000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6f45732cf10881546f0fd23896d2bb60\nPlaintext: ffffffffffffffffffffffffffffe000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2e3579ca15af27f64b3c955a5bfc30ba\nPlaintext: fffffffffffffffffffffffffffff000\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 34a2c5a91ae2aec99b7d1b5fa6780447\nPlaintext: fffffffffffffffffffffffffffff800\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a4d6616bd04f87335b0e53351227a9ee\nPlaintext: fffffffffffffffffffffffffffffc00\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7f692b03945867d16179a8cefc83ea3f\nPlaintext: fffffffffffffffffffffffffffffe00\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3bd141ee84a0e6414a26e7a4f281f8a2\nPlaintext: ffffffffffffffffffffffffffffff00\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d17", "88f572d98b2b16ec5d5f3922b99bc\nPlaintext: ffffffffffffffffffffffffffffff80\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0833ff6f61d98a57b288e8c3586b85a6\nPlaintext: ffffffffffffffffffffffffffffffc0\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8568261797de176bf0b43becc6285afb\nPlaintext: ffffffffffffffffffffffffffffffe0\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f9b0fda0c4a898f5b9e6f661c4ce4d07\nPlaintext: fffffffffffffffffffffffffffffff0\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8ade895913685c67c5269f8aae42983e\nPlaintext: fffffffffffffffffffffffffffffff8\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 39bde67d5c8ed8a8b1c37eb8fa9f5ac0\nPlaintext: fffffffffffffffffffffffffffffffc\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5c005e72c1418c44f569f2ea33ba54f3\nPlaintext: fffffffffffffffffffffffffffffffe\n\nCipher: AES-128-CBC\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3f5b8cc9ea855a0afa7347d23e8d664e\nPlaintext: ffffffffffffffffffffffffffffffff\n\n", }; -static const size_t kLen21 = 116191; +static const size_t kLen22 = 116191; -static const char *kData22[] = { +static const char *kData23[] = { "# Generated by \"make_cavp -cipher=aes -extra-labels=Cipher=AES-128-CTR -swap-iv-plaintext kat_aes/CBCGFSbox128.rsp kat_aes/CBCKeySbox128.rsp kat_aes/CBCVarKey128.rsp kat_aes/CBCVarTxt128.rsp\"\n\n# File 1: kat_aes/CBCGFSbox128.rsp\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: f34481ec3cc627bacd5dc3fb08f273e6\nCiphertext: 0336763e966d92595a567cc9ce537f5e\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 9798c4640bad75c7c3227db910174e72\nCiphertext: a9a1631bf4996954ebc093957b234589\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 96ab5c2ff612d9dfaae8c31f30c42168\nCiphertext: ff4f8391a6a40ca5b25d23bedd44a597\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 6a118a874519e64e9963798a503f1d35\nCiphertext: dc43be40be0e53712f7e2bf5ca707209\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: cb9fceec81286ca3e989bd979b0cb284\nCiphertext: 92beedab1895a94faa69b632e5cc47ce\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: b26aeb1874e47ca8358ff22378f09144\nCiphertext: 459264f4798f6a78bacb89c15ed3d601\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 58c8e00b2631686d54eab84b91f0aca1\nCiphertext: 08a4e2efec8a8e3312ca7460b9040bbf\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0336763e966d92595a567cc9ce537f5e\nIV: f34481ec3cc627bacd5dc3fb08f273e6\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a9a1631bf4996954ebc093957b234589\nIV: 9798c4640bad75c7c3227db910174e72\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ff4f8391a6a40ca5b25d23bedd44a597\nIV: 96ab5c2ff612d9dfaae8c31f30c42168\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: dc43be40be0e53712f7e2bf5ca707209\nIV: 6a118a874519e64e9963798a503f1d35\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 92beedab1895a94faa69b632e5cc47ce\nIV: cb9fceec81286ca3e989bd979b0cb284\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 459264f4798f6a78bacb89c15ed3d601\nIV: b26aeb1874e47ca8358ff22378f09144\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 08a4e2efec8a8e3312ca7460b9040bbf\nIV: 58c8e00b2631686d54eab84b91f0aca1\n\n# File 2: kat_aes/CBCKeySbox128.rsp\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 10a58869d74be5a374cf867cfb473859\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6d251e6944b051e04eaa6fb4dbf78465\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: caea65cdbb75e9169ecd22ebe6e54675\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6e29201190152df4ee058139def610bb\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: a2e2fa9baf7d20822ca9f0542f764a41\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c3b44b95d9d2f25670eee9a0de099fa3\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: b6364ac4e1de1e285eaf144a2415f7a0\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5d9b05578fc944b3cf1ccf0e746cd581\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 64cf9c7abc50b888af65f49d521944b2\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f7efc89d5dba578104016ce5ad659c05\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 47d6742eefcc0465dc96355e851b64d9\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0306194f666d183624aa230a8b264ae7\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 3eb39790678c56bee34bbcdeccf6cdb5\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 858075d536d79ccee571f7d7204b1f67\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 64110a924f0743d500ccadae72c13427\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 35870c6a57e9e92314bcb8087cde72ce\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 18d8126516f8a12ab1a36d9f04d68e51\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6c68e9be5ec41e22c825b7c7affb4363\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: f530357968578480b398a3c251cd1093\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f5df39990fc688f1b07224cc03e86cea\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: da84367f325d42d601b4326964802e8e\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: bba071bcb470f8f6586e5d3add18bc66\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: e37b1c6aa2846f6fdb413f238b089f23\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 43c9f7e62f5d288bb27aa40ef8fe1ea8\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 6c002b682483e0cabcc731c253be5674\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3580d19cff44f1014a7c966a69059de5\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 143ae8ed6555aba96110ab58893a8ae1\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 806da864dd29d48deafbe764f8202aef\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: b69418a85332240dc82492353956ae0c\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a303d940ded8f0baff6f75414cac5243\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 71b5c08a1993e1362e4d0ce9b22b78d5\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c2dabd117f8a3ecabfbb11d12194d9d0\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: e234cdca2606b81f29408d5f6da21206\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: fff60a4740086b3b9c56195b98d91a7b\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 13237c49074a3da078dc1d828bb78c6f\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8146a08e2357f0caa30ca8c94d1a0544\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 3071a2a48fe6cbd04f1a129098e308f8\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4b98e06d356deb07ebb824e5713f7be3\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 90f42ec0f68385f2ffc5dfc03a654dce\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7a20a53d460fc9ce0423a7a0764c6cf2\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: febd9a24d8b65c1c787d50a4ed3619a9\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f4a70d8af877f9b02b4c40df57d45b17\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 10a58869d74be5a374cf867cfb473859\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6d251e6944b051e04eaa6fb4dbf78465\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: caea65cdbb75e9169ecd22ebe6e54675\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6e29201190152df4ee058139def610bb\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: a2e2fa9baf7d20822ca9f0542f764a41\nPlaintext: 00000000000000000000000000000000\nCiphertext: c3b44b95d9d2f25670eee9a0de099fa3\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: b6364ac4e1de1e285eaf144a2415f7a0\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5d9b05578fc944b3cf1ccf0e746cd581\nIV: 0000", "0000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 64cf9c7abc50b888af65f49d521944b2\nPlaintext: 00000000000000000000000000000000\nCiphertext: f7efc89d5dba578104016ce5ad659c05\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 47d6742eefcc0465dc96355e851b64d9\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0306194f666d183624aa230a8b264ae7\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 3eb39790678c56bee34bbcdeccf6cdb5\nPlaintext: 00000000000000000000000000000000\nCiphertext: 858075d536d79ccee571f7d7204b1f67\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 64110a924f0743d500ccadae72c13427\nPlaintext: 00000000000000000000000000000000\nCiphertext: 35870c6a57e9e92314bcb8087cde72ce\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 18d8126516f8a12ab1a36d9f04d68e51\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6c68e9be5ec41e22c825b7c7affb4363\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: f530357968578480b398a3c251cd1093\nPlaintext: 00000000000000000000000000000000\nCiphertext: f5df39990fc688f1b07224cc03e86cea\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: da84367f325d42d601b4326964802e8e\nPlaintext: 00000000000000000000000000000000\nCiphertext: bba071bcb470f8f6586e5d3add18bc66\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: e37b1c6aa2846f6fdb413f238b089f23\nPlaintext: 00000000000000000000000000000000\nCiphertext: 43c9f7e62f5d288bb27aa40ef8fe1ea8\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 6c002b682483e0cabcc731c253be5674\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3580d19cff44f1014a7c966a69059de5\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 143ae8ed6555aba96110ab58893a8ae1\nPlaintext: 00000000000000000000000000000000\nCiphertext: 806da864dd29d48deafbe764f8202aef\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: b69418a85332240dc82492353956ae0c\nPlaintext: 00000000000000000000000000000000\nCiphertext: a303d940ded8f0baff6f75414cac5243\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 71b5c08a1993e1362e4d0ce9b22b78d5\nPlaintext: 00000000000000000000000000000000\nCiphertext: c2dabd117f8a3ecabfbb11d12194d9d0\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: e234cdca2606b81f29408d5f6da21206\nPlaintext: 00000000000000000000000000000000\nCiphertext: fff60a4740086b3b9c56195b98d91a7b\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 13237c49074a3da078dc1d828bb78c6f\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8146a08e2357f0caa30ca8c94d1a0544\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 3071a2a48fe6cbd04f1a129098e308f8\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4b98e06d356deb07ebb824e5713f7be3\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 90f42ec0f68385f2ffc5dfc03a654dce\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7a20a53d460fc9ce0423a7a0764c6cf2\nIV: 00000000000000000000000000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: febd9a24d8b65c1c787d50a4ed3619a9\nPlaintext: 00000000000000000000000000000000\nCiphertext: f4a70d8af877f9b02b4c40df57d45b17\nIV: 00000000000000000000000000000000\n\n# File 3: kat_aes/CBCVarKey128.rsp\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: 80000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0edd33d3c621e546455bd8ba1418bec8\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: c0000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4bc3f883450c113c64ca42e1112a9e87\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: e0000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 72a1da770f5d7ac4c9ef94d822affd97\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: f0000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 970014d634e2b7650777e8e84d03ccd8\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: f8000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f17e79aed0db7e279e955b5f493875a7\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fc000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9ed5a75136a940d0963da379db4af26a\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fe000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c4295f83465c7755e8fa364bac6a7ea5\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ff000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b1d758256b28fd850ad4944208cf1155\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ff800000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 42ffb34c743de4d88ca38011c990890b\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffc00000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9958f0ecea8b2172c0c1995f9182c0f3\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffe00000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 956d7798fac20f82a8823f984d06f7f5\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fff00000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a01bf44f2d16be928ca44aaf7b9b106b\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fff80000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b5f1a33e50d40d103764c76bd4c6b6f8\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffc0000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2637050c9fc0d4817e2d69de878aee8d\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffe0000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 113ecbe4a453269a0dd26069467fb5b5\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffff0000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 97d0754fe68f11b9e375d070a608c884\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffff8000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c6a0b3e998d05068a5399778405200b4\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffc000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: df556a33438db87bc41b1752c55e5e49\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffe000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 90fb128d3a1af6e548521bb962bf1f05\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffff000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 26298e9c1db517c215fadfb7d2a8d691\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffff800000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a6cb761d61f8292d0df393a279ad0380\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffc00000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 12acd89b13cd5f8726e34d44fd486108\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffe00000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ", "95b1703fc57ba09fe0c3580febdd7ed4\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffff00000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: de11722d893e9f9121c381becc1da59a\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffff80000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6d114ccb27bf391012e8974c546d9bf2\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffc0000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5ce37e17eb4646ecfac29b9cc38d9340\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffe0000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 18c1b6e2157122056d0243d8a165cddb\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffff0000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 99693e6a59d1366c74d823562d7e1431\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffff8000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6c7c64dc84a8bba758ed17eb025a57e3\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffc000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e17bc79f30eaab2fac2cbbe3458d687a\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffe000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1114bc2028009b923f0b01915ce5e7c4\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffff000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9c28524a16a1e1c1452971caa8d13476\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffff800000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ed62e16363638360fdd6ad62112794f0\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffc00000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5a8688f0b2a2c16224c161658ffd4044\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffe00000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 23f710842b9bb9c32f26648c786807ca\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffff00000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 44a98bf11e163f632c47ec6a49683a89\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffff80000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0f18aff94274696d9b61848bd50ac5e5\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffc0000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 82408571c3e2424540207f833b6dda69\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffe0000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 303ff996947f0c7d1f43c8f3027b9b75\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffff0000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7df4daf4ad29a3615a9b6ece5c99518a\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffff8000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c72954a48d0774db0b4971c526260415\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffc000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1df9b76112dc6531e07d2cfda04411f0\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffe000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8e4d8e699119e1fc87545a647fb1d34f\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffff000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e6c4807ae11f36f091c57d9fb68548d1\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffff800000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8ebf73aad49c82007f77a5c1ccec6ab4\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffc00000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4fb288cc2040049001d2c7585ad123fc\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffe00000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 04497110efb9dceb13e2b13fb4465564\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffff00000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 75550e6cb5a88e49634c9ab69eda0430\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffff80000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b6768473ce9843ea66a81405dd50b345\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffffc0000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: cb2f430383f9084e03a653571e065de6\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffffe0000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ff4e66c07bae3e79fb7d210847a3b0ba\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffff0000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7b90785125505fad59b13c186dd66ce3\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffff8000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8b527a6aebdaec9eaef8eda2cb7783e5\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffffc000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 43fdaf53ebbc9880c228617d6a9b548b\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffffe000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 53786104b9744b98f052c46f1c850d0b\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffffff000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b5ab3013dd1e61df06cbaf34ca2aee78\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffffff800000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7470469be9723030fdcc73a8cd4fbb10\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffffffc00000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a35a63f5343ebe9ef8167bcb48ad122e\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: ffffffffffffffe00000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: fd8687f0757a210e9fdf181204c30863\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffffff00000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7a181e84bd5457d26a88fbae96018fb0\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffffff80000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 653317b9362b6f9b9e1a580e68d494b5\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffffffc0000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 995c9dc0b689f03c45867b5faa5c18d1\n\nCipher: AES-128-CTR\nOperation: ENCRYPT\nKey: fffffffffffffffe0000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 77a4d96d56dda398b9aabecfc75729fd", @@ -861,9 +867,9 @@ "laintext: 00000000000000000000000000000000\nCiphertext: b87c921b91829ef3b13ca541ee1130a6\nIV: ffffffffffffffffffff800000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2e65eb6b6ea383e109accce8326b0393\nIV: ffffffffffffffffffffc00000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9ca547f7439edc3e255c0f4d49aa8990\nIV: ffffffffffffffffffffe00000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a5e652614c9300f37816b1f9fd0c87f9\nIV: fffffffffffffffffffff00000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 14954f0b4697776f44494fe458d814ed\nIV: fffffffffffffffffffff80000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7c8d9ab6c2761723fe42f8bb506cbcf7\nIV: fffffffffffffffffffffc0000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: db7e1932679fdd99742aab04aa0d5a80\nIV: fffffffffffffffffffffe0000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4c6a1c83e568cd10f27c2d73ded19c28\nIV: ffffffffffffffffffffff0000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 90ecbe6177e674c98de412413f7ac915\nIV: ffffffffffffffffffffff8000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 90684a2ac55fe1ec2b8ebd5622520b73\nIV: ffffffffffffffffffffffc000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7472f9a7988607ca79707795991035e6\nIV: ffffffffffffffffffffffe000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 56aff089878bf3352f8df172a3ae47d8\nIV: fffffffffffffffffffffff000000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 65c0526cbe40161b8019a2a3171abd23\nIV: fffffffffffffffffffffff800000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 377be0be33b4e3e310b4aabda173f84f\nIV: fffffffffffffffffffffffc00000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9402e9aa6f69de6504da8d20c4fcaa2f\nIV: fffffffffffffffffffffffe00000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 123c1f4af313ad8c2ce648b2e71fb6e1\nIV: ffffffffffffffffffffffff00000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1ffc626d30203dcdb0019fb80f726cf4\nIV: ffffffffffffffffffffffff80000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 76da1fbe3a50728c50fd2e621b5ad885\nIV: ffffffffffffffffffffffffc0000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 082eb8be35f442fb52668e16a591d1d6\nIV: ffffffffffffffffffffffffe0000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e656f9ecf5fe27ec3e4a73d00c282fb3\nIV: fffffffffffffffffffffffff0000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2ca8209d63274cd9a29bb74bcd77683a\nIV: fffffffffffffffffffffffff8000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 79bf5dce14bb7dd73a8e3611de7ce026\nIV: fffffffffffffffffffffffffc000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3c849939a5d29399f344c4a0eca8a576\nIV: fffffffffffffffffffffffffe000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ed3c0a94d59bece98835da7aa4f07ca2\nIV: ffffffffffffffffffffffffff000000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 63919ed4ce10196438b6ad09d99cd795\nIV: ffffffffffffffffffffffffff800000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7678f3a833f19fea95f3c6029e2bc610\nIV: ffffffffffffffffffffffffffc00000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3aa426831067d36b92be7c5f81c13c56\nIV: ffffffffffffffffffffffffffe00000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9272e2d2cdd11050998c845077a30ea0\nIV: fffffffffffffffffffffffffff00000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 088c4b53f5ec0ff814c19adae7f6246c\nIV: fffffffffffffffffffffffffff80000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4010a5e401fdf0a0354ddbcc0d012b17\nIV: fffffffffffffffffffffffffffc0000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a87a385736c0a6189bd6589bd8445a93\nIV: fffffffffffffffffffffffffffe0000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 545f2b83d9616dccf60fa9830e9cd287\nIV: ffffffffffffffffffffffffffff0000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4b706f7f92406352394037a6d4f4688d\nIV: ffffffffffffffffffffffffffff8000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b7972b3941c44b90afa7b264bfba7387\nIV: ffffffffffffffffffffffffffffc000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6f45732cf10881546f0fd23896d2bb60\nIV: ffffffffffffffffffffffffffffe000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2e3579ca15af27f64b3c955a5bfc30ba\nIV: fffffffffffffffffffffffffffff000\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 34a2c5a91ae2aec99b7d1b5fa6780447\nIV: fffffffffffffffffffffffffffff800\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a4d6616bd04f87335b0e53351227a9ee\nIV: fffffffffffffffffffffffffffffc00\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7f692b03945867d16179a8cefc83ea3f\nIV: fffffffffffffffffffffffffffffe00\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3bd141ee84a0e6414a26e7a4f281f8a2\nIV: ffffffffffffffffffffffffffffff00\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 0000000000000000000000", "0000000000\nCiphertext: d1788f572d98b2b16ec5d5f3922b99bc\nIV: ffffffffffffffffffffffffffffff80\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0833ff6f61d98a57b288e8c3586b85a6\nIV: ffffffffffffffffffffffffffffffc0\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8568261797de176bf0b43becc6285afb\nIV: ffffffffffffffffffffffffffffffe0\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f9b0fda0c4a898f5b9e6f661c4ce4d07\nIV: fffffffffffffffffffffffffffffff0\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8ade895913685c67c5269f8aae42983e\nIV: fffffffffffffffffffffffffffffff8\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 39bde67d5c8ed8a8b1c37eb8fa9f5ac0\nIV: fffffffffffffffffffffffffffffffc\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5c005e72c1418c44f569f2ea33ba54f3\nIV: fffffffffffffffffffffffffffffffe\n\nCipher: AES-128-CTR\nOperation: DECRYPT\nKey: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3f5b8cc9ea855a0afa7347d23e8d664e\nIV: ffffffffffffffffffffffffffffffff\n\n", }; -static const size_t kLen22 = 116210; +static const size_t kLen23 = 116210; -static const char *kData23[] = { +static const char *kData24[] = { "# Generated by \"make_cavp -cipher gcm kat_gcm/gcmDecrypt128.rsp kat_gcm/gcmEncryptExtIV128.rsp\"\n\n# File 1: kat_gcm/gcmDecrypt128.rsp\n\nKEY: cf063a34d4a9a76c2c86787d3f96db71\nNONCE: 113b9785971864c83b01c787\nCT: \nAD: \nTAG: 72ac8493e3a5228b5d130a69d2510e42\nIN: \n\nKEY: a49a5e26a2f8cb63d05546c2a62f5343\nNONCE: 907763b19b9b4ab6bd4f0281\nCT: \nAD: \nTAG: a2be08210d8c470a8df6e8fbd79ec5cf\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2ad0bf5aeb47a0c1a98da3dfdab4fded\nNONCE: 25f1b6091ee7040fea4ba854\nCT: \nAD: \nTAG: d7963d240317653e01cf5abe5d0966ae\nIN: \n\nKEY: d8cd400a0a73d114cd3ecf36537cab3d\nNONCE: 3c162c9f16a49b8fe6c92a81\nCT: \nAD: \nTAG: 4203aec165f9d397cf9009770a088c16\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: a982a7bae2b3eae1b7832f16faf693b4\nNONCE: 78d2d2fa43850483ce933576\nCT: \nAD: \nTAG: ceabb89ee3179e25ed32d5a225006361\nIN: \n\nKEY: f9e3992196f7d7a21bd956f4b5a5ffce\nNONCE: 0794a6bdf5f198c9f193b9ba\nCT: \nAD: \nTAG: f8247fd5dc7bd6d40e96af32aa9c1889\nIN: \n\nKEY: c91aab7ebe13653a71a4232fd1beb793\nNONCE: 7799464b6de6383da0daec52\nCT: \nAD: \nTAG: 00c4f7033f3c05e9d531f3ca573dc98d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: e7e4eefd0a3abd4ee1bef270d257eab7\nNONCE: f548f2a04a50a2f0342b2250\nCT: \nAD: \nTAG: 044159b8a18668167fbd28ac500c20fe\nIN: \n\nKEY: 1bd49e553457459aee1b5d83e7c216a2\nNONCE: 2b37cf40ed2685eb2a907cd0\nCT: \nAD: \nTAG: fcb41d17fdb023d4d14f84a387d3ad77\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 4d6486fa68ce5a14b9db7334ab4838cb\nNONCE: afad3f4190d56a1b8eb08e58\nCT: \nAD: \nTAG: 4bda04755b7ce9da020ce7467a5ced8f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: da5b59d5eb448fd6c08c350df9a82114\nNONCE: 15fb65d9fe2fa27f226312c0\nCT: \nAD: \nTAG: e407fccbb9f00eeb9cef4a520cff957c\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 07d5a7d405b21c64d74cc0988693b784\nNONCE: 2eefd7990ea025925e9ca6f9\nCT: \nAD: \nTAG: 1439522d18c9eb129f1f776590027761\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 48760dec952010140ffc4b4078438b56\nNONCE: 930cc3ff276d7bbb74d187ef\nCT: \nAD: \nTAG: 8673dcb97934d54dc17de0037344737f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: ed7c50762dc0dc4aa5c8be4cf0a56b88\nNONCE: 50dfb73b5034cffb6709af8f\nCT: \nAD: \nTAG: cb02203ee8eccec446ed1c2cf68fd1c0\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: b5d4b3e80a56adbc780ff02c5da6a7ab\nNONCE: abc5b96c5e872502971dcc55\nCT: \nAD: \nTAG: 4e85677cc16e2b2fb50a2ca9c0ac1b9c\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: eac258e99c55e6ae8ef1da26640613d7\nNONCE: 4e8df20faaf2c8eebe922902\nCT: \nAD: \nTAG: e39aeaebe86aa309a4d062d6274339\nIN: \n\nKEY: 3726cf02fcc6b8639a5497652c94350d\nNONCE: 55fef82cde693ce76efcc193\nCT: \nAD: \nTAG: 3d68111a81ed22d2ef5bccac4fc27f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: f202299d5fd74f03b12d2119a6c4c038\nNONCE: eec51e7958c3f20a1bb71815\nCT: \nAD: \nTAG: a81886b3fb26e51fca87b267e1e157\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: fd52925f39546b4c55ffb6b20c59898c\nNONCE: f5cf3227444afd905a5f6dba\nCT: \nAD: \nTAG: 1665b0f1a0b456e1664cfd3de08ccd\nIN: \n\nKEY: 39c070eaace1c6e30ab004bfbfa830fd\nNONCE: 6e55ff3bba561f17f338313c\nCT: \nAD: \nTAG: 4e3c2db540790f26a4704e72ef9b4f\nIN: \n\nKEY: 96b12ebb99edca96838f88caaa74abbc\nNONCE: 679feb33d6e35962518a63c1\nCT: \nAD: \nTAG: cbe9d90bb8600bb14e8ca81cde5b2e\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 5b1a1ad45349cb7ec3afb613674c9381\nNONCE: 7ef3542c0ca2415f767eec7c\nCT: \nAD: \nTAG: fbc65cc7f1f4edbb746b47f950e472\nIN: \n\nKEY: b349f8d86e91144c86ed49a100358239\nNONCE: 3e3879e1a4ccf74cc442b9c5\nCT: \nAD: \nTAG: 0d935691c84813b8c1e5ba23ee621f\nIN: \n\nKEY: df4074001cf89ad0b046fceeea5a1ef2\nNONCE: 080fb68a083a219354a7cdcd\nCT: \nAD: \nTAG: eaa44ef28c446610b33dd2fdbdb8a0\nIN: \n\nKEY: 84816510accb68149ee65be220df3d9e\nNONCE: 99c41452f73f3a2dd48f2eaf\nCT: \nAD: \nTAG: 5d5f3c09d2498587c7230dbe5fd497\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 98740d9ac6cee9379253d4e6718a1de5\nNONCE: b723dd15270c767a31636117\nCT: \nAD: \nTAG: 199630b915021b98055f295d08befc\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 79b8cb97ec3e3f7536eeaffc64bdb372\nNONCE: e945122f1e4d960a2e9f9a41\nCT: \nAD: \nTAG: cb9c041f18070030399006d77954cb\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 26e7fb1c3b5448d7ad7b67aadaf360bb\nNONCE: 34bf017f9283236dee171e10\nCT: \nAD: \nTAG: 8756ca5c8aa644a852e5eb2c49bf39\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: d6a515d24ef9099695b179c01bc1f4b1\nNONCE: b54a5bbbf6faae5f33b8c133\nCT: \nAD: \nTAG: 02b1243c92f6b059d00bd672dfb8e5\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9e9ec40db0a07f24c417d3c63d1b946b\nNONCE: 8605c97fa5d8f94798b845f9\nCT: \nAD: \nTAG: 10ce3c41553e7f5b413d1470ced09b\nIN: \n\nKEY: dc1b3fdce56baf77ddb22246ebb224db\nNONCE: 1394643db950ac42366cda3c\nCT: \nAD: \nTAG: 25bfdb151d21994e90b095230247\nIN: \n\nKEY: c1b668ee720eb90730d7c30e663e941b\nNONCE: b8f27f51092d65697a9740de\nCT: \nAD: \nTAG: d6acce523efdb3e7b28220896827\nIN: \n\nKEY: 7a25451203338a3a046902fc5169a9ac\nNONCE: 070a0b0fb560999c6b778aa5\nCT: \nAD: \nTAG: 51d73876b57dea6ef24e2740fc69\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 8747e8b9058632721cab00c217e24fca\nNONCE: c44c7bbf8b4a48e2b64c4e41\nCT: \nAD: \nTAG: 2f7fccde59ec9e6ad2cbd6ced7c1\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 79d9e7d647dbe9926ba08f078b2c4768\nNONCE: b7fef625e03c6e97bb7988eb\nCT: \nAD: \nTAG: 8508fe578eacef69d8e1468cc905\nIN: \n\nKEY: 84ade1f350d68ceff9fe8a7ef120e7b6\nNONCE: 7617886bff63257768f54173\nCT: \nAD: \nTAG: 461ecfef2f3b746cc3a47c28a43a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: f7a85574fb8be04e92d219cf3524877b\nNONCE: 9a3febc5d2bd389e0db3863c\nCT: \nAD: \nTAG: 69a1d7bbf81f830534312c641068\nIN: \n\nKEY: 18f42b8a3dca6e80777d5c681d8c4a32\nNONCE: ed425811547c5989ea6d4cb2\nCT: \nAD: \nTAG: 60b5712b52b56facc8758aec40c9\nIN: \n\nKEY: adeb972fe5160e14137c286b6e281163\nNONCE: 38e536e647b83fc429bbcabd\nCT: \nAD: \nTAG: 22e32a3c2637ac48c0deaf06435c\nIN: \n\nKEY: 0686f241ca82a590980929858c789d7a\nNONCE: c5d0737448692684c5ac1c8c\nCT: \nAD: \nTAG: 65eecbd0fe423c6e1608745ab677\nIN: \n\nKEY: f7d57c6e4699d4f242270f41781d39dc\nNONCE: a2842a9dd1b5874cb50e8707\nCT: \nAD: \nTAG: 09999cdc3dd28e818b88a6485c8d\nIN: \n\nKEY: 4df05ee5ee95c69938b4049a2be92504\nNONCE: afdefd136622128fd6c2c534\nCT: \nAD: \nTAG: 3a24e5f166d70627954b55029fc3\nIN: \n\nKEY: 0f4469766ea265d22cba4c7105bc49b0\nNONCE: 25ede41ed4c638195354713a\nCT: \nAD: \nTAG: 6dd4e9cc6ed04976f2cced5804b4\nIN: \n\nKEY: 24c7de158fcb0808b3cfda0e95706e6f\nNONCE: 88eb7f00a129040d05952d17\nCT: \nAD: \nTAG: 2d587fd20457566fed19cca36d2b\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2610de38144b05876b0d0b34a1c7812e\nNONCE: 6673bf587f9f90df3a1715fd\nCT: \nAD: \nTAG: 7b13fff5e79951ebee51d12f8422\nIN: \n\nKEY: a830c905dad3a8e5aae739d7ab60a5dc\nNONCE: 54633aa565952e80fb0b9869\nCT: \nAD: \nTAG: 482d9381230cd015b2a16976b6\nIN: \n\nKEY: eb7ae9788a5dc09a7812e389c67138ea\nNONCE: 2ecd19b70ffe87cad58a0029\nCT: \nAD: \nTAG: c1ebf4e3594a722bab9f61e084\nIN: \n\nKEY: 9c247b33ffb3fe486f8f1c06b3db6563\nNONCE: 978769bc16a7dd3d90ab9d76\nCT: \nAD: \nTAG: 09acccba7e7be6b5687b478327\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 23281eec6b12fe1184e6c113788915b8\nNONCE: 78538fb690491381daa41ef5\nCT: \nAD: \nTAG: 80d9c8d781035be9f68de209ad\nIN: \n\nKEY: 443657744df4b5d5de80f27efe244b27\nNONCE: a637b48e67d1cf8f3ddf6d7c\nCT: \nAD: \nTAG: bf84664af0260e0b5b352e5cd9\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: b93ae43e8eb3e94b67b09b833e376327\nNONCE: 14ef4f357845d34ce06b170a\nCT: \nAD: \nTAG: 22c987ec9c91ce7714fbb794d8\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 6eff3644c83c75c0678cf4f6713561f7\nNONCE: e7bf04fab5909668065d2b43\nCT: \nAD: \nTAG: 2fab50a07c1a50ba8e4381dad9\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9613b9b4c70e5ab130534309059e99b7\nNONCE: 40414f80b586ecfb22860442\nCT: \nAD: \nTAG: 9cc1a298d9d57b6d4bcdf3e5b5\nIN: \n\nKEY: 400fcee6ea1b8b1fccffdbccef08a5e2\nNONCE: dc16236581a6da126550b08a\nCT: \nAD: \nTAG: 6ceeca2188cf4da42ed3f248df\nIN: \n\nKEY: d27c84466faf1a45a2435eb9293478e2\nNONCE: cdd7e1bdf60bd12885dc8fdc\nCT: \nAD: \nTAG: 5397381a8817ef557ac6c57a22\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 8ed40d2b24f52dbf2fa8486c8fde62e9\nNONCE: 837f36e0f6fb34d08e8df9f9\nCT: \nAD: \nTAG: e6c787dfeae37a34dc49d52caa\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 34395d007dac4a4b83c943de4406d821\nNONCE: 4bbfe5f3276461e594b1fd2e\nCT: \nAD: \nTAG: 30daec9c07fa2e11a1acc28baa\nIN: \n\nKEY: 5a8321edf8d532d51299ecbaffc56cbc\nNONCE: c512db4e75e52950f89f458e\nCT: \nAD: \nTAG: 88fddfe667c3519963ebb6d0b7\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: d9ed395776deb772a218db03abbd8606\nNONCE: 600075a6d85d86d6a3f6624a\nCT: \nAD: \nTAG: 7f486053d65559dca0a3761e00\nIN: \n\nKEY: 16b5d6282fa184deeb837c706f191079\nNONCE: ea09b0a8f65f3ac16d954c9a\nCT: \nAD: \nTAG: 6defe4a6354e1383111d96fcb3\nIN: \n\nKEY: 4c5a02440befba5820539ccf74b40355\nNONCE: 3852fd7da7a375a2a2227e9c\nCT: \nAD: \nTAG: 9f45b723d14708dad1edd831\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: d4e885208426247f27428ede3b318e68\nNONCE: 5513f9ec35e2e72be3470f57\nCT: \nAD: \nTAG: 48d716f0f94ac7fbc291932e\nIN: \n\nKEY: 25954f34970b4fc834fff", "1552bea4896\nNONCE: b66b254e66240f0e8e262f01\nCT: \nAD: \nTAG: 5b5569b200c06bd24382ec73\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 303b5662bcf71ca82e07e10248c17629\nNONCE: 45f9c33e03f84fa88209858d\nCT: \nAD: \nTAG: e8b99255a0e953d57361db29\nIN: \n\nKEY: 8394912058620e935335f7627b18b1b3\nNONCE: 772149bd434c0b27ac45e672\nCT: \nAD: \nTAG: c7a43e2ee7e161a52583ad83\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2ca00481ac56aac664b28f29781a7e82\nNONCE: 14574966f3b12bc0502a3a55\nCT: \nAD: \nTAG: 938628eba4b72f79fd7b7396\nIN: \n\nKEY: 8ed5a13a5046d10379c75eaa3fd17bb2\nNONCE: 2b111cc8c84ff7f1c262ec1c\nCT: \nAD: \nTAG: 82e8bed016ae384ae75ac16c\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 7041298fe906405905e8b4de1de3c0f0\nNONCE: e4fbdc72d00a331bfa326d59\nCT: \nAD: \nTAG: 17292560680114395372691a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: faeeee9bbaff25e221121d1122807009\nNONCE: e9e872d525c2315f49e2d94f\nCT: \nAD: \nTAG: 98146c72b9365016ff33b7e2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: df0a1dd37c0144e0bcff6e7deed857f0\nNONCE: eba039eaf7f2f48f761abc9c\nCT: \nAD: \nTAG: 973e0ff877b085ad8083d6c9\nIN: \n\nKEY: 27f19b4b2d23285d92480ca2dc3799dc\nNONCE: 335b2f88f2fc4b6188867558\nCT: \nAD: \nTAG: 8b1c43ade7a3c5af9a639e02\nIN: \n\nKEY: 6edf19775190943d196148165087ebe1\nNONCE: c2fcf9919d85407086c2be20\nCT: \nAD: \nTAG: dda2c0cfe5d922a3cfb15ab8\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9acca9099afc2ec75441587bdd96a469\nNONCE: ca178e969478e36621db60df\nCT: \nAD: \nTAG: 86a70322e57fd6cca64a6aa6\nIN: \n\nKEY: d0718716395e03f7fde7fb40f497f9cf\nNONCE: dd20e6b684a0f53d3785df71\nCT: \nAD: \nTAG: 70cfeb7a503a1869fa0dc0ee\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 5fcbf7953da6781ae96852885ae01488\nNONCE: 34ca7d2a0aaf09fcb8a5b39a\nCT: \nAD: \nTAG: 142828e093e80e346008c2b6\nIN: \n\nKEY: a958dea10183955fb62b5cf0d6560efd\nNONCE: 9c6fd7fcb79ab149a2ef8416\nCT: \nAD: \nTAG: 0fa19df0ef498402\nIN: \n\nKEY: 2bd8c68da36fc74a66e8bc9c58c7b3d9\nNONCE: 0a0c9cee4e712ce526271644\nCT: \nAD: \nTAG: f94a128bb6c31902\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 5f8441de9b68a525bd77a9f8db9ac1ec\nNONCE: 7b704888d905e11b3e8f6751\nCT: \nAD: \nTAG: 1920f39509e495ec\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 47a49ee87638b74b48dfc42b9892ff93\nNONCE: 927f32a1fdeed0da6c80c4c1\nCT: \nAD: \nTAG: 568ca20233ab20e1\nIN: \n\nKEY: 871616dda80c31ef677f770774f41d27\nNONCE: 94f9c4a7f7d69cfef745c085\nCT: \nAD: \nTAG: f779d3356f60d96c\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: e6a7ce1c109162cc24552b2de8355bd8\nNONCE: b140aa5f0f2312cf7b8696c1\nCT: \nAD: \nTAG: ea5f6c5b9224afcc\nIN: \n\nKEY: a90b62bfba34ca0cfb4d5ccd52ff7369\nNONCE: 5fd3cf7a9a1e2a15ad6a58e2\nCT: \nAD: \nTAG: 6f3dd881088a0b29\nIN: \n\nKEY: 6280067b5626d5d6bf35ab1c903c1d75\nNONCE: 99523c6f792e03276c44ba7a\nCT: \nAD: \nTAG: 3a68ccdb69008d9d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: f40b500c70209092efa29a2a7e96ca64\nNONCE: 86d1047059ee2986bd96daf7\nCT: \nAD: \nTAG: c594ea04f674de69\nIN: \n\nKEY: 6cb7829e2295e60036bb967d06116601\nNONCE: 4dfb5fb2ea41fae7653e1438\nCT: \nAD: \nTAG: bb9b39fe673ffd18\nIN: \n\nKEY: 05cd9b0de53c072321ae4a1cdc2cafc3\nNONCE: c869859421df985bbc8c9c62\nCT: \nAD: \nTAG: 0f8ad033a0ae3cb2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: fd025400ab17f5e35c3cae3aeed4ebc7\nNONCE: 6c3b7e178df39504d3ca2e31\nCT: \nAD: \nTAG: 5fd986d21ac0bb49\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: c7678eeb06cd24484b81a469c024c3d6\nNONCE: a1fea7d9afd9493a83b5d531\nCT: \nAD: \nTAG: 8c5828f475c4f902\nIN: \n\nKEY: 056c731555048f5831a4c7ba57f9022b\nNONCE: a8a13e93a33807811ed327f6\nCT: \nAD: \nTAG: c2d9d4fb79d675f3\nIN: \n\nKEY: c0395a8391049d30f7e0fa7afd1b0ec4\nNONCE: 381894100b3d786bfca314b7\nCT: \nAD: \nTAG: 2fef77ef639adc00\nIN: \n\nKEY: d1cb603b886e9deb62cbf5182caaeb35\nNONCE: cd23f90cfd17727ea0975ff2\nCT: \nAD: \nTAG: e319af65\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: e626638a113c617077f5c4b2284921c5\nNONCE: c4a8864b4c3385a78cb8759f\nCT: \nAD: \nTAG: 039d51f8\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 8f74a8b922fcf1a8eed7320df9f03fd6\nNONCE: 925ec6414e777062ac839f06\nCT: \nAD: \nTAG: bb0dc912\nIN: \n\nKEY: f59152b1d2991e7dfbd6b9cf91d2a9f1\nNONCE: 776f95b088803b537dfbe941\nCT: \nAD: \nTAG: 9163e80b\nIN: \n\nKEY: 72a9159c9f8f4953b6ab4fbad02c019a\nNONCE: 7ca4d31dba07c89b3d5cf059\nCT: \nAD: \nTAG: ee28643d\nIN: \n\nKEY: 6ca652634faee86176a8bbff37f5234c\nNONCE: 77bbe192e81594223b8869cb\nCT: \nAD: \nTAG: d054e86e\nIN: \n\nKEY: d06a1cebb4b1cf8b2f48126bffd4530b\nNONCE: ac7c4c669d5d7749d114448a\nCT: \nAD: \nTAG: c606dbcb\nIN: \n\nKEY: 42797f87d381cbbec3dddb8e7ee1b30e\nNONCE: c4be94c9b2f76132875374d0\nCT: \nAD: \nTAG: 40156799\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: accec0302ba0f854c2c5a6faf08f4972\nNONCE: 2722ce4848acc2b4cc9aafa2\nCT: \nAD: \nTAG: d90c055f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 117ecaafb5c844ceb9e505f8a33bfa79\nNONCE: cb95b76c9dbf4b6ee4fe6a46\nCT: \nAD: \nTAG: 641e2aa6\nIN: \n\nKEY: 453e89f0646d2532e3d0d019a7d7e302\nNONCE: 14732cb98fb4ad26c0ee9e1b\nCT: \nAD: \nTAG: 232f4035\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 121143f3835cb0d1f88f8f53a7abdb11\nNONCE: 601c15958cf77c0ea1c3862e\nCT: \nAD: \nTAG: 43c61d3d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: c5d7666d37ced3e4c2b9b738d4b38557\nNONCE: 012fa72716b777e0bc248f2d\nCT: \nAD: \nTAG: f4208947\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 5d06c11668c4aa9899496b5d7f229b83\nNONCE: 0ca7102fff9fe056a5afa9f8\nCT: \nAD: \nTAG: d7a7af6d\nIN: \n\nKEY: b63a6afbc9906d23f1e9c0f487b6d919\nNONCE: 2b091d6b35e4f9ba5f9cfdb8\nCT: \nAD: \nTAG: d1eafd50\nIN: \n\nKEY: d1f6af919cde85661208bdce0c27cb22\nNONCE: 898c6929b435017bf031c3c5\nCT: \nAD: 7c5faa40e636bbc91107e68010c92b9f\nTAG: ae45f11777540a2caeb128be8092468a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2370e320d4344208e0ff5683f243b213\nNONCE: 04dbb82f044d30831c441228\nCT: \nAD: d43a8e5089eea0d026c03a85178b27da\nTAG: 2a049c049d25aa95969b451d93c31c6e\nIN: \n\nKEY: bc3ab28150fd4cb731d5f48ed2784173\nNONCE: 40408445c203c647312b8f01\nCT: \nAD: 53d2fc19963fc99a36a524e39cb68aa8\nTAG: 3f04dbd2f49909f73044175041fd9eff\nIN: \n\nKEY: 34537f1a0ba093aefedefe8b4b6b34e7\nNONCE: 9c5fc88eb388ef6776aa2182\nCT: \nAD: 4dd377d089c617dda1ecd42341d1878b\nTAG: c0fccde30ba354e23c05b5371c40d088\nIN: \n\nKEY: 54c3f935982de19de88d6384f9493389\nNONCE: 3d7eec1cdf3cd419511793ab\nCT: \nAD: 2ded8cbc69fa57678aadc7477f2a2173\nTAG: 74107fc192c94a7d85d0f9205f8b02c9\nIN: \n\nKEY: 790f8945b127a1a418d6d58b4378e0dc\nNONCE: f5694d77b816f2cef0ac80fc\nCT: \nAD: e5c71b82a60c97f050511a3b9a09e450\nTAG: 4c75effb688dccd0affe92c0e0391d64\nIN: \n\nKEY: f6ed6f0afea7e99ab320b525107715c9\nNONCE: 351e7dc999b9de77ce61b2f7\nCT: \nAD: c9101b64e0b6abc0e46828aec14d29cc\nTAG: 4f2ec2e1ab001443a60722671a9c9656\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2eccf9cda0e4e70f273ee8251120c768\nNONCE: 1d869f4b8497bc19d948cea6\nCT: \nAD: 1d86a6a21f23ee56ad0fa6c1de525906\nTAG: 37ffc390298c3ea8cceb382f394c2fc2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: d61767f07b959e94f73c64cb5a5520b3\nNONCE: ecfa850395f8cf9348f1324f\nCT: \nAD: c3571bf1700b114bbf0c6bb2278d4d88\nTAG: 1065f86bc9e22197880ea87ac326a17f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9421cac15ce7d49ec7c088f7524a1ff5\nNONCE: b3d395bca123b265c05577cc\nCT: \nAD: eb6e06071dae4360e8347bfb72d9c188\nTAG: 1f04c228c7efc71f1706d10fd819f35e\nIN: \n\nKEY: 8580395a5d777c1690af79f6068e291b\nNONCE: cad1a0f2b76f064ca56be3cf\nCT: \nAD: 174388edf0b7f86fe634cb942c13754b\nTAG: 0067b03f2e0efc72cb08792fbe3b0267\nIN: \n\nKEY: 0c21da9c8b84d371fde59e6d1752113e\nNONCE: f8c13e58aaa329427438db8b\nCT: \nAD: b8b197789cfd085b09a47760c28c7e8a\nTAG: f8613cc5dcb4cc5c78f1f7c2d8084ec6\nIN: \n\nKEY: 162fc51e46e771222a04842f5546db8c\nNONCE: 13557e09e738eb895eca2d8d\nCT: \nAD: 691e71952c31a6b49b785f627c03e948\nTAG: 4f7ea723b1abd74e53fa356809275ca4\nIN: \n\nKEY: c46d9562d954801b8e99e4e57cbcc0ec\nNONCE: 30414c934b14e0bb0110ae44\nCT: \nAD: 41ae6a63855c1944446491e80670bf68\nTAG: 3e2366a2cf5632c1ecfde33f1f5f6d18\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2904df4dafcc6bbb8375baf6a7eede80\nNONCE: 6aae8ff4b1609f4026b47259\nCT: \nAD: c4afa7b21e5f41b892be52365a18584e\nTAG: e1810fe340207fa83815182bbad62bde\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: a663a6aeac790c61e07e5f8ab843439d\nNONCE: e287d287051c82e2253e33f7\nCT: \nAD: d211a58e7d4884a26669b335c0af8d5c\nTAG: cdf52e39cced5c04ddaec8227826da\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 6dfa1a07c14f978020ace450ad663d18\nNONCE: 34edfa462a14c6969a680ec1\nCT: \nAD: 2a35c7f5f8578e919a581c60500c04f6\nTAG: 751f3098d59cf4ea1d2fb0853bde1c\nIN: \n\nKEY: 5f20eb8f6f579ec235b3403831fd58b1\nNONCE: b989444625a730876cc1a439\nCT: \nAD: 5881865ceb44bf171a7ba87d63f1fdcb\nTAG: 2d9c926c872c04bd0915f3e4ffccc5\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: d1e376ecfa46321a3a4a187fc1524789\nNONCE: 7387c1af03adfffc53248ac8\nCT: \nAD: e9d8269ecf857dd6afd85fa90260a565\nTAG: 6a1da57b70e9c4fd006e4a669008d5\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: f20681f4b61e72f8a6517e40b5860e0a\nNONCE: df80104736d5acba2348e5be\nCT: \nAD: e4247e85dafdabff95b6d8c27e8979a2\n", "TAG: 746ee686eddfac0785341bb616f90e\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 0f6ee618d0b66fa269398d5d3279931b\nNONCE: 7ac7c776a9a77aa8f7fc653b\nCT: \nAD: 2774b19121188965922c4a702c45fcfb\nTAG: 58d810fd408978d0f5eb33f06aa861\nIN: \n\nKEY: 9405240a2e0fbef7ac89f66f9188472f\nNONCE: 60718e8fb2866d27ddff8a78\nCT: \nAD: e86f19201889740743a9b95091283ab5\nTAG: 2984f343aff7e0ad84aa7134f77699\nIN: \n\nKEY: 9a5f24a325ac049169f7073b9583fa79\nNONCE: bf364dee6ac48e711aa2af2e\nCT: \nAD: 131339c8b9c785350efee37c0c37b6e5\nTAG: 69b1815c978cccdd146c51ad164429\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2b51c516898ded4dfedf1839eb09f059\nNONCE: 8080260add3b5d2182b3574a\nCT: \nAD: 303f4aa89c1ce37ff8b36940c65586e6\nTAG: 3750db28f9a09493ab60c9cb426e0b\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 084877d61fd67442461c741afc4cf5f8\nNONCE: 798bce4a6b8663919dc922e0\nCT: \nAD: 056221633de809d2f48ff41c2d75d851\nTAG: a6c40f9765113e9dea6fd2f8bae96b\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: fe9cb0d7753d80686621fcf28705a39a\nNONCE: bd71586f2509814283ca1ec8\nCT: \nAD: 8676d9c9952340c31c9eb9e0d75c68d4\nTAG: d55ab183b959d697fb9145d37a7b27\nIN: \n\nKEY: 0ddee4104e896aae2849e8c4c5b97da4\nNONCE: 03d4bf8a036f974f92c77ed3\nCT: \nAD: 742838addd4a519d901736aa0a08d769\nTAG: cfb89c9ad51c348d65f7ce7cc4b72a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: a22e58bd9a09eddaa630d499dd6d410c\nNONCE: ea9a7f75676dcc2f79b9147b\nCT: \nAD: 0a730acd7b5805ca0fbfdd5bef7690c5\nTAG: f3c63684015db6cc958bfb3ac84222\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 8e5f16c84b0dd5357ad66f0540f1bf87\nNONCE: 6231ff08e050b7f7c5204842\nCT: \nAD: ab622472635a3ebae68aaaf8153df35a\nTAG: 1df90759291bfebd7cb239e75746ee\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 31c987a595a80a4c91de68805f66e5b9\nNONCE: 67edf7afbc125ecf99a804a2\nCT: \nAD: 8648a3452aaa3ff68d488de1abecef41\nTAG: 1c9199d9465ba5c9314911b4ad2057\nIN: \n\nKEY: 2d4fe4c17b1e86f0316846e642ff3a4d\nNONCE: a8b283438ad968e17fb5a755\nCT: \nAD: d0fdf6e1543d2b0f62c96c6e9c09c977\nTAG: 80149613bc962e4735acf317a3a4\nIN: \n\nKEY: aebb04a17265c4720d5a377c38efc460\nNONCE: b607be60340e557013e7adce\nCT: \nAD: 3cff96ceffa4c9a2193beeca9444e474\nTAG: a207fb626fb731c3234bad3573e8\nIN: \n\nKEY: 0807bf020df6ce3aba407e4d4f76ef6e\nNONCE: de63592624932a0805bce0a2\nCT: \nAD: 7c85c60c15301bfff6f2a4a3038b3c9f\nTAG: 5c83dce13c5bed35d8941f16627a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: efaa4666776ff4c6a87f563dd2e2794e\nNONCE: 9eb99f9741d9de6d3cbc9703\nCT: \nAD: 3addaaf513eb42606a24311ca7058846\nTAG: df02cfaace61423d45f64cec0e78\nIN: \n\nKEY: cf8d3e7cd62754bea5092409db3dc6c4\nNONCE: 5af3d5f1d144de8aca4bbda3\nCT: \nAD: 907083ee93cbf0b9b8421b8083bfcde8\nTAG: f19ebbc361dff17249251c9a7f5c\nIN: \n\nKEY: b894e7483c9f367b41af103f2860a6c8\nNONCE: 42d71d79e22740e1d1871ab5\nCT: \nAD: 8f78015bb82fbe032a6595e679198b47\nTAG: 96ce7b7f620b697f074f109c4488\nIN: \n\nKEY: 8299ee6ebdf1ea6e2561933b406de656\nNONCE: 98aade4ae4cda264b364987b\nCT: \nAD: 29a0fdb89ec5c5f969932e0aa0c170a8\nTAG: 60e0a7c2384f1d208abcfd4e4b3d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 29ac8dc4b69fb48289ceecd435ce3066\nNONCE: 2ecc8b95fae59fe59402bae5\nCT: \nAD: ec279eebc147897ea067a105c7e418c9\nTAG: d6f6127ec39852f18a7941948e41\nIN: \n\nKEY: 065bcae64ef1a982237e5977e73382ae\nNONCE: 164fed8cbe6d6cb0bbb6d608\nCT: \nAD: ed7da5abf307f9ceb18b630de9291b4a\nTAG: ac22e57ebf8ff258ffc77fa4bbb5\nIN: \n\nKEY: 1ad71eb24ea2a8055533fc1ec1b51b98\nNONCE: b27b640c3919a21da93e42c5\nCT: \nAD: 882acc108ee77afc6754089e864f0080\nTAG: dc36f18c131004e815c228a3fe9c\nIN: \n\nKEY: 54f06e8769711b40076d3cfc0239c324\nNONCE: d607633bd5336ce01c98f458\nCT: \nAD: e8f2f9edf850ade8e7cb55fba052e27a\nTAG: ff32f6d2418b2e646288bb105dcf\nIN: \n\nKEY: 8a473ce70b7694cb36efe5f5f268f1c4\nNONCE: 8236c764c7614dedabdd2dc0\nCT: \nAD: 4ea00a00b2bde6f183366b1ce8c33400\nTAG: 158bba897c1ab0cbce33355947fb\nIN: \n\nKEY: 4b42945e4361de3f6623b01872ff5f95\nNONCE: 5d7ec8f90b140049a8ef85f6\nCT: \nAD: 50feab5dce291d771df81b0124da29ed\nTAG: 90590e115ba688b50a66d59eb8b2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: f2bad7d4f033b19c3b918da3021b3edb\nNONCE: 3825afbecc01cc66caddd402\nCT: \nAD: 49a6738279742410a0ce63276306c288\nTAG: 95a5980947205fe2225dbd39d098\nIN: \n\nKEY: 2c113bdd16d5f827bb84d9a9f1e2ced8\nNONCE: 97ce5737ca5305cebc3dbd0f\nCT: \nAD: 6833844c135173f2641190a5c81e2d38\nTAG: 9576596016c502bfb51adf861405\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 1dfee02fd2e411d8a95218059717e65e\nNONCE: 534f2db1833e2b95d17f4749\nCT: \nAD: 969f2d219986f9e3305b8be533ca164a\nTAG: 750e26041514a140374e857b19\nIN: \n\nKEY: 80a351296fdf716a59ce9cd3f3db1378\nNONCE: d57877a78eaea750131e1f62\nCT: \nAD: 89d5b612686f10f4523ad8721abb4a17\nTAG: 1445fe02c7eacc1968b5c2f436\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 44cdf8d44d4a85d4c718b6dfb3565f1f\nNONCE: 5fe0e438db113e46f73f0227\nCT: \nAD: 76fbc7e5d64be21cbb341b32ea61d8c6\nTAG: 98aaad6c40345751803926295d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 5e86779506b46f0eabc6181b5a313222\nNONCE: ad02946f9f4e148462d14eea\nCT: \nAD: 89d777550c1c2148dbef73d7179d2bef\nTAG: dbfdb23c13eec51652128a223e\nIN: \n\nKEY: 0ea30aaa137345525472dbaa01918c86\nNONCE: 5ab6b70b7ede3b3fb08fcc39\nCT: \nAD: 64c3471c9ee1da88220ebae0a48cf98f\nTAG: cd171585c15995cedfcd148582\nIN: \n\nKEY: b0589030b2496a3b7ef823e2cc39bfd5\nNONCE: 6b9d5bc27d46fcdc6fbc39a9\nCT: \nAD: 7639433669bd4c1a1f3b1ac04fbf9cd8\nTAG: 83328a0e57afdf647e59a2d2c1\nIN: \n\nKEY: 81b27f066e5508f361cb98b3f378199c\nNONCE: 9ead7424a30cdc069b8668ed\nCT: \nAD: c19b80309e4aa34569f3058d13372b94\nTAG: a1127f3719147804e4eaeed8ca\nIN: \n\nKEY: 61a35d01df1b36fdbce2a6fc52b28305\nNONCE: 9d1708a0221d1d9bf3354a79\nCT: \nAD: 5ed9b0cd7a5e4072cce8f782a5438d1f\nTAG: 954fd6412d4b5f93d681c27baa\nIN: \n\nKEY: 15bbdcee8d262dfcf68f451e24bf26ca\nNONCE: c33f1f1eb456e6fb6d2277d3\nCT: \nAD: a3562c2071373e21cf346fee25cec4f2\nTAG: 1ce20f2935f8b8433a6820c228\nIN: \n\nKEY: eeda4ca996042630c017972b3bdaf09a\nNONCE: 0e02cd8bb87275df5287cee9\nCT: \nAD: 4ff3c0e013efca89e774b5794a8ba170\nTAG: 3b0e6daa01ad734c2eca681bf2\nIN: \n\nKEY: 75798e2e0ee570b06d4c47786336a099\nNONCE: e17c46acd0b0bbb15a5f9349\nCT: \nAD: e3779798212e7e9b4b2f387fbbbd95fe\nTAG: 1ab3d2c1cd55a89278224fc037\nIN: \n\nKEY: af2b060a94b20c9960f94fced963b2c5\nNONCE: dc8defbb5e45227e8576f45e\nCT: \nAD: 122f529fef4445f11a34111e10fd8b5d\nTAG: bb862654b76bd729ced4b4e9ad\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: e1d07f1bc8f4a4b145badb96c85a82a6\nNONCE: 685e9636a2915adfc867889d\nCT: \nAD: 80c001fbf00b2bfd38ce903f0cd72db4\nTAG: ac9191dbb057b670dc76a194c2\nIN: \n\nKEY: ec4b3c2e077de7c2d62e28e3d05fe6c4\nNONCE: 704106b91d3a8f4dbee3ddbf\nCT: \nAD: f27dc1430cb30f8018cfc670eec9bb71\nTAG: d28d19fbedf2439140b0573083\nIN: \n\nKEY: 0dbbad4a54122500bb584787bfe94a86\nNONCE: dcad55f03d29103503858ff9\nCT: \nAD: 3c26ce754334b7fcc4576f4014349134\nTAG: 3251f275a3be44de87c5ff0544\nIN: \n\nKEY: d36cd8e8dd709b68433b4cef15efa4b8\nNONCE: dc859fa01cf3992fd5e74ba3\nCT: \nAD: 5983b73431118f294a4de08a4fbfbcc3\nTAG: 109412f2cd3dee2e75d9d90d\nIN: \n\nKEY: aa2717236879b0bfc29661187c0d2420\nNONCE: 1264dcda92ded29c03d846be\nCT: \nAD: 6b12dfb961f2e4d0ca2cea60666003af\nTAG: d69227a40670b13097d6f583\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 308a70f727df2e3c0f9da9f6607710b6\nNONCE: 1a790ff86fc2e6a428c9dd89\nCT: \nAD: fa18646779fa5a8ce9e271de0872f76d\nTAG: 68ffa9b8b2cc804935136712\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: fb01d2721acc1c4a832232bb7ec59163\nNONCE: 6cd3cf1bc45c6f26b87b95a3\nCT: \nAD: 3fde68f37caf7e0f38c0281e3fb5e9a1\nTAG: f9da75272d67a6e180764a18\nIN: \n\nKEY: 8478e6653acf07ebb766bc941953aa23\nNONCE: 143b6fe40260052ddfc4537b\nCT: \nAD: 12f49ae610cea95e776f27f0ea433dc6\nTAG: 60aa4aefb53b800e1efd64bf\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: f56ab97fbd0a2d8c6725f5a5ad117a2c\nNONCE: 266a436d9d05ee331a3ec858\nCT: \nAD: f31a01cd934b44208e9abe08c21f8be7\nTAG: b07258864aa6083fc15899e7\nIN: \n\nKEY: ba8a42bcc9d0bcbc9129d536d2364ebd\nNONCE: 6fc5c4ddb461acee4e3c2271\nCT: \nAD: 6bbb55b97c9cc3cfffa4f450b0debfee\nTAG: 3696c121fbb1def560c14182\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 827e4e3e9a4de530ae43510b94a55d54\nNONCE: d6c7fba9a73e76f6d1b015c6\nCT: \nAD: 3beff1d14cd6021b709d399d02015b05\nTAG: 2d58236b7e8113c821ddb4a0\nIN: \n\nKEY: 608ab3f94dd16b51c9afe4ba8dbdf852\nNONCE: a7b32bc6c976e8bd839f9af9\nCT: \nAD: eb212ef0a3a307024978a2c41a41d8a5\nTAG: 7aed47ba76b07717558bb87b\nIN: \n\nKEY: ef50e9ca5c53c2ddf49ccbd3c41a5a56\nNONCE: 817bee5ddedd26601cdb7cbc\nCT: \nAD: 75e26952eeaae53d83f77a3a502d3ca3\nTAG: 37245789deaada2d0dc5f2d4\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: a9811b598adf0bbc34395b43829e86f6\nNONCE: c0def2f064789ad5d8f63799\nCT: \nAD: a735aab3b327ca3f575a09157b77a1c7\nTAG: 9f457e8e4757dae5cbd395bc\nIN: \n\nKEY: 3d906fa69252e00551b4a6347fe367ac\nNONCE: 067ea32f23e29d116fb0512b\nCT: \nAD: 4bf2a2096e27e75448cde7744b0209b", @@ -1515,9 +1521,9 @@ "45795cf2a4ea1f33cbb4e1d769231b72a590ce3dc408ec7386a265d65102833edd8dd43b718e9ccf2655ccab0a6022dd81f6697544d9e8bd69c5e6511879686dc2d936cf9e4fb23ef1273fb61eb7bd62ab2b8c49fb916368d7f4a1fa081fd9b3633c1e4cf\nIN: 15ecba6f0f8a42236d020573bbc866d29a86dbff689694e0ba3087bcaade496eacf110d903cd99b81b808c6ecb6f36cb990b63\nAD: 6e848ab8f7f4971a52cbcd42eca24d33a8ba4a43a473444fe2a5f69cac5209779939349d7a73e65db30ff0adbdbf7f99db3f4a810764e4edde1a95b6138e08c7c939549d83aecd46a84a9b897b6896ab07a6a9de663376d6197d\nCT: 9c7d13e78bacc849c76072c527abba06046075fae2a3d13079f0f66635a521e0e1e822e05e009ce3aa788052f5600c00e71031\nTAG: cf632f67bc5092e0\n\nKEY: b4166038b75dec191fc0ddf8375ff4c7\nNONCE: 7f4ab1196310affe7d2d3c165f48c4a5652dc76e0baa1497727a87c49b445d350e810e8b73f9d53590fcc041a863971bf70c715f90bc594a5b98c521b0a91907b0058583f48aa10aba51c45937dfad510b5772e4875186954a575e906e48efa26bb1cf6201fec8f13a3a477da68fb6288b3573095d7027c1fea292d0ba2f2aa0\nIN: e4f6678ac787f6b6ea1c2f04ebae8afdb8941f1ca363f5654d4822358d6041af03979e269f070ba9f03e814114bedaea88a203\nAD: b9bf722d2eae013fa11c49f3475514f9592556abfc334cf9dfba3cfe37d0de7d7c996eb6712facb376651178585d4a60844f52e2590837c35acf169817b692bfae8d08ef374bba4bb0301005b4aae16c54f848b8226a312ad6b3\nCT: b16224062ade5afd4796e658b3beef0d13683e494aa0d745d930378d4b8bd0465f4e58b8ec9c85e97779a461a426e337abe399\nTAG: 3fc244c1caca2757\n\nKEY: d16e4e7ec43a42bd7156f259b369ce93\nNONCE: 34834e81b1ed4ea895cc76788c3adb48c2884b213a46f24a2012a5d06dd6a7175b61d9d4ffdc0e00c54163280b2ed247be68788866094b5b8846e0da034940f800cf3dd0ccd44163a085cb0194461fbde7d621e029fe3effbdde9d856d70fa3398ace4216a94d530b71408bdb9d3036ec81a8a21df120965629c13b796d7d9a7\nIN: 3c6791d91654bf4069f7ccce712fcfb82dac85f2669b80dae7d23f94ebcb280ef621ed8c5cc77fc582dc4f8240061b5e269a1a\nAD: 4bfeb3935a388f15b7418182f8b37c61487865f519c5e7dfbfa4c3b74e60398d82d449ed418ee301895bcd8ddf5a9d50b74037af9a261bad3633600ba7dc79f06a5f09f350ad43c90c27f744779e82f850e23fd79136adafb555\nCT: aa546ace6bd092399bdefe0ab0985f9c380006117be38648e3a0da80cf4d32ece831c06e532b9324fd1df14a6acf8d75275fc3\nTAG: 7068e4ca6ac26998\n\nKEY: c4a8b2c99b62a2a64f8086aab1fd6c43\nNONCE: 2e6d6f434c72c71560f05b55fb7c07e310260aec112aab0e64e8f87fe738fc1b23dea859bbefbe9545fb575fc0a6d45fef42af09dccc9fde0a52ee84afe8d1339641ee5e00239e42b310d9acfd428c2075d93112bcf9ebe728707966ec29b1f72e87cccf75a2255875bf78abf0cd6534520625ac7d0df18bd6a1fd613f894198\nIN: a77ccd123128b46d9144fc5a90ec64bce6b4b5efc5646c8d4961eebe253235baeb236d8af9d1d81ad2bd4c86db78c31c1c8c90\nAD: 23463bb91dcd4716b7364e71a2ebe5e1aaef3cba8ea4214dbd6a987c9850af86518747c4869e00ce244f418ce19f0113705999aac35ad0bbda719573d69101046b34df89774d0093684ad7ec66eb509d8e7c25f552956c488095\nCT: a3632572e59a7c558d5e1ee9f5c059a5e118964c14e3d4e953b5c15d105db76bf970ed17bcccd84162feecbb3fc93d7015143a\nTAG: 27ccd8eae70c6ec9\n\nKEY: 2633d1781ce54f74ac609a5b5209a01f\nNONCE: 7d0e90b7e9f36f760d2dcbd66f352df45f3917afdbe1d0a89cc44be0bd85cf8bf75edbdd33f1d16dad02824d81389210b0f146f3df63f9232d7035eb9e8297a09474985b3e038a5fa6840155d8848fc7c53061ba0f442b84408660a997176ca5bf3473103fd3c9a1de2580b9e539af872259ecae925a8ef50f5a176a069b1fb8\nIN: ae695828625b264e0b13d3c9a539f2cf306a7501cdd35b817b699b2d7c25cf20d2dceec3fa883019db807272fddfdca8e7f672\nAD: 584c3cad3035d1427d6f5f1b261e97a5ea7d97c0b88cedf3b1aa5e21e5916805a63964eab4449d8806e7af60618465cf39f82769b7528bba9bb9c04992cd7b9e26efe9be38e1bfeeb41678c52d5ba3508fd7a2b1e8478505bfde\nCT: fbc32a56885100a36c276ff368db9236906021a8cc7500f2b3e78a6ca01546827073ff1103145f139f4d116eb47b84e33c7160\nTAG: 49589b3a\n\nKEY: 62dc8e1a98863c7de64f30b74c01d530\nNONCE: e9f658589f973895510cb34eef99b0cf34fc311c20c21464e07c4d6d34a15fcad3ea9ef51ef05513fb700cbb92aeef35e4cdda47b2c06c1104e987afa1cd6f827e7bc5a8db6d0657345945c068cabfd6e6b57533c929fe5804e121809b8b43d050a211fbee319879b1ba4cc2768df3a92014839086a377663a1d1967d7c602e9\nIN: f2c54a35286a225389e853e51f3f64b6980a79262e5545856c053d558d87d7b739eb75f27587efe219eb82e9a176fa14419dbe\nAD: 5d78b486c29131866569768d5eedb61afc48de7d1a223d0cccc647cf35408bb932293f3bc1b51a504e13c27548d083c8e8a45d4e9d4dc923c3c2bde38d6cdeaed2929b67e371356f74f635b3b1183ee0db71476f2024e1f5e13c\nCT: fe0c3ae08418ef91b478360942a84a58f8d93df7fe5bde138f59cc23432f04b9637841ccf7a5d539a36f621a7d17e026d4cc2c\nTAG: e413041a\n\nKEY: 9cb4b060870a2563d9f38b7c84f45ad0\nNONCE: 6f268f644af70b43d71c881009a29d966d4d4b13e9a22dae30c299d69d195f92d7ac45579444358acb2de20b78afa3f258eae68f7abc68a664f375efe43f8d39c69668931dd0daba24c8fb74b0a0eca13434ee9573246d342a91514a2495b6c8fce8ec9ecfc93400601d80ac9c4711777a7cc00086d31cc536c05b961c4fc5e8\nIN: 0f75400a6deb4427878b0ac3a1cc3950b39531716cab167ba2113aac383627b173ccd942858b0a3dc5bea3144f9a52179a8565\nAD: 99932f2dcd9dd63a4af30ede3b00d8e12fd24f2328fb03a3251cb1ff9b67b9bfcfe5432e444d4d60a8ce6a39fa41a391c0bccf686d9ac044f72c60ee8f3f26b8355267343b31bc0d2886c84dc6bb1c7c20388c16d04fada74915\nCT: 872ffa67cc633f74ad29cb8b0595989c0c79a5028f629b2800d1412abf1df68a10142e760ecadafba3361f2d43afe79c29c168\nTAG: 15851c9b\n\nKEY: b9587f9d7f881ec94a096b7fddfdc5ce\nNONCE: 107ab768521c30b4778ff9191934249561b8df2e803190da64de20f05979d2376ff6c048aefca35b246a888319b21306f52d1f1f1913545f532a3cf1de4cd52b926321a5a27f501bda538e1418c4b07599a9f897cd6d37320d1e08ffd4a2697bdf91fd5123038ccafd38457e061e3c48def212f94a5efe259ff276ee86c91337\nIN: 5d69699972afef8d1a7fcbb513a87dfdcbfcf01c367d5a378a649cbf92812c6da38815270a9ba0af4be351ad8b062a73a7f63b\nAD: a9d648927fce9991ae15571e1f7810536b41714506ee0197b9471e06613bcb8636203c1c67b93af6d1545baa181c2a149ac471dbd54dbae9784848a4b7ac6894a67bf40ed892df9bc720376e866e92c05c16bc58db1286d5ccb4\nCT: ee550d3368a1115d9cbb1dc37715d7e16e827eabc7d73b537c4cb6fd437e7c88e4afac6ee8807046f0da4788b3b26eb31e4a58\nTAG: dcd71cee\n\nKEY: 1e0c8c8cd53c942ca29dd3d202eb343f\nNONCE: beaf4a32b50c86f92611d7ab665ba344a12f8e5b281580f043633e9bf515d572520b23bf9e5214c38ab43fa4ef2f1a1bca05bba703c5c529943f069ea6f6053e8af0c7eb751b628a82e3ac22ada6e17a12152ae2d5d4162f70e34a8d0685af1d174db91cdc1c103678245cd9483753aca6ac240e5909c18c84f0c090dede24ee\nIN: 2dba40b971012ee4f3b443fd815726065859a28a06d22a1c35cd04529c7b805999cde4ce370b2ed3ea675428dcf5a3a99f7622\nAD: b61a1b5501326d7e67387500835f788574d21fa80df4a9fc6184259a8f0fd8180ef988e12baa645b7500ee246ea52284722051ec4c345a803714f2bc8f02dad385c575128cc6247ca3d293e2b487327f69b0304d402f97dcfa5c\nCT: ce5e806ad840e78042c2e0da0ff3af376a1f7d38adcab0226da6d34887b2b3ae17efcafeb0e32f5070d7cdb850c9ab5b0d8614\nTAG: 6d82627c\n\nKEY: 2fadbffa3eae8caba795506e9d9db0ef\nNONCE: f67d45a1d51912eed0e80d5f5ae05ce4c2c381aee2c4a391823df6b44ad123802602160cd679bdf893dc3aaa547a604e7d1e94de79523891ad32fc0943c822cfb995e5efa197f37a885aab5fd91d47c5ccf852977d7e689f663c5e933a5a72eb4417fce7f3a635cdcaffd60bfa875ad6c2f72cf284831fe640a23fdda21fcf77\nIN: 2f01fb5b9036ab22af19b326769f332b3f6adffbaa9583474bcc5499e00413f9b273a76412ce7d268f12471c078600a2f15bef\nAD: b872df430bd4400030ec5c38289a4be8d4bae608023b6f3922aab24f75bc0d29c2fc378bfdf47a99d7d3d53e1ea2e9420c2752f5b9b6e06b18b9eebd2344e190c4c1ee0f60b14ca89b5c8d3a25c9546a2d013b22ee9fbf92a247\nCT: c1d0f6f53c885b6470372f7d7468eb42fa1f4e20b540a68cac91060050f430d27c50e85403428a75de816c4747776476ae4e3d\nTAG: 8a457c98\n\nKEY: 3f3ec6bb52cc9a725abbf7b9b3f9fa4d\nNONCE: a700805e157f5fd7cec77bc556c2ad7e662c4b55b284970175d0476189822855d44fdecbe28b3fe7a73a6040e6994b8460262b5b5ac1049dbcf4a5febe21eb8574d3a679cc480958852efe787746b4b85acb86757cc855b9db99193208029ad1446631e4a101a115122a98e861c62ef1e3d6587122353b5f958420dc7c80d751\nIN: 07029e02ff512e948112d4f51d5f86d04edd2003447aba21f3976a7200f765130b8971508acbdaa6191c7691dccdde8617a86b\nAD: c6ca6cc319e5296e2ee085036193bbfc4e25a6079dfce25171ef0a2dd569355c73c69cfba69dfac17834ed3226886c07e5461bd605e83be4edd20173f395b37093bef321949d8a0797987796b30aa3387bfd3137506d6fbe5080\nCT: 3b26164ad8088f7e16ae82bd48c7c09230b05a820ea8f89cb4ca54529ccfd74addc308d00ef18f6712d3beac1946ab7da0852e\nTAG: 7e25563d\n\nKEY: 2f2f448e677da243aed2046c864db4dd\nNONCE: e0e01fea2c7c412f6365486b8859d1955075d82f68fb217047db274042d5fec731765541c2111e2ebd17894fd38b82cfadaa34c16526c1bc2efd3b8d6eacd7c4643da5288f37a0c61e8eebf6da76d641ad4c6545c0d7a7d4ae4a23373687e08b8e2d9c457ceff49947bf59e96db4f7304665584d22a0bc858a49721987afa904\nIN: 07a1024ae506ac70abb723c606eea5f6df328195c2f5a3fb629dd2813251abc7d3874deccca999", "44caefcb83f5bbbf36566807\nAD: be09b05e89a7e910f21607bed4e950d120e9d935c715023febdcd4639de7e440189aac53009cfbcd2acb230688abca97165943c65b1e8ed24ca72c4b57084e0610040929b918922d0f1b8a0d25c8cce46889add73b0b6d8a89bf\nCT: 15e4f0f567861361eb342ca281bf1b860f6681b33ba7c547682c4e92d48805cccce12b4be0c3b13af464fba9e79c561e3f0f00\nTAG: e7a6dfb2\n\nKEY: c35b35f68743e2e4f88bb48059f2e21b\nNONCE: 2dfae4843d58be3cc005915c357c5bdfaf7c4e7817e0164b123ec1ad08187269c323568f2bb80c50100b0de276dee9c81ba98801b848bdfdd6185a1926b3eb6adf1df193a6609932a150e0eeee08ee58d3027c712cc729abf9e7bfd3d5b328aa2887109b606704cee0455bf7135a3b4179c8aa86ac31e5e3209c04921975fb83\nIN: b1f1dd264e4f26da74f839728cf70743ef435c016a6549b17b70ac93ac37b0e97bbc3fd092dc07f2b020527b781a38f8d2687c\nAD: 65556a625bfa8b96e71ab5eca7bacb87c9140828b8605d9f3e441628d76281d5a5aca1fec44f038162977cff46d64f965bc4f94214fc63cc56c496aa9aca5adb855faef1f54123633a5d4dc367ab3cceb0c9e42eff3d981945d6\nCT: dabfba195ac7f737153810c3b6db598e2e346af941108f6535b3cbd389428280daf4d86b78148197fd6e0831434a0fdda3bf93\nTAG: c85e1c09\n\nKEY: f6e086357ed6cb07dbb463aa500ae69c\nNONCE: 15b56fb043a72881081a72bce9298e21fe60aeaf1e4b4a85bde873930adecb48d4c8f17362aef0cdf2c3bbbdbc00ce29669b633f181bfcb85c44511c5754ca07595dbdcd335b0078ebf8b09f5190096a9078259168b5a5e1b79211b62d8f0c306e5a0c4e81ea0c6c78e63f5529b633c28494c6f0a42ffe51be150df24aed1602\nIN: fe49c833bfcb93c401b3483d7c7fc9fdaaf3a2146bcc36e0ffe37ef1ac6ce855d0fad3675c9c9fe7cb908589cddf43c4c35421\nAD: b3f36b821f294d33a90c4675aba4b32f32abc3683843ad1689acf130a43a3b21b3473d3a6c7cccecd4c767a7682a26fc524eb6c9688719acfd708c304d3db201b662f48610cbb6c1ae521f00de7904d668b95b812be2b4298807\nCT: e56f27f5aea684a8421f1d559b56d80b3790cf3fbb5cd309f2866ae628c8196605edaca9be512cf6a42e53aca4478405a95d6a\nTAG: d2d608be\n\nKEY: 0dbefe872ed2ea2a964fe991541ae834\nNONCE: 82f382aee615f224677e876367268b31c89981e816c7c5a5ed1c7fa50370ce6a6e13dc2d1ffefef5d317302e22874d28fc67e0cf4d6fdbf1b5c8ff5645256378eca8426454ea600376aadf02d17bc171e40faa2e62530235063e73ac50d06c2a88d9e5e35739cffe8ac70aa2c4f4e00716052f823e0dcdd2b4b5afacbc79f4c1\nIN: 8445831a7b481e187978afbf195eb65eac1ebf3acf1fa452da79248ea484c9bc00d233c2e3b827de9b46bad3726c315080ca7f\nAD: 72caa4d008c9f7f9667fb98501c7e44972f491a8723db27e4a404d377cb4456234f9b56b9235087e25016e00cc6e6be08de7d8739a546db4a78407cc9200404332955a3c68d1f3c6bebf9c74d2e9bc54dc1c56c6b62c72bad6d0\nCT: 800fa98daa36955ab30dd4044756cccf382210a6548069d2f740094c29bdd10ba9bb0db0ca7a7db5fdaf2217c59ff5e0bce136\nTAG: fbc8e65c\n\nKEY: 92666e547ca6722278bc41f78c606014\nNONCE: 2e9733e8dc10ca3964e96b56839fbce9969f5f821fdf2f278e5465b6cf3fac8ed407d04b602209a0c97c14b710f6a3f29f65a1599869139f8061824745ad4470406956d3018eec8ff2584164db279a5a5f724030fa8478e7dacb949e473dee12332fd611bd66b06faa380b57b530a5cac30f3aacd607233c22460240edad253d\nIN: 97ce2ebd1850551b96813179b2bad2270eccf7195fe70273c9b4045e68a501781e47f808cb248326cb6425635db1d516ec760f\nAD: 20d0f02f1346ed9c8a697a5b507ed482033a177d4a71bd694b1533e94b72aaf54e48be64b6f7a30b2c6e94a00159ad60ce84d677d035790591a00e8068275e5caebe185bdb14ad24ab41e8fa3d0f4e19f57a390707efcd191cd0\nCT: 44af16eb4079f52009592436a0f1d7373a992fb5679c048466804495b9e1264e8292afe33c2661e30d3c2fedab5963bf0c63f5\nTAG: 917b6024\n\nKEY: d3f7d84e2a2f2e45e19e7dd4432f6cbb\nNONCE: bf1b1afa5c28d0f6883a12a4eb984ee8edd3c75e91d44628eb1133bad58506285961fd3d2d3f671788895a55824022c4b5a2ee0e470124c9b7cc00d6082e95991deedff69e366e9eb96a9e814e58e89c58abb224dc13d78db68797bbccdacf082f8563cc4c40137203c206476668482d51eee902c7e3344e7355ac18b61d3e1a\nIN: e02d21da508ab1157ec2aee2c18a924a34b84d7746bba79da3662402c111d686fb5f50a8831f01623e1b22f1a79b2cd014d715\nAD: 951ea13d95700d0c97e12df456280532ef86260307cf95375211b7fb44c3eb50ddeb5ef350714ac2c620ef8f66eb0da1796915400210568360d571e58de7d30e06b812112069667370376812e4e593362226997fe2947ded6371\nCT: d948b5f4f415423b656abf715c9fc756f90117f694b32961fa8f4bf003cffd463716644eef0ce5919dca38788e0df24a7d1367\nTAG: 19a23818\n\nKEY: 357e9c3ab5323ff141bdf17228b80a61\nNONCE: de8cd40a5db81e8b7083807a8a5c16d4808f48c52a56c68b77edb01b563f80513518eac2672c8f5524aa6e3850337233c693dec99a547cf6599dc33a6d89763e5f91d9a74715c9a635ed1931403b2fbec8be85f287506ed4bd7da3c6e2b25e29becf9466f4abdf3b0daa4818a7f31563fb5be7aba7cbd53c6522331fc04d4573\nIN: 995142af8870fd1c805aa9919f76485dc1fed5ead1e8366633ef09db5595c1a305bd10d945409148744d3998aba6434172087f\nAD: 863ebc2231af641f620f618567007847057146db69b1066dc1c4464d251729eb6ea3871d3e997e71a963439e9d81691a7196ddd439748e795a2cc62b8382a61e79863259cb643851f9a271130e0f9f54e15f0dc3ec8b27084c39\nCT: fc12b78280d4a9eef7d536f2f5b3b3d63cf641e07f6b91332b9200d224632c5b1ee41ee136693bf0c26d569e998d9a09ad24f8\nTAG: c0f7d0e6\n\nKEY: 0e00c76561d2bd9b40c3c15427e2b08f\nNONCE: 492cadaccd3ca3fbc9cf9f06eb3325c4e159850b0dbe98199b89b7af528806610b6f63998e1eae80c348e74cbb921d8326631631fc6a5d304f39166daf7ea15fa1977f101819adb510b50fe9932e12c5a85aa3fd1e73d8d760af218be829903a77c63359d75edd91b4f6ed5465a72662f5055999e059e7654a8edc921aa0d496\nIN: fef03c2d7fb15bf0d2df18007d99f967c878ad59359034f7bb2c19af120685d78e32f6b8b83b032019956ca9c0195721476b85\nAD: d8f1163d8c840292a2b2dacf4ac7c36aff8733f18fabb4fa5594544125e03d1e6e5d6d0fd61656c8d8f327c92839ae5539bb469c9257f109ebff85aad7bd220fdaa95c022dbd0c7bb2d878ad504122c943045d3c5eba8f1f56c0\nCT: 4f6cf471be7cbd2575cd5a1747aea8fe9dea83e51936beac3e68f66206922060c697ffa7af80ad6bb68f2cf4fc97416ee52abe\nTAG: e20b6655\n\n", }; -static const size_t kLen23 = 5321952; +static const size_t kLen24 = 5321952; -static const char *kData24[] = { +static const char *kData25[] = { "# Generated by \"make_cavp -cipher=aes -extra-labels=Cipher=AES-192-CBC kat_aes/CBCGFSbox192.rsp kat_aes/CBCKeySbox192.rsp kat_aes/CBCVarKey192.rsp kat_aes/CBCVarTxt192.rsp\"\n\n# File 1: kat_aes/CBCGFSbox192.rsp\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 1b077a6af4b7f98229de786d7516b639\nCiphertext: 275cfc0413d8ccb70513c3859b1d0f72\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 9c2d8842e5f48f57648205d39a239af1\nCiphertext: c9b8135ff1b5adc413dfd053b21bd96d\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: bff52510095f518ecca60af4205444bb\nCiphertext: 4a3650c3371ce2eb35e389a171427440\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 51719783d3185a535bd75adc65071ce1\nCiphertext: 4f354592ff7c8847d2d0870ca9481b7c\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 26aa49dcfe7629a8901a69a9914e6dfd\nCiphertext: d5e08bf9a182e857cf40b3a36ee248cc\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 941a4773058224e1ef66d10e0a6ee782\nCiphertext: 067cd9d3749207791841562507fa9626\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 275cfc0413d8ccb70513c3859b1d0f72\nPlaintext: 1b077a6af4b7f98229de786d7516b639\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c9b8135ff1b5adc413dfd053b21bd96d\nPlaintext: 9c2d8842e5f48f57648205d39a239af1\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4a3650c3371ce2eb35e389a171427440\nPlaintext: bff52510095f518ecca60af4205444bb\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4f354592ff7c8847d2d0870ca9481b7c\nPlaintext: 51719783d3185a535bd75adc65071ce1\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d5e08bf9a182e857cf40b3a36ee248cc\nPlaintext: 26aa49dcfe7629a8901a69a9914e6dfd\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 067cd9d3749207791841562507fa9626\nPlaintext: 941a4773058224e1ef66d10e0a6ee782\n\n# File 2: kat_aes/CBCKeySbox192.rsp\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: e9f065d7c13573587f7875357dfbb16c53489f6a4bd0f7cd\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0956259c9cd5cfd0181cca53380cde06\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 15d20f6ebc7e649fd95b76b107e6daba967c8a9484797f29\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8e4e18424e591a3d5b6f0876f16f8594\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: a8a282ee31c03fae4f8e9b8930d5473c2ed695a347e88b7c\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 93f3270cfc877ef17e106ce938979cb0\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: cd62376d5ebb414917f0c78f05266433dc9192a1ec943300\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7f6c25ff41858561bb62f36492e93c29\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 502a6ab36984af268bf423c7f509205207fc1552af4a91e5\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8e06556dcbb00b809a025047cff2a940\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 25a39dbfd8034f71a81f9ceb55026e4037f8f6aa30ab44ce\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3608c344868e94555d23a120f8a5502d\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: e08c15411774ec4a908b64eadc6ac4199c7cd453f3aaef53\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 77da2021935b840b7f5dcc39132da9e5\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 3b375a1ff7e8d44409696e6326ec9dec86138e2ae010b980\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3b7c24f825e3bf9873c9f14d39a0e6f4\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 950bb9f22cc35be6fe79f52c320af93dec5bc9c0c2f9cd53\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 64ebf95686b353508c90ecd8b6134316\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 7001c487cc3e572cfc92f4d0e697d982e8856fdcc957da40\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ff558c5d27210b7929b73fc708eb4cf1\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: f029ce61d4e5a405b41ead0a883cc6a737da2cf50a6c92ae\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a2c3b2a818075490a7b4c14380f02702\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 61257134a518a0d57d9d244d45f6498cbc32f2bafc522d79\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: cfe4d74002696ccf7d87b14a2f9cafc9\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: b0ab0a6a818baef2d11fa33eac947284fb7d748cfb75e570\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d2eafd86f63b109b91f5dbb3a3fb7e13\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ee053aa011c8b428cdcc3636313c54d6a03cac01c71579d6\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9b9fdd1c5975655f539998b306a324af\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: d2926527e0aa9f37b45e2ec2ade5853ef807576104c7ace3\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: dd619e1cf204446112e0af2b9afa8f8c\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 982215f4e173dfa0fcffe5d3da41c4812c7bcc8ed3540f93\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d4f0aae13c8fe9339fbf9e69ed0ad74d\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 98c6b8e01e379fbd14e61af6af891596583565f2a27d59e9\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 19c80ec4a6deb7e5ed1033dda933498f\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: b3ad5cea1dddc214ca969ac35f37dae1a9a9d1528f89bb35\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3cf5e1d21a17956d1dffad6a7c41c659\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 45899367c3132849763073c435a9288a766c8b9ec2308516\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 69fd12e8505f8ded2fdcb197a121b362\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ec250e04c3903f602647b85a401a1ae7ca2f02f67fa4253e\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8aa584e2cc4d17417a97cb9a28ba29c8\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: d077a03bd8a38973928ccafe4a9d2f455130bd0af5ae46a9\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: abc786fb1edb504580c4d882ef29a0c7\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: d184c36cf0dddfec39e654195006022237871a47c33d3198\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2e19fb60a3e1de0166f483c97824a978\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 4c6994ffa9dcdc805b60c2c0095334c42d95a8fc0ca5b080\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7656709538dd5fec41e0ce6a0f8e207d\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: c88f5b00a4ef9a6840e2acaf33f00a3bdc4e25895303fa72\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a67cf333b314d411d3c0ae6e1cfcd8f5\n\nCipher: AES-192-CBC\nOpera", "tion: DECRYPT\nKey: e9f065d7c13573587f7875357dfbb16c53489f6a4bd0f7cd\nIV: 00000000000000000000000000000000\nCiphertext: 0956259c9cd5cfd0181cca53380cde06\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 15d20f6ebc7e649fd95b76b107e6daba967c8a9484797f29\nIV: 00000000000000000000000000000000\nCiphertext: 8e4e18424e591a3d5b6f0876f16f8594\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: a8a282ee31c03fae4f8e9b8930d5473c2ed695a347e88b7c\nIV: 00000000000000000000000000000000\nCiphertext: 93f3270cfc877ef17e106ce938979cb0\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: cd62376d5ebb414917f0c78f05266433dc9192a1ec943300\nIV: 00000000000000000000000000000000\nCiphertext: 7f6c25ff41858561bb62f36492e93c29\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 502a6ab36984af268bf423c7f509205207fc1552af4a91e5\nIV: 00000000000000000000000000000000\nCiphertext: 8e06556dcbb00b809a025047cff2a940\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 25a39dbfd8034f71a81f9ceb55026e4037f8f6aa30ab44ce\nIV: 00000000000000000000000000000000\nCiphertext: 3608c344868e94555d23a120f8a5502d\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: e08c15411774ec4a908b64eadc6ac4199c7cd453f3aaef53\nIV: 00000000000000000000000000000000\nCiphertext: 77da2021935b840b7f5dcc39132da9e5\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 3b375a1ff7e8d44409696e6326ec9dec86138e2ae010b980\nIV: 00000000000000000000000000000000\nCiphertext: 3b7c24f825e3bf9873c9f14d39a0e6f4\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 950bb9f22cc35be6fe79f52c320af93dec5bc9c0c2f9cd53\nIV: 00000000000000000000000000000000\nCiphertext: 64ebf95686b353508c90ecd8b6134316\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 7001c487cc3e572cfc92f4d0e697d982e8856fdcc957da40\nIV: 00000000000000000000000000000000\nCiphertext: ff558c5d27210b7929b73fc708eb4cf1\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: f029ce61d4e5a405b41ead0a883cc6a737da2cf50a6c92ae\nIV: 00000000000000000000000000000000\nCiphertext: a2c3b2a818075490a7b4c14380f02702\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 61257134a518a0d57d9d244d45f6498cbc32f2bafc522d79\nIV: 00000000000000000000000000000000\nCiphertext: cfe4d74002696ccf7d87b14a2f9cafc9\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: b0ab0a6a818baef2d11fa33eac947284fb7d748cfb75e570\nIV: 00000000000000000000000000000000\nCiphertext: d2eafd86f63b109b91f5dbb3a3fb7e13\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: ee053aa011c8b428cdcc3636313c54d6a03cac01c71579d6\nIV: 00000000000000000000000000000000\nCiphertext: 9b9fdd1c5975655f539998b306a324af\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: d2926527e0aa9f37b45e2ec2ade5853ef807576104c7ace3\nIV: 00000000000000000000000000000000\nCiphertext: dd619e1cf204446112e0af2b9afa8f8c\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 982215f4e173dfa0fcffe5d3da41c4812c7bcc8ed3540f93\nIV: 00000000000000000000000000000000\nCiphertext: d4f0aae13c8fe9339fbf9e69ed0ad74d\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 98c6b8e01e379fbd14e61af6af891596583565f2a27d59e9\nIV: 00000000000000000000000000000000\nCiphertext: 19c80ec4a6deb7e5ed1033dda933498f\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: b3ad5cea1dddc214ca969ac35f37dae1a9a9d1528f89bb35\nIV: 00000000000000000000000000000000\nCiphertext: 3cf5e1d21a17956d1dffad6a7c41c659\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 45899367c3132849763073c435a9288a766c8b9ec2308516\nIV: 00000000000000000000000000000000\nCiphertext: 69fd12e8505f8ded2fdcb197a121b362\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: ec250e04c3903f602647b85a401a1ae7ca2f02f67fa4253e\nIV: 00000000000000000000000000000000\nCiphertext: 8aa584e2cc4d17417a97cb9a28ba29c8\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: d077a03bd8a38973928ccafe4a9d2f455130bd0af5ae46a9\nIV: 00000000000000000000000000000000\nCiphertext: abc786fb1edb504580c4d882ef29a0c7\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: d184c36cf0dddfec39e654195006022237871a47c33d3198\nIV: 00000000000000000000000000000000\nCiphertext: 2e19fb60a3e1de0166f483c97824a978\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 4c6994ffa9dcdc805b60c2c0095334c42d95a8fc0ca5b080\nIV: 00000000000000000000000000000000\nCiphertext: 7656709538dd5fec41e0ce6a0f8e207d\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: c88f5b00a4ef9a6840e2acaf33f00a3bdc4e25895303fa72\nIV: 00000000000000000000000000000000\nCiphertext: a67cf333b314d411d3c0ae6e1cfcd8f5\nPlaintext: 00000000000000000000000000000000\n\n# File 3: kat_aes/CBCVarKey192.rsp\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: 800000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: de885dc87f5a92594082d02cc1e1b42c\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: c00000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 132b074e80f2a597bf5febd8ea5da55e\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: e00000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6eccedf8de592c22fb81347b79f2db1f\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: f00000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 180b09f267c45145db2f826c2582d35c\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: f80000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: edd807ef7652d7eb0e13c8b5e15b3bc0\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fc0000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9978bcf8dd8fd72241223ad24b31b8a4\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fe0000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5310f654343e8f27e12c83a48d24ff81\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ff0000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 833f71258d53036b02952c76c744f5a1\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ff8000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: eba83ff200cff9318a92f8691a06b09f\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffc000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ff620ccbe9f3292abdf2176b09f04eba\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffe000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7ababc4b3f516c9aafb35f4140b548f9\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fff000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: aa187824d9c4582b0916493ecbde8c57\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fff800000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1c0ad553177fd5ea1092c9d626a29dc4\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKe", "y: fffc00000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a5dc46c37261194124ecaebd680408ec\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffe00000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e4f2f2ae23e9b10bacfa58601531ba54\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffff00000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b7d67cf1a1e91e8ff3a57a172c7bf412\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffff80000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 26706be06967884e847d137128ce47b3\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffc0000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b2f8b409b0585909aad3a7b5a219072a\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffe0000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5e4b7bff0290c78344c54a23b722cd20\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffff0000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 07093657552d4414227ce161e9ebf7dd\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffff8000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e1af1e7d8bc225ed4dffb771ecbb9e67\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffc000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ef6555253635d8432156cfd9c11b145a\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffe000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: fb4035074a5d4260c90cbd6da6c3fceb\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffff000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 446ee416f9ad1c103eb0cc96751c88e1\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffff800000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 198ae2a4637ac0a7890a8fd1485445c9\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffc00000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 562012ec8faded0825fb2fa70ab30cbd\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffe00000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: cc8a64b46b5d88bf7f247d4dbaf38f05\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffff00000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a168253762e2cc81b42d1e5001762699\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffff80000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1b41f83b38ce5032c6cd7af98cf62061\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffc0000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 61a89990cd1411750d5fb0dc988447d4\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffe0000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b5accc8ed629edf8c68a539183b1ea82\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffff0000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b16fa71f846b81a13f361c43a851f290\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffff8000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4fad6efdff5975aee7692234bcd54488\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffc000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ebfdb05a783d03082dfe5fdd80a00b17\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffe000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: eb81b584766997af6ba5529d3bdd8609\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffff000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0cf4ff4f49c8a0ca060c443499e29313\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffff800000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: cc4ba8a8e029f8b26d8afff9df133bb6\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffffc00000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: fefebf64360f38e4e63558f0ffc550c3\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffffe00000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 12ad98cbf725137d6a8108c2bed99322\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffff00000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6afaa996226198b3e2610413ce1b3f78\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffff80000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2a8ce6747a7e39367828e290848502d9\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffffc0000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 223736e8b8f89ca1e37b6deab40facf1\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffffe0000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c0f797e50418b95fa6013333917a9480\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffffff0000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a758de37c2ece2a02c73c01fedc9a132\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffffff8000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3a9b87ae77bae706803966c66c73adbd\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffffffc000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d365ab8df8ffd782e358121a4a4fc541\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: fffffffffffe000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c8dcd9e6f75e6c36c8daee0466f0ed74\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffffff000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c79a637beb1c0304f14014c037e736dd\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffffff800000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 105f0a25e84ac930d996281a5f954dd9\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffffffc00000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 42e4074b2927973e8d17ffa92f7fe615\n\nCipher: AES-192-CBC\nOperation: ENCRYPT\nKey: ffffffffffffe00000000000000000000000000000000000\n", @@ -1538,9 +1544,9 @@ "0000\nCiphertext: 0882a16f44088d42447a29ac090ec17e\nPlaintext: fffffffffffffff00000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3a3c15bfc11a9537c130687004e136ee\nPlaintext: fffffffffffffff80000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 22c0a7678dc6d8cf5c8a6d5a9960767c\nPlaintext: fffffffffffffffc0000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b46b09809d68b9a456432a79bdc2e38c\nPlaintext: fffffffffffffffe0000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 93baaffb35fbe739c17c6ac22eecf18f\nPlaintext: ffffffffffffffff0000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c8aa80a7850675bc007c46df06b49868\nPlaintext: ffffffffffffffff8000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 12c6f3877af421a918a84b775858021d\nPlaintext: ffffffffffffffffc000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 33f123282c5d633924f7d5ba3f3cab11\nPlaintext: ffffffffffffffffe000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a8f161002733e93ca4527d22c1a0c5bb\nPlaintext: fffffffffffffffff000000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b72f70ebf3e3fda23f508eec76b42c02\nPlaintext: fffffffffffffffff800000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6a9d965e6274143f25afdcfc88ffd77c\nPlaintext: fffffffffffffffffc00000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a0c74fd0b9361764ce91c5200b095357\nPlaintext: fffffffffffffffffe00000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 091d1fdc2bd2c346cd5046a8c6209146\nPlaintext: ffffffffffffffffff00000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e2a37580116cfb71856254496ab0aca8\nPlaintext: ffffffffffffffffff80000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e0b3a00785917c7efc9adba322813571\nPlaintext: ffffffffffffffffffc0000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 733d41f4727b5ef0df4af4cf3cffa0cb\nPlaintext: ffffffffffffffffffe0000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a99ebb030260826f981ad3e64490aa4f\nPlaintext: fffffffffffffffffff0000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 73f34c7d3eae5e80082c1647524308ee\nPlaintext: fffffffffffffffffff8000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 40ebd5ad082345b7a2097ccd3464da02\nPlaintext: fffffffffffffffffffc000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7cc4ae9a424b2cec90c97153c2457ec5\nPlaintext: fffffffffffffffffffe000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 54d632d03aba0bd0f91877ebdd4d09cb\nPlaintext: ffffffffffffffffffff000000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d3427be7e4d27cd54f5fe37b03cf0897\nPlaintext: ffffffffffffffffffff800000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b2099795e88cc158fd75ea133d7e7fbe\nPlaintext: ffffffffffffffffffffc00000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a6cae46fb6fadfe7a2c302a34242817b\nPlaintext: ffffffffffffffffffffe00000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 026a7024d6a902e0b3ffccbaa910cc3f\nPlaintext: fffffffffffffffffffff00000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 156f07767a85a4312321f63968338a01\nPlaintext: fffffffffffffffffffff80000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 15eec9ebf42b9ca76897d2cd6c5a12e2\nPlaintext: fffffffffffffffffffffc0000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: db0d3a6fdcc13f915e2b302ceeb70fd8\nPlaintext: fffffffffffffffffffffe0000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 71dbf37e87a2e34d15b20e8f10e48924\nPlaintext: ffffffffffffffffffffff0000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c745c451e96ff3c045e4367c833e3b54\nPlaintext: ffffffffffffffffffffff8000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 340da09c2dd11c3b679d08ccd27dd595\nPlaintext: ffffffffffffffffffffffc000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8279f7c0c2a03ee660c6d392db025d18\nPlaintext: ffffffffffffffffffffffe000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a4b2c7d8eba531ff47c5041a55fbd1ec\nPlaintext: fffffffffffffffffffffff000000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 74569a2ca5a7bd5131ce8dc7cbfbf72f\nPlaintext: fffffffffffffffffffffff800000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3713da0c0219b63454035613b5a403dd\nPlaintext: fffffffffffffffffffffffc00000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8827551ddcc9df23fa72a3de4e9f0b07\nPlaintext: fffffffffffffffffffffffe00000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2e3febfd625bfcd0a2c06eb460da1732\nPlaintext: ffffffffffffffffffffffff00000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ee82e6ba488156f76496311da6941deb\nPl", "aintext: ffffffffffffffffffffffff80000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4770446f01d1f391256e85a1b30d89d3\nPlaintext: ffffffffffffffffffffffffc0000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: af04b68f104f21ef2afb4767cf74143c\nPlaintext: ffffffffffffffffffffffffe0000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: cf3579a9ba38c8e43653173e14f3a4c6\nPlaintext: fffffffffffffffffffffffff0000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b3bba904f4953e09b54800af2f62e7d4\nPlaintext: fffffffffffffffffffffffff8000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: fc4249656e14b29eb9c44829b4c59a46\nPlaintext: fffffffffffffffffffffffffc000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9b31568febe81cfc2e65af1c86d1a308\nPlaintext: fffffffffffffffffffffffffe000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9ca09c25f273a766db98a480ce8dfedc\nPlaintext: ffffffffffffffffffffffffff000000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b909925786f34c3c92d971883c9fbedf\nPlaintext: ffffffffffffffffffffffffff800000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 82647f1332fe570a9d4d92b2ee771d3b\nPlaintext: ffffffffffffffffffffffffffc00000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3604a7e80832b3a99954bca6f5b9f501\nPlaintext: ffffffffffffffffffffffffffe00000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 884607b128c5de3ab39a529a1ef51bef\nPlaintext: fffffffffffffffffffffffffff00000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 670cfa093d1dbdb2317041404102435e\nPlaintext: fffffffffffffffffffffffffff80000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7a867195f3ce8769cbd336502fbb5130\nPlaintext: fffffffffffffffffffffffffffc0000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 52efcf64c72b2f7ca5b3c836b1078c15\nPlaintext: fffffffffffffffffffffffffffe0000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4019250f6eefb2ac5ccbcae044e75c7e\nPlaintext: ffffffffffffffffffffffffffff0000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 022c4f6f5a017d292785627667ddef24\nPlaintext: ffffffffffffffffffffffffffff8000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e9c21078a2eb7e03250f71000fa9e3ed\nPlaintext: ffffffffffffffffffffffffffffc000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a13eaeeb9cd391da4e2b09490b3e7fad\nPlaintext: ffffffffffffffffffffffffffffe000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c958a171dca1d4ed53e1af1d380803a9\nPlaintext: fffffffffffffffffffffffffffff000\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 21442e07a110667f2583eaeeee44dc8c\nPlaintext: fffffffffffffffffffffffffffff800\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 59bbb353cf1dd867a6e33737af655e99\nPlaintext: fffffffffffffffffffffffffffffc00\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 43cd3b25375d0ce41087ff9fe2829639\nPlaintext: fffffffffffffffffffffffffffffe00\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6b98b17e80d1118e3516bd768b285a84\nPlaintext: ffffffffffffffffffffffffffffff00\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ae47ed3676ca0c08deea02d95b81db58\nPlaintext: ffffffffffffffffffffffffffffff80\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 34ec40dc20413795ed53628ea748720b\nPlaintext: ffffffffffffffffffffffffffffffc0\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4dc68163f8e9835473253542c8a65d46\nPlaintext: ffffffffffffffffffffffffffffffe0\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2aabb999f43693175af65c6c612c46fb\nPlaintext: fffffffffffffffffffffffffffffff0\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e01f94499dac3547515c5b1d756f0f58\nPlaintext: fffffffffffffffffffffffffffffff8\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9d12435a46480ce00ea349f71799df9a\nPlaintext: fffffffffffffffffffffffffffffffc\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: cef41d16d266bdfe46938ad7884cc0cf\nPlaintext: fffffffffffffffffffffffffffffffe\n\nCipher: AES-192-CBC\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b13db4da1f718bc6904797c82bcf2d32\nPlaintext: ffffffffffffffffffffffffffffffff\n\n", }; -static const size_t kLen24 = 154319; +static const size_t kLen25 = 154319; -static const char *kData25[] = { +static const char *kData26[] = { "# Generated by \"make_cavp -cipher=aes -extra-labels=Cipher=AES-192-CTR -swap-iv-plaintext kat_aes/CBCGFSbox192.rsp kat_aes/CBCKeySbox192.rsp kat_aes/CBCVarKey192.rsp kat_aes/CBCVarTxt192.rsp\"\n\n# File 1: kat_aes/CBCGFSbox192.rsp\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 1b077a6af4b7f98229de786d7516b639\nCiphertext: 275cfc0413d8ccb70513c3859b1d0f72\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 9c2d8842e5f48f57648205d39a239af1\nCiphertext: c9b8135ff1b5adc413dfd053b21bd96d\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: bff52510095f518ecca60af4205444bb\nCiphertext: 4a3650c3371ce2eb35e389a171427440\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 51719783d3185a535bd75adc65071ce1\nCiphertext: 4f354592ff7c8847d2d0870ca9481b7c\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 26aa49dcfe7629a8901a69a9914e6dfd\nCiphertext: d5e08bf9a182e857cf40b3a36ee248cc\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 941a4773058224e1ef66d10e0a6ee782\nCiphertext: 067cd9d3749207791841562507fa9626\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 275cfc0413d8ccb70513c3859b1d0f72\nIV: 1b077a6af4b7f98229de786d7516b639\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c9b8135ff1b5adc413dfd053b21bd96d\nIV: 9c2d8842e5f48f57648205d39a239af1\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4a3650c3371ce2eb35e389a171427440\nIV: bff52510095f518ecca60af4205444bb\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4f354592ff7c8847d2d0870ca9481b7c\nIV: 51719783d3185a535bd75adc65071ce1\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d5e08bf9a182e857cf40b3a36ee248cc\nIV: 26aa49dcfe7629a8901a69a9914e6dfd\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 067cd9d3749207791841562507fa9626\nIV: 941a4773058224e1ef66d10e0a6ee782\n\n# File 2: kat_aes/CBCKeySbox192.rsp\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: e9f065d7c13573587f7875357dfbb16c53489f6a4bd0f7cd\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0956259c9cd5cfd0181cca53380cde06\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 15d20f6ebc7e649fd95b76b107e6daba967c8a9484797f29\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8e4e18424e591a3d5b6f0876f16f8594\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: a8a282ee31c03fae4f8e9b8930d5473c2ed695a347e88b7c\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 93f3270cfc877ef17e106ce938979cb0\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: cd62376d5ebb414917f0c78f05266433dc9192a1ec943300\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7f6c25ff41858561bb62f36492e93c29\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 502a6ab36984af268bf423c7f509205207fc1552af4a91e5\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8e06556dcbb00b809a025047cff2a940\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 25a39dbfd8034f71a81f9ceb55026e4037f8f6aa30ab44ce\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3608c344868e94555d23a120f8a5502d\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: e08c15411774ec4a908b64eadc6ac4199c7cd453f3aaef53\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 77da2021935b840b7f5dcc39132da9e5\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 3b375a1ff7e8d44409696e6326ec9dec86138e2ae010b980\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3b7c24f825e3bf9873c9f14d39a0e6f4\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 950bb9f22cc35be6fe79f52c320af93dec5bc9c0c2f9cd53\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 64ebf95686b353508c90ecd8b6134316\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 7001c487cc3e572cfc92f4d0e697d982e8856fdcc957da40\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ff558c5d27210b7929b73fc708eb4cf1\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: f029ce61d4e5a405b41ead0a883cc6a737da2cf50a6c92ae\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a2c3b2a818075490a7b4c14380f02702\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 61257134a518a0d57d9d244d45f6498cbc32f2bafc522d79\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: cfe4d74002696ccf7d87b14a2f9cafc9\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: b0ab0a6a818baef2d11fa33eac947284fb7d748cfb75e570\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d2eafd86f63b109b91f5dbb3a3fb7e13\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ee053aa011c8b428cdcc3636313c54d6a03cac01c71579d6\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9b9fdd1c5975655f539998b306a324af\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: d2926527e0aa9f37b45e2ec2ade5853ef807576104c7ace3\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: dd619e1cf204446112e0af2b9afa8f8c\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 982215f4e173dfa0fcffe5d3da41c4812c7bcc8ed3540f93\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d4f0aae13c8fe9339fbf9e69ed0ad74d\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 98c6b8e01e379fbd14e61af6af891596583565f2a27d59e9\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 19c80ec4a6deb7e5ed1033dda933498f\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: b3ad5cea1dddc214ca969ac35f37dae1a9a9d1528f89bb35\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3cf5e1d21a17956d1dffad6a7c41c659\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 45899367c3132849763073c435a9288a766c8b9ec2308516\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 69fd12e8505f8ded2fdcb197a121b362\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ec250e04c3903f602647b85a401a1ae7ca2f02f67fa4253e\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8aa584e2cc4d17417a97cb9a28ba29c8\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: d077a03bd8a38973928ccafe4a9d2f455130bd0af5ae46a9\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: abc786fb1edb504580c4d882ef29a0c7\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: d184c36cf0dddfec39e654195006022237871a47c33d3198\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2e19fb60a3e1de0166f483c97824a978\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 4c6994ffa9dcdc805b60c2c0095334c42d95a8fc0ca5b080\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7656709538dd5fec41e0ce6a0f8e207d\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: c88f5b00a4ef9a6840e2acaf33f00a3bdc4e25895303fa72\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a67cf333b314d411d3c0ae6e1cfcd8f5\n\nCipher", ": AES-192-CTR\nOperation: DECRYPT\nKey: e9f065d7c13573587f7875357dfbb16c53489f6a4bd0f7cd\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0956259c9cd5cfd0181cca53380cde06\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 15d20f6ebc7e649fd95b76b107e6daba967c8a9484797f29\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8e4e18424e591a3d5b6f0876f16f8594\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: a8a282ee31c03fae4f8e9b8930d5473c2ed695a347e88b7c\nPlaintext: 00000000000000000000000000000000\nCiphertext: 93f3270cfc877ef17e106ce938979cb0\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: cd62376d5ebb414917f0c78f05266433dc9192a1ec943300\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7f6c25ff41858561bb62f36492e93c29\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 502a6ab36984af268bf423c7f509205207fc1552af4a91e5\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8e06556dcbb00b809a025047cff2a940\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 25a39dbfd8034f71a81f9ceb55026e4037f8f6aa30ab44ce\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3608c344868e94555d23a120f8a5502d\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: e08c15411774ec4a908b64eadc6ac4199c7cd453f3aaef53\nPlaintext: 00000000000000000000000000000000\nCiphertext: 77da2021935b840b7f5dcc39132da9e5\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 3b375a1ff7e8d44409696e6326ec9dec86138e2ae010b980\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3b7c24f825e3bf9873c9f14d39a0e6f4\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 950bb9f22cc35be6fe79f52c320af93dec5bc9c0c2f9cd53\nPlaintext: 00000000000000000000000000000000\nCiphertext: 64ebf95686b353508c90ecd8b6134316\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 7001c487cc3e572cfc92f4d0e697d982e8856fdcc957da40\nPlaintext: 00000000000000000000000000000000\nCiphertext: ff558c5d27210b7929b73fc708eb4cf1\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: f029ce61d4e5a405b41ead0a883cc6a737da2cf50a6c92ae\nPlaintext: 00000000000000000000000000000000\nCiphertext: a2c3b2a818075490a7b4c14380f02702\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 61257134a518a0d57d9d244d45f6498cbc32f2bafc522d79\nPlaintext: 00000000000000000000000000000000\nCiphertext: cfe4d74002696ccf7d87b14a2f9cafc9\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: b0ab0a6a818baef2d11fa33eac947284fb7d748cfb75e570\nPlaintext: 00000000000000000000000000000000\nCiphertext: d2eafd86f63b109b91f5dbb3a3fb7e13\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: ee053aa011c8b428cdcc3636313c54d6a03cac01c71579d6\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9b9fdd1c5975655f539998b306a324af\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: d2926527e0aa9f37b45e2ec2ade5853ef807576104c7ace3\nPlaintext: 00000000000000000000000000000000\nCiphertext: dd619e1cf204446112e0af2b9afa8f8c\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 982215f4e173dfa0fcffe5d3da41c4812c7bcc8ed3540f93\nPlaintext: 00000000000000000000000000000000\nCiphertext: d4f0aae13c8fe9339fbf9e69ed0ad74d\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 98c6b8e01e379fbd14e61af6af891596583565f2a27d59e9\nPlaintext: 00000000000000000000000000000000\nCiphertext: 19c80ec4a6deb7e5ed1033dda933498f\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: b3ad5cea1dddc214ca969ac35f37dae1a9a9d1528f89bb35\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3cf5e1d21a17956d1dffad6a7c41c659\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 45899367c3132849763073c435a9288a766c8b9ec2308516\nPlaintext: 00000000000000000000000000000000\nCiphertext: 69fd12e8505f8ded2fdcb197a121b362\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: ec250e04c3903f602647b85a401a1ae7ca2f02f67fa4253e\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8aa584e2cc4d17417a97cb9a28ba29c8\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: d077a03bd8a38973928ccafe4a9d2f455130bd0af5ae46a9\nPlaintext: 00000000000000000000000000000000\nCiphertext: abc786fb1edb504580c4d882ef29a0c7\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: d184c36cf0dddfec39e654195006022237871a47c33d3198\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2e19fb60a3e1de0166f483c97824a978\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 4c6994ffa9dcdc805b60c2c0095334c42d95a8fc0ca5b080\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7656709538dd5fec41e0ce6a0f8e207d\nIV: 00000000000000000000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: c88f5b00a4ef9a6840e2acaf33f00a3bdc4e25895303fa72\nPlaintext: 00000000000000000000000000000000\nCiphertext: a67cf333b314d411d3c0ae6e1cfcd8f5\nIV: 00000000000000000000000000000000\n\n# File 3: kat_aes/CBCVarKey192.rsp\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: 800000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: de885dc87f5a92594082d02cc1e1b42c\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: c00000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 132b074e80f2a597bf5febd8ea5da55e\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: e00000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6eccedf8de592c22fb81347b79f2db1f\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: f00000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 180b09f267c45145db2f826c2582d35c\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: f80000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: edd807ef7652d7eb0e13c8b5e15b3bc0\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fc0000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9978bcf8dd8fd72241223ad24b31b8a4\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fe0000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5310f654343e8f27e12c83a48d24ff81\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ff0000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 833f71258d53036b02952c76c744f5a1\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ff8000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: eba83ff200cff9318a92f8691a06b09f\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffc000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ff620ccbe9f3292abdf2176b09f04eba\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffe000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7ababc4b3f516c9aafb35f4140b548f9\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fff000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: aa187824d9c4582b0916493ecbde8c57\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fff800000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1c0ad553177fd5ea1092c9d626a29dc4\n\nCipher: AES-192-CTR\nOp", "eration: ENCRYPT\nKey: fffc00000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a5dc46c37261194124ecaebd680408ec\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffe00000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e4f2f2ae23e9b10bacfa58601531ba54\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffff00000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b7d67cf1a1e91e8ff3a57a172c7bf412\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffff80000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 26706be06967884e847d137128ce47b3\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffc0000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b2f8b409b0585909aad3a7b5a219072a\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffe0000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5e4b7bff0290c78344c54a23b722cd20\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffff0000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 07093657552d4414227ce161e9ebf7dd\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffff8000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e1af1e7d8bc225ed4dffb771ecbb9e67\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffc000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ef6555253635d8432156cfd9c11b145a\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffe000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: fb4035074a5d4260c90cbd6da6c3fceb\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffff000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 446ee416f9ad1c103eb0cc96751c88e1\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffff800000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 198ae2a4637ac0a7890a8fd1485445c9\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffc00000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 562012ec8faded0825fb2fa70ab30cbd\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffe00000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: cc8a64b46b5d88bf7f247d4dbaf38f05\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffff00000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a168253762e2cc81b42d1e5001762699\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffff80000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1b41f83b38ce5032c6cd7af98cf62061\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffc0000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 61a89990cd1411750d5fb0dc988447d4\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffe0000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b5accc8ed629edf8c68a539183b1ea82\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffff0000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b16fa71f846b81a13f361c43a851f290\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffff8000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4fad6efdff5975aee7692234bcd54488\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffc000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ebfdb05a783d03082dfe5fdd80a00b17\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffe000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: eb81b584766997af6ba5529d3bdd8609\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffff000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0cf4ff4f49c8a0ca060c443499e29313\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffff800000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: cc4ba8a8e029f8b26d8afff9df133bb6\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffffc00000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: fefebf64360f38e4e63558f0ffc550c3\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffffe00000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 12ad98cbf725137d6a8108c2bed99322\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffff00000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6afaa996226198b3e2610413ce1b3f78\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffff80000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2a8ce6747a7e39367828e290848502d9\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffffc0000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 223736e8b8f89ca1e37b6deab40facf1\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffffe0000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c0f797e50418b95fa6013333917a9480\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffffff0000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a758de37c2ece2a02c73c01fedc9a132\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffffff8000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3a9b87ae77bae706803966c66c73adbd\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffffffc000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d365ab8df8ffd782e358121a4a4fc541\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: fffffffffffe000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c8dcd9e6f75e6c36c8daee0466f0ed74\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffffff000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: c79a637beb1c0304f14014c037e736dd\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffffff800000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 105f0a25e84ac930d996281a5f954dd9\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffffffc00000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 42e4074b2927973e8d17ffa92f7fe615\n\nCipher: AES-192-CTR\nOperation: ENCRYPT\nKey: ffffffffffffe00000000000000000", @@ -1561,9 +1567,9 @@ "000000000000000000000000000000\nCiphertext: 0882a16f44088d42447a29ac090ec17e\nIV: fffffffffffffff00000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3a3c15bfc11a9537c130687004e136ee\nIV: fffffffffffffff80000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 22c0a7678dc6d8cf5c8a6d5a9960767c\nIV: fffffffffffffffc0000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b46b09809d68b9a456432a79bdc2e38c\nIV: fffffffffffffffe0000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 93baaffb35fbe739c17c6ac22eecf18f\nIV: ffffffffffffffff0000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c8aa80a7850675bc007c46df06b49868\nIV: ffffffffffffffff8000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 12c6f3877af421a918a84b775858021d\nIV: ffffffffffffffffc000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 33f123282c5d633924f7d5ba3f3cab11\nIV: ffffffffffffffffe000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a8f161002733e93ca4527d22c1a0c5bb\nIV: fffffffffffffffff000000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b72f70ebf3e3fda23f508eec76b42c02\nIV: fffffffffffffffff800000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6a9d965e6274143f25afdcfc88ffd77c\nIV: fffffffffffffffffc00000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a0c74fd0b9361764ce91c5200b095357\nIV: fffffffffffffffffe00000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 091d1fdc2bd2c346cd5046a8c6209146\nIV: ffffffffffffffffff00000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e2a37580116cfb71856254496ab0aca8\nIV: ffffffffffffffffff80000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e0b3a00785917c7efc9adba322813571\nIV: ffffffffffffffffffc0000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 733d41f4727b5ef0df4af4cf3cffa0cb\nIV: ffffffffffffffffffe0000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a99ebb030260826f981ad3e64490aa4f\nIV: fffffffffffffffffff0000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 73f34c7d3eae5e80082c1647524308ee\nIV: fffffffffffffffffff8000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 40ebd5ad082345b7a2097ccd3464da02\nIV: fffffffffffffffffffc000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7cc4ae9a424b2cec90c97153c2457ec5\nIV: fffffffffffffffffffe000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 54d632d03aba0bd0f91877ebdd4d09cb\nIV: ffffffffffffffffffff000000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d3427be7e4d27cd54f5fe37b03cf0897\nIV: ffffffffffffffffffff800000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b2099795e88cc158fd75ea133d7e7fbe\nIV: ffffffffffffffffffffc00000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a6cae46fb6fadfe7a2c302a34242817b\nIV: ffffffffffffffffffffe00000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 026a7024d6a902e0b3ffccbaa910cc3f\nIV: fffffffffffffffffffff00000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 156f07767a85a4312321f63968338a01\nIV: fffffffffffffffffffff80000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 15eec9ebf42b9ca76897d2cd6c5a12e2\nIV: fffffffffffffffffffffc0000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: db0d3a6fdcc13f915e2b302ceeb70fd8\nIV: fffffffffffffffffffffe0000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 71dbf37e87a2e34d15b20e8f10e48924\nIV: ffffffffffffffffffffff0000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c745c451e96ff3c045e4367c833e3b54\nIV: ffffffffffffffffffffff8000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 340da09c2dd11c3b679d08ccd27dd595\nIV: ffffffffffffffffffffffc000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8279f7c0c2a03ee660c6d392db025d18\nIV: ffffffffffffffffffffffe000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a4b2c7d8eba531ff47c5041a55fbd1ec\nIV: fffffffffffffffffffffff000000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 74569a2ca5a7bd5131ce8dc7cbfbf72f\nIV: fffffffffffffffffffffff800000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3713da0c0219b63454035613b5a403dd\nIV: fffffffffffffffffffffffc00000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8827551ddcc9df23fa72a3de4e9f0b07\nIV: fffffffffffffffffffffffe00000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2e3febfd625bfcd0a2c06eb460da1732\nIV: ffffffffffffffffffffffff00000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ee82e6ba4", "88156f76496311da6941deb\nIV: ffffffffffffffffffffffff80000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4770446f01d1f391256e85a1b30d89d3\nIV: ffffffffffffffffffffffffc0000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: af04b68f104f21ef2afb4767cf74143c\nIV: ffffffffffffffffffffffffe0000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: cf3579a9ba38c8e43653173e14f3a4c6\nIV: fffffffffffffffffffffffff0000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b3bba904f4953e09b54800af2f62e7d4\nIV: fffffffffffffffffffffffff8000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: fc4249656e14b29eb9c44829b4c59a46\nIV: fffffffffffffffffffffffffc000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9b31568febe81cfc2e65af1c86d1a308\nIV: fffffffffffffffffffffffffe000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9ca09c25f273a766db98a480ce8dfedc\nIV: ffffffffffffffffffffffffff000000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b909925786f34c3c92d971883c9fbedf\nIV: ffffffffffffffffffffffffff800000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 82647f1332fe570a9d4d92b2ee771d3b\nIV: ffffffffffffffffffffffffffc00000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3604a7e80832b3a99954bca6f5b9f501\nIV: ffffffffffffffffffffffffffe00000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 884607b128c5de3ab39a529a1ef51bef\nIV: fffffffffffffffffffffffffff00000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 670cfa093d1dbdb2317041404102435e\nIV: fffffffffffffffffffffffffff80000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7a867195f3ce8769cbd336502fbb5130\nIV: fffffffffffffffffffffffffffc0000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 52efcf64c72b2f7ca5b3c836b1078c15\nIV: fffffffffffffffffffffffffffe0000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4019250f6eefb2ac5ccbcae044e75c7e\nIV: ffffffffffffffffffffffffffff0000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 022c4f6f5a017d292785627667ddef24\nIV: ffffffffffffffffffffffffffff8000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e9c21078a2eb7e03250f71000fa9e3ed\nIV: ffffffffffffffffffffffffffffc000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a13eaeeb9cd391da4e2b09490b3e7fad\nIV: ffffffffffffffffffffffffffffe000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: c958a171dca1d4ed53e1af1d380803a9\nIV: fffffffffffffffffffffffffffff000\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 21442e07a110667f2583eaeeee44dc8c\nIV: fffffffffffffffffffffffffffff800\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 59bbb353cf1dd867a6e33737af655e99\nIV: fffffffffffffffffffffffffffffc00\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 43cd3b25375d0ce41087ff9fe2829639\nIV: fffffffffffffffffffffffffffffe00\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6b98b17e80d1118e3516bd768b285a84\nIV: ffffffffffffffffffffffffffffff00\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ae47ed3676ca0c08deea02d95b81db58\nIV: ffffffffffffffffffffffffffffff80\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 34ec40dc20413795ed53628ea748720b\nIV: ffffffffffffffffffffffffffffffc0\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4dc68163f8e9835473253542c8a65d46\nIV: ffffffffffffffffffffffffffffffe0\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2aabb999f43693175af65c6c612c46fb\nIV: fffffffffffffffffffffffffffffff0\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e01f94499dac3547515c5b1d756f0f58\nIV: fffffffffffffffffffffffffffffff8\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9d12435a46480ce00ea349f71799df9a\nIV: fffffffffffffffffffffffffffffffc\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: cef41d16d266bdfe46938ad7884cc0cf\nIV: fffffffffffffffffffffffffffffffe\n\nCipher: AES-192-CTR\nOperation: DECRYPT\nKey: 000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b13db4da1f718bc6904797c82bcf2d32\nIV: ffffffffffffffffffffffffffffffff\n\n", }; -static const size_t kLen25 = 154338; +static const size_t kLen26 = 154338; -static const char *kData26[] = { +static const char *kData27[] = { "# Generated by \"make_cavp -cipher=aes -extra-labels=Cipher=AES-256-CBC kat_aes/CBCGFSbox256.rsp kat_aes/CBCKeySbox256.rsp kat_aes/CBCVarKey256.rsp kat_aes/CBCVarTxt256.rsp\"\n\n# File 1: kat_aes/CBCGFSbox256.rsp\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 014730f80ac625fe84f026c60bfd547d\nCiphertext: 5c9d844ed46f9885085e5d6a4f94c7d7\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 0b24af36193ce4665f2825d7b4749c98\nCiphertext: a9ff75bd7cf6613d3731c77c3b6d0c04\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 761c1fe41a18acf20d241650611d90f1\nCiphertext: 623a52fcea5d443e48d9181ab32c7421\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 8a560769d605868ad80d819bdba03771\nCiphertext: 38f2c7ae10612415d27ca190d27da8b4\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 91fbef2d15a97816060bee1feaa49afe\nCiphertext: 1bc704f1bce135ceb810341b216d7abe\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5c9d844ed46f9885085e5d6a4f94c7d7\nPlaintext: 014730f80ac625fe84f026c60bfd547d\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a9ff75bd7cf6613d3731c77c3b6d0c04\nPlaintext: 0b24af36193ce4665f2825d7b4749c98\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 623a52fcea5d443e48d9181ab32c7421\nPlaintext: 761c1fe41a18acf20d241650611d90f1\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 38f2c7ae10612415d27ca190d27da8b4\nPlaintext: 8a560769d605868ad80d819bdba03771\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1bc704f1bce135ceb810341b216d7abe\nPlaintext: 91fbef2d15a97816060bee1feaa49afe\n\n# File 2: kat_aes/CBCKeySbox256.rsp\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: c47b0294dbbbee0fec4757f22ffeee3587ca4730c3d33b691df38bab076bc558\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 46f2fb342d6f0ab477476fc501242c5f\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 28d46cffa158533194214a91e712fc2b45b518076675affd910edeca5f41ac64\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4bf3b0a69aeb6657794f2901b1440ad4\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: c1cc358b449909a19436cfbb3f852ef8bcb5ed12ac7058325f56e6099aab1a1c\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 352065272169abf9856843927d0674fd\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 984ca75f4ee8d706f46c2d98c0bf4a45f5b00d791c2dfeb191b5ed8e420fd627\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4307456a9e67813b452e15fa8fffe398\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: b43d08a447ac8609baadae4ff12918b9f68fc1653f1269222f123981ded7a92f\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4663446607354989477a5c6f0f007ef4\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 1d85a181b54cde51f0e098095b2962fdc93b51fe9b88602b3f54130bf76a5bd9\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 531c2c38344578b84d50b3c917bbb6e1\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: dc0eba1f2232a7879ded34ed8428eeb8769b056bbaf8ad77cb65c3541430b4cf\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: fc6aec906323480005c58e7e1ab004ad\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: f8be9ba615c5a952cabbca24f68f8593039624d524c816acda2c9183bd917cb9\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a3944b95ca0b52043584ef02151926a8\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 797f8b3d176dac5b7e34a2d539c4ef367a16f8635f6264737591c5c07bf57a3e\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a74289fe73a4c123ca189ea1e1b49ad5\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 6838d40caf927749c13f0329d331f448e202c73ef52c5f73a37ca635d4c47707\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b91d4ea4488644b56cf0812fa7fcf5fc\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ccd1bc3c659cd3c59bc437484e3c5c724441da8d6e90ce556cd57d0752663bbc\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 304f81ab61a80c2e743b94d5002a126b\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 13428b5e4c005e0636dd338405d173ab135dec2a25c22c5df0722d69dcc43887\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 649a71545378c783e368c9ade7114f6c\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 07eb03a08d291d1b07408bf3512ab40c91097ac77461aad4bb859647f74f00ee\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 47cb030da2ab051dfc6c4bf6910d12bb\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 90143ae20cd78c5d8ebdd6cb9dc1762427a96c78c639bccc41a61424564eafe1\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 798c7c005dee432b2c8ea5dfa381ecc3\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: b7a5794d52737475d53d5a377200849be0260a67a2b22ced8bbef12882270d07\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 637c31dc2591a07636f646b72daabbe7\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fca02f3d5011cfc5c1e23165d413a049d4526a991827424d896fe3435e0bf68e\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 179a49c712154bbffbe6e7a84a18e220\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: c47b0294dbbbee0fec4757f22ffeee3587ca4730c3d33b691df38bab076bc558\nIV: 00000000000000000000000000000000\nCiphertext: 46f2fb342d6f0ab477476fc501242c5f\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 28d46cffa158533194214a91e712fc2b45b518076675affd910edeca5f41ac64\nIV: 00000000000000000000000000000000\nCiphertext: 4bf3b0a69aeb6657794f2901b1440ad4\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: c1cc358b449909a19436cfbb3f852ef8bcb5ed12ac7058325f56e6099aab1a1c\nIV: 00000000000000000000000000000000\nCiphertext: 352065272169abf9856843927d0674fd\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 984ca75f4ee8d706f46c2d98c0bf4a45f5b00d791c2dfeb191b5ed8e420fd627\nIV: 00000000000000000000000000000000\nCiphertext: 4307456a9e67813b452e15fa8fffe398\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: b43d08a447ac8609baadae4ff12918b9f68fc1653f1269222f123981ded7a92f\nIV: 00000000000000000000000000000000\nCiphertext: 4663446607354989477a5c6f0f007ef4\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 1d85a181b54cde51f0e098095b2962fdc93b51fe9b88602b3f54130bf76a5bd9\nIV: 00000000000000000000000000000000\nCiphertext: 531c2c38344578b84d50b3c917bbb6e1\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: dc0eba1f2232a7879ded34ed8428eeb8769b056bbaf8ad77cb65c3541430b4cf\nIV: 00000000000000000000000000000000\nCiphertext: fc6aec906323480005c58e7e1ab004ad\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: f8be9ba615c5a952cabbca24f68f8593039624d524c816acda2c9183bd917cb9\nIV: 00000000000000000000000000000000\nCiphertext:", " a3944b95ca0b52043584ef02151926a8\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 797f8b3d176dac5b7e34a2d539c4ef367a16f8635f6264737591c5c07bf57a3e\nIV: 00000000000000000000000000000000\nCiphertext: a74289fe73a4c123ca189ea1e1b49ad5\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 6838d40caf927749c13f0329d331f448e202c73ef52c5f73a37ca635d4c47707\nIV: 00000000000000000000000000000000\nCiphertext: b91d4ea4488644b56cf0812fa7fcf5fc\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: ccd1bc3c659cd3c59bc437484e3c5c724441da8d6e90ce556cd57d0752663bbc\nIV: 00000000000000000000000000000000\nCiphertext: 304f81ab61a80c2e743b94d5002a126b\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 13428b5e4c005e0636dd338405d173ab135dec2a25c22c5df0722d69dcc43887\nIV: 00000000000000000000000000000000\nCiphertext: 649a71545378c783e368c9ade7114f6c\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 07eb03a08d291d1b07408bf3512ab40c91097ac77461aad4bb859647f74f00ee\nIV: 00000000000000000000000000000000\nCiphertext: 47cb030da2ab051dfc6c4bf6910d12bb\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 90143ae20cd78c5d8ebdd6cb9dc1762427a96c78c639bccc41a61424564eafe1\nIV: 00000000000000000000000000000000\nCiphertext: 798c7c005dee432b2c8ea5dfa381ecc3\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: b7a5794d52737475d53d5a377200849be0260a67a2b22ced8bbef12882270d07\nIV: 00000000000000000000000000000000\nCiphertext: 637c31dc2591a07636f646b72daabbe7\nPlaintext: 00000000000000000000000000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: fca02f3d5011cfc5c1e23165d413a049d4526a991827424d896fe3435e0bf68e\nIV: 00000000000000000000000000000000\nCiphertext: 179a49c712154bbffbe6e7a84a18e220\nPlaintext: 00000000000000000000000000000000\n\n# File 3: kat_aes/CBCVarKey256.rsp\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: 8000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e35a6dcb19b201a01ebcfa8aa22b5759\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: c000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b29169cdcf2d83e838125a12ee6aa400\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: e000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d8f3a72fc3cdf74dfaf6c3e6b97b2fa6\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: f000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1c777679d50037c79491a94da76a9a35\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: f800000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9cf4893ecafa0a0247a898e040691559\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fc00000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8fbb413703735326310a269bd3aa94b2\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fe00000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 60e32246bed2b0e859e55c1cc6b26502\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ff00000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ec52a212f80a09df6317021bc2a9819e\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ff80000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f23e5b600eb70dbccf6c0b1d9a68182c\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffc0000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a3f599d63a82a968c33fe26590745970\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffe0000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d1ccb9b1337002cbac42c520b5d67722\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fff0000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: cc111f6c37cf40a1159d00fb59fb0488\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fff8000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: dc43b51ab609052372989a26e9cdd714\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffc000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4dcede8da9e2578f39703d4433dc6459\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffe000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1a4c1c263bbccfafc11782894685e3a8\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffff000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 937ad84880db50613423d6d527a2823d\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffff800000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 610b71dfc688e150d8152c5b35ebc14d\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffc00000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 27ef2495dabf323885aab39c80f18d8b\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffe00000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 633cafea395bc03adae3a1e2068e4b4e\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffff00000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6e1b482b53761cf631819b749a6f3724\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffff80000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 976e6f851ab52c771998dbb2d71c75a9\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffc0000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 85f2ba84f8c307cf525e124c3e22e6cc\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffe0000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6bcca98bf6a835fa64955f72de4115fe\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffff0000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2c75e2d36eebd65411f14fd0eb1d2a06\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffff8000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: bd49295006250ffca5100b6007a0eade\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffc000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a190527d0ef7c70f459cd3940df316ec\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffe00", "0000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: bbd1097a62433f79449fa97d4ee80dbf\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffff000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 07058e408f5b99b0e0f061a1761b5b3b\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffff800000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5fd1f13fa0f31e37fabde328f894eac2\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffc00000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: fc4af7c948df26e2ef3e01c1ee5b8f6f\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffe00000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 829fd7208fb92d44a074a677ee9861ac\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffff00000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ad9fc613a703251b54c64a0e76431711\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffff80000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 33ac9eccc4cc75e2711618f80b1548e8\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffc0000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2025c74b8ad8f4cda17ee2049c4c902d\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffe0000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f85ca05fe528f1ce9b790166e8d551e7\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffff0000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6f6238d8966048d4967154e0dad5a6c9\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffff8000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f2b21b4e7640a9b3346de8b82fb41e49\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffc000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f836f251ad1d11d49dc344628b1884e1\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffe000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 077e9470ae7abea5a9769d49182628c3\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffff000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e0dcc2d27fc9865633f85223cf0d611f\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffff800000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: be66cfea2fecd6bf0ec7b4352c99bcaa\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffc00000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: df31144f87a2ef523facdcf21a427804\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffe00000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: b5bb0f5629fb6aae5e1839a3c3625d63\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffff00000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3c9db3335306fe1ec612bdbfae6b6028\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffff80000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3dd5c34634a79d3cfcc8339760e6f5f4\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffc0000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 82bda118a3ed7af314fa2ccc5c07b761\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffe0000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2937a64f7d4f46fe6fea3b349ec78e38\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffff0000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 225f068c28476605735ad671bb8f39f3\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffff8000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ae682c5ecd71898e08942ac9aa89875c\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffffc000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5e031cb9d676c3022d7f26227e85c38f\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffffe000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a78463fb064db5d52bb64bfef64f2dda\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffff000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8aa9b75e784593876c53a00eae5af52b\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffff800000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3f84566df23da48af692722fe980573a\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffffc00000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 31690b5ed41c7eb42a1e83270a7ff0e6\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffffe00000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 77dd7702646d55f08365e477d3590eda\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffffff00000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4c022ac62b3cb78d739cc67b3e20bb7e\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffffff80000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 092fa137ce18b5dfe7906f550bb13370\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffffffc0000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3e0cdadf2e68353c0027672c97144dd3\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: ffffffffffffffe0000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: d8c4b200b383fc1f2b2ea677618a1d27\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffffff0000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 11825f99b0e9bb3477c1c0713b015aac\n\nCipher: AES-256-CBC\nOperation: ENCRYPT\nKey: fffffffffffffff8000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: f8b9fffb5c187f7ddc7", @@ -1589,9 +1595,9 @@ "00000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4cc42fc1407b008fe350907c092e80ac\nPlaintext: ffffffffffffffffffff800000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 08b244ce7cbc8ee97fbba808cb146fda\nPlaintext: ffffffffffffffffffffc00000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 39b333e8694f21546ad1edd9d87ed95b\nPlaintext: ffffffffffffffffffffe00000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3b271f8ab2e6e4a20ba8090f43ba78f3\nPlaintext: fffffffffffffffffffff00000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9ad983f3bf651cd0393f0a73cccdea50\nPlaintext: fffffffffffffffffffff80000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8f476cbff75c1f725ce18e4bbcd19b32\nPlaintext: fffffffffffffffffffffc0000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 905b6267f1d6ab5320835a133f096f2a\nPlaintext: fffffffffffffffffffffe0000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 145b60d6d0193c23f4221848a892d61a\nPlaintext: ffffffffffffffffffffff0000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 55cfb3fb6d75cad0445bbc8dafa25b0f\nPlaintext: ffffffffffffffffffffff8000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7b8e7098e357ef71237d46d8b075b0f5\nPlaintext: ffffffffffffffffffffffc000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2bf27229901eb40f2df9d8398d1505ae\nPlaintext: ffffffffffffffffffffffe000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 83a63402a77f9ad5c1e931a931ecd706\nPlaintext: fffffffffffffffffffffff000000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6f8ba6521152d31f2bada1843e26b973\nPlaintext: fffffffffffffffffffffff800000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e5c3b8e30fd2d8e6239b17b44bd23bbd\nPlaintext: fffffffffffffffffffffffc00000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1ac1f7102c59933e8b2ddc3f14e94baa\nPlaintext: fffffffffffffffffffffffe00000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 21d9ba49f276b45f11af8fc71a088e3d\nPlaintext: ffffffffffffffffffffffff00000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 649f1cddc3792b4638635a392bc9bade\nPlaintext: ffffffffffffffffffffffff80000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e2775e4b59c1bc2e31a2078c11b5a08c\nPlaintext: ffffffffffffffffffffffffc0000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2be1fae5048a25582a679ca10905eb80\nPlaintext: ffffffffffffffffffffffffe0000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: da86f292c6f41ea34fb2068df75ecc29\nPlaintext: fffffffffffffffffffffffff0000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 220df19f85d69b1b562fa69a3c5beca5\nPlaintext: fffffffffffffffffffffffff8000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1f11d5d0355e0b556ccdb6c7f5083b4d\nPlaintext: fffffffffffffffffffffffffc000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 62526b78be79cb384633c91f83b4151b\nPlaintext: fffffffffffffffffffffffffe000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 90ddbcb950843592dd47bbef00fdc876\nPlaintext: ffffffffffffffffffffffffff000000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2fd0e41c5b8402277354a7391d2618e2\nPlaintext: ffffffffffffffffffffffffff800000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3cdf13e72dee4c581bafec70b85f9660\nPlaintext: ffffffffffffffffffffffffffc00000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: afa2ffc137577092e2b654fa199d2c43\nPlaintext: ffffffffffffffffffffffffffe00000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8d683ee63e60d208e343ce48dbc44cac\nPlaintext: fffffffffffffffffffffffffff00000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 705a4ef8ba2133729c20185c3d3a4763\nPlaintext: fffffffffffffffffffffffffff80000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0861a861c3db4e94194211b77ed761b9\nPlaintext: fffffffffffffffffffffffffffc0000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4b00c27e8b26da7eab9d3a88dec8b031\nPlaintext: fffffffffffffffffffffffffffe0000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5f397bf03084820cc8810d52e5b666e9\nPlaintext: ffffffffffffffffffffffffffff0000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 63fafabb72c07bfbd3ddc9b1203104b8\nPlaintext: ffffffffffffffffffffffffffff8000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 683e2140585b18452dd4ffbb93c95df9\nPlaintext: ffffffffffffffffffffffffffffc000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 286894e48e537f8763b56707d7d155c8\nPlaintext: ffffffffffffffffffffffffffffe000\n\nCiphe", "r: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a423deabc173dcf7e2c4c53e77d37cd1\nPlaintext: fffffffffffffffffffffffffffff000\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: eb8168313e1cfdfdb5e986d5429cf172\nPlaintext: fffffffffffffffffffffffffffff800\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 27127daafc9accd2fb334ec3eba52323\nPlaintext: fffffffffffffffffffffffffffffc00\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ee0715b96f72e3f7a22a5064fc592f4c\nPlaintext: fffffffffffffffffffffffffffffe00\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 29ee526770f2a11dcfa989d1ce88830f\nPlaintext: ffffffffffffffffffffffffffffff00\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0493370e054b09871130fe49af730a5a\nPlaintext: ffffffffffffffffffffffffffffff80\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9b7b940f6c509f9e44a4ee140448ee46\nPlaintext: ffffffffffffffffffffffffffffffc0\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2915be4a1ecfdcbe3e023811a12bb6c7\nPlaintext: ffffffffffffffffffffffffffffffe0\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7240e524bc51d8c4d440b1be55d1062c\nPlaintext: fffffffffffffffffffffffffffffff0\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: da63039d38cb4612b2dc36ba26684b93\nPlaintext: fffffffffffffffffffffffffffffff8\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 0f59cb5a4b522e2ac56c1a64f558ad9a\nPlaintext: fffffffffffffffffffffffffffffffc\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 7bfe9d876c6d63c1d035da8fe21c409d\nPlaintext: fffffffffffffffffffffffffffffffe\n\nCipher: AES-256-CBC\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: acdace8078a32b1a182bfa4987ca1347\nPlaintext: ffffffffffffffffffffffffffffffff\n\n", }; -static const size_t kLen26 = 191479; +static const size_t kLen27 = 191479; -static const char *kData27[] = { +static const char *kData28[] = { "# Generated by \"make_cavp -cipher=aes -extra-labels=Cipher=AES-256-CTR -swap-iv-plaintext kat_aes/CBCGFSbox256.rsp kat_aes/CBCKeySbox256.rsp kat_aes/CBCVarKey256.rsp kat_aes/CBCVarTxt256.rsp\"\n\n# File 1: kat_aes/CBCGFSbox256.rsp\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 014730f80ac625fe84f026c60bfd547d\nCiphertext: 5c9d844ed46f9885085e5d6a4f94c7d7\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 0b24af36193ce4665f2825d7b4749c98\nCiphertext: a9ff75bd7cf6613d3731c77c3b6d0c04\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 761c1fe41a18acf20d241650611d90f1\nCiphertext: 623a52fcea5d443e48d9181ab32c7421\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 8a560769d605868ad80d819bdba03771\nCiphertext: 38f2c7ae10612415d27ca190d27da8b4\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 91fbef2d15a97816060bee1feaa49afe\nCiphertext: 1bc704f1bce135ceb810341b216d7abe\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5c9d844ed46f9885085e5d6a4f94c7d7\nIV: 014730f80ac625fe84f026c60bfd547d\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a9ff75bd7cf6613d3731c77c3b6d0c04\nIV: 0b24af36193ce4665f2825d7b4749c98\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 623a52fcea5d443e48d9181ab32c7421\nIV: 761c1fe41a18acf20d241650611d90f1\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 38f2c7ae10612415d27ca190d27da8b4\nIV: 8a560769d605868ad80d819bdba03771\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1bc704f1bce135ceb810341b216d7abe\nIV: 91fbef2d15a97816060bee1feaa49afe\n\n# File 2: kat_aes/CBCKeySbox256.rsp\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: c47b0294dbbbee0fec4757f22ffeee3587ca4730c3d33b691df38bab076bc558\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 46f2fb342d6f0ab477476fc501242c5f\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 28d46cffa158533194214a91e712fc2b45b518076675affd910edeca5f41ac64\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4bf3b0a69aeb6657794f2901b1440ad4\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: c1cc358b449909a19436cfbb3f852ef8bcb5ed12ac7058325f56e6099aab1a1c\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 352065272169abf9856843927d0674fd\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 984ca75f4ee8d706f46c2d98c0bf4a45f5b00d791c2dfeb191b5ed8e420fd627\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4307456a9e67813b452e15fa8fffe398\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: b43d08a447ac8609baadae4ff12918b9f68fc1653f1269222f123981ded7a92f\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4663446607354989477a5c6f0f007ef4\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 1d85a181b54cde51f0e098095b2962fdc93b51fe9b88602b3f54130bf76a5bd9\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 531c2c38344578b84d50b3c917bbb6e1\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: dc0eba1f2232a7879ded34ed8428eeb8769b056bbaf8ad77cb65c3541430b4cf\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: fc6aec906323480005c58e7e1ab004ad\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: f8be9ba615c5a952cabbca24f68f8593039624d524c816acda2c9183bd917cb9\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a3944b95ca0b52043584ef02151926a8\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 797f8b3d176dac5b7e34a2d539c4ef367a16f8635f6264737591c5c07bf57a3e\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a74289fe73a4c123ca189ea1e1b49ad5\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 6838d40caf927749c13f0329d331f448e202c73ef52c5f73a37ca635d4c47707\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b91d4ea4488644b56cf0812fa7fcf5fc\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ccd1bc3c659cd3c59bc437484e3c5c724441da8d6e90ce556cd57d0752663bbc\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 304f81ab61a80c2e743b94d5002a126b\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 13428b5e4c005e0636dd338405d173ab135dec2a25c22c5df0722d69dcc43887\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 649a71545378c783e368c9ade7114f6c\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 07eb03a08d291d1b07408bf3512ab40c91097ac77461aad4bb859647f74f00ee\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 47cb030da2ab051dfc6c4bf6910d12bb\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 90143ae20cd78c5d8ebdd6cb9dc1762427a96c78c639bccc41a61424564eafe1\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 798c7c005dee432b2c8ea5dfa381ecc3\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: b7a5794d52737475d53d5a377200849be0260a67a2b22ced8bbef12882270d07\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 637c31dc2591a07636f646b72daabbe7\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fca02f3d5011cfc5c1e23165d413a049d4526a991827424d896fe3435e0bf68e\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 179a49c712154bbffbe6e7a84a18e220\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: c47b0294dbbbee0fec4757f22ffeee3587ca4730c3d33b691df38bab076bc558\nPlaintext: 00000000000000000000000000000000\nCiphertext: 46f2fb342d6f0ab477476fc501242c5f\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 28d46cffa158533194214a91e712fc2b45b518076675affd910edeca5f41ac64\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4bf3b0a69aeb6657794f2901b1440ad4\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: c1cc358b449909a19436cfbb3f852ef8bcb5ed12ac7058325f56e6099aab1a1c\nPlaintext: 00000000000000000000000000000000\nCiphertext: 352065272169abf9856843927d0674fd\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 984ca75f4ee8d706f46c2d98c0bf4a45f5b00d791c2dfeb191b5ed8e420fd627\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4307456a9e67813b452e15fa8fffe398\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: b43d08a447ac8609baadae4ff12918b9f68fc1653f1269222f123981ded7a92f\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4663446607354989477a5c6f0f007ef4\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 1d85a181b54cde51f0e098095b2962fdc93b51fe9b88602b3f54130bf76a5bd9\nPlaintext: 00000000000000000000000000000000\nCiphertext: 531c2c38344578b84d50b3c917bbb6e1\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: dc0eba1f2232a7879ded34ed8428eeb8769b056bbaf8ad77cb65c3541430b4cf\nPlaintext: 00000000000000000000000000000000\nCiphertext: fc6aec906323480005c58e7e1ab004ad\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: f8be9ba615c5a952cabbca24f68f8593039624d524c816acda2c9183bd917cb9\nPlaintext: 000000000000000000", "00000000000000\nCiphertext: a3944b95ca0b52043584ef02151926a8\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 797f8b3d176dac5b7e34a2d539c4ef367a16f8635f6264737591c5c07bf57a3e\nPlaintext: 00000000000000000000000000000000\nCiphertext: a74289fe73a4c123ca189ea1e1b49ad5\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 6838d40caf927749c13f0329d331f448e202c73ef52c5f73a37ca635d4c47707\nPlaintext: 00000000000000000000000000000000\nCiphertext: b91d4ea4488644b56cf0812fa7fcf5fc\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: ccd1bc3c659cd3c59bc437484e3c5c724441da8d6e90ce556cd57d0752663bbc\nPlaintext: 00000000000000000000000000000000\nCiphertext: 304f81ab61a80c2e743b94d5002a126b\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 13428b5e4c005e0636dd338405d173ab135dec2a25c22c5df0722d69dcc43887\nPlaintext: 00000000000000000000000000000000\nCiphertext: 649a71545378c783e368c9ade7114f6c\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 07eb03a08d291d1b07408bf3512ab40c91097ac77461aad4bb859647f74f00ee\nPlaintext: 00000000000000000000000000000000\nCiphertext: 47cb030da2ab051dfc6c4bf6910d12bb\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 90143ae20cd78c5d8ebdd6cb9dc1762427a96c78c639bccc41a61424564eafe1\nPlaintext: 00000000000000000000000000000000\nCiphertext: 798c7c005dee432b2c8ea5dfa381ecc3\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: b7a5794d52737475d53d5a377200849be0260a67a2b22ced8bbef12882270d07\nPlaintext: 00000000000000000000000000000000\nCiphertext: 637c31dc2591a07636f646b72daabbe7\nIV: 00000000000000000000000000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: fca02f3d5011cfc5c1e23165d413a049d4526a991827424d896fe3435e0bf68e\nPlaintext: 00000000000000000000000000000000\nCiphertext: 179a49c712154bbffbe6e7a84a18e220\nIV: 00000000000000000000000000000000\n\n# File 3: kat_aes/CBCVarKey256.rsp\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: 8000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e35a6dcb19b201a01ebcfa8aa22b5759\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: c000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b29169cdcf2d83e838125a12ee6aa400\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: e000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d8f3a72fc3cdf74dfaf6c3e6b97b2fa6\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: f000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1c777679d50037c79491a94da76a9a35\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: f800000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 9cf4893ecafa0a0247a898e040691559\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fc00000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8fbb413703735326310a269bd3aa94b2\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fe00000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 60e32246bed2b0e859e55c1cc6b26502\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ff00000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ec52a212f80a09df6317021bc2a9819e\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ff80000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f23e5b600eb70dbccf6c0b1d9a68182c\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffc0000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a3f599d63a82a968c33fe26590745970\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffe0000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d1ccb9b1337002cbac42c520b5d67722\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fff0000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: cc111f6c37cf40a1159d00fb59fb0488\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fff8000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: dc43b51ab609052372989a26e9cdd714\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffc000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4dcede8da9e2578f39703d4433dc6459\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffe000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 1a4c1c263bbccfafc11782894685e3a8\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffff000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 937ad84880db50613423d6d527a2823d\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffff800000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 610b71dfc688e150d8152c5b35ebc14d\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffc00000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 27ef2495dabf323885aab39c80f18d8b\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffe00000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 633cafea395bc03adae3a1e2068e4b4e\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffff00000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6e1b482b53761cf631819b749a6f3724\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffff80000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 976e6f851ab52c771998dbb2d71c75a9\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffc0000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 85f2ba84f8c307cf525e124c3e22e6cc\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffe0000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6bcca98bf6a835fa64955f72de4115fe\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffff0000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2c75e2d36eebd65411f14fd0eb1d2a06\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffff8000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: bd49295006250ffca5100b6007a0eade\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffc000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a190527d0ef7c70f459cd3940df316ec\n\nCipher: AES-256-CTR\nOperation: ENC", "RYPT\nKey: ffffffe000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: bbd1097a62433f79449fa97d4ee80dbf\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffff000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 07058e408f5b99b0e0f061a1761b5b3b\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffff800000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5fd1f13fa0f31e37fabde328f894eac2\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffc00000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: fc4af7c948df26e2ef3e01c1ee5b8f6f\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffe00000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 829fd7208fb92d44a074a677ee9861ac\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffff00000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ad9fc613a703251b54c64a0e76431711\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffff80000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 33ac9eccc4cc75e2711618f80b1548e8\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffc0000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2025c74b8ad8f4cda17ee2049c4c902d\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffe0000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f85ca05fe528f1ce9b790166e8d551e7\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffff0000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 6f6238d8966048d4967154e0dad5a6c9\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffff8000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f2b21b4e7640a9b3346de8b82fb41e49\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffc000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: f836f251ad1d11d49dc344628b1884e1\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffe000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 077e9470ae7abea5a9769d49182628c3\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffff000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: e0dcc2d27fc9865633f85223cf0d611f\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffff800000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: be66cfea2fecd6bf0ec7b4352c99bcaa\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffc00000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: df31144f87a2ef523facdcf21a427804\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffe00000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: b5bb0f5629fb6aae5e1839a3c3625d63\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffff00000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3c9db3335306fe1ec612bdbfae6b6028\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffff80000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3dd5c34634a79d3cfcc8339760e6f5f4\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffc0000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 82bda118a3ed7af314fa2ccc5c07b761\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffe0000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 2937a64f7d4f46fe6fea3b349ec78e38\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffff0000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 225f068c28476605735ad671bb8f39f3\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffff8000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ae682c5ecd71898e08942ac9aa89875c\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffffc000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 5e031cb9d676c3022d7f26227e85c38f\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffffe000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: a78463fb064db5d52bb64bfef64f2dda\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffff000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 8aa9b75e784593876c53a00eae5af52b\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffff800000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3f84566df23da48af692722fe980573a\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffffc00000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 31690b5ed41c7eb42a1e83270a7ff0e6\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffffe00000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 77dd7702646d55f08365e477d3590eda\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffffff00000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 4c022ac62b3cb78d739cc67b3e20bb7e\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffffff80000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 092fa137ce18b5dfe7906f550bb13370\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffffffc0000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 3e0cdadf2e68353c0027672c97144dd3\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: ffffffffffffffe0000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: d8c4b200b383fc1f2b2ea677618a1d27\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffffff0000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: 11825f99b0e9bb3477c1c0713b015aac\n\nCipher: AES-256-CTR\nOperation: ENCRYPT\nKey: fffffffffffffff8000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nIV: 00000000000000000000000000000000\nCiphertext: ", @@ -1617,9 +1623,9 @@ "000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4cc42fc1407b008fe350907c092e80ac\nIV: ffffffffffffffffffff800000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 08b244ce7cbc8ee97fbba808cb146fda\nIV: ffffffffffffffffffffc00000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 39b333e8694f21546ad1edd9d87ed95b\nIV: ffffffffffffffffffffe00000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3b271f8ab2e6e4a20ba8090f43ba78f3\nIV: fffffffffffffffffffff00000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9ad983f3bf651cd0393f0a73cccdea50\nIV: fffffffffffffffffffff80000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8f476cbff75c1f725ce18e4bbcd19b32\nIV: fffffffffffffffffffffc0000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 905b6267f1d6ab5320835a133f096f2a\nIV: fffffffffffffffffffffe0000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 145b60d6d0193c23f4221848a892d61a\nIV: ffffffffffffffffffffff0000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 55cfb3fb6d75cad0445bbc8dafa25b0f\nIV: ffffffffffffffffffffff8000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7b8e7098e357ef71237d46d8b075b0f5\nIV: ffffffffffffffffffffffc000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2bf27229901eb40f2df9d8398d1505ae\nIV: ffffffffffffffffffffffe000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 83a63402a77f9ad5c1e931a931ecd706\nIV: fffffffffffffffffffffff000000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 6f8ba6521152d31f2bada1843e26b973\nIV: fffffffffffffffffffffff800000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e5c3b8e30fd2d8e6239b17b44bd23bbd\nIV: fffffffffffffffffffffffc00000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1ac1f7102c59933e8b2ddc3f14e94baa\nIV: fffffffffffffffffffffffe00000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 21d9ba49f276b45f11af8fc71a088e3d\nIV: ffffffffffffffffffffffff00000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 649f1cddc3792b4638635a392bc9bade\nIV: ffffffffffffffffffffffff80000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: e2775e4b59c1bc2e31a2078c11b5a08c\nIV: ffffffffffffffffffffffffc0000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2be1fae5048a25582a679ca10905eb80\nIV: ffffffffffffffffffffffffe0000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: da86f292c6f41ea34fb2068df75ecc29\nIV: fffffffffffffffffffffffff0000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 220df19f85d69b1b562fa69a3c5beca5\nIV: fffffffffffffffffffffffff8000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 1f11d5d0355e0b556ccdb6c7f5083b4d\nIV: fffffffffffffffffffffffffc000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 62526b78be79cb384633c91f83b4151b\nIV: fffffffffffffffffffffffffe000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 90ddbcb950843592dd47bbef00fdc876\nIV: ffffffffffffffffffffffffff000000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2fd0e41c5b8402277354a7391d2618e2\nIV: ffffffffffffffffffffffffff800000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 3cdf13e72dee4c581bafec70b85f9660\nIV: ffffffffffffffffffffffffffc00000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: afa2ffc137577092e2b654fa199d2c43\nIV: ffffffffffffffffffffffffffe00000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 8d683ee63e60d208e343ce48dbc44cac\nIV: fffffffffffffffffffffffffff00000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 705a4ef8ba2133729c20185c3d3a4763\nIV: fffffffffffffffffffffffffff80000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0861a861c3db4e94194211b77ed761b9\nIV: fffffffffffffffffffffffffffc0000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 4b00c27e8b26da7eab9d3a88dec8b031\nIV: fffffffffffffffffffffffffffe0000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 5f397bf03084820cc8810d52e5b666e9\nIV: ffffffffffffffffffffffffffff0000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 63fafabb72c07bfbd3ddc9b1203104b8\nIV: ffffffffffffffffffffffffffff8000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 683e2140585b18452dd4ffbb93c95df9\nIV: ffffffffffffffffffffffffffffc000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 286894e48e537f8763b56707d7d155c8\nIV: ffffffffffffffffffff", "ffffffffe000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: a423deabc173dcf7e2c4c53e77d37cd1\nIV: fffffffffffffffffffffffffffff000\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: eb8168313e1cfdfdb5e986d5429cf172\nIV: fffffffffffffffffffffffffffff800\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 27127daafc9accd2fb334ec3eba52323\nIV: fffffffffffffffffffffffffffffc00\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: ee0715b96f72e3f7a22a5064fc592f4c\nIV: fffffffffffffffffffffffffffffe00\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 29ee526770f2a11dcfa989d1ce88830f\nIV: ffffffffffffffffffffffffffffff00\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0493370e054b09871130fe49af730a5a\nIV: ffffffffffffffffffffffffffffff80\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 9b7b940f6c509f9e44a4ee140448ee46\nIV: ffffffffffffffffffffffffffffffc0\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 2915be4a1ecfdcbe3e023811a12bb6c7\nIV: ffffffffffffffffffffffffffffffe0\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7240e524bc51d8c4d440b1be55d1062c\nIV: fffffffffffffffffffffffffffffff0\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: da63039d38cb4612b2dc36ba26684b93\nIV: fffffffffffffffffffffffffffffff8\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 0f59cb5a4b522e2ac56c1a64f558ad9a\nIV: fffffffffffffffffffffffffffffffc\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: 7bfe9d876c6d63c1d035da8fe21c409d\nIV: fffffffffffffffffffffffffffffffe\n\nCipher: AES-256-CTR\nOperation: DECRYPT\nKey: 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext: 00000000000000000000000000000000\nCiphertext: acdace8078a32b1a182bfa4987ca1347\nIV: ffffffffffffffffffffffffffffffff\n\n", }; -static const size_t kLen27 = 191498; +static const size_t kLen28 = 191498; -static const char *kData28[] = { +static const char *kData29[] = { "# Generated by \"make_cavp -cipher gcm kat_gcm/gcmDecrypt256.rsp kat_gcm/gcmEncryptExtIV256.rsp\"\n\n# File 1: kat_gcm/gcmDecrypt256.rsp\n\nKEY: f5a2b27c74355872eb3ef6c5feafaa740e6ae990d9d48c3bd9bb8235e589f010\nNONCE: 58d2240f580a31c1d24948e9\nCT: \nAD: \nTAG: 15e051a5e4a5f5da6cea92e2ebee5bac\nIN: \n\nKEY: e5a8123f2e2e007d4e379ba114a2fb66e6613f57c72d4e4f024964053028a831\nNONCE: 51e43385bf533e168427e1ad\nCT: \nAD: \nTAG: 38fe845c66e66bdd884c2aecafd280e6\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: c5ba3bf9ada560fb0301cd4e0b8b8a46a2aff2400395a72ed5804b3c755c4e59\nNONCE: de2b956e704063c000f28bbb\nCT: \nAD: \nTAG: 04eb9b20fd4548dc71594f20073a45a2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: c1d6162b585e2bac14d554d5675c6ddaa6b93be2eb07f8df86c9bb30f93ae688\nNONCE: f04dfce5c8e7713c71a70cc9\nCT: \nAD: \nTAG: 37fb4f33c82f6fce0c562896b3e10fc2\nIN: \n\nKEY: 70458edea4d95c8b3e069f14e1ad71d9186f482fe6d85088c71db58267e747ec\nNONCE: d6413ee8453a1729a658c6f4\nCT: \nAD: \nTAG: bd9e5e0c6ddc94acf65bf4e301d20a37\nIN: \n\nKEY: aa0bedc56b30418235aa94327062c34e0ddbf931e7bcb964b60678d411baf6cb\nNONCE: 8a7220c9a7e417e5da182bdb\nCT: \nAD: \nTAG: ae7e608491439940b4d1046c28361258\nIN: \n\nKEY: c11ce73ba45d5e33be3efd335c4d67d659284b3a824ae35d5982e9ea4c68145d\nNONCE: 1eeffdbab0745a757789018f\nCT: \nAD: \nTAG: d387f9e6bbbbf273746c9b5276a8618c\nIN: \n\nKEY: 639664a00278e45d18cd4ac1265a4fea39d1cd8d7907a0adb38723209c46a4bf\nNONCE: d838ba74c7ad57ee5266c5b7\nCT: \nAD: \nTAG: 3750f87de43cfa02ef882d6497da082d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: dc18f40a774ceeb930f0bb45070404783c66988a515db1a36ec0cc0d70fac2fd\nNONCE: 9c3a7dd947e6f50a6577c5ff\nCT: \nAD: \nTAG: 511924f2603d6d38920539fb10178989\nIN: \n\nKEY: 39aed23722e201752d2e53efe66c8f0f695658a63a9a8cecf4e25f02dd7da1d5\nNONCE: ce0108bc35e7ff7ba8408f3f\nCT: \nAD: \nTAG: 66acc084d5f62e639338131f5ab8f6c1\nIN: \n\nKEY: c5c19e080bbbce795754ae25e36dc7aea1589d823fe89835d0286e54de7f3153\nNONCE: 3109398abd423349b9b50adc\nCT: \nAD: \nTAG: 73c92b76997dbd9fe251436a7f61a666\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 831640f910ef709eb0ec3998ea5aa55470082de05ee20ed8b19f067d8af1308e\nNONCE: 443dcee827eb4cc49fe2b287\nCT: \nAD: \nTAG: 005ec26c2d708d5234b7937313dc7384\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 56567431c5210979a8dbb432966a81b3f1db5ec021f8aae0f0c3cce3678cc6fd\nNONCE: 45a97d48000ce1dab68de02e\nCT: \nAD: \nTAG: bbb295fd1e37c317f8130221af50496b\nIN: \n\nKEY: fdf71650d60cb7aa566cdd7ba66f462ed613a1c6c1dfdab0ba8e676fb7a8b935\nNONCE: a035553c5a9b88a67627dbcc\nCT: \nAD: \nTAG: 4a7361a05757e2cb60cc17ff8c5911b7\nIN: \n\nKEY: 3b19d8a4795b52e6dc4f8fd3c091c05a65c8f3cddc665ab473e6144011ae54a4\nNONCE: 23744265b6865b99bed99f11\nCT: \nAD: \nTAG: b7a67b6068d2b22c1b26f795ee1701be\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 31201b86ccb6cbcf289798225c55de5a1c936a18aec996b5b8dcceb33bf96b41\nNONCE: c2c6402f1f5ae89a6fa0fb65\nCT: \nAD: \nTAG: 0b0bebb86a5d60f1f1881cea155e33\nIN: \n\nKEY: 2878cdd980bd1289e2efef7f3116b0a2772d272412e1cfeaf20f90cc278820e9\nNONCE: 9ada69a2f393958cc3866bf9\nCT: \nAD: \nTAG: cff55846db838aaf5e08e88f8d7fe2\nIN: \n\nKEY: 1ee02b8c391d6559ceb1683221821e377d20fb186733d24d2becb73e4121e92b\nNONCE: 70181ecf28be85c68f4dbe86\nCT: \nAD: \nTAG: b90acb4d41e2df4c148d8837ca712b\nIN: \n\nKEY: e8cd41c3d9ee7dca4c5d66753384cd1a034f729595fbeb00042874fe704fe4a8\nNONCE: cab88d202761537e288dcd47\nCT: \nAD: \nTAG: 954296ab400209335f424eb22636a5\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 56fec15de81f78182f3f4d9cda32c3d7744568ab6e2285c7c3384bd17f0a4e22\nNONCE: 71e09145955273fd889cefda\nCT: \nAD: \nTAG: 3b2191283125d17f1f41558279630f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: f66d1d2bd210d75c555b856c5c61d9c09b035498a9896284c34d9312e35b1065\nNONCE: 10dda1bf8ebca4b0a1f3396d\nCT: \nAD: \nTAG: 6da9c30516fe1d60355a01211669dd\nIN: \n\nKEY: 421ad8416b0558e225e9e3de2ec1c7fc0ea5a3378291dfd4c43f85fb3fa63d59\nNONCE: 23a84ef01256fa90a44e502b\nCT: \nAD: \nTAG: 237b556e56c27f03ff2e893d46dc14\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 5a848b232b428015fc1a86134774558bdb3180f8b853bc32be40b6e4f098a857\nNONCE: cc87b1468b8ee9a5a4e1d7e1\nCT: \nAD: \nTAG: 329be89d4cd62d3d3a755d0989f3e7\nIN: \n\nKEY: 9a865aa04969fe50bcb48b90d75ce72f1ced9337ef81acec5a633eac7544f86d\nNONCE: cf4962b18e6b8f6f4146a0e7\nCT: \nAD: \nTAG: da7e4d68f4f77271537786350f8fcc\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: e106e692ae0285dad853a3232e150c1ccc602d74bf3bd91e0ffa36c33855d152\nNONCE: c4fe31cf2f36bf29080e6317\nCT: \nAD: \nTAG: 2523855a9d0bf9db28c39142aabb76\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: cfae5da8cabe9bd774713bc5b6c5a3ae42a872154636b6f976ee51e6a197a949\nNONCE: 033a03e2d701d1aafea3c399\nCT: \nAD: \nTAG: bb94014b3268e39eb71a2e3f5e65b2\nIN: \n\nKEY: 267b7087ad528cb9564c909b4fd8f9a80787ac2f85f23d10be6d0b2bfa043c09\nNONCE: cf8e3f28b1af597a76d0f538\nCT: \nAD: \nTAG: acec8a91da886b56075e5661fd5281\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 174162718b2e85482533322741309a4d3100c77e4178cd936b9881ab868b9bf9\nNONCE: 6a4abe063efd24fc960c56cb\nCT: \nAD: \nTAG: 1dc929a76cc0f4e28e65367e29002b\nIN: \n\nKEY: badd602c95d173fcb1334a32cd1437fbbfc21813bbefa8457b543a6f05c7ca80\nNONCE: c28a85678f63fd46edf03810\nCT: \nAD: \nTAG: 94f4cc2fb26c2d487b20b01441574f\nIN: \n\nKEY: 8ff59e7c71865c94b637a924132e5519137da18573ee797c981dfd41c70538e7\nNONCE: 80b277f8789d5f1165924d21\nCT: \nAD: \nTAG: fc1bd57ced8be952b9ff6017502ff6\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 799c0a95a15bbe3915cd55ff2af71a437247c74092819c8f398f820b5829b4de\nNONCE: 53be11fdaa1cef09b7cbbdf7\nCT: \nAD: \nTAG: e81916926bbd1cf8d0378467dd99\nIN: \n\nKEY: d24580e7584b7fce9bce2e6a0d1d3bab184ac25171e57c9d67db832325202a96\nNONCE: 2d40c5487ea483e543238c93\nCT: \nAD: \nTAG: ed989ab0f70be34acf71f6ac6a00\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: a8b15b30aa3f69190611031906cc125c98289fed2836f99b29e1d38b2c32c8ed\nNONCE: 317a4522cc374f32458142e2\nCT: \nAD: \nTAG: 4d421b1e0551f632b80f14cc433e\nIN: \n\nKEY: 8f85436046b48589390986646a5ed0e1587d431d1d10ec66d490f38c60ae9182\nNONCE: 6bbe054c533f5d659f5442fd\nCT: \nAD: \nTAG: edf25381a757cf747676fea43772\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9254c8375c3fe74b35a125a8e9f5109cf880f13ad03b7ff35ac0255efbc51a5d\nNONCE: 912705e60880ea3b9554dd69\nCT: \nAD: \nTAG: a5c899aea5e9483d9506682b6a66\nIN: \n\nKEY: 3a3908ae84d595b377fa7325374a7cf8ab6b70e62d21b8b5be75ae2e31334481\nNONCE: ec3ec0cec10bcbd3f2ea0002\nCT: \nAD: \nTAG: c122ee4d6df5f23f1e48732516e7\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 57eb6a05eb054b404f2d87623fe1340b052d20597e9331ef90ad684d4f660202\nNONCE: ee2468096c2befc44e16d351\nCT: \nAD: \nTAG: 0894132b1594df56b6114419cd4c\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 8704fce138b35ccf644ed70285300df5a7ddb19c3a1e244b6c6764c565812fc6\nNONCE: 8acfc17f01e8200da86009c1\nCT: \nAD: \nTAG: 914a956e661b064f91cfe779bf14\nIN: \n\nKEY: 6bdf1a1a465dc9777147de2f73527f193883ea5241d5cd209939290d73a3e149\nNONCE: c9e36c568487a78cf85269d6\nCT: \nAD: \nTAG: 34fbc5a0c2bb9bf937c4316838da\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 4da9edd0d5f7fe42bd0ff2d6342c9588625bf24ed3e3f5c1a456f2915ead961a\nNONCE: 3f1ece70c54dcc320de79733\nCT: \nAD: \nTAG: 083510a941749021d64ba5ec59d4\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 7a83b53a0b11f4477f673cad123ea5548903759e9d5d856235c59ff3af1caa8d\nNONCE: 7c3f82f7bf425398742916fc\nCT: \nAD: \nTAG: 7de106e354fe15c5111cb127335f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 4f17984fd466eede268b8ef75629cc7bac53b2dfcaf326700ac1a9841ea580fe\nNONCE: 2a9d7d283c33c953ed0fb90a\nCT: \nAD: \nTAG: 9befbbe25a1f2d7e8eb39689f39b\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: d7a5f32bc7ba818b26fdc03fc1a4de7d8837bcebc023b36591284a0973fde527\nNONCE: d590b0a69cea63c8c3293f2c\nCT: \nAD: \nTAG: 1080033d9a947bb879b1df5576c3\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 270b3ca4321ba7346226c89868483a6e6e679cd896f8e9d52cea9000e1939746\nNONCE: 3f29410035eeb93d03a7b2d1\nCT: \nAD: \nTAG: 7529cd4204b9a8e149034907e829\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 0bf97de28518991a5043c1b6d56d2ef87d38d195d47984fc1ccbfcb7f3860908\nNONCE: 1d76c092d2dd79a62b970403\nCT: \nAD: \nTAG: e63432142ef64756c38d693fd8fe\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 585daad086f48a3dffd89e3712f1f8033e8b168c107ddc7f3454690decc132d5\nNONCE: e2f2a83f6aaec072d8268cee\nCT: \nAD: \nTAG: d400ebadcef9ce147a3b00ea39\nIN: \n\nKEY: 42de0aed7e4b699546d351af85db208d79273393bde6318e33232850c65457e7\nNONCE: 82bd822d011e38319a76dfe2\nCT: \nAD: \nTAG: e262760567ca2ca6cbb3fa5703\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 00ae365607def9dd57d4f38f131ea9659abdd96eae6c52179b16796cf1ee53a0\nNONCE: 56d2485bb17cd4a6791ebd07\nCT: \nAD: \nTAG: 8460e8e8fbb4c8212c96fee330\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 27271e1fa38fadaae145b7fdb15c357c95cf7cbe77961561b59b0ad27df57b5b\nNONCE: 22fb1457c21627e8ddf5017c\nCT: \nAD: \nTAG: 0b6b620e9f5d1ba6e886d71e75\nIN: \n\nKEY: eb9fd8b60a524219cf09805e6aabf65ebb1730fe3b1ef0d91adf054", "44088d665\nNONCE: f8745cf1171199ee02607d59\nCT: \nAD: \nTAG: 65866a3b4455bd3ee58a88d7c3\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: cc72d5bdb02986acecd74dfcf20d880ae5bc14afd26db1b9f04fe08b85a4bf6e\nNONCE: b2d26145ed1be0cf782ea5fd\nCT: \nAD: \nTAG: 101f1e5c96748958462434cdd5\nIN: \n\nKEY: 4ac59235d7350ddad294fa9e0ea8e246a7c9f10689d2b0bd9e0145ecebf89885\nNONCE: cef0563a1797cc62589af02b\nCT: \nAD: \nTAG: a5299a6eaaf9b3ad82bd23b340\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 30fc4f8d634f404d1a66791d7c745d841c635320b7a1b28fbd26f3154b952d19\nNONCE: e7addadf0740e62ee32dd111\nCT: \nAD: \nTAG: 4c9a4fdecf2af9a609b67b6564\nIN: \n\nKEY: 3896ca84611b23bda4af5cc9fe0d62cf093019f1192a2c27cd7d2c1320102998\nNONCE: 0cc3ae5b56f3db71e2195e6e\nCT: \nAD: \nTAG: 0413fefe638d6613ad15ff5422\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9d4cfc649a6c146c20b17e44af835c42cafe4c8e1ebcba092c22d77fdb0a5478\nNONCE: a27cce894b2dc42f1754aae0\nCT: \nAD: \nTAG: b1259f4cae8c4708fd46e60c26\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: e7ad81d26e5a639b7e99d3b205ddb6a09598ac804b5913ee8b8e724e5b69d003\nNONCE: 08fc7f46f6f600feecefc008\nCT: \nAD: \nTAG: e51e2ed634294d73942a9aafd8\nIN: \n\nKEY: d9288c7e44440398e9c5b6156615bb0d63064cbcee22cee46e710cdf6753e2cf\nNONCE: dc37870991b27ae42dfd6c33\nCT: \nAD: \nTAG: 5408193318902ae3e92b4b6eca\nIN: \n\nKEY: 3e7c2c5dd3c9e092e45d0ee9eaa2f8c2714cf845f50be787cb6a3e65726a7a56\nNONCE: 0e39d519e9d6db4dc462f2ec\nCT: \nAD: \nTAG: bbf6cd3c840ba5347b281ccd99\nIN: \n\nKEY: 29ae533689bc22ea72580a42260b71128504ff55f4025f455fe656a7cd534c08\nNONCE: fd0a67e9cdea915eb367e069\nCT: \nAD: \nTAG: 6421e4d996407496e09231a96e\nIN: \n\nKEY: 7930342c63e26215a80eaa824ec382d452c6d71f81a7ac2667b1baf1b139cee8\nNONCE: 920cf0199c32cdcf419971ad\nCT: \nAD: \nTAG: 866e974b681af38f0a98074ec1\nIN: \n\nKEY: 96ad13bf2492f4675340e65b455bd0b884574f5b6c4fea774462496b8a0925ad\nNONCE: 2ddf6aa50c2ea9106ce0a951\nCT: \nAD: \nTAG: 10a471540cc7bae14273f2e2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: b1599e78f21b175a3038aacde9141f7198c301ff80276020c1974342baad1e55\nNONCE: abdd25c66d7821fde6ec0b76\nCT: \nAD: \nTAG: ab077a703bfb6646d5aef26b\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 7c487e31244dcbf84ee6e7c03714302aa3e52ae1282f8de72c44d3777e73593c\nNONCE: 297e056784c12646ed2fa6c7\nCT: \nAD: \nTAG: 08c53ea6cc85662f0d9bb018\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: d9304fc27885ac2ac5cf871e9c5758ad66babbc50b26d1c3e32d00ebb4273525\nNONCE: c73d0831e8e23cec9ac4143c\nCT: \nAD: \nTAG: 2f19c7a022909777853ccd5a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9f6fed7d59ef1650244ee0966f647179968edb74f5d9b4ea412300979d2c9d9d\nNONCE: c0d8eafd572e76402bf2421b\nCT: \nAD: \nTAG: 157519d699f8f19b6ed0a4c9\nIN: \n\nKEY: 72eb01f911a998bd534b696b0ce99cbbe7788f1d5f3f1c07f5286daef7007ad0\nNONCE: 6930e168edf7be096aa92f77\nCT: \nAD: \nTAG: 8229b618c52079abd2d8cf96\nIN: \n\nKEY: e625dc4d57da4975c5e2bbdc3be61716c910975848f2a06a8a375c12ceff702a\nNONCE: 44925a2c8f2eaa0d02d33047\nCT: \nAD: \nTAG: 9a0f456312dce97e23d4af58\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 648914e5322383a1984b84726deeead89dd19c60556622d61ce649ba74b152b5\nNONCE: 8a070725978278d7e3e6fae4\nCT: \nAD: \nTAG: 40819c4375be0ec64543f5c2\nIN: \n\nKEY: b0a2fc05e05eb23b03f6fd073d1502fa071cfdde6e4a57f344d3b46587d44667\nNONCE: 6b05139925fca211928767ab\nCT: \nAD: \nTAG: b927b087690a7d2fdc5da1d7\nIN: \n\nKEY: 9a56a45297bf12c63db8207118c3570f05eebcc31a87ad20ac85fad9a9cfcbce\nNONCE: 2108bf02ae1b9191e5f20e06\nCT: \nAD: \nTAG: c1a03eeb46a080507fb39e33\nIN: \n\nKEY: 98f9da937717a7698eda75b5671ea209dde1b37506d2a5874b9ec57805310e73\nNONCE: 4db9d0d9cb66a80565af6c84\nCT: \nAD: \nTAG: eeef79af87fe6bc0d0476d16\nIN: \n\nKEY: b5c699b548cd0839a24eec8aee1b0a5bc42de0bec78aacaa9b18b666986891b4\nNONCE: 87e21a74da97bc02d7f9e0cc\nCT: \nAD: \nTAG: c4a584270a5b0bfe0ac979bb\nIN: \n\nKEY: cd3adadded7c7ae047ae38c93a73d029fdf4e12a8a0c2fbc6c5f354fe07b0fa9\nNONCE: acf47c06e93b5d042c8444b9\nCT: \nAD: \nTAG: f1391598e2172300fb5279dc\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: cf90a8f6731d71abaaa354076c69812a96145b4d283369b0c519ce1818c85cff\nNONCE: 718b1b2d8979f54e357bce92\nCT: \nAD: \nTAG: ea7dc6b16c9a870a560facbc\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 849ee5f331af0bbb2366033ca07c29fe8ec64b2e18f8d2af91d88c08b958763c\nNONCE: 23b34d13fa0e2c954e0a5974\nCT: \nAD: \nTAG: c4a18f7724ca968055aa0d8a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: caed02e544e9eb475360e9b3e4b6e7572605081790ec54ea39ab9bc67932e0fd\nNONCE: d2ffaa7f0b6c3c708238a1b0\nCT: \nAD: \nTAG: eb053ee206ab47cc\nIN: \n\nKEY: ddd2cc50ed30a394387adcef5dcfdb7405082d62b3a513902977301f22ccf851\nNONCE: 4dc0d75a392e1b1cd2e5b6d6\nCT: \nAD: \nTAG: 11e713078f660a45\nIN: \n\nKEY: ae166cba7907a50a2faeb8a1f835e0a21b6074f403d2fbf265ca8525663865c5\nNONCE: d70ea09bd1dc20d47625a7ce\nCT: \nAD: \nTAG: 8a0138d6b06dbee0\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 119c935ac47a3d2e2bbc2fe753c34727ea28e96c288a8b46a0c884066a85edc5\nNONCE: e04c72c0dfec84d52bcda87d\nCT: \nAD: \nTAG: 5ca9d3a5b75b519a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 166ebf390a9aa54e3c525b06497adcdc9b394ba25e65731c0004e9ff9793e0e5\nNONCE: 7e8e61d97c17a303510d581c\nCT: \nAD: \nTAG: 7c2a0b411cc8f2f5\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 7f3c7d35e06b60a0e948212da1170467a54b88a488e7edf4b7fbf9d03f645d4f\nNONCE: 3b21437bd320ffc3f90f835c\nCT: \nAD: \nTAG: 7e18457fe81b2302\nIN: \n\nKEY: 37875cda07364dae174c1b422e0daa8b949b6478332988504ef3f633d58df4ca\nNONCE: 746e59be002990d169b4a783\nCT: \nAD: \nTAG: 81be9ff1ddfb32bc\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 6e1eec50f2eb68da620a913a2a0d2250ad0541f3acf88fed2f890f840c0046ad\nNONCE: a75bf504651adadd31743464\nCT: \nAD: \nTAG: 49d75b1504d39ebb\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2864eb7a7025da05ea9ed75f07baf26d90b8eb93f2c57dec6dcc87e650f48f54\nNONCE: 98b764326898d43e443f441b\nCT: \nAD: \nTAG: 1996834986570afe\nIN: \n\nKEY: 8ef06b7a47655a6248c782291476d983d43e17cf419852868d488d2a6093f750\nNONCE: 40c3ceb10e9dddfe23569244\nCT: \nAD: \nTAG: ce828e8aa6056b7f\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 30ec395340ba1d05b9964dc932750e6bcfb3acabd1c07656ca3654128893d77c\nNONCE: 69d240b1d240c0c71cf10966\nCT: \nAD: \nTAG: 18b112b18cd0bd86\nIN: \n\nKEY: 18efa6f3395d20ddbd483924fabdbe105d70e69f4652b929207d9746b098ee11\nNONCE: 4f166cb3acc43383ec9b2bfd\nCT: \nAD: \nTAG: 4b34f4c59236dcbf\nIN: \n\nKEY: 540407922c1056e6e0df4c9a7af8360222cec57167161ad00121a5cc19bebd53\nNONCE: 6d9f32e3139a18fcd34c1e73\nCT: \nAD: \nTAG: f12553f984d4a1d0\nIN: \n\nKEY: ddd54500533cffd1af87c6f58d880d45c1d27c22ed283c110d04227658d443ac\nNONCE: 2cb369234c276e1838c9575a\nCT: \nAD: \nTAG: 7f43b5a32da7b9f2\nIN: \n\nKEY: 62450ce465840e8d49e7aab125f66817bf57ccb0553e5aa633150913406281eb\nNONCE: da552ec45463002256b07393\nCT: \nAD: \nTAG: dccb3788c2e2a66f\nIN: \n\nKEY: 5765ad16f4dbd4d4e6370dbfa18b8ef5ac37459e39556afaba9b553dea4c1b23\nNONCE: 59678f262588e4d526d9fc34\nCT: \nAD: \nTAG: a68f33ed\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: a29fa93614e9f714c73d3707d1142b2514fa8a14641f79ef14e9bf0e812f49fa\nNONCE: 68272acf71b1cdad4655dbdc\nCT: \nAD: \nTAG: b90e554a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 717d2a5396ae21560a895a7847f53c47956d155ca4dd2165137d3506ff48a7bf\nNONCE: 6ccd8086830f586fa3b0e777\nCT: \nAD: \nTAG: a618ac6a\nIN: \n\nKEY: 6ecf9a1db3e42ed91d2206646369d9eab43fab9efbf797a6b2633db3eebcff18\nNONCE: 7142907a03b12ba332d84107\nCT: \nAD: \nTAG: 57e1882b\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 186361bee6c4d37b94b6c9389216db63b7cf7c5b28592c290c02c9aa0978b6e7\nNONCE: f1a7b61b6a503665049d36ae\nCT: \nAD: \nTAG: aa52f4e2\nIN: \n\nKEY: d8d3fd180da0136621d9a7ebb273bdc4ae48fa72997c7b902c2c512c2bcc11e6\nNONCE: 4f7692221b2e295220f6a1a9\nCT: \nAD: \nTAG: 7c16931d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2231071e59bbfa627f0881f04ea13290302674e05f405f75e3c62d787d07c2f3\nNONCE: 65b3758e6418f04afa2b4d9d\nCT: \nAD: \nTAG: a56259a6\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: fa1dc19ed84ffa40c94ffd1021208f50dffe16e9f0a53b5ee6be55163a408618\nNONCE: 09bb332baa725ca0c72a150b\nCT: \nAD: \nTAG: 76c71a63\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 0a7733e3c0e7017b17abc46e25047b3b5d5a3f95bd45e069953d08761b826e9e\nNONCE: 0257955c4f6b354ae46b5d44\nCT: \nAD: \nTAG: 04f4bffe\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 060ecdff8a7325d76017b93071797b2c299d6519d0605b565c8550c66875cdd5\nNONCE: a8f8288d9124ee73c6b89f47\nCT: \nAD: \nTAG: f493e8eb\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 9a9d85fff37716f90d4523586e99046e66cede008fd8acdb55ecefcd9228d7b8\nNONCE: 8a7296be2b691ea45bf4cf9d\nCT: \nAD: \nTAG: d63728a4\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 2344f2cb986326d931d768e8f9bf7cbf7aa0fe91fe5d7a9d8e0591e1144a064a\nNONCE: 0fd7ad08c13f0c97f5c85d75\nCT: \nAD: \nTAG: 6196202c\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 17b00458ce181235bc704ea54cfed4a74d792350ea4e3e1dd4d1817b3720b4f6\nNONCE: c4ec09b35b857bea94a728a2\nCT: \nAD: \nTAG: acceb73a\nIN: \n\nKEY: 7e6c0a5cc37125408f8f11f5607054a3314924c36a7f1b1988c46cd06", "ebe4ffa\nNONCE: 299973ab4a56aaa8a67e6e59\nCT: \nAD: \nTAG: 1f450c0a\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 1b5b987676d7ce62c42d9103f7ee8b3964da272eaae5097a0e0b0a2678e6a382\nNONCE: 1828385a47e53ce3810c0bc0\nCT: \nAD: \nTAG: f938bdc2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 6dfdafd6703c285c01f14fd10a6012862b2af950d4733abb403b2e745b26945d\nNONCE: 3749d0b3d5bacb71be06ade6\nCT: \nAD: c0d249871992e70302ae008193d1e89f\nTAG: 4aa4cc69f84ee6ac16d9bfb4e05de500\nIN: \n\nKEY: 033360a08d0b2963ce4dcf807b772ac86ae3e8b8fabb9cd3a636f8ec54365646\nNONCE: 8dcaa63d13a2425395609914\nCT: \nAD: f9d15fc34984b8f4a7caa29a82b24c52\nTAG: 42bc9cc93a1c8592bd29c9ef9f907780\nIN: \n\nKEY: 4f1a5fc8e4689c493ef8e23a653e86e4d4c8972a2338653375b0f36a4feb91d7\nNONCE: 9b8221a631404088218fe487\nCT: \nAD: f09b0fc4e4ccb5e28dfcc0792a6800f3\nTAG: 31073f1a0050462a03c7ad0bbefaf93b\nIN: \n\nKEY: e70e4f6919b521dab68f0dff6b4aa57e443db4f8301186819d8611969af33b28\nNONCE: 63d5ff1ba0d5e69f5dc1c92f\nCT: \nAD: c29abcf1f61063c6765747da8980fde4\nTAG: 3d78ec2d237dfd57b8b125ff0912653a\nIN: \n\nKEY: 2c392a5eb1a9c705371beda3a901c7c61dca4d93b4291de1dd0dd15ec11ffc45\nNONCE: 0723fb84a08f4ea09841f32a\nCT: \nAD: 140be561b6171eab942c486a94d33d43\nTAG: aa0e1c9b57975bfc91aa137231977d2c\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 48f7b300acde77c3a00e8dcde06063761d2dc64809db5d39c7a671d2b2f7902e\nNONCE: 194e611ed5980b0e93a4a388\nCT: \nAD: 72ce59bdf0059bf33e03e5fc21f3a6df\nTAG: 7d26231fd58aea00331165c8adf912f3\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 94233d297c08899ccd69eeec3e4e258eacabee0cdc2c363c352e833200162599\nNONCE: 733fa0c7e0e692b0ea66a402\nCT: \nAD: b5bcc7ef6837b61253db277118fafc9d\nTAG: 024174b6f7fed276966d17b31cab2b47\nIN: \n\nKEY: c90ac1e868bb79467a58383f02440f9155d57dc719f0a22d0d6f088ebe7c18ae\nNONCE: 149a0b9691b35750f72e03e9\nCT: \nAD: 2426db7f430a090f5132c63d23504350\nTAG: 807b58bebd6de9752f62eec313def53b\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: efc390eb39011ec8078700f4de848298c26d750c9127fa79cb8c1089038da129\nNONCE: 13b65b7cf33db33b3d5afb1f\nCT: \nAD: 7e56ab79b176488969e51a58de554979\nTAG: 35ec21526ab815582d201582e7ddcd77\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 5c202933d7efedc1bdc4fcf72794bf448f6c22959978e1947e399d9f3386bf2b\nNONCE: fef59a2f3e7d9eae573ff06a\nCT: \nAD: 9cdab8e46ef227f113e1ce1dc7ee2733\nTAG: 76bf3a22f991625dda441975b4af8952\nIN: \n\nKEY: 577cd9f1a9f0f4b61455db0d5183536c2e5d000df5c812e140ca746ea9d05cbd\nNONCE: 7d6a93560b53453681028e45\nCT: \nAD: 7b4114eb668366fc26bc2078f04cac9a\nTAG: 294409118a4ac46ee9444464ac352cd6\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 942c44274a9dabdb86328484ee933d0d632efb6a074323ab41fac267c0b25e48\nNONCE: 961645b7ec62bb4e4bda29f6\nCT: \nAD: 0e4f8509aaa009192fa04425b9d803b9\nTAG: 2fd7f29b68ec985ec564926484df7e3d\nIN: \n\nKEY: ebacc6cd567c245f37100d76f2898a471a435b07d605a3251835f450f9861da3\nNONCE: 164617867a09dd08d75b8675\nCT: \nAD: 7f5b2c707a8199c8795d7d440664e9cb\nTAG: c8881e8c4dd1d62a2cf6f8458b45c0af\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 415fbefbe947204a5a4412372922cd68ef7cab6b7f48d8da868f24c2426e755f\nNONCE: f939844564c5b26e18b907d8\nCT: \nAD: 462ef98fe991867d0888954adc772edf\nTAG: 811b9c99e66456002558c8a8392b04ff\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 8f82e4eb127be9b5a2dedf8f3f16ed46df0443eab39d604523b2a0909044426e\nNONCE: e0d06f20e17990d17abedfd3\nCT: \nAD: 81f78234cb6c9f8c8134a81e29712457\nTAG: bbde500c67c81f7d2ecb214b33f298b6\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 3395a1485315c5b5e6353acb05ae9499c440a2e9f5c57494662f827235ea314c\nNONCE: 3b7e632571602456b49880f0\nCT: \nAD: f283f80226dacb69c8af089ec6b59e81\nTAG: 84c8beff4b0d160ee68ac613097f51\nIN: \n\nKEY: 737ef66d81c3c2610f77f90244b45c9fcbb3f46b41c8cfa959f1b64bf1af9a30\nNONCE: ee35b4f52756562c53f34710\nCT: \nAD: 591d20b3dad931c15958a6c08945f2c0\nTAG: 67786146498e15b97785ed29e3cf4d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 667eb074e723473425639188aeb1137645968b37fd51ac85ecf887630537e790\nNONCE: 66259c4c34952325039dae8f\nCT: \nAD: be4e71df8b90ae61fcfe2522fad707be\nTAG: 313f387ceb2fee4113a3b97a75a0cb\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 864c3c19d43a850bf696f546be59fa4939ee7a2b39fe0f3e56f6b777c4929d09\nNONCE: d53bb663a8d0aac07eddd12a\nCT: \nAD: 4ad4e048c24b370530f482a4d7a6d1ba\nTAG: fc0e69cd020693a0186da50cdc6f69\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 42b434401a46ab08b799571e8b2ff3834bf002ca910989ed86bafd5a6142d190\nNONCE: 81eb9cc03444f5d0dc3b76d9\nCT: \nAD: 82f75629976fd7ab11ef70c6f8f977f9\nTAG: bd1bb7d7cdb7f25a457b85e939c131\nIN: \n\nKEY: 7e4d9071738036cad1ddcaf8439d0f243aef78116dff67269fc3fec66b86384b\nNONCE: 3a7fbd41615e656a0ff3738a\nCT: \nAD: f4adfe43c17af941168fa4b879ebf209\nTAG: 48a7f7b1a1c05f20e9bf049bb562b2\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 345e15dfc70d4f0609cbc5724276f606ab3aa9d0ae4bcb5a6536dbfef8f5df62\nNONCE: 970bc624e62e6834b7f3fe5d\nCT: \nAD: 44a5fa62b3babf2c86064cc0a65b1cb8\nTAG: d7b83a03f18f6623bd41acc3f6f3aa\nIN: \n\nKEY: 6dcb770c7777225902bae16a6e77045ffe682a7985c265566c61c4ffb405a547\nNONCE: 1faf5b86290e23ff7411c146\nCT: \nAD: fbe8e5e071969c7baf0f4c1c2a830327\nTAG: 78a4078b4decc5e34d477e308f0cc7\nIN: \n\nKEY: ef9a0377ae02c600f6fdd5dd6f4f7a30954235539bc9b3fce0085b3b30d6c354\nNONCE: 33db5adfa43c37d002e82038\nCT: \nAD: 945b8a540c57923e7cd4ca319e40063d\nTAG: 3c0e1f73433c5d229e739fed399ff6\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 6ec5526e7cff0b75f9af20ea59e7cdbaa91a4194d51374527909a3bd6d8ba3bb\nNONCE: c23ff927bba76205628506bc\nCT: \nAD: 8ed268badda27f8fe5a16ce8a3d7fc2e\nTAG: 3079599fc1b2e66e1c9f668cf9c001\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: fdf860cfc7e769d262f1e0b0640a56e0081c75ea96376e4a51ff728dc4b11503\nNONCE: d29767af7bb47bc18fd7076b\nCT: \nAD: ee7e40f375e100fdaf39765d60429289\nTAG: 19f95691d2fc7d7724474ebb501738\nIN: \n\nKEY: b548e4934f5c64d3c0f0b78f7b4d8824aac46b3c8d2cc35ee4bfb254e4fcbaf7\nNONCE: 2eede1dc6447c7afc4415358\nCT: \nAD: 8bd50878c430718b7b3775fed76e5aeb\nTAG: a7186df4cec4bcf921ee8733359567\nIN: \n\nKEY: eb70ee93654a3ae49775d315e51c758bc0b61c1fa848089fc12c65419a00afc2\nNONCE: 87cd3cadd925b79636bf128a\nCT: \nAD: 80b04fb39d7b6096be12dec866de2d37\nTAG: 3f9902ce6dd2fefe0a9578276250f0\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: db8151b0d80c930331ed8c7ff7d8038b34ad20fbf537844f7ba9912b71213f1a\nNONCE: 32f9e46e555eeabf12bc59ce\nCT: \nAD: f2ba52d1e09c37eebdcf15250979643e\nTAG: 8817c90146b70b252c124e03ada704\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: 65b90acf1544349bfa1871163c92680139aa9a5e2b620c43b41cc59fe1cfc15c\nNONCE: 5cff688f2ba29cf9a6d94a7d\nCT: \nAD: 43d55cfde3d5832f0adbf3dc47943d00\nTAG: bb787f2450cda0c33b08579dca4e63\nIN: \n\nKEY: 34d3dd0a9cbec32dfe94c9707b48dff9e2ecdbee7ca28b3ca9dabbb3701ae493\nNONCE: f8e05f6e7a04cadca8b5c4fd\nCT: \nAD: 9e52b1a7c1fb736d659754e671caa840\nTAG: d6615a18f437f38311f5ac3a9f60\nIN: \n\nKEY: e8ad0a2b1bfceeac69ed3e075d4dc5fc03b3633919bc5edf0f1ffd9842424985\nNONCE: f8b5b6bde3fc26b7a553ecef\nCT: \nAD: ed8bc8a123b35e0e7ed3aa8f8820b0fd\nTAG: 008bb8ed513bf8d3210d1278382e\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: ac9d68e15be409d5998885b714bb51f0d5a75df29e4ed7be2c1c1e4c6db49ae4\nNONCE: 4bcd1869cdcb16adb45dfb98\nCT: \nAD: 9f81a65554c7185181fec88601051cfc\nTAG: a7ca610547cba6ec333371528c0c\nIN: \n\nKEY: e9a4f481187083070dc1956a7c34ee9b86791cd6e40353e3f868560ee77127c3\nNONCE: b7894710eb0cea0acf1838fc\nCT: \nAD: caf33a8552cd0caaf1333c9aed7eda13\nTAG: 326e875a09b9df1ada0321a005f2\nIN: \n\nKEY: 0220d839e195821944f343a71dde45006a2c3600df8883bc83a9fd60cc67771e\nNONCE: 8d22fe9571e9096c22f3fae9\nCT: \nAD: bad23a8f33857c447e89b0691b7fb03f\nTAG: 43c0cabf088b71fed4dabd63c2e8\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: b253cdbb8519abd630435f277d9d69f25c3fc7c87004e506092f05855854b9a9\nNONCE: 493bacee0dbe6edb5b77d1fd\nCT: \nAD: ccd5a9521aaa06b967316be581487a63\nTAG: 01afc617f6a2786dcf13ecc00bbe\nIN: \n\nKEY: a0cf288734824493aa3673f95e68d07e289d394a04f2e3e5881afab773f1e242\nNONCE: 2c18ee9f12c5229c0cfc3f43\nCT: \nAD: 0b89b94d636559adc46902e463514e12\nTAG: c933b5cee0de1a2cab183afe3ec5\nIN: \n\nKEY: 3271f86968b3fd49bf4ec0e572616e2b96edd4a530c519b542ca926b09a92efe\nNONCE: af184a643754b70eb60b15f1\nCT: \nAD: cd839a71cd04bac3bc3c17871b6853f0\nTAG: ee6ba4f92dcee9c20b734811318a\nIN: \n\nKEY: 31a3e5aa9da7b44c302cd716937584195adfd26f24a6c49720a50d49762df80f\nNONCE: 9a999c5f8dade4184aae1301\nCT: \nAD: 0d84dd614fc04e58a971a270bec5b8f6\nTAG: 230bc3c4cb7c46e73ce3662d1e15\nIN: \n\nKEY: 865f524ea89d3299b372c01f5c072c1fe07f78e86620fcab5e3e96cd3044962e\nNONCE: 8df4d357882c805d5a5a5d95\nCT: \nAD: f9b70b9d4bb6f9562b10cb65ba1c0a7d\nTAG: ab59a2107248e6651e3d6f3e116d\nFAILS: \nNO_SEAL: \nIN: \n\nKEY: c12c83994e125c98e588d93f968572460345c44b5f94deecd538f0e5e7b0fd66\nNONCE: b684791dd61b9d940a0dee14\nCT: \nAD: 57a128a7ac50137520ffce721271b8ca\nTAG: e322ccdcd7594", @@ -2333,9 +2339,9 @@ "ac4f2cd8a71f0fb078323449c5bd4e3cac8422318b06b44c49ccb701d69831\nTAG: 7347166e\n\nKEY: 36f610b6f08b020f4d3ca0faba582222016aa4ae44c619efc3aa8a3d794c4678\nNONCE: 842b957ca5f56f3b3686269f17f7e5b712593b8f37fd6079459958e31e07955f1a1861204e4c9e5a6b70205a0f45a33229b948524f7102dbaaf4e7a66900006168ec0c99e766fe89da8ae72dcda8e071f4c2fe75ce3cf903dd7b53ddf5ef95a88663c381afea00abc5e6be5c6477a9c5152312cf54af7b0c718a5985e5e8c7ec\nIN: 78a7deed4eb613cf2b3e572a3ff47e6551c7908fded855fba64247493a7360505f1a08e7ab850d00d02b970e3a2b5da9bb6c33\nAD: 6f91e23494601696841fd9dc0a0e7fdcb6b32aaaf2ee7b84270a59aaa2bb13b5bd1990a9fe3b0534751f10c2058dd3a550fbab61bdb4525fe6bd45326419a48339398f3191e7ddb0d8f65f4b00b4f5b6ca4aba9e99edcd0ad05f\nCT: aab48f5510ad845ebe79e7689dbf7ffb1dc3c6a810c1b754576576675e77fa81eace7882045220baded90ac098c6c65f26613d\nTAG: b21bccec\n\nKEY: 14644de3b6efc121077952f76c3e76ce847306a355e734e0869b51506f6bd979\nNONCE: 84a47e799c51d8052b27644399a4b807487d64c06ea037b62af6a0b0d1212f4acfd1d080518c1a9fec5b2c8ba4699ad7df155715cd049f5085e86c0601fab79ef1472fbb35065e7dfee9e4077e0e365d185f3c88564abf1fd1c3d3bf1a209a5e24a2b027895ef1524fe199c31a4bf690ea3ce209cbb9ffcbac4c06461e010fb9\nIN: ed1a2abba7e782a8f3625f5abcf613cb3d353837fb88edc5b117fc35ab553e244a60dd2ed67aa6b8a99ade1bab69cf04405957\nAD: 7e223758e23e4bb99ee7406030a2db698d5e32c69d5f19170c052bd597bbfd4bbbdcebbdcc801b1bcad869da195a8c4452bedec0fcd91fedb6fa49c38e187e8b536b69da683ce4a322b81e70c93eb66c9010ca3be5d54200d87c\nCT: 80b8c3829d991e5b1331cf229d7448988ed6271efccfe84998acc67e924c73362337da0d697f4b4613d06a88bb4ae8fa81c2cb\nTAG: 38b59916\n\nKEY: eb3fe1c8bb57d72fea9f9e9cc3cc746d41742716dd3cbf574eee95162bd93f9f\nNONCE: 1ee1a2fe7dab975fffd19230d80804b45662855c0a5bbd2802e47b2d3fe55b0c15e2383e7070404ce46670c0a2840a6e14945c5bd9ac521bad8ca7effd6dbe71f74eca082a490d15088d7bbfeb9cbb1e8ee86d77b1db35b43a259a14ab6b771ac58ce36bf99d28417a04d2d3ff2d4380a6b23ccd6e68b0ae58a6fa54c973b6a0\nIN: 0ace576340e524019888cb4900fd9b52e5382e4e36ac9a969c5f6bdddfac12c2d991ea9e2ed5f68dc4a51d62dab83df8f838af\nAD: 28d402e6e8cce27e47a0eb03b5497915c3b71399fb95f4bc6d3255cad73508eed443cd44e59cacf9177dd3ac1cdca5233bce39621227951d11f2a2012930822ee929dc791f3eaf1a97e219db04d6f178b804de60224ab120abdd\nCT: 50096632df34a1f2d8848304e20060d999a5b1eda1932774e30f36026da8c6c0baca7f6e59a7c74018c5f51075008b74424bd2\nTAG: 7d9d2417\n\nKEY: 85ee354b4675a9c5d16e3d6f4118043bd92f209f016f49efab7ce3023b78112e\nNONCE: 5c3b5a95147880f9d14373bc3886e92036a0abcb49fb6768e2811761cfcddbcac813bea95a5b76fa1ce5fc726708ddeee5d1a9196d31eb1f0c1d4992ba37a9c4179d223c460ff2b512a9d3cf3562c586d793efd94a5e93d4b1e86ae96c3aa6711a291ec710dfbd7ec46b2ed4f4085df511fabcc5e42bded5214253d235f12d14\nIN: 1b56de101a75bb9d1a5e77590be302837d3921278e480347944b92975e819e7a233339f31ecf02b874842fb5a136c810a9a9ca\nAD: d2eb4e760ed4fb687b32c6bd073bffaf9631ed3ab83101cab236352d024cf422b917a7660a484be236e4d3b3fa3343d3f9e87d86c50834a213b7ca2a3212c254564e1c59551c7bd3e01710a7d8c8419320a6d3362489aa368424\nCT: 67dec658a84468cb86268099e03ce701e9936c27b50059b5c9e8743df7df5b828364ab7025f854cb9e3cfb27ca5b717502b838\nTAG: 65a1bfa1\n\nKEY: 6f79bf94da7dde3c86009934d9258f1b3fc2f5382aca9c9cb8e216eed235f34c\nNONCE: 83e413c8e6f76b32aeb2960c11aa9e522d3994e14c18609c634c9cc1cf94f2c49a5347d3f440367f08a3322eb3560675bc4715d03abbe0da4a75208775e8bdc3ff2d33daa301f53dd75a83f74c998245c1826ad41602c3fea313098d20a65e417e7c6ff954d9c9b2458a04ab4deddf07dd22bc409211dbd121f5a95215d40094\nIN: 738516823e8f5d23f3181b297eb70be633e3b0cdd61117384e474e3223658167ad6afd83d9839bc925876e4e41a001f678a06a\nAD: 02a59b404f7fceabc06e0988bcbfbca1d08f75a83f2cb9542edf106702e2c9964d7e37ef86fb368a9890a4f2ae7f58f336cb2df990cdaa2775959c99cf1d11a59abe348cc5a47f98c447e6500b1013b38418677bd582c5fbdcd8\nCT: 183cc63f537b301e928a1efa211818a128964e5d025c7dde9ccd69e6a8dddc2b9824520e31d52cde506062d225407520a00155\nTAG: bb1df68d\n\nKEY: 0c5aa8e0b1979183b997f29362ae83700d3ba6190a210fc90541b17e45a46668\nNONCE: 96a1f2559204788f6bb0ea50bd598614a7ce518ec4dab951e9517bc46357448a6b4aed200ee21a7543fbff861ed56321195675d9225cac72547d3e4880b9517672b86206e9acffba53d66526e919587e7b284a612aec391517e907f2bf6a625a990466d66cb14c690be17b7a22085ab032a05dbc16a99437670cfa2bb8a283d6\nIN: f460e28cb67fb2b0aa5315c25f8132e5a8298ae3077ee0bd918fe1acd6312a98a3412a3198c834beb932200281fe6128a08be3\nAD: 9c410a60931ef1cb5f6fa9c7da0a96ca537daac174fd4f1bf247de1e25d3dd44a37f54d58ca48d1ecdcf2ebff8959c2db0ac82244ac76243404adf45be72aff4b19be063c088e1810f9eb4b894f405c61691e2789297b17430b8\nCT: 3e12c2a17cad65077073385c055054bc8f72f1beca59b0636384d027dc1350d39a8f3c77f5bc26eb916287dd742bcd3a819299\nTAG: 154a3b39\n\nKEY: ace49b23bebdbb36cae24809c68cd4763c000c689c77d230256f6e5206ba178c\nNONCE: 34e829796c7d186b3c83c894b3f36f3f07d66261670f4c1f74c83b074b2b7e5fabd8756d2c9676bb52e9c7a62c7c26376128d1ffda5f9ad5d7b48724d46672eabf83ab9e6cd596510bd9ab3be81089c4262a9f8a88820c6e27a49593bf91b9dbc884b4548aa9ec4bed9e1d5be57d413553459f5d8e7cbca84ac89babb45f501c\nIN: 9c85b9c441034e26c5ebf04580cf617eea19a001098c910a7eac423af2f5fb2cee0335fde1fe56bdfd31af513e99e92d5ad7cd\nAD: 419583e7bd2f698ddbbdd429a81654c37b07dd2d80f34c9ac3d0f9ef7329f39fb5c21db57bdd496fd69097736989fd0f1d3c803ebbff7d128ac31873754f881247896907574bcecfdf2eb3a5e6996050eafd68f0401d0543fd46\nCT: 9141c922cb598ae9dd3aefd9593e2788870e9ac546fb3fbf5ba0bd1479216743cb603c4cc2fad030796f9cdb5b325ee4c33d8a\nTAG: 356fdb25\n\nKEY: 69e095a9ae4cd697869b845c4e848b7fe1511d1ee334ffa63ea427eee18a6b54\nNONCE: 7ae669a8b81bbcc2b72724a14169f1e2e1c114c0ff3ef33434a82d368272525398ae1a9aabb1c50ddebfca5e853dde04b46518bc94b91b51364c82301087ca30852ec7ac52f51ecda1c2ca2e099c040929f6d1236157011ddf7e928df7fb329a012752eb66cdb725e416e7a10108b2bd4f676b5ab85b8f33438c273bddb8cffa\nIN: b2727222246b940448a24741984ab6afe5e9474e60cbb8ce714110390f1c90b33ed0ec0267b86cc305b9807e370ca146bd61c4\nAD: 74a1899056c4ef9d848cd7c8d8ca377c6810912c62e428fe5acb60908abae48c887e7460943e9d6795fa6203b994e05799ab8edb55c29fcdccc3c41b3b74346f354a214d3abf891b8058e55461d3f68c3a2897bc514212aac91d\nCT: ddeaac80cb1db067d40143a382eedb2183809153db5b23528c476ae25c9db5d28d53dbab6f59ac5c016150f8384f5b84767189\nTAG: 0936e1ff\n\nKEY: 9c8e8c0638b76c552d1ce80028b707286bf2a84568d7021179be55708e820adb\nNONCE: f414375eb3faa866349ee5a6f11db10b2d2b32719906fb25f22ac2053e9f402c4cf545ae973336ada616d99fd57e7b2fbb6bb8f167fd907efbd9983515d509cbb6966778bccfdedacd9cb58b0a8fbf0a3900128f9f47317485e2c8e30a65f68e43ff8ed0b20c83681e750214b8f004f2529f1f3fb06554a47ffb8532edecf949\nIN: 8af304c8d9ff794d784cca9bafec22868cf7cf5c038b2afa7cefbd84be5d98b50d3009bad9d69083abf47b5068d59465c10389\nAD: 913b191b128e8d021ca46d29455b8082e7013ea49e1c931fe94adf3cfde26785ad9e9828eb48bdda066eb530c5af62481eca4401fe31eb320f6c52011db38f98144a0ea5f9fa6d5c373c76eead287e67e83f9dde0f2e27a6c40e\nCT: 63a8f8e0183e5c30532dd6d5235d6418828243e4ef9aab82ad537e20fa11fe188d440a7fd5a53669422c65fed98a00e4631f44\nTAG: 33491cd4\n\nKEY: d74eb3cfdd9fd9fe176415e1973a12f0110ef55568746e99d07d91b339cee79f\nNONCE: 06b5cc871a93bf13726836392a7e134f2b122f2238b086f18ec88f16d21f1914551a63a169e97c9dadabc9f488bf54a7883e618e59472041dd74ad356e7d92f8666af1b4b2cdb35fb0d722ac0b31d2fd475052507eafb98d5c2109b5f10254957fc9b4c6dbfb3bf4692771b4ed305d7521f5842d1aeaca0ffbab8247fc3b76bd\nIN: d654f510806c9ece9c12dc749cb9a08467cac2cad1afcf3b4a41a2e0873dea9bc0cf61b7aac2ebba93eb46ae6c5f11610d0b41\nAD: 9855a05c20be9b2416fa0032d94db428c949e68262f8a084ce3762f85c3edbe6175ef48279141822c101929aecf36e8a68e8fec8524945debb54e046b3c71a44630e569ec849691c7f0f9a74e374d27732df33578c5bde492907\nCT: af6f67769f0f099e6590e97dc6d605dea986772a68966408e81d49b1e8d24fd835daed0d4bda048c47d5ef87f22752e99e1446\nTAG: d449dec7\n\nKEY: b5f849da887e3c1878b6775aff7e49f5f31ed8cdf9f79ead5b36219eea87af80\nNONCE: 63f75fd55a8bf19eadfa23eb7a3e5c8fd13d79f6bb6ba414d2027fb08283f5108c11c2d49db52f4c68c11164c8a1585bf115512cbe5f5aa478c6c0e91864f5198862a694f0c2471aacd32ba57be1a33f04a56fdc60a3dcdde73c7714c10eb67b749433b1b3027b3c4b4f29fc57c3eaad9eefd033dc4d42bc75b36e7445a383db\nIN: c1a27f693387a1c8f5fd1eed0c5cf3111897dc8797b4e63e89bcea06cb19b734e354d9f539f5af700641f0f4acf91ab52147f0\nAD: 6dc78b3a5ea409838b533ebd77cf1d1b4808fef131275a0d4dcd94ca0f55b9dd86017bd664e036c2fa756c65a7a7d246229900fa468349eb2de18b5bf1af0f7da56ed0377a65f5e650ddf081c4a29eb985456b276b4d303b7832\nCT: 837a", "ff99c32f665841239e0897134461fc3e8faa8f9965eca5dae67b2934e0816f39d36c45ef8a0b8066ae4f9752e65ef3a6d9\nTAG: 94b73bcf\n\nKEY: cd670a8ac109d0f0e436ee42e490d5576bb7c13230f727b150b473bde659826d\nNONCE: 719191db1dc5ae92cf75cd8ff02ff036e78d6bef59714e5d40c24301443952148c61ab2e7e15d95f8d1792ee307a27c0112ec1b28c4a0416f76290b77d89088542d13649d17af09d6c5302438895534dedbb587f543c0d76b1e3e065ce6a261473d27dab6a928ad1fc786333dac512f3b521760dd1f67907292d868423a4f64b\nIN: c94ebec7d8aa421bfa9a0203520e02570338d12359c5b16d51050cd3f802351b17cad85b52ea9b42147f528a25e52c170c6308\nAD: abdf817a7ff3f28bd0b5ef0c2ec02ccde1799d4dea806580941f63b7840b2deedd3873ad1c3186ee3c6b6fa95062fcb56e33c6737532e7c326e116f2da4cc920c8bb354e8d2e27c1920962e16a4c89521c4e1699f2145f742d36\nCT: 286b594cf9a92b2d7348f0c75619e14916f2cafb990cc2d6aa07162d0703a9f7591e40eae402edfc64cafbedfc7ec2147acd51\nTAG: 22d3ec0f\n\n", }; -static const size_t kLen28 = 5825374; +static const size_t kLen29 = 5825374; -static const char *kData29[] = { +static const char *kData30[] = { "# Generated by \"make_cavp -extra-labels Cipher=DES-EDE3-CBC -cipher tdes kat_des/KAT_TDES/TCBCinvperm.rsp kat_des/KAT_TDES/TCBCpermop.rsp kat_des/KAT_TDES/TCBCsubtab.rsp kat_des/KAT_TDES/TCBCvarkey.rsp kat_des/KAT_TDES/TCBCvartext.rsp\"\n\n# File 1: kat_des/KAT_TDES/TCBCinvperm.rsp\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 95f8a5e5dd31d900\nCiphertext: 8000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: dd7f121ca5015619\nCiphertext: 4000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 2e8653104f3834ea\nCiphertext: 2000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 4bd388ff6cd81d4f\nCiphertext: 1000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 20b9e767b2fb1456\nCiphertext: 0800000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 55579380d77138ef\nCiphertext: 0400000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 6cc5defaaf04512f\nCiphertext: 0200000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0d9f279ba5d87260\nCiphertext: 0100000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: d9031b0271bd5a0a\nCiphertext: 0080000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 424250b37c3dd951\nCiphertext: 0040000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: b8061b7ecd9a21e5\nCiphertext: 0020000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: f15d0f286b65bd28\nCiphertext: 0010000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: add0cc8d6e5deba1\nCiphertext: 0008000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e6d5f82752ad63d1\nCiphertext: 0004000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: ecbfe3bd3f591a5e\nCiphertext: 0002000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: f356834379d165cd\nCiphertext: 0001000000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 2b9f982f20037fa9\nCiphertext: 0000800000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 889de068a16f0be6\nCiphertext: 0000400000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e19e275d846a1298\nCiphertext: 0000200000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 329a8ed523d71aec\nCiphertext: 0000100000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e7fce22557d23c97\nCiphertext: 0000080000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 12a9f5817ff2d65d\nCiphertext: 0000040000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: a484c3ad38dc9c19\nCiphertext: 0000020000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: fbe00a8a1ef8ad72\nCiphertext: 0000010000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 750d079407521363\nCiphertext: 0000008000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 64feed9c724c2faf\nCiphertext: 0000004000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: f02b263b328e2b60\nCiphertext: 0000002000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 9d64555a9a10b852\nCiphertext: 0000001000000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: d106ff0bed5255d7\nCiphertext: 0000000800000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e1652c6b138c64a5\nCiphertext: 0000000400000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e428581186ec8f46\nCiphertext: 0000000200000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: aeb5f5ede22d1a36\nCiphertext: 0000000100000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e943d7568aec0c5c\nCiphertext: 0000000080000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: df98c8276f54b04b\nCiphertext: 0000000040000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: b160e4680f6c696f\nCiphertext: 0000000020000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: fa0752b07d9c4ab8\nCiphertext: 0000000010000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: ca3a2b036dbc8502\nCiphertext: 0000000008000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 5e0905517bb59bcf\nCiphertext: 0000000004000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 814eeb3b91d90726\nCiphertext: 0000000002000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 4d49db1532919c9f\nCiphertext: 0000000001000000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 25eb5fc3f8cf0621\nCiphertext: 0000000000800000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: ab6a20c0620d1c6f\nCiphertext: 0000000000400000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 79e90dbc98f92cca\nCiphertext: 0000000000200000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 866ecedd8072bb0e\nCiphertext: 0000000000100000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 8b54536f2f3e64a8\nCiphertext: 0000000000080000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: ", "ea51d3975595b86b\nCiphertext: 0000000000040000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: caffc6ac4542de31\nCiphertext: 0000000000020000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 8dd45a2ddf90796c\nCiphertext: 0000000000010000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 1029d55e880ec2d0\nCiphertext: 0000000000008000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 5d86cb23639dbea9\nCiphertext: 0000000000004000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 1d1ca853ae7c0c5f\nCiphertext: 0000000000002000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: ce332329248f3228\nCiphertext: 0000000000001000\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 8405d1abe24fb942\nCiphertext: 0000000000000800\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e643d78090ca4207\nCiphertext: 0000000000000400\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 48221b9937748a23\nCiphertext: 0000000000000200\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: dd7c0bbd61fafd54\nCiphertext: 0000000000000100\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 2fbc291a570db5c4\nCiphertext: 0000000000000080\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: e07c30d7e4e26e12\nCiphertext: 0000000000000040\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0953e2258e8e90a1\nCiphertext: 0000000000000020\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 5b711bc4ceebf2ee\nCiphertext: 0000000000000010\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: cc083f1e6d9e85f6\nCiphertext: 0000000000000008\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: d2fd8867d50d2dfe\nCiphertext: 0000000000000004\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 06e7ea22ce92708f\nCiphertext: 0000000000000002\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 166b40b44aba4bd6\nCiphertext: 0000000000000001\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 8000000000000000\nPlaintext: 95f8a5e5dd31d900\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 4000000000000000\nPlaintext: dd7f121ca5015619\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 2000000000000000\nPlaintext: 2e8653104f3834ea\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 1000000000000000\nPlaintext: 4bd388ff6cd81d4f\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0800000000000000\nPlaintext: 20b9e767b2fb1456\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0400000000000000\nPlaintext: 55579380d77138ef\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0200000000000000\nPlaintext: 6cc5defaaf04512f\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0100000000000000\nPlaintext: 0d9f279ba5d87260\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0080000000000000\nPlaintext: d9031b0271bd5a0a\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0040000000000000\nPlaintext: 424250b37c3dd951\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0020000000000000\nPlaintext: b8061b7ecd9a21e5\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0010000000000000\nPlaintext: f15d0f286b65bd28\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0008000000000000\nPlaintext: add0cc8d6e5deba1\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0004000000000000\nPlaintext: e6d5f82752ad63d1\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0002000000000000\nPlaintext: ecbfe3bd3f591a5e\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0001000000000000\nPlaintext: f356834379d165cd\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000800000000000\nPlaintext: 2b9f982f20037fa9\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000400000000000\nPlaintext: 889de068a16f0be6\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000200000000000\nPlaintext: e19e275d846a1298\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000100000000000\nPlaintext: 329a8ed523d71aec\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000080000000000\nPlaintext: e7fce22557d23c97\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000040000000000\nPlaintext: 12a9f5817ff2d65d\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000020000000000\nPlaintext: a484c3ad38dc9c19\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000010000000000\nPlaintext: fbe00a8a1ef8ad72\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000008000000000\nPlaintext: 750d079407521363\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000004000000000\nPlaintext: 64feed9c724c2faf\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000002000000000\nPlaintext: f02b263b328e2b60\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000001000000000\nPlaintext: 9d64555a9a10b852\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000800000000\nPlaintext: d106ff0bed5255d7\n\nCipher: DES-ED", "E3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000400000000\nPlaintext: e1652c6b138c64a5\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000200000000\nPlaintext: e428581186ec8f46\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000100000000\nPlaintext: aeb5f5ede22d1a36\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000080000000\nPlaintext: e943d7568aec0c5c\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000040000000\nPlaintext: df98c8276f54b04b\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000020000000\nPlaintext: b160e4680f6c696f\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000010000000\nPlaintext: fa0752b07d9c4ab8\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000008000000\nPlaintext: ca3a2b036dbc8502\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000004000000\nPlaintext: 5e0905517bb59bcf\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000002000000\nPlaintext: 814eeb3b91d90726\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000001000000\nPlaintext: 4d49db1532919c9f\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000800000\nPlaintext: 25eb5fc3f8cf0621\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000400000\nPlaintext: ab6a20c0620d1c6f\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000200000\nPlaintext: 79e90dbc98f92cca\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000100000\nPlaintext: 866ecedd8072bb0e\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000080000\nPlaintext: 8b54536f2f3e64a8\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000040000\nPlaintext: ea51d3975595b86b\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000020000\nPlaintext: caffc6ac4542de31\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000010000\nPlaintext: 8dd45a2ddf90796c\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000008000\nPlaintext: 1029d55e880ec2d0\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000004000\nPlaintext: 5d86cb23639dbea9\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000002000\nPlaintext: 1d1ca853ae7c0c5f\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000001000\nPlaintext: ce332329248f3228\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000800\nPlaintext: 8405d1abe24fb942\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000400\nPlaintext: e643d78090ca4207\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000200\nPlaintext: 48221b9937748a23\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000100\nPlaintext: dd7c0bbd61fafd54\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000080\nPlaintext: 2fbc291a570db5c4\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000040\nPlaintext: e07c30d7e4e26e12\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000020\nPlaintext: 0953e2258e8e90a1\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000010\nPlaintext: 5b711bc4ceebf2ee\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000008\nPlaintext: cc083f1e6d9e85f6\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000004\nPlaintext: d2fd8867d50d2dfe\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000002\nPlaintext: 06e7ea22ce92708f\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0000000000000001\nPlaintext: 166b40b44aba4bd6\n\n# File 2: kat_des/KAT_TDES/TCBCpermop.rsp\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 104691348998013110469134899801311046913489980131\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: 88d55e54f54c97b4\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 100710348998802010071034899880201007103489988020\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: 0c0cc00c83ea48fd\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 10071034c898012010071034c898012010071034c8980120\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: 83bc8ef3a6570183\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 104610348998802010461034899880201046103489988020\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: df725dcad94ea2e9\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 108691151919010110869115191901011086911519190101\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: e652b53b550be8b0\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 108691151958010110869115195801011086911519580101\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: af527120c485cbb0\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 5107b015195801015107b015195801015107b01519580101\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: 0f04ce393db926d5\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 1007b015191901011007b015191901011007b01519190101\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: c9f00ffc74079067\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 310791549808010131079154980801013107915498080101\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: 7cfd82a593252b4e\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 310791949808010131079194980801013107919498080101\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: cb49a2f9e91363e3\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 10079115b908014010079115b908014010079115b9080140\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: 00b588be70d23f56\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 310791159808014031079115980801403107911598080140\nIV: 0000000000000000\nPlaintext: 0000000000000000\nCiphertext: 406a9a6ab43399ae\n\nCipher: DES-EDE3-CBC\nOperation: ", @@ -2347,9 +2353,9 @@ "CRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000020000000\nCiphertext: b160e4680f6c696f\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000010000000\nCiphertext: fa0752b07d9c4ab8\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000008000000\nCiphertext: ca3a2b036dbc8502\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000004000000\nCiphertext: 5e0905517bb59bcf\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000002000000\nCiphertext: 814eeb3b91d90726\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000001000000\nCiphertext: 4d49db1532919c9f\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000800000\nCiphertext: 25eb5fc3f8cf0621\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000400000\nCiphertext: ab6a20c0620d1c6f\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000200000\nCiphertext: 79e90dbc98f92cca\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000100000\nCiphertext: 866ecedd8072bb0e\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000080000\nCiphertext: 8b54536f2f3e64a8\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000040000\nCiphertext: ea51d3975595b86b\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000020000\nCiphertext: caffc6ac4542de31\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000010000\nCiphertext: 8dd45a2ddf90796c\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000008000\nCiphertext: 1029d55e880ec2d0\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000004000\nCiphertext: 5d86cb23639dbea9\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000002000\nCiphertext: 1d1ca853ae7c0c5f\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000001000\nCiphertext: ce332329248f3228\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000800\nCiphertext: 8405d1abe24fb942\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000400\nCiphertext: e643d78090ca4207\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000200\nCiphertext: 48221b9937748a23\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000100\nCiphertext: dd7c0bbd61fafd54\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000080\nCiphertext: 2fbc291a570db5c4\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000040\nCiphertext: e07c30d7e4e26e12\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000020\nCiphertext: 0953e2258e8e90a1\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000010\nCiphertext: 5b711bc4ceebf2ee\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000008\nCiphertext: cc083f1e6d9e85f6\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000004\nCiphertext: d2fd8867d50d2dfe\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000002\nCiphertext: 06e7ea22ce92708f\n\nCipher: DES-EDE3-CBC\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nPlaintext: 0000000000000001\nCiphertext: 166b40b44aba4bd6\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 95f8a5e5dd31d900\nPlaintext: 8000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: dd7f121ca5015619\nPlaintext: 4000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 2e8653104f3834ea\nPlaintext: 2000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 4bd388ff6cd81d4f\nPlaintext: 1000000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 20b9e767b2fb1456\nPlaintext: 0800000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 55579380d77138ef\nPlaintext: 0400000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 6cc5defaaf04512f\nPlaintext: 0200000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0d9f279ba5d87260\nPlaintext: 0100000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: d9031b0271bd5a0a\nPlaintext: 0080000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 424250b37c3dd951\nPlaintext: 0040000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: b8061b7ecd9a21e5\nPlaintext: 0020000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: f15d0f286b65bd28\nPlaintext: 0010000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: add0cc8d6e5deba1\nPlaintext: 0008000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e6d5f82752ad63d1\nPlaintext: 0004000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: ecbfe3bd3f591a5e\nPlaintext: 0002000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: f356834379d165cd\nPlaintext: 0001000000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 2b9f982f20037fa9\nPlaintext: 0000800000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nI", "V: 0000000000000000\nCiphertext: 889de068a16f0be6\nPlaintext: 0000400000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e19e275d846a1298\nPlaintext: 0000200000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 329a8ed523d71aec\nPlaintext: 0000100000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e7fce22557d23c97\nPlaintext: 0000080000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 12a9f5817ff2d65d\nPlaintext: 0000040000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: a484c3ad38dc9c19\nPlaintext: 0000020000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: fbe00a8a1ef8ad72\nPlaintext: 0000010000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 750d079407521363\nPlaintext: 0000008000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 64feed9c724c2faf\nPlaintext: 0000004000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: f02b263b328e2b60\nPlaintext: 0000002000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 9d64555a9a10b852\nPlaintext: 0000001000000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: d106ff0bed5255d7\nPlaintext: 0000000800000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e1652c6b138c64a5\nPlaintext: 0000000400000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e428581186ec8f46\nPlaintext: 0000000200000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: aeb5f5ede22d1a36\nPlaintext: 0000000100000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e943d7568aec0c5c\nPlaintext: 0000000080000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: df98c8276f54b04b\nPlaintext: 0000000040000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: b160e4680f6c696f\nPlaintext: 0000000020000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: fa0752b07d9c4ab8\nPlaintext: 0000000010000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: ca3a2b036dbc8502\nPlaintext: 0000000008000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 5e0905517bb59bcf\nPlaintext: 0000000004000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 814eeb3b91d90726\nPlaintext: 0000000002000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 4d49db1532919c9f\nPlaintext: 0000000001000000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 25eb5fc3f8cf0621\nPlaintext: 0000000000800000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: ab6a20c0620d1c6f\nPlaintext: 0000000000400000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 79e90dbc98f92cca\nPlaintext: 0000000000200000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 866ecedd8072bb0e\nPlaintext: 0000000000100000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 8b54536f2f3e64a8\nPlaintext: 0000000000080000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: ea51d3975595b86b\nPlaintext: 0000000000040000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: caffc6ac4542de31\nPlaintext: 0000000000020000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 8dd45a2ddf90796c\nPlaintext: 0000000000010000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 1029d55e880ec2d0\nPlaintext: 0000000000008000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 5d86cb23639dbea9\nPlaintext: 0000000000004000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 1d1ca853ae7c0c5f\nPlaintext: 0000000000002000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: ce332329248f3228\nPlaintext: 0000000000001000\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 8405d1abe24fb942\nPlaintext: 0000000000000800\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e643d78090ca4207\nPlaintext: 0000000000000400\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 48221b9937748a23\nPlaintext: 0000000000000200\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: dd7c0bbd61fafd54\nPlaintext: 0000000000000100\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 2fbc291a570db5c4\nPlaintext: 0000000000000080\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: e07c30d7e4e26e12\nPlaintext: 0000000000000040\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 0953e2258e8e90a1\nPlaintext: 0000000000000020\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 5b711bc4ceebf2ee\nPlaintext: 0000000000000010\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: cc083f1e6d9e85f6\nPlaintext: 0000000000000008\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: d2fd8867d50d2dfe\nPlaintext: 0000000000000004\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 06e7ea22ce92708f\nPlaintext: 0000000000000002\n\nCipher: DES-EDE3-CBC\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nIV: 0000000000000000\nCiphertext: 166b40b44aba4bd6\nPlaintext: 0000000000000001\n\n", }; -static const size_t kLen29 = 81764; +static const size_t kLen30 = 81764; -static const char *kData30[] = { +static const char *kData31[] = { "# Generated by \"make_cavp -extra-labels Cipher=DES-EDE3 -cipher tdes kat_des/KAT_TDES/TECBinvperm.rsp kat_des/KAT_TDES/TECBpermop.rsp kat_des/KAT_TDES/TECBsubtab.rsp kat_des/KAT_TDES/TECBvarkey.rsp kat_des/KAT_TDES/TECBvartext.rsp\"\n\n# File 1: kat_des/KAT_TDES/TECBinvperm.rsp\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 95f8a5e5dd31d900\nCiphertext: 8000000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: dd7f121ca5015619\nCiphertext: 4000000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 2e8653104f3834ea\nCiphertext: 2000000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 4bd388ff6cd81d4f\nCiphertext: 1000000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 20b9e767b2fb1456\nCiphertext: 0800000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 55579380d77138ef\nCiphertext: 0400000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 6cc5defaaf04512f\nCiphertext: 0200000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0d9f279ba5d87260\nCiphertext: 0100000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: d9031b0271bd5a0a\nCiphertext: 0080000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 424250b37c3dd951\nCiphertext: 0040000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: b8061b7ecd9a21e5\nCiphertext: 0020000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: f15d0f286b65bd28\nCiphertext: 0010000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: add0cc8d6e5deba1\nCiphertext: 0008000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: e6d5f82752ad63d1\nCiphertext: 0004000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: ecbfe3bd3f591a5e\nCiphertext: 0002000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: f356834379d165cd\nCiphertext: 0001000000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 2b9f982f20037fa9\nCiphertext: 0000800000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 889de068a16f0be6\nCiphertext: 0000400000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: e19e275d846a1298\nCiphertext: 0000200000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 329a8ed523d71aec\nCiphertext: 0000100000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: e7fce22557d23c97\nCiphertext: 0000080000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 12a9f5817ff2d65d\nCiphertext: 0000040000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: a484c3ad38dc9c19\nCiphertext: 0000020000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: fbe00a8a1ef8ad72\nCiphertext: 0000010000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 750d079407521363\nCiphertext: 0000008000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 64feed9c724c2faf\nCiphertext: 0000004000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: f02b263b328e2b60\nCiphertext: 0000002000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 9d64555a9a10b852\nCiphertext: 0000001000000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: d106ff0bed5255d7\nCiphertext: 0000000800000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: e1652c6b138c64a5\nCiphertext: 0000000400000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: e428581186ec8f46\nCiphertext: 0000000200000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: aeb5f5ede22d1a36\nCiphertext: 0000000100000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: e943d7568aec0c5c\nCiphertext: 0000000080000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: df98c8276f54b04b\nCiphertext: 0000000040000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: b160e4680f6c696f\nCiphertext: 0000000020000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: fa0752b07d9c4ab8\nCiphertext: 0000000010000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: ca3a2b036dbc8502\nCiphertext: 0000000008000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 5e0905517bb59bcf\nCiphertext: 0000000004000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 814eeb3b91d90726\nCiphertext: 0000000002000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 4d49db1532919c9f\nCiphertext: 0000000001000000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 25eb5fc3f8cf0621\nCiphertext: 0000000000800000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: ab6a20c0620d1c6f\nCiphertext: 0000000000400000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 79e90dbc98f92cca\nCiphertext: 0000000000200000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 866ecedd8072bb0e\nCiphertext: 0000000000100000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 8b54536f2f3e64a8\nCiphertext: 0000000000080000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: ea51d3975595b86b\nCiphertext: 0000000000040000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: caffc6ac4542de31\nCiphertext: 0000000000020000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 8dd45a2ddf90796c\nCiphertext: 0000000000010000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 1029d55e880ec2d0\nCiphertext: 0000000000008000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 5d86cb23639dbea9\nCiphertext: 0000000000004000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 1d1ca853ae7c0c5f\nCiphertext: 0000000000002000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: ce332329248f3228\nCiphertext: 0000000000001000\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 8405d1abe24fb942\nCiphertext: 0000000000000800\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101", "010101010101010101\nPlaintext: e643d78090ca4207\nCiphertext: 0000000000000400\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 48221b9937748a23\nCiphertext: 0000000000000200\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: dd7c0bbd61fafd54\nCiphertext: 0000000000000100\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 2fbc291a570db5c4\nCiphertext: 0000000000000080\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: e07c30d7e4e26e12\nCiphertext: 0000000000000040\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0953e2258e8e90a1\nCiphertext: 0000000000000020\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 5b711bc4ceebf2ee\nCiphertext: 0000000000000010\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: cc083f1e6d9e85f6\nCiphertext: 0000000000000008\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: d2fd8867d50d2dfe\nCiphertext: 0000000000000004\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 06e7ea22ce92708f\nCiphertext: 0000000000000002\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 166b40b44aba4bd6\nCiphertext: 0000000000000001\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 8000000000000000\nPlaintext: 95f8a5e5dd31d900\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 4000000000000000\nPlaintext: dd7f121ca5015619\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 2000000000000000\nPlaintext: 2e8653104f3834ea\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 1000000000000000\nPlaintext: 4bd388ff6cd81d4f\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0800000000000000\nPlaintext: 20b9e767b2fb1456\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0400000000000000\nPlaintext: 55579380d77138ef\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0200000000000000\nPlaintext: 6cc5defaaf04512f\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0100000000000000\nPlaintext: 0d9f279ba5d87260\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0080000000000000\nPlaintext: d9031b0271bd5a0a\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0040000000000000\nPlaintext: 424250b37c3dd951\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0020000000000000\nPlaintext: b8061b7ecd9a21e5\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0010000000000000\nPlaintext: f15d0f286b65bd28\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0008000000000000\nPlaintext: add0cc8d6e5deba1\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0004000000000000\nPlaintext: e6d5f82752ad63d1\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0002000000000000\nPlaintext: ecbfe3bd3f591a5e\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0001000000000000\nPlaintext: f356834379d165cd\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000800000000000\nPlaintext: 2b9f982f20037fa9\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000400000000000\nPlaintext: 889de068a16f0be6\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000200000000000\nPlaintext: e19e275d846a1298\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000100000000000\nPlaintext: 329a8ed523d71aec\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000080000000000\nPlaintext: e7fce22557d23c97\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000040000000000\nPlaintext: 12a9f5817ff2d65d\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000020000000000\nPlaintext: a484c3ad38dc9c19\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000010000000000\nPlaintext: fbe00a8a1ef8ad72\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000008000000000\nPlaintext: 750d079407521363\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000004000000000\nPlaintext: 64feed9c724c2faf\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000002000000000\nPlaintext: f02b263b328e2b60\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000001000000000\nPlaintext: 9d64555a9a10b852\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000800000000\nPlaintext: d106ff0bed5255d7\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000400000000\nPlaintext: e1652c6b138c64a5\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000200000000\nPlaintext: e428581186ec8f46\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000100000000\nPlaintext: aeb5f5ede22d1a36\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000080000000\nPlaintext: e943d7568aec0c5c\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000040000000\nPlaintext: df98c8276f54b04b\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000020000000\nPlaintext: b160e4680f6c696f\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000010000000\nPlaintext: fa0752b07d9c4ab8\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000008000000\nPlaintext: ca3a2b036dbc8502\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000004000000\nPlaintext: 5e0905517bb59bcf\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000002000000\nPlaintext: 814eeb3b91d90726\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000001000000\nPlaintext: 4d49db1532919c9f\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000800000\nPlaintext: 25eb5fc3f8cf0621\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000400000\nPlaintext: ab6a20c0620d1c6f\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000200000\nPlaintext: 79e90dbc98f92cca\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000100000\nPlaintext: 866ecedd8072bb0e\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000080000\nPlai", "ntext: 8b54536f2f3e64a8\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000040000\nPlaintext: ea51d3975595b86b\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000020000\nPlaintext: caffc6ac4542de31\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000010000\nPlaintext: 8dd45a2ddf90796c\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000008000\nPlaintext: 1029d55e880ec2d0\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000004000\nPlaintext: 5d86cb23639dbea9\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000002000\nPlaintext: 1d1ca853ae7c0c5f\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000001000\nPlaintext: ce332329248f3228\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000800\nPlaintext: 8405d1abe24fb942\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000400\nPlaintext: e643d78090ca4207\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000200\nPlaintext: 48221b9937748a23\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000100\nPlaintext: dd7c0bbd61fafd54\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000080\nPlaintext: 2fbc291a570db5c4\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000040\nPlaintext: e07c30d7e4e26e12\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000020\nPlaintext: 0953e2258e8e90a1\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000010\nPlaintext: 5b711bc4ceebf2ee\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000008\nPlaintext: cc083f1e6d9e85f6\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000004\nPlaintext: d2fd8867d50d2dfe\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000002\nPlaintext: 06e7ea22ce92708f\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0000000000000001\nPlaintext: 166b40b44aba4bd6\n\n# File 2: kat_des/KAT_TDES/TECBpermop.rsp\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 104691348998013110469134899801311046913489980131\nPlaintext: 0000000000000000\nCiphertext: 88d55e54f54c97b4\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100710348998802010071034899880201007103489988020\nPlaintext: 0000000000000000\nCiphertext: 0c0cc00c83ea48fd\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 10071034c898012010071034c898012010071034c8980120\nPlaintext: 0000000000000000\nCiphertext: 83bc8ef3a6570183\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 104610348998802010461034899880201046103489988020\nPlaintext: 0000000000000000\nCiphertext: df725dcad94ea2e9\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 108691151919010110869115191901011086911519190101\nPlaintext: 0000000000000000\nCiphertext: e652b53b550be8b0\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 108691151958010110869115195801011086911519580101\nPlaintext: 0000000000000000\nCiphertext: af527120c485cbb0\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 5107b015195801015107b015195801015107b01519580101\nPlaintext: 0000000000000000\nCiphertext: 0f04ce393db926d5\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 1007b015191901011007b015191901011007b01519190101\nPlaintext: 0000000000000000\nCiphertext: c9f00ffc74079067\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 310791549808010131079154980801013107915498080101\nPlaintext: 0000000000000000\nCiphertext: 7cfd82a593252b4e\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 310791949808010131079194980801013107919498080101\nPlaintext: 0000000000000000\nCiphertext: cb49a2f9e91363e3\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 10079115b908014010079115b908014010079115b9080140\nPlaintext: 0000000000000000\nCiphertext: 00b588be70d23f56\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 310791159808014031079115980801403107911598080140\nPlaintext: 0000000000000000\nCiphertext: 406a9a6ab43399ae\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 1007d015899801011007d015899801011007d01589980101\nPlaintext: 0000000000000000\nCiphertext: 6cb773611dca9ada\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 910791158998010191079115899801019107911589980101\nPlaintext: 0000000000000000\nCiphertext: 67fd21c17dbb5d70\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 9107d015891901019107d015891901019107d01589190101\nPlaintext: 0000000000000000\nCiphertext: 9592cb4110430787\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 1007d015989801201007d015989801201007d01598980120\nPlaintext: 0000000000000000\nCiphertext: a6b7ff68a318ddd3\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100794049819010110079404981901011007940498190101\nPlaintext: 0000000000000000\nCiphertext: 4d102196c914ca16\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010791049119040101079104911904010107910491190401\nPlaintext: 0000000000000000\nCiphertext: 2dfa9f4573594965\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010791049119010101079104911901010107910491190101\nPlaintext: 0000000000000000\nCiphertext: b46604816c0e0774\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010794049119040101079404911904010107940491190401\nPlaintext: 0000000000000000\nCiphertext: 6e7e6221a4f34e87\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 19079210981a010119079210981a010119079210981a0101\nPlaintext: 0000000000000000\nCiphertext: aa85e74643233199\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100791199819080110079119981908011007911998190801\nPlaintext: 0000000000000000\nCiphertext: 2e5a19db4d1962d6\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 10079119981a080110079119981a080110079119981a0801\nPlaintext: 0000000000000000\nCiphertext: 23a866a809d30894\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100792109819010110079210981901011007921098190101\nPlaintext: 0000000000000000\nCiphertext: d812d961f017d320\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100791159819010b100791159819010b100791159819010b\nPlaintext: 0000000000000000\nCiphertext: 055605816e58608f\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100480159819010110048015981901011004801598190101\nPlaintext: 0000000000000000\nCiphertext: abd88e8b1b7716f1\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100480159819010210048015981901021004801598190102\nPlaintext: 0000000000000000\nCiphertext: 537ac95be69da1e1\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100480159819010810048015981901081004801598190108\nPlaintext: 0000000000000000\nCiphertext: aed0f6ae3c25cdd8\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100291159810010410029115981001041002911598100104\nPlaintext: 0000000000000000\nCiphertext: b3e35a5ee53e7b8d\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100291159819010410029115981901041002911598190104\nPlaintext: 0000000000000000\nCiphertext: 61c79c71921a2ef8\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100291159810020110029115981002011002911598100201\nPlaintext: 0000000000000000\nCiphertext: e2f5728f0995013c\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 100291169810010110029116981001011002911698100101\nPlaintext: 0000000000000000\nCiphertext: 1aeac39a61f0a464\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 104691348998013110469134899801311046913489980131\nCiphertext: 88d55e54f54c97b4\nPlaintext: 0000000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 100710348998802010071034899880201007103489988020\nCiphertext: 0c0cc00c83ea48fd\nPlaintext: 0000000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 10071034c898012010071034c898012010071034c8980120\nCiphertext: 83bc8ef3a6570183\nPlaintext: 0000000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 104610348998802010461034899880201046103489988020\nCiphertext: df725dcad94ea2e9\nPlaintext: 00", @@ -2360,9 +2366,9 @@ "101010101010101010101010101\nPlaintext: 0000000000200000\nCiphertext: 79e90dbc98f92cca\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000100000\nCiphertext: 866ecedd8072bb0e\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000080000\nCiphertext: 8b54536f2f3e64a8\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000040000\nCiphertext: ea51d3975595b86b\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000020000\nCiphertext: caffc6ac4542de31\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000010000\nCiphertext: 8dd45a2ddf90796c\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000008000\nCiphertext: 1029d55e880ec2d0\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000004000\nCiphertext: 5d86cb23639dbea9\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000002000\nCiphertext: 1d1ca853ae7c0c5f\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000001000\nCiphertext: ce332329248f3228\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000800\nCiphertext: 8405d1abe24fb942\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000400\nCiphertext: e643d78090ca4207\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000200\nCiphertext: 48221b9937748a23\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000100\nCiphertext: dd7c0bbd61fafd54\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000080\nCiphertext: 2fbc291a570db5c4\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000040\nCiphertext: e07c30d7e4e26e12\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000020\nCiphertext: 0953e2258e8e90a1\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000010\nCiphertext: 5b711bc4ceebf2ee\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000008\nCiphertext: cc083f1e6d9e85f6\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000004\nCiphertext: d2fd8867d50d2dfe\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000002\nCiphertext: 06e7ea22ce92708f\n\nCipher: DES-EDE3\nOperation: ENCRYPT\nKey: 010101010101010101010101010101010101010101010101\nPlaintext: 0000000000000001\nCiphertext: 166b40b44aba4bd6\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 95f8a5e5dd31d900\nPlaintext: 8000000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: dd7f121ca5015619\nPlaintext: 4000000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 2e8653104f3834ea\nPlaintext: 2000000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 4bd388ff6cd81d4f\nPlaintext: 1000000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 20b9e767b2fb1456\nPlaintext: 0800000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 55579380d77138ef\nPlaintext: 0400000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 6cc5defaaf04512f\nPlaintext: 0200000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0d9f279ba5d87260\nPlaintext: 0100000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: d9031b0271bd5a0a\nPlaintext: 0080000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 424250b37c3dd951\nPlaintext: 0040000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: b8061b7ecd9a21e5\nPlaintext: 0020000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: f15d0f286b65bd28\nPlaintext: 0010000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: add0cc8d6e5deba1\nPlaintext: 0008000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e6d5f82752ad63d1\nPlaintext: 0004000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: ecbfe3bd3f591a5e\nPlaintext: 0002000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: f356834379d165cd\nPlaintext: 0001000000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 2b9f982f20037fa9\nPlaintext: 0000800000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 889de068a16f0be6\nPlaintext: 0000400000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e19e275d846a1298\nPlaintext: 0000200000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 329a8ed523d71aec\nPlaintext: 0000100000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e7fce22557d23c97\nPlaintext: 0000080000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 12a9f5817ff2d65d\nPlaintext: 0000040000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: a484c3ad38dc9c19\nPlaintext: 0000020000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: fbe00a8a1ef8ad72\nPlaintext: 0000010000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 750d079407521363\nPlaintext: 0000008000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 64feed9c724c2faf\nPlaintext: 0000004000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: f02b263b328e2b60\nPlaintext: 0000002000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 9d64555a9a10b852\nPlaintext: 0000001000000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: d106ff0bed5255d7\nPlaintext: 0000000800000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e1652c6b138c64a5\nPlaintext: 0000000400000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e428581186ec8f46\nPlaintext: 0000000200000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: aeb5f5ede22d1a36\nPlaintext: 0000000100000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e943d7568aec0c5c\nPlaintext: 0000000080000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: df98c8276f54", "b04b\nPlaintext: 0000000040000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: b160e4680f6c696f\nPlaintext: 0000000020000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: fa0752b07d9c4ab8\nPlaintext: 0000000010000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: ca3a2b036dbc8502\nPlaintext: 0000000008000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 5e0905517bb59bcf\nPlaintext: 0000000004000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 814eeb3b91d90726\nPlaintext: 0000000002000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 4d49db1532919c9f\nPlaintext: 0000000001000000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 25eb5fc3f8cf0621\nPlaintext: 0000000000800000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: ab6a20c0620d1c6f\nPlaintext: 0000000000400000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 79e90dbc98f92cca\nPlaintext: 0000000000200000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 866ecedd8072bb0e\nPlaintext: 0000000000100000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 8b54536f2f3e64a8\nPlaintext: 0000000000080000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: ea51d3975595b86b\nPlaintext: 0000000000040000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: caffc6ac4542de31\nPlaintext: 0000000000020000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 8dd45a2ddf90796c\nPlaintext: 0000000000010000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 1029d55e880ec2d0\nPlaintext: 0000000000008000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 5d86cb23639dbea9\nPlaintext: 0000000000004000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 1d1ca853ae7c0c5f\nPlaintext: 0000000000002000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: ce332329248f3228\nPlaintext: 0000000000001000\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 8405d1abe24fb942\nPlaintext: 0000000000000800\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e643d78090ca4207\nPlaintext: 0000000000000400\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 48221b9937748a23\nPlaintext: 0000000000000200\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: dd7c0bbd61fafd54\nPlaintext: 0000000000000100\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 2fbc291a570db5c4\nPlaintext: 0000000000000080\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: e07c30d7e4e26e12\nPlaintext: 0000000000000040\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 0953e2258e8e90a1\nPlaintext: 0000000000000020\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 5b711bc4ceebf2ee\nPlaintext: 0000000000000010\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: cc083f1e6d9e85f6\nPlaintext: 0000000000000008\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: d2fd8867d50d2dfe\nPlaintext: 0000000000000004\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 06e7ea22ce92708f\nPlaintext: 0000000000000002\n\nCipher: DES-EDE3\nOperation: DECRYPT\nKey: 010101010101010101010101010101010101010101010101\nCiphertext: 166b40b44aba4bd6\nPlaintext: 0000000000000001\n\n", }; -static const size_t kLen30 = 70010; +static const size_t kLen31 = 70010; -static const char *kData31[] = { +static const char *kData32[] = { "# The contents of this file were generated from\n# http://ed25519.cr.yp.to/python/sign.input using the following Python script:\n#\n# import sys\n#\n# isFirst = True\n#\n# for line in sys.stdin.readlines():\n# (private, public, message, sig_and_message, _) = line.split(':')\n#\n# if not isFirst:\n# print\n# print \"PRIV:\", private\n# print \"PUB:\", public\n# print \"MESSAGE:\", message\n# print \"SIG:\", sig_and_message[:128]\n# isFirst = False\n\nPRIV: 9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a\nPUB: d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a\nMESSAGE: \nSIG: e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b\n\nPRIV: 4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c\nPUB: 3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c\nMESSAGE: 72\nSIG: 92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00\n\nPRIV: c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025\nPUB: fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025\nMESSAGE: af82\nSIG: 6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a\n\nPRIV: 0d4a05b07352a5436e180356da0ae6efa0345ff7fb1572575772e8005ed978e9e61a185bcef2613a6c7cb79763ce945d3b245d76114dd440bcf5f2dc1aa57057\nPUB: e61a185bcef2613a6c7cb79763ce945d3b245d76114dd440bcf5f2dc1aa57057\nMESSAGE: cbc77b\nSIG: d9868d52c2bebce5f3fa5a79891970f309cb6591e3e1702a70276fa97c24b3a8e58606c38c9758529da50ee31b8219cba45271c689afa60b0ea26c99db19b00c\n\nPRIV: 6df9340c138cc188b5fe4464ebaa3f7fc206a2d55c3434707e74c9fc04e20ebbc0dac102c4533186e25dc43128472353eaabdb878b152aeb8e001f92d90233a7\nPUB: c0dac102c4533186e25dc43128472353eaabdb878b152aeb8e001f92d90233a7\nMESSAGE: 5f4c8989\nSIG: 124f6fc6b0d100842769e71bd530664d888df8507df6c56dedfdb509aeb93416e26b918d38aa06305df3095697c18b2aa832eaa52edc0ae49fbae5a85e150c07\n\nPRIV: b780381a65edf8b78f6945e8dbec7941ac049fd4c61040cf0c324357975a293ce253af0766804b869bb1595be9765b534886bbaab8305bf50dbc7f899bfb5f01\nPUB: e253af0766804b869bb1595be9765b534886bbaab8305bf50dbc7f899bfb5f01\nMESSAGE: 18b6bec097\nSIG: b2fc46ad47af464478c199e1f8be169f1be6327c7f9a0a6689371ca94caf04064a01b22aff1520abd58951341603faed768cf78ce97ae7b038abfe456aa17c09\n\nPRIV: 78ae9effe6f245e924a7be63041146ebc670dbd3060cba67fbc6216febc44546fbcfbfa40505d7f2be444a33d185cc54e16d615260e1640b2b5087b83ee3643d\nPUB: fbcfbfa40505d7f2be444a33d185cc54e16d615260e1640b2b5087b83ee3643d\nMESSAGE: 89010d855972\nSIG: 6ed629fc1d9ce9e1468755ff636d5a3f40a5d9c91afd93b79d241830f7e5fa29854b8f20cc6eecbb248dbd8d16d14e99752194e4904d09c74d639518839d2300\n\nPRIV: 691865bfc82a1e4b574eecde4c7519093faf0cf867380234e3664645c61c5f7998a5e3a36e67aaba89888bf093de1ad963e774013b3902bfab356d8b90178a63\nPUB: 98a5e3a36e67aaba89888bf093de1ad963e774013b3902bfab356d8b90178a63\nMESSAGE: b4a8f381e70e7a\nSIG: 6e0af2fe55ae377a6b7a7278edfb419bd321e06d0df5e27037db8812e7e3529810fa5552f6c0020985ca17a0e02e036d7b222a24f99b77b75fdd16cb05568107\n\nPRIV: 3b26516fb3dc88eb181b9ed73f0bcd52bcd6b4c788e4bcaf46057fd078bee073f81fb54a825fced95eb033afcd64314075abfb0abd20a970892503436f34b863\nPUB: f81fb54a825fced95eb033afcd64314075abfb0abd20a970892503436f34b863\nMESSAGE: 4284abc51bb67235\nSIG: d6addec5afb0528ac17bb178d3e7f2887f9adbb1ad16e110545ef3bc57f9de2314a5c8388f723b8907be0f3ac90c6259bbe885ecc17645df3db7d488f805fa08\n\nPRIV: edc6f5fbdd1cee4d101c063530a30490b221be68c036f5b07d0f953b745df192c1a49c66e617f9ef5ec66bc4c6564ca33de2a5fb5e1464062e6d6c6219155efd\nPUB: c1a49c66e617f9ef5ec66bc4c6564ca33de2a5fb5e1464062e6d6c6219155efd\nMESSAGE: 672bf8965d04bc5146\nSIG: 2c76a04af2391c147082e33faacdbe56642a1e134bd388620b852b901a6bc16ff6c9cc9404c41dea12ed281da067a1513866f9d964f8bdd24953856c50042901\n\nPRIV: 4e7d21fb3b1897571a445833be0f9fd41cd62be3aa04040f8934e1fcbdcacd4531b2524b8348f7ab1dfafa675cc538e9a84e3fe5819e27c12ad8bbc1a36e4dff\nPUB: 31b2524b8348f7ab1dfafa675cc538e9a84e3fe5819e27c12ad8bbc1a36e4dff\nMESSAGE: 33d7a786aded8c1bf691\nSIG: 28e4598c415ae9de01f03f9f3fab4e919e8bf537dd2b0cdf6e79b9e6559c9409d9151a4c40f083193937627c369488259e99da5a9f0a87497fa6696a5dd6ce08\n\nPRIV: a980f892db13c99a3e8971e965b2ff3d41eafd54093bc9f34d1fd22d84115bb644b57ee30cdb55829d0a5d4f046baef078f1e97a7f21b62d75f8e96ea139c35f\nPUB: 44b57ee30cdb55829d0a5d4f046baef078f1e97a7f21b62d75f8e96ea139c35f\nMESSAGE: 3486f68848a65a0eb5507d\nSIG: 77d389e599630d934076329583cd4105a649a9292abc44cd28c40000c8e2f5ac7660a81c85b72af8452d7d25c070861dae91601c7803d656531650dd4e5c4100\n\nPRIV: 5b5a619f8ce1c66d7ce26e5a2ae7b0c04febcd346d286c929e19d0d5973bfef96fe83693d011d111131c4f3fbaaa40a9d3d76b30012ff73bb0e39ec27ab18257\nPUB: 6fe83693d011d111131c4f3fbaaa40a9d3d76b30012ff73bb0e39ec27ab18257\nMESSAGE: 5a8d9d0a22357e6655f9c785\nSIG: 0f9ad9793033a2fa06614b277d37381e6d94f65ac2a5a94558d09ed6ce922258c1a567952e863ac94297aec3c0d0c8ddf71084e504860bb6ba27449b55adc40e\n\nPRIV: 940c89fe40a81dafbdb2416d14ae469119869744410c3303bfaa0241dac57800a2eb8c0501e30bae0cf842d2bde8dec7386f6b7fc3981b8c57c9792bb94cf2dd\nPUB: a2eb8c0501e30bae0cf842d2bde8dec7386f6b7fc3981b8c57c9792bb94cf2dd\nMESSAGE: b87d3813e03f58cf19fd0b6395\nSIG: d8bb64aad8c9955a115a793addd24f7f2b077648714f49c4694ec995b330d09d640df310f447fd7b6cb5c14f9fe9f490bcf8cfadbfd2169c8ac20d3b8af49a0c\n\nPRIV: 9acad959d216212d789a119252ebfe0c96512a23c73bd9f3b202292d6916a738cf3af898467a5b7a52d33d53bc037e2642a8da996903fc252217e9c033e2f291\nPUB: cf3af898467a5b7a52d33d53bc037e2642a8da996903fc252217e9c033e2f291\nMESSAGE: 55c7fa434f5ed8cdec2b7aeac173\nSIG: 6ee3fe81e23c60eb2312b2006b3b25e6838e02106623f844c44edb8dafd66ab0671087fd195df5b8f58a1d6e52af42908053d55c7321010092748795ef94cf06\n\nPRIV: d5aeee41eeb0e9d1bf8337f939587ebe296161e6bf5209f591ec939e1440c300fd2a565723163e29f53c9de3d5e8fbe36a7ab66e1439ec4eae9c0a604af291a5\nPUB: fd2a565723163e29f53c9de3d5e8fbe36a7ab66e1439ec4eae9c0a604af291a5\nMESSAGE: 0a688e79be24f866286d4646b5d81c\nSIG: f68d04847e5b249737899c014d31c805c5007a62c0a10d50bb1538c5f35503951fbc1e08682f2cc0c92efe8f4985dec61dcbd54d4b94a22547d24451271c8b00\n\nPRIV: 0a47d10452ae2febec518a1c7c362890c3fc1a49d34b03b6467d35c904a8362d34e5a8508c4743746962c066e4badea2201b8ab484de5c4f94476ccd2143955b\nPUB: 34e5a8508c4743746962c066e4badea2201b8ab484de5c4f94476ccd2143955b\nMESSAGE: c942fa7ac6b23ab7ff612fdc8e68ef39\nSIG: 2a3d27dc40d0a8127949a3b7f908b3688f63b7f14f651aacd715940bdbe27a0809aac142f47ab0e1e44fa490ba87ce5392f33a891539caf1ef4c367cae54500c\n\nPRIV: f8148f7506b775ef46fdc8e8c756516812d47d6cfbfa318c27c9a22641e56f170445e456dacc7d5b0bbed23c8200cdb74bdcb03e4c7b73f0a2b9b46eac5d4372\nPUB: 0445e456dacc7d5b0bbed23c8200cdb74bdcb03e4c7b73f0a2b9b46eac5d4372\nMESSAGE: 7368724a5b0efb57d28d97622dbde725af\nSIG: 3653ccb21219202b8436fb41a32ba2618c4a133431e6e63463ceb3b6106c4d56e1d2ba165ba76eaad3dc39bffb130f1de3d8e6427db5b71938db4e272bc3e20b\n\nPRIV: 77f88691c4eff23ebb7364947092951a5ff3f10785b417e918823a552dab7c7574d29127f199d86a8676aec33b4ce3f225ccb191f52c191ccd1e8cca65213a6b\nPUB: 74d29127f199d86a8676aec33b4ce3f225ccb191f52c191ccd1e8cca65213a6b\nMESSAGE: bd8e05033f3a8bcdcbf4beceb70901c82e31\nSIG: fbe929d743a03c17910575492f3092ee2a2bf14a60a3fcacec74a58c7334510fc262db582791322d6c8c41f1700adb80027ecabc14270b703444ae3ee7623e0a\n\nPRIV: ab6f7aee6a0837b334ba5eb1b2ad7fcecfab7e323cab187fe2e0a95d80eff1325b96dca497875bf9664c5e75facf3f9bc54bae913d66ca15ee85f1491ca24d2c\nPUB: 5b96dca497875bf9664c5e75facf3f9bc54bae913d66ca15ee85f1491ca24d2c\nMESSAGE: 8171456f8b907189b1d779e26bc5afbb08c67a\nSIG: 73bca64e9dd0db88138eedfafcea8f5436cfb74bfb0e7733cf349baa0c49775c56d5934e1d38e36f39b7c5beb0a836510c45126f8ec4b6810519905b0ca07c09\n\nPRIV: 8d135de7c8411bbdbd1b31e5dc678f2ac7109e792b60f38cd24936e8a898c32d1ca281938529896535a7714e3584085b86ef9fec723f42819fc8dd5d8c00817f\nPUB: 1ca281938529896535a7714e3584085b86ef9fec723f42819fc8dd5d8c00817f\nMESSAGE: 8ba6a4c9a15a244a9c26bb2a59b1026f21348b49\nSIG: a1adc2bc6a2d980662677e7fdff6424de7dba50f5795ca90fdf3e96e256f3285cac71d3360482e993d0294ba4ec7440c61affdf35f", "e83e6e04263937db93f105\n\nPRIV: 0e765d720e705f9366c1ab8c3fa84c9a44370c06969f803296884b2846a652a47fae45dd0a05971026d410bc497af5be7d0827a82a145c203f625dfcb8b03ba8\nPUB: 7fae45dd0a05971026d410bc497af5be7d0827a82a145c203f625dfcb8b03ba8\nMESSAGE: 1d566a6232bbaab3e6d8804bb518a498ed0f904986\nSIG: bb61cf84de61862207c6a455258bc4db4e15eea0317ff88718b882a06b5cf6ec6fd20c5a269e5d5c805bafbcc579e2590af414c7c227273c102a10070cdfe80f\n\nPRIV: db36e326d676c2d19cc8fe0c14b709202ecfc761d27089eb6ea4b1bb021ecfa748359b850d23f0715d94bb8bb75e7e14322eaf14f06f28a805403fbda002fc85\nPUB: 48359b850d23f0715d94bb8bb75e7e14322eaf14f06f28a805403fbda002fc85\nMESSAGE: 1b0afb0ac4ba9ab7b7172cddc9eb42bba1a64bce47d4\nSIG: b6dcd09989dfbac54322a3ce87876e1d62134da998c79d24b50bd7a6a797d86a0e14dc9d7491d6c14a673c652cfbec9f962a38c945da3b2f0879d0b68a921300\n\nPRIV: c89955e0f7741d905df0730b3dc2b0ce1a13134e44fef3d40d60c020ef19df77fdb30673402faf1c8033714f3517e47cc0f91fe70cf3836d6c23636e3fd2287c\nPUB: fdb30673402faf1c8033714f3517e47cc0f91fe70cf3836d6c23636e3fd2287c\nMESSAGE: 507c94c8820d2a5793cbf3442b3d71936f35fe3afef316\nSIG: 7ef66e5e86f2360848e0014e94880ae2920ad8a3185a46b35d1e07dea8fa8ae4f6b843ba174d99fa7986654a0891c12a794455669375bf92af4cc2770b579e0c\n\nPRIV: 4e62627fc221142478aee7f00781f817f662e3b75db29bb14ab47cf8e84104d6b1d39801892027d58a8c64335163195893bfc1b61dbeca3260497e1f30371107\nPUB: b1d39801892027d58a8c64335163195893bfc1b61dbeca3260497e1f30371107\nMESSAGE: d3d615a8472d9962bb70c5b5466a3d983a4811046e2a0ef5\nSIG: 836afa764d9c48aa4770a4388b654e97b3c16f082967febca27f2fc47ddfd9244b03cfc729698acf5109704346b60b230f255430089ddc56912399d1122de70a\n\nPRIV: 6b83d7da8908c3e7205b39864b56e5f3e17196a3fc9c2f5805aad0f5554c142dd0c846f97fe28585c0ee159015d64c56311c886eddcc185d296dbb165d2625d6\nPUB: d0c846f97fe28585c0ee159015d64c56311c886eddcc185d296dbb165d2625d6\nMESSAGE: 6ada80b6fa84f7034920789e8536b82d5e4678059aed27f71c\nSIG: 16e462a29a6dd498685a3718b3eed00cc1598601ee47820486032d6b9acc9bf89f57684e08d8c0f05589cda2882a05dc4c63f9d0431d6552710812433003bc08\n\nPRIV: 19a91fe23a4e9e33ecc474878f57c64cf154b394203487a7035e1ad9cd697b0d2bf32ba142ba4622d8f3e29ecd85eea07b9c47be9d64412c9b510b27dd218b23\nPUB: 2bf32ba142ba4622d8f3e29ecd85eea07b9c47be9d64412c9b510b27dd218b23\nMESSAGE: 82cb53c4d5a013bae5070759ec06c3c6955ab7a4050958ec328c\nSIG: 881f5b8c5a030df0f75b6634b070dd27bd1ee3c08738ae349338b3ee6469bbf9760b13578a237d5182535ede121283027a90b5f865d63a6537dca07b44049a0f\n\nPRIV: 1d5b8cb6215c18141666baeefcf5d69dad5bea9a3493dddaa357a4397a13d4de94d23d977c33e49e5e4992c68f25ec99a27c41ce6b91f2bfa0cd8292fe962835\nPUB: 94d23d977c33e49e5e4992c68f25ec99a27c41ce6b91f2bfa0cd8292fe962835\nMESSAGE: a9a8cbb0ad585124e522abbfb40533bdd6f49347b55b18e8558cb0\nSIG: 3acd39bec8c3cd2b44299722b5850a0400c1443590fd4861d59aae7496acb3df73fc3fdf7969ae5f50ba47dddc435246e5fd376f6b891cd4c2caf5d614b6170c\n\nPRIV: 6a91b3227c472299089bdce9356e726a40efd840f11002708b7ee55b64105ac29d084aa8b97a6b9bafa496dbc6f76f3306a116c9d917e681520a0f914369427e\nPUB: 9d084aa8b97a6b9bafa496dbc6f76f3306a116c9d917e681520a0f914369427e\nMESSAGE: 5cb6f9aa59b80eca14f6a68fb40cf07b794e75171fba96262c1c6adc\nSIG: f5875423781b66216cb5e8998de5d9ffc29d1d67107054ace3374503a9c3ef811577f269de81296744bd706f1ac478caf09b54cdf871b3f802bd57f9a6cb9101\n\nPRIV: 93eaa854d791f05372ce72b94fc6503b2ff8ae6819e6a21afe825e27ada9e4fb16cee8a3f2631834c88b670897ff0b08ce90cc147b4593b3f1f403727f7e7ad5\nPUB: 16cee8a3f2631834c88b670897ff0b08ce90cc147b4593b3f1f403727f7e7ad5\nMESSAGE: 32fe27994124202153b5c70d3813fdee9c2aa6e7dc743d4d535f1840a5\nSIG: d834197c1a3080614e0a5fa0aaaa808824f21c38d692e6ffbd200f7dfb3c8f44402a7382180b98ad0afc8eec1a02acecf3cb7fde627b9f18111f260ab1db9a07\n\nPRIV: 941cac69fb7b1815c57bb987c4d6c2ad2c35d5f9a3182a79d4ba13eab253a8ad23be323c562dfd71ce65f5bba56a74a3a6dfc36b573d2f94f635c7f9b4fd5a5b\nPUB: 23be323c562dfd71ce65f5bba56a74a3a6dfc36b573d2f94f635c7f9b4fd5a5b\nMESSAGE: bb3172795710fe00054d3b5dfef8a11623582da68bf8e46d72d27cece2aa\nSIG: 0f8fad1e6bde771b4f5420eac75c378bae6db5ac6650cd2bc210c1823b432b48e016b10595458ffab92f7a8989b293ceb8dfed6c243a2038fc06652aaaf16f02\n\nPRIV: 1acdbb793b0384934627470d795c3d1dd4d79cea59ef983f295b9b59179cbb283f60c7541afa76c019cf5aa82dcdb088ed9e4ed9780514aefb379dabc844f31a\nPUB: 3f60c7541afa76c019cf5aa82dcdb088ed9e4ed9780514aefb379dabc844f31a\nMESSAGE: 7cf34f75c3dac9a804d0fcd09eba9b29c9484e8a018fa9e073042df88e3c56\nSIG: be71ef4806cb041d885effd9e6b0fbb73d65d7cdec47a89c8a994892f4e55a568c4cc78d61f901e80dbb628b86a23ccd594e712b57fa94c2d67ec26634878507\n\nPRIV: 8ed7a797b9cea8a8370d419136bcdf683b759d2e3c6947f17e13e2485aa9d420b49f3a78b1c6a7fca8f3466f33bc0e929f01fba04306c2a7465f46c3759316d9\nPUB: b49f3a78b1c6a7fca8f3466f33bc0e929f01fba04306c2a7465f46c3759316d9\nMESSAGE: a750c232933dc14b1184d86d8b4ce72e16d69744ba69818b6ac33b1d823bb2c3\nSIG: 04266c033b91c1322ceb3446c901ffcf3cc40c4034e887c9597ca1893ba7330becbbd8b48142ef35c012c6ba51a66df9308cb6268ad6b1e4b03e70102495790b\n\nPRIV: f2ab396fe8906e3e5633e99cabcd5b09df0859b516230b1e0450b580b65f616c8ea074245159a116aa7122a25ec16b891d625a68f33660423908f6bdc44f8c1b\nPUB: 8ea074245159a116aa7122a25ec16b891d625a68f33660423908f6bdc44f8c1b\nMESSAGE: 5a44e34b746c5fd1898d552ab354d28fb4713856d7697dd63eb9bd6b99c280e187\nSIG: a06a23d982d81ab883aae230adbc368a6a9977f003cebb00d4c2e4018490191a84d3a282fdbfb2fc88046e62de43e15fb575336b3c8b77d19ce6a009ce51f50c\n\nPRIV: 550a41c013f79bab8f06e43ad1836d51312736a9713806fafe6645219eaa1f9daf6b7145474dc9954b9af93a9cdb34449d5b7c651c824d24e230b90033ce59c0\nPUB: af6b7145474dc9954b9af93a9cdb34449d5b7c651c824d24e230b90033ce59c0\nMESSAGE: 8bc4185e50e57d5f87f47515fe2b1837d585f0aae9e1ca383b3ec908884bb900ff27\nSIG: 16dc1e2b9fa909eefdc277ba16ebe207b8da5e91143cde78c5047a89f681c33c4e4e3428d5c928095903a811ec002d52a39ed7f8b3fe1927200c6dd0b9ab3e04\n\nPRIV: 19ac3e272438c72ddf7b881964867cb3b31ff4c793bb7ea154613c1db068cb7ef85b80e050a1b9620db138bfc9e100327e25c257c59217b601f1f6ac9a413d3f\nPUB: f85b80e050a1b9620db138bfc9e100327e25c257c59217b601f1f6ac9a413d3f\nMESSAGE: 95872d5f789f95484e30cbb0e114028953b16f5c6a8d9f65c003a83543beaa46b38645\nSIG: ea855d781cbea4682e350173cb89e8619ccfddb97cdce16f9a2f6f6892f46dbe68e04b12b8d88689a7a31670cdff409af98a93b49a34537b6aa009d2eb8b4701\n\nPRIV: ca267de96c93c238fafb1279812059ab93ac03059657fd994f8fa5a09239c821017370c879090a81c7f272c2fc80e3aac2bc603fcb379afc98691160ab745b26\nPUB: 017370c879090a81c7f272c2fc80e3aac2bc603fcb379afc98691160ab745b26\nMESSAGE: e05f71e4e49a72ec550c44a3b85aca8f20ff26c3ee94a80f1b431c7d154ec9603ee02531\nSIG: ac957f82335aa7141e96b59d63e3ccee95c3a2c47d026540c2af42dc9533d5fd81827d1679ad187aeaf37834915e75b147a9286806c8017516ba43dd051a5e0c\n\nPRIV: 3dff5e899475e7e91dd261322fab09980c52970de1da6e2e201660cc4fce7032f30162bac98447c4042fac05da448034629be2c6a58d30dfd578ba9fb5e3930b\nPUB: f30162bac98447c4042fac05da448034629be2c6a58d30dfd578ba9fb5e3930b\nMESSAGE: 938f0e77621bf3ea52c7c4911c5157c2d8a2a858093ef16aa9b107e69d98037ba139a3c382\nSIG: 5efe7a92ff9623089b3e3b78f352115366e26ba3fb1a416209bc029e9cadccd9f4affa333555a8f3a35a9d0f7c34b292cae77ec96fa3adfcaadee2d9ced8f805\n\nPRIV: 9a6b847864e70cfe8ba6ab22fa0ca308c0cc8bec7141fbcaa3b81f5d1e1cfcfc34ad0fbdb2566507a81c2b1f8aa8f53dccaa64cc87ada91b903e900d07eee930\nPUB: 34ad0fbdb2566507a81c2b1f8aa8f53dccaa64cc87ada91b903e900d07eee930\nMESSAGE: 838367471183c71f7e717724f89d401c3ad9863fd9cc7aa3cf33d3c529860cb581f3093d87da\nSIG: 2ab255169c489c54c732232e37c87349d486b1eba20509dbabe7fed329ef08fd75ba1cd145e67b2ea26cb5cc51cab343eeb085fe1fd7b0ec4c6afcd9b979f905\n\nPRIV: 575be07afca5d063c238cd9b8028772cc49cda34471432a2e166e096e2219efc94e5eb4d5024f49d7ebf79817c8de11497dc2b55622a51ae123ffc749dbb16e0\nPUB: 94e5eb4d5024f49d7ebf79817c8de11497dc2b55622a51ae123ffc749dbb16e0\nMESSAGE: 33e5918b66d33d55fe717ca34383eae78f0af82889caf6696e1ac9d95d1ffb32cba755f9e3503e\nSIG: 58271d44236f3b98c58fd7ae0d2f49ef2b6e3affdb225aa3ba555f0e11cc53c23ad19baf24346590d05d7d5390582082cf94d39cad6530ab93d13efb39279506\n\nPRIV: 15ffb45514d43444d61fcb105e30e135fd268523dda20b82758b1794231104411772c5abc2d23fd2f9d1c3257be7bc3c1cd79cee40844b749b3a7743d2f964b8\nPUB: 1772c5abc2d23fd2f9d1c3257be7bc3c1cd79cee40844b749b3a7743d2f964b8\nMESSAGE: da9c5559d0ea51d255b6bd9d7638b876472f942b330fc0e2b30aea68d77368fce4948272991d257e\nSIG: 6828cd7624e793b8a4ceb96d3c2a975bf773e5ff6645f353614058621e58835289e7f31f42dfe6", "af6d736f2644511e320c0fa698582a79778d18730ed3e8cb08\n\nPRIV: fe0568642943b2e1afbfd1f10fe8df87a4236bea40dce742072cb21886eec1fa299ebd1f13177dbdb66a912bbf712038fdf73b06c3ac020c7b19126755d47f61\nPUB: 299ebd1f13177dbdb66a912bbf712038fdf73b06c3ac020c7b19126755d47f61\nMESSAGE: c59d0862ec1c9746abcc3cf83c9eeba2c7082a036a8cb57ce487e763492796d47e6e063a0c1feccc2d\nSIG: d59e6dfcc6d7e3e2c58dec81e985d245e681acf6594a23c59214f7bed8015d813c7682b60b3583440311e72a8665ba2c96dec23ce826e160127e18132b030404\n\nPRIV: 5ecb16c2df27c8cf58e436a9d3affbd58e9538a92659a0f97c4c4f994635a8cada768b20c437dd3aa5f84bb6a077ffa34ab68501c5352b5cc3fdce7fe6c2398d\nPUB: da768b20c437dd3aa5f84bb6a077ffa34ab68501c5352b5cc3fdce7fe6c2398d\nMESSAGE: 56f1329d9a6be25a6159c72f12688dc8314e85dd9e7e4dc05bbecb7729e023c86f8e0937353f27c7ede9\nSIG: 1c723a20c6772426a670e4d5c4a97c6ebe9147f71bb0a415631e44406e290322e4ca977d348fe7856a8edc235d0fe95f7ed91aefddf28a77e2c7dbfd8f552f0a\n\nPRIV: d599d637b3c30a82a9984e2f758497d144de6f06b9fba04dd40fd949039d7c846791d8ce50a44689fc178727c5c3a1c959fbeed74ef7d8e7bd3c1ab4da31c51f\nPUB: 6791d8ce50a44689fc178727c5c3a1c959fbeed74ef7d8e7bd3c1ab4da31c51f\nMESSAGE: a7c04e8ba75d0a03d8b166ad7a1d77e1b91c7aaf7befdd99311fc3c54a684ddd971d5b3211c3eeaff1e54e\nSIG: ebf10d9ac7c96108140e7def6fe9533d727646ff5b3af273c1df95762a66f32b65a09634d013f54b5dd6011f91bc336ca8b355ce33f8cfbec2535a4c427f8205\n\nPRIV: 30ab8232fa7018f0ce6c39bd8f782fe2e159758bb0f2f4386c7f28cfd2c85898ecfb6a2bd42f31b61250ba5de7e46b4719afdfbc660db71a7bd1df7b0a3abe37\nPUB: ecfb6a2bd42f31b61250ba5de7e46b4719afdfbc660db71a7bd1df7b0a3abe37\nMESSAGE: 63b80b7956acbecf0c35e9ab06b914b0c7014fe1a4bbc0217240c1a33095d707953ed77b15d211adaf9b97dc\nSIG: 9af885344cc7239498f712df80bc01b80638291ed4a1d28baa5545017a72e2f65649ccf9603da6eb5bfab9f5543a6ca4a7af3866153c76bf66bf95def615b00c\n\nPRIV: 0ddcdc872c7b748d40efe96c2881ae189d87f56148ed8af3ebbbc80324e38bdd588ddadcbcedf40df0e9697d8bb277c7bb1498fa1d26ce0a835a760b92ca7c85\nPUB: 588ddadcbcedf40df0e9697d8bb277c7bb1498fa1d26ce0a835a760b92ca7c85\nMESSAGE: 65641cd402add8bf3d1d67dbeb6d41debfbef67e4317c35b0a6d5bbbae0e034de7d670ba1413d056f2d6f1de12\nSIG: c179c09456e235fe24105afa6e8ec04637f8f943817cd098ba95387f9653b2add181a31447d92d1a1ddf1ceb0db62118de9dffb7dcd2424057cbdff5d41d0403\n\nPRIV: 89f0d68299ba0a5a83f248ae0c169f8e3849a9b47bd4549884305c9912b46603aba3e795aab2012acceadd7b3bd9daeeed6ff5258bdcd7c93699c2a3836e3832\nPUB: aba3e795aab2012acceadd7b3bd9daeeed6ff5258bdcd7c93699c2a3836e3832\nMESSAGE: 4f1846dd7ad50e545d4cfbffbb1dc2ff145dc123754d08af4e44ecc0bc8c91411388bc7653e2d893d1eac2107d05\nSIG: 2c691fa8d487ce20d5d2fa41559116e0bbf4397cf5240e152556183541d66cf753582401a4388d390339dbef4d384743caa346f55f8daba68ba7b9131a8a6e0b\n\nPRIV: 0a3c1844e2db070fb24e3c95cb1cc6714ef84e2ccd2b9dd2f1460ebf7ecf13b172e409937e0610eb5c20b326dc6ea1bbbc0406701c5cd67d1fbde09192b07c01\nPUB: 72e409937e0610eb5c20b326dc6ea1bbbc0406701c5cd67d1fbde09192b07c01\nMESSAGE: 4c8274d0ed1f74e2c86c08d955bde55b2d54327e82062a1f71f70d536fdc8722cdead7d22aaead2bfaa1ad00b82957\nSIG: 87f7fdf46095201e877a588fe3e5aaf476bd63138d8a878b89d6ac60631b3458b9d41a3c61a588e1db8d29a5968981b018776c588780922f5aa732ba6379dd05\n\nPRIV: c8d7a8818b98dfdb20839c871cb5c48e9e9470ca3ad35ba2613a5d3199c8ab2390d2efbba4d43e6b2b992ca16083dbcfa2b322383907b0ee75f3e95845d3c47f\nPUB: 90d2efbba4d43e6b2b992ca16083dbcfa2b322383907b0ee75f3e95845d3c47f\nMESSAGE: 783e33c3acbdbb36e819f544a7781d83fc283d3309f5d3d12c8dcd6b0b3d0e89e38cfd3b4d0885661ca547fb9764abff\nSIG: fa2e994421aef1d5856674813d05cbd2cf84ef5eb424af6ecd0dc6fdbdc2fe605fe985883312ecf34f59bfb2f1c9149e5b9cc9ecda05b2731130f3ed28ddae0b\n\nPRIV: b482703612d0c586f76cfcb21cfd2103c957251504a8c0ac4c86c9c6f3e429fffd711dc7dd3b1dfb9df9704be3e6b26f587fe7dd7ba456a91ba43fe51aec09ad\nPUB: fd711dc7dd3b1dfb9df9704be3e6b26f587fe7dd7ba456a91ba43fe51aec09ad\nMESSAGE: 29d77acfd99c7a0070a88feb6247a2bce9984fe3e6fbf19d4045042a21ab26cbd771e184a9a75f316b648c6920db92b87b\nSIG: 58832bdeb26feafc31b46277cf3fb5d7a17dfb7ccd9b1f58ecbe6feb979666828f239ba4d75219260ecac0acf40f0e5e2590f4caa16bbbcd8a155d347967a607\n\nPRIV: 84e50dd9a0f197e3893c38dbd91fafc344c1776d3a400e2f0f0ee7aa829eb8a22c50f870ee48b36b0ac2f8a5f336fb090b113050dbcc25e078200a6e16153eea\nPUB: 2c50f870ee48b36b0ac2f8a5f336fb090b113050dbcc25e078200a6e16153eea\nMESSAGE: f3992cde6493e671f1e129ddca8038b0abdb77bb9035f9f8be54bd5d68c1aeff724ff47d29344391dc536166b8671cbbf123\nSIG: 69e6a4491a63837316e86a5f4ba7cd0d731ecc58f1d0a264c67c89befdd8d3829d8de13b33cc0bf513931715c7809657e2bfb960e5c764c971d733746093e500\n\nPRIV: b322d46577a2a991a4d1698287832a39c487ef776b4bff037a05c7f1812bdeeceb2bcadfd3eec2986baff32b98e7c4dbf03ff95d8ad5ff9aa9506e5472ff845f\nPUB: eb2bcadfd3eec2986baff32b98e7c4dbf03ff95d8ad5ff9aa9506e5472ff845f\nMESSAGE: 19f1bf5dcf1750c611f1c4a2865200504d82298edd72671f62a7b1471ac3d4a30f7de9e5da4108c52a4ce70a3e114a52a3b3c5\nSIG: c7b55137317ca21e33489ff6a9bfab97c855dc6f85684a70a9125a261b56d5e6f149c5774d734f2d8debfc77b721896a8267c23768e9badb910eef83ec258802\n\nPRIV: 960cab5034b9838d098d2dcbf4364bec16d388f6376d73a6273b70f82bbc98c05e3c19f2415acf729f829a4ebd5c40e1a6bc9fbca95703a9376087ed0937e51a\nPUB: 5e3c19f2415acf729f829a4ebd5c40e1a6bc9fbca95703a9376087ed0937e51a\nMESSAGE: f8b21962447b0a8f2e4279de411bea128e0be44b6915e6cda88341a68a0d818357db938eac73e0af6d31206b3948f8c48a447308\nSIG: 27d4c3a1811ef9d4360b3bdd133c2ccc30d02c2f248215776cb07ee4177f9b13fc42dd70a6c2fed8f225c7663c7f182e7ee8eccff20dc7b0e1d5834ec5b1ea01\n\nPRIV: eb77b2638f23eebc82efe45ee9e5a0326637401e663ed029699b21e6443fb48e9ef27608961ac711de71a6e2d4d4663ea3ecd42fb7e4e8627c39622df4af0bbc\nPUB: 9ef27608961ac711de71a6e2d4d4663ea3ecd42fb7e4e8627c39622df4af0bbc\nMESSAGE: 99e3d00934003ebafc3e9fdb687b0f5ff9d5782a4b1f56b9700046c077915602c3134e22fc90ed7e690fddd4433e2034dcb2dc99ab\nSIG: 18dc56d7bd9acd4f4daa78540b4ac8ff7aa9815f45a0bba370731a14eaabe96df8b5f37dbf8eae4cb15a64b244651e59d6a3d6761d9e3c50f2d0cbb09c05ec06\n\nPRIV: b625aa89d3f7308715427b6c39bbac58effd3a0fb7316f7a22b99ee5922f2dc965a99c3e16fea894ec33c6b20d9105e2a04e2764a4769d9bbd4d8bacfeab4a2e\nPUB: 65a99c3e16fea894ec33c6b20d9105e2a04e2764a4769d9bbd4d8bacfeab4a2e\nMESSAGE: e07241dbd3adbe610bbe4d005dd46732a4c25086ecb8ec29cd7bca116e1bf9f53bfbf3e11fa49018d39ff1154a06668ef7df5c678e6a\nSIG: 01bb901d83b8b682d3614af46a807ba2691358feb775325d3423f549ff0aa5757e4e1a74e9c70f9721d8f354b319d4f4a1d91445c870fd0ffb94fed64664730d\n\nPRIV: b1c9f8bd03fe82e78f5c0fb06450f27dacdf716434db268275df3e1dc177af427fc88b1f7b3f11c629be671c21621f5c10672fafc8492da885742059ee6774cf\nPUB: 7fc88b1f7b3f11c629be671c21621f5c10672fafc8492da885742059ee6774cf\nMESSAGE: 331da7a9c1f87b2ac91ee3b86d06c29163c05ed6f8d8a9725b471b7db0d6acec7f0f702487163f5eda020ca5b493f399e1c8d308c3c0c2\nSIG: 4b229951ef262f16978f7914bc672e7226c5f8379d2778c5a2dc0a2650869f7acfbd0bcd30fdb0619bb44fc1ae5939b87cc318133009c20395b6c7eb98107701\n\nPRIV: 6d8cdb2e075f3a2f86137214cb236ceb89a6728bb4a200806bf3557fb78fac6957a04c7a5113cddfe49a4c124691d46c1f9cdc8f343f9dcb72a1330aeca71fda\nPUB: 57a04c7a5113cddfe49a4c124691d46c1f9cdc8f343f9dcb72a1330aeca71fda\nMESSAGE: 7f318dbd121c08bfddfeff4f6aff4e45793251f8abf658403358238984360054f2a862c5bb83ed89025d2014a7a0cee50da3cb0e76bbb6bf\nSIG: a6cbc947f9c87d1455cf1a708528c090f11ecee4855d1dbaadf47454a4de55fa4ce84b36d73a5b5f8f59298ccf21992df492ef34163d87753b7e9d32f2c3660b\n\nPRIV: 47adc6d6bf571ee9570ca0f75b604ac43e303e4ab339ca9b53cacc5be45b2ccba3f527a1c1f17dfeed92277347c9f98ab475de1755b0ab546b8a15d01b9bd0be\nPUB: a3f527a1c1f17dfeed92277347c9f98ab475de1755b0ab546b8a15d01b9bd0be\nMESSAGE: ce497c5ff5a77990b7d8f8699eb1f5d8c0582f70cb7ac5c54d9d924913278bc654d37ea227590e15202217fc98dac4c0f3be2183d133315739\nSIG: 4e8c318343c306adbba60c92b75cb0569b9219d8a86e5d57752ed235fc109a43c2cf4e942cacf297279fbb28675347e08027722a4eb7395e00a17495d32edf0b\n\nPRIV: 3c19b50b0fe47961719c381d0d8da9b9869d312f13e3298b97fb22f0af29cbbe0f7eda091499625e2bae8536ea35cda5483bd16a9c7e416b341d6f2c83343612\nPUB: 0f7eda091499625e2bae8536ea35cda5483bd16a9c7e416b341d6f2c83343612\nMESSAGE: 8ddcd63043f55ec3bfc83dceae69d8f8b32f4cdb6e2aebd94b4314f8fe7287dcb62732c9052e7557fe63534338efb5b6254c5d41d2690cf5144f\nSIG: efbd41f26a5d62685516f882b6ec74e0d5a71830d203c231248f26e99a9c6578ec900d68cdb8fa7216ad0d24f9ecbc9ffa655351666582f626645395a31fa704\n\nPRIV: 34e1e9d539107eb86b393a5ccea1496d35bc7d5e9a8c5159d957", @@ -2419,9 +2425,9 @@ "28bb92e9a0edec8951ce2009a88ee1b64d9b9e89f69051203384210a102a44d2d6703173b68507dceadd3bf6510df2a5cefd9c80e4f385b2f9e6215813ed32\nSIG: 9da60cc4a64d07dee1346bd3d3010995ce2738208ab35b34c2a8fd1787ae3a1e207fe784525154fae4f5794cd8503045fea85cf77fd92f6a70cd0c5a52c0810e\n\nPRIV: 1126496a582ce58d3d618dd8a3933547aa7a8a30fb54063b8dfdd31671c6c73de10229c623fa8ad8982c3e4c36ff52df0f219b57915b6e980e5fe72ea0962e22\nPUB: e10229c623fa8ad8982c3e4c36ff52df0f219b57915b6e980e5fe72ea0962e22\nMESSAGE: 6a4b52d730ddab829b2a179590cbd4c372498e9f439977c0a10dc13c0ae1736eaaff063371434fd0da80360ec5890607d2fae1c9a2e1ab0b7f3d667f5b1b9c418f18b10c9e6fd669d3ebec168efef44163e577a2ebd0f2cb768f80c23188e86069e4d10f410306cedd7a341a61e0f4f3bc25041bc2f922ed073e1e2f1b709c579d10630f33071754d707894a1c62190de18882c564dc4c01dc545dd8966404ed78fa3267a9469f63b6120abb65f9b3ba3eee28d79c2eb4e7020cc6987dfc5c29672f8c0fa3e690d584fe000c64f352610179621bfd5ff3eb30d18f1a0250416db93b1c1e93cf8a3646517560d1cc8fff822b51ef27b200e987b592390753453ef138bd3d29db7cb1b5f45e4795b89c53f49704192752237c6ab274849f9594ee9777f6efe70483129d067f97199d9ae36090703864f7ca4750a6f3b6ff83824c910484394d1e2eceba18446fe4e994ce07433a740ddd05f0e396d482894e6f14acf7b97bae6c7eb88703039fa785d60a3af78b13243a4f88dde1d998617f2e3fa7eafc2f435dd4ac1ea9c238407aa09b4eea8ed434927b406674ac270458cfb3bf29c347f94559613179b9502192321b88e9af0a90e9a4ab9eddaae382e3734d1415ebe32499c34e6fdeaf15b0d9787985e08dfe495460c54f6743d81ff16881e5e30c51f4b092373783f12423c3e1ae8591130a269980caa1cb5c\nSIG: b30eb56ca9b120bf849a3a9d56af033de8a590c9e1240c1e36dbc6cf0a71b78a11ec143fb9959a8f25b57711d6a90a67e01be3a4da2b69394869bb8d64b87e0f\n\nPRIV: 9c167aff3b1b788f133d422de8ca9a64316409f9e35bfe22032ec417ae9abc6defb534f0d47c068e77b28a906d95ad8d213a4d4fc1c70542f01e596d57b5f019\nPUB: efb534f0d47c068e77b28a906d95ad8d213a4d4fc1c70542f01e596d57b5f019\nMESSAGE: 68ac0fc2b607ba38e377fae845c808c8f9fa614eb1f31158a9620a937d3e301e85acaa69144bc349a39dfb582041c4a197ae99b4d4d59b7a2ca3d16228b5591cbf57c18a781efd19193c47b16c6023a3a8ba3d668f05a37f1e83b0d7febdd10f63e48ef7a20e015b1c6725d4c300a986c60e3a115469c8e52ba05b51c05d0af40d89fd9ed76f36950aee3c7819898a903cfe0361a91c69100b495141e86ee79d63d17403fb1a1629ef63cb7e9d2720cbfff0002b190bcdc26794124dd38d42bcaa7175405eb0bbcf8e37d65d05a37195b479371fa2bbbb167d91cee88235dd72ea88fc73ce3ce43d33b715f25f192ec215dac124899c5e7586e86340d8cbe53735defbe02e4cc9fde69fb9794d1db72b98c0f19766ee5138bbfa78909aa299b4913c499deaf54b4841d5044829984936700dcf92f36542b2fc7e86441b9925f5d0b78c17a85cfcfcb20b0fd751349c27463abde4d27df74265288713f96dea013b945521808b4996b1b2dc0338b6d236efd6d2b27dafda46ec5fa32b965e8bb5e8bb61bd966edeb774681e0ea8c17b8c99fa7d660f0f66c9bc6d95cbd7dc094724098eb05191b53a3df6566b9c90e0d7dff2943848b61a20d48c22b6d3c958e293d709c8f48110230ff51918562877daf6d920c85a82e07c451fe7ae9759c0a77e97bb298b5d0592a41d08f67a4ed5a1bb41e937b6a68aeb38fd5be9\nSIG: c9ae67fd6415dcbab292fab394ca6c3b7d90ca244dc6a7764e74fd202bf4b2905bd2030e6beb914c3c238db371b1cba6d9261aa392ec871a4b8b12fe9c1c970e\n\nPRIV: e9948805eb341b2867479c668fd3532c309941c0ad4cb2e54231756e6a1bdecb5447a8e34d6a640002d8d60bcf1ddc711e4c465c94c34b50bdef358960ff81f1\nPUB: 5447a8e34d6a640002d8d60bcf1ddc711e4c465c94c34b50bdef358960ff81f1\nMESSAGE: 91cffd7eb1cf6bd4756bce6a30af9dfba26ddd1cce0394c194a3e39cc3d1cbc221b7eb70bea18d29c267457176a3c9e53c18e47d10a67c464505197702e6b2470d38869db5174b158f9992e4435d02246f540258dedd3ce33df582555a681fb76ecaccb1c2989b177e3b7e454aaa529de59bf5a03123d571df2e7f7cb830805c58b74a653bac0e5a888e08dc2236d6cd496aa06d0d67cf3b335e218c49dedad82fc1be9ef20cac61905c30eb132d739b16ca8a8c906619c0e0d8b33985327e36f3d4b8fda387c186cc50443104db761f7ff9301270204a713e58902101fad000ce931647c577fdec148dca95cdc08918ebed037c60332fadf088f036083ebc92e173b7ddcc30c493f27e69cd17a20d30b78f83a72e4f5a747d86d96c5e1bb7a438166204013e2164d6aabc0d562f54015c365c80445607145e5692ee34f6353077fab7452d88ce3eb01d2b3797dc91b341a3a726301516baae18e851f74dfbdf0866bb2376867de55231e362c472c52116544cd4f81e93571c4ec820e7e653f4e21be0a942576c9de91e7d1251683d859de448f822dcf3d2cf55ede2f9c71b6063d1373061f8f5936b698d1384e65459ea2bc26ec96775ef425207432dda0ac1fe28526c5e4559349c3d8df9918230f4044683cc2c1b858d141ab8d0805bb9336067522aa89c810f3eaa7ac2d8dd28c3751225a19ecec8bcca52439946\nSIG: d3dc62d6ce9c766f2abaf9a7fbe09d6bdb07a4747b56080db09beb4a4e804a70d7ddf4119475c7be834f31956f4a71dad029cdf2363dd0365ce22dc27f078003\n\nPRIV: b01753efa73bb3de7aa778be7afcbff66a5d3e2c2f8b5aa2b048844050996965d0cc6cf109c999fbf6d16f471fafd0232b0a68d4c46406ec7545dbaba8194158\nPUB: d0cc6cf109c999fbf6d16f471fafd0232b0a68d4c46406ec7545dbaba8194158\nMESSAGE: 684e612f27eead0d34844cc81ba911c28aaf6d66e71229e8cc3462f7c7a050daa30cb74471150f07dad459b5a91358476c0598255d8a642dd7c0802811bd88e4cac597efe41ebd96cd0f3b5ce72db4be1a3dbd6b84f5446e3da600d3b1d2b460a009bd31cacd98a91518ce33e9a703d404288736ccc43103fc69e67974f31652fa3dadef3337f6c897a3d201303c8f03597b4a87c98f291ccd58a3f1e898332aa5993b47fcb5ddaa1c0868b643742d0e4a4b9cd427038b3b74999bc89ac3484c0ca13f25aae8e78ae1ccee6218accab81a4f694f5324a347629d49b55e4037504a9acc8df58c6841dddcd4fc4347f7b6f1fd9de0564577e6f329ed951a0a6b9124ff63e22eb36d3a8863bc1bf69cea24c605967e7d8948953f27d5c4c75f0849f872a3e3d16d422fa5a11e1b9a74df6f38b90f277d81fce8437a14d99d2bef189d7cac83ddc61377ed348b3c4fc09ec2b9005925d04a71e26d641667bdf549294331c6ea01cd5c0bd1b6a7ecfda20b0f1929582b74697cb262c3927d6b223f4b5f3043aa6eb4571a78e9da11c2b36f64552580caa7b5fa6b90f929e0162e608d1240d7242cd2f47025c03debe059b1dc94770232bc6765148480bb1d9f50da1ee6448cf9c88b19dd459932c06ed811c4a64a12d5938bd1c757bcfaeaee8933fe5fff21763de740482bcf1ba59afdc8fcf873c3d507bb394e32e45f736519\nSIG: 16b7421227ae09130685cbb1a0c60aa57a5e1afe1bbe6bacea0c281bcc8998e6824a772c3208a6b6b4d236695505c9be82700cf93a783985a39e16e377a7410e\n\nPRIV: 4f4b20d899366f2f23ee628f229b236cf80f43ba183177c97ee34829546f1742c94576641f4a893cdfcee7b39fc21929b86b349976d7b0a46d39a588bcfe4357\nPUB: c94576641f4a893cdfcee7b39fc21929b86b349976d7b0a46d39a588bcfe4357\nMESSAGE: db8ef02e3033e6b96a56cab05082fb4695f4a1c916250dd75173f430a10c9468817709d37623346ae8245b42bda0da6b60462ccfdfc75a9ab994e66c9ab9fecdd8599610910affe4f10215cb280bf8f9f2700a444796dae93e06c6bea7d8b4fe1301baa79ccec769368feb2442c7de84f095e6b3bff63d388cbafb2b9809dc38e9b12ebd039c0a57f4d522e91ec8d1f2b8d23a4a0ae059af85393bb0a15f749110f6774a1fd731a6ec213e4ff435daab546d31ed9ec3b6d8cc2edacebf4facc5566556eea92e5b3f2542239b25e28012dd4ef40072eebf83ed2a255181f3a442189d68c6c609f4dfdf3db7d67d087a2fcd6d2dc50bbfed8bfbbfcb74d3c41f02a87865b13b8efcf5c3581257be0aa913f60c370527bde11a475c136a17c5eefeb03f5bff28693ed841e8ed1f7c29102f5599dd444009bcea6a92d5574152458e0caf8a36aa72b5dc4908a6461c9b741453005c8fbcc68113ae184208ee14b835480c6efafed18a76000b38e5858290f4d51f52f096cbe490e1eb5cacb226ec495a55a7fa457843d57fab67f8be7e209334785bdd665d7b63e4daf57b6e78928b603c8c0f9bc85464733b61273ef9e2b8a0cd7c3bf8ee0a6872e34d5a27a625e35eaf7ff5440b8b141af704df70c9c18623bd11209513192505105cd7bcfa5f0d919da706948fbe1f761f315846aa3b4813dd9ba3d81b9204e5409c0382b6eb\nSIG: 0f80ff5d17488fe26f93c543b04ed959b5f0643fc61c7f2c3bc60132ba9c6210c8b250ea5e84d07b01de68bc174414eeeb31fdc2ba6823e231e312a91ededd02\n\n\n# Additional test vectors from RFC 8032\n\nPRIV: f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e\nPUB: 278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e\nMESSAGE: 08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc27", "32e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0\nSIG: 0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03\n\nPRIV: 833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf\nPUB: ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf\nMESSAGE: ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f\nSIG: dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704\n", }; -static const size_t kLen31 = 444193; +static const size_t kLen32 = 444193; -static const char *kData32[] = { +static const char *kData33[] = { "# Tests from NIST CAVP SP 800-56A ECCCDH Primitive Test Vectors.\n# http://csrc.nist.gov/groups/STM/cavp/documents/components/ecccdhtestvectors.zip\n#\n# P-521 test vectors were fixed to have the right length.\n\nCurve = P-224\nPrivate = 8346a60fc6f293ca5a0d2af68ba71d1dd389e5e40837942df3e43cbd\nX = 8de2e26adf72c582d6568ef638c4fd59b18da171bdf501f1d929e048\nY = 4a68a1c2b0fb22930d120555c1ece50ea98dea8407f71be36efac0de\nPeerX = af33cd0629bc7e996320a3f40368f74de8704fa37b8fab69abaae280\nPeerY = 882092ccbba7930f419a8a4f9bb16978bbc3838729992559a6f2e2d7\nZ = 7d96f9a3bd3c05cf5cc37feb8b9d5209d5c2597464dec3e9983743e8\n\nCurve = P-224\nPrivate = 043cb216f4b72cdf7629d63720a54aee0c99eb32d74477dac0c2f73d\nX = 2f90f5c8eac9c7decdbb97b6c2f715ab725e4fe40fe6d746efbf4e1b\nY = 66897351454f927a309b269c5a6d31338be4c19a5acfc32cf656f45c\nPeerX = 13bfcd4f8e9442393cab8fb46b9f0566c226b22b37076976f0617a46\nPeerY = eeb2427529b288c63c2f8963c1e473df2fca6caa90d52e2f8db56dd4\nZ = ee93ce06b89ff72009e858c68eb708e7bc79ee0300f73bed69bbca09\n\nCurve = P-224\nPrivate = 5ad0dd6dbabb4f3c2ea5fe32e561b2ca55081486df2c7c15c9622b08\nX = 005bca45d793e7fe99a843704ed838315ab14a5f6277507e9bc37531\nY = 43e9d421e1486ae5893bfd23c210e5c140d7c6b1ada59d842c9a98de\nPeerX = 756dd806b9d9c34d899691ecb45b771af468ec004486a0fdd283411e\nPeerY = 4d02c2ca617bb2c5d9613f25dd72413d229fd2901513aa29504eeefb\nZ = 3fcc01e34d4449da2a974b23fc36f9566754259d39149790cfa1ebd3\n\nCurve = P-224\nPrivate = 0aa6ff55a5d820efcb4e7d10b845ea3c9f9bc5dff86106db85318e22\nX = 2f96754131e0968198aa78fbe8c201dc5f3581c792de487340d32448\nY = 61e8a5cd79615203b6d89e9496f9e236fe3b6be8731e743d615519c6\nPeerX = 0f537bf1c1122c55656d25e8aa8417e0b44b1526ae0523144f9921c4\nPeerY = f79b26d30e491a773696cc2c79b4f0596bc5b9eebaf394d162fb8684\nZ = 49129628b23afcef48139a3f6f59ff5e9811aa746aa4ff33c24bb940\n\nCurve = P-224\nPrivate = efe6e6e25affaf54c98d002abbc6328da159405a1b752e32dc23950a\nX = 355e962920bde043695f6bffb4b355c63da6f5de665ed46f2ec817e2\nY = 748e095368f62e1d364edd461719793b404adbdaacbcadd88922ff37\nPeerX = 2b3631d2b06179b3174a100f7f57131eeea8947be0786c3dc64b2239\nPeerY = 83de29ae3dad31adc0236c6de7f14561ca2ea083c5270c78a2e6cbc0\nZ = fcdc69a40501d308a6839653a8f04309ec00233949522902ffa5eac6\n\nCurve = P-224\nPrivate = 61cb2932524001e5e9eeed6df7d9c8935ee3322029edd7aa8acbfd51\nX = d50e4adabfd989d7dbc7cf4052546cc7c447a97630436997ad4b9536\nY = 5bea503473c5eaef9552d42c40b1f2f7ca292733b255b9bbe1b12337\nPeerX = 4511403de29059f69a475c5a6a5f6cabed5d9f014436a8cb70a02338\nPeerY = 7d2d1b62aa046df9340f9c37a087a06b32cf7f08a223f992812a828b\nZ = 827e9025cb62e0e837c596063f3b9b5a0f7afd8d8783200086d61ec1\n\nCurve = P-224\nPrivate = 8c7ace347171f92def98d845475fc82e1d1496da81ee58f505b985fa\nX = b1a8dcac89aca2799320b451df1c7ff4d97567abb68141c0d95fc2aa\nY = 3524950902b1510bdc987d860afc27ad871ceaea66935abd3c0a99a8\nPeerX = 314a0b26dd31c248845d7cc17b61cad4608259bed85a58d1f1ffd378\nPeerY = 66e4b350352e119eecada382907f3619fd748ea73ae4899dfd496302\nZ = 335ba51228d94acbed851ca7821c801d5cb1c7975d7aa90a7159f8fa\n\nCurve = P-224\nPrivate = 382feb9b9ba10f189d99e71a89cdfe44cb554cec13a212840977fb68\nX = abb6f1e3773ff8fc73aea2a0b107809ce70adcefed6e41fc5cb43045\nY = a963897ae906c10a055eeadb97ffdd6f748d3e5621e5fff304e48ba7\nPeerX = abe6843beec2fd9e5fb64730d0be4d165438ce922ed75dd80b4603e5\nPeerY = 6afe8673a96c4ba9900ad85995e631e436c6cc88a2c2b47b7c4886b8\nZ = 8c2e627594206b34f7356d3426eb3d79f518ef843fbe94014cceace3\n\nCurve = P-224\nPrivate = e0d62035101ef487c485c60fb4500eebe6a32ec64dbe97dbe0232c46\nX = 88537735e9b23e3e0e076f135a82d33f9bffb465f3abce8322a62a62\nY = b4c8c123673197875c0bd14ed097606d330fba2b9200ef65a44764d3\nPeerX = 13cf9d6d2c9aae8274c27d446afd0c888ffdd52ae299a35984d4f527\nPeerY = dcbee75b515751f8ee2ae355e8afd5de21c62a939a6507b538cbc4af\nZ = 632abb662728dbc994508873d5c527ca5ef923c0d31fa6c47ef4c825\n\nCurve = P-224\nPrivate = b96ade5b73ba72aa8b6e4d74d7bf9c58e962ff78eb542287c7b44ba2\nX = 37682926a54f70a4c1748f54d50d5b00138a055f924f2c65e5b0bbe4\nY = 596afefcdd640d29635015b89bdddd1f8c2723686d332e7a06ca8799\nPeerX = 965b637c0dfbc0cf954035686d70f7ec30929e664e521dbaa2280659\nPeerY = 82a58ff61bc90019bbcbb5875d3863db0bc2a1fa34b0ad4de1a83f99\nZ = 34641141aab05ef58bd376d609345901fb8f63477c6be9097f037f1f\n\nCurve = P-224\nPrivate = a40d7e12049c71e6522c7ff2384224061c3a457058b310557655b854\nX = 399801243bfe0c2da9b0a53c8ca57f2eee87aaa94a8e4d5e029f42ca\nY = aa49e6d4b47cee7a5c4ab71d5a67da84e0b9b425ce3e70da68c889e7\nPeerX = 73cc645372ca2e71637cda943d8148f3382ab6dd0f2e1a49da94e134\nPeerY = df5c355c23e6e232ebc3bee2ab1873ee0d83e3382f8e6fe613f6343c\nZ = 4f74ac8507501a32bfc5a78d8271c200e835966e187e8d00011a8c75\n\nCurve = P-224\nPrivate = ad2519bc724d484e02a69f05149bb047714bf0f5986fac2e222cd946\nX = df9c1e0ef15e53b9f626e2be1cbe893639c06f3e0439ee95d7d4b1e3\nY = 7a52a7386adda243efdf8941085c84e31239cab92b8017336748965e\nPeerX = 546578216250354e449e21546dd11cd1c5174236739acad9ce0f4512\nPeerY = d2a22fcd66d1abedc767668327c5cb9c599043276239cf3c8516af24\nZ = ad09c9ae4d2324ea81bb555b200d3c003e22a6870ee03b52df49e4de\n\nCurve = P-224\nPrivate = 3d312a9b9d8ed09140900bbac1e095527ebc9e3c6493bcf3666e3a29\nX = b4a0198dc8810e884425b750928b0c960c31f7a99663400b01a179df\nY = 812b601bfc0738242c6f86f830f27acd632ca618a0b5280c9d5769f7\nPeerX = 1d46b1dc3a28123cb51346e67baec56404868678faf7d0e8b2afa22a\nPeerY = 0ec9e65ec97e218373e7fc115c2274d5b829a60d93f71e01d58136c3\nZ = ef029c28c68064b8abd2965a38c404fb5e944ace57e8638daba9d3cd\n\nCurve = P-224\nPrivate = 8ce0822dc24c153995755ac350737ef506641c7d752b4f9300c612ed\nX = 00dfc7ec137690cd6d12fdb2fd0b8c5314582108769c2b722ffb3958\nY = 5eef3da4ba458127346bb64023868bddb7558a2ecfc813645f4ce9fe\nPeerX = 266d038cc7a4fe21f6c976318e827b82bb5b8f7443a55298136506e0\nPeerY = df123d98a7a20bbdf3943df2e3563422f8c0cf74d53aaabdd7c973ba\nZ = f83c16661dfcbad021cc3b5a5af51d9a18db4653866b3ff90787ce3e\n\nCurve = P-224\nPrivate = 0ff9b485325ab77f29e7bc379fed74bfac859482da0dee7528c19db2\nX = 7e603e6976db83c36011508fa695d1b515249e2e54b48fcbcfb90247\nY = 0179a600ce86adfca9b1b931fa5173d618da09e841803d19b0264286\nPeerX = eb0a09f7a1c236a61f595809ec5670efd92e4598d5e613e092cdfdca\nPeerY = 50787ae2f2f15b88bc10f7b5f0aee1418373f16153aebd1fba54288d\nZ = f51258c63f232e55a66aa25ebd597b2018d1052c02eeb63866758005\n\nCurve = P-224\nPrivate = 19cf5ff6306467f28b9fe0675a43c0582552c8c12e59ce7c38f292b1\nX = fc20e906e609c112cfc2e0fea6303882c5db94e87e022373ab2c082a\nY = aecdf1daa71782bc5a26bbbd8d7e8a76490e26abc17dffc774bd7341\nPeerX = 6b2f6b18a587f562ffc61bd9b0047322286986a78f1fd139b84f7c24\nPeerY = 7096908e4615266be59a53cd655515056ff92370a6271a5d3823d704\nZ = 7fdc969a186ff18429f2a276dac43beea21182d82ce2e5a0876552b1\n\nCurve = P-224\nPrivate = 90a15368e3532c0b1e51e55d139447c2c89bc160719d697291ea7c14\nX = c6837d506e976da7db3ad1267c359dff2ea6fb0b7f7f8e77024c59e9\nY = 67eb491d2fc8a530c46525d2a8b2d7c1df5fba1ae740a4649c683ee6\nPeerX = 328101ba826acd75ff9f34d5574ce0dbc92f709bad8d7a33c47940c1\nPeerY = df39f1ea88488c55d5538160878b9ced18a887ea261dd712d14024ff\nZ = 3d60ab6db2b3ffe2d29ccff46d056e54230cf34982e241556ed2920c\n\nCurve = P-224\nPrivate = 8e0838e05e1721491067e1cabc2e8051b290e2616eec427b7121897d\nX = e9150f770075626019e18f95473b71e6828041791d3f08d3faeeaa2b\nY = 475f70735eaae52308a3b763dc88efe18ab590ebafa035f6e08b001c\nPeerX = 0081e34270871e2ebbd94183f617b4ae15f0416dd634fe6e934cf3c0\nPeerY = 3a1e9f38a7b90b7317d26b9f6311063ab58b268cf489b2e50386d5d6\nZ = 9116d72786f4db5df7a8b43078c6ab9160d423513d35ea5e2559306d\n\nCurve = P-224\nPrivate = 38106e93f16a381adb1d72cee3da66ae462ad4bbfea9ecdf35d0814e\nX = 7be6c4c917829ab657dd79e8637d7aefd2f81f0de7654d957e97658d\nY = 430d22d9e8438310f61e0d43f25fa3e34585f432baad27db3021bf0d\nPeerX = 2623632fdf0bd856805a69aa186d4133ef5904e1f655a972d66cce07\nPeerY = 2cef9728dd06fb8b50150f529b695076d4507983912585c89bd0682e\nZ = 207c53dcefac789aaa0276d9200b3a940ce5f2296f4cb2e81a185d3d\n\nCurve = P-224\nPrivate = e5d1718431cf50f6cbd1bc8019fa16762dfa12c989e5999977fb4ea2\nX = 2ea4966e7f92ed7f5cc61fde792045f63b731d6e7d0de2577f2d8ece\nY = 1c4a7b1ede6f839162292df424be78e8176fb6f942a3c02391700f31\nPeerX = 8ee4d1dcc31dee4bf6fe21ca8a587721d910acfb122c16c2a77a8152\nPeerY = 4ebf323fff04eb477069a0ac68b345f6b1ae134efc31940e513cb99f\nZ = 10e467da34f48ad7072005bccd6da1b2ba3f71eafa1c393842f91d74\n\nCurve = P-224\nPrivate = 3d635691b62a9a927c633951c9369c8862bd2119d30970c2644727d6\nX =", " 438bbb980517afb20be1d674e3ac2b31cef07a9b23fb8f6e38e0d6c0\nY = 0be5f1c47d58d21b6ed28423b32f5a94750da47edcef33ea79942afd\nPeerX = 97dcbe6d28335882a6d193cc54a1063dd0775dc328565300bb99e691\nPeerY = dad11dd5ece8cfd9f97c9a526e4a1506e6355969ee87826fc38bcd24\nZ = 82fd2f9c60c4f999ac00bbe64bfc11da8ff8cda2e499fced65230bb1\n\nCurve = P-224\nPrivate = acf3c85bbdc379f02f5ea36e7f0f53095a9e7046a28685a8659bf798\nX = ff7511215c71d796bd646e8474be4416b91684ce0d269ef6f422013b\nY = b7bf5e79b5a9393bb9ea42c0bdb2d3c2dc806e1a7306aa58e4fdbea5\nPeerX = ce9126dd53972dea1de1d11efef900de34b661859c4648c5c0e534f7\nPeerY = e113b6f2c1659d07f2716e64a83c18bbce344dd2121fe85168eae085\nZ = 530f7e7fc932613b29c981f261cb036cba3f1df3864e0e1cba2685a2\n\nCurve = P-224\nPrivate = cffd62cb00a0e3163fbf2c397fadc9618210f86b4f54a675287305f0\nX = 04bf4d948f4430d18b4ed6c96dbaf981fa11a403ed16887f06754981\nY = 7c1326a9cef51f79d4e78303d6064b459f612584ac2fdf593d7d5d84\nPeerX = 84419967d6cfad41e75a02b6da605a97949a183a97c306c4b46e66a5\nPeerY = 5cc9b259718b1bc8b144fde633a894616ffd59a3a6d5d8e942c7cbb7\nZ = 49f6fd0139248ef4df2db05d1319bd5b1489e249827a45a8a5f12427\n\nCurve = P-224\nPrivate = 85f903e43943d13c68932e710e80de52cbc0b8f1a1418ea4da079299\nX = 970a4a7e01d4188497ceb46955eb1b842d9085819a9b925c84529d3d\nY = dfa2526480f833ea0edbd204e4e365fef3472888fe7d9691c3ebc09f\nPeerX = 7c9cac35768063c2827f60a7f51388f2a8f4b7f8cd736bd6bc337477\nPeerY = 29ee6b849c6025d577dbcc55fbd17018f4edbc2ef105b004d6257bcd\nZ = 8f7e34e597ae8093b98270a74a8dfcdbed457f42f43df487c5487161\n\nCurve = P-224\nPrivate = cce64891a3d0129fee0d4a96cfbe7ac470b85e967529057cfa31a1d9\nX = a6b29632db94da2125dc1cf80e03702687b2acc1122022fa2174765a\nY = 61723edd73e10daed73775278f1958ba56f1fc9d085ebc2b64c84fe5\nPeerX = 085a7642ad8e59b1a3e8726a7547afbecffdac1dab7e57230c6a9df4\nPeerY = f91c36d881fe9b8047a3530713554a1af4c25c5a8e654dcdcf689f2e\nZ = 71954e2261e8510be1a060733671d2e9d0a2d012eb4e09556d697d2a\n\nCurve = P-256\nPrivate = 7d7dc5f71eb29ddaf80d6214632eeae03d9058af1fb6d22ed80badb62bc1a534\nX = ead218590119e8876b29146ff89ca61770c4edbbf97d38ce385ed281d8a6b230\nY = 28af61281fd35e2fa7002523acc85a429cb06ee6648325389f59edfce1405141\nPeerX = 700c48f77f56584c5cc632ca65640db91b6bacce3a4df6b42ce7cc838833d287\nPeerY = db71e509e3fd9b060ddb20ba5c51dcc5948d46fbf640dfe0441782cab85fa4ac\nZ = 46fc62106420ff012e54a434fbdd2d25ccc5852060561e68040dd7778997bd7b\n\nCurve = P-256\nPrivate = 38f65d6dce47676044d58ce5139582d568f64bb16098d179dbab07741dd5caf5\nX = 119f2f047902782ab0c9e27a54aff5eb9b964829ca99c06b02ddba95b0a3f6d0\nY = 8f52b726664cac366fc98ac7a012b2682cbd962e5acb544671d41b9445704d1d\nPeerX = 809f04289c64348c01515eb03d5ce7ac1a8cb9498f5caa50197e58d43a86a7ae\nPeerY = b29d84e811197f25eba8f5194092cb6ff440e26d4421011372461f579271cda3\nZ = 057d636096cb80b67a8c038c890e887d1adfa4195e9b3ce241c8a778c59cda67\n\nCurve = P-256\nPrivate = 1accfaf1b97712b85a6f54b148985a1bdc4c9bec0bd258cad4b3d603f49f32c8\nX = d9f2b79c172845bfdb560bbb01447ca5ecc0470a09513b6126902c6b4f8d1051\nY = f815ef5ec32128d3487834764678702e64e164ff7315185e23aff5facd96d7bc\nPeerX = a2339c12d4a03c33546de533268b4ad667debf458b464d77443636440ee7fec3\nPeerY = ef48a3ab26e20220bcda2c1851076839dae88eae962869a497bf73cb66faf536\nZ = 2d457b78b4614132477618a5b077965ec90730a8c81a1c75d6d4ec68005d67ec\n\nCurve = P-256\nPrivate = 207c43a79bfee03db6f4b944f53d2fb76cc49ef1c9c4d34d51b6c65c4db6932d\nX = 24277c33f450462dcb3d4801d57b9ced05188f16c28eda873258048cd1607e0d\nY = c4789753e2b1f63b32ff014ec42cd6a69fac81dfe6d0d6fd4af372ae27c46f88\nPeerX = df3989b9fa55495719b3cf46dccd28b5153f7808191dd518eff0c3cff2b705ed\nPeerY = 422294ff46003429d739a33206c8752552c8ba54a270defc06e221e0feaf6ac4\nZ = 96441259534b80f6aee3d287a6bb17b5094dd4277d9e294f8fe73e48bf2a0024\n\nCurve = P-256\nPrivate = 59137e38152350b195c9718d39673d519838055ad908dd4757152fd8255c09bf\nX = a8c5fdce8b62c5ada598f141adb3b26cf254c280b2857a63d2ad783a73115f6b\nY = 806e1aafec4af80a0d786b3de45375b517a7e5b51ffb2c356537c9e6ef227d4a\nPeerX = 41192d2813e79561e6a1d6f53c8bc1a433a199c835e141b05a74a97b0faeb922\nPeerY = 1af98cc45e98a7e041b01cf35f462b7562281351c8ebf3ffa02e33a0722a1328\nZ = 19d44c8d63e8e8dd12c22a87b8cd4ece27acdde04dbf47f7f27537a6999a8e62\n\nCurve = P-256\nPrivate = f5f8e0174610a661277979b58ce5c90fee6c9b3bb346a90a7196255e40b132ef\nX = 7b861dcd2844a5a8363f6b8ef8d493640f55879217189d80326aad9480dfc149\nY = c4675b45eeb306405f6c33c38bc69eb2bdec9b75ad5af4706aab84543b9cc63a\nPeerX = 33e82092a0f1fb38f5649d5867fba28b503172b7035574bf8e5b7100a3052792\nPeerY = f2cf6b601e0a05945e335550bf648d782f46186c772c0f20d3cd0d6b8ca14b2f\nZ = 664e45d5bba4ac931cd65d52017e4be9b19a515f669bea4703542a2c525cd3d3\n\nCurve = P-256\nPrivate = 3b589af7db03459c23068b64f63f28d3c3c6bc25b5bf76ac05f35482888b5190\nX = 9fb38e2d58ea1baf7622e96720101cae3cde4ba6c1e9fa26d9b1de0899102863\nY = d5561b900406edf50802dd7d73e89395f8aed72fba0e1d1b61fe1d22302260f0\nPeerX = 6a9e0c3f916e4e315c91147be571686d90464e8bf981d34a90b6353bca6eeba7\nPeerY = 40f9bead39c2f2bcc2602f75b8a73ec7bdffcbcead159d0174c6c4d3c5357f05\nZ = ca342daa50dc09d61be7c196c85e60a80c5cb04931746820be548cdde055679d\n\nCurve = P-256\nPrivate = d8bf929a20ea7436b2461b541a11c80e61d826c0a4c9d322b31dd54e7f58b9c8\nX = 20f07631e4a6512a89ad487c4e9d63039e579cb0d7a556cb9e661cd59c1e7fa4\nY = 6de91846b3eee8a5ec09c2ab1f41e21bd83620ccdd1bdce3ab7ea6e02dd274f5\nPeerX = a9c0acade55c2a73ead1a86fb0a9713223c82475791cd0e210b046412ce224bb\nPeerY = f6de0afa20e93e078467c053d241903edad734c6b403ba758c2b5ff04c9d4229\nZ = 35aa9b52536a461bfde4e85fc756be928c7de97923f0416c7a3ac8f88b3d4489\n\nCurve = P-256\nPrivate = 0f9883ba0ef32ee75ded0d8bda39a5146a29f1f2507b3bd458dbea0b2bb05b4d\nX = abb61b423be5d6c26e21c605832c9142dc1dfe5a5fff28726737936e6fbf516d\nY = 733d2513ef58beab202090586fac91bf0fee31e80ab33473ab23a2d89e58fad6\nPeerX = 94e94f16a98255fff2b9ac0c9598aac35487b3232d3231bd93b7db7df36f9eb9\nPeerY = d8049a43579cfa90b8093a94416cbefbf93386f15b3f6e190b6e3455fedfe69a\nZ = 605c16178a9bc875dcbff54d63fe00df699c03e8a888e9e94dfbab90b25f39b4\n\nCurve = P-256\nPrivate = 2beedb04b05c6988f6a67500bb813faf2cae0d580c9253b6339e4a3337bb6c08\nX = 3d63e429cb5fa895a9247129bf4e48e89f35d7b11de8158efeb3e106a2a87395\nY = 0cae9e477ef41e7c8c1064379bb7b554ddcbcae79f9814281f1e50f0403c61f3\nPeerX = e099bf2a4d557460b5544430bbf6da11004d127cb5d67f64ab07c94fcdf5274f\nPeerY = d9c50dbe70d714edb5e221f4e020610eeb6270517e688ca64fb0e98c7ef8c1c5\nZ = f96e40a1b72840854bb62bc13c40cc2795e373d4e715980b261476835a092e0b\n\nCurve = P-256\nPrivate = 77c15dcf44610e41696bab758943eff1409333e4d5a11bbe72c8f6c395e9f848\nX = ad5d13c3db508ddcd38457e5991434a251bed49cf5ddcb59cdee73865f138c9f\nY = 62cec1e70588aa4fdfc7b9a09daa678081c04e1208b9d662b8a2214bf8e81a21\nPeerX = f75a5fe56bda34f3c1396296626ef012dc07e4825838778a645c8248cff01658\nPeerY = 33bbdf1b1772d8059df568b061f3f1122f28a8d819167c97be448e3dc3fb0c3c\nZ = 8388fa79c4babdca02a8e8a34f9e43554976e420a4ad273c81b26e4228e9d3a3\n\nCurve = P-256\nPrivate = 42a83b985011d12303db1a800f2610f74aa71cdf19c67d54ce6c9ed951e9093e\nX = ab48caa61ea35f13f8ed07ffa6a13e8db224dfecfae1a7df8b1bb6ebaf0cb97d\nY = 1274530ca2c385a3218bddfbcbf0b4024c9badd5243bff834ebff24a8618dccb\nPeerX = 2db4540d50230756158abf61d9835712b6486c74312183ccefcaef2797b7674d\nPeerY = 62f57f314e3f3495dc4e099012f5e0ba71770f9660a1eada54104cdfde77243e\nZ = 72877cea33ccc4715038d4bcbdfe0e43f42a9e2c0c3b017fc2370f4b9acbda4a\n\nCurve = P-256\nPrivate = ceed35507b5c93ead5989119b9ba342cfe38e6e638ba6eea343a55475de2800b\nX = 9a8cd9bd72e71752df91440f77c547509a84df98114e7de4f26cdb39234a625d\nY = d07cfc84c8e144fab2839f5189bb1d7c88631d579bbc58012ed9a2327da52f62\nPeerX = cd94fc9497e8990750309e9a8534fd114b0a6e54da89c4796101897041d14ecb\nPeerY = c3def4b5fe04faee0a11932229fff563637bfdee0e79c6deeaf449f85401c5c4\nZ = e4e7408d85ff0e0e9c838003f28cdbd5247cdce31f32f62494b70e5f1bc36307\n\nCurve = P-256\nPrivate = 43e0e9d95af4dc36483cdd1968d2b7eeb8611fcce77f3a4e7d059ae43e509604\nX = f989cf8ee956a82e7ebd9881cdbfb2fd946189b08db53559bc8cfdd48071eb14\nY = 5eff28f1a18a616b04b7d337868679f6dd84f9a7b3d7b6f8af276c19611a541d\nPeerX = 15b9e467af4d290c417402e040426fe4cf236bae72baa392ed89780dfccdb471\nPeerY = cdf4e9170fb904302b8fd93a820ba8cc7ed4efd3a6f2d6b05b80b2ff2aee4e77\nZ = ed56bcf695b734142c24ecb1fc1bb64d08f175eb243a31f37b3d9bb4407f3b96\n\nCurve = P-256\nPrivate = b2f3600df3368ef8a0bb85ab22f41fc0e5f4fdd54be8167a5c3cd4b08db04903\nX = 69c627", "625b36a429c398b45c38677cb35d8beb1cf78a571e40e99fe4eac1cd4e\nY = 81690112b0a88f20f7136b28d7d47e5fbc2ada3c8edd87589bc19ec9590637bd\nPeerX = 49c503ba6c4fa605182e186b5e81113f075bc11dcfd51c932fb21e951eee2fa1\nPeerY = 8af706ff0922d87b3f0c5e4e31d8b259aeb260a9269643ed520a13bb25da5924\nZ = bc5c7055089fc9d6c89f83c1ea1ada879d9934b2ea28fcf4e4a7e984b28ad2cf\n\nCurve = P-256\nPrivate = 4002534307f8b62a9bf67ff641ddc60fef593b17c3341239e95bdb3e579bfdc8\nX = 5fe964671315a18aa68a2a6e3dd1fde7e23b8ce7181471cfac43c99e1ae80262\nY = d5827be282e62c84de531b963884ba832db5d6b2c3a256f0e604fe7e6b8a7f72\nPeerX = 19b38de39fdd2f70f7091631a4f75d1993740ba9429162c2a45312401636b29c\nPeerY = 09aed7232b28e060941741b6828bcdfa2bc49cc844f3773611504f82a390a5ae\nZ = 9a4e8e657f6b0e097f47954a63c75d74fcba71a30d83651e3e5a91aa7ccd8343\n\nCurve = P-256\nPrivate = 4dfa12defc60319021b681b3ff84a10a511958c850939ed45635934ba4979147\nX = c9b2b8496f1440bd4a2d1e52752fd372835b364885e154a7dac49295f281ec7c\nY = fbe6b926a8a4de26ccc83b802b1212400754be25d9f3eeaf008b09870ae76321\nPeerX = 2c91c61f33adfe9311c942fdbff6ba47020feff416b7bb63cec13faf9b099954\nPeerY = 6cab31b06419e5221fca014fb84ec870622a1b12bab5ae43682aa7ea73ea08d0\nZ = 3ca1fc7ad858fb1a6aba232542f3e2a749ffc7203a2374a3f3d3267f1fc97b78\n\nCurve = P-256\nPrivate = 1331f6d874a4ed3bc4a2c6e9c74331d3039796314beee3b7152fcdba5556304e\nX = 59e1e101521046ad9cf1d082e9d2ec7dd22530cce064991f1e55c5bcf5fcb591\nY = 482f4f673176c8fdaa0bb6e59b15a3e47454e3a04297d3863c9338d98add1f37\nPeerX = a28a2edf58025668f724aaf83a50956b7ac1cfbbff79b08c3bf87dfd2828d767\nPeerY = dfa7bfffd4c766b86abeaf5c99b6e50cb9ccc9d9d00b7ffc7804b0491b67bc03\nZ = 1aaabe7ee6e4a6fa732291202433a237df1b49bc53866bfbe00db96a0f58224f\n\nCurve = P-256\nPrivate = dd5e9f70ae740073ca0204df60763fb6036c45709bf4a7bb4e671412fad65da3\nX = 30b9db2e2e977bcdc98cb87dd736cbd8e78552121925cf16e1933657c2fb2314\nY = 6a45028800b81291bce5c2e1fed7ded650620ebbe6050c6f3a7f0dfb4673ab5c\nPeerX = a2ef857a081f9d6eb206a81c4cf78a802bdf598ae380c8886ecd85fdc1ed7644\nPeerY = 563c4c20419f07bc17d0539fade1855e34839515b892c0f5d26561f97fa04d1a\nZ = 430e6a4fba4449d700d2733e557f66a3bf3d50517c1271b1ddae1161b7ac798c\n\nCurve = P-256\nPrivate = 5ae026cfc060d55600717e55b8a12e116d1d0df34af831979057607c2d9c2f76\nX = 46c9ebd1a4a3c8c0b6d572b5dcfba12467603208a9cb5d2acfbb733c40cf6391\nY = 46c913a27d044185d38b467ace011e04d4d9bbbb8cb9ae25fa92aaf15a595e86\nPeerX = ccd8a2d86bc92f2e01bce4d6922cf7fe1626aed044685e95e2eebd464505f01f\nPeerY = e9ddd583a9635a667777d5b8a8f31b0f79eba12c75023410b54b8567dddc0f38\nZ = 1ce9e6740529499f98d1f1d71329147a33df1d05e4765b539b11cf615d6974d3\n\nCurve = P-256\nPrivate = b601ac425d5dbf9e1735c5e2d5bdb79ca98b3d5be4a2cfd6f2273f150e064d9d\nX = 7c9e950841d26c8dde8994398b8f5d475a022bc63de7773fcf8d552e01f1ba0a\nY = cc42b9885c9b3bee0f8d8c57d3a8f6355016c019c4062fa22cff2f209b5cc2e1\nPeerX = c188ffc8947f7301fb7b53e36746097c2134bf9cc981ba74b4e9c4361f595e4e\nPeerY = bf7d2f2056e72421ef393f0c0f2b0e00130e3cac4abbcc00286168e85ec55051\nZ = 4690e3743c07d643f1bc183636ab2a9cb936a60a802113c49bb1b3f2d0661660\n\nCurve = P-256\nPrivate = fefb1dda1845312b5fce6b81b2be205af2f3a274f5a212f66c0d9fc33d7ae535\nX = 38b54db85500cb20c61056edd3d88b6a9dc26780a047f213a6e1b900f76596eb\nY = 6387e4e5781571e4eb8ae62991a33b5dc33301c5bc7e125d53794a39160d8fd0\nPeerX = 317e1020ff53fccef18bf47bb7f2dd7707fb7b7a7578e04f35b3beed222a0eb6\nPeerY = 09420ce5a19d77c6fe1ee587e6a49fbaf8f280e8df033d75403302e5a27db2ae\nZ = 30c2261bd0004e61feda2c16aa5e21ffa8d7e7f7dbf6ec379a43b48e4b36aeb0\n\nCurve = P-256\nPrivate = 334ae0c4693d23935a7e8e043ebbde21e168a7cba3fa507c9be41d7681e049ce\nX = 3f2bf1589abf3047bf3e54ac9a95379bff95f8f55405f64eca36a7eebe8ffca7\nY = 5212a94e66c5ae9a8991872f66a72723d80ec5b2e925745c456f5371943b3a06\nPeerX = 45fb02b2ceb9d7c79d9c2fa93e9c7967c2fa4df5789f9640b24264b1e524fcb1\nPeerY = 5c6e8ecf1f7d3023893b7b1ca1e4d178972ee2a230757ddc564ffe37f5c5a321\nZ = 2adae4a138a239dcd93c243a3803c3e4cf96e37fe14e6a9b717be9599959b11c\n\nCurve = P-256\nPrivate = 2c4bde40214fcc3bfc47d4cf434b629acbe9157f8fd0282540331de7942cf09d\nX = 29c0807f10cbc42fb45c9989da50681eead716daa7b9e91fd32e062f5eb92ca0\nY = ff1d6d1955d7376b2da24fe1163a271659136341bc2eb1195fc706dc62e7f34d\nPeerX = a19ef7bff98ada781842fbfc51a47aff39b5935a1c7d9625c8d323d511c92de6\nPeerY = e9c184df75c955e02e02e400ffe45f78f339e1afe6d056fb3245f4700ce606ef\nZ = 2e277ec30f5ea07d6ce513149b9479b96e07f4b6913b1b5c11305c1444a1bc0b\n\nCurve = P-256\nPrivate = 85a268f9d7772f990c36b42b0a331adc92b5941de0b862d5d89a347cbf8faab0\nX = 9cf4b98581ca1779453cc816ff28b4100af56cf1bf2e5bc312d83b6b1b21d333\nY = 7a5504fcac5231a0d12d658218284868229c844a04a3450d6c7381abe080bf3b\nPeerX = 356c5a444c049a52fee0adeb7e5d82ae5aa83030bfff31bbf8ce2096cf161c4b\nPeerY = 57d128de8b2a57a094d1a001e572173f96e8866ae352bf29cddaf92fc85b2f92\nZ = 1e51373bd2c6044c129c436e742a55be2a668a85ae08441b6756445df5493857\n\nCurve = P-384\nPrivate = 3cc3122a68f0d95027ad38c067916ba0eb8c38894d22e1b15618b6818a661774ad463b205da88cf699ab4d43c9cf98a1\nX = 9803807f2f6d2fd966cdd0290bd410c0190352fbec7ff6247de1302df86f25d34fe4a97bef60cff548355c015dbb3e5f\nY = ba26ca69ec2f5b5d9dad20cc9da711383a9dbe34ea3fa5a2af75b46502629ad54dd8b7d73a8abb06a3a3be47d650cc99\nPeerX = a7c76b970c3b5fe8b05d2838ae04ab47697b9eaf52e764592efda27fe7513272734466b400091adbf2d68c58e0c50066\nPeerY = ac68f19f2e1cb879aed43a9969b91a0839c4c38a49749b661efedf243451915ed0905a32b060992b468c64766fc8437a\nZ = 5f9d29dc5e31a163060356213669c8ce132e22f57c9a04f40ba7fcead493b457e5621e766c40a2e3d4d6a04b25e533f1\n\nCurve = P-384\nPrivate = 92860c21bde06165f8e900c687f8ef0a05d14f290b3f07d8b3a8cc6404366e5d5119cd6d03fb12dc58e89f13df9cd783\nX = ea4018f5a307c379180bf6a62fd2ceceebeeb7d4df063a66fb838aa35243419791f7e2c9d4803c9319aa0eb03c416b66\nY = 68835a91484f05ef028284df6436fb88ffebabcdd69ab0133e6735a1bcfb37203d10d340a8328a7b68770ca75878a1a6\nPeerX = 30f43fcf2b6b00de53f624f1543090681839717d53c7c955d1d69efaf0349b7363acb447240101cbb3af6641ce4b88e0\nPeerY = 25e46c0c54f0162a77efcc27b6ea792002ae2ba82714299c860857a68153ab62e525ec0530d81b5aa15897981e858757\nZ = a23742a2c267d7425fda94b93f93bbcc24791ac51cd8fd501a238d40812f4cbfc59aac9520d758cf789c76300c69d2ff\n\nCurve = P-384\nPrivate = 12cf6a223a72352543830f3f18530d5cb37f26880a0b294482c8a8ef8afad09aa78b7dc2f2789a78c66af5d1cc553853\nX = fcfcea085e8cf74d0dced1620ba8423694f903a219bbf901b0b59d6ac81baad316a242ba32bde85cb248119b852fab66\nY = 972e3c68c7ab402c5836f2a16ed451a33120a7750a6039f3ff15388ee622b7065f7122bf6d51aefbc29b37b03404581b\nPeerX = 1aefbfa2c6c8c855a1a216774550b79a24cda37607bb1f7cc906650ee4b3816d68f6a9c75da6e4242cebfb6652f65180\nPeerY = 419d28b723ebadb7658fcebb9ad9b7adea674f1da3dc6b6397b55da0f61a3eddacb4acdb14441cb214b04a0844c02fa3\nZ = 3d2e640f350805eed1ff43b40a72b2abed0a518bcebe8f2d15b111b6773223da3c3489121db173d414b5bd5ad7153435\n\nCurve = P-384\nPrivate = 8dd48063a3a058c334b5cc7a4ce07d02e5ee6d8f1f3c51a1600962cbab462690ae3cd974fb39e40b0e843daa0fd32de1\nX = e38c9846248123c3421861ea4d32669a7b5c3c08376ad28104399494c84ff5efa3894adb2c6cbe8c3c913ef2eec5bd3c\nY = 9fa84024a1028796df84021f7b6c9d02f0f4bd1a612a03cbf75a0beea43fef8ae84b48c60172aadf09c1ad016d0bf3ce\nPeerX = 8bc089326ec55b9cf59b34f0eb754d93596ca290fcb3444c83d4de3a5607037ec397683f8cef07eab2fe357eae36c449\nPeerY = d9d16ce8ac85b3f1e94568521aae534e67139e310ec72693526aa2e927b5b322c95a1a033c229cb6770c957cd3148dd7\nZ = 6a42cfc392aba0bfd3d17b7ccf062b91fc09bbf3417612d02a90bdde62ae40c54bb2e56e167d6b70db670097eb8db854\n\nCurve = P-384\nPrivate = 84ece6cc3429309bd5b23e959793ed2b111ec5cb43b6c18085fcaea9efa0685d98a6262ee0d330ee250bc8a67d0e733f\nX = 3222063a2997b302ee60ee1961108ff4c7acf1c0ef1d5fb0d164b84bce71c431705cb9aea9a45f5d73806655a058bee3\nY = e61fa9e7fbe7cd43abf99596a3d3a039e99fa9dc93b0bdd9cad81966d17eeaf557068afa7c78466bb5b22032d1100fa6\nPeerX = eb952e2d9ac0c20c6cc48fb225c2ad154f53c8750b003fd3b4ed8ed1dc0defac61bcdde02a2bcfee7067d75d342ed2b0\nPeerY = f1828205baece82d1b267d0d7ff2f9c9e15b69a72df47058a97f3891005d1fb38858f5603de840e591dfa4f6e7d489e1\nZ = ce7ba454d4412729a32bb833a2d1fd2ae612d4667c3a900e069214818613447df8c611de66da200db7c375cf913e4405\n\nCurve = P-384\nPrivate = 68fce2121dc3a1e37b10f1dde309f9e2e18fac47cd1770951451c3484cdb77cb136d00e731260597cc2859601c01a25b\nX = 868be0e694841830e424d913d8e7d86b84ee1021d82b0ecf523f09fe89a76c0c95c49f2dfbcf829c1e39709d55efbb3b\nY = 9195eb183675b40fd", @@ -2431,9 +2437,9 @@ "fd3e0faceb636b34ed17e044a9f249dae8fc132e937e2d9349cd2ed77bb1049ceb692a2ec5b17ad61502a64c\nY = 001ec91d3058573fa6c0564a02a1a010160c313bc7c73510dc983e5461682b5be00dbce7e2c682ad73f29ca822cdc111f68fabe33a7b384a648342c3cdb9f050bcdb\nPeerX = 017200b3f16a68cbaed2bf78ba8cddfb6cffac262bba00fbc25f9dc72a07ce59372904899f364c44cb264c097b647d4412bee3e519892d534d9129f8a28f7500fee7\nPeerY = 00baba8d672a4f4a3b63de48b96f56e18df5d68f7d70d5109833f43770d6732e06b39ad60d93e5b43db8789f1ec0aba47286a39ea584235acea757dbf13d53b58364\nZ = 0101e462e9d9159968f6440e956f11dcf2227ae4aea81667122b6af9239a291eb5d6cf5a4087f358525fcacfa46bb2db01a75af1ba519b2d31da33eda87a9d565748\n\nCurve = P-521\nPrivate = 005bacfff268acf6553c3c583b464ea36a1d35e2b257a5d49eb3419d5a095087c2fb4d15cf5bf5af816d0f3ff7586490ccd3ddc1a98b39ce63749c6288ce0dbdac7d\nX = 0036e488da7581472a9d8e628c58d6ad727311b7e6a3f6ae33a8544f34b09280249020be7196916fafd90e2ec54b66b5468d2361b99b56fa00d7ac37abb8c6f16653\nY = 011edb9fb8adb6a43f4f5f5fdc1421c9fe04fc8ba46c9b66334e3af927c8befb4307104f299acec4e30f812d9345c9720d19869dbfffd4ca3e7d2713eb5fc3f42615\nPeerX = 004efd5dbd2f979e3831ce98f82355d6ca14a5757842875882990ab85ab9b7352dd6b9b2f4ea9a1e95c3880d65d1f3602f9ca653dc346fac858658d75626f4d4fb08\nPeerY = 0061cf15dbdaa7f31589c98400373da284506d70c89f074ed262a9e28140796b7236c2eef99016085e71552ff488c72b7339fefb7915c38459cb20ab85aec4e45052\nZ = 0141d6a4b719ab67eaf04a92c0a41e2dda78f4354fb90bdc35202cc7699b9b04d49616f82255debf7bbec045ae58f982a66905fcfae69d689785e38c868eb4a27e7b\n\nCurve = P-521\nPrivate = 008e2c93c5423876223a637cad367c8589da69a2d0fc68612f31923ae50219df2452e7cc92615b67f17b57ffd2f52b19154bb40d7715336420fde2e89fee244f59dc\nX = 00fa3b35118d6c422570f724a26f90b2833b19239174cea081c53133f64db60d6940ea1261299c04c1f4587cdb0c4c39616479c1bb0c146799a118032dcf98f899c0\nY = 0069f040229006151fa32b51f679c8816f7c17506b403809dc77cd58a2aec430d94d13b6c916de99f355aa45fcfbc6853d686c71be496a067d24bfaea4818fc51f75\nPeerX = 0129891de0cf3cf82e8c2cf1bf90bb296fe00ab08ca45bb7892e0e227a504fdd05d2381a4448b68adff9c4153c87eacb78330d8bd52515f9f9a0b58e85f446bb4e10\nPeerY = 009edd679696d3d1d0ef327f200383253f6413683d9e4fcc87bb35f112c2f110098d15e5701d7ceee416291ff5fed85e687f727388b9afe26a4f6feed560b218e6bb\nZ = 00345e26e0abb1aac12b75f3a9cf41efe1c336396dffa4a067a4c2cfeb878c68b2b045faa4e5b4e6fa4678f5b603c351903b14bf9a6a70c439257199a640890b61d1\n\nCurve = P-521\nPrivate = 0004d49d39d40d8111bf16d28c5936554326b197353eebbcf47545393bc8d3aaf98f14f5be7074bfb38e6cc97b989754074daddb3045f4e4ce745669fdb3ec0d5fa8\nX = 012ec226d050ce07c79b3df4d0f0891f9f7adf462e8c98dbc1a2a14f5e53a3f5ad894433587cc429a8be9ea1d84fa33b1803690dae04da7218d30026157fc995cf52\nY = 004837dfbf3426f57b5c793269130abb9a38f618532211931154db4eeb9aede88e57290f842ea0f2ea9a5f74c6203a3920fe4e305f6118f676b154e1d75b9cb5eb88\nPeerX = 01a3c20240e59f5b7a3e17c275d2314ba1741210ad58b71036f8c83cc1f6b0f409dfdd9113e94b67ec39c3291426c23ffcc447054670d2908ff8fe67dc2306034c5c\nPeerY = 01d2825bfd3af8b1e13205780c137fe938f84fde40188e61ea02cead81badfdb425c29f7d7fb0324debadc10bbb93de68f62c35069268283f5265865db57a79f7bf7\nZ = 006fe9de6fb8e672e7fd150fdc5e617fabb0d43906354ccfd224757c7276f7a1010091b17ed072074f8d10a5ec971eb35a5cb7076603b7bc38d432cbc059f80f9488\n\nCurve = P-521\nPrivate = 011a5d1cc79cd2bf73ea106f0e60a5ace220813b53e27b739864334a07c03367efda7a4619fa6eef3a9746492283b3c445610a023a9cc49bf4591140384fca5c8bb5\nX = 00eb07c7332eedb7d3036059d35f7d2288d4377d5f42337ad3964079fb120ccd4c8bd384b585621055217023acd9a94fcb3b965bfb394675e788ade41a1de73e620c\nY = 00491a835de2e6e7deb7e090f4a11f2c460c0b1f3d5e94ee8d751014dc720784fd3b54500c86ebaef18429f09e8e876d5d1538968a030d7715dde99f0d8f06e29d59\nPeerX = 007e2d138f2832e345ae8ff65957e40e5ec7163f016bdf6d24a2243daa631d878a4a16783990c722382130f9e51f0c1bd6ff5ac96780e48b68f5dec95f42e6144bb5\nPeerY = 00b0de5c896791f52886b0f09913e26e78dd0b69798fc4df6d95e3ca708ecbcbcce1c1895f5561bbabaae372e9e67e6e1a3be60e19b470cdf673ec1fc393d3426e20\nZ = 01e4e759ecedce1013baf73e6fcc0b92451d03bdd50489b78871c333114990c9ba6a9b2fc7b1a2d9a1794c1b60d9279af6f146f0bbfb0683140403bfa4ccdb524a29\n\nCurve = P-521\nPrivate = 010c908caf1be74c616b625fc8c1f514446a6aec83b5937141d6afbb0a8c7666a7746fa1f7a6664a2123e8cdf6cd8bf836c56d3c0ebdcc980e43a186f938f3a78ae7\nX = 0031890f4c7abec3f723362285d77d2636f876817db3bbc88b01e773597b969ff6f013ea470c854ab4a7739004eb8cbea69b82ddf36acadd406871798ecb2ac3aa7f\nY = 00d8b429ae3250266b9643c0c765a60dc10155bc2531cf8627296f4978b6640a9e600e19d0037d58503fa80799546a814d7478a550aa90e5ebeb052527faaeae5d08\nPeerX = 00118c36022209b1af8ebad1a12b566fc48744576e1199fe80de1cdf851cdf03e5b9091a8f7e079e83b7f827259b691d0c22ee29d6bdf73ec7bbfd746f2cd97a357d\nPeerY = 00da5ff4904548a342e2e7ba6a1f4ee5f840411a96cf63e6fe622f22c13e614e0a847c11a1ab3f1d12cc850c32e095614ca8f7e2721477b486e9ff40372977c3f65c\nZ = 0163c9191d651039a5fe985a0eea1eba018a40ab1937fcd2b61220820ee8f2302e9799f6edfc3f5174f369d672d377ea8954a8d0c8b851e81a56fda95212a6578f0e\n\nCurve = P-521\nPrivate = 01b37d6b7288de671360425d3e5ac1ccb21815079d8d73431e9b74a6f0e7ae004a357575b11ad66642ce8b775593eba9d98bf25c75ef0b4d3a2098bbc641f59a2b77\nX = 00189a5ee34de7e35aefeaeef9220c18071b4c29a4c3bd9d954458bd3e82a7a34da34cff5579b8101c065b1f2f527cf4581501e28ef5671873e65267733d003520af\nY = 01eb4bc50a7b4d4599d7e3fa773ddb9eb252c9b3422872e544bdf75c7bf60f5166ddc11eb08fa7c30822dabaee373ab468eb2d922e484e2a527fff2ebb804b7d9a37\nPeerX = 01780edff1ca1c03cfbe593edc6c049bcb2860294a92c355489d9afb2e702075ade1c953895a456230a0cde905de4a3f38573dbfcccd67ad6e7e93f0b5581e926a5d\nPeerY = 00a5481962c9162962e7f0ebdec936935d0eaa813e8226d40d7f6119bfd940602380c86721e61db1830f51e139f210000bcec0d8edd39e54d73a9a129f95cd5fa979\nZ = 015d613e267a36342e0d125cdad643d80d97ed0600afb9e6b9545c9e64a98cc6da7c5aaa3a8da0bdd9dd3b97e9788218a80abafc106ef065c8f1c4e1119ef58d298b\n\nCurve = P-521\nPrivate = 00f2661ac762f60c5fff23be5d969ccd4ec6f98e4e72618d12bdcdb9b4102162333788c0bae59f91cdfc172c7a1681ee44d96ab2135a6e5f3415ebbcd55165b1afb0\nX = 00a8e25a6902d687b4787cdc94c364ac7cecc5c495483ed363dc0aa95ee2bd739c4c4d46b17006c728b076350d7d7e54c6822f52f47162a25109aaaba690cab696ec\nY = 0168d2f08fe19e4dc9ee7a195b03c9f7fe6676f9f520b6270557504e72ca4394a2c6918625e15ac0c51b8f95cd560123653fb8e8ee6db961e2c4c62cc54e92e2a2a9\nPeerX = 016dacffa183e5303083a334f765de724ec5ec9402026d4797884a9828a0d321a8cfac74ab737fe20a7d6befcfc73b6a35c1c7b01d373e31abc192d48a4241a35803\nPeerY = 011e5327cac22d305e7156e559176e19bee7e4f2f59e86f1a9d0b6603b6a7df1069bde6387feb71587b8ffce5b266e1bae86de29378a34e5c74b6724c4d40a719923\nZ = 014d6082a3b5ced1ab8ca265a8106f302146c4acb8c30bb14a4c991e3c82a9731288bdb91e0e85bda313912d06384fc44f2153fb13506fa9cf43c9aab5750988c943\n\nCurve = P-521\nPrivate = 00f430ca1261f09681a9282e9e970a9234227b1d5e58d558c3cc6eff44d1bdf53de16ad5ee2b18b92d62fc79586116b0efc15f79340fb7eaf5ce6c44341dcf8dde27\nX = 006c1d9b5eca87de1fb871a0a32f807c725adccde9b3967453a71347d608f0c030cd09e338cdecbf4a02015bc8a6e8d3e2595fe773ffc2fc4e4a55d0b1a2cc00323b\nY = 01141b2109e7f4981c952aa818a2b9f6f5c41feccdb7a7a45b9b4b672937771b008cae5f934dfe3fed10d383ab1f38769c92ce88d9be5414817ecb073a31ab368ccb\nPeerX = 00a091421d3703e3b341e9f1e7d58f8cf7bdbd1798d001967b801d1cec27e605c580b2387c1cb464f55ce7ac80334102ab03cfb86d88af76c9f4129c01bedd3bbfc4\nPeerY = 008c9c577a8e6fc446815e9d40baa66025f15dae285f19eb668ee60ae9c98e7ecdbf2b2a68e22928059f67db188007161d3ecf397e0883f0c4eb7eaf7827a62205cc\nZ = 0020c00747cb8d492fd497e0fec54644bf027d418ab686381f109712a99cabe328b9743d2225836f9ad66e5d7fed1de247e0da92f60d5b31f9e47672e57f710598f4\n\nCurve = P-521\nPrivate = 005dc33aeda03c2eb233014ee468dff753b72f73b00991043ea353828ae69d4cd0fadeda7bb278b535d7c57406ff2e6e473a5a4ff98e90f90d6dadd25100e8d85666\nX = 00c825ba307373cec8dd2498eef82e21fd9862168dbfeb83593980ca9f82875333899fe94f137daf1c4189eb502937c3a367ea7951ed8b0f3377fcdf2922021d46a5\nY = 016b8a2540d5e65493888bc337249e67c0a68774f3e8d81e3b4574a0125165f0bd58b8af9de74b35832539f95c3cd9f1b759408560aa6851ae3ac7555347b0d3b13b\nPeerX = 004f38816681771289ce0cb83a5e29a1ab06fc91f786994b23708ff08a08a0f675b809ae99e9f9967eb1a49f196057d69e50d6dedb4dd2d9a81c02bdcc8f7f518460\nPeerY = 009efb244c8b91087de1eed766500f0e81530752d469256ef79f6b965d8a2232a0c2dbc4e8e1d09214bab38485be6e357c4200d073b52f04e4a16fc6f5247187aecb\nZ = 00c2bfafcd7fbd3e2fd1c", "750fdea61e70bd4787a7e68468c574ee99ebc47eedef064e8944a73bcb7913dbab5d93dca660d216c553622362794f7a2acc71022bdb16f\n\nCurve = P-521\nPrivate = 00df14b1f1432a7b0fb053965fd8643afee26b2451ecb6a8a53a655d5fbe16e4c64ce8647225eb11e7fdcb23627471dffc5c2523bd2ae89957cba3a57a23933e5a78\nX = 004e8583bbbb2ecd93f0714c332dff5ab3bc6396e62f3c560229664329baa5138c3bb1c36428abd4e23d17fcb7a2cfcc224b2e734c8941f6f121722d7b6b94154576\nY = 01cf0874f204b0363f020864672fadbf87c8811eb147758b254b74b14fae742159f0f671a018212bbf25b8519e126d4cad778cfff50d288fd39ceb0cac635b175ec0\nPeerX = 01a32099b02c0bd85371f60b0dd20890e6c7af048c8179890fda308b359dbbc2b7a832bb8c6526c4af99a7ea3f0b3cb96ae1eb7684132795c478ad6f962e4a6f446d\nPeerY = 017627357b39e9d7632a1370b3e93c1afb5c851b910eb4ead0c9d387df67cde85003e0e427552f1cd09059aad0262e235cce5fba8cedc4fdc1463da76dcd4b6d1a46\nZ = 01aaf24e5d47e4080c18c55ea35581cd8da30f1a079565045d2008d51b12d0abb4411cda7a0785b15d149ed301a3697062f42da237aa7f07e0af3fd00eb1800d9c41\n", }; -static const size_t kLen32 = 58307; +static const size_t kLen33 = 58307; -static const char *kData33[] = { +static const char *kData34[] = { "# Public key algorithm tests\n\n# Keys used for PKEY operations.\n\n# RSA 2048 bit key.\nPrivateKey = RSA-2048\nType = RSA\nInput = 308204bc020100300d06092a864886f70d0101010500048204a6308204a20201000282010100cd0081ea7b2ae1ea06d59f7c73d9ffb94a09615c2e4ba7c636cef08dd3533ec3185525b015c769b99a77d6725bf9c3532a9b6e5f6627d5fb85160768d3dda9cbd35974511717dc3d309d2fc47ee41f97e32adb7f9dd864a1c4767a666ecd71bc1aacf5e7517f4b38594fea9b05e42d5ada9912008013e45316a4d9bb8ed086b88d28758bacaf922d46a868b485d239c9baeb0e2b64592710f42b2d1ea0a4b4802c0becab328f8a68b0073bdb546feea9809d2849912b390c1532bc7e29c7658f8175fae46f34332ff87bcab3e40649b98577869da0ea718353f0722754886913648760d122be676e0fc483dd20ffc31bda96a31966c9aa2e75ad03de47e1c44f02030100010282010060297ac7991b167a06d6b24758b8cbe208beb9b2d9ec9738bd80f90a2e35005dd7ce292d9e29ba885bd316fef1f20913bc0ac90d6b0808b2414d82104441d8624a33ce0233c8f780a48b375aff02d76712228a702484db3f9ebecccfbbee1709dba182800d949e9e4216e0bff3558388f8bd90da373a1d82743ec3fbdd1427fd16825a657a316912e8695365117ca2f845c909405fcac55f895fc15d20386c26ee78c9e99075029a178a6c1e4cf0c200e8a9cfb27e9d156f86e6c2adc22b1a84a1cd5ca5b2790875d79407c84b352395cb81cc3fed5bb043b69ede0c07204550025cee8c5f440170b6120bb48e0f747bcd8f522110850df043c428dfd187053102818100f6f961b47cbc035d3aedebc7de850a956b65ecdb9cf60764063f15aa48553c58d972fe6675056e35ddfdc37bf3b9f2f622ee271337256849c9bef2176fe8f7c3f8bb91ba374dd53baf3dec814d2bdec10c1fdc88cdd16876f26b1edfa3f094197edf4d42ff1fb2971103b898ca859c427287086a842ab410bb69cf2d35af6be302818100d47e724a7ff41048b270c2524a4101878b73159bb73d3dbc187b220e635b3534f96e243a184d93f860b6bfbb6b71c1ed9a1e1f458583023c301e96a692c1a08b53d0ec9ca910100d80451e3b7dc6a01bac4aecef8df798846bc235a08cbba2cf4c06804cc11219e95608c714e3f1430d491fadbba32a5751a04f97745834c9a502818021f2452bb9b95dfd028c914bf799f1ca77e89a95d50d3c16d384f8455f8bd7af9eb3dfa3d591d9842def235f7630a8e48c088ff6642e101794535a933e1e976fa8509fc728b2da0c4a1a08d7fcf37abaae1ff3001aca1dc1bbb05d9dffbaa1a09f7fb1eef38237d9ebccc722b9338436dde7119112798c26809c1a8dec4320610281801f7510aa62c2d8de4a3c53282781f41e02d0e8b402ae78432e449c48110161a11403f02d01880a8dcc938152d79721a4711a607ac4471ebf964810f95be47a45e60499e29f4c9773c83773404f606637728c2d0351bb03c326c8bb73a721e7fa5440ea2172bba1465fcc30dcb0d9f89930e815aa1f7f9729a857e00e0338dd590281804d1f0d756fe77e01099a652f50a88b7b685dc5bf00981d5d2376fd0c6fe29cd5b638734479305a73ad3c1599d39eae3bae035fbd6fed07c28de705933879a06e48e6a603686ed8e2560a5f6af1f2c24faf4aa960e382186f15eedce9a2491ae730680dd4cf778b70faa86826ab3223477cc91377b19a6d5a2eaea219760beed5\n\n# The public half of the same key encoded as a SubjectPublicKeyInfo.\nPublicKey = RSA-2048-SPKI\nType = RSA\nInput = 30820122300d06092a864886f70d01010105000382010f003082010a0282010100cd0081ea7b2ae1ea06d59f7c73d9ffb94a09615c2e4ba7c636cef08dd3533ec3185525b015c769b99a77d6725bf9c3532a9b6e5f6627d5fb85160768d3dda9cbd35974511717dc3d309d2fc47ee41f97e32adb7f9dd864a1c4767a666ecd71bc1aacf5e7517f4b38594fea9b05e42d5ada9912008013e45316a4d9bb8ed086b88d28758bacaf922d46a868b485d239c9baeb0e2b64592710f42b2d1ea0a4b4802c0becab328f8a68b0073bdb546feea9809d2849912b390c1532bc7e29c7658f8175fae46f34332ff87bcab3e40649b98577869da0ea718353f0722754886913648760d122be676e0fc483dd20ffc31bda96a31966c9aa2e75ad03de47e1c44f0203010001\n\n# The same key but with a negative RSA modulus.\nPublicKey = RSA-2048-SPKI-Negative\nInput = 30820121300d06092a864886f70d01010105000382010e003082010902820100cd0081ea7b2ae1ea06d59f7c73d9ffb94a09615c2e4ba7c636cef08dd3533ec3185525b015c769b99a77d6725bf9c3532a9b6e5f6627d5fb85160768d3dda9cbd35974511717dc3d309d2fc47ee41f97e32adb7f9dd864a1c4767a666ecd71bc1aacf5e7517f4b38594fea9b05e42d5ada9912008013e45316a4d9bb8ed086b88d28758bacaf922d46a868b485d239c9baeb0e2b64592710f42b2d1ea0a4b4802c0becab328f8a68b0073bdb546feea9809d2849912b390c1532bc7e29c7658f8175fae46f34332ff87bcab3e40649b98577869da0ea718353f0722754886913648760d122be676e0fc483dd20ffc31bda96a31966c9aa2e75ad03de47e1c44f0203010001\nError = NEGATIVE_NUMBER\n\n# The same key but with missing parameters rather than a NULL.\nPublicKey = RSA-2048-SPKI-Invalid\nInput = 30820120300b06092a864886f70d0101010382010f003082010a0282010100cd0081ea7b2ae1ea06d59f7c73d9ffb94a09615c2e4ba7c636cef08dd3533ec3185525b015c769b99a77d6725bf9c3532a9b6e5f6627d5fb85160768d3dda9cbd35974511717dc3d309d2fc47ee41f97e32adb7f9dd864a1c4767a666ecd71bc1aacf5e7517f4b38594fea9b05e42d5ada9912008013e45316a4d9bb8ed086b88d28758bacaf922d46a868b485d239c9baeb0e2b64592710f42b2d1ea0a4b4802c0becab328f8a68b0073bdb546feea9809d2849912b390c1532bc7e29c7658f8175fae46f34332ff87bcab3e40649b98577869da0ea718353f0722754886913648760d122be676e0fc483dd20ffc31bda96a31966c9aa2e75ad03de47e1c44f0203010001\nError = DECODE_ERROR\n\n# The same key but with an incorrectly-encoded length prefix.\nPublicKey = RSA-2048-SPKI-Invalid2\nInput = 3083000122300d06092a864886f70d01010105000382010f003082010a0282010100cd0081ea7b2ae1ea06d59f7c73d9ffb94a09615c2e4ba7c636cef08dd3533ec3185525b015c769b99a77d6725bf9c3532a9b6e5f6627d5fb85160768d3dda9cbd35974511717dc3d309d2fc47ee41f97e32adb7f9dd864a1c4767a666ecd71bc1aacf5e7517f4b38594fea9b05e42d5ada9912008013e45316a4d9bb8ed086b88d28758bacaf922d46a868b485d239c9baeb0e2b64592710f42b2d1ea0a4b4802c0becab328f8a68b0073bdb546feea9809d2849912b390c1532bc7e29c7658f8175fae46f34332ff87bcab3e40649b98577869da0ea718353f0722754886913648760d122be676e0fc483dd20ffc31bda96a31966c9aa2e75ad03de47e1c44f0203010001\nError = DECODE_ERROR\n\n# RSA 512 bit key.\nPrivateKey = RSA-512\nType = RSA\nInput = 30820154020100300d06092a864886f70d01010105000482013e3082013a020100024100dd20403d976a38c9d79152d87b5c8e9f05033eadd7b7de709bf5b0c4a5182a97d18483526b02362b992e154a9f37faa396ca2685cdab8fec09877ebe705f4dd70203010001024055bebcca655d7e39de8a6eaa9d636db682161907064039544755c53eeb99ec618c03a210dbc61471eaba10c5c365c9726d6b7a96f54d455f7d168d49367270e1022100f21a05d9fd6817301ce49ce10448f9bdd44f5ef5b7557cd7d83155db46382ae7022100e9d1f7157783db2feab1936954ddc4e83aa365695868144cda1be6813b61d791022100d6001eb0040920860ce41fafdf23ca6dfbdf74e6e9f98cf3164cf5c16f9e727d02206f6f73f4b52b10517be6f9bc5f87fa0a3bb817e2e711636b651f9af1c85d4f21022063eff2e57f5b4ca20342cfe793e25526624e3692f192461f9e1ce7f13f2d72c8\n\n# RSA 515 bit key.\nPrivateKey = RSA-515\nType = RSA\nInput = 30820157020100300d06092a864886f70d0101010500048201413082013d0201000241054fa166e205e658bbe8a2dc35311c0c2b75b7e4569fd9642c8bae809279271fc824f26baa1166ea46298ca63379ea76adbada2b61e5066820a35beaec1aca227f020301000102410266c972be0d30e53ac2acb1aa13b4bd0401cccf212452a66b4615f7e943831f67b4ca48560582d0ca886044aaaaf87945252a848c1947944186e6eb83969bf91102210309e631761842cc8a2ccfd372c20a9cba21de1a199c30ab440bc6b51079f4e825022101bf715c1db432627ca7c29a293b9210f2eff1e92d12f306ebaa5334f8ee03dcd30221018ac58a765f2b8f37d434081fe5ff92b81735ead2f263f4968ccf63d61fbe3d0d0221015b247a1159a2d5a25d0db049593c6405f77f3a278c521d066e290c2a2d8fb59d0221026224aa31fd95c14d24fd03b8a195bba4cc88df7c37f5370a5ab19f882f1404d6\n\n# EC P-256 key\nPrivateKey = P-256\nType = EC\nInput = 308187020100301306072a8648ce3d020106082a8648ce3d030107046d306b02010104208a872fb62893c4d1ffc5b9f0f91758069f8352e08fa05a49f8db926cb5728725a144034200042c150f429ce70f216c252cf5e062ce1f639cd5d165c7f89424072c27197d78b33b920e95cdb664e990dcf0cfea0d94e2a8e6af9d0e58056e653104925b9fe6c9\n\n# The same key as above with the optional public key omitted.\nPrivateKey = P-256-MissingPublic\nType = EC\nInput = 3041020100301306072a8648ce3d020106082a8648ce3d0301070427302502010104208a872fb62893c4d1ffc5b9f0f91758069f8352e08fa05a49f8db926cb5728725\n\n# The same key as above with redundant parameters.\nPrivateKey = P-256-ExtraParameters\nType = EC\nInput = 308193020100301306072a8648ce3d020106082a8648ce3d0301070479307702010104208a872fb62893c4d1ffc5b9f0f91758069f8352e08fa05a49f8db926cb5728725a00a06082a8648ce3d030107a144034200042c150f429ce70f216c252cf5e062ce1f639cd5d165c7f89424072c27197d78b33b920e95cdb664e990dcf0cfea0d94e2a8e6af9d0e58056e653104925b9fe6c9\n# The key re-encodes with the parameters removed.\nOutput = 308187020100301306072a8648ce3d020106082a8648ce3d030107046d306b02010104208a872fb62893c4d1ffc5b9f0f91758069f8352e08fa05a49f8db926cb5728725a144034200042c150f429ce70f216c252cf5e062ce1f639cd5d165c7f89424072c27197d78b33b920e95cdb664e990dcf0cfea0d94e2a8e6a", "f9d0e58056e653104925b9fe6c9\n\n# The same key, but with the redundant parameters in the ECPrivateKey mismatched.\nPrivateKey = P-256-BadInnerParameters\nInput = 308190020100301306072a8648ce3d020106082a8648ce3d0301070476307402010104208a872fb62893c4d1ffc5b9f0f91758069f8352e08fa05a49f8db926cb5728725a00706052b81040022a144034200042c150f429ce70f216c252cf5e062ce1f639cd5d165c7f89424072c27197d78b33b920e95cdb664e990dcf0cfea0d94e2a8e6af9d0e58056e653104925b9fe6c9\nError = GROUP_MISMATCH\n\n# The public half of the same key encoded as a PublicKey.\nPublicKey = P-256-SPKI\nType = EC\nInput = 3059301306072a8648ce3d020106082a8648ce3d030107034200042c150f429ce70f216c252cf5e062ce1f639cd5d165c7f89424072c27197d78b33b920e95cdb664e990dcf0cfea0d94e2a8e6af9d0e58056e653104925b9fe6c9\n\n# The same as above, but with the curve explicitly spelled out.\nPublicKey = P-256-SPKI\nInput = 3082014b3082010306072a8648ce3d02013081f7020101302c06072a8648ce3d0101022100ffffffff00000001000000000000000000000000ffffffffffffffffffffffff305b0420ffffffff00000001000000000000000000000000fffffffffffffffffffffffc04205ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b031500c49d360886e704936a6678e1139d26b7819f7e900441046b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c2964fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5022100ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551020101034200042c150f429ce70f216c252cf5e062ce1f639cd5d165c7f89424072c27197d78b33b920e95cdb664e990dcf0cfea0d94e2a8e6af9d0e58056e653104925b9fe6c9\nError = DECODE_ERROR\n\n# The same as above, but with trailing data after the curve name.\nPublicKey = P-256-SPKI\nInput = 305b301506072a8648ce3d020106082a8648ce3d0301070500034200042c150f429ce70f216c252cf5e062ce1f639cd5d165c7f89424072c27197d78b33b920e95cdb664e990dcf0cfea0d94e2a8e6af9d0e58056e653104925b9fe6c9\nError = DECODE_ERROR\n\n# A DSA private key.\nPrivateKey = DSA-1024\nType = DSA\nInput = 308202650201003082023906072a8648ce3804013082022c02820101009e12fab3de12213501dd82aa10ca2d101d2d4ebfef4d2a3f8daa0fe0cedad8d6af85616aa2f3252c0a2b5a6db09e6f14900e0ddb8311876dd8f9669525f99ed65949e184d5064793271169a228680b95ec12f59a8e20b21f2b58eb2a2012d35bde2ee351822fe8f32d0a330565dcce5c672b7259c14b2433d0b5b2ca2b2db0ab626e8f13f47fe0345d904e7294bb038e9ce21a9e580b83356278706cfe768436c69de149ccff98b4aab8cb4f6385c9f102ce59346eaeef27e0ad222d53d6e89cc8cde5776dd00057b03f2d88ab3cedbafd7b585f0b7f7835e17a3728bbf25ea62572f245dc111f3ce39cb6ffacc31b0a2790e7bde90224ea9b09315362af3d2b022100f381dcf53ebf724f8b2e5ca82c010fb4b5eda9358d0fd88ed278589488b54fc3028201000c402a725dcc3a62e02bf4cf43cd17f4a493591220223669cf4193edab423ad08dfb552e308a6a57a5ffbc7cd0fb2087f81f8df0cb08ab2133287d2b6968714a94f633c940845a48a3e16708dde761cc6a8eab2d84db21b6ea5b07681493cc9c31fbc368b243f6ddf8c932a8b4038f44e7b15ca876344a147859f2b43b39458668ad5e0a1a9a669546dd2812e3b3617a0aef99d58e3bb4cc87fd94225e01d2dcc469a77268146c51918f18e8b4d70aa1f0c7623bcc52cf3731d38641b2d2830b7eecb2f09552ff137d046e494e7f33c3590002b16d1b97d936fda28f90c3ed3ca35338168ac16f77c3c57adc2e8f7c6c2256e41a5f65450590dbb5bcf06d66610423022100b0c768702743bc51242993a971a52889795444f7c6452203d0ce84fe6117d46e\n\n# A DSA public key.\nPublicKey = DSA-1024-SPKI\nType = DSA\nInput = 308201b73082012c06072a8648ce3804013082011f02818100b3429b8b128c9079f9b72e86857e98d265e5d91661ed8b5f4cc56e5eed1e571da30186983a9dd76297eab73ee13a1db841f8800d04a7cab478af6cde2ea4a2868531af169a24858c6268efa39ceb7ed0d4227eb5bbb01124a2a5a26038c7bcfb8cc827f68f5202345166e4718596799b65c9def82828ce44e62e38e41a0d24b1021500c5a56c81ddd87f47e676546c56d05706421624cf0281810094de40d27314fe929e47ff9b1ac65cfc73ef38c4d381c890be6217b15039ae18190e6b421af8c0bda35a5cfd050f58ae2644adce83e68c8e5ba11729df56bbb21e227a60b816cc033fa799a38fe1ba5b4aa1801b6f841ce3df99feb3b4fb96950c960af13fa2ce920aabc12dd24ad2044a35063ea0e25f67f560f4cfbdc5598303818400028180258c30ebbb7f34fdc873ce679f6cea373c7886d75d4421b90920db034daedd292c64d8edd8cdbdd7f3ad23d74cfa2135247d0cef6ecf2e14f99e19d22a8c1266bd8fb8719c0e5667c716c45c7adbdabe548085bdad2dfee636f8d52fd6adb2193df6c4f0520fbd171b91882e0e4f321f8250ffecf4dbea00e114427d3ef96c1a\n\n# The same key as above, but without the parameters.\nPublicKey = DSA-1024-SPKI-No-Params\nType = DSA\nInput = 308192300906072a8648ce38040103818400028180258c30ebbb7f34fdc873ce679f6cea373c7886d75d4421b90920db034daedd292c64d8edd8cdbdd7f3ad23d74cfa2135247d0cef6ecf2e14f99e19d22a8c1266bd8fb8719c0e5667c716c45c7adbdabe548085bdad2dfee636f8d52fd6adb2193df6c4f0520fbd171b91882e0e4f321f8250ffecf4dbea00e114427d3ef96c1a\n\n# Private keys from RFC 8032.\nPrivateKey = Ed25519\nType = Ed25519\nInput = 302e020100300506032b6570042204209d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60\n\nPrivateKey = Ed25519-2\nType = Ed25519\nInput = 302e020100300506032b6570042204204ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb\n\nPrivateKey = Ed25519-3\nType = Ed25519\nInput = 302e020100300506032b657004220420c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7\n\nPrivateKey = Ed25519-4\nType = Ed25519\nInput = 302e020100300506032b657004220420f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5\n\nPrivateKey = Ed25519-5\nType = Ed25519\nInput = 302e020100300506032b657004220420833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42\n\n# Public keys from RFC 8032.\nPublicKey = Ed25519-SPKI\nType = Ed25519\nInput = 302a300506032b6570032100d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a\n\nPublicKey = Ed25519-SPKI-2\nType = Ed25519\nInput = 302a300506032b65700321003d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c\n\nPublicKey = Ed25519-SPKI-3\nType = Ed25519\nInput = 302a300506032b6570032100fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025\n\nPublicKey = Ed25519-SPKI-4\nType = Ed25519\nInput = 302a300506032b6570032100278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e\n\nPublicKey = Ed25519-SPKI-5\nType = Ed25519\nInput = 302a300506032b6570032100ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf\n\n# The first key, private and public, with invalid NULL parameters.\nPrivateKey = Ed25519-NULL\nInput = 3030020100300706032b65700500042204209d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60\nError = DECODE_ERROR\n\nPublicKey = Ed25519-SPKI-NULL\nInput = 302c300706032b65700500032100d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a\nError = DECODE_ERROR\n\n# Sample public key from draft-ietf-curdle-pkix-04.\nPublicKey = Ed25519-SPKI-Spec\nType = Ed25519\nInput = 302a300506032b657003210019bf44096984cdfe8541bac167dc3b96c85086aa30b6b6cb0c5c38ad703166e1\n\n# Sample private key from draft-ietf-curdle-pkix-04.\nPrivateKey = Ed25519-Spec\nType = Ed25519\nInput = 302e020100300506032b657004220420d4ee72dbf913584ad5b6d8f1f769f8ad3afe7c28cbf1d4fbe097a88f44755842\n\n\n# RSA tests\n\nSign = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2eaee6cd60089a52482d4809a238149520df3bdde4cb9e23d9307b05c0a6f327052325a29adf2cc95b66523be7024e2a585c3d4db15dfbe146efe0ecdc0402e33fe5d40324ee96c5c3edd374a15cdc0f5d84aa243c0f07e188c6518fbfceae158a9943be398e31097da81b62074f626eff738be6160741d5a26957a482b3251fd85d8df78b98148459de10aa93305dbb4a5230aa1da291a9b0e481918f99b7638d72bb687f97661d304ae145d64a474437a4ef39d7b8059332ddeb07e92bf6e0e3acaf8afedc93795e4511737ec1e7aab6d5bc9466afc950c1c17b48ad\n\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2eaee6cd60089a52482d4809a238149520df3bdde4cb9e23d9307b05c0a6f327052325a29adf2cc95b66523be7024e2a585c3d4db15dfbe146efe0ecdc0402e33fe5d40324ee96c5c3edd374a15cdc0f5d84aa243c0f07e188c6518fbfceae158a9943be398e31097da81b62074f626eff738be6160741d5a26957a482b3251fd85d8df78b98148459de10aa93305dbb4a5230aa1da291a9b0e481918f99b7638d72bb687f97661d304ae145d64a474437a4ef39d7b8059332ddeb07e92bf6e0e3acaf8afedc93795e4511737ec1e7aab6d5bc9466afc950c1c17b48ad\n\nVerify = RSA-2048-SPKI\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2eaee6cd60089a52482d4809a238149520df3bdde4cb9e23d9307b05c0a6f327052325a29adf2cc95b66523be7024e2a585c3d", "4db15dfbe146efe0ecdc0402e33fe5d40324ee96c5c3edd374a15cdc0f5d84aa243c0f07e188c6518fbfceae158a9943be398e31097da81b62074f626eff738be6160741d5a26957a482b3251fd85d8df78b98148459de10aa93305dbb4a5230aa1da291a9b0e481918f99b7638d72bb687f97661d304ae145d64a474437a4ef39d7b8059332ddeb07e92bf6e0e3acaf8afedc93795e4511737ec1e7aab6d5bc9466afc950c1c17b48ad\n\n# Digest too long\nSign = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF12345\"\nError = INVALID_MESSAGE_LENGTH\n\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF12345\"\nOutput = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2eaee6cd60089a52482d4809a238149520df3bdde4cb9e23d9307b05c0a6f327052325a29adf2cc95b66523be7024e2a585c3d4db15dfbe146efe0ecdc0402e33fe5d40324ee96c5c3edd374a15cdc0f5d84aa243c0f07e188c6518fbfceae158a9943be398e31097da81b62074f626eff738be6160741d5a26957a482b3251fd85d8df78b98148459de10aa93305dbb4a5230aa1da291a9b0e481918f99b7638d72bb687f97661d304ae145d64a474437a4ef39d7b8059332ddeb07e92bf6e0e3acaf8afedc93795e4511737ec1e7aab6d5bc9466afc950c1c17b48ad\nError = INVALID_MESSAGE_LENGTH\n\n# Digest too short\nSign = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF123\"\nError = INVALID_MESSAGE_LENGTH\n\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF123\"\nOutput = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2eaee6cd60089a52482d4809a238149520df3bdde4cb9e23d9307b05c0a6f327052325a29adf2cc95b66523be7024e2a585c3d4db15dfbe146efe0ecdc0402e33fe5d40324ee96c5c3edd374a15cdc0f5d84aa243c0f07e188c6518fbfceae158a9943be398e31097da81b62074f626eff738be6160741d5a26957a482b3251fd85d8df78b98148459de10aa93305dbb4a5230aa1da291a9b0e481918f99b7638d72bb687f97661d304ae145d64a474437a4ef39d7b8059332ddeb07e92bf6e0e3acaf8afedc93795e4511737ec1e7aab6d5bc9466afc950c1c17b48ad\nError = INVALID_MESSAGE_LENGTH\n\n# Digest too large for key.\nSign = RSA-512\nDigest = SHA512\nInput = \"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF\"\nError = DIGEST_TOO_BIG_FOR_RSA_KEY\n\n# Mismatched digest\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1233\"\nOutput = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2eaee6cd60089a52482d4809a238149520df3bdde4cb9e23d9307b05c0a6f327052325a29adf2cc95b66523be7024e2a585c3d4db15dfbe146efe0ecdc0402e33fe5d40324ee96c5c3edd374a15cdc0f5d84aa243c0f07e188c6518fbfceae158a9943be398e31097da81b62074f626eff738be6160741d5a26957a482b3251fd85d8df78b98148459de10aa93305dbb4a5230aa1da291a9b0e481918f99b7638d72bb687f97661d304ae145d64a474437a4ef39d7b8059332ddeb07e92bf6e0e3acaf8afedc93795e4511737ec1e7aab6d5bc9466afc950c1c17b48ad\nError = BAD_SIGNATURE\n\n# Corrupted signature\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1233\"\nOutput = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2eaee6cd60089a52482d4809a238149520df3bdde4cb9e23d9307b05c0a6f327052325a29adf2cc95b66523be7024e2a585c3d4db15dfbe146efe0ecdc0402e33fe5d40324ee96c5c3edd374a15cdc0f5d84aa243c0f07e188c6518fbfceae158a9943be398e31097da81b62074f626eff738be6160741d5a26957a482b3251fd85d8df78b98148459de10aa93305dbb4a5230aa1da291a9b0e481918f99b7638d72bb687f97661d304ae145d64a474437a4ef39d7b8059332ddeb07e92bf6e0e3acaf8afedc93795e4511737ec1e7aab6d5bc9466afc950c1c17b48ae\nError = BLOCK_TYPE_IS_NOT_01\n\n# parameter missing (NOTE: this differs from upstream)\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = 3ec3fc29eb6e122bd7aa361cd09fe1bcbe85311096a7b9e4799cedfb2351ce0ab7fe4e75b4f6b37f67edd9c60c800f9ab941c0c157d7d880ca9de40c951d60fd293ae220d4bc510b1572d6e85a1bbbd8605b52e05f1c64fafdae59a1c2fbed214b7844d0134619de62851d5a0522e32e556e5950f3f97b8150e3f0dffee612c924201c27cd9bc8b423a71533380c276d3d59fcba35a2e80a1a192ec266a6c2255012cd86a349fe90a542b355fa3355b04da6cdf1df77f0e7bd44a90e880e1760266d233e465226f5db1c68857847d82072861ee266ddfc2e596845b77e1803274a579835ab5e4975d81d20b7df9cec7795489e4a2bdb8c1cf6a6b359945ac92c\nError = BAD_SIGNATURE\n\n# embedded digest too long\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = afec9a0d5330a08f54283bb4a9d4e7e7e70fc1342336c4c766fba713f66970151c6e27413c48c33864ea45a0238787004f338ed3e21b53b0fe9c1151c42c388cbc7cba5a06b706c407a5b48324fbe994dc7afc3a19fb3d2841e66222596c14cd72a0f0a7455a019d8eb554f59c0183f9552b75aa96fee8bf935945e079ca283d2bd3534a86f11351f6d6181fbf433e5b01a6d1422145c7a72214d3aacdd5d3af12b2d6bf6438f9f9a64010d8aeed801c87f0859412b236150b86a545f7239be022f4a7ad246b59df87514294cb4a4c7c5a997ee53c66054d9f38ca4e76c1f7af83c30f737ef70f83a45aebe18238ddb95e1998814ca4fc72388f1533147c169d\nError = BAD_SIGNATURE\n\n# embedded digest too short\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = afec9a0d5330a08f54283bb4a9d4e7e7e70fc1342336c4c766fba713f66970151c6e27413c48c33864ea45a0238787004f338ed3e21b53b0fe9c1151c42c388cbc7cba5a06b706c407a5b48324fbe994dc7afc3a19fb3d2841e66222596c14cd72a0f0a7455a019d8eb554f59c0183f9552b75aa96fee8bf935945e079ca283d2bd3534a86f11351f6d6181fbf433e5b01a6d1422145c7a72214d3aacdd5d3af12b2d6bf6438f9f9a64010d8aeed801c87f0859412b236150b86a545f7239be022f4a7ad246b59df87514294cb4a4c7c5a997ee53c66054d9f38ca4e76c1f7af83c30f737ef70f83a45aebe18238ddb95e1998814ca4fc72388f1533147c169d\nError = BAD_SIGNATURE\n\n# Garbage after DigestInfo\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = 9ee34872d4271a7d8808af0a4052a145a6d6a8437d00da3ed14428c7f087cd39f4d43334c41af63e7fa1ba363fee7bcef401d9d36a662abbab55ce89a696e1be0dfa19a5d09ca617dd488787b6048baaefeb29bc8688b2fe3882de2b77c905b5a8b56cf9616041e5ec934ba6de863efe93acc4eef783fe7f72a00fa65d6093ed32bf98ce527e62ccb1d56317f4be18b7e0f55d7c36617d2d0678a306e3350956b662ac15df45215dd8f6b314babb9788e6c272fa461e4c9b512a11a4b92bc77c3a4c95c903fccb238794eca5c750477bf56ea6ee6a167367d881b485ae3889e7c489af8fdf38e0c0f2aed780831182e34abedd43c39281b290774bf35cc25274\nError = BAD_SIGNATURE\n\n# invalid tag for parameter\nVerify = RSA-2048\nDigest = SHA1\nInput = \"0123456789ABCDEF1234\"\nOutput = 49525db4d44c755e560cba980b1d85ea604b0e077fcadd4ba44072a3487bbddb835016200a7d8739cce2dc3223d9c20cbdd25059ab02277f1f21318efd18e21038ec89aa9d40680987129e8b41ba33bceb86518bdf47268b921cce2037acabca6575d832499538d6f40cdba0d40bd7f4d8ea6ca6e2eec87f294efc971407857f5d7db09f6a7b31e301f571c6d82a5e3d08d2bb3a36e673d28b910f5bec57f0fcc4d968fd7c94d0b9226dec17f5192ad8b42bcab6f26e1bea1fdc3b958199acb00f14ebcb2a352f3afcedd4c09000128a603bbeb9696dea13040445253972d46237a25c7845e3b464e6984c2348ea1f1210a9ff0b00d2d72b50db00c009bb39f9\nError = BAD_SIGNATURE\n\n\n# RSA-PSS tests.\n\n# Zero salt length makes the output deterministic\nSign = RSA-2048\nRSAPadding = PSS\nPSSSaltLength = 0\nDigest = SHA256\nInput = \"0123456789ABCDEF0123456789ABCDEF\"\nOutput = 4de433d5844043ef08d354da03cb29068780d52706d7d1e4d50efb7d58c9d547d83a747ddd0635a96b28f854e50145518482cb49e963054621b53c60c498d07c16e9c2789c893cf38d4d86900de71bde463bd2761d1271e358c7480a1ac0bab930ddf39602ad1bc165b5d7436b516b7a7858e8eb7ab1c420eeb482f4d207f0e462b1724959320a084e13848d11d10fb593e66bf680bf6d3f345fc3e9c3de60abbac37e1c6ec80a268c8d9fc49626c679097aa690bc1aa662b95eb8db70390861aa0898229f9349b4b5fdd030d4928c47084708a933144be23bd3c6e661b85b2c0ef9ed36d498d5b7320e8194d363d4ad478c059bae804181965e0b81b663158a\n\n# Verify of above signature\nVerify = RSA-2048-SPKI\nRSAPadding = PSS\nPSSSaltLength = 0\nDigest = SHA256\nInput = \"0123456789ABCDEF0123456789ABCDEF\"\nOutput = 4de433d5844043ef08d354da03cb29068780d52706d7d1e4d50efb7d58c9d547d83a747ddd0635a96b28f854e50145518482cb49e963054621b53c60c498d07c16e9c2789c893cf38d4d86900de71bde463bd2761d1271e358c7480a1ac0bab930ddf39602ad1bc165b5d7436b516b7a7858e8eb7ab1c420eeb482f4d207f0e462b1724959320a084e13848d11d10fb593e66bf680bf6d3f345fc3e9c3de60abbac37e1c6ec80a268c8d9fc49626c679097aa690bc1aa662b95eb8db70390861aa0898229f9349b4b5fdd030d4928c47084708a933144be23bd3c6e661b85b2c0ef9ed36d498d5b7320e8194d363d4ad478c059bae804181965e0b81b663158a\n\n# A non-zero salt length must be checked by round-tripping.\nSign = RSA-2048\nRSAPadding = PSS\nPSSSaltLength = 32\nDigest = SHA256\nInput = \"0123456789ABCDEF0123456789ABCDEF\"\nCheckVerify\n\n# Auto-detected salt length\nVerify = RSA-2048-SPKI\nRSAPadding = PSS\nPSSSaltLength = -2\nDigest = SHA256\nInput = \"0123456789ABCDEF0123456789ABCDEF\"\nOutput = 4de433d5844043ef08d354da03cb29068780d52706d7", @@ -2451,19 +2457,19 @@ "0831fdcd9bc33d51f79ed2ffc16bcf4d59812fcebcaa3f9069b0e445686d644c25ccf63b456ee5fa6ffe96f19cdf751fed9eaf35957754dbf4bfea5216aa1844dc507cb2d080e722eba150308c2b5ff1193620f1766ecf4481bafb943bd292877f2136ca494aba0\nOutput = a7dd6c7dc24b46f9dd5f1e91ada4c3b3df947e877232a9\n\nDecrypt = RSA-OAEP-10\nRSAPadding = OAEP\nMGF1Digest = SHA1\nInput = 2d207a73432a8fb4c03051b3f73b28a61764098dfa34c47a20995f8115aa6816679b557e82dbee584908c6e69782d7deb34dbd65af063d57fca76a5fd069492fd6068d9984d209350565a62e5c77f23038c12cb10c6634709b547c46f6b4a709bd85ca122d74465ef97762c29763e06dbc7a9e738c78bfca0102dc5e79d65b973f28240caab2e161a78b57d262457ed8195d53e3c7ae9da021883c6db7c24afdd2322eac972ad3c354c5fcef1e146c3a0290fb67adf007066e00428d2cec18ce58f9328698defef4b2eb5ec76918fde1c198cbb38b7afc67626a9aefec4322bfd90d2563481c9a221f78c8272c82d1b62ab914e1c69f6af6ef30ca5260db4a46\nOutput = eaf1a73a1b0c4609537de69cd9228bbcfb9a8ca8c6c3efaf056fe4a7f4634ed00b7c39ec6922d7b8ea2c04ebac\n\n\n# Single-shot signing tests.\n\nSignMessage = RSA-2048\nDigest = SHA256\nInput = \"Hello world\"\nOutput = 301894798b49d6ec55d32dcc74314f04230591a515781f3eb4492f5324b56046836c4bc3e25942af341e88558cb4c3814a849207575d343189147989b16e296b5138dbbc717116dc416f201dfa35943d15060493953cda1f04a13ff89845cf7fd69e1a78d5d38522a77bb234e5d0ba2ae17ada6e22fdae27a4052fdb8ac267507dfe06ed7a865e61a52b530bbbf65c7caa89739613df10ae3b0e62ff6831ee0770086aad39c329462aede9f1b29a501bc3d09e0fe4034aa5d6831d44491d508111d88a1d7ba50cee5ef7e701b3a589adc09a752a974a6805956f4a1a0582f66309a1e02e9fb6b10d2c820fe98bb2eb04f435bc8a649cc9ab6c5a4c03e83800d1\n\nVerifyMessage = RSA-2048\nDigest = SHA256\nInput = \"Hello world\"\nOutput = 301894798b49d6ec55d32dcc74314f04230591a515781f3eb4492f5324b56046836c4bc3e25942af341e88558cb4c3814a849207575d343189147989b16e296b5138dbbc717116dc416f201dfa35943d15060493953cda1f04a13ff89845cf7fd69e1a78d5d38522a77bb234e5d0ba2ae17ada6e22fdae27a4052fdb8ac267507dfe06ed7a865e61a52b530bbbf65c7caa89739613df10ae3b0e62ff6831ee0770086aad39c329462aede9f1b29a501bc3d09e0fe4034aa5d6831d44491d508111d88a1d7ba50cee5ef7e701b3a589adc09a752a974a6805956f4a1a0582f66309a1e02e9fb6b10d2c820fe98bb2eb04f435bc8a649cc9ab6c5a4c03e83800d1\n\nVerifyMessage = RSA-2048-SPKI\nDigest = SHA256\nInput = \"Hello world\"\nOutput = 301894798b49d6ec55d32dcc74314f04230591a515781f3eb4492f5324b56046836c4bc3e25942af341e88558cb4c3814a849207575d343189147989b16e296b5138dbbc717116dc416f201dfa35943d15060493953cda1f04a13ff89845cf7fd69e1a78d5d38522a77bb234e5d0ba2ae17ada6e22fdae27a4052fdb8ac267507dfe06ed7a865e61a52b530bbbf65c7caa89739613df10ae3b0e62ff6831ee0770086aad39c329462aede9f1b29a501bc3d09e0fe4034aa5d6831d44491d508111d88a1d7ba50cee5ef7e701b3a589adc09a752a974a6805956f4a1a0582f66309a1e02e9fb6b10d2c820fe98bb2eb04f435bc8a649cc9ab6c5a4c03e83800d1\n\nVerifyMessage = P-256\nDigest = SHA256\nInput = \"Hello world\"\nOutput = 304502204c66004635c267394bd6857c1e0b53b22a2bab1ca7dff9d5c1b42143858b3ea7022100ae81228510e03cd49a8863d2ebd1c05fe0c87eacd1150433132b909994cd0dbd\n\n# Digest can't be omitted in many algorithms.\nSignMessage = RSA-2048\nInput = \"Hello world\"\nError = NO_DEFAULT_DIGEST\n\nVerifyMessage = RSA-2048\nInput = \"Hello world\"\nOutput = 301894798b49d6ec55d32dcc74314f04230591a515781f3eb4492f5324b56046836c4bc3e25942af341e88558cb4c3814a849207575d343189147989b16e296b5138dbbc717116dc416f201dfa35943d15060493953cda1f04a13ff89845cf7fd69e1a78d5d38522a77bb234e5d0ba2ae17ada6e22fdae27a4052fdb8ac267507dfe06ed7a865e61a52b530bbbf65c7caa89739613df10ae3b0e62ff6831ee0770086aad39c329462aede9f1b29a501bc3d09e0fe4034aa5d6831d44491d508111d88a1d7ba50cee5ef7e701b3a589adc09a752a974a6805956f4a1a0582f66309a1e02e9fb6b10d2c820fe98bb2eb04f435bc8a649cc9ab6c5a4c03e83800d1\nError = NO_DEFAULT_DIGEST\n\n# Signing test vectors from RFC 8032.\nSignMessage = Ed25519\nInput = \"\"\nOutput = e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b\n\nSignMessage = Ed25519-2\nInput = 72\nOutput = 92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00\n\nSignMessage = Ed25519-3\nInput = af82\nOutput = 6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a\n\nSignMessage = Ed25519-4\nInput = 08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0\nOutput = 0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03\n\nSignMessage = Ed25519-5\nInput = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f\nOutput = dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704\n\n# Signing with public keys is not allowed.\nSignMessage = Ed25519-SPKI\nInput = \"\"\nError = NOT_A_PRIVATE_KEY\n\n# Verify test vectors from RFC 8032. Test verifying with both the public and\n# private key.\nVerifyMessage = Ed25519\nInput = \"\"\nOutput = e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b\n\nVerifyMessage = Ed25519-SPKI\nInput = \"\"\nOutput = e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b\n\nVerifyMessage = Ed25519-2\nInput = 72\nOutput = 92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00\n\nVerifyMessage = Ed25519-SPKI-2\nInput = 72\nOutput = 92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00\n\nVerifyMessage = Ed25519-3\nInput = af82\nOutput = 6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a\n\nVerifyMessage = Ed25519-SPKI-3\nInput = af82\nOutput = 6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a\n\nVerifyMessage = Ed25519-4\nInput = 08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d", "9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0\nOutput = 0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03\n\nVerifyMessage = Ed25519-SPKI-4\nInput = 08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0\nOutput = 0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03\n\nVerifyMessage = Ed25519-5\nInput = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f\nOutput = dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704\n\nVerifyMessage = Ed25519-SPKI-5\nInput = ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f\nOutput = dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704\n\n# Length is wrong.\nVerifyMessage = Ed25519-SPKI\nInput = \"\"\nOutput = e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a10\nError = INVALID_SIGNATURE\n\n# Message is wrong.\nVerifyMessage = Ed25519-SPKI\nInput = \"Hello world\"\nOutput = e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b\nError = INVALID_SIGNATURE\n\n# Ed25519 does not support configuring a digest.\nSignMessage = Ed25519\nInput = \"\"\nDigest = SHA256\nError = COMMAND_NOT_SUPPORTED\n\n# Ed25519 does not support signing a pre-hashed value.\nSign = Ed25519\nInput = \"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\"\nError = OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE\n\nVerify = Ed25519\nInput = \"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\"\nOutput = e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b\nError = OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE\n", }; -static const size_t kLen33 = 128816; - -static const char *kData34[] = { - "#\n# Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.\n#\n# Licensed under the OpenSSL license (the \"License\"). You may not use\n# this file except in compliance with the License. You can obtain a copy\n# in the file LICENSE in the source distribution or at\n# https://www.openssl.org/source/license.html\n\nPassword = \"\"\nSalt = \"\"\nN = 16\nr = 1\np = 1\nKey = 77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906\n\nPassword = \"password\"\nSalt = \"NaCl\"\nN = 1024\nr = 8\np = 16\nKey = fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640\n\nPassword = \"pleaseletmein\"\nSalt = \"SodiumChloride\"\nN = 16384\nr = 8\np = 1\nKey = 7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887\n\n# NB: this test requires more than 1GB of memory to run so it is disabled by\n# default. Uncomment it to run.\n# Password = \"pleaseletmein\"\n# Salt = \"SodiumChloride\"\n# N = 1048576\n# r = 8\n# p = 1\n# Key = 2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4\n# MaxMemory = 10000000000\n", -}; -static const size_t kLen34 = 1262; +static const size_t kLen34 = 128816; static const char *kData35[] = { - "# Test vectors from FIPS-197, Appendix C.\n\nMode = Raw\nKey = 000102030405060708090a0b0c0d0e0f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 69c4e0d86a7b0430d8cdb78070b4c55a\n\nMode = Raw\nKey = 000102030405060708090a0b0c0d0e0f1011121314151617\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = dda97ca4864cdfe06eaf70a0ec0d7191\n\nMode = Raw\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 8ea2b7ca516745bfeafc49904b496089\n\n\n# Test vectors from\n# http://csrc.nist.gov/groups/ST/toolkit/documents/kms/key-wrap.pdf\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 1fa68b0a8112b447aef34bd8fb5a7b829d3e862371d2cfe5\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f1011121314151617\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 96778b25ae6ca435f92b5b97c050aed2468ab8a17ad84e5d\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 64e8c3f9ce0f5ba263e9777905818a2a93c8191e7d6e8ae7\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f1011121314151617\nPlaintext = 00112233445566778899aabbccddeeff0001020304050607\nCiphertext = 031d33264e15d33268f24ec260743edce1c6c7ddee725a936ba814915c6762d2\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff0001020304050607\nCiphertext = a8f9bc1612c68b3ff6e6f4fbe30e71e4769c8b80a32cb8958cd5d17d6b254da1\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff000102030405060708090a0b0c0d0e0f\nCiphertext = 28c9f404c4b810f4cbccb35cfb87f8263f5786e2d80ed326cbc7f0e71a99f43bfb988b9b7a02dd21\n", + "#\n# Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.\n#\n# Licensed under the OpenSSL license (the \"License\"). You may not use\n# this file except in compliance with the License. You can obtain a copy\n# in the file LICENSE in the source distribution or at\n# https://www.openssl.org/source/license.html\n\nPassword = \"\"\nSalt = \"\"\nN = 16\nr = 1\np = 1\nKey = 77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906\n\nPassword = \"password\"\nSalt = \"NaCl\"\nN = 1024\nr = 8\np = 16\nKey = fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640\n\nPassword = \"pleaseletmein\"\nSalt = \"SodiumChloride\"\nN = 16384\nr = 8\np = 1\nKey = 7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887\n\n# NB: this test requires more than 1GB of memory to run so it is disabled by\n# default. Uncomment it to run.\n# Password = \"pleaseletmein\"\n# Salt = \"SodiumChloride\"\n# N = 1048576\n# r = 8\n# p = 1\n# Key = 2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4\n# MaxMemory = 10000000000\n", }; -static const size_t kLen35 = 1834; +static const size_t kLen35 = 1262; static const char *kData36[] = { + "# Test vectors from FIPS-197, Appendix C.\n\nMode = Raw\nKey = 000102030405060708090a0b0c0d0e0f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 69c4e0d86a7b0430d8cdb78070b4c55a\n\nMode = Raw\nKey = 000102030405060708090a0b0c0d0e0f1011121314151617\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = dda97ca4864cdfe06eaf70a0ec0d7191\n\nMode = Raw\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 8ea2b7ca516745bfeafc49904b496089\n\n\n# Test vectors from\n# http://csrc.nist.gov/groups/ST/toolkit/documents/kms/key-wrap.pdf\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 1fa68b0a8112b447aef34bd8fb5a7b829d3e862371d2cfe5\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f1011121314151617\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 96778b25ae6ca435f92b5b97c050aed2468ab8a17ad84e5d\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff\nCiphertext = 64e8c3f9ce0f5ba263e9777905818a2a93c8191e7d6e8ae7\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f1011121314151617\nPlaintext = 00112233445566778899aabbccddeeff0001020304050607\nCiphertext = 031d33264e15d33268f24ec260743edce1c6c7ddee725a936ba814915c6762d2\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff0001020304050607\nCiphertext = a8f9bc1612c68b3ff6e6f4fbe30e71e4769c8b80a32cb8958cd5d17d6b254da1\n\nMode = KeyWrap\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nPlaintext = 00112233445566778899aabbccddeeff000102030405060708090a0b0c0d0e0f\nCiphertext = 28c9f404c4b810f4cbccb35cfb87f8263f5786e2d80ed326cbc7f0e71a99f43bfb988b9b7a02dd21\n", +}; +static const size_t kLen36 = 1834; + +static const char *kData37[] = { "# Sum tests.\n#\n# These test vectors satisfy A + B = Sum.\n\nSum = 0\nA = 0\nB = 0\n\nSum = c590e57ee64fced3ca84d4bb013bba7d633e68b2ff4e27bf1db43f386dbfcce501f112b7fff6fb9436a576ccfccce12867becf02b91961453ea41f414764407d\nA = c590e57ee64fced3ca84d4bb013bba7d633e68b2ff4e27bf1db43f386dbfcce501f112b7fff6fb9436a576ccfccce12867becf02b91961453ea41f414764407d\nB = 0\n\nSum = -c590e57ee64fced3ca84d4bb013bba7d633e68b2ff4e27bf1db43f386dbfcce501f112b7fff6fb9436a576ccfccce12867becf02b91961453ea41f414764407d\nA = -c590e57ee64fced3ca84d4bb013bba7d633e68b2ff4e27bf1db43f386dbfcce501f112b7fff6fb9436a576ccfccce12867becf02b91961453ea41f414764407d\nB = 0\n\nSum = 0\nA = c590e57ee64fced3ca84d4bb013bba7d633e68b2ff4e27bf1db43f386dbfcce501f112b7fff6fb9436a576ccfccce12867becf02b91961453ea41f414764407d\nB = -c590e57ee64fced3ca84d4bb013bba7d633e68b2ff4e27bf1db43f386dbfcce501f112b7fff6fb9436a576ccfccce12867becf02b91961453ea41f414764407d\n\nSum = c590e57ee64fced3ca84d4bb013bba7d633e68b2ff4e27bf1db43f386dbfcce501f112b7fff6fb9436a576ccfccce12867becf02b91961453ea41f414764407d\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 23f85668bf4d0fa273d8c7f63c5fee57811062a674111e295a73a58e08dd0fd58eda1f473960559d5b96d1862164e96efded31f756df3f57c\n\nSum = c590e57ee64fceccd54e0bdc52476a756d32e794922dca0acc780d2c6af8852351102b40dfb97009f95e019a5bf38e5d127aa78bc34425edf96f763084a8b09f\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -4b5b16252ba2355e0b87f01baa721783c403607a4c1b5652c09a68e96926c8e314fa580bf0ad3f8f59bd70f14df86a4676661899b54c79a62\n\nSum = -c590e57ee64fcec882fef3ffd015a3fd9024d8f5f6d53eb537d6abdb0ff5e76a8fb08d5feed113fc9e74745d957adf32704a08339ba42efd5746c5d478e3f57b\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 908007a2f3c551c58958d1059427a0391d4d768f61cb802e4cb062c778354ea3eaa8f0dfbd14ca8203e07ae6d07269b58088a39f7608c5586\n\nSum = -c590e57ee64fceeb242f8a0893eaa0d2ccc3dc57ec40fe917cfde66618fba678ce0c8fffc566d4e8c7944d6443def8014fe8ee410a1b8dfd06cb0b436619e0dd\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1999301bd9877fe07ca711f308b2f1bc4a704fd194ec4dbc297355d6285340d6ad7e90cb0add1770aea19737a06750c3a7a6fa0b778ca995dc\n\nSum = c590e57ee64fcef321395bba088ca0a867e1e85a1ea77478f8783e6a6cf8f3e582bff83cb2d7d9fd549fcbb40dea22ac140351007030059500bdca81413600e9\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 219639ed8afc21e052422fff0ae5583231ebca2999404b099628093e6540b1dbc20b9c495aa7229b5965b19a5fcd653b3fa0eccab567c5b5e8\n\nSum = c590e57ee64fce834a00cc6282cb0eef49eac7a8d5b51988cb49253ed85ae261c76f2327a691fc63eceab02614807048b2816cdb9b89ca66a17b6ed1abdab580\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -4e40fea1cc899fb166dbc721a6639a28be4164ef92545307ed934796afcb9401d75c18d23352471709fbd049c50740ffeebe5590fa2d959581\n\nSum = -c590e57ee64fce1a17609c61ce02f1020c6eb6e241e3fdd01546ce7247725589de32db95f36718d410f9ce9a94fecc8fb205e876fde75ce83f4d01e1bd5d818d\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = b7739ed1cd3e67cf541943326cf76b4476f767465ee53b94c57c83de417ebee5673809b3bed1c8bac2fc4bce29a4e36d6d2083fdea1c12c974\n\nSum = -c590e57ee64fd03e2d08c3d8e5110d08e3d36557d82e0e49b408337a8c9d4298802ae5f0145a9587531a70d2f8af932b8262245428b5c549817d333f2dfaeeec\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -16ca20955a9d8a64cb2be217c089edecc02a75a1ea95fef584925742c18a234974c0a16ee7991e80bd8d4106db385eafaf421ac3373548aa3eb\n\nSum = c590e57ee64fd1bcac71b5b055e5934ba15dd7f56370063369c36e57a6b753269e085d0f4d38bfb711d5579dd1d89d07f266e727b232a497d5b0d9bfbc02d8a5\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 2eb21724781497ad2f57babeea62a20c3ec5d1559867a0968d74351a337db12c17bc8d1d5446b1115b5441530870f67da4275dfd9f3e2928da4\n\nSum = c590e57ee64fc7860b0be6ce861bc2f099db7fb623912b7b0729c019a8183c669c73efe02b195483a4cd2c78244cd59678ac4d62f6887fe686a3eed37ed460ff\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -74b7ff38760864efd658bd6699915be16cc058454b78495ade8be42c9f7470ca9b7a43655e1427ab1bc35a5693dac424a6ed92d10f85a9bea02\n\nSum = -c590e57ee64fc3126776e79d9fca06233bd2ef5570a65e4521183627bdbdbc555e9118508cf63f519bc0caedbffd5b1a913ee8c3603804820a9ce54b1207bdef\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = bbf238886916ca0ba32e9def9f9c8a8e401eb95dea96ef02df9fc25a186e52fbee9ad42b76ba6ca2c381d12cddd4292c5d355341a80c7688d12\n\nSum = -c590e57ee64fe6dfd728dfbe45aee52380b5a00cf1e05e9f09ac582e2714bb589caf2ad038111c5b1b5573a45706ab1f6fd5d5a1ee7ef4a9bf186dca8a9ede12\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -180e4c29718f394424cd5b03b6bdb8911c57fcfe435cfa66d10941f870f8c5eb1e1fd251f14af03f23ccc1841f014bb42a545f476dfeb12e9311\n\nSum = c590e57ee65004b3e18a5820de4a6d25e7c3d310003e0b8716bbfd51d5f0f3e87fdf8e00599d713397255281e66ef419a9d9bb228e8f052764f5f861ccca656f\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 35e2568ae9f1d1dfaccfc211e9c0c6eec9400a0de880a94309992528d428e77772f84e21d0287fa76cc6fb880481ebc43ad20524f895f35a1a6e\n\nSum = c590e57ee64f84896a5f11f575d34b6001f27d4b4d6e7cd9485260629f8f7f1c6ca6f6115b98d776774295dde4d59cdbbceccad097a0a054b501bfb47d81e85c\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -4a4820a05c39969774f623bf6c03ebe0c56dc45bb46e8d1e6b32ee0fc3c6168d26c4d1c0ec7b81f1ea76f164ebd00b2a2a00aacf40175bee62a5\n\nSum = -c590e57ee64edf1b2b57b4cbb92d778ea6b9d9878a0374d4ea81691b09811b105bb6dbf23a57d89264f0e6c83f8d00fe00681644feed56e15fc81103ab9b7dd6\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = efb65fa7b963533d48c77ef80fc7af4bcd72222cabb6232ccf3efeffdde537ce25a8e4129b91273a8654ade9a05ba3dd73740008eec82dd4cd2b\n\nSum = -c590e57ee650e25da7b60146e014f472bfff9809aa8f519db7943f69d9ad09ee75a3427c6127cce7bd27f224b9dec03111fb066956b4903f9f9740cce1aa4ba7\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1138c1cb69317d3aa341c9a4daeba71400f56aae62a98acff1f9f1aec88a4ef01ceac74246fcb531738de63a94fc8b3e9c5ea3fc64101083a00a6\n\nSum = c590e57ee653af8752322840ed720f628f9674c81073b58372e49ef26d4a2a9d46a0391bc170336614b27849de98709a4b321da4ddfb978e9f10df29154edb9f\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 3e0b5c732ba11e1074f0c69e48b78d724733c66368a21409c404debe97f444f4a352acbaef5f077d0e9479ce067043b30cd393f3fdf5d3bde909e\n\nSum = c590e57ee64bc13634cbd149aae35ee47bde6ea3663f74ff300cfdb2d845f902f017586c6d4f83f08c3b4f0c035055d13fc9d340b7b9ed164432aed44e8f4d7c\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -40d9b56339ce561876171a9d37aabd30fcd47dca1171e5467f14c6a9f616b04d67a4abcc8334d637731816e87e35feb10dd3f1b9e50f78ae0fd85\n\nSum = -c590e57ee6477eb692705f8da1357e71591336907a5e0a6e39715088d53b2610882765357563fd101bcf05ca545a0c718f52879fdf4f80cb9a12cf108eca60ed\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0f", "fcbd9704b01\nB = 8501af88f0ea16b3541e4cc9eb2bebef137d8d33cc4485772c43ed28f54a1fcc2012b2d347c8f126d7ae11eff2f00c37b4989c5be30bb4aa5ea14\n\nSum = -c590e57ee669b662e37f5abf13d00d2f0c1c9a8b99ec546361aad255f375bc2742a3487c351c5ba00efef09c77331577460a47c57125c620b643e9eaf36a146b\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -19e791587fec9007654cd8e66ab13c609d121c54fcbd84c6c7d1d7e7ec8ea4c2f65d64c5fb6e43106b8e2497b89124ce5afbcb5672ea1f19f9c96a\n\nSum = c590e57ee681dcbf1554f22c0b1ffead917dd414299cb37ce6967ffec9c333931e70358729843c8130ac95aba47fa1fa5da74000eff25eecae176f093a4effca\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 320ded8a5583fcfeb53e576bcbeac4f04d7135d9e86b2d9d154943c3b97bafb75e3e45e7a913523db81aa7af5589604d2794974e466f3d60deb4c9\n\nSum = c590e57ee5e505ae4a2e1f25a1ae9b7b4d17dd2cccc09f2416d964e55af6d0d31fe259c160f87646a72e6732d5110256b3b35425225d622b81418435c9dd8cc4\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -6ac92340d14f096abc24dad89a0c226c8ea322f5d4afebd1b7197c3ad46016112d87f4a1d51b2691b684fbfa9e627b806d6829de8f7b960f92be3d\n\nSum = -c590e57ee58c3ef1582bf7a516e36f92b60f5a587e2c8cb071d1d52ff215854e52de1519fd5204fa52292dfdc397d8d76b78005941358b63a3e6ca41b0eb09b7\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = c38fe032d37689f58750c36fa28ef6bb22b5969adc3fa13a98650107d8a4bd74d3f940f6da545ba32fae7b42d9b64761953ef1bbea358a2885414a\n\nSum = -c590e57ee80262967da4038a143f8ff2e78646108f25ff7183444ba507d76f9b05a34c8310e682c05495d0863ceff264964dbfa7c064adf6d26d2dca6e22ab13\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1b293c4f2a4955b07d4cf9cc1d45cc155d6bd2a769636d3db29854baaec92ab9ec084850b924e2cd6286b11e7fc09071d99e3a1729c2dfe94b26012\n\nSum = c590e57ee85427f08e8c89ffebfcc05c73370ad4cb77696c2b2f3878e6f6df341d4d931b5097aba49f14ac0312e7da1c843d6fd08119822e75e6e7a8c7bcb7b0\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 204591f038d1bd0df9200064d852185922827251e8123a7ba48f4e4c296d943de71ad69561129a9ac2052c9d5ebb92fde4eb7d91615e7dcee4c6caf\n\nSum = c590e57ee051ca1a363c47a4cc016c3de7f7e17985009b545528289e9fbc9086f4b42a73826eca0c278b0d1b4ef6d74b9a0bfcb7855d40fdb201fbad1074b927\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -5fe04b754c3268a406954183dba07d5b44ea6f2b785ec328cf159c866028f63efb7342f2178753e17d0b0071445b9e91d6d8957adcf041ec8fb91da\n\nSum = -c590e57edcd6e9ef06fe33f3817ba3d0c50c8122b77615c4b8fa50c5514f113d7ba53ce057d487bcbc373c4384d07b29a527b7ef785ca609474879b42a9a4c3a\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 978e4e284013a3b8aef1c8560a5682c81d92c8253b3c40bdb5ed911df117cf71a51767e8ccc4615e1f70c290929feb12a6e244c18888617aed5fec7\n\nSum = -c590e57f0436bdceb586a093522eb1630e0fc08f8790957aba1875a42b7676f9ca936e8f6f3478d6ef5cd590bf6ded0700440dcd769496822af8015f0a6ba2b6\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1de6eefd2a87326445c3f10ce85dd7404e415333ad6a60d2fec88caa6fdcb4b7fd0e7a9ba659533758a665b451f2572cd3c9cc2ccb27019330fb57b5\n\nSum = c590e57f1df3f004d5e49f49fa28603b26659f1fd35e0d8d7a2753591dbc12c51e6b588427dbe3faba2f0c1f2f0a2aea9ba1fcb2fe71c6ff40555058d23c8661\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 37a421334ae5311aedbd9fe500b3b5d09a0ecb466d793e87f10e2875c3b49eacb5b5e5bf712b89c5c842a397ed5046125ba6fca9e084508cf8cc3b60\n\nSum = c590e57e9a4abf4572fa7c4c9f73e9d3fd1227646fd6d15b51924bd7a5d417b01fe6b4273eaa6ece387422b81c8116f29702d7d66d2f6e8c3454807b3b7d413c\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -4c050f8c1804f1e26cf6d682289fc1eac97870ebbb1bc8f986d9d29f3ad005b0337b8f6d108f5fa14a467060174edeca359b5bc92b7c7f509df309c5\n\nSum = -c590e57e64216c306f17017ac9dd7085113e16c83168664dbb77c7ad3ddfc79b09f9ea0c474a0b497ca15e7fb258eed9666fd009f691a3b2d691c2c6b22ba3b3\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 822e62a11be86cb4428d4fd11473d28707e6dbf951364d23eece22b450bccfcb2adbf2f1cc6223d9b46e987947e1e696ac3926a2893f3d052744a74e\n\nSum = -c590e5806ab4d09773c4f94a4aac09f6ed7609eec1d0bafecb09e30f032f706e9adadc191ff9e6d7dccc821f7a8666a590e521749d24912c5a5ffeff246f7c85\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1846501c5e8c58b1b3e4149a0c7c4209f888178b7be5bce3dd681861f40242241add3e89c93c8ffc613bedf52e2936ad3fa59c6d6fa8eff334aff3184\n\nSum = c590e58248cbf5dd61ec57994fc862ab479dc6cda51cc17356c45cef66bbfdd12f5cc421940a561581c123fb17483beb7a1cce2596fa9ca76e722a6f4621eae9\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 3627c270bd6ece96a435da25521ebdd7e6bcd7f2c4a16481e3a0e1381d4a60a4a21e457da38bda1a1b080b498cbcb1784f42fd2520ea12aa36cb19fe8\n\nSum = c590e5771a85bdb1f26c0386ce837bec4b0af5656496efdf4f134d875f066dd6d477ca8f87ffb275da07da4dd1bed4232849a526836b47f2d69f2d53b6b3e2f1\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -7cbca111f98936aa83de74469daa6f3e9d4b85267bd9ac749cda77c78863eef47ea264bc56efba80b9508b32f8608117a1f5f82628931d27822bc6810\n\nSum = -c590e571c76afad23439f904e8a80fc28dcabb6cb732e361ed3eef471be6fa755e3fe746edbfe448c1f289ffed7dfc01fe9066d780564f57f93abbca9b9a995a\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = d1ee4d3ff56c5752a23c2b09397e72de2821c5ee51f6f258a10c6efd9fc76d290846619f28710f85979498b50afc14fc922747afd669644013dd5b1a7\n\nSum = -c590e598cd5d4a59ff5d6c97c6370fb517f1d492a7776f90063b0ddd6702e37c60fc78bb12857911cea37b7263584d7dc815676de6b8880200acea154b59b08b\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -19e70d7b88745dfe68b9cc4f5ef23feb436e282d48f98cf90c3a54f92d0645bee3a05f7ad6859ff918fc90c62b19c3b0cd43edbdaca0dbea4971e9658a\n\nSum = c590e5b5829e6fceb77830fbe999a98127b50302fd0f6a86ea4aea27b846747a07e6fcf5457676e6446137d6bdd8ff4fb7ca747b650b066d65d7dc1e172488e7\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 369c4ea0fd2c78c2ccdd2ee92b020319b3c3c0283fdd9cd5568b988a2aad30431dd35078aafb5db57d571177fd0978bddac2403c180606dc523db43de6\n\nSum = c590e52a3ab5d5c458634254e2f672a322000750741e969d2f6cd12d172480ad1455300e3a0575b068b85d50b58f9737be13073188d0f03b71494bd0fd2fea16\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -54ab99f90d329c2bda29744db303b1e1fec530aba9dd4143a4158969a2466189c93820888ae04b2508b137f01af03eaf6f19f9da19ee87b3fadc4060eb\n\nSum = -c590e4880579ef7241bde94e8c7847badc705f53828751f9975f0e66371d2ddff8740b143f32e88be8e686e2bf5a3ce03d864d7699a813b1777b9239af242c7d\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = f6e0d5df5f494184e07ff2789b494189fbb6c7f04d754f066af590bc6f6242aec332f315af601cfb76a76d4a7270cb692a0922b6a3e8556d922a4c1e84\n\nSum = -c590e6dbe54098694155509e38c61d503ab7e5237d2cdfc2b87fb57e3a8420fe37fe50a0dad4f0eae3d38fad6198e4ecaeae183a12078f53d09ac8099c715242\nA = -c590e5", "7ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -15cfef0c997b655e26f2c5b5cfa1505fbd443dd9d7babd1a0ad0dd636aedd4796c968aef2af9ad00d53fad15d9a005c61996f3cc4fe70c9c83dc3010741\n\nSum = c590e906254d013be2021ad591e76e26706a6815b8c484b6528fec65416e1066957002713e1183f1005f565983aad7aa031e549e6fc57094ca3e4383e7fdbc15\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 3873efd326a5702aca6857cadd04ab87ec67f75426f45e1d79414c026173ab94899cbeb85b5b75bd4001ce3505754cc9dfdccfaa63f6a6d43b80e8d7114\n\nSum = c590e0e0079190d7afd80acd6326fe93cc00903318608df31ee4493d11271dac7291bd142cca0e5dd7dda59dabd460a69b7855d9c2acb5f062de76665e07cbd7\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -49edebe3df9db276361a943c1c259b1591c20eeb453edc9cb941b86cca2e824fcc3455befdd7125dcbbbaf326ac12d960c6e01e1464fcf289657b687f2a\n\nSum = -c590d9ae456d66c1b132d844eb223867ba4560b36f53c42a616cf8cc657e6d252f813847fb9fc50127227684e5c0f5cd890eceb341d21e788e42f843e9b64080\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = bd0a0e2680fd9cc95ea214887ee6b6c889bc9fb7e1cab411c04c72f7d2a2b35818f7686393a21e10bd4810691852542e7ed60f8abdcd18e0787efba0a81\n\nSum = -c5910498291472fe1d0047d5bdd9e46deb3f26000e943fce8d83d700d9ae233ab3a28849bbb346803da142db6a471e9f79cd49571f40dbc46f7b727a4bb3016a\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1f1942c4a42c9200d9a6b16f2417c58d3cb0d544fd8780d5c22fad0038eb58ebce72498d4844f49dc082037f974ccb7b92b67c76116f0faa72ae7242b669\n\nSum = c59112d841ea109440e78563d9eefef201c81e86ae967083f8b7db80d1eaf58551d30519ca6dd79164fe69a29cf1ba22446cb2999f73292241005bf17b37528e\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 2d595b9a41c2b5e81734cd843e9bdc16353775472e3cec09c6afa53d0b35f71c4b425847d9561bfae749362a32cf961afbf8fca85ecce12f5c25a1c7078d\n\nSum = c590671f890ca06c74ac6d2c4d75aabeaaa55312e85a5e1ea9cef0e08e154e2b090eaba869e9f6e4a47ae10b9c1eb0f6ae4fb3ef12b3121d96066c6c8e592b6e\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -7e5f5d432e6516530102bef515977b0c963c50f4e42862df23f09e989c2451a80e2f083c0756a488a14dcaa8d65c000202b19017b837c9ca935f4b171f93\n\nSum = -c58ff0ae92ab03072154949a7143d45278ef77a0ba71a785d5a370e0d30a9b4b4f7e96a395d13e6afeebbd717365d471ee56ba11c472a63c0532558104bedfc5\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = f4d053a4cbca69aad9949b26ec03acc271ae7edd9ac1370aa3f059a34f040b382333dc54bfd04a17c4e7f361b2e0bffafc8ede5824195a9eaa4ad4b16b3c\n\nSum = -c5927a5fcc3b31abeca3998ad99c07626112288a6ad95b24929fed581040757fdce73881c48b02daf09986ea436a3f5ceb6833c31fa2e1691567601a26c7a6c9\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -194e0e5eb62da61a42b5bcd31470c3b603f3b318a18dd85f1d886e3928b3082307eaa5265049fa7960490dca2b80a3d167d227cd81713b596604e4d575bc8\n\nSum = c59395e94d495451e3fea153f3e4361a088004a7d5426c1b94aec44108ad6f5cecc3a80dda0cea9f51b882747258137e171bf021b4fc59f4dcf0106d4ba952fa\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 2b06a66f9858058ff3324e77975c3e2ce1b589bf329d48800af6fdbff850d920cee3667e6ec6408b5001b0b908c2b68ca398112318f9f7d1f10a1723907f9\n\nSum = c58bdb26c0fd6766f3affea389cbe7db25c06d5d56356d3d945347775bddf479ffc9e279e7d1ee88eddb239906749815ae4502fbbc6fe978a001ccdafd89cb10\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -50a582552676a974f6f8b829ed87afff17bf1e319d509785acd59d0cff5d55aecd75d8a540fb25b285ec06052ef3d000cb3a4e65ae0dcbfcf32f0dbe67ff1\n\nSum = -c581afe9b7ae86d4b7053f19649beea6cb935799a553f035f9b9a7fba6d5559e4ecdcd1637c73c8052c6cc52ee1c28d1e5aed9db7261b7356afd6e3dbc213684\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = f35952ea147fcd3fa2f15a7ced1af5a1e91b593fb521112f46cd585d894b10be8ecc13a5ec1baf63cb60678ab5e80c8a2dcc53069131ff4d3918e1d4f147d\n\nSum = -c5a19f36a65a6a8d52a53a63f99a1b957d6e376b7010ad14695d78d67b0d7c86881006188bd27bbf205c8c9c200dc8f5c08ab6b97dcd512f6cb93ed9a361ff9f\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -10b9b7c00a9bbbc7a5cc34ed2f5b3f57bc4e1c36c16acd5caf64054e5f92372d594c4119ac7d83d7590a42b94641a312390018db0286da0ce83f0dc9f1b49e\n\nSum = c5cd0e5da24b67a894402b0eee5dd586ab70e5beb0693e263a54995193663a9b770141379c1f097a49d1a889bbf0c348c6f40ed50bd7bdc11a7869c6106c6d80\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 3c28debbfb98d70940bcdfe1f3153085befc6f7719fbdf2da6848066b8504c1c4a876029f90b3f00ce263055293bf618a25834690cf36bbaa769fa36fc227f\n\nSum = c54e2c560a00226701b76cf03d5de27a8c69b38a6b85dad9f7c903d2e87f9a7d247522e72491460f6a529e5ca2aaaf690cb238b873ffb49d9fb0ecacfedd4e90\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -42b928dc4fac6a8948013ecf0cdddb994835c4cdc9676d14e510fe442e4fd2364196f04d94b82bdeb0e3fcc41cd7e9a19f7de82ecb15b7c020131eda92fc71\n\nSum = -c4bfb037f6e6e861efb090ee610c33e7568790259f747dc6e55d442aadd68c0cc93c7617f83980e8813c0fb7dd28c8aaca6ad8fdde5d2bfec9ae096faa9ef54e\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = d13546ef68e66f9b4edd40ab5e8c6ecf2a592999dac4802750d0a67ed75e42917a43bf79ec7d52c7c772a1899ebea7e3e6dda2c46d9e569622f65c2ed155b3\n\nSum = -c6aa2af8c9ae8be4aada83f66b7f31a8bce5e92c67d8938424a1405903e5502bffc4ee1e333da4bcfd0cb383b19a566372f877a8344b66dbceabc9786dd0e4f2\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1194579e35ebd131fdb15c75f1471529733ffdd2e89513d17f32b87d73765dca50e3446c117a681b409312a4ad2cf10c4a6c10791809c866edac9ac946099f1\n\nSum = c8aff66c9bdaa49eafac0f65d3ddff223b7a5471f7400431ca3a54615d600fc4a163f8fb648bddb5fd6915db1991611805040e0f86f152c8fd3333ef70d632e4\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = 31f10edb58ad5cd24aca136c7733ecc15c86b22bdf0c1eabd8c3f9030b2257546ad3f23f265df7ab4659381b2c9d9c556b2576ee42688739d6234239765e7e3\n\nSum = be1b6eb768e2cef388eebe31f9b21e51b38b351cc8175eba06d49eef04c2936f32167174dcb82297fd4180d0afb5da2c455d158c7a5bf01bdef8c295a4f20390\nA = c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -77576c77d6cffde0210affd12b8a2047226b4327137e38d05d975e227eb56e028a04862956ddba34bc20188b711ad2668f4a114286eda3980d83d36347e4771\n\nSum = -ba32fca1d5cc5f31ecaf5407f376d3aef9f4abc04fd4c6893721d3e50e9141abf356eb2ff6f7a4f9b42983148670d2918e1dff7aa7ae33a6e9dadcb708b4f9dc\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = b5de8dd10836f9f9e501a2718f3eca72bbd3d8ee97a7bbdd58c40ec1e1ca8a3675fcea77b2e594194d9ff44e056b4c12033b725fb1c96ae75f62314d0bb5125\n\nSum = -e388afbf17c495f86aa7298a45f848eb57e5baaee42b1f7de8c2311bfbb8f74549712c05fd3bd11ab8874fb55abb22a37ba3512e733ecd5c472842e8e6f7b179\nA = -c590e57ee64fced18aff6e2f0c6ac05625b1e94f394f42470cae14d12cadea4f5ab6b9d77225fe3b4903825966c78752ae51b6a0a2caca555fd0ffcbd9704b01\nB = -1df7ca403174c726dfa7bb5b398d88953233d15faadbdd36dc141c", @@ -2572,9 +2578,9 @@ "333b2ad9ff45c7f3c7e5934b3127e8b1a55225958ee6ccf42423e81559bf070ad3f3353b78c0ffd41475af49f59d268ef78bdae879f5155e8d1cc07\nP = bd37c850cf7d702bac879f3c21a51a5a4df2b8eb0935861e0753a6eb62261a95\n\nModSqrt = 10e16859c67bdb2eaab52a7c847dbf37162eda258a9f6262ebacfe4cbbbc1080\nA = 21ce7905894faf220bdf4a82a2d855994ca2dc9feaecaa53c7f146e1f49934215695e9bb46ba370b7005a90c399674caa8969eb442e7914d90f749774d7fd194\nP = bd37c850cf7d702bac879f3c21a51a5a4df2b8eb0935861e0753a6eb62261a95\n\nModSqrt = 32a00586adc6f6cc2b1a04e1be0ab569fde235e1436c38b6af92bc5ebd60bc1c\nA = 350da4fd8cf03c12f7dd6ac6d3ab801a3413964083e374662aaf878d6838b97d4feb9e52cd307a25b113e101661a865463ee2480c626aa4e2ec437d72e7bae4c\nP = bd37c850cf7d702bac879f3c21a51a5a4df2b8eb0935861e0753a6eb62261a95\n\nModSqrt = 971f75bc7afa8b4b50f1d4b05e52deac7d4836a08d30546f29649bf1ca6a247\nA = 655ed4c5d8d0afb4f9360372ee1ef1303898d2423e585108a3303faedb55064d2ef25666ed4c4d71fe6063fea1f3142b435714b0e30b339dd791d347c884654\nP = 9810151ad4bc9c5d68fc326395b509f2625bfebca1c3801ad4da7539fdbaa6f7\n\nModSqrt = 48fa882b7cb6a29de9e3769f72eb67f1efd4d2af56f0c7e410c610efcbce2065\nA = 14f3503f33b243800eac1defaab33e04c01e80163fb3efd03860970cc016832431ca4fc6d1b760f4f40166b0b8b3c40dbebc81460cc10890172243770338f090\nP = 9810151ad4bc9c5d68fc326395b509f2625bfebca1c3801ad4da7539fdbaa6f7\n\nModSqrt = 236fd7e397ea7f8bc2a288eb7236ca41936fa702b7dccca56c8852e147511f7d\nA = 1bbd0980feac854782813bcde4da85e8a054549a1b515e065da4236528035e756882e29e762cf60453e375cca9dc6ff637f9558bf86646e3b928f68f82af7efe\nP = 9810151ad4bc9c5d68fc326395b509f2625bfebca1c3801ad4da7539fdbaa6f7\n\nModSqrt = 693f0cbe8c81b0afde0cd2f83e53795dcae6b0cc4ba930ab5c752400d787f14\nA = 7b20f9664b23907e152ab8c9a907f72e8670c1c38ab4cd1411ea7c2159c09aa131afe068929b8e6ad1409b74c04975180d1cd0a9fa74e923c3fd451e8da2c34\nP = 9810151ad4bc9c5d68fc326395b509f2625bfebca1c3801ad4da7539fdbaa6f7\n\nModSqrt = 4a086c50b0bad576501ddb6280743b2c9d247841eb7f14d90561432ff7dca6f0\nA = 4367431ec0cd0d7626538b93a090c30fe0c97c18ca03b97ddae304b619112b5b4d02bf0f041fa3fd673f9ef2ceb07eb2079d11c56dd903b1a87e8252a97b8079\nP = 9810151ad4bc9c5d68fc326395b509f2625bfebca1c3801ad4da7539fdbaa6f7\n\nModSqrt = 18f8433fa468d8065157708f1f1e53b8e31d39c6011fbc2bad93de1b5548e19c\nA = 739c032bb4139c199c40f548d37234298772e4ccb9d3ba28412b60ad23b4c465b0787e2382f1c5a4a87af2d20eb978b7dcbe73f2112249477d15c8a85e54a79\nP = adcd56924f73836ebe4dccfe006ad3b1e5076562cd11b161642cab7af2284659\n\nModSqrt = 49e3c8eef5e067cabd51a7c01384ce05ab8f4342f655559d8a689eb7b20e0106\nA = 18400c2cc3e06b99b4e39c77b9af5ff0e9c683f1708321afa4cd5b6988d13b36b1d9eb4379b7902d9ceb40c03f814b2b6a01b90509bbb4532f13ab1571c4d04a\nP = adcd56924f73836ebe4dccfe006ad3b1e5076562cd11b161642cab7af2284659\n\nModSqrt = 35548c530745f440329325cc8a5fbd90c16a7f0788879a4869bc4d4f73acda0e\nA = 181a3c5ab02566e7166c4d6d2f2bd4a8ecc25991a98d270bde80cf4332766a7068b14240bf5f5dcd45e90ef252596da3eb05b11d68b2063f7b3a825742593ca9\nP = adcd56924f73836ebe4dccfe006ad3b1e5076562cd11b161642cab7af2284659\n\nModSqrt = 1ab7046e6af061ade5f9719008fa4d989007e2a579a134a5b9f19ec410984096\nA = 1008a03e211fab0d45856377079bc96b0776c2d4c0175661f3493246cea2ab0a02a706c85314fb707ad9906bedb2cfd577d62092ae08ff21d7b949373ea954c7\nP = adcd56924f73836ebe4dccfe006ad3b1e5076562cd11b161642cab7af2284659\n\nModSqrt = 2be9e3e7515960d90f115b89f60dedc173a73ce163b4036e85b7b6a76fd90852\nA = 392053a9f0100540a8e1a0c353e922068a84dad3a4a8e8962fbc0bee2b6a06e20d08ade16eb1409a16acfcac3db5c43c421505e07035ca308b15c4a6db0864c0\nP = adcd56924f73836ebe4dccfe006ad3b1e5076562cd11b161642cab7af2284659\n\nModSqrt = 5b301bb93bdcf050183107e36258b53b4805918114ea1c2227b0911d5b4dc077\nA = 55e55e5f94dc3d7aabc921f6469d85fa2e1e92a87347c57afad5872306ae69f9fb99297d1e3e793dd9e8632244208154de5da7114fd876383bf1422f7ece024\nP = d43280ac150f725f4a2a1dceb1c79bcac57855a4eba72ae93762d09bcb2444fb\n\nModSqrt = 2df9609e2f5a5156c3260461b2ee52eacdef00bd8b091479813143a6c5283f71\nA = 2099325b7f12fe77353ddf3f2b2c5ef77b49671b150af954cf84e9675e3ecde3e057084641a633d19533b4712ab49924c8b5c31d591abcc88291f51253fa2a7\nP = d43280ac150f725f4a2a1dceb1c79bcac57855a4eba72ae93762d09bcb2444fb\n\nModSqrt = dfab751710e9008e25e422d1199d6fbec4dc7fba35b4da9d225a746eb4126a0\nA = c006af53d4737fb293584df6ffe2e4cb3fd8dc77fb7c1f13b97bb9c249e3ee5fb9feff7488265b3093906c08a4946f142ac7b491937d24bfba6413366ce371d\nP = d43280ac150f725f4a2a1dceb1c79bcac57855a4eba72ae93762d09bcb2444fb\n\nModSqrt = 26bc030008d6c60a09fb0e16093a649fcb40c6c21a8e2da2353ba4b07c4f85d5\nA = 1eaabcfad2ed349ac9356e6f4da0b301266ddde811cb0f817aba8f5c10fb8b8ba9d0ef2dd386b668f16eac296118fdb8cb7afe1b865648c81c2fa3cf21f2711b\nP = d43280ac150f725f4a2a1dceb1c79bcac57855a4eba72ae93762d09bcb2444fb\n\nModSqrt = 35051b1482ec2578f3dc0000a422cb5111e43c37f1ac20b1844d3de2128c4556\nA = 315ff9de178681116f2a5fa78eebf4818e1d680435eacdfaf9d0e5c4fc01fc034b352c82fd52c81ca30d68864952dacc99d08269c9dd7ca99ccf22da98c3840\nP = d43280ac150f725f4a2a1dceb1c79bcac57855a4eba72ae93762d09bcb2444fb\n\nModSqrt = a5474252885cacf004c460a7793ff0b0a2187bb1a9ed700ae3470199faef71f\nA = 19856fc1351c4b02abf573bb2fc6ff92355fa369d62bb8f2260fa772fb1693f509a56cad661930abcac049dd70f4b16bed4a4c172e73e772504c9990ce7f92f\nP = dc315fd52684fba79e577a204de9053b11a5d7a414263fec9eff6ff62188829d\n\nModSqrt = 12daf4722387ecf47de1b0b6b110a062dc5ea2685bc9dbde66b8d15622985029\nA = fb8479787069116abc42abfd7dc0c24d2ad04fe0c04b42a6dff714af715d17e0fd77855f950f264542b06d48e8818de813ddb7975798b7debefcdaa5ff86beb\nP = dc315fd52684fba79e577a204de9053b11a5d7a414263fec9eff6ff62188829d\n\nModSqrt = 397996ed5c0ac6ad32e43c337e9de421b87774cc162bf7ac7bbedf4a9029255e\nA = 5aa04353321bd2de92481be740357f979da464b53aa39111fdbb734cf7af6b3857d1baa08d3a126a3dd34a2fbae2bf2b84e900686c1d31505b390185acef5fe5\nP = dc315fd52684fba79e577a204de9053b11a5d7a414263fec9eff6ff62188829d\n\nModSqrt = 2cf4b844a54ba359dc592ef1b49f43fcfeae84d1087edfefdd0b9174b43c0a3c\nA = 365a8650510bcfd8fa87432f167cf487234c215857403b9270b5eebeafa48cd6da47fd60dc311b94d1d72baad0447c31f0b212d755f46c256e16e5e015e6546e\nP = dc315fd52684fba79e577a204de9053b11a5d7a414263fec9eff6ff62188829d\n\nModSqrt = 9277c73043ff767c3fa606f0cd66b9d854a600c8c18287f191ce277758c3f31\nA = 62cec3901626d03e8df66299a87c54b1f7a55cafc99f0b6bba1b5d51a3d2b7d2171c9135a9d8a5346d436e0136b12e515e703e3cd84ecfe154eb94c6772a6d72\nP = dc315fd52684fba79e577a204de9053b11a5d7a414263fec9eff6ff62188829d\n\nModSqrt = 4189e5a90c1b1abdc1c7c05b3587e6f362e06f927b6cf5f0d271aab3d6f90765\nA = 336b8d0f9dac842c696bc020f49c6aa023842c16f2052eb02f17959006554ca0012042c80c72590f21c6bf5a3714c9cb552aa69730e33db93a56a909b273f39\nP = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f\n\nModSqrt = 36ccd38cb5a6bd8a73bca55936a2227c503664422c2296faf7e2b1c6a375a43a\nA = fecfd60a376befbe48d2c4f6d070d716d2f403cd5daefbce62b720df44deb605162c8f20f49fd7ec30d4f8e70d803d45b3a44b5d912baa3410d991165d7c507\nP = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f\n\nModSqrt = 198fc8569be172dc9b71023ed3d42d2ba94bae4099643f6517ab03f540527fdb\nA = 65bebdb00a96fc814ec44b81f98b59fba3c30203928fa5214c51e0a97091645280c947b005847f239758482b9bfc45b066fde340d1fe32fc9c1bf02e1b2d0ec\nP = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f\n\nModSqrt = 21b7f74c30ded681d6138cf8e6fd798f32a049e94138e982f1845df3dc9e686f\nA = 9a30b791c1ba4f394b4e3dcd5837e474237f4fe8987b255c098a47b2c14c598ec69d2beae444dd4fe9c4ede8173d2b187677cc706a3c28f3b81627d8a5fb6fd\nP = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f\n\nModSqrt = a1d52989f12f204d3d2167d9b1e6c8a6174c0c786a979a5952383b7b8bd186\nA = 2eee37cf06228a387788188e650bc6d8a2ff402931443f69156a29155eca07dcb45f3aac238d92943c0c25c896098716baa433f25bd696a142f5a69d5d937e81\nP = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f\n\n\n# NotModSquare tests.\n#\n# These test vectors are such that NotModSquare is not a square modulo P.\n\nNotModSquare = 03\nP = 07\n\nNotModSquare = 05\nP = 07\n\nNotModSquare = 06\nP = 07\n\nNotModSquare = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951e\nP = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f\n\n\n# ModInv tests.\n#\n# These test vectors satisfy ModInv * A = 1 (mod M) and 0 <= ModInv < M.\n\nModInv = 00\nA = 00\nM = 01\n\nModInv = 00\nA = 01\nM = 01\n\nModInv = 00\nA = 02\nM = 01\n\nModInv = 00\nA ", "= 03\nM = 01\n", }; -static const size_t kLen36 = 868364; +static const size_t kLen37 = 868364; -static const char *kData37[] = { +static const char *kData38[] = { "# Negation tests.\n#\n# The following tests satisfy A = -B (mod P).\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000000000\nB = 0000000000000000000000000000000000000000000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000000001\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffffffe\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000000003\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffffffc\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000000007\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffffff8\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000000000f\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffffff0\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000000001f\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffffffe0\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000000003f\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffffffc0\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000000007f\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffffff80\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000000000ff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffffff00\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000000001ff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffffe00\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000000003ff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffffc00\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000000007ff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffff800\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000000fff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffff000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000001fff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffffe000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000003fff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffffc000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000007fff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffff8000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000000ffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffff0000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000001ffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffe0000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000003ffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffffc0000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000007ffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffff80000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000000fffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffff00000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000001fffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffe00000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000003fffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffffc00000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000007fffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffff800000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000000ffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffff000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000001ffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffe000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000003ffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffffc000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000007ffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffff8000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000000fffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffff0000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000001fffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffe0000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000003fffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffffc0000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000007fffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffff80000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000000ffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffff00000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000001ffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffe00000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000003ffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffffc00000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000007ffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffff800000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000000fffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffff000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000001fffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffe000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000003fffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffffc000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000007fffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffff8000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000000ffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffff0000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000001ffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffe0000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000003ffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffffc0000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000007ffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffff80000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000000fffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffff00000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000001fffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffe00000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000003fffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffffc00000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000007fffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffff800000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000000ffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffff000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000001ffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffe000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000003ffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffffc000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000007ffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffff8000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000000fffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffff0000000000000\n\nTest = Negate\nA ", "= 000000000000000000000000000000000000000000000000001fffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffe0000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000003fffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffffc0000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000007fffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffff80000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000000ffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffff00000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000001ffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffe00000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000003ffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffffc00000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000007ffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffff800000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000000fffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffff000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000001fffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffe000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000003fffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffffc000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000007fffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffff8000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000000ffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffff0000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000001ffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffe0000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000003ffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffffc0000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000007ffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffff80000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000000fffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffff00000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000001fffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffe00000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000003fffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffffc00000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000007fffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffff800000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000000ffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffff000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000001ffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffe000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000003ffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffffc000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000007ffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffff8000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000000fffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffff0000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000001fffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffe0000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000003fffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffffc0000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000007fffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffff80000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000000ffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffff00000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000001ffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffe00000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000003ffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fffc00000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000007ffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fff800000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000000fffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fff000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000001fffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffe000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000003fffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ffc000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000007fffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ff8000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000000ffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000ff0000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000001ffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fe0000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000003ffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000fc0000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000007ffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000f80000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000000fffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000f00000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000001fffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000e00000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000003fffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000c00000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000007fffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000800000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000000ffffffffffffffffffffffff\nB = ffffffff00000001000000000000000000000000000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000001ffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffffffff000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000003ffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffffffd000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000007ffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffffff9000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000000fffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffffff1000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000001fffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffffffe1000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000003fffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffffffc1000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000007fffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffffff81000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000000ffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffffff01000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000001ffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffffe01000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000003ffffffffffffffffffffffffff\nB = ffffffff0000", "0000fffffffffffffffffffffc01000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000007ffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffff801000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000000fffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffff001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000001fffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffffe001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000003fffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffffc001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000007fffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffff8001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000000ffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffff0001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000001ffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffe0001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000003ffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffffc0001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000007ffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffff80001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000000fffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffff00001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000001fffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffe00001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000003fffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffffc00001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000007fffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffff800001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000000ffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffff000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000001ffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffe000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000003ffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffffc000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000007ffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffff8000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000000fffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffff0000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000001fffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffe0000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000003fffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffffc0000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000007fffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffff80000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000000ffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffff00000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000001ffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffe00000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000003ffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffffc00000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000007ffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffff800000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000000fffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffff000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000001fffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffe000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000003fffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffffc000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000007fffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffff8000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000000ffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffff0000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000001ffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffe0000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000003ffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffffc0000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000007ffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffff80000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000000fffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffff00000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000001fffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffe00000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000003fffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffffc00000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000007fffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffff800000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000000ffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffff000000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000001ffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffe000000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000003ffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffffc000000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000007ffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffff8000000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000000fffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffff0000000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000001fffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffe0000000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000003fffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffffc0000000000001000000000000000000000000\n\nTest = Negate\nA = 000000000000000000000000007fffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffff80000000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000000ffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffff00000000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000001ffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffe00000000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000003ffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffffc00000000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000000000000000007ffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffff800000000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000000fffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000fffffffff000000000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000001fffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffe000000000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000003fffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffffc000000000000001000000000000000000000000\n\nTest = Negate\nA = 0000000000000000000000007fffffffffffffffffffffffffffffffffffffff\nB = ffffffff00000000ffffffff8000000000000001000000000000000000000000\n\nTest = Negate\nA = 00000000000", @@ -2584,9 +2590,9 @@ "00000000000000000000000000000\n\nTest = PointAdd\nA.X = bcba3eebf2b0af1174a4b874b155b4dc74bd5fb57c70214561aaabb105635580\nA.Y = 1dc33ce74f651305dd89263c1d314edd2773ef6dd043742a6f47f29542b9eb07\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = f9e0b98b1a87b6c49c4cc5fc47efd157e5f12cf5543d71cfa38187a3793d6791\nB.Y = 3b2de94df438554381037c9f9d2c21991c6975d83c0acd42ef1a8419a040436f\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = 6bd7b4e06d7862f749901a398417e941618c11c48dffcce719e4026220b77477\nResult.Y = 1e2ffd71e8c206acc19032d26a53ea275fefea51a2c90e4dd3c8b7c6acc51ab6\n\nTest = PointAdd\nA.X = d71c6da129f6e867bf525563e1d8bdbd2f90a9bac7de867a6ea2317a5d6cb507\nA.Y = 125e0cc1ba0c93caa19edb419a764f88d955289c4c6e77d02d90e4e31d47c9a2\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = 334c2200ec08896808ab12a76820ff674fcdccff6d85afa2e586b31fc944de33\nB.Y = b5ee8cfa25896d4075588c60926a2582a099c7a5acbcfec78fba457c4886301c\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = 93e9d4e6f7736f80da1b00d221024ccfd17f2927d6b505a5bcefe0801fe6f0a9\nResult.Y = 4824eeb2d5da27d57e1d50c2dae000acdcddcbaf534d8b7e7d97854ed3dc939e\n\nTest = PointAdd\nA.X = 0daba41be2b418e7d160a363e6cbdcbff5d433f96b0d5be3812c0a7adfab8ed4\nA.Y = 3ae4dd97c4d2987a63df16c5fb8c494164e14b93eeebd5585d74bd26e2201499\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = 87135fb06383ec8b282fdc028eb38fd447ac1ecc76922e37f0cc454febb11aee\nB.Y = 98ab966087531eb3eea1e5e36189271a02f7ee8e381f9c78d6f346a301f96f81\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = 2e096c2fabf06a5b838c7e07fda436d068dd1c4e3ff4f5704f89ab9df6b4be5b\nResult.Y = 59ca6304321ae1e41bfa30f52e7ef27fceeade8507f20837654383d70e8a41df\n\nTest = PointAdd\nA.X = 356db98c21c2169899b9b296edcacb7d531524f2572913b75edb7b73196f5682\nA.Y = 47a26c52b1b2f229109e8aca7f5b4af768baf053a15ff8f58051c7e4e1b7f818\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = 56956f6d3bbbd4aece299f29bb4c537355f312f391c207c6ec6efe646362b288\nB.Y = a69fc73c0636c9928764cc9d6e1482577b6ca06f277c098f571108356a858cab\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = ca0ddd995a77173a1438473bf82734cb3a09fafe7050bda9bd592a1cf078fa38\nResult.Y = 379da87952d36c5396b934a2ce8b003ee8fc4155b3b488f2f550734e2a82ce7d\n\nTest = PointAdd\nA.X = 13764cccab4addf5cf4ef5fb4af60a93e08fa3a0a72653abf013e3427abbf82c\nA.Y = c3dc524745368a0dc4948f897402f4b5a280acbf74f5ea9180d038a483d4090a\nA.Z = 2903a04d6615ec23cd63ba46287be2e7a8eeee030bed49e7a94769386a46f209\nB.X = a5c5921f9a8c569f661693bfae1b167937987c2fe951956ef0e34c426965c648\nB.Y = f8a299605e690a78e583371e59cf2b848d475afc35bb1448981c53ad8c0a6581\nB.Z = 9c3fde73f1899a76eb40f055fce02ab9c1b1ce7d43b54c54f93ffe56830e3f83\nResult.X = 4073318e85bc2d7637fd0129fa8eb86b6ca20334542795f3bb1de54b90a16b69\nResult.Y = 9a1b1e7435d98287b244d2337f8bf0e9c87b40677bf1ea2a9dedbd07c5241ee0\n\nTest = PointAdd\nA.X = f72706b81fca2b1530238bdc2c0c454b5116ee54fdf156bc62bffea73f0645af\nA.Y = c6e66d9ae8fc5e164e6a985f866aae41f3c4e4281a0eea9173e4e77cb29e4bc7\nA.Z = 6a84f9c37634b8aefdae477e9efec66f20d2f6159575f40c7b21a1e0732e8c49\nB.X = bcf21b020cb8fb4b2ef7f639240d221dd96fc08d7fa575c2e7037fc84d8f03b2\nB.Y = abc500f82f06f0d69a920c8d80eef9dd2310cd09e0d89d80fc7397aa4e361dd1\nB.Z = 5031c46be15f9d4fa9a347be998c07f9cc7f754999fe0f9c3c8b38e0d85dda9f\nResult.X = 401b010df4dd21ed96f7c8babb401db74b3b6ee7f55c498803203855b5911de9\nResult.Y = 05e585cca569bc22855f7df32b20a4a45315a1ca5d98d2b94792eb748ec8744b\n\nTest = PointAdd\nA.X = 7b44b52e9fb1bc58c81a2adc9bfedcc42bba3cb34ec666e51cba8050d48fdb37\nA.Y = 2b7e629fef7b4e175f5eb30c421e60f26fefdf5f9fed743cad4a8e638c18696a\nA.Z = 68f31acd92bed56a4556e954b0c51f9f8f3b797bc853d1b2b01b228657bd317f\nB.X = 3d293c36fd065d1f054eb218932d60feb00d1bd4bee0236cb9788d9723df9571\nB.Y = c8b893b8e9ff935f2e060227334e32ba144f4046b1bd4961f4479ad3fef1c7d2\nB.Z = 9c072deacfe5c025c763efebb4feab79e954c47d3e86ef4abfbd1901f50d8495\nResult.X = 245582d32415c77a2e3abbf844cf1a40c31466c1418cd279747e5394744509be\nResult.Y = 5c2f80f947d2df7fb1f829d05c6175f6fce7cd2d7f79fd7aa865f930e910e9fd\n\nTest = PointAdd\nA.X = 75ab91b8a46a5a1abf827cb209373b28cbb8f83a06adf6a9b10ac76e22493ecc\nA.Y = abd989a78d1bcee7e63920d7e637f9763901da408a9d8c731e4e65a6fc52e1a1\nA.Z = 188a24145243ca066c35870e5a8835532ad512fbdcf5f5ae4033b262fa9aa6b8\nB.X = 5d6e885ec19069b2aa51a2723c98da1f03e8dbc344fe1de0bdb42910ba8bfe96\nB.Y = a1f86e66eacc38db7e47154a324a16031705b4803addf074037d3320b50dbef8\nB.Z = 5cff900a783687049a7d497b1f8cd837c479a61f3fef4b7ced180ea82770bc75\nResult.X = a4029333b9b9db434eea002bd6d4e0d9f3e5317c685511a30ecae351fc60d164\nResult.Y = 8e9302c77bc6f560c9bec473ef1ffb76b357c0d4794192696bda8e99651798ee\n\nTest = PointAdd\nA.X = 8d1867f890abaa26b634d5d5cdeb0f4abc7ebd16d807479f837fcece592dc0eb\nA.Y = fc68c801999c12070eddeb3169219c491f9e8fe29cdc4e3cb698ee8471934076\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = 8d1867f890abaa26b634d5d5cdeb0f4abc7ebd16d807479f837fcece592dc0eb\nB.Y = fc68c801999c12070eddeb3169219c491f9e8fe29cdc4e3cb698ee8471934076\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = 8da53dc540c1450c73082ad3b799d0d18a69a747fcd81f847e9e60484dcf579a\nResult.Y = c20c398e99e0513a452b5e9b6331863d1ac3eee6fcf73021f505a0b62daf6f80\n\nTest = PointAdd\nA.X = 328b983f6490312e37e8eeb2121cd622cf85dbcf78af93df74fbca961ce3bfa2\nA.Y = 1c8a0aea2f2e540770644f48c41810bf7f9e1a782b2f6397712b17c88109fbce\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = 328b983f6490312e37e8eeb2121cd622cf85dbcf78af93df74fbca961ce3bfa2\nB.Y = 1c8a0aea2f2e540770644f48c41810bf7f9e1a782b2f6397712b17c88109fbce\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = b6f3c548944862dfdea2314ca6d6a88780b08da41becf58384af80544aca4966\nResult.Y = 95afecb4ad3195485a2aad3cd14008c9a7c1e0c02656c3c2b7cd5f2e7f3a4474\n\nTest = PointAdd\nA.X = 3ae6b24cadd6a14612d24a1c094a35c6be56db8f53a6d526e0ede03923918443\nA.Y = de8a23105c5f5c88b77dbde74e30a56f8865d78a5ce9060cff9f2927dbd196b6\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = 3ae6b24cadd6a14612d24a1c094a35c6be56db8f53a6d526e0ede03923918443\nB.Y = de8a23105c5f5c88b77dbde74e30a56f8865d78a5ce9060cff9f2927dbd196b6\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = 6f125b512c3c736f39781fcd89adb653e515b4ce1e1204505f08d0a8480052ef\nResult.Y = e1acfccf1b9950067adf0f06e0d9703a8b1ac1bbdbb35b08df28cd56c24ae5a0\n\nTest = PointAdd\nA.X = f317c6c02d9a6ff0799b3b4a22f83c95324831baad336ecd0c631ea04a5e11c8\nA.Y = b624e8057d411031f41b30cd02f56c24e89262e885007b7a1ed1861feb7ffcda\nA.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nB.X = f317c6c02d9a6ff0799b3b4a22f83c95324831baad336ecd0c631ea04a5e11c8\nB.Y = b624e8057d411031f41b30cd02f56c24e89262e885007b7a1ed1861feb7ffcda\nB.Z = 00000000fffffffeffffffffffffffffffffffff000000000000000000000001\nResult.X = e805208c74602e54482d113f16fcf6e4600436f8af49705cdd05ecfb0e6d45fd\nResult.Y = baded898bfead1b4eb3ab3bbd0129837efc85823dabe82718a975bd603f96d9e\n\nTest = PointAdd\nA.X = 3a6802aeaebc67046a1e75152822fa8bab04c11ae2b816f42c073daee3f13274\nA.Y = d6522c882d18e32bc5ea1fa59efbce8ce2369f2154dcc00e6fb17500f50f8ebf\nA.Z = bea747d5bb1c6ee865249d7a22378f3c760916e163497f4b6ef4da8adcb5dfab\nB.X = 3a6802aeaebc67046a1e75152822fa8bab04c11ae2b816f42c073daee3f13274\nB.Y = d6522c882d18e32bc5ea1fa59efbce8ce2369f2154dcc00e6fb17500f50f8ebf\nB.Z = bea747d5bb1c6ee865249d7a22378f3c760916e163497f4b6ef4da8adcb5dfab\nResult.X = 5a2891dca746889d413d8dc1a69b715954baf692689fc32d9aa10b7431a5c149\nResult.Y = 91db7288536b4f6d78e5a787ecbb5094f6834515038cb070a7fa4870af8045f0\n\nTest = PointAdd\nA.X = c76ddbcb15bc63f82807804536a0d25fd7a639c71adf953ad6cc8f68d915f485\nA.Y = e3a4f830809f5e91b68699c05fa9faa7c3d1f9d1b1c982c282508fa18d695537\nA.Z = eb372f19c7b9466a116363ad9114a89ad287523da318d915f59ed5e558bd824e\nB.X = c76ddbcb15bc63f82807804536a0d25fd7a639c71adf953ad6cc8f68d915f485\nB.Y = e3a4f830809f5e91b68699c05fa9faa7c3d1f9d1b1c982c282508fa18d695537\nB.Z = eb372f19c7b9466a116363ad9114a89ad287523da318d915f", "59ed5e558bd824e\nResult.X = c5485a3509f55c7cc33d098fb0bfe1b198a9f26ce0ebc29bec5baa29ef6f74a2\nResult.Y = 60e949a551aa94afc9a3efe411a3c63ecb851ef1738ed24c88f86cf85ec01020\n\nTest = PointAdd\nA.X = ca72936509631f09d2a3ac14fb786daabb15520ef01de4298c7fd71653e89194\nA.Y = 02aeb6b6f04cd8125887baa18e6e79ba2b0acfa9a2443e9eea36ca7715eb8eb3\nA.Z = 8b4ef1a52fa42c711445e0463003f2ed38ace6583bf08198e9a0b938b4589479\nB.X = ca72936509631f09d2a3ac14fb786daabb15520ef01de4298c7fd71653e89194\nB.Y = 02aeb6b6f04cd8125887baa18e6e79ba2b0acfa9a2443e9eea36ca7715eb8eb3\nB.Z = 8b4ef1a52fa42c711445e0463003f2ed38ace6583bf08198e9a0b938b4589479\nResult.X = 8d3b35c5661faafa83510ab9b3f1642bb121e7686ed4ae61323ddee2c7247f93\nResult.Y = 1a22ef5df156ca80235fe3cd1ca3152e21a3e17b2a34dd93b2003e3274a8a2fb\n\nTest = PointAdd\nA.X = db7b023fbe056819027fa09c5a2a0d777a53fb78c00bf4f31f46b63a7494bbfe\nA.Y = 59affcbf4628d572ee56b95087d30e765bb518b123e879b25df9960dab706a32\nA.Z = 1f7c7226d78e51478c683bbb6afe01abc2225dbfc773d0806d30ff5f827b76c8\nB.X = db7b023fbe056819027fa09c5a2a0d777a53fb78c00bf4f31f46b63a7494bbfe\nB.Y = 59affcbf4628d572ee56b95087d30e765bb518b123e879b25df9960dab706a32\nB.Z = 1f7c7226d78e51478c683bbb6afe01abc2225dbfc773d0806d30ff5f827b76c8\nResult.X = fba400ae656ec3103c5c5f531d2a0f7368031e01a48a91f1a4f3138d294b13be\nResult.Y = 160e358ad1f059eb62722df01a7440048a1db21ecaea8698efa9677db6e9ff97\n", }; -static const size_t kLen37 = 58702; +static const size_t kLen38 = 58702; -static const char *kData38[] = { +static const char *kData39[] = { "# Tests from NIST CAVP 186-4 ECDSA2VS Test Vectors, Signature Generation Test\n# http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip\n#\n# NIST's files provide message and digest pairs. Since this is a low-level test,\n# the digests have been extracted. P-521 test vectors were fixed to have the\n# right number of leading zeros.\n\nCurve = P-224\nPrivate = 16797b5c0c7ed5461e2ff1b88e6eafa03c0f46bf072000dfc830d615\nX = 605495756e6e88f1d07ae5f98787af9b4da8a641d1a9492a12174eab\nY = f5cc733b17decc806ef1df861a42505d0af9ef7c3df3959b8dfc6669\nDigest = 07eb2a50bf70eee87467600614a490e7600437d077ec651a27e65e67\nK = d9a5a7328117f48b4b8dd8c17dae722e756b3ff64bd29a527137eec0\nR = 2fc2cff8cdd4866b1d74e45b07d333af46b7af0888049d0fdbc7b0d6\nS = 8d9cc4c8ea93e0fd9d6431b9a1fd99b88f281793396321b11dac41eb\n\nCurve = P-224\nPrivate = cf020a1ff36c28511191482ed1e5259c60d383606c581948c3fbe2c5\nX = fa21f85b99d3dc18c6d53351fbcb1e2d029c00fa7d1663a3dd94695e\nY = e9e79578f8988b168edff1a8b34a5ed9598cc20acd1f0aed36715d88\nDigest = bde0fbb390fb05d0b75df5bd0d0a4ea29516125f19830e3b0c93b641\nK = c780d047454824af98677cf310117e5f9e99627d02414f136aed8e83\nR = 45145f06b566ec9fd0fee1b6c6551a4535c7a3bbfc0fede45f4f5038\nS = 7302dff12545b069cf27df49b26e4781270585463656f2834917c3ca\n\nCurve = P-224\nPrivate = dde6f173fa9f307d206ce46b4f02851ebce9638a989330249fd30b73\nX = fc21a99b060afb0d9dbf3250ea3c4da10be94ce627a65874d8e4a630\nY = e8373ab7190890326aac4aacca3eba89e15d1086a05434dd033fd3f3\nDigest = c2c03fe07e10538f6a38d5831b5dda9ce7478b3ed31323d60617dc95\nK = 6629366a156840477df4875cfba4f8faa809e394893e1f5525326d07\nR = 41f8e2b1ae5add7c24da8725a067585a3ad6d5a9ed9580beb226f23a\nS = a5d71bff02dce997305dd337128046f36714398f4ef6647599712fae\n\nCurve = P-224\nPrivate = aeee9071248f077590ac647794b678ad371f8e0f1e14e9fbff49671e\nX = fad0a34991bbf89982ad9cf89337b4bd2565f84d5bdd004289fc1cc3\nY = 5d8b6764f28c8163a12855a5c266efeb9388df4994b85a8b4f1bd3bc\nDigest = 5d52747226f37a5afcd94d1b95867c0111bcb34402dad12bee76c1b7\nK = 1d35d027cd5a569e25c5768c48ed0c2b127c0f99cb4e52ea094fe689\nR = 2258184ef9f0fa698735379972ce9adf034af76017668bfcdab978de\nS = 866fb8e505dea6c909c2c9143ec869d1bac2282cf12366130ff2146c\n\nCurve = P-224\nPrivate = 29c204b2954e1406a015020f9d6b3d7c00658298feb2d17440b2c1a4\nX = 0e0fc15e775a75d45f872e5021b554cc0579da19125e1a49299c7630\nY = cb64fe462d025ae2a1394746bdbf8251f7ca5a1d6bb13e0edf6b7b09\nDigest = a1ab56bd011b7e6c7e066f25333d08cf81ac0d9c1abfa09f004ab52f\nK = 39547c10bb947d69f6c3af701f2528e011a1e80a6d04cc5a37466c02\nR = 86622c376d326cdf679bcabf8eb034bf49f0c188f3fc3afd0006325d\nS = 26613d3b33c70e635d7a998f254a5b15d2a3642bf321e8cff08f1e84\n\nCurve = P-224\nPrivate = 8986a97b24be042a1547642f19678de4e281a68f1e794e343dabb131\nX = 2c070e68e8478341938f3d5026a1fe01e778cdffbebbdd7a4cd29209\nY = cde21c9c7c6590ba300715a7adac278385a5175b6b4ea749c4b6a681\nDigest = 8ef4d8a368fad480bac518d625e97206adcafa87c52aef3d179cbfa9\nK = 509712f9c0f3370f6a09154159975945f0107dd1cee7327c68eaa90b\nR = 57afda5139b180de96373c3d649700682e37efd56ae182335f081013\nS = eb6cd58650cfb26dfdf21de32fa17464a6efc46830eedc16977342e6\n\nCurve = P-224\nPrivate = d9aa95e14cb34980cfddadddfa92bde1310acaff249f73ff5b09a974\nX = 3a0d4b8e5fad1ea1abb8d3fb742cd45cd0b76d136e5bbb33206ad120\nY = c90ac83276b2fa3757b0f226cd7360a313bc96fd8329c76a7306cc7d\nDigest = 28fabbac167f3d6a20c2f5a4bcee527c96be04bdd2c596f09d8fbab7\nK = 1f1739af68a3cee7c5f09e9e09d6485d9cd64cc4085bc2bc89795aaf\nR = 09bbdd003532d025d7c3204c00747cd52ecdfbc7ce3dde8ffbea23e1\nS = 1e745e80948779a5cc8dc5cb193beebb550ec9c2647f4948bf58ba7d\n\nCurve = P-224\nPrivate = 380fb6154ad3d2e755a17df1f047f84712d4ec9e47d34d4054ea29a8\nX = 4772c27cca3348b1801ae87b01cb564c8cf9b81c23cc74468a907927\nY = de9d253935b09617a1655c42d385bf48504e06fa386f5fa533a21dcb\nDigest = 50dd74b5af40978e809cee3eb41195402ebb5056e4437f753f9a9d0d\nK = 14dbdffa326ba2f3d64f79ff966d9ee6c1aba0d51e9a8e59f5686dc1\nR = ff6d52a09ca4c3b82da0440864d6717e1be0b50b6dcf5e1d74c0ff56\nS = 09490be77bc834c1efaa23410dcbf800e6fae40d62a737214c5a4418\n\nCurve = P-224\nPrivate = 6b98ec50d6b7f7ebc3a2183ff9388f75e924243827ddded8721186e2\nX = 1f249911b125348e6e0a473479105cc4b8cfb4fa32d897810fc69ffe\nY = a17db03b9877d1b6328329061ea67aec5a38a884362e9e5b7d7642dc\nDigest = 9fee01807ab6c43a794abf6dcd6118915252ca7d3a31a1ff96b88a8d\nK = ab3a41fedc77d1f96f3103cc7dce215bf45054a755cf101735fef503\nR = 70ccc0824542e296d17a79320d422f1edcf9253840dafe4427033f40\nS = e3823699c355b61ab1894be3371765fae2b720405a7ce5e790ca8c00\n\nCurve = P-224\nPrivate = 8dda0ef4170bf73077d685e7709f6f747ced08eb4cde98ef06ab7bd7\nX = 7df67b960ee7a2cb62b22932457360ab1e046c1ec84b91ae65642003\nY = c764ca9fc1b0cc2233fa57bdcfedaab0131fb7b5f557d6ca57f4afe0\nDigest = c349032f84384b913bd5d19b9211ddce221d66a45e8a051878254117\nK = 9ef6ebd178a76402968bc8ec8b257174a04fb5e2d65c1ab34ab039b9\nR = eef9e8428105704133e0f19636c89e570485e577786df2b09f99602a\nS = 8c01f0162891e4b9536243cb86a6e5c177323cca09777366caf2693c\n\nCurve = P-224\nPrivate = 3dbe18cd88fa49febfcb60f0369a67b2379a466d906ac46a8b8d522b\nX = b10150fd797eb870d377f1dbfa197f7d0f0ad29965af573ec13cc42a\nY = 17b63ccefbe27fb2a1139e5757b1082aeaa564f478c23a8f631eed5c\nDigest = 63fe0d82cf5edf972e97316666a0914432e420f80b4f78ceb92afd1d\nK = 385803b262ee2ee875838b3a645a745d2e199ae112ef73a25d68d15f\nR = 1d293b697f297af77872582eb7f543dc250ec79ad453300d264a3b70\nS = 517a91b89c4859fcc10834242e710c5f0fed90ac938aa5ccdb7c66de\n\nCurve = P-224\nPrivate = c906b667f38c5135ea96c95722c713dbd125d61156a546f49ddaadc6\nX = 3c9b4ef1748a1925578658d3af51995b989ad760790157b25fe09826\nY = 55648f4ff4edfb899e9a13bd8d20f5c24b35dc6a6a4e42ed5983b4a0\nDigest = 9b44ee16e576c50c0b6b37ac1437bf8f013a745615012451e54a12f2\nK = b04d78d8ac40fefadb99f389a06d93f6b5b72198c1be02dbff6195f0\nR = 4bdd3c84647bad93dcaffd1b54eb87fc61a5704b19d7e6d756d11ad0\nS = fdd81e5dca54158514f44ba2330271eff4c618330328451e2d93b9fb\n\nCurve = P-224\nPrivate = 3456745fbd51eac9b8095cd687b112f93d1b58352dbe02c66bb9b0cc\nX = f0acdfbc75a748a4a0ac55281754b5c4a364b7d61c5390b334daae10\nY = 86587a6768f235bf523fbfc6e062c7401ac2b0242cfe4e5fb34f4057\nDigest = 3c89c15dee194b3223e7b53a8a5845d4873a12a2f1581d5413359828\nK = 854b20c61bcdf7a89959dbf0985880bb14b628f01c65ef4f6446f1c1\nR = a2601fbb9fe89f39814735febb349143baa934170ffb91c6448a7823\nS = bf90f9305616020a0e34ef30803fc15fa97dffc0948452bbf6cb5f66\n\nCurve = P-224\nPrivate = 2c522af64baaca7b7a08044312f5e265ec6e09b2272f462cc705e4c3\nX = 5fad3c047074b5de1960247d0cc216b4e3fb7f3b9cd960575c8479fc\nY = e4fc9c7f05ff0b040eb171fdd2a1dfe2572c564c2003a08c3179a422\nDigest = 2b7faf36fdf0e393ddeb9fc875dd99f670e3d538fd0462395ea06c8f\nK = 9267763383f8db55eed5b1ca8f4937dc2e0ca6175066dc3d4a4586af\nR = 422e2e9fe535eb62f11f5f8ce87cf2e9ec65e61c06737cf6a0019ae6\nS = 116cfcf0965b7bc63aecade71d189d7e98a0434b124f2afbe3ccf0a9\n\nCurve = P-224\nPrivate = 3eff7d07edda14e8beba397accfee060dbe2a41587a703bbe0a0b912\nX = 6dd84f4d66f362844e41a7913c40b4aad5fa9ba56bb44c2d2ed9efac\nY = 15f65ebcdf2fd9f8035385a330bdabec0f1cd9cc7bc31d2fadbe7cda\nDigest = 5b24b6157c0d1edf3a40c22a0745d23bdb59379e5e5e776ed040288d\nK = 7bb48839d7717bab1fdde89bf4f7b4509d1c2c12510925e13655dead\nR = 127051d85326049115f307af2bc426f6c2d08f4774a0b496fb6982b1\nS = 6857e84418c1d1179333b4e5307e92abade0b74f7521ad78044bf597\n\nCurve = P-224\nPrivate = 888fc992893bdd8aa02c80768832605d020b81ae0b25474154ec89aa\nX = 4c741e4d20103670b7161ae72271082155838418084335338ac38fa4\nY = db7919151ac28587b72bad7ab180ec8e95ab9e2c8d81d9b9d7e2e383\nDigest = 00c6fc53c1986d19a8a8b580ee553dc1240745d760647d1c0adf442c133c7f56\nK = 06f7a56007825433c4c61153df1a135eee2f38ec687b492ed40d9c90\nR = 0909c9b9cae8d2790e29db6afdb45c04f5b072c4c20410c7dc9b6772\nS = 298f4fcae1fe271da1e0345d11d07a1fca43f58af4c113b909eedea0\n\nCurve = P-224\nPrivate = 5b5a3e186e7d5b9b0fbdfc74a05e0a3d85dc4be4c87269190c839972\nX = 897089f4ef05b943eeac06589f0e09ccc571a6add3eb1610a2fc830f\nY = 62ba3f6b3e6f0f062058b93e6f25b6041246c5be13584a41cae7e244\nDigest = fb5dd3b8d280fe7c4838f01b2a5c28493ed3084f46b40642600ba39e43fbff7b\nK = 5b6f7eca2bcc5899fce41b8169d48cd57cf0c4a1b66a30a150072676\nR = f12c9985d454ffbc899ebbbb6cf43e3debcac7f19029f8f2f35cce31\nS = 12fcb848adbd8b1b4c72b2b54a04d936e4a5f480ae2a3ea2e3c1baae\n\nCurve = P-224\nPrivate = f60b3a4d4e31c7005a3d2d0f91cb096d016a8ddb5ab10ecb2a549170\nX = 40a4ab1e6a9f84b4dedb81795e6a7124d1cfdfd", "7ec64c5d4b9e32666\nY = 83aa32a3c2fc068e62626f2dafce5d7f050e826e5c145cd2d13d1b27\nDigest = f4083aebe08c9bdb8c08ff844ffc207f80fa4406fb73bdbc1c6020f71281bdae\nK = c31150420dfb38ba8347e29add189ec3e38c14b0c541497fb90bf395\nR = bf6c6daa89b21211ea2c9f45192d91603378d46b1a5057962dafaf12\nS = cb6b237950e0f0369323055cd1f643528c7a64616f75b11c4ddd63c7\n\nCurve = P-224\nPrivate = c8fc474d3b1cba5981348de5aef0839e376f9f18e7588f1eed7c8c85\nX = 66f49457ed15f67ed4042195856f052fe774077f61cebcb9efddc365\nY = 3a6e3f3423eec7308a69eb1b0416d67cc3b84d24f251d7cbdb45c079\nDigest = cb017b280093879c4b114b52ea670f14e97b661074abccc8539a23280fe136b4\nK = 5e5405ae9ab6164bb476c1bb021ec78480e0488736e4f8222920fbd9\nR = 7b7beaf9f696ca1a8051527478c4c075ab45aa4768937886dbf38618\nS = 93d4cf110a37c5a6f15c4e6024822118539e860dee2f60b8c3f462f6\n\nCurve = P-224\nPrivate = 04ef5d2a45341e2ace9af8a6ebd25f6cde45453f55b7a724eb6c21f6\nX = 8d642868e4d0f55ee62a2052e6b806b566d2ac79dbde7939fe725773\nY = 79505a57cd56904d2523b3e1281e9021167657d38aeb7d42fc8ec849\nDigest = 5f1d77f456d7ed30acad33795b50733d54226e57df4281a43d3821d0762f12fe\nK = ec60ea6f3d6b74d102e5574182566b7e79a69699a307fee70a2d0d22\nR = 2fd7fcbb7832c97ce325301dd338b279a9e28b8933284d49c6eabcf6\nS = 550b2f1efc312805a6ed8f252e692d8ee19eaa5bcd5d0cda63a1a3f0\n\nCurve = P-224\nPrivate = 35d4bbe77d149812339e85c79483cb270bdac56bbf30b5ef3d1f4d39\nX = 7924b1d7f5920cce98e25094e40f2eb3eb80d70b17e14b3d36c3671c\nY = 26c5af35f71e61858582b7cc2b41790597c53ee514ffdf7a289d108c\nDigest = cce0671ca07521fdaa81eced1dc37282bd9a6dbbaeb8cd00d13d4cf75cef044c\nK = 751869c1d0e79eb30aae8fbfb6d97bfa332123fd6b6c72c9cd3c1796\nR = 26bb1b92b0f01e94eba5fa429271371db527ce857abba13bd1103f64\nS = 836aba9c63e1252c2b2d72a21e6a41b82241ebe32647e7f814652bcb\n\nCurve = P-224\nPrivate = 2c291a393281b75264c9b8817af684fa86a1cdc900822f74039dc5d6\nX = 18cb5826ad60e6696bf07655032a3749f6577ca36da3ccd6e66a137c\nY = 194e14820fe02d784fd1363ff7a30399518309765bd3f4412d646da2\nDigest = 4ee903b828f54f35adab0bfec06eb064abde530d8ed0384730aa23e8e9664801\nK = e2a860416229dfd3f5a5cc92344ca015093a543943a0d8f73bf2b2fd\nR = 00e300c1ef4a8c4ca5da6413856f8981db49de29bdf03f32ffc3ceab\nS = f250f18a51ba5f63e1584097841099fa6ae4e98ee458c061d1d5aed7\n\nCurve = P-224\nPrivate = 831ea25dbeda33d272a1382c5def0e83929170ab06a629eed6ee244b\nX = 076518e393940d42dfd09819409d66966d8c9189c83d554a9cc8a082\nY = 44d0ceaf4c0f50e46bea4a52e30423ce3ada19edd363ac5694c65cb8\nDigest = 215e9817eccaa125e0c053fed373f4605de292d27a692bd4f744e63215fd8705\nK = 6be6dd9f6a083915ccba54626caf12d246d3aece0a7eda7d8d85599c\nR = ff1460946e06fb6f5d35e8d2625ca70ffb9b45308e3fabf6ad8351b1\nS = 6029aa3990918e8cb8a388d53b0772e5cdfff49c3405fe0d3a95933a\n\nCurve = P-224\nPrivate = 70f74c7324ef137318b610ead8ddc5b964e0eed3750b20612fc2e67b\nX = 279649e2a2918e683520cde3fc98b0ae58a7100e8de35e7c9cc797b6\nY = aa4de6be34be61f02880139787b9038f4554a8ef1c994b887c2974b5\nDigest = 6571a344765c0512d3911a7724509b649a6ce4106823be76726f117f109ec0fa\nK = 8e984864f86f7a2a73f3edda17dbccd13fac8fa4b872814abf223b1b\nR = 3b18736fa11d04e27e2614cda03a63ec11a180f357b0b3192920d09c\nS = 2f0f3dbd570727b14fbb29155538e62c930dd51c4035275c1365dc60\n\nCurve = P-224\nPrivate = 026be5789886d25039c11d7d58a11a6e1d52cb1d5657561f2165b8a8\nX = 3fa617c50b177da1a2bdb98b780ad21ad1195c4bd24465f6187de3c9\nY = e3fd8d8876dfd03a4a4e31a1acad3a08d983826d286c250c4e5620c1\nDigest = 95914b17ff0362e12305d71657bbc9d919ae4aa746bf4ebe95b2d2fe7ca3f022\nK = 0128b8e3f50731eb5fcc223517fc0cf6b96cd1d2807eb4524bc46f77\nR = 3a6b633f96f3d0b6d54f7fb29ac33709e4f0dd8fa0e51606ed9765ca\nS = 63e8c119dfa51784decd864f6911f2210a80f8f02d472d88df10d119\n\nCurve = P-224\nPrivate = e79c18d935c2839644762867aa793201f96a3cde080c5968412ce784\nX = b7ae1e992b1c7fde1141f40bd913358538ca0f07f62b729f13cea327\nY = 811252d12120e04805fc171a439d382c43b68a21e1a0bdf5e4ec1da4\nDigest = 2dd97b10b2ac90709062989f57873e30696bf8376957e68f7de95aa333a67685\nK = 7abedab1d36f4f0959a03d968b27dd5708223b66e0fc48594d827361\nR = d35047d74e1e7305bb8c1a94e8ae47cb1591c3437a3e185e00afe710\nS = d9c425c9d5feb776ac8952e6c4eee0ecd68aef2f0e7bff2e49c9185e\n\nCurve = P-224\nPrivate = 0d087f9d1f8ae29c9cf791490efc4a5789a9d52038c4b1d22494ad8c\nX = cd95cf8fb1cd21690f40d647f2353672a1076cc6c46bddaad2d0fc56\nY = 934262f74d9ee0f8a2754f64cb7415923d64bf00c94a39b52803f577\nDigest = 7c74a2e71f7bb3101787517394a67d03f977c95519526b47854e417b95bf8d1b\nK = 557d0e3995dc6377b3911546dd7aeaeec62a6d8f2af6a274382fc37f\nR = 56df0ea6afdcc232ceb41729eec00cf906b69b6e28423a36d3c92cc5\nS = f4f70fd948c9a147f55317fdea7b8a84c33e721014552d5800d63edc\n\nCurve = P-224\nPrivate = 0830aebb6577d3a3be3ba54a4501c987b0e0bb593267b9bbadb66583\nX = b88652020e083ccc1c43dc83d1881884dd4c7e3b4e3460b344b1ea64\nY = 22b69b517f86d7c26dc37c0f8feb4bb07fe876149fbcc3334fd2805b\nDigest = ccc04666744685c57d2256f21cee0f53857a0528a96d59bb13cdeb92fd786d4f\nK = e4f4a3280574c704c2fde47ca81ec883d27f2c5a961a294db7cda9d2\nR = b30b8a0079d9a134b5e1618c2ac63e3fbe0e95866b9dbc5f423f2707\nS = 3dc36746610271ef66e0aa52cc2ccadc5c9b08dc769e4dc4f6538c11\n\nCurve = P-224\nPrivate = 2acc9b97e625263e8e4cd164302c7d1e078bfcdd706111a13ccda5b2\nX = ce1a06f82df874dded37cca03b56c0648e4e8917ecd40ee73ee61588\nY = ceb6177b8f1ac7c5c6e6e1f7737cc3026952ee392badd2cd7af32f9d\nDigest = 9e7d5f30677692b669e21cf5461fa7f2e887dfcbbeb2db88d666bd591a944e00\nK = e401fa80f96480d437ed4f61a783888062ec33d530b188fd48016a6d\nR = 28674f447c4742e4087bbccfb522fbad4e18b56031d2ce8f532b078a\nS = a5a7a13d15b423dd17771f73cea98d89dbffa846cc209b45c0e29b76\n\nCurve = P-224\nPrivate = f4e873d4fb944fb52323406f933815092b7672221de4d1c45917f3fc\nX = 0dc2cdddb990341adb1de73f02d87fc3822485a659a15145f4251d5f\nY = cf78b2a83c7352eda1af2c74e1804ea04b35f76c04e89d90281dc2bb\nDigest = d8978f697bef71b062d4b3211e8ab5b993c09920af803614dbb9437f6e261b70\nK = 5d1476c682a64162fd2fdc82696fc8cab1469a86f707ea2757416e40\nR = 82982b38ed465138df4018d7cfb835edcb591cb57446ca49d163782b\nS = 8ef1d7b326cabee7f7ab95b7b98d3c27a069c0fd95a1599c0ccb422b\n\nCurve = P-224\nPrivate = 62c572ee0d6f81b27e591d788bfc2f42b5105d2663078dfb58069ebd\nX = bd6ba605639b98fa8113a16a3bb004ddfaec901c98a931206165f4a5\nY = a3190b10ef39e88abd60b2293b4707512b45c6c5ed5794cc11454427\nDigest = 1a9fc0195bf0f53cebba8aa7ccc8567c680d75187392d6d8201854ec4a6e6abd349037d831809e9f3add2fc09d27e4a4\nK = 0f0bb1e428bcdebf4dc62a5278068efc0f8ce75f89e89b3630f102b2\nR = aac0ea27e129f544abcc77f110e70bbdd5aa3e425dc39d5e8887025d\nS = 10e5dd06aee6b8419a04aa33d9d5678b0039c3acc3c4b61fe106bfdc\n\nCurve = P-224\nPrivate = e2f86bf73ba9336fa023343060f038e9ad41e5fe868e9f80574619a3\nX = f5d5346f17898ea6bbdfff19c216a8757a5dc37b95315f5481628381\nY = ae61fd172ac8b7a4f13870a932dece465834cbd4f50bbcfb802c824e\nDigest = 0f236d9a43edd55dacf5ff9f93ee805395e130ca2c8ad2eaea0fdd68e2ee2fadae9f41aa46f881485db208bd9cdc463b\nK = 35724ac043e3b44b73b5a7919cf675190306d26aa67c27c28c873534\nR = 535147c265af138eec50c7fb570bcc8d2e6f675597b0fcc034e536bc\nS = 743812c188a1dddf9fb34b90738f8b2e58760d6cd20ccceb1bb9c516\n\nCurve = P-224\nPrivate = b0a203438e2586d7575bc417a4a798e47abc22aa3955b58fc2789f17\nX = dc5d217862a1e5b00c95affa9d8b925a72b9beaeb7a86dc397e788d8\nY = 5f05f8e976ae1eb1036eca6d683a82850795bf9127dee5f8b2859445\nDigest = 525b6241eb2a6dd00b55b172708aafd0775e959b7c601903f44ffcfc17ee979f34f204680f8a71044a6d7e3679a50576\nK = 408e9c8b1f33136d6ddb93ff3a498bc09d4eee99bf69cdd5af0aa5a2\nR = 1b5a964c8b1fc634c6e2b82322499df1d7f0c12a4d2a77723c816ab8\nS = cf54599a36ca064fae0aa936de5266f87704409d22a15d28c01b7f2a\n\nCurve = P-224\nPrivate = efcfa50fad6fb2065f9a55f28c0c42fa24c809ccb19b6fc6d8ffb085\nX = 61521a0cfb72be77ba33cb3b8e022743cd9130ff49e97093b71aa178\nY = ce0819aedaf6fce639d0e593f8ab0147eeb6058f5f2b448231584ea9\nDigest = 88c4b7ca396f17e82c92596c301e41d7f01810bfeb33173cc0d1fedf3fd5ace6892ba9a788de13417f0ef00ff87344fb\nK = d1eea821f286eae6ebc1f61b08f9ad4323a3787e94af4c32cd31351b\nR = b37caaa71103752ac559f9eb4943324409ebfa8b585f684dcaa5c411\nS = 7c28e7619e2944ab4b7be022878c8052ebdf2cae5dff4f976c49686a\n\nCurve = P-224\nPrivate = 61a17816937987764cdc064dc7b5b4f5b16db1023acdfe25902957dd\nX = a7e975c0a8f87c683bb8e31bc160843a7b69c945f4850bd60e1c08c0\nY = 8930a454dcc2aa13bed7ea89368b2c9d689d816b2acf4e52585ee9c4\nDigest = 3babfaba30f3300171e6adcf4f62a12287031ac40078c96b2c2c063849e9a42ef3be953dc11fb319c18bf22fe511bf37\nK = 44b1fdec2629f9075f89c134ac28ff19bfddaa", "9db02a5d7f853582b4\nR = b0f5635d8bc9c53a1d54a3ec63de59ed66e6b2358d4ab79755414326\nS = 67c68fe265c7e5aba4232deeafb88545a2aa266fb9f2c2bb3f3ae8d2\n\nCurve = P-224\nPrivate = 79d5367314ec664aa0f6ca36f95549502a05bf8400bf532d669fab8d\nX = 3191f0237102dac159032ab2dde53cf56c9ec827b5caddfe9e83c02a\nY = b496b1bdcca4434ac0d0d91ea38ff3bc33f9f54095bfe17796d5a9e2\nDigest = 9f36da1a5653469a52f85e7e3b2a21ac3497cc00ff37e03235bbdf951695f182312ad5c8fb8a5fbd0295dc8c5acda068\nK = da529c52f5cc1f435d873109cd991d6cd7e1631d9ff1dd9521dd5db6\nR = 8e0ac63903f4921755430572c3f08bc272790639bdf1009fe2a9a714\nS = 6278c841a2d0a270791fe54b36c49d426d67907aa4e4f59c8638ad97\n\nCurve = P-224\nPrivate = 1320eedad4745121793a7eaf732b0b4498f7cb456cac8cf45a1f66f0\nX = 9fdd99906ab77fd29e9021bde947d05a7a9eb153612269bfb0899bc9\nY = 681b65b9ac8e4c2899bb622dafb253b7bf5a6e38e5f6595f997c291a\nDigest = 12532cbcfd4e80373bc235ac0bfa2a70b1044786d29f9384d555030f5df3cb5ab9f973df638b6835cb756792d1fe1a4e\nK = 66ed8d8934633f4125f593cf1b1d3745c4db1f15dde60cf46ca1c7f2\nR = 80199485a3a96447b39f7679cd47412a78675ba17dcbd10465dc5b48\nS = a251fd9f136a3cb0dd0bc80659ae032e4a761ba7045da0034553fb8c\n\nCurve = P-224\nPrivate = e18821329447d3f65ba7279e96bd4624ffa1b32b90f6e8331b1e876d\nX = 46c9ed837232c47022df2f1a1578fbe65ac9f2e81c98a74cc22ea31a\nY = 6fc5e9568ae62b31412a0b0b367242e9fd7e518c83aa06a069e1d90d\nDigest = 89030408e06cc06d3dbfb51f6725c710a2bc9db9e07ff1ec8a32a827d93d2dc951834cdb01a7afa1fe4cf4e9186ee424\nK = a4c1eb402a2fb3af26e0e14a3d2fc8ed3bc1a8b2475270356a79fdd3\nR = d478b68733d8ad44be46766e7b66af782fbdc7ff7ed0b191176da98a\nS = 5eae9160ccf71fd1d359d89cecce72ef8afaeee2365f6ba828aa450a\n\nCurve = P-224\nPrivate = f73e030d5a696b358986d3efaca121cf71f775f8835a21e6135145d7\nX = 9ca2c6ea87ac8dd3a23a5b4010841a7c8af309038882ae44634bcf55\nY = b0a347dbd5ded3b8702ac5a457e8b32bd4de06fd315095fa1b7d5fe1\nDigest = eda24262a9e64be110a6c96763e8a4b5edb38af2a084695e294593583b462c56b0db50bc014eb19278e3f3d675eb5f22\nK = e3cc786c1288ea567836c51d6d69dd0cab5c015987d936ccc3a4beb3\nR = f1234da71761b7a0f49e661a419d2a739bdc4544bf87690e3d2f96db\nS = 096d16bf8020c3d3c233894ad8eb81206010e62c6e692a215e088fd4\n\nCurve = P-224\nPrivate = 7a0789323f8741c157a1753ae165ecaf8e8b03a60561f8b80cee467c\nX = 101271a9addd4bd1f19d00bf116c8524f52cefd598e85dc381597acb\nY = 2f17d14f4d8ccb28b216553718152ba7c104646d8eca986dd9ddea39\nDigest = 983a5d16b009cc65bdf3c3badc2f21280e04f44244b70a583c2e9732534497373f51b226c3ab7bd69c6940e46bc41fa1\nK = d169f04f05b60c625cda864d187938863964dab7bb3b9dfc04b05519\nR = e4a51be686a764b709da23ab48b1985e153c6ee238d945e743907afc\nS = 118a8f1ffe3cd556ce6345bd1a398dd9cc3729b7fd6d8af9bfd82f40\n\nCurve = P-224\nPrivate = 78e795d0edb11fd9e28dc26b21e751aa89bea0d87932ef11c95c0e18\nX = 9edd544107977134bf6360d43ccabb3c94d627c03963c0a04b439627\nY = ece4c61d319a0e41f3de7863e7c355bac94395aaa74cdb5f74a87a5b\nDigest = ae7b5fde427af9c450368b11f66f49bf8c3b6e1f5abed6bb25683001924dfb005738637e1c1b7855566330d202ecc763\nK = 36f7c0f76808b826a0a974a1fd6e155e00a73f1d34674a8f88be405a\nR = 3e319444438bc2cc92f323ea842cb402b3c3c2448c89869ef7998edb\nS = 3420cc38f058f41c31e71f4b1ad488f801111c73541de69fcee60695\n\nCurve = P-224\nPrivate = bee02d8bc5bffb3fd3b4c9d6f686409f02662d10150d1e58d689966a\nX = 8848f964c847fe9dddc774618d4588c9cd56bbe588d7b1fb369c8bfa\nY = ebbb699fbd0dc08859fe9132285fe20dff3b9d561c0640b6e0717607\nDigest = 63ef787f467ff0cd6e5012b09414c00ef56dba959c4b62bf7e76a4205078d436c45591752c8d55abe728a2d28b5b0643\nK = 59f1450d857b40e5552a4b8cd4ab0df2f01716635d172c1106840f21\nR = a206d8398a16a991bc217f77f23c6f648384f254f255a8a876404444\nS = eb1169cb5b1423dc0bfaffe565ae57f986e00de06405e3e7b605862e\n\nCurve = P-224\nPrivate = dc0ddf6e501418bb8eafc5d7ccc143369e2aa441df8fc57d5f94a738\nX = 063a5d632f4144376e14cfb03ad8ccf1489b613acd184d20dff66545\nY = e77727f057b043d8a0f7458196b72e92d11f85b0891c6aaa9d915f58\nDigest = 11f0d587e82e7490af4737c272877d9d37c1e7ae7f2fd3b00d8fa0d4f2bcb3a41d5185e65604b8c411a407eb6c558954\nK = ff0e5cae2671db7a1b90e22c63e7570bdd27352d45bac31e338debe0\nR = 5bc0b4998481ecbd3b6609184a84ca41d69b08c37138097f559259f8\nS = 0df8828eb1ca85e46405b94e1a2972c34c5e620a54e2f640f04aecc5\n\nCurve = P-224\nPrivate = 229d89b2fcf8441ffc95ebb2ac2ef156e25825782044b2b8bd6a3e01\nX = de616848d8044a44789ef1ba3a6dd66fe9257ddc57f7534e59a701be\nY = 26cbf74a6d25e5b34b96d30f327abd574cff7f7dbe6686573a7d6c5c\nDigest = 537d6d3d4be3e3beaf31014dae59ca7186c1c1a32c88068ff343180a138ceb6d7c38e0ae1e9b51003b71c1a2f3a3741b\nK = 3b18ca6ec8e8e255ac88f64302745ca0b73ff94b2b2d48be95b4aaee\nR = fa94fd8b827c06115c1eefd50afc02ce5926ee0e789667783c01c34b\nS = edf766a66973cfc33e4159966c07321a7f6549c3c60e8586ef41402b\n\nCurve = P-224\nPrivate = 97d747068147c0393a0bb5c159e2c9f1bd538f6204823294883abe28\nX = 3858a576eef2ce24d01766997fb81b3f3f78b6104cd188610be221d7\nY = 95ffc677ac7bfe3e0bb4cffb17355a964c8356a807151b3cba5d1f4e\nDigest = 7e16034a71ebf52a7a6cd00fe469c6edc121b2882462176298c9443aca2a0ad6ebe2eb9e145097409873170f40d503dd\nK = c1a2ec1ef16cfd5107c892790daefbed061be78bd8576696b60f64d5\nR = 18c908541843fcdac99b9ff6bb397f3f8094d16b42670216e4eaa2d7\nS = c107a8a508ff57c5d4f78f86cc37e129c864d1c44ed5e73909613b74\n\nCurve = P-224\nPrivate = ba5374541c13597bded6880849184a593d69d3d4f0b1cb4d0919cbd6\nX = ac635fe00e8b7a3c8ef5655bdfb7f83e8532e59c0cc0b6534d810ffa\nY = 1d067aebeba66e79b28ecfe59ac6fdf5e1970dc3a84499c9d90cd8e2\nDigest = 3edbb59a32b2464291d0a96023a798c1fc6cb5ff4fcecfadcfac2be00c26fa27181aef76c96d8269aeaf2275eeacbb777abbd9571de9279edc5695a3345cad9b\nK = 187ed1f45c466cbafcd4b9577fb222408c011225dcccfd20f08b8d89\nR = f83d54945997584c923c09662c34cf9ad1e987da8bfd9be600e7a098\nS = 4ff2dba9dba992c98a095b1144a539310e1a570e20c88b7d0aa1955c\n\nCurve = P-224\nPrivate = 1e27187134d0a63542adf4665fba22f00cfc7b0a1e02effe913ceedc\nX = ecaea8ceea55c3bd418fd34a4ff2499e25e66a104eed846bc00c31d2\nY = 3933a356ab1f2dabc303ff0a5d076131e77032e6f502336883bf78a7\nDigest = 825ab979af5c263d9f074a2d771d1d1cdfa435e7938245a3c9ee30cb77ee8c1475051d2f09d7d11d920a6c754bfd253903131c491994679cafdb8cfbf32b763d\nK = 34cb597deae9a3b1cada937abcd247161b19b2b336b20e2e42ae01f1\nR = 58177ba46fb291490b39368774accf72736412c1fb5ee0f27b9b1e02\nS = 58337d78b95a080bfcabb5809bee012501b4da84b8ef310a4628f11c\n\nCurve = P-224\nPrivate = 0905b40e6c29bfcbf55e04266f68f10ca8d3905001d68bb61a27749b\nX = d656b73b131aa4c6336a57849ce0d3682b6ab2113d013711e8c29762\nY = 6328335ffc2029afbfe2a15cc5636978778c3f9dab84840b05f2e705\nDigest = d0db7c20c201cd8c63ca777293543750d7f6a9e375b056e74cfe9fb2c95b2cc9807d8a9607a5b0fad6eeda86e4f73ace139e77a5356181b8cbef3f88173253b6\nK = dc82840d147f893497a82f023d7d2cbf0a3a5b2ac6cc1b9b23e504be\nR = 583af080e0ec7c1ba5a491a84889b7b7b11ccfe18927c7c219b11757\nS = b23700035349df25d839f0973bef78a7515287de6c83707907074fa6\n\nCurve = P-224\nPrivate = afbaede5d75e4f241dd5b53220f3f5b9c1aa1d5d298e2d43236452dc\nX = fe83e59fc8ea8b939355d3258fe53a64d45f63031a0716b7cc416173\nY = f151d23060f1c856eb7f1f58be72a7228c3af89e43b56e9695b558c7\nDigest = 37d9091eddc6fc34b45cf97140e956a42ab659f6bd442e81b57c4ecfbdab45f7380a7efdbac5400ceb1bf683194232cd086c1b4e09fc9313f1bc38af731f1a98\nK = 0fbbe7b40136c81a8fb894498d5502157a1cf5a89d0643de92cd38f6\nR = 24f3f457c7b72b7e759d5a8afbf330e31c5d8d2e36f92c0e79c5d87d\nS = 36fd1193def34f12a960740fd79fb38bf2b480726ccad540eb42cdf8\n\nCurve = P-224\nPrivate = 950b07b0c2b7539a21b5135bfede214733f2e009647d38d8b21d760c\nX = f43d13bbfcee3b724063b3910fea49fd591b81e86fdb813b1a492d0c\nY = 6b4c8d6fa5dc661889e3cf5ec64997a78222837885f85d2fe9b684fb\nDigest = 8ddf64c9c67289a76c2f5b44a30b8365f4adf487b4edadada5749cad9e5765c57a348a750817a53e5c2ff551e003747ca1e3438b2aa1952c6876fda8fd8f4de2\nK = 83e110d0d1e700d2f36543028737d2a2f1474aa3b4b28998a39e4793\nR = 2685265bc878e85d10ab13293dec190881a57c4a467f8fc2170432ea\nS = 80a347bb49036522369339bd6485a967cdda818915d8eb947302fcf9\n\nCurve = P-224\nPrivate = 015bd9f5dfef393b431c3c7fced24385d861ccb563542574a5d2a9bc\nX = e868690641e2cda13b289a6c5d2fb175940396044d9cf27b4f2240af\nY = 4c78c9abdf2b7fc67ed4497001d7bcf1daca1739dc14a661f91d7c40\nDigest = 7c22f34d5897ccdf7d807f68a7f16e3093a4413625e7853401a4e0384d26893f1997c84557515f2ea66afe7629f62415e6b98e18e97dcb4fb2dec97cf2dd68d9\nK = e2374350f47c08f3c1359d4edf87e61d1ba4e7dd1540d8d9062efa79\nR = e12dc088d2bc032bb214c77d0e0fb749fc8e61ebe1ed72996f1084b6\nS = 0ab58aa31e0bba5fbc76855e6549", @@ -2608,9 +2614,9 @@ "1d2f3d15e51352\nY = 0014368b8e746807b2b68f3615cd78d761a464ddd7918fc8df51d225962fdf1e3dc243e265100ff0ec133359e332e44dd49afd8e5f38fe86133573432d33c02fa0a3\nDigest = a6200971c6a289e2fcb80f78ec08a5079ea2675efd68bcab479552aa5bcb8edf3c993c79d7cebcc23c20e5af41723052b871134cc71d5c57206182a7068cc39b\nK = 00bc2c0f37155859303de6fa539a39714e195c37c6ea826e224c8218584ae09cd0d1cc14d94d93f2d83c96e4ef68517fdb3f383da5404e5a426bfc5d424e253c181b\nR = 01a3c4a6386c4fb614fba2cb9e74201e1aaa0001aa931a2a939c92e04b8344535a20f53c6e3c69c75c2e5d2fe3549ed27e6713cb0f4a9a94f6189eb33bff7d453fce\nS = 016a997f81aa0bea2e1469c8c1dab7df02a8b2086ba482c43af04f2174831f2b1761658795adfbdd44190a9b06fe10e578987369f3a2eced147cff89d8c2818f7471\n\nCurve = P-521\nPrivate = 014787f95fb1057a2f3867b8407e54abb91740c097dac5024be92d5d65666bb16e4879f3d3904d6eab269cf5e7b632ab3c5f342108d1d4230c30165fba3a1bf1c66f\nX = 00c2d540a7557f4530de35bbd94da8a6defbff783f54a65292f8f76341c996cea38795805a1b97174a9147a8644282e0d7040a6f83423ef2a0453248156393a1782e\nY = 0119f746c5df8cec24e4849ac1870d0d8594c799d2ceb6c3bdf891dfbd2242e7ea24d6aec3166214734acc4cbf4da8f71e2429c5c187b2b3a048527c861f58a9b97f\nDigest = 46ff533622cc90321a3aeb077ec4db4fbf372c7a9db48b59de7c5d59e6314110676ba5491bd20d0f02774eef96fc2e88ca99857d21ef255184c93fb1ff4f01d3\nK = 0186cd803e6e0c9925022e41cb68671adba3ead5548c2b1cd09348ab19612b7af3820fd14da5fe1d7b550ed1a3c8d2f30592cd7745a3c09ee7b5dcfa9ed31bdd0f1f\nR = 010ed3ab6d07a15dc3376494501c27ce5f78c8a2b30cc809d3f9c3bf1aef437e590ef66abae4e49065ead1af5f752ec145acfa98329f17bca9991a199579c41f9229\nS = 008c3457fe1f93d635bb52df9218bf3b49a7a345b8a8a988ac0a254340546752cddf02e6ce47eee58ea398fdc9130e55a4c09f5ae548c715f5bcd539f07a34034d78\n\nCurve = P-521\nPrivate = 015807c101099c8d1d3f24b212af2c0ce525432d7779262eed0709275de9a1d8a8eeeadf2f909cf08b4720815bc1205a23ad1f825618cb78bde747acad8049ca9742\nX = 0160d7ea2e128ab3fabd1a3ad5455cb45e2f977c2354a1345d4ae0c7ce4e492fb9ff958eddc2aa61735e5c1971fa6c99beda0f424a20c3ce969380aaa52ef5f5daa8\nY = 014e4c83f90d196945fb4fe1e41913488aa53e24c1d2142d35a1eed69fed784c0ef44d71bc21afe0a0065b3b87069217a5abab4355cf8f4ceae5657cd4b9c8008f1f\nDigest = 6b514f8d85145e30ced23b4b22c85d79ed2bfcfed5b6b2b03f7c730f1981d46d4dadd6699c28627d41c8684bac305b59eb1d9c966de184ae3d7470a801c99fd4\nK = 0096731f8c52e72ffcc095dd2ee4eec3da13c628f570dba169b4a7460ab471149abdede0b63e4f96faf57eab809c7d2f203fd5ab406c7bd79869b7fae9c62f97c794\nR = 01e2bf98d1186d7bd3509f517c220de51c9200981e9b344b9fb0d36f34d969026c80311e7e73bb13789a99e0d59e82ebe0e9595d9747204c5f5550c30d934aa30c05\nS = 012fed45cc874dc3ed3a11dd70f7d5c61451fbea497dd63e226e10364e0718d3722c27c7b4e5027051d54b8f2a57fc58bc070a55b1a5877b0f388d768837ef2e9cec\n\nCurve = P-521\nPrivate = 018692def0b516edcdd362f42669999cf27a65482f9358fcab312c6869e22ac469b82ca9036fe123935b8b9ed064acb347227a6e377fb156ec833dab9f170c2ac697\nX = 01ceee0be3293d8c0fc3e38a78df55e85e6b4bbce0b9995251f0ac55234140f82ae0a434b2bb41dc0aa5ecf950d4628f82c7f4f67651b804d55d844a02c1da6606f7\nY = 01f775eb6b3c5e43fc754052d1f7fc5b99137afc15d231a0199a702fc065c917e628a54e038cbfebe05c90988b65183b368a2061e5b5c1b025bbf2b748fae00ba297\nDigest = 53c86e0b08b28e22131324f6bfad52984879ab09363d6b6c051aac78bf3568be3faeade6a2dda57dece4527abaa148326d3adbd2d725374bdac9ccb8ac39e51e\nK = 0161cf5d37953e09e12dc0091dc35d5fb3754c5c874e474d2b4a4f1a90b870dff6d99fb156498516e25b9a6a0763170702bb8507fdba4a6131c7258f6ffc3add81fd\nR = 014dfa43046302b81fd9a34a454dea25ccb594ace8df4f9d98556ca5076bcd44b2a9775dfaca50282b2c8988868e5a31d9eb08e794016996942088d43ad3379eb9a1\nS = 0120be63bd97691f6258b5e78817f2dd6bf5a7bf79d01b8b1c3382860c4b00f89894c72f93a69f3119cb74c90b03e9ede27bd298b357b9616a7282d176f3899aaa24\n\nCurve = P-521\nPrivate = 00a63f9cdefbccdd0d5c9630b309027fa139c31e39ca26686d76c22d4093a2a5e5ec4e2308ce43eb8e563187b5bd811cc6b626eace4063047ac0420c3fdcff5bdc04\nX = 014cab9759d4487987b8a00afd16d7199585b730fb0bfe63796272dde9135e7cb9e27cec51207c876d9214214b8c76f82e7363f5086902a577e1c50b4fbf35ce9966\nY = 01a83f0caa01ca2166e1206292342f47f358009e8b891d3cb817aec290e0cf2f47e7fc637e39dca03949391839684f76b94d34e5abc7bb750cb44486cce525eb0093\nDigest = a9e9a9cb1febc380a22c03bacd18f8c46761180badd2e58b94703bd82d5987c52baec418388bc3f1e6831a130c400b3c865c51b73514f5b0a9026d9e8da2e342\nK = 001e51fd877dbbcd2ab138fd215d508879298d10c7fcbdcc918802407088eb6ca0f18976a13f2c0a57867b0298512fc85515b209c4435e9ef30ab01ba649838bc7a0\nR = 011a1323f6132d85482d9b0f73be838d8f9e78647934f2570fededca7c234cc46aa1b97da5ac1b27b714f7a171dc4209cbb0d90e4f793c4c192dc039c31310d6d99b\nS = 00386a5a0fc55d36ca7231a9537fee6b9e51c2255363d9c9e7cb7185669b302660e23133eb21eb56d305d36e69a79f5b6fa25b46ec61b7f699e1e9e927fb0bceca06\n\nCurve = P-521\nPrivate = 0024f7d67dfc0d43a26cc7c19cb511d30a097a1e27e5efe29e9e76e43849af170fd9ad57d5b22b1c8840b59ebf562371871e12d2c1baefc1abaedc872ed5d2666ad6\nX = 009da1536154b46e3169265ccba2b4da9b4b06a7462a067c6909f6c0dd8e19a7bc2ac1a47763ec4be06c1bec57d28c55ee936cb19588cc1398fe4ea3bd07e6676b7f\nY = 014150cdf25da0925926422e1fd4dcfcffb05bdf8682c54d67a9bd438d21de5af43a15d979b320a847683b6d12ac1383a7183095e9da491c3b4a7c28874625e70f87\nDigest = 7e324819033de8f2bffded5472853c3e68f4872ed25db79636249aecc24242cc3ca229ce7bd6d74eac8ba32f779e7002095f5d452d0bf24b30e1ce2eb56bb413\nK = 01c1308f31716d85294b3b5f1dc87d616093b7654907f55289499b419f38ceeb906d2c9fe4cc3d80c5a38c53f9739311b0b198111fede72ebde3b0d2bc4c2ef090d2\nR = 000dbf787ce07c453c6c6a67b0bf6850c8d6ca693a3e9818d7453487844c9048a7a2e48ff982b64eb9712461b26b5127c4dc57f9a6ad1e15d8cd56d4fd6da7186429\nS = 00c6f1c7774caf198fc189beb7e21ca92ceccc3f9875f0e2d07dc1d15bcc8f210b6dd376bf65bb6a454bf563d7f563c1041d62d6078828a57538b25ba54723170665\n\nCurve = P-521\nPrivate = 00349471460c205d836aa37dcd6c7322809e4e8ef81501e5da87284b267d843897746b33016f50a7b702964910361ed51d0afd9d8559a47f0b7c25b2bc952ce8ed9e\nX = 000bbd4e8a016b0c254e754f68f0f4ed081320d529ecdc7899cfb5a67dd04bc85b3aa6891a3ed2c9861ae76c3847d81780c23ad84153ea2042d7fd5d517a26ff3ce4\nY = 00645953afc3c1b3b74fdf503e7d3f982d7ee17611d60f8eb42a4bddbec2b67db1f09b54440c30b44e8071d404658285cb571462001218fc8c5e5b98b9fae28272e6\nDigest = 4541f9a04b289cd3b13d31d2f513d9243b7e8c3a0cbd3e0c790892235a4d4569ef8aef62444ecc64608509e6ad082bf7cd060d172550faa158b2fd396aa1e37b\nK = 000eb2bd8bb56b9d2e97c51247baf734cc655c39e0bfda35375f0ac2fe82fad699bf1989577e24afb33c3868f91111e24fefe7dec802f3323ac013bec6c048fe5568\nR = 014bf63bdbc014aa352544bd1e83ede484807ed760619fa6bc38c4f8640840195e1f2f149b29903ca4b6934404fb1f7de5e39b1ea04dba42819c75dbef6a93ebe269\nS = 005d1bcf2295240ce4415042306abd494b4bda7cf36f2ee2931518d2454faa01c606be120b057062f2f3a174cb09c14f57ab6ef41cb3802140da22074d0e46f908d4\n\nCurve = P-521\nPrivate = 007788d34758b20efc330c67483be3999d1d1a16fd0da81ed28895ebb35ee21093d37ea1ac808946c275c44454a216195eb3eb3aea1b53a329eca4eb82dd48c784f5\nX = 00157d80bd426f6c3cee903c24b73faa02e758607c3e102d6e643b7269c299684fdaba1acddb83ee686a60acca53cddb2fe976149205c8b8ab6ad1458bc00993cc43\nY = 016e33cbed05721b284dacc8c8fbe2d118c347fc2e2670e691d5d53daf6ef2dfec464a5fbf46f8efce81ac226915e11d43c11c8229fca2327815e1f8da5fe95021fc\nDigest = 7ec0906f9fbe0e001460852c0b6111b1cd01c9306c0c57a5e746d43f48f50ebb111551d04a90255b22690d79ea60e58bed88220d485daaf9b6431740bb499e39\nK = 00a73477264a9cc69d359464abb1ac098a18c0fb3ea35e4f2e6e1b060dab05bef1255d9f9c9b9fbb89712e5afe13745ae6fd5917a9aedb0f2860d03a0d8f113ea10c\nR = 007e315d8d958b8ce27eaf4f3782294341d2a46fb1457a60eb9fe93a9ae86f3764716c4f5f124bd6b114781ed59c3f24e18aa35c903211b2f2039d85862932987d68\nS = 01bcc1d211ebc120a97d465b603a1bb1e470109e0a55d2f1b5c597803931bd6d7718f010d7d289b31533e9fcef3d141974e5955bc7f0ee342b9cad05e29a3dded30e\n\nCurve = P-521\nPrivate = 01f98696772221e6cccd5569ed8aed3c435ee86a04689c7a64d20c30f6fe1c59cc10c6d2910261d30c3b96117a669e19cfe5b696b68feeacf61f6a3dea55e6e5837a\nX = 007002872c200e16d57e8e53f7bce6e9a7832c387f6f9c29c6b75526262c57bc2b56d63e9558c5761c1d62708357f586d3aab41c6a7ca3bf6c32d9c3ca40f9a2796a\nY = 01fe3e52472ef224fb38d5a0a14875b52c2f50b82b99eea98d826c77e6a9ccf798de5ffa92a0d65965f740c702a3027be66b9c844f1b2e96c134eb3fdf3edddcf11c\nDigest = 7230642b79eed2fd50f19f79f943d67d6ef609ec06c9adbb4b0a62126926080ecd474922d1af6c01f4c354affde016b284b13dbb3122555dea2a2e6ca2a357dc\nK = 01a277cf0414c6adb621d1cc0311ec908401ce040c6687ed45", "a0cdf2910c42c9f1954a4572d8e659733d5e26cbd35e3260be40017b2f5d38ec42315f5c0b056c596d\nR = 00d732ba8b3e9c9e0a495249e152e5bee69d94e9ff012d001b140d4b5d082aa9df77e10b65f115a594a50114722db42fa5fbe457c5bd05e7ac7ee510aa68fe7b1e7f\nS = 0134ac5e1ee339727df80c35ff5b2891596dd14d6cfd137bafd50ab98e2c1ab4008a0bd03552618d217912a9ec502a902f2353e757c3b5776309f7f2cfebf913e9cd\n\nCurve = P-521\nPrivate = 013c3852a6bc8825b45fd7da1754078913d77f4e586216a6eb08b6f03adce7464f5dbc2bea0eb7b12d103870ef045f53d67e3600d7eba07aac5db03f71b64db1cceb\nX = 00c97a4ebcbbe701c9f7be127e87079edf479b76d3c14bfbee693e1638e5bff8d4705ac0c14597529dbe13356ca85eb03a418edfe144ce6cbf3533016d4efc29dbd4\nY = 011c75b7a8894ef64109ac2dea972e7fd5f79b75dab1bf9441a5b8b86f1dc1324426fa6cf4e7b973b44e3d0576c52e5c9edf8ce2fc18cb3c28742d44419f044667f8\nDigest = d209f43006e29ada2b9fe840afdf5fe6b0abeeef5662acf3fbca7e6d1bf4538f7e860332ef6122020e70104b541c30c3c0581e2b1daa0d767271769d0f073133\nK = 01e25b86db041f21c2503d547e2b1b655f0b99d5b6c0e1cf2bdbd8a8c6a053f5d79d78c55b4ef75bff764a74edc920b35536e3c470b6f6b8fd53898f3bbc467539ef\nR = 01dce45ea592b34d016497882c48dc0c7afb1c8e0f81a051800d7ab8da9d237efd892207bc9401f1d30650f66af8d5349fc5b19727756270722d5a8adb0a49b72d0a\nS = 00b79ffcdc33e028b1ab894cb751ec792a69e3011b201a76f3b878655bc31efd1c0bf3b98aea2b14f262c19d142e008b98e890ebbf464d3b025764dd2f73c4251b1a\n\nCurve = P-521\nPrivate = 01654eaa1f6eec7159ee2d36fb24d15d6d33a128f36c52e2437f7d1b5a44ea4fa965c0a26d0066f92c8b82bd136491e929686c8bde61b7c704daab54ed1e1bdf6b77\nX = 01f269692c47a55242bb08731ff920f4915bfcecf4d4431a8b487c90d08565272c52ca90c47397f7604bc643982e34d05178e979c2cff7ea1b9eaec18d69ca7382de\nY = 00750bdd866fba3e92c29599c002ac6f9e2bf39af8521b7b133f70510e9918a94d3c279edec97ab75ecda95e3dd7861af84c543371c055dc74eeeff7061726818327\nDigest = c992314e8d282d10554b2e6e8769e8b10f85686cccafb30e7db62beaad080e0da6b5cf7cd1fc5614df56705fb1a841987cb950101e2f66d55f3a285fc75829ff\nK = 01b7519becd00d750459d63a72f13318b6ac61b8c8e7077cf9415c9b4b924f35514c9c28a0fae43d06e31c670a873716156aa7bc744577d62476e038b116576a9e53\nR = 0183bddb46c249e868ef231a1ebd85d0773bf8105a092ab7d884d677a1e9b7d6014d6358c09538a99d9dca8f36f163ac1827df420c3f9360cc66900a9737a7f756f3\nS = 00d05ee3e64bac4e56d9d8bd511c8a43941e953cba4e5d83c0553acb87091ff54f3aad4d69d9f15e520a2551cc14f2c86bb45513fef0295e381a7635486bd3917b50\n\nCurve = P-521\nPrivate = 01cba5d561bf18656991eba9a1dde8bde547885ea1f0abe7f2837e569ca52f53df5e64e4a547c4f26458b5d9626ed6d702e5ab1dd585cf36a0c84f768fac946cfd4c\nX = 012857c2244fa04db3b73db4847927db63cce2fa6cb22724466d3e20bc950a9250a15eafd99f236a801e5271e8f90d9e8a97f37c12f7da65bce8a2c93bcd25526205\nY = 00f394e37c17d5b8e35b488fa05a607dbc74264965043a1fb60e92edc212296ae72d7d6fe2e3457e67be853664e1da64f57e44bd259076b3bb2b06a2c604fea1be9d\nDigest = 6e14c91db5309a075fe69f6fe8ecd663a5ba7fab14770f96b05c22e1f631cde9e086c44335a25f63d5a43ddf57da899fcedbc4a3a4350ad2edd6f70c01bb051e\nK = 00e790238796fee7b5885dc0784c7041a4cc7ca4ba757d9f7906ad1fcbab5667e3734bc2309a48047442535ff89144b518f730ff55c0c67eeb4c880c2dfd2fb60d69\nR = 01d7ce382295a2a109064ea03f0ad8761dd60eefb9c207a20e3c5551e82ac6d2ee5922b3e9655a65ba6c359dcbf8fa843fbe87239a5c3e3eaecec0407d2fcdb687c2\nS = 0161963a6237b8955a8a756d8df5dbd303140bb90143b1da5f07b32f9cb64733dc6316080924733f1e2c81ade9d0be71b5b95b55666026a035a93ab3004d0bc0b19f\n\nCurve = P-521\nPrivate = 00972e7ff25adf8a032535e5b19463cfe306b90803bf27fabc6046ae0807d2312fbab85d1da61b80b2d5d48f4e5886f27fca050b84563aee1926ae6b2564cd756d63\nX = 01d7f1e9e610619daa9d2efa563610a371677fe8b58048fdc55a98a49970f6afa6649c516f9c72085ca3722aa595f45f2803402b01c832d28aac63d9941f1a25dfea\nY = 01571facce3fcfe733a8eef4e8305dfe99103a370f82b3f8d75085414f2592ad44969a2ef8196c8b9809f0eca2f7ddc71c47879e3f37a40b9fecf97992b97af29721\nDigest = 26b4f562053f7aed8b7268e95eff336ac80a448fae52329d2771b138c9c7f70de936ef54158446afa72b0a27c2a73ca45dfa38a2ba2bf323d31aba499651128f\nK = 00517f6e4002479dc89e8cbb55b7c426d128776ca82cf81be8c1da9557178783f40e3d047db7e77867f1af030a51de470ee3128c22e9c2d642d71e4904ab5a76edfa\nR = 01c3262a3a3fb74fa5124b71a6c7f7b7e6d56738eabaf7666b372b299b0c99ee8a16be3df88dd955de093fc8c049f76ee83a4138cee41e5fe94755d27a52ee44032f\nS = 0072fd88bb1684c4ca9531748dfce4c161037fcd6ae5c2803b7117fb60d3db5df7df380591aaf3073a3031306b76f062dcc547ded23f6690293c34a710e7e9a226c3\n\nCurve = P-521\nPrivate = 01f0ec8da29295394f2f072672db014861be33bfd9f91349dad5566ff396bea055e53b1d61c8c4e5c9f6e129ed75a49f91cce1d5530ad4e78c2b793a63195eb9f0da\nX = 009ec1a3761fe3958073b9647f34202c5e8ca2428d056facc4f3fedc7077fa87f1d1eb30cc74f6e3ff3d3f82df2641cea1eb3ff1529e8a3866ae2055aacec0bf68c4\nY = 00bed0261b91f664c3ff53e337d8321cb988c3edc03b46754680097e5a8585245d80d0b7045c75a9c5be7f599d3b5eea08d828acb6294ae515a3df57a37f903ef62e\nDigest = ea13b25b80ec89ffa649a00ce85a494892f9fb7389df56eed084d670efb020c05508ac3f04872843c92a67ee5ea02e0445dad8495cd823ca16f5510d5863002b\nK = 00ac3b6d61ebda99e23301fa198d686a13c0832af594b289c9a55669ce6d62011384769013748b68465527a597ed6858a06a99d50493562b3a7dbcee975ad34657d8\nR = 00cef3f4babe6f9875e5db28c27d6a197d607c3641a90f10c2cc2cb302ba658aa151dc76c507488b99f4b3c8bb404fb5c852f959273f412cbdd5e713c5e3f0e67f94\nS = 00097ed9e005416fc944e26bcc3661a09b35c128fcccdc2742739c8a301a338dd77d9d13571612a3b9524a6164b09fe73643bbc31447ee31ef44a490843e4e7db23f\n", }; -static const size_t kLen38 = 160910; +static const size_t kLen39 = 160910; -static const char *kData39[] = { +static const char *kData40[] = { "# Tests from NIST CAVP 186-4 ECDSA2VS Test Vectors, Signature Verification Test\n# http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip\n#\n# NIST's files provide message and digest pairs. Since this is a low-level test,\n# the digests have been extracted. P-521 test vectors were fixed to have the\n# right number of leading zeros.\n\nCurve = P-224\nX = a100d410ce497e991070285c439cd361a1a9c6c973fd6f5e1ba9ec66\nY = 0a8c3a2f909f212c84441b8c0030529cbd731304d86f771d89d7cc29\nDigest = 6a02c84186eb132d8e91ab6fea2e066f6f8de1a5\nR = 1bfcaab01e47addd4733369320364ad208169ffb15e6aac33c2d7c06\nS = 07fb33465e7b7b373feda2ea35ab7cc9477156a1335ecad942f99627\n\nCurve = P-224\nX = a6cd3d14cd5eb188a9f59d9c32e93d890558de382f6fba5ff5c6e395\nY = 7a76734a0afead9e5e4aba65f1ae353d6445b1689b5ea402de5f9af9\nDigest = ab1205b7f9f591a013c70cb645435b38689644c1\nR = f0f670963c3d2a3281d639f850f3781c6402d99a1bf07cd9f35b2975\nS = 758e84920c1b744502cd787cdd64ec58364ccc6917258a2580097492\nInvalid =\n\nCurve = P-224\nX = f5fe7875a517207f1336ec2bb4fe5cc7eb80ee2b0f8ebeff4c56e620\nY = 0b7ac24ea9092d03b28904d89714b517be023235abc9cffa297cf4ad\nDigest = d62c7a42fcf3738276a6e0d27160328e9f27e5aa\nR = 88617e694e361d2cfef6b0658d444607fba030ad31fe8dead14db22e\nS = 5b0bf37c4a583dd75d99aec20943ea02617cecdbcd295d35ed01cc32\nInvalid =\n\nCurve = P-224\nX = 8a6a77179ffc0ff5d412cf859cc82aa19cd18e5224ab997e9c2e46b0\nY = 3d67c177ca7cc12c7b05a3bf55fb78549ef5400a566efe8ae3580c9f\nDigest = 0b5a025a4038b6f9f995001c0b8d7a660e6766c2\nR = 107b7442e6569ddde54b5da55a9dac9bd348079358047a19a3de0b91\nS = 92359be39353cb263946294fb728eecf1880f50a43637f391d3e7824\n\nCurve = P-224\nX = f9f23388d573562f29e7e7c9a98f27e7a1ff02d2d66e177c6506466f\nY = 4545937caf1878fbacc34ca38a0e5e1f6ad2b25ddd796d06c8d12351\nDigest = cf670c7589b91dac6a131fe2e863e86ee790ca75\nR = bc1db32e437c67439c27db1dc607e3c505210c984bf707a8e87abb70\nS = b760f4943a2397311e54e888a1ad379ad9c45d1fd09b5389ce1a00ee\nInvalid =\n\nCurve = P-224\nX = 8781e5a98950092570d685964e9ed27760fb7dcff8d3b6f3c8f77151\nY = 9207cef64b7c2ed181c57337001f45f1e800e0d1bc8adac296e454b5\nDigest = e5e5e8c8b3f7146c72ef86ca1b75f422181b5729\nR = 79826ae5b0297b9404829df0f02bbb7b8acb35459e13a4045c40f242\nS = 2a629dab19c9e5cd0a551a43851fe6d8409469f86cbcf6204b41e5b5\nInvalid =\n\nCurve = P-224\nX = 03c78c532b8767784fd45e75027abce3371181f8f54914811588cbb2\nY = 166c7b70e98fa11ac361d827557676ec07e553370a462b4fe502dedb\nDigest = 270606c9c9b136ffada9588f15f9786455369422\nR = ff18b493b166d832c9c25ee491525e4c188ff2b804e38b5964941c48\nS = bbf4291db484b4e4143c01a284c03543bbdaa2db1f1c571f1e5a5e2e\nInvalid =\n\nCurve = P-224\nX = 99fab11464484cee96d72dfcf0327d671787a2f6ee32f9b184c48fec\nY = fe8ec3d660cfa3f3e09e5cfc2c3298d4de2f464416deb5b4a27ac062\nDigest = 9c77c796ba619aedef68b2d30b4ba00c4972488b\nR = 714c48c143cb259408c04f77a38d6484e788cb268fc9789d5e871491\nS = 542793d5dbcabcebc83a809cca02b8e95189c93fa4e330d66d5a62ef\nInvalid =\n\nCurve = P-224\nX = 014e8e57388eba32ebdce80df60c481e5c7758374f90a92e0a82f1b9\nY = d1aa8418f992283c5b6bb0461f05dc9103050dc55e0265e1c99b935d\nDigest = 82b45d1fb3bb502c7c20ee1e2d63f2aaa9f492ab\nR = a159b83e80e656f54f614e8437821bd87f6f13264ac8eca1b3ddde29\nS = b77b7bc8cf374f012ee15f9f9224a46a560a5b689cfc92ca4fa03459\nInvalid =\n\nCurve = P-224\nX = e0b9e3cadca81311923d6d6adcfc326b62fac9c4b8d61c5f960c88fa\nY = be505338108f8d3f0ee80aefa304d51dd4a4035477934a98a6111403\nDigest = f4da99fee346e572906e6dc8083a3d0c2e09b773\nR = 8dba585dc3312056a7be61161c7af8ba8b538f0c125c80cf9af2682e\nS = 1b5b1adac4d66c7045f3f79c3aa154a0274c4a994ac7a093e2482eeb\nInvalid =\n\nCurve = P-224\nX = 29197e94a3617e62d9999c859640871a4537a073ca4f12a4c324dcad\nY = fe198969ac7cbe49df2c61c4cc6fa502c2207a7da10acdccec7b1cad\nDigest = 58fab970cb7c1f0dac21b7c7fd67d0ad169688a1\nR = 261670b09afaeee71c590c5658e3f57d859b18a887f70fdeb90e57ea\nS = d1d12c11cf7f4a9dd015ead4bd245793cb37ffee1f4cf109b7b68394\nInvalid =\n\nCurve = P-224\nX = 0fac352c1c444435e6aeb1d60f28ac773b0170ae902afb0944ef0a12\nY = ac3ca693a7c5347a074808b43edea94059e2b1d0571d935fde3f5841\nDigest = 4b69dbfac12f1b974566d8170d1672d0f5fc0506\nR = c33c7a4de313ff856d2f51cd9e3d173bd10668c296f0e6b208c036ef\nS = e562d30822b5cc69713a57ce8c70f83827add85a06c88109505ebf7a\nInvalid =\n\nCurve = P-224\nX = b0d4298e998b7d9d4509322a1ac974c6180956533debafd3d9e7f2fc\nY = 185a64ca840d4b6a2800e72433f26dd523f97daadc18d6d01533f0ad\nDigest = b84805c37e76e530729ddcb59a68ad69d40c82f9\nR = a5155ce53050cbfe84b67d62ce118c6004564087f2fe1cdf44e9c945\nS = b6894b050d77a3ff4d191ddc0c9fc7009a7472e31739949193d7cceb\nInvalid =\n\nCurve = P-224\nX = 59996a4a06658e553fc2993f0f55e3fc8ca2cb52d30f882a37729be4\nY = a5f68f26ea6608fd1f350d8da7c187c7e70f23363177a5aa41508fce\nDigest = ef0a69578d8a1dc930803a7ad2a92c3c19ab6513\nR = 704ef49e0a43c61ef5b325899acb9d12287883a849976c8b9c950634\nS = 73da6e3a26d5c512405fc09fcfdf650dd8da748e6c3dfc05032d7a9f\n\nCurve = P-224\nX = a0cfdfc5a096b0b23ba6748ebaad17e60228b204aebdc01057a7154b\nY = 9f6bd5369d21d88d7b5c3ce221af530fb9a8fb91e751cdb855ff32a6\nDigest = b05f0232e6d44151e249e7b75c7c9ab05c14d44b\nR = d68aa9048e84b8653b8ff3ab31bc73884c6ac7df1fd1bd3c38c16b0d\nS = 38ce58afe5fbc6af892e06a4ddd978c745d5ec700cab825c11dd8fd1\nInvalid =\n\nCurve = P-224\nX = f1eb36b3e1c96a18d87878d5fa8b79d77afce9d2ce40d26199f33482\nY = ae819af474f3efbd62401a407036505c5a2d60449274593865de3374\nDigest = 1dd27c95dd6fb3f080afebdf5a1ad906502e12ab8f64e5f38f67c386\nR = 003122e976bac378c06ec95fd73290b067e7ff022d23493c40663ec9\nS = b99eb4220146a282c7a34f98a9a4fa38ed3f48ca2c7983cde2d3235f\n\nCurve = P-224\nX = 3bdcc7c6112cde3c0522f1a4863f1d7b6727c5bff67598ba2f1bafc1\nY = 47acb6b254e0e8747e0039de471d0dda443cb09a592c678717d83200\nDigest = 19b39292f4e862ed3ee90c35e709587231191632dc8b35611dd24abe\nR = a5aab7768f549f8fe3c7e650154c865b71ea5089bd6303bfdfd19316\nS = ee4989c4b96bcc802464fe44b2adeb1b3506755a3f4fb3f9252bf21b\nInvalid =\n\nCurve = P-224\nX = 6d5bacf458cee3ded627d0ff14fd2aeb54fe1455d6daaf7bb43faeea\nY = caecc8d3967ca1c8889607e9ed975b8a335a17c0acbcfbfed721ee1c\nDigest = 328ab7d2a7c56d09cb72cedaacc23a6da46d5cf984dfdfd16af60964\nR = 80e7024bf30ecddf7a658785ae51cd6e5a23963c89ee96a82346d889\nS = 561252dc8d9280fc54da0046da494fa5e4b7aed213923e8b894a1ae3\nInvalid =\n\nCurve = P-224\nX = 7f9789c729355516588a5c75cb2cbcf85a14c35e14a5d03b4ef920d7\nY = 49e95c49e62dd20f02ed16594f35ebf3415ed50e6efdc0c548101a9d\nDigest = c5bb2d7ca9b37af1f4bb572ae6b6e69e8fcab9ac1cc5a6e1b6d1f8de\nR = 3c7b664413c2a0e4682a9d1c88243a96196fbd03f72cb873b9bee8b9\nS = 8f7f81ee9d3a2660ab1d666bac6cc434143ca9b04ff638ca7b4aa1ea\n\nCurve = P-224\nX = fd3efc7108edbe155adcd8686d8605e811fa79756c7e2dc8c1c04212\nY = 59edea73a4e5f91541fb4cabce539afffa85b6b0113289f049ce60a0\nDigest = 562d1a8fa642dd8bbb4f4801f2d9fc8cf3452be916c0ecd6c8ddc4fc\nR = 4907884b8b7d0eb9a7b24420f69c58e3a17314e101da0280c0ceb130\nS = f7629bed92e5c40f35d7731912fb45a3cee06eab3d409a62997f2282\nInvalid =\n\nCurve = P-224\nX = 8b3f3e31d9c8408a39997455ffe0240fe128a5f1be9b3a33a97b0910\nY = d74ac6ad8de2407887c335bd66f684454dee175a2af713bb334cb3fe\nDigest = b57ffce01c72221c6714e4a38c76746c45a8cc685f37c55a69f6773f\nR = d28ae763c22f50ae9ee9fbe5bab682fd8d820b99ab70677cc46624f7\nS = d9fa54d0300a6ac74936e7a47fbacadcbb4b25ae3a5b550aaf53991f\nInvalid =\n\nCurve = P-224\nX = f4fd02f3d224727e156a2cd7543483f3e35eb65219e32c7923f93ecf\nY = e7aa734828ef326259f98e0e8c3f30b62bd3295c6d1af2c429a087f6\nDigest = 8e70efc206d69d1bd1dce263a29a56030ad5602046bc61848899474d\nR = 9f57e28f69d2ebd96f6d98903156a4e795730e09fb67963771b0a851\nS = 8cfe716488479e04500c8eccdc86fdd54ff00258639f7177169e2030\nInvalid =\n\nCurve = P-224\nX = 0fdb8faf52d8f46229cca1e0f22e869a91bd56eb6dccc547151f9c68\nY = 96c8d1946528bdd2c14c3a0a9c17a088d3f0599752d095ba9de9ffa6\nDigest = db452771046d4b64ba673771b49df905881df9c4b6a1292a11f87515\nR = c53c0ce7d408278552a5fe5854c05641cbe93b1dc18eff1c68af53c1\nS = be7453a12693ce7812fe58746323882bc14eff972480b49431cb10b3\nInvalid =\n\nCurve = P-224\nX = 240431da69703b32ba2ae501d2458b355b66170725806b45996db195\nY = 13beb5198ee00abdcfb2cc5454416d4f7c795e97a14bd93cec3f0a56\nDigest = 3598d7d7b2cd9e482fd3bbebb9ae4549a4b452c81b89f3da6f6f2e85\nR = ad03bdf64e3450407a2a977e1985853d6ea41568c3a394d696de6739\nS = 7b55db9abf2045e2dc7ccfa2e8fb501883c494662d400590c74d100f\nInvalid =\n\nCurve = P-224\nX = 8c80c86f91b1e330f86f5177fdba839e625a27e8531f232efb10a484\nY = a24deab897", "8dfe7398f7a1da0633ff7cf5aa7b7365ce2d840ce81c80\nDigest = 44603667b2251cf051cd67b927714d67a25295679d884c4b79099a80\nR = 0c422b292308f31af78b1261d12765cced1cf96a83a6bc3bd90330fc\nS = db34f4462d0bb1927cc99273dc92d3fe654c85a3b53c6d74ed900621\nInvalid =\n\nCurve = P-224\nX = 3a5d1b7ee6749630c9619789b256f6bad5bc4b09950cd53b78d5ef30\nY = e85c7ee707df680eeb5fd78451f7302ae653f96721443826096f62a3\nDigest = 2ed9e7077df2ca2f8a96dfea2127b1b34147fcf963f9d73e8aff9df6\nR = 671ad280609364b0e26c92b13891f677db7c83499d0a3d7b6d80affa\nS = 7c4b9c5a3937d540ed8bd59e340c13f02313445e06b2bf7525f5726a\nInvalid =\n\nCurve = P-224\nX = 350f59509abc9f7f9b35a8b80065258727a8ffc27e6dac635ed68900\nY = 634fceae493b200cc7680297fd940dd86a5111da14bed68c797ef254\nDigest = 012a6edb0064f2b734b0297ab924efcb0e653be9e6ae97c371d59680\nR = 13a302b200555a0e80584e6ede32c0f9c5a199125b219c3e8d0fbf96\nS = 13f1d7b0c87acea6290cd9d36f1820f546f83dd8d7d9abe9da5812a9\nInvalid =\n\nCurve = P-224\nX = 1fdb820003a2fe61deef2b68b92ac711abc76200c534ec3abc99a187\nY = 32f87d0554b6b5e389311fd3c86825fcd42654a0b6f5d4d5ba73031b\nDigest = 2afe40d5042eb4020b14053e9ead6774d566e0b536912b7de4450090\nR = c03e551abcb12eadbc291b2d5fdd53bf725b785933e0766969f0355e\nS = 94826a8753cb949e0199be3220b4f90318f1c835cdd67efc50df7fbd\n\nCurve = P-224\nX = 208dcc6c87e7c38bd914bc9b350602ff62ac62fa4fd633c1af5b8cd7\nY = 0263587c7692c8be1f78de88ed6dc99ce1198ecc53a77ae6cf98a323\nDigest = 3f95e73294defecfc125a2dbbf322d31f323c030adf244c07a7c8746\nR = c12d3b396e1a894dfe4a28971ce4983547596879956504e1a3aed75c\nS = 067b729ca23be6cd520fbe9b972b9bb3d00c9ee96832a5c35e20e0e0\nInvalid =\n\nCurve = P-224\nX = a66a652fa36413dccd72c83febedda051182dc5758a1466366197f5f\nY = dc813a79e0fc647d8892dcf4f2132c90914a520cbbad65f458ee0fae\nDigest = 8a8942761ccd4ac7c88c4afcb6bc69d431cc3d10e6ad7a2b8610892f\nR = 809d1b4557eaf36b6eab3449dad56e61d572bd8b63d51b63af1b0bc6\nS = 8bf88226a463606ab57c27ed78f1b71ccd61732fa58b62ee845fd3dd\nInvalid =\n\nCurve = P-224\nX = 8856fb8b81a4eacd971a954560018f33cbb71cc1fc243d03f63cabcb\nY = 28afa26baf31b4d89de1dadd2289006f836f23a11383817ec7e4e799\nDigest = d8454640ad1f4632cc667823418ae56c62028825d727adfc84afdb0842b0c9a4\nR = efccef331805e71bbf876cbbc2342a6bc4508aea7c691029c8396aef\nS = bed544d09e28dbf01a30b2cfb61b98ad6201a9818f22b4f543f3e7f5\nInvalid =\n\nCurve = P-224\nX = 34c5ff3de565b85bfdd9f0a8b3fb0d46f924c57b276bcc830a1ed580\nY = 609d22200ef38b410da77f7a8ff2f58448188042978fd9ae1b2b4477\nDigest = 831979405db4eb9dadf01249fa15f68d4846e0ece70a320d3022f75f3dc281cc\nR = f0138024fe0516738f3bd0e0fec10defaca8c3b89c161a77489cf2b7\nS = 4ae0934266d9e3d64c2a12f546b132ba0f33ef50abc90e7ef5974805\n\nCurve = P-224\nX = 465afb14f4bf85022ac1f635f46c0b2f6548bace9352d32f74eab012\nY = 036371a3246dbf1069d2d268ca431553d1f2bf0181225145881b7be0\nDigest = 489cd3c10d94f7f284bc4ea472634a5d7f0d280d5abbf139c110ef80c8bf463f\nR = 9bcd57a2fec2518903e4b13dc0a7b84bafed5c4908546e94ffae87ed\nS = a337e06582f6b3973df38b93a0fb2a63f7774b62db50dba557e5cfcc\nInvalid =\n\nCurve = P-224\nX = b8b7f923c05ec95ebd484db7c58d219cfd26ee6b66149631f25ffe4c\nY = 6bda5f4f988784555a80b5494eca51ad2c7f88ce94d2090ee0c76fba\nDigest = b100feed0121d9d0471e5bd94a659510c2f84e313f476431deac17ca6d87bd79\nR = ce4d86bf5a7543d1cba8e4470a297e9a48d0096d7788c6284b1c0af3\nS = 229eb0636ee62508ce3719396d7577ed892cec70a66857fdee0d1fa0\nInvalid =\n\nCurve = P-224\nX = 13e84ec2eb993818d7d78330855ee2fbe8ddb548a5e4198e2087b3b2\nY = c95dff249e10c506fb547a92ade53c61ddbb667c760e4127a1a7f806\nDigest = 21a9f65d4cdcc287e0bf330e4f76f1168d16d0cea796dd6c0e13cd2837decaf1\nR = ed26f00ed696e114305c546ed04db5fc35efa43059c0d8bbcd418d0c\nS = 6e16efbe9501e3055d74966a49232cd76b5d1241468788b4cc7378b4\nInvalid =\n\nCurve = P-224\nX = 16c23c93699cf665a5da8b2d4baa72c36158d3433b1b945e47204b0d\nY = 12023703e1b59ec9054ff22d15567b9f74058b47cc13f2ca08ab77c1\nDigest = d62496d0ee0453e7f13f8d9c57adcd33442a5365f626381ed665f95f528aa198\nR = ada849b673a1bd2949a8b4d8fdfc239ec53524a356d37da3c9d17ae2\nS = 698de3a3d8697c2e8e5b2c85fceb8796750c5b44154f01ce86d99e24\nInvalid =\n\nCurve = P-224\nX = a580f9a0cd15abff8e1e712f16b0fd4142d0d773af3c657abc06c2a6\nY = 22c6286340dc072e64274209eda60503047700571caee64b4a2306c2\nDigest = 25ef291dd6a2047ea193f8aedd3f4692f2c135cb519922a17cba3e969423b030\nR = c6fae06274dc052e482102520b49d4ccc4cb7eb8a3ea41bd3680ddad\nS = 50d66b75a2bbd0468be1f9e61bfda85b6329505b0134d60846cbe4b7\n\nCurve = P-224\nX = 0b4fb6fe5f6cf6adc7d28683628d4b9c569d21d2397533f5bd121a23\nY = b44d60a3414b9b7b6e4ad735ce2f9cb05593b0874ada5e65acdead4c\nDigest = 7d53ebba0424c4b6731806407f97af4af863a5a87c759626830c9e8753ca50fe\nR = ab5ac2039b49690c6436793decb1a6a58ac34833a8091005312a93a7\nS = 98fe955cd836501cef78c7a05fa27edf2fb3afea80990028ff64e984\nInvalid =\n\nCurve = P-224\nX = bae2b3634c7854c932551ece8dced2139a51705059503881a9239c78\nY = 094d5e455bc9296202618d7022512b0f9ce53d796c7294e6eb076a29\nDigest = bb5c0917ec5376b2c685f3a530a9f8ef1ef1c1b398ab66f479d936cd662efc1b\nR = 2fbdc7e9e98aed5dbbcc5b034e17a95209e2fe1b01515426b8b372c3\nS = f2b19226528f10be6ef0d27ec3703db690261206b7e42f93a691192e\nInvalid =\n\nCurve = P-224\nX = 49d9ff4f4bbd4320b6806a7fbaaedd962283c766a6c130e4b62139dc\nY = 06dbe8e7fb8fccf9758101ae46939c6fd4d3afc526ba6c8156c6b013\nDigest = 9a113d3d73543e17faba847981e0b7fbc5647e547bfc989921ddc987133692d1\nR = 2d83aa59bcfc8a0237884826e08dbd78a56733598e379f2a9d51e9e2\nS = 485036c74618d0e665775fbe2d614a313c550f9826b955d3e5636fd1\nInvalid =\n\nCurve = P-224\nX = 78451cca49655978b65d8ddd45ff367c47f321f5d55ddac7969ab82b\nY = 25b77f820aa9ec93ec89d7fc84285f3f3deed496e0cd3fb9ee4a5c99\nDigest = 352afd36279bee1ef5727c55c7428bb79db949a9f1953eb98cfd38c4a4a458af\nR = 998789490e008ed11febdfe2981a55c733eb9739d7f37fd5c2a7ec96\nS = c3ec8afade81860ff23cc1e7d759d32d9a5775886ef17bfb719df4aa\nInvalid =\n\nCurve = P-224\nX = 18ced60b7fd9ebf76c3aa5976dcbdef40bd3e36033c013553043dd84\nY = 30398582dbd2004064f8055e7fe0fe8df11b2c9d9e2931ad12d09628\nDigest = a1e3668af6307f6a2b7414079e73308ee0836b588b92a48bd5baa9a62f45b0f8\nR = f880143960e812464810c175001b5d39592fe63aab544deb9ca301a0\nS = 1e0657df071a25dd791264b411c8964688f4fe17ce024e659836ebe1\nInvalid =\n\nCurve = P-224\nX = 5d67c1fca848ba7f3d9de5b1894d3993ac4ebe68cdb0b49553b3b0e9\nY = 07c219a8323273c81f5694306d0dd1d133a49efce5003bc90f05578f\nDigest = e8f714f901cd2390c66f9fa9cb81ecc5f17a82bd934cf19c5ce2bcbd3a985de9\nR = 767cb6b2efa7a40739830659b0cc24fe3de771d00104b3dcc0f640bc\nS = f2e7268bc011d79d33f3551d2edd3c95f324955479b8e29e8aba629b\n\nCurve = P-224\nX = eac72b399cb791b3ed25cb0a49eb157e69603197e0327eac5448680d\nY = bdab3a2270066e74e8210eed7b5d43fba1e26845b6c037a8a7e2a13b\nDigest = 74aa7c8f25644514582fa904cea1ea88a0b262ffca43cdf6536ad97d8550616e\nR = 55485947e9e3c194a29c8ecaddb18eefd16fb6919aeb0bbbd8c12369\nS = 6309a2cc7fdd9eccb32b86d5577aa54ada79899a9645f2e299630d31\nInvalid =\n\nCurve = P-224\nX = 17f741267bf3e8143046707d41eafc9555953fe5f57d6c035452b232\nY = c667554d9a55fc8ab1062203dcbcd2bf9769c696a295350cb28aa01a\nDigest = 3b997a1c220593cab4301e07886db745436911b8abfd9d1b03cc12e1c7fa4510\nR = 57408bfcc68e60ad000eddbfe6eccbe5f87b98c95de0e0a2e065da92\nS = 51249bddc149f0942be001b2f3d6f6d17a0cc36fefce147058944667\nInvalid =\n\nCurve = P-224\nX = 3297edac34cb802df263f8d366f62a8b746c316adfb1c84a1c79c58c\nY = 79fe82e87ef5879c12eda6adda198a662fd77afa6a1fb5696cb7da9d\nDigest = e71dc3ab7ce73995d053bc6361bbb3f20e39ec2f295d97fa2bd229ed31a56dde6bf2c9cf6b0a9cc7e65962c57f3662a3\nR = 9993defdcf83965723c03e04ce6c33b3972cef3c449cdf1bc69990db\nS = 553b22a4164549f16aa1a928eee74548fc141fd3c16f213318965974\n\nCurve = P-224\nX = 2bc010527ea7427cedd213aeccf0c62dc513785888c6373740139d8b\nY = 2e9eb7ddf027ff7678ca880511be147098b34d8e77acb4389fbc6e50\nDigest = 781195b6396344146fe8b73a2526b4b1c981d26b9adcce0123176be1239f798c847495fd714661d1ba8e41f2ccfd052b\nR = 70a7cb04295a53b4a3a695ccb5d87856fe9152fce11987d4c43207bd\nS = 49f4094368f2de9327ca2913ef940e17c5801e8f589413838831083f\nInvalid =\n\nCurve = P-224\nX = 55c6217adbefff6e21bfb5d1b75213ce7b20c900d514ee094f27ad0d\nY = a68ae9f86eb9c10de3e7d9b03868518f33f571f85c3529d2902575d3\nDigest = a318b24bbb5ba46e6656f8ad68201c024e7b3b3849d6a70f3abce8c20f5b98ae43a326f5f48994045f0ff27098837b5b\nR = c073fba87267b45853e693910c1de791908ca7a25c1716ec2d3cec71\nS = 6138c86daf1021ae4af0faaf0abd5958f93944d5b0d82c40214bacca\nInvalid =\n\nCurve = P-224\nX = 4d0cab0dae88fa0cf53a2a6562934e0cf", "0271cc7fe54a30109a232be\nY = 70835833cf9e1f989a18d419e7bee9eb5cef1fd145cf62c4411c372c\nDigest = 6abbf2557f2e9b4e020126f4a87fb0262a1ec59bd3b569581048c5692f8a1cd381ee9c3cf195fa1a362a87ab604d79b3\nR = 3b8548eab4dc123e236133d826f2badbde96f92249f456e33ccc9739\nS = c82b2e41b9e2b21594cc03b1c0de216f183403c6025e18bb29bff421\n\nCurve = P-224\nX = f55a53b818b3ec4b4402a2c63429c1d78f2cd0d8d202e33812878a03\nY = 5a2b1a00615c56b4313828bd70526b12f402df1d40fa4900c994af8b\nDigest = da8d2571bea9840494a41f03c6c357410de030a7b5c023a0487020bb5b7c45fb6c5ed0e3dc66e4c0ab8460d9bda68c94\nR = fa934f9fdb765fabb5693ccb1de4177f172a8de108805a48f4bb989c\nS = 12994f2a26252742667044a01b509b0f315e8141629f760267b850e1\nInvalid =\n\nCurve = P-224\nX = 40a5c52dda7de858a2c17d12856c552ab820023336b9b4fc196bcd67\nY = 301e5368f59c00f15e6f3a91510444fb75a4ead8efb0778b4419e7db\nDigest = 0f88ea2d9dd40c19cd31c7a7cff71379431c9dc0a3092041a5fcbd2c20a05a8cb6e5a8aa143f1dfa169d2eaf87d01e26\nR = 0fd8773fac425a2761b954c946020615336d3e350ae40743641917fe\nS = d59f2b806ccecc444f9387f511c7f9926fe7f045c0ea633a51b7db47\nInvalid =\n\nCurve = P-224\nX = 372a134eec0dae3322de8836b89dde11a69e0379a60b10343abd478c\nY = 65921970ca8cf5a75f044db0e29802afe1726d18b3e07b61c768c242\nDigest = 1547d49d33566f8c05f68b9a980e113f919bbdef8d6d53046456a2c2ebe27ad86eaa52d05677fadd5ccc3e84b04c0f94\nR = be6474845a42fd4e85b91238f1e3ba11cc88e216d295c1b07d855987\nS = 2724242ffb5775f614ee06eaa4c985358f64869ce4ae4bfb16b5271d\nInvalid =\n\nCurve = P-224\nX = 9ad2cee0d92b00b11157a18fcd752f43e772ede7a46475a50e7ad8d2\nY = a6edfae6c5589dc0db6353b8655fe3b0f7dab2aa8400cbbd72d1a572\nDigest = 60942be3ff8d2370481b04fa07743482e08a61d3724010d7edd49bcf12e1463ae059696c825ac0505f079625b95310a1\nR = c31a40b6c245572457a19efac0da0db22b2a0818de716b6fdc5bdb32\nS = ed8204de94f1d92ae3fa6e10c727eea38d0e12b58133fda1a15559bb\nInvalid =\n\nCurve = P-224\nX = ed071a20d76f81c776875f8d3307841d33b70523ea40abd691d55d21\nY = 34ca47d8ba0a984d0d728c4d8c6b9aacdded03c6070616680aac162c\nDigest = e0776a80c616b8e596bacb0391a19956b2f0e2c566c50dd2ba99f9e59ff3dfa6197622c2a64cb4d02780a39c68d249e0\nR = c7a5dce4733a81bd738e0a6e0667dc1fade86db119e7f3cde57d6dc6\nS = dfb7f43343941cce331be27047b131617910f68393630fa53d137df4\nInvalid =\n\nCurve = P-224\nX = f51097e1e4b4f3b32e92fded0b4c8b7240a62731292e615a4cae0dcf\nY = 0549003f18e67076bc68110a75252072fc29b6d4a336d152dac2c3d1\nDigest = 48803bce00fe101650dcc83b290c49a524b21422f1f6a3aaa6e2f201863ffc355346d167dcb0ac552007a46cf8d6e4ad\nR = 6875a118dbf586a51af2212d5f32908c9f31110e9e9a7e4cdf7494c5\nS = 1542ab4260459e82070bbad405193a1894ce717af158daf1d096bc01\nInvalid =\n\nCurve = P-224\nX = 5255e4fdc816044389e9c6f5e09b85aedbe1c85b1cf9b7190ef7c2cc\nY = 683c8cb6f31e4cc1e2a5361eb47e305d5d8bfeaf94e261a341aedde6\nDigest = 995229c018cd0ea061672c46ec30c99693fff1cad491b13b4093df0154872adf946644dee6192657b436931c30b7af9d\nR = f1b0f8a3fbf7d4de19cc1d3b4c525c31bd97c2e2a94eb8a27c7c197d\nS = 936d3f49a9aa58935cfe227b22db83314ffadcc4751c8e26853d8cd0\nInvalid =\n\nCurve = P-224\nX = 7cdaf519f6b1254cb8da4668a2dd2015857ceec17f838c15d7d34b27\nY = e29f80fa4f830af7737126d4454b6498905e2c633fa61ad6acb30823\nDigest = c7d8d1f060287ec402092be54ca6e06895e91f9d0c29010124c0d9bd54007d8039b7328ec7b3a29e1d5d4d8fb78807e4\nR = e640f3e676a11007e73efd00b23087adefc9b9407ae8b79b47c397f3\nS = 66b7860a0ca35c2f1c65d50f99def9f2bfc0a6cad2008dcc38d6b3d7\nInvalid =\n\nCurve = P-224\nX = ca1a04f08708ae714b7dfb3db509970d30b7e01be7fd6181613894a7\nY = 1d90a2fcda7dd6ce8b207eef48340e58cd439a3ce17658f6f82be778\nDigest = 1f710f925826bc33c0da91798cb7d7d0700883da685a1fb9503179f0a06b589bf92eb4b67496faf21cd74c8e3d560d77\nR = 9e810ec2a0bc205df6a75bd6410e0c8ea1c738e71af060e2eb271aa6\nS = 9d05eeb46258c468b0398cb6e421149bbea5ed936be3fde3380111cb\nInvalid =\n\nCurve = P-224\nX = 558c323d8259e055a025fbbe6ba8b525b02f32caddfd31e5b08219d4\nY = e1d6398b1c47132632cd3f3fae14fc3ee3092faa619074fd951a5870\nDigest = 4b662138833a976051b20ddfb02e67339715b77046bedeb1e30b9dccbcd84204e76da722bb3bd020fbbe33a182792e0f\nR = 05d8b0bcedf287a4740bfc548570b1c1fff71058e0a9d88476bbb6a1\nS = 769321d50e34939e622a727855501e25a7ad44ec979985e7389aa3f9\nInvalid =\n\nCurve = P-224\nX = 9237e61ad9ffafc61cc1c72b6d2f96d69b588c8feee4074359f694f7\nY = db25a18f1eee72734c640313f5c6c0441358611406cc62619113b4ba\nDigest = 4e7bbf78843a767536977b240e9d1516c73c0fa19bc91448280fd85361b06fdd11ee413f956ca4ea3d67c0e325a1d53a\nR = a58225b10080dab26644f10d8a817ffc4ed4535011729491b6ad5d00\nS = ddbc010e295882e0731ff240f15ed82fa3e81b7552c690cc5b40be03\n\nCurve = P-224\nX = ea7efb9a7e7bf693dc0249504ead70dd422ec86806cd649ed57a7ffe\nY = 33dfb17b1cb244279990019286ab477a2aff2b55c08959deed0b1a28\nDigest = 330f78db9f217f95d99cbcb5414a32523025b85c87ed5aaa3a5e6b006c53cecbbd446166bb9b98e944626332c3266e82356e72110bdbf7df2431b8e7faf59e45\nR = deab574de1f971419b7ba9e169866c3a6233fc627c13dc6a8cb88bdc\nS = 8d4c542bb0046da1b3912652a2c84542668cd89920808785d04e4352\nInvalid =\n\nCurve = P-224\nX = 6fce4d789b1240f2ab1c23051aa03e219da99943a18864e7876d4d11\nY = 3e84a6bddea4a28cf8151ae73aa7b1964c37e654241353a9fa723f67\nDigest = 0088e4cbf3eddb6eaf108fd3937c439684ff8fe5595f2032948423a2a15811b34b0def245bed3b4b4ca90d3f497f3aaa2577a7154d22d7254dfc4755eb9b7b17\nR = 2d1b4f1ccaebc0a929598b650ee364abfd6091a542ba426886d75f38\nS = 44f3d7afe84ae33ab5f9426dfc85248ebc7e0df434d35980ddec75e0\nInvalid =\n\nCurve = P-224\nX = 72013dd6f5b1eb709b3b7da234987f9a36c6f0b095620b8c31f02381\nY = 319d54c719b59d91900b3c20d963ddf1a10d80d6601ac155094b075a\nDigest = 3cba2980faf5579c7ddbeb31c3318a162a882129a1efe1fc9acc3219a617c460701f22fd7a5c46b017bd9ec9c40587127319ea14b148d2be4df9875d5bef6e4e\nR = eb38db9b757b3cf04020f09188c789bf0258cd0467cf7d67368e8703\nS = 7664e85f01e67881712b24083f89e838c8b818de4d665494e7016833\nInvalid =\n\nCurve = P-224\nX = c6a65011926eb64e02bf472d5ba37841d49cfb7f17a20fb9f59355de\nY = 386ccb33d944fd7be6b8531863d2b6200cd602d300d7e7681537e53f\nDigest = eaa81b1236121db12f2036611eb6d3e5386f5733125fb26844cb4188109aae402525fc63bcd73494c36c170d1934b108739d79b0c4f184bd85ffce93b1beecde\nR = 9e7c637a699dd52512faea847079f0ad41b20cd7a5461c36d01e857e\nS = dec6e9ef361de3f6ec7d87de3129eaac5fd0b43b5f7f58ce46c29173\n\nCurve = P-224\nX = 5bcdbaeb2f6c57e8a9dffe94804e74daaf9db8452d13c6a8bc2a4966\nY = a564072356c5d86200e979291a19d5e73d8bcb701cf84d9012824bf6\nDigest = 4a5de84f304f0c83365ae4213fee71c0944d8580f9d8e7455fc961e9f98bf3d51b7fc20aa44e36c0bdaa09e365767742e9bd8bc868d5c6cd8e1cd2ce2968e3dc\nR = c58436fb77aaa4468dee284e1220141ce9ff4426f75daadf5a898a6f\nS = 87aeee1229a50921d8e77e7e3478061f5c051097defb104a0455ed81\nInvalid =\n\nCurve = P-224\nX = 6c6a7deef8b3dee2eaa98d8ec877dddb460365968e63ffe5c249a421\nY = 1ad1715797b5e47c4be24d7ecb8141f1772344a2f643cc66fbcf3f9d\nDigest = f59946dd73887a1fb945ae3e5b44b574512e36dd7d35925b0bdc3a3f69a88e50dc6ebaaac86092679961a99d7ba5724363c5886e7c2cd566433c5a9d59e2515d\nR = f778faa2dc2cee7de2af0bbc4339239dc240907e59ac034464ce986b\nS = 2ac929588a8dc8785808c9d4366bd7b1a81e0fc5be0c63e62344c251\nInvalid =\n\nCurve = P-224\nX = 0ee33a134feae6ee1488bf10edf7cf7c318a2d709080a24818619b91\nY = d7d39536e42652baf55159847f475ded075385a3c1af5c3dcb17ee6a\nDigest = 00fc4992514c1053eee7facc5199161a2b0f69dad2770326371ba42c2c12ffdb4ff6bd86fc440dc8dc1354dad42ff0c2a055b61137532a62521b0f3508ebe611\nR = 34bd0407f80cb6fc759036e6d4522eb6da94874c92ce0f02d8f5f2ad\nS = 3a2dd970050ff990162e5702b06905d03e3c7bb2771050de6d84eece\nInvalid =\n\nCurve = P-224\nX = 31d3c62a4305c37a15e9102072e287a8e0ac027f9189cb9d87ecbea2\nY = 26449ca391af6a2a9f8daaa036f2c9044b336773ee48bcbd9cad59f0\nDigest = dfafbf96b70ead7e91dbf48b8efd062bf2bc0aac6d3e90a7fdf61aac13a74b304bcd0d0c23c88df269d45bdd31d50f0fccfc0324698af4dbcffef04ca05a119e\nR = dc33e8f7b52f584aa3f091aba10c2a9a23be6835e1551092652e1bbc\nS = ae84a6d19f6bad3f9886930c0a1406016fae813673db1516b31b638c\nInvalid =\n\nCurve = P-224\nX = a6e4470712df583d0c795237ff46c9df5718ba2aa24139a2d99721b4\nY = 9edb403a8c10807e8736af665dbcf6052bd4b43bcdc8b9eb8d4394fd\nDigest = 36cd6716cbb8b7f96df4617143be7b74f42bc94e468e79e6658d00b092e24d6de82f207693427fb439dd13bcf49665cac343ea35a79b5963cb21273094ce28fd\nR = 4e9ba5bc4f4fc4e507c1e5cbd0d688da4237385b16ff06601436d8ab\nS = 4e0450a57d802d0ea7b0fb57eb162267195bc4248a831a0ee8b0380d\nInvalid =\n\nCurve = P-224\nX = 350fa782e1cf7254b18cde30683e54edf2c1b4782525fd081bed5920\nY = a77de5b4139ff63e108b6fbd3a7e6c0", @@ -2630,15 +2636,15 @@ "6c8acb8ed9136b1c5adf6f11bfb5f3dd8bb1e208ca8329a0aff9bf286e3be90e4d61d5147bcaf2293f934862cca6aead51d6e0a083093\nY = 01963e84a2f06a9cb273a424ee5fa1ae5900fef348371cc91c99323f58bbcd8742a4495a4f7ef52677501a4d5d663658c1f6c8f6edef8b7880e6894ff9e52bb617da\nDigest = c55e6d3091b6eb8f48794749ae0c7e9394ca3cb7b083ad65177f8f8db938a76ed6d3c1286a3d51b333c74d1c0f8032b7\nR = 012fc3e0c18c4edbcda4f82b5136c893a6307c3f60affa15d0d99fc0e4a3576b7daefa363b3a362014d14f631c35619f6861bdff9a7b503825bf9f027fcb9a31fd8a\nS = 01a138d6b02fd2a7ba45f7f952b2f329ba6a8e25697379330dddd91d1d6e865d3df1541bc4717d3e09b10a57cf38dcef587ac31b4a8abedef43e4f6cdf6ec3f49eea\nInvalid =\n\nCurve = P-521\nX = 01efc81c1efc7a9bc36ed49a5ef6fa1ba641360fa5c0f96cc1e4a3f4d973c95e86935d979fc2101370777637ab210a56fc4173a50a758725d60e9f925f2066d2bc00\nY = 0108225fc94ab33c74aff785dcc68c45cfc3cbbdfa3481fd2a3f97308be671fb32fc8d268c129d97f140210def188dceecc9d712ac397793dbc39c5cac332671ec54\nDigest = 5fe56235e4684bd7419e321db508565d30cd351086ef67d943aa5b932f93efdce875be295920ce5210b7d3f092f401e6\nR = 00480c48a24e7a7ef832547d107769254fcdb4e7982d0e6abd16822837fd4f3b66d81e1d4a018606881abebd220ed8ca865d7e00499ac9651a98c65502baebf34a98\nS = 00ccd22d1b44a1701c99f662535aea9abff7e27f73628101f42708737db8b07effdc2b0b05d4ef233c5910b6261ae9d9c540115f27d2af766c0494c33d31bd56b3db\nInvalid =\n\nCurve = P-521\nX = 00a15c8040f94235b8b444f7a74ca293ed1b718449911eefbdb74332687850a644395394c690aa98e8064f6eca600fc3f659208c0f8a21a1e7113bed0c6e00e3176e\nY = 004bebea7037b731d175043dec3630b2ee85c680a81256921a89407c14507c10ac043deb5d474602211ad58cb569a8b805686bdac3ef7ff62a4d25b27200706b603d\nDigest = d27a626bc9154bfc85b03724329b8a06454d5dc005997bd565f64a80134c865e73a2e123d2b433927efcbdfa3eafa827\nR = 00c1a70919025aceb29dbabdfc2a43715192cc60fc3d1ceababb40f91e3110b2cdd8f6e9c1bafe7415a26fa4179f8fc261b143ddb094fe61117afb13adae9db8943d\nS = 00197d7f87aea8d6ccd2178614b147b290ec780c8075f8439137803c0e9a589e415d84fa23f5f31d61c1674f87142d4ba4f8473fc92d7715c281dcf3f1ee5c2f1390\n\nCurve = P-521\nX = 012a593f568ca2571e543e00066ecd3a3272a57e1c94fe311e5df96afc1b792e5862720fc730e62052bbf3e118d3a078f0144fc00c9d8baaaa8298ff63981d09d911\nY = 017cea5ae75a74100ee03cdf2468393eef55ddabfe8fd5718e88903eb9fd241e8cbf9c68ae16f4a1db26c6352afcb1894a9812da6d32cb862021c86cd8aa483afc26\nDigest = 7679eaaf0495725fa99c51a2dd0c35c8882b840e1c2340ba793013b1e2567471cba35c0dd6247cc2c2ca14f6556912a5687023fb2f0ee02114393bed4c598742\nR = 01aac7692baf3aa94a97907307010895efc1337cdd686f9ef2fd8404796a74701e55b03ceef41f3e6f50a0eeea11869c4789a3e8ab5b77324961d081e1a3377ccc91\nS = 0009c1e7d93d056b5a97759458d58c49134a45071854b8a6b8272f9fe7e78e1f3d8097e8a6e731f7ab4851eb26d5aa4fdadba6296dc7af835fe3d1b6dba4b031d5f3\nInvalid =\n\nCurve = P-521\nX = 01d6aef44370325a8a5882f4667c21172cdc8fa41d712562883ececff53883ac8ee276124e825088c79d6c9d96323cb7b8c0b7ea44d3f0026e2538f4b62d785bb1af\nY = 0027203959a6e944b91fe6306debe74dc5dde9831fd0ec27e8be2d0b56807d63151b15f6495b8632e919e1e6b015f5ae5f2b6fb8cf75b5f848f00cf4ee457cebed3a\nDigest = b99c410653ce928e365d3613331b5df067020e92f634696279d5cee80f1f4a82f7d976a059e318b36eb25314b56f8765a81070d0944f4c86e8407d9c3e2aa7da\nR = 004417ff74889dde6bb1820b5d13da5c81dcf9b0723ee89bb1ff0d3faa90d497685709f315b2cbe55481dee43ebb6d25b1501ae69494dd69e7bffb72f987d1573b93\nS = 00fd7aa027c665458c7ac11d54d4f32cb4a1e727b499ce27b08d3d647c636cc3222a4f0a6057732249ddc22574d7cb80c3769c3ea9de3d33db3edd8ea90cb3f8dc8a\nInvalid =\n\nCurve = P-521\nX = 0153eb2be05438e5c1effb41b413efc2843b927cbf19f0bc9cc14b693eee26394a0d8880dc946a06656bcd09871544a5f15c7a1fa68e00cdc728c7cfb9c448034867\nY = 0143ae8eecbce8fcf6b16e6159b2970a9ceb32c17c1d878c09317311b7519ed5ece3374e7929f338ddd0ec0522d81f2fa4fa47033ef0c0872dc049bb89233eef9bc1\nDigest = 97ff5a81fc88f7ddd3bc58154ffd2695912fe50ce7c63b62bd798fb673c6aa49f54bc7301fb7bddc6edc51b7e0d0b4dec9f80851fff02a33671ad9a406bbabe5\nR = 00dd633947446d0d51a96a0173c01125858abb2bece670af922a92dedcec067136c1fa92e5fa73d7116ac9c1a42b9cb642e4ac19310b049e48c53011ffc6e7461c36\nS = 00efbdc6a414bb8d663bb5cdb7c586bccfe7589049076f98cee82cdb5d203fddb2e0ffb77954959dfa5ed0de850e42a86f5a63c5a6592e9b9b8bd1b40557b9cd0cc0\n\nCurve = P-521\nX = 01184b27a48e223891cbd1f4a0255747d078f82768157e5adcc8e78355a2ff17d8363dfa39bcdb48e2fae759ea3bd6a8909ce1b2e7c20653915b7cd7b94d8f110349\nY = 003bd6e273ee4278743f1bb71ff7aefe1f2c52954d674c96f268f3985e69727f22adbe31e0dbe01da91e3e6d19baf8efa4dcb4d1cacd06a8efe1b617bd681839e6b9\nDigest = ee21776d7174103b7fb65f03fd5d78744d2706c6726ece81e3943cf90f60fad6d8978af6cae9bc059aee2412ef86d0600694447a10b9d21079b9ca77500634a9\nR = 004c1d88d03878f967133eb56714945d3c89c3200fad08bd2d3b930190246bf8d43e453643c94fdab9c646c5a11271c800d5df25c11927c000263e785251d62acd59\nS = 012e31766af5c605a1a67834702052e7e56bbd9e2381163a9bf16b579912a98bebabb70587da58bec621c1e779a8a21c193dda0785018fd58034f9a6ac3e297e3790\nInvalid =\n\nCurve = P-521\nX = 01d9020b8e6717254eebe619d46dd5a9dda7ba5491a7d1b6820fba888e236fafd71179200437f4d61284fb5a3dfbada66bac3e6909ccbeee03c2b93a8bebe41a73f4\nY = 0048a5f09174fda12704acdd8ed560695dec42864b6300a030768a0be7f09d25f82d7b126125e41417a145641937807ed8d1af7a53f5bc3fc3c57427d755dcce3e25\nDigest = cc4e8efb1e9061500bd2dcc5233c2bfa3d3bd89067c26cfee4fff4a5a7c9c9b15151aec1fa91e78b67cfe3efd966ce65681dd3daf36b887d844033a473be592d\nR = 0092df2dcb457fc7578eaacc98ffd73ade07d764e9553506f3dc958cdb3f65d37665528cb2f5f8bded0db0a57e6fa73bfad1aaf94718379d1655db4f32d4c505a785\nS = 010e0c31479c2b29dc2726fe9f75b397d9e37a17619e96bc631c62e9ece71f05b199804cc803940d43ddee41171dd7787668c7db05049dd5b63e4f63562aa700ca81\nInvalid =\n\nCurve = P-521\nX = 0007067d2cf7b7619b9fcff2c898246ae0950439b8bab92d809624970eda18456cb99953ce1ae45ee5d36ef02fcd5caa4d951de8581f0c21e572caad56d6dce60da3\nY = 01913c59007a309005f226b6a30122828d60b4d0390359e1977f88b5347dacf2056dd362648e8b1d6fc038a3bd3fde6f1140c740efa9075ab8b4a64b334c5cd43f09\nDigest = 996010910456dee59309f1631f30e3dbf7ac2da7d5d7f69223c8a18f491cb18f7e11d0ca09352b715354a071e6d392a8c1dc0751569bdfcf36c158c8b07a5ba6\nR = 012aa4a532c108aa3cfb1753f95ca626bb72bd96a423d727656d4ebdc3f406d6cc6c44d3718f9abae8a0b46be9b57f8fd3a540326b63d0d4a8a93165715920437787\nS = 001badaf38e16efd75915f4806f054d40abd2d11e402039bd48c832f66cbfd145e4dac93357d476b7e608d7b75a017374ae76eee86c505f2cc16eaa19075827ccd60\nInvalid =\n\nCurve = P-521\nX = 00365388d9589c18ae608124b4cf746ff488183a912e07d26b6e867c5defb552a5a0df5a16b6342014dd1b0b6760072bcd60045d6a9a514fc74d16047c2e8765636d\nY = 01a5319b26fd555f2a12e557418f6aa65a3461aeaea5c0c6d8698ceaa5495eed7a7d2fed0b76e77b5be11834f36e413d5288e47231c0eb0e9007d4b042bb7a1b6014\nDigest = f8e150be2f657c8266fadc9bdb04648fc5a51f3c3f7521022aaf58d24165f8af4ad66319d8aa2dab48fe8a2f773c8d0e6c8c4f732e0fdfbae4b91918530c1f91\nR = 01d9ef377063a592cf81e27815a2c20789ff9b60f7f125e618b52d90b35abdd41cd7f437cfad337953ab0314fe8e79a2f2d27fa08597d4b28313358f714a737321fb\nS = 00f01d4f150e0a174674a6a61a58a4ba781406024f6dd1b5252e04807b8a807a4ff8d52883eaa258286e506ef4b04ca890e6f81a79ed9a0cd5ed585094fea0bc5c43\n\nCurve = P-521\nX = 00fd0cac24aeb75ca50c50a72340256b43649050e0fa155f72342877bf49c3d57ac2b51b828385ee6aea94bae38587e63390f5ef4ac5540a9e6fc6f1c1e79b524693\nY = 0107b227bdd307efd7a8d4034f733d150c41601215e76eea2bac62ad2427dff52f75f46da3d5fe31bfaedf071d2a8bb5e3c82bf6c84ecdf89ca233c92d599d376309\nDigest = d0d8c24bc5b6f34bf35b08f25dc2d6ebcd36b565f96bee9c1b47030428f10c3ad2904de19247b29650690c08517404e8ca55f366ab176e5089a4c9c661f90eb2\nR = 01c00196aa5dcbc4c4404fa76504a5eacbc96aa66c3ba531a3a679f3fb675ce58f863e08b0d2bdeae74d96ad93a39a78ed4bb3749e26567d0ca5c48a71079925b617\nS = 00f1188eba4f0943f4003ddad6a54606c13af26014db2eb8e60534fad3dae8f07c021cea0990987f1e02dce03fe53360472c3dee3c305bb3ef4b0b53ea6625bf152a\nInvalid =\n\nCurve = P-521\nX = 0104a96beea09d88ea6789a9925880c8a9ece8d764be931675640c1bf847ac8e7a8b14f408ba6722c2bf6295db9132d6ad2fe287fa6e6855f7c58ed238148a896944\nY = 01b5e8e643fae552261427ea7d521f380adf605579462315c75e9203203ebdc9ee33dd7ba885b6cccccbd2327462988223c4b31485311c935a341ee87ba1ee820ce0\nDigest = e9ea3c8aeae3133be537da09b98c096b9a9eb287a02b3542efd30f0026ea9cb3f242b842b2cedbf02e70b44ff8a0b1bcf6f31956eaf6c0dd9a023bea36440068\nR = 00ba2c57827baae684d2c637590275c782a6db263a5358c8e1a08b5460ca3cf0f5ff8d4119a6b0d55fc68a75c793098e0a5622a0b4e2", "fcb0f17943440138d751797b\nS = 01594beb73b2ebb7c573ff07b5c43e722dc05979df0eef53587e9fe06a920f61d2efcc7671e6cb875df4e4d92cd4d37cc3eadcb9b6aee8f2097790ce24d6dcda8706\nInvalid =\n\nCurve = P-521\nX = 010d587aa82a4d8e690672c00e3fd71826d892862d14dc4fbad4935aaab86924dc7ee6f7fd3e2bbe86a8652589448494dab83d363d1d623cbae59f6c2670706a0576\nY = 01a9734c99b6ff21267050738937c30971d0f6fe07e29794748a5017ea1036c975c9a52e6d3739ca0e8d70e784529cc1a7437aac5d75c69121b69020a95356137f1d\nDigest = 8814a9dbef9e6d9b8322bdf8d471b207388bb7bf831d9fba8ad29da52d528d5d5108c01e4459f5ca13e26bf5da3c848195558828d7a00f53abb9fce47ef35091\nR = 0188dcb840dfc573a97117009226d58dbb930ba8ec848931786abc770611f3519c8ba73cceb5b489170805bcf04974672fe66c908ba379aca99fa67fec81a994c2d1\nS = 000b1a185512dc6a65e454ea2bdb8049ef8f012a53ae87b759fb5d9edba51ea32e254e80545a99eb4b7c58af96b7c433535fa3f009cc644b1c97666d88355af9fc19\n\nCurve = P-521\nX = 0182c957a62e2e27aa28acee2e2f7b1ed6aef81c68001d2648da47d2b621e8b8bd18d991cd1e3fb9afb84f639fbed1050584428cd2a1d50f877532ffdefdd4e6f7ba\nY = 005fadeef58cc0d79362b599e94636f9c70e3e5580c085b7ea52a5fd24fe4a892120b8f28ba53ec249c42d6d3b36268b8ca8464e54b72d37327d7504d9b7ce534d95\nDigest = e1838cf6ab5daf5ed28dc1b3365eb03466e01cc30f6fec9756c966cc7b89ef5ddb32754302a33b5aa309c871f98de082a21cf734ba8a368794d89b0cde1cfcf7\nR = 01e3a78e973fef6b6de8a0356401e89f435ae5f49c0173f073c4dbb9c91463e420f5265eade8305f11d30fa8d97e5b4c5ab33975f73385aea81fbdde2f7ddf7fdf16\nS = 00efeca10b5362e05a8f2e3df6661d0d536b32ca1e0a62515df2d94eb314aadb5eb40468483e24b16efe85c503d6c231ef860aabe674b72ed1ddd93853338e5e4e50\nInvalid =\n\nCurve = P-521\nX = 009911b41f9af525c874e05bfdf050331bf830296911bcb18eec16275027d63fa106c8989b07921c7e58b02711b5b5880cc4e6d9174e0d31060548cf643bf7ed4f0c\nY = 0184fc0fac3c2c80c69c1c0293f4e5e22fa08c267b1f36ac5ad6dfdf4da1754f7942f48cb56f56cba05e22b91508fe4db3703066e8f697aca56f974f3fe530c9640c\nDigest = 365868aac67d82cc0510bcfb012f9035f99b5841329344f1b45f0489463cfe22c2f3641f7d6c59a3703aa2804323db8fec4fb3804f521149e5f7d38c9e1e94f2\nR = 017b8a22fd8f73112310867909f234fad6aa82999c28ea5a2e74b4b4bc79b2f89008b4d361ef7e797c7656f7d9317eff3e5a4982799b8cc0db82618bd2aa3959f617\nS = 01edacc6d1c0004b2090d2025d615de1fd53a96e826a3930c7cafaf3c87f34b2583997534cfa127485600a7ae04e6af4a2e98c77fd04507195e520e80014aa982a3c\nInvalid =\n\nCurve = P-521\nX = 006da3b694e3123ef96b3fd2ab964f85a36110590720dc1724a5d50d3050498957211c6a1535032cf1f31240bfab967cc0cf3b442c35a1bfa3e72470df1863d2593a\nY = 017d0a5dc460c85d0365c7bdc2e9300e276b8aa97368af9972744f4422442afc601ecfe7903a33b0354c901c7b61f29d2d3c5610192cd188291c5651754b385b87a8\nDigest = 4e992e9e5403eb9822958f2737b70fa8096474a845a0f37244af744a6009e3b6e6e008faa7192fc01755bb785e03e4e3d2caef03eeadfe32a7fbc7e3bda49f5e\nR = 01f9cb1f4e2e65282a929acd8b685ab34da176f5c73bcb374fd1b09bc995385ce3902d6c5496b02916fd5a28f6f8bb662828a76aa0ad14b01bc24a63b328c7bb949b\nS = 001d6b3a2f34e3b7bf63d06b11ace172ca61ac5a911a4b408d766eb586c9ab820d42f555e546d892643e12a6752465427c213e3839e4f8cb3a7e4fd83642843e8544\nInvalid =\n\nCurve = P-521\nX = 00b7e03f0d623a0998add5360dfb0bfe836fcb0a46b0d6f697ba6b3766bd8698ac8c7af62f50511c6aa5e613f4a99fa28f70b220ba1cddb22482be74c969953ae6e5\nY = 00d4ee40ee4441dc85356760f87ba32e2e7c269a2e53a2e8425d5ff02f5e4fe8d65cefe20e162c3915d2eb9ad1354bd28595a86dbdc94a5d40c5b44b1e3aa3965455\nDigest = 8ebb37c7b60ba4622070391864a70b5e797dc2464151304b1d9614b77f0bcb92fce230f42cf98f9b2612f481c21f70564f5cbfc4e81e48e08ae27b466f717e02\nR = 01fcba4781de6506f7c3f26521f0e036b5225f651e69e115d6784b2176a666edf69d759627468400a73a136f599fb8db4643fcc16bdeeef6384a1875e1c81c36b962\nS = 00a21cfaa7e1ee0eff7efc3d7e936378500283b00687363070974483ad474c58c6b55b77f678d78e7cb44d9745f79394659bdd26b72663608384b5ae9cac1c888d13\nInvalid =\n\nCurve = P-521\nX = 001bb7c623fde41beec7ddfb96f65848c2f52b50b39576bf06de6ccf157b8ec49889528728480928236300447da7171f58c8f0e0ba8fd3e2cf378b88619aa6c1e0bc\nY = 01f8b20a1a7df319bf78c2cee03581a1ffe8ca5107fbfd40760fbd5ef5247e2df1092d5caf504a9ee653ded2995f0cdd841d6af29c9f720770056ebbc128705f68e6\nDigest = c18be2e3f935561d1ad1cacf6ae06e733a463c7e5063cbb0cfaf162a579522786755dff879d2bb0b63d4eea9120a2ed648d601a5cb2dee936dbada679bcc134b\nR = 0000db4c31f316912295c5b9506aabc24b0b2dc2b2358e6b023148889d9200bcf44762e88575e359b4868b2d93ba7bdb24800b09fc22eade0744b9832b71ee784e9c\nS = 018c84437fac7cd82099a2a4230084ac27ec7ea9c92e1c9d9a71290df9b37dc881f9ba59ed331c22dca4b2cbb837cd916e0a78398d2b7aaf8e88f113a942beac48c0\nInvalid =\n", }; -static const size_t kLen39 = 143692; +static const size_t kLen40 = 143692; -static const char *kData40[] = { +static const char *kData41[] = { "Key = 00000000000000000000000000000000\nPlaintext = \nAdditionalData = \nNonce = 000000000000000000000000\nCiphertext = \nTag = 58e2fccefa7e3061367f1d57a4e7455a\n\nKey = 00000000000000000000000000000000\nPlaintext = 00000000000000000000000000000000\nAdditionalData = \nNonce = 000000000000000000000000\nCiphertext = 0388dace60b6a392f328c2b971b2fe78\nTag = ab6e47d42cec13bdf53a67b21257bddf\n\nKey = feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255\nAdditionalData = \nNonce = cafebabefacedbaddecaf888\nCiphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f5985\nTag = 4d5c2af327cd64a62cf35abd2ba6fab4\n\nKey = feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = cafebabefacedbaddecaf888\nCiphertext = 42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091\nTag = 5bc94fbc3221a5db94fae95ae7121a47\n\nKey = feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = cafebabefacedbad\nCiphertext = 61353b4c2806934a777ff51fa22a4755699b2a714fcdc6f83766e5f97b6c742373806900e49f24b22b097544d4896b424989b5e1ebac0f07c23f4598\nTag = 3612d2e79e3b0785561be14aaca2fccb\n\nKey = feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b\nCiphertext = 8ce24998625615b603a033aca13fb894be9112a5c3a211a8ba262a3cca7e2ca701e4a9a4fba43c90ccdcb281d48c7c6fd62875d2aca417034c34aee5\nTag = 619cc5aefffe0bfa462af43c1699d050\n\nKey = 000000000000000000000000000000000000000000000000\nPlaintext = \nAdditionalData = \nNonce = 000000000000000000000000\nCiphertext = \nTag = cd33b28ac773f74ba00ed1f312572435\n\nKey = 000000000000000000000000000000000000000000000000\nPlaintext = 00000000000000000000000000000000\nAdditionalData = \nNonce = 000000000000000000000000\nCiphertext = 98e7247c07f0fe411c267e4384b0f600\nTag = 2ff58d80033927ab8ef4d4587514f0fb\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255\nAdditionalData = \nNonce = cafebabefacedbaddecaf888\nCiphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710acade256\nTag = 9924a7c8587336bfb118024db8674a14\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = cafebabefacedbaddecaf888\nCiphertext = 3980ca0b3c00e841eb06fac4872a2757859e1ceaa6efd984628593b40ca1e19c7d773d00c144c525ac619d18c84a3f4718e2448b2fe324d9ccda2710\nTag = 2519498e80f1478f37ba55bd6d27618c\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = cafebabefacedbad\nCiphertext = 0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7\nTag = 65dcc57fcf623a24094fcca40d3533f8\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = cafebabefacedbad\nCiphertext = 0f10f599ae14a154ed24b36e25324db8c566632ef2bbb34f8347280fc4507057fddc29df9a471f75c66541d4d4dad1c9e93a19a58e8b473fa0f062f7\nTag = 65dcc57fcf623a24094fcca40d3533f8\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b\nCiphertext = d27e88681ce3243c4830165a8fdcf9ff1de9a1d8e6b447ef6ef7b79828666e4581e79012af34ddd9e2f037589b292db3e67c036745fa22e7e9b7373b\nTag = dcf566ff291c25bbb8568fc3d376a6d9\n\nKey = 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext = \nAdditionalData = \nNonce = 000000000000000000000000\nCiphertext = \nTag = 530f8afbc74536b9a963b4f1c4cb738b\n\nKey = 0000000000000000000000000000000000000000000000000000000000000000\nPlaintext = 00000000000000000000000000000000\nAdditionalData = \nNonce = 000000000000000000000000\nCiphertext = cea7403d4d606b6e074ec5d3baf39d18\nTag = d0d1c8a799996bf0265b98b5d48ab919\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255\nAdditionalData = \nNonce = cafebabefacedbaddecaf888\nCiphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad\nTag = b094dac5d93471bdec1a502270e3cc6c\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = cafebabefacedbaddecaf888\nCiphertext = 522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662\nTag = 76fc6ece0f4e1768cddf8853bb2d551b\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = cafebabefacedbad\nCiphertext = c3762df1ca787d32ae47c13bf19844cbaf1ae14d0b976afac52ff7d79bba9de0feb582d33934a4f0954cc2363bc73f7862ac430e64abe499f47c9b1f\nTag = 3a337dbf46a792c45e454913fe2ea8f2\n\nKey = feffe9928665731c6d6a8f9467308308feffe9928665731c6d6a8f9467308308\nPlaintext = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b39\nAdditionalData = feedfacedeadbeeffeedfacedeadbeefabaddad2\nNonce = 9313225df88406e555909c5aff5269aa6a7a9538534f7da1e4c303d2a318a728c3c0c95156809539fcf0e2429a6b525416aedbf5a0de6a57a637b39b\nCiphertext = 5a8def2f0c9e53f1f75d7853659e2a20eeb2b22aafde6419a058ab4f6f746bf40fc0c3b780f244452da3ebf1c5d82cdea2418997200ef82e44ae7e3f\nTag = a44a8266ee1c8eb0c8b5d4cf5ae9f19a\n\nKey = 00000000000000000000000000000000\nPlaintext = \nAdditionalData = d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255522dc1f099567d07f47f37a32a84427d643a8cdcbfe5c0c97598a2bd2555d1aa8cb08e48590dbb3da7b08b1056828838c5f61e6393ba7a0abcc9f662898015ad\nNonce = 000000000000000000000000\nCiphertext = \nTag = 5fea793a2d6f974d37e68e0cb8ff9492\n\nKey = 00000000000000000000000000000000\nPlaintext = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nAdditionalData = \n# This nonce results in 0xfff in counter LSB.\nNonce = ffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nCiphertext = 56b3373ca9ef6e4a2b64fe1e9a17b61425f10d47a75a5fce13efc6bc784af24f4141bdd48cf7c770887afd573cca5418a9aeffcd7c5ceddfc6a78397b9a85b499da558257267caab2ad0b23ca476a53cb17fb41c4b8b475cb4f3f7165094c229c9e8c4dc0a2a5ff1903e501511221376a1cdb8364c5061a20cae74bc4acd76ceb0abc9fd3217ef9f8c90be402ddf6d8697f4f880dff15bfb7a6b28241ec8fe183c2d59e3f9dfff653c7126f0acb9e64211f42bae12af462b1070bef1ab5e3606872ca10dee15b3249b1a1b958f23134c4bccb7d03200bce420a2f8eb66dcf3644d1423c1b5699003c13ecef4bf38a3b60eedc34033bac1902783dc6d89e2e774188a439c7ebcc0672dbda4ddcfb2794613b0be41315ef778708a70ee7d75165c\nTag = 8b307f6b33286d0ab026a9ed3fe1e85f\n", }; -static const size_t kLen40 = 9174; +static const size_t kLen41 = 9174; -static const char *kData41[] = { +static const char *kData42[] = { "# These test vectors were taken from NIST's CAVP tests for CTR-DRBG.\n# Specifically those for AES-256 with no derivation function.\n\nEntropyInput = e4bc23c5089a19d86f4119cb3fa08c0a4991e0a1def17e101e4c14d9c323460a7c2fb58e0b086c6c57b55f56cae25bad\nPersonalizationString =\nEntropyInputReseed = fd85a836bba85019881e8c6bad23c9061adc75477659acaea8e4a01dfe07a1832dad1c136f59d70f8653a5dc118663d6\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = b2cb8905c05e5950ca31895096be29ea3d5a3b82b269495554eb80fe07de43e193b9e7c3ece73b80e062b1c1f68202fbb1c52a040ea2478864295282234aaada\n\nEntropyInput = edfdb55e77d418a63e4414dfd42225ed257cf74e99325fba26e8f3a4524a71bc80a731af23256908cb4675a9c253ea6f\nPersonalizationString =\nEntropyInputReseed = a9372fea93d607fbbc75a97b7f65f2d4ae8c06bd184981572e888a35c5794d2bb380a4ae04bba27f2efcc9e7914b96dc\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 11b1a0f0bb935ec0c54e089e0cd20832d1f00e7069f30e9ea2e35b7f15ecf0577d0e90035bf0f91ffd9e8a1fa8a507503739afbec19393e02c9b7c230cdea36f\n\nEntropyInput = f253fd442b105434c0f47ba9b6798bc20c8832a142a2a6d965678485a3ac52393528a5e092341d60ad74429f4005f8bb\nPersonalizationString =\nEntropyInputReseed = 600c822b198dbdcd9d13ee25bd4b846e5d8665725eac5347b4cfe7512c1f3fbdc4c51c85d977ca58e9e6485a17c533bb\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 076419bdd354d6a1f1415a0a71bed94db29cad22f0205d983c841874497875a4857404e573545366850fe6eb5286e0deb87ddd63bb3317b4556a82920412aeef\n\nEntropyInput = 8dbf2c37dbbf3862f05af4b32e98edd3d8cd7bd34d8a23daa2d15200daed6e9d238387ba85ddfd35a2986bdf5790e1a7\nPersonalizationString =\nEntropyInputReseed = f67aed05dea08baa16cbb669ae310a0b8e019da0a7fe2762abf684121292186a50bc13d568576ce5d7aeb080e4604a1e\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 69666e65c5623140da35927ec39189fcfda0891674efdcd2a7d6f2628921a37bd49a164590413c04f6090a50336f040b015dd8c45452991bcdd96994c5ecc6bd\n\nEntropyInput = 2fac25dcea5274a7dbd6af112d757b59a4447f5dcbda972666af071c5d8f71583ec6914a1e685f610b8a43ffada0b411\nPersonalizationString =\nEntropyInputReseed = 52f5b1f927c0873ae375d6a6e140fe594fd474a63bcdcd6a98109e32ad980ce534714ec626dad7acd43101415e5817d2\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 3096cf20137eb6f94d9d26a4871eddf10285c6984776847105ca9294aafc68925ad8bd7f36bb68fe371476114649ead11b926f9f0fc1d21c744342ff5c44c8e3\n\nEntropyInput = 4133a0e6ce837125f46f2a44e05c4f64d76879156ea16a1d16db1d3ec460cc53609fa9e4b3081f9dde0b79f00c93ac5a\nPersonalizationString =\nEntropyInputReseed = 4613b2327dc9054f34faf933d62bf7b12ec8b34626c07ef7512cecd8aedcbd4023f26b859a941c5af77ec1e2e02a1d9c\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = be02e94fd18c488741fd90b6980118dffba1cda5bd25aa23d44414392201c5a78c3ea68252f92afaaf540b298d3f80a94818f1d1ca84c2be5f66a46191a7548b\n\nEntropyInput = e312fd67b5009ab1c896ba8f85d53fb29517ed2a26d20a4b9d09505ec004bef5739cc94e7f368989c675eee1f40501a2\nPersonalizationString =\nEntropyInputReseed = 176ec11c0d4462ea26b1bdee41208e3ff3b430de11f12567ebe982c16d709f681fcd9f5bd5309f3f2a9d80b3a426929a\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 07cb9f51e34be38fe1d1c18858ee44db227c1e6a6c2f7d09e9143e87e9e09df0af9a5cb7a183e5d26359509fe619e52e59e3333d3620373d3ae5a008b51ef786\n\nEntropyInput = 3eaf30117135d9167c829e35bd8da227a6302471b649381858085e67c65496058ded0ab176a38b3888f4e3c2e65269dd\nPersonalizationString =\nEntropyInputReseed = df60a1b9fb2f8501756edd09e489fc98a60ed08646f5a2e018f55b71c76b9b7718ac4ae61b41241593829108ddeb0ef0\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 29c4d540354e97f50f3fb1de84eef471192cd76a670de34176c6465523ff249ed5eafe2c09f091f5ed101cf8a971d782f150a2642ed291e850906e29328d6b8a\n\nEntropyInput = 99d5543c192c6a1069bf548d80d678bc42c1f020f0b29a0ceeba424c03f8a8aa38df1c0fe100ee4c1b0bc870b4afa3d2\nPersonalizationString =\nEntropyInputReseed = a0fddd29c792f6f411b5d532fff2564d492ca15ac8b7fe1b4575e9b59806823665ad7ac4e2adcd2803ccaabe87ab75ed\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 3d58e98a1f4beda50f84f773c405d106b28f4be6da2a2942098403843bffa3323c53661a7f072a020c68f55ea2b3a9cf9157b7c4cdff5e642ee9be1f436f9c18\n\nEntropyInput = 2151ba6cf2ed6a7366991e516443162b6ed4e7f8ef2d6c81ec5e5feb0061e20ced65da27847956194dc6177b5e0befa9\nPersonalizationString =\nEntropyInputReseed = 73418efab1c6039145dc6ce09b84abde4ef4f8eaccbac250213bdd75e2a5e8b42ffb1367bd8d1281e3b0051651f78a05\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 5b219cb285c820f3bce52b9eff15afa042de3036f1a52896eab34e4476c28c60127cf8daddce0809efafab03c9269cd220a49f79220e14db9d208311d2a22a1b\n\nEntropyInput = 7c7321b69fdefdece32c45e47cce07a0d599e83ea8ee5781e2f2ff341f292c0bdb848e5ab379771639e811fed45f63d7\nPersonalizationString =\nEntropyInputReseed = 4b04652d3d0515b305f4da346754c0d398c8cfefe8e5c1edacb79cb8396018bda12ad7d42bf86e801159bb62c34fff68\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 379c12dc2c8a884c6f40df5353047d74efbd9c626795b86256abec4a6f42ba26529f19e4b043f53776180c7ab16a3817b4a50c09bb3355234786e714edb9e2b4\n\nEntropyInput = 3a56329b07dffb8bc7761c0c2b4ec4ec3b7ed2513f0cc3d9be3eb9a153e8e1605d9392dbb951e4b0989ef473301f6f57\nPersonalizationString =\nEntropyInputReseed = ff6efb9b946748af0992bdc38eeb15d4991bb610692e1fe53ff828405924a544ee0e4da70aa1d0ae55e7925a58cf5597\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 9f32e40391217833176ca768beedd2839892c6fc17dec5c250f0820c576e4ed615729653515ae13292a2e4aedaa2df74c6535d8c625dd1cab479d3c5ae7bf955\n\nEntropyInput = d550f48af436ae42ea48a8cb0cd615be8db51691b365ef20ed826b28561fbacc9deb28cd3d83655033068948c55683da\nPersonalizationString =\nEntropyInputReseed = 76ea2e732f77b337ddd402e367c158dacc3433feb40d7b4376fb8dc449891336b00841580ea189583ada95cef783d540\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 8433b2ac45da6fdcbeaf3e6f76e66beb5b90a89a9cb197cfbe405ed53b1dd51a42cfc9aec5fe7cf778f88031fb7b15b0874d4d1ea87ef3895848721b34fb1a35\n\nEntropyInput = ce6137f720affd106396d9b66540580ae216d5d7dab48ed2729cdb3e587c7d8da13ce39ea8d9d8c22220a96b74e7ee9d\nPersonalizationString =\nEntropyInputReseed = af9f12fddeef001b08a5993f62da5e7c3aff23f882ae874b9f66f28eca1106e6386dd82f07ae1fb6868f186e2ec4f449\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 219fc160dbc136cdc9a7c3407eafde4639602cc58101c512dfbd85cc26b61fc9a94cdf76f15a1de7a46e36ab64aca3eeae36acd6e3d0b3fe59b75958b3eddd24\n\nEntropyInput = 1accff5a19861164c5d2cf542cf41a789f143c7956518ae158d4449ff0c257a00966faa862ccbb363bcf4aeb31089134\nPersonalizationString =\nEntropyInputReseed = f2fa58209759d84bf38a1656bae655669767a902ade22a830df56b32ef9e1c992335eb4cb27eeb142bfd21b5d31451de\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = f214b4055d182cb258d9e9b61251bebc9bf090db662c4e36023cc156964fbbe1cedf691cd0c3d7db4262fb65a5d34b942f909b0f31fc18009766413523dcaf40\n\nEntropyInput = 99903165903fea49c2db26ed675e44cc14cb2c1f28b836b203240b02771e831146ffc4335373bb344688c5c950670291\nPersonalizationString =\nEntropyInputReseed = b4ee99fa9e0eddaf4a3612013cd636c4af69177b43eebb3c58a305b9979b68b5cc820504f6c029aad78a5d29c66e84a0\nAdditionalInputReseed = 2d8c5c28b05696e74774eb69a10f01c5fabc62691ddf7848a8004bb5eeb4d2c5febe1aa01f4d557b23d7e9a0e4e90655\nAdditionalInput1 = 0dc9cde42ac6e856f01a55f219c614de90c659260948db5053d414bab0ec2e13e995120c3eb5aafc25dc4bdcef8ace24\nAdditionalInput2 = 711be6c035013189f362211889248ca8a3268e63a7eb26836d915810a680ac4a33cd1180811a31a0f44f08db3dd64f91\nReturnedBits = 11c7a0326ea737baa7a993d510fafee5374e7bbe17ef0e3e29f50fa68aac2124b017d449768491cac06d136d691a4e80785739f9aaedf311bba752a3268cc531\n\nEntropyInput = f963096540d0023d6703e18248755ad16aea91852a2db0dd0f6a414d2a5822f3224ac8b1d47b01aaecc93ae299081d7d\nPersonalizationString =\nEntropyInputReseed = 399ed54bd846de00d42fb1f92d1ade93e81e32cd6ce73825f0bf86179dd46fd79bc8cbbd3b8834e58cc86619e19b08b4\nAdditionalInputReseed = ee073f9f6145d0a7c09a5e4a12d65baeba360bc9b5d7cadf93e7d2454dfde507af37e49782cf8550dd3a548e8cf98563\nAdditionalInput1 =", " 6a42ffe56dac0b4dc5d84b49698859b3645c920151565bf29f56b6322244bcaa7cd1ebb8ee9936d8ee1d280f547ae245\nAdditionalInput2 = d057c418a758d99a8ee855093da9bc1734a5168a6df9d9c9924e8bb472b5945563d86350dcf3e11aebcbd06a22b9ef78\nReturnedBits = a0cd72e63f49ce4c1d64e21e92546afced2af268549ef48d3ca88afe4d4097f91a52ecd0e7ad12ec0a1f67dd8c5325b78ee507c0a63cf90d64e9c47862acedf3\n\nEntropyInput = 333a0269eb0fb1d9d1e92f55de9e13cd7e24de64f5f276382d3eb2ff356a66679a9a75d2da31d39a940a09cc85d9d531\nPersonalizationString =\nEntropyInputReseed = cbf504cc473c9a6e66493b71b9684e8df458e65d2cc676e4e6ad43eb59172932c0956d0623134a6a3bba23906ec9da0a\nAdditionalInputReseed = abc86c71ae0585827ffe0d19a9fe97f23cdc4afd67978e553e0669d4635ca1df30250843fefd4d1288f6fbc3bfe04a72\nAdditionalInput1 = 15d15fbe7c060e6811bf47c21e93639c00cdcc562f4e02c88f7e347ec14a2c8410fdb2ddc3dfa62ba9ed1758f12017df\nAdditionalInput2 = fff311ea4c5cbd8ce53c45fe8d8106c28eb06d01ec9d8245c29f95b50b13085a0ec28803d733bd0d8a75193e63e21d5d\nReturnedBits = fcdb52bb6e2ba8d896973b9284b32af6364a34a2b80b3e3c7684c200c9e0a02f7bc6c3cd32b159df9b98da07a17baab9b0b07eab214544d5c562e454ec643de1\n\nEntropyInput = 86e4c30c5a7dfcca86eda7723930ab3272635f0ad9e2fd70a2d7a69b6a07dc0cddeabffa9c411198e3cb7589cb29d3f2\nPersonalizationString =\nEntropyInputReseed = e1af1c42cd29dd002e10e5839e8b679d3c5192da5e1b655123132ff1ade22b35651ac6df66fa14f36e1832be7a176895\nAdditionalInputReseed = 5f619073fa2e98b9f06bb4676bb972379ceb727e1e8768ef09e532cf3d8fed5ce92a7528eb55ae552959d74f75dd0324\nAdditionalInput1 = 330e316bec4955d907d7d7bf2b7149f0aaf4285ed1a2b7e387376ea1a4e0858c114ec3ddddf7a1edd7c8a29b1f12b998\nAdditionalInput2 = 405911cf7c6779e02e4740fa9737f189370292494c80621cfaa9f7d16d68219e72d474f8d5a54aa8ea8020dff9c36650\nReturnedBits = e359c3e23315c9c1d69ab2ec96ec3c6c5aad868e58709e101b0fa08c4041248e4d538d038993250d395d9651513514fca5760dcb9970dce53d2d1c2712bc56d0\n\nEntropyInput = d8cc5d13badedbdc2fd41852247a9f2879b0103b4a8186f0a08da7d55453b7484f642a9e5a5182340584d2ca7cd5ed10\nPersonalizationString =\nEntropyInputReseed = 35788b8369fdc3dfd206efb873b5c5215f5b8ecb0541fc0a0e027e868a91053b5d58cc8ca0751e0c0893c868e2322471\nAdditionalInputReseed = 6afcdc760fe62b080f141886b516623971f8014ede86e50d62d307a90cf3512da5fefd37b3932d3d9d86ad0c03447be4\nAdditionalInput1 = 72105702fbf1da4c10ff087b02db764804963fd986de933b757b8fe5a6016e0f2700573925aced85c09e2ad9f9f7b2c2\nAdditionalInput2 = 65f9a3fe4e1953b7d538f6d6ca3c0a73bda2276fe8f80860c07b7ed139d748c3c45db5d96598f77ff863a43977ba390c\nReturnedBits = 7c2b600c3f550671215b03ad7aebf71086ec59aa4f45cf6b3bac9bba2e108f801f6478b098fcc4e063454cd3f64a951ed70f619866c1a4e70b5c47458c09e083\n\nEntropyInput = 07d14a0d9fbc76a155047a93bc0bb2b578fa7dd75cfe9a44bb8709fe3cc2302fdcc06a9c6751f4602a3a4955c0f38c7e\nPersonalizationString =\nEntropyInputReseed = 8babab6b9f8429f554156da3905122cb48c0b901fb6eaad8df771e8d583ba885dfbad02e47524b1981768593bde88260\nAdditionalInputReseed = c185c45cb07e8c8ba8eb31d3bd48a7c864137c689214c2fb3b1d6d6abcda84f2922a862a0955e67695391d60d6f2d1bf\nAdditionalInput1 = 326a5c9c4a1a2b6fdc369fe2a171bf625dc26e23d1a34faacf59bd33be98ff7ac7f16e485b6da3145ea4db37ee4ffefa\nAdditionalInput2 = de096ad13dcc1ee1449c3a0661edee028603590f087474161a7ab8fcfac896a924e14b0a57aeac17fed676f4b9c7168c\nReturnedBits = 60911e6e6455bf4d85a4f76378390f6cd537d7cce88228cf34e4a4889adf62a9cc1070dfc39c254e81a8557bb2c350fe3f462199e377d3796ed139117b6b0f45\n\nEntropyInput = b3458c6b38ca70c44fc6c601e088863fafc953c6b5d3ee57fb1a07f3f65dd5e6dc19aed17aa5530913aca598b26a40c0\nPersonalizationString =\nEntropyInputReseed = faa8d3feabf972e482e5a0b3821c23ba067c45267e3715a4c10f65716a348030d7fa5637e9f000b3e47d786c013fc035\nAdditionalInputReseed = 901ef89ea38203b83249a34a1a8cbd0da4773ccd503d60a395be3a3db113613e6c571a49960a4e99d302b6f237f64d54\nAdditionalInput1 = f2f87693d1f28f95b0a6459c538e82be99a8cefe8a2c7ca037822072e63670dd141873f3dc9e309c6ead40783f46794e\nAdditionalInput2 = 93cfefbb7624a137cbd7b177918823893e77251fc5660a76ab0cfaa3b340ae822a8a75365056f06b0a7e76afc39f6819\nReturnedBits = 5bbcdeb5d7d1ae19e4ef7878abd1ca4f2641d42c765b94a7689172a4e90baae46ebcfa5427a882c1614cab36f186a98dd3a15febc4b23add955f69dbfd5e5d2e\n\nEntropyInput = 6dbcf6f2f3997ed55471f779039982bc84a1c052fbf5883d6f62c0a61db108386e74759d7237bb0efca030aac76bc7e6\nPersonalizationString =\nEntropyInputReseed = 1a16753c195fed27a1abbe067b2b22aff4c49ae7832d18d01cef5ea5c7d5833008036f71e9c77c1629b6f61370b57f7b\nAdditionalInputReseed = ec54395931ac0aea2a8739d4c51e33c8425906005c341db373247e73b968c2c79257cf7ac74353c00fd81a80f4c95b8c\nAdditionalInput1 = dbd6bb5579a10e395b534431f3ab7c8025527bf99e4f7c162d681f8d35a56f6a03729f07ab43897ad0e80146044b1614\nAdditionalInput2 = 5d35742c25620bb795eae41178d7fc86d9cbe050ea702573ae6adb61e16c411b7445548dc535d57371bb11e2cdd59597\nReturnedBits = ba3905bfddcabf6dae311d1fc19fff1f6fc1ce779e38f864b7ccd2aeb1b3d6ec1845305c29d39b8736b3977277ecaf5735d0e4acefccf7778ac3542af815fd41\n\nEntropyInput = 3a9e8099007c67f6e5f98525cc4295a68c5d5135d01f5f66305c7048ca02525caa3f790b2d12a8520e9963a9cdd597a8\nPersonalizationString =\nEntropyInputReseed = 15993dba9775db8a5bf79778a316f2910d4dc0be59c3b21c650e3aa89c8c89b33fc69e9e5d642e7fee16d61b691de2bf\nAdditionalInputReseed = 946121bae27e5804daeba0d7dc7ae0c1c397bfab106e13b8b7c5462b540d147119af5b7c4f9c198161e5aa9be34e2d28\nAdditionalInput1 = e9799421e75bae7086731a21242dc101c93b768fc747734a357454fc0f7c082cfdb79b8bbcea2d1122d89316a7bfbd3d\nAdditionalInput2 = caa04f94b4b9d694e2c4bfa1e8e708b9c00d9c3d645243acfcb879d2e2ba723d9e48908738114eab7d15f8cf36b043ae\nReturnedBits = 9bd50f3c5384eb28d931f03a64eb97ef140e1e81f4c1d9c910cd7d79a40494e1fcc53d82cd32df35d53b05a450e54b7ec71e28359c1273848e5ab117d5ded88f\n\nEntropyInput = 7f2a0213de6738ec62bedab769a5f01732dad2d35dd4cad7a765dbbb6f9101f57b65ec8fc4e23fb3479ce6211ca3d84e\nPersonalizationString =\nEntropyInputReseed = aeb097e9ddc4dfe87874ddb1a856ec3d00fff1b38c8f954681c11e61bac8b6b2e2d8d010e6820f9c4d807b295acb8ab0\nAdditionalInputReseed = b33ad3dec7d529b71e39d59147f79b4884039d1112804fe8c70e174fdd9828c06a4d44d20aa5fc1918c3ee8082a2bf93\nAdditionalInput1 = 8632d221757132bb7b883b7dc26755f62ec2ffab0876168d11ea7b92774c15c553b11320393d64a2262133608ca92a18\nAdditionalInput2 = ccaf3bc3ae9cdbfa885aa8414c1f823c6a3ecc020b619201a52ce0b7516ba1f49755c450c532bfe11c06b9d0e049ccae\nReturnedBits = 4b1c065a288e5eec56b67fb341e25fc7521b794b52b94f9570bdb16583bb6f7a780aea5297496355ffb4bf5a444c277c96394619cc33cbb5a3b2a9f49b00f9df\n\nEntropyInput = 80773d0272ff48ba84b98c817365b097f21258624d0de8529381977950a5e49ff2b79d0f2522269970ea6d484198922c\nPersonalizationString =\nEntropyInputReseed = 9b101ac018be88da3611a236dfb1300c0049947e9f6ebef7a3ad6e1499efeca0b142826fa06f427e271865232a18dd29\nAdditionalInputReseed = a67ee22453dcaa5e4726e3084872145ab60489bcb6e83346c108f3efcce5b3d988b84d58786658d87c2dc3b9035e9d88\nAdditionalInput1 = 546515bf86e48dfb2b4dd21c2b46f10c1e797ab799b51822e8e7cd99ccebcca00b8899ef6af5cb395168aada9056a6c9\nAdditionalInput2 = 57bedda63fc5f792a608be111141a12e522496c086194515909bddcd868be997e718e7c5899e28dd6b123cbcc3f2a8f2\nReturnedBits = 4075461e459f15cd32030551be47528223693c2f44e32443cbe9271eefe74fa0a6e1ec04f4b8f41d7ed6c5f455281a3cba56d952b08b7753f6a3d7da3517317a\n\nEntropyInput = dc132c15af0e214d1b56eb88849e96b81dc17f238eb3d1bb9a659219dbd77eba38ca2796a8011e29cfad76f8cbbf099d\nPersonalizationString =\nEntropyInputReseed = cba23d4fdbb6c11e38012b71ca264bff9d1264bb20a39bb27d86dcdf7d72ce7a4f5c124cdf2aca6aaee20832495181e6\nAdditionalInputReseed = 07e043add7cc14612a82926c09934dea092f4618cce25674972b1f50b2907c7e3d40a25722ea49b0c7ceb6b57ff2d870\nAdditionalInput1 = 0017ff834967cff8827598ff6c00a9c97f0347c34f2523a85dd7d18ff5575756c1f5383de50338d0ab0505841d70a193\nAdditionalInput2 = c404dbc3cb0851b08530f96500f5a2c10d8985c82dec2ba31d4199fd07687ccf124382fbee3fa119938f0c72ac586102\nReturnedBits = 1935cce86bde7087fcab30b5dce0e072ad741c2f281902e1801e56c08ae8b256d27514de92dd48a838ca426820002c1206f86cad37cfd99d3a935e05f56a7507\n\nEntropyInput = e48495930a7fc86ecbfad807d40ca84ba35e346c812090def8f44d9e48b0a40704ac67ec80ae15b12e858ae85a7ed9cf\nPersonalizationString =\nEntropyInputReseed = f4735954d17e99077061c9604e8f1734d61dd662e54e37256c0f8bf276e025d59d21cacc0869ededb44a2aac9fcf2ccc\nAdditionalInputReseed = e796322fc0ef503251f6d4bd72dc5ea8100", "c5a59f1a4fe4837fa8eb2623bc650a0cd48c306f139e0ecd169a51deb2cd0\nAdditionalInput1 = 1c844d24b7cd9512e5035bc457612ebf6d3df6867aa909038bcbc1f474f7d0783ed474e34525a817bea1fbc883961e31\nAdditionalInput2 = 5c5671ba79bd0b83f74d0ed98e9c8b369a2de34188d8b7cada20b3363738d1252ece1e6a26d007acdfc5b6108412766a\nReturnedBits = 40f17e2bf6084a6447f2c40d601e16a43098dadd9f9614d518874623e8e684438c02e127e582b000dfd46df03dd5435edc4f0f47098320fd311afdbb8542c4db\n\nEntropyInput = df4a888ec7363fadd99ce2223ed39577a41bc220d20b253f98dbfc617aff8fe4ac66e5da1b5097228422cf8242baaf53\nPersonalizationString =\nEntropyInputReseed = e16dca80b2061706e8180dce8f59e888f150836a0bbceac179a4b8d882eead78709ed9951102728abbbbf9226a2d913e\nAdditionalInputReseed = febc9f6b9f2b90b4320d5d41e5c5506fa32b164d86d5e7f91d4a360fe179c127bd2bdeb78fe760174e856a5e04ed898b\nAdditionalInput1 = 0aba74cd299e75886c9e7e5293e5915d720da2c8c1cca7f0e1d6f2b672b4014eb4582e97a877121c87956185736ba0e9\nAdditionalInput2 = e451eac802660ac843fc72b66d59f1e1ca831f22d6a361929043f7626f1d82133f512fb1f2d8ca51004f80ed600609e4\nReturnedBits = 968b708ed6b54d2e5a66d46f22998748dfb5cf47e817732a40938bf3593fb251ccf8f2076837715d14b316bfb52560135602ff98338593696bf80a462b214c4b\n\nEntropyInput = 43bc561c4dd1b904a5333a092a670d0d1b61128a13be2e538a329094574819284e414b938dc8b1860b385c293c03010d\nPersonalizationString =\nEntropyInputReseed = eb362136f4ccc9e302505d525befbfa99d8c3336187d5902b03ed75641913ce973743757f97dae9366874ba62bd87013\nAdditionalInputReseed = a901f4daaa638804177a0b263e8cbc81688df3beb218b02316da83b729230a9e5112fb3896b727298755bb9ac6b6250a\nAdditionalInput1 = e33d181f3159fb0874eff5ef8ddd2b51a60b13ccf046f7e637ed27bed81bb604277f7345e6b8f0e09f925793ce417fff\nAdditionalInput2 = 3ecf6233820e6cceddac7b024c490c5ee14c73d5b598c92cda30940471b6ed450019120689aaf157fd87b71b13afea25\nReturnedBits = 9d793dd96b870dfa0267623bd1c2d8bd3e2c63e9f211340f630fea01358011394154145a10659c4d98274a525c48a90da0126a99b85ed5b4b903195f0dddc762\n\nEntropyInput = ffad10100025a879672ff50374b286712f457dd01441d76ac1a1cd15c7390dd93179a2f5920d198bf34a1b76fbc21289\nPersonalizationString = 1d2be6f25e88fa30c4ef42e4d54efd957dec231fa00143ca47580be666a8c143a916c90b3819a0a7ea914e3c9a2e7a3f\nEntropyInputReseed = 6c1a089cae313363bc76a780139eb4f2f2048b1f6b07896c5c412bff0385440fc43b73facbb79e3a252fa01fe17ab391\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = e053c7d4bd9099ef6a99f190a5fd80219437d642006672338da6e0fe73ca4d24ffa51151bfbdac78d8a2f6255046edf57a04626e9977139c6933274299f3bdff\n\nEntropyInput = f1e0d7b1ac7e4e155bb588500f57d0c59969267ea5427e2d7fde1f9c54e67b7f6562bfc1019b8b5799d2a833fdccac79\nPersonalizationString = 86da37245d9bd1fb59a4bc7abd289ea2999258042c5fa696f2da7344bb6ebc5b770ca284bfe642570b52ef47b780d5c9\nEntropyInputReseed = 9c2c9c07cab12cf50f8846148034a416c83366c1e20776073751553cae69da8d1f6bce6bde27087659d69a62e2ba7c3c\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = e0ac06d7eae89469b6c14a31e7f0464ee21f7b30d2264c2de3e435cb40d0e5043ee13dfbc0342156750880b2d5dddb3bebb43b162a8478235c8b87f96d0284fd\n\nEntropyInput = 1dbee767e9916ab322ba461fbf9f7515cfbcb45944a7b471577da087690d94d967018b631e0c1f64da3c805d049f449a\nPersonalizationString = 966b5cd94019d4d90b48ea7f540a698cfe30d7eb25f5f7e5fe42d9f53ebed6e94e733b0794fc6bf30627911e20cc18e8\nEntropyInputReseed = 96e828128f183c76c90ec8341a43561368b77114048ccb05db66128d54c9539d1adc1d72f7fb0950e41b1343a9e4df76\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = c4d3f5c55d3979b174020650ad7a46b423ec446dff2a9e9fe0a782bf65a72d5fcb1896bc1092a8c73f41295e2e7044434f88aa0aca78f7eac40e322cb7c25563\n\nEntropyInput = df588bff3a1fc97a908067da6a7fef08c889ac29ad7d639bd047157bacab4dbdee3dffe575f37d071af94cbd7628d398\nPersonalizationString = 548715cfb28c1bc56453b8c39e24cfd64077c0f6e9d959d51b9f0667b97d3c4e1a179d1a554df845b24c26daec85845a\nEntropyInputReseed = f8c165b5ebd8347a2ffef2218f993877027e977598b4fdac2f65d8d994c7432900f8407ab5aed1885dee5aa2458f5998\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = deed18220bd8f72a34559924f3cad925ee717690f76bc223d5ffeebbb554b61b9d9eb6ac5697b06331e236672677e2e01d6e3fd581a4fa1ebad289797b68955f\n\nEntropyInput = 98555093e443fe8e2bc8d2eb4d3a7abb8eba00b25683a6b31191fff7c043665ec2cad3e99e55bbc241b8edc699dbc9ed\nPersonalizationString = 5627a0a55457db05e3903d4b69ce15f55f933168d6eb374c044e8f1040f61ed7eb24f87f91c68cde050f504b8965dd81\nEntropyInputReseed = 18d17e1b68378801f83e7aa9a6d4b84d3960022c740e6c845869a5db553d2e02479cd92f3c0d8abd3e92fc9c9fbc6a3f\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 7a7f0ab07a540b4e9a3eda3f8bd1262015d8ea6d512dbea05942421f5a73242ac236009ef083bf2e51b19c40d1a019367a6b96fb52d254e4d881550aef0549ed\n\nEntropyInput = 07793bac6461f23e5eb0d1bc60b5f735515458d1530540df1c8e6fc5c3ebfb06b9db60a8947eb629ff7a375fe680d696\nPersonalizationString = c1e2132b77b6c15742e06e856c1549c4ccebd1b2eda93e2c43391b52cad51490fe34157f57be9eb4eff463b059986680\nEntropyInputReseed = 23e47e0c41462f7c619bbcd5b73f9ab1c68c7cdf1ec92c4c37126402958e110e329107742e70db611b93974c393936a6\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = e6dab4a887f48ec33cb293ffdab5fc69595f94c72c5a9bb43f468f75490190b7e0f14f5c04550cb62a6d0ee0c3d834be3434c8229c124087bb985a06b9a37267\n\nEntropyInput = 25cefa0512921fd4a3a4e5e7c48c6201185a6968419ae5bcc6667bb74c35de4f91988a33f25ea88a8443c65643cc73dd\nPersonalizationString = 07ddf125960c346680b4b361c0a9c6dc1008a85ce1861b45ff18907e6e7db41b046e5f016617e6c5b0ceb5575ac278a8\nEntropyInputReseed = 8cf41e5413b0c8ffacbc4dfc119f10b47569359b911448f45c7ad63dd58e872410c25176b986fee8b83966d0098d996a\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = ab58ec5c35600566dd2ee187a5b67dfa65bebe13333670d2a198fa5af0c20294c6cb69d37564d2b2587ea5587e12341e77f47f173d6cc9f9b9e5dedf0ee1a8d0\n\nEntropyInput = 929f1dec0a6d14de483a2fe114a430796d0b449fca56a4ddbbe661bdc26a8df85cafad7b677ccbf1fe4cb0d5e8cb57a9\nPersonalizationString = 0bf8c590a66653c0494750d10274b583d86e540b517bfc23bb3b0c9fde373e456558468603c2115c97d3662e6825f4f2\nEntropyInputReseed = 84030628534b7525dbd4023aed1ab08c4f2b86a7c2fa3bc9559b425cce07c34fac14e963256aea03f74f1122a7a30483\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 199f2dce5bbe32c693151a216fb36ccea7996c313f6b78fa30ad812a0e603965023fc29706a71b753d79244cb9e8fdaff467e0f963426b10ad89a98e987af316\n\nEntropyInput = 7bc5d970186b9e1b0052b7564dbabf61c89cb3d64ff42f9a62d625112aca0486cdf0336c3612254b40cbfba83ab65b42\nPersonalizationString = a25326fef30f9c94423d99759a1ee575536a9715df9526de9a0b8dbcc3a2234cd835615f5dfe7823927355f569ec6f02\nEntropyInputReseed = ef8a0137013be212402e42b28c03ed6420881aa38b3a3e6e90a861116516df1ef732a19e8935ffcd9be7a2fc236783b7\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 29f81ecf3f41d278c01bba9af9bc0fe6009539682f46723ce5b0ff75fed217ad71580b5dac46289e324d824094c332c3955c528257701a14ec2bfecce4f62a6c\n\nEntropyInput = 0c841a245a19295281163b07541590376d31d86a9be99e66cc22352dabb29f95e113ee233d74d3f2b7f2f608830525f0\nPersonalizationString = 28d3581054d87f153aee12edca47bad80bfc9b066ad1e8b9d96c851dc7b8ed768cad007b891d1c9447d43065b483d085\nEntropyInputReseed = 587a1dae75c2a1f2dea7fb42ef7bf38646b76a964ecd7043d8b62fdd9e6a5c007882f02f78fd040561d15a337e59f257\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = ba7bce080963fe2b4e8f0e1aa700e92b3908e18dc78728666904b0220e4077fef2cd18bbea29a2755a3499798cca445bb75269a5adca2f291dd3875457c69a89\n\nEntropyInput = f4afddabe515ca3e776730e7d44461b27e8f72407ca398d3fb578365e09ea8c24d6c4b09724907a610d755407d38667f\nPersonalizationString = 846bcbc7014ca8c6fb042a80d4a8c3aa50b6c5eff15e4b12f966ab17e6514cbb22fb2eed628ee5c2a8acde821a956078\nEntropyInputReseed = b2aeab1165b150908c9bb52c2b7167c149ea4fb4710edc8acfbc63f7652bb552d636a7e6fc3d1e74d3f65461baaac087\nAdditionalInputReseed =\nAdditionalInput1 =\nAdditionalInput2 =\nReturnedBits = 2a0335c3caeeec7c797f99fbc145654d3985c3c71025c8e4bd4b098801f15d21c272420417d805b0ad1ce68f904502a46130246315957bc07a5db4f3447a84e7\n\nEntropyInput = 6942413e05ac487cf539bc61aa6866ef8cbd9d0f15e1385f37bba5a951a29fc956d46f8740603af7c71800048c8312ad", @@ -2660,14 +2666,14 @@ "887d92419e3c839b8b1dc43c6507026f1f851e\nAdditionalInputReseed = 857848c62203307b39728acf11ac8462302d3a41d186778b3f112a86270252f058fbe5767496e47662186b8d0817de02\nAdditionalInput1 = 9a08df0de742fd2e2d55121a58b700dfbff250a4881b02fc3b8952b48ecd4d034d6e7c757cdf91bf7c31dfaf70b1da22\nAdditionalInput2 = 3bf0e4f1291a8bc272cc985878335882c75831510f27963c7c01a879c60c5b67a9a14a656a746a80a091adf6ffb1adf6\nReturnedBits = 69361d61f4cf5ed489888934f320a9acc5383e719f09a1e30b6029bf71d4b4cb54859798ace2d8ee5e681d4acb223b9c119dab2dd07e6db3f7f844c2b46b9c47\n\nEntropyInput = 6f45b55ac62d5ffd452d36b1e4b18cc6abd6ad93e87558b79fbe99b4f4a962b74bad00821019bd126d6f9dd73912acf7\nPersonalizationString = 913a783046baefe428346085fd640caa1874d4aa6974832cacc5b51e78514bcfedd174606bef1721df7a1194a0ccd1e3\nEntropyInputReseed = d9e19ce3197004ab3a4bf995a481149b6d8e59a3970161cb0d3917374c0c86bb5e9bc509bd01b6796fa1e77e5fdddb16\nAdditionalInputReseed = fd31068c90614e04463acdf856b034293a079a816f1c5f3de63b870a9876f7397d2f93bd3f6776b56a78f7178e1fbb87\nAdditionalInput1 = 068e3791b91adb820b27c45a5d8544eed3133486a7d2d0bc503d8abad8b7093f3df214f1e0ac4ff2d347c760b2a605d5\nAdditionalInput2 = 6c55927a349d321d1a2141aeccc3543e9726ffcf3d8fdfe1aed63c61972a213c12ea65d648e476268611e9b08486a648\nReturnedBits = 552b4c4035d964b5eb26e3036445793df67b7321d36e8d2362fe284503b587c961a33b816b40b93d4b006769177c6593c553b6e669076f25a3e2a7214156c249\n\nEntropyInput = 8d492df46257a62e717302992682e28494f84d0f3237c16439efbbd16a94b3356eb7f7c2a0206892045a0d7d36d69f03\nPersonalizationString = b915f3311feadf6676df2389baacccdafc74cf200ed7b99167b33dafa875ce4aac1a61ce54972ec54f9b0901a3b050ee\nEntropyInputReseed = 2e345fe3a471c5066b20f4aaeaaf73921426ac1bc0509e93671535a8fbc016f5967403d6d13b4760491bf973c47a8ed5\nAdditionalInputReseed = 2e8f1f01a7664890feef93152f7b7f05032b4c70c58b5f261ef0a9c2aef23f2a14ee57c3d3465af24289b1c850e52ef8\nAdditionalInput1 = f8c218c996284f757c491cba025fd84cc701f9f83a16f03c314712c2354fee39214ed5994ab24641826bc15ed1bb5f61\nAdditionalInput2 = 146c53dc4af90f26d8c85822810d9bde2949495c23ca2c7c13ceee8221cbe8105491d560e0044c8d50d7e365da41890b\nReturnedBits = b19dd18494235abdcb3b4e99c9355d19d543c7fb7e1048d63d9e25abcc12dcb31549cec2818667713ad1dc35142072ca8daa511927aca71303493e500503be8b\n\nEntropyInput = 2a595f08947d0056ed19ecc8a547867834c125cf1740230a1325b93bf29951cbedcaa6a8f5cbe69801fb9a197ad576c6\nPersonalizationString = c0fb9dbea13863dfbfdb2c0dd864887413794a07a4dd228836f0f6afab901496486a2d508a3f4b784d83382629cddbc1\nEntropyInputReseed = a3ddfc3aefc94dcaf656f4d8eef0065a6d233a76e0a4c26e2d8bbb86459c9e4a173ff8cbec85ebc14712640741427668\nAdditionalInputReseed = d4eb9b12fc2a6fc75a69701c8b5ece02e47f813effb705dbdef0294e38907f5aadf40bdbcc067d0ebc0bf3661a2e0990\nAdditionalInput1 = d3c4bf4f8a3f61413fe1953523ba83bc02ae6d7eea1c8ba288f8e06f0d0276e61667a410f90548d283c4f1ae79483961\nAdditionalInput2 = e6fc29680eef141e1372e17729c9f4407b3f7a57057be1081ce46c78693334bf56867791072d9d18a7b4835bf251712d\nReturnedBits = 08475bfb8e621e12e212f4960e737023f7a3de3b204b6ffeeb929f424ca78c6ae2e0d726237915e5e244616713e88a39df302208e3a324f5444213b70b2e9c09\n\nEntropyInput = 3d5332b91dcaad893df504c7c675b69890b28055dfd3ec7d0ba56990dcda175096ff8f8f9f9ecd6dddeb96b829b98c3e\nPersonalizationString = 34753432b3c6bedc4d2296dffce8a66591b400867f7edf10cee447046f5f767036da9f3f4a02f7b8cba7bdd4365c1fef\nEntropyInputReseed = 1a69af0ff696f9a2fe0fddd26ccf6fae215faf91804461928c884eec13b1dd1501862a738373454e1b449c6026cebceb\nAdditionalInputReseed = dc47e104175f3c9812feed9e143da5cd7e553e3423db5bc8be3b652f577100267ff795804aaf42c3991589e7688a977b\nAdditionalInput1 = e64c0cad3dfc0bf0eba3317cf37b7779b91bf3de3e0ba36d3e16feb0014286596edd364c197847e8732925f971294dfa\nAdditionalInput2 = 1ff3a6bdb7e319a86b35d062cf017ed270c6b5511bc3d63083272e76bf4db9d90e836f18d98f1f79c2e91eeb0bc635e2\nReturnedBits = fdef7e67c3d19f5f74784bdc64d2c23d0a3f027846da2b2afba940fdc2f066d89b63d27e55d3d0a88bddb97e29676894ec8a18268e4bc27d181a867c5a80fe2c\n\nEntropyInput = 156c8c0f44f4a8f17044957b572ed16d54b73a9510d2b260a036ad6ef223f45e124c4ae9dae0fdf5684792da0ff5ea0a\nPersonalizationString = 1472f56d5498564a5b53d2eae27103f41f565d7873b37c37c30472075f1d84d69a8d68c92636ae06aa61678358cc47d4\nEntropyInputReseed = 6bc2bfd44f72982b23b6d22c85f7d601d5941ebe6e9ee9d06a8efe652539ec00b1136adbc4e43aaab76c3ad6a57a267e\nAdditionalInputReseed = a83b1547fadb97e491ef0bdb8b0d006ab16638fdb211613051f0f57586c146882f1062b7f71a8c15bb27200fa83ffcaf\nAdditionalInput1 = ac188da8a895e0807bab61b1ebd73acbe43f99f375c7d29174f675e1667237cedf1d41fc50da277a0db21ee2891a5abf\nAdditionalInput2 = adf9a30b6cd9dac23f193f66df9d606a5765b96cc42c099530c53c26a6d6bcf0779ae060d188e1cc5bdab6c312892267\nReturnedBits = fcc79828bf2c9d3d799d7a0e83583c70aeb156e25df0b2fde030c2775c9986c8054e848128ba38ff5e5b0b1e5b72f9e41726b960008408f5152b1a47072fbdf7\n\nEntropyInput = 5e0dd8e37aa23d0fe79efcb8e5538ee90ffb5733decc83f7677488c4f64c2e0d2a918968a5c7351de9360f23fe606a4a\nPersonalizationString = 5161b794e4a13371b320ae4b2b6b698e4df507402a7582555598089dd9484358d37f891294948512e4198a79de8ca3d9\nEntropyInputReseed = 850ffb89bc23562f3ea03947c1afa7309a0ccdc0b714bc94ff45d66884b74fba0bffce97887f2efc178388f36f0ea95e\nAdditionalInputReseed = 50f605cb940f573c4ef3ddff8caa9a3f544f40fdf583b82cd79338523d896f72f86be1f9bb37d9aca02a2856f713c812\nAdditionalInput1 = da7bcf6810a6b3820548065edbec0fa2fd4bc03e5d50666f98a8bea6b744e04aafa0714582f11b6608852c45ee51df6b\nAdditionalInput2 = 4e9c0c770699656217a0b2dbb466a0fcb0cdb5d4a4a05da40fa2eb546f2f0f28aea575a0bdf6e89352d519db44f47dc5\nReturnedBits = 40ec0e8e3e54cd4fd78f5e006bf3134c378ba619ccf9e7530c79217da631458b5f9135bc8b0d6f2e742c53b58d0ebc18263f9d2ef37a2fa0fb086d2193857863\n\nEntropyInput = 219a364ad362fd8a1d69c1284fd64cc9ec05e6bfbdd133ac9170594b5d95946d3dda2ebcc58deeace86f9dca5ad99c18\nPersonalizationString = b0b27b03fc65effe4610e61916f2e9bd252d47efcc08b84aa505b1befd3a7e9295ca764ac88f099bbecc28301f0f298e\nEntropyInputReseed = 1bccdb4b2ce863fbee104d7a56f2cd88a44a088392883a6db30e6fc7bf5611759c71d53a61fe62b6314d7426e510a722\nAdditionalInputReseed = a06eab3b05eb3649a01be82a356030effdbf45fd71f49b1862ecf33fdb28a7191a34f104b9eda1da4ba48daf9da381b6\nAdditionalInput1 = 88b17e13e02a7e9a3f8263946fae0b6a9052692c3c5cbe858369c4d0b198b9c6a8f4c87ff5e6b2835a7944b911266aa9\nAdditionalInput2 = 828222c8a275427a5f8a963d0d65e92f6170d5089c9a162429c093a28dd69f71135342f16b3baea9a4764e2cc3762267\nReturnedBits = a739f9fee9a40049e42b00b381a1f663877abb776ec655e3a7870bd94bea1a25d3c6d380eced435e498044daf78b349bc1868e4bff6257cf2711ed08e2357201\n\nEntropyInput = f8513c2f6e46f75fce3671ccb3c69158583a873b0dda83d8b1cd548f4e5efd75642f2c23cf8792d51023f31d795f6f5b\nPersonalizationString = e94f7212257885511b15a873d0158fa5ea648846afbcf9d62a7abc4e6909dd43c671fa18bc289f47e2301e9aa69c3e88\nEntropyInputReseed = 487b9c1866ffdaaf6760cdee3df5a930196d30b0ac8db780656577ddfc1ff3508c451ef2b0b478a2cf0c73027597b2ae\nAdditionalInputReseed = 7387b59f8c78e79d36edacbb428fd515ef9e58086059bf7fd642053b0f5706cfe86eb3c35ca0b6f02e5d1304e476e3cf\nAdditionalInput1 = bafc59ef40e59d8c28851212e1c357cce0d06f02c69d14585170ca8eb18396a331d635cf0651319842cee2f7c87285c2\nAdditionalInput2 = 82d905ba69b6c45ca28107beb6698a152631ab48614235f6a9f12e019f66bf326151d9ee84e0cd42b6566dbffb46ec35\nReturnedBits = 163f48d09f3e9ebf9f8647766a0b2e189a2f3a21a5a4e31c8a4f3bd138cc50030ac8bea1c4d9e9aa0b67f34926239fbcedfd1992da165b941cf03b56737737b2\n\nEntropyInput = 0a8f092764d473d48215e947ea8a32b5da8ea86d8ed0d83bce31b1b5a21e7c5f1af2186a39caf9afa61644caef02ef9b\nPersonalizationString = 84637faba756917b0f44ba2e0e26546f5239782e4d9f952ee251367081629e71c20a7459995a7563810daeab74220664\nEntropyInputReseed = eacaded3d89a63b94a5c14c3087306e670fc4ee7d56cafef4c5aa7d553ca89ed34418056a44f5447e2b07dd541ac4645\nAdditionalInputReseed = 104a1541313fc4be9d34bced288c1c1b6fa793e9096f8be5673a2c6825dabef91fd88e45a061b2d897f9b5e8a8ae0ad3\nAdditionalInput1 = e30c9d8aba0bd5dc63d911897e4dcadbeacc3ed9392d8e361b356e02a81d65bdab91f7e9f8dd2b2bf9af0da5100e77d4\nAdditionalInput2 = 2bed42b8c05461ba2756a5f38393d5538d20eb9cf1c06775e7fef7284341f61ccd34b0148d1e870c1992dfd065560ed6\nReturnedBits = 855a6af3e6dddf194ceaafcef6f7ee91f489a61a73b759d41be4d5298510b9902f5b78b1162cba417684519634b578afda9802bd782f04b3a25106f3586ad8a4\n\nEntropyInput =", " ed63e3b88a2f0d6a40b7b36a06cd8d40ec10158ab6c4f8dabdb879e45d22db573320d2641bfd7db31eb6bbf4c6330b9f\nPersonalizationString = f82a5ee81f349a69dfa6a6e53b406bb560cb0339f61b3886237023ae4582b9725b8774a8044ec5134ebd4d7606f18188\nEntropyInputReseed = 7104522c2a69bec7e010d9670d7ab92dd817ac7ff05d63ab0e12d431d4c9aef4d715421c1fb5d05d3aecba36859a6038\nAdditionalInputReseed = 3b83034ea440604d0b7d04857623e9adc0eb9aad4a45b2079863eed3d72e65abf67d255673e769a2e2584eea59f1ebaa\nAdditionalInput1 = 8678e4f831887e96a27c3a8ce0963f4b34bbca25791b06526cb6c55624c33d98a0356be624238cecacba3535e872c4c7\nAdditionalInput2 = ec3452ea2722984bbe6a5b7c22ad58df37a854abc8630b9e21bcd0469eb207e5f44e044f5f666920dd55e81a393500de\nReturnedBits = c340765fe7a3479bef2d7d59e321066f8ad0db53aed4c517bf8339566bf877d53921e6de2650d0080529004a5fd32124ce8e58a040e2d55656b37d9ea827cb91\n\nEntropyInput = 882ed05487dce4b4f9e58ec4f2da1fa5d8ebb4ef9fcbf7b0a0e15c4dccb8e19788f86dcf2885e71a20cbd9ac10a6648e\nPersonalizationString = 05f5bc41687ea1e4c34a69944fbae283cfee4c42b1bbd78fddb0973d0fca948539b6843658b67c30b73191b9a0bf2921\nEntropyInputReseed = ca1603d4c8711404c7bdc12c7c75b2943a4b042ea1d2eb54506a6876952157caf3b152dc75f27f2213645a141577e8ba\nAdditionalInputReseed = 83cda53380888d53515e58154f89d5528ab69f31fbcfca34988cf03c4cae5f60aa6291f32d99ab2a726b6e08d2502cf5\nAdditionalInput1 = 5bf5ca9f964edd91e8ef491fd3cd32faf9cb9d1993d8221914d1751fb0d4252a5ca950e213f088050900b2bd74f5e336\nAdditionalInput2 = dba28dc1d8d615651547867d4ef42519045ee16378143685101da47a27b55498078e8a8f4854052f7cc6f5b02e571ae8\nReturnedBits = 01f11971835819c1148aa079eea09fd5b1aa3ac6ba557ae3317b1a33f4505174cf9d7e940821c9b0e5527a1d3e186a7a83f187c62d3223cf5964ff9526d8484c\n", }; -static const size_t kLen41 = 157331; - -static const char *kData42[] = { - "HMAC = MD5\n# Note: The empty key results in passing NULL to HMAC_Init_ex, so this tests\n# that HMAC_CTX and HMAC treat NULL as the empty key initially.\nKey =\nInput = \"More text test vectors to stuff up EBCDIC machines :-)\"\nOutput = e9139d1e6ee064ef8cf514fc7dc83e86\n\n# HMAC tests from RFC2104\nHMAC = MD5\nKey = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b\nInput = \"Hi There\"\nOutput = 9294727a3638bb1c13f48ef8158bfc9d\n\nHMAC = MD5\nKey = \"Jefe\"\nInput = \"what do ya want for nothing?\"\nOutput = 750c783e6ab0b503eaa86e310a5db738\n\nHMAC = MD5\nKey = AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\nInput = DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\nOutput = 56be34521d144c88dbb8c733f0e8b3f6\n\n# HMAC tests from NIST test data\n\nHMAC = SHA1\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = 5FD596EE78D5553C8FF4E72D266DFD192366DA29\n\nHMAC = SHA1\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F10111213\nOutput = 4C99FF0CB1B31BD33F8431DBAF4D17FCD356A807\n\nHMAC = SHA1\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F60616263\nOutput = 2D51B2F7750E410584662E38F133435F4C4FD42A\n\nHMAC = SHA224\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = C7405E3AE058E8CD30B08B4140248581ED174CB34E1224BCC1EFC81B\n\nHMAC = SHA224\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B\nOutput = E3D249A8CFB67EF8B7A169E9A0A599714A2CECBA65999A51BEB8FBBE\n\nHMAC = SHA224\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F60616263\nOutput = 91C52509E5AF8531601AE6230099D90BEF88AAEFB961F4080ABC014D\n\nHMAC = SHA256\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = 8BB9A1DB9806F20DF7F77B82138C7914D174D59E13DC4D0169C9057B133E1D62\n\nHMAC = SHA256\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\nOutput = A28CF43130EE696A98F14A37678B56BCFCBDD9E5CF69717FECF5480F0EBDF790\n\nHMAC = SHA256\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F60616263\nOutput = BDCCB6C72DDEADB500AE768386CB38CC41C63DBB0878DDB9C7A38A431B78378D\n\nHMAC = SHA384\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\nOutput = 63C5DAA5E651847CA897C95814AB830BEDEDC7D25E83EEF9195CD45857A37F448947858F5AF50CC2B1B730DDF29671A9\n\nHMAC = SHA384\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F\nOutput = 6EB242BDBB582CA17BEBFA481B1E23211464D2B7F8C20B9FF2201637B93646AF5AE9AC316E98DB45D9CAE773675EEED0\n\nHMAC = SHA384\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7\nOutput = 5B664436DF69B0CA22551231A3F0A3D5B4F97991713CFA84BFF4D0792EFF96C27DCCBBB6F79B65D548B40E8564CEF594\n\nHMAC = SHA512\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\nOutput = FC25E240658CA785B7A811A8D3F7B4CA48CFA26A8A366BF2CD1F836B05FCB024BD36853081811D6CEA4216EBAD79DA1CFCB95EA4586B8A0CE356596A55FB1347\n\nHMAC = SHA512\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = FD44C18BDA0BB0A6CE0E82B031BF2818F6539BD56EC00BDC10A8A2D730B3634DE2545D639B0F2CF710D0692C72A1896F1F211C2B922D1A96C392E07E7EA9FEDC\n\nHMAC = SHA512\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7\nOutput = D93EC8D2DE1AD2A9957CB9B83F14E76AD6B5E0CCE285079A127D3B14BCCB7AA7286D4AC0D4CE64215F2BC9E6870B33D97438BE4AAA20CDA5C5A912B48B8E27F3\n\n# Additional HMAC tests from OpenSSL.\nHMAC = SHA1\nInput = \"My test data\"\nKey =\nOutput = 61afdecb95429ef494d61fdee15990cabf0826fc\n\nHMAC = SHA256\nInput = \"My test data\"\nKey =\nOutput = 2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776\n\nHMAC = SHA256\nInput = \"My test data\"\nKey = \"123456\"\nOutput = bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd\n\nHMAC = SHA1\nInput = \"My test data\"\nKey = \"12345\"\nOutput = 7dbe8c764c068e3bcd6e6b0fbcd5e6fc197b15bb\n", -}; -static const size_t kLen42 = 6201; +static const size_t kLen42 = 157331; static const char *kData43[] = { + "HMAC = MD5\n# Note: The empty key results in passing NULL to HMAC_Init_ex, so this tests\n# that HMAC_CTX and HMAC treat NULL as the empty key initially.\nKey =\nInput = \"More text test vectors to stuff up EBCDIC machines :-)\"\nOutput = e9139d1e6ee064ef8cf514fc7dc83e86\n\n# HMAC tests from RFC2104\nHMAC = MD5\nKey = 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b\nInput = \"Hi There\"\nOutput = 9294727a3638bb1c13f48ef8158bfc9d\n\nHMAC = MD5\nKey = \"Jefe\"\nInput = \"what do ya want for nothing?\"\nOutput = 750c783e6ab0b503eaa86e310a5db738\n\nHMAC = MD5\nKey = AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\nInput = DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD\nOutput = 56be34521d144c88dbb8c733f0e8b3f6\n\n# HMAC tests from NIST test data\n\nHMAC = SHA1\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = 5FD596EE78D5553C8FF4E72D266DFD192366DA29\n\nHMAC = SHA1\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F10111213\nOutput = 4C99FF0CB1B31BD33F8431DBAF4D17FCD356A807\n\nHMAC = SHA1\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F60616263\nOutput = 2D51B2F7750E410584662E38F133435F4C4FD42A\n\nHMAC = SHA224\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = C7405E3AE058E8CD30B08B4140248581ED174CB34E1224BCC1EFC81B\n\nHMAC = SHA224\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B\nOutput = E3D249A8CFB67EF8B7A169E9A0A599714A2CECBA65999A51BEB8FBBE\n\nHMAC = SHA224\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F60616263\nOutput = 91C52509E5AF8531601AE6230099D90BEF88AAEFB961F4080ABC014D\n\nHMAC = SHA256\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = 8BB9A1DB9806F20DF7F77B82138C7914D174D59E13DC4D0169C9057B133E1D62\n\nHMAC = SHA256\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\nOutput = A28CF43130EE696A98F14A37678B56BCFCBDD9E5CF69717FECF5480F0EBDF790\n\nHMAC = SHA256\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F60616263\nOutput = BDCCB6C72DDEADB500AE768386CB38CC41C63DBB0878DDB9C7A38A431B78378D\n\nHMAC = SHA384\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\nOutput = 63C5DAA5E651847CA897C95814AB830BEDEDC7D25E83EEF9195CD45857A37F448947858F5AF50CC2B1B730DDF29671A9\n\nHMAC = SHA384\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F\nOutput = 6EB242BDBB582CA17BEBFA481B1E23211464D2B7F8C20B9FF2201637B93646AF5AE9AC316E98DB45D9CAE773675EEED0\n\nHMAC = SHA384\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7\nOutput = 5B664436DF69B0CA22551231A3F0A3D5B4F97991713CFA84BFF4D0792EFF96C27DCCBBB6F79B65D548B40E8564CEF594\n\nHMAC = SHA512\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\nOutput = FC25E240658CA785B7A811A8D3F7B4CA48CFA26A8A366BF2CD1F836B05FCB024BD36853081811D6CEA4216EBAD79DA1CFCB95EA4586B8A0CE356596A55FB1347\n\nHMAC = SHA512\nInput = \"Sample message for keylen<blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\nOutput = FD44C18BDA0BB0A6CE0E82B031BF2818F6539BD56EC00BDC10A8A2D730B3634DE2545D639B0F2CF710D0692C72A1896F1F211C2B922D1A96C392E07E7EA9FEDC\n\nHMAC = SHA512\nInput = \"Sample message for keylen=blocklen\"\nKey = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7\nOutput = D93EC8D2DE1AD2A9957CB9B83F14E76AD6B5E0CCE285079A127D3B14BCCB7AA7286D4AC0D4CE64215F2BC9E6870B33D97438BE4AAA20CDA5C5A912B48B8E27F3\n\n# Additional HMAC tests from OpenSSL.\nHMAC = SHA1\nInput = \"My test data\"\nKey =\nOutput = 61afdecb95429ef494d61fdee15990cabf0826fc\n\nHMAC = SHA256\nInput = \"My test data\"\nKey =\nOutput = 2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776\n\nHMAC = SHA256\nInput = \"My test data\"\nKey = \"123456\"\nOutput = bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd\n\nHMAC = SHA1\nInput = \"My test data\"\nKey = \"12345\"\nOutput = 7dbe8c764c068e3bcd6e6b0fbcd5e6fc197b15bb\n", +}; +static const size_t kLen43 = 6201; + +static const char *kData44[] = { "# RFC 7539, section 2.5.2.\n\nKey = 85d6be7857556d337f4452fe42d506a80103808afb0db2fd4abff6af4149f51b\nInput = \"Cryptographic Forum Research Group\"\nMAC = a8061dc1305136c6c22b8baf0c0127a9\n\n\n# RFC 7539, section A.3.\n\nKey = 0000000000000000000000000000000000000000000000000000000000000000\nInput = 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\nMAC = 00000000000000000000000000000000\n\nKey = 0000000000000000000000000000000036e5f6b5c5e06070f0efca96227a863e\nInput = 416e79207375626d697373696f6e20746f20746865204945544620696e74656e6465642062792074686520436f6e7472696275746f7220666f72207075626c69636174696f6e20617320616c6c206f722070617274206f6620616e204945544620496e7465726e65742d4472616674206f722052464320616e6420616e792073746174656d656e74206d6164652077697468696e2074686520636f6e74657874206f6620616e204945544620616374697669747920697320636f6e7369646572656420616e20224945544620436f6e747269627574696f6e222e20537563682073746174656d656e747320696e636c756465206f72616c2073746174656d656e747320696e20494554462073657373696f6e732c2061732077656c6c206173207772697474656e20616e6420656c656374726f6e696320636f6d6d756e69636174696f6e73206d61646520617420616e792074696d65206f7220706c6163652c207768696368206172652061646472657373656420746f\nMAC = 36e5f6b5c5e06070f0efca96227a863e\n\nKey = 36e5f6b5c5e06070f0efca96227a863e00000000000000000000000000000000\nInput = 416e79207375626d697373696f6e20746f20746865204945544620696e74656e6465642062792074686520436f6e7472696275746f7220666f72207075626c69636174696f6e20617320616c6c206f722070617274206f6620616e204945544620496e7465726e65742d4472616674206f722052464320616e6420616e792073746174656d656e74206d6164652077697468696e2074686520636f6e74657874206f6620616e204945544620616374697669747920697320636f6e7369646572656420616e20224945544620436f6e747269627574696f6e222e20537563682073746174656d656e747320696e636c756465206f72616c2073746174656d656e747320696e20494554462073657373696f6e732c2061732077656c6c206173207772697474656e20616e6420656c656374726f6e696320636f6d6d756e69636174696f6e73206d61646520617420616e792074696d65206f7220706c6163652c207768696368206172652061646472657373656420746f\nMAC = f3477e7cd95417af89a6b8794c310cf0\n\nKey = 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0\nInput = 2754776173206272696c6c69672c20616e642074686520736c6974687920746f7665730a446964206779726520616e642067696d626c6520696e2074686520776162653a0a416c6c206d696d737920776572652074686520626f726f676f7665732c0a416e6420746865206d6f6d65207261746873206f757467726162652e\nMAC = 4541669a7eaaee61e708dc7cbcc5eb62\n\nKey = 0200000000000000000000000000000000000000000000000000000000000000\nInput = ffffffffffffffffffffffffffffffff\nMAC = 03000000000000000000000000000000\n\nKey = 02000000000000000000000000000000ffffffffffffffffffffffffffffffff\nInput = 02000000000000000000000000000000\nMAC = 03000000000000000000000000000000\n\nKey = 0100000000000000000000000000000000000000000000000000000000000000\nInput = fffffffffffffffffffffffffffffffff0ffffffffffffffffffffffffffffff11000000000000000000000000000000\nMAC = 05000000000000000000000000000000\n\nKey = 0100000000000000000000000000000000000000000000000000000000000000\nInput = fffffffffffffffffffffffffffffffffbfefefefefefefefefefefefefefefe01010101010101010101010101010101\nMAC = 00000000000000000000000000000000\n\nKey = 0200000000000000000000000000000000000000000000000000000000000000\nInput = fdffffffffffffffffffffffffffffff\nMAC = faffffffffffffffffffffffffffffff\n\nKey = 0100000000000000040000000000000000000000000000000000000000000000\nInput = e33594d7505e43b900000000000000003394d7505e4379cd01000000000000000000000000000000000000000000000001000000000000000000000000000000\nMAC = 14000000000000005500000000000000\n\nKey = 0100000000000000040000000000000000000000000000000000000000000000\nInput = e33594d7505e43b900000000000000003394d7505e4379cd010000000000000000000000000000000000000000000000\nMAC = 13000000000000000000000000000000\n\n\n# Additional test vectors that are long enough to ensure OpenSSL's SIMD\n# assembly is fully tested.\n\n# Length 2048.\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nInput = 248ac31085b6c2adaaa38259a0d7192c5c35d1bb4ef39ad94c38d1c82479e2dd2159a077024b0589bc8a20101b506f0a1ad0bbab76e83a83f1b94be6beae74e874cab692c5963a75436b776121ec9f62399a3e66b2d22707dae81933b6277f3c8516bcbe26dbbd86f373103d7cf4cad1888c952118fbfbd0d7b4bedc4ae4936aff91157e7aa47c54442ea78d6ac251d324a0fbe49d89cc3521b66d16e9c66a3709894e4eb0a4eedc4ae19468e66b81f271351b1d921ea551047abcc6b87a901fde7db79fa1818c11336dbc07244a40eb14cf77bde35e78ae9ad7d3f57ed7e7f23926c9172f82d77684ea5ed7d74ebc6f142b997036bcb7cce8df1bbc0d5b35a46509c954fc9469d214d6238f166cbf872156b4c41d7aac5942cffb175023078252a3f36e315c5d4ce0e39928a018252862becacef96a19f03bdcf46d75584299d1f8b03c0169e9e407d937145b5e5024139e7022a1978f114f24cdfa23780a119735c41da8fb759bbb3f025c6ec30e6c6e9bce8615be68e392fce59fd26a8e6a6cc5c606e3848116e4d01d29565a1facfb524b6d29643b826eee1e42869fc76df229dd79b39a2b1df28bb335c3a5f15a855d0121e4a6da34b5e4d5b7b5d5746a03ecff70811e1516fcec1bf7462e8876a2d21710aa168c78f45a6a15015950e221da85d3ec822ad6d0a6931b25a06b7bb5f3c10bb36cd4d647f9561982fde9818de5d4bf8db7f86c53b4ff14928ac15f79023b61861e73e44216540bb302153770da2533de9795252ab5fb77ad924c9338c8144c23d4c90dab9a18feac1a1574d4545e1435eb405e6c4c439fc724fce992ae85badf345bad16d85fbd338f04433703614754d0e7e54c4ccde2670587d52ecfb5a70a14a501bacc727722649931d8515b13d020a78e511fe136d45fbf97f9c7f689fcc677cfb3683723878350ffe9d08130cc6e567b6179e01b7eb2b3bbcf0873e1308eec018edeb8cce946338e15d5bf68c71916a83a99358039ef071e009546a2df936879dffbba397a93925d229a469fd17d71b7f524e03a30da6ee927542f8b369bed4734fe25dbd63d24ffd2a222f5f84f75d858ab989be925af570ad6d45bd28ce61b5139e1dd2f0b7795fe072e6e83acbb5e7b777a70c641e4cab2af40eed69abc334cd2703c3273204fac580c6a3d6680427e5f7d051e8380a53f93a180f4556ecea4530b9a2d5948dad63d415b6874f6b90e767d6d265be86351b53ba690780bb57c21b57418c5b97559e840c68257f839e7583a4bf7c7645c5987d40cc1ba79a218c35edfacdabe581d950e4bb7a481ebe64d61d00e75b1f25f1ce5f5462334a5b9038a697aa0937a3f8017e05d2c9c05dcb05c0b02508dea619b137f5444b6f088eb3cb2c66788f88afdfbba8faa1c490485624c88ae11e57347a676902e7553f056188493209bdbb30acc63c9e41e16a9d6c009416b520a76ba38f57628170c43626b5cb46179dc5bf65de865085f84bf741c223fbe474d2d19d8f43914fbd6586351089e73babf344f988b7963fe44528457d7aad3c564f6bcbd0d772a4c9fd328e6022d1c7c9f86726f8d5a23797d309c0f653ab1ac687833eb2700f156296062a8b377078f45f6b68c3d07cae1913ba8d5a6f9bf7525a3439eb932d4cefc4bf8e1b07b48ca13ece366cbc3e0388915915d1757475103a9e9454e7e6355de2d6acbf4710f9a63e4f6d3cd70c2d6fca88dd8a14448fdb63ce9350fdaafbe0b8bd1c5d307dae76dfed799aef2d8f23d5608d37d1330dd38b94860905dbeebf78d7b7318b7d42aed40d3f9899e9f420cbd92a6eeae3026f7725694e0e4bee016ba346fed2c21172bdb4a461cebe0cfe38e76645226ac127a259c193264d735ce8c8a57e17dd3f0579e2e86dc295ad1f45ba2d85db35044da61f7d401274b31eefbeb34e8d2ae596e9b4541aae117bdac5ed0b324c20539c27c07a411d5288b0b5f6fa16e9a7df85dc319fa6b71cd08a859c06a3f7b0289e1750adbf182f9750fea96fea5ab7aa3473340607cd7ed2c626f5382491c26d5d5bea61401dee7319c94d418f297e61ceac8f258ee8c23831bda081591f5a918e96855774ddedffc51e5b180f1971806d42fc333020b734aeb45adb0bc47325d0cea5f6713a786558022afc39d573892aa3635efbfd8bcb11c57f306c72146afe8b45388125cb7bf9ecf965a7ba4f768c77be366470dcdcf214b7f6a5a9460ed4fe44ae559d85e2fdc2094de83fff12ea8804db1215c4ca865871bdd7f8ef32ab799bf923ffb02c1ded7d129beadad46c5eda31ab1a6f43da05ea08bff7ffa88d8966353d01830558c39b930b01d175e437124d8edd0d2698fd8932f2b2c9b14746e52879c57a395538150f390264f00e60d470711202f4194499ff79037ca9885dc8d695f7d917a3086ca88e8f8d0243efee09302cf39e039eb7cc8dd19d28120d5fe533b5727cd39133181c729ca6f90a015ed30be7668d5cb5ecc33a53ee69bf7d1a5ecbdb153803743c6adaaabd36bf84e5be38d3f04a5d5dbfd67bdcd3b176e65bd1391ade775cc32ce43a847fb6c672a3fe97a5d4081c4986959ec5fb898f42a9397ba2b3ec2c1018f8d76d057f2366bd0e4465514ad6560c599664fb85621fe771e00f43d39b591b2a6a321100f4d1ef23a376d5ae3eeedbfe23da73dff0ee4d16b34ebddd8f5f053db9824105fc7300dbee7ea6af56b112319e3e215a0fc79ae946f6b5227453ec7fcaf17cf7651f71499a50d81221404d5f129ac50ea7528ff0e0069ec4ab8acb7919d81749ab37a870c5ef2cc5a15cf96709d3c65b4addc77e7416847160bcabb94ea36377e0ef71be80b5cc53effd5444888044a353574c72", "c924bba2a8b4e8354188ebfed\nMAC = 69d28f73dd09d39a92aa179da354b7ea\n\n# Length 2049.\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nInput = 248ac31085b6c2adaaa38259a0d7192c5c35d1bb4ef39ad94c38d1c82479e2dd2159a077024b0589bc8a20101b506f0a1ad0bbab76e83a83f1b94be6beae74e874cab692c5963a75436b776121ec9f62399a3e66b2d22707dae81933b6277f3c8516bcbe26dbbd86f373103d7cf4cad1888c952118fbfbd0d7b4bedc4ae4936aff91157e7aa47c54442ea78d6ac251d324a0fbe49d89cc3521b66d16e9c66a3709894e4eb0a4eedc4ae19468e66b81f271351b1d921ea551047abcc6b87a901fde7db79fa1818c11336dbc07244a40eb14cf77bde35e78ae9ad7d3f57ed7e7f23926c9172f82d77684ea5ed7d74ebc6f142b997036bcb7cce8df1bbc0d5b35a46509c954fc9469d214d6238f166cbf872156b4c41d7aac5942cffb175023078252a3f36e315c5d4ce0e39928a018252862becacef96a19f03bdcf46d75584299d1f8b03c0169e9e407d937145b5e5024139e7022a1978f114f24cdfa23780a119735c41da8fb759bbb3f025c6ec30e6c6e9bce8615be68e392fce59fd26a8e6a6cc5c606e3848116e4d01d29565a1facfb524b6d29643b826eee1e42869fc76df229dd79b39a2b1df28bb335c3a5f15a855d0121e4a6da34b5e4d5b7b5d5746a03ecff70811e1516fcec1bf7462e8876a2d21710aa168c78f45a6a15015950e221da85d3ec822ad6d0a6931b25a06b7bb5f3c10bb36cd4d647f9561982fde9818de5d4bf8db7f86c53b4ff14928ac15f79023b61861e73e44216540bb302153770da2533de9795252ab5fb77ad924c9338c8144c23d4c90dab9a18feac1a1574d4545e1435eb405e6c4c439fc724fce992ae85badf345bad16d85fbd338f04433703614754d0e7e54c4ccde2670587d52ecfb5a70a14a501bacc727722649931d8515b13d020a78e511fe136d45fbf97f9c7f689fcc677cfb3683723878350ffe9d08130cc6e567b6179e01b7eb2b3bbcf0873e1308eec018edeb8cce946338e15d5bf68c71916a83a99358039ef071e009546a2df936879dffbba397a93925d229a469fd17d71b7f524e03a30da6ee927542f8b369bed4734fe25dbd63d24ffd2a222f5f84f75d858ab989be925af570ad6d45bd28ce61b5139e1dd2f0b7795fe072e6e83acbb5e7b777a70c641e4cab2af40eed69abc334cd2703c3273204fac580c6a3d6680427e5f7d051e8380a53f93a180f4556ecea4530b9a2d5948dad63d415b6874f6b90e767d6d265be86351b53ba690780bb57c21b57418c5b97559e840c68257f839e7583a4bf7c7645c5987d40cc1ba79a218c35edfacdabe581d950e4bb7a481ebe64d61d00e75b1f25f1ce5f5462334a5b9038a697aa0937a3f8017e05d2c9c05dcb05c0b02508dea619b137f5444b6f088eb3cb2c66788f88afdfbba8faa1c490485624c88ae11e57347a676902e7553f056188493209bdbb30acc63c9e41e16a9d6c009416b520a76ba38f57628170c43626b5cb46179dc5bf65de865085f84bf741c223fbe474d2d19d8f43914fbd6586351089e73babf344f988b7963fe44528457d7aad3c564f6bcbd0d772a4c9fd328e6022d1c7c9f86726f8d5a23797d309c0f653ab1ac687833eb2700f156296062a8b377078f45f6b68c3d07cae1913ba8d5a6f9bf7525a3439eb932d4cefc4bf8e1b07b48ca13ece366cbc3e0388915915d1757475103a9e9454e7e6355de2d6acbf4710f9a63e4f6d3cd70c2d6fca88dd8a14448fdb63ce9350fdaafbe0b8bd1c5d307dae76dfed799aef2d8f23d5608d37d1330dd38b94860905dbeebf78d7b7318b7d42aed40d3f9899e9f420cbd92a6eeae3026f7725694e0e4bee016ba346fed2c21172bdb4a461cebe0cfe38e76645226ac127a259c193264d735ce8c8a57e17dd3f0579e2e86dc295ad1f45ba2d85db35044da61f7d401274b31eefbeb34e8d2ae596e9b4541aae117bdac5ed0b324c20539c27c07a411d5288b0b5f6fa16e9a7df85dc319fa6b71cd08a859c06a3f7b0289e1750adbf182f9750fea96fea5ab7aa3473340607cd7ed2c626f5382491c26d5d5bea61401dee7319c94d418f297e61ceac8f258ee8c23831bda081591f5a918e96855774ddedffc51e5b180f1971806d42fc333020b734aeb45adb0bc47325d0cea5f6713a786558022afc39d573892aa3635efbfd8bcb11c57f306c72146afe8b45388125cb7bf9ecf965a7ba4f768c77be366470dcdcf214b7f6a5a9460ed4fe44ae559d85e2fdc2094de83fff12ea8804db1215c4ca865871bdd7f8ef32ab799bf923ffb02c1ded7d129beadad46c5eda31ab1a6f43da05ea08bff7ffa88d8966353d01830558c39b930b01d175e437124d8edd0d2698fd8932f2b2c9b14746e52879c57a395538150f390264f00e60d470711202f4194499ff79037ca9885dc8d695f7d917a3086ca88e8f8d0243efee09302cf39e039eb7cc8dd19d28120d5fe533b5727cd39133181c729ca6f90a015ed30be7668d5cb5ecc33a53ee69bf7d1a5ecbdb153803743c6adaaabd36bf84e5be38d3f04a5d5dbfd67bdcd3b176e65bd1391ade775cc32ce43a847fb6c672a3fe97a5d4081c4986959ec5fb898f42a9397ba2b3ec2c1018f8d76d057f2366bd0e4465514ad6560c599664fb85621fe771e00f43d39b591b2a6a321100f4d1ef23a376d5ae3eeedbfe23da73dff0ee4d16b34ebddd8f5f053db9824105fc7300dbee7ea6af56b112319e3e215a0fc79ae946f6b5227453ec7fcaf17cf7651f71499a50d81221404d5f129ac50ea7528ff0e0069ec4ab8acb7919d81749ab37a870c5ef2cc5a15cf96709d3c65b4addc77e7416847160bcabb94ea36377e0ef71be80b5cc53effd5444888044a353574c72c924bba2a8b4e8354188ebfedc8\nMAC = d6a26654b88572e875d9661c83471c1b\n\n# Length 2050.\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nInput = 248ac31085b6c2adaaa38259a0d7192c5c35d1bb4ef39ad94c38d1c82479e2dd2159a077024b0589bc8a20101b506f0a1ad0bbab76e83a83f1b94be6beae74e874cab692c5963a75436b776121ec9f62399a3e66b2d22707dae81933b6277f3c8516bcbe26dbbd86f373103d7cf4cad1888c952118fbfbd0d7b4bedc4ae4936aff91157e7aa47c54442ea78d6ac251d324a0fbe49d89cc3521b66d16e9c66a3709894e4eb0a4eedc4ae19468e66b81f271351b1d921ea551047abcc6b87a901fde7db79fa1818c11336dbc07244a40eb14cf77bde35e78ae9ad7d3f57ed7e7f23926c9172f82d77684ea5ed7d74ebc6f142b997036bcb7cce8df1bbc0d5b35a46509c954fc9469d214d6238f166cbf872156b4c41d7aac5942cffb175023078252a3f36e315c5d4ce0e39928a018252862becacef96a19f03bdcf46d75584299d1f8b03c0169e9e407d937145b5e5024139e7022a1978f114f24cdfa23780a119735c41da8fb759bbb3f025c6ec30e6c6e9bce8615be68e392fce59fd26a8e6a6cc5c606e3848116e4d01d29565a1facfb524b6d29643b826eee1e42869fc76df229dd79b39a2b1df28bb335c3a5f15a855d0121e4a6da34b5e4d5b7b5d5746a03ecff70811e1516fcec1bf7462e8876a2d21710aa168c78f45a6a15015950e221da85d3ec822ad6d0a6931b25a06b7bb5f3c10bb36cd4d647f9561982fde9818de5d4bf8db7f86c53b4ff14928ac15f79023b61861e73e44216540bb302153770da2533de9795252ab5fb77ad924c9338c8144c23d4c90dab9a18feac1a1574d4545e1435eb405e6c4c439fc724fce992ae85badf345bad16d85fbd338f04433703614754d0e7e54c4ccde2670587d52ecfb5a70a14a501bacc727722649931d8515b13d020a78e511fe136d45fbf97f9c7f689fcc677cfb3683723878350ffe9d08130cc6e567b6179e01b7eb2b3bbcf0873e1308eec018edeb8cce946338e15d5bf68c71916a83a99358039ef071e009546a2df936879dffbba397a93925d229a469fd17d71b7f524e03a30da6ee927542f8b369bed4734fe25dbd63d24ffd2a222f5f84f75d858ab989be925af570ad6d45bd28ce61b5139e1dd2f0b7795fe072e6e83acbb5e7b777a70c641e4cab2af40eed69abc334cd2703c3273204fac580c6a3d6680427e5f7d051e8380a53f93a180f4556ecea4530b9a2d5948dad63d415b6874f6b90e767d6d265be86351b53ba690780bb57c21b57418c5b97559e840c68257f839e7583a4bf7c7645c5987d40cc1ba79a218c35edfacdabe581d950e4bb7a481ebe64d61d00e75b1f25f1ce5f5462334a5b9038a697aa0937a3f8017e05d2c9c05dcb05c0b02508dea619b137f5444b6f088eb3cb2c66788f88afdfbba8faa1c490485624c88ae11e57347a676902e7553f056188493209bdbb30acc63c9e41e16a9d6c009416b520a76ba38f57628170c43626b5cb46179dc5bf65de865085f84bf741c223fbe474d2d19d8f43914fbd6586351089e73babf344f988b7963fe44528457d7aad3c564f6bcbd0d772a4c9fd328e6022d1c7c9f86726f8d5a23797d309c0f653ab1ac687833eb2700f156296062a8b377078f45f6b68c3d07cae1913ba8d5a6f9bf7525a3439eb932d4cefc4bf8e1b07b48ca13ece366cbc3e0388915915d1757475103a9e9454e7e6355de2d6acbf4710f9a63e4f6d3cd70c2d6fca88dd8a14448fdb63ce9350fdaafbe0b8bd1c5d307dae76dfed799aef2d8f23d5608d37d1330dd38b94860905dbeebf78d7b7318b7d42aed40d3f9899e9f420cbd92a6eeae3026f7725694e0e4bee016ba346fed2c21172bdb4a461cebe0cfe38e76645226ac127a259c193264d735ce8c8a57e17dd3f0579e2e86dc295ad1f45ba2d85db35044da61f7d401274b31eefbeb34e8d2ae596e9b4541aae117bdac5ed0b324c20539c27c07a411d5288b0b5f6fa16e9a7df85dc319fa6b71cd08a859c06a3f7b0289e1750adbf182f9750fea96fea5ab7aa3473340607cd7ed2c626f5382491c26d5d5bea61401dee7319c94d418f297e61ceac8f258ee8c23831bda081591f5a918e96855774ddedffc51e5b180f1971806d42fc333020b734aeb45adb0bc47325d0cea5f6713a786558022afc39d573892aa3635efbfd8bcb11c57f306c72146afe8b45388125cb7bf9ecf965a7ba4f768c77be366470dcdcf214b7f6a5a9460ed4fe44ae559d85e2fdc2094de83fff12ea8804db1215c4ca865871bdd7f8ef32ab799bf923ffb02c1ded7d129beadad46c5eda31ab1a6f43da05ea08bff7ffa88d8966353d01830558c39b930b01d175e437124d8edd0d2698fd8932f2b2c9b14746e52879c57a395538150f390264f00e60d470711202f4194499ff79037ca9885dc8d695f7d917a3086ca88e8f8d0243efee09302cf39e039eb7cc8dd19d28120d5fe533b5727cd39133181c729ca6f90a015ed30be7668d5cb5ecc33a53ee69bf7d1a5ecbdb153803743c6adaaabd36bf84e5be38d3f04a5d5dbfd67bdcd3b176e65bd1391ade775cc32ce43a847fb6c672a3fe97a5d4081c4986959ec5fb898f42a9397ba2b3ec2c1018f8d76d057f2366bd0e4465514ad6560c599664fb85621fe771e00f43d39b591b2a6a321100f4d1ef23a376d5ae3eeedbfe", "23da73dff0ee4d16b34ebddd8f5f053db9824105fc7300dbee7ea6af56b112319e3e215a0fc79ae946f6b5227453ec7fcaf17cf7651f71499a50d81221404d5f129ac50ea7528ff0e0069ec4ab8acb7919d81749ab37a870c5ef2cc5a15cf96709d3c65b4addc77e7416847160bcabb94ea36377e0ef71be80b5cc53effd5444888044a353574c72c924bba2a8b4e8354188ebfedc852\nMAC = 9fbbb7f7adcd0cd5b46a4a520b22499a\n\n# Length 2051.\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nInput = 248ac31085b6c2adaaa38259a0d7192c5c35d1bb4ef39ad94c38d1c82479e2dd2159a077024b0589bc8a20101b506f0a1ad0bbab76e83a83f1b94be6beae74e874cab692c5963a75436b776121ec9f62399a3e66b2d22707dae81933b6277f3c8516bcbe26dbbd86f373103d7cf4cad1888c952118fbfbd0d7b4bedc4ae4936aff91157e7aa47c54442ea78d6ac251d324a0fbe49d89cc3521b66d16e9c66a3709894e4eb0a4eedc4ae19468e66b81f271351b1d921ea551047abcc6b87a901fde7db79fa1818c11336dbc07244a40eb14cf77bde35e78ae9ad7d3f57ed7e7f23926c9172f82d77684ea5ed7d74ebc6f142b997036bcb7cce8df1bbc0d5b35a46509c954fc9469d214d6238f166cbf872156b4c41d7aac5942cffb175023078252a3f36e315c5d4ce0e39928a018252862becacef96a19f03bdcf46d75584299d1f8b03c0169e9e407d937145b5e5024139e7022a1978f114f24cdfa23780a119735c41da8fb759bbb3f025c6ec30e6c6e9bce8615be68e392fce59fd26a8e6a6cc5c606e3848116e4d01d29565a1facfb524b6d29643b826eee1e42869fc76df229dd79b39a2b1df28bb335c3a5f15a855d0121e4a6da34b5e4d5b7b5d5746a03ecff70811e1516fcec1bf7462e8876a2d21710aa168c78f45a6a15015950e221da85d3ec822ad6d0a6931b25a06b7bb5f3c10bb36cd4d647f9561982fde9818de5d4bf8db7f86c53b4ff14928ac15f79023b61861e73e44216540bb302153770da2533de9795252ab5fb77ad924c9338c8144c23d4c90dab9a18feac1a1574d4545e1435eb405e6c4c439fc724fce992ae85badf345bad16d85fbd338f04433703614754d0e7e54c4ccde2670587d52ecfb5a70a14a501bacc727722649931d8515b13d020a78e511fe136d45fbf97f9c7f689fcc677cfb3683723878350ffe9d08130cc6e567b6179e01b7eb2b3bbcf0873e1308eec018edeb8cce946338e15d5bf68c71916a83a99358039ef071e009546a2df936879dffbba397a93925d229a469fd17d71b7f524e03a30da6ee927542f8b369bed4734fe25dbd63d24ffd2a222f5f84f75d858ab989be925af570ad6d45bd28ce61b5139e1dd2f0b7795fe072e6e83acbb5e7b777a70c641e4cab2af40eed69abc334cd2703c3273204fac580c6a3d6680427e5f7d051e8380a53f93a180f4556ecea4530b9a2d5948dad63d415b6874f6b90e767d6d265be86351b53ba690780bb57c21b57418c5b97559e840c68257f839e7583a4bf7c7645c5987d40cc1ba79a218c35edfacdabe581d950e4bb7a481ebe64d61d00e75b1f25f1ce5f5462334a5b9038a697aa0937a3f8017e05d2c9c05dcb05c0b02508dea619b137f5444b6f088eb3cb2c66788f88afdfbba8faa1c490485624c88ae11e57347a676902e7553f056188493209bdbb30acc63c9e41e16a9d6c009416b520a76ba38f57628170c43626b5cb46179dc5bf65de865085f84bf741c223fbe474d2d19d8f43914fbd6586351089e73babf344f988b7963fe44528457d7aad3c564f6bcbd0d772a4c9fd328e6022d1c7c9f86726f8d5a23797d309c0f653ab1ac687833eb2700f156296062a8b377078f45f6b68c3d07cae1913ba8d5a6f9bf7525a3439eb932d4cefc4bf8e1b07b48ca13ece366cbc3e0388915915d1757475103a9e9454e7e6355de2d6acbf4710f9a63e4f6d3cd70c2d6fca88dd8a14448fdb63ce9350fdaafbe0b8bd1c5d307dae76dfed799aef2d8f23d5608d37d1330dd38b94860905dbeebf78d7b7318b7d42aed40d3f9899e9f420cbd92a6eeae3026f7725694e0e4bee016ba346fed2c21172bdb4a461cebe0cfe38e76645226ac127a259c193264d735ce8c8a57e17dd3f0579e2e86dc295ad1f45ba2d85db35044da61f7d401274b31eefbeb34e8d2ae596e9b4541aae117bdac5ed0b324c20539c27c07a411d5288b0b5f6fa16e9a7df85dc319fa6b71cd08a859c06a3f7b0289e1750adbf182f9750fea96fea5ab7aa3473340607cd7ed2c626f5382491c26d5d5bea61401dee7319c94d418f297e61ceac8f258ee8c23831bda081591f5a918e96855774ddedffc51e5b180f1971806d42fc333020b734aeb45adb0bc47325d0cea5f6713a786558022afc39d573892aa3635efbfd8bcb11c57f306c72146afe8b45388125cb7bf9ecf965a7ba4f768c77be366470dcdcf214b7f6a5a9460ed4fe44ae559d85e2fdc2094de83fff12ea8804db1215c4ca865871bdd7f8ef32ab799bf923ffb02c1ded7d129beadad46c5eda31ab1a6f43da05ea08bff7ffa88d8966353d01830558c39b930b01d175e437124d8edd0d2698fd8932f2b2c9b14746e52879c57a395538150f390264f00e60d470711202f4194499ff79037ca9885dc8d695f7d917a3086ca88e8f8d0243efee09302cf39e039eb7cc8dd19d28120d5fe533b5727cd39133181c729ca6f90a015ed30be7668d5cb5ecc33a53ee69bf7d1a5ecbdb153803743c6adaaabd36bf84e5be38d3f04a5d5dbfd67bdcd3b176e65bd1391ade775cc32ce43a847fb6c672a3fe97a5d4081c4986959ec5fb898f42a9397ba2b3ec2c1018f8d76d057f2366bd0e4465514ad6560c599664fb85621fe771e00f43d39b591b2a6a321100f4d1ef23a376d5ae3eeedbfe23da73dff0ee4d16b34ebddd8f5f053db9824105fc7300dbee7ea6af56b112319e3e215a0fc79ae946f6b5227453ec7fcaf17cf7651f71499a50d81221404d5f129ac50ea7528ff0e0069ec4ab8acb7919d81749ab37a870c5ef2cc5a15cf96709d3c65b4addc77e7416847160bcabb94ea36377e0ef71be80b5cc53effd5444888044a353574c72c924bba2a8b4e8354188ebfedc852f5\nMAC = eb7cdceb97ade2a07622f8f5a4b1ce15\n\n# Length 2052.\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nInput = 248ac31085b6c2adaaa38259a0d7192c5c35d1bb4ef39ad94c38d1c82479e2dd2159a077024b0589bc8a20101b506f0a1ad0bbab76e83a83f1b94be6beae74e874cab692c5963a75436b776121ec9f62399a3e66b2d22707dae81933b6277f3c8516bcbe26dbbd86f373103d7cf4cad1888c952118fbfbd0d7b4bedc4ae4936aff91157e7aa47c54442ea78d6ac251d324a0fbe49d89cc3521b66d16e9c66a3709894e4eb0a4eedc4ae19468e66b81f271351b1d921ea551047abcc6b87a901fde7db79fa1818c11336dbc07244a40eb14cf77bde35e78ae9ad7d3f57ed7e7f23926c9172f82d77684ea5ed7d74ebc6f142b997036bcb7cce8df1bbc0d5b35a46509c954fc9469d214d6238f166cbf872156b4c41d7aac5942cffb175023078252a3f36e315c5d4ce0e39928a018252862becacef96a19f03bdcf46d75584299d1f8b03c0169e9e407d937145b5e5024139e7022a1978f114f24cdfa23780a119735c41da8fb759bbb3f025c6ec30e6c6e9bce8615be68e392fce59fd26a8e6a6cc5c606e3848116e4d01d29565a1facfb524b6d29643b826eee1e42869fc76df229dd79b39a2b1df28bb335c3a5f15a855d0121e4a6da34b5e4d5b7b5d5746a03ecff70811e1516fcec1bf7462e8876a2d21710aa168c78f45a6a15015950e221da85d3ec822ad6d0a6931b25a06b7bb5f3c10bb36cd4d647f9561982fde9818de5d4bf8db7f86c53b4ff14928ac15f79023b61861e73e44216540bb302153770da2533de9795252ab5fb77ad924c9338c8144c23d4c90dab9a18feac1a1574d4545e1435eb405e6c4c439fc724fce992ae85badf345bad16d85fbd338f04433703614754d0e7e54c4ccde2670587d52ecfb5a70a14a501bacc727722649931d8515b13d020a78e511fe136d45fbf97f9c7f689fcc677cfb3683723878350ffe9d08130cc6e567b6179e01b7eb2b3bbcf0873e1308eec018edeb8cce946338e15d5bf68c71916a83a99358039ef071e009546a2df936879dffbba397a93925d229a469fd17d71b7f524e03a30da6ee927542f8b369bed4734fe25dbd63d24ffd2a222f5f84f75d858ab989be925af570ad6d45bd28ce61b5139e1dd2f0b7795fe072e6e83acbb5e7b777a70c641e4cab2af40eed69abc334cd2703c3273204fac580c6a3d6680427e5f7d051e8380a53f93a180f4556ecea4530b9a2d5948dad63d415b6874f6b90e767d6d265be86351b53ba690780bb57c21b57418c5b97559e840c68257f839e7583a4bf7c7645c5987d40cc1ba79a218c35edfacdabe581d950e4bb7a481ebe64d61d00e75b1f25f1ce5f5462334a5b9038a697aa0937a3f8017e05d2c9c05dcb05c0b02508dea619b137f5444b6f088eb3cb2c66788f88afdfbba8faa1c490485624c88ae11e57347a676902e7553f056188493209bdbb30acc63c9e41e16a9d6c009416b520a76ba38f57628170c43626b5cb46179dc5bf65de865085f84bf741c223fbe474d2d19d8f43914fbd6586351089e73babf344f988b7963fe44528457d7aad3c564f6bcbd0d772a4c9fd328e6022d1c7c9f86726f8d5a23797d309c0f653ab1ac687833eb2700f156296062a8b377078f45f6b68c3d07cae1913ba8d5a6f9bf7525a3439eb932d4cefc4bf8e1b07b48ca13ece366cbc3e0388915915d1757475103a9e9454e7e6355de2d6acbf4710f9a63e4f6d3cd70c2d6fca88dd8a14448fdb63ce9350fdaafbe0b8bd1c5d307dae76dfed799aef2d8f23d5608d37d1330dd38b94860905dbeebf78d7b7318b7d42aed40d3f9899e9f420cbd92a6eeae3026f7725694e0e4bee016ba346fed2c21172bdb4a461cebe0cfe38e76645226ac127a259c193264d735ce8c8a57e17dd3f0579e2e86dc295ad1f45ba2d85db35044da61f7d401274b31eefbeb34e8d2ae596e9b4541aae117bdac5ed0b324c20539c27c07a411d5288b0b5f6fa16e9a7df85dc319fa6b71cd08a859c06a3f7b0289e1750adbf182f9750fea96fea5ab7aa3473340607cd7ed2c626f5382491c26d5d5bea61401dee7319c94d418f297e61ceac8f258ee8c23831bda081591f5a918e96855774ddedffc51e5b180f1971806d42fc333020b734aeb45adb0bc47325d0cea5f6713a786558022afc39d573892aa3635efbfd8bcb11c57f306c72146afe8b45388125cb7bf9ecf965a7ba4f768c77be366470dcdcf214b7f6a5a9460ed4fe44ae559d85e2fdc2094de83fff12ea8804db1215c4ca865871bdd7f8ef32ab799bf923ffb02c1ded7d129beadad46c5eda31ab1a6f43da05ea08bff7ffa88d8966353d01830558c39b930b01d175e437124d8edd0d2698fd8932f2b2c9b14746e52879c57a395538150f390264f00e60d470711202f4194499ff79037ca9885dc8d695f7d917a3086ca88e8f8d0243efee09302cf39e039eb7cc8dd19d28120d5fe533b5727cd39133181c729ca6f9", @@ -2679,56 +2685,56 @@ "90485624c88ae11e57347a676902e7553f056188493209bdbb30acc63c9e41e16a9d6c009416b520a76ba38f57628170c43626b5cb46179dc5bf65de865085f84bf741c223fbe474d2d19d8f43914fbd6586351089e73babf344f988b7963fe44528457d7aad3c564f6bcbd0d772a4c9fd328e6022d1c7c9f86726f8d5a23797d309c0f653ab1ac687833eb2700f156296062a8b377078f45f6b68c3d07cae1913ba8d5a6f9bf7525a3439eb932d4cefc4bf8e1b07b48ca13ece366cbc3e0388915915d1757475103a9e9454e7e6355de2d6acbf4710f9a63e4f6d3cd70c2d6fca88dd8a14448fdb63ce9350fdaafbe0b8bd1c5d307dae76dfed799aef2d8f23d5608d37d1330dd38b94860905dbeebf78d7b7318b7d42aed40d3f9899e9f420cbd92a6eeae3026f7725694e0e4bee016ba346fed2c21172bdb4a461cebe0cfe38e76645226ac127a259c193264d735ce8c8a57e17dd3f0579e2e86dc295ad1f45ba2d85db35044da61f7d401274b31eefbeb34e8d2ae596e9b4541aae117bdac5ed0b324c20539c27c07a411d5288b0b5f6fa16e9a7df85dc319fa6b71cd08a859c06a3f7b0289e1750adbf182f9750fea96fea5ab7aa3473340607cd7ed2c626f5382491c26d5d5bea61401dee7319c94d418f297e61ceac8f258ee8c23831bda081591f5a918e96855774ddedffc51e5b180f1971806d42fc333020b734aeb45adb0bc47325d0cea5f6713a786558022afc39d573892aa3635efbfd8bcb11c57f306c72146afe8b45388125cb7bf9ecf965a7ba4f768c77be366470dcdcf214b7f6a5a9460ed4fe44ae559d85e2fdc2094de83fff12ea8804db1215c4ca865871bdd7f8ef32ab799bf923ffb02c1ded7d129beadad46c5eda31ab1a6f43da05ea08bff7ffa88d8966353d01830558c39b930b01d175e437124d8edd0d2698fd8932f2b2c9b14746e52879c57a395538150f390264f00e60d470711202f4194499ff79037ca9885dc8d695f7d917a3086ca88e8f8d0243efee09302cf39e039eb7cc8dd19d28120d5fe533b5727cd39133181c729ca6f90a015ed30be7668d5cb5ecc33a53ee69bf7d1a5ecbdb153803743c6adaaabd36bf84e5be38d3f04a5d5dbfd67bdcd3b176e65bd1391ade775cc32ce43a847fb6c672a3fe97a5d4081c4986959ec5fb898f42a9397ba2b3ec2c1018f8d76d057f2366bd0e4465514ad6560c599664fb85621fe771e00f43d39b591b2a6a321100f4d1ef23a376d5ae3eeedbfe23da73dff0ee4d16b34ebddd8f5f053db9824105fc7300dbee7ea6af56b112319e3e215a0fc79ae946f6b5227453ec7fcaf17cf7651f71499a50d81221404d5f129ac50ea7528ff0e0069ec4ab8acb7919d81749ab37a870c5ef2cc5a15cf96709d3c65b4addc77e7416847160bcabb94ea36377e0ef71be80b5cc53effd5444888044a353574c72c924bba2a8b4e8354188ebfedc852f59073f4347a8c8a28c99e21\nMAC = c6e5d1810fd878ac6b844c66cef36a22\n\n# Length 2063.\nKey = 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\nInput = 248ac31085b6c2adaaa38259a0d7192c5c35d1bb4ef39ad94c38d1c82479e2dd2159a077024b0589bc8a20101b506f0a1ad0bbab76e83a83f1b94be6beae74e874cab692c5963a75436b776121ec9f62399a3e66b2d22707dae81933b6277f3c8516bcbe26dbbd86f373103d7cf4cad1888c952118fbfbd0d7b4bedc4ae4936aff91157e7aa47c54442ea78d6ac251d324a0fbe49d89cc3521b66d16e9c66a3709894e4eb0a4eedc4ae19468e66b81f271351b1d921ea551047abcc6b87a901fde7db79fa1818c11336dbc07244a40eb14cf77bde35e78ae9ad7d3f57ed7e7f23926c9172f82d77684ea5ed7d74ebc6f142b997036bcb7cce8df1bbc0d5b35a46509c954fc9469d214d6238f166cbf872156b4c41d7aac5942cffb175023078252a3f36e315c5d4ce0e39928a018252862becacef96a19f03bdcf46d75584299d1f8b03c0169e9e407d937145b5e5024139e7022a1978f114f24cdfa23780a119735c41da8fb759bbb3f025c6ec30e6c6e9bce8615be68e392fce59fd26a8e6a6cc5c606e3848116e4d01d29565a1facfb524b6d29643b826eee1e42869fc76df229dd79b39a2b1df28bb335c3a5f15a855d0121e4a6da34b5e4d5b7b5d5746a03ecff70811e1516fcec1bf7462e8876a2d21710aa168c78f45a6a15015950e221da85d3ec822ad6d0a6931b25a06b7bb5f3c10bb36cd4d647f9561982fde9818de5d4bf8db7f86c53b4ff14928ac15f79023b61861e73e44216540bb302153770da2533de9795252ab5fb77ad924c9338c8144c23d4c90dab9a18feac1a1574d4545e1435eb405e6c4c439fc724fce992ae85badf345bad16d85fbd338f04433703614754d0e7e54c4ccde2670587d52ecfb5a70a14a501bacc727722649931d8515b13d020a78e511fe136d45fbf97f9c7f689fcc677cfb3683723878350ffe9d08130cc6e567b6179e01b7eb2b3bbcf0873e1308eec018edeb8cce946338e15d5bf68c71916a83a99358039ef071e009546a2df936879dffbba397a93925d229a469fd17d71b7f524e03a30da6ee927542f8b369bed4734fe25dbd63d24ffd2a222f5f84f75d858ab989be925af570ad6d45bd28ce61b5139e1dd2f0b7795fe072e6e83acbb5e7b777a70c641e4cab2af40eed69abc334cd2703c3273204fac580c6a3d6680427e5f7d051e8380a53f93a180f4556ecea4530b9a2d5948dad63d415b6874f6b90e767d6d265be86351b53ba690780bb57c21b57418c5b97559e840c68257f839e7583a4bf7c7645c5987d40cc1ba79a218c35edfacdabe581d950e4bb7a481ebe64d61d00e75b1f25f1ce5f5462334a5b9038a697aa0937a3f8017e05d2c9c05dcb05c0b02508dea619b137f5444b6f088eb3cb2c66788f88afdfbba8faa1c490485624c88ae11e57347a676902e7553f056188493209bdbb30acc63c9e41e16a9d6c009416b520a76ba38f57628170c43626b5cb46179dc5bf65de865085f84bf741c223fbe474d2d19d8f43914fbd6586351089e73babf344f988b7963fe44528457d7aad3c564f6bcbd0d772a4c9fd328e6022d1c7c9f86726f8d5a23797d309c0f653ab1ac687833eb2700f156296062a8b377078f45f6b68c3d07cae1913ba8d5a6f9bf7525a3439eb932d4cefc4bf8e1b07b48ca13ece366cbc3e0388915915d1757475103a9e9454e7e6355de2d6acbf4710f9a63e4f6d3cd70c2d6fca88dd8a14448fdb63ce9350fdaafbe0b8bd1c5d307dae76dfed799aef2d8f23d5608d37d1330dd38b94860905dbeebf78d7b7318b7d42aed40d3f9899e9f420cbd92a6eeae3026f7725694e0e4bee016ba346fed2c21172bdb4a461cebe0cfe38e76645226ac127a259c193264d735ce8c8a57e17dd3f0579e2e86dc295ad1f45ba2d85db35044da61f7d401274b31eefbeb34e8d2ae596e9b4541aae117bdac5ed0b324c20539c27c07a411d5288b0b5f6fa16e9a7df85dc319fa6b71cd08a859c06a3f7b0289e1750adbf182f9750fea96fea5ab7aa3473340607cd7ed2c626f5382491c26d5d5bea61401dee7319c94d418f297e61ceac8f258ee8c23831bda081591f5a918e96855774ddedffc51e5b180f1971806d42fc333020b734aeb45adb0bc47325d0cea5f6713a786558022afc39d573892aa3635efbfd8bcb11c57f306c72146afe8b45388125cb7bf9ecf965a7ba4f768c77be366470dcdcf214b7f6a5a9460ed4fe44ae559d85e2fdc2094de83fff12ea8804db1215c4ca865871bdd7f8ef32ab799bf923ffb02c1ded7d129beadad46c5eda31ab1a6f43da05ea08bff7ffa88d8966353d01830558c39b930b01d175e437124d8edd0d2698fd8932f2b2c9b14746e52879c57a395538150f390264f00e60d470711202f4194499ff79037ca9885dc8d695f7d917a3086ca88e8f8d0243efee09302cf39e039eb7cc8dd19d28120d5fe533b5727cd39133181c729ca6f90a015ed30be7668d5cb5ecc33a53ee69bf7d1a5ecbdb153803743c6adaaabd36bf84e5be38d3f04a5d5dbfd67bdcd3b176e65bd1391ade775cc32ce43a847fb6c672a3fe97a5d4081c4986959ec5fb898f42a9397ba2b3ec2c1018f8d76d057f2366bd0e4465514ad6560c599664fb85621fe771e00f43d39b591b2a6a321100f4d1ef23a376d5ae3eeedbfe23da73dff0ee4d16b34ebddd8f5f053db9824105fc7300dbee7ea6af56b112319e3e215a0fc79ae946f6b5227453ec7fcaf17cf7651f71499a50d81221404d5f129ac50ea7528ff0e0069ec4ab8acb7919d81749ab37a870c5ef2cc5a15cf96709d3c65b4addc77e7416847160bcabb94ea36377e0ef71be80b5cc53effd5444888044a353574c72c924bba2a8b4e8354188ebfedc852f59073f4347a8c8a28c99e21df\nMAC = f6eaae369c3cb5c05748e8d919178e00\n\n# Regression test for https://rt.openssl.org/Ticket/Display.html?id=4439\nKey = 2d773be37adb1e4d683bf0075e79c4ee037918535a7f99ccb7040fb5f5f43aea\nInput = 89dab80b7717c1db5db437860a3f70218e93e1b8f461fb677f16f35f6f87e2a91c99bc3a47ace47640cc95c345be5ecca5a3523c35cc01893af0b64a620334270372ec12482d1b1e363561698a578b359803495bb4e2ef1930b17a5190b580f141300df30adbeca28f6427a8bc1a999fd51c554a017d095d8c3e3127daf9f595\nMAC = c85d15ed44c378d6b00e23064c7bcd51\n\n# Regression tests for https://rt.openssl.org/Ticket/Display.html?id=4483\n\nKey = 7f1b02640000000000000000000000000000000000000000cccccccccccccccc\nInput = cccccccccccccccccccccccccccccccccccccccccccccccccc80ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccceccccccccccccccccccccccccccccccccccccc5cccccccccccccccccccccccccccccccccccccccccce3ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccaccccccccccccccccccccce6cccccccccc000000afccccccccccccccccccfffffff5000000000000000000000000000000000000000000000000000000ffffffe70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000719205a8521dfc\nMAC = 8559b876eceed66eb37798c0457baff9\n\nKey = e00016000000000000000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaaaa\nInput = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa000000000000000000800264\nMAC = 00bd1258978e205444c9aaaa82006fed\n\nKey = 0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c\nInput = 02fc\nMAC = 06120c0c0c0c0c0c0c0c0c0c0c0c0c0c\n\nKey = 00ff000000000000000000000000000000000000001e00000000000000007b7b\nInput = 7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7a7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b5c7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b", "7b7b7b7b7b7b7b7b7b7b7b7b7b6e7b007b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7a7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b5c7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b7b6e7b001300000000b300000000000000000000000000000000000000000000f20000000000000000000000000000000000002000efff0009000000000000000000000000100000000009000000640000000000000000000000001300000000b300000000000000000000000000000000000000000000f20000000000000000000000000000000000002000efff00090000000000000000007a000010000000000900000064000000000000000000000000000000000000000000000000fc\nMAC = 33205bbf9e9f8f7212ab9e2ab9b7e4a5\n", }; -static const size_t kLen43 = 74392; +static const size_t kLen44 = 74392; -static const char *kData44[] = { +static const char *kData45[] = { "-----BEGIN CERTIFICATE-----\nMII2MzCCNRugAwIBAgIBATANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJDQTAg\nFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowDTELMAkGA1UEAxMCQ0Ew\nggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6C9qEGRIBQXV8Lj29vVu+\nU+tyXzSSinWIumK5ijPhCm3DLnv4RayxkFwemtnkGRZ/o94ZnsXkBfU/IlsYdkuq\n8wK9WI/ql3gwWjH+KARIhIQcSLGiJcLN6kGuG2nlRBKMcPgPiEq2B0yBXFf4tG3C\nBbeae7+8G7uvOmv8NLyKj32neWpnUCTL5o2VwyPoxjLxT5gUR69v9XSVFj2irCZb\nsEedeKSb++LqyMhLfnRTzNv+ZHNh4izZHrktR25MvnT5QyBq32hx7AjZ2/xo70Om\nH7w10a2DwsVjJNMdxTEmgyvU9M6CeYRPX1Ykfg+sXCTtkTVAlBDUviIqY95CKy25\nAgMBAAGjgjOaMIIzljAOBgNVHQ8BAf8EBAMCAgQwEwYDVR0lBAwwCgYIKwYBBQUH\nAwEwDwYDVR0TAQH/BAUwAwEB/zCCM1wGA1UdHgSCM1MwgjNPoIIZqDAJggd0MC50\nZXN0MAmCB3QxLnRlc3QwCYIHdDIudGVzdDAJggd0My50ZXN0MAmCB3Q0LnRlc3Qw\nCYIHdDUudGVzdDAJggd0Ni50ZXN0MAmCB3Q3LnRlc3QwCYIHdDgudGVzdDAJggd0\nOS50ZXN0MAqCCHQxMC50ZXN0MAqCCHQxMS50ZXN0MAqCCHQxMi50ZXN0MAqCCHQx\nMy50ZXN0MAqCCHQxNC50ZXN0MAqCCHQxNS50ZXN0MAqCCHQxNi50ZXN0MAqCCHQx\nNy50ZXN0MAqCCHQxOC50ZXN0MAqCCHQxOS50ZXN0MAqCCHQyMC50ZXN0MAqCCHQy\nMS50ZXN0MAqCCHQyMi50ZXN0MAqCCHQyMy50ZXN0MAqCCHQyNC50ZXN0MAqCCHQy\nNS50ZXN0MAqCCHQyNi50ZXN0MAqCCHQyNy50ZXN0MAqCCHQyOC50ZXN0MAqCCHQy\nOS50ZXN0MAqCCHQzMC50ZXN0MAqCCHQzMS50ZXN0MAqCCHQzMi50ZXN0MAqCCHQz\nMy50ZXN0MAqCCHQzNC50ZXN0MAqCCHQzNS50ZXN0MAqCCHQzNi50ZXN0MAqCCHQz\nNy50ZXN0MAqCCHQzOC50ZXN0MAqCCHQzOS50ZXN0MAqCCHQ0MC50ZXN0MAqCCHQ0\nMS50ZXN0MAqCCHQ0Mi50ZXN0MAqCCHQ0My50ZXN0MAqCCHQ0NC50ZXN0MAqCCHQ0\nNS50ZXN0MAqCCHQ0Ni50ZXN0MAqCCHQ0Ny50ZXN0MAqCCHQ0OC50ZXN0MAqCCHQ0\nOS50ZXN0MAqCCHQ1MC50ZXN0MAqCCHQ1MS50ZXN0MAqCCHQ1Mi50ZXN0MAqCCHQ1\nMy50ZXN0MAqCCHQ1NC50ZXN0MAqCCHQ1NS50ZXN0MAqCCHQ1Ni50ZXN0MAqCCHQ1\nNy50ZXN0MAqCCHQ1OC50ZXN0MAqCCHQ1OS50ZXN0MAqCCHQ2MC50ZXN0MAqCCHQ2\nMS50ZXN0MAqCCHQ2Mi50ZXN0MAqCCHQ2My50ZXN0MAqCCHQ2NC50ZXN0MAqCCHQ2\nNS50ZXN0MAqCCHQ2Ni50ZXN0MAqCCHQ2Ny50ZXN0MAqCCHQ2OC50ZXN0MAqCCHQ2\nOS50ZXN0MAqCCHQ3MC50ZXN0MAqCCHQ3MS50ZXN0MAqCCHQ3Mi50ZXN0MAqCCHQ3\nMy50ZXN0MAqCCHQ3NC50ZXN0MAqCCHQ3NS50ZXN0MAqCCHQ3Ni50ZXN0MAqCCHQ3\nNy50ZXN0MAqCCHQ3OC50ZXN0MAqCCHQ3OS50ZXN0MAqCCHQ4MC50ZXN0MAqCCHQ4\nMS50ZXN0MAqCCHQ4Mi50ZXN0MAqCCHQ4My50ZXN0MAqCCHQ4NC50ZXN0MAqCCHQ4\nNS50ZXN0MAqCCHQ4Ni50ZXN0MAqCCHQ4Ny50ZXN0MAqCCHQ4OC50ZXN0MAqCCHQ4\nOS50ZXN0MAqCCHQ5MC50ZXN0MAqCCHQ5MS50ZXN0MAqCCHQ5Mi50ZXN0MAqCCHQ5\nMy50ZXN0MAqCCHQ5NC50ZXN0MAqCCHQ5NS50ZXN0MAqCCHQ5Ni50ZXN0MAqCCHQ5\nNy50ZXN0MAqCCHQ5OC50ZXN0MAqCCHQ5OS50ZXN0MAuCCXQxMDAudGVzdDALggl0\nMTAxLnRlc3QwC4IJdDEwMi50ZXN0MAuCCXQxMDMudGVzdDALggl0MTA0LnRlc3Qw\nC4IJdDEwNS50ZXN0MAuCCXQxMDYudGVzdDALggl0MTA3LnRlc3QwC4IJdDEwOC50\nZXN0MAuCCXQxMDkudGVzdDALggl0MTEwLnRlc3QwC4IJdDExMS50ZXN0MAuCCXQx\nMTIudGVzdDALggl0MTEzLnRlc3QwC4IJdDExNC50ZXN0MAuCCXQxMTUudGVzdDAL\nggl0MTE2LnRlc3QwC4IJdDExNy50ZXN0MAuCCXQxMTgudGVzdDALggl0MTE5LnRl\nc3QwC4IJdDEyMC50ZXN0MAuCCXQxMjEudGVzdDALggl0MTIyLnRlc3QwC4IJdDEy\nMy50ZXN0MAuCCXQxMjQudGVzdDALggl0MTI1LnRlc3QwC4IJdDEyNi50ZXN0MAuC\nCXQxMjcudGVzdDALggl0MTI4LnRlc3QwC4IJdDEyOS50ZXN0MAuCCXQxMzAudGVz\ndDALggl0MTMxLnRlc3QwC4IJdDEzMi50ZXN0MAuCCXQxMzMudGVzdDALggl0MTM0\nLnRlc3QwC4IJdDEzNS50ZXN0MAuCCXQxMzYudGVzdDALggl0MTM3LnRlc3QwC4IJ\ndDEzOC50ZXN0MAuCCXQxMzkudGVzdDALggl0MTQwLnRlc3QwC4IJdDE0MS50ZXN0\nMAuCCXQxNDIudGVzdDALggl0MTQzLnRlc3QwC4IJdDE0NC50ZXN0MAuCCXQxNDUu\ndGVzdDALggl0MTQ2LnRlc3QwC4IJdDE0Ny50ZXN0MAuCCXQxNDgudGVzdDALggl0\nMTQ5LnRlc3QwC4IJdDE1MC50ZXN0MAuCCXQxNTEudGVzdDALggl0MTUyLnRlc3Qw\nC4IJdDE1My50ZXN0MAuCCXQxNTQudGVzdDALggl0MTU1LnRlc3QwC4IJdDE1Ni50\nZXN0MAuCCXQxNTcudGVzdDALggl0MTU4LnRlc3QwC4IJdDE1OS50ZXN0MAuCCXQx\nNjAudGVzdDALggl0MTYxLnRlc3QwC4IJdDE2Mi50ZXN0MAuCCXQxNjMudGVzdDAL\nggl0MTY0LnRlc3QwC4IJdDE2NS50ZXN0MAuCCXQxNjYudGVzdDALggl0MTY3LnRl\nc3QwC4IJdDE2OC50ZXN0MAuCCXQxNjkudGVzdDALggl0MTcwLnRlc3QwC4IJdDE3\nMS50ZXN0MAuCCXQxNzIudGVzdDALggl0MTczLnRlc3QwC4IJdDE3NC50ZXN0MAuC\nCXQxNzUudGVzdDALggl0MTc2LnRlc3QwC4IJdDE3Ny50ZXN0MAuCCXQxNzgudGVz\ndDALggl0MTc5LnRlc3QwC4IJdDE4MC50ZXN0MAuCCXQxODEudGVzdDALggl0MTgy\nLnRlc3QwC4IJdDE4My50ZXN0MAuCCXQxODQudGVzdDALggl0MTg1LnRlc3QwC4IJ\ndDE4Ni50ZXN0MAuCCXQxODcudGVzdDALggl0MTg4LnRlc3QwC4IJdDE4OS50ZXN0\nMAuCCXQxOTAudGVzdDALggl0MTkxLnRlc3QwC4IJdDE5Mi50ZXN0MAuCCXQxOTMu\ndGVzdDALggl0MTk0LnRlc3QwC4IJdDE5NS50ZXN0MAuCCXQxOTYudGVzdDALggl0\nMTk3LnRlc3QwC4IJdDE5OC50ZXN0MAuCCXQxOTkudGVzdDALggl0MjAwLnRlc3Qw\nC4IJdDIwMS50ZXN0MAuCCXQyMDIudGVzdDALggl0MjAzLnRlc3QwC4IJdDIwNC50\nZXN0MAuCCXQyMDUudGVzdDALggl0MjA2LnRlc3QwC4IJdDIwNy50ZXN0MAuCCXQy\nMDgudGVzdDALggl0MjA5LnRlc3QwC4IJdDIxMC50ZXN0MAuCCXQyMTEudGVzdDAL\nggl0MjEyLnRlc3QwC4IJdDIxMy50ZXN0MAuCCXQyMTQudGVzdDALggl0MjE1LnRl\nc3QwC4IJdDIxNi50ZXN0MAuCCXQyMTcudGVzdDALggl0MjE4LnRlc3QwC4IJdDIx\nOS50ZXN0MAuCCXQyMjAudGVzdDALggl0MjIxLnRlc3QwC4IJdDIyMi50ZXN0MAuC\nCXQyMjMudGVzdDALggl0MjI0LnRlc3QwC4IJdDIyNS50ZXN0MAuCCXQyMjYudGVz\ndDALggl0MjI3LnRlc3QwC4IJdDIyOC50ZXN0MAuCCXQyMjkudGVzdDALggl0MjMw\nLnRlc3QwC4IJdDIzMS50ZXN0MAuCCXQyMzIudGVzdDALggl0MjMzLnRlc3QwC4IJ\ndDIzNC50ZXN0MAuCCXQyMzUudGVzdDALggl0MjM2LnRlc3QwC4IJdDIzNy50ZXN0\nMAuCCXQyMzgudGVzdDALggl0MjM5LnRlc3QwC4IJdDI0MC50ZXN0MAuCCXQyNDEu\ndGVzdDALggl0MjQyLnRlc3QwC4IJdDI0My50ZXN0MAuCCXQyNDQudGVzdDALggl0\nMjQ1LnRlc3QwC4IJdDI0Ni50ZXN0MAuCCXQyNDcudGVzdDALggl0MjQ4LnRlc3Qw\nC4IJdDI0OS50ZXN0MAuCCXQyNTAudGVzdDALggl0MjUxLnRlc3QwC4IJdDI1Mi50\nZXN0MAuCCXQyNTMudGVzdDALggl0MjU0LnRlc3QwC4IJdDI1NS50ZXN0MAuCCXQy\nNTYudGVzdDALggl0MjU3LnRlc3QwC4IJdDI1OC50ZXN0MAuCCXQyNTkudGVzdDAL\nggl0MjYwLnRlc3QwC4IJdDI2MS50ZXN0MAuCCXQyNjIudGVzdDALggl0MjYzLnRl\nc3QwC4IJdDI2NC50ZXN0MAuCCXQyNjUudGVzdDALggl0MjY2LnRlc3QwC4IJdDI2\nNy50ZXN0MAuCCXQyNjgudGVzdDALggl0MjY5LnRlc3QwC4IJdDI3MC50ZXN0MAuC\nCXQyNzEudGVzdDALggl0MjcyLnRlc3QwC4IJdDI3My50ZXN0MAuCCXQyNzQudGVz\ndDALggl0Mjc1LnRlc3QwC4IJdDI3Ni50ZXN0MAuCCXQyNzcudGVzdDALggl0Mjc4\nLnRlc3QwC4IJdDI3OS50ZXN0MAuCCXQyODAudGVzdDALggl0MjgxLnRlc3QwC4IJ\ndDI4Mi50ZXN0MAuCCXQyODMudGVzdDALggl0Mjg0LnRlc3QwC4IJdDI4NS50ZXN0\nMAuCCXQyODYudGVzdDALggl0Mjg3LnRlc3QwC4IJdDI4OC50ZXN0MAuCCXQyODku\ndGVzdDALggl0MjkwLnRlc3QwC4IJdDI5MS50ZXN0MAuCCXQyOTIudGVzdDALggl0\nMjkzLnRlc3QwC4IJdDI5NC50ZXN0MAuCCXQyOTUudGVzdDALggl0Mjk2LnRlc3Qw\nC4IJdDI5Ny50ZXN0MAuCCXQyOTgudGVzdDALggl0Mjk5LnRlc3QwC4IJdDMwMC50\nZXN0MAuCCXQzMDEudGVzdDALggl0MzAyLnRlc3QwC4IJdDMwMy50ZXN0MAuCCXQz\nMDQudGVzdDALggl0MzA1LnRlc3QwC4IJdDMwNi50ZXN0MAuCCXQzMDcudGVzdDAL\nggl0MzA4LnRlc3QwC4IJdDMwOS50ZXN0MAuCCXQzMTAudGVzdDALggl0MzExLnRl\nc3QwC4IJdDMxMi50ZXN0MAuCCXQzMTMudGVzdDALggl0MzE0LnRlc3QwC4IJdDMx\nNS50ZXN0MAuCCXQzMTYudGVzdDALggl0MzE3LnRlc3QwC4IJdDMxOC50ZXN0MAuC\nCXQzMTkudGVzdDALggl0MzIwLnRlc3QwC4IJdDMyMS50ZXN0MAuCCXQzMjIudGVz\ndDALggl0MzIzLnRlc3QwC4IJdDMyNC50ZXN0MAuCCXQzMjUudGVzdDALggl0MzI2\nLnRlc3QwC4IJdDMyNy50ZXN0MAuCCXQzMjgudGVzdDALggl0MzI5LnRlc3QwC4IJ\ndDMzMC50ZXN0MAuCCXQzMzEudGVzdDALggl0MzMyLnRlc3QwC4IJdDMzMy50ZXN0\nMAuCCXQzMzQudGVzdDALggl0MzM1LnRlc3QwC4IJdDMzNi50ZXN0MAuCCXQzMzcu\ndGVzdDALggl0MzM4LnRlc3QwC4IJdDMzOS50ZXN0MAuCCXQzNDAudGVzdDALggl0\nMzQxLnRlc3QwC4IJdDM0Mi50ZXN0MAuCCXQzNDMudGVzdDALggl0MzQ0LnRlc3Qw\nC4IJdDM0NS50ZXN0MAuCCXQzNDYudGVzdDALggl0MzQ3LnRlc3QwC4IJdDM0OC50\nZXN0MAuCCXQzNDkudGVzdDALggl0MzUwLnRlc3QwC4IJdDM1MS50ZXN0MAuCCXQz\nNTIudGVzdDALggl0MzUzLnRlc3QwC4IJdDM1NC50ZXN0MAuCCXQzNTUudGVzdDAL\nggl0MzU2LnRlc3QwC4IJdDM1Ny50ZXN0MAuCCXQzNTgudGVzdDALggl0MzU5LnRl\nc3QwC4IJdDM2MC50ZXN0MAuCCXQzNjEudGVzdDALggl0MzYyLnRlc3QwC4IJdDM2\nMy50ZXN0MAuCCXQzNjQudGVzdDALggl0MzY1LnRlc3QwC4IJdDM2Ni50ZXN0MAuC\nCXQzNjcudGVzdDALggl0MzY4LnRlc3QwC4IJdDM2OS50ZXN0MAuCCXQzNzAudGVz\ndDALggl0MzcxLnRlc3QwC4IJdDM3Mi50ZXN0MAuCCXQzNzMudGVzdDALggl0Mzc0\nLnRlc3QwC4IJdDM3NS50ZXN0MAuCCXQzNzYudGVzdDALggl0Mzc3LnRlc3QwC4IJ\ndDM3OC50ZXN0MAuCCXQzNzkudGVzdDALggl0MzgwLnRlc3QwC4IJdDM4MS50ZXN0\nMAuCCXQzODIudGVzdDALggl0MzgzLnRlc3QwC4IJdDM4NC50ZXN0MAuCCXQzODUu\ndGVzdDALggl0Mzg2LnRlc3QwC4IJdDM4Ny50ZXN0MAuCCXQzODgudGVzdDALggl0\nMzg5LnRlc3QwC4IJdDM5MC50ZXN0MAuCCXQzOTEudGVzdDALggl0MzkyLnRlc3Qw\nC4IJdDM5My50ZXN0MAuCCXQzOTQudGVzdDALggl0Mzk1LnRlc3QwC4IJdDM5Ni50\nZXN0MAuCCXQzOTcudGVzdDALggl0Mzk4LnRlc3QwC4IJdDM5OS50ZXN0MAuCCXQ0\nMDAudGVzdDALggl0NDAxLnRlc3QwC4IJdDQwMi50ZXN0MAuCCXQ0MDMudGVzdDAL\nggl0NDA0LnRlc3QwC4IJdDQwNS50ZXN0MAuCCXQ0MDYudGVzdDALggl0NDA3LnRl\nc3QwC4IJdDQwOC50ZXN0MAuCCXQ0MDkudGVzdDALggl0NDEwLnRlc3QwC4IJdDQx\nMS50ZXN0MAuCCXQ0MTIudGVzdDALggl0NDEzLnRlc3QwC4IJdDQxNC50ZXN0MAuC\nCXQ0MTUudGVzdDALggl0NDE2LnRlc3QwC4IJdDQxNy50ZXN0MAuCCXQ0MTgudGVz\ndDALggl0NDE5LnRlc3QwC4IJdDQyMC50ZXN0MAuCCXQ0MjEudGVzdDALggl0NDIy\nLnRlc3QwC4IJdDQyMy50ZXN0MAuCCXQ0MjQudGVzdDALggl0NDI1LnRlc3QwC4IJ\ndDQyNi50ZXN0MAuCCXQ0MjcudGVzdDALggl0NDI4LnRlc3QwC4IJdDQyOS50ZXN0\nMAuCCXQ0MzAudGVzdDALggl0NDMxLnRlc3QwC4IJdDQzMi50ZXN0MAuCCXQ0MzMu\ndGVzdDALggl0NDM0LnRlc3QwC4IJdDQzNS50ZXN", "0MAuCCXQ0MzYudGVzdDALggl0\nNDM3LnRlc3QwC4IJdDQzOC50ZXN0MAuCCXQ0MzkudGVzdDALggl0NDQwLnRlc3Qw\nC4IJdDQ0MS50ZXN0MAuCCXQ0NDIudGVzdDALggl0NDQzLnRlc3QwC4IJdDQ0NC50\nZXN0MAuCCXQ0NDUudGVzdDALggl0NDQ2LnRlc3QwC4IJdDQ0Ny50ZXN0MAuCCXQ0\nNDgudGVzdDALggl0NDQ5LnRlc3QwC4IJdDQ1MC50ZXN0MAuCCXQ0NTEudGVzdDAL\nggl0NDUyLnRlc3QwC4IJdDQ1My50ZXN0MAuCCXQ0NTQudGVzdDALggl0NDU1LnRl\nc3QwC4IJdDQ1Ni50ZXN0MAuCCXQ0NTcudGVzdDALggl0NDU4LnRlc3QwC4IJdDQ1\nOS50ZXN0MAuCCXQ0NjAudGVzdDALggl0NDYxLnRlc3QwC4IJdDQ2Mi50ZXN0MAuC\nCXQ0NjMudGVzdDALggl0NDY0LnRlc3QwC4IJdDQ2NS50ZXN0MAuCCXQ0NjYudGVz\ndDALggl0NDY3LnRlc3QwC4IJdDQ2OC50ZXN0MAuCCXQ0NjkudGVzdDALggl0NDcw\nLnRlc3QwC4IJdDQ3MS50ZXN0MAuCCXQ0NzIudGVzdDALggl0NDczLnRlc3QwC4IJ\ndDQ3NC50ZXN0MAuCCXQ0NzUudGVzdDALggl0NDc2LnRlc3QwC4IJdDQ3Ny50ZXN0\nMAuCCXQ0NzgudGVzdDALggl0NDc5LnRlc3QwC4IJdDQ4MC50ZXN0MAuCCXQ0ODEu\ndGVzdDALggl0NDgyLnRlc3QwC4IJdDQ4My50ZXN0MAuCCXQ0ODQudGVzdDALggl0\nNDg1LnRlc3QwC4IJdDQ4Ni50ZXN0MAuCCXQ0ODcudGVzdDALggl0NDg4LnRlc3Qw\nC4IJdDQ4OS50ZXN0MAuCCXQ0OTAudGVzdDALggl0NDkxLnRlc3QwC4IJdDQ5Mi50\nZXN0MAuCCXQ0OTMudGVzdDALggl0NDk0LnRlc3QwC4IJdDQ5NS50ZXN0MAuCCXQ0\nOTYudGVzdDALggl0NDk3LnRlc3QwC4IJdDQ5OC50ZXN0MAuCCXQ0OTkudGVzdDAL\nggl0NTAwLnRlc3QwC4IJdDUwMS50ZXN0MAuCCXQ1MDIudGVzdDALggl0NTAzLnRl\nc3QwC4IJdDUwNC50ZXN0MAuCCXQ1MDUudGVzdDALggl0NTA2LnRlc3QwC4IJdDUw\nNy50ZXN0MAuCCXQ1MDgudGVzdDALggl0NTA5LnRlc3QwC4IJdDUxMC50ZXN0MAuC\nCXQ1MTEudGVzdDALggl0NTEyLnRlc3QwB4IFLnRlc3ShghmfMAmCB3gwLnRlc3Qw\nCYIHeDEudGVzdDAJggd4Mi50ZXN0MAmCB3gzLnRlc3QwCYIHeDQudGVzdDAJggd4\nNS50ZXN0MAmCB3g2LnRlc3QwCYIHeDcudGVzdDAJggd4OC50ZXN0MAmCB3g5LnRl\nc3QwCoIIeDEwLnRlc3QwCoIIeDExLnRlc3QwCoIIeDEyLnRlc3QwCoIIeDEzLnRl\nc3QwCoIIeDE0LnRlc3QwCoIIeDE1LnRlc3QwCoIIeDE2LnRlc3QwCoIIeDE3LnRl\nc3QwCoIIeDE4LnRlc3QwCoIIeDE5LnRlc3QwCoIIeDIwLnRlc3QwCoIIeDIxLnRl\nc3QwCoIIeDIyLnRlc3QwCoIIeDIzLnRlc3QwCoIIeDI0LnRlc3QwCoIIeDI1LnRl\nc3QwCoIIeDI2LnRlc3QwCoIIeDI3LnRlc3QwCoIIeDI4LnRlc3QwCoIIeDI5LnRl\nc3QwCoIIeDMwLnRlc3QwCoIIeDMxLnRlc3QwCoIIeDMyLnRlc3QwCoIIeDMzLnRl\nc3QwCoIIeDM0LnRlc3QwCoIIeDM1LnRlc3QwCoIIeDM2LnRlc3QwCoIIeDM3LnRl\nc3QwCoIIeDM4LnRlc3QwCoIIeDM5LnRlc3QwCoIIeDQwLnRlc3QwCoIIeDQxLnRl\nc3QwCoIIeDQyLnRlc3QwCoIIeDQzLnRlc3QwCoIIeDQ0LnRlc3QwCoIIeDQ1LnRl\nc3QwCoIIeDQ2LnRlc3QwCoIIeDQ3LnRlc3QwCoIIeDQ4LnRlc3QwCoIIeDQ5LnRl\nc3QwCoIIeDUwLnRlc3QwCoIIeDUxLnRlc3QwCoIIeDUyLnRlc3QwCoIIeDUzLnRl\nc3QwCoIIeDU0LnRlc3QwCoIIeDU1LnRlc3QwCoIIeDU2LnRlc3QwCoIIeDU3LnRl\nc3QwCoIIeDU4LnRlc3QwCoIIeDU5LnRlc3QwCoIIeDYwLnRlc3QwCoIIeDYxLnRl\nc3QwCoIIeDYyLnRlc3QwCoIIeDYzLnRlc3QwCoIIeDY0LnRlc3QwCoIIeDY1LnRl\nc3QwCoIIeDY2LnRlc3QwCoIIeDY3LnRlc3QwCoIIeDY4LnRlc3QwCoIIeDY5LnRl\nc3QwCoIIeDcwLnRlc3QwCoIIeDcxLnRlc3QwCoIIeDcyLnRlc3QwCoIIeDczLnRl\nc3QwCoIIeDc0LnRlc3QwCoIIeDc1LnRlc3QwCoIIeDc2LnRlc3QwCoIIeDc3LnRl\nc3QwCoIIeDc4LnRlc3QwCoIIeDc5LnRlc3QwCoIIeDgwLnRlc3QwCoIIeDgxLnRl\nc3QwCoIIeDgyLnRlc3QwCoIIeDgzLnRlc3QwCoIIeDg0LnRlc3QwCoIIeDg1LnRl\nc3QwCoIIeDg2LnRlc3QwCoIIeDg3LnRlc3QwCoIIeDg4LnRlc3QwCoIIeDg5LnRl\nc3QwCoIIeDkwLnRlc3QwCoIIeDkxLnRlc3QwCoIIeDkyLnRlc3QwCoIIeDkzLnRl\nc3QwCoIIeDk0LnRlc3QwCoIIeDk1LnRlc3QwCoIIeDk2LnRlc3QwCoIIeDk3LnRl\nc3QwCoIIeDk4LnRlc3QwCoIIeDk5LnRlc3QwC4IJeDEwMC50ZXN0MAuCCXgxMDEu\ndGVzdDALggl4MTAyLnRlc3QwC4IJeDEwMy50ZXN0MAuCCXgxMDQudGVzdDALggl4\nMTA1LnRlc3QwC4IJeDEwNi50ZXN0MAuCCXgxMDcudGVzdDALggl4MTA4LnRlc3Qw\nC4IJeDEwOS50ZXN0MAuCCXgxMTAudGVzdDALggl4MTExLnRlc3QwC4IJeDExMi50\nZXN0MAuCCXgxMTMudGVzdDALggl4MTE0LnRlc3QwC4IJeDExNS50ZXN0MAuCCXgx\nMTYudGVzdDALggl4MTE3LnRlc3QwC4IJeDExOC50ZXN0MAuCCXgxMTkudGVzdDAL\nggl4MTIwLnRlc3QwC4IJeDEyMS50ZXN0MAuCCXgxMjIudGVzdDALggl4MTIzLnRl\nc3QwC4IJeDEyNC50ZXN0MAuCCXgxMjUudGVzdDALggl4MTI2LnRlc3QwC4IJeDEy\nNy50ZXN0MAuCCXgxMjgudGVzdDALggl4MTI5LnRlc3QwC4IJeDEzMC50ZXN0MAuC\nCXgxMzEudGVzdDALggl4MTMyLnRlc3QwC4IJeDEzMy50ZXN0MAuCCXgxMzQudGVz\ndDALggl4MTM1LnRlc3QwC4IJeDEzNi50ZXN0MAuCCXgxMzcudGVzdDALggl4MTM4\nLnRlc3QwC4IJeDEzOS50ZXN0MAuCCXgxNDAudGVzdDALggl4MTQxLnRlc3QwC4IJ\neDE0Mi50ZXN0MAuCCXgxNDMudGVzdDALggl4MTQ0LnRlc3QwC4IJeDE0NS50ZXN0\nMAuCCXgxNDYudGVzdDALggl4MTQ3LnRlc3QwC4IJeDE0OC50ZXN0MAuCCXgxNDku\ndGVzdDALggl4MTUwLnRlc3QwC4IJeDE1MS50ZXN0MAuCCXgxNTIudGVzdDALggl4\nMTUzLnRlc3QwC4IJeDE1NC50ZXN0MAuCCXgxNTUudGVzdDALggl4MTU2LnRlc3Qw\nC4IJeDE1Ny50ZXN0MAuCCXgxNTgudGVzdDALggl4MTU5LnRlc3QwC4IJeDE2MC50\nZXN0MAuCCXgxNjEudGVzdDALggl4MTYyLnRlc3QwC4IJeDE2My50ZXN0MAuCCXgx\nNjQudGVzdDALggl4MTY1LnRlc3QwC4IJeDE2Ni50ZXN0MAuCCXgxNjcudGVzdDAL\nggl4MTY4LnRlc3QwC4IJeDE2OS50ZXN0MAuCCXgxNzAudGVzdDALggl4MTcxLnRl\nc3QwC4IJeDE3Mi50ZXN0MAuCCXgxNzMudGVzdDALggl4MTc0LnRlc3QwC4IJeDE3\nNS50ZXN0MAuCCXgxNzYudGVzdDALggl4MTc3LnRlc3QwC4IJeDE3OC50ZXN0MAuC\nCXgxNzkudGVzdDALggl4MTgwLnRlc3QwC4IJeDE4MS50ZXN0MAuCCXgxODIudGVz\ndDALggl4MTgzLnRlc3QwC4IJeDE4NC50ZXN0MAuCCXgxODUudGVzdDALggl4MTg2\nLnRlc3QwC4IJeDE4Ny50ZXN0MAuCCXgxODgudGVzdDALggl4MTg5LnRlc3QwC4IJ\neDE5MC50ZXN0MAuCCXgxOTEudGVzdDALggl4MTkyLnRlc3QwC4IJeDE5My50ZXN0\nMAuCCXgxOTQudGVzdDALggl4MTk1LnRlc3QwC4IJeDE5Ni50ZXN0MAuCCXgxOTcu\ndGVzdDALggl4MTk4LnRlc3QwC4IJeDE5OS50ZXN0MAuCCXgyMDAudGVzdDALggl4\nMjAxLnRlc3QwC4IJeDIwMi50ZXN0MAuCCXgyMDMudGVzdDALggl4MjA0LnRlc3Qw\nC4IJeDIwNS50ZXN0MAuCCXgyMDYudGVzdDALggl4MjA3LnRlc3QwC4IJeDIwOC50\nZXN0MAuCCXgyMDkudGVzdDALggl4MjEwLnRlc3QwC4IJeDIxMS50ZXN0MAuCCXgy\nMTIudGVzdDALggl4MjEzLnRlc3QwC4IJeDIxNC50ZXN0MAuCCXgyMTUudGVzdDAL\nggl4MjE2LnRlc3QwC4IJeDIxNy50ZXN0MAuCCXgyMTgudGVzdDALggl4MjE5LnRl\nc3QwC4IJeDIyMC50ZXN0MAuCCXgyMjEudGVzdDALggl4MjIyLnRlc3QwC4IJeDIy\nMy50ZXN0MAuCCXgyMjQudGVzdDALggl4MjI1LnRlc3QwC4IJeDIyNi50ZXN0MAuC\nCXgyMjcudGVzdDALggl4MjI4LnRlc3QwC4IJeDIyOS50ZXN0MAuCCXgyMzAudGVz\ndDALggl4MjMxLnRlc3QwC4IJeDIzMi50ZXN0MAuCCXgyMzMudGVzdDALggl4MjM0\nLnRlc3QwC4IJeDIzNS50ZXN0MAuCCXgyMzYudGVzdDALggl4MjM3LnRlc3QwC4IJ\neDIzOC50ZXN0MAuCCXgyMzkudGVzdDALggl4MjQwLnRlc3QwC4IJeDI0MS50ZXN0\nMAuCCXgyNDIudGVzdDALggl4MjQzLnRlc3QwC4IJeDI0NC50ZXN0MAuCCXgyNDUu\ndGVzdDALggl4MjQ2LnRlc3QwC4IJeDI0Ny50ZXN0MAuCCXgyNDgudGVzdDALggl4\nMjQ5LnRlc3QwC4IJeDI1MC50ZXN0MAuCCXgyNTEudGVzdDALggl4MjUyLnRlc3Qw\nC4IJeDI1My50ZXN0MAuCCXgyNTQudGVzdDALggl4MjU1LnRlc3QwC4IJeDI1Ni50\nZXN0MAuCCXgyNTcudGVzdDALggl4MjU4LnRlc3QwC4IJeDI1OS50ZXN0MAuCCXgy\nNjAudGVzdDALggl4MjYxLnRlc3QwC4IJeDI2Mi50ZXN0MAuCCXgyNjMudGVzdDAL\nggl4MjY0LnRlc3QwC4IJeDI2NS50ZXN0MAuCCXgyNjYudGVzdDALggl4MjY3LnRl\nc3QwC4IJeDI2OC50ZXN0MAuCCXgyNjkudGVzdDALggl4MjcwLnRlc3QwC4IJeDI3\nMS50ZXN0MAuCCXgyNzIudGVzdDALggl4MjczLnRlc3QwC4IJeDI3NC50ZXN0MAuC\nCXgyNzUudGVzdDALggl4Mjc2LnRlc3QwC4IJeDI3Ny50ZXN0MAuCCXgyNzgudGVz\ndDALggl4Mjc5LnRlc3QwC4IJeDI4MC50ZXN0MAuCCXgyODEudGVzdDALggl4Mjgy\nLnRlc3QwC4IJeDI4My50ZXN0MAuCCXgyODQudGVzdDALggl4Mjg1LnRlc3QwC4IJ\neDI4Ni50ZXN0MAuCCXgyODcudGVzdDALggl4Mjg4LnRlc3QwC4IJeDI4OS50ZXN0\nMAuCCXgyOTAudGVzdDALggl4MjkxLnRlc3QwC4IJeDI5Mi50ZXN0MAuCCXgyOTMu\ndGVzdDALggl4Mjk0LnRlc3QwC4IJeDI5NS50ZXN0MAuCCXgyOTYudGVzdDALggl4\nMjk3LnRlc3QwC4IJeDI5OC50ZXN0MAuCCXgyOTkudGVzdDALggl4MzAwLnRlc3Qw\nC4IJeDMwMS50ZXN0MAuCCXgzMDIudGVzdDALggl4MzAzLnRlc3QwC4IJeDMwNC50\nZXN0MAuCCXgzMDUudGVzdDALggl4MzA2LnRlc3QwC4IJeDMwNy50ZXN0MAuCCXgz\nMDgudGVzdDALggl4MzA5LnRlc3QwC4IJeDMxMC50ZXN0MAuCCXgzMTEudGVzdDAL\nggl4MzEyLnRlc3QwC4IJeDMxMy50ZXN0MAuCCXgzMTQudGVzdDALggl4MzE1LnRl\nc3QwC4IJeDMxNi50ZXN0MAuCCXgzMTcudGVzdDALggl4MzE4LnRlc3QwC4IJeDMx\nOS50ZXN0MAuCCXgzMjAudGVzdDALggl4MzIxLnRlc3QwC4IJeDMyMi50ZXN0MAuC\nCXgzMjMudGVzdDALggl4MzI0LnRlc3QwC4IJeDMyNS50ZXN0MAuCCXgzMjYudGVz\ndDALggl4MzI3LnRlc3QwC4IJeDMyOC50ZXN0MAuCCXgzMjkudGVzdDALggl4MzMw\nLnRlc3QwC4IJeDMzMS50ZXN0MAuCCXgzMzIudGVzdDALggl4MzMzLnRlc3QwC4IJ\neDMzNC50ZXN0MAuCCXgzMzUudGVzdDALggl4MzM2LnRlc3QwC4IJeDMzNy50ZXN0\nMAuCCXgzMzgudGVzdDALggl4MzM5LnRlc3QwC4IJeDM0MC50ZXN0MAuCCXgzNDEu\ndGVzdDALggl4MzQyLnRlc3QwC4IJeDM0My50ZXN0MAuCCXgzNDQudGVzdDALggl4\nMzQ1LnRlc3QwC4IJeDM0Ni50ZXN0MAuCCXgzNDcudGVzdDALggl4MzQ4LnRlc3Qw\nC4IJeDM0OS50ZXN0MAuCCXgzNTAudGVzdDALggl4MzUxLnRlc3QwC4IJeDM1Mi50\nZXN0MAuCCXgzNTMudGVzdDALggl4MzU0LnRlc3QwC4IJeDM1NS50ZXN0MAuCCXgz\nNTYudGVzdDALggl4MzU3LnRlc3QwC4IJeDM1OC50ZXN0MAuCCXgzNTkudGVzdDAL\nggl4MzYwLnRlc3QwC4IJeDM2MS50ZXN0MAuCCXgzNjIudGVzdDALggl4MzYzLnRl\nc3QwC4IJeDM2NC50ZXN0MAuCCXgzNjUudGVzdDALggl4MzY2LnRlc3QwC4IJeDM2\nNy50ZXN0MAuCCXgzNjgudGVzdDALggl4MzY5LnRlc3QwC4IJeDM3MC50ZXN0MAuC\nCXgzNzEudGVzdDALggl4MzcyLnRlc3QwC4IJeDM3My50ZXN0MAuCCXgzNzQudGVz\ndDALggl4Mzc1LnRlc3QwC4IJeDM3Ni50ZXN0MAuCCXgzNzcudGVzdDALggl4Mzc4\nLnRlc3QwC4IJeDM3OS50ZXN0MAuCCXgzODAudGVzdDALggl4MzgxLnRlc3QwC4IJ\neDM4Mi50ZXN0MAuCCXgzODMudGVzdDALggl4Mzg0LnRlc3QwC4IJeDM4NS50ZXN0\nMAuCCXgzODYudGVzdDALggl4Mzg3LnRlc3QwC4IJeDM4OC50ZXN0MAuCCXgzODku\ndGVzdDALggl4MzkwLnRlc3QwC4IJeDM5MS50ZXN0MAuCCXgzOTIudGVzdDALggl4\nMzkzLnRlc3QwC4IJeDM5NC50ZXN0MAuCCXgzOTUud", "GVzdDALggl4Mzk2LnRlc3Qw\nC4IJeDM5Ny50ZXN0MAuCCXgzOTgudGVzdDALggl4Mzk5LnRlc3QwC4IJeDQwMC50\nZXN0MAuCCXg0MDEudGVzdDALggl4NDAyLnRlc3QwC4IJeDQwMy50ZXN0MAuCCXg0\nMDQudGVzdDALggl4NDA1LnRlc3QwC4IJeDQwNi50ZXN0MAuCCXg0MDcudGVzdDAL\nggl4NDA4LnRlc3QwC4IJeDQwOS50ZXN0MAuCCXg0MTAudGVzdDALggl4NDExLnRl\nc3QwC4IJeDQxMi50ZXN0MAuCCXg0MTMudGVzdDALggl4NDE0LnRlc3QwC4IJeDQx\nNS50ZXN0MAuCCXg0MTYudGVzdDALggl4NDE3LnRlc3QwC4IJeDQxOC50ZXN0MAuC\nCXg0MTkudGVzdDALggl4NDIwLnRlc3QwC4IJeDQyMS50ZXN0MAuCCXg0MjIudGVz\ndDALggl4NDIzLnRlc3QwC4IJeDQyNC50ZXN0MAuCCXg0MjUudGVzdDALggl4NDI2\nLnRlc3QwC4IJeDQyNy50ZXN0MAuCCXg0MjgudGVzdDALggl4NDI5LnRlc3QwC4IJ\neDQzMC50ZXN0MAuCCXg0MzEudGVzdDALggl4NDMyLnRlc3QwC4IJeDQzMy50ZXN0\nMAuCCXg0MzQudGVzdDALggl4NDM1LnRlc3QwC4IJeDQzNi50ZXN0MAuCCXg0Mzcu\ndGVzdDALggl4NDM4LnRlc3QwC4IJeDQzOS50ZXN0MAuCCXg0NDAudGVzdDALggl4\nNDQxLnRlc3QwC4IJeDQ0Mi50ZXN0MAuCCXg0NDMudGVzdDALggl4NDQ0LnRlc3Qw\nC4IJeDQ0NS50ZXN0MAuCCXg0NDYudGVzdDALggl4NDQ3LnRlc3QwC4IJeDQ0OC50\nZXN0MAuCCXg0NDkudGVzdDALggl4NDUwLnRlc3QwC4IJeDQ1MS50ZXN0MAuCCXg0\nNTIudGVzdDALggl4NDUzLnRlc3QwC4IJeDQ1NC50ZXN0MAuCCXg0NTUudGVzdDAL\nggl4NDU2LnRlc3QwC4IJeDQ1Ny50ZXN0MAuCCXg0NTgudGVzdDALggl4NDU5LnRl\nc3QwC4IJeDQ2MC50ZXN0MAuCCXg0NjEudGVzdDALggl4NDYyLnRlc3QwC4IJeDQ2\nMy50ZXN0MAuCCXg0NjQudGVzdDALggl4NDY1LnRlc3QwC4IJeDQ2Ni50ZXN0MAuC\nCXg0NjcudGVzdDALggl4NDY4LnRlc3QwC4IJeDQ2OS50ZXN0MAuCCXg0NzAudGVz\ndDALggl4NDcxLnRlc3QwC4IJeDQ3Mi50ZXN0MAuCCXg0NzMudGVzdDALggl4NDc0\nLnRlc3QwC4IJeDQ3NS50ZXN0MAuCCXg0NzYudGVzdDALggl4NDc3LnRlc3QwC4IJ\neDQ3OC50ZXN0MAuCCXg0NzkudGVzdDALggl4NDgwLnRlc3QwC4IJeDQ4MS50ZXN0\nMAuCCXg0ODIudGVzdDALggl4NDgzLnRlc3QwC4IJeDQ4NC50ZXN0MAuCCXg0ODUu\ndGVzdDALggl4NDg2LnRlc3QwC4IJeDQ4Ny50ZXN0MAuCCXg0ODgudGVzdDALggl4\nNDg5LnRlc3QwC4IJeDQ5MC50ZXN0MAuCCXg0OTEudGVzdDALggl4NDkyLnRlc3Qw\nC4IJeDQ5My50ZXN0MAuCCXg0OTQudGVzdDALggl4NDk1LnRlc3QwC4IJeDQ5Ni50\nZXN0MAuCCXg0OTcudGVzdDALggl4NDk4LnRlc3QwC4IJeDQ5OS50ZXN0MAuCCXg1\nMDAudGVzdDALggl4NTAxLnRlc3QwC4IJeDUwMi50ZXN0MAuCCXg1MDMudGVzdDAL\nggl4NTA0LnRlc3QwC4IJeDUwNS50ZXN0MAuCCXg1MDYudGVzdDALggl4NTA3LnRl\nc3QwC4IJeDUwOC50ZXN0MAuCCXg1MDkudGVzdDALggl4NTEwLnRlc3QwC4IJeDUx\nMS50ZXN0MAuCCXg1MTIudGVzdDANBgkqhkiG9w0BAQsFAAOCAQEAL2zj4W3+BzBa\nUA0pBD3K5mXq5H94uVT3YFiS1Yrrv1aGJjnb9iabNjdPNRFq7eBm1OajFTv8UtE/\nWJR0JDvBTs7yvpOgTy+JY9RY8NP72gdOOvpZ3DbJ0bbSUFqBVQlM8771Mz9RVQX9\ni9oCqVkakKI/9guAU2XHx9ztTB6N3mULB3QkeFmlyrqeeVK/2lFErArRxyKQXjxb\ncfD76JGADWpp6p1/QUGYmPNYGxHMtWzAhzX1zs/OdGwVVX7g6xxfFdOw0z2PVSPL\notKS5E3GWvqe43Edz3D6AI7jp6ibtH32HX/D4lLLd9nSiQURvJJ0nrMYZI+7p1DE\n6BsnsA2jNg==\n-----END CERTIFICATE-----\n", }; -static const size_t kLen44 = 18852; +static const size_t kLen45 = 18852; -static const char *kData45[] = { +static const char *kData46[] = { "-----BEGIN CERTIFICATE-----\nMIJMMTCCSxmgAwIBAgIBAjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJDQTAg\nFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowgjO+MRAwDgYDVQQDEwd0\nMC50ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nMUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nM0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nNUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nN0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0OEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nOUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTBAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDExQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxMkB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0MTNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDE0QHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQxNUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTZAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDE3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxOEB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0MTlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDIwQHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQyMUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjJAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDIzQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQyNEB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0MjVAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDI2QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQyN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjhAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDI5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzMEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDMy\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzM0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nMzRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDM1QHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQzNkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzdAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDM4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzOUB0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0NDBAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQxQHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ0MkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDNAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDQ0QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ0NUB0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0NDZAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQ3QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ0OEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDlAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDUwQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1MUB0ZXN0\nMRcwFQYJKoZIhvcNAQkBFgh0NTJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDUzQHRl\nc3QxFzAVBgkqhkiG9w0BCQEWCHQ1NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NTVA\ndGVzdDEXMBUGCSqGSIb3DQEJARYIdDU2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1\nN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NThAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDU5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2MEB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0NjFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDYyQHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQ2M0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NjRAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDY1QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2NkB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0NjdAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDY4QHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQ2OUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzBAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDcxQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3MkB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0NzNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDc0QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQ3NUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzZAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDc3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3OEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgw\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4MUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nODJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgzQHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQ4NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0ODVAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDg2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4N0B0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0ODhAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDg5QHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ5MEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTFAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDkyQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5M0B0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0OTRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDk1QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ5NkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTdAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDk4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTAwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTAzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEwNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTA2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTA5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDExMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTEyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEx\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTE1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxMTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDExN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTE4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDEyMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTIxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxMjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyM0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTI0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTI3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEyOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTMwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEzMkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTMzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDEzNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEz\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTQyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE0NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTQ1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTQ4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTUxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE1M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTU0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTU3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE1OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNjRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTY2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE2OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTY5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNzBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTcyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTc1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE3N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTc4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNzlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4MEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTgxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxODJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE4M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxODVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxODhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4OUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTkwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE5MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTkzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxOTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5NUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTk2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTk5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIwMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjAyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIwNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjA1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIwN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjA4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIx\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjExQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjE0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDIxNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjE3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyMThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjIwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjIzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIyNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjI2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjI5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIzMUB0ZXN0MRgwFgY", "JKoZIhvcNAQkBFgl0MjMyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIz\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjM1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIzN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjM4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI0MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjQxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyNDJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjQ0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjQ3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI0OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjUwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyNTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI1MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjUzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDI1NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjU2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyNTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI1\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjU5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyNjBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI2MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjYyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNjNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI2NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjY1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyNjZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI2N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjY4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNjlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI3MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjcxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNzJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI3M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjc0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyNzVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI3NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0Mjc3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNzhAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDI3OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjgwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyODFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI4\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjgzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyODRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI4NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0Mjg2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyODdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI4OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjg5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyOTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI5MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjkyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyOTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI5NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjk1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyOTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI5N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjk4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyOTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMwMEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzAxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMDJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDMwM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzA0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzMDVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMw\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzA3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzMDhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMwOUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzEwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDMxMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzEzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzMTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMxNUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzE2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDMxOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzE5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDMyMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzIyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzMjNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMyNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzI1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDMyN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzI4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMz\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzMxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzMzJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMzM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzM0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMzVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDMzNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzM3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzMzhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMzOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzQwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM0MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzQzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM0NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzQ2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzNDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM0OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzQ5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM1MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzUyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM1\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzU1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzNTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM1N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzU4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDM2MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzYxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzNjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM2M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzY0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM2NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzY3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM2OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzcwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzNzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM3MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzczQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM3NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzc2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzNzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM3\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzc5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzODBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM4MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzgyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzODNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDM4NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzg1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzODZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM4N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0Mzg4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzODlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM5MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzkxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzOTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM5M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzk0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzOTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM5NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0Mzk3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzOThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM5OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDAwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MDFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQw\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDAzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0MDRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQwNUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDA2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MDdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQwOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDA5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0MTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQxMUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDEyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQxNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDE1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQxN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDE4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0MTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQyMEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDIxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MjJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQyM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDI0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MjVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQy\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDI3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0MjhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQyOUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDMwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MzFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQzMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDMzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0MzRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQzNUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDM2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MzdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQzOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDM5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ0MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDQyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0NDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ0NEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDQ1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ0N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDQ4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDUxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0NTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1M0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDU0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQ1NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDU3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0NThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDYwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ2MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDYzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NjRAd", "GVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ2NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDY2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0NjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ2OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDY5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ3MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDcyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ3\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDc1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0NzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ3N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDc4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQ4MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDgxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0ODJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ4M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDg0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0ODVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ4NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDg3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0ODhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ4OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDkwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0OTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ5MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDkzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0OTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ5NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDk2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0OTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ5\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDk5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ1MDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUwMUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NTAyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDUwNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTA1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ1MDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUwN0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NTA4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDUxMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNTExQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MTJAdGVzdDCCASIwDQYJKoZIhvcN\nAQEBBQADggEPADCCAQoCggEBALoL2oQZEgFBdXwuPb29W75T63JfNJKKdYi6YrmK\nM+EKbcMue/hFrLGQXB6a2eQZFn+j3hmexeQF9T8iWxh2S6rzAr1Yj+qXeDBaMf4o\nBEiEhBxIsaIlws3qQa4baeVEEoxw+A+ISrYHTIFcV/i0bcIFt5p7v7wbu686a/w0\nvIqPfad5amdQJMvmjZXDI+jGMvFPmBRHr2/1dJUWPaKsJluwR514pJv74urIyEt+\ndFPM2/5kc2HiLNkeuS1Hbky+dPlDIGrfaHHsCNnb/GjvQ6YfvDXRrYPCxWMk0x3F\nMSaDK9T0zoJ5hE9fViR+D6xcJO2RNUCUENS+Iipj3kIrLbkCAwEAAaOCFeUwghXh\nMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8E\nAjAAMIIVqgYDVR0RBIIVoTCCFZ2CB3QwLnRlc3SCB3QxLnRlc3SCB3QyLnRlc3SC\nB3QzLnRlc3SCB3Q0LnRlc3SCB3Q1LnRlc3SCB3Q2LnRlc3SCB3Q3LnRlc3SCB3Q4\nLnRlc3SCB3Q5LnRlc3SCCHQxMC50ZXN0ggh0MTEudGVzdIIIdDEyLnRlc3SCCHQx\nMy50ZXN0ggh0MTQudGVzdIIIdDE1LnRlc3SCCHQxNi50ZXN0ggh0MTcudGVzdIII\ndDE4LnRlc3SCCHQxOS50ZXN0ggh0MjAudGVzdIIIdDIxLnRlc3SCCHQyMi50ZXN0\nggh0MjMudGVzdIIIdDI0LnRlc3SCCHQyNS50ZXN0ggh0MjYudGVzdIIIdDI3LnRl\nc3SCCHQyOC50ZXN0ggh0MjkudGVzdIIIdDMwLnRlc3SCCHQzMS50ZXN0ggh0MzIu\ndGVzdIIIdDMzLnRlc3SCCHQzNC50ZXN0ggh0MzUudGVzdIIIdDM2LnRlc3SCCHQz\nNy50ZXN0ggh0MzgudGVzdIIIdDM5LnRlc3SCCHQ0MC50ZXN0ggh0NDEudGVzdIII\ndDQyLnRlc3SCCHQ0My50ZXN0ggh0NDQudGVzdIIIdDQ1LnRlc3SCCHQ0Ni50ZXN0\nggh0NDcudGVzdIIIdDQ4LnRlc3SCCHQ0OS50ZXN0ggh0NTAudGVzdIIIdDUxLnRl\nc3SCCHQ1Mi50ZXN0ggh0NTMudGVzdIIIdDU0LnRlc3SCCHQ1NS50ZXN0ggh0NTYu\ndGVzdIIIdDU3LnRlc3SCCHQ1OC50ZXN0ggh0NTkudGVzdIIIdDYwLnRlc3SCCHQ2\nMS50ZXN0ggh0NjIudGVzdIIIdDYzLnRlc3SCCHQ2NC50ZXN0ggh0NjUudGVzdIII\ndDY2LnRlc3SCCHQ2Ny50ZXN0ggh0NjgudGVzdIIIdDY5LnRlc3SCCHQ3MC50ZXN0\nggh0NzEudGVzdIIIdDcyLnRlc3SCCHQ3My50ZXN0ggh0NzQudGVzdIIIdDc1LnRl\nc3SCCHQ3Ni50ZXN0ggh0NzcudGVzdIIIdDc4LnRlc3SCCHQ3OS50ZXN0ggh0ODAu\ndGVzdIIIdDgxLnRlc3SCCHQ4Mi50ZXN0ggh0ODMudGVzdIIIdDg0LnRlc3SCCHQ4\nNS50ZXN0ggh0ODYudGVzdIIIdDg3LnRlc3SCCHQ4OC50ZXN0ggh0ODkudGVzdIII\ndDkwLnRlc3SCCHQ5MS50ZXN0ggh0OTIudGVzdIIIdDkzLnRlc3SCCHQ5NC50ZXN0\nggh0OTUudGVzdIIIdDk2LnRlc3SCCHQ5Ny50ZXN0ggh0OTgudGVzdIIIdDk5LnRl\nc3SCCXQxMDAudGVzdIIJdDEwMS50ZXN0ggl0MTAyLnRlc3SCCXQxMDMudGVzdIIJ\ndDEwNC50ZXN0ggl0MTA1LnRlc3SCCXQxMDYudGVzdIIJdDEwNy50ZXN0ggl0MTA4\nLnRlc3SCCXQxMDkudGVzdIIJdDExMC50ZXN0ggl0MTExLnRlc3SCCXQxMTIudGVz\ndIIJdDExMy50ZXN0ggl0MTE0LnRlc3SCCXQxMTUudGVzdIIJdDExNi50ZXN0ggl0\nMTE3LnRlc3SCCXQxMTgudGVzdIIJdDExOS50ZXN0ggl0MTIwLnRlc3SCCXQxMjEu\ndGVzdIIJdDEyMi50ZXN0ggl0MTIzLnRlc3SCCXQxMjQudGVzdIIJdDEyNS50ZXN0\nggl0MTI2LnRlc3SCCXQxMjcudGVzdIIJdDEyOC50ZXN0ggl0MTI5LnRlc3SCCXQx\nMzAudGVzdIIJdDEzMS50ZXN0ggl0MTMyLnRlc3SCCXQxMzMudGVzdIIJdDEzNC50\nZXN0ggl0MTM1LnRlc3SCCXQxMzYudGVzdIIJdDEzNy50ZXN0ggl0MTM4LnRlc3SC\nCXQxMzkudGVzdIIJdDE0MC50ZXN0ggl0MTQxLnRlc3SCCXQxNDIudGVzdIIJdDE0\nMy50ZXN0ggl0MTQ0LnRlc3SCCXQxNDUudGVzdIIJdDE0Ni50ZXN0ggl0MTQ3LnRl\nc3SCCXQxNDgudGVzdIIJdDE0OS50ZXN0ggl0MTUwLnRlc3SCCXQxNTEudGVzdIIJ\ndDE1Mi50ZXN0ggl0MTUzLnRlc3SCCXQxNTQudGVzdIIJdDE1NS50ZXN0ggl0MTU2\nLnRlc3SCCXQxNTcudGVzdIIJdDE1OC50ZXN0ggl0MTU5LnRlc3SCCXQxNjAudGVz\ndIIJdDE2MS50ZXN0ggl0MTYyLnRlc3SCCXQxNjMudGVzdIIJdDE2NC50ZXN0ggl0\nMTY1LnRlc3SCCXQxNjYudGVzdIIJdDE2Ny50ZXN0ggl0MTY4LnRlc3SCCXQxNjku\ndGVzdIIJdDE3MC50ZXN0ggl0MTcxLnRlc3SCCXQxNzIudGVzdIIJdDE3My50ZXN0\nggl0MTc0LnRlc3SCCXQxNzUudGVzdIIJdDE3Ni50ZXN0ggl0MTc3LnRlc3SCCXQx\nNzgudGVzdIIJdDE3OS50ZXN0ggl0MTgwLnRlc3SCCXQxODEudGVzdIIJdDE4Mi50\nZXN0ggl0MTgzLnRlc3SCCXQxODQudGVzdIIJdDE4NS50ZXN0ggl0MTg2LnRlc3SC\nCXQxODcudGVzdIIJdDE4OC50ZXN0ggl0MTg5LnRlc3SCCXQxOTAudGVzdIIJdDE5\nMS50ZXN0ggl0MTkyLnRlc3SCCXQxOTMudGVzdIIJdDE5NC50ZXN0ggl0MTk1LnRl\nc3SCCXQxOTYudGVzdIIJdDE5Ny50ZXN0ggl0MTk4LnRlc3SCCXQxOTkudGVzdIIJ\ndDIwMC50ZXN0ggl0MjAxLnRlc3SCCXQyMDIudGVzdIIJdDIwMy50ZXN0ggl0MjA0\nLnRlc3SCCXQyMDUudGVzdIIJdDIwNi50ZXN0ggl0MjA3LnRlc3SCCXQyMDgudGVz\ndIIJdDIwOS50ZXN0ggl0MjEwLnRlc3SCCXQyMTEudGVzdIIJdDIxMi50ZXN0ggl0\nMjEzLnRlc3SCCXQyMTQudGVzdIIJdDIxNS50ZXN0ggl0MjE2LnRlc3SCCXQyMTcu\ndGVzdIIJdDIxOC50ZXN0ggl0MjE5LnRlc3SCCXQyMjAudGVzdIIJdDIyMS50ZXN0\nggl0MjIyLnRlc3SCCXQyMjMudGVzdIIJdDIyNC50ZXN0ggl0MjI1LnRlc3SCCXQy\nMjYudGVzdIIJdDIyNy50ZXN0ggl0MjI4LnRlc3SCCXQyMjkudGVzdIIJdDIzMC50\nZXN0ggl0MjMxLnRlc3SCCXQyMzIudGVzdIIJdDIzMy50ZXN0ggl0MjM0LnRlc3SC\nCXQyMzUudGVzdIIJdDIzNi50ZXN0ggl0MjM3LnRlc3SCCXQyMzgudGVzdIIJdDIz\nOS50ZXN0ggl0MjQwLnRlc3SCCXQyNDEudGVzdIIJdDI0Mi50ZXN0ggl0MjQzLnRl\nc3SCCXQyNDQudGVzdIIJdDI0NS50ZXN0ggl0MjQ2LnRlc3SCCXQyNDcudGVzdIIJ\ndDI0OC50ZXN0ggl0MjQ5LnRlc3SCCXQyNTAudGVzdIIJdDI1MS50ZXN0ggl0MjUy\nLnRlc3SCCXQyNTMudGVzdIIJdDI1NC50ZXN0ggl0MjU1LnRlc3SCCXQyNTYudGVz\ndIIJdDI1Ny50ZXN0ggl0MjU4LnRlc3SCCXQyNTkudGVzdIIJdDI2MC50ZXN0ggl0\nMjYxLnRlc3SCCXQyNjIudGVzdIIJdDI2My50ZXN0ggl0MjY0LnRlc3SCCXQyNjUu\ndGVzdIIJdDI2Ni50ZXN0ggl0MjY3LnRlc3SCCXQyNjgudGVzdIIJdDI2OS50ZXN0\nggl0MjcwLnRlc3SCCXQyNzEudGVzdIIJdDI3Mi50ZXN0ggl0MjczLnRlc3SCCXQy\nNzQudGVzdIIJdDI3NS50ZXN0ggl0Mjc2LnRlc3SCCXQyNzcudGVzdIIJdDI3OC50\nZXN0ggl0Mjc5LnRlc3SCCXQyODAudGVzdIIJdDI4MS50ZXN0ggl0MjgyLnRlc3SC\nCXQyODMudGVzdIIJdDI4NC50ZXN0ggl0Mjg1LnRlc3SCCXQyODYudGVzdIIJdDI4\nNy50ZXN0ggl0Mjg4LnRlc3SCCXQyODkudGVzdIIJdDI5MC50ZXN0ggl0MjkxLnRl\nc3SCCXQyOTIudGVzdIIJdDI5My50ZXN0ggl0Mjk0LnRlc3SCCXQyOTUudGVzdIIJ\ndDI5Ni50ZXN0ggl0Mjk3LnRlc3SCCXQyOTgudGVzdIIJdDI5OS50ZXN0ggl0MzAw\nLnRlc3SCCXQzMDEudGVzdIIJdDMwMi50ZXN0ggl0MzAzLnRlc3SCCXQzMDQudGVz\ndIIJdDMwNS50ZXN0ggl0MzA2LnRlc3SCCXQzMDcudGVzdIIJdDMwOC50ZXN0ggl0\nMzA5LnRlc3SCCXQzMTAudGVzdIIJdDMxMS50ZXN0ggl0MzEyLnRlc3SCCXQzMTMu\ndGVzdIIJdDMxNC50ZXN0ggl0MzE1LnRlc3SCCXQzMTYudGVzdIIJdDMxNy50ZXN0\nggl0MzE4LnRlc3SCCXQzMTkudGVzdIIJdDMyMC50ZXN0ggl0MzIxLnRlc3SCCXQz\nMjIudGVzdIIJdDMyMy50ZXN0ggl0MzI0LnRlc3SCCXQzMjUudGVzdIIJdDMyNi50\nZXN0ggl0MzI3LnRlc3SCCXQzMjgudGVzdIIJdDMyOS50ZXN0ggl0MzMwLnRlc3SC\nCXQzMzEudGVzdIIJdDMzMi50ZXN0ggl0MzMzLnRlc3SCCXQzMzQudGVzdIIJdDMz\nNS50ZXN0ggl0MzM2LnRlc3SCCXQzMzcudGVzdIIJdDMzOC50ZXN0ggl0MzM5LnRl\nc3SCCXQzNDAudGVzdIIJdDM0MS50ZXN0ggl0MzQyLnRlc3SCCXQzNDMudGVzdIIJ\ndDM0NC50ZXN0ggl0MzQ1LnRlc3SCCXQzNDYudGVzdIIJdDM0Ny50ZXN0ggl0MzQ4\nLnRlc3SCCXQzNDkudGVzdIIJdDM1MC50ZXN0ggl0MzUxLnRlc3SCCXQzNTIudGVz\ndIIJdDM1My50ZXN0ggl0MzU0LnRlc3SCCXQzNTUudGVzdIIJdDM1Ni50ZXN0ggl0\nMzU3LnRlc3SCCXQzNTgudGVzdIIJdDM1OS50ZXN0ggl0MzYwLnRlc3SCCXQzNjEu\ndGVzdIIJdDM2Mi50ZXN0ggl0MzYzLnRlc3SCCXQzNjQudGVzdIIJdDM2NS50ZXN0\nggl0MzY2LnRlc3SCCXQzNjcudGVzdIIJdDM2OC50ZXN0ggl0MzY5LnRlc3SCCXQz\nNzAudGVzdIIJdDM3MS50ZXN0ggl0MzcyLnRlc3SCCXQzNzMudGVzdIIJdDM3NC50\nZXN0ggl0Mzc1LnRlc3SCCXQzNzYudGVzdIIJdDM3Ny50ZXN0ggl0Mzc4LnRlc3SC\nCXQzNzkudGVzdIIJdDM4MC50ZXN0ggl0MzgxLnRlc3SCCXQzODIudGVzdIIJdDM4\nMy50ZXN0ggl0Mzg0LnRlc3SCCXQzODUudGVzdIIJdDM4Ni50ZXN0ggl0Mzg3LnRl\nc3SCCXQzODgudGVzdIIJdDM4OS50ZXN0ggl0MzkwLnRlc3SCCXQzOTEudGVzdIIJ\ndDM5Mi50ZXN0ggl0MzkzLnRlc3SCCXQzOTQudGVzdIIJdDM5NS50ZXN0ggl0Mzk2\nLnRlc3SCCXQzOTcudGVzdIIJdDM5OC50ZXN0ggl0Mzk5LnRlc3SCCXQ0MDAudGVz\ndIIJdDQwMS50ZXN0ggl0NDAyLnRlc3SCCXQ0MDMudGVzdIIJdDQwNC50ZXN0ggl0\nNDA1LnRlc3SCCXQ0MDYudGVzdIIJdDQwNy50ZXN0ggl0NDA4LnRlc3SCCXQ0MDku\ndGVzdIIJdDQxMC50ZXN0ggl0NDExLnRlc3SCCXQ0MTI", "udGVzdIIJdDQxMy50ZXN0\nggl0NDE0LnRlc3SCCXQ0MTUudGVzdIIJdDQxNi50ZXN0ggl0NDE3LnRlc3SCCXQ0\nMTgudGVzdIIJdDQxOS50ZXN0ggl0NDIwLnRlc3SCCXQ0MjEudGVzdIIJdDQyMi50\nZXN0ggl0NDIzLnRlc3SCCXQ0MjQudGVzdIIJdDQyNS50ZXN0ggl0NDI2LnRlc3SC\nCXQ0MjcudGVzdIIJdDQyOC50ZXN0ggl0NDI5LnRlc3SCCXQ0MzAudGVzdIIJdDQz\nMS50ZXN0ggl0NDMyLnRlc3SCCXQ0MzMudGVzdIIJdDQzNC50ZXN0ggl0NDM1LnRl\nc3SCCXQ0MzYudGVzdIIJdDQzNy50ZXN0ggl0NDM4LnRlc3SCCXQ0MzkudGVzdIIJ\ndDQ0MC50ZXN0ggl0NDQxLnRlc3SCCXQ0NDIudGVzdIIJdDQ0My50ZXN0ggl0NDQ0\nLnRlc3SCCXQ0NDUudGVzdIIJdDQ0Ni50ZXN0ggl0NDQ3LnRlc3SCCXQ0NDgudGVz\ndIIJdDQ0OS50ZXN0ggl0NDUwLnRlc3SCCXQ0NTEudGVzdIIJdDQ1Mi50ZXN0ggl0\nNDUzLnRlc3SCCXQ0NTQudGVzdIIJdDQ1NS50ZXN0ggl0NDU2LnRlc3SCCXQ0NTcu\ndGVzdIIJdDQ1OC50ZXN0ggl0NDU5LnRlc3SCCXQ0NjAudGVzdIIJdDQ2MS50ZXN0\nggl0NDYyLnRlc3SCCXQ0NjMudGVzdIIJdDQ2NC50ZXN0ggl0NDY1LnRlc3SCCXQ0\nNjYudGVzdIIJdDQ2Ny50ZXN0ggl0NDY4LnRlc3SCCXQ0NjkudGVzdIIJdDQ3MC50\nZXN0ggl0NDcxLnRlc3SCCXQ0NzIudGVzdIIJdDQ3My50ZXN0ggl0NDc0LnRlc3SC\nCXQ0NzUudGVzdIIJdDQ3Ni50ZXN0ggl0NDc3LnRlc3SCCXQ0NzgudGVzdIIJdDQ3\nOS50ZXN0ggl0NDgwLnRlc3SCCXQ0ODEudGVzdIIJdDQ4Mi50ZXN0ggl0NDgzLnRl\nc3SCCXQ0ODQudGVzdIIJdDQ4NS50ZXN0ggl0NDg2LnRlc3SCCXQ0ODcudGVzdIIJ\ndDQ4OC50ZXN0ggl0NDg5LnRlc3SCCXQ0OTAudGVzdIIJdDQ5MS50ZXN0ggl0NDky\nLnRlc3SCCXQ0OTMudGVzdIIJdDQ5NC50ZXN0ggl0NDk1LnRlc3SCCXQ0OTYudGVz\ndIIJdDQ5Ny50ZXN0ggl0NDk4LnRlc3SCCXQ0OTkudGVzdIIJdDUwMC50ZXN0ggl0\nNTAxLnRlc3SCCXQ1MDIudGVzdIIJdDUwMy50ZXN0ggl0NTA0LnRlc3SCCXQ1MDUu\ndGVzdIIJdDUwNi50ZXN0ggl0NTA3LnRlc3SCCXQ1MDgudGVzdIIJdDUwOS50ZXN0\nggl0NTEwLnRlc3SCCXQ1MTEudGVzdIIJdDUxMi50ZXN0MA0GCSqGSIb3DQEBCwUA\nA4IBAQCp6JcB0NWRQJSgjsI0ycv1gpuoo2k/NjPlkYCcsLwmTPRVdpBHi9MJNS2i\nMKPk7Wek2y9wJw6QPq9fMi/XSmEqRcFC8uBZ9evyTwmVbzzRsEN3qGHCrVdOnVLa\nD7x7NjoTLApVNelYTxMPEennTd9+we8cl0T2TqosTnbxyvP+pnwtpazjDAFKlt8e\nJpLRlRtWR/aScZ+P8CGj4b3prp12NJIAPG9W2ZqiHNLNMhTQG4Bz+O5+zMnIbC+e\nAhc4co+A/7qzselNZL1pcFFyRtTeLAcREuZVTTRa/EXmlLqzMe+UEEinEtdktnPL\nKO0ED3qPXggpBbFaa4/PVubBS4QU\n-----END CERTIFICATE-----\n", }; -static const size_t kLen45 = 26473; +static const size_t kLen46 = 26473; -static const char *kData46[] = { +static const char *kData47[] = { "-----BEGIN CERTIFICATE-----\nMIIunDCCLYSgAwIBAgIBAzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJDQTAg\nFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowEjEQMA4GA1UEAxMHdDAu\ndGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoL2oQZEgFBdXwu\nPb29W75T63JfNJKKdYi6YrmKM+EKbcMue/hFrLGQXB6a2eQZFn+j3hmexeQF9T8i\nWxh2S6rzAr1Yj+qXeDBaMf4oBEiEhBxIsaIlws3qQa4baeVEEoxw+A+ISrYHTIFc\nV/i0bcIFt5p7v7wbu686a/w0vIqPfad5amdQJMvmjZXDI+jGMvFPmBRHr2/1dJUW\nPaKsJluwR514pJv74urIyEt+dFPM2/5kc2HiLNkeuS1Hbky+dPlDIGrfaHHsCNnb\n/GjvQ6YfvDXRrYPCxWMk0x3FMSaDK9T0zoJ5hE9fViR+D6xcJO2RNUCUENS+Iipj\n3kIrLbkCAwEAAaOCK/4wgiv6MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr\nBgEFBQcDATAMBgNVHRMBAf8EAjAAMIIrwwYDVR0RBIIrujCCK7aCB3QwLnRlc3SC\nB3QxLnRlc3SCB3QyLnRlc3SCB3QzLnRlc3SCB3Q0LnRlc3SCB3Q1LnRlc3SCB3Q2\nLnRlc3SCB3Q3LnRlc3SCB3Q4LnRlc3SCB3Q5LnRlc3SCCHQxMC50ZXN0ggh0MTEu\ndGVzdIIIdDEyLnRlc3SCCHQxMy50ZXN0ggh0MTQudGVzdIIIdDE1LnRlc3SCCHQx\nNi50ZXN0ggh0MTcudGVzdIIIdDE4LnRlc3SCCHQxOS50ZXN0ggh0MjAudGVzdIII\ndDIxLnRlc3SCCHQyMi50ZXN0ggh0MjMudGVzdIIIdDI0LnRlc3SCCHQyNS50ZXN0\nggh0MjYudGVzdIIIdDI3LnRlc3SCCHQyOC50ZXN0ggh0MjkudGVzdIIIdDMwLnRl\nc3SCCHQzMS50ZXN0ggh0MzIudGVzdIIIdDMzLnRlc3SCCHQzNC50ZXN0ggh0MzUu\ndGVzdIIIdDM2LnRlc3SCCHQzNy50ZXN0ggh0MzgudGVzdIIIdDM5LnRlc3SCCHQ0\nMC50ZXN0ggh0NDEudGVzdIIIdDQyLnRlc3SCCHQ0My50ZXN0ggh0NDQudGVzdIII\ndDQ1LnRlc3SCCHQ0Ni50ZXN0ggh0NDcudGVzdIIIdDQ4LnRlc3SCCHQ0OS50ZXN0\nggh0NTAudGVzdIIIdDUxLnRlc3SCCHQ1Mi50ZXN0ggh0NTMudGVzdIIIdDU0LnRl\nc3SCCHQ1NS50ZXN0ggh0NTYudGVzdIIIdDU3LnRlc3SCCHQ1OC50ZXN0ggh0NTku\ndGVzdIIIdDYwLnRlc3SCCHQ2MS50ZXN0ggh0NjIudGVzdIIIdDYzLnRlc3SCCHQ2\nNC50ZXN0ggh0NjUudGVzdIIIdDY2LnRlc3SCCHQ2Ny50ZXN0ggh0NjgudGVzdIII\ndDY5LnRlc3SCCHQ3MC50ZXN0ggh0NzEudGVzdIIIdDcyLnRlc3SCCHQ3My50ZXN0\nggh0NzQudGVzdIIIdDc1LnRlc3SCCHQ3Ni50ZXN0ggh0NzcudGVzdIIIdDc4LnRl\nc3SCCHQ3OS50ZXN0ggh0ODAudGVzdIIIdDgxLnRlc3SCCHQ4Mi50ZXN0ggh0ODMu\ndGVzdIIIdDg0LnRlc3SCCHQ4NS50ZXN0ggh0ODYudGVzdIIIdDg3LnRlc3SCCHQ4\nOC50ZXN0ggh0ODkudGVzdIIIdDkwLnRlc3SCCHQ5MS50ZXN0ggh0OTIudGVzdIII\ndDkzLnRlc3SCCHQ5NC50ZXN0ggh0OTUudGVzdIIIdDk2LnRlc3SCCHQ5Ny50ZXN0\nggh0OTgudGVzdIIIdDk5LnRlc3SCCXQxMDAudGVzdIIJdDEwMS50ZXN0ggl0MTAy\nLnRlc3SCCXQxMDMudGVzdIIJdDEwNC50ZXN0ggl0MTA1LnRlc3SCCXQxMDYudGVz\ndIIJdDEwNy50ZXN0ggl0MTA4LnRlc3SCCXQxMDkudGVzdIIJdDExMC50ZXN0ggl0\nMTExLnRlc3SCCXQxMTIudGVzdIIJdDExMy50ZXN0ggl0MTE0LnRlc3SCCXQxMTUu\ndGVzdIIJdDExNi50ZXN0ggl0MTE3LnRlc3SCCXQxMTgudGVzdIIJdDExOS50ZXN0\nggl0MTIwLnRlc3SCCXQxMjEudGVzdIIJdDEyMi50ZXN0ggl0MTIzLnRlc3SCCXQx\nMjQudGVzdIIJdDEyNS50ZXN0ggl0MTI2LnRlc3SCCXQxMjcudGVzdIIJdDEyOC50\nZXN0ggl0MTI5LnRlc3SCCXQxMzAudGVzdIIJdDEzMS50ZXN0ggl0MTMyLnRlc3SC\nCXQxMzMudGVzdIIJdDEzNC50ZXN0ggl0MTM1LnRlc3SCCXQxMzYudGVzdIIJdDEz\nNy50ZXN0ggl0MTM4LnRlc3SCCXQxMzkudGVzdIIJdDE0MC50ZXN0ggl0MTQxLnRl\nc3SCCXQxNDIudGVzdIIJdDE0My50ZXN0ggl0MTQ0LnRlc3SCCXQxNDUudGVzdIIJ\ndDE0Ni50ZXN0ggl0MTQ3LnRlc3SCCXQxNDgudGVzdIIJdDE0OS50ZXN0ggl0MTUw\nLnRlc3SCCXQxNTEudGVzdIIJdDE1Mi50ZXN0ggl0MTUzLnRlc3SCCXQxNTQudGVz\ndIIJdDE1NS50ZXN0ggl0MTU2LnRlc3SCCXQxNTcudGVzdIIJdDE1OC50ZXN0ggl0\nMTU5LnRlc3SCCXQxNjAudGVzdIIJdDE2MS50ZXN0ggl0MTYyLnRlc3SCCXQxNjMu\ndGVzdIIJdDE2NC50ZXN0ggl0MTY1LnRlc3SCCXQxNjYudGVzdIIJdDE2Ny50ZXN0\nggl0MTY4LnRlc3SCCXQxNjkudGVzdIIJdDE3MC50ZXN0ggl0MTcxLnRlc3SCCXQx\nNzIudGVzdIIJdDE3My50ZXN0ggl0MTc0LnRlc3SCCXQxNzUudGVzdIIJdDE3Ni50\nZXN0ggl0MTc3LnRlc3SCCXQxNzgudGVzdIIJdDE3OS50ZXN0ggl0MTgwLnRlc3SC\nCXQxODEudGVzdIIJdDE4Mi50ZXN0ggl0MTgzLnRlc3SCCXQxODQudGVzdIIJdDE4\nNS50ZXN0ggl0MTg2LnRlc3SCCXQxODcudGVzdIIJdDE4OC50ZXN0ggl0MTg5LnRl\nc3SCCXQxOTAudGVzdIIJdDE5MS50ZXN0ggl0MTkyLnRlc3SCCXQxOTMudGVzdIIJ\ndDE5NC50ZXN0ggl0MTk1LnRlc3SCCXQxOTYudGVzdIIJdDE5Ny50ZXN0ggl0MTk4\nLnRlc3SCCXQxOTkudGVzdIIJdDIwMC50ZXN0ggl0MjAxLnRlc3SCCXQyMDIudGVz\ndIIJdDIwMy50ZXN0ggl0MjA0LnRlc3SCCXQyMDUudGVzdIIJdDIwNi50ZXN0ggl0\nMjA3LnRlc3SCCXQyMDgudGVzdIIJdDIwOS50ZXN0ggl0MjEwLnRlc3SCCXQyMTEu\ndGVzdIIJdDIxMi50ZXN0ggl0MjEzLnRlc3SCCXQyMTQudGVzdIIJdDIxNS50ZXN0\nggl0MjE2LnRlc3SCCXQyMTcudGVzdIIJdDIxOC50ZXN0ggl0MjE5LnRlc3SCCXQy\nMjAudGVzdIIJdDIyMS50ZXN0ggl0MjIyLnRlc3SCCXQyMjMudGVzdIIJdDIyNC50\nZXN0ggl0MjI1LnRlc3SCCXQyMjYudGVzdIIJdDIyNy50ZXN0ggl0MjI4LnRlc3SC\nCXQyMjkudGVzdIIJdDIzMC50ZXN0ggl0MjMxLnRlc3SCCXQyMzIudGVzdIIJdDIz\nMy50ZXN0ggl0MjM0LnRlc3SCCXQyMzUudGVzdIIJdDIzNi50ZXN0ggl0MjM3LnRl\nc3SCCXQyMzgudGVzdIIJdDIzOS50ZXN0ggl0MjQwLnRlc3SCCXQyNDEudGVzdIIJ\ndDI0Mi50ZXN0ggl0MjQzLnRlc3SCCXQyNDQudGVzdIIJdDI0NS50ZXN0ggl0MjQ2\nLnRlc3SCCXQyNDcudGVzdIIJdDI0OC50ZXN0ggl0MjQ5LnRlc3SCCXQyNTAudGVz\ndIIJdDI1MS50ZXN0ggl0MjUyLnRlc3SCCXQyNTMudGVzdIIJdDI1NC50ZXN0ggl0\nMjU1LnRlc3SCCXQyNTYudGVzdIIJdDI1Ny50ZXN0ggl0MjU4LnRlc3SCCXQyNTku\ndGVzdIIJdDI2MC50ZXN0ggl0MjYxLnRlc3SCCXQyNjIudGVzdIIJdDI2My50ZXN0\nggl0MjY0LnRlc3SCCXQyNjUudGVzdIIJdDI2Ni50ZXN0ggl0MjY3LnRlc3SCCXQy\nNjgudGVzdIIJdDI2OS50ZXN0ggl0MjcwLnRlc3SCCXQyNzEudGVzdIIJdDI3Mi50\nZXN0ggl0MjczLnRlc3SCCXQyNzQudGVzdIIJdDI3NS50ZXN0ggl0Mjc2LnRlc3SC\nCXQyNzcudGVzdIIJdDI3OC50ZXN0ggl0Mjc5LnRlc3SCCXQyODAudGVzdIIJdDI4\nMS50ZXN0ggl0MjgyLnRlc3SCCXQyODMudGVzdIIJdDI4NC50ZXN0ggl0Mjg1LnRl\nc3SCCXQyODYudGVzdIIJdDI4Ny50ZXN0ggl0Mjg4LnRlc3SCCXQyODkudGVzdIIJ\ndDI5MC50ZXN0ggl0MjkxLnRlc3SCCXQyOTIudGVzdIIJdDI5My50ZXN0ggl0Mjk0\nLnRlc3SCCXQyOTUudGVzdIIJdDI5Ni50ZXN0ggl0Mjk3LnRlc3SCCXQyOTgudGVz\ndIIJdDI5OS50ZXN0ggl0MzAwLnRlc3SCCXQzMDEudGVzdIIJdDMwMi50ZXN0ggl0\nMzAzLnRlc3SCCXQzMDQudGVzdIIJdDMwNS50ZXN0ggl0MzA2LnRlc3SCCXQzMDcu\ndGVzdIIJdDMwOC50ZXN0ggl0MzA5LnRlc3SCCXQzMTAudGVzdIIJdDMxMS50ZXN0\nggl0MzEyLnRlc3SCCXQzMTMudGVzdIIJdDMxNC50ZXN0ggl0MzE1LnRlc3SCCXQz\nMTYudGVzdIIJdDMxNy50ZXN0ggl0MzE4LnRlc3SCCXQzMTkudGVzdIIJdDMyMC50\nZXN0ggl0MzIxLnRlc3SCCXQzMjIudGVzdIIJdDMyMy50ZXN0ggl0MzI0LnRlc3SC\nCXQzMjUudGVzdIIJdDMyNi50ZXN0ggl0MzI3LnRlc3SCCXQzMjgudGVzdIIJdDMy\nOS50ZXN0ggl0MzMwLnRlc3SCCXQzMzEudGVzdIIJdDMzMi50ZXN0ggl0MzMzLnRl\nc3SCCXQzMzQudGVzdIIJdDMzNS50ZXN0ggl0MzM2LnRlc3SCCXQzMzcudGVzdIIJ\ndDMzOC50ZXN0ggl0MzM5LnRlc3SCCXQzNDAudGVzdIIJdDM0MS50ZXN0ggl0MzQy\nLnRlc3SCCXQzNDMudGVzdIIJdDM0NC50ZXN0ggl0MzQ1LnRlc3SCCXQzNDYudGVz\ndIIJdDM0Ny50ZXN0ggl0MzQ4LnRlc3SCCXQzNDkudGVzdIIJdDM1MC50ZXN0ggl0\nMzUxLnRlc3SCCXQzNTIudGVzdIIJdDM1My50ZXN0ggl0MzU0LnRlc3SCCXQzNTUu\ndGVzdIIJdDM1Ni50ZXN0ggl0MzU3LnRlc3SCCXQzNTgudGVzdIIJdDM1OS50ZXN0\nggl0MzYwLnRlc3SCCXQzNjEudGVzdIIJdDM2Mi50ZXN0ggl0MzYzLnRlc3SCCXQz\nNjQudGVzdIIJdDM2NS50ZXN0ggl0MzY2LnRlc3SCCXQzNjcudGVzdIIJdDM2OC50\nZXN0ggl0MzY5LnRlc3SCCXQzNzAudGVzdIIJdDM3MS50ZXN0ggl0MzcyLnRlc3SC\nCXQzNzMudGVzdIIJdDM3NC50ZXN0ggl0Mzc1LnRlc3SCCXQzNzYudGVzdIIJdDM3\nNy50ZXN0ggl0Mzc4LnRlc3SCCXQzNzkudGVzdIIJdDM4MC50ZXN0ggl0MzgxLnRl\nc3SCCXQzODIudGVzdIIJdDM4My50ZXN0ggl0Mzg0LnRlc3SCCXQzODUudGVzdIIJ\ndDM4Ni50ZXN0ggl0Mzg3LnRlc3SCCXQzODgudGVzdIIJdDM4OS50ZXN0ggl0Mzkw\nLnRlc3SCCXQzOTEudGVzdIIJdDM5Mi50ZXN0ggl0MzkzLnRlc3SCCXQzOTQudGVz\ndIIJdDM5NS50ZXN0ggl0Mzk2LnRlc3SCCXQzOTcudGVzdIIJdDM5OC50ZXN0ggl0\nMzk5LnRlc3SCCXQ0MDAudGVzdIIJdDQwMS50ZXN0ggl0NDAyLnRlc3SCCXQ0MDMu\ndGVzdIIJdDQwNC50ZXN0ggl0NDA1LnRlc3SCCXQ0MDYudGVzdIIJdDQwNy50ZXN0\nggl0NDA4LnRlc3SCCXQ0MDkudGVzdIIJdDQxMC50ZXN0ggl0NDExLnRlc3SCCXQ0\nMTIudGVzdIIJdDQxMy50ZXN0ggl0NDE0LnRlc3SCCXQ0MTUudGVzdIIJdDQxNi50\nZXN0ggl0NDE3LnRlc3SCCXQ0MTgudGVzdIIJdDQxOS50ZXN0ggl0NDIwLnRlc3SC\nCXQ0MjEudGVzdIIJdDQyMi50ZXN0ggl0NDIzLnRlc3SCCXQ0MjQudGVzdIIJdDQy\nNS50ZXN0ggl0NDI2LnRlc3SCCXQ0MjcudGVzdIIJdDQyOC50ZXN0ggl0NDI5LnRl\nc3SCCXQ0MzAudGVzdIIJdDQzMS50ZXN0ggl0NDMyLnRlc3SCCXQ0MzMudGVzdIIJ\ndDQzNC50ZXN0ggl0NDM1LnRlc3SCCXQ0MzYudGVzdIIJdDQzNy50ZXN0ggl0NDM4\nLnRlc3SCCXQ0MzkudGVzdIIJdDQ0MC50ZXN0ggl0NDQxLnRlc3SCCXQ0NDIudGVz\ndIIJdDQ0My50ZXN0ggl0NDQ0LnRlc3SCCXQ0NDUudGVzdIIJdDQ0Ni50ZXN0ggl0\nNDQ3LnRlc3SCCXQ0NDgudGVzdIIJdDQ0OS50ZXN0ggl0NDUwLnRlc3SCCXQ0NTEu\ndGVzdIIJdDQ1Mi50ZXN0ggl0NDUzLnRlc3SCCXQ0NTQudGVzdIIJdDQ1NS50ZXN0\nggl0NDU2LnRlc3SCCXQ0NTcudGVzdIIJdDQ1OC50ZXN0ggl0NDU5LnRlc3SCCXQ0\nNjAudGVzdIIJdDQ2MS50ZXN0ggl0NDYyLnRlc3SCCXQ0NjMudGVzdIIJdDQ2NC50\nZXN0ggl0NDY1LnRlc3SCCXQ0NjYudGVzdIIJdDQ2Ny50ZXN0ggl0NDY4LnRlc3SC\nCXQ0NjkudGVzdIIJdDQ3MC50ZXN0ggl0NDcxLnRlc3SCCXQ0NzIudGVzdIIJdDQ3\nMy50ZXN0ggl0NDc0LnRlc3SCCXQ0NzUudGVzdIIJdDQ3Ni50ZXN0ggl0NDc3LnRl\nc3SCCXQ0NzgudGVzdIIJdDQ3OS50ZXN0ggl0NDgwLnRlc3SCCXQ0ODEudGVzdIIJ\ndDQ4Mi50ZXN0ggl0NDgzLnRlc3SCCXQ0ODQudGVzdIIJdDQ4NS50ZXN0ggl0NDg2\nLnRlc3SCCXQ0ODcudGVzdIIJdDQ4OC50ZXN0ggl0NDg5LnRlc3SCCXQ0OTAudGVz\ndIIJdDQ5MS50ZXN0ggl0NDkyLnRlc3SCCXQ0OTMudGVzdIIJdDQ5NC50ZXN0ggl0\nNDk1LnRlc3SCCXQ0OTYudGVzdIIJdDQ5Ny50ZXN0ggl0NDk4LnRlc3SCCXQ0OTku\ndGVzdIIJdDUwMC50ZXN0ggl0NTAxLnRlc3SCCXQ1MDIudGVzdIIJdDUwMy50ZXN0\nggl0NTA0LnRlc3SCCXQ1MDUudGVzdIIJdDUwNi50ZXN0ggl0NTA3LnRlc3SCCXQ1\nMDgudGVzdIIJdDUwOS50ZXN0ggl0NTEwLnRlc3SCCXQ1MTEudGVzdIIJdDUxMi50\nZXN0ggl0NTEzLnRlc3SCCXQ1MTQudGVzdIIJdDU", "xNS50ZXN0ggl0NTE2LnRlc3SC\nCXQ1MTcudGVzdIIJdDUxOC50ZXN0ggl0NTE5LnRlc3SCCXQ1MjAudGVzdIIJdDUy\nMS50ZXN0ggl0NTIyLnRlc3SCCXQ1MjMudGVzdIIJdDUyNC50ZXN0ggl0NTI1LnRl\nc3SCCXQ1MjYudGVzdIIJdDUyNy50ZXN0ggl0NTI4LnRlc3SCCXQ1MjkudGVzdIIJ\ndDUzMC50ZXN0ggl0NTMxLnRlc3SCCXQ1MzIudGVzdIIJdDUzMy50ZXN0ggl0NTM0\nLnRlc3SCCXQ1MzUudGVzdIIJdDUzNi50ZXN0ggl0NTM3LnRlc3SCCXQ1MzgudGVz\ndIIJdDUzOS50ZXN0ggl0NTQwLnRlc3SCCXQ1NDEudGVzdIIJdDU0Mi50ZXN0ggl0\nNTQzLnRlc3SCCXQ1NDQudGVzdIIJdDU0NS50ZXN0ggl0NTQ2LnRlc3SCCXQ1NDcu\ndGVzdIIJdDU0OC50ZXN0ggl0NTQ5LnRlc3SCCXQ1NTAudGVzdIIJdDU1MS50ZXN0\nggl0NTUyLnRlc3SCCXQ1NTMudGVzdIIJdDU1NC50ZXN0ggl0NTU1LnRlc3SCCXQ1\nNTYudGVzdIIJdDU1Ny50ZXN0ggl0NTU4LnRlc3SCCXQ1NTkudGVzdIIJdDU2MC50\nZXN0ggl0NTYxLnRlc3SCCXQ1NjIudGVzdIIJdDU2My50ZXN0ggl0NTY0LnRlc3SC\nCXQ1NjUudGVzdIIJdDU2Ni50ZXN0ggl0NTY3LnRlc3SCCXQ1NjgudGVzdIIJdDU2\nOS50ZXN0ggl0NTcwLnRlc3SCCXQ1NzEudGVzdIIJdDU3Mi50ZXN0ggl0NTczLnRl\nc3SCCXQ1NzQudGVzdIIJdDU3NS50ZXN0ggl0NTc2LnRlc3SCCXQ1NzcudGVzdIIJ\ndDU3OC50ZXN0ggl0NTc5LnRlc3SCCXQ1ODAudGVzdIIJdDU4MS50ZXN0ggl0NTgy\nLnRlc3SCCXQ1ODMudGVzdIIJdDU4NC50ZXN0ggl0NTg1LnRlc3SCCXQ1ODYudGVz\ndIIJdDU4Ny50ZXN0ggl0NTg4LnRlc3SCCXQ1ODkudGVzdIIJdDU5MC50ZXN0ggl0\nNTkxLnRlc3SCCXQ1OTIudGVzdIIJdDU5My50ZXN0ggl0NTk0LnRlc3SCCXQ1OTUu\ndGVzdIIJdDU5Ni50ZXN0ggl0NTk3LnRlc3SCCXQ1OTgudGVzdIIJdDU5OS50ZXN0\nggl0NjAwLnRlc3SCCXQ2MDEudGVzdIIJdDYwMi50ZXN0ggl0NjAzLnRlc3SCCXQ2\nMDQudGVzdIIJdDYwNS50ZXN0ggl0NjA2LnRlc3SCCXQ2MDcudGVzdIIJdDYwOC50\nZXN0ggl0NjA5LnRlc3SCCXQ2MTAudGVzdIIJdDYxMS50ZXN0ggl0NjEyLnRlc3SC\nCXQ2MTMudGVzdIIJdDYxNC50ZXN0ggl0NjE1LnRlc3SCCXQ2MTYudGVzdIIJdDYx\nNy50ZXN0ggl0NjE4LnRlc3SCCXQ2MTkudGVzdIIJdDYyMC50ZXN0ggl0NjIxLnRl\nc3SCCXQ2MjIudGVzdIIJdDYyMy50ZXN0ggl0NjI0LnRlc3SCCXQ2MjUudGVzdIIJ\ndDYyNi50ZXN0ggl0NjI3LnRlc3SCCXQ2MjgudGVzdIIJdDYyOS50ZXN0ggl0NjMw\nLnRlc3SCCXQ2MzEudGVzdIIJdDYzMi50ZXN0ggl0NjMzLnRlc3SCCXQ2MzQudGVz\ndIIJdDYzNS50ZXN0ggl0NjM2LnRlc3SCCXQ2MzcudGVzdIIJdDYzOC50ZXN0ggl0\nNjM5LnRlc3SCCXQ2NDAudGVzdIIJdDY0MS50ZXN0ggl0NjQyLnRlc3SCCXQ2NDMu\ndGVzdIIJdDY0NC50ZXN0ggl0NjQ1LnRlc3SCCXQ2NDYudGVzdIIJdDY0Ny50ZXN0\nggl0NjQ4LnRlc3SCCXQ2NDkudGVzdIIJdDY1MC50ZXN0ggl0NjUxLnRlc3SCCXQ2\nNTIudGVzdIIJdDY1My50ZXN0ggl0NjU0LnRlc3SCCXQ2NTUudGVzdIIJdDY1Ni50\nZXN0ggl0NjU3LnRlc3SCCXQ2NTgudGVzdIIJdDY1OS50ZXN0ggl0NjYwLnRlc3SC\nCXQ2NjEudGVzdIIJdDY2Mi50ZXN0ggl0NjYzLnRlc3SCCXQ2NjQudGVzdIIJdDY2\nNS50ZXN0ggl0NjY2LnRlc3SCCXQ2NjcudGVzdIIJdDY2OC50ZXN0ggl0NjY5LnRl\nc3SCCXQ2NzAudGVzdIIJdDY3MS50ZXN0ggl0NjcyLnRlc3SCCXQ2NzMudGVzdIIJ\ndDY3NC50ZXN0ggl0Njc1LnRlc3SCCXQ2NzYudGVzdIIJdDY3Ny50ZXN0ggl0Njc4\nLnRlc3SCCXQ2NzkudGVzdIIJdDY4MC50ZXN0ggl0NjgxLnRlc3SCCXQ2ODIudGVz\ndIIJdDY4My50ZXN0ggl0Njg0LnRlc3SCCXQ2ODUudGVzdIIJdDY4Ni50ZXN0ggl0\nNjg3LnRlc3SCCXQ2ODgudGVzdIIJdDY4OS50ZXN0ggl0NjkwLnRlc3SCCXQ2OTEu\ndGVzdIIJdDY5Mi50ZXN0ggl0NjkzLnRlc3SCCXQ2OTQudGVzdIIJdDY5NS50ZXN0\nggl0Njk2LnRlc3SCCXQ2OTcudGVzdIIJdDY5OC50ZXN0ggl0Njk5LnRlc3SCCXQ3\nMDAudGVzdIIJdDcwMS50ZXN0ggl0NzAyLnRlc3SCCXQ3MDMudGVzdIIJdDcwNC50\nZXN0ggl0NzA1LnRlc3SCCXQ3MDYudGVzdIIJdDcwNy50ZXN0ggl0NzA4LnRlc3SC\nCXQ3MDkudGVzdIIJdDcxMC50ZXN0ggl0NzExLnRlc3SCCXQ3MTIudGVzdIIJdDcx\nMy50ZXN0ggl0NzE0LnRlc3SCCXQ3MTUudGVzdIIJdDcxNi50ZXN0ggl0NzE3LnRl\nc3SCCXQ3MTgudGVzdIIJdDcxOS50ZXN0ggl0NzIwLnRlc3SCCXQ3MjEudGVzdIIJ\ndDcyMi50ZXN0ggl0NzIzLnRlc3SCCXQ3MjQudGVzdIIJdDcyNS50ZXN0ggl0NzI2\nLnRlc3SCCXQ3MjcudGVzdIIJdDcyOC50ZXN0ggl0NzI5LnRlc3SCCXQ3MzAudGVz\ndIIJdDczMS50ZXN0ggl0NzMyLnRlc3SCCXQ3MzMudGVzdIIJdDczNC50ZXN0ggl0\nNzM1LnRlc3SCCXQ3MzYudGVzdIIJdDczNy50ZXN0ggl0NzM4LnRlc3SCCXQ3Mzku\ndGVzdIIJdDc0MC50ZXN0ggl0NzQxLnRlc3SCCXQ3NDIudGVzdIIJdDc0My50ZXN0\nggl0NzQ0LnRlc3SCCXQ3NDUudGVzdIIJdDc0Ni50ZXN0ggl0NzQ3LnRlc3SCCXQ3\nNDgudGVzdIIJdDc0OS50ZXN0ggl0NzUwLnRlc3SCCXQ3NTEudGVzdIIJdDc1Mi50\nZXN0ggl0NzUzLnRlc3SCCXQ3NTQudGVzdIIJdDc1NS50ZXN0ggl0NzU2LnRlc3SC\nCXQ3NTcudGVzdIIJdDc1OC50ZXN0ggl0NzU5LnRlc3SCCXQ3NjAudGVzdIIJdDc2\nMS50ZXN0ggl0NzYyLnRlc3SCCXQ3NjMudGVzdIIJdDc2NC50ZXN0ggl0NzY1LnRl\nc3SCCXQ3NjYudGVzdIIJdDc2Ny50ZXN0ggl0NzY4LnRlc3SCCXQ3NjkudGVzdIIJ\ndDc3MC50ZXN0ggl0NzcxLnRlc3SCCXQ3NzIudGVzdIIJdDc3My50ZXN0ggl0Nzc0\nLnRlc3SCCXQ3NzUudGVzdIIJdDc3Ni50ZXN0ggl0Nzc3LnRlc3SCCXQ3NzgudGVz\ndIIJdDc3OS50ZXN0ggl0NzgwLnRlc3SCCXQ3ODEudGVzdIIJdDc4Mi50ZXN0ggl0\nNzgzLnRlc3SCCXQ3ODQudGVzdIIJdDc4NS50ZXN0ggl0Nzg2LnRlc3SCCXQ3ODcu\ndGVzdIIJdDc4OC50ZXN0ggl0Nzg5LnRlc3SCCXQ3OTAudGVzdIIJdDc5MS50ZXN0\nggl0NzkyLnRlc3SCCXQ3OTMudGVzdIIJdDc5NC50ZXN0ggl0Nzk1LnRlc3SCCXQ3\nOTYudGVzdIIJdDc5Ny50ZXN0ggl0Nzk4LnRlc3SCCXQ3OTkudGVzdIIJdDgwMC50\nZXN0ggl0ODAxLnRlc3SCCXQ4MDIudGVzdIIJdDgwMy50ZXN0ggl0ODA0LnRlc3SC\nCXQ4MDUudGVzdIIJdDgwNi50ZXN0ggl0ODA3LnRlc3SCCXQ4MDgudGVzdIIJdDgw\nOS50ZXN0ggl0ODEwLnRlc3SCCXQ4MTEudGVzdIIJdDgxMi50ZXN0ggl0ODEzLnRl\nc3SCCXQ4MTQudGVzdIIJdDgxNS50ZXN0ggl0ODE2LnRlc3SCCXQ4MTcudGVzdIIJ\ndDgxOC50ZXN0ggl0ODE5LnRlc3SCCXQ4MjAudGVzdIIJdDgyMS50ZXN0ggl0ODIy\nLnRlc3SCCXQ4MjMudGVzdIIJdDgyNC50ZXN0ggl0ODI1LnRlc3SCCXQ4MjYudGVz\ndIIJdDgyNy50ZXN0ggl0ODI4LnRlc3SCCXQ4MjkudGVzdIIJdDgzMC50ZXN0ggl0\nODMxLnRlc3SCCXQ4MzIudGVzdIIJdDgzMy50ZXN0ggl0ODM0LnRlc3SCCXQ4MzUu\ndGVzdIIJdDgzNi50ZXN0ggl0ODM3LnRlc3SCCXQ4MzgudGVzdIIJdDgzOS50ZXN0\nggl0ODQwLnRlc3SCCXQ4NDEudGVzdIIJdDg0Mi50ZXN0ggl0ODQzLnRlc3SCCXQ4\nNDQudGVzdIIJdDg0NS50ZXN0ggl0ODQ2LnRlc3SCCXQ4NDcudGVzdIIJdDg0OC50\nZXN0ggl0ODQ5LnRlc3SCCXQ4NTAudGVzdIIJdDg1MS50ZXN0ggl0ODUyLnRlc3SC\nCXQ4NTMudGVzdIIJdDg1NC50ZXN0ggl0ODU1LnRlc3SCCXQ4NTYudGVzdIIJdDg1\nNy50ZXN0ggl0ODU4LnRlc3SCCXQ4NTkudGVzdIIJdDg2MC50ZXN0ggl0ODYxLnRl\nc3SCCXQ4NjIudGVzdIIJdDg2My50ZXN0ggl0ODY0LnRlc3SCCXQ4NjUudGVzdIIJ\ndDg2Ni50ZXN0ggl0ODY3LnRlc3SCCXQ4NjgudGVzdIIJdDg2OS50ZXN0ggl0ODcw\nLnRlc3SCCXQ4NzEudGVzdIIJdDg3Mi50ZXN0ggl0ODczLnRlc3SCCXQ4NzQudGVz\ndIIJdDg3NS50ZXN0ggl0ODc2LnRlc3SCCXQ4NzcudGVzdIIJdDg3OC50ZXN0ggl0\nODc5LnRlc3SCCXQ4ODAudGVzdIIJdDg4MS50ZXN0ggl0ODgyLnRlc3SCCXQ4ODMu\ndGVzdIIJdDg4NC50ZXN0ggl0ODg1LnRlc3SCCXQ4ODYudGVzdIIJdDg4Ny50ZXN0\nggl0ODg4LnRlc3SCCXQ4ODkudGVzdIIJdDg5MC50ZXN0ggl0ODkxLnRlc3SCCXQ4\nOTIudGVzdIIJdDg5My50ZXN0ggl0ODk0LnRlc3SCCXQ4OTUudGVzdIIJdDg5Ni50\nZXN0ggl0ODk3LnRlc3SCCXQ4OTgudGVzdIIJdDg5OS50ZXN0ggl0OTAwLnRlc3SC\nCXQ5MDEudGVzdIIJdDkwMi50ZXN0ggl0OTAzLnRlc3SCCXQ5MDQudGVzdIIJdDkw\nNS50ZXN0ggl0OTA2LnRlc3SCCXQ5MDcudGVzdIIJdDkwOC50ZXN0ggl0OTA5LnRl\nc3SCCXQ5MTAudGVzdIIJdDkxMS50ZXN0ggl0OTEyLnRlc3SCCXQ5MTMudGVzdIIJ\ndDkxNC50ZXN0ggl0OTE1LnRlc3SCCXQ5MTYudGVzdIIJdDkxNy50ZXN0ggl0OTE4\nLnRlc3SCCXQ5MTkudGVzdIIJdDkyMC50ZXN0ggl0OTIxLnRlc3SCCXQ5MjIudGVz\ndIIJdDkyMy50ZXN0ggl0OTI0LnRlc3SCCXQ5MjUudGVzdIIJdDkyNi50ZXN0ggl0\nOTI3LnRlc3SCCXQ5MjgudGVzdIIJdDkyOS50ZXN0ggl0OTMwLnRlc3SCCXQ5MzEu\ndGVzdIIJdDkzMi50ZXN0ggl0OTMzLnRlc3SCCXQ5MzQudGVzdIIJdDkzNS50ZXN0\nggl0OTM2LnRlc3SCCXQ5MzcudGVzdIIJdDkzOC50ZXN0ggl0OTM5LnRlc3SCCXQ5\nNDAudGVzdIIJdDk0MS50ZXN0ggl0OTQyLnRlc3SCCXQ5NDMudGVzdIIJdDk0NC50\nZXN0ggl0OTQ1LnRlc3SCCXQ5NDYudGVzdIIJdDk0Ny50ZXN0ggl0OTQ4LnRlc3SC\nCXQ5NDkudGVzdIIJdDk1MC50ZXN0ggl0OTUxLnRlc3SCCXQ5NTIudGVzdIIJdDk1\nMy50ZXN0ggl0OTU0LnRlc3SCCXQ5NTUudGVzdIIJdDk1Ni50ZXN0ggl0OTU3LnRl\nc3SCCXQ5NTgudGVzdIIJdDk1OS50ZXN0ggl0OTYwLnRlc3SCCXQ5NjEudGVzdIIJ\ndDk2Mi50ZXN0ggl0OTYzLnRlc3SCCXQ5NjQudGVzdIIJdDk2NS50ZXN0ggl0OTY2\nLnRlc3SCCXQ5NjcudGVzdIIJdDk2OC50ZXN0ggl0OTY5LnRlc3SCCXQ5NzAudGVz\ndIIJdDk3MS50ZXN0ggl0OTcyLnRlc3SCCXQ5NzMudGVzdIIJdDk3NC50ZXN0ggl0\nOTc1LnRlc3SCCXQ5NzYudGVzdIIJdDk3Ny50ZXN0ggl0OTc4LnRlc3SCCXQ5Nzku\ndGVzdIIJdDk4MC50ZXN0ggl0OTgxLnRlc3SCCXQ5ODIudGVzdIIJdDk4My50ZXN0\nggl0OTg0LnRlc3SCCXQ5ODUudGVzdIIJdDk4Ni50ZXN0ggl0OTg3LnRlc3SCCXQ5\nODgudGVzdIIJdDk4OS50ZXN0ggl0OTkwLnRlc3SCCXQ5OTEudGVzdIIJdDk5Mi50\nZXN0ggl0OTkzLnRlc3SCCXQ5OTQudGVzdIIJdDk5NS50ZXN0ggl0OTk2LnRlc3SC\nCXQ5OTcudGVzdIIJdDk5OC50ZXN0ggl0OTk5LnRlc3SCCnQxMDAwLnRlc3SCCnQx\nMDAxLnRlc3SCCnQxMDAyLnRlc3SCCnQxMDAzLnRlc3SCCnQxMDA0LnRlc3SCCnQx\nMDA1LnRlc3SCCnQxMDA2LnRlc3SCCnQxMDA3LnRlc3SCCnQxMDA4LnRlc3SCCnQx\nMDA5LnRlc3SCCnQxMDEwLnRlc3SCCnQxMDExLnRlc3SCCnQxMDEyLnRlc3SCCnQx\nMDEzLnRlc3SCCnQxMDE0LnRlc3SCCnQxMDE1LnRlc3SCCnQxMDE2LnRlc3SCCnQx\nMDE3LnRlc3SCCnQxMDE4LnRlc3SCCnQxMDE5LnRlc3SCCnQxMDIwLnRlc3SCCnQx\nMDIxLnRlc3SCCnQxMDIyLnRlc3SCCnQxMDIzLnRlc3SCCnQxMDI0LnRlc3QwDQYJ\nKoZIhvcNAQELBQADggEBAGfZxjrjcjFw5FnJMzq7SIad+JpmvMar7VnzXj84hjoV\nFuUqiclqjg1KRD7aIh5M1VEQv+AAk8UP6jMrvLJpoi5OD8ljivNA8zycj1N/LhNq\n8MjZauCTS+tuXIoh5hOE/TQqY6cUxY4LRBLIFIcbH0FGF22amCtowMVbRoaUpPvr\nGR5OXPAS3yRiEWrp703c21o3hw9QckB82z7Lxnt3oOFPg62EFPXiqE07Wkw/1xH4\nJ9yy45XW5A77kfel22hVs873QVHI+GkKoTPe/q6eQVgesR2vpDRytKDP9K4tK4KS\n6hqVxj6a8Eqund0izSV+UXkskc9iN6EPXvVTELo3hD8=\n-----END CERTIFICATE-----\n", }; -static const size_t kLen46 = 16219; +static const size_t kLen47 = 16219; -static const char *kData47[] = { +static const char *kData48[] = { "-----BEGIN CERTIFICATE-----\nMIJqmDCCaYCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJDQTAg\nFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowgmfXMRAwDgYDVQQDEwd0\nMC50ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nMUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nM0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nNUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nN0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0OEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nOUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTBAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDExQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxMkB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0MTNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDE0QHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQxNUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTZAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDE3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxOEB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0MTlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDIwQHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQyMUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjJAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDIzQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQyNEB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0MjVAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDI2QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQyN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjhAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDI5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzMEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDMy\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzM0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nMzRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDM1QHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQzNkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzdAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDM4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzOUB0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0NDBAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQxQHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ0MkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDNAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDQ0QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ0NUB0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0NDZAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQ3QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ0OEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDlAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDUwQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1MUB0ZXN0\nMRcwFQYJKoZIhvcNAQkBFgh0NTJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDUzQHRl\nc3QxFzAVBgkqhkiG9w0BCQEWCHQ1NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NTVA\ndGVzdDEXMBUGCSqGSIb3DQEJARYIdDU2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1\nN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NThAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDU5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2MEB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0NjFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDYyQHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQ2M0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NjRAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDY1QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2NkB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0NjdAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDY4QHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQ2OUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzBAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDcxQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3MkB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0NzNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDc0QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQ3NUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzZAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDc3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3OEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgw\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4MUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nODJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgzQHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQ4NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0ODVAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDg2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4N0B0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0ODhAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDg5QHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ5MEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTFAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDkyQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5M0B0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0OTRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDk1QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ5NkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTdAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDk4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTAwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTAzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEwNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTA2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTA5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDExMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTEyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEx\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTE1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxMTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDExN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTE4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDEyMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTIxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxMjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyM0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTI0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTI3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEyOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTMwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEzMkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTMzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDEzNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEz\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTQyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE0NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTQ1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTQ4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTUxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE1M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTU0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTU3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE1OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNjRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTY2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE2OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTY5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNzBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTcyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTc1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE3N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTc4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNzlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4MEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTgxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxODJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE4M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxODVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxODhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4OUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTkwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE5MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTkzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxOTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5NUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTk2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTk5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIwMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjAyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIwNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjA1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIwN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjA4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIx\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjExQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjE0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDIxNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjE3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyMThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjIwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjIzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIyNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjI2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjI5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIzMUB0ZXN0MRgwFgY", "JKoZIhvcNAQkBFgl0MjMyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIz\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjM1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIzN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjM4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI0MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjQxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyNDJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjQ0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjQ3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI0OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjUwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyNTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI1MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjUzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDI1NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjU2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyNTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI1\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjU5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyNjBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI2MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjYyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNjNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI2NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjY1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyNjZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI2N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjY4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNjlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI3MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjcxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNzJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI3M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjc0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyNzVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI3NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0Mjc3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNzhAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDI3OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjgwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyODFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI4\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjgzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyODRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI4NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0Mjg2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyODdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI4OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjg5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyOTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI5MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjkyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyOTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI5NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjk1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyOTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI5N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjk4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyOTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMwMEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzAxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMDJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDMwM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzA0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzMDVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMw\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzA3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzMDhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMwOUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzEwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDMxMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzEzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzMTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMxNUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzE2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDMxOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzE5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDMyMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzIyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzMjNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMyNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzI1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDMyN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzI4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMz\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzMxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzMzJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMzM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzM0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMzVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDMzNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzM3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzMzhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMzOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzQwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM0MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzQzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM0NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzQ2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzNDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM0OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzQ5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM1MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzUyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM1\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzU1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzNTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM1N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzU4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDM2MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzYxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzNjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM2M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzY0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM2NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzY3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM2OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzcwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzNzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM3MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzczQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM3NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzc2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzNzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM3\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzc5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzODBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM4MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzgyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzODNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDM4NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzg1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzODZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM4N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0Mzg4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzODlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM5MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzkxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzOTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM5M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzk0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzOTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM5NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0Mzk3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzOThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM5OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDAwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MDFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQw\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDAzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0MDRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQwNUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDA2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MDdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQwOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDA5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0MTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQxMUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDEyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQxNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDE1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQxN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDE4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0MTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQyMEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDIxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MjJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQyM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDI0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MjVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQy\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDI3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0MjhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQyOUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDMwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MzFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQzMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDMzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0MzRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQzNUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDM2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MzdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQzOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDM5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ0MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDQyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0NDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ0NEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDQ1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ0N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDQ4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDUxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0NTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1M0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDU0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQ1NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDU3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0NThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDYwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ2MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDYzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NjRAd", "GVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ2NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDY2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0NjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ2OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDY5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ3MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDcyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ3\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDc1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0NzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ3N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDc4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQ4MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDgxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0ODJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ4M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDg0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0ODVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ4NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDg3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0ODhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ4OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDkwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0OTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ5MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDkzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0OTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ5NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDk2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0OTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ5\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDk5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ1MDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUwMUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NTAyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDUwNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTA1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ1MDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUwN0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NTA4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDUxMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNTExQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDUxM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTE0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ1MTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUxNkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NTE3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDUxOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTIwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MjFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUy\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTIzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ1MjRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUyNUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NTI2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MjdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDUyOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTI5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ1MzBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUzMUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NTMyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MzNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDUzNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNTM1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MzZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDUzN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTM4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ1MzlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU0MEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NTQxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NDJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDU0M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTQ0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NDVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU0\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTQ3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ1NDhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU0OUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NTUwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDU1MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTUzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ1NTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU1NUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NTU2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDU1OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNTU5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NjBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDU2MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTYyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ1NjNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU2NEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NTY1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NjZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDU2N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTY4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NjlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU3\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTcxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ1NzJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU3M0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NTc0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1NzVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDU3NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTc3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ1NzhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU3OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NTgwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1ODFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDU4MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNTgzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1ODRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDU4NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTg2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ1ODdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU4OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NTg5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1OTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDU5MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTkyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ1OTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU5\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTk1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ1OTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDU5N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NTk4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1OTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDYwMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjAxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ2MDJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDYwM0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NjA0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MDVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDYwNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNjA3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MDhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDYwOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjEwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ2MTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDYxMkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NjEzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDYxNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjE2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDYx\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjE5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ2MjBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDYyMUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NjIyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MjNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDYyNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjI1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ2MjZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDYyN0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NjI4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MjlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDYzMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNjMxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MzJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDYzM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjM0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ2MzVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDYzNkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NjM3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2MzhAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDYzOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjQwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NDFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY0\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjQzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ2NDRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY0NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NjQ2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NDdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDY0OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjQ5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ2NTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY1MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NjUyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDY1NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNjU1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDY1N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjU4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ2NTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY2MEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NjYxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NjJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDY2M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjY0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NjVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY2\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjY3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ2NjhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY2OUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NjcwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NzFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDY3MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjczQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ2NzRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY3NUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0Njc2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2NzdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDY3OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNjc5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2ODBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDY4MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjgyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ2ODNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY4NEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0Njg1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2ODZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDY4N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Njg4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ2ODlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY5\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NjkxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ2OTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY5M0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0Njk0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ2OTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDY5NkB0ZXN0MRgwFgYJKoZIhvcNAQk", "BFgl0Njk3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ2OThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDY5OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NzAwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDcwMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNzAzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDcwNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzA2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ3MDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDcwOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NzA5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDcxMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzEyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDcx\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzE1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ3MTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDcxN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NzE4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDcyMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzIxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ3MjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDcyM0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NzI0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDcyNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNzI3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDcyOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzMwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ3MzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDczMkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NzMzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDczNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzM2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ3MzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDcz\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzM5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ3NDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc0MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NzQyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDc0NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzQ1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ3NDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc0N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NzQ4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDc1MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNzUxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDc1M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzU0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ3NTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc1NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NzU3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDc1OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzYwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NjFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc2\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzYzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ3NjRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc2NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NzY2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NjdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDc2OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzY5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ3NzBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc3MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NzcyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NzNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDc3NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNzc1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3NzZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDc3N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Nzc4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ3NzlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc4MEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NzgxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3ODJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDc4M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Nzg0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ3ODVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc4\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Nzg3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ3ODhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc4OUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NzkwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3OTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDc5MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NzkzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ3OTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDc5NUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0Nzk2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ3OTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDc5OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNzk5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDgwMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODAyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ4MDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDgwNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0ODA1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDgwN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODA4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDgx\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODExQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ4MTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDgxM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0ODE0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDgxNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODE3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ4MThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDgxOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0ODIwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDgyMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nODIzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MjRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDgyNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODI2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ4MjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDgyOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0ODI5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDgzMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODMyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDgz\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODM1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ4MzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDgzN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0ODM4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4MzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDg0MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODQxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ4NDJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg0M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0ODQ0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NDVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDg0NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nODQ3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NDhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDg0OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODUwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ4NTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg1MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0ODUzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDg1NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODU2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg1\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODU5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ4NjBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg2MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0ODYyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NjNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDg2NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODY1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ4NjZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg2N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0ODY4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NjlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDg3MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nODcxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NzJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDg3M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODc0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ4NzVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg3NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0ODc3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4NzhAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDg3OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODgwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ4ODFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg4\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODgzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ4ODRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg4NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0ODg2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4ODdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDg4OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODg5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ4OTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDg5MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0ODkyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4OTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDg5NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nODk1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ4OTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDg5N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0ODk4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ4OTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDkwMEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0OTAxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MDJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDkwM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTA0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MDVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDkw\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTA3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ5MDhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDkwOUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0OTEwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDkxMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTEzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ5MTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDkxNUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0OTE2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDkxOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nOTE5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MjBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDkyMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTIyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ5MjNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDkyNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0OTI1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MjZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDkyN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTI4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MjlAdGVzdDEYMBYGC", "SqGSIb3DQEJARYJdDkz\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTMxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ5MzJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDkzM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0OTM0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5MzVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDkzNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTM3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ5MzhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDkzOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0OTQwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDk0MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nOTQzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDk0NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTQ2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ5NDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk0OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0OTQ5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDk1MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTUyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk1\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTU1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ5NTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk1N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0OTU4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDk2MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTYxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ5NjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk2M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0OTY0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDk2NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nOTY3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDk2OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTcwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ5NzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk3MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0OTczQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDk3NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTc2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ5NzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk3\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTc5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ5ODBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk4MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0OTgyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5ODNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDk4NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTg1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ5ODZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk4N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0OTg4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5ODlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDk5MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nOTkxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5OTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDk5M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0OTk0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ5OTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDk5NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0OTk3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ5OThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDk5OUB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAwMEB0\nZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAwMUB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0\nMTAwMkB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAwM0B0ZXN0MRkwFwYJKoZIhvcN\nAQkBFgp0MTAwNEB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAwNUB0ZXN0MRkwFwYJ\nKoZIhvcNAQkBFgp0MTAwNkB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAwN0B0ZXN0\nMRkwFwYJKoZIhvcNAQkBFgp0MTAwOEB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAw\nOUB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAxMEB0ZXN0MRkwFwYJKoZIhvcNAQkB\nFgp0MTAxMUB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAxMkB0ZXN0MRkwFwYJKoZI\nhvcNAQkBFgp0MTAxM0B0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAxNEB0ZXN0MRkw\nFwYJKoZIhvcNAQkBFgp0MTAxNUB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAxNkB0\nZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAxN0B0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0\nMTAxOEB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAxOUB0ZXN0MRkwFwYJKoZIhvcN\nAQkBFgp0MTAyMEB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAyMUB0ZXN0MRkwFwYJ\nKoZIhvcNAQkBFgp0MTAyMkB0ZXN0MRkwFwYJKoZIhvcNAQkBFgp0MTAyM0B0ZXN0\nMRkwFwYJKoZIhvcNAQkBFgp0MTAyNEB0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOC\nAQ8AMIIBCgKCAQEAugvahBkSAUF1fC49vb1bvlPrcl80kop1iLpiuYoz4Qptwy57\n+EWssZBcHprZ5BkWf6PeGZ7F5AX1PyJbGHZLqvMCvViP6pd4MFox/igESISEHEix\noiXCzepBrhtp5UQSjHD4D4hKtgdMgVxX+LRtwgW3mnu/vBu7rzpr/DS8io99p3lq\nZ1Aky+aNlcMj6MYy8U+YFEevb/V0lRY9oqwmW7BHnXikm/vi6sjIS350U8zb/mRz\nYeIs2R65LUduTL50+UMgat9ocewI2dv8aO9Dph+8NdGtg8LFYyTTHcUxJoMr1PTO\ngnmET19WJH4PrFwk7ZE1QJQQ1L4iKmPeQistuQIDAQABozUwMzAOBgNVHQ8BAf8E\nBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADANBgkqhkiG\n9w0BAQsFAAOCAQEAtMIpnGzOBkJXEBmCsRVbTrg9QgYRlGPG48+cXT2QbIutAmbj\nmiF+OYg/bRsQtuqcKjnJYog+x6UCU3d34jaMEfEXfHSwF7xPQrqJm45MXhG3so4E\n+el5GMAS+SKFQK3w8NPoGhGwn82sz4XV6HMG+ANUxMlCrOcx2jh5UW+7ITjdRwJd\nReJ/JaMpneJdwGFSU9Vn+t7PFb51/pOYqO/PuEANzphovjMVcFZ6mtAQwYDkQZBJ\nVy1/7bPoNmbKD0GAS6HpS+xaJ/DnjjD6Kal2T7GMyvRMogj5BeZ/uEkXCEhvoaBT\nos1gaqqnGpZ6JSEDctzjgpCtEPR40yiz1wv1CA==\n-----END CERTIFICATE-----\n", }; -static const size_t kLen47 = 37015; +static const size_t kLen48 = 37015; -static const char *kData48[] = { +static const char *kData49[] = { "-----BEGIN CERTIFICATE-----\nMIInDDCCJfSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJDQTAg\nFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowghmkMRAwDgYDVQQDEwd0\nMC50ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nMUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nM0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nNUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nN0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0OEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nOUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTBAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDExQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxMkB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0MTNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDE0QHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQxNUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTZAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDE3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxOEB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0MTlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDIwQHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQyMUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjJAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDIzQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQyNEB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0MjVAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDI2QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQyN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjhAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDI5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzMEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDMy\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzM0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nMzRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDM1QHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQzNkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzdAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDM4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzOUB0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0NDBAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQxQHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ0MkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDNAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDQ0QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ0NUB0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0NDZAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQ3QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ0OEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDlAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDUwQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1MUB0ZXN0\nMRcwFQYJKoZIhvcNAQkBFgh0NTJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDUzQHRl\nc3QxFzAVBgkqhkiG9w0BCQEWCHQ1NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NTVA\ndGVzdDEXMBUGCSqGSIb3DQEJARYIdDU2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1\nN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NThAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDU5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2MEB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0NjFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDYyQHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQ2M0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NjRAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDY1QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2NkB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0NjdAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDY4QHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQ2OUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzBAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDcxQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3MkB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0NzNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDc0QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQ3NUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzZAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDc3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3OEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgw\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4MUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nODJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgzQHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQ4NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0ODVAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDg2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4N0B0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0ODhAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDg5QHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ5MEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTFAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDkyQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5M0B0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0OTRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDk1QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ5NkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTdAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDk4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTAwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTAzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEwNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTA2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTA5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDExMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTEyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEx\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTE1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxMTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDExN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTE4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDEyMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTIxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxMjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyM0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTI0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTI3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEyOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTMwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEzMkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTMzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDEzNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEz\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTQyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE0NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTQ1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTQ4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTUxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE1M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTU0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTU3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE1OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNjRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTY2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE2OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTY5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNzBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTcyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTc1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE3N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTc4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNzlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4MEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTgxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxODJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE4M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxODVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxODhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4OUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTkwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE5MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTkzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxOTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5NUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTk2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTk5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIwMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjAyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIwNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjA1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIwN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjA4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIx\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjExQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjE0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDIxNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjE3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyMThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjIwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjIzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIyNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjI2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjI5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIzMUB0ZXN0MRgwFgY", "JKoZIhvcNAQkBFgl0MjMyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIz\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjM1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIzN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjM4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI0MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjQxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyNDJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjQ0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjQ3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI0OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjUwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyNTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI1MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjUzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDI1NUB0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A\nMIIBCgKCAQEAugvahBkSAUF1fC49vb1bvlPrcl80kop1iLpiuYoz4Qptwy57+EWs\nsZBcHprZ5BkWf6PeGZ7F5AX1PyJbGHZLqvMCvViP6pd4MFox/igESISEHEixoiXC\nzepBrhtp5UQSjHD4D4hKtgdMgVxX+LRtwgW3mnu/vBu7rzpr/DS8io99p3lqZ1Ak\ny+aNlcMj6MYy8U+YFEevb/V0lRY9oqwmW7BHnXikm/vi6sjIS350U8zb/mRzYeIs\n2R65LUduTL50+UMgat9ocewI2dv8aO9Dph+8NdGtg8LFYyTTHcUxJoMr1PTOgnmE\nT19WJH4PrFwk7ZE1QJQQ1L4iKmPeQistuQIDAQABo4IK2jCCCtYwDgYDVR0PAQH/\nBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwggqfBgNV\nHREEggqWMIIKkoIHdDAudGVzdIIHdDEudGVzdIIHdDIudGVzdIIHdDMudGVzdIIH\ndDQudGVzdIIHdDUudGVzdIIHdDYudGVzdIIHdDcudGVzdIIHdDgudGVzdIIHdDku\ndGVzdIIIdDEwLnRlc3SCCHQxMS50ZXN0ggh0MTIudGVzdIIIdDEzLnRlc3SCCHQx\nNC50ZXN0ggh0MTUudGVzdIIIdDE2LnRlc3SCCHQxNy50ZXN0ggh0MTgudGVzdIII\ndDE5LnRlc3SCCHQyMC50ZXN0ggh0MjEudGVzdIIIdDIyLnRlc3SCCHQyMy50ZXN0\nggh0MjQudGVzdIIIdDI1LnRlc3SCCHQyNi50ZXN0ggh0MjcudGVzdIIIdDI4LnRl\nc3SCCHQyOS50ZXN0ggh0MzAudGVzdIIIdDMxLnRlc3SCCHQzMi50ZXN0ggh0MzMu\ndGVzdIIIdDM0LnRlc3SCCHQzNS50ZXN0ggh0MzYudGVzdIIIdDM3LnRlc3SCCHQz\nOC50ZXN0ggh0MzkudGVzdIIIdDQwLnRlc3SCCHQ0MS50ZXN0ggh0NDIudGVzdIII\ndDQzLnRlc3SCCHQ0NC50ZXN0ggh0NDUudGVzdIIIdDQ2LnRlc3SCCHQ0Ny50ZXN0\nggh0NDgudGVzdIIIdDQ5LnRlc3SCCHQ1MC50ZXN0ggh0NTEudGVzdIIIdDUyLnRl\nc3SCCHQ1My50ZXN0ggh0NTQudGVzdIIIdDU1LnRlc3SCCHQ1Ni50ZXN0ggh0NTcu\ndGVzdIIIdDU4LnRlc3SCCHQ1OS50ZXN0ggh0NjAudGVzdIIIdDYxLnRlc3SCCHQ2\nMi50ZXN0ggh0NjMudGVzdIIIdDY0LnRlc3SCCHQ2NS50ZXN0ggh0NjYudGVzdIII\ndDY3LnRlc3SCCHQ2OC50ZXN0ggh0NjkudGVzdIIIdDcwLnRlc3SCCHQ3MS50ZXN0\nggh0NzIudGVzdIIIdDczLnRlc3SCCHQ3NC50ZXN0ggh0NzUudGVzdIIIdDc2LnRl\nc3SCCHQ3Ny50ZXN0ggh0NzgudGVzdIIIdDc5LnRlc3SCCHQ4MC50ZXN0ggh0ODEu\ndGVzdIIIdDgyLnRlc3SCCHQ4My50ZXN0ggh0ODQudGVzdIIIdDg1LnRlc3SCCHQ4\nNi50ZXN0ggh0ODcudGVzdIIIdDg4LnRlc3SCCHQ4OS50ZXN0ggh0OTAudGVzdIII\ndDkxLnRlc3SCCHQ5Mi50ZXN0ggh0OTMudGVzdIIIdDk0LnRlc3SCCHQ5NS50ZXN0\nggh0OTYudGVzdIIIdDk3LnRlc3SCCHQ5OC50ZXN0ggh0OTkudGVzdIIJdDEwMC50\nZXN0ggl0MTAxLnRlc3SCCXQxMDIudGVzdIIJdDEwMy50ZXN0ggl0MTA0LnRlc3SC\nCXQxMDUudGVzdIIJdDEwNi50ZXN0ggl0MTA3LnRlc3SCCXQxMDgudGVzdIIJdDEw\nOS50ZXN0ggl0MTEwLnRlc3SCCXQxMTEudGVzdIIJdDExMi50ZXN0ggl0MTEzLnRl\nc3SCCXQxMTQudGVzdIIJdDExNS50ZXN0ggl0MTE2LnRlc3SCCXQxMTcudGVzdIIJ\ndDExOC50ZXN0ggl0MTE5LnRlc3SCCXQxMjAudGVzdIIJdDEyMS50ZXN0ggl0MTIy\nLnRlc3SCCXQxMjMudGVzdIIJdDEyNC50ZXN0ggl0MTI1LnRlc3SCCXQxMjYudGVz\ndIIJdDEyNy50ZXN0ggl0MTI4LnRlc3SCCXQxMjkudGVzdIIJdDEzMC50ZXN0ggl0\nMTMxLnRlc3SCCXQxMzIudGVzdIIJdDEzMy50ZXN0ggl0MTM0LnRlc3SCCXQxMzUu\ndGVzdIIJdDEzNi50ZXN0ggl0MTM3LnRlc3SCCXQxMzgudGVzdIIJdDEzOS50ZXN0\nggl0MTQwLnRlc3SCCXQxNDEudGVzdIIJdDE0Mi50ZXN0ggl0MTQzLnRlc3SCCXQx\nNDQudGVzdIIJdDE0NS50ZXN0ggl0MTQ2LnRlc3SCCXQxNDcudGVzdIIJdDE0OC50\nZXN0ggl0MTQ5LnRlc3SCCXQxNTAudGVzdIIJdDE1MS50ZXN0ggl0MTUyLnRlc3SC\nCXQxNTMudGVzdIIJdDE1NC50ZXN0ggl0MTU1LnRlc3SCCXQxNTYudGVzdIIJdDE1\nNy50ZXN0ggl0MTU4LnRlc3SCCXQxNTkudGVzdIIJdDE2MC50ZXN0ggl0MTYxLnRl\nc3SCCXQxNjIudGVzdIIJdDE2My50ZXN0ggl0MTY0LnRlc3SCCXQxNjUudGVzdIIJ\ndDE2Ni50ZXN0ggl0MTY3LnRlc3SCCXQxNjgudGVzdIIJdDE2OS50ZXN0ggl0MTcw\nLnRlc3SCCXQxNzEudGVzdIIJdDE3Mi50ZXN0ggl0MTczLnRlc3SCCXQxNzQudGVz\ndIIJdDE3NS50ZXN0ggl0MTc2LnRlc3SCCXQxNzcudGVzdIIJdDE3OC50ZXN0ggl0\nMTc5LnRlc3SCCXQxODAudGVzdIIJdDE4MS50ZXN0ggl0MTgyLnRlc3SCCXQxODMu\ndGVzdIIJdDE4NC50ZXN0ggl0MTg1LnRlc3SCCXQxODYudGVzdIIJdDE4Ny50ZXN0\nggl0MTg4LnRlc3SCCXQxODkudGVzdIIJdDE5MC50ZXN0ggl0MTkxLnRlc3SCCXQx\nOTIudGVzdIIJdDE5My50ZXN0ggl0MTk0LnRlc3SCCXQxOTUudGVzdIIJdDE5Ni50\nZXN0ggl0MTk3LnRlc3SCCXQxOTgudGVzdIIJdDE5OS50ZXN0ggl0MjAwLnRlc3SC\nCXQyMDEudGVzdIIJdDIwMi50ZXN0ggl0MjAzLnRlc3SCCXQyMDQudGVzdIIJdDIw\nNS50ZXN0ggl0MjA2LnRlc3SCCXQyMDcudGVzdIIJdDIwOC50ZXN0ggl0MjA5LnRl\nc3SCCXQyMTAudGVzdIIJdDIxMS50ZXN0ggl0MjEyLnRlc3SCCXQyMTMudGVzdIIJ\ndDIxNC50ZXN0ggl0MjE1LnRlc3SCCXQyMTYudGVzdIIJdDIxNy50ZXN0ggl0MjE4\nLnRlc3SCCXQyMTkudGVzdIIJdDIyMC50ZXN0ggl0MjIxLnRlc3SCCXQyMjIudGVz\ndIIJdDIyMy50ZXN0ggl0MjI0LnRlc3SCCXQyMjUudGVzdIIJdDIyNi50ZXN0ggl0\nMjI3LnRlc3SCCXQyMjgudGVzdIIJdDIyOS50ZXN0ggl0MjMwLnRlc3SCCXQyMzEu\ndGVzdIIJdDIzMi50ZXN0ggl0MjMzLnRlc3SCCXQyMzQudGVzdIIJdDIzNS50ZXN0\nggl0MjM2LnRlc3SCCXQyMzcudGVzdIIJdDIzOC50ZXN0ggl0MjM5LnRlc3SCCXQy\nNDAudGVzdIIJdDI0MS50ZXN0ggl0MjQyLnRlc3SCCXQyNDMudGVzdIIJdDI0NC50\nZXN0ggl0MjQ1LnRlc3SCCXQyNDYudGVzdIIJdDI0Ny50ZXN0ggl0MjQ4LnRlc3SC\nCXQyNDkudGVzdIIJdDI1MC50ZXN0ggl0MjUxLnRlc3SCCXQyNTIudGVzdIIJdDI1\nMy50ZXN0ggl0MjU0LnRlc3SCCXQyNTUudGVzdDANBgkqhkiG9w0BAQsFAAOCAQEA\nJIFn5ymMVnj0DOFldXQzAjaosat0Z1dAca0BFO/4bf+IfvpaLvZCiSucInV0ejgR\ndP3UsoiXV8qXBax1nr5t4k+yOGYbhgj3imHFtKhFaqJ45AqEJOmzCHWIN0LkN+YL\nME6JBJr86EB+diLPBS7iljmtvN7avvmJ8AbGFI6eB5BwSjewavWpv55u52zMWti7\nCa2WpKffH74zhnGqkbMzEiiRa1L1+H/uQBJ0BEeAZbr+pSkJZJvzY/eH8a7fLHra\nLfBqD4epDm6RI6gSNeJ+G7qSfpVSk7l9bsVh7rUTSSCKBxhcImudqBuLfswoa0Ub\nZoA33vstMRAur0m/blHQHA==\n-----END CERTIFICATE-----\n", }; -static const size_t kLen48 = 13599; +static const size_t kLen49 = 13599; -static const char *kData49[] = { +static const char *kData50[] = { "-----BEGIN CERTIFICATE-----\nMIIYgzCCF2ugAwIBAgIBBjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJDQTAg\nFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowEjEQMA4GA1UEAxMHdDAu\ndGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoL2oQZEgFBdXwu\nPb29W75T63JfNJKKdYi6YrmKM+EKbcMue/hFrLGQXB6a2eQZFn+j3hmexeQF9T8i\nWxh2S6rzAr1Yj+qXeDBaMf4oBEiEhBxIsaIlws3qQa4baeVEEoxw+A+ISrYHTIFc\nV/i0bcIFt5p7v7wbu686a/w0vIqPfad5amdQJMvmjZXDI+jGMvFPmBRHr2/1dJUW\nPaKsJluwR514pJv74urIyEt+dFPM2/5kc2HiLNkeuS1Hbky+dPlDIGrfaHHsCNnb\n/GjvQ6YfvDXRrYPCxWMk0x3FMSaDK9T0zoJ5hE9fViR+D6xcJO2RNUCUENS+Iipj\n3kIrLbkCAwEAAaOCFeUwghXhMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr\nBgEFBQcDATAMBgNVHRMBAf8EAjAAMIIVqgYDVR0RBIIVoTCCFZ2CB3QwLnRlc3SC\nB3QxLnRlc3SCB3QyLnRlc3SCB3QzLnRlc3SCB3Q0LnRlc3SCB3Q1LnRlc3SCB3Q2\nLnRlc3SCB3Q3LnRlc3SCB3Q4LnRlc3SCB3Q5LnRlc3SCCHQxMC50ZXN0ggh0MTEu\ndGVzdIIIdDEyLnRlc3SCCHQxMy50ZXN0ggh0MTQudGVzdIIIdDE1LnRlc3SCCHQx\nNi50ZXN0ggh0MTcudGVzdIIIdDE4LnRlc3SCCHQxOS50ZXN0ggh0MjAudGVzdIII\ndDIxLnRlc3SCCHQyMi50ZXN0ggh0MjMudGVzdIIIdDI0LnRlc3SCCHQyNS50ZXN0\nggh0MjYudGVzdIIIdDI3LnRlc3SCCHQyOC50ZXN0ggh0MjkudGVzdIIIdDMwLnRl\nc3SCCHQzMS50ZXN0ggh0MzIudGVzdIIIdDMzLnRlc3SCCHQzNC50ZXN0ggh0MzUu\ndGVzdIIIdDM2LnRlc3SCCHQzNy50ZXN0ggh0MzgudGVzdIIIdDM5LnRlc3SCCHQ0\nMC50ZXN0ggh0NDEudGVzdIIIdDQyLnRlc3SCCHQ0My50ZXN0ggh0NDQudGVzdIII\ndDQ1LnRlc3SCCHQ0Ni50ZXN0ggh0NDcudGVzdIIIdDQ4LnRlc3SCCHQ0OS50ZXN0\nggh0NTAudGVzdIIIdDUxLnRlc3SCCHQ1Mi50ZXN0ggh0NTMudGVzdIIIdDU0LnRl\nc3SCCHQ1NS50ZXN0ggh0NTYudGVzdIIIdDU3LnRlc3SCCHQ1OC50ZXN0ggh0NTku\ndGVzdIIIdDYwLnRlc3SCCHQ2MS50ZXN0ggh0NjIudGVzdIIIdDYzLnRlc3SCCHQ2\nNC50ZXN0ggh0NjUudGVzdIIIdDY2LnRlc3SCCHQ2Ny50ZXN0ggh0NjgudGVzdIII\ndDY5LnRlc3SCCHQ3MC50ZXN0ggh0NzEudGVzdIIIdDcyLnRlc3SCCHQ3My50ZXN0\nggh0NzQudGVzdIIIdDc1LnRlc3SCCHQ3Ni50ZXN0ggh0NzcudGVzdIIIdDc4LnRl\nc3SCCHQ3OS50ZXN0ggh0ODAudGVzdIIIdDgxLnRlc3SCCHQ4Mi50ZXN0ggh0ODMu\ndGVzdIIIdDg0LnRlc3SCCHQ4NS50ZXN0ggh0ODYudGVzdIIIdDg3LnRlc3SCCHQ4\nOC50ZXN0ggh0ODkudGVzdIIIdDkwLnRlc3SCCHQ5MS50ZXN0ggh0OTIudGVzdIII\ndDkzLnRlc3SCCHQ5NC50ZXN0ggh0OTUudGVzdIIIdDk2LnRlc3SCCHQ5Ny50ZXN0\nggh0OTgudGVzdIIIdDk5LnRlc3SCCXQxMDAudGVzdIIJdDEwMS50ZXN0ggl0MTAy\nLnRlc3SCCXQxMDMudGVzdIIJdDEwNC50ZXN0ggl0MTA1LnRlc3SCCXQxMDYudGVz\ndIIJdDEwNy50ZXN0ggl0MTA4LnRlc3SCCXQxMDkudGVzdIIJdDExMC50ZXN0ggl0\nMTExLnRlc3SCCXQxMTIudGVzdIIJdDExMy50ZXN0ggl0MTE0LnRlc3SCCXQxMTUu\ndGVzdIIJdDExNi50ZXN0ggl0MTE3LnRlc3SCCXQxMTgudGVzdIIJdDExOS50ZXN0\nggl0MTIwLnRlc3SCCXQxMjEudGVzdIIJdDEyMi50ZXN0ggl0MTIzLnRlc3SCCXQx\nMjQudGVzdIIJdDEyNS50ZXN0ggl0MTI2LnRlc3SCCXQxMjcudGVzdIIJdDEyOC50\nZXN0ggl0MTI5LnRlc3SCCXQxMzAudGVzdIIJdDEzMS50ZXN0ggl0MTMyLnRlc3SC\nCXQxMzMudGVzdIIJdDEzNC50ZXN0ggl0MTM1LnRlc3SCCXQxMzYudGVzdIIJdDEz\nNy50ZXN0ggl0MTM4LnRlc3SCCXQxMzkudGVzdIIJdDE0MC50ZXN0ggl0MTQxLnRl\nc3SCCXQxNDIudGVzdIIJdDE0My50ZXN0ggl0MTQ0LnRlc3SCCXQxNDUudGVzdIIJ\ndDE0Ni50ZXN0ggl0MTQ3LnRlc3SCCXQxNDgudGVzdIIJdDE0OS50ZXN0ggl0MTUw\nLnRlc3SCCXQxNTEudGVzdIIJdDE1Mi50ZXN0ggl0MTUzLnRlc3SCCXQxNTQudGVz\ndIIJdDE1NS50ZXN0ggl0MTU2LnRlc3SCCXQxNTcudGVzdIIJdDE1OC50ZXN0ggl0\nMTU5LnRlc3SCCXQxNjAudGVzdIIJdDE2MS50ZXN0ggl0MTYyLnRlc3SCCXQxNjMu\ndGVzdIIJdDE2NC50ZXN0ggl0MTY1LnRlc3SCCXQxNjYudGVzdIIJdDE2Ny50ZXN0\nggl0MTY4LnRlc3SCCXQxNjkudGVzdIIJdDE3MC50ZXN0ggl0MTcxLnRlc3SCCXQx\nNzIudGVzdIIJdDE3My50ZXN0ggl0MTc0LnRlc3SCCXQxNzUudGVzdIIJdDE3Ni50\nZXN0ggl0MTc3LnRlc3SCCXQxNzgudGVzdIIJdDE3OS50ZXN0ggl0MTgwLnRlc3SC\nCXQxODEudGVzdIIJdDE4Mi50ZXN0ggl0MTgzLnRlc3SCCXQxODQudGVzdIIJdDE4\nNS50ZXN0ggl0MTg2LnRlc3SCCXQxODcudGVzdIIJdDE4OC50ZXN0ggl0MTg5LnRl\nc3SCCXQxOTAudGVzdIIJdDE5MS50ZXN0ggl0MTkyLnRlc3SCCXQxOTMudGVzdIIJ\ndDE5NC50ZXN0ggl0MTk1LnRlc3SCCXQxOTYudGVzdIIJdDE5Ny50ZXN0ggl0MTk4\nLnRlc3SCCXQxOTkudGVzdIIJdDIwMC50ZXN0ggl0MjAxLnRlc3SCCXQyMDIudGVz\ndIIJdDIwMy50ZXN0ggl0MjA0LnRlc3SCCXQyMDUudGVzdIIJdDIwNi50ZXN0ggl0\nMjA3LnRlc3SCCXQyMDgudGVzdIIJdDIwOS50ZXN0ggl0MjEwLnRlc3SCCXQyMTEu\ndGVzdIIJdDIxMi50ZXN0ggl0MjEzLnRlc3SCCXQyMTQudGVzdIIJdDIxNS50ZXN0\nggl0MjE2LnRlc3SCCXQyMTcudGVzdIIJdDIxOC50ZXN0ggl0MjE5LnRlc3SCCXQy\nMjAudGVzdIIJdDIyMS50ZXN0ggl0MjIyLnRlc3SCCXQyMjMudGVzdIIJdDIyNC50\nZXN0ggl0MjI1LnRlc3SCCXQyMjYudGVzdIIJdDIyNy50ZXN0ggl0MjI4LnRlc3SC\nCXQyMjkudGVzdIIJdDIzMC50ZXN0ggl0MjMxLnRlc3SCCXQyMzIudGVzdIIJdDIz\nMy50ZXN0ggl0MjM0LnRlc3SCCXQyMzUudGVzdIIJdDIzNi50ZXN0ggl0MjM3LnRl\nc3SCCXQyMzgudGVzdIIJdDIzOS50ZXN0ggl0MjQwLnRlc3SCCXQyNDEudGVzdIIJ\ndDI0Mi50ZXN0ggl0MjQzLnRlc3SCCXQyNDQudGVzdIIJdDI0NS50ZXN0ggl0MjQ2\nLnRlc3SCCXQyNDcudGVzdIIJdDI0OC50ZXN0ggl0MjQ5LnRlc3SCCXQyNTAudGVz\ndIIJdDI1MS50ZXN0ggl0MjUyLnRlc3SCCXQyNTMudGVzdIIJdDI1NC50ZXN0ggl0\nMjU1LnRlc3SCCXQyNTYudGVzdIIJdDI1Ny50ZXN0ggl0MjU4LnRlc3SCCXQyNTku\ndGVzdIIJdDI2MC50ZXN0ggl0MjYxLnRlc3SCCXQyNjIudGVzdIIJdDI2My50ZXN0\nggl0MjY0LnRlc3SCCXQyNjUudGVzdIIJdDI2Ni50ZXN0ggl0MjY3LnRlc3SCCXQy\nNjgudGVzdIIJdDI2OS50ZXN0ggl0MjcwLnRlc3SCCXQyNzEudGVzdIIJdDI3Mi50\nZXN0ggl0MjczLnRlc3SCCXQyNzQudGVzdIIJdDI3NS50ZXN0ggl0Mjc2LnRlc3SC\nCXQyNzcudGVzdIIJdDI3OC50ZXN0ggl0Mjc5LnRlc3SCCXQyODAudGVzdIIJdDI4\nMS50ZXN0ggl0MjgyLnRlc3SCCXQyODMudGVzdIIJdDI4NC50ZXN0ggl0Mjg1LnRl\nc3SCCXQyODYudGVzdIIJdDI4Ny50ZXN0ggl0Mjg4LnRlc3SCCXQyODkudGVzdIIJ\ndDI5MC50ZXN0ggl0MjkxLnRlc3SCCXQyOTIudGVzdIIJdDI5My50ZXN0ggl0Mjk0\nLnRlc3SCCXQyOTUudGVzdIIJdDI5Ni50ZXN0ggl0Mjk3LnRlc3SCCXQyOTgudGVz\ndIIJdDI5OS50ZXN0ggl0MzAwLnRlc3SCCXQzMDEudGVzdIIJdDMwMi50ZXN0ggl0\nMzAzLnRlc3SCCXQzMDQudGVzdIIJdDMwNS50ZXN0ggl0MzA2LnRlc3SCCXQzMDcu\ndGVzdIIJdDMwOC50ZXN0ggl0MzA5LnRlc3SCCXQzMTAudGVzdIIJdDMxMS50ZXN0\nggl0MzEyLnRlc3SCCXQzMTMudGVzdIIJdDMxNC50ZXN0ggl0MzE1LnRlc3SCCXQz\nMTYudGVzdIIJdDMxNy50ZXN0ggl0MzE4LnRlc3SCCXQzMTkudGVzdIIJdDMyMC50\nZXN0ggl0MzIxLnRlc3SCCXQzMjIudGVzdIIJdDMyMy50ZXN0ggl0MzI0LnRlc3SC\nCXQzMjUudGVzdIIJdDMyNi50ZXN0ggl0MzI3LnRlc3SCCXQzMjgudGVzdIIJdDMy\nOS50ZXN0ggl0MzMwLnRlc3SCCXQzMzEudGVzdIIJdDMzMi50ZXN0ggl0MzMzLnRl\nc3SCCXQzMzQudGVzdIIJdDMzNS50ZXN0ggl0MzM2LnRlc3SCCXQzMzcudGVzdIIJ\ndDMzOC50ZXN0ggl0MzM5LnRlc3SCCXQzNDAudGVzdIIJdDM0MS50ZXN0ggl0MzQy\nLnRlc3SCCXQzNDMudGVzdIIJdDM0NC50ZXN0ggl0MzQ1LnRlc3SCCXQzNDYudGVz\ndIIJdDM0Ny50ZXN0ggl0MzQ4LnRlc3SCCXQzNDkudGVzdIIJdDM1MC50ZXN0ggl0\nMzUxLnRlc3SCCXQzNTIudGVzdIIJdDM1My50ZXN0ggl0MzU0LnRlc3SCCXQzNTUu\ndGVzdIIJdDM1Ni50ZXN0ggl0MzU3LnRlc3SCCXQzNTgudGVzdIIJdDM1OS50ZXN0\nggl0MzYwLnRlc3SCCXQzNjEudGVzdIIJdDM2Mi50ZXN0ggl0MzYzLnRlc3SCCXQz\nNjQudGVzdIIJdDM2NS50ZXN0ggl0MzY2LnRlc3SCCXQzNjcudGVzdIIJdDM2OC50\nZXN0ggl0MzY5LnRlc3SCCXQzNzAudGVzdIIJdDM3MS50ZXN0ggl0MzcyLnRlc3SC\nCXQzNzMudGVzdIIJdDM3NC50ZXN0ggl0Mzc1LnRlc3SCCXQzNzYudGVzdIIJdDM3\nNy50ZXN0ggl0Mzc4LnRlc3SCCXQzNzkudGVzdIIJdDM4MC50ZXN0ggl0MzgxLnRl\nc3SCCXQzODIudGVzdIIJdDM4My50ZXN0ggl0Mzg0LnRlc3SCCXQzODUudGVzdIIJ\ndDM4Ni50ZXN0ggl0Mzg3LnRlc3SCCXQzODgudGVzdIIJdDM4OS50ZXN0ggl0Mzkw\nLnRlc3SCCXQzOTEudGVzdIIJdDM5Mi50ZXN0ggl0MzkzLnRlc3SCCXQzOTQudGVz\ndIIJdDM5NS50ZXN0ggl0Mzk2LnRlc3SCCXQzOTcudGVzdIIJdDM5OC50ZXN0ggl0\nMzk5LnRlc3SCCXQ0MDAudGVzdIIJdDQwMS50ZXN0ggl0NDAyLnRlc3SCCXQ0MDMu\ndGVzdIIJdDQwNC50ZXN0ggl0NDA1LnRlc3SCCXQ0MDYudGVzdIIJdDQwNy50ZXN0\nggl0NDA4LnRlc3SCCXQ0MDkudGVzdIIJdDQxMC50ZXN0ggl0NDExLnRlc3SCCXQ0\nMTIudGVzdIIJdDQxMy50ZXN0ggl0NDE0LnRlc3SCCXQ0MTUudGVzdIIJdDQxNi50\nZXN0ggl0NDE3LnRlc3SCCXQ0MTgudGVzdIIJdDQxOS50ZXN0ggl0NDIwLnRlc3SC\nCXQ0MjEudGVzdIIJdDQyMi50ZXN0ggl0NDIzLnRlc3SCCXQ0MjQudGVzdIIJdDQy\nNS50ZXN0ggl0NDI2LnRlc3SCCXQ0MjcudGVzdIIJdDQyOC50ZXN0ggl0NDI5LnRl\nc3SCCXQ0MzAudGVzdIIJdDQzMS50ZXN0ggl0NDMyLnRlc3SCCXQ0MzMudGVzdIIJ\ndDQzNC50ZXN0ggl0NDM1LnRlc3SCCXQ0MzYudGVzdIIJdDQzNy50ZXN0ggl0NDM4\nLnRlc3SCCXQ0MzkudGVzdIIJdDQ0MC50ZXN0ggl0NDQxLnRlc3SCCXQ0NDIudGVz\ndIIJdDQ0My50ZXN0ggl0NDQ0LnRlc3SCCXQ0NDUudGVzdIIJdDQ0Ni50ZXN0ggl0\nNDQ3LnRlc3SCCXQ0NDgudGVzdIIJdDQ0OS50ZXN0ggl0NDUwLnRlc3SCCXQ0NTEu\ndGVzdIIJdDQ1Mi50ZXN0ggl0NDUzLnRlc3SCCXQ0NTQudGVzdIIJdDQ1NS50ZXN0\nggl0NDU2LnRlc3SCCXQ0NTcudGVzdIIJdDQ1OC50ZXN0ggl0NDU5LnRlc3SCCXQ0\nNjAudGVzdIIJdDQ2MS50ZXN0ggl0NDYyLnRlc3SCCXQ0NjMudGVzdIIJdDQ2NC50\nZXN0ggl0NDY1LnRlc3SCCXQ0NjYudGVzdIIJdDQ2Ny50ZXN0ggl0NDY4LnRlc3SC\nCXQ0NjkudGVzdIIJdDQ3MC50ZXN0ggl0NDcxLnRlc3SCCXQ0NzIudGVzdIIJdDQ3\nMy50ZXN0ggl0NDc0LnRlc3SCCXQ0NzUudGVzdIIJdDQ3Ni50ZXN0ggl0NDc3LnRl\nc3SCCXQ0NzgudGVzdIIJdDQ3OS50ZXN0ggl0NDgwLnRlc3SCCXQ0ODEudGVzdIIJ\ndDQ4Mi50ZXN0ggl0NDgzLnRlc3SCCXQ0ODQudGVzdIIJdDQ4NS50ZXN0ggl0NDg2\nLnRlc3SCCXQ0ODcudGVzdIIJdDQ4OC50ZXN0ggl0NDg5LnRlc3SCCXQ0OTAudGVz\ndIIJdDQ5MS50ZXN0ggl0NDkyLnRlc3SCCXQ0OTMudGVzdIIJdDQ5NC50ZXN0ggl0\nNDk1LnRlc3SCCXQ0OTYudGVzdIIJdDQ5Ny50ZXN0ggl0NDk4LnRlc3SCCXQ0OTku\ndGVzdIIJdDUwMC50ZXN0ggl0NTAxLnRlc3SCCXQ1MDIudGVzdIIJdDUwMy50ZXN0\nggl0NTA0LnRlc3SCCXQ1MDUudGVzdIIJdDUwNi50ZXN0ggl0NTA3LnRlc3SCCXQ1\nMDgudGVzdIIJdDUwOS50ZXN0ggl0NTEwLnRlc3SCCXQ1MTEudGVzdIIJdDUxMi50\nZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQBjxDfYTob", "CREWVHPrt1T9iT2t0gieS7hVw\nlQaezO1n+m0MerQ92DHhMXBROBiMXIWyvTa341xClpYAwPqqAIUEdS0L5r4Jq/Ep\n4uglb+eZXMvTAm89KH3L8xTugc8UtHMqbfyo92v96wgFXBrcDDXIkGdPkLyz2s2J\nQjpNVG/La/EYTQdHPgv6Rg0g+t6RNN1JJ0p1wQ5ItDc8d/bfWdlG/EViWVRsiSBh\n7YRbkGWdnHnorCe0yIg0jKCk3UhgXaYY66/alpmE/QVXSaLgNvdmJ5m9mixY0ZaB\n0niy+KzIgBczvDcxVdL5/fsxGvA4nI8Gi7Z+EJDKXeED+FwcTDJD\n-----END CERTIFICATE-----\n", }; -static const size_t kLen49 = 8557; +static const size_t kLen50 = 8557; -static const char *kData50[] = { +static const char *kData51[] = { "-----BEGIN CERTIFICATE-----\nMII2fzCCNWegAwIBAgIBBzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDEwJDQTAg\nFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowgjO+MRAwDgYDVQQDEwd0\nMC50ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nMUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0MkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nM0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nNUB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0NkB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nN0B0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0OEB0ZXN0MRYwFAYJKoZIhvcNAQkBFgd0\nOUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTBAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDExQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxMkB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0MTNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDE0QHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQxNUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MTZAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDE3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQxOEB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0MTlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDIwQHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQyMUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjJAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDIzQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQyNEB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0MjVAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDI2QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQyN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MjhAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDI5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzMEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDMy\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzM0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nMzRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDM1QHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQzNkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0MzdAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDM4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQzOUB0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0NDBAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQxQHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ0MkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDNAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDQ0QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ0NUB0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0NDZAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDQ3QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ0OEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NDlAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDUwQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1MUB0ZXN0\nMRcwFQYJKoZIhvcNAQkBFgh0NTJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDUzQHRl\nc3QxFzAVBgkqhkiG9w0BCQEWCHQ1NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NTVA\ndGVzdDEXMBUGCSqGSIb3DQEJARYIdDU2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ1\nN0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NThAdGVzdDEXMBUGCSqGSIb3DQEJARYI\ndDU5QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2MEB0ZXN0MRcwFQYJKoZIhvcNAQkB\nFgh0NjFAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDYyQHRlc3QxFzAVBgkqhkiG9w0B\nCQEWCHQ2M0B0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NjRAdGVzdDEXMBUGCSqGSIb3\nDQEJARYIdDY1QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ2NkB0ZXN0MRcwFQYJKoZI\nhvcNAQkBFgh0NjdAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDY4QHRlc3QxFzAVBgkq\nhkiG9w0BCQEWCHQ2OUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzBAdGVzdDEXMBUG\nCSqGSIb3DQEJARYIdDcxQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3MkB0ZXN0MRcw\nFQYJKoZIhvcNAQkBFgh0NzNAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDc0QHRlc3Qx\nFzAVBgkqhkiG9w0BCQEWCHQ3NUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzZAdGVz\ndDEXMBUGCSqGSIb3DQEJARYIdDc3QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ3OEB0\nZXN0MRcwFQYJKoZIhvcNAQkBFgh0NzlAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgw\nQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4MUB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0\nODJAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDgzQHRlc3QxFzAVBgkqhkiG9w0BCQEW\nCHQ4NEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0ODVAdGVzdDEXMBUGCSqGSIb3DQEJ\nARYIdDg2QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ4N0B0ZXN0MRcwFQYJKoZIhvcN\nAQkBFgh0ODhAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDg5QHRlc3QxFzAVBgkqhkiG\n9w0BCQEWCHQ5MEB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTFAdGVzdDEXMBUGCSqG\nSIb3DQEJARYIdDkyQHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5M0B0ZXN0MRcwFQYJ\nKoZIhvcNAQkBFgh0OTRAdGVzdDEXMBUGCSqGSIb3DQEJARYIdDk1QHRlc3QxFzAV\nBgkqhkiG9w0BCQEWCHQ5NkB0ZXN0MRcwFQYJKoZIhvcNAQkBFgh0OTdAdGVzdDEX\nMBUGCSqGSIb3DQEJARYIdDk4QHRlc3QxFzAVBgkqhkiG9w0BCQEWCHQ5OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTAwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTAzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEwNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTA2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEwOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTA5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDExMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTEyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEx\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTE1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxMTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDExN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTE4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDEyMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTIxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxMjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyM0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTI0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDEyNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTI3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDEyOUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTMwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxMzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEzMkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTMzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDEzNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxMzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDEz\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTM5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTQyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE0NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTQ1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE0N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTQ4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTUxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE1M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTU0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE1NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTU3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE1OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTYzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxNjRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE2NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTY2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNjdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE2OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTY5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxNzBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTcyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE3NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTc1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxNzZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDE3N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTc4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQxNzlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4MEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MTgxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxODJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDE4M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQxODVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTg3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQxODhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE4OUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MTkwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDE5MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MTkzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQxOTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5NUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MTk2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQxOTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDE5OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMTk5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIwMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjAyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIwNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjA1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIwN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjA4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIx\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjExQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjE0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDIxNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjE3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyMThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIxOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjIwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjIzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMjRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDIyNUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjI2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyMjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIyOEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjI5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDIzMUB0ZXN0MRgwFgY", "JKoZIhvcNAQkBFgl0MjMyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIz\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjM1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyMzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDIzN0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjM4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyMzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI0MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjQxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyNDJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjQ0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI0NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjQ3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNDhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI0OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjUwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyNTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI1MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MjUzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDI1NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjU2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyNTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI1\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjU5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyNjBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI2MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MjYyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNjNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI2NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjY1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyNjZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI2N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjY4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNjlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI3MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjcxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNzJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI3M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjc0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyNzVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI3NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0Mjc3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyNzhAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDI3OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjgwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQyODFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI4\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MjgzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQyODRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI4NUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0Mjg2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyODdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDI4OEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjg5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQyOTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDI5MUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MjkyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyOTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDI5NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMjk1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQyOTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDI5N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mjk4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQyOTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMwMEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzAxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMDJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDMwM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzA0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzMDVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMw\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzA3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzMDhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMwOUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzEwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMTFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDMxMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzEzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzMTRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMxNUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzE2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMTdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDMxOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzE5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDMyMUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzIyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzMjNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMyNEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzI1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDMyN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzI4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzMjlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMz\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzMxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzMzJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMzM0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzM0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzMzVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDMzNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzM3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzMzhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDMzOUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzQwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNDFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM0MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzQzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNDRAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM0NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzQ2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzNDdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM0OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzQ5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM1MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzUyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM1\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzU1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzNTZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM1N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzU4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNTlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDM2MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzYxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzNjJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM2M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0MzY0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNjVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM2NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzY3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNjhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM2OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0MzcwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzNzFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM3MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0MzczQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzNzRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM3NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzc2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQzNzdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM3\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzc5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQzODBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM4MUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0MzgyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzODNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDM4NEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzg1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQzODZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM4N0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0Mzg4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzODlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDM5MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nMzkxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzOTJAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDM5M0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0Mzk0QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQzOTVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDM5NkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0Mzk3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQzOThAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDM5OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDAwQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MDFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQw\nMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDAzQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0MDRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQwNUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDA2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MDdAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQwOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDA5QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0MTBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQxMUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDEyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MTNA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQxNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDE1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MTZAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQxN0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDE4QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0MTlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQyMEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDIxQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MjJAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQyM0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDI0QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MjVAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQy\nNkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDI3QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0MjhAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQyOUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDMwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MzFAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQzMkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDMzQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0MzRAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQzNUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDM2QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0MzdA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQzOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDM5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDBAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ0MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDQyQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0NDNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ0NEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDQ1QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDZAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ0N0B0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDQ4QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NDlAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1\nMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDUxQHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0NTJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1M0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDU0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NTVAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQ1NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDU3QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0NThAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ1OUB0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDYwQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NjFA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ2MkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDYzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NjRAd", "GVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ2NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDY2QHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0NjdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ2OEB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDY5QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzBAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ3MUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDcyQHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzNAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ3\nNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDc1QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ0NzZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ3N0B0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NDc4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0NzlAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDQ4MEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDgxQHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ0ODJAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ4M0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NDg0QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0ODVA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ4NkB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNDg3QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0ODhAdGVzdDEYMBYGCSqGSIb3DQEJ\nARYJdDQ4OUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDkwQHRlc3QxGDAWBgkqhkiG\n9w0BCQEWCXQ0OTFAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ5MkB0ZXN0MRgwFgYJ\nKoZIhvcNAQkBFgl0NDkzQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ0OTRAdGVzdDEY\nMBYGCSqGSIb3DQEJARYJdDQ5NUB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDk2QHRl\nc3QxGDAWBgkqhkiG9w0BCQEWCXQ0OTdAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDQ5\nOEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NDk5QHRlc3QxGDAWBgkqhkiG9w0BCQEW\nCXQ1MDBAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUwMUB0ZXN0MRgwFgYJKoZIhvcN\nAQkBFgl0NTAyQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MDNAdGVzdDEYMBYGCSqG\nSIb3DQEJARYJdDUwNEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0NTA1QHRlc3QxGDAW\nBgkqhkiG9w0BCQEWCXQ1MDZAdGVzdDEYMBYGCSqGSIb3DQEJARYJdDUwN0B0ZXN0\nMRgwFgYJKoZIhvcNAQkBFgl0NTA4QHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MDlA\ndGVzdDEYMBYGCSqGSIb3DQEJARYJdDUxMEB0ZXN0MRgwFgYJKoZIhvcNAQkBFgl0\nNTExQHRlc3QxGDAWBgkqhkiG9w0BCQEWCXQ1MTJAdGVzdDCCASIwDQYJKoZIhvcN\nAQEBBQADggEPADCCAQoCggEBALoL2oQZEgFBdXwuPb29W75T63JfNJKKdYi6YrmK\nM+EKbcMue/hFrLGQXB6a2eQZFn+j3hmexeQF9T8iWxh2S6rzAr1Yj+qXeDBaMf4o\nBEiEhBxIsaIlws3qQa4baeVEEoxw+A+ISrYHTIFcV/i0bcIFt5p7v7wbu686a/w0\nvIqPfad5amdQJMvmjZXDI+jGMvFPmBRHr2/1dJUWPaKsJluwR514pJv74urIyEt+\ndFPM2/5kc2HiLNkeuS1Hbky+dPlDIGrfaHHsCNnb/GjvQ6YfvDXRrYPCxWMk0x3F\nMSaDK9T0zoJ5hE9fViR+D6xcJO2RNUCUENS+Iipj3kIrLbkCAwEAAaM1MDMwDgYD\nVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAw\nDQYJKoZIhvcNAQELBQADggEBAH6ad2kFE0qGDe3ErMdwTGjbBz3T12dDvAUVhGHQ\nuZShOdPsXMHD2mUqFgLE0iJFeXB7jOSAKtzmKHNmxZ4W0UZ7eMPPogkgIbG3d3yR\n8zBO21CUyOQWChywpKcAou9ji3Kq6pb4+mqq0a5TGIYyGJKSUTv09KI+iHgwteCX\nDHzzhuTs8AhodmNO5K/F9YFWJWvQ1NrwyUmOFEw8/UcljyKxFrP2VEov0fWeiTRB\nPs6VaFBW7SEEi8fAM9W5kfsl+iWRvwFcFdXGQt1HbeywCu58DLI4uceHCFb+3MMO\nXv7wJ5UhQODuzwuq7CuZvlxR2tiFoPP+s5fPH0L8MBP5z6w=\n-----END CERTIFICATE-----\n", }; -static const size_t kLen50 = 18953; +static const size_t kLen51 = 18953; static std::string AssembleString(const char **data, size_t len) { std::string ret; @@ -2758,144 +2764,147 @@ if (strcmp(path, "crypto/cipher_extra/test/aes_128_ccm_bluetooth_tests.txt") == 0) { return AssembleString(kData4, kLen4); } - if (strcmp(path, "crypto/cipher_extra/test/aes_128_ctr_hmac_sha256.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_128_ccm_bluetooth_8_tests.txt") == 0) { return AssembleString(kData5, kLen5); } - if (strcmp(path, "crypto/cipher_extra/test/aes_128_gcm_siv_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_128_ctr_hmac_sha256.txt") == 0) { return AssembleString(kData6, kLen6); } - if (strcmp(path, "crypto/cipher_extra/test/aes_128_gcm_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_128_gcm_siv_tests.txt") == 0) { return AssembleString(kData7, kLen7); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha1_ssl3_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_128_gcm_tests.txt") == 0) { return AssembleString(kData8, kLen8); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha1_tls_implicit_iv_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha1_ssl3_tests.txt") == 0) { return AssembleString(kData9, kLen9); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha1_tls_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha1_tls_implicit_iv_tests.txt") == 0) { return AssembleString(kData10, kLen10); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha256_tls_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha1_tls_tests.txt") == 0) { return AssembleString(kData11, kLen11); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha384_tls_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha256_tls_tests.txt") == 0) { return AssembleString(kData12, kLen12); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_ctr_hmac_sha256.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_cbc_sha384_tls_tests.txt") == 0) { return AssembleString(kData13, kLen13); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_gcm_siv_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_ctr_hmac_sha256.txt") == 0) { return AssembleString(kData14, kLen14); } - if (strcmp(path, "crypto/cipher_extra/test/aes_256_gcm_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_gcm_siv_tests.txt") == 0) { return AssembleString(kData15, kLen15); } - if (strcmp(path, "crypto/cipher_extra/test/chacha20_poly1305_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/aes_256_gcm_tests.txt") == 0) { return AssembleString(kData16, kLen16); } - if (strcmp(path, "crypto/cipher_extra/test/cipher_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/chacha20_poly1305_tests.txt") == 0) { return AssembleString(kData17, kLen17); } - if (strcmp(path, "crypto/cipher_extra/test/des_ede3_cbc_sha1_ssl3_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/cipher_tests.txt") == 0) { return AssembleString(kData18, kLen18); } - if (strcmp(path, "crypto/cipher_extra/test/des_ede3_cbc_sha1_tls_implicit_iv_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/des_ede3_cbc_sha1_ssl3_tests.txt") == 0) { return AssembleString(kData19, kLen19); } - if (strcmp(path, "crypto/cipher_extra/test/des_ede3_cbc_sha1_tls_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/des_ede3_cbc_sha1_tls_implicit_iv_tests.txt") == 0) { return AssembleString(kData20, kLen20); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_128_cbc.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/des_ede3_cbc_sha1_tls_tests.txt") == 0) { return AssembleString(kData21, kLen21); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_128_ctr.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_128_cbc.txt") == 0) { return AssembleString(kData22, kLen22); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_128_gcm.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_128_ctr.txt") == 0) { return AssembleString(kData23, kLen23); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_192_cbc.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_128_gcm.txt") == 0) { return AssembleString(kData24, kLen24); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_192_ctr.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_192_cbc.txt") == 0) { return AssembleString(kData25, kLen25); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_256_cbc.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_192_ctr.txt") == 0) { return AssembleString(kData26, kLen26); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_256_ctr.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_256_cbc.txt") == 0) { return AssembleString(kData27, kLen27); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_256_gcm.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_256_ctr.txt") == 0) { return AssembleString(kData28, kLen28); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/tdes_cbc.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/aes_256_gcm.txt") == 0) { return AssembleString(kData29, kLen29); } - if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/tdes_ecb.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/tdes_cbc.txt") == 0) { return AssembleString(kData30, kLen30); } - if (strcmp(path, "crypto/curve25519/ed25519_tests.txt") == 0) { + if (strcmp(path, "crypto/cipher_extra/test/nist_cavp/tdes_ecb.txt") == 0) { return AssembleString(kData31, kLen31); } - if (strcmp(path, "crypto/ecdh/ecdh_tests.txt") == 0) { + if (strcmp(path, "crypto/curve25519/ed25519_tests.txt") == 0) { return AssembleString(kData32, kLen32); } - if (strcmp(path, "crypto/evp/evp_tests.txt") == 0) { + if (strcmp(path, "crypto/ecdh/ecdh_tests.txt") == 0) { return AssembleString(kData33, kLen33); } - if (strcmp(path, "crypto/evp/scrypt_tests.txt") == 0) { + if (strcmp(path, "crypto/evp/evp_tests.txt") == 0) { return AssembleString(kData34, kLen34); } - if (strcmp(path, "crypto/fipsmodule/aes/aes_tests.txt") == 0) { + if (strcmp(path, "crypto/evp/scrypt_tests.txt") == 0) { return AssembleString(kData35, kLen35); } - if (strcmp(path, "crypto/fipsmodule/bn/bn_tests.txt") == 0) { + if (strcmp(path, "crypto/fipsmodule/aes/aes_tests.txt") == 0) { return AssembleString(kData36, kLen36); } - if (strcmp(path, "crypto/fipsmodule/ec/p256-x86_64_tests.txt") == 0) { + if (strcmp(path, "crypto/fipsmodule/bn/bn_tests.txt") == 0) { return AssembleString(kData37, kLen37); } - if (strcmp(path, "crypto/fipsmodule/ecdsa/ecdsa_sign_tests.txt") == 0) { + if (strcmp(path, "crypto/fipsmodule/ec/p256-x86_64_tests.txt") == 0) { return AssembleString(kData38, kLen38); } - if (strcmp(path, "crypto/fipsmodule/ecdsa/ecdsa_verify_tests.txt") == 0) { + if (strcmp(path, "crypto/fipsmodule/ecdsa/ecdsa_sign_tests.txt") == 0) { return AssembleString(kData39, kLen39); } - if (strcmp(path, "crypto/fipsmodule/modes/gcm_tests.txt") == 0) { + if (strcmp(path, "crypto/fipsmodule/ecdsa/ecdsa_verify_tests.txt") == 0) { return AssembleString(kData40, kLen40); } - if (strcmp(path, "crypto/fipsmodule/rand/ctrdrbg_vectors.txt") == 0) { + if (strcmp(path, "crypto/fipsmodule/modes/gcm_tests.txt") == 0) { return AssembleString(kData41, kLen41); } - if (strcmp(path, "crypto/hmac_extra/hmac_tests.txt") == 0) { + if (strcmp(path, "crypto/fipsmodule/rand/ctrdrbg_vectors.txt") == 0) { return AssembleString(kData42, kLen42); } - if (strcmp(path, "crypto/poly1305/poly1305_tests.txt") == 0) { + if (strcmp(path, "crypto/hmac_extra/hmac_tests.txt") == 0) { return AssembleString(kData43, kLen43); } - if (strcmp(path, "crypto/x509/many_constraints.pem") == 0) { + if (strcmp(path, "crypto/poly1305/poly1305_tests.txt") == 0) { return AssembleString(kData44, kLen44); } - if (strcmp(path, "crypto/x509/many_names1.pem") == 0) { + if (strcmp(path, "crypto/x509/many_constraints.pem") == 0) { return AssembleString(kData45, kLen45); } - if (strcmp(path, "crypto/x509/many_names2.pem") == 0) { + if (strcmp(path, "crypto/x509/many_names1.pem") == 0) { return AssembleString(kData46, kLen46); } - if (strcmp(path, "crypto/x509/many_names3.pem") == 0) { + if (strcmp(path, "crypto/x509/many_names2.pem") == 0) { return AssembleString(kData47, kLen47); } - if (strcmp(path, "crypto/x509/some_names1.pem") == 0) { + if (strcmp(path, "crypto/x509/many_names3.pem") == 0) { return AssembleString(kData48, kLen48); } - if (strcmp(path, "crypto/x509/some_names2.pem") == 0) { + if (strcmp(path, "crypto/x509/some_names1.pem") == 0) { return AssembleString(kData49, kLen49); } - if (strcmp(path, "crypto/x509/some_names3.pem") == 0) { + if (strcmp(path, "crypto/x509/some_names2.pem") == 0) { return AssembleString(kData50, kLen50); } + if (strcmp(path, "crypto/x509/some_names3.pem") == 0) { + return AssembleString(kData51, kLen51); + } fprintf(stderr, "File not embedded: %s.\n", path); abort(); }
diff --git a/third_party/gvr-android-sdk/BUILD.gn b/third_party/gvr-android-sdk/BUILD.gn index 4ce8053..73e88146 100644 --- a/third_party/gvr-android-sdk/BUILD.gn +++ b/third_party/gvr-android-sdk/BUILD.gn
@@ -40,9 +40,9 @@ "*google/vr/cardboard/VrParamsProviderFactory.class", "*google/vr/cardboard/VrParamsProviderFactory\$ContentProviderClientHandle.class", "*google/vr/cardboard/VrSettingsProviderContract.class", - "*google/vr/internal/controller/ControllerServiceBridge.class", - "*google/vr/internal/controller/ControllerServiceBridge\$*", - "*google/vr/internal/controller/NativeCallbacks.class", + + # TODO(mthiesse): Figure out whether all files in this directory are needed. + "*google/vr/internal/controller/*", "*google/vr/ndk/base/AndroidCompat.class", "*google/vr/ndk/base/BuildConstants.class", "*google/vr/ndk/base/DaydreamApi*.class", @@ -55,25 +55,23 @@ "*google/vr/ndk/base/SdkConfigurationReader.class", "*google/vr/ndk/base/TraceCompat.class", "*google/vr/ndk/base/Version.class", - "*google/vr/sdk/common/deps/a.class", - "*google/vr/sdk/common/deps/b.class", - "*google/vr/sdk/common/deps/c.class", - "*google/vr/sdk/proto/nano/CardboardDevice.class", - "*google/vr/sdk/proto/nano/CardboardDevice\$*", - "*google/vr/sdk/proto/nano/Display.class", - "*google/vr/sdk/proto/nano/Display\$*", - "*google/vr/sdk/proto/nano/SdkConfiguration.class", - "*google/vr/sdk/proto/nano/SdkConfiguration\$*", - "*google/vr/vrcore/base/api/ParcelableProto.class", - "*google/vr/vrcore/base/api/VrCoreConstants.class", - "*google/vr/vrcore/base/api/VrCoreNotAvailableException.class", - "*google/vr/vrcore/base/api/VrCoreUtils.class", - "*google/vr/vrcore/base/api/VrCoreUtils\$*", - "*google/vr/vrcore/common/api/IDaydream*", - "*google/vr/vrcore/common/api/ITransition*", - "*google/vr/vrcore/common/api/IVrCore*", - "*google/vr/vrcore/controller/api/IController*", - "*google/vr/vrcore/controller/api/Controller*", + + # TODO(mthiesse): Figure out whether all files in this directory are needed. + "*google/vr/sdk/common/deps/*", + + # TODO(mthiesse): Figure out whether all files in this directory are needed. + "*google/vr/sdk/proto/nano/*", + + # TODO(mthiesse): Figure out whether all files in this directory are needed. + "*google/vr/vrcore/base/api/*", + + # TODO(mthiesse): Figure out whether all files in this directory are needed. + "*google/vr/vrcore/common/api/*", + + # TODO(mthiesse): Figure out whether all files in this directory are needed. + "*google/vr/vrcore/controller/api/*", + + # TODO(mthiesse): Figure out whether all files in this directory are needed. "*google/vr/vrcore/library/api/*", ]
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 9407f8a..032305ed 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium
@@ -69,3 +69,6 @@ - Merge http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a6ec26 Regenerated glsl_lexer.cc using Linux 3.13.0-63 (Ubuntu 14.04), Flex 2.5.39. + +- update GLDEBUGPROCARB typedef to latest spec version to avoid type mismatch + between headers (making userParam a const GLvoid*).
diff --git a/tools/clang/blink_gc_plugin/BadPatternFinder.cpp b/tools/clang/blink_gc_plugin/BadPatternFinder.cpp index 4b8152b..f3bec427 100644 --- a/tools/clang/blink_gc_plugin/BadPatternFinder.cpp +++ b/tools/clang/blink_gc_plugin/BadPatternFinder.cpp
@@ -31,14 +31,12 @@ // Matches any application of make_unique where the template argument is // known to refer to a garbage-collected type. auto make_unique_matcher = - callExpr(callee(functionDecl( - hasAnyName( - "::std::make_unique", "::base::MakeUnique", - "::WTF::MakeUnique", "::base::WrapUnique", - "::WTF::WrapUnique", "::WTF::WrapArrayUnique"), - hasTemplateArgument( - 0, refersToType(GarbageCollectedType()))) - .bind("badfunc"))) + callExpr( + callee(functionDecl( + hasAnyName("::std::make_unique", "::base::WrapUnique"), + hasTemplateArgument( + 0, refersToType(GarbageCollectedType()))) + .bind("badfunc"))) .bind("bad"); match_finder.addDynamicMatcher(make_unique_matcher, this); }
diff --git a/tools/code_coverage/coverage.py b/tools/code_coverage/coverage.py index bdd1000..1e60818 100755 --- a/tools/code_coverage/coverage.py +++ b/tools/code_coverage/coverage.py
@@ -307,8 +307,11 @@ html_file.write(html_header + html_table + html_footer) -def _GetPlatform(): - """Returns current running platform.""" +def _GetHostPlatform(): + """Returns the host platform. + + This is separate from the target platform/os that coverage is running for. + """ if sys.platform == 'win32' or sys.platform == 'cygwin': return 'win' if sys.platform.startswith('linux'): @@ -318,10 +321,18 @@ return 'mac' +def _GetTargetOS(): + """Returns the target os specified in args.gn file. + + Returns an empty string is target_os is not specified. + """ + build_args = _ParseArgsGnFile() + return build_args['target_os'] if 'target_os' in build_args else '' + + def _IsIOS(): """Returns true if the target_os specified in args.gn file is ios""" - build_args = _ParseArgsGnFile() - return 'target_os' in build_args and build_args['target_os'] == '"ios"' + return _GetTargetOS() == 'ios' # TODO(crbug.com/759794): remove this function once tools get included to @@ -330,7 +341,7 @@ def DownloadCoverageToolsIfNeeded(): """Temporary solution to download llvm-profdata and llvm-cov tools.""" - def _GetRevisionFromStampFile(stamp_file_path, platform): + def _GetRevisionFromStampFile(stamp_file_path): """Returns a pair of revision number by reading the build stamp file. Args: @@ -343,29 +354,23 @@ return 0, 0 with open(stamp_file_path) as stamp_file: - for stamp_file_line in stamp_file.readlines(): - if ',' in stamp_file_line: - package_version, target_os = stamp_file_line.rstrip().split(',') - else: - package_version = stamp_file_line.rstrip() - target_os = '' + stamp_file_line = stamp_file.readline() + if ',' in stamp_file_line: + package_version = stamp_file_line.rstrip().split(',')[0] + else: + package_version = stamp_file_line.rstrip() - if target_os and target_os != 'ios' and platform != target_os: - continue + clang_revision_str, clang_sub_revision_str = package_version.split('-') + return int(clang_revision_str), int(clang_sub_revision_str) - clang_revision_str, clang_sub_revision_str = package_version.split('-') - return int(clang_revision_str), int(clang_sub_revision_str) - - assert False, 'Coverage is only supported on target_os - linux, mac and ios' - - platform = _GetPlatform() + host_platform = _GetHostPlatform() clang_revision, clang_sub_revision = _GetRevisionFromStampFile( - clang_update.STAMP_FILE, platform) + clang_update.STAMP_FILE) coverage_revision_stamp_file = os.path.join( os.path.dirname(clang_update.STAMP_FILE), 'cr_coverage_revision') coverage_revision, coverage_sub_revision = _GetRevisionFromStampFile( - coverage_revision_stamp_file, platform) + coverage_revision_stamp_file) has_coverage_tools = ( os.path.exists(LLVM_COV_PATH) and os.path.exists(LLVM_PROFDATA_PATH)) @@ -373,25 +378,27 @@ if (has_coverage_tools and coverage_revision == clang_revision and coverage_sub_revision == clang_sub_revision): # LLVM coverage tools are up to date, bail out. - return clang_revision + return package_version = '%d-%d' % (clang_revision, clang_sub_revision) coverage_tools_file = 'llvm-code-coverage-%s.tgz' % package_version # The code bellow follows the code from tools/clang/scripts/update.py. - if platform == 'mac': + if host_platform == 'mac': coverage_tools_url = clang_update.CDS_URL + '/Mac/' + coverage_tools_file - else: - assert platform == 'linux' + elif host_platform == 'linux': coverage_tools_url = ( clang_update.CDS_URL + '/Linux_x64/' + coverage_tools_file) + else: + assert host_platform == 'win' + coverage_tools_url = (clang_update.CDS_URL + '/Win/' + coverage_tools_file) try: clang_update.DownloadAndUnpack(coverage_tools_url, clang_update.LLVM_BUILD_DIR) logging.info('Coverage tools %s unpacked', package_version) with open(coverage_revision_stamp_file, 'w') as file_handle: - file_handle.write('%s,%s' % (package_version, platform)) + file_handle.write('%s,%s' % (package_version, host_platform)) file_handle.write('\n') except urllib2.URLError: raise Exception( @@ -930,7 +937,6 @@ subprocess_cmd.extend( ['-object=' + binary_path for binary_path in binary_paths[1:]]) _AddArchArgumentForIOSIfNeeded(subprocess_cmd, len(binary_paths)) - subprocess_cmd.extend(filters) json_output = json.loads(subprocess.check_output(subprocess_cmd)) @@ -1032,6 +1038,19 @@ ).format(CLANG_COVERAGE_BUILD_ARG) +def _ValidateCurrentPlatformIsSupported(): + """Asserts that this script suports running on the current platform""" + target_os = _GetTargetOS() + if target_os: + current_platform = target_os + else: + current_platform = _GetHostPlatform() + + assert current_platform in [ + 'linux', 'mac', 'chromeos', 'ios' + ], ('Coverage is only supported on linux, mac, chromeos and ios.') + + def _ParseArgsGnFile(): """Parses args.gn file and returns results as a dictionary. @@ -1052,7 +1071,10 @@ continue key = key_value_pair[0].strip() - value = key_value_pair[1].strip() + + # Values are wrapped within a pair of double-quotes, so remove the leading + # and trailing double-quotes. + value = key_value_pair[1].strip().strip('"') build_args[key] = value return build_args @@ -1156,34 +1178,34 @@ def Main(): """Execute tool commands.""" - assert _GetPlatform() in [ - 'linux', 'mac' - ], ('This script is only supported on linux and mac platforms.') assert os.path.abspath(os.getcwd()) == SRC_ROOT_PATH, ('This script must be ' 'called from the root ' 'of checkout.') - DownloadCoverageToolsIfNeeded() - args = _ParseCommandArguments() global BUILD_DIR BUILD_DIR = args.build_dir global OUTPUT_DIR OUTPUT_DIR = args.output_dir - log_level = logging.DEBUG if args.verbose else logging.INFO - log_format = '[%(asctime)s] %(message)s' - log_file = args.log_file if args.log_file else None - logging.basicConfig(filename=log_file, level=log_level, format=log_format) - assert len(args.targets) == len(args.command), ('Number of targets must be ' 'equal to the number of test ' 'commands.') + + # logging should be configured before it is used. + log_level = logging.DEBUG if args.verbose else logging.INFO + log_format = '[%(asctime)s %(levelname)s] %(message)s' + log_file = args.log_file if args.log_file else None + logging.basicConfig(filename=log_file, level=log_level, format=log_format) + assert os.path.exists(BUILD_DIR), ( 'Build directory: {} doesn\'t exist. ' 'Please run "gn gen" to generate.').format(BUILD_DIR) + _ValidateCurrentPlatformIsSupported() _ValidateBuildingWithClangCoverage() _VerifyTargetExecutablesAreInBuildDirectory(args.command) + DownloadCoverageToolsIfNeeded() + absolute_filter_paths = [] if args.filters: absolute_filter_paths = _VerifyPathsAndReturnAbsolutes(args.filters)
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index b927b10d..22e2d40c 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl
@@ -1071,8 +1071,10 @@ 'asan', 'lsan', 'release_trybot', ], + # Cast Linux takes very long in linking, possibly due to being on GCE + # (crbug/794423). 'cast_release_bot': [ - 'cast', 'release_bot', + 'cast', 'release_bot', 'minimal_symbols', ], 'cast_release_trybot': [
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index d196bfe..7636aeb 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -6569,6 +6569,9 @@ <enum name="ConsentAuditorFeature"> <int value="0" label="CHROME_SYNC"/> + <int value="1" label="PLAY_STORE"/> + <int value="2" label="BACKUP_AND_RESTORE"/> + <int value="3" label="GOOGLE_LOCATION_SERVICE"/> </enum> <enum name="ContentResourceType"> @@ -26847,7 +26850,6 @@ <int value="1007444341" label="enable-prefixed-encrypted-media"/> <int value="1015895665" label="drop-sync-credential:enabled"/> <int value="1017364362" label="VrIconInDaydreamHome:enabled"/> - <int value="1017488850" label="ash-enable-new-overview-animations"/> <int value="1018998019" label="memlog"/> <int value="1019623058" label="ash-enable-shelf-model-synchronization"/> <int value="1019857902" @@ -26861,6 +26863,7 @@ <int value="1049885154" label="OfflinePagesPrefetching:disabled"/> <int value="1050048304" label="enable-font-cache-scaling"/> <int value="1050321458" label="new-profile-management"/> + <int value="1053743655" label="NewOverviewAnimations:enabled"/> <int value="1054910800" label="enable-timezone-tracking-option"/> <int value="1057887829" label="AutofillScanThemeDialog:disabled"/> <int value="1059007599" label="enable-gpu-appcontainer"/> @@ -27251,6 +27254,7 @@ <int value="1960169775" label="NewPhotoPicker:disabled"/> <int value="1961425320" label="force-qtkit"/> <int value="1964816410" label="AndroidPayIntegrationV2:enabled"/> + <int value="1965976546" label="NewOverviewAnimations:disabled"/> <int value="1966730288" label="disable-threaded-compositing"/> <int value="1969604362" label="enable-pinch-virtual-viewport"/> <int value="1971964569" label="NewEncodeCpuLoadEstimator:disabled"/> @@ -37058,16 +37062,18 @@ </enum> <enum name="QuicConnectionMigrationStatus"> - <int value="0" label="NO_MIGRATABLE_STREAMS"/> - <int value="1" label="ALREADY_MIGRATED"/> - <int value="2" label="INTERNAL_ERROR"/> - <int value="3" label="TOO_MANY_CHANGES"/> - <int value="4" label="SUCCESS"/> - <int value="5" label="NON_MIGRATABLE_STREAM"/> - <int value="6" label="NOT_ENABLED"/> - <int value="7" label="NO_ALTERNATE_NETWORK"/> - <int value="8" label="ON_PATH_DEGRADING_DISABLED"/> - <int value="9" label="DISABLED_BY_CONFIG"/> + <int value="0" label="No stream to migrate"/> + <int value="1" label="Already migrated"/> + <int value="2" label="Internal error"/> + <int value="3" label="Too many migrations"/> + <int value="4" label="Success"/> + <int value="5" label="Disabled by non-migratable stream"/> + <int value="6" label="Migration not enabled"/> + <int value="7" label="No alternate network"/> + <int value="8" label="Disabled by too many path degradings"/> + <int value="9" label="Disabled by config"/> + <int value="10" label="Path degrading not enabled"/> + <int value="11" label="Timeout with no new network"/> </enum> <enum name="QuicDisabledReason">
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index f716452..78ee2639 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -8924,6 +8924,40 @@ </summary> </histogram> +<histogram name="BrowserWindow.Resize.Duration" units="ms"> + <owner>sadrul@chromium.org</owner> + <summary> + Duration of an interactive resize from start to end. Measure only on + Windows. + </summary> +</histogram> + +<histogram name="BrowserWindow.Resize.StepBoundsChange" units="pixels"> + <owner>sadrul@chromium.org</owner> + <summary> + Size changed between two consecutive steps during browser-window resize. + Measure only on Windows. + </summary> +</histogram> + +<histogram name="BrowserWindow.Resize.StepCount" units="steps"> + <owner>sadrul@chromium.org</owner> + <summary> + Number of intermediate resize-steps taken to complete the resize from start + to end. Measure only on Windows. + </summary> +</histogram> + +<histogram name="BrowserWindow.Resize.StepInterval" units="ms"> + <owner>sadrul@chromium.org</owner> + <summary> + Time-interval between two consecutive steps during browser-window resize. An + interactive resize can have many number of small steps. This measures the + interval between two steps. 'Duration' measures the interval between the + first and last steps. Measured only on Windows. + </summary> +</histogram> + <histogram name="Bubbles.Close.Accepted" enum="BubbleType"> <owner>hcarmona@chromium.org</owner> <summary>An open bubble was closed because the user accepted it.</summary> @@ -47075,8 +47109,11 @@ <histogram name="Net.QuicSession.ConnectionMigration" enum="QuicConnectionMigrationStatus"> - <owner>jri@chromium.org</owner> - <summary>The result of a QUIC connection migration attempt.</summary> + <owner>zhongyi@chromium.org</owner> + <summary> + The result of a QUIC connection migration attempt. The suffix specifies the + cause of connection migration. + </summary> </histogram> <histogram name="Net.QuicSession.ConnectionTypeFromPeer" enum="AddressFamily"> @@ -91222,6 +91259,14 @@ </summary> </histogram> +<histogram name="Tab.Visibility" units="ms"> + <owner>fdoray@chromium.org</owner> + <summary> + Time spent by a tab in a given visibility state. Recorded when the + visibility changes and when the tab is closed. + </summary> +</histogram> + <histogram name="Tab.VisibleTime" units="ms"> <owner>csharrison@chromium.org</owner> <summary> @@ -104562,6 +104607,17 @@ <affected-histogram name="Renderer4.BeginToFinish_NormalLoad"/> </histogram_suffixes> +<histogram_suffixes name="ConnectionMigrationCause" separator="."> + <suffix name="Unknown"/> + <suffix name="OnNetworkConnected"/> + <suffix name="OnNetworkDisconnected"/> + <suffix name="OnWriteError"/> + <suffix name="OnNetworkMadeDefault"/> + <suffix name="OnMigrateBackToDefaultNetwork"/> + <suffix name="OnPathDegrading"/> + <affected-histogram name="Net.QuicSession.ConnectionMigration"/> +</histogram_suffixes> + <histogram_suffixes name="ConnectivityDiagnostics" separator="."> <suffix name="0" label="INTERNET_DISCONNECTED"/> <suffix name="1" label="CHROME_VERSION"/> @@ -113418,6 +113474,12 @@ <affected-histogram name="SiteIsolation.XSD.Browser.Blocked"/> </histogram_suffixes> +<histogram_suffixes name="Size" separator="."> + <suffix name="Width"/> + <suffix name="Height"/> + <affected-histogram name="BrowserWindow.Resize.StepBoundsChange"/> +</histogram_suffixes> + <histogram_suffixes name="SkiaDrawScaleFactorFilterQuality" separator="."> <suffix name="AnyFilterQuality" label="Any filter quality was used."/> <suffix name="HighFilterQuality" label="High filter quality was used."/> @@ -114342,6 +114404,19 @@ <affected-histogram name="WebRTC.Video.Encoded.Qp"/> </histogram_suffixes> +<histogram_suffixes name="Visibility" separator="."> + <suffix name="Visible" + label="The tab is visible. Except on ChromeOS, a tab fully covered by + other windows is considered visible."/> + <suffix name="Occluded" + label="The tab is fully covered by other windows. ChromeOS-only."/> + <suffix name="Hidden" + label="The tab is not visible because it is in a minimized window + (desktop) or background app (mobile), or because it isn't active + in its tab strip."/> + <affected-histogram name="Tab.Visibility"/> +</histogram_suffixes> + <histogram_suffixes name="VR.Mode" separator="."> <suffix name="AllVR" label="Entered either VR Browsing or WebVR mode."/> <suffix name="VRBrowsing" label="Entered VR Browsing Mode."/>
diff --git a/tools/perf/core/upload_results_to_perf_dashboard.py b/tools/perf/core/upload_results_to_perf_dashboard.py index bafa71b..9645cc9 100755 --- a/tools/perf/core/upload_results_to_perf_dashboard.py +++ b/tools/perf/core/upload_results_to_perf_dashboard.py
@@ -40,7 +40,7 @@ if not 'charts' in results: # These are legacy results. dashboard_json = results_dashboard.MakeListOfPoints( - results, options.configuration.name, stripped_test_name, + results, options.configuration_name, stripped_test_name, options.buildername, options.buildnumber, {}, _GetMachineGroup(options), revisions_dict=revisions) else:
diff --git a/tools/perf/measurements/rasterize_and_record_micro.py b/tools/perf/measurements/rasterize_and_record_micro.py index ca457825..951f783b 100644 --- a/tools/perf/measurements/rasterize_and_record_micro.py +++ b/tools/perf/measurements/rasterize_and_record_micro.py
@@ -67,37 +67,37 @@ pixels_recorded = data['pixels_recorded'] record_time = data['record_time_ms'] pixels_rasterized = data['pixels_rasterized'] - pixels_rasterized_non_solid = data['pixels_rasterized_with_non_solid_color'] rasterize_time = data['rasterize_time_ms'] - picture_memory_usage = data['picture_memory_usage'] + painter_memory_usage = data.get('painter_memory_usage', 0) + paint_op_memory_usage = data.get('paint_op_memory_usage', 0) + paint_op_count = data.get('paint_op_count', 0) results.AddValue(scalar.ScalarValue( results.current_page, 'pixels_recorded', 'pixels', pixels_recorded)) results.AddValue(scalar.ScalarValue( results.current_page, 'pixels_rasterized', 'pixels', pixels_rasterized)) results.AddValue(scalar.ScalarValue( - results.current_page, 'pixels_rasterized_non_solid', 'pixels', - pixels_rasterized_non_solid)) - results.AddValue(scalar.ScalarValue( results.current_page, 'rasterize_time', 'ms', rasterize_time)) results.AddValue(scalar.ScalarValue( - results.current_page, 'viewport_picture_size', 'bytes', - picture_memory_usage)) - results.AddValue(scalar.ScalarValue( results.current_page, 'record_time', 'ms', record_time)) + results.AddValue(scalar.ScalarValue( + results.current_page, 'painter_memory_usage', 'bytes', + painter_memory_usage)) + results.AddValue(scalar.ScalarValue( + results.current_page, 'paint_op_memory_usage', 'bytes', + paint_op_memory_usage)) + results.AddValue(scalar.ScalarValue( + results.current_page, 'paint_op_count', 'count', + paint_op_count)) record_time_painting_disabled = data['record_time_painting_disabled_ms'] record_time_caching_disabled = data['record_time_caching_disabled_ms'] record_time_construction_disabled = \ data['record_time_construction_disabled_ms'] - # TODO(wangxianzhu): Remove this workaround when reference builds get past - # r367465. record_time_subsequence_caching_disabled = \ - data.get('record_time_subsequence_caching_disabled_ms', 0) - # TODO(wkorman): Remove the default-to-zero workaround below when - # reference builds get past the change that adds this comment. + data['record_time_subsequence_caching_disabled_ms'] record_time_partial_invalidation = \ - data.get('record_time_partial_invalidation_ms', 0) + data['record_time_partial_invalidation_ms'] results.AddValue(scalar.ScalarValue( results.current_page, 'record_time_painting_disabled', 'ms', record_time_painting_disabled)) @@ -117,23 +117,14 @@ if self._report_detailed_results: pixels_rasterized_with_non_solid_color = \ data['pixels_rasterized_with_non_solid_color'] - pixels_rasterized_as_opaque = \ - data['pixels_rasterized_as_opaque'] + pixels_rasterized_as_opaque = data['pixels_rasterized_as_opaque'] total_layers = data['total_layers'] total_picture_layers = data['total_picture_layers'] total_picture_layers_with_no_content = \ data['total_picture_layers_with_no_content'] - total_picture_layers_off_screen = \ - data['total_picture_layers_off_screen'] - # TODO(wkorman): Why are we storing rasterize_results_.total_memory_usage - # in a field called |total_pictures_in_pile_size|? Did we just repurpose - # that field to avoid having to rename/create another? - total_pictures_in_pile_size = data['total_pictures_in_pile_size'] + total_picture_layers_off_screen = data['total_picture_layers_off_screen'] results.AddValue(scalar.ScalarValue( - results.current_page, 'total_size_of_pictures_in_piles', 'bytes', - total_pictures_in_pile_size)) - results.AddValue(scalar.ScalarValue( results.current_page, 'pixels_rasterized_with_non_solid_color', 'pixels', pixels_rasterized_with_non_solid_color)) results.AddValue(scalar.ScalarValue(
diff --git a/tools/perf/measurements/rasterize_and_record_micro_unittest.py b/tools/perf/measurements/rasterize_and_record_micro_unittest.py index 827f8a9..a94e234a 100644 --- a/tools/perf/measurements/rasterize_and_record_micro_unittest.py +++ b/tools/perf/measurements/rasterize_and_record_micro_unittest.py
@@ -91,15 +91,17 @@ self.assertEqual( total_picture_layers_off_screen[0].GetRepresentativeNumber(), 0) - viewport_picture_size = \ - results.FindAllPageSpecificValuesNamed('viewport_picture_size') - self.assertEquals(len(viewport_picture_size), 1) - self.assertGreater( - viewport_picture_size[0].GetRepresentativeNumber(), 0) + painter_memory_usage = results.FindAllPageSpecificValuesNamed( + 'painter_memory_usage') + self.assertEquals(len(painter_memory_usage), 1) + self.assertGreater(painter_memory_usage[0].GetRepresentativeNumber(), 0) - total_size_of_pictures_in_piles = \ - results.FindAllPageSpecificValuesNamed( - 'total_size_of_pictures_in_piles') - self.assertEquals(len(total_size_of_pictures_in_piles), 1) - self.assertGreater( - total_size_of_pictures_in_piles[0].GetRepresentativeNumber(), 0) + paint_op_memory_usage = results.FindAllPageSpecificValuesNamed( + 'paint_op_memory_usage') + self.assertEquals(len(paint_op_memory_usage), 1) + self.assertGreater(paint_op_memory_usage[0].GetRepresentativeNumber(), 0) + + paint_op_count = results.FindAllPageSpecificValuesNamed( + 'paint_op_count') + self.assertEquals(len(paint_op_count), 1) + self.assertGreater(paint_op_count[0].GetRepresentativeNumber(), 0)
diff --git a/ui/aura/test/ui_controls_factory_aurawin.cc b/ui/aura/test/ui_controls_factory_aurawin.cc index b1c7008..4dfb844f 100644 --- a/ui/aura/test/ui_controls_factory_aurawin.cc +++ b/ui/aura/test/ui_controls_factory_aurawin.cc
@@ -41,8 +41,8 @@ DCHECK(!command); // No command key on Aura HWND window = native_window->GetHost()->GetAcceleratedWidget(); - return SendKeyPressImpl( - window, key, control, shift, alt, base::Closure()); + return SendKeyPressImpl(window, key, control, shift, alt, + base::OnceClosure()); } bool SendKeyPressNotifyWhenDone(gfx::NativeWindow native_window, ui::KeyboardCode key, @@ -50,27 +50,27 @@ bool shift, bool alt, bool command, - const base::Closure& task) override { + base::OnceClosure task) override { DCHECK(!command); // No command key on Aura HWND window = native_window->GetHost()->GetAcceleratedWidget(); - return SendKeyPressImpl(window, key, control, shift, alt, task); + return SendKeyPressImpl(window, key, control, shift, alt, std::move(task)); } bool SendMouseMove(long screen_x, long screen_y) override { - return SendMouseMoveImpl(screen_x, screen_y, base::Closure()); + return SendMouseMoveImpl(screen_x, screen_y, base::OnceClosure()); } bool SendMouseMoveNotifyWhenDone(long screen_x, long screen_y, - const base::Closure& task) override { - return SendMouseMoveImpl(screen_x, screen_y, task); + base::OnceClosure task) override { + return SendMouseMoveImpl(screen_x, screen_y, std::move(task)); } bool SendMouseEvents(MouseButton type, int state) override { - return SendMouseEventsImpl(type, state, base::Closure()); + return SendMouseEventsImpl(type, state, base::OnceClosure()); } bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& task) override { - return SendMouseEventsImpl(type, state, task); + base::OnceClosure task) override { + return SendMouseEventsImpl(type, state, std::move(task)); } bool SendMouseClick(MouseButton type) override { return SendMouseEvents(type, UP | DOWN);
diff --git a/ui/aura/test/ui_controls_factory_aurax11.cc b/ui/aura/test/ui_controls_factory_aurax11.cc index 93c2025..f012d14 100644 --- a/ui/aura/test/ui_controls_factory_aurax11.cc +++ b/ui/aura/test/ui_controls_factory_aurax11.cc
@@ -56,8 +56,8 @@ bool shift, bool alt, bool command) override { - return SendKeyPressNotifyWhenDone( - window, key, control, shift, alt, command, base::Closure()); + return SendKeyPressNotifyWhenDone(window, key, control, shift, alt, command, + base::OnceClosure()); } bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, ui::KeyboardCode key, @@ -65,7 +65,7 @@ bool shift, bool alt, bool command, - const base::Closure& closure) override { + base::OnceClosure closure) override { XEvent xevent = {0}; xevent.xkey.type = KeyPress; if (control) @@ -93,16 +93,16 @@ if (command) UnmaskAndSetKeycodeThenSend(&xevent, Mod4Mask, XK_Meta_L); DCHECK(!xevent.xkey.state); - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseMove(long screen_x, long screen_y) override { - return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure()); + return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::OnceClosure()); } bool SendMouseMoveNotifyWhenDone(long screen_x, long screen_y, - const base::Closure& closure) override { + base::OnceClosure closure) override { gfx::Point root_location(screen_x, screen_y); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(host_->window()); @@ -129,15 +129,15 @@ // WindowTreeHost will take care of other necessary fields. PostEventToWindowTreeHost(xevent, host_); } - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseEvents(MouseButton type, int state) override { - return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); + return SendMouseEventsNotifyWhenDone(type, state, base::OnceClosure()); } bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& closure) override { + base::OnceClosure closure) override { XEvent xevent = {0}; XButtonEvent* xbutton = &xevent.xbutton; gfx::Point mouse_loc = aura::Env::GetInstance()->last_mouse_location(); @@ -175,13 +175,13 @@ PostEventToWindowTreeHost(xevent, host_); button_down_mask = (button_down_mask | xbutton->state) ^ xbutton->state; } - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseClick(MouseButton type) override { return SendMouseEvents(type, UP | DOWN); } - void RunClosureAfterAllPendingUIEvents(const base::Closure& closure) { + void RunClosureAfterAllPendingUIEvents(base::OnceClosure closure) { if (closure.is_null()) return; static XEvent* marker_event = NULL; @@ -194,7 +194,7 @@ } marker_event->xclient.message_type = MarkerEventAtom(); PostEventToWindowTreeHost(*marker_event, host_); - ui::PlatformEventWaiter::Create(closure, base::Bind(&Matcher)); + ui::PlatformEventWaiter::Create(std::move(closure), base::Bind(&Matcher)); } private: void SetKeycodeAndSendThenMask(XEvent* xevent,
diff --git a/ui/aura/test/ui_controls_factory_ozone.cc b/ui/aura/test/ui_controls_factory_ozone.cc index a8c511e..416bbf6 100644 --- a/ui/aura/test/ui_controls_factory_ozone.cc +++ b/ui/aura/test/ui_controls_factory_ozone.cc
@@ -31,17 +31,16 @@ bool shift, bool alt, bool command) override { - return SendKeyPressNotifyWhenDone( - window, key, control, shift, alt, command, base::Closure()); + return SendKeyPressNotifyWhenDone(window, key, control, shift, alt, command, + base::OnceClosure()); } - bool SendKeyPressNotifyWhenDone( - gfx::NativeWindow window, - ui::KeyboardCode key, - bool control, - bool shift, - bool alt, - bool command, - const base::Closure& closure) override { + bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, + ui::KeyboardCode key, + bool control, + bool shift, + bool alt, + bool command, + base::OnceClosure closure) override { int flags = button_down_mask_; if (control) { @@ -87,17 +86,16 @@ PostKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_LWIN, flags); } - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseMove(long screen_x, long screen_y) override { - return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure()); + return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::OnceClosure()); } - bool SendMouseMoveNotifyWhenDone( - long screen_x, - long screen_y, - const base::Closure& closure) override { + bool SendMouseMoveNotifyWhenDone(long screen_x, + long screen_y, + base::OnceClosure closure) override { gfx::Point root_location(screen_x, screen_y); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(host_->window()); @@ -118,16 +116,15 @@ PostMouseEvent(event_type, host_location, button_down_mask_, 0); - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseEvents(ui_controls::MouseButton type, int state) override { - return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); + return SendMouseEventsNotifyWhenDone(type, state, base::OnceClosure()); } - bool SendMouseEventsNotifyWhenDone( - ui_controls::MouseButton type, - int state, - const base::Closure& closure) override { + bool SendMouseEventsNotifyWhenDone(ui_controls::MouseButton type, + int state, + base::OnceClosure closure) override { gfx::Point root_location = aura::Env::GetInstance()->last_mouse_location(); aura::client::ScreenPositionClient* screen_position_client = aura::client::GetScreenPositionClient(host_->window()); @@ -167,15 +164,16 @@ button_down_mask_ | flag, flag); } - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseClick(ui_controls::MouseButton type) override { return SendMouseEvents(type, ui_controls::UP | ui_controls::DOWN); } - void RunClosureAfterAllPendingUIEvents(const base::Closure& closure) { + void RunClosureAfterAllPendingUIEvents(base::OnceClosure closure) { if (!closure.is_null()) - base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, closure); + base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, + std::move(closure)); } private:
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index b5904fe..a540b61 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn
@@ -310,6 +310,10 @@ "win/message_box_win.h", "win/mouse_wheel_util.cc", "win/mouse_wheel_util.h", + "win/on_screen_keyboard_display_manager_stub.cc", + "win/on_screen_keyboard_display_manager_stub.h", + "win/on_screen_keyboard_display_manager_tab_tip.cc", + "win/on_screen_keyboard_display_manager_tab_tip.h", "win/open_file_name_win.cc", "win/open_file_name_win.h", "win/osk_display_manager.cc", @@ -928,6 +932,7 @@ if (is_win) { sources += [ "dragdrop/os_exchange_data_win_unittest.cc", + "win/direct_manipulation_unittest.cc", "win/hwnd_subclass_unittest.cc", "win/open_file_name_win_unittest.cc", "win/osk_display_manager_unittest.cc",
diff --git a/ui/base/test/ui_controls.h b/ui/base/test/ui_controls.h index 6715c823f..bed1671 100644 --- a/ui/base/test/ui_controls.h +++ b/ui/base/test/ui_controls.h
@@ -60,7 +60,7 @@ bool shift, bool alt, bool command, - const base::Closure& task); + base::OnceClosure task); // Simulate a mouse move. bool SendMouseMove(long screen_x, long screen_y); @@ -69,7 +69,7 @@ // belonging to the current process. bool SendMouseMoveNotifyWhenDone(long screen_x, long screen_y, - const base::Closure& task); + base::OnceClosure task); enum MouseButton { LEFT = 0, @@ -91,7 +91,7 @@ bool SendMouseEvents(MouseButton type, int state); bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& task); + base::OnceClosure task); // Same as SendMouseEvents with UP | DOWN. bool SendMouseClick(MouseButton type);
diff --git a/ui/base/test/ui_controls_aura.cc b/ui/base/test/ui_controls_aura.cc index 512e440..634899d 100644 --- a/ui/base/test/ui_controls_aura.cc +++ b/ui/base/test/ui_controls_aura.cc
@@ -4,6 +4,7 @@ #include "ui/base/test/ui_controls_aura.h" +#include "base/callback.h" #include "base/logging.h" namespace ui_controls { @@ -35,10 +36,10 @@ bool shift, bool alt, bool command, - const base::Closure& task) { + base::OnceClosure task) { CHECK(g_ui_controls_enabled); - return instance_->SendKeyPressNotifyWhenDone( - window, key, control, shift, alt, command, task); + return instance_->SendKeyPressNotifyWhenDone(window, key, control, shift, alt, + command, std::move(task)); } // static @@ -48,11 +49,9 @@ } // static -bool SendMouseMoveNotifyWhenDone(long x, - long y, - const base::Closure& task) { +bool SendMouseMoveNotifyWhenDone(long x, long y, base::OnceClosure task) { CHECK(g_ui_controls_enabled); - return instance_->SendMouseMoveNotifyWhenDone(x, y, task); + return instance_->SendMouseMoveNotifyWhenDone(x, y, std::move(task)); } // static @@ -64,9 +63,9 @@ // static bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& task) { + base::OnceClosure task) { CHECK(g_ui_controls_enabled); - return instance_->SendMouseEventsNotifyWhenDone(type, state, task); + return instance_->SendMouseEventsNotifyWhenDone(type, state, std::move(task)); } // static
diff --git a/ui/base/test/ui_controls_aura.h b/ui/base/test/ui_controls_aura.h index 08fad638..1d90172 100644 --- a/ui/base/test/ui_controls_aura.h +++ b/ui/base/test/ui_controls_aura.h
@@ -30,20 +30,21 @@ bool shift, bool alt, bool command, - const base::Closure& task) = 0; + base::OnceClosure task) = 0; // Simulate a mouse move. (x,y) are absolute screen coordinates. virtual bool SendMouseMove(long x, long y) = 0; virtual bool SendMouseMoveNotifyWhenDone(long x, long y, - const base::Closure& task) = 0; + base::OnceClosure task) = 0; // Sends a mouse down and/or up message. The click will be sent to wherever // the cursor currently is, so be sure to move the cursor before calling this // (and be sure the cursor has arrived!). virtual bool SendMouseEvents(MouseButton type, int state) =0; - virtual bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& task) = 0; + virtual bool SendMouseEventsNotifyWhenDone(MouseButton type, + int state, + base::OnceClosure task) = 0; // Same as SendMouseEvents with BUTTON_UP | BUTTON_DOWN. virtual bool SendMouseClick(MouseButton type) = 0;
diff --git a/ui/base/test/ui_controls_internal_win.cc b/ui/base/test/ui_controls_internal_win.cc index 143e7fc..b8f4dbac 100644 --- a/ui/base/test/ui_controls_internal_win.cc +++ b/ui/base/test/ui_controls_internal_win.cc
@@ -38,7 +38,7 @@ // reference when the message is received. static scoped_refptr<InputDispatcher> CreateForMessage( WPARAM message_type, - const base::Closure& callback); + base::OnceClosure callback); // Constructs a dispatcher that will invoke |callback| when a mouse move // message has been received. Upon receipt, an error message is logged if the @@ -51,7 +51,7 @@ // instance will release this reference when the message is received. static scoped_refptr<InputDispatcher> CreateForMouseMove( const gfx::Point& screen_point, - const base::Closure& callback); + base::OnceClosure callback); private: template <typename T, typename... Args> @@ -60,7 +60,7 @@ InputDispatcher(WPARAM message_waiting_for, const gfx::Point& screen_point, - const base::Closure& callback); + base::OnceClosure callback); ~InputDispatcher(); // Installs the dispatcher as the current hook. @@ -97,7 +97,7 @@ THREAD_CHECKER(thread_checker_); // The callback to run when the desired message is received. - base::Closure callback_; + base::OnceClosure callback_; // The message on which the instance is waiting -- unsed for WM_KEYUP // messages. @@ -120,24 +120,24 @@ // static scoped_refptr<InputDispatcher> InputDispatcher::CreateForMessage( WPARAM message_type, - const base::Closure& callback) { + base::OnceClosure callback) { DCHECK_NE(message_type, static_cast<WPARAM>(WM_MOUSEMOVE)); return base::MakeRefCounted<InputDispatcher>(message_type, gfx::Point(0, 0), - callback); + std::move(callback)); } // static scoped_refptr<InputDispatcher> InputDispatcher::CreateForMouseMove( const gfx::Point& screen_point, - const base::Closure& callback) { + base::OnceClosure callback) { return base::MakeRefCounted<InputDispatcher>(WM_MOUSEMOVE, screen_point, - callback); + std::move(callback)); } InputDispatcher::InputDispatcher(WPARAM message_waiting_for, const gfx::Point& screen_point, - const base::Closure& callback) - : callback_(callback), + base::OnceClosure callback) + : callback_(std::move(callback)), message_waiting_for_(message_waiting_for), expected_mouse_location_(screen_point), weak_factory_(this) { @@ -333,7 +333,7 @@ bool control, bool shift, bool alt, - const base::Closure& task) { + base::OnceClosure task) { // SendInput only works as we expect it if one of our windows is the // foreground window already. HWND target_window = (::GetActiveWindow() && @@ -345,7 +345,7 @@ scoped_refptr<InputDispatcher> dispatcher; if (task) - dispatcher = InputDispatcher::CreateForMessage(WM_KEYUP, task); + dispatcher = InputDispatcher::CreateForMessage(WM_KEYUP, std::move(task)); // If a pop-up menu is open, it won't receive events sent using SendInput. // Check for a pop-up menu using its window class (#32768) and if one @@ -418,9 +418,7 @@ return true; } -bool SendMouseMoveImpl(long screen_x, - long screen_y, - const base::Closure& task) { +bool SendMouseMoveImpl(long screen_x, long screen_y, base::OnceClosure task) { gfx::Point screen_point = display::win::ScreenWin::DIPToScreenPoint({screen_x, screen_y}); screen_x = screen_point.x(); @@ -446,7 +444,7 @@ ::GetCursorPos(¤t_pos); if (screen_x == current_pos.x && screen_y == current_pos.y) { if (task) - base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task); + base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(task)); return true; } @@ -458,8 +456,8 @@ scoped_refptr<InputDispatcher> dispatcher; if (task) { - dispatcher = - InputDispatcher::CreateForMouseMove({screen_x, screen_y}, task); + dispatcher = InputDispatcher::CreateForMouseMove({screen_x, screen_y}, + std::move(task)); } if (!::SendInput(1, &input, sizeof(input))) @@ -471,8 +469,7 @@ return true; } -bool SendMouseEventsImpl(MouseButton type, int state, - const base::Closure& task) { +bool SendMouseEventsImpl(MouseButton type, int state, base::OnceClosure task) { DWORD down_flags = MOUSEEVENTF_ABSOLUTE; DWORD up_flags = MOUSEEVENTF_ABSOLUTE; UINT last_event; @@ -503,7 +500,7 @@ scoped_refptr<InputDispatcher> dispatcher; if (task) - dispatcher = InputDispatcher::CreateForMessage(last_event, task); + dispatcher = InputDispatcher::CreateForMessage(last_event, std::move(task)); INPUT input = { 0 }; input.type = INPUT_MOUSE;
diff --git a/ui/base/test/ui_controls_internal_win.h b/ui/base/test/ui_controls_internal_win.h index 97b4688..40731cea 100644 --- a/ui/base/test/ui_controls_internal_win.h +++ b/ui/base/test/ui_controls_internal_win.h
@@ -19,13 +19,10 @@ bool control, bool shift, bool alt, - const base::Closure& task); -bool SendMouseMoveImpl(long screen_x, long screen_y, const base::Closure& task); -bool SendMouseEventsImpl(MouseButton type, - int state, - const base::Closure& task); + base::OnceClosure task); +bool SendMouseMoveImpl(long screen_x, long screen_y, base::OnceClosure task); +bool SendMouseEventsImpl(MouseButton type, int state, base::OnceClosure task); bool SendTouchEventsImpl(int action, int num, int x, int y); -void RunClosureAfterAllPendingUITasksImpl(const base::Closure& task); } // namespace internal } // namespace ui_controls
diff --git a/ui/base/test/ui_controls_mac.mm b/ui/base/test/ui_controls_mac.mm index ecfbb91..5275b6c 100644 --- a/ui/base/test/ui_controls_mac.mm +++ b/ui/base/test/ui_controls_mac.mm
@@ -133,7 +133,7 @@ // A helper function to watch for the event queue. The specific task will be // fired when there is no more event in the queue. -void EventQueueWatcher(const base::Closure& task) { +void EventQueueWatcher(base::OnceClosure task) { NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode @@ -141,9 +141,9 @@ // If there is still event in the queue, then we need to check again. if (event) { base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&EventQueueWatcher, task)); + FROM_HERE, base::BindOnce(&EventQueueWatcher, std::move(task))); } else { - base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task); + base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(task)); } } @@ -251,9 +251,8 @@ bool alt, bool command) { CHECK(g_ui_controls_enabled); - return SendKeyPressNotifyWhenDone(window, key, - control, shift, alt, command, - base::Closure()); + return SendKeyPressNotifyWhenDone(window, key, control, shift, alt, command, + base::OnceClosure()); } // Win and Linux implement a SendKeyPress() this as a @@ -264,7 +263,7 @@ bool shift, bool alt, bool command, - const base::Closure& task) { + base::OnceClosure task) { CHECK(g_ui_controls_enabled); DCHECK(base::MessageLoopForUI::IsCurrent()); @@ -283,7 +282,7 @@ if (!task.is_null()) { base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&EventQueueWatcher, task)); + FROM_HERE, base::BindOnce(&EventQueueWatcher, std::move(task))); } return true; @@ -291,14 +290,14 @@ bool SendMouseMove(long x, long y) { CHECK(g_ui_controls_enabled); - return SendMouseMoveNotifyWhenDone(x, y, base::Closure()); + return SendMouseMoveNotifyWhenDone(x, y, base::OnceClosure()); } // Input position is in screen coordinates. However, NSMouseMoved // events require them window-relative, so we adjust. We *DO* flip // the coordinate space, so input events can be the same for all // platforms. E.g. (0,0) is upper-left. -bool SendMouseMoveNotifyWhenDone(long x, long y, const base::Closure& task) { +bool SendMouseMoveNotifyWhenDone(long x, long y, base::OnceClosure task) { CHECK(g_ui_controls_enabled); g_mouse_location = gfx::ScreenPointToNSPoint(gfx::Point(x, y)); // flip! @@ -332,7 +331,7 @@ if (!task.is_null()) { base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&EventQueueWatcher, task)); + FROM_HERE, base::BindOnce(&EventQueueWatcher, std::move(task))); } return true; @@ -340,17 +339,18 @@ bool SendMouseEvents(MouseButton type, int state) { CHECK(g_ui_controls_enabled); - return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); + return SendMouseEventsNotifyWhenDone(type, state, base::OnceClosure()); } -bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& task) { +bool SendMouseEventsNotifyWhenDone(MouseButton type, + int state, + base::OnceClosure task) { CHECK(g_ui_controls_enabled); // On windows it appears state can be (UP|DOWN). It is unclear if // that'll happen here but prepare for it just in case. if (state == (UP|DOWN)) { - return (SendMouseEventsNotifyWhenDone(type, DOWN, base::Closure()) && - SendMouseEventsNotifyWhenDone(type, UP, task)); + return (SendMouseEventsNotifyWhenDone(type, DOWN, base::OnceClosure()) && + SendMouseEventsNotifyWhenDone(type, UP, std::move(task))); } NSEventType event_type = NSLeftMouseDown; if (type == LEFT) { @@ -396,7 +396,7 @@ if (!task.is_null()) { base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&EventQueueWatcher, task)); + FROM_HERE, base::BindOnce(&EventQueueWatcher, std::move(task))); } return true; @@ -404,7 +404,7 @@ bool SendMouseClick(MouseButton type) { CHECK(g_ui_controls_enabled); - return SendMouseEventsNotifyWhenDone(type, UP|DOWN, base::Closure()); + return SendMouseEventsNotifyWhenDone(type, UP | DOWN, base::OnceClosure()); } bool IsFullKeyboardAccessEnabled() {
diff --git a/ui/base/test/ui_controls_win.cc b/ui/base/test/ui_controls_win.cc index f9f6bf9..a1fdb7e8 100644 --- a/ui/base/test/ui_controls_win.cc +++ b/ui/base/test/ui_controls_win.cc
@@ -25,7 +25,7 @@ CHECK(g_ui_controls_enabled); DCHECK(!command); // No command key on Windows return internal::SendKeyPressImpl(window, key, control, shift, alt, - base::Closure()); + base::OnceClosure()); } bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, @@ -34,36 +34,38 @@ bool shift, bool alt, bool command, - const base::Closure& task) { + base::OnceClosure task) { CHECK(g_ui_controls_enabled); DCHECK(!command); // No command key on Windows - return internal::SendKeyPressImpl(window, key, control, shift, alt, task); + return internal::SendKeyPressImpl(window, key, control, shift, alt, + std::move(task)); } bool SendMouseMove(long x, long y) { CHECK(g_ui_controls_enabled); - return internal::SendMouseMoveImpl(x, y, base::Closure()); + return internal::SendMouseMoveImpl(x, y, base::OnceClosure()); } -bool SendMouseMoveNotifyWhenDone(long x, long y, const base::Closure& task) { +bool SendMouseMoveNotifyWhenDone(long x, long y, base::OnceClosure task) { CHECK(g_ui_controls_enabled); - return internal::SendMouseMoveImpl(x, y, task); + return internal::SendMouseMoveImpl(x, y, std::move(task)); } bool SendMouseEvents(MouseButton type, int state) { CHECK(g_ui_controls_enabled); - return internal::SendMouseEventsImpl(type, state, base::Closure()); + return internal::SendMouseEventsImpl(type, state, base::OnceClosure()); } -bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& task) { +bool SendMouseEventsNotifyWhenDone(MouseButton type, + int state, + base::OnceClosure task) { CHECK(g_ui_controls_enabled); - return internal::SendMouseEventsImpl(type, state, task); + return internal::SendMouseEventsImpl(type, state, std::move(task)); } bool SendMouseClick(MouseButton type) { CHECK(g_ui_controls_enabled); - return internal::SendMouseEventsImpl(type, UP | DOWN, base::Closure()); + return internal::SendMouseEventsImpl(type, UP | DOWN, base::OnceClosure()); } bool SendTouchEvents(int action, int num, int x, int y) {
diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc index 3e1850d..c227b35 100644 --- a/ui/base/ui_base_features.cc +++ b/ui/base/ui_base_features.cc
@@ -50,6 +50,10 @@ return base::win::GetVersion() >= base::win::VERSION_WIN8 && base::FeatureList::IsEnabled(kPointerEventsForTouch); } + +// Enables DirectManipulation API for processing Precision Touchpad events. +const base::Feature kPrecisionTouchpad{"PrecisionTouchpad", + base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_WIN) // Used to have ash run in its own process. This implicitly turns on the
diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h index acff7278..f21fb22 100644 --- a/ui/base/ui_base_features.h +++ b/ui/base/ui_base_features.h
@@ -21,6 +21,7 @@ #if defined(OS_WIN) UI_BASE_EXPORT extern const base::Feature kDirectManipulationStylus; UI_BASE_EXPORT extern const base::Feature kPointerEventsForTouch; +UI_BASE_EXPORT extern const base::Feature kPrecisionTouchpad; // Returns true if the system should use WM_POINTER events for touch events. UI_BASE_EXPORT bool IsUsingWMPointerForTouch();
diff --git a/ui/base/win/direct_manipulation.cc b/ui/base/win/direct_manipulation.cc index 78f19277..31d25d62 100644 --- a/ui/base/win/direct_manipulation.cc +++ b/ui/base/win/direct_manipulation.cc
@@ -5,60 +5,95 @@ #include "ui/base/win/direct_manipulation.h" #include <objbase.h> +#include <cmath> +#include "base/memory/ptr_util.h" +#include "base/threading/thread_task_runner_handle.h" #include "base/win/windows_version.h" +#include "ui/base/ui_base_features.h" namespace ui { namespace win { // static std::unique_ptr<DirectManipulationHelper> -DirectManipulationHelper::CreateInstance() { - // TODO(dtapuska): Do not create a DirectManipulationHelper on any windows - // versions as it only causes issues. High Precision Touchpad events seem to - // always be sent to apps with recent Windows 10 versions. This class should - // eventually be removed. See https://crbug.com/647038. +DirectManipulationHelper::CreateInstance(HWND window) { + if (!::IsWindow(window)) + return nullptr; + + if (!base::FeatureList::IsEnabled(features::kPrecisionTouchpad)) + return nullptr; + + // DM_POINTERHITTEST supported since Win10. + if (base::win::GetVersion() < base::win::VERSION_WIN10) + return nullptr; + + std::unique_ptr<DirectManipulationHelper> instance = + base::WrapUnique(new DirectManipulationHelper()); + instance->window_ = window; + + if (instance->Initialize()) + return instance; + return nullptr; } +// static +std::unique_ptr<DirectManipulationHelper> +DirectManipulationHelper::CreateInstanceForTesting( + WindowEventTarget* event_target, + Microsoft::WRL::ComPtr<IDirectManipulationViewport> viewport) { + if (!base::FeatureList::IsEnabled(features::kPrecisionTouchpad)) + return nullptr; + + // DM_POINTERHITTEST supported since Win10. + if (base::win::GetVersion() < base::win::VERSION_WIN10) + return nullptr; + + std::unique_ptr<DirectManipulationHelper> instance = + base::WrapUnique(new DirectManipulationHelper()); + + instance->event_handler_ = + Microsoft::WRL::Make<DirectManipulationHandler>(instance.get()); + instance->event_handler_->SetWindowEventTarget(event_target); + + instance->viewport_ = viewport; + + return instance; +} + +DirectManipulationHelper::~DirectManipulationHelper() { + if (viewport_) + viewport_->Abandon(); +} + DirectManipulationHelper::DirectManipulationHelper() {} -DirectManipulationHelper::~DirectManipulationHelper() { - if (view_port_outer_) - view_port_outer_->Abandon(); -} +// We only use Direct Manipulation as event handler so we can use any size for +// the fake viewport. +const RECT VIEWPORT_DEFAULT_RECT = {0, 0, 1000, 1000}; -void DirectManipulationHelper::Initialize(HWND window) { - DCHECK(::IsWindow(window)); - - // TODO(ananta) - // Remove the CHECK statements here and below and replace them with logs - // when this code stabilizes. +bool DirectManipulationHelper::Initialize() { + // IDirectManipulationUpdateManager is the first COM object created by the + // application to retrieve other objects in the Direct Manipulation API. + // It also serves to activate and deactivate Direct Manipulation functionality + // on a per-HWND basis. HRESULT hr = ::CoCreateInstance(CLSID_DirectManipulationManager, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&manager_)); - CHECK(SUCCEEDED(hr)); + if (!SUCCEEDED(hr)) + return false; - hr = ::CoCreateInstance(CLSID_DCompManipulationCompositor, nullptr, - CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&compositor_)); - CHECK(SUCCEEDED(hr)); + // Since we want to use fake viewport, we need UpdateManager to tell a fake + // fake render frame. + hr = manager_->GetUpdateManager(IID_PPV_ARGS(&update_manager_)); + if (!SUCCEEDED(hr)) + return false; - hr = manager_->GetUpdateManager(IID_PPV_ARGS(update_manager_.GetAddressOf())); - CHECK(SUCCEEDED(hr)); + hr = manager_->CreateViewport(nullptr, window_, IID_PPV_ARGS(&viewport_)); + if (!SUCCEEDED(hr)) + return false; - hr = compositor_->SetUpdateManager(update_manager_.Get()); - CHECK(SUCCEEDED(hr)); - - hr = compositor_.CopyTo(frame_info_.GetAddressOf()); - CHECK(SUCCEEDED(hr)); - - hr = manager_->CreateViewport(frame_info_.Get(), window, - IID_PPV_ARGS(view_port_outer_.GetAddressOf())); - CHECK(SUCCEEDED(hr)); - - // - // Enable the desired configuration for each viewport. - // DIRECTMANIPULATION_CONFIGURATION configuration = DIRECTMANIPULATION_CONFIGURATION_INTERACTION | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X | @@ -69,53 +104,206 @@ DIRECTMANIPULATION_CONFIGURATION_SCALING | DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA; - hr = view_port_outer_->ActivateConfiguration(configuration); - CHECK(SUCCEEDED(hr)); + hr = viewport_->ActivateConfiguration(configuration); + if (!SUCCEEDED(hr)) + return false; + + // Since we are using fake viewport and only want to use Direct Manipulation + // for touchpad, we need to use MANUALUPDATE option. + hr = viewport_->SetViewportOptions( + DIRECTMANIPULATION_VIEWPORT_OPTIONS_MANUALUPDATE); + if (!SUCCEEDED(hr)) + return false; + + event_handler_ = Microsoft::WRL::Make<DirectManipulationHandler>(this); + if (!SUCCEEDED(hr)) + return false; + + // We got Direct Manipulation transform from + // IDirectManipulationViewportEventHandler. + hr = viewport_->AddEventHandler(window_, event_handler_.Get(), + &view_port_handler_cookie_); + if (!SUCCEEDED(hr)) + return false; + + hr = viewport_->SetViewportRect(&VIEWPORT_DEFAULT_RECT); + if (!SUCCEEDED(hr)) + return false; + + manager_->Activate(window_); + + hr = viewport_->Enable(); + update_manager_->Update(nullptr); + if (!SUCCEEDED(hr)) + return false; + + return true; } -void DirectManipulationHelper::SetBounds(const gfx::Rect& bounds) { - Microsoft::WRL::ComPtr<IDirectManipulationPrimaryContent> - primary_content_outer; - HRESULT hr = view_port_outer_->GetPrimaryContent( - IID_PPV_ARGS(primary_content_outer.GetAddressOf())); - CHECK(SUCCEEDED(hr)); - - Microsoft::WRL::ComPtr<IDirectManipulationContent> content_outer; - hr = primary_content_outer.CopyTo(content_outer.GetAddressOf()); - CHECK(SUCCEEDED(hr)); - - RECT rect = bounds.ToRECT(); - - hr = view_port_outer_->SetViewportRect(&rect); - CHECK(SUCCEEDED(hr)); - - hr = content_outer->SetContentRect(&rect); - CHECK(SUCCEEDED(hr)); +void DirectManipulationHelper::Activate() { + manager_->Activate(window_); } -void DirectManipulationHelper::Activate(HWND window) { - DCHECK(::IsWindow(window)); - manager_->Activate(window); +void DirectManipulationHelper::Deactivate() { + manager_->Deactivate(window_); } -void DirectManipulationHelper::Deactivate(HWND window) { - DCHECK(::IsWindow(window)); - manager_->Deactivate(window); -} +bool DirectManipulationHelper::OnPointerHitTest( + WPARAM w_param, + WindowEventTarget* event_target) { + // Only DM_POINTERHITTEST can be the first message of input sequence of + // touchpad input. + // TODO(chaopeng) Check if Windows API changes: + // For WM_POINTER, the pointer type will show the event from mouse. + // For WM_POINTERACTIVATE, the pointer id will be different with the following + // message. + event_handler_->SetWindowEventTarget(event_target); -void DirectManipulationHelper::HandleMouseWheel(HWND window, - UINT message, - WPARAM w_param, - LPARAM l_param) { - MSG msg = {window, message, w_param, l_param}; - - HRESULT hr = view_port_outer_->SetContact(DIRECTMANIPULATION_MOUSEFOCUS); - if (SUCCEEDED(hr)) { - BOOL handled = FALSE; - manager_->ProcessInput(&msg, &handled); - view_port_outer_->ReleaseContact(DIRECTMANIPULATION_MOUSEFOCUS); + using GetPointerTypeFn = BOOL(WINAPI*)(UINT32, POINTER_INPUT_TYPE*); + UINT32 pointer_id = GET_POINTERID_WPARAM(w_param); + POINTER_INPUT_TYPE pointer_type; + static GetPointerTypeFn get_pointer_type = reinterpret_cast<GetPointerTypeFn>( + GetProcAddress(GetModuleHandleA("user32.dll"), "GetPointerType")); + if (get_pointer_type && get_pointer_type(pointer_id, &pointer_type) && + pointer_type == PT_TOUCHPAD) { + viewport_->SetContact(pointer_id); + // Request begin frame for fake viewport. + need_poll_events_ = true; } + return need_poll_events_; } -} // namespace win. -} // namespace ui. +HRESULT DirectManipulationHelper::ResetViewport(bool need_poll_events) { + // By zooming the primary content to a rect that match the viewport rect, we + // reset the content's transform to identity. + HRESULT hr = viewport_->ZoomToRect( + static_cast<float>(VIEWPORT_DEFAULT_RECT.left), + static_cast<float>(VIEWPORT_DEFAULT_RECT.top), + static_cast<float>(VIEWPORT_DEFAULT_RECT.right), + static_cast<float>(VIEWPORT_DEFAULT_RECT.bottom), FALSE); + if (!SUCCEEDED(hr)) + return hr; + + need_poll_events_ = need_poll_events; + return S_OK; +} + +bool DirectManipulationHelper::PollForNextEvent() { + // Simulate 1 frame in update_manager_. + update_manager_->Update(nullptr); + return need_poll_events_; +} + +// DirectManipulationHandler +DirectManipulationHandler::DirectManipulationHandler() { + NOTREACHED(); +} + +DirectManipulationHandler::DirectManipulationHandler( + DirectManipulationHelper* helper) + : helper_(helper) {} + +DirectManipulationHandler::~DirectManipulationHandler() {} + +HRESULT DirectManipulationHandler::OnViewportStatusChanged( + IDirectManipulationViewport* viewport, + DIRECTMANIPULATION_STATUS current, + DIRECTMANIPULATION_STATUS previous) { + // The state of our viewport has changed! We'l be in one of three states: + // - ENABLED: initial state + // - READY: the previous gesture has been completed + // - RUNNING: gesture updating + // - INERTIA: finger leave touchpad content still updating by inertia + HRESULT hr = S_OK; + + // Reset the viewport when we're idle, so the content transforms always start + // at identity. + if (current == DIRECTMANIPULATION_READY) { + // Every animation will receive 2 ready message, we should stop request + // compositor animation at the second ready. + first_ready_ = !first_ready_; + hr = helper_->ResetViewport(first_ready_); + last_scale_ = 1.0f; + last_x_offset_ = 0.0f; + last_y_offset_ = 0.0f; + } + + return hr; +} + +HRESULT DirectManipulationHandler::OnViewportUpdated( + IDirectManipulationViewport* viewport) { + // Nothing to do here. + return S_OK; +} + +bool FloatEquals(float f1, float f2) { + // The idea behind this is to use this fraction of the larger of the + // two numbers as the limit of the difference. This breaks down near + // zero, so we reuse this as the minimum absolute size we will use + // for the base of the scale too. + static const float epsilon_scale = 0.00001f; + return fabs(f1 - f2) < + epsilon_scale * + std::fmax(std::fmax(std::fabs(f1), std::fabs(f2)), epsilon_scale); +} + +bool DifferentLessThanOne(int f1, int f2) { + return abs(f1 - f2) < 1; +} + +HRESULT DirectManipulationHandler::OnContentUpdated( + IDirectManipulationViewport* viewport, + IDirectManipulationContent* content) { + float xform[6]; + HRESULT hr = content->GetContentTransform(xform, ARRAYSIZE(xform)); + if (!SUCCEEDED(hr)) + return hr; + + float scale = xform[0]; + int x_offset = xform[4]; + int y_offset = xform[5]; + + // Ignore if Windows pass scale=0 to us. + if (scale == 0.0f) { + LOG(ERROR) << "Windows DirectManipulation API pass scale = 0."; + return hr; + } + + // Ignore the scale factor change less than float point rounding error and + // scroll offset change less than 1. + // TODO(456622) Because we don't fully support fractional scroll, pass float + // scroll offset feels steppy. eg. + // first x_offset is 0.1 ignored, but last_x_offset_ set to 0.1 + // second x_offset is 1 but x_offset - last_x_offset_ is 0.9 ignored. + if (FloatEquals(scale, last_scale_) && + DifferentLessThanOne(x_offset, last_x_offset_) && + DifferentLessThanOne(y_offset, last_y_offset_)) { + return hr; + } + + DCHECK_NE(last_scale_, 0.0f); + + // Consider this is a Scroll when scale factor equals 1.0. + if (FloatEquals(scale, 1.0f)) { + event_target_->ApplyPanGestureScroll(x_offset - last_x_offset_, + y_offset - last_y_offset_); + } else { + event_target_->ApplyPinchZoomScale(scale / last_scale_); + } + + last_scale_ = scale; + last_x_offset_ = x_offset; + last_y_offset_ = y_offset; + + return hr; +} + +void DirectManipulationHandler::SetWindowEventTarget( + WindowEventTarget* event_target) { + DCHECK(event_target); + event_target_ = event_target; +} + +} // namespace win +} // namespace ui
diff --git a/ui/base/win/direct_manipulation.h b/ui/base/win/direct_manipulation.h index af7ad807..acd9086a 100644 --- a/ui/base/win/direct_manipulation.h +++ b/ui/base/win/direct_manipulation.h
@@ -5,79 +5,134 @@ #ifndef UI_WIN_DIRECT_MANIPULATION_H_ #define UI_WIN_DIRECT_MANIPULATION_H_ -#include <directmanipulation.h> -#include <wrl/client.h> +#include <windows.h> +#include <directmanipulation.h> +#include <wrl.h> #include <memory> +#include "base/gtest_prod_util.h" #include "base/macros.h" #include "ui/base/ui_base_export.h" +#include "ui/base/win/window_event_target.h" #include "ui/gfx/geometry/rect.h" +namespace content { +class DirectManipulationBrowserTest; +} // namespace content + namespace ui { namespace win { +class DirectManipulationUnitTest; + +class DirectManipulationHelper; + +// DirectManipulationHandler receives status update and gesture events from +// Direct Manipulation API. +class DirectManipulationHandler + : public Microsoft::WRL::RuntimeClass< + Microsoft::WRL::RuntimeClassFlags< + Microsoft::WRL::RuntimeClassType::ClassicCom>, + Microsoft::WRL::Implements< + Microsoft::WRL::RuntimeClassFlags< + Microsoft::WRL::RuntimeClassType::ClassicCom>, + Microsoft::WRL::FtmBase, + IDirectManipulationViewportEventHandler>> { + public: + explicit DirectManipulationHandler(DirectManipulationHelper* helper); + + // WindowEventTarget updates for every DM_POINTERHITTEST in case window + // hierarchy changed. + void SetWindowEventTarget(WindowEventTarget* event_target); + + private: + friend DirectManipulationUnitTest; + + DirectManipulationHandler(); + ~DirectManipulationHandler() override; + + HRESULT STDMETHODCALLTYPE + OnViewportStatusChanged(_In_ IDirectManipulationViewport* viewport, + _In_ DIRECTMANIPULATION_STATUS current, + _In_ DIRECTMANIPULATION_STATUS previous) override; + + HRESULT STDMETHODCALLTYPE + OnViewportUpdated(_In_ IDirectManipulationViewport* viewport) override; + + HRESULT STDMETHODCALLTYPE + OnContentUpdated(_In_ IDirectManipulationViewport* viewport, + _In_ IDirectManipulationContent* content) override; + + DirectManipulationHelper* helper_ = nullptr; + WindowEventTarget* event_target_ = nullptr; + float last_scale_ = 1.0f; + int last_x_offset_ = 0; + int last_y_offset_ = 0; + bool first_ready_ = false; + + DISALLOW_COPY_AND_ASSIGN(DirectManipulationHandler); +}; + // Windows 10 provides a new API called Direct Manipulation which generates -// smooth scroll events via WM_MOUSEWHEEL messages with predictable deltas -// on high precision touch pads. This basically requires the application window -// to register as a Direct Manipulation consumer. The way mouse wheel messages -// are dispatched is +// smooth scroll and scale factor via IDirectManipulationViewportEventHandler +// on precision touchpad. // 1. The foreground window is checked to see if it is a Direct Manipulation // consumer. -// 2. If it is then Direct Manipulation takes over and sends the following -// messages. WM_POINTERACTIVATE, WM_POINTERDOWN and DM_POINTERHITTEST. -// 3. It then posts WM_MOUSEWHEEL messages with precision deltas which vary -// based on the amount of the scroll. -// 4. If the foreground window is not a Direct Manipulation consumer, it -// then takes a fallback route where it posts WM_MOUSEWHEEL messages -// with precision but varying deltas to the window. There is a also -// a slight delay in receiving the first set of mouse wheel messages. -// This causes scrolling to appear janky and jumpy. -// Our approach for addressing this is to do the absolute minimum to -// register our window as a Direct Manipulation consumer. This class -// provides the necessary functionality to register the passed in HWND as a -// Direct Manipulation consumer. We don't rely on Direct manipulation -// to do the smooth scrolling in the background thread as documented on -// msdn. +// 2. Call SetContact in Direct Manipulation takes over the following scrolling +// when DM_POINTERHITTEST. +// 3. OnViewportStatusChanged will be called when the gesture phase change. +// OnContentUpdated will be called when the gesture update. class UI_BASE_EXPORT DirectManipulationHelper { public: - // Creates an instance of this class if Direct Manipulation is enabled on - // the platform. If not returns NULL. - static std::unique_ptr<DirectManipulationHelper> CreateInstance(); + // Creates and initializes an instance of this class if Direct Manipulation is + // enabled on the platform. Returns nullptr if it disabled or failed on + // initialization. + static std::unique_ptr<DirectManipulationHelper> CreateInstance(HWND window); - // This function instantiates Direct Manipulation and creates a viewport for - // the passed in |window|. - // consumer. Most of the code is boiler plate and is based on the sample. - void Initialize(HWND window); - - // Sets the bounds of the fake Direct manipulation viewport to match those - // of the legacy window. - void SetBounds(const gfx::Rect& bounds); - - // Registers and activates the passed in |window| as a Direct Manipulation - // consumer. - void Activate(HWND window); - - // Deactivates Direct Manipulation processing on the passed in |window|. - void Deactivate(HWND window); - - // Passes the WM_MOUSEWHEEL messages to Direct Manipulation. This is for - // logistics purposes. - void HandleMouseWheel(HWND window, - UINT message, - WPARAM w_param, - LPARAM l_param); + // Creates and initializes an instance for testing. + static std::unique_ptr<DirectManipulationHelper> CreateInstanceForTesting( + WindowEventTarget* event_target, + Microsoft::WRL::ComPtr<IDirectManipulationViewport> viewport); ~DirectManipulationHelper(); + // Registers and activates the passed in |window| as a Direct Manipulation + // consumer. + void Activate(); + + // Deactivates Direct Manipulation processing on the passed in |window|. + void Deactivate(); + + // Reset the fake viewport for gesture end. + HRESULT ResetViewport(bool need_animtation); + + // Pass the pointer hit test to Direct Manipulation. Return true indicated we + // need poll for new events every frame from here. + bool OnPointerHitTest(WPARAM w_param, WindowEventTarget* event_target); + + // On each frame poll new Direct Manipulation events. Return true if we still + // need poll for new events on next frame, otherwise stop request need begin + // frame. + bool PollForNextEvent(); + private: + friend class content::DirectManipulationBrowserTest; + friend class DirectManipulationUnitTest; + DirectManipulationHelper(); - Microsoft::WRL::ComPtr<IDirectManipulationManager2> manager_; - Microsoft::WRL::ComPtr<IDirectManipulationCompositor> compositor_; + // This function instantiates Direct Manipulation and creates a viewport for + // the passed in |window|. Return false if initialize failed. + bool Initialize(); + + Microsoft::WRL::ComPtr<IDirectManipulationManager> manager_; Microsoft::WRL::ComPtr<IDirectManipulationUpdateManager> update_manager_; - Microsoft::WRL::ComPtr<IDirectManipulationFrameInfoProvider> frame_info_; - Microsoft::WRL::ComPtr<IDirectManipulationViewport2> view_port_outer_; + Microsoft::WRL::ComPtr<IDirectManipulationViewport> viewport_; + Microsoft::WRL::ComPtr<DirectManipulationHandler> event_handler_; + HWND window_; + DWORD view_port_handler_cookie_; + bool need_poll_events_ = false; DISALLOW_COPY_AND_ASSIGN(DirectManipulationHelper); };
diff --git a/ui/base/win/direct_manipulation_unittest.cc b/ui/base/win/direct_manipulation_unittest.cc new file mode 100644 index 0000000..687aefb --- /dev/null +++ b/ui/base/win/direct_manipulation_unittest.cc
@@ -0,0 +1,532 @@ +// Copyright 2018 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 "ui/base/win/direct_manipulation.h" + +#include <objbase.h> + +#include "base/macros.h" +#include "base/test/scoped_feature_list.h" +#include "base/win/windows_version.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/ui_base_features.h" + +namespace ui { + +namespace win { + +namespace { + +class MockDirectManipulationViewport + : public Microsoft::WRL::RuntimeClass< + Microsoft::WRL::RuntimeClassFlags< + Microsoft::WRL::RuntimeClassType::ClassicCom>, + Microsoft::WRL::Implements< + Microsoft::WRL::RuntimeClassFlags< + Microsoft::WRL::RuntimeClassType::ClassicCom>, + Microsoft::WRL::FtmBase, + IDirectManipulationViewport>> { + public: + MockDirectManipulationViewport() {} + + ~MockDirectManipulationViewport() override {} + + HRESULT STDMETHODCALLTYPE Enable() override { return S_OK; } + + HRESULT STDMETHODCALLTYPE Disable() override { return S_OK; } + + HRESULT STDMETHODCALLTYPE SetContact(_In_ UINT32 pointerId) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE ReleaseContact(_In_ UINT32 pointerId) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE ReleaseAllContacts() override { return S_OK; } + + HRESULT STDMETHODCALLTYPE + GetStatus(_Out_ DIRECTMANIPULATION_STATUS* status) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE GetTag(_In_ REFIID riid, + _COM_Outptr_opt_ void** object, + _Out_opt_ UINT32* id) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE SetTag(_In_opt_ IUnknown* object, + _In_ UINT32 id) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE GetViewportRect(_Out_ RECT* viewport) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SetViewportRect(_In_ const RECT* viewport) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE ZoomToRect(_In_ const float left, + _In_ const float top, + _In_ const float right, + _In_ const float bottom, + _In_ BOOL animate) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SetViewportTransform(_In_reads_(point_count) const float* matrix, + _In_ DWORD point_count) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SyncDisplayTransform(_In_reads_(point_count) const float* matrix, + _In_ DWORD point_count) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + GetPrimaryContent(_In_ REFIID riid, _COM_Outptr_ void** object) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + AddContent(_In_ IDirectManipulationContent* content) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + RemoveContent(_In_ IDirectManipulationContent* content) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE SetViewportOptions( + _In_ DIRECTMANIPULATION_VIEWPORT_OPTIONS options) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE AddConfiguration( + _In_ DIRECTMANIPULATION_CONFIGURATION configuration) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE RemoveConfiguration( + _In_ DIRECTMANIPULATION_CONFIGURATION configuration) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE ActivateConfiguration( + _In_ DIRECTMANIPULATION_CONFIGURATION configuration) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE SetManualGesture( + _In_ DIRECTMANIPULATION_GESTURE_CONFIGURATION configuration) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SetChaining(_In_ DIRECTMANIPULATION_MOTION_TYPES enabledTypes) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + AddEventHandler(_In_opt_ HWND window, + _In_ IDirectManipulationViewportEventHandler* eventHandler, + _Out_ DWORD* cookie) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE RemoveEventHandler(_In_ DWORD cookie) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SetInputMode(_In_ DIRECTMANIPULATION_INPUT_MODE mode) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SetUpdateMode(_In_ DIRECTMANIPULATION_INPUT_MODE mode) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE Stop() override { return S_OK; } + + HRESULT STDMETHODCALLTYPE Abandon() override { return S_OK; } + + private: + DISALLOW_COPY_AND_ASSIGN(MockDirectManipulationViewport); +}; + +class MockDirectManipulationContent + : public Microsoft::WRL::RuntimeClass< + Microsoft::WRL::RuntimeClassFlags< + Microsoft::WRL::RuntimeClassType::ClassicCom>, + Microsoft::WRL::Implements< + Microsoft::WRL::RuntimeClassFlags< + Microsoft::WRL::RuntimeClassType::ClassicCom>, + Microsoft::WRL::FtmBase, + IDirectManipulationContent>> { + public: + MockDirectManipulationContent() {} + + ~MockDirectManipulationContent() override {} + + void SetContentTransform(float scale, float scroll_x, float scroll_y) { + for (int i = 0; i < 6; ++i) + transforms_[i] = 0; + transforms_[0] = scale; + transforms_[4] = scroll_x; + transforms_[5] = scroll_y; + } + + HRESULT STDMETHODCALLTYPE + GetContentTransform(_Out_writes_(point_count) float* transforms, + _In_ DWORD point_count) override { + for (int i = 0; i < 6; ++i) + transforms[i] = transforms_[i]; + return S_OK; + } + + // Other Overrides + HRESULT STDMETHODCALLTYPE GetContentRect(_Out_ RECT* contentSize) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SetContentRect(_In_ const RECT* contentSize) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE GetViewport(_In_ REFIID riid, + _COM_Outptr_ void** object) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE GetTag(_In_ REFIID riid, + _COM_Outptr_opt_ void** object, + _Out_opt_ UINT32* id) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE SetTag(_In_opt_ IUnknown* object, + _In_ UINT32 id) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + GetOutputTransform(_Out_writes_(point_count) float* matrix, + _In_ DWORD point_count) override { + return S_OK; + } + + HRESULT STDMETHODCALLTYPE + SyncContentTransform(_In_reads_(point_count) const float* matrix, + _In_ DWORD point_count) override { + return S_OK; + } + + private: + float transforms_[6]; + + DISALLOW_COPY_AND_ASSIGN(MockDirectManipulationContent); +}; + +enum class Gesture { kScroll, kScale }; + +struct Event { + Gesture gesture_; + float scale_ = 0; + float scroll_x_ = 0; + float scroll_y_ = 0; + + Event(float scale) : gesture_(Gesture::kScale), scale_(scale) {} + + Event(float scroll_x, float scroll_y) + : gesture_(Gesture::kScroll), scroll_x_(scroll_x), scroll_y_(scroll_y) {} +}; + +class MockWindowEventTarget : public WindowEventTarget { + public: + MockWindowEventTarget() {} + + ~MockWindowEventTarget() override {} + + void ApplyPinchZoomScale(float scale) override { + events_.push_back(Event(scale)); + } + + void ApplyPanGestureScroll(int scroll_x, int scroll_y) override { + events_.push_back(Event(scroll_x, scroll_y)); + } + + std::vector<Event> GetEvents() { + std::vector<Event> result = events_; + events_.clear(); + return result; + } + + // Other Overrides + LRESULT HandleMouseMessage(unsigned int message, + WPARAM w_param, + LPARAM l_param, + bool* handled) override { + return S_OK; + } + + LRESULT HandlePointerMessage(unsigned int message, + WPARAM w_param, + LPARAM l_param, + bool* handled) override { + return S_OK; + } + + LRESULT HandleKeyboardMessage(unsigned int message, + WPARAM w_param, + LPARAM l_param, + bool* handled) override { + return S_OK; + } + + LRESULT HandleTouchMessage(unsigned int message, + WPARAM w_param, + LPARAM l_param, + bool* handled) override { + return S_OK; + } + + LRESULT HandleScrollMessage(unsigned int message, + WPARAM w_param, + LPARAM l_param, + bool* handled) override { + return S_OK; + } + + LRESULT HandleNcHitTestMessage(unsigned int message, + WPARAM w_param, + LPARAM l_param, + bool* handled) override { + return S_OK; + } + + void HandleParentChanged() override {} + + private: + std::vector<Event> events_; + + DISALLOW_COPY_AND_ASSIGN(MockWindowEventTarget); +}; + +} // namespace + +class DirectManipulationUnitTest : public testing::Test { + public: + DirectManipulationUnitTest() { + scoped_feature_list_.InitAndEnableFeature(features::kPrecisionTouchpad); + + viewport_ = Microsoft::WRL::Make<MockDirectManipulationViewport>(); + content_ = Microsoft::WRL::Make<MockDirectManipulationContent>(); + direct_manipulation_helper_ = + DirectManipulationHelper::CreateInstanceForTesting(&event_target_, + viewport_); + } + + ~DirectManipulationUnitTest() override {} + + DirectManipulationHelper* GetDirectManipulationHelper() { + return direct_manipulation_helper_.get(); + } + + std::vector<Event> GetEvents() { return event_target_.GetEvents(); } + + void ViewportStatusChanged(DIRECTMANIPULATION_STATUS current, + DIRECTMANIPULATION_STATUS previous) { + direct_manipulation_helper_->event_handler_->OnViewportStatusChanged( + viewport_.Get(), current, previous); + } + + void ContentUpdated(float scale, float scroll_x, float scroll_y) { + content_->SetContentTransform(scale, scroll_x, scroll_y); + direct_manipulation_helper_->event_handler_->OnContentUpdated( + viewport_.Get(), content_.Get()); + } + + void SetNeedAnimation(bool need_poll_events) { + direct_manipulation_helper_->need_poll_events_ = need_poll_events; + } + + bool NeedAnimation() { + return direct_manipulation_helper_->need_poll_events_; + } + + private: + std::unique_ptr<DirectManipulationHelper> direct_manipulation_helper_; + Microsoft::WRL::ComPtr<MockDirectManipulationViewport> viewport_; + Microsoft::WRL::ComPtr<MockDirectManipulationContent> content_; + MockWindowEventTarget event_target_; + base::test::ScopedFeatureList scoped_feature_list_; + + DISALLOW_COPY_AND_ASSIGN(DirectManipulationUnitTest); +}; + +TEST_F(DirectManipulationUnitTest, HelperShouldCreateForWin10) { + // We should create DirectManipulationHelper instance when win version >= 10. + EXPECT_EQ(GetDirectManipulationHelper() != nullptr, + base::win::GetVersion() >= base::win::VERSION_WIN10); +} + +TEST_F(DirectManipulationUnitTest, ReceiveSimplePanTransform) { + if (!GetDirectManipulationHelper()) + return; + + ContentUpdated(1, 10, 0); + std::vector<Event> events = GetEvents(); + + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScroll, events[0].gesture_); + EXPECT_EQ(10, events[0].scroll_x_); + EXPECT_EQ(0, events[0].scroll_y_); + + // For next update, should only apply the difference. + ContentUpdated(1, 15, 0); + + events = GetEvents(); + + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScroll, events[0].gesture_); + EXPECT_EQ(5, events[0].scroll_x_); + EXPECT_EQ(0, events[0].scroll_y_); +} + +TEST_F(DirectManipulationUnitTest, ReceiveSimpleScaleTransform) { + if (!GetDirectManipulationHelper()) + return; + + ContentUpdated(1.1f, 0, 0); + std::vector<Event> events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScale, events[0].gesture_); + EXPECT_EQ(1.1f, events[0].scale_); + + // For next update, should only apply the difference. + ContentUpdated(1.21f, 0, 0); + events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScale, events[0].gesture_); + EXPECT_EQ(1.1f, events[0].scale_); +} + +TEST_F(DirectManipulationUnitTest, ReceiveScrollTransformLessThanOne) { + if (!GetDirectManipulationHelper()) + return; + + // Scroll offset less than 1, should not apply. + ContentUpdated(1, 0.1f, 0); + std::vector<Event> events = GetEvents(); + EXPECT_EQ(0u, events.size()); + + // Scroll offset less than 1, should not apply. + ContentUpdated(1, 0.2f, 0); + events = GetEvents(); + EXPECT_EQ(0u, events.size()); + + // Scroll offset more than 1, should only apply integer part. + ContentUpdated(1, 1.2f, 0); + events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScroll, events[0].gesture_); + EXPECT_EQ(1, events[0].scroll_x_); + EXPECT_EQ(0, events[0].scroll_y_); + + // Scroll offset difference less than 1, should not apply. + ContentUpdated(1, 1.5f, 0); + events = GetEvents(); + EXPECT_EQ(0u, events.size()); + + // Scroll offset difference more than 1, should only apply integer part. + ContentUpdated(1, 3.0f, 0); + events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScroll, events[0].gesture_); + EXPECT_EQ(2, events[0].scroll_x_); + EXPECT_EQ(0, events[0].scroll_y_); +} + +TEST_F(DirectManipulationUnitTest, + ReceiveScaleTransformLessThanFloatPointError) { + if (!GetDirectManipulationHelper()) + return; + + // Scale factor less than float point error, ignore. + ContentUpdated(1.000001f, 0, 0); + std::vector<Event> events = GetEvents(); + EXPECT_EQ(0u, events.size()); + + // Scale factor more than float point error, apply. + ContentUpdated(1.00001f, 0, 0); + events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScale, events[0].gesture_); + EXPECT_EQ(1.00001f, events[0].scale_); + + // Scale factor difference less than float point error, ignore. + ContentUpdated(1.000011f, 0, 0); + events = GetEvents(); + EXPECT_EQ(0u, events.size()); + + // Scale factor difference more than float point error, apply. + ContentUpdated(1.000021f, 0, 0); + events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScale, events[0].gesture_); + EXPECT_EQ(1.000021f / 1.00001f, events[0].scale_); +} + +TEST_F(DirectManipulationUnitTest, InSameSequenceReceiveBothScrollAndScale) { + if (!GetDirectManipulationHelper()) + return; + + // Direct Manipulation maybe give incorrect predictions. In this case, we will + // receive scroll first then scale after. + + // First event is a scroll event. + ContentUpdated(1.0f, 5, 0); + std::vector<Event> events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScroll, events[0].gesture_); + + // Second event comes with scale factor. Now the scroll offset only noise. + ContentUpdated(1.00001f, 5, 0); + events = GetEvents(); + EXPECT_EQ(1u, events.size()); + EXPECT_EQ(Gesture::kScale, events[0].gesture_); +} + +TEST_F(DirectManipulationUnitTest, + NeedAnimtationShouldBeFalseAfterSecondReset) { + if (!GetDirectManipulationHelper()) + return; + + // Direct Manipulation will set need_poll_events_ true when DM_POINTERTEST + // from touchpad. + SetNeedAnimation(true); + + // Receive first ready when gesture end. + ViewportStatusChanged(DIRECTMANIPULATION_READY, DIRECTMANIPULATION_RUNNING); + EXPECT_TRUE(NeedAnimation()); + + // Receive second ready from ZoomToRect. + ViewportStatusChanged(DIRECTMANIPULATION_READY, DIRECTMANIPULATION_RUNNING); + EXPECT_FALSE(NeedAnimation()); +} + +} // namespace win + +} // namespace ui \ No newline at end of file
diff --git a/ui/base/win/on_screen_keyboard_display_manager_stub.cc b/ui/base/win/on_screen_keyboard_display_manager_stub.cc new file mode 100644 index 0000000..6476524 --- /dev/null +++ b/ui/base/win/on_screen_keyboard_display_manager_stub.cc
@@ -0,0 +1,30 @@ +// Copyright 2018 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 "ui/base/win/on_screen_keyboard_display_manager_stub.h" + +namespace ui { + +// OnScreenKeyboardDisplayManagerStub member definitions. +OnScreenKeyboardDisplayManagerStub::OnScreenKeyboardDisplayManagerStub() {} + +OnScreenKeyboardDisplayManagerStub::~OnScreenKeyboardDisplayManagerStub() {} + +bool OnScreenKeyboardDisplayManagerStub::DisplayVirtualKeyboard( + OnScreenKeyboardObserver* observer) { + return false; +} + +bool OnScreenKeyboardDisplayManagerStub::DismissVirtualKeyboard() { + return false; +} + +void OnScreenKeyboardDisplayManagerStub::RemoveObserver( + OnScreenKeyboardObserver* observer) {} + +bool OnScreenKeyboardDisplayManagerStub::IsKeyboardVisible() const { + return false; +} + +} // namespace ui
diff --git a/ui/base/win/on_screen_keyboard_display_manager_stub.h b/ui/base/win/on_screen_keyboard_display_manager_stub.h new file mode 100644 index 0000000..9fb9e25 --- /dev/null +++ b/ui/base/win/on_screen_keyboard_display_manager_stub.h
@@ -0,0 +1,35 @@ +// Copyright 2018 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 UI_BASE_WIN_ON_SCREEN_KEYBOARD_DISPLAY_MANAGER_STUB_H_ +#define UI_BASE_WIN_ON_SCREEN_KEYBOARD_DISPLAY_MANAGER_STUB_H_ + +#include "ui/base/ui_base_export.h" +#include "ui/base/win/osk_display_manager.h" + +namespace ui { + +// This class provides a stub OnScreenDisplayManager. +// Used for < Win8 OS versions. +class UI_BASE_EXPORT OnScreenKeyboardDisplayManagerStub + : public OnScreenKeyboardDisplayManager { + public: + ~OnScreenKeyboardDisplayManagerStub() override; + + // OnScreenKeyboardDisplayManager overrides. + bool DisplayVirtualKeyboard(OnScreenKeyboardObserver* observer) final; + bool DismissVirtualKeyboard() final; + void RemoveObserver(OnScreenKeyboardObserver* observer) final; + bool IsKeyboardVisible() const final; + + private: + friend class OnScreenKeyboardDisplayManager; + OnScreenKeyboardDisplayManagerStub(); + + DISALLOW_COPY_AND_ASSIGN(OnScreenKeyboardDisplayManagerStub); +}; + +} // namespace ui + +#endif // UI_BASE_WIN_ON_SCREEN_KEYBOARD_DISPLAY_MANAGER_STUB_H_
diff --git a/ui/base/win/on_screen_keyboard_display_manager_tab_tip.cc b/ui/base/win/on_screen_keyboard_display_manager_tab_tip.cc index bbce7bd..23b0379 100644 --- a/ui/base/win/on_screen_keyboard_display_manager_tab_tip.cc +++ b/ui/base/win/on_screen_keyboard_display_manager_tab_tip.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/win/osk_display_manager.h" +#include "ui/base/win/on_screen_keyboard_display_manager_tab_tip.h" #include <windows.h> + #include <shellapi.h> #include <shlobj.h> #include <shobjidl.h> // Must be before propkey. #include "base/bind.h" -#include "base/debug/leak_annotations.h" #include "base/location.h" #include "base/logging.h" #include "base/single_thread_task_runner.h" @@ -27,8 +27,10 @@ namespace { -constexpr int kCheckOSKDelayMs = 1000; -constexpr int kDismissKeyboardRetryTimeoutMs = 100; +constexpr base::TimeDelta kCheckOSKDelay = + base::TimeDelta::FromMilliseconds(1000); +constexpr base::TimeDelta kDismissKeyboardRetryTimeout = + base::TimeDelta::FromMilliseconds(100); constexpr int kDismissKeyboardMaxRetries = 5; constexpr wchar_t kOSKClassName[] = L"IPTip_Main_Window"; @@ -131,14 +133,14 @@ // a delayed task to check if the keyboard is visible because of the possible // delay between the ShellExecute call and the keyboard becoming visible. base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(&OnScreenKeyboardDetector::CheckIfKeyboardVisible, - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kCheckOSKDelayMs)); + FROM_HERE, + base::BindOnce(&OnScreenKeyboardDetector::CheckIfKeyboardVisible, + keyboard_detector_factory_.GetWeakPtr()), + kCheckOSKDelay); } bool OnScreenKeyboardDetector::DismissKeyboard() { - // We dismiss the virtual keyboard by generating the ESC keystroke - // programmatically. + // We dismiss the virtual keyboard by generating the SC_CLOSE. HWND osk = ::FindWindow(kOSKClassName, nullptr); if (::IsWindow(osk) && ::IsWindowEnabled(osk)) { keyboard_detect_requested_ = false; @@ -146,16 +148,19 @@ HandleKeyboardHidden(); PostMessage(osk, WM_SYSCOMMAND, SC_CLOSE, 0); return true; - } else if (keyboard_detect_requested_) { + } + + if (keyboard_detect_requested_) { if (keyboard_dismiss_retry_count_ < kDismissKeyboardMaxRetries) { keyboard_dismiss_retry_count_++; // Please refer to the comments in the DetectKeyboard() function for more // information as to why we need a delayed task here. base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(base::IgnoreResult( - &OnScreenKeyboardDetector::DismissKeyboard), - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kDismissKeyboardRetryTimeoutMs)); + FROM_HERE, + base::BindOnce( + base::IgnoreResult(&OnScreenKeyboardDetector::DismissKeyboard), + keyboard_detector_factory_.GetWeakPtr()), + kDismissKeyboardRetryTimeout); } else { keyboard_dismiss_retry_count_ = 0; } @@ -190,7 +195,7 @@ if (!osk_visible_notification_received_) HandleKeyboardVisible(); } else { - DVLOG(1) << "OSK did not come up in 1 second. Something wrong."; + DVLOG(1) << "OSK did not come up. Something wrong."; } } @@ -221,9 +226,10 @@ } } else { base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(&OnScreenKeyboardDetector::HideIfNecessary, - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kCheckOSKDelayMs)); + FROM_HERE, + base::BindOnce(&OnScreenKeyboardDetector::HideIfNecessary, + keyboard_detector_factory_.GetWeakPtr()), + kCheckOSKDelay); } } @@ -236,9 +242,10 @@ // Now that the keyboard is visible, run the task to detect if it was hidden. base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(&OnScreenKeyboardDetector::HideIfNecessary, - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kCheckOSKDelayMs)); + FROM_HERE, + base::BindOnce(&OnScreenKeyboardDetector::HideIfNecessary, + keyboard_detector_factory_.GetWeakPtr()), + kCheckOSKDelay); } void OnScreenKeyboardDetector::HandleKeyboardHidden() { @@ -253,25 +260,15 @@ RemoveObserver(&observer); } -// OnScreenKeyboardDisplayManager member definitions. -OnScreenKeyboardDisplayManager::OnScreenKeyboardDisplayManager() {} - -OnScreenKeyboardDisplayManager::~OnScreenKeyboardDisplayManager() {} - -OnScreenKeyboardDisplayManager* OnScreenKeyboardDisplayManager::GetInstance() { - static OnScreenKeyboardDisplayManager* instance = nullptr; - if (!instance) { - instance = new OnScreenKeyboardDisplayManager; - ANNOTATE_LEAKING_OBJECT_PTR(instance); - } - return instance; +// OnScreenKeyboardDisplayManagerTabTip member definitions. +OnScreenKeyboardDisplayManagerTabTip::OnScreenKeyboardDisplayManagerTabTip() { + DCHECK_GE(base::win::GetVersion(), base::win::VERSION_WIN8); } -bool OnScreenKeyboardDisplayManager::DisplayVirtualKeyboard( - OnScreenKeyboardObserver* observer) { - if (base::win::GetVersion() < base::win::VERSION_WIN8) - return false; +OnScreenKeyboardDisplayManagerTabTip::~OnScreenKeyboardDisplayManagerTabTip() {} +bool OnScreenKeyboardDisplayManagerTabTip::DisplayVirtualKeyboard( + OnScreenKeyboardObserver* observer) { if (base::win::IsKeyboardPresentOnSlate(nullptr, ui::GetHiddenWindow())) return false; @@ -287,7 +284,7 @@ if (success) { // If multiple calls to DisplayVirtualKeyboard occur one after the other, // the last observer would be the one to get notifications. - keyboard_detector_.reset(new OnScreenKeyboardDetector); + keyboard_detector_ = std::make_unique<OnScreenKeyboardDetector>(); if (observer) keyboard_detector_->AddObserver(observer); keyboard_detector_->DetectKeyboard(::GetForegroundWindow()); @@ -295,20 +292,18 @@ return success; } -bool OnScreenKeyboardDisplayManager::DismissVirtualKeyboard() { - if (base::win::GetVersion() < base::win::VERSION_WIN8) - return false; - +bool OnScreenKeyboardDisplayManagerTabTip::DismissVirtualKeyboard() { return keyboard_detector_ ? keyboard_detector_->DismissKeyboard() : false; } -void OnScreenKeyboardDisplayManager::RemoveObserver( +void OnScreenKeyboardDisplayManagerTabTip::RemoveObserver( OnScreenKeyboardObserver* observer) { if (keyboard_detector_) keyboard_detector_->RemoveObserver(observer); } -bool OnScreenKeyboardDisplayManager::GetOSKPath(base::string16* osk_path) { +bool OnScreenKeyboardDisplayManagerTabTip::GetOSKPath( + base::string16* osk_path) { DCHECK(osk_path); // We need to launch TabTip.exe from the location specified under the @@ -372,7 +367,7 @@ return !osk_path->empty(); } -bool OnScreenKeyboardDisplayManager::IsKeyboardVisible() const { +bool OnScreenKeyboardDisplayManagerTabTip::IsKeyboardVisible() const { return OnScreenKeyboardDetector::IsKeyboardVisible(nullptr); }
diff --git a/ui/base/win/on_screen_keyboard_display_manager_tab_tip.h b/ui/base/win/on_screen_keyboard_display_manager_tab_tip.h index b5392c4..d2428e6 100644 --- a/ui/base/win/on_screen_keyboard_display_manager_tab_tip.h +++ b/ui/base/win/on_screen_keyboard_display_manager_tab_tip.h
@@ -2,59 +2,50 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_WIN_OSK_DISPLAY_MANAGER_H_ -#define UI_BASE_WIN_OSK_DISPLAY_MANAGER_H_ +#ifndef UI_BASE_WIN_ON_SCREEN_KEYBOARD_DISPLAY_MANAGER_TAP_TIP_H_ +#define UI_BASE_WIN_ON_SCREEN_KEYBOARD_DISPLAY_MANAGER_TAP_TIP_H_ -#include "base/memory/weak_ptr.h" -#include "base/observer_list.h" +#include "base/gtest_prod_util.h" #include "base/strings/string16.h" #include "ui/base/ui_base_export.h" -#include "ui/gfx/geometry/rect.h" +#include "ui/base/win/osk_display_manager.h" namespace ui { class OnScreenKeyboardDetector; -class OnScreenKeyboardObserver; -// This class provides functionality to display the on screen keyboard on -// Windows 8+. It optionally notifies observers that the OSK is displayed, -// hidden, etc. -class UI_BASE_EXPORT OnScreenKeyboardDisplayManager { +// This class provides an implementation of the OnScreenKeyboardDisplayManager +// that uses heuristics and the TabTip.exe to display the on screen keyboard. +// Used on Windows > 7 and Windows < 10.0.10240.0 +class UI_BASE_EXPORT OnScreenKeyboardDisplayManagerTabTip + : public OnScreenKeyboardDisplayManager { public: - static OnScreenKeyboardDisplayManager* GetInstance(); + ~OnScreenKeyboardDisplayManagerTabTip() override; - ~OnScreenKeyboardDisplayManager(); - - // Functions to display and dismiss the keyboard. - // The optional |observer| parameter allows callers to be notified when the - // keyboard is displayed, dismissed, etc. - bool DisplayVirtualKeyboard(OnScreenKeyboardObserver* observer); - // When the keyboard is dismissed, the registered observer if any is removed - // after notifying it. - bool DismissVirtualKeyboard(); - - // Removes a registered observer. - void RemoveObserver(OnScreenKeyboardObserver* observer); + // OnScreenKeyboardDisplayManager overrides. + bool DisplayVirtualKeyboard(OnScreenKeyboardObserver* observer) final; + bool DismissVirtualKeyboard() final; + void RemoveObserver(OnScreenKeyboardObserver* observer) final; + bool IsKeyboardVisible() const final; // Returns the path of the on screen keyboard exe (TabTip.exe) in the // |osk_path| parameter. // Returns true on success. bool GetOSKPath(base::string16* osk_path); - // Returns true if the virtual keyboard is currently visible. - bool IsKeyboardVisible() const; - private: - OnScreenKeyboardDisplayManager(); + friend class OnScreenKeyboardDisplayManager; + friend class OnScreenKeyboardTest; + OnScreenKeyboardDisplayManagerTabTip(); std::unique_ptr<OnScreenKeyboardDetector> keyboard_detector_; // The location of TabTip.exe. base::string16 osk_path_; - DISALLOW_COPY_AND_ASSIGN(OnScreenKeyboardDisplayManager); + DISALLOW_COPY_AND_ASSIGN(OnScreenKeyboardDisplayManagerTabTip); }; } // namespace ui -#endif // UI_BASE_WIN_OSK_DISPLAY_MANAGER_H_ +#endif // UI_BASE_WIN_ON_SCREEN_KEYBOARD_DISPLAY_MANAGER_TAP_TIP_H_
diff --git a/ui/base/win/osk_display_manager.cc b/ui/base/win/osk_display_manager.cc index bbce7bd..28456462 100644 --- a/ui/base/win/osk_display_manager.cc +++ b/ui/base/win/osk_display_manager.cc
@@ -4,255 +4,13 @@ #include "ui/base/win/osk_display_manager.h" -#include <windows.h> -#include <shellapi.h> -#include <shlobj.h> -#include <shobjidl.h> // Must be before propkey. - -#include "base/bind.h" #include "base/debug/leak_annotations.h" -#include "base/location.h" -#include "base/logging.h" -#include "base/single_thread_task_runner.h" -#include "base/strings/string_util.h" -#include "base/threading/thread_task_runner_handle.h" -#include "base/win/registry.h" -#include "base/win/scoped_co_mem.h" -#include "base/win/win_util.h" #include "base/win/windows_version.h" -#include "ui/base/win/hidden_window.h" -#include "ui/base/win/osk_display_observer.h" -#include "ui/display/win/dpi.h" -#include "ui/gfx/geometry/dip_util.h" - -namespace { - -constexpr int kCheckOSKDelayMs = 1000; -constexpr int kDismissKeyboardRetryTimeoutMs = 100; -constexpr int kDismissKeyboardMaxRetries = 5; - -constexpr wchar_t kOSKClassName[] = L"IPTip_Main_Window"; - -constexpr wchar_t kWindows8OSKRegPath[] = - L"Software\\Classes\\CLSID\\{054AAE20-4BEA-4347-8A35-64A533254A9D}" - L"\\LocalServer32"; - -} // namespace +#include "ui/base/win/on_screen_keyboard_display_manager_stub.h" +#include "ui/base/win/on_screen_keyboard_display_manager_tab_tip.h" namespace ui { -// This class provides functionality to detect when the on screen keyboard -// is displayed and move the main window up if it is obscured by the keyboard. -class OnScreenKeyboardDetector { - public: - OnScreenKeyboardDetector(); - ~OnScreenKeyboardDetector(); - - // Schedules a delayed task which detects if the on screen keyboard was - // displayed. - void DetectKeyboard(HWND main_window); - - // Dismisses the on screen keyboard. If a call to display the keyboard was - // made, this function waits for the keyboard to become visible by retrying - // upto a maximum of kDismissKeyboardMaxRetries. - bool DismissKeyboard(); - - // Add/Remove keyboard observers. - // Please note that this class does not track the |observer| destruction. It - // is upto the classes which set up these observers to remove them when they - // are destroyed. - void AddObserver(OnScreenKeyboardObserver* observer); - void RemoveObserver(OnScreenKeyboardObserver* observer); - - // Returns true if the osk is visible. Sets osk bounding rect if non-null - static bool IsKeyboardVisible(gfx::Rect* osk_bounding_rect); - - private: - // Executes as a task and detects if the on screen keyboard is displayed. - // Once the keyboard is displayed it schedules the HideIfNecessary() task to - // detect when the keyboard is or should be hidden. - void CheckIfKeyboardVisible(); - - // Executes as a task and detects if the keyboard was hidden or should be - // hidden. - void HideIfNecessary(); - - // Notifies observers that the keyboard was displayed. - // A recurring task HideIfNecessary() is started to detect when the OSK - // disappears. - void HandleKeyboardVisible(); - - // Notifies observers that the keyboard was hidden. - // The observer list is cleared out after this notification. - void HandleKeyboardHidden(); - - // Removes all observers from the list. - void ClearObservers(); - - // The main window which displays the on screen keyboard. - HWND main_window_ = nullptr; - - // Tracks if the keyboard was displayed. - bool osk_visible_notification_received_ = false; - - // The keyboard dimensions in pixels. - gfx::Rect osk_rect_pixels_; - - // Set to true if a call to DetectKeyboard() was made. - bool keyboard_detect_requested_ = false; - - // Contains the number of attempts made to dismiss the keyboard. Please refer - // to the DismissKeyboard() function for more information. - int keyboard_dismiss_retry_count_ = 0; - - base::ObserverList<OnScreenKeyboardObserver, false> observers_; - - // Should be the last member in the class. Helps ensure that tasks spawned - // by this class instance are canceled when it is destroyed. - base::WeakPtrFactory<OnScreenKeyboardDetector> keyboard_detector_factory_; - - DISALLOW_COPY_AND_ASSIGN(OnScreenKeyboardDetector); -}; - -// OnScreenKeyboardDetector member definitions. -OnScreenKeyboardDetector::OnScreenKeyboardDetector() - : keyboard_detector_factory_(this) {} - -OnScreenKeyboardDetector::~OnScreenKeyboardDetector() { - ClearObservers(); -} - -void OnScreenKeyboardDetector::DetectKeyboard(HWND main_window) { - main_window_ = main_window; - keyboard_detect_requested_ = true; - // The keyboard is displayed by TabTip.exe which is launched via a - // ShellExecute call in the - // OnScreenKeyboardDisplayManager::DisplayVirtualKeyboard() function. We use - // a delayed task to check if the keyboard is visible because of the possible - // delay between the ShellExecute call and the keyboard becoming visible. - base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(&OnScreenKeyboardDetector::CheckIfKeyboardVisible, - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kCheckOSKDelayMs)); -} - -bool OnScreenKeyboardDetector::DismissKeyboard() { - // We dismiss the virtual keyboard by generating the ESC keystroke - // programmatically. - HWND osk = ::FindWindow(kOSKClassName, nullptr); - if (::IsWindow(osk) && ::IsWindowEnabled(osk)) { - keyboard_detect_requested_ = false; - keyboard_dismiss_retry_count_ = 0; - HandleKeyboardHidden(); - PostMessage(osk, WM_SYSCOMMAND, SC_CLOSE, 0); - return true; - } else if (keyboard_detect_requested_) { - if (keyboard_dismiss_retry_count_ < kDismissKeyboardMaxRetries) { - keyboard_dismiss_retry_count_++; - // Please refer to the comments in the DetectKeyboard() function for more - // information as to why we need a delayed task here. - base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(base::IgnoreResult( - &OnScreenKeyboardDetector::DismissKeyboard), - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kDismissKeyboardRetryTimeoutMs)); - } else { - keyboard_dismiss_retry_count_ = 0; - } - } - return false; -} - -void OnScreenKeyboardDetector::AddObserver(OnScreenKeyboardObserver* observer) { - observers_.AddObserver(observer); -} - -void OnScreenKeyboardDetector::RemoveObserver( - OnScreenKeyboardObserver* observer) { - observers_.RemoveObserver(observer); -} - -// static -bool OnScreenKeyboardDetector::IsKeyboardVisible(gfx::Rect* osk_bounding_rect) { - HWND osk = ::FindWindow(kOSKClassName, nullptr); - if (!::IsWindow(osk)) - return false; - if (osk_bounding_rect) { - RECT osk_rect = {}; - ::GetWindowRect(osk, &osk_rect); - *osk_bounding_rect = gfx::Rect(osk_rect); - } - return ::IsWindowVisible(osk) && ::IsWindowEnabled(osk); -} - -void OnScreenKeyboardDetector::CheckIfKeyboardVisible() { - if (IsKeyboardVisible(&osk_rect_pixels_)) { - if (!osk_visible_notification_received_) - HandleKeyboardVisible(); - } else { - DVLOG(1) << "OSK did not come up in 1 second. Something wrong."; - } -} - -void OnScreenKeyboardDetector::HideIfNecessary() { - HWND osk = ::FindWindow(kOSKClassName, nullptr); - if (!::IsWindow(osk)) - return; - - // Three cases here. - // 1. OSK was hidden because the user dismissed it. - // 2. We are no longer in the foreground. - // 3. The OSK is still visible. - // In the first case we just have to notify the observers that the OSK was - // hidden. - // In the second case we need to dismiss the OSK which internally will - // notify the observers about the OSK being hidden. - if (!::IsWindowEnabled(osk)) { - if (osk_visible_notification_received_) { - if (main_window_ == ::GetForegroundWindow()) { - DVLOG(1) << "OSK window hidden while we are in the foreground."; - HandleKeyboardHidden(); - } - } - } else if (main_window_ != ::GetForegroundWindow()) { - if (osk_visible_notification_received_) { - DVLOG(1) << "We are no longer in the foreground. Dismising OSK."; - DismissKeyboard(); - } - } else { - base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(&OnScreenKeyboardDetector::HideIfNecessary, - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kCheckOSKDelayMs)); - } -} - -void OnScreenKeyboardDetector::HandleKeyboardVisible() { - DCHECK(!osk_visible_notification_received_); - osk_visible_notification_received_ = true; - - for (OnScreenKeyboardObserver& observer : observers_) - observer.OnKeyboardVisible(osk_rect_pixels_); - - // Now that the keyboard is visible, run the task to detect if it was hidden. - base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(&OnScreenKeyboardDetector::HideIfNecessary, - keyboard_detector_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kCheckOSKDelayMs)); -} - -void OnScreenKeyboardDetector::HandleKeyboardHidden() { - osk_visible_notification_received_ = false; - for (OnScreenKeyboardObserver& observer : observers_) - observer.OnKeyboardHidden(osk_rect_pixels_); - ClearObservers(); -} - -void OnScreenKeyboardDetector::ClearObservers() { - for (auto& observer : observers_) - RemoveObserver(&observer); -} - // OnScreenKeyboardDisplayManager member definitions. OnScreenKeyboardDisplayManager::OnScreenKeyboardDisplayManager() {} @@ -261,119 +19,13 @@ OnScreenKeyboardDisplayManager* OnScreenKeyboardDisplayManager::GetInstance() { static OnScreenKeyboardDisplayManager* instance = nullptr; if (!instance) { - instance = new OnScreenKeyboardDisplayManager; + if (base::win::GetVersion() < base::win::VERSION_WIN8) + instance = new OnScreenKeyboardDisplayManagerStub(); + else + instance = new OnScreenKeyboardDisplayManagerTabTip(); ANNOTATE_LEAKING_OBJECT_PTR(instance); } return instance; } -bool OnScreenKeyboardDisplayManager::DisplayVirtualKeyboard( - OnScreenKeyboardObserver* observer) { - if (base::win::GetVersion() < base::win::VERSION_WIN8) - return false; - - if (base::win::IsKeyboardPresentOnSlate(nullptr, ui::GetHiddenWindow())) - return false; - - if (osk_path_.empty() && !GetOSKPath(&osk_path_)) { - DLOG(WARNING) << "Failed to get on screen keyboard path from registry"; - return false; - } - - HINSTANCE ret = ::ShellExecuteW(nullptr, L"", osk_path_.c_str(), nullptr, - nullptr, SW_SHOW); - - bool success = reinterpret_cast<intptr_t>(ret) > 32; - if (success) { - // If multiple calls to DisplayVirtualKeyboard occur one after the other, - // the last observer would be the one to get notifications. - keyboard_detector_.reset(new OnScreenKeyboardDetector); - if (observer) - keyboard_detector_->AddObserver(observer); - keyboard_detector_->DetectKeyboard(::GetForegroundWindow()); - } - return success; -} - -bool OnScreenKeyboardDisplayManager::DismissVirtualKeyboard() { - if (base::win::GetVersion() < base::win::VERSION_WIN8) - return false; - - return keyboard_detector_ ? keyboard_detector_->DismissKeyboard() : false; -} - -void OnScreenKeyboardDisplayManager::RemoveObserver( - OnScreenKeyboardObserver* observer) { - if (keyboard_detector_) - keyboard_detector_->RemoveObserver(observer); -} - -bool OnScreenKeyboardDisplayManager::GetOSKPath(base::string16* osk_path) { - DCHECK(osk_path); - - // We need to launch TabTip.exe from the location specified under the - // LocalServer32 key for the {{054AAE20-4BEA-4347-8A35-64A533254A9D}} - // CLSID. - // TabTip.exe is typically found at - // c:\program files\common files\microsoft shared\ink on English Windows. - // We don't want to launch TabTip.exe from - // c:\program files (x86)\common files\microsoft shared\ink. This path is - // normally found on 64 bit Windows. - base::win::RegKey key(HKEY_LOCAL_MACHINE, kWindows8OSKRegPath, - KEY_READ | KEY_WOW64_64KEY); - DWORD osk_path_length = 1024; - if (key.ReadValue(nullptr, base::WriteInto(osk_path, osk_path_length), - &osk_path_length, nullptr) != ERROR_SUCCESS) { - return false; - } - - osk_path->resize(base::string16::traits_type::length(osk_path->c_str())); - - *osk_path = base::ToLowerASCII(*osk_path); - - size_t common_program_files_offset = osk_path->find(L"%commonprogramfiles%"); - // Typically the path to TabTip.exe read from the registry will start with - // %CommonProgramFiles% which needs to be replaced with the corrsponding - // expanded string. - // If the path does not begin with %CommonProgramFiles% we use it as is. - if (common_program_files_offset != base::string16::npos) { - // Preserve the beginning quote in the path. - osk_path->erase(common_program_files_offset, - wcslen(L"%commonprogramfiles%")); - // The path read from the registry contains the %CommonProgramFiles% - // environment variable prefix. On 64 bit Windows the SHGetKnownFolderPath - // function returns the common program files path with the X86 suffix for - // the FOLDERID_ProgramFilesCommon value. - // To get the correct path to TabTip.exe we first read the environment - // variable CommonProgramW6432 which points to the desired common - // files path. Failing that we fallback to the SHGetKnownFolderPath API. - - // We then replace the %CommonProgramFiles% value with the actual common - // files path found in the process. - base::string16 common_program_files_path; - DWORD buffer_size = - GetEnvironmentVariable(L"CommonProgramW6432", nullptr, 0); - if (buffer_size) { - GetEnvironmentVariable( - L"CommonProgramW6432", - base::WriteInto(&common_program_files_path, buffer_size), - buffer_size); - DCHECK(!common_program_files_path.empty()); - } else { - base::win::ScopedCoMem<wchar_t> common_program_files; - if (FAILED(SHGetKnownFolderPath(FOLDERID_ProgramFilesCommon, 0, nullptr, - &common_program_files))) { - return false; - } - common_program_files_path = common_program_files; - } - osk_path->insert(common_program_files_offset, common_program_files_path); - } - return !osk_path->empty(); -} - -bool OnScreenKeyboardDisplayManager::IsKeyboardVisible() const { - return OnScreenKeyboardDetector::IsKeyboardVisible(nullptr); -} - } // namespace ui
diff --git a/ui/base/win/osk_display_manager.h b/ui/base/win/osk_display_manager.h index b5392c4..628fbb3 100644 --- a/ui/base/win/osk_display_manager.h +++ b/ui/base/win/osk_display_manager.h
@@ -13,7 +13,6 @@ namespace ui { -class OnScreenKeyboardDetector; class OnScreenKeyboardObserver; // This class provides functionality to display the on screen keyboard on @@ -23,36 +22,24 @@ public: static OnScreenKeyboardDisplayManager* GetInstance(); - ~OnScreenKeyboardDisplayManager(); + virtual ~OnScreenKeyboardDisplayManager(); // Functions to display and dismiss the keyboard. // The optional |observer| parameter allows callers to be notified when the // keyboard is displayed, dismissed, etc. - bool DisplayVirtualKeyboard(OnScreenKeyboardObserver* observer); + virtual bool DisplayVirtualKeyboard(OnScreenKeyboardObserver* observer) = 0; // When the keyboard is dismissed, the registered observer if any is removed // after notifying it. - bool DismissVirtualKeyboard(); + virtual bool DismissVirtualKeyboard() = 0; // Removes a registered observer. - void RemoveObserver(OnScreenKeyboardObserver* observer); - - // Returns the path of the on screen keyboard exe (TabTip.exe) in the - // |osk_path| parameter. - // Returns true on success. - bool GetOSKPath(base::string16* osk_path); + virtual void RemoveObserver(OnScreenKeyboardObserver* observer) = 0; // Returns true if the virtual keyboard is currently visible. - bool IsKeyboardVisible() const; + virtual bool IsKeyboardVisible() const = 0; - private: + protected: OnScreenKeyboardDisplayManager(); - - std::unique_ptr<OnScreenKeyboardDetector> keyboard_detector_; - - // The location of TabTip.exe. - base::string16 osk_path_; - - DISALLOW_COPY_AND_ASSIGN(OnScreenKeyboardDisplayManager); }; } // namespace ui
diff --git a/ui/base/win/osk_display_manager_unittest.cc b/ui/base/win/osk_display_manager_unittest.cc index f9112c8..2beda8b 100644 --- a/ui/base/win/osk_display_manager_unittest.cc +++ b/ui/base/win/osk_display_manager_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/win/osk_display_manager.h" +#include "ui/base/win/on_screen_keyboard_display_manager_tab_tip.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -12,15 +12,26 @@ #include "base/win/windows_version.h" #include "testing/gtest/include/gtest/gtest.h" +namespace ui { + +class OnScreenKeyboardTest : public ::testing::Test { + protected: + std::unique_ptr<OnScreenKeyboardDisplayManagerTabTip> + CreateOSKDisplayManager() { + return std::unique_ptr<OnScreenKeyboardDisplayManagerTabTip>( + new OnScreenKeyboardDisplayManagerTabTip()); + } +}; + // This test validates the on screen keyboard path (tabtip.exe) which is read // from the registry. -TEST(OnScreenKeyboardTest, OSKPath) { +TEST_F(OnScreenKeyboardTest, OSKPath) { // The on screen keyboard is only available on Windows 8+. if (base::win::GetVersion() < base::win::VERSION_WIN8) return; - ui::OnScreenKeyboardDisplayManager* keyboard_display_manager = - ui::OnScreenKeyboardDisplayManager::GetInstance(); + std::unique_ptr<OnScreenKeyboardDisplayManagerTabTip> + keyboard_display_manager(CreateOSKDisplayManager()); EXPECT_NE(nullptr, keyboard_display_manager); base::string16 osk_path; @@ -38,3 +49,5 @@ EXPECT_TRUE(base::PathExists(base::FilePath(osk_path))); } + +} // namespace ui
diff --git a/ui/base/win/window_event_target.h b/ui/base/win/window_event_target.h index 3e9240ef..2be4b5a3 100644 --- a/ui/base/win/window_event_target.h +++ b/ui/base/win/window_event_target.h
@@ -89,6 +89,13 @@ // Notification from the forwarder window that its parent changed. virtual void HandleParentChanged() = 0; + // Apply the transform from Direct Manipulation API. + // ApplyPinchZoomScale is the pinch-zoom gesture. scale is the scale factor. + // ApplyPanGestureScroll is the pan gesture, scroll_x and scroll_y are pixel + // precison scroll offset. + virtual void ApplyPinchZoomScale(float scale) = 0; + virtual void ApplyPanGestureScroll(int scroll_x, int scroll_y) = 0; + protected: WindowEventTarget(); virtual ~WindowEventTarget();
diff --git a/ui/events/blink/web_input_event.cc b/ui/events/blink/web_input_event.cc index 94015fb..baaaeba 100644 --- a/ui/events/blink/web_input_event.cc +++ b/ui/events/blink/web_input_event.cc
@@ -464,6 +464,9 @@ webkit_event.delta_x = event.x_offset(); webkit_event.delta_y = event.y_offset(); + if (event.flags() & ui::EF_PRECISION_SCROLLING_DELTA) + webkit_event.has_precise_scrolling_deltas = true; + webkit_event.wheel_ticks_x = webkit_event.delta_x / MouseWheelEvent::kWheelDelta; webkit_event.wheel_ticks_y =
diff --git a/ui/events/event_constants.h b/ui/events/event_constants.h index 9340ec0..8d9e7df2 100644 --- a/ui/events/event_constants.h +++ b/ui/events/event_constants.h
@@ -139,6 +139,9 @@ EF_CURSOR_HIDE = 1 << 20, // Indicates this mouse event is generated // because the cursor was just hidden. This // can be used to update hover state. + EF_PRECISION_SCROLLING_DELTA = // Indicates this mouse event is from high + 1 << 21, // precision touchpad and will come with a + // high precision delta. }; // Result of dispatching an event.
diff --git a/ui/events/test/platform_event_waiter.cc b/ui/events/test/platform_event_waiter.cc index b0807bb..3169bcc 100644 --- a/ui/events/test/platform_event_waiter.cc +++ b/ui/events/test/platform_event_waiter.cc
@@ -12,9 +12,9 @@ namespace ui { PlatformEventWaiter::PlatformEventWaiter( - const base::Closure& success_callback, + base::OnceClosure success_callback, const PlatformEventMatcher& event_matcher) - : success_callback_(success_callback), + : success_callback_(std::move(success_callback)), event_matcher_(event_matcher) { PlatformEventSource::GetInstance()->AddPlatformEventObserver(this); } @@ -25,7 +25,8 @@ void PlatformEventWaiter::WillProcessEvent(const PlatformEvent& event) { if (event_matcher_.Run(event)) { - base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, success_callback_); + base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, + std::move(success_callback_)); delete this; } } @@ -35,9 +36,9 @@ // static PlatformEventWaiter* PlatformEventWaiter::Create( - const base::Closure& success_callback, + base::OnceClosure success_callback, const PlatformEventMatcher& event_matcher) { - return new PlatformEventWaiter(success_callback, event_matcher); + return new PlatformEventWaiter(std::move(success_callback), event_matcher); } } // namespace ui
diff --git a/ui/events/test/platform_event_waiter.h b/ui/events/test/platform_event_waiter.h index a4c53802..9c3ed4c 100644 --- a/ui/events/test/platform_event_waiter.h +++ b/ui/events/test/platform_event_waiter.h
@@ -15,11 +15,11 @@ public: typedef base::Callback<bool(const PlatformEvent&)> PlatformEventMatcher; - static PlatformEventWaiter* Create(const base::Closure& success_callback, + static PlatformEventWaiter* Create(base::OnceClosure success_callback, const PlatformEventMatcher& event_matcher); private: - PlatformEventWaiter(const base::Closure& success_callback, + PlatformEventWaiter(base::OnceClosure success_callback, const PlatformEventMatcher& event_matcher); ~PlatformEventWaiter() override; @@ -27,7 +27,7 @@ void WillProcessEvent(const PlatformEvent& event) override; void DidProcessEvent(const PlatformEvent& event) override; - base::Closure success_callback_; + base::OnceClosure success_callback_; PlatformEventMatcher event_matcher_; DISALLOW_COPY_AND_ASSIGN(PlatformEventWaiter);
diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc index a8d6b5c..3f391c4 100644 --- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc +++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc
@@ -74,8 +74,8 @@ bool alt, bool command) override { DCHECK(!command); // No command key on Aura - return SendKeyPressNotifyWhenDone( - window, key, control, shift, alt, command, base::Closure()); + return SendKeyPressNotifyWhenDone(window, key, control, shift, alt, command, + base::OnceClosure()); } bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window, @@ -84,7 +84,7 @@ bool shift, bool alt, bool command, - const base::Closure& closure) override { + base::OnceClosure closure) override { DCHECK(!command); // No command key on Aura aura::WindowTreeHost* host = window->GetHost(); @@ -114,16 +114,16 @@ UnmaskAndSetKeycodeThenSend(host, &xevent, ControlMask, XK_Control_L); } DCHECK(!xevent.xkey.state); - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseMove(long screen_x, long screen_y) override { - return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::Closure()); + return SendMouseMoveNotifyWhenDone(screen_x, screen_y, base::OnceClosure()); } bool SendMouseMoveNotifyWhenDone(long screen_x, long screen_y, - const base::Closure& closure) override { + base::OnceClosure closure) override { gfx::Point screen_location(screen_x, screen_y); gfx::Point root_location = screen_location; aura::Window* root_window = RootWindowForPoint(screen_location); @@ -159,15 +159,15 @@ // RootWindow will take care of other necessary fields. aura::test::PostEventToWindowTreeHost(xevent, host); } - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseEvents(MouseButton type, int state) override { - return SendMouseEventsNotifyWhenDone(type, state, base::Closure()); + return SendMouseEventsNotifyWhenDone(type, state, base::OnceClosure()); } bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, - const base::Closure& closure) override { + base::OnceClosure closure) override { XEvent xevent = {0}; XButtonEvent* xbutton = &xevent.xbutton; gfx::Point mouse_loc = aura::Env::GetInstance()->last_mouse_location(); @@ -204,13 +204,13 @@ aura::test::PostEventToWindowTreeHost(xevent, root_window->GetHost()); button_down_mask = (button_down_mask | xbutton->state) ^ xbutton->state; } - RunClosureAfterAllPendingUIEvents(closure); + RunClosureAfterAllPendingUIEvents(std::move(closure)); return true; } bool SendMouseClick(MouseButton type) override { return SendMouseEvents(type, UP | DOWN); } - void RunClosureAfterAllPendingUIEvents(const base::Closure& closure) { + void RunClosureAfterAllPendingUIEvents(base::OnceClosure closure) { if (closure.is_null()) return; static XEvent* marker_event = NULL; @@ -223,7 +223,7 @@ } marker_event->xclient.message_type = MarkerEventAtom(); XSendEvent(x_display_, x_window_, x11::False, 0, marker_event); - ui::PlatformEventWaiter::Create(closure, base::Bind(&Matcher)); + ui::PlatformEventWaiter::Create(std::move(closure), base::Bind(&Matcher)); } private: aura::Window* RootWindowForPoint(const gfx::Point& point) {
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index c8fb7eec..cddb014 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc
@@ -31,7 +31,6 @@ #include "ui/base/ime/text_input_type.h" #include "ui/base/ui_base_features.h" #include "ui/base/view_prop.h" -#include "ui/base/win/direct_manipulation.h" #include "ui/base/win/internal_constants.h" #include "ui/base/win/lock_state.h" #include "ui/base/win/mouse_wheel_util.h" @@ -411,13 +410,6 @@ DCHECK(delegate_->GetHWNDMessageDelegateInputMethod()); delegate_->GetHWNDMessageDelegateInputMethod()->AddObserver(this); - // Direct Manipulation is enabled on Windows 10+. The CreateInstance function - // returns NULL if Direct Manipulation is not available. - direct_manipulation_helper_ = - ui::win::DirectManipulationHelper::CreateInstance(); - if (direct_manipulation_helper_) - direct_manipulation_helper_->Initialize(hwnd()); - // Disable pen flicks (http://crbug.com/506977) base::win::DisableFlicks(hwnd()); } @@ -601,8 +593,6 @@ ShowWindowWithState(ui::SHOW_STATE_INACTIVE); } } - if (direct_manipulation_helper_) - direct_manipulation_helper_->Activate(hwnd()); } void HWNDMessageHandler::ShowWindowWithState(ui::WindowShowState show_state) { @@ -1068,6 +1058,48 @@ touch_ids_.clear(); } +void HWNDMessageHandler::ApplyPinchZoomScale(float scale) { + // We fake a default ctrl+wheel event here. Offset 120 is the default scroll + // offset on Windows. + // TODO(chaopeng) Send pinch-zoom event here. + gfx::Vector2d offset = + scale > 1 ? gfx::Vector2d(120, 120) : gfx::Vector2d(-120, -120); + + POINT root_location = {0}; + ::GetCursorPos(&root_location); + + POINT location = {root_location.x, root_location.y}; + ScreenToClient(hwnd(), &root_location); + + gfx::Point cursor_location(location); + gfx::Point cursor_root_location(root_location); + + ui::MouseWheelEvent wheel_event(offset, cursor_location, cursor_root_location, + base::TimeTicks::Now(), ui::EF_CONTROL_DOWN, + ui::EF_PRECISION_SCROLLING_DELTA); + + delegate_->HandleMouseEvent(wheel_event); +} + +void HWNDMessageHandler::ApplyPanGestureScroll(int scroll_x, int scroll_y) { + gfx::Vector2d offset{scroll_x, scroll_y}; + + POINT root_location = {0}; + ::GetCursorPos(&root_location); + + POINT location = {root_location.x, root_location.y}; + ScreenToClient(hwnd(), &location); + + gfx::Point cursor_location(location); + gfx::Point cursor_root_location(root_location); + + ui::MouseWheelEvent wheel_event(offset, cursor_location, cursor_root_location, + base::TimeTicks::Now(), ui::EF_NONE, + ui::EF_PRECISION_SCROLLING_DELTA); + + delegate_->HandleMouseEvent(wheel_event); +} + //////////////////////////////////////////////////////////////////////////////// // HWNDMessageHandler, private: @@ -2540,13 +2572,9 @@ SetDwmFrameExtension(DwmFrameState::ON); if (window_pos->flags & SWP_SHOWWINDOW) { delegate_->HandleVisibilityChanged(true); - if (direct_manipulation_helper_) - direct_manipulation_helper_->Activate(hwnd()); SetDwmFrameExtension(DwmFrameState::ON); } else if (window_pos->flags & SWP_HIDEWINDOW) { delegate_->HandleVisibilityChanged(false); - if (direct_manipulation_helper_) - direct_manipulation_helper_->Deactivate(hwnd()); } SetMsgHandled(FALSE); @@ -2699,12 +2727,6 @@ if (!ref.get()) return 0; - if (direct_manipulation_helper_ && track_mouse && - (message == WM_MOUSEWHEEL || message == WM_MOUSEHWHEEL)) { - direct_manipulation_helper_->HandleMouseWheel(hwnd(), message, w_param, - l_param); - } - if (!handled && message == WM_NCLBUTTONDOWN && w_param != HTSYSMENU && w_param != HTCAPTION && delegate_->GetFrameMode() == FrameMode::CUSTOM_DRAWN) { @@ -3031,9 +3053,6 @@ delegate_->HandleClientSizeChanged(GetClientAreaBounds().size()); ResetWindowRegion(false, true); } - - if (direct_manipulation_helper_) - direct_manipulation_helper_->SetBounds(bounds_in_pixels); } void HWNDMessageHandler::CheckAndHandleBackgroundFullscreenOnMonitor(
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h index 5d5765c..c419e2b6 100644 --- a/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h
@@ -41,9 +41,6 @@ class InputMethod; class TextInputClient; class ViewProp; -namespace win { -class DirectManipulationHelper; -} // namespace win } // namespace ui namespace views { @@ -261,13 +258,13 @@ WPARAM w_param, LPARAM l_param, bool* handled) override; - LRESULT HandleNcHitTestMessage(unsigned int message, WPARAM w_param, LPARAM l_param, bool* handled) override; - void HandleParentChanged() override; + void ApplyPinchZoomScale(float scale) override; + void ApplyPanGestureScroll(int scroll_x, int scroll_y) override; // Returns the auto-hide edges of the appbar. See // ViewsDelegate::GetAppbarAutohideEdges() for details. If the edges change, @@ -728,12 +725,6 @@ // Some assistive software need to track the location of the caret. std::unique_ptr<ui::AXSystemCaretWin> ax_system_caret_; - // This class provides functionality to register the legacy window as a - // Direct Manipulation consumer. This allows us to support smooth scroll - // in Chrome on Windows 10. - std::unique_ptr<ui::win::DirectManipulationHelper> - direct_manipulation_helper_; - // The location where the user clicked on the caption. We cache this when we // receive the WM_NCLBUTTONDOWN message. We use this in the subsequent // WM_NCMOUSEMOVE message to see if the mouse actually moved.
diff --git a/ui/webui/resources/cr_components/chromeos/network/network_config.js b/ui/webui/resources/cr_components/chromeos/network/network_config.js index 14ce5485..1a1e453 100644 --- a/ui/webui/resources/cr_components/chromeos/network/network_config.js +++ b/ui/webui/resources/cr_components/chromeos/network/network_config.js
@@ -53,9 +53,6 @@ */ type: String, - /** Set by embedder if saveOrConnect should always connect. */ - connectOnSave: Boolean, - /** True if the user configuring the network can toggle the shared state. */ shareAllowEnable: Boolean, @@ -360,7 +357,19 @@ this.setShareNetwork_(); }, - saveOrConnect: function() { + save: function() { + this.saveAndConnect_(false /* connect */); + }, + + connect: function() { + this.saveAndConnect_(true /* connect */); + }, + + /** + * @param {boolean} connect If true, connect after save. + * @private + */ + saveAndConnect_: function(connect) { if (this.propertiesSent_) return; this.propertiesSent_ = true; @@ -376,13 +385,14 @@ this.globalPolicy.AllowOnlyPolicyNetworksToConnect)) { CrOnc.setTypeProperty(propertiesToSet, 'AutoConnect', false); } - // Create the configuration, then connect to it in the callback. this.networkingPrivate.createNetwork( - this.shareNetwork_, propertiesToSet, - this.createNetworkCallback_.bind(this)); + this.shareNetwork_, propertiesToSet, (guid) => { + this.createNetworkCallback_(connect, guid); + }); } else { - this.networkingPrivate.setProperties( - this.guid, propertiesToSet, this.setPropertiesCallback_.bind(this)); + this.networkingPrivate.setProperties(this.guid, propertiesToSet, () => { + this.setPropertiesCallback_(connect); + }); } }, @@ -400,7 +410,7 @@ connectIfConfigured_: function() { if (!this.isConfigured_) return; - this.saveOrConnect(); + this.connect(); }, /** @private */ @@ -1204,8 +1214,11 @@ return (chrome.runtime.lastError && chrome.runtime.lastError.message) || ''; }, - /** @private */ - setPropertiesCallback_: function() { + /** + * @param {boolean} connect If true, connect after save. + * @private + */ + setPropertiesCallback_: function(connect) { this.setError_(this.getRuntimeError_()); if (this.error) { console.error('setProperties error: ' + this.guid + ': ' + this.error); @@ -1213,7 +1226,7 @@ return; } var connectState = this.networkProperties.ConnectionState; - if (this.connectOnSave && + if (connect && (!connectState || connectState == CrOnc.ConnectionState.NOT_CONNECTED)) { this.startConnect_(this.guid); @@ -1223,10 +1236,11 @@ }, /** + * @param {boolean} connect If true, connect after save. * @param {string} guid * @private */ - createNetworkCallback_: function(guid) { + createNetworkCallback_: function(connect, guid) { this.setError_(this.getRuntimeError_()); if (this.error) { console.error( @@ -1235,7 +1249,8 @@ this.propertiesSent_ = false; return; } - this.startConnect_(guid); + if (connect) + this.startConnect_(guid); }, /**
