From 92d8879e594df0a703ef5bd31b78d748f2be1def Mon Sep 17 00:00:00 2001 From: "github-action[bot]" Date: Fri, 30 Sep 2022 20:55:05 +0200 Subject: [PATCH] Update On Fri Sep 30 20:55:04 CEST 2022 --- Cargo.lock | 6 +- browser/actors/AboutPrivateBrowsingParent.jsm | 4 +- browser/actors/AboutProtectionsParent.jsm | 2 +- browser/actors/ClickHandlerChild.jsm | 8 +- browser/actors/ContextMenuChild.jsm | 11 +- browser/actors/FormValidationChild.sys.mjs | 4 +- browser/actors/NetErrorParent.jsm | 8 +- browser/app/pbproxy/module.ver | 8 + browser/app/profile/firefox.js | 7 + .../base/content/aboutDialog-appUpdater.js | 25 +- browser/base/content/aboutDialog.css | 20 +- browser/base/content/aboutDialog.js | 3 +- browser/base/content/aboutDialog.xhtml | 74 +- browser/base/content/browser-ctrlTab.js | 4 +- .../browser-data-submission-info-bar.js | 4 +- browser/base/content/browser-places.js | 11 +- browser/base/content/browser-sidebar.js | 12 +- browser/base/content/browser-sync.js | 4 +- browser/base/content/browser.js | 30 +- browser/base/content/nsContextMenu.js | 4 +- browser/base/content/pageinfo/pageInfo.css | 5 + browser/base/content/safeMode.js | 4 +- .../test/favicons/browser_favicon_load.js | 6 +- .../general/browser_remoteTroubleshoot.js | 5 +- .../test/performance/browser_startup.js | 6 +- .../performance/browser_startup_content.js | 5 +- .../browser_startup_content_subframe.js | 5 +- browser/base/content/test/plugins/head.js | 6 +- .../base/content/test/protectionsUI/head.js | 4 +- .../browser_identityIcon_img_url.js | 2 +- .../browser_preXULSkeletonUIRegistry.js | 8 +- .../test/static/browser_parsable_css.js | 4 +- .../static/browser_sentence_case_strings.js | 4 +- .../content/test/sync/browser_fxa_badge.js | 4 +- .../base/content/test/webextensions/head.js | 4 +- browser/base/content/utilityOverlay.js | 5 +- browser/components/BrowserContentHandler.jsm | 5 +- browser/components/BrowserGlue.jsm | 34 +- .../aboutlogins/AboutLoginsParent.jsm | 5 +- .../tests/browser/browser_openExport.js | 4 +- .../customizableui/CustomizableUI.jsm | 5 +- .../customizableui/CustomizableWidgets.jsm | 5 +- .../customizableui/content/panelUI.js | 14 +- .../test/browser_panelUINotifications.js | 4 +- ...r_panelUINotifications_bannerVisibility.js | 4 +- ...browser_panelUINotifications_fullscreen.js | 4 +- ...ifications_fullscreen_noAutoHideToolbar.js | 4 +- .../browser_panelUINotifications_modals.js | 4 +- ...rowser_panelUINotifications_multiWindow.js | 4 +- browser/components/distribution.js | 4 +- browser/components/doh/test/unit/head.js | 4 +- .../components/downloads/DownloadsViewUI.jsm | 6 +- .../downloads/DownloadsViewableInternally.jsm | 8 +- .../downloads/content/allDownloadsView.js | 2 +- .../components/downloads/content/downloads.js | 16 +- .../components/downloads/content/indicator.js | 11 - .../components/downloads/test/browser/head.js | 6 +- .../components/downloads/test/unit/head.js | 8 +- .../unit/test_DownloadsViewableInternally.js | 4 +- .../enterprisepolicies/Policies.sys.mjs | 2 +- .../browser/browser_policy_app_auto_update.js | 8 +- .../browser/browser_policy_app_update.js | 8 +- .../browser_policy_background_app_update.js | 8 +- .../browser_policy_disable_profile_reset.js | 4 +- .../extensions/parent/ext-browser.js | 6 +- .../components/extensions/parent/ext-tabs.js | 8 +- .../extensions/parent/ext-topSites.js | 5 +- .../browser_ext_browserAction_keyclick.js | 41 +- .../test/browser/browser_ext_webRequest.js | 4 +- .../extensions/test/xpcshell/head.js | 5 +- ...st_ext_chrome_settings_overrides_update.js | 6 +- .../test/xpcshell/test_ext_topSites.js | 4 +- .../components/firefoxview/featureCallout.mjs | 8 +- .../firefox-view-tabs-setup-manager.sys.mjs | 6 +- browser/components/firefoxview/helpers.mjs | 6 +- .../ion/test/browser/browser_ion_ui.js | 4 +- .../migration/360seMigrationUtils.jsm | 5 +- .../migration/FirefoxProfileMigrator.jsm | 12 +- .../components/migration/MSMigrationUtils.jsm | 6 +- .../components/migration/MigrationUtils.jsm | 24 +- .../migration/SafariProfileMigrator.jsm | 10 +- .../migration/tests/unit/head_migration.js | 18 +- .../aboutwelcome/AboutWelcomeParent.jsm | 4 +- .../aboutwelcome/content/aboutwelcome.css | 5 + .../aboutwelcome/lib/AboutWelcomeDefaults.jsm | 5 +- .../aboutwelcome/aboutwelcome.scss | 4 + .../newtab/lib/ASRouterTargeting.jsm | 6 +- .../newtab/lib/ASRouterTriggerListeners.jsm | 2 +- .../newtab/lib/ActivityStreamStorage.jsm | 8 +- .../newtab/lib/DiscoveryStreamFeed.jsm | 12 +- .../newtab/lib/DownloadsManager.jsm | 7 +- browser/components/newtab/lib/FaviconFeed.jsm | 6 +- .../components/newtab/lib/HighlightsFeed.jsm | 8 +- .../newtab/lib/OnboardingMessageProvider.jsm | 8 +- .../PersonalityProvider.jsm | 8 +- browser/components/newtab/lib/PlacesFeed.jsm | 12 +- .../components/newtab/lib/RemoteImages.jsm | 8 +- .../components/newtab/lib/TelemetryFeed.jsm | 8 +- .../components/newtab/lib/TopSitesFeed.jsm | 12 +- .../components/newtab/lib/TopStoriesFeed.jsm | 11 +- ...wser_aboutwelcome_upgrade_multistage_mr.js | 5 +- .../browser/browser_asrouter_remoteimages.js | 4 +- .../browser/browser_asrouter_targeting.js | 12 +- .../browser/browser_topsites_annotation.js | 6 +- .../components/newtab/test/xpcshell/head.js | 8 +- .../browser/browser_favicon_userContextId.js | 6 +- .../pagedata/PageDataParent.sys.mjs | 7 +- .../pagedata/PageDataService.sys.mjs | 7 +- .../pagedata/tests/unit/test_queue.js | 5 +- .../components/places/PlacesUIUtils.sys.mjs | 2 +- browser/components/pocket/content/pktApi.jsm | 8 +- .../preferences/extensionControlled.js | 5 +- browser/components/preferences/main.inc.xhtml | 4 +- browser/components/preferences/preferences.js | 18 +- .../tests/browser_primaryPassword.js | 4 +- ..._privatebrowsing_DownloadLastDirWithCPS.js | 4 +- ...browser_privatebrowsing_downloadLastDir.js | 4 +- ...owser_privatebrowsing_downloadLastDir_c.js | 4 +- ..._privatebrowsing_downloadLastDir_toggle.js | 4 +- .../privatebrowsing/test/browser/head.js | 10 +- .../browser/browser_protections_report_ui.js | 4 +- .../screenshots/ScreenshotsUtils.sys.mjs | 5 +- .../screenshots/content/screenshots.js | 5 +- .../components/sessionstore/SessionStore.jsm | 10 +- .../browser_firefoxView_selected_restore.js | 34 +- browser/components/shell/HeadlessShell.jsm | 4 +- browser/components/shell/ShellService.jsm | 6 +- .../shell/nsWindowsShellService.cpp | 15 +- .../components/shell/test/browser_1119088.js | 4 +- .../syncedtabs/SyncedTabsDeckComponent.js | 4 +- .../syncedtabs/SyncedTabsDeckView.js | 4 +- .../components/syncedtabs/TabListComponent.js | 4 +- browser/components/syncedtabs/TabListView.js | 4 +- .../browser_contentpermissionprompt.js | 4 +- .../components/translation/BingTranslator.jsm | 8 +- .../translation/GoogleTranslator.jsm | 8 +- .../translation/YandexTranslator.jsm | 8 +- browser/components/uitour/UITour.jsm | 6 +- .../components/uitour/test/browser_UITour.js | 7 +- .../urlbar/QuickActionsLoaderDefault.sys.mjs | 2 +- browser/components/urlbar/UrlbarInput.sys.mjs | 2 +- .../urlbar/UrlbarProviderAboutPages.sys.mjs | 7 +- .../urlbar/UrlbarProviderAutofill.sys.mjs | 7 +- .../UrlbarProviderBookmarkKeywords.sys.mjs | 7 +- .../UrlbarProviderInterventions.sys.mjs | 4 +- .../urlbar/UrlbarProviderPlaces.sys.mjs | 6 +- .../UrlbarProviderPreloadedSites.sys.mjs | 5 +- .../urlbar/UrlbarProviderSearchTips.sys.mjs | 4 +- browser/components/urlbar/UrlbarUtils.sys.mjs | 6 +- .../tests/browser-tips/browser_searchTips.js | 4 +- .../browser_searchTips_interaction.js | 4 +- .../urlbar/tests/browser-tips/head.js | 2 +- .../urlbar/tests/browser/browser.ini | 5 +- .../tests/browser/browser_quickactions.js | 306 +- .../browser/browser_quickactions_devtools.js | 163 + .../browser_quickactions_tab_refocus.js | 194 + .../urlbar/tests/browser/browser_top_sites.js | 5 +- .../browser/browser_top_sites_private.js | 5 +- ...ser_urlbar_telemetry_sponsored_topsites.js | 5 +- .../components/urlbar/tests/browser/head.js | 4 +- browser/components/urlbar/tests/unit/head.js | 2 +- .../unit/test_UrlbarController_integration.js | 4 +- .../urlbar/tests/unit/test_about_urls.js | 4 +- .../formautofill/content/manageDialog.js | 14 +- .../browser/browser_privacyPreferences.js | 4 +- .../formautofill/test/browser/head.js | 12 +- .../extensions/formautofill/test/unit/head.js | 12 +- .../test/unit/test_autofillFormFields.js | 4 +- .../test/unit/test_collectFormFields.js | 1051 +-- .../test/unit/test_creditCardRecords.js | 4 +- .../test/unit/test_getCreditCardLogo.js | 4 +- .../formautofill/test/unit/test_getRecords.js | 8 +- .../test/unit/test_previewFormFields.js | 4 +- browser/locales/l10n-changesets.json | 14 +- browser/modules/AppUpdater.jsm | 8 +- browser/modules/ExtensionsUI.jsm | 5 +- browser/modules/FaviconLoader.jsm | 8 +- browser/modules/PageActions.jsm | 5 +- browser/modules/PingCentre.jsm | 8 +- .../test/browser/browser_PermissionUI.js | 4 +- .../browser/browser_PermissionUI_prompts.js | 4 +- .../browser_ProcessHangNotifications.js | 4 +- .../browser_UnsubmittedCrashHandler.js | 4 +- .../test/unit/test_InstallationTelemetry.js | 8 +- browser/modules/test/unit/test_PingCentre.js | 4 +- browser/themes/Windows8WindowFrameColor.jsm | 4 +- browser/themes/linux/pageInfo.css | 8 - browser/themes/osx/pageInfo.css | 4 - .../shared/preferences/mozilla-logo.svg | 3 +- .../themes/shared/preferences/preferences.css | 23 +- browser/themes/windows/pageInfo.css | 4 - .../mozscreenshots/extension/TestRunner.jsm | 4 +- .../browser/browser_screenshots_cropping.js | 4 +- build.gradle | 4 +- build/clang-plugin/CustomMatchers.h | 23 +- build/clang-plugin/ThreadAllows.py | 110 +- build/clang-plugin/ThreadAllows.txt | 71 +- build/clang-plugin/ThreadFileAllows.txt | 69 +- build/clang-plugin/import_mozilla_checks.py | 4 +- build/moz.configure/toolchain.configure | 8 +- caps/NullPrincipal.cpp | 1 - caps/nsJSPrincipals.cpp | 1 - chrome/RegistryMessageUtils.h | 18 - .../src/modules/extensions-helper.js | 9 +- devtools/client/definitions.js | 10 +- .../browser-toolbox/Launcher.sys.mjs | 8 +- .../client/framework/toolbox-host-manager.js | 7 +- devtools/client/framework/toolbox-hosts.js | 10 +- devtools/client/framework/toolbox.js | 14 +- devtools/client/fronts/memory.js | 14 +- .../browser_inspector_extension_sidebar.js | 6 - .../test/head_devtools_inspector_sidebar.js | 4 +- .../markup/test/browser_markup_mutation_02.js | 12 +- .../browser_rules_edit-property-increments.js | 12 +- .../rules/views/text-property-editor.js | 11 +- ...er_net_new_request_panel_content-length.js | 5 + devtools/client/shared/inplace-editor.js | 10 +- .../shared/remote-debugging/adb/adb-binary.js | 28 +- .../client/styleeditor/StyleEditorUI.sys.mjs | 10 +- .../styleeditor/StyleSheetEditor.sys.mjs | 10 +- .../test/browser_styleeditor_filesave.js | 4 +- .../test/browser_styleeditor_import.js | 4 +- .../browser_styleeditor_sourcemap_watching.js | 4 +- devtools/client/themes/common.css | 1 + devtools/client/themes/storage.css | 11 +- devtools/client/themes/toolbox.css | 19 +- devtools/client/themes/widgets.css | 1 + .../test/browser/browser_console.js | 4 +- .../browser/browser_console_screenshot.js | 4 +- ...jsterm_file_load_save_keyboard_shortcut.js | 4 +- .../browser_jsterm_screenshot_command_file.js | 4 +- ..._jsterm_screenshot_command_fixed_header.js | 4 +- ...wser_jsterm_screenshot_command_selector.js | 4 +- ...sole_context_menu_export_console_output.js | 5 +- .../test/browser/browser_webconsole_split.js | 2 +- .../browser_webconsole_split_persist.js | 8 +- devtools/client/webconsole/webconsole-ui.js | 10 +- devtools/platform/JSDebugger.cpp | 1 - .../server/actors/accessibility/accessible.js | 10 +- .../actors/highlighters/tabbing-order.js | 10 +- devtools/server/actors/inspector/walker.js | 10 +- .../actors/network-monitor/network-content.js | 14 +- devtools/server/actors/object.js | 12 +- .../utils/content-process-storage.js | 13 +- devtools/server/actors/storage.js | 15 +- .../server/actors/targets/webextension.js | 13 +- devtools/server/actors/webconsole.js | 14 +- .../webconsole/content-process-forward.js | 7 +- .../actors/webconsole/eval-with-debugger.js | 10 +- devtools/server/performance/memory.js | 10 +- .../xpcshell/test_addon_debugging_connect.js | 9 +- devtools/shared/DevToolsUtils.js | 23 +- .../heapsnapshot/HeapSnapshotFileUtils.js | 10 +- devtools/shared/layout/utils.js | 10 +- devtools/shared/security/socket.js | 12 +- devtools/shared/system.js | 10 +- .../shared/tests/xpcshell/test_fetch-file.js | 4 +- .../tests/xpcshell/test_client_server_bulk.js | 4 +- .../transport/tests/xpcshell/test_queue.js | 4 +- .../tests/xpcshell/test_transport_bulk.js | 4 +- .../shared/webconsole/js-property-provider.js | 10 +- devtools/shared/webconsole/parser-helper.js | 12 +- docshell/base/nsIContentViewer.idl | 24 +- .../browser/browser_fission_maxOrigins.js | 4 +- dom/base/CustomElementRegistry.cpp | 9 +- dom/base/CustomElementRegistry.h | 4 +- dom/base/DOMException.cpp | 1 - dom/base/nsDOMWindowUtils.cpp | 16 +- dom/base/nsFrameMessageManager.cpp | 19 - dom/base/nsGlobalWindowInner.cpp | 17 +- dom/base/nsGlobalWindowInner.h | 4 +- dom/base/nsGlobalWindowOuter.cpp | 24 +- dom/base/nsGlobalWindowOuter.h | 1 + dom/base/nsTextFragment.cpp | 1 - dom/bindings/Codegen.py | 60 +- dom/events/EventListenerService.cpp | 1 - dom/events/IMEStateManager.cpp | 36 +- .../tests/test_ext_response_constructor.html | 1 + .../tests/test_invalid_header_exception.html | 2 +- dom/file/MemoryBlobImpl.cpp | 1 - dom/indexedDB/SerializationHelpers.h | 8 - dom/interfaces/base/nsIDOMWindowUtils.idl | 5 + dom/ipc/StructuredCloneData.h | 11 +- dom/ipc/jsactor/JSActor.cpp | 15 - dom/ipc/jsactor/JSActor.h | 5 - dom/ipc/jsactor/JSProcessActorChild.cpp | 15 - dom/ipc/jsactor/JSProcessActorParent.cpp | 15 - dom/ipc/jsactor/JSWindowActorChild.cpp | 16 - dom/ipc/jsactor/JSWindowActorParent.cpp | 16 - dom/ipc/tests/browser_bug1646088.js | 4 +- dom/localstorage/SerializationHelpers.h | 7 - dom/manifest/Manifest.jsm | 8 +- dom/media/eme/MediaKeyStatusMap.cpp | 14 +- dom/media/eme/MediaKeyStatusMap.h | 5 +- dom/media/gmp/GMPMessageUtils.h | 16 - .../platforms/ffmpeg/FFmpegVideoDecoder.cpp | 9 +- .../tests/mochitests/mediaStreamPlayback.js | 2 + dom/media/webrtc/tests/mochitests/pc.js | 8 + .../OnlineSpeechRecognitionService.cpp | 1 - .../tests/sharedWorker2_messageChannel.js | 2 + .../tests/sharedWorker_messageChannel.js | 2 + .../test_midi_device_explicit_open_close.html | 1 - .../test_midi_device_implicit_open_close.html | 1 - dom/midi/tests/test_midi_device_pending.html | 8 +- dom/midi/tests/test_midi_device_sysex.html | 2 +- dom/midi/tests/test_midi_message_event.html | 2 +- .../test_midi_packet_timing_sorting.html | 1 - .../tests/test_midi_permission_gated.html | 10 +- ...test_tcpsocket_client_and_server_basics.js | 3 + dom/network/tests/test_udpsocket.html | 8 +- dom/notification/Notification.cpp | 19 +- dom/notification/Notification.h | 4 +- dom/notification/new/NotificationDB.jsm | 8 +- dom/notification/test/mochitest/mochitest.ini | 2 + .../test_notification_crossorigin_iframe.html | 25 +- .../test/mochitest/test_notification_tag.html | 15 +- dom/offline/nsDOMOfflineResourceList.cpp | 1 - dom/push/PushBroadcastService.jsm | 8 +- .../test/xpcshell/test_broadcast_success.js | 4 +- .../browser_test_mixed_content_download.js | 2 +- .../NavigationPreloadManager.cpp | 20 +- dom/serviceworkers/NavigationPreloadManager.h | 11 +- .../RemoteServiceWorkerContainerImpl.cpp | 236 - .../RemoteServiceWorkerContainerImpl.h | 61 - .../RemoteServiceWorkerImpl.cpp | 115 - dom/serviceworkers/RemoteServiceWorkerImpl.h | 47 - .../RemoteServiceWorkerRegistrationImpl.cpp | 240 - .../RemoteServiceWorkerRegistrationImpl.h | 65 - dom/serviceworkers/ServiceWorker.cpp | 120 +- dom/serviceworkers/ServiceWorker.h | 44 +- dom/serviceworkers/ServiceWorkerChild.cpp | 6 +- dom/serviceworkers/ServiceWorkerChild.h | 8 +- dom/serviceworkers/ServiceWorkerContainer.cpp | 237 +- dom/serviceworkers/ServiceWorkerContainer.h | 42 +- .../ServiceWorkerContainerChild.cpp | 8 +- .../ServiceWorkerContainerChild.h | 8 +- dom/serviceworkers/ServiceWorkerEvents.cpp | 8 +- dom/serviceworkers/ServiceWorkerManager.cpp | 3 +- dom/serviceworkers/ServiceWorkerPrivate.cpp | 2778 +++---- dom/serviceworkers/ServiceWorkerPrivate.h | 338 +- .../ServiceWorkerPrivateImpl.cpp | 1332 ---- dom/serviceworkers/ServiceWorkerPrivateImpl.h | 288 - .../ServiceWorkerRegistration.cpp | 214 +- .../ServiceWorkerRegistration.h | 54 +- .../ServiceWorkerRegistrationChild.cpp | 11 +- .../ServiceWorkerRegistrationChild.h | 8 +- dom/serviceworkers/moz.build | 4 - dom/serviceworkers/test/mochitest-common.ini | 5 + dom/serviceworkers/test/mochitest.ini | 4 +- dom/webidl/Clients.webidl | 2 +- dom/webidl/CustomElementRegistry.webidl | 2 +- dom/webidl/MediaKeyStatusMap.webidl | 2 +- dom/webidl/ServiceWorkerContainer.webidl | 2 +- dom/webidl/Window.webidl | 7 +- dom/workers/ScriptLoader.cpp | 29 +- dom/workers/loader/CacheLoadHandler.cpp | 4 + dom/workers/loader/NetworkLoadHandler.cpp | 4 - .../RemoteWorkerControllerChild.cpp | 4 +- dom/xml/test/test_bug293347.html | 2 +- dom/xslt/xpath/txNodeSet.cpp | 1 - dom/xslt/xslt/txMozillaXSLTProcessor.cpp | 1 - dom/xul/test/test_bug199692.xhtml | 2 +- dom/xul/test/test_bug311681.xhtml | 7 +- dom/xul/test/test_import_xul_to_content.xhtml | 1 + editor/libeditor/InsertNodeTransaction.cpp | 1 - editor/spellchecker/EditorSpellCheck.cpp | 1 - extensions/auth/nsAuthGSSAPI.cpp | 1 - extensions/auth/nsAuthSSPI.cpp | 1 - extensions/auth/nsAuthSambaNTLM.cpp | 1 - .../spellcheck/src/mozEnglishWordUtils.cpp | 1 - gfx/ipc/GfxMessageUtils.h | 6 - gfx/layers/apz/src/APZCTreeManager.cpp | 2 +- gfx/src/nsThebesFontEnumerator.cpp | 1 - .../browser_windowless_troubleshoot_crash.js | 4 +- gfx/thebes/COLRFonts.cpp | 39 +- gfx/thebes/gfxASurface.cpp | 1 - gfx/thebes/gfxFT2FontList.cpp | 5 +- gfx/thebes/gfxWindowsPlatform.cpp | 2 - .../RenderCompositorSWGL.cpp | 17 +- gfx/webrender_bindings/RenderCompositorSWGL.h | 3 + image/decoders/icon/mac/nsIconChannelCocoa.mm | 1 - image/decoders/icon/win/nsIconChannel.cpp | 1 - image/decoders/nsPNGDecoder.cpp | 1 - .../hyphenation/glue/nsHyphenationManager.cpp | 1 - intl/strres/nsStringBundle.cpp | 1 - ipc/chromium/moz.build | 1 + ipc/chromium/src/base/pickle.cc | 83 +- ipc/chromium/src/base/pickle.h | 20 +- ipc/chromium/src/chrome/common/ipc_message.h | 3 - .../src/chrome/common/ipc_message_utils.cc | 105 + .../src/chrome/common/ipc_message_utils.h | 254 +- ipc/glue/ByteBufUtils.h | 7 - ipc/glue/IPCMessageUtils.cpp | 24 - ipc/glue/IPCMessageUtils.h | 9 - ipc/glue/IPCMessageUtilsSpecializations.h | 434 +- ipc/glue/ProtocolMessageUtils.h | 8 - ipc/glue/SerializedStructuredCloneBuffer.cpp | 78 + ipc/glue/SerializedStructuredCloneBuffer.h | 45 +- ipc/glue/ShmemMessageUtils.h | 4 - ipc/glue/moz.build | 2 +- js/src/gc/Cell.h | 16 +- js/src/gc/GC.cpp | 22 +- js/src/gc/GCInternals.h | 1 + js/src/gc/GCParallelTask.cpp | 7 +- js/src/gc/Marking.cpp | 30 +- js/src/gc/Nursery.cpp | 16 +- js/src/gc/Statistics.cpp | 16 +- js/src/gc/StoreBuffer.h | 21 +- js/src/gc/Sweeping.cpp | 9 +- js/src/gc/TraceKind.h | 59 + js/src/gc/Tracer.h | 1 + js/src/gc/Zone.cpp | 4 +- js/src/vm/Interpreter.cpp | 5 +- js/src/vm/PropMap-inl.h | 3 +- js/src/vm/Time.h | 8 +- js/xpconnect/src/xpcprivate.h | 1 - .../tests/components/native/xpctest_private.h | 1 - layout/base/nsDocumentViewer.cpp | 67 +- layout/base/nsLayoutUtils.cpp | 35 +- layout/base/nsLayoutUtils.h | 6 +- layout/generic/BRFrame.cpp | 7 +- layout/generic/BlockReflowState.cpp | 14 +- layout/generic/BlockReflowState.h | 8 +- layout/generic/nsBlockFrame.cpp | 130 +- layout/generic/nsBlockFrame.h | 4 +- layout/generic/nsBlockReflowContext.cpp | 2 +- layout/generic/nsFloatManager.cpp | 11 +- layout/generic/nsFloatManager.h | 6 +- layout/generic/nsIFrame.cpp | 33 +- layout/generic/nsIFrame.h | 37 +- layout/generic/nsInlineFrame.cpp | 4 +- layout/generic/nsLineBox.cpp | 23 +- layout/generic/nsLineBox.h | 69 +- layout/reftests/font-face/CAhem.ttf | Bin 12448 -> 12524 bytes layout/reftests/font-face/colrv1-05-ref.html | 89 + layout/reftests/font-face/colrv1-05.html | 27 + layout/reftests/font-face/reftest.list | 1 + layout/style/ServoBindings.toml | 1 + layout/style/nsStyleConsts.h | 9 - layout/style/nsStyleStruct.cpp | 7 +- layout/style/nsStyleStruct.h | 2 +- layout/tools/reftest/reftest.jsm | 4 +- memory/replace/dmd/test/test_dmd.js | 4 +- mfbt/BufferList.h | 158 - mfbt/tests/TestBufferList.cpp | 63 - .../android/actors/GeckoViewAutoFillChild.jsm | 5 +- mobile/android/annotations/build.gradle | 7 +- .../android/components/extensions/ext-tabs.js | 8 +- .../geckoview/FilePickerDelegate.jsm | 5 +- .../modules/geckoview/GeckoViewProgress.jsm | 5 +- .../modules/geckoview/GeckoViewUtils.jsm | 4 +- .../libjar/zipwriter/nsDeflateConverter.cpp | 1 - modules/libjar/zipwriter/nsZipDataStream.cpp | 1 - modules/libjar/zipwriter/nsZipHeader.cpp | 1 - modules/libjar/zipwriter/nsZipWriter.cpp | 1 - modules/libpref/init/StaticPrefList.yaml | 19 +- .../MozProcessMitigationDynamicCodePolicy.h | 38 + mozglue/misc/WindowsProcessMitigations.cpp | 7 +- mozglue/misc/moz.build | 1 + netwerk/dns/PublicSuffixList.jsm | 5 +- netwerk/dns/effective_tld_names.dat | 1 + netwerk/ipc/NeckoMessageUtils.h | 12 - .../converters/nsHTTPCompressConv.cpp | 1 - netwerk/test/unit/head_servers.js | 73 + netwerk/test/unit/test_tls_server.js | 4 +- .../unit/test_tls_server_multiple_clients.js | 4 +- netwerk/test/unit/test_websocket_server.js | 17 + netwerk/wifi/nsWifiAccessPoint.cpp | 1 - parser/html/nsHtml5NamedCharacters.h | 1 - parser/html/nsHtml5NamedCharactersAccel.h | 1 - .../configure/test_toolchain_configure.py | 2 +- .../test/configure/test_toolchain_helpers.py | 4 +- python/mozbuild/mozbuild/vendor/moz.build | 8 + remote/cdp/domains/parent/Target.jsm | 4 +- .../browser/target/browser_closeTarget.js | 2 +- remote/marionette/addon.js | 6 +- remote/marionette/browser.js | 6 +- remote/shared/Log.jsm | 4 +- remote/shared/TabManager.jsm | 4 +- .../modules/root/browsingContext.jsm | 5 +- security/manager/ssl/StaticHPKPins.h | 34 +- security/manager/ssl/nsSTSPreloadList.inc | 406 +- security/manager/ssl/tests/unit/head_psm.js | 8 +- security/manager/tools/genRootCAHashes.js | 4 +- ...OCESS_MITIGATION_DYNAMIC_CODE_POLICY.patch | 40 + .../patches/with_update/patch_order.txt | 1 + .../sandbox/win/src/process_mitigations.cc | 6 +- .../win/src/sandboxbroker/sandboxBroker.cpp | 6 +- services/automation/ServicesAutomation.jsm | 5 +- services/common/hawkclient.js | 4 +- services/common/hawkrequest.js | 4 +- services/common/kinto-storage-adapter.js | 4 +- services/common/logmanager.js | 12 +- services/common/modules-testing/logging.js | 4 +- services/common/rest.js | 8 +- services/common/tests/unit/head_helpers.js | 2 +- services/common/tests/unit/test_logmanager.js | 4 +- .../common/tests/unit/test_storage_adapter.js | 4 +- services/common/tokenserverclient.js | 4 +- services/common/utils.js | 4 +- services/fxaccounts/Credentials.jsm | 4 +- services/fxaccounts/FxAccounts.jsm | 4 +- services/fxaccounts/FxAccountsCommon.js | 4 +- services/fxaccounts/FxAccountsKeys.jsm | 4 +- .../tests/xpcshell/test_accounts.js | 4 +- .../fxaccounts/tests/xpcshell/test_profile.js | 4 +- services/settings/Utils.jsm | 4 +- .../dumps/security-state/intermediates.json | 6932 +++++++++-------- services/sync/Weave.jsm | 8 +- services/sync/modules-testing/fxa_utils.js | 4 +- services/sync/modules/SyncDisconnect.jsm | 5 +- services/sync/modules/SyncedTabs.jsm | 4 +- services/sync/modules/addonsreconciler.js | 4 +- services/sync/modules/addonutils.js | 4 +- services/sync/modules/bridged_engine.js | 8 +- services/sync/modules/doctor.js | 4 +- services/sync/modules/engines.js | 8 +- services/sync/modules/engines/forms.js | 4 +- services/sync/modules/engines/tabs.js | 4 +- services/sync/modules/keys.js | 4 +- services/sync/modules/policies.js | 4 +- services/sync/modules/record.js | 4 +- services/sync/modules/resource.js | 4 +- services/sync/modules/service.js | 4 +- services/sync/modules/stages/declined.js | 4 +- services/sync/modules/stages/enginesync.js | 4 +- services/sync/modules/status.js | 4 +- services/sync/modules/sync_auth.js | 4 +- services/sync/modules/telemetry.js | 4 +- services/sync/tests/unit/head_helpers.js | 8 +- services/sync/tests/unit/head_http_server.js | 2 +- services/sync/tests/unit/test_addons_store.js | 4 +- services/sync/tests/unit/test_engine.js | 4 +- .../sync/tests/unit/test_errorhandler_2.js | 4 +- .../tests/unit/test_errorhandler_filelog.js | 4 +- .../tests/unit/test_fxa_node_reassignment.js | 4 +- .../sync/tests/unit/test_node_reassignment.js | 4 +- .../sync/tests/unit/test_service_cluster.js | 4 +- services/sync/tests/unit/test_utils_json.js | 4 +- services/sync/tps/extensions/tps/api.js | 4 +- .../tps/resource/auth/fxaccounts.jsm | 4 +- .../tps/resource/modules/formautofill.jsm | 8 +- .../extensions/tps/resource/modules/forms.jsm | 4 +- .../sync/tps/extensions/tps/resource/tps.jsm | 10 +- .../components/style/properties/gecko.mako.rs | 10 +- .../style/properties/longhands/box.mako.rs | 3 +- servo/components/style/values/computed/box.rs | 1 + .../components/style/values/specified/box.rs | 2 +- servo/ports/geckolib/cbindgen.toml | 1 + storage/Variant.h | 1 - storage/mozStorageArgValueArray.cpp | 1 - storage/mozStorageAsyncStatement.cpp | 1 - storage/mozStorageAsyncStatementJSHelper.cpp | 1 - storage/mozStorageAsyncStatementParams.cpp | 1 - storage/mozStorageStatement.cpp | 1 - storage/mozStorageStatementJSHelper.cpp | 1 - storage/mozStorageStatementParams.cpp | 1 - storage/mozStorageStatementRow.cpp | 1 - storage/test/gtest/storage_test_harness.h | 1 - taskcluster/ci/fetch/moz.build | 8 + taskcluster/ci/fetch/toolchains.yml | 30 +- taskcluster/ci/updatebot/moz.build | 8 + .../scripts/genHPKPStaticPins.js | 4 +- .../scripts/getHSTSPreloadList.js | 8 +- taskcluster/docker/recipes/install-node.sh | 4 +- taskcluster/docker/updatebot/moz.build | 8 + taskcluster/scripts/misc/moz.build | 8 + testing/modules/FileTestUtils.jsm | 4 +- testing/modules/MockRegistrar.jsm | 4 +- testing/specialpowers/api.js | 4 +- .../specialpowers/content/MockFilePicker.jsm | 8 +- .../content/SpecialPowersParent.jsm | 5 +- .../talos/talos/pageloader/chrome/Profiler.js | 4 +- .../startup_test/sessionrestore/addon/api.js | 5 +- testing/talos/talos/talos-powers/api.js | 4 +- .../bidi/browsing_context/close/close.py.ini | 5 - ...le-writable-lock.https.tentative.worker.js | 13 +- .../tests/fs/resources/test-helpers.js | 3 +- .../FileSystemFileHandle-getFile.js | 2 +- .../FileSystemWritableFileStream-piped.js | 16 +- .../FileSystemWritableFileStream.js | 20 +- .../bidi/browsing_context/navigate/wait.py | 25 +- .../audioipc2-client/.cargo-checksum.json | 2 +- .../rust/audioipc2-client/src/context.rs | 22 +- .../rust/audioipc2-client/src/stream.rs | 49 +- .../audioipc2-server/.cargo-checksum.json | 2 +- .../rust/audioipc2-server/src/server.rs | 20 +- .../rust/audioipc2/.cargo-checksum.json | 2 +- third_party/rust/audioipc2/src/ipccore.rs | 20 +- third_party/rust/audioipc2/src/rpccore.rs | 149 +- toolkit/actors/AutoCompleteChild.jsm | 8 +- toolkit/actors/AutoScrollChild.jsm | 8 +- toolkit/actors/DateTimePickerChild.jsm | 8 +- toolkit/actors/DateTimePickerParent.jsm | 8 +- toolkit/actors/FindBarChild.jsm | 12 +- toolkit/actors/FinderChild.jsm | 8 +- toolkit/actors/InlineSpellCheckerChild.jsm | 9 +- toolkit/actors/PictureInPictureChild.sys.mjs | 6 +- toolkit/actors/RemotePageChild.jsm | 15 +- toolkit/actors/SelectChild.jsm | 8 +- .../aboutmemory/content/aboutMemory.js | 8 +- .../content/aboutThirdParty.js | 4 +- .../antitracking/TrackingDBService.jsm | 4 +- .../test/xpcshell/test_tracking_db_service.js | 4 +- .../asyncshutdown/AsyncShutdown.jsm | 8 +- .../tests/xpcshell/test_AsyncShutdown.js | 4 +- .../BackgroundTask_message.jsm | 5 +- .../tests/browser/browser_xpcom_graph_wait.js | 2 +- .../contentprefs/ContentPrefService2.jsm | 8 +- .../ContextualIdentityService.jsm | 8 +- .../cookiebanners/CookieBannerListService.jsm | 5 +- .../components/crashes/CrashManager.in.jsm | 9 +- .../components/crashes/CrashManagerTest.jsm | 5 +- .../components/crashmonitor/CrashMonitor.jsm | 4 +- toolkit/components/downloads/DownloadCore.jsm | 11 +- .../components/downloads/DownloadHistory.jsm | 2 +- .../downloads/DownloadIntegration.jsm | 12 +- toolkit/components/downloads/Downloads.jsm | 4 +- .../test/unit/common_test_Download.js | 8 +- .../components/downloads/test/unit/head.js | 8 +- .../EnterprisePoliciesParent.sys.mjs | 4 +- toolkit/components/extensions/Extension.jsm | 5 +- .../components/extensions/ExtensionChild.jsm | 5 +- .../extensions/ExtensionPermissions.jsm | 12 +- .../extensions/ExtensionScriptingStore.jsm | 5 +- .../extensions/ExtensionSettingsStore.jsm | 8 +- .../extensions/ExtensionShortcuts.jsm | 11 +- .../extensions/ExtensionStorage.jsm | 8 +- .../extensions/ExtensionStorageIDB.jsm | 4 +- .../extensions/ExtensionStorageSyncKinto.jsm | 4 +- .../extensions/ExtensionTestCommon.jsm | 8 +- .../extensions/ExtensionXPCShellUtils.jsm | 8 +- toolkit/components/extensions/FindContent.jsm | 19 +- .../components/extensions/NativeManifests.jsm | 5 +- toolkit/components/extensions/Schemas.jsm | 8 +- .../extensions/ext-browser-content.js | 14 +- .../extensions/parent/ext-downloads.js | 8 +- .../storage/ExtensionStorageComponents.jsm | 5 +- .../extensions/test/xpcshell/head.js | 6 +- .../xpcshell/test_ext_MessageManagerProxy.js | 4 +- .../test_ext_extensionPreferencesManager.js | 4 +- .../extensions/test/xpcshell/test_ext_l10n.js | 4 +- .../test/xpcshell/test_native_manifests.js | 4 +- .../test/xpcshell/test_proxy_failover.js | 4 +- .../xpcshell/test_webRequest_ancestors.js | 4 +- .../formautofill/CreditCardRuleset.jsm | 16 +- .../formautofill/FormAutofillContent.jsm | 5 +- .../formautofill/FormAutofillHandler.jsm | 57 +- .../formautofill/FormAutofillHeuristics.jsm | 5 +- .../formautofill/FormAutofillParent.jsm | 7 +- .../formautofill/FormAutofillPreferences.jsm | 8 +- .../formautofill/FormAutofillStorageBase.jsm | 7 +- .../formautofill/FormAutofillSync.jsm | 5 +- .../formautofill/FormAutofillUtils.jsm | 7 +- .../ProfileAutoCompleteResult.jsm | 5 +- .../android/FormAutofillStorage.jsm | 4 +- .../default/FormAutofillPrompter.jsm | 4 +- .../default/FormAutofillStorage.jsm | 9 +- .../glean_parser_ext/run_glean_parser.py | 23 +- toolkit/components/glean/moz.build | 38 +- .../browser/browser_sma_configure_homepage.js | 4 +- .../test/browser/head.js | 4 +- .../browser/browser_asrouter_trigger_docs.js | 4 +- .../components/narrate/NarrateControls.jsm | 4 +- .../nimbus/lib/ExperimentManager.jsm | 5 +- .../lib/RemoteSettingsExperimentLoader.jsm | 5 +- .../components/nimbus/lib/SharedDataMap.jsm | 14 +- .../nimbus/test/NimbusTestUtils.jsm | 5 +- .../browser/browser_experimentstore_load.js | 8 +- ...ser_experimentstore_load_single_feature.js | 8 +- .../unit/test_ExperimentAPI_NimbusFeatures.js | 4 +- .../unit/test_ExperimentManager_context.js | 4 +- ...eSettingsExperimentLoader_updateRecipes.js | 4 +- toolkit/components/normandy/Normandy.jsm | 8 +- .../normandy/NormandyMigrations.jsm | 4 +- .../actions/BranchedAddonStudyAction.jsm | 5 +- .../normandy/actions/ShowHeartbeatAction.jsm | 8 +- .../components/normandy/lib/AddonRollouts.jsm | 8 +- .../components/normandy/lib/AddonStudies.jsm | 8 +- .../components/normandy/lib/LogManager.jsm | 4 +- .../normandy/lib/NormandyAddonManager.jsm | 5 +- .../normandy/lib/PreferenceExperiments.jsm | 8 +- .../normandy/lib/PreferenceRollouts.jsm | 8 +- .../components/normandy/lib/RecipeRunner.jsm | 4 +- toolkit/components/normandy/lib/Storage.jsm | 8 +- .../test/browser/browser_AddonRollouts.js | 4 +- .../test/browser/browser_AddonStudies.js | 4 +- .../test/browser/browser_LogManager.js | 4 +- .../browser/browser_NormandyAddonManager.js | 4 +- .../browser/browser_PreferenceRollouts.js | 4 +- .../test/browser/browser_about_studies.js | 4 +- .../normandy/test/unit/test_Normandy.js | 4 +- .../normandy/test/unit/test_NormandyApi.js | 4 +- .../normandy/test/unit/test_addon_unenroll.js | 4 +- .../osfile/modules/osfile_async_front.jsm | 8 +- .../tests/mochi/main_test_osfile_async.js | 4 +- .../components/osfile/tests/xpcshell/head.js | 8 +- .../xpcshell/test_file_URL_conversion.js | 4 +- .../tests/xpcshell/test_osfile_async_copy.js | 4 +- .../osfile/tests/xpcshell/test_shutdown.js | 4 +- .../components/passwordmgr/LoginCSVImport.jsm | 5 +- .../passwordmgr/LoginFormFactory.jsm | 5 +- .../components/passwordmgr/LoginHelper.jsm | 8 +- .../passwordmgr/LoginManagerChild.jsm | 9 +- toolkit/components/passwordmgr/LoginStore.jsm | 4 +- .../components/passwordmgr/test/unit/head.js | 5 +- .../pdfjs/content/PdfStreamConverter.jsm | 8 +- .../components/pdfjs/content/PdfjsParent.jsm | 8 +- .../pictureinpicture/PictureInPicture.sys.mjs | 4 +- .../pictureinpicture/content/player.js | 4 +- .../components/pictureinpicture/tests/head.js | 4 +- .../places/BookmarkHTMLUtils.sys.mjs | 4 +- .../components/places/PlacesDBUtils.sys.mjs | 7 +- .../components/places/PlacesSyncUtils.sys.mjs | 2 +- toolkit/components/places/PlacesUtils.sys.mjs | 6 +- .../places/SyncedBookmarksMirror.sys.mjs | 2 +- .../places/tests/gtest/places_test_harness.h | 1 - .../components/places/tests/head_common.js | 6 +- .../history/test_removeVisitsByFilter.js | 4 +- .../components/places/tests/sync/head_sync.js | 2 +- .../promiseworker/PromiseWorker.jsm | 8 +- toolkit/components/reader/AboutReader.jsm | 8 +- toolkit/components/reader/test/head.js | 8 +- .../remotepagemanager/MessagePort.jsm | 8 +- toolkit/components/satchel/FormHistory.jsm | 8 +- .../components/satchel/FormHistoryChild.jsm | 8 +- .../satchel/test/unit/head_satchel.js | 6 +- .../satchel/test/unit/test_history_api.js | 4 +- .../components/search/SearchService.sys.mjs | 91 +- .../search/SearchSuggestionController.sys.mjs | 5 +- .../search/tests/xpcshell/head_search.js | 4 +- .../test_engine_selector_remote_settings.js | 5 +- .../test_remove_engine_notification_box.js | 56 +- .../tests/xpcshell/test_searchSuggest.js | 4 +- .../xpcshell/test_telemetry_event_default.js | 106 +- toolkit/components/telemetry/app/ClientID.jsm | 4 +- .../telemetry/app/TelemetryArchive.jsm | 4 +- .../telemetry/app/TelemetryControllerBase.jsm | 4 +- .../app/TelemetryControllerParent.jsm | 4 +- .../telemetry/app/TelemetryEnvironment.jsm | 22 +- .../app/TelemetryReportingPolicy.jsm | 4 +- .../telemetry/app/TelemetryScheduler.jsm | 4 +- .../telemetry/app/TelemetrySend.jsm | 12 +- .../telemetry/app/TelemetryStorage.jsm | 4 +- .../telemetry/app/TelemetryUtils.jsm | 8 +- .../telemetry/pings/CoveragePing.jsm | 24 +- .../components/telemetry/pings/EventPing.jsm | 5 +- .../components/telemetry/pings/HealthPing.jsm | 4 +- .../telemetry/pings/ModulesPing.jsm | 4 +- .../components/telemetry/pings/PrioPing.jsm | 5 +- .../telemetry/pings/TelemetrySession.jsm | 4 +- .../telemetry/pings/UntrustedModulesPing.jsm | 4 +- .../components/telemetry/pings/UpdatePing.jsm | 4 +- .../components/telemetry/tests/unit/head.js | 9 +- .../telemetry/tests/unit/test_PingSender.js | 4 +- .../unit/test_TelemetryReportingPolicy.js | 4 +- .../tests/unit/test_TelemetryUtils.js | 4 +- .../tests/unit/test_UninstallPing.js | 4 +- .../terminator/TerminatorTelemetry.jsm | 8 +- .../components/thumbnails/PageThumbUtils.jsm | 8 +- toolkit/components/thumbnails/test/head.js | 4 +- .../url-classifier/nsUrlClassifierUtils.cpp | 1 - .../components/urlformatter/URLFormatter.jsm | 7 +- .../components/utils/ClientEnvironment.jsm | 4 +- .../viewsource/test/browser/head.js | 4 +- .../test_XULStore_migration_profile_change.js | 4 +- toolkit/content/aboutAbout.js | 4 +- toolkit/content/aboutNetworking.js | 5 +- toolkit/content/aboutSupport.js | 14 +- toolkit/content/aboutTelemetry.js | 4 +- toolkit/content/aboutwebrtc/aboutWebrtc.js | 8 +- toolkit/content/contentAreaUtils.js | 7 +- .../browser_save_folder_standalone_image.js | 4 +- .../content/widgets/browser-custom-element.js | 13 +- toolkit/content/widgets/editor.js | 4 +- toolkit/content/widgets/findbar.js | 4 +- toolkit/content/widgets/menu.js | 8 +- toolkit/content/widgets/moz-input-box.js | 4 +- toolkit/content/widgets/tabbox.js | 8 +- toolkit/crashreporter/CrashSubmit.jsm | 4 +- .../test/unit/test_crash_AsyncShutdown.js | 12 +- toolkit/library/rust/shared/Cargo.toml | 4 +- ...PagesUtils.jsm => AboutPagesUtils.sys.mjs} | 10 +- toolkit/modules/ActorManagerParent.jsm | 8 +- ...tions.jsm => AppMenuNotifications.sys.mjs} | 6 +- ...{AsanReporter.jsm => AsanReporter.sys.mjs} | 11 +- .../{AsyncPrefs.jsm => AsyncPrefs.sys.mjs} | 10 +- ...{BinarySearch.jsm => BinarySearch.sys.mjs} | 6 +- ...tils.jsm => BrowserTelemetryUtils.sys.mjs} | 10 +- ...{BrowserUtils.jsm => BrowserUtils.sys.mjs} | 13 +- .../{CertUtils.jsm => CertUtils.sys.mjs} | 4 +- toolkit/modules/{Color.jsm => Color.sys.mjs} | 6 +- .../{CreditCard.jsm => CreditCard.sys.mjs} | 8 +- ...rPanel.jsm => DateTimePickerPanel.sys.mjs} | 6 +- toolkit/modules/DeferredTask.jsm | 8 +- toolkit/modules/E10SUtils.jsm | 2 +- .../{FileUtils.jsm => FileUtils.sys.mjs} | 4 +- ...dBarContent.jsm => FindBarContent.sys.mjs} | 9 +- .../modules/{Finder.jsm => Finder.sys.mjs} | 29 +- ...hlighter.jsm => FinderHighlighter.sys.mjs} | 24 +- ...derIterator.jsm => FinderIterator.sys.mjs} | 16 +- ...{FinderParent.jsm => FinderParent.sys.mjs} | 23 +- ...{FirstStartup.jsm => FirstStartup.sys.mjs} | 8 +- ...ikeFactory.jsm => FormLikeFactory.sys.mjs} | 10 +- ...lManager.jsm => GMPInstallManager.sys.mjs} | 64 +- .../{GMPUtils.jsm => GMPUtils.sys.mjs} | 29 +- .../{Geometry.jsm => Geometry.sys.mjs} | 6 +- .../{HiddenFrame.jsm => HiddenFrame.sys.mjs} | 6 +- toolkit/modules/{Http.jsm => Http.sys.mjs} | 6 +- .../{IndexedDB.jsm => IndexedDB.sys.mjs} | 5 +- ...Checker.jsm => InlineSpellChecker.sys.mjs} | 5 +- ....jsm => InlineSpellCheckerContent.sys.mjs} | 13 +- .../{Integration.jsm => Integration.sys.mjs} | 10 +- .../{JSONFile.jsm => JSONFile.sys.mjs} | 18 +- .../{JsonSchema.jsm => JsonSchema.sys.mjs} | 6 +- ...{KeywordUtils.jsm => KeywordUtils.sys.mjs} | 6 +- .../{LayoutUtils.jsm => LayoutUtils.sys.mjs} | 6 +- ...r.jsm => LightweightThemeConsumer.sys.mjs} | 8 +- toolkit/modules/{Log.jsm => Log.sys.mjs} | 9 +- toolkit/modules/{NLP.jsm => NLP.sys.mjs} | 6 +- .../{NewTabUtils.jsm => NewTabUtils.sys.mjs} | 17 +- .../{OSKeyStore.jsm => OSKeyStore.sys.mjs} | 18 +- ...sEnvironment.jsm => OsEnvironment.sys.mjs} | 14 +- ...ionsUtils.jsm => PermissionsUtils.sys.mjs} | 6 +- ...cations.jsm => PopupNotifications.sys.mjs} | 8 +- .../{ProcessType.jsm => ProcessType.sys.mjs} | 6 +- .../{ProfileAge.jsm => ProfileAge.sys.mjs} | 8 +- ...{PromiseUtils.jsm => PromiseUtils.sys.mjs} | 6 +- ...istUtils.jsm => PropertyListUtils.sys.mjs} | 6 +- ...er.jsm => RemotePageAccessManager.sys.mjs} | 38 +- ...{ResetProfile.jsm => ResetProfile.sys.mjs} | 6 +- ...itor.jsm => ResponsivenessMonitor.sys.mjs} | 6 +- ...ectionUtils.jsm => SelectionUtils.sys.mjs} | 6 +- ...viceRequest.jsm => ServiceRequest.sys.mjs} | 10 +- ...hortcutUtils.jsm => ShortcutUtils.sys.mjs} | 9 +- .../modules/{Sqlite.jsm => Sqlite.sys.mjs} | 18 +- .../{SubDialog.jsm => SubDialog.sys.mjs} | 14 +- ...{Troubleshoot.jsm => Troubleshoot.sys.mjs} | 8 +- .../{UpdateUtils.jsm => UpdateUtils.sys.mjs} | 13 +- ...wsRegistry.jsm => WindowsRegistry.sys.mjs} | 6 +- toolkit/modules/moz.build | 146 +- .../tests/browser/browser_AsyncPrefs.js | 4 +- .../tests/browser/browser_BrowserUtils.js | 4 +- .../tests/browser/browser_CreditCard.js | 8 +- .../modules/tests/browser/browser_Geometry.js | 4 +- .../browser/browser_InlineSpellChecker.js | 4 +- .../tests/browser/browser_Troubleshoot.js | 4 +- .../tests/modules/OSKeyStoreTestUtils.jsm | 12 +- toolkit/modules/tests/xpcshell/head.js | 4 +- .../tests/xpcshell/test_AllowedAppSources.js | 4 +- .../tests/xpcshell/test_BinarySearch.js | 4 +- .../tests/xpcshell/test_BrowserUtils.js | 4 +- .../test_BrowserUtils_urlFormatting.js | 8 +- toolkit/modules/tests/xpcshell/test_Color.js | 4 +- .../modules/tests/xpcshell/test_CreditCard.js | 4 +- .../modules/tests/xpcshell/test_FileUtils.js | 4 +- .../tests/xpcshell/test_FinderIterator.js | 4 +- .../tests/xpcshell/test_GMPInstallManager.js | 16 +- toolkit/modules/tests/xpcshell/test_Http.js | 4 +- .../modules/tests/xpcshell/test_IgnoreList.js | 2 +- .../tests/xpcshell/test_Integration.js | 4 +- .../modules/tests/xpcshell/test_JSONFile.js | 8 +- .../modules/tests/xpcshell/test_JsonSchema.js | 4 +- toolkit/modules/tests/xpcshell/test_Log.js | 4 +- .../tests/xpcshell/test_Log_nsIStackFrame.js | 30 +- .../tests/xpcshell/test_Log_stackTrace.js | 4 +- .../tests/xpcshell/test_PermissionsUtils.js | 4 +- .../modules/tests/xpcshell/test_ProfileAge.js | 4 +- .../tests/xpcshell/test_PromiseUtils.js | 4 +- .../test_UpdateUtils_updatechannel.js | 4 +- .../tests/xpcshell/test_UpdateUtils_url.js | 12 +- .../tests/xpcshell/test_firstStartup.js | 4 +- .../modules/tests/xpcshell/test_osKeyStore.js | 4 +- .../tests/xpcshell/test_propertyListsUtils.js | 4 +- .../tests/xpcshell/test_readCertPrefs.js | 4 +- .../tests/xpcshell/test_servicerequest_xhr.js | 4 +- toolkit/modules/tests/xpcshell/test_sqlite.js | 12 +- .../tests/xpcshell/test_sqlite_shutdown.js | 4 +- toolkit/mozapps/downloads/HelperAppDlg.jsm | 8 +- ...rowser_unknownContentType_delayedbutton.js | 4 +- toolkit/mozapps/extensions/AddonManager.jsm | 8 +- .../mozapps/extensions/amInstallTrigger.jsm | 4 +- .../mozapps/extensions/content/shortcuts.js | 5 +- .../extensions/internal/AddonRepository.jsm | 9 +- .../extensions/internal/AddonTestUtils.jsm | 4 +- .../internal/AddonUpdateChecker.jsm | 18 +- .../extensions/internal/GMPProvider.sys.mjs | 18 +- .../internal/ProductAddonChecker.jsm | 13 +- .../extensions/internal/XPIDatabase.jsm | 14 +- .../extensions/internal/XPIInstall.jsm | 14 +- .../extensions/internal/XPIProvider.jsm | 12 +- .../test/browser/browser_gmpProvider.js | 12 +- .../mozapps/extensions/test/browser/head.js | 6 +- .../extensions/test/xpcshell/head_addons.js | 4 +- .../test/xpcshell/test_aom_startup.js | 4 +- .../test/xpcshell/test_gmpProvider.js | 10 +- .../test/xpcshell/test_permissions_prefs.js | 4 +- .../BackgroundTask_backgroundupdate.jsm | 7 +- toolkit/mozapps/update/BackgroundUpdate.jsm | 9 +- toolkit/mozapps/update/UpdateListener.jsm | 8 +- toolkit/mozapps/update/UpdateService.jsm | 13 +- toolkit/mozapps/update/UpdateServiceStub.jsm | 4 +- ...wser_aboutPrefs_backgroundUpdateSetting.js | 8 +- toolkit/mozapps/update/tests/browser/head.js | 14 +- toolkit/mozapps/update/tests/data/shared.js | 12 +- .../unit_aus_update/languagePackUpdates.js | 4 +- ...uccessPartialWhileBackgroundTaskRunning.js | 4 +- toolkit/profile/xpcshell/head.js | 4 +- toolkit/xre/MacLaunchHelper.mm | 1 - .../dllservices/tests/TestDllInterceptor.cpp | 4 +- tools/lint/rejected-words.yml | 7 +- tools/profiler/gecko/nsProfiler.cpp | 1 - .../xpcshell/test_feature_mainthreadio.js | 4 +- uriloader/exthandler/ExtHandlerService.jsm | 18 +- .../exthandler/mac/nsOSHelperAppService.mm | 1 - .../exthandler/nsExternalHelperAppService.cpp | 1 - .../exthandler/nsOSHelperAppServiceChild.cpp | 1 - uriloader/exthandler/tests/mochitest/head.js | 4 +- uriloader/exthandler/tests/unit/head.js | 4 +- .../test_downloads_improvements_migration.js | 4 +- widget/IMEData.cpp | 4 +- widget/IMEData.h | 14 +- widget/android/GeckoEditableSupport.cpp | 14 +- widget/cocoa/nsClipboard.mm | 1 - widget/gtk/IMContextWrapper.cpp | 12 +- widget/gtk/NativeKeyBindings.cpp | 1 - widget/gtk/nsFilePicker.cpp | 1 - widget/gtk/nsWindow.cpp | 35 +- widget/nsGUIEventIPC.h | 11 +- widget/nsTransferable.cpp | 1 - widget/tests/browser/browser.ini | 2 + .../browser/browser_test_InputContextURI.js | 118 + .../browser/browser_test_clipboardcache.js | 4 +- widget/windows/KeyboardLayout.cpp | 1 - widget/windows/TSFTextStore.cpp | 105 +- widget/windows/TSFTextStore.h | 35 +- widget/windows/WinIMEHandler.cpp | 26 +- widget/windows/WinIMEHandler.h | 4 +- xpcom/base/LogModulePrefWatcher.cpp | 1 - xpcom/base/components.conf | 7 - xpcom/base/moz.build | 2 - xpcom/base/nsIMemory.idl | 56 - xpcom/base/nsINIParser.cpp | 22 +- xpcom/base/nsINIParser.h | 6 +- xpcom/base/nsMemory.cpp | 38 - xpcom/base/nsMemory.h | 135 +- xpcom/base/nsMemoryImpl.cpp | 126 +- xpcom/base/nsMemoryImpl.h | 46 - xpcom/build/XPCOM.h | 1 - xpcom/build/nsXPCOM.h | 10 - xpcom/ds/nsIINIParser.idl | 11 + xpcom/ds/nsINIParserImpl.cpp | 13 + xpcom/ds/nsSupportsPrimitives.cpp | 1 - xpcom/ds/nsVariant.cpp | 1 - xpcom/io/Base64.cpp | 24 +- xpcom/io/nsLinebreakConverter.cpp | 1 - xpcom/io/nsLocalFileWin.cpp | 1 - xpcom/io/nsPipe3.cpp | 1 - xpcom/io/nsScriptableInputStream.cpp | 1 - xpcom/io/nsSegmentedBuffer.cpp | 1 - xpcom/io/nsStorageStream.h | 1 - xpcom/io/nsStringStream.h | 10 +- xpcom/string/nsReadableUtils.cpp | 1 - xpcom/string/nsTextFormatter.cpp | 7 - xpcom/tests/gtest/TestDeadlockDetector.cpp | 1 - xpcom/tests/gtest/TestExpirationTracker.cpp | 1 - xpcom/tests/unit/test_bug745466.js | 4 +- xpcom/tests/unit/test_iniParser.js | 13 +- xpcom/tests/unit/test_mac_xattrs.js | 4 +- xpcom/threads/nsProcessCommon.cpp | 1 - xpcom/threads/nsThreadPool.cpp | 1 - xpfe/appshell/AppWindow.cpp | 10 +- 972 files changed, 10987 insertions(+), 14340 deletions(-) create mode 100644 browser/app/pbproxy/module.ver create mode 100644 browser/components/urlbar/tests/browser/browser_quickactions_devtools.js create mode 100644 browser/components/urlbar/tests/browser/browser_quickactions_tab_refocus.js delete mode 100644 dom/serviceworkers/RemoteServiceWorkerContainerImpl.cpp delete mode 100644 dom/serviceworkers/RemoteServiceWorkerContainerImpl.h delete mode 100644 dom/serviceworkers/RemoteServiceWorkerImpl.cpp delete mode 100644 dom/serviceworkers/RemoteServiceWorkerImpl.h delete mode 100644 dom/serviceworkers/RemoteServiceWorkerRegistrationImpl.cpp delete mode 100644 dom/serviceworkers/RemoteServiceWorkerRegistrationImpl.h delete mode 100644 dom/serviceworkers/ServiceWorkerPrivateImpl.cpp delete mode 100644 dom/serviceworkers/ServiceWorkerPrivateImpl.h create mode 100644 ipc/chromium/src/chrome/common/ipc_message_utils.cc delete mode 100644 ipc/glue/IPCMessageUtils.cpp create mode 100644 ipc/glue/SerializedStructuredCloneBuffer.cpp create mode 100644 js/src/gc/TraceKind.h create mode 100644 layout/reftests/font-face/colrv1-05-ref.html create mode 100644 layout/reftests/font-face/colrv1-05.html create mode 100644 mozglue/misc/MozProcessMitigationDynamicCodePolicy.h create mode 100644 python/mozbuild/mozbuild/vendor/moz.build create mode 100644 security/sandbox/chromium-shim/patches/with_update/mingw_fix_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY.patch create mode 100644 taskcluster/ci/fetch/moz.build create mode 100644 taskcluster/ci/updatebot/moz.build create mode 100644 taskcluster/docker/updatebot/moz.build create mode 100644 taskcluster/scripts/misc/moz.build rename toolkit/modules/{AboutPagesUtils.jsm => AboutPagesUtils.sys.mjs} (84%) rename toolkit/modules/{AppMenuNotifications.jsm => AppMenuNotifications.sys.mjs} (98%) rename toolkit/modules/{AsanReporter.jsm => AsanReporter.sys.mjs} (94%) rename toolkit/modules/{AsyncPrefs.jsm => AsyncPrefs.sys.mjs} (95%) rename toolkit/modules/{BinarySearch.jsm => BinarySearch.sys.mjs} (96%) rename toolkit/modules/{BrowserTelemetryUtils.jsm => BrowserTelemetryUtils.sys.mjs} (97%) rename toolkit/modules/{BrowserUtils.jsm => BrowserUtils.sys.mjs} (98%) rename toolkit/modules/{CertUtils.jsm => CertUtils.sys.mjs} (99%) rename toolkit/modules/{Color.jsm => Color.sys.mjs} (98%) rename toolkit/modules/{CreditCard.jsm => CreditCard.sys.mjs} (99%) rename toolkit/modules/{DateTimePickerPanel.jsm => DateTimePickerPanel.sys.mjs} (98%) rename toolkit/modules/{FileUtils.jsm => FileUtils.sys.mjs} (99%) rename toolkit/modules/{FindBarContent.jsm => FindBarContent.sys.mjs} (93%) rename toolkit/modules/{Finder.jsm => Finder.sys.mjs} (97%) rename toolkit/modules/{FinderHighlighter.jsm => FinderHighlighter.sys.mjs} (99%) rename toolkit/modules/{FinderIterator.jsm => FinderIterator.sys.mjs} (99%) rename toolkit/modules/{FinderParent.jsm => FinderParent.sys.mjs} (97%) rename toolkit/modules/{FirstStartup.jsm => FirstStartup.sys.mjs} (94%) rename toolkit/modules/{FormLikeFactory.jsm => FormLikeFactory.sys.mjs} (97%) rename toolkit/modules/{GMPInstallManager.jsm => GMPInstallManager.sys.mjs} (96%) rename toolkit/modules/{GMPUtils.jsm => GMPUtils.sys.mjs} (95%) rename toolkit/modules/{Geometry.jsm => Geometry.sys.mjs} (98%) rename toolkit/modules/{HiddenFrame.jsm => HiddenFrame.sys.mjs} (97%) rename toolkit/modules/{Http.jsm => Http.sys.mjs} (96%) rename toolkit/modules/{IndexedDB.jsm => IndexedDB.sys.mjs} (99%) rename toolkit/modules/{InlineSpellChecker.jsm => InlineSpellChecker.sys.mjs} (99%) rename toolkit/modules/{InlineSpellCheckerContent.jsm => InlineSpellCheckerContent.sys.mjs} (93%) rename toolkit/modules/{Integration.jsm => Integration.sys.mjs} (98%) rename toolkit/modules/{JSONFile.jsm => JSONFile.sys.mjs} (98%) rename toolkit/modules/{JsonSchema.jsm => JsonSchema.sys.mjs} (98%) rename toolkit/modules/{KeywordUtils.jsm => KeywordUtils.sys.mjs} (97%) rename toolkit/modules/{LayoutUtils.jsm => LayoutUtils.sys.mjs} (94%) rename toolkit/modules/{LightweightThemeConsumer.jsm => LightweightThemeConsumer.sys.mjs} (98%) rename toolkit/modules/{Log.jsm => Log.sys.mjs} (99%) rename toolkit/modules/{NLP.jsm => NLP.sys.mjs} (97%) rename toolkit/modules/{NewTabUtils.jsm => NewTabUtils.sys.mjs} (99%) rename toolkit/modules/{OSKeyStore.jsm => OSKeyStore.sys.mjs} (98%) rename toolkit/modules/{OsEnvironment.jsm => OsEnvironment.sys.mjs} (92%) rename toolkit/modules/{PermissionsUtils.jsm => PermissionsUtils.sys.mjs} (96%) rename toolkit/modules/{PopupNotifications.jsm => PopupNotifications.sys.mjs} (99%) rename toolkit/modules/{ProcessType.jsm => ProcessType.sys.mjs} (92%) rename toolkit/modules/{ProfileAge.jsm => ProfileAge.sys.mjs} (97%) rename toolkit/modules/{PromiseUtils.jsm => PromiseUtils.sys.mjs} (96%) rename toolkit/modules/{PropertyListUtils.jsm => PropertyListUtils.sys.mjs} (99%) rename toolkit/modules/{RemotePageAccessManager.jsm => RemotePageAccessManager.sys.mjs} (93%) rename toolkit/modules/{ResetProfile.jsm => ResetProfile.sys.mjs} (97%) rename toolkit/modules/{ResponsivenessMonitor.jsm => ResponsivenessMonitor.sys.mjs} (88%) rename toolkit/modules/{SelectionUtils.jsm => SelectionUtils.sys.mjs} (98%) rename toolkit/modules/{ServiceRequest.jsm => ServiceRequest.sys.mjs} (95%) rename toolkit/modules/{ShortcutUtils.jsm => ShortcutUtils.sys.mjs} (98%) rename toolkit/modules/{Sqlite.jsm => Sqlite.sys.mjs} (99%) rename toolkit/modules/{SubDialog.jsm => SubDialog.sys.mjs} (99%) rename toolkit/modules/{Troubleshoot.jsm => Troubleshoot.sys.mjs} (99%) rename toolkit/modules/{UpdateUtils.jsm => UpdateUtils.sys.mjs} (99%) rename toolkit/modules/{WindowsRegistry.jsm => WindowsRegistry.sys.mjs} (97%) create mode 100644 widget/tests/browser/browser_test_InputContextURI.js delete mode 100644 xpcom/base/nsIMemory.idl delete mode 100644 xpcom/base/nsMemory.cpp delete mode 100644 xpcom/base/nsMemoryImpl.h diff --git a/Cargo.lock b/Cargo.lock index 76e3d15b88e..3789698132b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -318,7 +318,7 @@ dependencies = [ [[package]] name = "audioipc2" version = "0.5.0" -source = "git+https://github.com/kinetiknz/audioipc-2?rev=ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb#ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb" +source = "git+https://github.com/kinetiknz/audioipc-2?rev=42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5#42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5" dependencies = [ "arrayvec", "ashmem", @@ -346,7 +346,7 @@ dependencies = [ [[package]] name = "audioipc2-client" version = "0.5.0" -source = "git+https://github.com/kinetiknz/audioipc-2?rev=ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb#ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb" +source = "git+https://github.com/kinetiknz/audioipc-2?rev=42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5#42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5" dependencies = [ "audio_thread_priority", "audioipc2", @@ -357,7 +357,7 @@ dependencies = [ [[package]] name = "audioipc2-server" version = "0.5.0" -source = "git+https://github.com/kinetiknz/audioipc-2?rev=ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb#ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb" +source = "git+https://github.com/kinetiknz/audioipc-2?rev=42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5#42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5" dependencies = [ "audio_thread_priority", "audioipc2", diff --git a/browser/actors/AboutPrivateBrowsingParent.jsm b/browser/actors/AboutPrivateBrowsingParent.jsm index 8218d6d12ba..2c42eaecaa8 100644 --- a/browser/actors/AboutPrivateBrowsingParent.jsm +++ b/browser/actors/AboutPrivateBrowsingParent.jsm @@ -9,8 +9,8 @@ var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingParent"]; const { ASRouter } = ChromeUtils.import( "resource://activity-stream/lib/ASRouter.jsm" ); -const { BrowserUtils } = ChromeUtils.import( - "resource://gre/modules/BrowserUtils.jsm" +const { BrowserUtils } = ChromeUtils.importESModule( + "resource://gre/modules/BrowserUtils.sys.mjs" ); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" diff --git a/browser/actors/AboutProtectionsParent.jsm b/browser/actors/AboutProtectionsParent.jsm index ee5b89a0bcf..79fa212e8e0 100644 --- a/browser/actors/AboutProtectionsParent.jsm +++ b/browser/actors/AboutProtectionsParent.jsm @@ -12,11 +12,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", Region: "resource://gre/modules/Region.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { - BrowserUtils: "resource://gre/modules/BrowserUtils.jsm", FXA_PWDMGR_HOST: "resource://gre/modules/FxAccountsCommon.js", FXA_PWDMGR_REALM: "resource://gre/modules/FxAccountsCommon.js", AddonManager: "resource://gre/modules/AddonManager.jsm", diff --git a/browser/actors/ClickHandlerChild.jsm b/browser/actors/ClickHandlerChild.jsm index cf274b210b7..f746619cc3e 100644 --- a/browser/actors/ClickHandlerChild.jsm +++ b/browser/actors/ClickHandlerChild.jsm @@ -27,11 +27,9 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/E10SUtils.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "BrowserUtils", - "resource://gre/modules/BrowserUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", +}); class MiddleMousePasteHandlerChild extends JSWindowActorChild { handleEvent(clickEvent) { diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm index 4dfc3e8db36..befcffc201b 100644 --- a/browser/actors/ContextMenuChild.jsm +++ b/browser/actors/ContextMenuChild.jsm @@ -14,15 +14,18 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + InlineSpellCheckerContent: + "resource://gre/modules/InlineSpellCheckerContent.sys.mjs", + SelectionUtils: "resource://gre/modules/SelectionUtils.sys.mjs", + SpellCheckHelper: "resource://gre/modules/InlineSpellChecker.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { E10SUtils: "resource://gre/modules/E10SUtils.jsm", - SpellCheckHelper: "resource://gre/modules/InlineSpellChecker.jsm", LoginManagerChild: "resource://gre/modules/LoginManagerChild.jsm", WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", - SelectionUtils: "resource://gre/modules/SelectionUtils.jsm", - InlineSpellCheckerContent: - "resource://gre/modules/InlineSpellCheckerContent.jsm", ContentDOMReference: "resource://gre/modules/ContentDOMReference.jsm", }); diff --git a/browser/actors/FormValidationChild.sys.mjs b/browser/actors/FormValidationChild.sys.mjs index 33a59552063..6fa2e3c90d4 100644 --- a/browser/actors/FormValidationChild.sys.mjs +++ b/browser/actors/FormValidationChild.sys.mjs @@ -7,9 +7,7 @@ * the display of the help panel on invalid elements. */ -const { LayoutUtils } = ChromeUtils.import( - "resource://gre/modules/LayoutUtils.jsm" -); +import { LayoutUtils } from "resource://gre/modules/LayoutUtils.sys.mjs"; export class FormValidationChild extends JSWindowActorChild { constructor() { diff --git a/browser/actors/NetErrorParent.jsm b/browser/actors/NetErrorParent.jsm index 598225cf2b6..4e1fe6e9950 100644 --- a/browser/actors/NetErrorParent.jsm +++ b/browser/actors/NetErrorParent.jsm @@ -22,11 +22,9 @@ const PREF_SSL_IMPACT_ROOTS = [ const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "BrowserUtils", - "resource://gre/modules/BrowserUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", +}); class CaptivePortalObserver { constructor(actor) { diff --git a/browser/app/pbproxy/module.ver b/browser/app/pbproxy/module.ver new file mode 100644 index 00000000000..5ef8d2a02ae --- /dev/null +++ b/browser/app/pbproxy/module.ver @@ -0,0 +1,8 @@ +WIN32_MODULE_COMPANYNAME=Mozilla Corporation +WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers; available under the MPL 2 license. +WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@ +WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@ +WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation. +WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ +WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@ +WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 8e242d00e5e..33440af56af 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -2722,3 +2722,10 @@ pref("browser.places.snapshots.expiration.userManaged.days", 420); pref("browser.firefox-view.feature-tour", "{\"message\":\"FIREFOX_VIEW_FEATURE_TOUR\",\"screen\":\"FIREFOX_VIEW_SPOTLIGHT\",\"complete\":false}"); // Number of times the user visited about:firefoxview pref("browser.firefox-view.view-count", 0); + +// Enables cookie banner handling in Nightly in Private Browsing Mode. See +// StaticPrefList.yaml for a description of the prefs. +#ifdef NIGHTLY_BUILD + pref("cookiebanners.service.mode.privateBrowsing", 1); + pref("cookiebanners.bannerClicking.enabled", true); +#endif diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js index cf9ab35c62b..67fd755a782 100644 --- a/browser/base/content/aboutDialog-appUpdater.js +++ b/browser/base/content/aboutDialog-appUpdater.js @@ -10,10 +10,14 @@ var { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); + +ChromeUtils.defineESModuleGetters(this, { + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { AppUpdater: "resource:///modules/AppUpdater.jsm", DownloadUtils: "resource://gre/modules/DownloadUtils.jsm", - UpdateUtils: "resource://gre/modules/UpdateUtils.jsm", }); var UPDATING_MIN_DISPLAY_TIME_MS = 1500; @@ -80,7 +84,7 @@ appUpdater.prototype = { }, get selectedPanel() { - return this.updateDeck.querySelector(".selected"); + return this.updateDeck.selectedPanel; }, _onAppUpdateStatus(status, ...args) { @@ -94,22 +98,23 @@ appUpdater.prototype = { case AppUpdater.STATUS.OTHER_INSTANCE_HANDLING_UPDATES: this.selectPanel("otherInstanceHandlingUpdates"); break; - case AppUpdater.STATUS.DOWNLOADING: - this.downloadStatus = document.getElementById("downloadStatus"); + case AppUpdater.STATUS.DOWNLOADING: { + let downloadStatus = document.getElementById("downloadStatus"); if (!args.length) { - this.downloadStatus.textContent = DownloadUtils.getTransferTotal( + downloadStatus.textContent = DownloadUtils.getTransferTotal( 0, this.update.selectedPatch.size ); this.selectPanel("downloading"); } else { let [progress, max] = args; - this.downloadStatus.textContent = DownloadUtils.getTransferTotal( + downloadStatus.textContent = DownloadUtils.getTransferTotal( progress, max ); } break; + } case AppUpdater.STATUS.STAGING: this.selectPanel("applying"); break; @@ -172,6 +177,9 @@ appUpdater.prototype = { icons.className = aChildID; } + // Make sure to select the panel before potentially auto-focusing the button. + this.updateDeck.selectedPanel = panel; + let button = panel.querySelector("button"); if (button) { if (aChildID == "downloadAndInstall") { @@ -192,8 +200,6 @@ appUpdater.prototype = { "update.downloadAndInstallButton.accesskey" ); } - this.selectedPanel?.classList.remove("selected"); - panel.classList.add("selected"); if ( this.options.buttonAutoFocus && (!document.commandDispatcher.focusedElement || // don't steal the focus @@ -202,9 +208,6 @@ appUpdater.prototype = { // except from the other buttons button.focus(); } - } else { - this.selectedPanel?.classList.remove("selected"); - panel.classList.add("selected"); } }, diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css index 37b8ef98737..307cac13257 100644 --- a/browser/base/content/aboutDialog.css +++ b/browser/base/content/aboutDialog.css @@ -3,14 +3,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @namespace html "http://www.w3.org/1999/xhtml"; +:root { -moz-box-layout: flex } + #aboutDialog { - width: 620px; /* Set an explicit line-height to avoid discrepancies in 'auto' spacing across screens with different device DPI, which may cause font metrics to round differently. */ line-height: 1.5; } +#aboutDialogContainer { + -moz-box-flex: 1; +} + #rightBox { background-image: url("chrome://branding/content/about-wordmark.svg"); background-repeat: no-repeat; @@ -60,16 +65,19 @@ padding-inline-start: 0; } -#updateDeck > *:not(.selected) { - visibility: hidden; +#updateDeck { + align-items: center; } -#updateButton, -#updateDeck > hbox > label { +#updateButton { margin-inline-start: 0; padding-inline-start: 0; } +#updateDeck description { + margin: 0; +} + .update-throbber { width: 16px; min-height: 16px; @@ -116,7 +124,7 @@ description > .text-link { #icons > .icon { -moz-context-properties: fill; - margin: 5px; + margin: 10px 5px; width: 16px; height: 16px; } diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 7735f0cdcd0..26200ccf3f4 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -109,7 +109,8 @@ async function init(aEvent) { document.getElementById("release").hidden = false; } - window.sizeToContent(); + const prefWidth = parseFloat(document.documentElement.getAttribute("width")); + window.sizeToContentConstrained(prefWidth, 0); if (AppConstants.platform == "macosx") { window.moveTo( diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml index 1f5afac8c12..6ce30732776 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -12,6 +12,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="aboutDialog" windowtype="Browser:About" + width="620" onload="init(event);" #ifdef MOZ_UPDATER onunload="onUnload(event);" @@ -37,7 +38,7 @@ diff --git a/layout/reftests/font-face/colrv1-05.html b/layout/reftests/font-face/colrv1-05.html new file mode 100644 index 00000000000..e7716ba874b --- /dev/null +++ b/layout/reftests/font-face/colrv1-05.html @@ -0,0 +1,27 @@ + + + +COLRv1 font test: compositing operators + + +

Some glyphs using PAINT_COMPOSITE:

+
+ghijkl +
+ +

And painting them to a canvas element:

+ + diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list index 9f3b1466d2f..a8ad03dbd2a 100644 --- a/layout/reftests/font-face/reftest.list +++ b/layout/reftests/font-face/reftest.list @@ -189,6 +189,7 @@ skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-237,0-277) == colrv1- skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-1,0-1) == colrv1-03.html colrv1-03-ref.html skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-1,0-600) fuzzy-if(Android,0-64,0-37100) == colrv1-04.html colrv1-04-ref.html +skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(Android,8-8,1484-1484) == colrv1-05.html colrv1-05-ref.html defaults # Check that the tech(color-COLRv1) function responds to whether COLRv1 support is enabled. diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml index 8a565b6f63b..c71f35e9633 100644 --- a/layout/style/ServoBindings.toml +++ b/layout/style/ServoBindings.toml @@ -455,6 +455,7 @@ cbindgen-types = [ { gecko = "StyleResize", servo = "crate::values::computed::Resize" }, { gecko = "StyleOverflowClipBox", servo = "crate::values::computed::OverflowClipBox" }, { gecko = "StyleFloat", servo = "crate::values::computed::Float" }, + { gecko = "StyleClear", servo = "crate::values::computed::Clear" }, { gecko = "StyleOverscrollBehavior", servo = "crate::values::computed::OverscrollBehavior" }, { gecko = "StyleTextAlign", servo = "crate::values::computed::TextAlign" }, { gecko = "StyleTextAlignLast", servo = "crate::values::computed::text::TextAlignLast" }, diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h index 59cbd0e7903..829118b6149 100644 --- a/layout/style/nsStyleConsts.h +++ b/layout/style/nsStyleConsts.h @@ -151,15 +151,6 @@ enum class StyleBoxShadowType : uint8_t { Inset, }; -// clear -enum class StyleClear : uint8_t { - None = 0, - Left, - Right, - Both, - Line, -}; - enum class StyleColumnFill : uint8_t { Balance, Auto, diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index ffe44232697..2eed6aa41ba 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -2208,7 +2208,7 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument) mDefaultAppearance(StyleAppearance::None), mPosition(StylePositionProperty::Static), mFloat(StyleFloat::None), - mBreakType(StyleClear::None), + mClear(StyleClear::None), mBreakInside(StyleBreakWithin::Auto), mBreakBefore(StyleBreakBetween::Auto), mBreakAfter(StyleBreakBetween::Auto), @@ -2264,7 +2264,7 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource) mDefaultAppearance(aSource.mDefaultAppearance), mPosition(aSource.mPosition), mFloat(aSource.mFloat), - mBreakType(aSource.mBreakType), + mClear(aSource.mClear), mBreakInside(aSource.mBreakInside), mBreakBefore(aSource.mBreakBefore), mBreakAfter(aSource.mBreakAfter), @@ -2539,8 +2539,7 @@ nsChangeHint nsStyleDisplay::CalcDifference( // // FIXME(emilio): We definitely change the frame tree in nsCSSFrameConstructor // based on break-before / break-after... Shouldn't that reframe? - if (mBreakType != aNewData.mBreakType || - mBreakInside != aNewData.mBreakInside || + if (mClear != aNewData.mClear || mBreakInside != aNewData.mBreakInside || mBreakBefore != aNewData.mBreakBefore || mBreakAfter != aNewData.mBreakAfter || mAppearance != aNewData.mAppearance || diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index 562a0f0c60c..c45b7ff517b 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -1295,7 +1295,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay { mozilla::StylePositionProperty mPosition; mozilla::StyleFloat mFloat; - mozilla::StyleClear mBreakType; + mozilla::StyleClear mClear; mozilla::StyleBreakWithin mBreakInside; mozilla::StyleBreakBetween mBreakBefore; mozilla::StyleBreakBetween mBreakAfter; diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm index 0fe75ae54a2..37c4436a2a4 100644 --- a/layout/tools/reftest/reftest.jsm +++ b/layout/tools/reftest/reftest.jsm @@ -10,8 +10,8 @@ var EXPORTED_SYMBOLS = [ "OnRefTestUnload", ]; -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const { XHTML_NS, diff --git a/memory/replace/dmd/test/test_dmd.js b/memory/replace/dmd/test/test_dmd.js index f9213ba6b33..92d40866c39 100644 --- a/memory/replace/dmd/test/test_dmd.js +++ b/memory/replace/dmd/test/test_dmd.js @@ -6,8 +6,8 @@ "use strict"; -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); // The xpcshell test harness sets PYTHON so we can read it here. diff --git a/mfbt/BufferList.h b/mfbt/BufferList.h index 0d3a968bca9..ca63d7af8ed 100644 --- a/mfbt/BufferList.h +++ b/mfbt/BufferList.h @@ -359,16 +359,6 @@ class BufferList : private AllocPolicy { BufferList MoveFallible( bool* aSuccess, OtherAllocPolicy aAP = OtherAllocPolicy()); - // Return a new BufferList that adopts the byte range starting at Iter so that - // range [aIter, aIter + aSize) is transplanted to the returned BufferList. - // Contents of the buffer before aIter + aSize is left undefined. - // Extract can fail, in which case *aSuccess will be false upon return. The - // moved buffers are erased from the original BufferList. In case of extract - // fails, the original BufferList is intact. All other iterators except aIter - // are invalidated. - // This method requires aIter and aSize to be 8-byte aligned. - BufferList Extract(IterImpl& aIter, size_t aSize, bool* aSuccess); - // Return the number of bytes from 'start' to 'end', two iterators within // this BufferList. size_t RangeLength(const IterImpl& start, const IterImpl& end) const { @@ -557,154 +547,6 @@ BufferList BufferList::MoveFallible( return result; } -template -BufferList BufferList::Extract(IterImpl& aIter, - size_t aSize, - bool* aSuccess) { - MOZ_RELEASE_ASSERT(aSize); - MOZ_RELEASE_ASSERT(mOwning); - MOZ_ASSERT(aSize % kSegmentAlignment == 0); - MOZ_ASSERT(intptr_t(aIter.mData) % kSegmentAlignment == 0); - - auto failure = [this, aSuccess]() { - *aSuccess = false; - return BufferList(0, 0, mStandardCapacity); - }; - - // Number of segments we'll need to copy data from to satisfy the request. - size_t segmentsNeeded = 0; - // If this is None then the last segment is a full segment, otherwise we need - // to copy this many bytes. - Maybe lastSegmentSize; - { - // Copy of the iterator to walk the BufferList and see how many segments we - // need to copy. - IterImpl iter = aIter; - size_t remaining = aSize; - while (!iter.Done() && remaining && - remaining >= iter.RemainingInSegment()) { - remaining -= iter.RemainingInSegment(); - iter.Advance(*this, iter.RemainingInSegment()); - segmentsNeeded++; - } - - if (remaining) { - if (iter.Done()) { - // We reached the end of the BufferList and there wasn't enough data to - // satisfy the request. - return failure(); - } - lastSegmentSize.emplace(remaining); - // The last block also counts as a segment. This makes the conditionals - // on segmentsNeeded work in the rest of the function. - segmentsNeeded++; - } - } - - BufferList result(0, 0, mStandardCapacity); - if (!result.mSegments.reserve(segmentsNeeded + lastSegmentSize.isSome())) { - return failure(); - } - - // Copy the first segment, it's special because we can't just steal the - // entire Segment struct from this->mSegments. - // - // As we leave the data before the new `aIter` position as "unspecified", we - // leave this data in the existing buffer, despite copying it into the new - // buffer. - size_t firstSegmentSize = std::min(aSize, aIter.RemainingInSegment()); - if (!result.WriteBytes(aIter.Data(), firstSegmentSize)) { - return failure(); - } - aIter.Advance(*this, firstSegmentSize); - segmentsNeeded--; - - // The entirety of the request wasn't in the first segment, now copy the - // rest. - if (segmentsNeeded) { - size_t finalSegmentCapacity = 0; - char* finalSegment = nullptr; - // Pre-allocate the final segment so that if this fails, we return before - // we delete the elements from |this->mSegments|. - if (lastSegmentSize.isSome()) { - finalSegmentCapacity = std::max(mStandardCapacity, *lastSegmentSize); - finalSegment = this->template pod_malloc(finalSegmentCapacity); - if (!finalSegment) { - return failure(); - } - } - - size_t removedBytes = 0; - size_t copyStart = aIter.mSegment; - // Copy segments from this over to the result and remove them from our - // storage. Not needed if the only segment we need to copy is the last - // partial one. - size_t segmentsToCopy = segmentsNeeded - lastSegmentSize.isSome(); - for (size_t i = 0; i < segmentsToCopy; ++i) { - result.mSegments.infallibleAppend(Segment( - mSegments[aIter.mSegment].mData, mSegments[aIter.mSegment].mSize, - mSegments[aIter.mSegment].mCapacity)); - removedBytes += mSegments[aIter.mSegment].mSize; - aIter.Advance(*this, aIter.RemainingInSegment()); - } - // Due to the way IterImpl works, there are two cases here: (1) if we've - // consumed the entirety of the BufferList, then the iterator is pointed at - // the end of the final segment, (2) otherwise it is pointed at the start - // of the next segment. We want to verify that we really consumed all - // |segmentsToCopy| segments. - MOZ_RELEASE_ASSERT( - (aIter.mSegment == copyStart + segmentsToCopy) || - (aIter.Done() && aIter.mSegment == copyStart + segmentsToCopy - 1)); - mSegments.erase(mSegments.begin() + copyStart, - mSegments.begin() + copyStart + segmentsToCopy); - - // Reset the iter's position for what we just deleted. - aIter.mSegment -= segmentsToCopy; - aIter.mAbsoluteOffset -= removedBytes; - mSize -= removedBytes; - - // If our iterator is already at the end, we just removed the very last - // segment of our buffer list and need to shift the iterator back to point - // at the end of the previous segment. - if (aIter.Done()) { - MOZ_ASSERT(lastSegmentSize.isNothing()); - if (mSegments.empty()) { - MOZ_ASSERT(aIter.mSegment == 0); - aIter.mData = aIter.mDataEnd = nullptr; - } else { - MOZ_ASSERT(aIter.mSegment == mSegments.length() - 1); - aIter.mData = aIter.mDataEnd = mSegments.back().End(); - } - } - - if (lastSegmentSize.isSome()) { - // We called reserve() on result.mSegments so infallibleAppend is safe. - result.mSegments.infallibleAppend( - Segment(finalSegment, 0, finalSegmentCapacity)); - bool r = result.WriteBytes(aIter.Data(), *lastSegmentSize); - MOZ_RELEASE_ASSERT(r); - aIter.Advance(*this, *lastSegmentSize); - } - } - - result.mSize = aSize; - - AssertConsistentSize(); - result.AssertConsistentSize(); - - // Ensure that the iterator is still valid when Extract returns. -#ifdef DEBUG - if (!mSegments.empty()) { - auto& segment = mSegments[aIter.mSegment]; - MOZ_ASSERT(segment.Start() <= aIter.mData); - MOZ_ASSERT(aIter.mDataEnd == segment.End()); - } -#endif - - *aSuccess = true; - return result; -} - template size_t BufferList::Truncate(IterImpl& aIter) { MOZ_ASSERT(aIter.IsIn(*this) || aIter.Done()); diff --git a/mfbt/tests/TestBufferList.cpp b/mfbt/tests/TestBufferList.cpp index 9535c2245fb..9c0d69d7d6c 100644 --- a/mfbt/tests/TestBufferList.cpp +++ b/mfbt/tests/TestBufferList.cpp @@ -242,69 +242,6 @@ int main(void) { MOZ_RELEASE_ASSERT(iter2.AdvanceAcrossSegments(bl2, kBorrowSize - 5)); MOZ_RELEASE_ASSERT(iter1.Data() == iter2.Data()); - // Extracting. - - const size_t kExtractStart = 8; - const size_t kExtractSize = 24; - const size_t kExtractOverSize = 1000; - - iter = bl.Iter(); - iter.Advance(bl, kExtractStart); - bl2 = bl.Extract(iter, kExtractSize, &success); - MOZ_RELEASE_ASSERT(success); - MOZ_RELEASE_ASSERT(bl2.Size() == kExtractSize); - - BufferList bl3 = bl.Extract(iter, kExtractOverSize, &success); - MOZ_RELEASE_ASSERT(!success); - - iter = bl2.Iter(); - MOZ_RELEASE_ASSERT(iter.AdvanceAcrossSegments(bl2, kExtractSize)); - MOZ_RELEASE_ASSERT(iter.Done()); - - BufferList bl4(8, 8, 8); - MOZ_ALWAYS_TRUE(bl4.WriteBytes("abcd1234", 8)); - iter = bl4.Iter(); - iter.Advance(bl4, 8); - - BufferList bl5 = bl4.Extract(iter, kExtractSize, &success); - MOZ_RELEASE_ASSERT(!success); - - BufferList bl6(0, 0, 16); - MOZ_ALWAYS_TRUE(bl6.WriteBytes("abcdefgh12345678", 16)); - MOZ_ALWAYS_TRUE(bl6.WriteBytes("ijklmnop87654321", 16)); - iter = bl6.Iter(); - iter.Advance(bl6, 8); - BufferList bl7 = bl6.Extract(iter, 16, &success); - MOZ_RELEASE_ASSERT(success); - char data[16]; - MOZ_RELEASE_ASSERT(bl6.ReadBytes(iter, data, 8)); - MOZ_RELEASE_ASSERT(memcmp(data, "87654321", 8) == 0); - iter = bl7.Iter(); - MOZ_RELEASE_ASSERT(bl7.ReadBytes(iter, data, 16)); - MOZ_RELEASE_ASSERT(memcmp(data, "12345678ijklmnop", 16) == 0); - - BufferList bl8(0, 0, 16); - MOZ_ALWAYS_TRUE(bl8.WriteBytes("abcdefgh12345678", 16)); - iter = bl8.Iter(); - BufferList bl9 = bl8.Extract(iter, 8, &success); - MOZ_RELEASE_ASSERT(success); - MOZ_RELEASE_ASSERT(bl9.Size() == 8); - MOZ_RELEASE_ASSERT(!iter.Done()); - - BufferList bl10(0, 0, 8); - MOZ_ALWAYS_TRUE(bl10.WriteBytes("abcdefgh", 8)); - MOZ_ALWAYS_TRUE(bl10.WriteBytes("12345678", 8)); - iter = bl10.Iter(); - BufferList bl11 = bl10.Extract(iter, 16, &success); - MOZ_RELEASE_ASSERT(success); - MOZ_RELEASE_ASSERT(bl11.Size() == 16); - MOZ_RELEASE_ASSERT(iter.Done()); - MOZ_RELEASE_ASSERT(iter.AdvanceAcrossSegments(bl10, 0)); - MOZ_RELEASE_ASSERT(iter.Done()); - iter = bl11.Iter(); - MOZ_RELEASE_ASSERT(bl11.ReadBytes(iter, data, 16)); - MOZ_RELEASE_ASSERT(memcmp(data, "abcdefgh12345678", 16) == 0); - // RangeLength. BufferList bl12(0, 0, 8); diff --git a/mobile/android/actors/GeckoViewAutoFillChild.jsm b/mobile/android/actors/GeckoViewAutoFillChild.jsm index e1820e5b18b..323a3dd3903 100644 --- a/mobile/android/actors/GeckoViewAutoFillChild.jsm +++ b/mobile/android/actors/GeckoViewAutoFillChild.jsm @@ -14,8 +14,11 @@ const { GeckoViewUtils } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm", LoginManagerChild: "resource://gre/modules/LoginManagerChild.jsm", }); diff --git a/mobile/android/annotations/build.gradle b/mobile/android/annotations/build.gradle index 59dae64075b..95f15b1d6ae 100644 --- a/mobile/android/annotations/build.gradle +++ b/mobile/android/annotations/build.gradle @@ -2,9 +2,12 @@ buildDir "${topobjdir}/gradle/build/mobile/android/annotations" apply plugin: 'java' +// lint should be X+23.Y.Z of gradle_plugin version, according to: +// http://googlesamples.github.io/android-custom-lint-rules/api-guide.html#example:samplelintcheckgithubproject/lintversion? + dependencies { - implementation 'com.android.tools.lint:lint:30.2.2' - implementation 'com.android.tools.lint:lint-checks:30.2.2' + implementation 'com.android.tools.lint:lint:30.3.0' + implementation 'com.android.tools.lint:lint-checks:30.3.0' } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/mobile/android/components/extensions/ext-tabs.js b/mobile/android/components/extensions/ext-tabs.js index 161471ce4fa..a293fde37ab 100644 --- a/mobile/android/components/extensions/ext-tabs.js +++ b/mobile/android/components/extensions/ext-tabs.js @@ -2,11 +2,9 @@ /* vim: set sts=2 sw=2 et tw=80: */ "use strict"; -ChromeUtils.defineModuleGetter( - this, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( this, diff --git a/mobile/android/components/geckoview/FilePickerDelegate.jsm b/mobile/android/components/geckoview/FilePickerDelegate.jsm index 30485a6dcba..f9b8c0c39e2 100644 --- a/mobile/android/components/geckoview/FilePickerDelegate.jsm +++ b/mobile/android/components/geckoview/FilePickerDelegate.jsm @@ -15,8 +15,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - FileUtils: "resource://gre/modules/FileUtils.jsm", GeckoViewPrompter: "resource://gre/modules/GeckoViewPrompter.jsm", }); diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.jsm b/mobile/android/modules/geckoview/GeckoViewProgress.jsm index 71f032fc8e5..746115c6db6 100644 --- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm +++ b/mobile/android/modules/geckoview/GeckoViewProgress.jsm @@ -29,8 +29,11 @@ XPCOMUtils.defineLazyServiceGetter( "nsIIDNService" ); +ChromeUtils.defineESModuleGetters(lazy, { + BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.jsm", HistogramStopwatch: "resource://gre/modules/GeckoViewTelemetry.jsm", }); diff --git a/mobile/android/modules/geckoview/GeckoViewUtils.jsm b/mobile/android/modules/geckoview/GeckoViewUtils.jsm index 6b111f98b66..e3ba81d7b42 100644 --- a/mobile/android/modules/geckoview/GeckoViewUtils.jsm +++ b/mobile/android/modules/geckoview/GeckoViewUtils.jsm @@ -6,7 +6,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { clearTimeout, setTimeout } = ChromeUtils.import( "resource://gre/modules/Timer.jsm" ); diff --git a/modules/libjar/zipwriter/nsDeflateConverter.cpp b/modules/libjar/zipwriter/nsDeflateConverter.cpp index 4da757a4c53..1fead9aa7b2 100644 --- a/modules/libjar/zipwriter/nsDeflateConverter.cpp +++ b/modules/libjar/zipwriter/nsDeflateConverter.cpp @@ -7,7 +7,6 @@ #include "nsDeflateConverter.h" #include "nsStringStream.h" #include "nsComponentManagerUtils.h" -#include "nsMemory.h" #include "nsCRT.h" #include "plstr.h" #include "mozilla/UniquePtr.h" diff --git a/modules/libjar/zipwriter/nsZipDataStream.cpp b/modules/libjar/zipwriter/nsZipDataStream.cpp index e71e12eefee..97bfda5a639 100644 --- a/modules/libjar/zipwriter/nsZipDataStream.cpp +++ b/modules/libjar/zipwriter/nsZipDataStream.cpp @@ -10,7 +10,6 @@ #include "nsDeflateConverter.h" #include "nsNetUtil.h" #include "nsComponentManagerUtils.h" -#include "nsMemory.h" #define ZIP_METHOD_STORE 0 #define ZIP_METHOD_DEFLATE 8 diff --git a/modules/libjar/zipwriter/nsZipHeader.cpp b/modules/libjar/zipwriter/nsZipHeader.cpp index 8b78ea091d5..7506670f1a4 100644 --- a/modules/libjar/zipwriter/nsZipHeader.cpp +++ b/modules/libjar/zipwriter/nsZipHeader.cpp @@ -5,7 +5,6 @@ #include "StreamFunctions.h" #include "nsZipHeader.h" -#include "nsMemory.h" #include "prtime.h" #define ZIP_FILE_HEADER_SIGNATURE 0x04034b50 diff --git a/modules/libjar/zipwriter/nsZipWriter.cpp b/modules/libjar/zipwriter/nsZipWriter.cpp index d781e3b80b0..0a965871f26 100644 --- a/modules/libjar/zipwriter/nsZipWriter.cpp +++ b/modules/libjar/zipwriter/nsZipWriter.cpp @@ -13,7 +13,6 @@ #include "nsIStreamListener.h" #include "nsIInputStreamPump.h" #include "nsComponentManagerUtils.h" -#include "nsMemory.h" #include "nsError.h" #include "nsStreamUtils.h" #include "nsThreadUtils.h" diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index 9c8f853edb0..422d11eeab8 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -6844,6 +6844,23 @@ value: @IS_NOT_EARLY_BETA_OR_EARLIER@ mirror: always + # If true, TSF and TIP (IME) can retrieve URL of the document containing + # the focused element. When this is set to true, Gecko exposes the spec + # of the URL. + # And Gecko exposes only "http" and "https" URLs. E.g., "data", "blob", + # "file" URLs are never exposed. +- name: intl.tsf.expose_url.allowed + type: bool + value: true + mirror: always + + # If true, TSF and TIP (IME) can retrieve URL of the document containing + # the focused element in the private browsing mode too. +- name: intl.tsf.expose_url_in_private_browsing.allowed + type: bool + value: false + mirror: always + #if defined(ENABLE_TESTS) # If true, NS_GetComplexLineBreaks compares the line breaks produced in the # content process using the Uniscribe line breaker, with those from a @@ -8883,7 +8900,7 @@ type: bool mirror: always #if defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID) - value: false + value: @IS_NIGHTLY_BUILD@ #elif defined(XP_WIN) && !defined(_ARM64_) value: true #elif defined(XP_MACOSX) diff --git a/mozglue/misc/MozProcessMitigationDynamicCodePolicy.h b/mozglue/misc/MozProcessMitigationDynamicCodePolicy.h new file mode 100644 index 00000000000..c0fd1170673 --- /dev/null +++ b/mozglue/misc/MozProcessMitigationDynamicCodePolicy.h @@ -0,0 +1,38 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// This file is temporarily needed for bug 1766432. We plan to remove it +// afterwards. Do not add new definitions here. + +#ifndef mozglue_misc_MozProcessMitigationDynamicCodePolicy_h__ +#define mozglue_misc_MozProcessMitigationDynamicCodePolicy_h__ + +#include + +// See bug 1766432 comment 4. We currently need to use our own definition +// for PROCESS_MITIGATION_DYNAMIC_CODE_POLICY in MinGW builds. +#if defined(__MINGW32__) || defined(__MINGW64__) + +typedef struct _MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY { + __C89_NAMELESS union { + DWORD Flags; + __C89_NAMELESS struct { + DWORD ProhibitDynamicCode : 1; + DWORD AllowThreadOptOut : 1; + DWORD AllowRemoteDowngrade : 1; + DWORD ReservedFlags : 29; + }; + }; +} MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY; + +#else + +using MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY = + PROCESS_MITIGATION_DYNAMIC_CODE_POLICY; + +#endif // defined(__MINGW32__) || defined(__MINGW64__) + +#endif // mozglue_misc_MozProcessMitigationDynamicCodePolicy_h__ diff --git a/mozglue/misc/WindowsProcessMitigations.cpp b/mozglue/misc/WindowsProcessMitigations.cpp index 79bc72ca8b8..bee281439be 100644 --- a/mozglue/misc/WindowsProcessMitigations.cpp +++ b/mozglue/misc/WindowsProcessMitigations.cpp @@ -11,6 +11,11 @@ #include "mozilla/Assertions.h" #include "mozilla/DynamicallyLinkedFunctionPtr.h" +// See bug 1766432 comment 4. In the future, we should keep this static assert +// when we remove MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY. +#include "mozilla/MozProcessMitigationDynamicCodePolicy.h" +static_assert(sizeof(MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY) == 4); + #if (_WIN32_WINNT < 0x0602) BOOL WINAPI GetProcessMitigationPolicy( HANDLE hProcess, PROCESS_MITIGATION_POLICY MitigationPolicy, PVOID lpBuffer, @@ -60,7 +65,7 @@ MFBT_API bool IsDynamicCodeDisabled() { return false; } - PROCESS_MITIGATION_DYNAMIC_CODE_POLICY polInfo; + MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY polInfo; if (!pGetProcessMitigationPolicy(::GetCurrentProcess(), ProcessDynamicCodePolicy, &polInfo, sizeof(polInfo))) { diff --git a/mozglue/misc/moz.build b/mozglue/misc/moz.build index 6179461052c..1b79cbaf6a0 100644 --- a/mozglue/misc/moz.build +++ b/mozglue/misc/moz.build @@ -75,6 +75,7 @@ if CONFIG["OS_ARCH"] == "WINNT": EXPORTS.mozilla += [ "DynamicallyLinkedFunctionPtr.h", "ImportDir.h", + "MozProcessMitigationDynamicCodePolicy.h", "NativeNt.h", "WindowsDpiInitialization.h", "WindowsEnumProcessModules.h", diff --git a/netwerk/dns/PublicSuffixList.jsm b/netwerk/dns/PublicSuffixList.jsm index db4eddf8ae9..13907b23a7d 100644 --- a/netwerk/dns/PublicSuffixList.jsm +++ b/netwerk/dns/PublicSuffixList.jsm @@ -6,8 +6,9 @@ const { RemoteSettings } = ChromeUtils.import( "resource://services-settings/remote-settings.js" ); -const FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm") - .FileUtils; +const FileUtils = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" +).FileUtils; const EXPORTED_SYMBOLS = ["PublicSuffixList"]; diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index c0345b41330..5676a31c3a3 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -12920,6 +12920,7 @@ azure-mobile.net cloudapp.net azurestaticapps.net 1.azurestaticapps.net +2.azurestaticapps.net centralus.azurestaticapps.net eastasia.azurestaticapps.net eastus2.azurestaticapps.net diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h index dd29d03a4dc..cc8e8711878 100644 --- a/netwerk/ipc/NeckoMessageUtils.h +++ b/netwerk/ipc/NeckoMessageUtils.h @@ -62,18 +62,6 @@ struct ParamTraits { ReadParam(aReader, &aResult->expireType) && ReadParam(aReader, &aResult->expireTime); } - - static void Log(const Permission& p, std::wstring* l) { - l->append(L"("); - LogParam(p.origin, l); - l->append(L", "); - LogParam(p.capability, l); - l->append(L", "); - LogParam(p.expireTime, l); - l->append(L", "); - LogParam(p.expireType, l); - l->append(L")"); - } }; template <> diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index d2e7783d70f..46677eb6379 100644 --- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsHTTPCompressConv.h" -#include "nsMemory.h" #include "plstr.h" #include "nsCOMPtr.h" #include "nsCRT.h" diff --git a/netwerk/test/unit/head_servers.js b/netwerk/test/unit/head_servers.js index efe9c50b7e0..29f570e2a56 100644 --- a/netwerk/test/unit/head_servers.js +++ b/netwerk/test/unit/head_servers.js @@ -648,6 +648,79 @@ class NodeWebSocketServer extends BaseNodeServer { } } +// websocket http2 server +// This code is inspired by +// https://github.com/szmarczak/http2-wrapper/blob/master/examples/ws/server.js +class NodeWebSocketHttp2ServerCode extends BaseNodeHTTPServerCode { + static async startServer(port) { + const fs = require("fs"); + const options = { + key: fs.readFileSync(__dirname + "/http2-cert.key"), + cert: fs.readFileSync(__dirname + "/http2-cert.pem"), + settings: { + enableConnectProtocol: true, + }, + }; + const http2 = require("http2"); + global.h2Server = http2.createSecureServer(options); + + let node_ws_root = `${__dirname}/../node-ws`; + const WebSocket = require(`${node_ws_root}/lib/websocket`); + + global.h2Server.on("stream", (stream, headers) => { + if (headers[":method"] === "CONNECT") { + stream.respond(); + + const ws = new WebSocket(null); + stream.setNoDelay = () => {}; + ws.setSocket(stream, Buffer.from(""), 100 * 1024 * 1024); + global.ws = ws; + + ws.on("message", data => { + if (global.wsInputHandler) { + global.wsInputHandler(data); + return; + } + + ws.send("test"); + }); + } else { + stream.respond(); + stream.end("ok"); + } + }); + + await global.h2Server.listen(port); + let serverPort = global.h2Server.address().port; + await ADB.forwardPort(serverPort); + + return serverPort; + } +} + +class NodeWebSocketHttp2Server extends BaseNodeServer { + _protocol = "h2ws"; + /// Starts the server + /// @port - default 0 + /// when provided, will attempt to listen on that port. + async start(port = 0) { + this.processId = await NodeServer.fork(); + + await this.execute(BaseNodeHTTPServerCode); + await this.execute(NodeWebSocketHttp2ServerCode); + await this.execute(ADB); + this._port = await this.execute( + `NodeWebSocketHttp2ServerCode.startServer(${port})` + ); + await this.execute(`global.path_handlers = {};`); + await this.execute(`global.wsInputHandler = null;`); + } + + async registerMessageHandler(handler) { + return this.execute(`global.wsInputHandler = ${handler.toString()}`); + } +} + // Helper functions async function with_node_servers(arrayOfClasses, asyncClosure) { diff --git a/netwerk/test/unit/test_tls_server.js b/netwerk/test/unit/test_tls_server.js index 6973e6cc9be..a79bb7ce7c3 100644 --- a/netwerk/test/unit/test_tls_server.js +++ b/netwerk/test/unit/test_tls_server.js @@ -11,8 +11,8 @@ Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports); const { MockRegistrar } = ChromeUtils.import( "resource://testing-common/MockRegistrar.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const certOverrideService = Cc[ "@mozilla.org/security/certoverride;1" diff --git a/netwerk/test/unit/test_tls_server_multiple_clients.js b/netwerk/test/unit/test_tls_server_multiple_clients.js index eb29be9983e..2ae69f813b2 100644 --- a/netwerk/test/unit/test_tls_server_multiple_clients.js +++ b/netwerk/test/unit/test_tls_server_multiple_clients.js @@ -8,8 +8,8 @@ do_get_profile(); // Ensure PSM is initialized Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const certOverrideService = Cc[ "@mozilla.org/security/certoverride;1" diff --git a/netwerk/test/unit/test_websocket_server.js b/netwerk/test/unit/test_websocket_server.js index bd09d6dd7ce..c3595be97e6 100644 --- a/netwerk/test/unit/test_websocket_server.js +++ b/netwerk/test/unit/test_websocket_server.js @@ -132,3 +132,20 @@ add_task(async function test_ws_through_https_proxy() { await proxy.stop(); await wss.stop(); }); + +add_task(async function test_websocket_over_h2() { + Services.prefs.setBoolPref("network.http.http2.websockets", true); + let wss = new NodeWebSocketHttp2Server(); + await wss.start(); + Assert.notEqual(wss.port(), null); + await wss.registerMessageHandler(data => { + global.ws.send(data); + }); + let chan = makeWebSocketChan(); + let url = `wss://localhost:${wss.port()}`; + const msg = "test websocket"; + let [status, res] = await channelOpenPromise(chan, url, msg); + Assert.equal(status, Cr.NS_OK); + Assert.equal(res, msg); + await wss.stop(); +}); diff --git a/netwerk/wifi/nsWifiAccessPoint.cpp b/netwerk/wifi/nsWifiAccessPoint.cpp index 62687c520ef..db2342772c4 100644 --- a/netwerk/wifi/nsWifiAccessPoint.cpp +++ b/netwerk/wifi/nsWifiAccessPoint.cpp @@ -4,7 +4,6 @@ #include "nsWifiAccessPoint.h" #include "nsString.h" -#include "nsMemory.h" #include "mozilla/Logging.h" extern mozilla::LazyLogModule gWifiMonitorLog; diff --git a/parser/html/nsHtml5NamedCharacters.h b/parser/html/nsHtml5NamedCharacters.h index 243fc76ad7a..379c2c17b9e 100644 --- a/parser/html/nsHtml5NamedCharacters.h +++ b/parser/html/nsHtml5NamedCharacters.h @@ -27,7 +27,6 @@ #include "nscore.h" #include "nsDebug.h" #include "mozilla/Logging.h" -#include "nsMemory.h" struct nsHtml5CharacterName { uint16_t nameStart; diff --git a/parser/html/nsHtml5NamedCharactersAccel.h b/parser/html/nsHtml5NamedCharactersAccel.h index 8942790d5a4..de21f67c453 100644 --- a/parser/html/nsHtml5NamedCharactersAccel.h +++ b/parser/html/nsHtml5NamedCharactersAccel.h @@ -13,7 +13,6 @@ #include "nscore.h" #include "nsDebug.h" #include "mozilla/Logging.h" -#include "nsMemory.h" class nsHtml5NamedCharactersAccel { public: diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py index 16e444546ae..202117296fe 100644 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py @@ -887,7 +887,7 @@ class OSXToolchainTest(BaseToolchainTest): SYSROOT_FLAGS = { "flags": PrependFlags( [ - "--sysroot", + "-isysroot", xcrun("", ("--show-sdk-path",))[1], "-mmacosx-version-min=10.12", ] diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py index 214e371453c..7b552fc0061 100644 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_helpers.py @@ -217,8 +217,8 @@ class FakeCompiler(dict): if arg is None: break if arg.startswith("-"): - # Ignore --sysroot and the argument that follows it. - if arg == "--sysroot": + # Ignore -isysroot/--sysroot and the argument that follows it. + if arg in ("-isysroot", "--sysroot"): next(args, None) else: flags.append(arg) diff --git a/python/mozbuild/mozbuild/vendor/moz.build b/python/mozbuild/mozbuild/vendor/moz.build new file mode 100644 index 00000000000..315dc32600c --- /dev/null +++ b/python/mozbuild/mozbuild/vendor/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +with Files("**"): + BUG_COMPONENT = ("Developer Infrastructure", "Mach Vendor & Updatebot") diff --git a/remote/cdp/domains/parent/Target.jsm b/remote/cdp/domains/parent/Target.jsm index 0a8f9939ed9..b6c1e83f806 100644 --- a/remote/cdp/domains/parent/Target.jsm +++ b/remote/cdp/domains/parent/Target.jsm @@ -105,7 +105,7 @@ class Target extends Domain { return { targetId: target.id }; } - closeTarget(options = {}) { + async closeTarget(options = {}) { const { targetId } = options; const { targetList } = this.session.target; const target = targetList.getById(targetId); @@ -114,7 +114,7 @@ class Target extends Domain { throw new Error(`Unable to find target with id '${targetId}'`); } - lazy.TabManager.removeTab(target.tab); + await lazy.TabManager.removeTab(target.tab); } async activateTarget(options = {}) { diff --git a/remote/cdp/test/browser/target/browser_closeTarget.js b/remote/cdp/test/browser/target/browser_closeTarget.js index 34d557c9d82..22d58f02e62 100644 --- a/remote/cdp/test/browser/target/browser_closeTarget.js +++ b/remote/cdp/test/browser/target/browser_closeTarget.js @@ -33,7 +33,7 @@ add_task(async function triggersTargetDestroyed({ client, tab }) { const targetDestroyed = Target.targetDestroyed(); info("Closing the target"); - Target.closeTarget({ targetId: targetInfo.targetId }); + await Target.closeTarget({ targetId: targetInfo.targetId }); await tabClosed; info("Tab was closed"); diff --git a/remote/marionette/addon.js b/remote/marionette/addon.js index 8065e5c4e19..acac4aa337e 100644 --- a/remote/marionette/addon.js +++ b/remote/marionette/addon.js @@ -12,10 +12,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AddonManager: "resource://gre/modules/AddonManager.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", - error: "chrome://remote/content/shared/webdriver/Errors.jsm", }); diff --git a/remote/marionette/browser.js b/remote/marionette/browser.js index 80c3210e352..bcc56e08b81 100644 --- a/remote/marionette/browser.js +++ b/remote/marionette/browser.js @@ -211,7 +211,7 @@ browser.Context = class { * @throws UnsupportedOperationError * If tab handling for the current application isn't supported. */ - closeTab() { + async closeTab() { // If the current window is not a browser then close it directly. Do the // same if only one remaining tab is open, or no tab selected at all. // @@ -233,10 +233,10 @@ browser.Context = class { let tabClosed; if (lazy.AppInfo.isAndroid) { - lazy.TabManager.removeTab(this.tab); + await lazy.TabManager.removeTab(this.tab); } else if (lazy.AppInfo.isFirefox) { tabClosed = new lazy.EventPromise(this.tab, "TabClose"); - this.tabBrowser.removeTab(this.tab); + await this.tabBrowser.removeTab(this.tab); } else { throw new lazy.error.UnsupportedOperationError( `closeTab() not supported for ${lazy.AppInfo.name}` diff --git a/remote/shared/Log.jsm b/remote/shared/Log.jsm index 37a5243cbf6..6c2a138e016 100644 --- a/remote/shared/Log.jsm +++ b/remote/shared/Log.jsm @@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["Log"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log: StdLog } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log: StdLog } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const PREF_REMOTE_LOG_LEVEL = "remote.log.level"; diff --git a/remote/shared/TabManager.jsm b/remote/shared/TabManager.jsm index 995292b1af6..f970c2c92a1 100644 --- a/remote/shared/TabManager.jsm +++ b/remote/shared/TabManager.jsm @@ -264,10 +264,10 @@ var TabManager = { * @param {Tab} tab * Tab to remove. */ - removeTab(tab) { + async removeTab(tab) { const ownerWindow = this._getWindowForTab(tab); const tabBrowser = this.getTabBrowser(ownerWindow); - tabBrowser.removeTab(tab); + await tabBrowser.removeTab(tab); }, /** diff --git a/remote/webdriver-bidi/modules/root/browsingContext.jsm b/remote/webdriver-bidi/modules/root/browsingContext.jsm index 9fa06bdde9d..efc34534173 100644 --- a/remote/webdriver-bidi/modules/root/browsingContext.jsm +++ b/remote/webdriver-bidi/modules/root/browsingContext.jsm @@ -102,7 +102,7 @@ class BrowsingContextModule extends Module { * @throws {InvalidArgumentError} * If the browsing context is not a top-level one. */ - close(options = {}) { + async close(options = {}) { const { context: contextId } = options; lazy.assert.string( @@ -134,7 +134,8 @@ class BrowsingContextModule extends Module { const browser = context.embedderElement; const tabBrowser = lazy.TabManager.getTabBrowser(browser.ownerGlobal); const tab = tabBrowser.getTabForBrowser(browser); - lazy.TabManager.removeTab(tab); + + await lazy.TabManager.removeTab(tab); } /** diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index 055a3a7f4ba..f9eb24fda47 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -115,14 +115,6 @@ static const char kGOOGLE_PIN_AddTrustPublicCARootFingerprint[] = static const char kGOOGLE_PIN_AddTrustQualifiedCARootFingerprint[] = "xzr8Lrp3DQy8HuQfJStS6Kk9ErctzOwDHY2DnL+Bink="; -/* GOOGLE_PIN_COMODORSADomainValidationSecureServerCA */ -static const char kGOOGLE_PIN_COMODORSADomainValidationSecureServerCAFingerprint[] = - "klO23nT2ehFDXCfx3eHTDRESMz3asj1muO+4aIdjiuY="; - -/* GOOGLE_PIN_DSTRootCAX3 */ -static const char kGOOGLE_PIN_DSTRootCAX3Fingerprint[] = - "Vjs8r4z+80wjNcr1YKepWQboSIRi63WsWXhIMN+eWys="; - /* GOOGLE_PIN_DigiCertECCSecureServerCA */ static const char kGOOGLE_PIN_DigiCertECCSecureServerCAFingerprint[] = "PZXN3lRAy+8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw="; @@ -319,14 +311,6 @@ static const char kStarfield_Class_2_CAFingerprint[] = static const char kStarfield_Root_Certificate_Authority___G2Fingerprint[] = "gI1os/q0iEpflxrOfRBVDXqVoWN3Tz7Dav/7IT++THQ="; -/* Swehack */ -static const char kSwehackFingerprint[] = - "FdaffE799rVb3oyAuhJ2mBW/XJwD07Uajb2G6YwSAEw="; - -/* SwehackBackup */ -static const char kSwehackBackupFingerprint[] = - "z6cuswA6E1vgFkCjUsbEYo0Lf3aP8M8YOvwkoiGzDCo="; - /* TestSPKI */ static const char kTestSPKIFingerprint[] = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; @@ -597,19 +581,6 @@ static const StaticFingerprints kPinset_yahoo = { kPinset_yahoo_Data }; -static const char* const kPinset_swehackCom_Data[] = { - kSwehackFingerprint, - kGOOGLE_PIN_DSTRootCAX3Fingerprint, - kLet_s_Encrypt_Authority_X3Fingerprint, - kGOOGLE_PIN_COMODORSADomainValidationSecureServerCAFingerprint, - kLet_s_Encrypt_Authority_X4Fingerprint, - kSwehackBackupFingerprint, -}; -static const StaticFingerprints kPinset_swehackCom = { - sizeof(kPinset_swehackCom_Data) / sizeof(const char*), - kPinset_swehackCom_Data -}; - /* Domainlist */ struct TransportSecurityPreload { // See bug 1338873 about making these fields const. @@ -1055,7 +1026,6 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "static.googleadsserving.cn", true, false, false, -1, &kPinset_google_root_pems }, { "stats.g.doubleclick.net", true, false, false, -1, &kPinset_google_root_pems }, { "sv.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, - { "swehack.org", true, true, false, -1, &kPinset_swehackCom }, { "sync.services.mozilla.com", true, false, true, 13, &kPinset_mozilla_services }, { "t.facebook.com", true, false, false, -1, &kPinset_facebook }, { "tablet.facebook.com", true, false, false, -1, &kPinset_facebook }, @@ -1121,8 +1091,8 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, }; -// Pinning Preload List Length = 496; +// Pinning Preload List Length = 495; static const int32_t kUnknownId = -1; -static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1672657851868000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1672924774048000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 155e6e21393..3e83ce05d14 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include -const PRTime gPreloadListExpirationTime = INT64_C(1675077045793000); +const PRTime gPreloadListExpirationTime = INT64_C(1675343967371000); %% 0--1.de, 1 0-0.io, 1 @@ -92,7 +92,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1675077045793000); 00dani.me, 1 00f.net, 1 00o00.top, 1 -00s.io, 0 00wbf.com, 1 01.org, 1 01011970.xyz, 1 @@ -1065,7 +1064,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1675077045793000); 168fff.cc, 1 168z6.com, 1 168zz.cc, 1 -16974.cc, 1 169xpj.com, 1 16megablast.tk, 1 16packets.com, 1 @@ -2906,7 +2904,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1675077045793000); 4digitiq.nl, 1 4dillusion.tk, 1 4dimension.net, 1 -4dlatest.com, 1 4dplay.com, 1 4dsoft.com, 1 4everdosti.tk, 1 @@ -3223,9 +3220,11 @@ const PRTime gPreloadListExpirationTime = INT64_C(1675077045793000); 534922.com, 1 535kb.com, 1 536422.com, 1 +5364b.com, 1 +5364c.com, 1 +5364d.com, 1 5364jc.com, 1 53pluk.cz, 1 -54.sb, 0 540922.com, 1 540interactive.com, 1 541022.com, 1 @@ -4901,7 +4900,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1675077045793000); 9499238.com, 0 9499263.com, 0 9499278.com, 0 -9499293.com, 1 +9499293.com, 0 9499343.com, 0 9499369.com, 0 9499399.com, 0 @@ -5152,7 +5151,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1675077045793000); 9968xpj.com, 0 9977432.com, 1 997z6.com, 1 -998081.com, 1 998sa.com, 1 998wei.com, 1 998wns.com, 1 @@ -5453,7 +5451,6 @@ aaacomms.com, 1 aaainfosystems.com, 1 aaapl.com, 1 aaapo.com.br, 0 -aaaportaserve.com, 0 aabanet.com.br, 1 aabeltech.com, 1 aabenjaminjewelry.com, 0 @@ -5503,7 +5500,7 @@ aarhusinside.dk, 1 aariefhaafiz.com, 1 aarklendoia.com, 1 aarkue.eu, 0 -aaron-gustafson.com, 1 +aaron-gustafson.com, 0 aaron-russell.co.uk, 1 aaron-schaal.de, 1 aaron-smith-cpa.com, 1 @@ -5541,7 +5538,6 @@ aawt.net.au, 0 aayan.com, 1 aayub.xyz, 1 ab-design.tk, 1 -ab-mfbnigeria.com, 0 ab-pflege.de, 1 ab-photography.nl, 0 ab-solutepilates.com, 1 @@ -6074,7 +6070,6 @@ accounts.google.com, 1 accpl.co, 1 accpressurewashing.com, 1 accreditamento.net, 1 -accreditedproperty.com, 1 accrosoft.com, 1 accubitsdemo.ml, 1 acculex.co.uk, 1 @@ -6155,7 +6150,6 @@ achievenewsfrance.tk, 1 achiever.ga, 1 achievingheightsacademy.com, 1 achiksongs.tk, 1 -achildshome.com, 1 achildshome.org, 1 achill.org, 1 achinsk.tk, 1 @@ -6527,7 +6521,6 @@ adderall.space, 1 addict.tk, 1 addictedtolength.co.uk, 1 addictedtotravel.pl, 1 -addictioncounsellors.co.nz, 0 addictionresource.com, 1 addictionsolutionsllc.com, 1 addictlaw.com, 1 @@ -6826,7 +6819,6 @@ adti.pt, 0 adubosvidere.com.br, 1 adultbizz.eu, 1 adulteducation.org.uk, 1 -adultforum.gr, 1 adultgames.pro, 1 adultmalecontent.com, 1 adultshop.com.au, 1 @@ -7049,7 +7041,6 @@ aefcleaning.com, 1 aegeanmep.com, 1 aegee-academy.eu, 1 aegee-academy.org, 1 -aegee-utrecht.nl, 1 aegee.eu, 1 aegis.moe, 1 aegisaccounting.co.uk, 1 @@ -7076,7 +7067,7 @@ aenterprise.info, 1 aeolservice.es, 1 aeon.co, 0 aeon.wiki, 0 -aeonc.com, 1 +aeonc.com, 0 aeonct.org, 1 aeonian.live, 0 aeonmall.global, 1 @@ -7173,6 +7164,7 @@ afcmrstest.org, 1 afcurgentcarelyndhurst.com, 0 afdah.se, 1 afearlessventure.com, 1 +affaire.com, 1 affairefacile.net, 1 affairemateriaux.fr, 1 affairs.com, 1 @@ -7461,7 +7453,6 @@ agate.pw, 1 agateh.com.au, 1 agaveandpine.com, 1 agavesurgery.com, 1 -agaviria.co, 1 agbremen.de, 0 agceauditores.cl, 1 agcegroup.cl, 1 @@ -7514,6 +7505,7 @@ agencybeam.com, 1 agencygood.tk, 1 agencyinmotion.com, 1 agencymanager.be, 1 +agencytsunami.com, 1 agenda-loto.net, 0 agenda21senden.de, 1 agendadelvolo.info, 1 @@ -7570,6 +7562,7 @@ agilecraft.com, 1 agilecyber.com, 1 agilee.io, 1 agilepeopleopsframework.com, 1 +agileui.com, 0 agiley.se, 1 agilicus.ca, 1 agilicus.com, 1 @@ -7777,7 +7770,6 @@ ahealthyjourney.ca, 1 ahegaoroulette.com, 1 ahelos.tk, 1 ahenkerp.com, 1 -ahero4all.org, 1 ahg-offices.fr, 1 ahhcomfortshoes.com, 1 ahidta.gov, 1 @@ -7856,7 +7848,6 @@ aibolit.ml, 1 aibolitik.tk, 1 aibot.tk, 1 aibsoftware.mx, 1 -aibuz.net, 1 aibuz.org, 1 aicamilwaukee.com, 1 aiccc.com.au, 1 @@ -8192,7 +8183,6 @@ airlineslasvegas.com, 1 airlineslowfare.com, 1 airlinesnashville.com, 1 airlinesnyc.com, 1 -airlinesreservation.org, 0 airlinesseating.com, 1 airlinessingapore.com, 1 airlinesticketbooking.com, 1 @@ -8698,7 +8688,6 @@ albergointernational.it, 1 albergolafiorita.com, 1 alberguecovadonga.es, 1 alberoraydolap.com, 0 -albersdruck.de, 1 albert-yu.com, 1 albertathome.org, 1 albertcuyp-markt.amsterdam, 1 @@ -9038,6 +9027,7 @@ algerie-music.tk, 1 alghadpowersolutions.com, 1 alghanimcatering.com, 1 alghubaibatours.com, 0 +algoarmada.com, 1 algoentremanos.com, 1 algofactory.de, 1 algolia.com, 1 @@ -9109,7 +9099,6 @@ alignedweb.com, 1 alignminds.com, 1 alignrs.com, 1 alignthoughts.com, 1 -alihashemrasheed.com, 1 aliibrahimov.tk, 1 aliim.gdn, 1 alikarslanov.tk, 1 @@ -9136,7 +9125,6 @@ alinecordeiro.adv.br, 1 alinecordeiro.com.br, 1 alineonline.tk, 1 alinode.com, 1 -alinol.com, 1 aliorange.com, 1 aliosmanyuksel.com.tr, 1 alireza2love.tk, 1 @@ -9162,6 +9150,7 @@ alitabergert.tk, 1 alitajran.com, 1 alitec.it, 1 alitpedia.ga, 1 +aliud.be, 1 aliv.biz, 1 alivecast.co.jp, 1 alix-board.de, 1 @@ -9658,7 +9647,6 @@ alphahunks.com, 1 alphainflatablehire.com, 1 alphalab.tk, 1 alphalibraries.com, 1 -alphalight.id, 1 alphalightgear.com, 1 alphanodes.com, 1 alphapengu.in, 1 @@ -10326,7 +10314,7 @@ amorxyoga.com, 1 amorymerced.tk, 1 amoryurgentcare.com, 1 amosca.tk, 1 -amotarget.com, 1 +amotarget.com, 0 amoursucre.com, 1 amoxicillin-500mg.ga, 1 amoxicillin.cf, 1 @@ -10708,7 +10696,7 @@ andrewrdaws.com, 1 andrewreaganm.com, 1 andrewrgoss.com, 1 andrewryno.com, 1 -andrewsfasteners.uk, 1 +andrewsfasteners.uk, 0 andrewsfss.marketing, 1 andrewsun.com, 1 andrewtasso.com, 1 @@ -10926,7 +10914,7 @@ angrybug.com, 1 angrydragonproductions.com, 1 angrymoulinex.tk, 1 angrysnarl.com, 1 -angryteeth.net, 1 +angryteeth.net, 0 angstrommold.com, 1 angular-js.ga, 1 angular-software.at, 1 @@ -11302,7 +11290,7 @@ answeraddiction.com, 1 answerbookstore.tk, 1 answerconnect.com, 1 answerforce.com, 1 -answering365.com, 1 +answering365.com, 0 answernow.cf, 1 answers-online.ru, 1 answersreviews.com, 1 @@ -11511,7 +11499,6 @@ antonios.ch, 1 antonis.cy, 1 antonis.org, 1 antonjuulnaber.dk, 1 -antonmcclure.com, 1 antonoff.tk, 1 antonok.com, 1 antonovka.ga, 1 @@ -11712,7 +11699,6 @@ apex.ac, 1 apex.to, 1 apexchain-dev.com, 1 apexconsulting.io, 1 -apexdigital.com, 1 apexfacades.com.au, 1 apexitsolutions.ca, 1 apexperformancegym.com, 1 @@ -11866,7 +11852,6 @@ app.gp, 1 app.lookout.com, 1 app.ps, 1 app.recurly.com, 1 -app.yinxiang.com, 0 app00228.com, 1 app11018.com, 1 app2attract.nl, 1 @@ -12080,7 +12065,6 @@ apviz.io, 1 apw-dortmund.de, 1 aqalat.com.sa, 1 aqarategypt.com, 1 -aqarbab.com, 1 aqdance.com.sg, 1 aqdun.com, 1 aqlivia.com, 1 @@ -12151,7 +12135,6 @@ aquaworld.tk, 1 aquedim.com, 1 aqueducttech.com, 1 aquienguate.com, 1 -aquila.co.uk, 1 aquilogia-patrimoine.fr, 1 aquimisa.com, 1 aquiparoxetina.gq, 1 @@ -12755,6 +12738,7 @@ arquipielago.tk, 1 arquitectura-ilimitada.tk, 1 arquitet.com.br, 1 arrakis.se, 1 +arrangeyour.com, 1 arraudi.be, 1 arraudi.eu, 1 arrazane.com.br, 1 @@ -13073,7 +13057,9 @@ arzaval.com, 1 arzid.com, 1 arzinfo.pw, 1 arzmercury.tk, 1 +arztpraxis-kubalok.de, 1 as-aeu-ecp-dev-ecomeeting.azurewebsites.net, 1 +as-aeu-ecp-qas-ecomeeting.azurewebsites.net, 1 as-kapmea-mark-swissbear.azurewebsites.net, 1 as.roma.it, 1 as200753.com, 1 @@ -13749,6 +13735,7 @@ atlantacustomfab.com, 0 atlantahealthcare.tk, 1 atlantareroof.com, 1 atlantica.tk, 1 +atlanticbeachacademy.com, 1 atlanticcitycasino.news, 1 atlanticcitycasinonews.com, 1 atlanticdatastream.ca, 1 @@ -15589,7 +15576,7 @@ babsbibs.com, 1 baburhat.tk, 1 babursahvizeofisi.com, 1 babushkin-mir.tk, 1 -baby-bath-tub.com, 1 +baby-bath-tub.com, 0 baby-digne.com, 0 baby-doll.tk, 1 baby-massage.tk, 1 @@ -15695,6 +15682,7 @@ backpacker.dating, 1 backpackinglight.com, 1 backpackingtours.com, 1 backpacktour.ru, 1 +backpagegals.com, 1 backporchartists.com, 1 backrestored.gq, 1 backrip.tk, 1 @@ -15989,7 +15977,6 @@ balboa.org.uk, 1 balbus.tk, 1 balca.ga, 1 balcaonet.com.br, 0 -balcarek.pl, 1 balconnr.com, 1 balconsverdun.com, 0 balcony.cf, 1 @@ -16325,6 +16312,7 @@ barbarasymmons.com, 1 barbarians.com, 0 barbaros.info, 1 barbate.fr, 1 +barbecueparty.nl, 1 barbelldivision.com, 1 barberheatingandair.com, 1 barberscorner.tk, 1 @@ -16342,8 +16330,6 @@ barbu.family, 1 barburas.com, 1 barca-movie.jp, 1 barcamp.koeln, 1 -barcats.co.nz, 1 -barcats.com.au, 1 barcel.com.mx, 1 barcelonapremium.es, 1 barcelonapremiummini.es, 1 @@ -16507,7 +16493,6 @@ basedriver.com, 1 baseerapp.com, 1 basel-gynaecology.com, 1 basel-gynaekologie.ch, 1 -basel-onlinemarketing.de, 1 baselang.com, 1 baselnazifrei.info, 0 basement961.co.nz, 1 @@ -16691,7 +16676,6 @@ baukelek.tk, 1 baumannfabrice.com, 1 baumbet.ro, 1 baumfreund.ch, 1 -baumkletterschule.de, 1 baumkuchen-aus-dresden.de, 1 baur.de, 1 bausep.de, 1 @@ -16889,6 +16873,7 @@ bcoffices.com.mx, 1 bcome.nl, 1 bcomm.com.au, 1 bcpc-ccgpfcheminots.com, 1 +bcperak.net, 1 bcrnews.tk, 1 bcrook.com, 1 bcrypt.online, 1 @@ -17840,6 +17825,7 @@ bertbrockham.org.uk, 1 berthabailey.com, 1 berthaundcarlbenzpreis.de, 1 berthelier.me, 1 +bertholdsson.com, 0 berthoudeconomicdevelopment.com, 1 bertietrains.co.uk, 1 bertietrains.com, 1 @@ -17857,7 +17843,6 @@ berzkalne.co.uk, 1 besanowsky.de, 1 besarfe.com, 1 besate.ec, 1 -besb.io, 1 besb66.club, 1 besb66.me, 1 besb66.ninja, 1 @@ -18870,7 +18855,6 @@ bigalba.ga, 1 bigambitions.co.za, 1 bigart.tk, 1 bigband.tk, 1 -bigbangco.com.br, 1 bigbearkh.com, 0 bigbeats.tk, 1 bigbeautysecrets.tk, 1 @@ -19091,7 +19075,6 @@ billogram.org, 1 billogram.se, 1 billogramcontent.com, 1 billograminternal.com, 1 -billogramstatic.com, 1 billogramtest.com, 1 billopay.com, 1 billopay.de, 1 @@ -19784,7 +19767,6 @@ bl4ckb0x.org, 1 blaa-arme.tk, 1 blaarmeersen.be, 1 blaasmuziek-laarbeek.nl, 1 -blaauwgeers.pro, 1 blaauwgeers.wiki, 1 blabber.im, 1 blabla.rocks, 0 @@ -19944,7 +19926,6 @@ blackwidow.tk, 1 blackwire.tk, 1 blackwoodrugby.tk, 1 blackworld.ga, 1 -blackwot.ru, 1 blackyau.cc, 0 blackys-chamber.de, 0 blackzebra.audio, 1 @@ -20044,6 +20025,7 @@ bleaklyrics.tk, 1 bleatingsheep.org, 1 bleche-onlineshop.at, 1 bleche-onlineshop.de, 1 +blechinger.io, 1 blechschmidt.saarland, 1 bledina.com, 1 bleedingcool.com, 1 @@ -20137,6 +20119,7 @@ blizko.tk, 1 blizora.com, 1 blk-booking.com, 1 blk-lunch.com, 1 +blk.me, 1 blkbx.eu, 1 blkj.com, 1 bllb.ru, 0 @@ -20155,7 +20138,6 @@ block-this.com, 1 block65.com, 1 blockchain.com, 1 blockchain.info, 1 -blockchain.poker, 1 blockchainaiintegra.com, 1 blockchainbulteni.com.tr, 1 blockchaindaigakko.jp, 1 @@ -20343,6 +20325,7 @@ bluecoatnetflowsupport.com, 1 bluecollarfetishwear.com, 1 bluecosmetics.tk, 1 blued.moe, 1 +bluedeck.org, 1 bluedivision.tk, 1 bluedog-security.com, 1 blueenergy.tk, 1 @@ -21079,6 +21062,7 @@ boros.tk, 1 borowski.pw, 1 borraxeiros.tk, 1 borriquillacuenca.tk, 1 +borsarini.it, 1 borsodsakk.hu, 1 bortebest.no, 1 bortox.it, 0 @@ -21326,7 +21310,6 @@ bovenwebdesign.nl, 1 bovworkplacepensions.com, 1 bowedwallcrackrepair.com, 1 bowelcontroltherapy.com, 1 -boweryandvine.com, 1 bowhill.me, 1 bowhunter-ahorn.de, 1 bowlcake.fr, 1 @@ -21851,7 +21834,6 @@ brianlanders.us, 1 brianleemarketing.com, 1 brianmwaters.net, 1 brianna.tk, 1 -brianoost.com, 1 brianpagan.net, 1 brianroadifer.com, 1 briansemrau.com, 1 @@ -22398,6 +22380,7 @@ btraviswrightmps.com, 1 btraviswrightmps.org, 1 btrb.ml, 1 btrfs.no, 1 +btsapem.com, 1 btsline.co.id, 1 btslr.co, 1 btsoft.eu, 1 @@ -22553,6 +22536,7 @@ bugalert.org, 1 bugbounty.ch, 1 bugcrowd.com, 1 bugfender.com, 1 +bugfest.co.uk, 1 bugfuzz.com, 1 buggiano.com, 1 bugginslab.co.uk, 1 @@ -22612,6 +22596,7 @@ buildworkout.com, 1 buileo.com, 1 builterra2.azurewebsites.net, 1 builtinboston.com, 1 +builtingym.com, 1 builtinla.com, 1 builtinseattle.com, 1 builtinsf.com, 1 @@ -23388,7 +23373,6 @@ bw.codes, 1 bwa.wroc.pl, 1 bwanglab.com, 1 bwashing.tk, 1 -bwasoimoveis.net, 1 bwcscorecard.org, 1 bweston.ga, 1 bwf11.com, 1 @@ -23487,7 +23471,6 @@ byronkg.us, 1 byrtz.de, 1 byrutor.org, 1 bysb.net, 1 -bysgo.com, 1 byshep.com, 1 byshop.tk, 1 byskafasi.com, 1 @@ -23795,6 +23778,7 @@ cafecentraal.tk, 1 cafecentral.tk, 1 cafechesscourt.com, 1 cafechroma.tk, 1 +cafecliche.com, 1 cafecobus.tk, 1 cafedelcielo.co, 1 cafedesignbooks.com, 1 @@ -24283,7 +24267,6 @@ canadapet.club, 1 canadapets.club, 1 canadapost-postescanada.ca, 1 canadapropertyexpert.ca, 1 -canadaradon.com, 1 canadasmotorcycle.ca, 1 canadian.dating, 1 canadianatheists.ca, 1 @@ -24890,6 +24873,7 @@ caroinstitute.cf, 1 carol-lambert.com, 1 carolcappelletti.com, 1 carolcestas.com, 1 +caroleblouin.ca, 1 caroletolila.com, 1 caroli.biz, 1 caroli.com, 1 @@ -25324,7 +25308,6 @@ casinotopplistan.com, 1 casinotopplisten.com, 1 casinotopsonline.com, 1 casinovendors.com, 1 -casinovergleich.com, 1 casio-caisses-enregistreuses.fr, 1 casio.bg, 1 casitawn.cf, 1 @@ -26059,6 +26042,7 @@ centsi.io, 1 centsiwallet.com, 1 centum.no, 1 centumail.com, 1 +centura.de, 1 centurialeonina.com, 1 centurion-consulting-cie.eu, 1 centurion-consulting.eu, 1 @@ -26306,7 +26290,6 @@ chaacker.tk, 1 chabad360.me, 1 chabadmyanmar.com, 1 chabaudparfum.com, 1 -chabik.com, 1 chaboisseau.net, 1 chacoonline.com.py, 1 chacraexperimental.com.py, 1 @@ -26321,6 +26304,7 @@ chagahq.com, 1 chaghi.tk, 1 chaghionline.tk, 1 chahal.blog, 1 +chai-che.com, 1 chaidu.com, 1 chaifeng.com, 1 chaikaclub.tk, 1 @@ -26946,7 +26930,6 @@ chianti2002.jp, 1 chiapasfutbol.com, 1 chiara.net.au, 1 chiaraiuola.com, 0 -chiaramail.com, 0 chiasang.tk, 1 chiaseeds24.com, 1 chiaseek.com, 1 @@ -27267,7 +27250,6 @@ chrisb.me, 0 chrisb.xyz, 0 chrisbillo.com, 1 chrisbrockdiving.com, 1 -chrisbryant.me.uk, 1 chrisburnell.com, 1 chriscarey.com, 1 chriscelkins.com, 1 @@ -27783,7 +27765,7 @@ cisa.gov, 1 cisamexico.com, 1 ciscoasanetflow.com, 1 ciscocyberthreatdefense.com, 1 -ciscodude.net, 0 +ciscodude.net, 1 ciscom.tk, 1 cisconetflowleader.com, 1 cisconetflowpartners.com, 1 @@ -28058,7 +28040,6 @@ ckp.ie, 1 ckpl.io, 1 ckpl.us, 1 ckrobotics.tk, 1 -ckrubble.com, 1 cktennis.com, 1 ckyalliancefinland.tk, 1 cl-automotive.com, 1 @@ -28230,7 +28211,6 @@ claudiney.eti.br, 1 claudiney.id, 1 claudiney.info, 1 claudiohdz.com, 1 -claumarservice.com, 1 claus-bahr.de, 1 claus-cremer.tk, 1 clauseriksen.net, 1 @@ -28283,6 +28263,7 @@ cleanspeak.com, 1 cleansweepaa.com, 1 cleanway.dk, 1 clear-concise.com, 0 +clear.ml, 1 clearance365.co.uk, 1 clearbit.com, 1 clearbooks.co.uk, 1 @@ -28465,6 +28446,7 @@ cliffburton.tk, 1 clifflu.net, 1 cliftonheritage.net, 1 clik.ga, 1 +cliksource.com, 0 climaencusco.com, 1 climaffaires.com, 1 climatechange2021.org, 1 @@ -28993,7 +28975,6 @@ co2fr.ee, 0 co3app.com, 1 coach-enligne.fr, 1 coach-hpe.ch, 0 -coach-immobilier-neuf.fr, 1 coach.org.uk, 0 coachapp-ipass.herokuapp.com, 1 coachbakery.com, 1 @@ -29603,6 +29584,7 @@ columbushydroxide.net, 1 columbushydroxide.org, 1 columbusks.gov, 1 columbusunderground.com, 1 +columbuswines.com, 1 colwichks.gov, 1 colyakoomusic.com, 1 com-b.vn, 1 @@ -31385,6 +31367,7 @@ creativenz.govt.nz, 1 creativephysics.ml, 1 creativescorpio.tk, 1 creativesectors.tk, 1 +creativesmm.com.ua, 1 creativestories.me, 1 creativetechsolution.in, 1 creativeweb.biz, 1 @@ -31700,7 +31683,6 @@ crown-trading.ru, 1 crownaffairs.ch, 1 crowncastles.co.uk, 1 crownchessclub.com, 1 -crownedhijab.com, 1 crownmarqueehire.co.uk, 1 crownpoint.com, 0 crownsterling.io, 1 @@ -32060,7 +32042,7 @@ cthomas.work, 1 cthu.io, 1 cthulhuden.com, 1 ctj.im, 1 -ctknight.me, 1 +ctknight.me, 0 ctkwwri.org, 1 ctliu.com, 1 ctm.community, 1 @@ -32142,7 +32124,6 @@ cubyhome.com, 1 cucabot.tk, 1 cucaracha.tk, 1 cuchichi.es, 1 -cuckold-secrets.tk, 1 cuckoo.ee, 1 cuddlecat.io, 1 cuddlecomfort.com, 1 @@ -33610,11 +33591,12 @@ dashhelpme.io, 1 dashice.com, 1 dashlane.com, 1 dashnearby.com, 1 +dashofmedia.com, 1 +dashofting.com, 1 dashwebconsulting.com, 1 dasignsource.com, 1 dasinternetluegt.at, 1 daskirschhaus.com, 1 -dasmailarchiv.ch, 1 dasolindustrialpark.tk, 1 dassolutions.eu, 1 dastchin.live, 1 @@ -34107,7 +34089,6 @@ dcnews.ro, 1 dco.sg, 1 dcomedieta.it, 1 dcoremassagechairs.com, 1 -dcpl.bt, 1 dcpower.eu, 1 dcpro.pt, 1 dcpudwa.gov, 1 @@ -34224,7 +34205,6 @@ dealbx.com, 1 dealchip.tk, 1 dealcruiser.nl, 1 dealdump.nl, 1 -dealerselectric.com, 1 dealerwriter.com, 1 dealinflatables.co.uk, 1 deallix.com, 1 @@ -34385,6 +34365,7 @@ decorativecosmetics.tk, 1 decorativeflooring.com, 1 decorator.uk, 1 decoratore.roma.it, 1 +decorauvent.ca, 1 decorestilo.com.br, 1 decorlux.bg, 1 decorluxmuebles.com, 1 @@ -34461,7 +34442,7 @@ deepgame.tk, 1 deephill.com, 1 deephousex.ru, 1 deepinnov.com, 1 -deepinsight.io, 1 +deepinsight.io, 0 deeplink-medical.com, 1 deepmountains.tk, 1 deepnote.com, 1 @@ -34631,7 +34612,6 @@ dekko.io, 1 dekleinezeppos.be, 1 dekodi.de, 1 dekonijnenburcht.tk, 1 -dekonix.ru, 1 dekoration.cf, 1 dekoration.gq, 1 dekoration.ml, 1 @@ -34651,6 +34631,7 @@ delay-dengi.cf, 1 delaydengy.tk, 1 delaysoft.tk, 1 delbecqvo.be, 1 +delcampomercado.com, 1 delcan.ga, 1 delcan.gq, 1 delcan.ml, 1 @@ -35270,7 +35251,6 @@ despertadoronline.com.es, 1 despertarparavida.org, 1 despinavandi.gr, 1 desplainesil.gov, 1 -desplats.com.ar, 1 despoina-vandi.tk, 1 despondentrock.tk, 1 despora.de, 1 @@ -35442,7 +35422,6 @@ develoupe.com, 1 develux.net, 1 devendradox.ml, 1 devendrameena.tk, 1 -devenir-equicoach.com, 1 devensys.com, 1 devenv.ml, 1 devflop.fr, 1 @@ -35561,7 +35540,7 @@ dexerto.fr, 0 dexign.ro, 1 dexigner.com, 1 dexlex.nl, 1 -dexonrest.azurewebsites.net, 1 +dexonrest.azurewebsites.net, 0 dexonservicedeskws.azurewebsites.net, 1 dextermarket.com, 1 dexterseries.ru, 1 @@ -35638,6 +35617,7 @@ dggm.ru, 1 dgl-24.de, 1 dgli.org, 1 dgmedia.tk, 1 +dgmenergy.com, 1 dgmutual.co.uk, 1 dgner.com, 1 dgo.co.il, 1 @@ -36253,6 +36233,7 @@ diligenciasprime.com.br, 1 diligo.ch, 0 dillewijnzwapak.nl, 1 dillonco.gov, 1 +dillonm.io, 1 dilmahtea.me, 1 dilmarames.com, 1 dima.pm, 0 @@ -36404,7 +36385,6 @@ directveilig.nl, 1 directverify.in, 1 direitonovo.com, 0 direj.tk, 1 -direktvermarktung-schmitzberger.at, 1 diretonoponto.gq, 1 direwolfsoftware.ca, 1 dirhami.com, 1 @@ -37113,6 +37093,7 @@ dmehub.com, 1 dmerkel.de, 1 dmess.ru, 1 dmfd.net, 1 +dmfj.io, 1 dmforcesupport.com, 1 dmforcesupport.marketing, 1 dmfss.com, 1 @@ -37230,6 +37211,7 @@ dnvod.ml, 1 do-do.tk, 1 do-it-service.de, 1 do-prod.com, 0 +do.gd, 1 do.search.yahoo.com, 0 do13.net, 1 do67.de, 1 @@ -37820,6 +37802,7 @@ donwhen.org, 1 donwilkssculptor.com, 1 dooby.fr, 1 doodle.com, 1 +doodlecorn.com, 1 doodlegames.tk, 1 doodung.com, 1 dookhtaniha.ir, 1 @@ -38733,7 +38716,6 @@ drtti.io, 1 drturner.com.au, 1 drubn.de, 1 druckerei-huesgen.de, 1 -druggist.uk, 1 drugpromosers.ga, 1 drugs.com, 1 drugsindustry.tk, 1 @@ -38924,7 +38906,6 @@ dubaiprivatejetcharter.com, 1 dubairanking.com, 1 dubairecipes.com, 1 dubaishoppingcity.com, 1 -dubaitalents.com, 1 dubaitraveltours.com, 1 dubaivisa.net, 1 dubaizone.cf, 1 @@ -38934,8 +38915,6 @@ dubious-website.com, 1 dubiouscreations.com, 1 dubkov.org, 0 dubl.tk, 1 -dublinhonda.com, 1 -dublinmazda.com, 1 dublinrail.tk, 1 duboisinternational.com, 1 duboisinvestissements.com, 1 @@ -39034,7 +39013,6 @@ dukkanacmak.com, 1 dukun.de, 1 dulanic.com, 1 dulceysalado.tk, 1 -dulcinea.eu.org, 1 dulcinea.tk, 1 dulcinela.es, 1 dulei.si, 1 @@ -39097,7 +39075,6 @@ dunkle-seite.org, 1 dunlaptn.gov, 1 dunmanelectric.com, 1 dunmanpoolandspa.com, 1 -dunneworthy.com, 1 dunningtonaudio.co.uk, 1 dunyahalleri.com, 1 duo-tauceti.com, 1 @@ -39123,7 +39100,6 @@ duplicazionechiavi.it, 1 dupuis.xyz, 1 duquess.com.br, 1 duquoinil.gov, 1 -dura.si, 1 durabletravailler.tk, 1 duraes.pt, 0 durakinesis.tk, 1 @@ -40737,6 +40713,7 @@ edularidea.com, 1 edularism.com, 1 edulayer.net, 1 edulinks.ml, 1 +edulpapp.com, 1 edumanage.tk, 1 edumaritime.net, 1 edumaster.pro, 1 @@ -41330,7 +41307,6 @@ eldiedesign.com, 1 eldisagjapi.de, 1 eldoradocylinders.com, 1 eldoradoil.gov, 1 -eldoradoinsurance.com, 1 eldrid.ge, 1 ele-sm.com, 1 elearningi.pl, 1 @@ -41533,6 +41509,7 @@ elektrotango.tk, 1 elektrotechnik-heisel.de, 1 elektrotechnik-kaetzel.de, 1 elektrotechnik-schreck.de, 1 +elektrotechniker-beck.de, 1 elektrownie-tanio.net, 1 elektryczka.pl, 1 elelenin.cf, 1 @@ -41611,7 +41588,6 @@ elevanhairdressing.co.uk, 1 elevateandprosper.com, 1 elevated-esthetics.com, 1 elevatedarborcare.com.au, 1 -elevatedconstructionltd.com, 1 elevatenutrition.com, 1 elevationcreative.net, 1 elevationplumbingandheating.com, 1 @@ -41710,7 +41686,7 @@ elisabeth-kostecki.de, 1 elisabeth-raendel.de, 1 elisabeth-strunz.de, 1 elisabethbegle.at, 1 -elisabethborgermans.com, 1 +elisabethborgermans.com, 0 elisabethcasanova.ch, 1 elisabethkostecki.de, 1 elisabethrene.com, 1 @@ -42473,7 +42449,6 @@ energiecentrale.gent, 1 energieconsultonline.nl, 1 energiekeurplus.nl, 1 energielabelbinneneenweek.nl, 1 -energija-visiems.lt, 1 energikompetens.se, 1 energoproff.com, 1 energozrouti.cz, 0 @@ -43194,6 +43169,7 @@ erkiss.club, 1 erkiss.live, 1 erkkiaronen.fi, 1 erlebe-salsa.de, 1 +erlebnisarchaeologie-bayern.de, 1 ermak.tk, 1 erman.ga, 1 ermeglio.com, 1 @@ -43494,7 +43470,7 @@ esoterikerforum.de, 1 espace-caen.fr, 0 espace-gestion.fr, 1 espace-habitat-francais.fr, 1 -espace-orenda.ch, 1 +espace-orenda.ch, 0 espace-vet.fr, 1 espace.network, 1 espace.spb.ru, 0 @@ -44291,6 +44267,7 @@ evisos.com.mx, 1 evitacion.com, 1 eviz.co, 1 evlear.com, 1 +evlilikarayanlar.com, 1 evlilikilan.com, 1 evlqa1sp1tzb05zo-reoo0vhj9a1t5pousfudnkg.com, 0 evntage.com, 1 @@ -44409,6 +44386,7 @@ example.wf, 1 exampleessays.com, 1 examroll.fr, 1 examroll.io, 1 +examroo.nl, 0 examsite.tk, 1 examsmate.in, 1 examticket.tk, 1 @@ -45569,7 +45547,6 @@ fanschic.com, 1 fanshenzhiyi.com, 1 fansided.com, 1 fansta.jp, 1 -fanstuff.ru, 1 fantacast.it, 1 fantasea.pl, 1 fantasiapainter.com, 1 @@ -46322,7 +46299,6 @@ feministspectrum.org, 1 feministwiki.org, 1 feminteligencia.com, 1 femiwiki.com, 1 -femmenordic.com, 1 femmes-women.gc.ca, 1 femmes.gc.ca, 1 femmesaupluriel.com, 1 @@ -46548,7 +46524,6 @@ ff-koenigstein-opf.de, 1 ff-obersunzing-niedersunzing.de, 1 ff-tostedt.de, 1 ff15.ddns.net, 1 -ff18.cc, 0 ff326.com, 0 ff5.info, 0 ff5197.co, 1 @@ -46883,6 +46858,7 @@ financecontrol.tk, 1 financedepth.com, 1 financedraft.com, 1 financeguest.com, 1 +financehindi.com, 1 financeinterface.tk, 1 financejobs.ch, 1 financelong.com, 1 @@ -47897,7 +47873,7 @@ flugsimulatorfrankfurt.com, 1 fluidattacks.co, 1 fluidattacks.com, 1 fluidbb.co.uk, 1 -fluidpicturesinc.com, 1 +fluidpicturesinc.com, 0 fluids.ac.uk, 1 fluidsignal.com, 1 fluig.com, 1 @@ -48603,7 +48579,6 @@ fortipartner.uk, 1 fortisadhesives.com.au, 1 fortlauderdaleaircharter.com, 1 fortmatic.com, 1 -fortnet.online, 1 fortnite.ca, 1 fortnitemagic.ga, 1 fortoglethorpega.gov, 1 @@ -48839,6 +48814,7 @@ fox-zulu.de, 1 fox.my, 0 fox47news.com, 1 fox4now.com, 1 +foxandfish-phishing.com, 1 foxandfish.be, 1 foxbenjaminfox.com, 1 foxbnc.co.uk, 1 @@ -50616,7 +50592,6 @@ gadgets-cars.com.es, 1 gadgets-mall.com, 1 gadgetshome.ml, 1 gadgetslab.tk, 1 -gadgetstock.ir, 0 gadingpromosindo.tk, 1 gadkiy-farm.tk, 1 gadsdensoefl.gov, 1 @@ -50793,7 +50768,6 @@ gambit.pro, 1 gambitnash.co.uk, 1 gambitnash.com, 1 gambitprint.com, 1 -gamblerhealing.com, 1 gamblersgaming.eu, 1 gamblerspick.com, 1 gambling-business.club, 1 @@ -51395,7 +51369,6 @@ geass.xyz, 1 geba-online.de, 1 gebaeude-braun.de, 1 gebaeudebilanzierung.de, 1 -gebaeudeklima-schweiz.ch, 1 gebeliktakibim.com, 1 geben.digital, 1 geblitzt.de, 1 @@ -51463,6 +51436,7 @@ geekspace.gq, 1 geeksquadforums.tk, 1 geekstreet.fr, 1 geekstuff.tk, 1 +geekstyle.cz, 1 geektarven.com, 1 geektechsolutions.com.au, 1 geektechypro.tk, 1 @@ -52460,6 +52434,7 @@ giftcardstarz.com, 1 giftedconsortium.com, 1 giftedmindies.art, 1 giftedmodels.com, 1 +giftex.cz, 1 giftexperts.com, 1 giftfavorite.tk, 1 giftfocus.com, 1 @@ -53197,6 +53172,7 @@ goatbot.xyz, 1 goathub.io, 1 goatlord.tk, 1 goatstore.ca, 1 +goaudits.com, 1 gobarrelroll.com, 1 gobetweenfilms.com, 1 gobeyondtheimpossible.com, 1 @@ -54151,6 +54127,7 @@ gravirpro.ru, 1 gravitascreative.net, 1 gravitational.co, 1 gravitational.com, 1 +gravitco.com, 1 gravitlauncher.ml, 1 graviton.work, 1 gravity-inc.net, 1 @@ -54563,7 +54540,6 @@ groomlake.tk, 1 groomscroft.co.uk, 1 groomscroft.com, 1 grootinadvies.nl, 1 -groots.com, 1 groots.ngo, 1 groove3.com, 1 grooveguard.tk, 1 @@ -54957,7 +54933,6 @@ guidechecking.com, 1 guidedesventes.fr, 1 guidedselling.net, 1 guidedsteps.com, 0 -guidefox.org, 1 guidegr.com, 1 guideline-pro.com, 1 guideline.com, 1 @@ -55007,6 +54982,7 @@ guitarfreak.tk, 1 guitarraclasica.tk, 1 guitarreria.tk, 1 guitarristaluisquintero.com, 1 +guitartrader.international, 1 gujarat.tk, 1 gujun-sky.com, 1 guki.me, 1 @@ -55369,7 +55345,6 @@ haberton.com, 1 habesha.bet, 1 habilcondominios.com.br, 1 habitable.ga, 1 -habitacionesalquiler.com, 1 habitat-domotique.fr, 1 habitatberks.org, 1 habitatetbatiment.fr, 1 @@ -55624,8 +55599,8 @@ haku.vn, 1 hakufarm.vn, 1 hakugin.me, 1 hal-9th.space, 1 -hal52.nl, 1 halacs.hu, 1 +halageorgia.com, 1 halagroup.ml, 1 halalbooking.com, 1 halbbit.eu, 1 @@ -56009,6 +55984,7 @@ harald-nyborg.dk, 1 harald-pfeiffer.de, 1 haramainbd.com, 1 harambo.cf, 1 +harapecorita.com, 1 harapjunk.hu, 1 harasov.tk, 1 harbecke.cloud, 1 @@ -56252,7 +56228,6 @@ hassans.tk, 1 hassclan.tk, 1 hasselbach-dellwig.de, 1 hassellunden.ga, 1 -hasseplatslageri.se, 1 hassiba-abderaouf.tk, 1 hassmelden.de, 0 hassra.org.uk, 1 @@ -56333,6 +56308,7 @@ havedicewillsave.com, 1 haveforeningen-enghaven.dk, 1 havefunbiking.com, 1 haveg.ru, 1 +haveibeenpwned.be, 1 haveibeenpwned.com, 1 havellab.de, 1 haven-staging.cloud, 1 @@ -56395,7 +56371,6 @@ haystack.tk, 1 haystackrenovation.com.au, 1 hayvid.com, 1 hayward.uk.com, 1 -haywardhonda.com, 1 hazalturesan.tk, 1 hazan.eu, 1 hazana.ovh, 1 @@ -56711,7 +56686,6 @@ healthkaro.tk, 1 healthkaty.tk, 1 healthkayak.ga, 1 healthknight.ga, 1 -healthl.ink, 1 healthlable.com, 1 healthlabs.com, 1 healthlar.com, 1 @@ -58201,7 +58175,6 @@ hlg88.cc, 1 hlidani-tornado.cz, 1 hlinformatics.nl, 1 hllr.xyz, 1 -hlnet.us, 1 hloe0xff.ru, 1 hlopokshop.ru, 1 hlpublicidad.com, 1 @@ -58490,6 +58463,7 @@ holytransaction.com, 1 holyubofficial.net, 1 holywhite.com, 1 holywr.it, 1 +holz.nu, 1 holzed.com, 1 holzschutz-holzbearbeitung.de, 1 holzspielzeug-shop.ch, 1 @@ -59157,6 +59131,8 @@ hotchillibox.com, 1 hotcoder.tk, 1 hotcursosrio.com.br, 1 hotdates18.com.au, 1 +hotdates18.dk, 1 +hotdates18.fi, 1 hotdishes.tk, 1 hotdoc.com.au, 1 hotdogscoolcats.net, 1 @@ -59270,7 +59246,6 @@ hotmail, 1 hotmango.tk, 1 hotmann.de, 1 hotmmagirls.com, 1 -hotnewhiphop.com, 1 hotnews-today.com, 1 hotnewsnl.tk, 1 hotnow.live, 1 @@ -59573,6 +59548,7 @@ hs-hire.co.uk, 1 hs7imports.com.br, 1 hsappstatic.net, 1 hsbc-zertifikate.de, 1 +hsbs.com.sg, 1 hschen.top, 0 hscorp.de, 1 hse-dev.com, 1 @@ -61044,7 +61020,6 @@ ihost.md, 1 ihostup.net, 1 ihouseu.com, 1 ihr-hausarzt-kleinmachnow.de, 1 -ihrb.com.br, 1 ihre-ernaehrung.de, 1 ihre-pflege-sachsen.de, 1 ihredls.de, 0 @@ -61348,7 +61323,6 @@ im4h.eu, 1 im4h.info, 1 im66.net, 1 ima-solutions.fr, 1 -imacs.org, 0 imadalin.ro, 1 image-cdn.co.uk, 1 image-drive.de, 1 @@ -61967,7 +61941,6 @@ inessoftsec.be, 1 inet.se, 1 inetdesign.tk, 1 inethost.eu, 1 -inetol.net, 1 inetpub.cn, 1 inetserver.eu, 1 inetsoftware.de, 1 @@ -62184,7 +62157,6 @@ informationsaveers.ga, 1 informationsaveest.ga, 1 informator.tk, 1 informelles.tk, 1 -informnapalm.org, 1 informspb.tk, 1 inforok.tk, 1 inforopub.tk, 1 @@ -62819,7 +62791,6 @@ intelliance.eu, 1 intellicore.cl, 1 intelligence-explosion.com, 1 intelligenetics.com, 0 -intelligentcontacts.com, 1 intelligentnegotiator.com, 1 intelligentrics.com, 1 intelligentwaves.com, 1 @@ -63364,7 +63335,6 @@ ipcontolsite.tk, 1 ipcstore.com, 1 ipdental.tk, 1 ipdfreedom.me, 1 -ipeeworld.com, 1 ipemcomodoro.com.ar, 1 iperconnessi.it, 1 iperon.org, 1 @@ -63822,7 +63792,6 @@ islensktlambakjot.is, 1 isleofman.tk, 1 isletech.net, 1 isletmenlikkursuankara.tk, 1 -isleyfarmsupply.com, 1 isliada.org, 1 islide-powerpoint.com, 1 islief.com, 1 @@ -64239,6 +64208,7 @@ itsforu.de, 1 itsgottabedark.com, 1 itsgreener.com, 1 itshamradio.com, 1 +itshka.rv.ua, 1 itsig-faq.de, 1 itsloution.tk, 1 itsm.tools, 1 @@ -65139,7 +65109,6 @@ javierflorescastillero.es, 1 javiergddw.com, 1 javierguandalini.com, 1 javierjurado.tk, 1 -javierlorente.es, 0 javiermascherano.tk, 1 javiersanchez.tk, 1 javiscoffee.com, 1 @@ -65182,7 +65151,7 @@ jaytauron.xyz, 1 jaytx.com, 1 jayveel.nl, 1 jayxon.com, 1 -jayxu.com, 0 +jayxu.com, 1 jazerxx.com, 1 jazminguaramato.com, 1 jazz-alliance.com, 1 @@ -65228,7 +65197,6 @@ jcadg.com, 1 jcaicedo.com, 1 jcaicedo.tk, 1 jcb.com, 1 -jcbgolfandcountryclub.com, 1 jccars-occasions.be, 1 jcchen.art, 1 jccrew.org, 1 @@ -65320,7 +65288,6 @@ jdlt.co.uk, 1 jdm.elk.pl, 1 jdm.pl, 1 jdmgarage.com.au, 1 -jdncr.com, 1 jdoi.pw, 1 jdpleisure.co.uk, 1 jdproofing.com, 1 @@ -66042,7 +66009,6 @@ jobig.co.il, 1 jobin.care, 1 jobindex.dk, 1 jobit.gr, 1 -jobkontor.com, 1 joblab.com.ua, 0 joblab.uk, 1 joblife.co.za, 1 @@ -66313,7 +66279,7 @@ jonahtheprophet.tk, 1 jonainhetwild.nl, 1 jonandnoraswedding.com, 1 jonas-thelemann.de, 1 -jonas.me, 1 +jonas.me, 0 jonasberger.com, 1 jonasbrothers-la-jonaticas.tk, 1 jonasdiego.tk, 1 @@ -66696,7 +66662,7 @@ jrstehlik.com, 1 jrstehlik.cz, 1 jrt.ovh, 1 jrtapsell.co.uk, 1 -jrtech.hu, 1 +jrtech.hu, 0 jrtouzi.com, 0 jrtransportedemotos.com.br, 1 jrucomsoc.tk, 1 @@ -67114,6 +67080,7 @@ justinmanders.nl, 1 justinsinkula.com, 1 justinstago.com, 1 justinstandring.com, 1 +justjavajobs.co.za, 1 justkidsdental.com, 1 justknigi.gq, 1 justknit.shop, 1 @@ -67701,6 +67668,7 @@ kamazuri.art, 1 kambistories.com, 1 kamchatkatravel.tk, 1 kamchatkawinter.tk, 1 +kamcolorectal.com, 1 kameari-za.space, 1 kameldesign.com, 1 kameliya.tk, 1 @@ -68059,11 +68027,8 @@ kasparovru.tk, 1 kasper-team.tk, 1 kasperstad.dk, 1 kass-media.com, 1 -kassa.at, 1 kassa.com, 1 kassa.expert, 1 -kasse.at, 1 -kasse.pro, 1 kassemmal.at, 1 kassola.tk, 1 kastamonuhaberleri.tk, 1 @@ -68572,7 +68537,6 @@ kenedytxedc.gov, 1 kenforeman.com, 1 keniasfamilychildcare.com, 1 keniff.gq, 1 -kenkoelectric.com, 0 kenlewis.com, 1 kenmartin.ru, 1 kennebec.gov, 1 @@ -69173,7 +69137,6 @@ kindbear.pl, 1 kinder-garten.tk, 1 kinderarzt-berlin-zia.de, 1 kinderarzt-traunstein.de, 1 -kinderballett-frankfurt.de, 1 kinderbasar-luhe.de, 1 kinderbuecher-kostenlos.de, 1 kinderchor-bayreuth.de, 1 @@ -69401,13 +69364,12 @@ kirsehirhaber.tk, 1 kirstenbos.ca, 1 kirstygreenwoodartist.ga, 1 kirus.de, 1 -kirwandigital.com, 1 kisakazan.ml, 1 kisallatorvos.hu, 1 kisaragihayato.com, 1 kiseimarriage.com, 1 kisel.org, 1 -kish-takhfif.com, 1 +kish-takhfif.com, 0 kishcar.co, 1 kisiselveri.com, 1 kiskeedeesailing.com, 1 @@ -69435,7 +69397,6 @@ kisvasut.tk, 1 kisytech.fr, 1 kita-freie-schule.de, 1 kita-sun.com, 1 -kitabat.com, 1 kitabgaul.com, 0 kitabnamabayi.com, 1 kitacoffee.com, 1 @@ -70243,7 +70204,7 @@ koolisw.tk, 1 koolitee.ee, 1 kooliveeb.ee, 1 koolkool.tk, 1 -koomaldreaming.com.au, 1 +koomaldreaming.com.au, 0 koood13.com, 1 kooplokaal.gent, 1 koopmansamenwerking.nl, 1 @@ -70582,6 +70543,7 @@ kredita.dk, 1 kreditkarta.ml, 1 kreditkarten-forum.de, 1 kreditkoll.nu, 1 +kreditmegasolusi.com, 1 kredito.pt, 1 kreditonline.ml, 1 kreditor.gq, 1 @@ -72425,7 +72387,6 @@ lausannedentiste.ch, 0 lausannelovers.ch, 0 laussat.de, 1 laut.digital, 1 -lautremode.com, 1 lauxincost.cf, 1 lauzon-hitter.com, 1 lava.moe, 1 @@ -73783,7 +73744,6 @@ lff.club, 1 lffweb.ga, 1 lfgss.com, 1 lfiore.uk, 1 -lfmosqueira.com.br, 1 lfnaturopathie.com, 1 lforum.tk, 1 lfrconseil.com, 1 @@ -73822,6 +73782,8 @@ lhakustik.se, 1 lhasaapso.com.br, 1 lhconsult.tk, 0 lheinrich.org, 1 +lhero.org, 1 +lhffinanceira.online, 1 lhm.de, 1 lhost.su, 1 lhp-creation.com, 1 @@ -74445,6 +74407,7 @@ linea-nova.be, 1 lineaesse5.it, 1 lineageos.org, 1 lineamortal.tk, 1 +linearb.io, 1 linearmap.com, 1 linebooks.cf, 1 linedance.tk, 1 @@ -74792,7 +74755,6 @@ litecache.de, 1 litecloud.ml, 1 litecoinnews.club, 1 litehost24.tk, 1 -litemere.org, 1 litemind.com, 0 liteminer.cf, 1 litepanels-parts.com, 1 @@ -75189,7 +75151,6 @@ loanreadycredit.com, 1 loansharkpro.com, 1 loanstreet.nl, 1 loantillpaydaydelaware.com, 1 -loavies.com, 1 lob-assets-staging.com, 1 lob-assets.com, 1 lob-staging.com, 1 @@ -75887,6 +75848,7 @@ losfuocos.tk, 1 losgringos.tk, 1 loshalcones.tk, 1 loshogares.mx, 1 +losinterrogantes.com, 1 losjardines.tk, 1 losjuegosdemesa.online, 1 loslegendarios.tk, 1 @@ -77373,7 +77335,6 @@ magneticmoney.de, 1 magnetoscopio.tk, 1 magnetoterapiapertutti.com, 1 magnetpass.uk, 1 -magnetremodeling.com, 1 magnets.jp, 1 magnetto.ga, 1 magnettracker.com, 1 @@ -77442,7 +77403,6 @@ mahler.io, 1 mahmalci.net, 1 mahmoodmehrabi.com, 1 mahmoodmehrabi.ir, 1 -mahmoudeeb.com, 1 mahnaz.tk, 1 mahnwache-luetzerath.org, 1 mahorka.tk, 1 @@ -78002,7 +77962,6 @@ manhattanks.gov, 1 manhole.club, 1 manhuagui.com, 1 mani.tw, 1 -maniac.msk.ru, 1 maniacoland.com, 1 maniadicane.com.br, 0 maniaiti.nz, 1 @@ -78523,7 +78482,6 @@ marketing-advertising.eu, 1 marketing1-0-1.com, 1 marketing4trends.com, 1 marketingautomationplan.nl, 1 -marketingbab.com, 1 marketingbrandingnews.com, 1 marketingbrandingnews.net, 1 marketingco.nl, 1 @@ -78746,7 +78704,6 @@ martincernac.cz, 1 martincornelissen.tk, 1 martindales.ltd.uk, 1 martindano.com, 1 -martindoe.pl, 1 martine.nu, 1 martinebot.com, 1 martinelias.cz, 1 @@ -78835,7 +78792,6 @@ mary-e-kay.tk, 1 maryamghorbani.com, 1 marycliffpress.com, 1 marycowanceramics.com, 1 -maryeclark.com, 1 maryeileen90.party, 1 maryeileenkelly.com, 1 maryhaze.net, 1 @@ -78996,6 +78952,7 @@ masterquest.tk, 1 masters-burrell.co.uk, 1 masters.black, 1 mastersadistancia.com, 1 +mastersindatascience.org, 1 mastersofmedia.nl, 1 mastersplace.tk, 1 masterstation.net, 1 @@ -79821,7 +79778,6 @@ mebelconcept.tk, 1 mebelipalitra.ru, 0 mebelisk.com.br, 1 mebelnik.pro, 1 -mebeloffice.com.ua, 1 mebelshik.tk, 1 mec010.com, 1 mec020.com, 1 @@ -80194,6 +80150,7 @@ medexpress.co.uk, 1 medfordoregon.gov, 1 medfordwi.gov, 1 medguide-bg.com, 1 +medhatzaki.com, 1 medhiwa.com, 1 medhy.fr, 1 medi.com.br, 1 @@ -80474,6 +80431,7 @@ mega-feeling.de, 1 mega-jeans.ru, 1 mega.co.nz, 1 mega.nz, 1 +mega888aplikasi.com, 1 megaar.tk, 1 megabike.tk, 1 megabook.ml, 1 @@ -80585,6 +80543,7 @@ meiksbar.de, 0 meiler.cf, 1 meilleur-casino-fiable.com, 1 meilleursavis.fr, 1 +meilleursjeuxporno.fr, 1 meilleurstrucs.com, 1 meima.cc, 1 meimeistartup.com, 1 @@ -80905,7 +80864,6 @@ meow-games.com, 1 meow.cloud, 0 meow.enterprises, 1 meow.plus, 1 -meowpic.com, 1 meowtech.network, 1 mepassport.com, 1 mepc.jp, 1 @@ -81020,7 +80978,6 @@ merlinnot.com, 1 merlinsmagic.tk, 1 merlinsoap.com, 1 merloaded.rocks, 1 -mermakov.info, 1 mernau.co, 1 merojob.com, 1 meronberry.jp, 1 @@ -81864,9 +81821,9 @@ mikemcgeephotography.com, 1 mikemooresales.com, 1 mikeowens.us, 1 mikeprocopio.com, 1 -mikerichards.email, 0 +mikerichards.email, 1 mikerichards.gallery, 1 -mikerichards.photography, 1 +mikerichards.photography, 0 mikerichards.photos, 1 mikerichards.pictures, 1 mikerichardsphotography.com, 1 @@ -82003,6 +81960,7 @@ millasexshopoficial.com.br, 1 millburyma.gov, 1 millcreekwa.gov, 1 millefleurs.eu, 1 +millenn.photos, 1 millennialmoney.id, 1 millennium-thisiswhoweare.net, 1 millenniumfalcon.org, 1 @@ -82629,7 +82587,6 @@ mitzpettel.com, 1 miui-germany.de, 1 miui.kr, 1 miukimodafeminina.com, 1 -mivestuariolaboral.com, 1 mividasecreta.tk, 1 mivm.cn, 1 mivne.co.il, 1 @@ -83122,7 +83079,6 @@ modelearth.org, 1 modelflight.com, 1 modelfotografie.tk, 1 modeli.tk, 1 -modelisme-rc.net, 1 modelisme-voiture-rc.fr, 1 modelist.com.ua, 1 modell-lq.net, 1 @@ -83210,7 +83166,6 @@ moeblog.cn, 1 moeblog.top, 1 moec.top, 1 moechel.com, 1 -moecraft.net, 1 moefactory.com, 1 moefi.xyz, 1 moegato.com, 1 @@ -83587,7 +83542,6 @@ monroetn.gov, 1 monshoppingcestcalais.fr, 1 monsieurbureau.com, 1 monsieursavon.ch, 0 -monsieurvincent.org, 1 monsitemoncommerce.com, 1 monsonshoney.com.au, 1 monsterandfox.co.uk, 1 @@ -84107,6 +84061,7 @@ mounimaharaj.tk, 1 mouniresidences.com, 1 mountain-retreat-center.com, 1 mountain-rock.ru, 1 +mountainbatchers.de, 1 mountainbell.net, 1 mountainchalet.blue, 1 mountaingrovemo.gov, 1 @@ -84204,7 +84159,6 @@ moybiznes.tk, 1 moyer.pub, 0 moylen.eu, 1 moyminsk.tk, 1 -moyoo.net, 1 moyu.host, 0 moyufangge.com, 1 moz.idv.tw, 1 @@ -84455,7 +84409,6 @@ msp.com.au, 1 msp66.de, 0 mspark.tk, 1 mspatexas.com, 1 -mspcc.org, 1 msphotographics.de, 1 mspnocsupport.com, 1 msprealestateinc.com, 1 @@ -84562,6 +84515,7 @@ mtredistricting.gov, 1 mtrx.tech, 1 mts-energia.eu, 1 mtsafe.gov, 1 +mtsn3padang.sch.id, 0 mtsoftware.com.au, 1 mtthwbrd.com, 1 mtv.re, 1 @@ -85373,7 +85327,6 @@ mycreditjunkie.com, 1 mycreditunion.gov, 1 mycredy.com, 1 mycrm.coach, 1 -mycroft.kr, 1 mycrowdstack.com, 1 mycrypnet.io, 1 mycustomwriting.com, 1 @@ -85973,7 +85926,6 @@ mytimer.tk, 1 myting.net, 1 mytntware.com, 1 mytodo.cloud, 1 -mytourstar.com, 1 mytraiteurs.com, 1 mytraning.cf, 1 mytransmissionexperts.com, 1 @@ -87360,7 +87312,7 @@ nerdgift.ml, 1 nerdherd.fun, 1 nerdherd.ovh, 1 nerdhouse.io, 1 -nerdies24.de, 1 +nerdies24.de, 0 nerdin.space, 1 nerdinator.ddns.net, 1 nerdjokes.de, 1 @@ -87514,7 +87466,6 @@ nethealth.ga, 1 nethealth.tk, 1 netherlandstypography.nl, 1 nethernet.nl.eu.org, 0 -nethlon.net, 1 nethorizon.cn, 1 nethound.ga, 1 nethruster.com, 0 @@ -87666,7 +87617,6 @@ netzklad.de, 1 netzona.org, 1 netzspielplatz.de, 0 netzsv.website, 1 -netztest.at, 1 netzvieh.de, 1 netzwerk-lq.com, 1 netzwerk-sozialliberal.de, 1 @@ -88072,6 +88022,7 @@ nextgenthemes.com, 1 nextgreatmess.com, 1 nexthop.co.th, 0 nextiot.de, 1 +nextitstep.com, 1 nextiva.com, 1 nextlegends.gov, 1 nextlevel-it.co.uk, 1 @@ -88605,7 +88556,6 @@ nilpointer.com, 1 nilrem.org, 0 nils.ch, 1 nils.moe, 1 -nilsbrisset.info, 1 nilsnet.tk, 1 nilsvital.de, 1 nim.tw, 1 @@ -89018,7 +88968,6 @@ noisky.cn, 1 noisyfox.cn, 1 noisyfox.io, 1 noisyspa.io, 1 -noites.pt, 1 noithatphangia.net, 1 noj.ac, 0 nojihata.com, 1 @@ -89135,7 +89084,6 @@ nootropicpedia.com, 1 nootropil.cf, 1 noovell.com, 1 nooverviewavailable.com, 1 -noozy.org, 1 nopagefound.com, 1 nopaincenter.ro, 0 nopajam.tk, 1 @@ -89932,6 +89880,7 @@ nutriciametabolics-shop.de, 1 nutricionistatulioalmeida.com, 1 nutriclub.co.id, 1 nutrienti.eu, 1 +nutriflex.co.za, 1 nutrifyyourself.com, 1 nutrijets.com, 1 nutriklin.com, 1 @@ -89953,6 +89902,7 @@ nutwgent.tk, 1 nuus.hu, 1 nuva.hu, 1 nuvabridge.com, 1 +nuvasystem.com, 1 nuvechtdal.nl, 1 nuvini.com, 1 nuvoagency.com, 1 @@ -90748,6 +90698,7 @@ oge.ch, 0 oge.gov, 1 ogfarms.in, 1 oggw.us, 1 +oggyp.com, 1 ogilvy.com, 1 ogis.gov, 1 ogkw.de, 1 @@ -90868,6 +90819,7 @@ okcasino.ga, 1 okchousebuyer.com, 1 okeeferanch.ca, 1 okemahok.gov, 1 +okeydeyim.com, 1 okhanvatansever.tk, 1 okhrana.agency, 1 okib.ca, 1 @@ -91529,6 +91481,7 @@ onlinecasinotrend.nl, 1 onlinechallenge.nl, 1 onlinecollegeessay.com, 1 onlinecosmeticsstore.tk, 1 +onlinecounselingprograms.com, 1 onlinecrafts.tk, 1 onlinedapoxetina.gq, 1 onlinedemo.hu, 1 @@ -91561,6 +91514,7 @@ onlinemarketfinds.cf, 1 onlinemarketingmuscle.com, 1 onlinemarketingtraining.co.uk, 1 onlinemob.ro, 1 +onlinemswprograms.com, 1 onlinenewspaperclassifieds.com, 1 onlinepay.tk, 1 onlinepaydayloans365.tk, 1 @@ -91649,7 +91603,7 @@ onpointinsights.us, 0 onpointplugins.com, 1 onpopup.ga, 1 onporn.fun, 1 -onrealt.ru, 1 +onrealt.ru, 0 onrr.gov, 1 onsemediagroup.ml, 1 onsenlaichelesdoigts.be, 1 @@ -91970,7 +91924,6 @@ oppada.com, 1 oppaiti.me, 1 oppejoud.ee, 1 oppekepe.org, 1 -opportunis.me, 1 opportunity.de, 1 opportunityfund.eu, 1 opportunityliu.top, 1 @@ -92971,7 +92924,6 @@ oyaquelegal.com.br, 1 oyensglobal.com, 1 oyesunn.com, 0 oyk13tyuj8ljpete31edj2tes-9if7bi.com, 0 -oymy.com, 1 oyosoft.fr, 1 oyosoft.net, 1 oyr79.tk, 1 @@ -93448,6 +93400,7 @@ palonhs.tk, 1 palotahaz.hu, 1 palpitediario.com.br, 1 paltopro.com, 1 +palucamoveis.com.br, 1 pamaniqu.nl, 1 pamashield.com, 1 pamc.tk, 1 @@ -93640,6 +93593,7 @@ papendal.nl, 1 paper-republic.org, 1 paper.sc, 1 paper.wf, 1 +papergamer.co.uk, 1 paperhoney.by, 1 papermasters.com, 1 papermotion.fr, 1 @@ -94332,6 +94286,7 @@ paveltoman.cz, 1 paven.io, 0 pavernosmatao.tk, 1 pavingtiles.tk, 1 +pavlic.se, 1 pavlov-ledec.cz, 1 pavlova.es, 1 paw.cloud, 1 @@ -94550,7 +94505,6 @@ pcsbrasil.ml, 1 pcscotus.gov, 1 pcsetting.com, 1 pcsoft.fr, 1 -pcsolottodraw.com, 1 pcsolutionsofwillis.ga, 1 pcsolutionsofwillis.gq, 1 pcsremodel.com, 1 @@ -94743,7 +94697,6 @@ peercraft.pl, 1 peercraft.pt, 1 peercraft.se, 1 peercraft.us, 1 -peerigon.com, 0 peername.com, 1 peernode.net, 1 peerpressurecreative.com, 1 @@ -95832,6 +95785,7 @@ photosight.ru, 1 photosight.tk, 1 photosoftware.nl, 1 phototechnique.tk, 1 +phototravel.uk, 1 phototrio.com, 1 photoutils.com, 1 photowall.tk, 1 @@ -95881,7 +95835,6 @@ phuket-idc.com, 1 phuket-idc.de, 1 phuket-nash.cf, 1 phuket-nash.ga, 1 -phuket-rawai.school, 1 phuket-tour.ga, 1 phuketbeach.tk, 1 phuketroman.tk, 1 @@ -96217,7 +96170,7 @@ pinflux2.com, 1 ping-books.cf, 1 pingandsue.us, 1 pingce.com, 1 -pingnp.me, 1 +pingnp.me, 0 pingpongparkinson.at, 1 pingrc.net, 1 pinguinita.tk, 1 @@ -96315,6 +96268,7 @@ pipabella.com, 1 pipeclub.tk, 1 pipenav.gq, 1 pipenny.net, 1 +piperswe.me, 1 pipestonecounty.gov, 1 pipfrosch.com, 0 pippenainteasy.com, 1 @@ -96335,6 +96289,7 @@ pirate-proxy.club, 1 pirate-proxy.one, 1 pirate-proxy.onl, 1 pirate-proxy.pw, 1 +pirate-punk.net, 1 pirate.gq, 0 piraten-basel.ch, 1 piraten-kleinbasel.ch, 1 @@ -97664,6 +97619,7 @@ poolsonline.tk, 1 poolspa.es, 1 pooltest.co.uk, 1 pooltools.net, 1 +poon.io, 1 poopjournal.rocks, 1 poopr.ru, 1 poorclarepa.org, 1 @@ -98080,6 +98036,7 @@ potatiz.com, 1 potato.im, 1 potatochip.tk, 1 potatodiet.ca, 1 +potatoinspirations.com, 1 potatolighting.com, 1 potatopro.com, 1 potatosouprecipe.ml, 1 @@ -98296,7 +98253,6 @@ ppoozl.com, 1 pppo.gov, 1 ppssh.org, 1 pptavmdata.org, 1 -ppusl.ro, 1 ppweb.pro, 1 ppy.la, 1 ppy.sh, 1 @@ -98580,6 +98536,7 @@ preppertactics.com, 1 preprodfan.gov, 1 prepscouts.tk, 1 prepsiedy.cf, 1 +prepz.es, 0 presail.com, 1 presbee.com, 1 presbvm.org, 1 @@ -98900,7 +98857,6 @@ privacycloud.nl, 1 privacydesign.ch, 1 privacyend.com, 1 privacyget.tk, 1 -privacyinternational.org, 1 privacymanatee.com, 1 privacynow.eu, 1 privacypro.io, 1 @@ -99182,7 +99138,6 @@ profmatheus.com, 1 profmetod.com, 1 proformer.io, 1 proformi.com, 1 -proforo.co, 1 profritual.ru, 1 profsaranya.com, 1 profservice.it, 1 @@ -99236,6 +99191,7 @@ programmes-neufs-corse.fr, 1 programming-solutions.tk, 1 programnews.tk, 1 programsareproofs.com, 1 +programsupport300procent.com, 1 programtracker.net, 1 prograph.tk, 1 prograppa.tk, 1 @@ -99359,7 +99315,6 @@ prometheanfire.net, 1 prometheanfire.org, 1 promethen.com, 1 prometheus.cf, 1 -promexbol.com.bo, 1 promiflash.de, 1 promifotos.com, 1 promisedland.tk, 1 @@ -99449,7 +99404,6 @@ propertymingo.com, 1 propertyofariana.pw, 1 propertyofthepeople.org, 1 propertyone.mk, 1 -propertyprofilereport.com, 1 propertyroad.co.uk, 1 propertysales-almeria.com, 1 propertyselling.ga, 1 @@ -99471,7 +99425,6 @@ propseller.com, 1 propshub.com, 1 propulse.xyz, 1 proquotient.com, 1 -proregiotram.de, 1 proris.com, 1 prosafilosofica.com.br, 0 proschlaf.at, 1 @@ -100316,7 +100269,6 @@ pwgenerator.net, 1 pwn.fi, 1 pwnedpass.tk, 1 pwnies.dk, 1 -pwolk.com, 1 pwoss.org, 1 pwoss.xyz, 1 pwsplash.com, 1 @@ -100428,6 +100380,7 @@ qaabildigital.com, 1 qabalah.ga, 1 qabalah.jp, 1 qabel.de, 1 +qabete.com, 1 qac.gov, 1 qaconstrucciones.com, 1 qadigitals.com, 1 @@ -100788,7 +100741,7 @@ qubhockey.tk, 1 qubicgames.com, 1 qubitechbd.com, 1 qubitsandbytes.co.uk, 1 -qubyte.codes, 1 +qubyte.codes, 0 quebeccat.com, 1 quebeccats.com, 1 quebecdogs.com, 1 @@ -101186,6 +101139,7 @@ rachelchen.me, 1 racheldiensthuette.de, 1 rachelmoorelaw.com, 1 rachelsbouncycastles.co.uk, 1 +rachelsimring.com, 1 racheltinniswood.ie, 1 rachelward.co.uk, 1 rachnacollege.tk, 1 @@ -101309,7 +101263,6 @@ radiocusco.tk, 1 radiodance.tk, 1 radiodarkwolf.tk, 1 radiodeluxe.ml, 1 -radiodetali-gold.ru, 1 radiodeutsch.com, 1 radiodevrijheid.tk, 1 radiodiagonal.tk, 1 @@ -101397,7 +101350,6 @@ radiosdeguate.com, 1 radioseda.ca, 1 radiosilver.tk, 1 radiosimba.ug, 1 -radiosity.club, 1 radiosterrekijker.tk, 1 radiosuperplus.tk, 1 radioszczecin.pl, 1 @@ -101446,7 +101398,6 @@ radreisetraumtreibstoff.de, 1 radstake.de, 1 raduga-tv.tk, 1 raduga4.ml, 1 -radverkehr-kelsterbach.de, 1 radwebhosting.com, 1 radyabkhodro.net, 1 radyn.com, 1 @@ -101653,7 +101604,6 @@ ramchand.tk, 1 ramel.tk, 1 ramen-dealer.de, 1 ramenramenramen.net, 1 -rametrix.com, 1 ramiabusalah.tk, 1 ramieres.cf, 1 ramirito.tk, 1 @@ -101771,6 +101721,7 @@ ranksite.ga, 1 ranksite.gq, 1 ranksite.ml, 1 ranksite.tk, 1 +ranktopay.com, 1 rankya.com, 1 rannamoisaaiasalong.ee, 1 rannseier.org, 1 @@ -101939,6 +101890,7 @@ ravijuhend.ee, 1 ravik.tk, 1 ravimiamet.ee, 0 ravinala-airports.aero, 1 +ravindran.me, 1 raviparekh.co.uk, 1 ravis.org, 1 ravkavonline.co.il, 1 @@ -102141,6 +102093,7 @@ rdmtaxservice.com, 1 rdns.cc, 1 rdns.gq, 1 rdo.gg, 1 +rdplumbers.co.za, 1 rdsm.be, 1 rdtech.de, 1 rdto.io, 1 @@ -102705,7 +102658,6 @@ reenergo.ru, 1 reening.net, 1 reentry.gov, 1 rees-carter.net, 1 -reesmemphis.com, 1 reesmichael1.com, 1 reeson.at, 1 reeson.de, 1 @@ -103160,7 +103112,6 @@ renemayrhofer.com, 0 reneploetz.de, 1 reneschmidt.de, 1 reneschroeter.de, 1 -renesteiper.com, 0 renet.com.br, 1 renet.tk, 1 renewablefreedom.org, 1 @@ -103885,6 +103836,7 @@ riccardopiccioni.it, 1 riccy.org, 1 riceadvice.info, 1 ricecountymn.gov, 1 +ricettesemplicieveloci.altervista.org, 1 rich-good.com, 0 richadams.me, 1 richandsteph.co.uk, 1 @@ -104734,6 +104686,7 @@ roma-servizi.it, 1 romab.com, 1 romacoffee.co.nz, 1 romagnaoggi.it, 1 +romail.ml, 1 romainlapoux.com, 1 romainlapoux.fr, 1 roman-pavlik.cz, 1 @@ -104816,7 +104769,6 @@ rongreenbaum.com, 1 roninathletics.com, 1 roninf.ch, 1 roninitconsulting.com, 1 -ronjagers.nl, 1 ronniegane.kiwi, 1 ronnylindner.de, 1 ronomon.com, 1 @@ -104885,7 +104837,6 @@ rootlair.com, 1 rootless.ga, 1 rootless.tk, 1 rootly.com, 1 -rootnician.com, 1 rootonline.de, 1 rootpak.com, 1 rootpigeon.com, 1 @@ -104904,7 +104855,6 @@ rootstation.de, 1 roottsquare.com, 1 rootusers.com, 1 rootze.com, 1 -roozaneh.net, 1 roozbeh.tk, 1 rop.cx, 1 ropd.info, 1 @@ -105529,7 +105479,6 @@ rugbugecoflooring.com, 1 rugby.tk, 1 rugby.video, 1 rugcleaninglondon.co.uk, 1 -rugdesigngallery.com, 1 rugeley-vets.co.uk, 1 rugged-cctv.com, 1 rugk.dedyn.io, 1 @@ -105836,7 +105785,7 @@ rxbusiness.com, 1 rxcarbon.com, 1 rxcom.net, 1 rxguide.nl, 1 -rxo.com, 1 +rxo.com, 0 rxtx.pt, 1 rxxx.ml, 1 ryabinushka.tk, 1 @@ -106642,6 +106591,7 @@ samin.tk, 1 samir-software.tk, 1 samiratv.tk, 1 samishnation.gov, 1 +samisoft.ir, 0 samiysok.cf, 1 samkelleher.com, 1 samkoandmikotoywarehouse.com, 1 @@ -106792,6 +106742,7 @@ sandrainden.nl, 1 sandraindenfotografie.nl, 1 sandramargolesmd.com, 1 sandramorrone.tk, 1 +sandras-hobbystueble.de, 1 sandrasturm.net, 1 sandrinesite.tk, 1 sandro.sk, 1 @@ -106866,7 +106817,6 @@ sankovitzmediation.com, 1 sankt-kassian.com, 1 sanktannae-advokater.dk, 1 sanktpetriskole.dk, 1 -sanleandromazda.com, 1 sanliurfahaberi.tk, 1 sanluisdequillota.tk, 1 sanmarcovecchio.tk, 1 @@ -107169,7 +107119,6 @@ satpersian.tk, 1 satplay.host, 1 satradio.tk, 1 satramana.org, 1 -sats4.me, 1 satselect.tk, 1 satserwis.xyz, 1 satsukii.moe, 1 @@ -107377,6 +107326,7 @@ sbermobile.ru, 1 sberna-fotofast.cz, 1 sbestimes.com, 1 sbf888.com, 1 +sbgcred.com, 1 sbhscotland.org.uk, 1 sbiewald.de, 1 sbir.gov, 0 @@ -108756,6 +108706,7 @@ sembosihosting.tk, 1 sembska.de, 1 sembyotic.com, 1 semcensurabrag.com.br, 1 +semdynamics.com, 1 semeia.io, 1 semena-ua.ml, 1 semenov.ml, 1 @@ -108820,7 +108771,6 @@ sendaiouji.com, 1 sendbird.com, 1 sendbox.cz, 1 sender.party, 1 -sender.services, 1 senderismoinfantil.tk, 1 senderosdelavida.com, 1 sendigperu.com, 1 @@ -108914,11 +108864,12 @@ sentry.io, 1 sentry.nu, 1 sentrybay.com, 1 sentworks.com, 1 +senu.pro, 1 senzaparole.de, 1 senzei.tk, 1 seo-analyse.com, 1 seo-blog12.tk, 1 -seo-dr-it.com, 1 +seo-dr-it.com, 0 seo-forum.nu, 0 seo-linz.at, 1 seo-obmen.tk, 1 @@ -109034,7 +108985,6 @@ seovisit.tk, 1 seovisits.tk, 1 seoviziti50.tk, 1 seovoorboekhouders.nl, 1 -seowebcreative.com, 1 seowebexpert.co.uk, 0 seowerkz.com, 1 seowind.io, 1 @@ -109191,7 +109141,6 @@ sertaobom.eco.br, 1 sertaovivo.tk, 1 sertasimmons.com, 1 sertim.tk, 1 -seru.eu, 1 serv.site, 1 serval-concept.com, 1 serval-formation.com, 1 @@ -110610,7 +110559,6 @@ shwrm.ch, 1 shymeck.pw, 1 shymeck.xyz, 1 shytok.net, 0 -shyuka.me, 1 si-benelux.nl, 1 si.to, 1 si2b.fr, 1 @@ -110895,7 +110843,6 @@ silta.tk, 1 siltmax.ee, 1 silv.me, 1 silv.tk, 1 -silvaserv.it, 1 silver-heart.co.uk, 1 silver-johnes.tk, 1 silverartcollector.com, 1 @@ -111937,7 +111884,6 @@ skysoftbg.com, 1 skysplash.gq, 1 skysuite.nl, 1 skytec.host, 1 -skytech-sat.com, 1 skyterraathome.com, 1 skyterraembrace.com, 1 skyterrawellness.com, 1 @@ -112701,6 +112647,7 @@ snowy.ink, 1 snowy.land, 1 snowyluma.com, 1 snowyluma.me, 1 +snp-media.de, 0 snperformance.gr, 1 snrat.com, 1 snrd.de, 1 @@ -113170,7 +113117,7 @@ solostocks.ma, 1 solostocks.net, 1 solostocks.pl, 1 solostocks.pt, 1 -solovey.su, 1 +solovey.su, 0 solovyovalawfirm.com, 1 solsi.ga, 1 solsocog.de, 1 @@ -113185,7 +113132,6 @@ solutionalbum.com, 1 solutionmotsfleches.com, 1 solutionplumber.com, 1 solutions-ii.com, 1 -solutions-teknik.com, 1 solutysmultiservices.com, 1 soluzionifightlist.cf, 1 solvation.de, 1 @@ -113246,7 +113192,6 @@ somogyivar.hu, 1 somosdefensores.org, 1 somosgesath.com, 1 somosgratitude.com.br, 1 -somoshuemul.cl, 0 somoslaarmenia.com, 1 somosweb.cf, 1 somoyorkies.com, 1 @@ -113369,7 +113314,7 @@ soomee.be, 1 soomee1.be, 1 soontm.net, 1 soopure.nl, 1 -soopy.moe, 1 +soopy.moe, 0 soora.jp, 1 sopelaotaez.tk, 1 sopenguin.com, 1 @@ -113473,7 +113418,7 @@ sospechhulp.nl, 1 sospeed.net, 1 sosregistration.eu, 1 sostacancun.com, 1 -soste.fi, 1 +soste.fi, 0 sosteam.jp, 1 sosteric.si, 1 sostm.org, 1 @@ -113922,6 +113867,7 @@ spec-auto.com.ua, 1 spec-ranking.pl, 1 specdrones.us, 1 special-equipment.tk, 1 +special-ops.org, 1 specialcameras.tk, 1 speciale.cf, 1 specialeffect.tk, 1 @@ -114394,7 +114340,6 @@ sprueche-zur-konfirmation.de, 1 spruijtparket.nl, 1 sprutech.de, 1 sps-lehrgang.de, 1 -spsidahoinc.com, 1 spslawoffice.com, 1 spstaticfiles.com, 1 spt.tf, 1 @@ -114530,6 +114475,7 @@ sreeharis.tk, 1 sreenadh.in, 1 srfloki.com, 1 srhdesign.co.uk, 1 +sri.com.pa, 1 srife.net, 1 srigc.com, 1 srilankachinasociety.org, 1 @@ -114777,7 +114723,6 @@ stagoz.com, 1 stahlen.dk, 1 stahlfors.com, 1 stahlp.dk, 1 -stail.eu, 1 stainhaufen.de, 1 stainless-steel-cookware.tk, 1 stainternational.com, 1 @@ -114787,7 +114732,6 @@ stairlin.com, 0 stairmaster.tk, 1 stairwayrecovery.com, 1 stajka.tk, 1 -stakedate.com, 1 stakestrategy.com, 1 stako.jp, 1 stakotec.de, 1 @@ -115013,7 +114957,6 @@ startstack.tech, 1 startstunter.com, 1 starttoact.nl, 1 starttraffic.uk, 1 -startup-lab.ro, 1 startup-stack.com, 1 startup-stack.tech, 1 startup.melbourne, 1 @@ -115238,6 +115181,7 @@ stefanovski.io, 1 stefanrusie.ro, 1 stefanvd.net, 1 stefany.cloud, 1 +stefany.eu, 1 stefchapman.tk, 1 stefcraps.tk, 1 steffenmeister.com, 1 @@ -115480,6 +115424,7 @@ stichtingsticky.nl, 0 stichtingwwtoegankelijk.nl, 1 stick2bike.de, 1 stickandpoketattookit.com, 1 +stickeramoi.com, 1 stickerparadise.me, 1 stickers-garage.com, 1 stickertrade.me, 1 @@ -115559,6 +115504,7 @@ stiphosting.nl, 1 stipsan.me, 1 stirblaut.de, 1 stirling.co, 1 +stirlingpoon.com, 1 stisidores.org, 1 stitch.money, 1 stitchfiddle.com, 1 @@ -115665,7 +115611,6 @@ stockyards.com, 1 stocp.org, 1 stodieck.com, 1 stoeckel.info, 0 -stoeco.net, 1 stoemp.gent, 1 stoffelnet.de, 1 stoffhandwerk.tk, 1 @@ -116116,7 +116061,6 @@ stromectol.gq, 1 stromkomfort.cz, 1 stromzivota.sk, 1 strona-na-medal.pl, 1 -strongdm.com, 1 strongervision.net, 1 stronghermoney.com, 0 strongholdinc.co.nz, 1 @@ -116202,7 +116146,6 @@ studentaid.gov, 1 studentenmobiliteit.be, 1 studentenplaza.tk, 1 studenterguiden.dk, 1 -studentexpat.com, 1 studentforums.biz, 1 studenti.tk, 1 studentinaneta.com, 1 @@ -116918,6 +116861,7 @@ supergreentonik.com, 1 supergroup.tk, 1 superguide.com.au, 1 superhappiness.com, 1 +superhappyfun.club, 1 superherba.cz, 1 superherofactory.hu, 1 superhits.gq, 1 @@ -116997,6 +116941,7 @@ supervets.com.au, 1 superway.es, 1 superwhoopi.tk, 1 superzaim.ga, 1 +supfood.cz, 1 supioka.com, 1 suplementasi.com, 1 suplments.co.uk, 1 @@ -117077,6 +117022,7 @@ surikov.tk, 1 suriname.tk, 1 surl.win, 1 surma.tk, 1 +surmoms.com, 1 surnet.io, 1 surnganet.tk, 1 suroil.com, 1 @@ -117084,7 +117030,7 @@ suroot.moe, 1 surplusdirectory.ml, 1 surpreem.com, 1 surpriz-net.tk, 1 -surprizeme.ru, 0 +surprizeme.ru, 1 surrealdb.com, 1 surrealistas.tk, 1 surreyheathyc.org.uk, 0 @@ -117316,7 +117262,6 @@ swallowforum.tk, 1 swallowgateway.com, 1 swallsoft.co.uk, 1 swallsoft.com, 1 -swamiclub.ru, 1 swanbitcoin.com, 1 swansdoor.org, 1 swanseajobs.net, 1 @@ -117519,7 +117464,6 @@ swtrayssq.gq, 1 swtun.com, 1 swvaux.com, 1 swwc.com, 1 -swxtd.com, 0 swy.cz, 1 swyn.net, 1 swynwyr.com, 1 @@ -117610,7 +117554,7 @@ symplyos.tk, 1 sympmarc.com, 1 symposium.beer, 1 symptome-erklaert.de, 1 -symvolik.ru, 1 +symvolik.ru, 0 syna.dev, 1 syna.site, 1 synabi.com, 0 @@ -118027,6 +117971,7 @@ taekwondo-berlin.tk, 1 taekwondo-hochwald.de, 1 taetomeister.de, 1 taffe-elec.com, 1 +tafnervotacao.com.br, 1 tafp3.ga, 1 tafusu-support.com, 1 tagabrand.co.uk, 1 @@ -118358,8 +118303,6 @@ tangyue.date, 1 tangzhao.net, 1 tanhaa.tk, 1 tanhongit.com, 1 -taniafitness.co.uk, 0 -taniafitness.com, 0 taniawizualizacja.pl, 1 tanie-obraczki-szczecin.tk, 1 tanie-uprawnienia-sep.pl, 1 @@ -119041,6 +118984,7 @@ tech-zealots.com, 1 tech3araby.com, 1 tech4founders.co, 1 tech4founders.com, 1 +tech4greece.gr, 1 tech506.com, 1 techacad.net, 0 techalert.net, 1 @@ -119868,7 +119812,7 @@ teskaassociates.com, 1 teskalabs.com, 1 tesla-fire.com, 1 tesla-tula.tk, 1 -tesladeaths.com, 1 +tesladeaths.com, 0 teslamagician.com, 1 teslamate.ca, 1 teslasuit.io, 1 @@ -120990,7 +120934,7 @@ theoldmill.tk, 1 theoldnews.net, 1 theoldsewingfactory.com, 1 theolodewijk.nl, 1 -theologique.ch, 0 +theologique.ch, 1 theomegagroup.co.uk, 1 theomg.co, 1 theonegroup.co.uk, 0 @@ -121775,7 +121719,6 @@ thuviensoft.com, 1 thuviensoft.net, 1 thuyetphapmoi.com, 1 thvideo.tv, 1 -thw-bernburg.de, 1 thwebdesigns.com, 1 thwiki.cc, 1 thxandbye.de, 1 @@ -122569,6 +122512,7 @@ toccoig.com, 1 tochi-urikata.net, 1 tochified.com, 1 tochinoki.co.jp, 1 +tocomtulio.com, 1 todacarreira.com, 1 todaciencia.com, 1 todamateria.com.br, 1 @@ -122690,6 +122634,7 @@ tokky.be, 1 tokky.cards, 1 tokky.eu, 1 tokky.fr, 1 +tokoangga.id, 0 tokobungaasryflorist.com, 0 tokobungadilampung.com, 1 tokocuan.id, 1 @@ -123237,7 +123182,6 @@ torg-ug.ru, 1 torgoborud.tk, 1 torgopt.tk, 1 torgovaya.tk, 1 -torgyug.ru, 1 torigaoka-dc.com, 1 toriko-official.ml, 1 torino.fi, 1 @@ -123792,8 +123736,6 @@ tractor-pulling.tk, 1 tractorfan.nl, 1 tractorpumps.com, 1 tracyhaze.net, 1 -tracyhonda.com, 1 -tracymazda.com, 1 tracyrobbinsking.com, 1 trad-n-vo.com, 1 tradavenue.com, 1 @@ -124043,6 +123985,7 @@ transmutatie.nl, 1 transnexus.com, 1 transon.tk, 1 transpak-cn.com, 1 +transparencia.gob.do, 1 transparency.cf, 1 transparency.org.pk, 1 transparencyinadmissions.org, 1 @@ -125048,7 +124991,7 @@ tsutsumi-kogyo.jp, 1 tsuyuzakihiroyuki.com, 1 tsv-1894.de, 0 tsv-hittfeld.de, 1 -tsvit.com.ua, 1 +tsvit.com.ua, 0 tsw.ovh, 1 tsxxlangel.com, 1 tsybanov.com, 1 @@ -125177,7 +125120,6 @@ tuhoctainha.net, 1 tuimprenta.com.ar, 1 tuinaportugal.com, 1 tuincentersnaet.be, 1 -tuinen-wylo.be, 1 tuinenhullebroek.be, 1 tuinenvermeiren.be, 1 tuingereedschappen.net, 0 @@ -125826,7 +125768,6 @@ tzinsurance.com, 1 tziyona.net, 1 tzki.ru, 1 tzonevrakis.gr, 1 -tzortzis.eu, 1 tzsec.com, 1 tzstamp.io, 1 tzunami.tk, 1 @@ -126170,7 +126111,6 @@ ukrainianwall.com, 1 ukrainskie-konstrukcii.com.ua, 1 ukrapak.com.ua, 1 ukrcredit.net, 1 -ukriate.com, 1 ukrn.io, 1 ukrnames.com, 1 ukrnet.co.uk, 1 @@ -126326,6 +126266,7 @@ unausa.com.br, 1 unautreregard.tk, 1 unaware.tk, 1 unbelievableplaces.de, 1 +unblock-zh.org, 1 unblockat.tk, 1 unblocked.at, 1 unblocked.cx, 1 @@ -126590,7 +126531,6 @@ unitedcarremoval.com.au, 1 unitedcyberdevelopment.com, 1 unitedea-ph.com, 1 unitedfitness.com.au, 1 -unitedforwildlife.org, 1 unitedkingdoms-guild.com, 1 unitedlisbon.school, 1 unitedpsychological.com, 1 @@ -126672,7 +126612,6 @@ universocaballo.top, 1 universogay.com, 1 universoscuola.it, 1 universovalve.net, 1 -universrumbacongolaise.com, 1 universus.tk, 1 univim.edu.mx, 1 univitale.fr, 0 @@ -126799,7 +126738,6 @@ unusualworldd.com, 1 unveiledanatolia.com, 1 unveiledgnosis.com, 1 unveilturkey.com, 1 -unvired.com, 1 unwa.tk, 1 unwire.com, 1 unwiredbrain.com, 0 @@ -126933,6 +126871,7 @@ upsocial.pp.ua, 1 upstairs.one, 1 upstart.com, 1 uptech.biz.id, 1 +uptech.vn, 0 uptechbrasil.com.br, 1 uptimed.com, 1 uptimesonar.com, 1 @@ -127696,6 +127635,7 @@ valiakhmetov.tk, 1 valiant.finance, 1 validation.link, 1 validatis.com, 1 +validator.nu, 1 validbot.com, 1 validius.fi, 1 validius.net, 1 @@ -127794,6 +127734,7 @@ vampyrium.net, 0 van-assen.com, 1 van-brandevoort.tk, 1 van11y.net, 1 +vanadrighem.eu, 1 vanarok.xyz, 0 vanasperenschoenen.nl, 1 vanbalen.be, 1 @@ -127876,6 +127817,7 @@ vanlong.com.vn, 1 vanna-mechti.tk, 1 vannaos.com, 1 vannaos.net, 1 +vanndigital.com, 1 vannoordgouda.nl, 1 vanouwerkerk.net, 1 vanquish.tk, 1 @@ -127939,7 +127881,6 @@ varghese.de, 1 variable.dk, 1 variablyconstant.com, 1 variance.pl, 1 -variasdesign.com, 1 variatesonline.tk, 1 varied.ga, 1 varierchairs.com, 1 @@ -128875,7 +128816,6 @@ viega.si, 1 viega.sk, 1 viega.us, 1 viekelis.lt, 0 -vielleserin.de, 1 viemeister.com, 1 viemontante.be, 0 viennadancecrew.at, 1 @@ -129533,7 +129473,6 @@ vitalhealthandbeauty.co.uk, 1 vitalia.cz, 1 vitaline.uz, 1 vitalismaatjes.nl, 1 -vitalitymedcenters.com, 1 vitalityscience.com, 0 vitaliyshepotkov.tk, 1 vitallispsy.be, 1 @@ -129566,7 +129505,6 @@ vitikit.com, 1 vitkausk.as, 1 vitlproducts.com, 1 vitman.tk, 1 -vitoye.com, 1 vitra-showrooms.co.uk, 1 vitra-vcare.co.uk, 1 vitrade.de, 1 @@ -130459,7 +130397,6 @@ vzducho-klima.cz, 1 vzemiseo.com, 1 vzemisite.com, 1 vzteam.ga, 1 -vztekloun.cz, 1 vzw-muzaik.tk, 1 vzwregent.be, 1 vzyatonlinezaim.ga, 1 @@ -131269,7 +131206,6 @@ wear-referrals.co.uk, 1 wear1015.ml, 1 wear2work.nl, 1 wearandcare.net, 1 -weare.fi, 0 weare.ie, 1 weare1inspirit.com, 1 wearebase.com, 1 @@ -131797,7 +131733,6 @@ wecleanbins.com, 1 wecoach.gg, 0 wecobble.com, 1 wecreate.ml, 1 -wed.pw, 1 wed13spain.tk, 1 weda.cf, 1 wedabout.com, 1 @@ -132221,7 +132156,6 @@ wetofu.top, 1 wetpussylipsex.com, 1 wetravel.company, 1 wetrepublic.com, 1 -wettbonus.net, 1 wetter.de, 1 wetthost.com, 1 wetumpkaal.gov, 1 @@ -132673,6 +132607,7 @@ wiki-iknownaught.ddns.net, 1 wiki-pedia.org, 1 wiki-play.ru, 1 wiki.berlin, 1 +wiki.python.org, 1 wiki.voyage, 1 wiki24.ru, 1 wikiboard.tk, 1 @@ -133270,6 +133205,7 @@ witcher.tk, 1 witchhunt.tk, 1 witchthicktits.tk, 1 witeetam.com, 1 +with-environment.com, 1 withdati.fr, 1 wither.cf, 1 witheveryheartbeat.com.au, 1 @@ -133861,7 +133797,6 @@ worldtalk.de, 1 worldtourismgroup.com, 1 worldtrandingnews.ml, 1 worldtravelmagazine.tk, 1 -worldtreechocolate.ca, 1 worldturkmans.tk, 1 worldupdatereviews.com, 1 worldviews-debattieren.de, 1 @@ -134289,6 +134224,8 @@ www.amazon.it, 1 www.amazon.nl, 1 www.banking.co.at, 1 www.braintreepayments.com, 0 +www.capitainetrain.com, 0 +www.captaintrain.com, 0 www.cnet.com, 1 www.dm-drogeriemarkt.ba, 1 www.dm-drogeriemarkt.bg, 1 @@ -134450,6 +134387,7 @@ x-iweb.ru, 1 x-lan.be, 1 x-net24.pl, 1 x-one.co.jp, 1 +x-orbit.dk, 1 x-team.co.il, 1 x-way.org, 1 x.io, 1 @@ -135366,6 +135304,7 @@ xn--ionunica-29c.ro, 1 xn--irr.xn--fiqs8s, 1 xn--is8h6d.gq, 0 xn--j1afcdm4f.xn--p1ai, 1 +xn--j1agcso.xn--p1ai, 1 xn--j1aoca.xn--p1ai, 1 xn--j4h.cf, 1 xn--j8se.com, 1 @@ -135374,7 +135313,7 @@ xn--jp8hx8f.ws, 1 xn--kckd0bd4a8tp27yee2e.com, 1 xn--keditr-0xa.biz, 1 xn--kinsthetik-s5a.ch, 1 -xn--kkcon-fwab.nz, 1 +xn--kkcon-fwab.nz, 0 xn--kl-oja.is, 1 xn--klmek-0sa.com, 1 xn--koabr-jra.de, 1 @@ -135569,7 +135508,7 @@ xomyak.tk, 1 xone.cz, 0 xonet.cz, 1 xonobixa.tk, 1 -xoommit.com, 1 +xoommit.com, 0 xor.cat, 1 xormatic.com, 1 xosh.fr, 1 @@ -135617,6 +135556,7 @@ xploredundee.com, 1 xplozion.tk, 1 xpods.sg, 1 xpornoizle.net, 1 +xportxpert.com, 1 xposedornot.com, 1 xposure.ae, 1 xpremium.org, 1 @@ -135643,6 +135583,7 @@ xrbox.me, 1 xrdd.de, 1 xrg.cz, 1 xrippedhd.com, 1 +xrism.ro, 1 xrockx.de, 1 xrp.pp.ua, 1 xrpnews.info, 1 @@ -135795,7 +135736,6 @@ xuyh0120.win, 1 xvadimx.me, 1 xvaldezendocrino.com, 1 xvidyo.ga, 1 -xvii.pl, 1 xviimusic.com, 1 xvix.eu, 1 xvmmod.com, 1 @@ -135860,7 +135800,6 @@ xylos.nl, 1 xynolabs.com, 1 xynonet.de, 1 xynta.ch, 1 -xyquadrat.ch, 1 xyrexwolf-sebastien-izambard.tk, 1 xywing.com, 0 xyz.blue, 1 @@ -136288,6 +136227,7 @@ ycnexp.eu.org, 1 ycnrg.org, 1 ycodendauteradio.net, 1 ycsgo.com, 0 +yd.io, 1 yd163.cc, 1 yd169.cc, 1 ydiversa.com, 1 @@ -136699,7 +136639,7 @@ youcanfinance.com.au, 1 youcanfuckoff.xyz, 1 youcanhelp.tk, 1 youcanmakeit.at, 1 -youcruit.com, 1 +youcruit.com, 0 youcruit.jobs, 1 youdontneedipv6.xyz, 1 youdungoofd.com, 1 @@ -136804,7 +136744,6 @@ yourbonus.click, 0 yourbreakfast.tk, 1 yourbristolsomerset.wedding, 1 yourbusiness.ml, 1 -yourcareerhost.com, 1 yourcfo.co.in, 1 yourcheshiremerseyside.wedding, 1 yourciso.com, 1 @@ -137925,7 +137864,7 @@ zerodeathsmd.gov, 1 zerodhacapital.com, 1 zerodhareview.co, 1 zerofox.gq, 1 -zerofy.de, 1 +zerofy.de, 0 zeroknowledge.me, 1 zerolink.click, 1 zerolink.es, 1 @@ -138625,6 +138564,7 @@ zuim.de, 1 zuishuzi.com, 1 zuitaotu.com, 1 zuiverjegeest.nl, 1 +zukonar.ru, 1 zukong.party, 1 zukunft-mobilitaet.net, 1 zula.africa, 1 diff --git a/security/manager/ssl/tests/unit/head_psm.js b/security/manager/ssl/tests/unit/head_psm.js index 671a20a1749..c9f5818e97e 100644 --- a/security/manager/ssl/tests/unit/head_psm.js +++ b/security/manager/ssl/tests/unit/head_psm.js @@ -8,16 +8,16 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm"); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js"); const { MockRegistrar } = ChromeUtils.import( "resource://testing-common/MockRegistrar.jsm" ); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" diff --git a/security/manager/tools/genRootCAHashes.js b/security/manager/tools/genRootCAHashes.js index e85625a6279..ea5794a2aad 100644 --- a/security/manager/tools/genRootCAHashes.js +++ b/security/manager/tools/genRootCAHashes.js @@ -12,8 +12,8 @@ const nsX509CertDB = "@mozilla.org/security/x509certdb;1"; const CertDb = Cc[nsX509CertDB].getService(Ci.nsIX509CertDB); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { CommonUtils } = ChromeUtils.import( diff --git a/security/sandbox/chromium-shim/patches/with_update/mingw_fix_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY.patch b/security/sandbox/chromium-shim/patches/with_update/mingw_fix_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY.patch new file mode 100644 index 00000000000..7dd3a82b7a3 --- /dev/null +++ b/security/sandbox/chromium-shim/patches/with_update/mingw_fix_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY.patch @@ -0,0 +1,40 @@ +# HG changeset patch +# User Yannis Juglaret +# Date 1663959861 -7200 +# Fri Sep 23 21:04:21 2022 +0200 +# Node ID 3678927a7e8652895bc739d4095a6fccca9d9096 +# Parent dac6a19a0031a64efacc9d0dd6e2f2416b2bf2d8 +Bug 1766432 - Part 2: Propagate custom definition for PROCESS_MITIGATION_DYNAMIC_CODE_POLICY to third-party. r=bobowen + +Differential Revision: https://phabricator.services.mozilla.com/D157904 + +diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc +--- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc ++++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc +@@ -17,6 +17,8 @@ + #include "sandbox/win/src/sandbox_rand.h" + #include "sandbox/win/src/win_utils.h" + ++#include "mozilla/MozProcessMitigationDynamicCodePolicy.h" ++ + namespace { + + // API defined in libloaderapi.h >= Win8. +@@ -231,7 +233,7 @@ bool ApplyProcessMitigationsToCurrentPro + // Verify caller is not accidentally setting both mutually exclusive + // policies. + DCHECK(!(flags & MITIGATION_DYNAMIC_CODE_DISABLE_WITH_OPT_OUT)); +- PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; ++ MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; + policy.ProhibitDynamicCode = true; + + if (!set_process_mitigation_policy(ProcessDynamicCodePolicy, &policy, +@@ -307,7 +309,7 @@ bool ApplyProcessMitigationsToCurrentPro + // Verify caller is not accidentally setting both mutually exclusive + // policies. + DCHECK(!(flags & MITIGATION_DYNAMIC_CODE_DISABLE)); +- PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; ++ MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; + policy.ProhibitDynamicCode = true; + policy.AllowThreadOptOut = true; + diff --git a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt index ba4487137b2..e59a8383bd2 100755 --- a/security/sandbox/chromium-shim/patches/with_update/patch_order.txt +++ b/security/sandbox/chromium-shim/patches/with_update/patch_order.txt @@ -29,3 +29,4 @@ lower_SDK_version_requirement.patch add_CET_STRICT_MODE.patch broker_complex_line_breaks.patch allow_reparse_points.patch +mingw_fix_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY.patch diff --git a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc index 557296c93f8..a67f9c19e25 100644 --- a/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc +++ b/security/sandbox/chromium/sandbox/win/src/process_mitigations.cc @@ -17,6 +17,8 @@ #include "sandbox/win/src/sandbox_rand.h" #include "sandbox/win/src/win_utils.h" +#include "mozilla/MozProcessMitigationDynamicCodePolicy.h" + namespace { // API defined in libloaderapi.h >= Win8. @@ -231,7 +233,7 @@ bool ApplyProcessMitigationsToCurrentProcess(MitigationFlags flags) { // Verify caller is not accidentally setting both mutually exclusive // policies. DCHECK(!(flags & MITIGATION_DYNAMIC_CODE_DISABLE_WITH_OPT_OUT)); - PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; + MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; policy.ProhibitDynamicCode = true; if (!set_process_mitigation_policy(ProcessDynamicCodePolicy, &policy, @@ -307,7 +309,7 @@ bool ApplyProcessMitigationsToCurrentProcess(MitigationFlags flags) { // Verify caller is not accidentally setting both mutually exclusive // policies. DCHECK(!(flags & MITIGATION_DYNAMIC_CODE_DISABLE)); - PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; + MOZ_PROCESS_MITIGATION_DYNAMIC_CODE_POLICY policy = {}; policy.ProhibitDynamicCode = true; policy.AllowThreadOptOut = true; diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp index 55120d41af3..ad8d337fe50 100644 --- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp +++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp @@ -1371,15 +1371,13 @@ bool SandboxBroker::SetSecurityLevelForUtilityProcess( && aSandbox != mozilla::ipc::SandboxingKind::MF_MEDIA_ENGINE_CDM #endif ) { -#if !defined(__MINGW32__) && !defined(__MINGW64__) mitigations |= sandbox::MITIGATION_DYNAMIC_CODE_DISABLE; -#endif // !defined(__MINGW32__) && !defined(__MINGW64__) } else { if (IsWin10CreatorsUpdateOrLater() && aSandbox == mozilla::ipc::SandboxingKind::UTILITY_AUDIO_DECODING_WMF) { -#if defined(_M_X64) && !defined(__MINGW64__) +#if defined(_M_X64) mitigations |= sandbox::MITIGATION_DYNAMIC_CODE_DISABLE; -#endif // defined(_M_X64) && !defined(__MINGW64__) +#endif // defined(_M_X64) } } diff --git a/services/automation/ServicesAutomation.jsm b/services/automation/ServicesAutomation.jsm index ad9ff0ab862..af75b7c2ae9 100644 --- a/services/automation/ServicesAutomation.jsm +++ b/services/automation/ServicesAutomation.jsm @@ -31,8 +31,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - Log: "resource://gre/modules/Log.jsm", Weave: "resource://services-sync/main.js", Svc: "resource://services-sync/util.js", FxAccountsClient: "resource://gre/modules/FxAccountsClient.jsm", diff --git a/services/common/hawkclient.js b/services/common/hawkclient.js index fcb7aed270a..3c199bdc369 100644 --- a/services/common/hawkclient.js +++ b/services/common/hawkclient.js @@ -32,7 +32,9 @@ const { HAWKAuthenticatedRESTRequest } = ChromeUtils.import( const { Observers } = ChromeUtils.import( "resource://services-common/observers.js" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/services/common/hawkrequest.js b/services/common/hawkrequest.js index 8a411deac07..7b1320e9072 100644 --- a/services/common/hawkrequest.js +++ b/services/common/hawkrequest.js @@ -12,7 +12,9 @@ var EXPORTED_SYMBOLS = [ const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { RESTRequest } = ChromeUtils.import( "resource://services-common/rest.js" ); diff --git a/services/common/kinto-storage-adapter.js b/services/common/kinto-storage-adapter.js index a5773a58c80..6627093ca0b 100644 --- a/services/common/kinto-storage-adapter.js +++ b/services/common/kinto-storage-adapter.js @@ -11,7 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm"); +const { Sqlite } = ChromeUtils.importESModule( + "resource://gre/modules/Sqlite.sys.mjs" +); const { Kinto } = ChromeUtils.import( "resource://services-common/kinto-offline-client.js" ); diff --git a/services/common/logmanager.js b/services/common/logmanager.js index e5ce91f8734..e30c81b5824 100644 --- a/services/common/logmanager.js +++ b/services/common/logmanager.js @@ -3,15 +3,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict;"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm"); const { Preferences } = ChromeUtils.import( diff --git a/services/common/modules-testing/logging.js b/services/common/modules-testing/logging.js index 2d5ad04e093..b03ba970d25 100644 --- a/services/common/modules-testing/logging.js +++ b/services/common/modules-testing/logging.js @@ -6,7 +6,9 @@ var EXPORTED_SYMBOLS = ["getTestLogger", "initTestLogging"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); function initTestLogging(level) { function LogStats() { diff --git a/services/common/rest.js b/services/common/rest.js index c44aeb254b3..f28806464ec 100644 --- a/services/common/rest.js +++ b/services/common/rest.js @@ -9,9 +9,11 @@ var EXPORTED_SYMBOLS = [ ]; const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { CommonUtils } = ChromeUtils.import( "resource://services-common/utils.js" diff --git a/services/common/tests/unit/head_helpers.js b/services/common/tests/unit/head_helpers.js index fb820036ac8..9dc58db09e2 100644 --- a/services/common/tests/unit/head_helpers.js +++ b/services/common/tests/unit/head_helpers.js @@ -4,7 +4,7 @@ /* import-globals-from head_global.js */ -var { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs"); var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js"); var { HTTP_400, diff --git a/services/common/tests/unit/test_logmanager.js b/services/common/tests/unit/test_logmanager.js index c1da01977d5..efae44ca899 100644 --- a/services/common/tests/unit/test_logmanager.js +++ b/services/common/tests/unit/test_logmanager.js @@ -7,8 +7,8 @@ const { LogManager } = ChromeUtils.import( "resource://services-common/logmanager.js" ); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); // Returns an array of [consoleAppender, dumpAppender, [fileAppenders]] for diff --git a/services/common/tests/unit/test_storage_adapter.js b/services/common/tests/unit/test_storage_adapter.js index f86661468b6..ecc6d3b4f7f 100644 --- a/services/common/tests/unit/test_storage_adapter.js +++ b/services/common/tests/unit/test_storage_adapter.js @@ -1,7 +1,9 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm"); +const { Sqlite } = ChromeUtils.importESModule( + "resource://gre/modules/Sqlite.sys.mjs" +); const { FirefoxAdapter } = ChromeUtils.import( "resource://services-common/kinto-storage-adapter.js" ); diff --git a/services/common/tokenserverclient.js b/services/common/tokenserverclient.js index 30dc7292d84..41133de2ca1 100644 --- a/services/common/tokenserverclient.js +++ b/services/common/tokenserverclient.js @@ -11,7 +11,9 @@ var EXPORTED_SYMBOLS = [ "TokenServerClientServerError", ]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { RESTRequest } = ChromeUtils.import( "resource://services-common/rest.js" ); diff --git a/services/common/utils.js b/services/common/utils.js index f482b59218d..de4bfa5dac0 100644 --- a/services/common/utils.js +++ b/services/common/utils.js @@ -7,7 +7,9 @@ var EXPORTED_SYMBOLS = ["CommonUtils"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const lazy = {}; ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm"); diff --git a/services/fxaccounts/Credentials.jsm b/services/fxaccounts/Credentials.jsm index 582ab6946ea..302caea1a66 100644 --- a/services/fxaccounts/Credentials.jsm +++ b/services/fxaccounts/Credentials.jsm @@ -13,7 +13,9 @@ var EXPORTED_SYMBOLS = ["Credentials"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { CryptoUtils } = ChromeUtils.import( "resource://services-crypto/utils.js" ); diff --git a/services/fxaccounts/FxAccounts.jsm b/services/fxaccounts/FxAccounts.jsm index 31f75859419..c00606e7a19 100644 --- a/services/fxaccounts/FxAccounts.jsm +++ b/services/fxaccounts/FxAccounts.jsm @@ -3,8 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { CryptoUtils } = ChromeUtils.import( "resource://services-crypto/utils.js" diff --git a/services/fxaccounts/FxAccountsCommon.js b/services/fxaccounts/FxAccountsCommon.js index e09c58d52ac..ceadbea95ee 100644 --- a/services/fxaccounts/FxAccountsCommon.js +++ b/services/fxaccounts/FxAccountsCommon.js @@ -8,7 +8,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { LogManager } = ChromeUtils.import( "resource://services-common/logmanager.js" ); diff --git a/services/fxaccounts/FxAccountsKeys.jsm b/services/fxaccounts/FxAccountsKeys.jsm index 1db238617e2..a27b53eb7c7 100644 --- a/services/fxaccounts/FxAccountsKeys.jsm +++ b/services/fxaccounts/FxAccountsKeys.jsm @@ -3,8 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { CommonUtils } = ChromeUtils.import( "resource://services-common/utils.js" diff --git a/services/fxaccounts/tests/xpcshell/test_accounts.js b/services/fxaccounts/tests/xpcshell/test_accounts.js index 0df08986b04..50ad3bdb3e0 100644 --- a/services/fxaccounts/tests/xpcshell/test_accounts.js +++ b/services/fxaccounts/tests/xpcshell/test_accounts.js @@ -22,8 +22,8 @@ const { DEPRECATED_SCOPE_ECOSYSTEM_TELEMETRY, PREF_LAST_FXA_USER, } = ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js"); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); // We grab some additional stuff via backstage passes. diff --git a/services/fxaccounts/tests/xpcshell/test_profile.js b/services/fxaccounts/tests/xpcshell/test_profile.js index 172e20896b1..809a4b41cce 100644 --- a/services/fxaccounts/tests/xpcshell/test_profile.js +++ b/services/fxaccounts/tests/xpcshell/test_profile.js @@ -12,8 +12,8 @@ const { FxAccountsProfileClient } = ChromeUtils.import( const { FxAccountsProfile } = ChromeUtils.import( "resource://gre/modules/FxAccountsProfile.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm index a8b0c67ce19..de557af4275 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm @@ -7,8 +7,8 @@ var EXPORTED_SYMBOLS = ["Utils"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { ServiceRequest } = ChromeUtils.import( - "resource://gre/modules/ServiceRequest.jsm" +const { ServiceRequest } = ChromeUtils.importESModule( + "resource://gre/modules/ServiceRequest.sys.mjs" ); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index cc1d97cc174..162da599132 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -1,5 +1,3479 @@ { "data": [ + { + "schema": 1664326321082, + "derHash": "roIgH1ZeBDm39K1okydZTrl0pPeBsabL/tWb04IxfxM=", + "subject": "CN=Thawte TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgRUNDIENBIEcx", + "whitelist": false, + "attachment": { + "hash": "57d89599988d7bc402c1ba123132fbf1a908a59550a9fc499d6c56a71b579771", + "size": 1142, + "filename": "Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO-bYvpiEQI=.pem", + "location": "security-state-staging/intermediates/70e34f90-78e8-45d4-ac31-585b43fe58fb.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO+bYvpiEQI=", + "crlite_enrolled": false, + "id": "9dee899c-9bcb-4d39-bc6c-85250c723859", + "last_modified": 1664326626009 + }, + { + "schema": 1664326321968, + "derHash": "vRk8R15OZ5OL7zQSK5i1WKKILn7ZQ2mmywETIO8VYjw=", + "subject": "CN=AlwaysOnSSL TLS ECC CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE", + "subjectDN": "MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIEVDQyBDQSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "6a6ab99ca26b4ea85f6b0ebff3e05be9589783e1fd7c0869984977e5eee35bf2", + "size": 1175, + "filename": "0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=.pem", + "location": "security-state-staging/intermediates/7b309fea-ab29-4cd2-be7f-2b1085a4c3e8.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=", + "crlite_enrolled": false, + "id": "de57018b-48a7-4a6a-a8ce-0b1b15e57d19", + "last_modified": 1664326626002 + }, + { + "schema": 1664326318466, + "derHash": "wCLVzqonXypiaPp5rDVlOzpzDe+kH5zYgX1tFZvTMJc=", + "subject": "CN=DigiCert Secure Site Korea EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIENB", + "whitelist": false, + "attachment": { + "hash": "9e5a746ac77a20cd8a2433a0ccf3dcca6a47d3f6602b22588154fbfcff3c111c", + "size": 1699, + "filename": "GU23iW3XanBnTnSB-qHY60G9W7OWfde0SLEvQJL9stY=.pem", + "location": "security-state-staging/intermediates/7d5c253a-8a9d-47b0-b14d-a935652bb1c7.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "GU23iW3XanBnTnSB+qHY60G9W7OWfde0SLEvQJL9stY=", + "crlite_enrolled": false, + "id": "3fb82116-362e-4282-982a-db1d110f0d11", + "last_modified": 1664326625994 + }, + { + "schema": 1664326316747, + "derHash": "sjopwxKnqAsP5rTnG5CcrpKtZJ6Idm5Wye6OHXwBOUU=", + "subject": "CN=Trust Provider B.V. TLS RSA EV CA G2,O=Trust Provider B.V.,C=NL", + "subjectDN": "MFoxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMS0wKwYDVQQDEyRUcnVzdCBQcm92aWRlciBCLlYuIFRMUyBSU0EgRVYgQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "db5c41ad0878314cf616d0ce27defe4bb76a6bedbe7e50c09eef688c2272a4ff", + "size": 1756, + "filename": "tbS_1veJrHW-X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=.pem", + "location": "security-state-staging/intermediates/8b17a910-28e4-4245-9c0e-613dfc959dbe.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "tbS/1veJrHW+X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=", + "crlite_enrolled": false, + "id": "0ce0ee4a-1393-4431-abf3-d006cbb96f03", + "last_modified": 1664326625986 + }, + { + "schema": 1664326320228, + "derHash": "BwUxODzNEA0+nNlk2weqXoRaBoby6uO8imJ7GCBXsfE=", + "subject": "CN=WoTrus EV SSL Pro CA,O=WoTrus CA Limited,C=CN", + "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIEVWIFNTTCBQcm8gQ0E=", + "whitelist": false, + "attachment": { + "hash": "eb4c0a82284e0aeb9ce6b91db33bee1985922cb215327f2e73e9fb3edbdaa292", + "size": 1845, + "filename": "rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=.pem", + "location": "security-state-staging/intermediates/f6452090-5838-4301-88db-8a0e4b236b13.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=", + "crlite_enrolled": false, + "id": "62dff257-444d-4410-b94f-61686e918ed5", + "last_modified": 1664326625979 + }, + { + "schema": 1664326315882, + "derHash": "15otXgMpXA6f6uNtAh69UglwCrGp6BekPzD6PGb3jSE=", + "subject": "CN=DigiCert TLS Hybrid ECC SHA384 2020 CA1,O=DigiCert Inc,C=US", + "subjectDN": "MFYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBIeWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMQ==", + "whitelist": false, + "attachment": { + "hash": "bc2954442e7a77c973da8e56642f87d300ade42db9755d9dfb888b77d502b45b", + "size": 1536, + "filename": "e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=.pem", + "location": "security-state-staging/intermediates/8f52065f-5cee-4d08-b159-e6444aec8a36.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=", + "crlite_enrolled": false, + "id": "b8541d60-7ae4-4cdb-b65c-94c6ea2f9622", + "last_modified": 1664326625971 + }, + { + "schema": 1664326315016, + "derHash": "vrjv6bGnPIQbN1qQ5f/4BIhI46KvZvbE3XuTjW/oxdg=", + "subject": "CN=TERENA SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", + "subjectDN": "MGQxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEYMBYGA1UEAxMPVEVSRU5BIFNTTCBDQSAz", + "whitelist": false, + "attachment": { + "hash": "e4ac7ab94f676f44055d2f3516028ed222a17a914725519dd8ff9d3afb675e0d", + "size": 1788, + "filename": "8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=.pem", + "location": "security-state-staging/intermediates/cf430545-b753-4480-94fd-67f3f032f9af.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=", + "crlite_enrolled": false, + "id": "6a7c2942-3cb4-418e-9ebd-9506dda57955", + "last_modified": 1664326625963 + }, + { + "schema": 1664326317605, + "derHash": "QD4GKiZTBZETKFuvgKDUrkIshIyfePrQH8lLxbh/7xo=", + "subject": "CN=DigiCert SHA2 Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MHUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNDAyBgNVBAMTK0RpZ2lDZXJ0IFNIQTIgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0E=", + "whitelist": false, + "attachment": { + "hash": "8c56cc97d9228cf4315abdb67ecbe6f845bb15c6bddfa4fc1b4bd41251669430", + "size": 1695, + "filename": "RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn_yOhI_y-ho=.pem", + "location": "security-state-staging/intermediates/078b10f3-5ab5-4378-ada1-201c314e5dc2.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=", + "crlite_enrolled": false, + "id": "6928877d-4683-4f4c-8186-42ac4ab38543", + "last_modified": 1664326625956 + }, + { + "schema": 1664326314161, + "derHash": "tutPitGXBz/lID+Pzr/VxQnN6co6pl7FnSA4MUJBktQ=", + "subject": "CN=Secure Site Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJVNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "cd904a90ca202b5ad90cebb83e4d5c23de42eb5861cff29e373aa692f5cebac5", + "size": 1699, + "filename": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem", + "location": "security-state-staging/intermediates/9d68a7bf-267d-4ad1-a0e1-76c7bfd5f003.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=", + "crlite_enrolled": false, + "id": "6dd778da-ae48-4e44-a711-9554a9bde292", + "last_modified": 1664326625948 + }, + { + "schema": 1664326310722, + "derHash": "cQAks3vZ8OFTfBikwg+aMcS0hdEkjGQ/ILTADzcWuoU=", + "subject": "CN=DigiCert EV Server CA G4,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCAgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBFViBTZXJ2ZXIgQ0EgRzQ=", + "whitelist": false, + "attachment": { + "hash": "ed7edc9b1f494a5623657a2e420f2213a6a924fbe887f8b45d30a0ace12b994d", + "size": 1951, + "filename": "rSOteFVbBeX8qJ_1s6WFayDHdgaEKLjbWQS5PZDkdvg=.pem", + "location": "security-state-staging/intermediates/d7567855-d0ad-4791-b70c-ad1638c4b0b8.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "rSOteFVbBeX8qJ/1s6WFayDHdgaEKLjbWQS5PZDkdvg=", + "crlite_enrolled": false, + "id": "05859cd9-5da1-4707-afc7-8ae8f5dbe9e5", + "last_modified": 1664326625940 + }, + { + "schema": 1664326309829, + "derHash": "DVG2zc80qfIhRHh/P9kg3IgA+2BJC/yNKJoZU+D72k0=", + "subject": "CN=TrustAsia EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "ce686ad6e53606937f47bb538464e59bb83f5d67b4f21eee779132956645376c", + "size": 1670, + "filename": "JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem", + "location": "security-state-staging/intermediates/8f378669-0201-4a76-9394-84b5d9f4d4bb.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=", + "crlite_enrolled": false, + "id": "f9fda149-0c99-483d-87d9-ede54b3cdd66", + "last_modified": 1664326625932 + }, + { + "schema": 1664326319338, + "derHash": "25mk8oTM8Qsm3nt6XWUXJbhXy8hx67MwKNZ7VVEO/Nk=", + "subject": "CN=Abbott Laboratories Secure Authentication CA,O=Abbott Laboratories Inc.,C=US", + "subjectDN": "MGcxCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xNTAzBgNVBAMTLEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIEF1dGhlbnRpY2F0aW9uIENB", + "whitelist": false, + "attachment": { + "hash": "d51732ac0b1ce932777f09ace232f20e4ab6fdc2e4be70d3441e83f23115c318", + "size": 1772, + "filename": "S-zMrWUPK-hCylswDO1ieeWHUSws1lexaXMxp-YEjWA=.pem", + "location": "security-state-staging/intermediates/0ee918aa-5ec3-4097-9959-8e60637a737e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "S+zMrWUPK+hCylswDO1ieeWHUSws1lexaXMxp+YEjWA=", + "crlite_enrolled": false, + "id": "21fb8eda-586a-49f6-a362-1c12e465ff21", + "last_modified": 1664326625925 + }, + { + "schema": 1664326312437, + "derHash": "75E4mTZU35LS+1hg4o3ogYqfSdtW7LaJpnp/wtWIHdI=", + "subject": "CN=DigiCert Secure Site Korea ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVDQyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "1cebaeaf42603c1ecacaaf80e014cd47e7847cb05d26b160ee9968c87797e04d", + "size": 1410, + "filename": "DqywqWwTJGFOkcrnV9IPNGtEO_GJMB1Y28mAQyChmRY=.pem", + "location": "security-state-staging/intermediates/18453308-5296-495f-9985-552e1584e920.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "DqywqWwTJGFOkcrnV9IPNGtEO/GJMB1Y28mAQyChmRY=", + "crlite_enrolled": false, + "id": "c1c62fba-bd9f-4dd1-91b4-5a7272e6906d", + "last_modified": 1664326625917 + }, + { + "schema": 1664326313287, + "derHash": "vmoNnh0RXyKT9qvxGz7I6ILiRCbu6wmqpQNZeZPneiU=", + "subject": "CN=TERENA SSL High Assurance CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", + "subjectDN": "MHMxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEnMCUGA1UEAxMeVEVSRU5BIFNTTCBIaWdoIEFzc3VyYW5jZSBDQSAz", + "whitelist": false, + "attachment": { + "hash": "8d237604a604b6c114352fe34117c1f80898239bdf21d1f81d2411892a0eec27", + "size": 1752, + "filename": "XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx-hQBmJ54WmCs=.pem", + "location": "security-state-staging/intermediates/8a739887-2661-4e6d-8937-838e82255c56.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx+hQBmJ54WmCs=", + "crlite_enrolled": false, + "id": "4060e977-0298-41b1-8f3d-af34a82c520d", + "last_modified": 1664326625909 + }, + { + "schema": 1664326311572, + "derHash": "L2iJlhp8pwZ+i6EDws+bmpJPjKKT8RF44joZeNLxM9M=", + "subject": "CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US", + "subjectDN": "MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=", + "whitelist": false, + "attachment": { + "hash": "d202b6061f57e425a4b7e1b2b848b30da87b4fa0eb8d5e4a70307ce5ff99228e", + "size": 1646, + "filename": "UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem", + "location": "security-state-staging/intermediates/0c3216d9-9fe7-4784-bccb-1927dd3ceff5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=", + "crlite_enrolled": false, + "id": "d64cb01d-fa83-4092-845b-913f4d4061d6", + "last_modified": 1664326625901 + }, + { + "schema": 1664326308953, + "derHash": "JOnyCsFnu48J3ooemWjMU/C186SUj1G4ZHtAsYbHXr4=", + "subject": "CN=DigiCert Secure Auth CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IFNlY3VyZSBBdXRoIENB", + "whitelist": false, + "attachment": { + "hash": "cda72d22a79f77e8f6bf5a1839b886065eb2ff2b353c100287cc8a32e4b0b773", + "size": 1792, + "filename": "tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=.pem", + "location": "security-state-staging/intermediates/6b4698ed-1e53-434f-b7d4-fe4692c7b107.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=", + "crlite_enrolled": false, + "id": "b69f8920-3d83-43c3-8b24-6edf10da5eef", + "last_modified": 1664326625894 + }, + { + "schema": 1664326308084, + "derHash": "j6xXZDnJ/T7xU7Ufnt0NOBtd97h1Wc6+ygQpfdRKY5s=", + "subject": "CN=DigiCert Global CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "52b1c1b08d18fc0370d8a9752dd7009dcb0db031a9495a435b240684ec2ba02d", + "size": 1634, + "filename": "njN4rRG-22dNXAi-yb8e3UMypgzPUPHlv4-foULwl1g=.pem", + "location": "security-state-staging/intermediates/00772084-a223-4f09-911c-f5ec083d339f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "njN4rRG+22dNXAi+yb8e3UMypgzPUPHlv4+foULwl1g=", + "crlite_enrolled": false, + "id": "0a341464-dd9a-4f0f-a855-d63fa887b2f4", + "last_modified": 1664326625886 + }, + { + "schema": 1664326306357, + "derHash": "m/7T2dyVI2vP/LNdSxINsOOGf2Kx/QFako2gswOWZoM=", + "subject": "CN=DigiCert High Assurance TLS RSA SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE4MDYGA1UEAxMvRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTE=", + "whitelist": false, + "attachment": { + "hash": "5e142f2c8b2fe06316f53d76be5e837878e6537e01e66186d01bb4b6167dfc1b", + "size": 1748, + "filename": "KKzhMaY72_nD-ZVShAg153XyomvfRUrrKjaWxh3ZCRo=.pem", + "location": "security-state-staging/intermediates/b5ade449-4506-4a44-87eb-1f9505aa417a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "KKzhMaY72/nD+ZVShAg153XyomvfRUrrKjaWxh3ZCRo=", + "crlite_enrolled": false, + "id": "324ecc15-aac9-473a-8fa5-04c69f2368f2", + "last_modified": 1664326625878 + }, + { + "schema": 1664326303736, + "derHash": "bGniAWVkQOuYzQh1dkoe0ZAV7YxEJ2Aaypxor6iXOVk=", + "subject": "CN=Abbott Laboratories Secure Server CA,O=Abbott Laboratories Inc.,C=US", + "subjectDN": "MF8xCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xLTArBgNVBAMTJEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIFNlcnZlciBDQQ==", + "whitelist": false, + "attachment": { + "hash": "eab39e7e333afe852aeb6f2575bf8e963df5990e6948452d109ad50c947571df", + "size": 1670, + "filename": "WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=.pem", + "location": "security-state-staging/intermediates/e4fb4ed4-bee3-40bb-9993-79934cb2d8f8.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=", + "crlite_enrolled": false, + "id": "981cf10f-0a58-4f74-ab2c-3dada26a9d3e", + "last_modified": 1664326625871 + }, + { + "schema": 1664326307214, + "derHash": "fAkS5d6EeLuG6OpGulrmXcOHC878vC9GeV7uz2SM++c=", + "subject": "CN=DigiCert Extended Validation CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzM=", + "whitelist": false, + "attachment": { + "hash": "79aef4deadba4e5527967cc9603d5b5f0168cc397952725b9f9163d98b117b70", + "size": 1158, + "filename": "26Ut6iLcm-3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=.pem", + "location": "security-state-staging/intermediates/5774f69e-4cb5-4196-aa07-a4dbb507ab58.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "26Ut6iLcm+3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=", + "crlite_enrolled": false, + "id": "e384f427-9be3-40cc-a194-d79fb73446fa", + "last_modified": 1664326625863 + }, + { + "schema": 1664326305512, + "derHash": "d81ReEppPZSC5+ppTkBTvP2d9lWA+84UsqdSfAgYA+E=", + "subject": "CN=DigiCert Assured ID TLS CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENBIEcy", + "whitelist": false, + "attachment": { + "hash": "4047153b7f6291ee88b059494c6c59bd5962070832386ef7274d1050ec7cce55", + "size": 1918, + "filename": "7DHaE3Q3dQ9k5S7DaYbXog4BK-Oj492ta3kc2xRJ04s=.pem", + "location": "security-state-staging/intermediates/87c5aea0-3786-4e58-acc2-9575e56b1073.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "7DHaE3Q3dQ9k5S7DaYbXog4BK+Oj492ta3kc2xRJ04s=", + "crlite_enrolled": false, + "id": "ed8651b1-33ff-4f92-bc75-55a696fe8d1b", + "last_modified": 1664326625855 + }, + { + "schema": 1664326302010, + "derHash": "iTfpDhSVyaeO+xgYLUP9xz/NKSq2NHoSuQd96HhTDmI=", + "subject": "CN=GeoTrust EV RSA CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIFJTQSBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "6e6acba4497685370050fe22f00922d96466b366ec048389689c951f2bc20540", + "size": 1646, + "filename": "AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw_OD7I=.pem", + "location": "security-state-staging/intermediates/54d08752-5c1b-49c6-8ecd-1cbdc144c4e3.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw/OD7I=", + "crlite_enrolled": false, + "id": "bcc2ec00-1bbb-49ff-9196-7453336027cc", + "last_modified": 1664326625847 + }, + { + "schema": 1664326304609, + "derHash": "+WkIgIGfBs3MCy8iSyB/KvYAP7VzObhnmhYPqVII1i0=", + "subject": "CN=DigiCert Baltimore CA-2 G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0yIEcy", + "whitelist": false, + "attachment": { + "hash": "8dc9d4aa138337848bff8373424db2e2dd239637f061a54c5dc8c5db87006e6f", + "size": 1581, + "filename": "56higu_MFWb_c2b0avLE5oN2ECS2C43RvzSUgx_2xIE=.pem", + "location": "security-state-staging/intermediates/1374f3d6-e2c4-481c-8658-733e97739f55.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "56higu/MFWb/c2b0avLE5oN2ECS2C43RvzSUgx/2xIE=", + "crlite_enrolled": false, + "id": "bd39e282-d3b0-4d50-ba66-de1d0121ebe8", + "last_modified": 1664326625839 + }, + { + "schema": 1664326298513, + "derHash": "wSP1r6zJ+QloCYUDVeW/eMqTdzSBEbUWepZN3twETek=", + "subject": "CN=TERENA Personal CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", + "subjectDN": "MGwxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEgMB4GA1UEAxMXVEVSRU5BIFBlcnNvbmFsIENBIDMgRzM=", + "whitelist": false, + "attachment": { + "hash": "ceaf99503d454e0bfc760c2d329942b0bb190599c2bd759df53ac0525ba6632e", + "size": 1561, + "filename": "YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=.pem", + "location": "security-state-staging/intermediates/9181fd99-fc3d-43be-ad3e-d1efb285d5ae.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=", + "crlite_enrolled": false, + "id": "2d2d71d8-63a8-4ebf-b9ff-41fc7de6502f", + "last_modified": 1664326625832 + }, + { + "schema": 1664326300276, + "derHash": "CQM/4jmW/kpZxMD1I9JWDjHf5MF9jqFAPUKalx9L1lo=", + "subject": "CN=WoTrus OV SSL Pro CA,O=WoTrus CA Limited,C=CN", + "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIE9WIFNTTCBQcm8gQ0E=", + "whitelist": false, + "attachment": { + "hash": "0496b3149e44ed6def4616b558d891efffb6b0d20710b857fed23934051aec68", + "size": 1861, + "filename": "zACNb3_D6r-GIH58_Q4EDalNSChXFVVFbUJICvq7SIQ=.pem", + "location": "security-state-staging/intermediates/f3b55e61-3d7d-4b0b-ac5f-0577a6dc5b2d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "zACNb3/D6r+GIH58/Q4EDalNSChXFVVFbUJICvq7SIQ=", + "crlite_enrolled": false, + "id": "41d32923-8355-4d67-bfab-517aa0f3a571", + "last_modified": 1664326625824 + }, + { + "schema": 1664326302864, + "derHash": "S8xeI0/oHt5Or4g6oZwxM1sLJuheBmuZReTLYVPrIMI=", + "subject": "CN=Thawte TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgUlNBIENBIEcx", + "whitelist": false, + "attachment": { + "hash": "c91c75d82301c3a18260ed11bc06f3c79a262ff7794711a32d4e0f6fae55fd16", + "size": 1634, + "filename": "42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG-CipUmaM=.pem", + "location": "security-state-staging/intermediates/d89aea89-0644-488a-87ec-6fe32a4c8f6b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG+CipUmaM=", + "crlite_enrolled": false, + "id": "2b1fde2c-d19d-47aa-9dde-8355994571e0", + "last_modified": 1664326625816 + }, + { + "schema": 1664326299399, + "derHash": "A2oY9fDrndXuAreFTfXDOEVgHYk5z7e2B/adFCwB2Qk=", + "subject": "CN=TrustAsia TLS RSA CA G8,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBSU0EgQ0EgRzg=", + "whitelist": false, + "attachment": { + "hash": "baed94d2114fb277ac21313dba187c25e023b4b709456260c83533348987d326", + "size": 1687, + "filename": "rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=.pem", + "location": "security-state-staging/intermediates/05a943d4-dfca-4c89-8f44-c716b11303c8.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=", + "crlite_enrolled": false, + "id": "ca450936-4851-4b5d-a03a-c68130f84102", + "last_modified": 1664326625808 + }, + { + "schema": 1664326297600, + "derHash": "ogZkT1ev0QuUFpSYhYmBwW1jOFjODIi1fPFPoqkqrP0=", + "subject": "CN=Secure Site Pro ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlNlY3VyZSBTaXRlIFBybyBFQ0MgQ0E=", + "whitelist": false, + "attachment": { + "hash": "b8140b2eeec8b54f38c8ab41c570c0475ea16dda43f8e2d9069082f2a48ba178", + "size": 1443, + "filename": "jqgpMe3J72LhpK4BfQvcmwg-Oh-RwdZH-swdUvq8F9k=.pem", + "location": "security-state-staging/intermediates/c8e1aca2-fc45-4263-bae9-d89eaec2fbd3.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "jqgpMe3J72LhpK4BfQvcmwg+Oh+RwdZH+swdUvq8F9k=", + "crlite_enrolled": false, + "id": "d444c5a6-804a-46e3-bbbb-8d03f923219f", + "last_modified": 1664326625800 + }, + { + "schema": 1664326294937, + "derHash": "wG4wf3z8HTL6cqTAM8h7kAGa8hbwd11kl4ouymyKIw4=", + "subject": "CN=GeoTrust TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBSU0EgQ0EgRzE=", + "whitelist": false, + "attachment": { + "hash": "3700beab3bb15a8f5d9dc68032c04ba1abcb58e60c4fc02bcb9dbbbdbf31258a", + "size": 1638, + "filename": "SDG5orEv8iX6MNenIAxa8nQFNpROB_6-llsZdXHZNqs=.pem", + "location": "security-state-staging/intermediates/ced454b6-3f1c-47f2-8881-f95499846b83.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "SDG5orEv8iX6MNenIAxa8nQFNpROB/6+llsZdXHZNqs=", + "crlite_enrolled": false, + "id": "b860e76d-2e99-4f11-8f34-c24d65fa9e26", + "last_modified": 1664326625793 + }, + { + "schema": 1664326301128, + "derHash": "t9/cJ+X/nzXv7J9LxTLDX3J3ibackKBIm0AkcpnZcDg=", + "subject": "CN=NCC Group Secure Server CA G4,O=NCC Group,C=US", + "subjectDN": "MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEc0", + "whitelist": false, + "attachment": { + "hash": "20fff621c66f045f49bcfe13bb5d0083c6a6e1e44def86dbf3b99e2ccfc4c3dc", + "size": 2259, + "filename": "MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN-THyz125ar_w=.pem", + "location": "security-state-staging/intermediates/3b467786-5cab-4a90-ac31-fa620d5a01e0.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN+THyz125ar/w=", + "crlite_enrolled": false, + "id": "06d88a0b-9af9-4681-ab32-9e94f802a262", + "last_modified": 1664326625785 + }, + { + "schema": 1664326295847, + "derHash": "GUAL5bejH7czkXcAeJ0vCiRxwMnVBsDlBMBsFtfLF8A=", + "subject": "CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJkRpZ2lDZXJ0IFNIQTIgSGlnaCBBc3N1cmFuY2UgU2VydmVyIENB", + "whitelist": false, + "attachment": { + "hash": "fc49ef5499c2e3eebd0f3199498da32725362a16eed48e7b69a27d8f05901331", + "size": 1687, + "filename": "k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K-59sNQws=.pem", + "location": "security-state-staging/intermediates/0acde44b-2192-4511-8c5a-b0e50f180ccf.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K+59sNQws=", + "crlite_enrolled": false, + "id": "c85675f4-4bb8-4759-909f-cea3b1729711", + "last_modified": 1664326625777 + }, + { + "schema": 1664326296721, + "derHash": "WOifT3BBDaALQUc8+kE/oHN+0nKfPtd74pp/RwU3cUc=", + "subject": "CN=Thawte ECC CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFQ0MgQ04gQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "03c396058ce8fa96e5b49b97d333b5074a6fc5235a9a4154a8f1c2b82693ef48", + "size": 1317, + "filename": "0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY-X4H-exCnC0=.pem", + "location": "security-state-staging/intermediates/d63c7368-5bb3-4fa5-a650-01451d8a5990.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY+X4H+exCnC0=", + "crlite_enrolled": false, + "id": "8724cf17-17f4-450b-9635-1eacada68535", + "last_modified": 1664326625769 + }, + { + "schema": 1664326291452, + "derHash": "lRQaNVpaKqPgESIcq5/nOBD9tdiBNYZPA+TYUr0Lvts=", + "subject": "CN=Thawte RSA CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBSU0EgQ04gQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "d0092989a33a059425f8fdb48fa5b67a27979e85599b87d5b3b4cdc9633acc51", + "size": 1792, + "filename": "hN3GzHyLopxOn8DxNQIEvpQa-NyS7R_1oQY0xsFsrOA=.pem", + "location": "security-state-staging/intermediates/fe06a439-e718-4f32-9f86-6496f932e53b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "hN3GzHyLopxOn8DxNQIEvpQa+NyS7R/1oQY0xsFsrOA=", + "crlite_enrolled": false, + "id": "3718bfa1-b885-4d18-ba3c-c5d9ba546f46", + "last_modified": 1664326625762 + }, + { + "schema": 1664326294088, + "derHash": "48JCed1qM3+IGxvGkuh49KMa/pWFHyCPlIALDCTYjDg=", + "subject": "CN=GeoTrust RSA CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "77b33c8317779db8fa911e3a9f4b194cb8c14bf035a51538332572ba33b22407", + "size": 1813, + "filename": "LYxGolhhMxT6m_MXQhVdp6zkEP-xK8sxXN4I4pBqtFs=.pem", + "location": "security-state-staging/intermediates/14b69ed3-e7ed-4c49-bac3-fac74b07509f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "LYxGolhhMxT6m/MXQhVdp6zkEP+xK8sxXN4I4pBqtFs=", + "crlite_enrolled": false, + "id": "6ddb3b1b-9a01-4257-b315-b29d2b88702d", + "last_modified": 1664326625754 + }, + { + "schema": 1664326292303, + "derHash": "E5rDa9hTmLu7RYhofCDcNoJ9A6X0Kq34fwK+zEvpv8I=", + "subject": "CN=DigiCert Secure Site EV CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIENOIENBIEcz", + "whitelist": false, + "attachment": { + "hash": "c30a8c2dba14a41fcf3c4466c0a37c568165ef661c1e847e1f42ba3523ae26e3", + "size": 1638, + "filename": "q0mT-mtnAchq7xXJEtVo25yl_8a1e08EqUu2Ww5ybfQ=.pem", + "location": "security-state-staging/intermediates/33ca1d04-2f29-43b2-bcb6-a67279e70854.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "q0mT+mtnAchq7xXJEtVo25yl/8a1e08EqUu2Ww5ybfQ=", + "crlite_enrolled": false, + "id": "7605906c-27c8-4817-9f0b-3ea342481f97", + "last_modified": 1664326625746 + }, + { + "schema": 1664326289637, + "derHash": "Y0/fJsmU52opGNnvxMq5xvyzRO9kKnnIkZK82g7VL0w=", + "subject": "CN=DigiCert Assured ID CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzM=", + "whitelist": false, + "attachment": { + "hash": "abd08758e317706405d73bf65d2507a5410f6ff635faffdeaa04c342401d0797", + "size": 1118, + "filename": "PvaHuwE2jRHMyjTCq1y7W0C__z4Wjsb057DegXU0Ars=.pem", + "location": "security-state-staging/intermediates/d9278d38-64f1-4628-b185-a021cc542517.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "PvaHuwE2jRHMyjTCq1y7W0C//z4Wjsb057DegXU0Ars=", + "crlite_enrolled": false, + "id": "34273cc6-ee7f-4a26-913c-03824bc48005", + "last_modified": 1664326625739 + }, + { + "schema": 1664326288722, + "derHash": "8mmsALQQAD9y3GKK+z2VAnljDHxdDIIUig/STfTaQwE=", + "subject": "CN=DigiCert Trust Service ECC CA,O=DigiCert Inc,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENB", + "whitelist": false, + "attachment": { + "hash": "aa171f11c4fc2ce99557f16f4732690df2f37aefee0e9b5fc01d10bf016d1aee", + "size": 1410, + "filename": "447EOyTQJY3PyAbUMHr-SyrdqoPSJsxpM0Nf26eUpV0=.pem", + "location": "security-state-staging/intermediates/21d55dea-31a3-4e8f-8e16-5c79c28af097.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "447EOyTQJY3PyAbUMHr+SyrdqoPSJsxpM0Nf26eUpV0=", + "crlite_enrolled": false, + "id": "2cc65175-28ff-4d4e-b161-e4914fca272a", + "last_modified": 1664326625731 + }, + { + "schema": 1664326287830, + "derHash": "vzVY+HfonSfapg2pZxZ2Vw376yFdhKxaNxItZ3a3j24=", + "subject": "CN=GeoTrust EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIEVDQyBDQSAyMDE4", + "whitelist": false, + "attachment": { + "hash": "fd09ba904b4aae46221e9b016749ea94a96f949958f1dd2f127e1155a6f0e083", + "size": 1390, + "filename": "KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4_NrxCA=.pem", + "location": "security-state-staging/intermediates/02ea376f-2b25-48af-aa1a-bbc3ae4d927a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4/NrxCA=", + "crlite_enrolled": false, + "id": "62aaa813-2caa-49f3-9a2f-e608096d7f84", + "last_modified": 1664326625723 + }, + { + "schema": 1664326290556, + "derHash": "6VKbQo+2c5C8ZFXXm6JDToFsVP5PNZkwy3Cdslb935Q=", + "subject": "CN=DigiCert High Assurance Trust Service ECC EV CA,O=DigiCert Inc,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxODA2BgNVBAMTL0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRUNDIEVWIENB", + "whitelist": false, + "attachment": { + "hash": "e1d33fc3556c65f83a31b2b6b1d28f6afb5af11d1824d26493f7b5811a803f95", + "size": 1431, + "filename": "MMkARzLCDka9T1FV6sAvs-cZUAaL2QbYfVCCeg3D0W8=.pem", + "location": "security-state-staging/intermediates/6eca4338-f97b-4342-9f65-4e9381d38460.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "MMkARzLCDka9T1FV6sAvs+cZUAaL2QbYfVCCeg3D0W8=", + "crlite_enrolled": false, + "id": "f3ac32ed-8109-4dab-8813-83e4bf7925d9", + "last_modified": 1664326625715 + }, + { + "schema": 1664326286917, + "derHash": "1hnzJXuYdW0ogR087pra2LyuG0Nnu7DHP2teVY+6RWM=", + "subject": "CN=DigiCert Basic EV ECC CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIEVDQyBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "09521230a03b590672f671bfd4e3d8e071b2ff923e8259b3d73a1094105c0708", + "size": 1378, + "filename": "yE_naogfFzNf_bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=.pem", + "location": "security-state-staging/intermediates/2cb2ac6b-d8eb-4647-bc20-a412d247958c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "yE/naogfFzNf/bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=", + "crlite_enrolled": false, + "id": "ebaaa8ba-2509-429c-b8fa-1401e752026c", + "last_modified": 1664326625708 + }, + { + "schema": 1664326285963, + "derHash": "aNCy6Mhb8Am02zmsi14vqOH9n9HlAocE6pKIx+Ryqus=", + "subject": "CN=TrustAsia TLS ECC CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBFQ0MgQ0E=", + "whitelist": false, + "attachment": { + "hash": "3e0e2d990132f8d357622f7b20cd687f510bd7c3674c06f211c12b87317f1eb1", + "size": 1406, + "filename": "x-B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=.pem", + "location": "security-state-staging/intermediates/18e448e1-105d-4af6-aed2-c3b148c16b31.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "x+B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=", + "crlite_enrolled": false, + "id": "5c2915b3-a16a-4f4f-9add-c7fc0882a381", + "last_modified": 1664326625700 + }, + { + "schema": 1664326285104, + "derHash": "Sv/k/vOUZNF4jGYK9ZHV5gGyYcSBHfCj3Z1hyv6OXtg=", + "subject": "CN=TrustAsia EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgRVYgVExTIFBybyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "a1a1ff80a1c8f43fc45d793dbaeaf32d05314f8eda44363ad6ea301f01d86c3f", + "size": 1658, + "filename": "JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem", + "location": "security-state-staging/intermediates/b087580d-0f78-4679-9ce6-07922d3ed4f8.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=", + "crlite_enrolled": false, + "id": "065a1355-6bb1-455f-9bd7-81c86fafb74d", + "last_modified": 1664326625692 + }, + { + "schema": 1664326293214, + "derHash": "umoMEXDhxzI4YHSbXnsO02WXXY/JB0CxXXD4Q6I5SUI=", + "subject": "CN=Secure Site Pro CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElNlY3VyZSBTaXRlIFBybyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "85f6a2b31ea1fb9dc7c6f10b9c4a06a72d0ee931bc7c241045f9c93994b8137f", + "size": 1674, + "filename": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem", + "location": "security-state-staging/intermediates/2ac911c5-7564-4f87-8226-5c4d8e843a63.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=", + "crlite_enrolled": false, + "id": "763f32c5-dafd-4b5f-97fe-b84705fb1c14", + "last_modified": 1664326625684 + }, + { + "schema": 1664326282530, + "derHash": "jYPWn6YVqiaDsT14lEgsVCsLzxi7ktMPAV+0JHGvu2Y=", + "subject": "CN=TrustAsia ECC EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzM=", + "whitelist": false, + "attachment": { + "hash": "4366255797b83166920a1e824ec09a03600ab8b2d5cec5d642855221c5ac5f8e", + "size": 1382, + "filename": "xgkVHlf2XyODr7l-8b1HSx2m_0yRG8ZF5HdfiYwDwaY=.pem", + "location": "security-state-staging/intermediates/74b980e9-95c9-430f-b226-a87543fc64de.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "xgkVHlf2XyODr7l+8b1HSx2m/0yRG8ZF5HdfiYwDwaY=", + "crlite_enrolled": false, + "id": "db1eb71a-d600-4007-9d9b-621f20217241", + "last_modified": 1664326625676 + }, + { + "schema": 1664326284248, + "derHash": "x5C0cShEfsC2DyK/y3ldccMm3ZEO4Sy7TMWoYZHrkbw=", + "subject": "CN=RapidSSL RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIFJTQSBDQSAyMDE4", + "whitelist": false, + "attachment": { + "hash": "6dea21c7a180a2dd42927ed8ef9f67c44fe495ebe3a0b9f915212bdd00222efa", + "size": 1687, + "filename": "nKWcsYrc-y5I8vLf1VGByjbt-Hnasjl-9h8lNKJytoE=.pem", + "location": "security-state-staging/intermediates/45cec3c7-5837-4564-ae9a-ca159c42fdae.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "nKWcsYrc+y5I8vLf1VGByjbt+Hnasjl+9h8lNKJytoE=", + "crlite_enrolled": false, + "id": "3db8db3a-6520-45ae-bc8b-ee66c7826bf1", + "last_modified": 1664326625669 + }, + { + "schema": 1664326280753, + "derHash": "YGDqsYASLrFPIu3kZbSppw4p5w+xguvwHVsTM/LnMkI=", + "subject": "CN=RapidSSL TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US", + "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==", + "whitelist": false, + "attachment": { + "hash": "6c7c03405726bedd36becbc36853410623ef354c89385bae175789653fd987a3", + "size": 1902, + "filename": "inFIEiXuCIo8SWXm9sdY-WQwNjNja_ms8JpF3Lq3T2w=.pem", + "location": "security-state-staging/intermediates/ad1efd30-2588-4cd2-900d-dbb5fae94085.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "inFIEiXuCIo8SWXm9sdY+WQwNjNja/ms8JpF3Lq3T2w=", + "crlite_enrolled": false, + "id": "d7a3379b-f0d3-4050-96f1-7902d58ebdcf", + "last_modified": 1664326625661 + }, + { + "schema": 1664326283408, + "derHash": "k1abJqpTXj4HyJHGvS+p3Ak5wk20s3Jq2FMe2xfEl8o=", + "subject": "CN=Thawte EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBSU0EgQ0EgMjAxOA==", + "whitelist": false, + "attachment": { + "hash": "2afcbb41f3261b8de1c381ea87d94d71e912d4f0f133fc7def226d445a3d1fc9", + "size": 1662, + "filename": "LrLVqGD-UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm_U=.pem", + "location": "security-state-staging/intermediates/533a2e28-1d5c-4259-832a-fc9c84b4a612.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "LrLVqGD+UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm/U=", + "crlite_enrolled": false, + "id": "18c0695e-ca93-4d3f-91c3-60819c6551f3", + "last_modified": 1664326625653 + }, + { + "schema": 1664326279871, + "derHash": "6h87+00ylrRn1LWCVZ1lGNZ21a/H0cJL6AJS95GRBG8=", + "subject": "CN=Thawte EV ECC CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBFQ0MgQ04gQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "33ae53a1dd37eb7264d34c624d9db19e86d364c1ed5789dc5876fb9ddcd38667", + "size": 1349, + "filename": "3GFGMg3yja_Gu8_Fov8gNPJ7b50vsniti0_Jy-xvY9A=.pem", + "location": "security-state-staging/intermediates/82fe6169-f611-4dbf-840c-605b8227052e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "3GFGMg3yja/Gu8/Fov8gNPJ7b50vsniti0/Jy+xvY9A=", + "crlite_enrolled": false, + "id": "f122e3af-5d95-4945-98ea-5f528a3d5347", + "last_modified": 1664326625645 + }, + { + "schema": 1664326279008, + "derHash": "OPc2R/HsruwPxa/misMODCYXHp8jL0UwcpQSQI/VNiY=", + "subject": "CN=DigiCert Baltimore TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US", + "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEJhbHRpbW9yZSBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==", + "whitelist": false, + "attachment": { + "hash": "2895d14312fddb01cbe298e63afe2299e876f4c86692a4fc1ce2b81b4098621b", + "size": 1752, + "filename": "cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9-UzsuNw=.pem", + "location": "security-state-staging/intermediates/b367aa12-6056-49e2-b8bc-e3e1a2120b35.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9+UzsuNw=", + "crlite_enrolled": false, + "id": "390e7060-735e-480e-8acd-98737a0ee80b", + "last_modified": 1664326625638 + }, + { + "schema": 1664326281652, + "derHash": "cDV7nlbT+zxsAJw4xxgUVMRikI37zm1U1g3+HlBuFP0=", + "subject": "CN=TrustAsia ECC OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "21240a41277b34c6a1189b4e59d1447d01a97e239d72efa20016aec9ed60ada1", + "size": 1406, + "filename": "zQ_SLNg_h_U_OTLMb3XQLYnyHZ7Y7Hk6_xyTVTSQekc=.pem", + "location": "security-state-staging/intermediates/b10cbda6-5d12-47d2-b428-377602c98dfd.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "zQ/SLNg/h/U/OTLMb3XQLYnyHZ7Y7Hk6/xyTVTSQekc=", + "crlite_enrolled": false, + "id": "3339ef7d-c87d-4d8d-b482-1257cf9a8f9a", + "last_modified": 1664326625630 + }, + { + "schema": 1664326276160, + "derHash": "pmyXrlnf+eoBXnPHRO5VIHRfEBo5XEl9GeHxaNOa/NA=", + "subject": "CN=DigiCert Secure Site Pro CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBDTiBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "fed0dc0203fd4a2fa009eba4aee1888c162e419b0c63be3155a472ad83b1b140", + "size": 1808, + "filename": "BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB_bo=.pem", + "location": "security-state-staging/intermediates/04307cc4-0014-46c3-ab8e-21b7b74b920c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB/bo=", + "crlite_enrolled": false, + "id": "d44f8523-49e6-4da8-9c0c-21f008f59251", + "last_modified": 1664326625622 + }, + { + "schema": 1664326275289, + "derHash": "29+pGsxNuK2D/MeXjjXWL24y5VEIJzyOyZjjEzWA1mQ=", + "subject": "CN=TrustAsia OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "09abfb488ce57ff55af2a8d48e0210dd09559b54b424afa704d5818fb498257b", + "size": 1821, + "filename": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem", + "location": "security-state-staging/intermediates/fc310196-a128-4383-818f-07e7f4229a9b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=", + "crlite_enrolled": false, + "id": "b9f2b1b6-b5e8-4bb2-94a4-90b62bde54e7", + "last_modified": 1664326625615 + }, + { + "schema": 1664326274418, + "derHash": "D7bOgJCdGa/uaojJWenpqmRmcVvOBcZEn+tTCghtrxQ=", + "subject": "CN=GeoTrust SupremeSSL EV 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL", + "subjectDN": "MGUxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xJDAiBgNVBAMTG0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBDQQ==", + "whitelist": false, + "attachment": { + "hash": "06e8ce6e80d24faa00adc58c2bc94093f41b82ea0000a194035528ceadda9270", + "size": 1691, + "filename": "uG3aQXLPd55q_z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=.pem", + "location": "security-state-staging/intermediates/da439913-8a40-4db9-b9b5-d510a42754d9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "uG3aQXLPd55q/z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=", + "crlite_enrolled": false, + "id": "4701752d-4c67-402a-8bde-1e5b1d71c950", + "last_modified": 1664326625607 + }, + { + "schema": 1664326278130, + "derHash": "eGeq6QXrjVVjX/67v4zwWmO5s5BmXeI2esEHPpKRNyg=", + "subject": "CN=Thawte CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHDAaBgNVBAMTE1RoYXd0ZSBDTiBSU0EgQ0EgRzE=", + "whitelist": false, + "attachment": { + "hash": "1674ecb890e170849faaede2b2c9416bbe036a07a6ee1fd61848524807f952ea", + "size": 1825, + "filename": "VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=.pem", + "location": "security-state-staging/intermediates/2339cef0-106c-4e85-bdf5-1ea426315d30.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=", + "crlite_enrolled": false, + "id": "4317d153-8a03-4ae1-bd0b-5443aab13e7d", + "last_modified": 1664326625600 + }, + { + "schema": 1664326277264, + "derHash": "sFBb8pR/CAerri1CwZND6vCNHd4/h0WwWJpXNieS5HA=", + "subject": "CN=DigiCert Secure Site Korea EV ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIEVDQyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "4bb9308e9c9bddb21616d43a79954c102783b7e356fc087715ae3f321cf74383", + "size": 1427, + "filename": "AdP_iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH-6k=.pem", + "location": "security-state-staging/intermediates/d4cb7ca6-62ba-4418-809b-88501dfd11b9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "AdP/iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH+6k=", + "crlite_enrolled": false, + "id": "45e5c84b-5a43-4463-8f9c-5e760840f90c", + "last_modified": 1664326625592 + }, + { + "schema": 1664326271796, + "derHash": "NU/PxhYqDuIgXb72iTHngDPs6dEl4IJOSbrr+C390Wc=", + "subject": "CN=GeoTrust SupremeSSL 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL", + "subjectDN": "MGIxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xITAfBgNVBAMTGEdlb1RydXN0IFN1cHJlbWVTU0wgMSBDQQ==", + "whitelist": false, + "attachment": { + "hash": "a0e114086535d0b0d6b6a9bf3b81ebfd13b7ecf4a82fee4469b8cde3ad7d1310", + "size": 1707, + "filename": "SM-CBbHgVoJj8KYqNoXbUd-IGEbfvpomZR5lGHQ3qng=.pem", + "location": "security-state-staging/intermediates/6e65d316-4fd9-4970-84b7-ab5cf7e4c2c9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "SM+CBbHgVoJj8KYqNoXbUd+IGEbfvpomZR5lGHQ3qng=", + "crlite_enrolled": false, + "id": "8fbe73ff-0669-4a65-9666-f706486e0e55", + "last_modified": 1664326625584 + }, + { + "schema": 1664326273543, + "derHash": "bmLL4+QqQcUEBbPi8aRCV2gyZ4VhhK+cAhEgcKyDaTY=", + "subject": "CN=Thawte ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBFQ0MgQ0EgMjAxOA==", + "whitelist": false, + "attachment": { + "hash": "aaccd4f02bd25a9869feb7eaf00bf29254d846a3042440bc67f2dded4146ae98", + "size": 1358, + "filename": "3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0-ig=.pem", + "location": "security-state-staging/intermediates/80cb5267-95af-4561-94fa-159dffc7384b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0+ig=", + "crlite_enrolled": false, + "id": "c80dae20-2b2c-4555-9acd-802e86077d0e", + "last_modified": 1664326625576 + }, + { + "schema": 1664326270041, + "derHash": "XSh2HL8wTq/NEns01hT+F5rHdE8VUq8cMSmEJa0FonU=", + "subject": "CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US", + "subjectDN": "MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==", + "whitelist": false, + "attachment": { + "hash": "c2cdb82c5e1bf5ef4193f5ea83b80439de8011541cd0db0c76e1bb7ec0b468fd", + "size": 1683, + "filename": "NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem", + "location": "security-state-staging/intermediates/ed4bff44-19e6-498e-9259-91ec361a7b9e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=", + "crlite_enrolled": false, + "id": "2d046223-ab4e-46b2-986d-e3da4c0832c8", + "last_modified": 1664326625569 + }, + { + "schema": 1664326270928, + "derHash": "l8S0QxYFXyalKh9mTOOFgAqWSoVSyZ0ryv1hjm2AdKA=", + "subject": "CN=DigiCert Basic ECC CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIEVDQyBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "b611e95bd602406b97a2c91d967caf70fcd7b56437d690cba228735942277f67", + "size": 1382, + "filename": "Mg4fdox_AdxNXF8FVxl956AK4z_M3V3fNH5JYxAVfu4=.pem", + "location": "security-state-staging/intermediates/b0f1290c-6a0d-47d7-8d45-59fcbb70158b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Mg4fdox/AdxNXF8FVxl956AK4z/M3V3fNH5JYxAVfu4=", + "crlite_enrolled": false, + "id": "2a71bf1d-54ea-43e1-bfad-fbd30e500409", + "last_modified": 1664326625561 + }, + { + "schema": 1664326268251, + "derHash": "FesKdcZzq/vc0vr8AoI8kf5svDbgB4hELIdU1yvsNxc=", + "subject": "CN=Encryption Everywhere DV TLS CA - G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "dde344d32d4e86413da0b7d37c26998d4ad3df3ca77e7f5f0053cbe4e746e064", + "size": 1678, + "filename": "GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=.pem", + "location": "security-state-staging/intermediates/07343162-9815-45f8-a95e-f2763cbe9c15.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=", + "crlite_enrolled": false, + "id": "aa3e61ad-a255-46e9-91c3-72520b55e7bf", + "last_modified": 1664326625553 + }, + { + "schema": 1664326269139, + "derHash": "2OJppusIy8M3rWV4xyE1eHSEyZ0vsIzO0CnoBr4QQPw=", + "subject": "CN=GeoTrust ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IEVDQyBDQSAyMDE4", + "whitelist": false, + "attachment": { + "hash": "e09d45c878751bf1ff0c329323a2fbfcf4ab034c73ea3028c6a001d090931e44", + "size": 1362, + "filename": "A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=.pem", + "location": "security-state-staging/intermediates/d38b536d-0613-4cda-96c9-e45d2dbfeae0.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=", + "crlite_enrolled": false, + "id": "9ae6e407-8a56-4149-b6a3-a866d64372ee", + "last_modified": 1664326625546 + }, + { + "schema": 1664326272665, + "derHash": "JXaHE9O0Wfk4LSpZT4XzRwn9KokwcxVCpBRv+yRr7Gk=", + "subject": "CN=DigiCert TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US", + "subjectDN": "ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBSU0EgU0hBMjU2IDIwMjAgQ0Ex", + "whitelist": false, + "attachment": { + "hash": "07cafa926a378703117e3b510b5d355851d64bae66fd9dcbc8f66da93cb60dcb", + "size": 1764, + "filename": "RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=.pem", + "location": "security-state-staging/intermediates/a5c4d407-50b5-4f8b-b512-1f94c112895a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=", + "crlite_enrolled": false, + "id": "edc74b28-6086-4e59-a786-7f11f3a68860", + "last_modified": 1664326625538 + }, + { + "schema": 1664326267348, + "derHash": "lYjvdBmeRazvzM/AxHAQ6fKjeh3UTGGk4cazNNpa9hQ=", + "subject": "CN=DigiCert EV RSA CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEVWIFJTQSBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "979717a08303b3bdf3cc094444c2d3f494028c214281cecf379dd35196298b15", + "size": 1873, + "filename": "w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=.pem", + "location": "security-state-staging/intermediates/23e4caa9-34aa-417e-96d6-0cbe09fe2c1b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=", + "crlite_enrolled": false, + "id": "36053ff3-6dc0-49e3-a6a6-d96c46b3982b", + "last_modified": 1664326625530 + }, + { + "schema": 1664326266488, + "derHash": "oUSKAV4TmcWokYEvDojG2EeyIdIfkyamYmukOg62Etk=", + "subject": "CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US", + "subjectDN": "MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB", + "whitelist": false, + "attachment": { + "hash": "b397cd1ec073303b2d5236a77c1446f20ccf4a85eaeca51549c6aa6108d92da2", + "size": 1804, + "filename": "0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem", + "location": "security-state-staging/intermediates/e66dd7a1-3bd1-42ac-98c6-daeefd436477.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=", + "crlite_enrolled": false, + "id": "cc712069-0be1-4f40-9cbd-38ca7c1847a7", + "last_modified": 1664326625522 + }, + { + "schema": 1664326265639, + "derHash": "3U4MF5APP8Klt7dzrkAhitcyFrXOXShev/zogw0PA0o=", + "subject": "CN=TERENA Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", + "subjectDN": "MGkxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEdMBsGA1UEAxMUVEVSRU5BIFBlcnNvbmFsIENBIDM=", + "whitelist": false, + "attachment": { + "hash": "5f70131626f90ff117b3f4e144a4104cefc2a25ad3b7b24ebbe7571cb6e9d37a", + "size": 1792, + "filename": "HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC_kcr3CVOg0=.pem", + "location": "security-state-staging/intermediates/5519208e-d7cc-40b7-9360-9aaec642f07a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC/kcr3CVOg0=", + "crlite_enrolled": false, + "id": "70744846-a620-4a6e-8867-00bb0c2bd5dd", + "last_modified": 1664326625515 + }, + { + "schema": 1664326264787, + "derHash": "ctD3y/RSm4DDSny7Q4vR0OH8JugOWcvU/XMU/N3w6ZQ=", + "subject": "CN=DigiCert High Assurance Trust Service EV CA,O=DigiCert Inc,C=US", + "subjectDN": "MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRVYgQ0E=", + "whitelist": false, + "attachment": { + "hash": "4b30b178e2fe81ae9cb867ac5f6e36b60573c72a0961a9f88fc1db7d61d0aaf0", + "size": 1699, + "filename": "HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=.pem", + "location": "security-state-staging/intermediates/70f38582-98bc-4752-8269-190f59635d8e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=", + "crlite_enrolled": false, + "id": "973ff8a7-ce57-46f6-850e-c9c6e0a5f5aa", + "last_modified": 1664326625506 + }, + { + "schema": 1664326263035, + "derHash": "y1ez/yBAyyaUl2JbyQ+p17TtSTjG9g9C9pr99QisKZM=", + "subject": "CN=DigiCert Basic RSA CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIFJTQSBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "6183d382e68c871db6d7256406cdd74001d595ef4bd736fcd8ffc633574569a7", + "size": 1821, + "filename": "ZckwC4fqIUCeiz1_ihqLY9TDek4tDc704HFPrhqylPo=.pem", + "location": "security-state-staging/intermediates/aabdf20d-d35a-4828-9c8e-d44fe1098547.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ZckwC4fqIUCeiz1/ihqLY9TDek4tDc704HFPrhqylPo=", + "crlite_enrolled": false, + "id": "49f5824f-cdce-4d43-8e45-02e42e7c2f48", + "last_modified": 1664326625498 + }, + { + "schema": 1664326263917, + "derHash": "ZVXWYdN/JJSiPC1fg0eeeAUbbedqFHtQbWvqKIK00GY=", + "subject": "CN=DigiCert Secure Site Korea CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIENB", + "whitelist": false, + "attachment": { + "hash": "03f9bb50867bac0516935740dfc891853da3c7d2b1a601308326b82ef732c23c", + "size": 1646, + "filename": "trjGmNMo7m2JbQME1aNrIcNXkG-fscWHZcrs2zCZOHg=.pem", + "location": "security-state-staging/intermediates/75549463-d317-4276-bf3a-19e056508361.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "trjGmNMo7m2JbQME1aNrIcNXkG+fscWHZcrs2zCZOHg=", + "crlite_enrolled": false, + "id": "27862dc6-0ed2-4f38-8d1a-9d7993fbfd82", + "last_modified": 1664326625490 + }, + { + "schema": 1664326260410, + "derHash": "/AG1j8eLnFkhF4TC4lvx0BKh4j8zchiEemLrQUXuSrY=", + "subject": "CN=GeoTrust EV ECC CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIEVDQyBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "9c7da6adba261fff8165aad9c1207192fab15a42739528904513d61318490095", + "size": 1370, + "filename": "aDb4btQIVH2hsyd4IxUsJGinBpyh-phY6PF4IHasdAw=.pem", + "location": "security-state-staging/intermediates/3b6fca76-7f63-404d-9abf-7ab592b983fd.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "aDb4btQIVH2hsyd4IxUsJGinBpyh+phY6PF4IHasdAw=", + "crlite_enrolled": false, + "id": "3afa2a26-d0c7-40b9-9948-ae8248fe87f4", + "last_modified": 1664326625482 + }, + { + "schema": 1664326259469, + "derHash": "YHXaXOzRXWWExVYDItXAn8IZnlLep5IdkQQKp1JIZy4=", + "subject": "CN=NCC Group Secure Server CA G2,O=NCC Group,C=US", + "subjectDN": "MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcy", + "whitelist": false, + "attachment": { + "hash": "6d28f77859c98bdf554102992dfa0363d577b6bce1ebcf342078dfd78b069f71", + "size": 1593, + "filename": "I00VnH3kFOOpwcnmh-WRlnA_EFwJgSkqGVgxV5O2veg=.pem", + "location": "security-state-staging/intermediates/29e39210-9eef-4ea4-82d4-50cb9917783e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "I00VnH3kFOOpwcnmh+WRlnA/EFwJgSkqGVgxV5O2veg=", + "crlite_enrolled": false, + "id": "0eed32a3-d320-4426-abdc-81c28d7e1a64", + "last_modified": 1664326625475 + }, + { + "schema": 1664326261270, + "derHash": "75KWA2ptfJhsjVnbk2CT546FxwrttP56VN3KqCEDHHI=", + "subject": "CN=DigiCert G5 TLS RSA4096 SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEwMC4GA1UEAxMnRGlnaUNlcnQgRzUgVExTIFJTQTQwOTYgU0hBMzg0IDIwMjEgQ0Ex", + "whitelist": false, + "attachment": { + "hash": "33ab6bfa9d61060281c2ebbcb71780c80a5ac2b429c5cb932f9a540cd319b189", + "size": 2377, + "filename": "5R0B4UlPeqmGgtewU9-0QUYDvO9-UNN4YyL8SiHOYVo=.pem", + "location": "security-state-staging/intermediates/0e43578c-ef31-4c8e-b5b1-2529e35e4d96.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5R0B4UlPeqmGgtewU9+0QUYDvO9+UNN4YyL8SiHOYVo=", + "crlite_enrolled": false, + "id": "bed5a55d-5b9c-40fb-b5e4-1ee14b847e60", + "last_modified": 1664326625467 + }, + { + "schema": 1664326262148, + "derHash": "KMu04NnE7m0ErI8UcXYFrjpL2Mv40IGyevbtsvPXajI=", + "subject": "CN=DigiCert Grid Trust CA G2,OU=www.digicert.com,O=DigiCert Grid,C=US", + "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSIwIAYDVQQDExlEaWdpQ2VydCBHcmlkIFRydXN0IENBIEcy", + "whitelist": false, + "attachment": { + "hash": "544c3726fd3951912634094ca6df5aa1090a31a80fdb5edf0277e9abd81bea8a", + "size": 1796, + "filename": "5TmPqy9bKSAy0zKN0Mz_yBIgKGk_pgZ4TMaSTFRh9xw=.pem", + "location": "security-state-staging/intermediates/227d5c5c-7f90-49be-aefa-d65b6fb1cfc2.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5TmPqy9bKSAy0zKN0Mz/yBIgKGk/pgZ4TMaSTFRh9xw=", + "crlite_enrolled": false, + "id": "e6868543-147b-405d-9626-7cae3e7d6c0c", + "last_modified": 1664326625459 + }, + { + "schema": 1664326258603, + "derHash": "DhC93udRLb156/C09I/u18g8K9PdgXZVZfT/EQt7+kI=", + "subject": "CN=Cybertrust Japan Extended Validation Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", + "subjectDN": "MGsxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjE3MDUGA1UEAxMuQ3liZXJ0cnVzdCBKYXBhbiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==", + "whitelist": false, + "attachment": { + "hash": "18920d33058e8f17a6bdee31b23b81bd7e4ed21bbc1448eb16b82585be4bd4ca", + "size": 1678, + "filename": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8_yf2AOohCgqgk=.pem", + "location": "security-state-staging/intermediates/30c66e60-3606-4569-9301-45e409642137.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8/yf2AOohCgqgk=", + "crlite_enrolled": false, + "id": "de62212d-97c9-4786-a039-945ab84ef95b", + "last_modified": 1664326625452 + }, + { + "schema": 1664326256888, + "derHash": "Go15Cvmys0191q9htapM8TgLhglcusK8qzW9Vm0BgMM=", + "subject": "CN=Secure Site Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIlNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0E=", + "whitelist": false, + "attachment": { + "hash": "840e93b7392e279f33dc1fc00f08d6429a4c62a6a952ed7455934769b1105c47", + "size": 1687, + "filename": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem", + "location": "security-state-staging/intermediates/adeeb09d-1c1b-4333-92ef-bcff5522fff3.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=", + "crlite_enrolled": false, + "id": "7987d8aa-24a9-48a4-bafd-eb28c3ed6e13", + "last_modified": 1664326625444 + }, + { + "schema": 1664326253292, + "derHash": "CFoHFFJN966ZGab1l4hEOeEqUz5hVS0p1qGMNQlvxUg=", + "subject": "CN=DigiCert SHA2 Extended Validation Server CA-3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MHkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTE2MDQGA1UEAxMtRGlnaUNlcnQgU0hBMiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQS0z", + "whitelist": false, + "attachment": { + "hash": "a538f5544f44d3ccf60e286bcc16d6d426e8a756b01f468df88bf18c0d4a122e", + "size": 1719, + "filename": "lwTPN61Qg5-1qAU-Mik9sFaDX5hLo2AHP80YR-IgN6M=.pem", + "location": "security-state-staging/intermediates/0486c6f8-9242-436a-ac4b-f79e0190ac35.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "lwTPN61Qg5+1qAU+Mik9sFaDX5hLo2AHP80YR+IgN6M=", + "crlite_enrolled": false, + "id": "31d059dc-e13a-4958-a089-4f6e29658616", + "last_modified": 1664326625437 + }, + { + "schema": 1664326252351, + "derHash": "qDhAXrsD9d/Y1KlXKubg4/NW7E7BNDdaWdt7GV3D7EQ=", + "subject": "CN=GeoTrust TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBFQ0MgQ0EgRzE=", + "whitelist": false, + "attachment": { + "hash": "c314d639f9d79bd1cc0fb4ad1de6c2d14f5a3552e4fb548497c2dfc4b048c3e8", + "size": 1146, + "filename": "5UDBgr_RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=.pem", + "location": "security-state-staging/intermediates/5194afcf-779a-4b67-8a2c-d2d678abc8e2.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5UDBgr/RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=", + "crlite_enrolled": false, + "id": "39bb1651-f937-42b1-a9c7-dbf371efada0", + "last_modified": 1664326625429 + }, + { + "schema": 1664326257758, + "derHash": "aZGdgg7fWCrbz44JKpKE2QF3LuK0Geqd4fWHLHkfxvo=", + "subject": "CN=Thawte EV RSA CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBSU0EgQ04gQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "805c41e7ce5efb3db0c012649e6317b9b3c5665f8fe363f8c493ccac544b82a2", + "size": 1626, + "filename": "5jGxIiaHNj15fBcUBvvAsMfKNtiK_podXNf0YoRUoeI=.pem", + "location": "security-state-staging/intermediates/011f252e-4d0f-4be1-9170-fface44ce0a9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5jGxIiaHNj15fBcUBvvAsMfKNtiK/podXNf0YoRUoeI=", + "crlite_enrolled": false, + "id": "a6b40e00-91a8-4c6a-bfa0-e54dbf745822", + "last_modified": 1664326625421 + }, + { + "schema": 1664326255105, + "derHash": "wWhWg/PIWQ6IWAGX8hnKuZ5UgqFWhjX1ltCYZ7L0Bb0=", + "subject": "CN=Postecom CS4,OU=Servizi di Certificazione,O=Postecom S.p.A.,C=IT", + "subjectDN": "MGIxCzAJBgNVBAYTAklUMRgwFgYDVQQKEw9Qb3N0ZWNvbSBTLnAuQS4xIjAgBgNVBAsTGVNlcnZpemkgZGkgQ2VydGlmaWNhemlvbmUxFTATBgNVBAMTDFBvc3RlY29tIENTNA==", + "whitelist": false, + "attachment": { + "hash": "025dd377e3279318440b3b87d0d4f17cf16eba256149ccceaeca209fdbf2ee22", + "size": 1630, + "filename": "PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=.pem", + "location": "security-state-staging/intermediates/dbb82e4f-7aec-48a0-ac02-21ed8c89e97c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=", + "crlite_enrolled": false, + "id": "5d43a6fa-2101-4a52-bc0a-d48146c43faa", + "last_modified": 1664326625413 + }, + { + "schema": 1664326251470, + "derHash": "mZNeIEJFNewBbzN7K+aPE0neZszkylqzZ/jzc4IVuDM=", + "subject": "CN=DigiCert Secure Site ECC CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDQS0x", + "whitelist": false, + "attachment": { + "hash": "1a5e1cfd28c5f42d5ec051123399c858ed20cf62dd5550bfff961a4aa3e7307b", + "size": 1374, + "filename": "Z5_2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=.pem", + "location": "security-state-staging/intermediates/4567866f-5a00-4281-8d39-96cd49487394.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Z5/2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=", + "crlite_enrolled": false, + "id": "8d662803-b81e-4f7c-b977-0386af9091ea", + "last_modified": 1664326625406 + }, + { + "schema": 1664326254214, + "derHash": "/ciYbPrE818azVF+D2G4eYgq4HbiuoC3e9Pw/lzviGI=", + "subject": "CN=DigiCert ECC Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKkRpZ2lDZXJ0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==", + "whitelist": false, + "attachment": { + "hash": "0563ca9171ec77c7dc031dc81fa7dd0cae759518c708ffd9626ac265013d5e29", + "size": 1414, + "filename": "WOINGBsGlG95B7s_6U7XB_KM7U73y-sXgtLqZpn3G88=.pem", + "location": "security-state-staging/intermediates/f2a467cf-852a-4877-8297-d067155b948c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "WOINGBsGlG95B7s/6U7XB/KM7U73y+sXgtLqZpn3G88=", + "crlite_enrolled": false, + "id": "31a6dd57-062d-4f9e-8c49-c1e3b9ec2788", + "last_modified": 1664326625398 + }, + { + "schema": 1664326255960, + "derHash": "8crKarI1CnZowT5BlgkIaB2vzH42jcuNR/7PljE5BIE=", + "subject": "CN=TrustAsia ECC OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0E=", + "whitelist": false, + "attachment": { + "hash": "c4c5e5a057734e12651756064c71f1ba18b9e7ca77b90e5d922b8140a2117211", + "size": 1435, + "filename": "Gk60bmqo_Mr2nOHuGjR4JqFa8B4v-ZsjwYEWTGOxLZ8=.pem", + "location": "security-state-staging/intermediates/6c26b65e-0f80-4751-914d-277116a56bcb.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Gk60bmqo/Mr2nOHuGjR4JqFa8B4v+ZsjwYEWTGOxLZ8=", + "crlite_enrolled": false, + "id": "4530dd5a-f084-4e4d-a29f-01b4434e4f6e", + "last_modified": 1664326625390 + }, + { + "schema": 1664326250563, + "derHash": "bo2VL9urrY3j1h4JQ5Nzm1pHNxpSvcsqPC+MQ2IvZA8=", + "subject": "CN=DigiCert Trusted Server CA G4,O=DigiCert Inc,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0ZWQgU2VydmVyIENBIEc0", + "whitelist": false, + "attachment": { + "hash": "15dd9f28242cbc8c7c6e592f07d7aee34c14e229225f95df277eda489fb2144e", + "size": 2263, + "filename": "ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=.pem", + "location": "security-state-staging/intermediates/4b699f50-0bbe-4fae-b162-c628ceafd5f0.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=", + "crlite_enrolled": false, + "id": "8b519983-0c91-4ee5-993d-bc9fee4a60c0", + "last_modified": 1664326625383 + }, + { + "schema": 1664326248804, + "derHash": "GZ7lgAlVXa4s2gYmkxxkOR1qiMzLH58LLugLZn9YHAY=", + "subject": "CN=Cisco Meraki CA,O=Cisco Systems\\, Inc.,C=US", + "subjectDN": "MEUxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRgwFgYDVQQDEw9DaXNjbyBNZXJha2kgQ0E=", + "whitelist": false, + "attachment": { + "hash": "1528a4dab30891539c1d26c31940c77bb23d870302ee395db0e3c6edf0270cba", + "size": 1638, + "filename": "GUIjMNe--V5-Oj0iDybPHPoFZBo3KkQeXR-6l1vJW34=.pem", + "location": "security-state-staging/intermediates/b7c2edca-eecf-41ee-95ae-d460adebdd41.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "GUIjMNe++V5+Oj0iDybPHPoFZBo3KkQeXR+6l1vJW34=", + "crlite_enrolled": false, + "id": "cedb8044-76ac-46bb-9df6-87fde0517cfe", + "last_modified": 1664326625375 + }, + { + "schema": 1664326249700, + "derHash": "my3U++6UH2UQ9xbASWmzZCiJJ2VGFwHvR9QbMolHXVA=", + "subject": "CN=DigiCert Global CA-3 G2,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEgMB4GA1UEAxMXRGlnaUNlcnQgR2xvYmFsIENBLTMgRzI=", + "whitelist": false, + "attachment": { + "hash": "250bc9edff1ff7853bd9af21cb2f9748dcf10461c9384c16bd18ed0a7d7ee7b3", + "size": 1662, + "filename": "Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=.pem", + "location": "security-state-staging/intermediates/fd14ed5b-3c47-4f72-875c-eb17e4792ece.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=", + "crlite_enrolled": false, + "id": "1c706d4e-94e8-476d-9d2d-323ce4b4efcc", + "last_modified": 1664326625367 + }, + { + "schema": 1664326244275, + "derHash": "igI8COShqsySWzTFx5ZajQUnVlrqEwq7kV5QjNM6+0U=", + "subject": "CN=GeoTrust RSA CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "68bccf72a6fa1673b1b5cb1775d8943e1e8377e2b4a7f3c379126f64ec0dd89f", + "size": 1792, + "filename": "Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC-fWQBE=.pem", + "location": "security-state-staging/intermediates/7a8ab771-37f3-457e-ae5c-8ffb63b6f29e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC+fWQBE=", + "crlite_enrolled": false, + "id": "1f28e67d-7ac2-46c1-ae7b-7c3d443054b7", + "last_modified": 1664326625359 + }, + { + "schema": 1664326246090, + "derHash": "zby+8W43I3cC+sxLVdOrkqF8+heDXhM3eqTSug/UegI=", + "subject": "CN=Cisco Meraki CA2,O=Cisco Systems\\, Inc.,C=US", + "subjectDN": "MEYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRkwFwYDVQQDExBDaXNjbyBNZXJha2kgQ0Ey", + "whitelist": false, + "attachment": { + "hash": "03fef49ccd3c137144e9ce38dcbde01b3abd7d1352674e90f7758145de269fa4", + "size": 1752, + "filename": "UNvyYoiHE-TJr4GNRJRQQVYLfL7m_X0ULyrRNeeQaKE=.pem", + "location": "security-state-staging/intermediates/190982c6-808b-490a-bac0-48048e0d26a0.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "UNvyYoiHE+TJr4GNRJRQQVYLfL7m/X0ULyrRNeeQaKE=", + "crlite_enrolled": false, + "id": "43464ec3-b91e-478c-b7cb-45af7465b042", + "last_modified": 1664326625352 + }, + { + "schema": 1664326245204, + "derHash": "mFFAkZNCI5yJCGsi38qkUIWQsRo94KQj4l68Pdr4kQ0=", + "subject": "CN=DigiCert Secure Site Pro ECC CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLjAsBgNVBAMTJURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFQ0MgQ04gQ0EgRzM=", + "whitelist": false, + "attachment": { + "hash": "59fabf6d371074df2fed2750d128dff31353b2691c777e5189ceae43ba1b2cb4", + "size": 1341, + "filename": "ljUnYjVBy0mvbfWJdhWfQmd_OGXEqZ6sBA-BZTbrSVY=.pem", + "location": "security-state-staging/intermediates/cb45983e-15d2-495d-a73a-01e52941fdb5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ljUnYjVBy0mvbfWJdhWfQmd/OGXEqZ6sBA+BZTbrSVY=", + "crlite_enrolled": false, + "id": "e18682ca-0440-47ad-9f9c-3eb3aa842b2a", + "last_modified": 1664326625344 + }, + { + "schema": 1664326247832, + "derHash": "jMNOEcFnBFgkreYcSQemRA7bLEOY6ZwRKoWdZh+OK8c=", + "subject": "CN=GeoTrust RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IFJTQSBDQSAyMDE4", + "whitelist": false, + "attachment": { + "hash": "b52c2405d007fa4609fce284e0ec8518bc3c2133009f36be18b2cc717cc58084", + "size": 1634, + "filename": "zUIraRNo-4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=.pem", + "location": "security-state-staging/intermediates/2e1a3cd7-0c11-46b6-ac97-522525cb0897.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "zUIraRNo+4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=", + "crlite_enrolled": false, + "id": "4ec89fca-6a6d-4154-9023-d7ec1ed235bd", + "last_modified": 1664326625336 + }, + { + "schema": 1664326246953, + "derHash": "2n5XePYvh2Vbj9JKieZR5XMp3JwHZacRWM5WRDykTpU=", + "subject": "CN=DigiCert Extended Validation CA-3 G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MHAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEtMCsGA1UEAxMkRGlnaUNlcnQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQS0zIEcz", + "whitelist": false, + "attachment": { + "hash": "daa2ce59cd5cd31c65c5ad2e7d7f1866f114717d332ca08ea30fd99a87088783", + "size": 1187, + "filename": "epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t_u8=.pem", + "location": "security-state-staging/intermediates/8cd6df9d-888e-4ce3-b6c5-a73d66888bb7.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t/u8=", + "crlite_enrolled": false, + "id": "464b0870-6d2a-4bb0-945c-c5ba1d987e67", + "last_modified": 1664326625329 + }, + { + "schema": 1664326242474, + "derHash": "FUxDPEkZKcXvaG6DjjI2ZKAOag2CLMyVj7TasD5JoI8=", + "subject": "CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US", + "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==", + "whitelist": false, + "attachment": { + "hash": "2243aecd6936cfcb0b2508e8f42b06f31a4950982b0c91e3d4965cdd8da03fb4", + "size": 1646, + "filename": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem", + "location": "security-state-staging/intermediates/17691b06-48fb-4385-a9ab-05f0ad126518.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=", + "crlite_enrolled": false, + "id": "987746d9-41a0-4c53-a6d5-6d8cab9cb559", + "last_modified": 1664326625321 + }, + { + "schema": 1664326241589, + "derHash": "l6BzlXxYEnJXV2cvIiaQZVoUB9cQEe38iy+txRKJEdo=", + "subject": "CN=DigiCert G5 TLS ECC SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEsMCoGA1UEAxMjRGlnaUNlcnQgRzUgVExTIEVDQyBTSEEzODQgMjAyMSBDQTE=", + "whitelist": false, + "attachment": { + "hash": "4a57bc07702213ad8106224c4a6f736bc535fa974729592b97c20e276d0f15a2", + "size": 1244, + "filename": "LsOdqDFw3goo_G8jjeEPxe-JSJ7aFp1RF5Ih4_2ZvFY=.pem", + "location": "security-state-staging/intermediates/b922bf76-82c6-4d56-9df0-a9ce0bbc8904.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "LsOdqDFw3goo/G8jjeEPxe+JSJ7aFp1RF5Ih4/2ZvFY=", + "crlite_enrolled": false, + "id": "62f940db-d5f1-4e34-b456-a57c2de3f9a8", + "last_modified": 1664326625313 + }, + { + "schema": 1664326238997, + "derHash": "KkG6gZ62Elr1y0uLDp6VTs55jCp+5D3Nr305WYfE1VI=", + "subject": "CN=AlwaysOnSSL TLS RSA CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE", + "subjectDN": "MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIFJTQSBDQSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "c12d96ada3ee7291ef29f2b18ab971c813e8a2be138651971e1a518c88863e98", + "size": 1670, + "filename": "DOdL2thyQw2ljWo5qhqUbm1_3EZBtYXxLKw14G9PO30=.pem", + "location": "security-state-staging/intermediates/40e88993-405f-440f-86bf-003848717116.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "DOdL2thyQw2ljWo5qhqUbm1/3EZBtYXxLKw14G9PO30=", + "crlite_enrolled": false, + "id": "a2f9858d-6717-421d-ada6-d08073c87767", + "last_modified": 1664326625306 + }, + { + "schema": 1664326243370, + "derHash": "Y1r2iJ9JBg/g57q8DyMxT7EY87GCQ90X9H2GR6aWhLE=", + "subject": "CN=Thawte Partner CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVRoYXd0ZSBQYXJ0bmVyIENB", + "whitelist": false, + "attachment": { + "hash": "517f47202cc97d6d6f41abf2c0fb2acc7fbb25207419b62568dbcda5a17b8dd3", + "size": 1630, + "filename": "W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=.pem", + "location": "security-state-staging/intermediates/faf3f16b-6ec5-4b45-919d-46fd8871e952.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=", + "crlite_enrolled": false, + "id": "fdd54c2e-e355-4800-9d81-527ddf3dbe00", + "last_modified": 1664326625298 + }, + { + "schema": 1664326239850, + "derHash": "wN0GD/jOVW81aD1WTg5mspBxeICGk/g/OqZCMmv20Mg=", + "subject": "CN=TrustAsia ECC EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "15ecb4d2bfb652859fe461ec4d56ef2af5aabdec1b7048209da418993219d311", + "size": 1398, + "filename": "6lJqHj6Al12YiHTPXbfLj9_MNtnpjUBiUvHLHqoVkTA=.pem", + "location": "security-state-staging/intermediates/007b303a-64fa-40b6-bbc5-b1e1c4daf0f0.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "6lJqHj6Al12YiHTPXbfLj9/MNtnpjUBiUvHLHqoVkTA=", + "crlite_enrolled": false, + "id": "bc77ca51-b829-47ac-83b4-8d36fa8fdb7d", + "last_modified": 1664326625291 + }, + { + "schema": 1664326238164, + "derHash": "GR4LSLeLfvpIIqRlrWmzRAW4eNEL2FPY5Xy4udnlC4s=", + "subject": "CN=Trust Technologies Global CA,OU=Digital Identity and Security,O=Telecom Italia Trust Technologies S.r.l.,C=IT", + "subjectDN": "MIGPMQswCQYDVQQGEwJJVDExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuci5sLjEmMCQGA1UECxMdRGlnaXRhbCBJZGVudGl0eSBhbmQgU2VjdXJpdHkxJTAjBgNVBAMTHFRydXN0IFRlY2hub2xvZ2llcyBHbG9iYWwgQ0E=", + "whitelist": false, + "attachment": { + "hash": "94a4e9c26aa1b7c676a213b4813818710a403a4e8c106d27113bba7c5ed0b0a7", + "size": 1683, + "filename": "kCvviSGuWkulE1Rv-GhY_fjUuT622_2qjrGk96XfS6A=.pem", + "location": "security-state-staging/intermediates/f7048242-ec1b-463f-9ca3-9c6e493c4a6d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "kCvviSGuWkulE1Rv+GhY/fjUuT622/2qjrGk96XfS6A=", + "crlite_enrolled": false, + "id": "a7cfef6c-2fd8-463f-919d-6c648941fe56", + "last_modified": 1664326625283 + }, + { + "schema": 1664326237322, + "derHash": "EDLGAB7WZKDNNDsTi8toYOIREBHD1fBlQPW+QRR4EqU=", + "subject": "CN=Legacy Technologies Intermediate,O=Legacy Technologies GmbH,C=DE", + "subjectDN": "MFsxCzAJBgNVBAYTAkRFMSEwHwYDVQQKExhMZWdhY3kgVGVjaG5vbG9naWVzIEdtYkgxKTAnBgNVBAMTIExlZ2FjeSBUZWNobm9sb2dpZXMgSW50ZXJtZWRpYXRl", + "whitelist": false, + "attachment": { + "hash": "9f15931b004051236bc8ed4b1fa4f90b6457dcf766a3079669bce0ff128bfb11", + "size": 1906, + "filename": "1IN_wrqE9VVL4qRI4B5j8xzAQgZ1Wap_tLlGGVYhcEc=.pem", + "location": "security-state-staging/intermediates/7a4e3658-6b03-4543-9e0b-5aba562bebeb.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "1IN/wrqE9VVL4qRI4B5j8xzAQgZ1Wap/tLlGGVYhcEc=", + "crlite_enrolled": false, + "id": "366c5429-2c2a-48e2-86a4-c28c1a3a5f54", + "last_modified": 1664326625276 + }, + { + "schema": 1664326234758, + "derHash": "X4hpRhXkxhaG4Qa4TDM4xnIMU19g029hKC7RXhl33UQ=", + "subject": "CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US", + "subjectDN": "MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=", + "whitelist": false, + "attachment": { + "hash": "ddd476a218cddfdfa053e1aac1cd92bd85a4418fa86d82cbf1ecd3d7a85fe32b", + "size": 1760, + "filename": "UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem", + "location": "security-state-staging/intermediates/7bfa15b8-4267-4b8c-b430-23dddbb6404a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=", + "crlite_enrolled": false, + "id": "ed2612e9-fdfc-412e-90c3-05ddee993b94", + "last_modified": 1664326625268 + }, + { + "schema": 1664326236475, + "derHash": "RAs3QW8t6FLKOGFQ1hHsCvMd1Y2KJ/iCgVp+o+5oSO4=", + "subject": "CN=Bloomberg TLS CA,O=Bloomberg LP,C=US", + "subjectDN": "MD8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxCbG9vbWJlcmcgTFAxGTAXBgNVBAMTEEJsb29tYmVyZyBUTFMgQ0E=", + "whitelist": false, + "attachment": { + "hash": "4a92e0f439e5ac3728da149e9dfcdac4443b6ce9ce1c908e2d20a150ad801b73", + "size": 1743, + "filename": "wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A-v0=.pem", + "location": "security-state-staging/intermediates/607ed211-fb20-4f94-983e-4f28c788decb.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A+v0=", + "crlite_enrolled": false, + "id": "40e80e12-a4fe-4188-8ab3-6b02b2355943", + "last_modified": 1664326625260 + }, + { + "schema": 1664326233020, + "derHash": "AMDLqVy/4eJwgUJ18ytQXW5ZFsK22mf69N0wnubobL4=", + "subject": "CN=DigiCert Secure Site ECC CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDTiBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "8607c668ffd111313d1bac37cc89373d3f0f37b454c9b4247d80bb41c7462d2a", + "size": 1337, + "filename": "mpDMzjSYAgr-a1VhfWcSLkk3xG29zzCRDJISnBodNVg=.pem", + "location": "security-state-staging/intermediates/d3d5ec25-e1b1-46da-ad86-9d0efdea52e8.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "mpDMzjSYAgr+a1VhfWcSLkk3xG29zzCRDJISnBodNVg=", + "crlite_enrolled": false, + "id": "0cabb874-cc9f-4f3c-bbdb-b0096ee3ebc1", + "last_modified": 1664326625253 + }, + { + "schema": 1664326232134, + "derHash": "01M7cypRim2mjvJmCF4R39EUwOsAks1DUwpE1UuRPtE=", + "subject": "CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB", + "whitelist": false, + "attachment": { + "hash": "8503ea96cc4afe592dd276b2331616cdcab35f585437369264cdb10317b7c1f5", + "size": 1662, + "filename": "3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem", + "location": "security-state-staging/intermediates/ed54c2d1-c94c-4f85-a594-1a321f6c6d09.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=", + "crlite_enrolled": false, + "id": "10ea447c-1348-4510-bf93-df74417f637c", + "last_modified": 1664326625245 + }, + { + "schema": 1664326240711, + "derHash": "cNyG+fd1C3Sx3sjNNS7CWDfDbmQPcUjghGTvWQHlpYk=", + "subject": "CN=Secure Site Pro Extended Validation ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "577ac346ffebe99d6da32d317208c24b599e73364354c65a1e968d1a0e249679", + "size": 1435, + "filename": "XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=.pem", + "location": "security-state-staging/intermediates/92de2a7d-3a4e-4193-9a4b-62f0f3fbb871.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=", + "crlite_enrolled": false, + "id": "50e57f50-8348-4ada-9ad8-b73758d5b387", + "last_modified": 1664326625237 + }, + { + "schema": 1664326235621, + "derHash": "OIPm3kkXpGtZTswtKsapXUPn6qjgiakfm8EE/xbfjeY=", + "subject": "CN=Secure Site Pro Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB", + "whitelist": false, + "attachment": { + "hash": "d86c7a477e4365081d111dc0b7a87945d10a54dca6dbfa31bc016b6b7714eb55", + "size": 1695, + "filename": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem", + "location": "security-state-staging/intermediates/d15ee40f-7057-421f-a864-6e16847d31fe.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=", + "crlite_enrolled": false, + "id": "17532cc5-7a32-494c-957b-330438017c68", + "last_modified": 1664326625229 + }, + { + "schema": 1664326228551, + "derHash": "qK0cJcxYCyEx/Mb8bWUTdG846pm9FiyBtcU5NJUXWxg=", + "subject": "CN=STRATO TLS RSA CA,OU=Domain Validated SSL,O=STRATO AG,C=DE", + "subjectDN": "MFwxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRowGAYDVQQDExFTVFJBVE8gVExTIFJTQSBDQQ==", + "whitelist": false, + "attachment": { + "hash": "b99df27262454afaed628c736471aba39f9cf60fbc452c5077c426d184145b16", + "size": 1654, + "filename": "_MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=.pem", + "location": "security-state-staging/intermediates/2650b60d-7122-4e1a-ae65-fec4e96bb1be.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "/MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=", + "crlite_enrolled": false, + "id": "d3436f68-7673-4573-887e-10435f7c9b60", + "last_modified": 1664326625222 + }, + { + "schema": 1664326230332, + "derHash": "Ut3on91vYQRz+TFMeosaxEL4qoM6pddzAG/adYyf8ew=", + "subject": "CN=GeoTrust ECC CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "e1d421efc7701807b272be245a0e91e28951861f5275b8127b114b8bca7daab7", + "size": 1321, + "filename": "htzU8zBrdwmMNFLvW_ZzkFTZcn95rIZbtuXmmiR6prc=.pem", + "location": "security-state-staging/intermediates/e74cc07a-c43b-42f8-9563-ce8caf0521d5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "htzU8zBrdwmMNFLvW/ZzkFTZcn95rIZbtuXmmiR6prc=", + "crlite_enrolled": false, + "id": "cf269307-4b53-4d48-a114-bb6d80cba476", + "last_modified": 1664326625214 + }, + { + "schema": 1664326233896, + "derHash": "ayMo5//1mLKt+Qt/PqQrRfpgbXjisRe31g6Z6CjPdWU=", + "subject": "CN=SecurityMetrics DigiCert EV CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US", + "subjectDN": "MHIxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMScwJQYDVQQDEx5TZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgRVYgQ0E=", + "whitelist": false, + "attachment": { + "hash": "8f2fed33a01ee802659c8cce0dca62c7338adc4912c859ac33291ca9ccb450a0", + "size": 2316, + "filename": "f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=.pem", + "location": "security-state-staging/intermediates/338ca3d9-aaf8-4f72-84fc-aa3473ff7e0a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=", + "crlite_enrolled": false, + "id": "8f3622a7-27bd-4844-a283-703d57161bea", + "last_modified": 1664326625206 + }, + { + "schema": 1664326231194, + "derHash": "IQbMeQfGS4pdovwzjulN//EO9xHe27T8aU7gkuxTKx0=", + "subject": "CN=TrustCubes ICA G1,OU=www.trustcubes.com,O=TRUSTCUBES LIMITED,C=GB", + "subjectDN": "MIGhMQswCQYDVQQGEwJHQjEbMBkGA1UEChMSVFJVU1RDVUJFUyBMSU1JVEVEMRcwFQYIKwYBBAGEBwETCTIyMzAxMzcwMTEjMCEGCSsGAQQBg5gqARMUOTg0NTAwNTA1RkU4MENEME5FNTgxGzAZBgNVBAsTEnd3dy50cnVzdGN1YmVzLmNvbTEaMBgGA1UEAxMRVHJ1c3RDdWJlcyBJQ0EgRzE=", + "whitelist": false, + "attachment": { + "hash": "4fd4f517ffa8aac9af19b9e801ab62735acff50caf86a036094e511433c5de0b", + "size": 1756, + "filename": "WQNVf79ywhoSIaihn1jQE-5z8UKENBfhCeJcnklN0YQ=.pem", + "location": "security-state-staging/intermediates/006f58e9-d885-42b4-b686-a26a127b9507.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "WQNVf79ywhoSIaihn1jQE+5z8UKENBfhCeJcnklN0YQ=", + "crlite_enrolled": false, + "id": "a7b8fc53-0818-4870-aeb4-0fc4462bbd98", + "last_modified": 1664326625199 + }, + { + "schema": 1664326227619, + "derHash": "Ukz3MxxO41PusezXTh+AGg8fCN+gMiCS9CIFr8OhdnU=", + "subject": "CN=DigiCert SHA-2 RADIUS CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFNIQS0yIFJBRElVUyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "aa9ab8aca60dc4901811836ab08219bf41a254f4a99c5a8df19a6e2e7a205861", + "size": 1674, + "filename": "yZwj8Xi_M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845-xQ=.pem", + "location": "security-state-staging/intermediates/22ac570b-4cc3-4c17-9e18-d971ddf56a48.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "yZwj8Xi/M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845+xQ=", + "crlite_enrolled": false, + "id": "5b92eb31-eb03-4a75-85b7-54719a5a0329", + "last_modified": 1664326625191 + }, + { + "schema": 1664326229450, + "derHash": "oNFSOgv2Y1UOuQgem93toSgU+VcLdpfZXfLqU9T/deM=", + "subject": "CN=RapidSSL ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIEVDQyBDQSAyMDE4", + "whitelist": false, + "attachment": { + "hash": "9a697f2608b2ac5c4f46062de1776c38440087ed4083ca828a3f55fafc471bcc", + "size": 1410, + "filename": "zJax49jXNWVm12ouj-dVmlW_r0Zw4NbjfsoCxV3-blM=.pem", + "location": "security-state-staging/intermediates/e9579747-90e1-476e-8584-f49cf81d5a9a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "zJax49jXNWVm12ouj+dVmlW/r0Zw4NbjfsoCxV3+blM=", + "crlite_enrolled": false, + "id": "f489bd87-1084-4d96-89f4-68c1dc43202c", + "last_modified": 1664326625184 + }, + { + "schema": 1664326225868, + "derHash": "3cu08wUdbmATEOsORrW7mcXouZ96U542eph96gMOMY4=", + "subject": "CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US", + "subjectDN": "MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==", + "whitelist": false, + "attachment": { + "hash": "fef5a3bae1ed2ec43c7ac48315dd5848dcddc98565757b54e37a4e6a8cfd8a99", + "size": 1800, + "filename": "NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem", + "location": "security-state-staging/intermediates/36301512-ecda-409a-9af9-1adcd3291550.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=", + "crlite_enrolled": false, + "id": "92ded146-e18a-48f3-b504-3ec6efe36e7d", + "last_modified": 1664326625176 + }, + { + "schema": 1664326224074, + "derHash": "A86bxxuR/bfLPFI1yuBwHLSGu9Yo1KreWEH8XwqjekY=", + "subject": "CN=DigiCert CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFURpZ2lDZXJ0IENOIFJTQSBDQSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "c27c05d060655cb099a911109bba4a1d37d8af8f018dc4d2dfad6e5274c164ac", + "size": 1829, + "filename": "MIKoeatlSqVA3aCIrE0_JYoP9vF4XSCTPHy-c9vAsKk=.pem", + "location": "security-state-staging/intermediates/891ec495-a9ed-4e9c-a88e-e0bd528c5bcf.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "MIKoeatlSqVA3aCIrE0/JYoP9vF4XSCTPHy+c9vAsKk=", + "crlite_enrolled": false, + "id": "c71148c4-7b1e-41d9-ab5f-466795767fc5", + "last_modified": 1664326625168 + }, + { + "schema": 1664326220594, + "derHash": "ydaRPz/t3v8YTJ7h1+F8WuyQiG7tXMPW6YEFgxyMDgs=", + "subject": "CN=TERENA SSL CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", + "subjectDN": "MGcxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEbMBkGA1UEAxMSVEVSRU5BIFNTTCBDQSAzIEcz", + "whitelist": false, + "attachment": { + "hash": "c34e8e1124aac0817764c399d00072c6d60abb9d90bfcb222a2db90df6f1633f", + "size": 1557, + "filename": "CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=.pem", + "location": "security-state-staging/intermediates/18fe6fa8-0078-4269-8b40-c399a6523419.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=", + "crlite_enrolled": false, + "id": "6f73b567-3c48-499d-a69e-5da61f1aafb8", + "last_modified": 1664326625160 + }, + { + "schema": 1664326224974, + "derHash": "sTGQXMciEnBhO1KayeeGqiMKv+FUoKy+RSvDUL0e/ks=", + "subject": "CN=DigiCert CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IENOIFJTQSBFViBDQSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "05e62f726d0dc50be765d984c585e938b40a504b1fcb88a02e90cca88e163ddb", + "size": 1683, + "filename": "mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=.pem", + "location": "security-state-staging/intermediates/bb88f2ec-ea56-4089-90a4-8d9259f9c264.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=", + "crlite_enrolled": false, + "id": "e988072a-6c66-46f0-b901-7fca54ca2ef5", + "last_modified": 1664326625153 + }, + { + "schema": 1664326223211, + "derHash": "tBpIZPDU7E6mMtAbPn8jJ3XlXiKzv9hkLuEpIoDQ5Ho=", + "subject": "CN=DigiCert Basic EV RSA CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIFJTQSBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "2488500f03c3d8515238899ef2a1f17805b624993fc13c196c39ff9e4ccc8704", + "size": 1654, + "filename": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=.pem", + "location": "security-state-staging/intermediates/0b915143-abba-4380-9fa4-03f105da62d9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=", + "crlite_enrolled": false, + "id": "b82a5536-966e-4914-86dd-98d87f07e263", + "last_modified": 1664326625145 + }, + { + "schema": 1664326222344, + "derHash": "8y3q8iznJGYfU9UocxGv8lQes47K9J3Yd7lAI+OhGx8=", + "subject": "CN=SecurityMetrics DigiCert CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US", + "subjectDN": "MG8xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMSQwIgYDVQQDExtTZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgQ0E=", + "whitelist": false, + "attachment": { + "hash": "d50c056638b09407fa0dee4209af760ade36d666f654cb728d8b942d6ab26464", + "size": 2312, + "filename": "m-VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=.pem", + "location": "security-state-staging/intermediates/6b75747f-e456-4dfc-8d25-d833991ae3c1.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "m+VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=", + "crlite_enrolled": false, + "id": "47556c51-b534-409d-9dc1-af68548bdc2d", + "last_modified": 1664326625137 + }, + { + "schema": 1664326219728, + "derHash": "sm6zEPj68O9bDQtxqmXsBQ+jreKRNPtDirZEAoj6bmc=", + "subject": "CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB", + "whitelist": false, + "attachment": { + "hash": "4cf5a68da77fb6a3d9ca37398febfa6527ad886b3e86117420589375b33083c5", + "size": 1666, + "filename": "3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem", + "location": "security-state-staging/intermediates/9f2f87aa-eb42-495d-a1f4-5b5d6bc4394f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=", + "crlite_enrolled": false, + "id": "e2f0b91f-d44f-42d2-ae2a-3b63eb6d7e9e", + "last_modified": 1664326625129 + }, + { + "schema": 1664326226749, + "derHash": "ml7s7px9iYvYHcO/Bm2vau+42xxZZ2IG0r/daCMSxvY=", + "subject": "CN=Thawte RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBSU0EgQ0EgMjAxOA==", + "whitelist": false, + "attachment": { + "hash": "8a7b2ec3e21a1e59ebe4e10096741f36dc996f8c2901999550f7e629555361dc", + "size": 1634, + "filename": "S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=.pem", + "location": "security-state-staging/intermediates/a295584b-223a-4e07-a0cb-3953ab3f2e46.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=", + "crlite_enrolled": false, + "id": "4d1beba6-fa58-40c2-8d1d-086d634fa5bd", + "last_modified": 1664326625121 + }, + { + "schema": 1664326218854, + "derHash": "ChY2AGMb1mJn+3rq0lxTiyt9cq1kFqK70oX2VLtkL20=", + "subject": "CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US", + "subjectDN": "MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB", + "whitelist": false, + "attachment": { + "hash": "99945b8fb1ff89697427d104cf744cf70ff8fc7f21b7ea991a9d7a97932b449b", + "size": 1687, + "filename": "0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem", + "location": "security-state-staging/intermediates/1d1ab64c-f64a-4919-aace-65e8529d7d55.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=", + "crlite_enrolled": false, + "id": "5958f121-2009-4512-9ba6-82063db5ad3a", + "last_modified": 1664326625113 + }, + { + "schema": 1664326217988, + "derHash": "iR7i4jKC5QdsmukEfejqkA4Gb4HW3Nm4Q8WQeLDxBbw=", + "subject": "CN=WoSign EV SSL Pro CA,O=WoSign CA Limited,C=CN", + "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIEVWIFNTTCBQcm8gQ0E=", + "whitelist": false, + "attachment": { + "hash": "2d79fd64b625d2f52cb5592212200817f868f152816de091bc2240f2994a6fdb", + "size": 1634, + "filename": "pH1dud9XORPnyq8wyLWWIS773gVEO_1UuyQKQdv4xKg=.pem", + "location": "security-state-staging/intermediates/102cb544-d2a1-4bd3-8ce4-a805eeee5aa3.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "pH1dud9XORPnyq8wyLWWIS773gVEO/1UuyQKQdv4xKg=", + "crlite_enrolled": false, + "id": "08aff822-4688-4856-98f3-f38310a21244", + "last_modified": 1664326625105 + }, + { + "schema": 1664326217100, + "derHash": "5vpISoWJQNEBl4VVRUqkZlMatsSrxK0rAAYmqqwNBPk=", + "subject": "CN=RapidSSL TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US", + "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==", + "whitelist": false, + "attachment": { + "hash": "ce06902050a1d292108abc7a82d7849f8885c4a89cab6e60d848b7e5481585e5", + "size": 1902, + "filename": "48hXNwn3laJAzsrIBprOcewUb097BGNL7e-MVM7Rcis=.pem", + "location": "security-state-staging/intermediates/45a314a9-8e95-47be-ac09-68cc6935adcc.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "48hXNwn3laJAzsrIBprOcewUb097BGNL7e+MVM7Rcis=", + "crlite_enrolled": false, + "id": "2c30341e-de02-4e9b-aba4-46f5e84fa680", + "last_modified": 1664326625097 + }, + { + "schema": 1664326215354, + "derHash": "9/veuCvpnUHNykGfyRhZ0+UobAdiBODpA9Z4uyE+2Js=", + "subject": "CN=Hostpoint TLS RSA CA,OU=Domain Validated SSL,O=Hostpoint AG,C=CH", + "subjectDN": "MGIxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRIb3N0cG9pbnQgVExTIFJTQSBDQQ==", + "whitelist": false, + "attachment": { + "hash": "13a44adeec67b57fe7198a7a70254d249d13d8968de9bd06caa41653638867fd", + "size": 1662, + "filename": "Q5l5uNBWZnOf3EnCFMK3ciNhPZboa_YPtUtL6yZ_DvU=.pem", + "location": "security-state-staging/intermediates/badd3199-2552-4fa5-9559-73d968f90197.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Q5l5uNBWZnOf3EnCFMK3ciNhPZboa/YPtUtL6yZ/DvU=", + "crlite_enrolled": false, + "id": "a82975c0-4bf0-4cfa-836b-909f5cd3e3ca", + "last_modified": 1664326625089 + }, + { + "schema": 1664326216237, + "derHash": "L7qP6RVBUEmqlChXy1MTf/09nlpHsntXgtq5tNp9Yk0=", + "subject": "CN=GeoTrust SupremeSSL EV 1 ECC CA,OU=www.supremessl.com,O=SupremeSSL,C=NL", + "subjectDN": "MGkxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xKDAmBgNVBAMTH0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBFQ0MgQ0E=", + "whitelist": false, + "attachment": { + "hash": "becde922e69097b5a8130c98daf7d342285a21c614dc8f8f4ecccff35b337305", + "size": 1423, + "filename": "A97Lx6chFTH9FkG_Io5Uc5oemCnN0d8O2NjR9d-Pr0w=.pem", + "location": "security-state-staging/intermediates/944e3b52-2ab2-49df-8597-3493ca03777f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "A97Lx6chFTH9FkG/Io5Uc5oemCnN0d8O2NjR9d+Pr0w=", + "crlite_enrolled": false, + "id": "036957de-97b5-494b-baac-8f7f7dbf8861", + "last_modified": 1664326625081 + }, + { + "schema": 1664326214458, + "derHash": "rshjiY8oTWzUxqP2w+ZSNICjWcM9r2b60zgYSbi7AYs=", + "subject": "CN=Cloudflare Inc RSA CA-2,O=Cloudflare\\, Inc.,C=US", + "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBSU0EgQ0EtMg==", + "whitelist": false, + "attachment": { + "hash": "e6beb4b3ac790c49b23fd4e9e9e03e0d29f7200df762a6b737068f6a873e8f9a", + "size": 1654, + "filename": "hS5jJ4P-iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=.pem", + "location": "security-state-staging/intermediates/e920545c-7b6c-4c76-9a6a-e2490d391424.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "hS5jJ4P+iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=", + "crlite_enrolled": false, + "id": "239072e9-3a93-488b-90f7-98aa49c2584b", + "last_modified": 1664326625068 + }, + { + "schema": 1664326221480, + "derHash": "HYDNGKeU8fSFDtwzxgSPAuhThqR/POg2l0qORSpg1/I=", + "subject": "CN=GeoTrust TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US", + "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==", + "whitelist": false, + "attachment": { + "hash": "f2cc23e906598af97fd1e3fe37eccecd8b7a9db965c4ffdf690a86682a25b4b1", + "size": 1902, + "filename": "WcAfM-6Mq47-SAT2M-PbyDhIlS5ynmlHH9IlN6Jm0AQ=.pem", + "location": "security-state-staging/intermediates/882a3187-eef5-4d92-93e6-550125329a3a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "WcAfM+6Mq47+SAT2M+PbyDhIlS5ynmlHH9IlN6Jm0AQ=", + "crlite_enrolled": false, + "id": "1c5c79c4-db0d-46bc-a71f-b8aea1c502e3", + "last_modified": 1664326625059 + }, + { + "schema": 1664326212717, + "derHash": "t1rumDb++8RG8oiilwuE/GCq+e+9LLn4L3WBeQ3kuNw=", + "subject": "CN=DigiCert Secure Site Pro EV CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBDTiBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "26af9fa1e7c77c446cb3a04828a0ea066545df24ccd3eb7388b4c284151f916f", + "size": 1642, + "filename": "2OVT1JHnI_dBAIq49zWtXoFiiSQRI-yC8zdls8oKK38=.pem", + "location": "security-state-staging/intermediates/4edbb396-edd5-4bfd-81b5-b537de90240a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "2OVT1JHnI/dBAIq49zWtXoFiiSQRI+yC8zdls8oKK38=", + "crlite_enrolled": false, + "id": "cc215f58-abea-4b31-947a-f62a88abb6ed", + "last_modified": 1664326625051 + }, + { + "schema": 1664326210742, + "derHash": "dOq1c9p9sZUJe+DpDzNJNMekyJ6Ag3WdtDM6AO3SQ9k=", + "subject": "CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex", + "whitelist": false, + "attachment": { + "hash": "999c9bf267d1157f83cee072ff3e458370831d98c64688771c80dc9c55c61174", + "size": 1483, + "filename": "vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem", + "location": "security-state-staging/intermediates/8e947df6-4c32-4098-ade0-96dc5f789020.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=", + "crlite_enrolled": false, + "id": "5fe4444f-8130-4fe0-8be1-2e1465d50ab4", + "last_modified": 1664326625043 + }, + { + "schema": 1664326209820, + "derHash": "RCLpY+5TzVjMn4XNQL9f/sAJX98aFUU1ZhwcBrytxps=", + "subject": "CN=RapidSSL TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBSU0EgQ0EgRzE=", + "whitelist": false, + "attachment": { + "hash": "97c7e7dd9d4df6ec631b1e879fc5d5d001c2ee54c275b370c5bfe8b2075f995e", + "size": 1691, + "filename": "E3tYcwo9CiqATmKtpMLW5V-pzIq-ZoDmpXSiJlXGmTo=.pem", + "location": "security-state-staging/intermediates/633fabe3-e7ff-425b-9146-a18134188c21.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "E3tYcwo9CiqATmKtpMLW5V+pzIq+ZoDmpXSiJlXGmTo=", + "crlite_enrolled": false, + "id": "7e9c3ad7-edb5-4500-b004-a7bbc004a745", + "last_modified": 1664326625036 + }, + { + "schema": 1664326213595, + "derHash": "Q49HPr/IiE710+DVLSZM2+Vso4LZ6/xonXdIlAn1Wm4=", + "subject": "CN=Google CA1,O=Google\\, Inc.,L=Mountain View,ST=CA,C=US", + "subjectDN": "MF4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEVMBMGA1UEChMMR29vZ2xlLCBJbmMuMRMwEQYDVQQDEwpHb29nbGUgQ0Ex", + "whitelist": false, + "attachment": { + "hash": "92179477e55d28f30f18aaf3fdc5144697ec2c7aebbe195309940fc4167c9d99", + "size": 1695, + "filename": "JqNL7R3G-I-oNR0Uoa1_QE7RwLsPo10K2QlsnoYQ8eg=.pem", + "location": "security-state-staging/intermediates/f1cb5a52-c3a4-4be8-a157-a235238513ca.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "JqNL7R3G+I+oNR0Uoa1/QE7RwLsPo10K2QlsnoYQ8eg=", + "crlite_enrolled": false, + "id": "9ef04497-4d5e-48bb-865f-c7627ba2ff7a", + "last_modified": 1664326625028 + }, + { + "schema": 1664326208907, + "derHash": "xicKFQaR++GQ2DH1E5vf7s97KYtPoMoXMGpp1+kee6I=", + "subject": "CN=DigiCert G5 TLS RSA4096 SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEwMC4GA1UEAxMnRGlnaUNlcnQgRzUgVExTIFJTQTQwOTYgU0hBMzg0IDIwMjEgQ0Ex", + "whitelist": false, + "attachment": { + "hash": "2af8b3632cefcd23ee28c7ef0e26baf3aa1f6248ff86a03ee9c42664bdcaf856", + "size": 2393, + "filename": "5R0B4UlPeqmGgtewU9-0QUYDvO9-UNN4YyL8SiHOYVo=.pem", + "location": "security-state-staging/intermediates/939f632b-9b51-4b94-911d-78a3fe1b1429.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5R0B4UlPeqmGgtewU9+0QUYDvO9+UNN4YyL8SiHOYVo=", + "crlite_enrolled": false, + "id": "b5040b0c-ef3a-493c-a5eb-e334c81a0902", + "last_modified": 1664326625020 + }, + { + "schema": 1664326211603, + "derHash": "R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=", + "subject": "CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US", + "subjectDN": "MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==", + "whitelist": false, + "attachment": { + "hash": "ab00a00ff3bbaee6458f8005af74030281b46c4c038c33d7039a01d5968b4fd1", + "size": 1772, + "filename": "ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem", + "location": "security-state-staging/intermediates/7152e9d3-3a75-4a64-a243-62e63233c96e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=", + "crlite_enrolled": false, + "id": "3f097f22-60fb-4a8c-b940-9602d83fab74", + "last_modified": 1664326625011 + }, + { + "schema": 1664326207982, + "derHash": "h38kznD0owR+TqcL7BvDG+m2Uzrf86OT/5v7PIEClEY=", + "subject": "CN=TrustAsia TLS ECC CA G9,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBFQ0MgQ0EgRzk=", + "whitelist": false, + "attachment": { + "hash": "213a8df28e7c3c0f36e3b517ad6b17c6286cc3b6ed28853c76b534b8a3a14474", + "size": 1191, + "filename": "z_Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=.pem", + "location": "security-state-staging/intermediates/30de5808-b0a9-4a94-9445-61d877cf87f7.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "z/Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=", + "crlite_enrolled": false, + "id": "f10d75dc-ab04-495d-90a1-c8a8e8d0af4f", + "last_modified": 1664326625003 + }, + { + "schema": 1664326206264, + "derHash": "M+ik7UiTB2DOGtei1E8HmyL2YAUnU5dhCeb8dHUlUr0=", + "subject": "CN=TrustAsia OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgT1YgVExTIFBybyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "d696e8a02c7f0d746829d2b3318c91ce8daf2c9b2478c186e6765456f154da1f", + "size": 1666, + "filename": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem", + "location": "security-state-staging/intermediates/7c03ad6f-9302-4ef0-8cfa-c63b88ca2eb0.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=", + "crlite_enrolled": false, + "id": "422d4f55-855c-47d0-b608-19915a4013b4", + "last_modified": 1664326624995 + }, + { + "schema": 1664326202743, + "derHash": "fK7saA5kl/xRCQc/g4FueY8n+JaKJmPByVcRtUgZLjU=", + "subject": "CN=GeoTrust ECC CN CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "46e627fcefde31414651ca984396410cd372950426d973d114d2360dcf3cd38b", + "size": 1374, + "filename": "5hUeeQGevtQx_9LReJqSkj73Yv0TUcld9s9jPFCqJqA=.pem", + "location": "security-state-staging/intermediates/53ecee3d-ffe9-40eb-9a7c-8d3951ba457c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5hUeeQGevtQx/9LReJqSkj73Yv0TUcld9s9jPFCqJqA=", + "crlite_enrolled": false, + "id": "9077c165-1ccf-47cc-a76a-d560b2ee0cda", + "last_modified": 1664326624987 + }, + { + "schema": 1664326207105, + "derHash": "M47bBPuL6vB6EHSef05TjeBxXa+2R41YBj+3yL2www0=", + "subject": "CN=DigiCert Global G3 TLS ECC SHA384 2020 CA1,O=DigiCert Inc,C=US", + "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMyBUTFMgRUNDIFNIQTM4NCAyMDIwIENBMQ==", + "whitelist": false, + "attachment": { + "hash": "89f87e5ab2d8608c9772c9ee89bb1ff266577aa9247e7555e07215b5108cbd82", + "size": 1325, + "filename": "qBRjZmOmkSNJL0p70zek7odSIzqs_muR4Jk9xYyCP-E=.pem", + "location": "security-state-staging/intermediates/9e35054b-aef6-4258-8ef5-65899c7b0772.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "qBRjZmOmkSNJL0p70zek7odSIzqs/muR4Jk9xYyCP+E=", + "crlite_enrolled": false, + "id": "751a26ff-6347-44ae-af17-142d6fcf49c7", + "last_modified": 1664326624979 + }, + { + "schema": 1664326204474, + "derHash": "8SJB7jTAOmCNNNvA6kZeG9GqEwkVVPnU0IYlP/POg9Q=", + "subject": "CN=DC Government SHA2 EV Intermediate CA,OU=Office of the Chief Technology Officer,O=Government of the District of Columbia,C=US", + "subjectDN": "MIGfMQswCQYDVQQGEwJVUzEvMC0GA1UEChMmR292ZXJubWVudCBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExLzAtBgNVBAsTJk9mZmljZSBvZiB0aGUgQ2hpZWYgVGVjaG5vbG9neSBPZmZpY2VyMS4wLAYDVQQDEyVEQyBHb3Zlcm5tZW50IFNIQTIgRVYgSW50ZXJtZWRpYXRlIENB", + "whitelist": false, + "attachment": { + "hash": "90f3dceffcd69e1b48cfc958f2ea459f79c5ee69520f368de74c3a929c78a497", + "size": 2073, + "filename": "D6bVPPyHKUFV0WmvSS6nCMgaQId_SQKugGjOOT48QXE=.pem", + "location": "security-state-staging/intermediates/cad5f6b5-2734-4acd-93bf-834cf09b57f9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "D6bVPPyHKUFV0WmvSS6nCMgaQId/SQKugGjOOT48QXE=", + "crlite_enrolled": false, + "id": "5d8690a3-f2cb-4d3f-8976-5ecde6bdf54b", + "last_modified": 1664326624972 + }, + { + "schema": 1664326205340, + "derHash": "qmHCkn3InbIlypoX1gA3PQWPaW2G0Q4r17Xo9EqX7tE=", + "subject": "CN=WoSign OV SSL Pro CA,O=WoSign CA Limited,C=CN", + "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIE9WIFNTTCBQcm8gQ0E=", + "whitelist": false, + "attachment": { + "hash": "8a650458c45daf0f355521940f4cb2d85e34c0cc71d7dae9339adbaeb2f3f9bd", + "size": 1666, + "filename": "YgNpzwCbB-5jnp9Vn5xVC090y79oIjE_2P8pF1_4DMI=.pem", + "location": "security-state-staging/intermediates/a9cbd897-053a-41e4-8393-6d04c9bc1206.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "YgNpzwCbB+5jnp9Vn5xVC090y79oIjE/2P8pF1/4DMI=", + "crlite_enrolled": false, + "id": "6149ff16-482f-4deb-b5e3-c7e9461390ef", + "last_modified": 1664326624964 + }, + { + "schema": 1664326199980, + "derHash": "LRQPILipbitNLxzFrKXloefcVqdJHlEJBpYPONLSGu8=", + "subject": "CN=GeoTrust EV RSA CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVWIFJTQSBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "5e98e5f403ff3dddd032a6ff647e356e6da095ecfa1bac29e32e80471dcfbc19", + "size": 1873, + "filename": "VHUagq80gsWdvnfHL_-2XSLZrAJk4I9d8fx6N8UvWGM=.pem", + "location": "security-state-staging/intermediates/e8d73d97-e9d2-4d02-b887-8bb211ce06b4.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "VHUagq80gsWdvnfHL/+2XSLZrAJk4I9d8fx6N8UvWGM=", + "crlite_enrolled": false, + "id": "d8b00e81-729c-44bc-9212-adbe0840cc08", + "last_modified": 1664326624956 + }, + { + "schema": 1664326201708, + "derHash": "5aHBkZ476u5ZNahIXdzg4/AaJhjbDweTs9s9msLZZ8c=", + "subject": "CN=DigiCert G5 TLS ECC SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", + "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEsMCoGA1UEAxMjRGlnaUNlcnQgRzUgVExTIEVDQyBTSEEzODQgMjAyMSBDQTE=", + "whitelist": false, + "attachment": { + "hash": "a84ab90fee0d4f6fbf6c6e63fbbbd741df2406c735f923d2eca3ea94915e934f", + "size": 1223, + "filename": "LsOdqDFw3goo_G8jjeEPxe-JSJ7aFp1RF5Ih4_2ZvFY=.pem", + "location": "security-state-staging/intermediates/868dc36d-ee40-4c52-9e2f-6fa71dc32488.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "LsOdqDFw3goo/G8jjeEPxe+JSJ7aFp1RF5Ih4/2ZvFY=", + "crlite_enrolled": false, + "id": "b6f346e1-b3e3-4cd2-a8d6-9c90e5bacb86", + "last_modified": 1664326624948 + }, + { + "schema": 1664326200826, + "derHash": "I93wiyI3PYYVjrnJn9tTZrGYBFYFMTct0g3OP7dm9Ww=", + "subject": "CN=GeoTrust CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IENOIFJTQSBDQSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "318d73015376f86e0506706af771be21a870ce1c70e5b3a7835733914bab3639", + "size": 1829, + "filename": "4H6OXny7MqJPbCOTpHyS0fSSUeHk_I5nKbIyuQwnfsA=.pem", + "location": "security-state-staging/intermediates/add22cce-aabf-4167-9d28-fb12c5e95054.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "4H6OXny7MqJPbCOTpHyS0fSSUeHk/I5nKbIyuQwnfsA=", + "crlite_enrolled": false, + "id": "5145609d-03ae-46e6-a8f0-b43ceb48f201", + "last_modified": 1664326624941 + }, + { + "schema": 1664326199136, + "derHash": "rRSmi+yUnoT2BjQZ1jRl0TfCrdPjqF4A6ePuguW0AY8=", + "subject": "CN=DigiCert Secure Site Japan CA,OU=www.digicert.co.jp,O=DigiCert Japan G.K.,C=JP", + "subjectDN": "MHAxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNEaWdpQ2VydCBKYXBhbiBHLksuMRswGQYDVQQLExJ3d3cuZGlnaWNlcnQuY28uanAxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEphcGFuIENB", + "whitelist": false, + "attachment": { + "hash": "704aec98d2d7480b5a48932114c1651471e99f1b14b3d85195169801f91a351d", + "size": 1658, + "filename": "RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=.pem", + "location": "security-state-staging/intermediates/a6e61ee2-41d7-44e4-8e27-9adb2e4d4b97.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=", + "crlite_enrolled": false, + "id": "6654ecd6-ce34-4540-b598-3c9c74265a99", + "last_modified": 1664326624933 + }, + { + "schema": 1664326203592, + "derHash": "ljBWsNlB2dviesd4BT2F5DzHn0dq00z915nCfjgYQOs=", + "subject": "CN=NCC Group Secure Server CA G3,O=NCC Group,C=US", + "subjectDN": "MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcz", + "whitelist": false, + "attachment": { + "hash": "9e28901777feba1e901463fa788510b1aee8a5be43288dd998f5adb2c216567f", + "size": 1110, + "filename": "o054ddOknAfLTeuaAC1q42pNk8GmJ-eXYrMMmlOPyUc=.pem", + "location": "security-state-staging/intermediates/23241c83-542b-4cec-b106-4bd44c660312.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "o054ddOknAfLTeuaAC1q42pNk8GmJ+eXYrMMmlOPyUc=", + "crlite_enrolled": false, + "id": "dcce2c9f-77dc-4d7f-8f66-e61882e0078b", + "last_modified": 1664326624925 + }, + { + "schema": 1664326198291, + "derHash": "Hgo6uZMVdxcoHUKr+AHrZN7tUA5BaMpwbWpx2BA8c6I=", + "subject": "CN=DigiCert Grid Trust CA,OU=www.digicert.com,O=DigiCert Grid,C=US", + "subjectDN": "MGExCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMR8wHQYDVQQDExZEaWdpQ2VydCBHcmlkIFRydXN0IENB", + "whitelist": false, + "attachment": { + "hash": "da4e397039d98baa39ac2d9fe30c7be0e57f8d32e62bbe09d45426bf2df5ae2d", + "size": 2316, + "filename": "TBKoZNHPiEWnnKpVqLc_CHX3Z3iNpZdilsVXHJhcqkw=.pem", + "location": "security-state-staging/intermediates/c44d1d33-b524-4062-965b-fe6dd07b118c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "TBKoZNHPiEWnnKpVqLc/CHX3Z3iNpZdilsVXHJhcqkw=", + "crlite_enrolled": false, + "id": "e5406e58-cea2-4e83-bf5b-5707b41137af", + "last_modified": 1664326624918 + }, + { + "schema": 1664326195669, + "derHash": "wa13eHltILymXIiaJlUCEVZSi7Yv9fpD4bjlqD49Lqo=", + "subject": "CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US", + "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==", + "whitelist": false, + "attachment": { + "hash": "8d5e0c561c61be2f2cef640011d673af8a75a82024f5bcf0348d3dd34002b5bd", + "size": 1760, + "filename": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem", + "location": "security-state-staging/intermediates/16773900-8e85-42bf-896c-e0656df0b64d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=", + "crlite_enrolled": false, + "id": "4f169191-0e4c-45dc-8273-0115bdb1c24c", + "last_modified": 1664326624910 + }, + { + "schema": 1664326197429, + "derHash": "0OilGsqrmvgnZ+LvFlQ8LMY1VRtd4NriXWqsceeGKHA=", + "subject": "CN=TrustAsia OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "ebd10662baa82cc7f2d221c4534c1a6175a301fec27e3ce8f3f99347e99e5f24", + "size": 1821, + "filename": "tv1pIXiJEYFUrzxhRqxCjTL7S9s7y_PZbxYVnDOXeCI=.pem", + "location": "security-state-staging/intermediates/d38f4ed5-7362-454c-9ad2-0f8d47c58d11.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "tv1pIXiJEYFUrzxhRqxCjTL7S9s7y/PZbxYVnDOXeCI=", + "crlite_enrolled": false, + "id": "8ed1f085-086f-402a-afa7-893c057aa162", + "last_modified": 1664326624902 + }, + { + "schema": 1664326193930, + "derHash": "lNTs4u2aVFe5aaE7JgSJ6aX+R5CgQfJ6PrQSbIRBjvk=", + "subject": "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US", + "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFNlY3VyZSBTZXJ2ZXIgQ0E=", + "whitelist": false, + "attachment": { + "hash": "bec9cb08be3aa288fb4998e6e9c6dc9b1663aa11bdbb71f81585d4a5a2b0b828", + "size": 1642, + "filename": "v2OX1FzmsvhGRs3vKv7P5R4N-Aly9A_qKXxfEauTwao=.pem", + "location": "security-state-staging/intermediates/bf9b04aa-1962-494b-b2f3-412c59ec9e7d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "v2OX1FzmsvhGRs3vKv7P5R4N+Aly9A/qKXxfEauTwao=", + "crlite_enrolled": false, + "id": "9d6a47bb-9ab0-4f77-b52f-493e7af27c1e", + "last_modified": 1664326624895 + }, + { + "schema": 1664326193057, + "derHash": "JT48lzLfiHTD1U2lIsFxEULJjCzqdmRjUVKomgPuk2Q=", + "subject": "CN=Optum Public Trust CA 1,O=Optum,L=Minneapolis,ST=Minnesota,C=US", + "subjectDN": "MGkxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlNaW5uZXNvdGExFDASBgNVBAcTC01pbm5lYXBvbGlzMQ4wDAYDVQQKEwVPcHR1bTEgMB4GA1UEAxMXT3B0dW0gUHVibGljIFRydXN0IENBIDE=", + "whitelist": false, + "attachment": { + "hash": "7d110bc6ad3efd8fd7bbcab1436ecaee6b8ceaf40a87936c938ff3a558bd2e59", + "size": 1796, + "filename": "vKi3BXeuhSDWdRuvjranv-RWto4k9Z05PXzhtTz0LnA=.pem", + "location": "security-state-staging/intermediates/d39a90f2-a2c1-4b96-bbc3-7aa70afff93b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "vKi3BXeuhSDWdRuvjranv+RWto4k9Z05PXzhtTz0LnA=", + "crlite_enrolled": false, + "id": "8618bd62-b0b1-40f7-ad87-92c0da8618d5", + "last_modified": 1664326624887 + }, + { + "schema": 1664326190435, + "derHash": "H4656ajgZsxbODPgazEpdktiJjnVsWP2AOHHkSC/Pu0=", + "subject": "CN=DigiCert Global G2 TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US", + "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==", + "whitelist": false, + "attachment": { + "hash": "2f0f7bd3aa5d887df233421b1862144f48f1e78aaf6bde77dd04a92bf7b1f74e", + "size": 1776, + "filename": "Wec45nQiFwKvHtuHxSAMGkt19k-uPSw9JlEkxhvYPHk=.pem", + "location": "security-state-staging/intermediates/68708c8c-138c-4ee0-a5c4-66532b7b641e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Wec45nQiFwKvHtuHxSAMGkt19k+uPSw9JlEkxhvYPHk=", + "crlite_enrolled": false, + "id": "30d6dd2b-af53-4e50-93c4-e7f3e0caa778", + "last_modified": 1664326624880 + }, + { + "schema": 1664326191302, + "derHash": "+2BghIRAqkWU/oEJdB76tAxWcysmxnw21tyUW7L+E88=", + "subject": "CN=Plex Devices High Assurance CA3,O=Plex\\, Inc.,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ez", + "whitelist": false, + "attachment": { + "hash": "cd28540e93a3e7eada94060afc6916529a05233243a206dfe1a370ff5b0563f8", + "size": 1817, + "filename": "7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu-SVeew9nqo=.pem", + "location": "security-state-staging/intermediates/43a54629-f407-4965-9395-d247c9d23517.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu+SVeew9nqo=", + "crlite_enrolled": false, + "id": "7d8027f5-c921-4f5d-bbbf-de30773d90a2", + "last_modified": 1664326624872 + }, + { + "schema": 1664326196548, + "derHash": "nbCiDDBVQeFegYqIDQZXmHapyQG47s2WhILFjZun8Kc=", + "subject": "CN=TrustAsia EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "ed5d563d514f39499b71d7a6f0a248b4c61e380f9e9dfca14d38306123d7bb76", + "size": 1650, + "filename": "qPCsIegto8XzD_ooUOSN32SyAwuprv0BX_QDRc0K3aI=.pem", + "location": "security-state-staging/intermediates/9c01f138-1562-4fe5-a690-f1a5bdbb13ba.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "qPCsIegto8XzD/ooUOSN32SyAwuprv0BX/QDRc0K3aI=", + "crlite_enrolled": false, + "id": "07245742-ecdb-4dc2-ace6-9a64038f11a1", + "last_modified": 1664326624864 + }, + { + "schema": 1664326192158, + "derHash": "91Qc9p0d4ayVOrwfrW94B6NO3+nhLBHmahlZMMI61sY=", + "subject": "CN=DigiCert Global CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "636a98faff2529c5913204d3e3fd962544a257b8fbf941b8f31bc0b8e6cb4f13", + "size": 1106, + "filename": "lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=.pem", + "location": "security-state-staging/intermediates/6db8a6bf-95cd-4548-a6f5-fbdf1e92811e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=", + "crlite_enrolled": false, + "id": "24e37e3a-1aa7-4c1d-946e-a1b956996fca", + "last_modified": 1664326624856 + }, + { + "schema": 1664326189590, + "derHash": "13N+Xy0//KQpkC6fOIz9bFlZzTWg/BA87i9+k9HGalI=", + "subject": "CN=DigiCert Assured ID TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENB", + "whitelist": false, + "attachment": { + "hash": "0447be26ffed9fcf5fd85dadbd96a4ba02719d4c6314f079cc94fea2fe3ccd09", + "size": 1735, + "filename": "wcEQuH5mngysd8OrgXuw0roT-SkrGkVZxVSpoNafgws=.pem", + "location": "security-state-staging/intermediates/045b4d0f-c83e-49b0-b4d3-6f9f64529e61.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "wcEQuH5mngysd8OrgXuw0roT+SkrGkVZxVSpoNafgws=", + "crlite_enrolled": false, + "id": "a7971f88-2e3c-48df-933b-1187e892478a", + "last_modified": 1664326624849 + }, + { + "schema": 1664326194799, + "derHash": "9hSuKxAUhPFfZvTdpW7m60InKPF52UOZ7eGawdhai9M=", + "subject": "CN=Secure Site CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVNlY3VyZSBTaXRlIENBIEcy", + "whitelist": false, + "attachment": { + "hash": "7b53c5585cb213e67ffc75e0e207d7df7736a01e94405c05fcadcda57a4dd6c5", + "size": 1825, + "filename": "3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem", + "location": "security-state-staging/intermediates/b9c0be27-667a-4073-b981-b75d445af54d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=", + "crlite_enrolled": false, + "id": "3cc06076-083d-4333-bdaf-0a479cc50aa0", + "last_modified": 1664326624841 + }, + { + "schema": 1664326186972, + "derHash": "Hk/DTSbgeT1VnjIv4RHx4ZqdLjS8JdPEJ7AypI0sW2o=", + "subject": "CN=Encryption Everywhere ECC DV TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MG0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLDAqBgNVBAMTI0VuY3J5cHRpb24gRXZlcnl3aGVyZSBFQ0MgRFYgVExTIENB", + "whitelist": false, + "attachment": { + "hash": "bd127e9ea89932ba68684ffc1be7ef8c10924c73c3c8c3fb210e768858e7a708", + "size": 1402, + "filename": "Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54_cJM=.pem", + "location": "security-state-staging/intermediates/c33abfe2-4130-438c-9bb4-f48a133e03ce.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54/cJM=", + "crlite_enrolled": false, + "id": "19d1eba6-116e-400e-a75a-87b35951def6", + "last_modified": 1664326624834 + }, + { + "schema": 1664326188719, + "derHash": "jEPF40DsZA+T6ndKxTU8ypBC92T/g3+HDYtkdjxFikE=", + "subject": "CN=GeoTrust TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US", + "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==", + "whitelist": false, + "attachment": { + "hash": "8f93397aaa187e95bb620112ea5ae24070adb0e6a08bc71b8425cf11a9a701ac", + "size": 1902, + "filename": "n5dIU-KFaI00Y_prmvaZhqXOquF72TlPANCLxCA9HE8=.pem", + "location": "security-state-staging/intermediates/4d8ec942-f6ba-4f33-9698-aa5141874bcf.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "n5dIU+KFaI00Y/prmvaZhqXOquF72TlPANCLxCA9HE8=", + "crlite_enrolled": false, + "id": "0c1467c2-b751-416d-b6ec-a4d50f03f2b4", + "last_modified": 1664326624826 + }, + { + "schema": 1664326187872, + "derHash": "avXE6sGAKJuUp3pdIx44Zf/pNPPmokv0h+tOK/2Amks=", + "subject": "CN=DigiCert Secure Site CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIENOIENBIEcz", + "whitelist": false, + "attachment": { + "hash": "8bd898f10684eae3810bae34d31c153bf823daf9bb8e90ef85a30c9afbd870bb", + "size": 1804, + "filename": "TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=.pem", + "location": "security-state-staging/intermediates/0990a5c9-b0a9-4df1-87f7-b59af54fd8c6.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=", + "crlite_enrolled": false, + "id": "bcfabcdf-0aaa-4ab8-8330-e4afa00417e7", + "last_modified": 1664326624818 + }, + { + "schema": 1664326186066, + "derHash": "90w7LH5FXWVNnuWqpxJ4nMsme5YcGhzkimnIYM0ZNng=", + "subject": "CN=Thawte EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBFQ0MgQ0EgMjAxOA==", + "whitelist": false, + "attachment": { + "hash": "ac60a878b837ac5acde21931778e37420c87650e995c87cd0c4cffb2ec59178d", + "size": 1390, + "filename": "sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS_jwKtxLc=.pem", + "location": "security-state-staging/intermediates/633972ce-a88d-43f3-b835-8d832f1bde0c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS/jwKtxLc=", + "crlite_enrolled": false, + "id": "923ae836-8f12-4700-a373-5060905c7289", + "last_modified": 1664326624811 + }, + { + "schema": 1664326185202, + "derHash": "k8OBywezU6kgwqe+1r6/GVxoJ53QUn038gvdDZnDMPo=", + "subject": "CN=DigiCert Assured ID CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "f6c8112ef8614332fdca113714480ab9d504ac5a161140b3a03b70156fe90951", + "size": 1654, + "filename": "dnPPE-JM_ZaNCC1Q198LELhQiAdfMsEPXi1LVYU-aPQ=.pem", + "location": "security-state-staging/intermediates/625fb1bf-2f17-4e4f-adbb-8ec1cedc9725.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "dnPPE+JM/ZaNCC1Q198LELhQiAdfMsEPXi1LVYU+aPQ=", + "crlite_enrolled": false, + "id": "992eec46-81fd-4ec5-9b30-0701ceb2c4de", + "last_modified": 1664326624803 + }, + { + "schema": 1664326183286, + "derHash": "vJE3miHnveEbRVvx1RGGMxaCgFpKNTqO4lj3oDcGxmQ=", + "subject": "CN=DigiCert Secure Site Pro EV ECC CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MFcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMTAvBgNVBAMTKERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBFQ0MgQ04gQ0EgRzM=", + "whitelist": false, + "attachment": { + "hash": "3c4b989bded7b9912a9b1b0f826da0d683072540c585b2bee8fdf873f6c364ba", + "size": 1374, + "filename": "ABohyUv2yKwrj07ViEB9SgfSMpe6-G4RvaB7869gYaQ=.pem", + "location": "security-state-staging/intermediates/21f99515-dc4d-47ea-9ccb-0492a2058411.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ABohyUv2yKwrj07ViEB9SgfSMpe6+G4RvaB7869gYaQ=", + "crlite_enrolled": false, + "id": "79639afa-3ee1-4fe4-8531-6191289ee51e", + "last_modified": 1664326624795 + }, + { + "schema": 1664326181523, + "derHash": "kuN3Cx60T4TC8ssAl8L9cSa9IStBwmEOeN39iUZ2Fzg=", + "subject": "CN=Cybertrust Japan ECC EV CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", + "subjectDN": "MFcxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEjMCEGA1UEAxMaQ3liZXJ0cnVzdCBKYXBhbiBFQ0MgRVYgQ0E=", + "whitelist": false, + "attachment": { + "hash": "1daf5084cd06736b07b49baee68114937ff6311a4104382645aa9cb5e07573f7", + "size": 1171, + "filename": "DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz-uWIQs=.pem", + "location": "security-state-staging/intermediates/d895d3d2-5442-4881-a48c-ae38a7c0d9be.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz+uWIQs=", + "crlite_enrolled": false, + "id": "8d3d797d-93c7-4e4c-95e2-fcdb27a14ed2", + "last_modified": 1664326624788 + }, + { + "schema": 1664326180649, + "derHash": "TjD4AEwY09eY7Fp3NDRrWl6+jVRCPOmCV/xXc1pvc40=", + "subject": "CN=DigiCert High Assurance CA-3b,O=DigiCert Inc,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTNi", + "whitelist": false, + "attachment": { + "hash": "94cc514696f4cc8b6732c63dc89f44d422cc8ba162a3ed5b61cadf555ab85772", + "size": 2048, + "filename": "1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=.pem", + "location": "security-state-staging/intermediates/8810131b-cfb6-4b4b-8251-b94be87ed9c2.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=", + "crlite_enrolled": false, + "id": "1c454263-3cfa-4316-a32c-594e2ca911f6", + "last_modified": 1664326624780 + }, + { + "schema": 1664326178928, + "derHash": "AJhxw6TGBzEeWukvAQlfm/dhALh5SrCppSEOZ5TIYHw=", + "subject": "CN=Trust Provider B.V. TLS RSA CA G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL", + "subjectDN": "MHYxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEqMCgGA1UEAxMhVHJ1c3QgUHJvdmlkZXIgQi5WLiBUTFMgUlNBIENBIEcx", + "whitelist": false, + "attachment": { + "hash": "e68c00c6a2d7a94a049d03b406000c58140c0e8f2bdaf4ec4dee420488b19972", + "size": 1687, + "filename": "DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN_FbGZLM=.pem", + "location": "security-state-staging/intermediates/d68b50e2-f640-4c14-8f8d-3d06895fa5dd.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN/FbGZLM=", + "crlite_enrolled": false, + "id": "310ba4f7-752f-4547-b995-bc2bc7591c0a", + "last_modified": 1664326624772 + }, + { + "schema": 1664326184182, + "derHash": "Av7Tui5qeEOjGKmBvIRwYf0oLZ6IR/+p9U14W2uB1vM=", + "subject": "CN=Secure Site Pro CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVNlY3VyZSBTaXRlIFBybyBDQSBHMg==", + "whitelist": false, + "attachment": { + "hash": "d3d8388c4d24d13d47226c4ec8f107db463d925badd0130e0d7ca2db6a707355", + "size": 1829, + "filename": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem", + "location": "security-state-staging/intermediates/05064024-e55d-4a24-8af1-a623cb42e66d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=", + "crlite_enrolled": false, + "id": "5c3d331a-3364-4c1a-9b1a-65d7a57f5af3", + "last_modified": 1664326624765 + }, + { + "schema": 1664326182420, + "derHash": "2jvitqbZcVwSlaQr5SbgAB0Q5ddUDwbnYxs05kSTSEg=", + "subject": "CN=Secure Site Pro ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIjAgBgNVBAMTGVNlY3VyZSBTaXRlIFBybyBFQ0MgQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "e35a825f1808b4a4b8cd9d0e951d3af60b0df0ec46fec0960740c2f92566aa5b", + "size": 1394, + "filename": "SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=.pem", + "location": "security-state-staging/intermediates/8164957e-941c-40a6-bafc-b00219396da0.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=", + "crlite_enrolled": false, + "id": "b108471a-d610-4b25-9eb1-fa54cd948643", + "last_modified": 1664326624757 + }, + { + "schema": 1664326178045, + "derHash": "/alHIIv6MgOmxXuHFKZHtwCeUWjoiVE0VFCx0tP5Gn0=", + "subject": "CN=TERENA eScience Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", + "subjectDN": "MHIxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEmMCQGA1UEAxMdVEVSRU5BIGVTY2llbmNlIFBlcnNvbmFsIENBIDM=", + "whitelist": false, + "attachment": { + "hash": "a948cf8f30ccb800e35bb069018109f31bedbe3743067ced32cb2e79edefc532", + "size": 1804, + "filename": "D4s14JIoSBMzTNeUUcWADRb_-SykkRSe9uuLuoU5ots=.pem", + "location": "security-state-staging/intermediates/fef5346e-9b0a-48da-a507-622c76da1104.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "D4s14JIoSBMzTNeUUcWADRb/+SykkRSe9uuLuoU5ots=", + "crlite_enrolled": false, + "id": "0478cf5c-b32a-4100-a960-ec6421916beb", + "last_modified": 1664326624749 + }, + { + "schema": 1664326179772, + "derHash": "MoZpFBLzDs5cBl/WL0OSpHYtHneBUzg1nfOQKZ+9Ye8=", + "subject": "CN=Thawte EV RSA CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFViBSU0EgQ0EgRzI=", + "whitelist": false, + "attachment": { + "hash": "a8197f401360acfc75a18e45c5c77d5d4e77dcd084fcf0258a8e91bed3346eeb", + "size": 1873, + "filename": "BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=.pem", + "location": "security-state-staging/intermediates/53198829-280c-44c6-a8d5-2b3d0141d4d7.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=", + "crlite_enrolled": false, + "id": "e01f49af-1b36-46a6-8852-c945934fa1f7", + "last_modified": 1664326624742 + }, + { + "schema": 1664326172795, + "derHash": "OrvmPa91bFAWtrhfUgFf2Oisvid8UIexJ6YFY6hB7Yo=", + "subject": "CN=Cloudflare Inc ECC CA-3,O=Cloudflare\\, Inc.,C=US", + "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBFQ0MgQ0EtMw==", + "whitelist": false, + "attachment": { + "hash": "f7e471ccaa5a049df60367b77d98d07cd5db968d7e9fbcc638ccf2b08d6572f7", + "size": 1378, + "filename": "FEzVOUp4dF3gI0ZVPRJhFbSJVXR-uQmMH65xhs1glH4=.pem", + "location": "security-state-staging/intermediates/94388457-922f-4508-8094-bb10ab4f11d7.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "FEzVOUp4dF3gI0ZVPRJhFbSJVXR+uQmMH65xhs1glH4=", + "crlite_enrolled": false, + "id": "ab828172-9f33-49df-8d8b-f17174f9e641", + "last_modified": 1664326624734 + }, + { + "schema": 1664326176323, + "derHash": "raGI+DDDE/YEZIjsNB8e1K95PG3CjFhgBEXfvrQWN0Y=", + "subject": "CN=Thawte CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlRoYXd0ZSBDTiBSU0EgRVYgQ0EgRzE=", + "whitelist": false, + "attachment": { + "hash": "e02463fc55522ad7b1e55d94442c9b9e0d7fe94f931562f95c40b173b423e4e8", + "size": 1678, + "filename": "Hn_AvJkahgLnROxUs8e4tPKOI2wS-n9H5P_jk0Cf2T4=.pem", + "location": "security-state-staging/intermediates/1bbfa46c-dfe1-4ed3-8f9b-eaa1fe2e12d7.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Hn/AvJkahgLnROxUs8e4tPKOI2wS+n9H5P/jk0Cf2T4=", + "crlite_enrolled": false, + "id": "f6ff9269-2497-4464-9adb-1cfa1ca71e7e", + "last_modified": 1664326624726 + }, + { + "schema": 1664326171899, + "derHash": "M9VzWYMfh3VObnVda1tW5+cSl93f6h1jlwhmBCgPb/w=", + "subject": "CN=Cybertrust Japan Secure Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", + "subjectDN": "MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIENB", + "whitelist": false, + "attachment": { + "hash": "d41fc55ada95fd61e6fe844c3f6490f2db299bd6a149d9861dc209e9938f43e2", + "size": 1711, + "filename": "bVyC1r63wwzb47rnbZ46v-604DOoFUXTp4JA0srlZRE=.pem", + "location": "security-state-staging/intermediates/35070f8c-d9da-4f65-9382-bf8ea4bb7376.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "bVyC1r63wwzb47rnbZ46v+604DOoFUXTp4JA0srlZRE=", + "crlite_enrolled": false, + "id": "82d8e2c5-9576-44f8-aae2-cfcc4c7e1734", + "last_modified": 1664326624718 + }, + { + "schema": 1664326170107, + "derHash": "vxyw4hPY08cLrolCn8Ft4sdPdVlj0bm0iL0CYNvJG5w=", + "subject": "CN=DigiCert Baltimore CA-1 G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0xIEcy", + "whitelist": false, + "attachment": { + "hash": "6e8a14353fd1d1bb9476fd46f1aca8687f2288716f64828ce95fe48b2a7f4b30", + "size": 1581, + "filename": "EppRiUi9P-L8-u3LNh2t2P4La8TbSH4Xh_DCYKPwqts=.pem", + "location": "security-state-staging/intermediates/89f5a0eb-9314-41fc-8fae-ea97d024063a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "EppRiUi9P+L8+u3LNh2t2P4La8TbSH4Xh/DCYKPwqts=", + "crlite_enrolled": false, + "id": "f91c2704-ae75-473f-9d97-fccf15e253e0", + "last_modified": 1664326624710 + }, + { + "schema": 1664326175457, + "derHash": "MZiW45VNUQ2jpLdTh+jIcLO8LDIo2FUJFuvpq9y3+SE=", + "subject": "CN=Oracle TLS RSA CA G1,OU=Organization Validated SSL,O=Oracle Corporation,C=US", + "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xIzAhBgNVBAsTGk9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRPcmFjbGUgVExTIFJTQSBDQSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "f5677aab4a4a5595d2fb7ec90b64027c9dae3fbc2d40c94a69a50ab45b582d86", + "size": 1678, + "filename": "92UUNzSFrSZZ2mG20rm7eFX2MV_e3zCq8ck0jTA9zMw=.pem", + "location": "security-state-staging/intermediates/ccdaebea-c9e8-4b7d-b412-1f34dfc85162.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "92UUNzSFrSZZ2mG20rm7eFX2MV/e3zCq8ck0jTA9zMw=", + "crlite_enrolled": false, + "id": "73b570ff-00cd-459f-8fc9-6c1d2398c857", + "last_modified": 1664326624702 + }, + { + "schema": 1664326174566, + "derHash": "w4BN5R6MFwUiIK4crT04PlTVt9wohDxC8NvZkTwehlg=", + "subject": "CN=Secure Site Pro Extended Validation ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "9a2067a61b58bd7732cfbbfb1b50c9fd59c6f466ab5e85edbf86065a9b4c21bc", + "size": 1463, + "filename": "_Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB_j8=.pem", + "location": "security-state-staging/intermediates/9df340b9-5581-4319-93d7-03e7df97b435.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "/Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB/j8=", + "crlite_enrolled": false, + "id": "c5bed312-b190-402f-8aa2-e8f337ebb2b8", + "last_modified": 1664326624695 + }, + { + "schema": 1664326169188, + "derHash": "yHzgOv+13mMZwhmXHy7S2Pb1OJ4tU7It0sVipcmCf8A=", + "subject": "CN=GeoTrust EV CN RSA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IEVWIENOIFJTQSBHMQ==", + "whitelist": false, + "attachment": { + "hash": "3ef397109e23513d25c637f4f4d25aca8102f0de50dd9b8c29ef06860be3147c", + "size": 1678, + "filename": "_AbtYXa2JlKxQyB1FnBObb2Wv8Q-bUxjsGRIXvzcvpQ=.pem", + "location": "security-state-staging/intermediates/12597c35-fd1e-4f3b-8136-4c8419a62439.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "/AbtYXa2JlKxQyB1FnBObb2Wv8Q+bUxjsGRIXvzcvpQ=", + "crlite_enrolled": false, + "id": "f1968ec8-bf26-495e-99a2-2fa3c73f81e6", + "last_modified": 1664326624686 + }, + { + "schema": 1664326171019, + "derHash": "1Gkx4Bgt1lXqDBbm3Zn45hr/5AH3NMbKjqAFapaOr4E=", + "subject": "CN=DigiCert Baltimore EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEJhbHRpbW9yZSBFViBDQQ==", + "whitelist": false, + "attachment": { + "hash": "97e070c494e675a685508925e7c9f7bd9330064b1658256296b84022edf16b7a", + "size": 1577, + "filename": "VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=.pem", + "location": "security-state-staging/intermediates/632f91d1-09ef-498e-b828-94c76c27331d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=", + "crlite_enrolled": false, + "id": "4cde6e6f-b699-4797-81ed-c43195526adc", + "last_modified": 1664326624678 + }, + { + "schema": 1664326168323, + "derHash": "pLK0dUVVn1//t83aehIg5i+3TRt6mk1NrLKyqDnOdFY=", + "subject": "CN=DigiCert Secure Site EV ECC CN CA G3,O=DigiCert Inc,C=US", + "subjectDN": "MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIEVDQyBDTiBDQSBHMw==", + "whitelist": false, + "attachment": { + "hash": "a7fa291c8bd1e5f516449f8bf1e2e1e6ed6a6787c5bb8d4c1f598dbdca33c9b0", + "size": 1370, + "filename": "k53DKcmdvTrcweDtMvf_MKTy3iBxavrlU-riK2LCoiQ=.pem", + "location": "security-state-staging/intermediates/21e6a7af-a62b-4d7d-bc91-ac39edf72464.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "k53DKcmdvTrcweDtMvf/MKTy3iBxavrlU+riK2LCoiQ=", + "crlite_enrolled": false, + "id": "65a20db5-6aec-4128-becd-1f0785604e3f", + "last_modified": 1664326624670 + }, + { + "schema": 1664326177186, + "derHash": "Hd/d+IPjlFsssk+luDeIN5xasFhCKrl532bHdHOYhoc=", + "subject": "CN=Aetna Inc. Secure EV CA2,O=Aetna Inc,C=US", + "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxITAfBgNVBAMTGEFldG5hIEluYy4gU2VjdXJlIEVWIENBMg==", + "whitelist": false, + "attachment": { + "hash": "859a201e0fac44519f77ae49c0f51dee2114dc1024e819f2e0334a11277777b6", + "size": 1626, + "filename": "u6NyIqjq8NgZ5VkAyKFRk6mJ-QeTmwgG2SNmXrkK7vE=.pem", + "location": "security-state-staging/intermediates/1e7b3b95-827d-4d57-82a5-e199120f0c80.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "u6NyIqjq8NgZ5VkAyKFRk6mJ+QeTmwgG2SNmXrkK7vE=", + "crlite_enrolled": false, + "id": "619763a5-936b-43f0-a9b5-02ee67969939", + "last_modified": 1664326624662 + }, + { + "schema": 1664326173666, + "derHash": "VIN+97WsSqI2BqFe8w3kbpu34j5g9u1PJhIJK5Ttxo8=", + "subject": "CN=Data Management Intermediate Certificate Authority,OU=Fresenius Kabi USA,O=Fresenius Kabi AG,C=US", + "subjectDN": "MIGDMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRRnJlc2VuaXVzIEthYmkgQUcxGzAZBgNVBAsTEkZyZXNlbml1cyBLYWJpIFVTQTE7MDkGA1UEAxMyRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHk=", + "whitelist": false, + "attachment": { + "hash": "5f33b8e38e004c1bcf92ca76d838dc3425c380684d74f76383bf32507d3b373b", + "size": 1748, + "filename": "6tOYk51VDHXklgQiMTHvUHAqQsHRj8do_RweZi812do=.pem", + "location": "security-state-staging/intermediates/1e03ffa2-edb9-4ff0-8da4-3b5f2e8d2adb.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "6tOYk51VDHXklgQiMTHvUHAqQsHRj8do/RweZi812do=", + "crlite_enrolled": false, + "id": "74784f65-5c79-4f63-a6ad-550cca4f2f09", + "last_modified": 1664326624655 + }, + { + "schema": 1664326166594, + "derHash": "RYRGunXZMukU8jwrV7fRku3bwhgdlY4Rga1SUXR6Hug=", + "subject": "CN=DigiCert ECC Secure Server CA,O=DigiCert Inc,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEVDQyBTZWN1cmUgU2VydmVyIENB", + "whitelist": false, + "attachment": { + "hash": "a08faded51b3b3920af25497e34885fc9fd376487470bebe6e0fd0db256b786a", + "size": 1333, + "filename": "PZXN3lRAy-8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=.pem", + "location": "security-state-staging/intermediates/7f8f54d6-880c-4f5e-90c5-43950f09297f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "PZXN3lRAy+8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=", + "crlite_enrolled": false, + "id": "bb0f20bc-ccc7-4c44-bd16-0b2a94e64928", + "last_modified": 1664326624647 + }, + { + "schema": 1664326165731, + "derHash": "jNco+cM5G6Q2ChDGbKSEyAdlHWIH8QYzZp7YiB/pG/U=", + "subject": "CN=CrowdStrike Global EV CA,O=CrowdStrike\\, Inc.,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFDcm93ZFN0cmlrZSwgSW5jLjEhMB8GA1UEAxMYQ3Jvd2RTdHJpa2UgR2xvYmFsIEVWIENB", + "whitelist": false, + "attachment": { + "hash": "9b5c4a4e56ffd2b307e3d885b93974df259d6d3078a6cb8b62255938c5699acc", + "size": 1853, + "filename": "jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=.pem", + "location": "security-state-staging/intermediates/71284bdb-5ea9-45fd-b39d-5d2276fd9a69.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=", + "crlite_enrolled": false, + "id": "9f2181fb-5b32-47d6-bf49-0be6c67443bc", + "last_modified": 1664326624639 + }, + { + "schema": 1664326167466, + "derHash": "dWqrkA4/XHYnNLZGH8MqndNB6h1KBCg0CSM8OXh6hn4=", + "subject": "CN=TrustAsia ECC OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzM=", + "whitelist": false, + "attachment": { + "hash": "8564399a58a7811f26e479caae21b5f77ae21c29c2437ce4beb5513b9e3de582", + "size": 1353, + "filename": "tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=.pem", + "location": "security-state-staging/intermediates/cbe6cf22-b14f-456d-a243-29fcbe5c9a1d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=", + "crlite_enrolled": false, + "id": "1c958fea-9fe7-4d5d-9426-7e71145da173", + "last_modified": 1664326624632 + }, + { + "schema": 1664326162226, + "derHash": "sayM+xgbnJNU4Xdfy9/P54mMXMmhfXYxW1fBEu7lUjQ=", + "subject": "CN=Encryption Everywhere DV TLS CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMg==", + "whitelist": false, + "attachment": { + "hash": "49370e3f9e272d741b015bb0f388957f4be2003f0e4924f2f5cebddcd1b42d0c", + "size": 1678, + "filename": "gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX-qzRMqb9Xoa1w=.pem", + "location": "security-state-staging/intermediates/34d38b55-811e-4b86-a485-32393b601f16.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX+qzRMqb9Xoa1w=", + "crlite_enrolled": false, + "id": "b2ad50e8-e510-4188-a4f8-c309b7af13bd", + "last_modified": 1664326624624 + }, + { + "schema": 1664326164856, + "derHash": "Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=", + "subject": "CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US", + "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=", + "whitelist": false, + "attachment": { + "hash": "b839f43495e3f321b12bbfe130f086ea35ee864d4a5ceca9ed004b7e9dbbc308", + "size": 1788, + "filename": "nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem", + "location": "security-state-staging/intermediates/8c91bc67-eed9-4106-b8ff-3e5ecf5c9a42.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=", + "crlite_enrolled": false, + "id": "7b8e9431-837e-4864-85de-908b4ef19fdb", + "last_modified": 1664326624616 + }, + { + "schema": 1664326160413, + "derHash": "dayOQdmnzHWNOZj+Aw9jjP0ohVgj2k6bVpVM+94FTrY=", + "subject": "CN=DigiCert Trust Service CA,O=DigiCert Inc,C=US", + "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgQ0E=", + "whitelist": false, + "attachment": { + "hash": "2cdb77056933d8338bc8866b5ecff0e170017a177389a08f90e006944f493763", + "size": 1849, + "filename": "gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=.pem", + "location": "security-state-staging/intermediates/c3d8c6c2-c88d-4044-bbab-49790345e058.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=", + "crlite_enrolled": false, + "id": "fe1d12b7-de18-4a6e-97ce-f5e1549c8d94", + "last_modified": 1664326624609 + }, + { + "schema": 1664326164006, + "derHash": "TzXGucEAkF/yW7AcCiDr4zW87vJJzp/6HhHgYu1m/NE=", + "subject": "CN=DigiCert Trusted G4 TLS RSA SHA384 2020 CA1,O=DigiCert Inc,C=US", + "subjectDN": "MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IFRydXN0ZWQgRzQgVExTIFJTQSBTSEEzODQgMjAyMCBDQTE=", + "whitelist": false, + "attachment": { + "hash": "5aa778206c7c0b1741ee853b137b342e94f534e7dc76cb2cb633e765794482aa", + "size": 2479, + "filename": "rjm2hHKNhSnI_7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=.pem", + "location": "security-state-staging/intermediates/f16ac849-dc79-4e52-86e4-1d37645c80e1.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "rjm2hHKNhSnI/7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=", + "crlite_enrolled": false, + "id": "1da54348-1704-4aa9-9838-0b4eaf56c560", + "last_modified": 1664326624601 + }, + { + "schema": 1664326159535, + "derHash": "efH1q2l96/GV9bfaZflTmWgu2uuAEVudQqauXi+piAI=", + "subject": "CN=TrustAsia TLS RSA CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBSU0EgQ0E=", + "whitelist": false, + "attachment": { + "hash": "2183fa940cb572e989ab42bf28fb1650ee490ea6b489a8a33ee79f8da8469c5f", + "size": 1683, + "filename": "jzqM6_58ozsPRvxUzg0hzjM-GcfwhTbU_G0TCDvL7hU=.pem", + "location": "security-state-staging/intermediates/d080816c-1351-444e-aade-24ed8f586175.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "jzqM6/58ozsPRvxUzg0hzjM+GcfwhTbU/G0TCDvL7hU=", + "crlite_enrolled": false, + "id": "81c5622c-3704-493d-99fb-ed0d34e22d8b", + "last_modified": 1664326624594 + }, + { + "schema": 1664326161324, + "derHash": "GFwK5HBCO51GeKfBBVtbSNkHBVBbeU4hXAY4UTNpgfQ=", + "subject": "CN=GeoTrust EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIFJTQSBDQSAyMDE4", + "whitelist": false, + "attachment": { + "hash": "7ce3818537ba21f0f1da583e8a25789be009298c8e9c98b1d577c9037018b892", + "size": 1666, + "filename": "yWulDX8E5Q0XG4-9jVDljmO2FvAVzIRhn2MppW4vyUM=.pem", + "location": "security-state-staging/intermediates/32aafacb-ac6b-4e0a-b1e4-74b264fd4d66.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "yWulDX8E5Q0XG4+9jVDljmO2FvAVzIRhn2MppW4vyUM=", + "crlite_enrolled": false, + "id": "8851be6c-6d3b-4b1c-9ca9-48820b97907f", + "last_modified": 1664326624586 + }, + { + "schema": 1664326163121, + "derHash": "LarG/frBbFSMU/8RmCVNfpN3YdIqHnzFwalGLpcUYfU=", + "subject": "CN=TrustAsia ECC EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", + "subjectDN": "MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0E=", + "whitelist": false, + "attachment": { + "hash": "a6577abedadd81611cdd084175ee766bb0beb264bf534578885e388b60a5d03c", + "size": 1427, + "filename": "FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=.pem", + "location": "security-state-staging/intermediates/3a6083c3-d893-43ac-bd9f-fe6697293aa1.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=", + "crlite_enrolled": false, + "id": "965bbebb-8d9d-4cf8-9ae2-c42ab5322276", + "last_modified": 1664326624578 + }, + { + "schema": 1664326156910, + "derHash": "z3z6T528y8ptIO/evq1OFzs052vaHrHmGfROBulfwgg=", + "subject": "CN=Wells Fargo Public Trust Certification Authority 01 G2,OU=Organization Validated TLS,O=Wells Fargo & Company,C=US", + "subjectDN": "MIGTMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVV2VsbHMgRmFyZ28gJiBDb21wYW55MSMwIQYDVQQLExpPcmdhbml6YXRpb24gVmFsaWRhdGVkIFRMUzE/MD0GA1UEAxM2V2VsbHMgRmFyZ28gUHVibGljIFRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDAxIEcy", + "whitelist": false, + "attachment": { + "hash": "a8a1ec42719c782ae44d78633be9e4daddc709bf1127ec155bae81e252f5ae6f", + "size": 1727, + "filename": "piL8cJbKkJ2PJeful08_TUBtZu6QcnuC-5qgNu13n_c=.pem", + "location": "security-state-staging/intermediates/3560b6a7-ac40-4c0b-ab01-ba7caf4f697e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "piL8cJbKkJ2PJeful08/TUBtZu6QcnuC+5qgNu13n/c=", + "crlite_enrolled": false, + "id": "2bc76535-9629-4fc1-bc41-f1ed5be342aa", + "last_modified": 1664326624571 + }, + { + "schema": 1664326157758, + "derHash": "QNaZIOoFRW+gEX3mCLioATeQtUIJfjQ+wcvOLfuXE7A=", + "subject": "CN=Secure Site Pro Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENBIEcy", + "whitelist": false, + "attachment": { + "hash": "3ecbe428b438a6837ddb6322b9cc1b5b106b0455f84524312b3c78988886d32c", + "size": 1703, + "filename": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem", + "location": "security-state-staging/intermediates/f0c0b7b4-8372-40d6-966a-c4db8084c76c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=", + "crlite_enrolled": false, + "id": "ad0355f7-e30a-4644-b92c-d6853b951ef5", + "last_modified": 1664326624563 + }, + { + "schema": 1664326158618, + "derHash": "TFbKejwQ61h2Xg/8+ANcV8nzvbAUhi9nZ1bPeJGT8Q4=", + "subject": "CN=Sonavation IoT CA,OU=sonavation.com,O=Sonavation\\, Inc.,C=US", + "subjectDN": "MF0xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBTb25hdmF0aW9uLCBJbmMuMRcwFQYDVQQLEw5zb25hdmF0aW9uLmNvbTEaMBgGA1UEAxMRU29uYXZhdGlvbiBJb1QgQ0E=", + "whitelist": false, + "attachment": { + "hash": "9435c16f54620272aec7d7abc3dd2a3ba91eb56527a23274814bcb29a44b2632", + "size": 1695, + "filename": "vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=.pem", + "location": "security-state-staging/intermediates/d3c84332-b918-41de-8190-89370390db4d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=", + "crlite_enrolled": false, + "id": "8d518eb7-5f35-46c4-b927-8b7aac8c0ff9", + "last_modified": 1664326624555 + }, + { + "schema": 1664326156061, + "derHash": "/BbVMgO9kYfWnMmdLaVRB2tNyymBQNZ1H3oBKWbJn90=", + "subject": "CN=RapidSSL TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", + "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBFQ0MgQ0EgRzE=", + "whitelist": false, + "attachment": { + "hash": "40dd078660f4e1d87d7b968c85f05309892ef31efbc7a7838b082de02aed4837", + "size": 1199, + "filename": "cBtUiO-mwdgMfNeEp_qKuEHswRn2nHp2FDUKVi_aTDw=.pem", + "location": "security-state-staging/intermediates/1dd32622-340e-4668-88c0-f66a190b9524.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "cBtUiO+mwdgMfNeEp/qKuEHswRn2nHp2FDUKVi/aTDw=", + "crlite_enrolled": false, + "id": "4263bbf6-d71d-487f-a3e5-52d926e62fca", + "last_modified": 1664326624547 + }, + { + "schema": 1664326155179, + "derHash": "w2g/fZF1Qhna2k6Nww5LGL05KLU9Ork9BzhLxYcc41U=", + "subject": "CN=Cybertrust Japan Secure Server ECC CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", + "subjectDN": "MGIxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEuMCwGA1UEAxMlQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIEVDQyBDQQ==", + "whitelist": false, + "attachment": { + "hash": "337fa733767ef0fd0ae9adf061a38f5935257e34b75ef029ff02def23a16f3b3", + "size": 1187, + "filename": "QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT_YKfPuvVU=.pem", + "location": "security-state-staging/intermediates/cb286769-4d82-4701-9ab8-f98e717410d3.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT/YKfPuvVU=", + "crlite_enrolled": false, + "id": "03b85d50-3c41-4be8-9a58-73e7c7b953a6", + "last_modified": 1664326624540 + }, + { + "schema": 1664326154269, + "derHash": "4b5ru7cPWiQec2/ETGohYL9s4ZuV7dZ7976JboN3h0U=", + "subject": "CN=TERENA eScience SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", + "subjectDN": "MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIGVTY2llbmNlIFNTTCBDQSAz", + "whitelist": false, + "attachment": { + "hash": "a08076a84bc8fe3155ddd8623e80fc94436c26827325f7ef4693220388fe0c0f", + "size": 1800, + "filename": "mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=.pem", + "location": "security-state-staging/intermediates/e3b599ad-6468-4e78-8fb0-d42803115117.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=", + "crlite_enrolled": false, + "id": "a1dac4ca-f74a-4c2a-82ab-dbee042b2786", + "last_modified": 1664326624531 + }, + { + "schema": 1664304522729, + "derHash": "51J+MNRzrsOxYq/cRwlUSdLdVJTOhi4v5PQ2wIEmL2Q=", + "subject": "CN=OCLC TLS Issuing RSA SubCA R1,O=OCLC\\, Inc.,C=US", + "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRMwEQYDVQQKDApPQ0xDLCBJbmMuMSYwJAYDVQQDDB1PQ0xDIFRMUyBJc3N1aW5nIFJTQSBTdWJDQSBSMQ==", + "whitelist": false, + "attachment": { + "hash": "74519fb4995ca1b2049180b68d90a199ba04b9dabb7186f66757c28da53399c0", + "size": 2259, + "filename": "tTLcUlxB7HbXqllccmThZ_W_11UBXG64FVmg6DZPdxk=.pem", + "location": "security-state-staging/intermediates/d9f43f3d-7853-4c74-809e-967155bfb50e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "tTLcUlxB7HbXqllccmThZ/W/11UBXG64FVmg6DZPdxk=", + "crlite_enrolled": false, + "id": "d935f49f-3ba2-4703-828e-55e1c411f582", + "last_modified": 1664305023209 + }, + { + "schema": 1664110623557, + "derHash": "XqOFfqzUx8pay8qcRifibzByA40ZGinUw/lGSy5fAMY=", + "subject": "CN=Microsoft RSA TLS Issuing EOC CA 01,O=Microsoft Corporation,C=US", + "subjectDN": "MFsxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLDAqBgNVBAMTI01pY3Jvc29mdCBSU0EgVExTIElzc3VpbmcgRU9DIENBIDAx", + "whitelist": false, + "attachment": { + "hash": "c4cf08af2dd2b1f29bdfb63d83a5482200edf35471b1453a302294b55f3068d5", + "size": 2694, + "filename": "Hx2OdoXOglUIj3kb_T-5J_UKwQBwkbW7wzR--8XZqAw=.pem", + "location": "security-state-staging/intermediates/81ce4311-98c7-4368-b741-d59fdfeee0b5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Hx2OdoXOglUIj3kb/T+5J/UKwQBwkbW7wzR++8XZqAw=", + "crlite_enrolled": false, + "id": "85bb3b93-bc7b-4813-bd54-54de9d3a4778", + "last_modified": 1664240223214 + }, { "schema": 1663959423669, "derHash": "tl/mob8tUv9ot9Pp0PBrMAocPySDCbcEBcp73sBUvd0=", @@ -5148,24 +8622,6 @@ "id": "6831d020-be6b-40ae-bcf0-87582137009e", "last_modified": 1663333023134 }, - { - "schema": 1663332648407, - "derHash": "my3U++6UH2UQ9xbASWmzZCiJJ2VGFwHvR9QbMolHXVA=", - "subject": "CN=DigiCert Global CA-3 G2,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEgMB4GA1UEAxMXRGlnaUNlcnQgR2xvYmFsIENBLTMgRzI=", - "whitelist": false, - "attachment": { - "hash": "757579da2f6f9930d26c82c4e92bc05ec07c1fcce3e1ee174551ff91391a2bd3", - "size": 1662, - "filename": "Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=.pem", - "location": "security-state-staging/intermediates/d3883f37-bd4a-41ad-8203-298556b22bf4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=", - "crlite_enrolled": false, - "id": "ec6de765-7e2e-48d2-89d5-fa17988865eb", - "last_modified": 1663333023123 - }, { "schema": 1663292934087, "derHash": "yX42zr8VgKsb2tYcHVOwXHWBnoXZNyFL5oTIWbItReA=", @@ -5310,42 +8766,6 @@ "id": "9e0c4d64-984d-43a7-bce2-36a26101fe95", "last_modified": 1662620223051 }, - { - "schema": 1662469023493, - "derHash": "aZGdgg7fWCrbz44JKpKE2QF3LuK0Geqd4fWHLHkfxvo=", - "subject": "CN=Thawte EV RSA CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBSU0EgQ04gQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "ce1818d94d078e469bacac8ce640901ec6f9ef4e08ee8ed1295da929ca3f4723", - "size": 1626, - "filename": "5jGxIiaHNj15fBcUBvvAsMfKNtiK_podXNf0YoRUoeI=.pem", - "location": "security-state-staging/intermediates/f5157a19-89e9-4513-9b51-b540e430b34c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5jGxIiaHNj15fBcUBvvAsMfKNtiK/podXNf0YoRUoeI=", - "crlite_enrolled": false, - "id": "e05d537c-e98a-4c16-8476-344896c66748", - "last_modified": 1662515823091 - }, - { - "schema": 1662043010551, - "derHash": "fAkS5d6EeLuG6OpGulrmXcOHC878vC9GeV7uz2SM++c=", - "subject": "CN=DigiCert Extended Validation CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "a9b8d926d5c6840a9c7cfbb16d22ea65f23628c6fdb4af615cb30e7d3ceaa1f1", - "size": 1158, - "filename": "26Ut6iLcm-3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=.pem", - "location": "security-state-staging/intermediates/d9eb8ff7-9305-49b0-b4e6-9b4a86ebd7f6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "26Ut6iLcm+3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=", - "crlite_enrolled": false, - "id": "afc3f6a7-6865-4035-9978-68f1eaa2e5dc", - "last_modified": 1662469023022 - }, { "schema": 1661950129116, "derHash": "EiGqtgN56f55kJqhCNwcLT/DEvZxy0vN4BxOZ9fnwIw=", @@ -5454,60 +8874,6 @@ "id": "cbf4b97a-4484-4add-84fe-5fa8e074c83e", "last_modified": 1661950623184 }, - { - "schema": 1661950130979, - "derHash": "DVG2zc80qfIhRHh/P9kg3IgA+2BJC/yNKJoZU+D72k0=", - "subject": "CN=TrustAsia EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "8410138c0818efe36c3c5e447194465f2a0b00c3453529916ca8fa0c0abaf130", - "size": 1670, - "filename": "JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem", - "location": "security-state-staging/intermediates/622cc492-e266-42bf-8807-edd1fafd23b3.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=", - "crlite_enrolled": false, - "id": "0188e712-0f9b-4e95-8c28-48e3eaae9945", - "last_modified": 1661950623173 - }, - { - "schema": 1661950131120, - "derHash": "jNco+cM5G6Q2ChDGbKSEyAdlHWIH8QYzZp7YiB/pG/U=", - "subject": "CN=CrowdStrike Global EV CA,O=CrowdStrike\\, Inc.,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFDcm93ZFN0cmlrZSwgSW5jLjEhMB8GA1UEAxMYQ3Jvd2RTdHJpa2UgR2xvYmFsIEVWIENB", - "whitelist": false, - "attachment": { - "hash": "aeae72b6b6e2f2f8a2aa8ada26064ad98f11711c82a084d34471dd8ada45bc94", - "size": 1853, - "filename": "jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=.pem", - "location": "security-state-staging/intermediates/983271b4-b453-4809-8582-3af405f54fdc.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=", - "crlite_enrolled": false, - "id": "edfeea6f-0f8a-4a58-a196-634c0ea181e0", - "last_modified": 1661950623163 - }, - { - "schema": 1661950130824, - "derHash": "Sv/k/vOUZNF4jGYK9ZHV5gGyYcSBHfCj3Z1hyv6OXtg=", - "subject": "CN=TrustAsia EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgRVYgVExTIFBybyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "9a34bc6ed9a54f81e18afe77e80e21229b781d54bc55db04519ecea2fb3e30f4", - "size": 1658, - "filename": "JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem", - "location": "security-state-staging/intermediates/50647d00-cffd-4a34-99f4-97db530d09bd.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=", - "crlite_enrolled": false, - "id": "58b5207a-569c-440d-b868-afae280ff8f2", - "last_modified": 1661950623152 - }, { "schema": 1661906933349, "derHash": "Zo+7JXQ1z23AEzmvCycq0Vz0Z2d2ooYc2ve0tZi/8Wk=", @@ -6120,24 +9486,6 @@ "id": "b7d934aa-0f81-4c1f-8dfb-ba992f219852", "last_modified": 1661374623282 }, - { - "schema": 1661374125013, - "derHash": "XqOFfqzUx8pay8qcRifibzByA40ZGinUw/lGSy5fAMY=", - "subject": "CN=Microsoft RSA TLS Issuing EOC CA 01,O=Microsoft Corporation,C=US", - "subjectDN": "MFsxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLDAqBgNVBAMTI01pY3Jvc29mdCBSU0EgVExTIElzc3VpbmcgRU9DIENBIDAx", - "whitelist": false, - "attachment": { - "hash": "c4cf08af2dd2b1f29bdfb63d83a5482200edf35471b1453a302294b55f3068d5", - "size": 2694, - "filename": "Hx2OdoXOglUIj3kb_T-5J_UKwQBwkbW7wzR--8XZqAw=.pem", - "location": "security-state-staging/intermediates/81ce4311-98c7-4368-b741-d59fdfeee0b5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Hx2OdoXOglUIj3kb/T+5J/UKwQBwkbW7wzR++8XZqAw=", - "crlite_enrolled": true, - "id": "85bb3b93-bc7b-4813-bd54-54de9d3a4778", - "last_modified": 1661374623270 - }, { "schema": 1661370832250, "derHash": "Uzjr7I+yrGCZYSbT52qjT9DzMYrHjrt6yPbxNh9ISzM=", @@ -6156,24 +9504,6 @@ "id": "efefd1fe-25c9-48a0-acda-ad37cb8c5d63", "last_modified": 1661371063389 }, - { - "schema": 1660265823834, - "derHash": "VIN+97WsSqI2BqFe8w3kbpu34j5g9u1PJhIJK5Ttxo8=", - "subject": "CN=Data Management Intermediate Certificate Authority,OU=Fresenius Kabi USA,O=Fresenius Kabi AG,C=US", - "subjectDN": "MIGDMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRRnJlc2VuaXVzIEthYmkgQUcxGzAZBgNVBAsTEkZyZXNlbml1cyBLYWJpIFVTQTE7MDkGA1UEAxMyRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHk=", - "whitelist": false, - "attachment": { - "hash": "e31d3bb304fdcef75199ff47761dd7a91e1a654cedec5485da203640dc0eee39", - "size": 1748, - "filename": "6tOYk51VDHXklgQiMTHvUHAqQsHRj8do_RweZi812do=.pem", - "location": "security-state-staging/intermediates/941016f3-c0dc-47ea-8440-1a189d509dbf.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "6tOYk51VDHXklgQiMTHvUHAqQsHRj8do/RweZi812do=", - "crlite_enrolled": false, - "id": "1e9a1998-a52f-498c-8217-0418e4aaeb12", - "last_modified": 1660654623240 - }, { "schema": 1660265332073, "derHash": "rXtYw8XZWGvltieZwnksQRHJhSqW97BgciEmVxOVfhw=", @@ -6282,24 +9612,6 @@ "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2", "last_modified": 1660265823282 }, - { - "schema": 1660160251622, - "derHash": "/AG1j8eLnFkhF4TC4lvx0BKh4j8zchiEemLrQUXuSrY=", - "subject": "CN=GeoTrust EV ECC CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIEVDQyBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "a71cb7825b1dcf648f03a80a46f1bd37d9455ca249fb68a85c6ecf9a15848e99", - "size": 1370, - "filename": "aDb4btQIVH2hsyd4IxUsJGinBpyh-phY6PF4IHasdAw=.pem", - "location": "security-state-staging/intermediates/c09c55b5-14e7-4603-a7a9-e7c0bc70e59b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "aDb4btQIVH2hsyd4IxUsJGinBpyh+phY6PF4IHasdAw=", - "crlite_enrolled": false, - "id": "4efbcf92-bf3d-47eb-a092-4b861635e97f", - "last_modified": 1660179423123 - }, { "schema": 1659747423666, "derHash": "PzHbdYKNqpbk3luCoGeP4gI71bJGw/klDL9nGOEJWPU=", @@ -6390,42 +9702,6 @@ "id": "b2b75b02-f724-47d0-b1fb-6d20723bca10", "last_modified": 1659488223102 }, - { - "schema": 1659487717752, - "derHash": "vmoNnh0RXyKT9qvxGz7I6ILiRCbu6wmqpQNZeZPneiU=", - "subject": "CN=TERENA SSL High Assurance CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", - "subjectDN": "MHMxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEnMCUGA1UEAxMeVEVSRU5BIFNTTCBIaWdoIEFzc3VyYW5jZSBDQSAz", - "whitelist": false, - "attachment": { - "hash": "effd0b7540a7b55bbbeb9e6a80bcdbd3b388bcd57d806539c76f81519c9d7595", - "size": 1752, - "filename": "XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx-hQBmJ54WmCs=.pem", - "location": "security-state-staging/intermediates/1bbb351c-9d45-49c1-b318-f589af9d1196.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx+hQBmJ54WmCs=", - "crlite_enrolled": false, - "id": "181cc0ed-5e29-45f4-8d8a-642c6de7cd5e", - "last_modified": 1659488223090 - }, - { - "schema": 1659337023517, - "derHash": "eGeq6QXrjVVjX/67v4zwWmO5s5BmXeI2esEHPpKRNyg=", - "subject": "CN=Thawte CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHDAaBgNVBAMTE1RoYXd0ZSBDTiBSU0EgQ0EgRzE=", - "whitelist": false, - "attachment": { - "hash": "6abb2fa6476c1d938c58f7d3648720a6cb3239b7fc026f82046b76d081192231", - "size": 1825, - "filename": "VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=.pem", - "location": "security-state-staging/intermediates/1ff4f374-cd06-4afa-af4e-4f8b3a444843.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=", - "crlite_enrolled": false, - "id": "f1601a66-8fd4-4b53-9279-cb7e19b76aa6", - "last_modified": 1659358623040 - }, { "schema": 1659055773370, "derHash": "AhXbfiLTbQ51NaEmkansDcf0PYOrWAwHCXEcHnqbVew=", @@ -6516,42 +9792,6 @@ "id": "00188779-96d0-4934-89ac-f7b56f182eef", "last_modified": 1658926623098 }, - { - "schema": 1658926112639, - "derHash": "Hd/d+IPjlFsssk+luDeIN5xasFhCKrl532bHdHOYhoc=", - "subject": "CN=Aetna Inc. Secure EV CA2,O=Aetna Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxITAfBgNVBAMTGEFldG5hIEluYy4gU2VjdXJlIEVWIENBMg==", - "whitelist": false, - "attachment": { - "hash": "e6068e6a00cb2a48657b0008e9ab5e6e47917580dc4400c9d7210b278ef98854", - "size": 1626, - "filename": "u6NyIqjq8NgZ5VkAyKFRk6mJ-QeTmwgG2SNmXrkK7vE=.pem", - "location": "security-state-staging/intermediates/0a4750b1-d9fb-4d20-8e86-0a6d40d82ece.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "u6NyIqjq8NgZ5VkAyKFRk6mJ+QeTmwgG2SNmXrkK7vE=", - "crlite_enrolled": false, - "id": "d84be73b-937b-4c91-b80e-a6cd1de6e276", - "last_modified": 1658926623087 - }, - { - "schema": 1658926112507, - "derHash": "1Gkx4Bgt1lXqDBbm3Zn45hr/5AH3NMbKjqAFapaOr4E=", - "subject": "CN=DigiCert Baltimore EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEJhbHRpbW9yZSBFViBDQQ==", - "whitelist": false, - "attachment": { - "hash": "71b566b9248c134842c94e190eb959e767923e037257d37b3e855d67a010ab2d", - "size": 1577, - "filename": "VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=.pem", - "location": "security-state-staging/intermediates/fb866139-1efa-47a1-b0a2-afca62bb7d30.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=", - "crlite_enrolled": false, - "id": "3395f234-9055-4caa-a4d5-11b4a7f375a3", - "last_modified": 1658926623075 - }, { "schema": 1658342923546, "derHash": "XLiObv8xXidXRbPHKIBkpWFCqz75rHBn8bs9KY+675U=", @@ -7020,78 +10260,6 @@ "id": "bc4939de-dfcf-4dba-ba83-ac8dada019cc", "last_modified": 1657544223180 }, - { - "schema": 1657327855850, - "derHash": "l6BzlXxYEnJXV2cvIiaQZVoUB9cQEe38iy+txRKJEdo=", - "subject": "CN=DigiCert G5 TLS ECC SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEsMCoGA1UEAxMjRGlnaUNlcnQgRzUgVExTIEVDQyBTSEEzODQgMjAyMSBDQTE=", - "whitelist": false, - "attachment": { - "hash": "9eb481f1157b0baaa48f602daf152e10e0fc228f4ab7b83fda06babe8c5abc5f", - "size": 1244, - "filename": "LsOdqDFw3goo_G8jjeEPxe-JSJ7aFp1RF5Ih4_2ZvFY=.pem", - "location": "security-state-staging/intermediates/45da7c6c-9db4-4476-b93f-5e6894f5845d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "LsOdqDFw3goo/G8jjeEPxe+JSJ7aFp1RF5Ih4/2ZvFY=", - "crlite_enrolled": true, - "id": "44ca8696-e2ef-4cf7-9535-6b70fad863bf", - "last_modified": 1657328223872 - }, - { - "schema": 1657327855489, - "derHash": "xicKFQaR++GQ2DH1E5vf7s97KYtPoMoXMGpp1+kee6I=", - "subject": "CN=DigiCert G5 TLS RSA4096 SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEwMC4GA1UEAxMnRGlnaUNlcnQgRzUgVExTIFJTQTQwOTYgU0hBMzg0IDIwMjEgQ0Ex", - "whitelist": false, - "attachment": { - "hash": "59bcc8f72267f3ac1ae6611dd3fd284b13be7d0a25337329afd256112fed80c3", - "size": 2393, - "filename": "5R0B4UlPeqmGgtewU9-0QUYDvO9-UNN4YyL8SiHOYVo=.pem", - "location": "security-state-staging/intermediates/8d488ec5-7732-4cdb-8223-954f233db995.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5R0B4UlPeqmGgtewU9+0QUYDvO9+UNN4YyL8SiHOYVo=", - "crlite_enrolled": true, - "id": "06f0c879-d539-468a-a8e6-d77712b63d12", - "last_modified": 1657328223860 - }, - { - "schema": 1657327853670, - "derHash": "75KWA2ptfJhsjVnbk2CT546FxwrttP56VN3KqCEDHHI=", - "subject": "CN=DigiCert G5 TLS RSA4096 SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEwMC4GA1UEAxMnRGlnaUNlcnQgRzUgVExTIFJTQTQwOTYgU0hBMzg0IDIwMjEgQ0Ex", - "whitelist": false, - "attachment": { - "hash": "b064463123ba3b32b8ed5b4240e35edce73dc5b88120d7d9ca0c095b9b9e5b37", - "size": 2377, - "filename": "5R0B4UlPeqmGgtewU9-0QUYDvO9-UNN4YyL8SiHOYVo=.pem", - "location": "security-state-staging/intermediates/458772f4-e2eb-4132-af8b-75b21e27cc95.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5R0B4UlPeqmGgtewU9+0QUYDvO9+UNN4YyL8SiHOYVo=", - "crlite_enrolled": true, - "id": "416bfe99-f5e2-4621-96ec-6ab3db91a4fb", - "last_modified": 1657328223848 - }, - { - "schema": 1657327856212, - "derHash": "5aHBkZ476u5ZNahIXdzg4/AaJhjbDweTs9s9msLZZ8c=", - "subject": "CN=DigiCert G5 TLS ECC SHA384 2021 CA1,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEsMCoGA1UEAxMjRGlnaUNlcnQgRzUgVExTIEVDQyBTSEEzODQgMjAyMSBDQTE=", - "whitelist": false, - "attachment": { - "hash": "d6d07678bdf2373f188ca802b91ac8e7ab22538bb5477b13a1d7105da76a2330", - "size": 1223, - "filename": "LsOdqDFw3goo_G8jjeEPxe-JSJ7aFp1RF5Ih4_2ZvFY=.pem", - "location": "security-state-staging/intermediates/7803875c-6dba-434b-8c1b-0078c1237be1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "LsOdqDFw3goo/G8jjeEPxe+JSJ7aFp1RF5Ih4/2ZvFY=", - "crlite_enrolled": true, - "id": "59abd9bb-13d4-4597-8581-29860c1e8c33", - "last_modified": 1657328223836 - }, { "schema": 1657327856400, "derHash": "My+erjZQx3RUrxT+GmIaJJj9EodzZiiQoNEoNbNDbiM=", @@ -8604,24 +11772,6 @@ "id": "ef25e7fa-720b-412c-bf83-aba79dc2aa8e", "last_modified": 1656593823398 }, - { - "schema": 1656463729081, - "derHash": "cQAks3vZ8OFTfBikwg+aMcS0hdEkjGQ/ILTADzcWuoU=", - "subject": "CN=DigiCert EV Server CA G4,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCAgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBFViBTZXJ2ZXIgQ0EgRzQ=", - "whitelist": false, - "attachment": { - "hash": "bfda2140f26102c7934ae20783fd8234f2b2f5bbbfe9aa291f7d91bb80b6078a", - "size": 1951, - "filename": "rSOteFVbBeX8qJ_1s6WFayDHdgaEKLjbWQS5PZDkdvg=.pem", - "location": "security-state-staging/intermediates/5b85823c-270a-414c-ab27-7a62b77143d1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "rSOteFVbBeX8qJ/1s6WFayDHdgaEKLjbWQS5PZDkdvg=", - "crlite_enrolled": true, - "id": "66f62e6d-0c5f-4d24-80c0-b99829e532cb", - "last_modified": 1656464223243 - }, { "schema": 1656463728905, "derHash": "5Iksmktuk5Pr3+3LwvoHt8a0gKKRXGb0cJnm8v/pocU=", @@ -8892,24 +12042,6 @@ "id": "43a2c25b-7851-4031-bd23-1be3b5327e04", "last_modified": 1655600223161 }, - { - "schema": 1655189823484, - "derHash": "cDV7nlbT+zxsAJw4xxgUVMRikI37zm1U1g3+HlBuFP0=", - "subject": "CN=TrustAsia ECC OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "eef7786b39056fba3e747973ce4532b06a0cd3dc1326554703821b55ecdd5eff", - "size": 1406, - "filename": "zQ_SLNg_h_U_OTLMb3XQLYnyHZ7Y7Hk6_xyTVTSQekc=.pem", - "location": "security-state-staging/intermediates/48fd3053-a283-46d0-99e4-f89312258dce.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "zQ/SLNg/h/U/OTLMb3XQLYnyHZ7Y7Hk6/xyTVTSQekc=", - "crlite_enrolled": false, - "id": "24ff0be6-616b-4ad5-8017-005dbb310bf7", - "last_modified": 1655301423076 - }, { "schema": 1655189537975, "derHash": "Du8FvaeELqhdHZgSSV78VhKDuqkNFDHFed1h9+2SaaE=", @@ -9324,24 +12456,6 @@ "id": "5e15deb4-1340-4b98-b021-7c82087df0ad", "last_modified": 1653188230063 }, - { - "schema": 1652723070188, - "derHash": "2n5XePYvh2Vbj9JKieZR5XMp3JwHZacRWM5WRDykTpU=", - "subject": "CN=DigiCert Extended Validation CA-3 G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MHAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEtMCsGA1UEAxMkRGlnaUNlcnQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQS0zIEcz", - "whitelist": false, - "attachment": { - "hash": "6844a48cc10ea1a880af9e0aea02a3fc4be2786b3ce299bd1644cd2fc49c1f64", - "size": 1187, - "filename": "epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t_u8=.pem", - "location": "security-state-staging/intermediates/5d0c77a4-ad61-4b2d-9500-0ed1ce697602.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t/u8=", - "crlite_enrolled": false, - "id": "9bd31525-cabf-4b0e-acc5-1952d08e7761", - "last_modified": 1652759882916 - }, { "schema": 1652389030686, "derHash": "ayP62JAYDDN7hkFV2uDem62e8L2njREvLL3D0CrReVY=", @@ -9558,42 +12672,6 @@ "id": "12dc1ddf-21cf-48f3-a951-66c500745442", "last_modified": 1651244233936 }, - { - "schema": 1651222124525, - "derHash": "BwUxODzNEA0+nNlk2weqXoRaBoby6uO8imJ7GCBXsfE=", - "subject": "CN=WoTrus EV SSL Pro CA,O=WoTrus CA Limited,C=CN", - "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIEVWIFNTTCBQcm8gQ0E=", - "whitelist": false, - "attachment": { - "hash": "7be2ec04c8313dc05a7e0bef9687e9b6f04e6acceb8e83e4058ae0bf0657219d", - "size": 1845, - "filename": "rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=.pem", - "location": "security-state-staging/intermediates/f4f0a492-6a5c-4308-b805-eab6245a5ba8.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=", - "crlite_enrolled": true, - "id": "f5fb39d4-0676-418d-b95a-7e81cb7b1c0a", - "last_modified": 1651222638925 - }, - { - "schema": 1651222122870, - "derHash": "CQM/4jmW/kpZxMD1I9JWDjHf5MF9jqFAPUKalx9L1lo=", - "subject": "CN=WoTrus OV SSL Pro CA,O=WoTrus CA Limited,C=CN", - "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIE9WIFNTTCBQcm8gQ0E=", - "whitelist": false, - "attachment": { - "hash": "0e6c76a6d70346ff239c0a9320d8ebda8b750ae57610ff62a44fb8e221319a31", - "size": 1861, - "filename": "zACNb3_D6r-GIH58_Q4EDalNSChXFVVFbUJICvq7SIQ=.pem", - "location": "security-state-staging/intermediates/ec16d029-5557-4b00-ab92-a11542e604e1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "zACNb3/D6r+GIH58/Q4EDalNSChXFVVFbUJICvq7SIQ=", - "crlite_enrolled": true, - "id": "28706576-bf19-447f-a3fb-607bf06bf536", - "last_modified": 1651222638915 - }, { "schema": 1651222123920, "derHash": "nOYws1+K4sZBnnNK2dL6MEdt2ec5Sx6Tsn+D93agJOo=", @@ -9990,42 +13068,6 @@ "id": "a673a51c-cf7a-4f0e-8ef0-c30a6fcaf0c4", "last_modified": 1650963440119 }, - { - "schema": 1650962917391, - "derHash": "D7bOgJCdGa/uaojJWenpqmRmcVvOBcZEn+tTCghtrxQ=", - "subject": "CN=GeoTrust SupremeSSL EV 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL", - "subjectDN": "MGUxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xJDAiBgNVBAMTG0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBDQQ==", - "whitelist": false, - "attachment": { - "hash": "384493a25bd899d9fdf55deb2a362135f4ec8be8dc34518f6004cef3e417556c", - "size": 1691, - "filename": "uG3aQXLPd55q_z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=.pem", - "location": "security-state-staging/intermediates/370e6c55-8cba-4d1b-a1a2-2535eb0412c5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "uG3aQXLPd55q/z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=", - "crlite_enrolled": false, - "id": "bd4e50e6-67eb-40a4-b53a-8c09c55e45fe", - "last_modified": 1650963440110 - }, - { - "schema": 1650962916445, - "derHash": "L7qP6RVBUEmqlChXy1MTf/09nlpHsntXgtq5tNp9Yk0=", - "subject": "CN=GeoTrust SupremeSSL EV 1 ECC CA,OU=www.supremessl.com,O=SupremeSSL,C=NL", - "subjectDN": "MGkxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xKDAmBgNVBAMTH0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBFQ0MgQ0E=", - "whitelist": false, - "attachment": { - "hash": "41ecc5811611c2cca06c08009be39d0f651319e8cea2f6913a6d81897be776be", - "size": 1423, - "filename": "A97Lx6chFTH9FkG_Io5Uc5oemCnN0d8O2NjR9d-Pr0w=.pem", - "location": "security-state-staging/intermediates/fada1854-a866-45e7-b9e0-58346ba95e76.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "A97Lx6chFTH9FkG/Io5Uc5oemCnN0d8O2NjR9d+Pr0w=", - "crlite_enrolled": false, - "id": "6faea35d-2ca4-409c-94f4-f60003ea2e0f", - "last_modified": 1650963440091 - }, { "schema": 1650962915469, "derHash": "chMOOyiQA0khRhf01vP7hdCEde54vwlcWUWKFNGCiGY=", @@ -10746,24 +13788,6 @@ "id": "d1b5e055-c4f8-4f16-96cf-f0ef4ee6496e", "last_modified": 1649973509938 }, - { - "schema": 1649860690936, - "derHash": "d81ReEppPZSC5+ppTkBTvP2d9lWA+84UsqdSfAgYA+E=", - "subject": "CN=DigiCert Assured ID TLS CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENBIEcy", - "whitelist": false, - "attachment": { - "hash": "38c26b5824725648f58682db859677ed5f482b8a98476190e2f4b5cea965ce52", - "size": 1918, - "filename": "7DHaE3Q3dQ9k5S7DaYbXog4BK-Oj492ta3kc2xRJ04s=.pem", - "location": "security-state-staging/intermediates/84f2426b-c265-4fe5-8bcc-09e6d612433c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "7DHaE3Q3dQ9k5S7DaYbXog4BK+Oj492ta3kc2xRJ04s=", - "crlite_enrolled": false, - "id": "d8d54086-08a6-43e4-94b4-1d46de796b92", - "last_modified": 1649973509799 - }, { "schema": 1649861371015, "derHash": "E0XC05rktlzKceiOmispxx3JE/lS6TWoErAE26eueVc=", @@ -10944,24 +13968,6 @@ "id": "5db1751f-eb67-4a74-b38e-d17a823eed64", "last_modified": 1648695444528 }, - { - "schema": 1648694933779, - "derHash": "dOq1c9p9sZUJe+DpDzNJNMekyJ6Ag3WdtDM6AO3SQ9k=", - "subject": "CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex", - "whitelist": false, - "attachment": { - "hash": "11a50056d6027ba92a4d016bbdd72de6b8e7498171f12762ce2eda7a60762e6e", - "size": 1483, - "filename": "vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem", - "location": "security-state-staging/intermediates/7bf16759-da8d-43e0-b260-f55aac6a39b7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=", - "crlite_enrolled": false, - "id": "ce744321-7f4d-4f9c-9da1-63454f6d33bb", - "last_modified": 1648695444515 - }, { "schema": 1648543717132, "derHash": "smjRaTSrW6Iy8XnNn1x/wH6oWDpWqafB1stY/ggjv1o=", @@ -11448,258 +14454,6 @@ "id": "e0227843-5910-4bd0-adaa-01d35e7a7005", "last_modified": 1647406642091 }, - { - "schema": 1647406127910, - "derHash": "RCLpY+5TzVjMn4XNQL9f/sAJX98aFUU1ZhwcBrytxps=", - "subject": "CN=RapidSSL TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBSU0EgQ0EgRzE=", - "whitelist": false, - "attachment": { - "hash": "69d032f5f19ec96ac1d0f6f0b439e8d2c2bfd00ab74cdabf88312932bac1b34f", - "size": 1691, - "filename": "E3tYcwo9CiqATmKtpMLW5V-pzIq-ZoDmpXSiJlXGmTo=.pem", - "location": "security-state-staging/intermediates/9eebdfa1-1d2e-4e19-abdd-69d9d51be643.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "E3tYcwo9CiqATmKtpMLW5V+pzIq+ZoDmpXSiJlXGmTo=", - "crlite_enrolled": true, - "id": "f7aa6ee8-81ba-45d2-8cff-4314c6e506ad", - "last_modified": 1647406642057 - }, - { - "schema": 1647406129124, - "derHash": "GFwK5HBCO51GeKfBBVtbSNkHBVBbeU4hXAY4UTNpgfQ=", - "subject": "CN=GeoTrust EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIFJTQSBDQSAyMDE4", - "whitelist": false, - "attachment": { - "hash": "a0a4b49c90bff29d9b9a8c5f2ef42bb769f854311f7a16f1b9861161f8870867", - "size": 1666, - "filename": "yWulDX8E5Q0XG4-9jVDljmO2FvAVzIRhn2MppW4vyUM=.pem", - "location": "security-state-staging/intermediates/69bd0c27-8b17-47e6-8656-b35a53ad9631.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "yWulDX8E5Q0XG4+9jVDljmO2FvAVzIRhn2MppW4vyUM=", - "crlite_enrolled": true, - "id": "1cc0b067-f5fa-460a-b0ce-63e242f5c312", - "last_modified": 1647406642046 - }, - { - "schema": 1647406128086, - "derHash": "/BbVMgO9kYfWnMmdLaVRB2tNyymBQNZ1H3oBKWbJn90=", - "subject": "CN=RapidSSL TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBFQ0MgQ0EgRzE=", - "whitelist": false, - "attachment": { - "hash": "5ab29482e9032bced4020a6ffd28ba40b857897ed628b88bc1554bc73e84f763", - "size": 1199, - "filename": "cBtUiO-mwdgMfNeEp_qKuEHswRn2nHp2FDUKVi_aTDw=.pem", - "location": "security-state-staging/intermediates/154391f2-0f93-44b9-b118-5fc88dafa782.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "cBtUiO+mwdgMfNeEp/qKuEHswRn2nHp2FDUKVi/aTDw=", - "crlite_enrolled": true, - "id": "de84a7ad-8fc1-4cf5-96dd-67d123f93d29", - "last_modified": 1647406642024 - }, - { - "schema": 1647406128422, - "derHash": "wG4wf3z8HTL6cqTAM8h7kAGa8hbwd11kl4ouymyKIw4=", - "subject": "CN=GeoTrust TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBSU0EgQ0EgRzE=", - "whitelist": false, - "attachment": { - "hash": "79eaef52d1cceae208d6f4e81408cb6e81bd7358789d8d112f8acbab4bbf4f9c", - "size": 1638, - "filename": "SDG5orEv8iX6MNenIAxa8nQFNpROB_6-llsZdXHZNqs=.pem", - "location": "security-state-staging/intermediates/9987d215-bbb5-4e1e-8e50-33173b65ca32.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "SDG5orEv8iX6MNenIAxa8nQFNpROB/6+llsZdXHZNqs=", - "crlite_enrolled": true, - "id": "3a3c5d35-1116-4a25-9c6e-f43057fdd426", - "last_modified": 1647406642013 - }, - { - "schema": 1647406127393, - "derHash": "qDhAXrsD9d/Y1KlXKubg4/NW7E7BNDdaWdt7GV3D7EQ=", - "subject": "CN=GeoTrust TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBFQ0MgQ0EgRzE=", - "whitelist": false, - "attachment": { - "hash": "c0c946701c933eed603c99ac71fe696329ac344e1eb857450da9a3c6fc6b28e7", - "size": 1146, - "filename": "5UDBgr_RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=.pem", - "location": "security-state-staging/intermediates/9ec06331-3cbe-42b8-91ab-ca659d7ff6e1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5UDBgr/RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=", - "crlite_enrolled": true, - "id": "500a38fb-8a19-47cf-b4b5-4000d9bf8da1", - "last_modified": 1647406642002 - }, - { - "schema": 1647406128950, - "derHash": "OIPm3kkXpGtZTswtKsapXUPn6qjgiakfm8EE/xbfjeY=", - "subject": "CN=Secure Site Pro Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB", - "whitelist": false, - "attachment": { - "hash": "873a9affb573886082637d5874421893f652b55adfa77a32cb7cd76d35bb12b5", - "size": 1695, - "filename": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem", - "location": "security-state-staging/intermediates/809d29c1-5609-421a-be6f-b48dc16e8d28.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=", - "crlite_enrolled": true, - "id": "127c9f06-6f9a-4d9e-b4f9-e0f7b637cd96", - "last_modified": 1647406641991 - }, - { - "schema": 1647399296865, - "derHash": "S8xeI0/oHt5Or4g6oZwxM1sLJuheBmuZReTLYVPrIMI=", - "subject": "CN=Thawte TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgUlNBIENBIEcx", - "whitelist": false, - "attachment": { - "hash": "ab46e21b2e6e52647007f65c64b45ece54a6f9162bf19babfd723021d1ed126d", - "size": 1634, - "filename": "42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG-CipUmaM=.pem", - "location": "security-state-staging/intermediates/1acc8b9e-e1d0-4bbd-92ab-c45c37b76729.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG+CipUmaM=", - "crlite_enrolled": true, - "id": "763c82cc-5847-4f29-a81a-d189fde21751", - "last_modified": 1647406641979 - }, - { - "schema": 1647406126872, - "derHash": "01M7cypRim2mjvJmCF4R39EUwOsAks1DUwpE1UuRPtE=", - "subject": "CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB", - "whitelist": false, - "attachment": { - "hash": "93b4a44bb6fe2449a59754db745e41e1157b80bf49f3c2f364ac5f13eaca7195", - "size": 1662, - "filename": "3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem", - "location": "security-state-staging/intermediates/179c0ac1-bf62-4ad7-8373-95d6baefb9a3.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=", - "crlite_enrolled": true, - "id": "4353f974-e604-4be1-b7e8-63cd2a9fe2c7", - "last_modified": 1647406641968 - }, - { - "schema": 1647406128251, - "derHash": "AJhxw6TGBzEeWukvAQlfm/dhALh5SrCppSEOZ5TIYHw=", - "subject": "CN=Trust Provider B.V. TLS RSA CA G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL", - "subjectDN": "MHYxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEqMCgGA1UEAxMhVHJ1c3QgUHJvdmlkZXIgQi5WLiBUTFMgUlNBIENBIEcx", - "whitelist": false, - "attachment": { - "hash": "be93cbc768b2a781054d69b3d1b32596d09aabb573a067ff44e5770bc18fb99e", - "size": 1687, - "filename": "DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN_FbGZLM=.pem", - "location": "security-state-staging/intermediates/f158c5a3-4e14-476d-a5ac-d85b7f4fcedc.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN/FbGZLM=", - "crlite_enrolled": true, - "id": "f7673261-e96a-4f2c-a927-d30881e9e80f", - "last_modified": 1647406641957 - }, - { - "schema": 1647406127221, - "derHash": "90w7LH5FXWVNnuWqpxJ4nMsme5YcGhzkimnIYM0ZNng=", - "subject": "CN=Thawte EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBFQ0MgQ0EgMjAxOA==", - "whitelist": false, - "attachment": { - "hash": "029e038309e109b338a8e5d3d4e6300803b81c7d7d64ed413d523864ea9f6f9d", - "size": 1390, - "filename": "sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS_jwKtxLc=.pem", - "location": "security-state-staging/intermediates/6c018133-a6a4-4913-a016-38a7d1ab820a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS/jwKtxLc=", - "crlite_enrolled": true, - "id": "2032121f-569e-449d-8b03-3e918762323e", - "last_modified": 1647406641946 - }, - { - "schema": 1647406129472, - "derHash": "vzVY+HfonSfapg2pZxZ2Vw376yFdhKxaNxItZ3a3j24=", - "subject": "CN=GeoTrust EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIEVDQyBDQSAyMDE4", - "whitelist": false, - "attachment": { - "hash": "76fd10b988ddc4d10ef675e1353505739b36be3396db70baccebfc087010c5f1", - "size": 1390, - "filename": "KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4_NrxCA=.pem", - "location": "security-state-staging/intermediates/0f71a53f-9fe4-41e8-bc4d-6053d563e69f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4/NrxCA=", - "crlite_enrolled": true, - "id": "d0f17c7c-e4ae-4815-966e-de2dfd1be49e", - "last_modified": 1647406641936 - }, - { - "schema": 1647406127564, - "derHash": "Go15Cvmys0191q9htapM8TgLhglcusK8qzW9Vm0BgMM=", - "subject": "CN=Secure Site Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIlNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0E=", - "whitelist": false, - "attachment": { - "hash": "8c560a22b1260bcb7f9b8c62c6d191f6064d6125f0146ef483820a79ada1e21a", - "size": 1687, - "filename": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem", - "location": "security-state-staging/intermediates/6bf4e11e-3aa2-4af0-a5f5-ac98a4454b33.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=", - "crlite_enrolled": true, - "id": "9ad85c01-2205-4529-a221-9f9977a9a3d0", - "last_modified": 1647406641924 - }, - { - "schema": 1647406129298, - "derHash": "k1abJqpTXj4HyJHGvS+p3Ak5wk20s3Jq2FMe2xfEl8o=", - "subject": "CN=Thawte EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBSU0EgQ0EgMjAxOA==", - "whitelist": false, - "attachment": { - "hash": "aa41f2f1317c4207a1ce000f100f89792938ebbd08ccc7367391461f45499ac8", - "size": 1662, - "filename": "LrLVqGD-UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm_U=.pem", - "location": "security-state-staging/intermediates/d6fae8ae-c5f1-47b9-82bc-084bf846e9fe.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "LrLVqGD+UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm/U=", - "crlite_enrolled": true, - "id": "62d8fb8a-2660-4ea7-991d-107ab02539e5", - "last_modified": 1647406641913 - }, - { - "schema": 1647406127050, - "derHash": "roIgH1ZeBDm39K1okydZTrl0pPeBsabL/tWb04IxfxM=", - "subject": "CN=Thawte TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgRUNDIENBIEcx", - "whitelist": false, - "attachment": { - "hash": "add9d8816c4153cd678d313dec7135ed32f3b5d71e1c1b6f73bf061cd4162394", - "size": 1142, - "filename": "Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO-bYvpiEQI=.pem", - "location": "security-state-staging/intermediates/f2a22335-497e-40e7-830a-378eeea47a5b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO+bYvpiEQI=", - "crlite_enrolled": true, - "id": "e4a64544-b0f8-45bd-9a58-20355ebc5549", - "last_modified": 1647406641902 - }, { "schema": 1647406126704, "derHash": "sU1QiQecHY92SduaXTzvsarAb2avxJIlxb4qoZ/UGjU=", @@ -11718,168 +14472,6 @@ "id": "b03bf780-0b68-4f48-9034-834ec2d038db", "last_modified": 1647406641891 }, - { - "schema": 1647355730713, - "derHash": "w4BN5R6MFwUiIK4crT04PlTVt9wohDxC8NvZkTwehlg=", - "subject": "CN=Secure Site Pro Extended Validation ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "0888b26cf00bcea2525da774e654b5c2ea18871782615c5140d3fb8b3541ab28", - "size": 1463, - "filename": "_Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB_j8=.pem", - "location": "security-state-staging/intermediates/8d999ad8-e345-4822-9bab-90e25accc007.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "/Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB/j8=", - "crlite_enrolled": false, - "id": "7044462a-7235-4d46-9816-525da44a50c7", - "last_modified": 1647376760212 - }, - { - "schema": 1647355729782, - "derHash": "vRk8R15OZ5OL7zQSK5i1WKKILn7ZQ2mmywETIO8VYjw=", - "subject": "CN=AlwaysOnSSL TLS ECC CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE", - "subjectDN": "MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIEVDQyBDQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "499064f03f4574c2c427e17330ae382a5058acecff6c7f5b7cbdc36b9933961b", - "size": 1175, - "filename": "0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=.pem", - "location": "security-state-staging/intermediates/f68d6d6e-b755-46b8-bb2c-3cd51783d68f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=", - "crlite_enrolled": false, - "id": "484a309f-c38f-4673-b797-7cb431b40f5e", - "last_modified": 1647376760204 - }, - { - "schema": 1647355728800, - "derHash": "qK0cJcxYCyEx/Mb8bWUTdG846pm9FiyBtcU5NJUXWxg=", - "subject": "CN=STRATO TLS RSA CA,OU=Domain Validated SSL,O=STRATO AG,C=DE", - "subjectDN": "MFwxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRowGAYDVQQDExFTVFJBVE8gVExTIFJTQSBDQQ==", - "whitelist": false, - "attachment": { - "hash": "d4b8e211872849d13a1e260cdc06a24464432a0fa7627e3f666d44abf76f5a34", - "size": 1654, - "filename": "_MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=.pem", - "location": "security-state-staging/intermediates/1930fc08-5dc1-4765-b773-cc763308de9b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "/MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=", - "crlite_enrolled": false, - "id": "8fb8c000-9fe8-49dd-9c15-ac4bfdac08fb", - "last_modified": 1647376760195 - }, - { - "schema": 1647355727754, - "derHash": "A2oY9fDrndXuAreFTfXDOEVgHYk5z7e2B/adFCwB2Qk=", - "subject": "CN=TrustAsia TLS RSA CA G8,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBSU0EgQ0EgRzg=", - "whitelist": false, - "attachment": { - "hash": "cbb7a86cf96f690954bcd21bb8c71a00ef436ee942cd65831bf21c11cbc25909", - "size": 1687, - "filename": "rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=.pem", - "location": "security-state-staging/intermediates/350bd8d3-2749-4c3e-a988-02288c0e6441.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=", - "crlite_enrolled": false, - "id": "d4d9e729-0cc2-44c4-8964-b32181486d06", - "last_modified": 1647376760186 - }, - { - "schema": 1647355724829, - "derHash": "MZiW45VNUQ2jpLdTh+jIcLO8LDIo2FUJFuvpq9y3+SE=", - "subject": "CN=Oracle TLS RSA CA G1,OU=Organization Validated SSL,O=Oracle Corporation,C=US", - "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xIzAhBgNVBAsTGk9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRPcmFjbGUgVExTIFJTQSBDQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "450ac021db301c37c528daccbe40e94f74a28f7ae6f6ba039650b6aae3c3d13e", - "size": 1678, - "filename": "92UUNzSFrSZZ2mG20rm7eFX2MV_e3zCq8ck0jTA9zMw=.pem", - "location": "security-state-staging/intermediates/393f3a10-429e-4ce1-845e-2beac5162af1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "92UUNzSFrSZZ2mG20rm7eFX2MV/e3zCq8ck0jTA9zMw=", - "crlite_enrolled": false, - "id": "66444cbb-0d77-4545-aeac-9f96adedc3a3", - "last_modified": 1647376760160 - }, - { - "schema": 1647355722905, - "derHash": "KkG6gZ62Elr1y0uLDp6VTs55jCp+5D3Nr305WYfE1VI=", - "subject": "CN=AlwaysOnSSL TLS RSA CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE", - "subjectDN": "MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIFJTQSBDQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "60ae06b06554f13d49fcd4ab75f5917d8c57dc17bd11f157428e11c66db10d22", - "size": 1670, - "filename": "DOdL2thyQw2ljWo5qhqUbm1_3EZBtYXxLKw14G9PO30=.pem", - "location": "security-state-staging/intermediates/236d592d-f7d5-465e-984d-3511d1792286.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "DOdL2thyQw2ljWo5qhqUbm1/3EZBtYXxLKw14G9PO30=", - "crlite_enrolled": false, - "id": "008c16c8-e2f9-4205-b90d-97ce5e46862c", - "last_modified": 1647376760143 - }, - { - "schema": 1647355720132, - "derHash": "sayM+xgbnJNU4Xdfy9/P54mMXMmhfXYxW1fBEu7lUjQ=", - "subject": "CN=Encryption Everywhere DV TLS CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMg==", - "whitelist": false, - "attachment": { - "hash": "c75d6fc5179d7bb7baea5ffe48d9fda3810fdcb1340a3ca83e1e7b97a4af6478", - "size": 1678, - "filename": "gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX-qzRMqb9Xoa1w=.pem", - "location": "security-state-staging/intermediates/de3a4a27-9c47-4b4a-978f-e8d3aadc9b3d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX+qzRMqb9Xoa1w=", - "crlite_enrolled": false, - "id": "6e35ba55-d2c3-4701-8e11-9d023cee4140", - "last_modified": 1647376760114 - }, - { - "schema": 1647355719183, - "derHash": "9/veuCvpnUHNykGfyRhZ0+UobAdiBODpA9Z4uyE+2Js=", - "subject": "CN=Hostpoint TLS RSA CA,OU=Domain Validated SSL,O=Hostpoint AG,C=CH", - "subjectDN": "MGIxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRIb3N0cG9pbnQgVExTIFJTQSBDQQ==", - "whitelist": false, - "attachment": { - "hash": "e06a612c20a2679cb1522f8e77265194fd2509fa105e19f74503f5f6e26acc68", - "size": 1662, - "filename": "Q5l5uNBWZnOf3EnCFMK3ciNhPZboa_YPtUtL6yZ_DvU=.pem", - "location": "security-state-staging/intermediates/699e988e-5291-4075-86bd-3e5b69bb9553.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Q5l5uNBWZnOf3EnCFMK3ciNhPZboa/YPtUtL6yZ/DvU=", - "crlite_enrolled": false, - "id": "d685f4b6-0528-48c0-95fe-4fa3050ce971", - "last_modified": 1647376760106 - }, - { - "schema": 1647355715297, - "derHash": "h38kznD0owR+TqcL7BvDG+m2Uzrf86OT/5v7PIEClEY=", - "subject": "CN=TrustAsia TLS ECC CA G9,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBFQ0MgQ0EgRzk=", - "whitelist": false, - "attachment": { - "hash": "619365f9c59d0f0dcfcb64ba525d68621f75fadebe181e15429e3dc854262b7c", - "size": 1191, - "filename": "z_Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=.pem", - "location": "security-state-staging/intermediates/42a61717-4f98-46d0-b662-78febf5ba323.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "z/Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=", - "crlite_enrolled": false, - "id": "50846adc-e121-40f2-b176-43cc90696068", - "last_modified": 1647376760070 - }, { "schema": 1647046118886, "derHash": "AgcFbRcsgL37bcRb6eWAiEYHjR5u7xtu1wJZqzMqZME=", @@ -12204,24 +14796,6 @@ "id": "bd39f78d-03b0-4fc6-9992-3728009c0be9", "last_modified": 1645579199119 }, - { - "schema": 1645578815444, - "derHash": "3cu08wUdbmATEOsORrW7mcXouZ96U542eph96gMOMY4=", - "subject": "CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US", - "subjectDN": "MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==", - "whitelist": false, - "attachment": { - "hash": "f0c9af66d96dd17fa4676b867f59ad47a1e282afe025a8c07064a4124e677b47", - "size": 1800, - "filename": "NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem", - "location": "security-state-staging/intermediates/e59a9aa8-df33-4e9d-990f-02947b90d084.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=", - "crlite_enrolled": true, - "id": "1f89a7fd-6188-48d0-a6ae-9aca6c116420", - "last_modified": 1645579199106 - }, { "schema": 1645578811716, "derHash": "U2o1o/pjA3nPO01LThOVr5z+0iQxOOY05DaaMeKHKEM=", @@ -12330,24 +14904,6 @@ "id": "4a6655ab-9a9a-43db-bb34-1602419c8ed9", "last_modified": 1645579198998 }, - { - "schema": 1645578782098, - "derHash": "lYjvdBmeRazvzM/AxHAQ6fKjeh3UTGGk4cazNNpa9hQ=", - "subject": "CN=DigiCert EV RSA CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEVWIFJTQSBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "6c7a7611b0ccd14478c030a701a6eee0909ea61c24f76a90cf4f5eaec2ddfd88", - "size": 1873, - "filename": "w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=.pem", - "location": "security-state-staging/intermediates/e9aa3824-9530-437d-8340-921be8f8a95b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=", - "crlite_enrolled": true, - "id": "34d5fe5a-2430-4976-ba50-dac1c1aa7ff9", - "last_modified": 1645579198972 - }, { "schema": 1645578824402, "derHash": "d4xRba7HAO5Ys1geQR5cDdR4ZjpRY6KYlTQVB9bpZN0=", @@ -12456,42 +15012,6 @@ "id": "46298d4d-e394-4fcb-adc0-3082f97262e0", "last_modified": 1645579198864 }, - { - "schema": 1645578825135, - "derHash": "OPc2R/HsruwPxa/misMODCYXHp8jL0UwcpQSQI/VNiY=", - "subject": "CN=DigiCert Baltimore TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US", - "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEJhbHRpbW9yZSBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==", - "whitelist": false, - "attachment": { - "hash": "b11aaedbe5436f35dfaa91a1b599580a4875728df582882c8b0654b4695f6f8d", - "size": 1752, - "filename": "cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9-UzsuNw=.pem", - "location": "security-state-staging/intermediates/a86b448d-0dd1-4119-b69b-a6bec70aaed9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9+UzsuNw=", - "crlite_enrolled": true, - "id": "162f1ce8-9959-4cbc-995b-5fdbbca305d7", - "last_modified": 1645579198849 - }, - { - "schema": 1645578806912, - "derHash": "MoZpFBLzDs5cBl/WL0OSpHYtHneBUzg1nfOQKZ+9Ye8=", - "subject": "CN=Thawte EV RSA CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFViBSU0EgQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "7ebde9e072e9a7bbb57c5810346275bf9ef461c815c5ae04aea58f3354aeb691", - "size": 1873, - "filename": "BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=.pem", - "location": "security-state-staging/intermediates/e0954ca8-926f-4315-8fa7-eb4716df67d1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=", - "crlite_enrolled": true, - "id": "3dce0ba2-8303-47c5-8ce1-ea18ce609759", - "last_modified": 1645579198821 - }, { "schema": 1645578776166, "derHash": "z9/vA3z9vWuw4xHpuygcpgJxxdriaVMSAzgG+ksOlLc=", @@ -12618,24 +15138,6 @@ "id": "ea2014b3-5f09-421e-8ffa-df84d388e8e5", "last_modified": 1645579198643 }, - { - "schema": 1645578800273, - "derHash": "5vpISoWJQNEBl4VVRUqkZlMatsSrxK0rAAYmqqwNBPk=", - "subject": "CN=RapidSSL TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US", - "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==", - "whitelist": false, - "attachment": { - "hash": "e080ccfbdfc6374397f903976e83dea4fdecc00a0a36cd72f9c882ceff09e62a", - "size": 1902, - "filename": "48hXNwn3laJAzsrIBprOcewUb097BGNL7e-MVM7Rcis=.pem", - "location": "security-state-staging/intermediates/25b23729-a85a-403d-98bd-99a9217920cb.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "48hXNwn3laJAzsrIBprOcewUb097BGNL7e+MVM7Rcis=", - "crlite_enrolled": true, - "id": "b3c48a33-5042-4191-8389-859ad2017128", - "last_modified": 1645579198628 - }, { "schema": 1645578822944, "derHash": "+dMhStb11tKzyBYflgKLdoErBYYUpmeGuSyP69rAIO4=", @@ -12654,24 +15156,6 @@ "id": "d8bb5569-b8b9-4d0c-b76c-61a051cbcdc4", "last_modified": 1645579198615 }, - { - "schema": 1645578805054, - "derHash": "H4656ajgZsxbODPgazEpdktiJjnVsWP2AOHHkSC/Pu0=", - "subject": "CN=DigiCert Global G2 TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US", - "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==", - "whitelist": false, - "attachment": { - "hash": "be6d0e35f0c53e7c0af632d9bdf5dabd2be82214fc5e1c990c2bb46537d41287", - "size": 1776, - "filename": "Wec45nQiFwKvHtuHxSAMGkt19k-uPSw9JlEkxhvYPHk=.pem", - "location": "security-state-staging/intermediates/9d0673f3-7b1c-4c38-80cc-7331811b706b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Wec45nQiFwKvHtuHxSAMGkt19k+uPSw9JlEkxhvYPHk=", - "crlite_enrolled": true, - "id": "eb6772b7-415a-4236-8454-b136388e9f8e", - "last_modified": 1645579198600 - }, { "schema": 1645578808026, "derHash": "aZ7WW909XnkHdtFl6noyW3rq9BlkeSGpL/KLsGgNcro=", @@ -12762,42 +15246,6 @@ "id": "683cede4-7626-4358-b2eb-145dd74960f4", "last_modified": 1645579198534 }, - { - "schema": 1645578821477, - "derHash": "wa13eHltILymXIiaJlUCEVZSi7Yv9fpD4bjlqD49Lqo=", - "subject": "CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US", - "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==", - "whitelist": false, - "attachment": { - "hash": "f4d91481d1e4e17c44e796f180b7b4af9f0ae8e97cf8d41165640b3fdefd8f5d", - "size": 1760, - "filename": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem", - "location": "security-state-staging/intermediates/22380da8-f9c8-4baa-bdc3-e20c22e57f43.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=", - "crlite_enrolled": true, - "id": "f5c1eed1-baba-4a0e-b8bd-e11bd62a7bec", - "last_modified": 1645579198521 - }, - { - "schema": 1645578792536, - "derHash": "jEPF40DsZA+T6ndKxTU8ypBC92T/g3+HDYtkdjxFikE=", - "subject": "CN=GeoTrust TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US", - "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==", - "whitelist": false, - "attachment": { - "hash": "4af7bd8ab75b6ddf04593a19426b34042c0a2078cfaa4c0c6b54dba25cc4a74c", - "size": 1902, - "filename": "n5dIU-KFaI00Y_prmvaZhqXOquF72TlPANCLxCA9HE8=.pem", - "location": "security-state-staging/intermediates/dc20a531-5bc3-4510-bcc1-cd637fc41a7e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "n5dIU+KFaI00Y/prmvaZhqXOquF72TlPANCLxCA9HE8=", - "crlite_enrolled": true, - "id": "2c352dd4-d521-48e4-a346-8c91c5cae8fc", - "last_modified": 1645579198467 - }, { "schema": 1645578819969, "derHash": "96mhsv2WSj8mcL1mjVYft8VdOqmrg5Hn4WlwLbij288=", @@ -12924,24 +15372,6 @@ "id": "bd02f375-a882-4a65-b9b8-3d879928ab3d", "last_modified": 1645579198303 }, - { - "schema": 1645578821834, - "derHash": "M47bBPuL6vB6EHSef05TjeBxXa+2R41YBj+3yL2www0=", - "subject": "CN=DigiCert Global G3 TLS ECC SHA384 2020 CA1,O=DigiCert Inc,C=US", - "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMyBUTFMgRUNDIFNIQTM4NCAyMDIwIENBMQ==", - "whitelist": false, - "attachment": { - "hash": "7b5d64467372b9a0fe18ac79c51920708cd6c7b9c0d147b7a4a34b03d00bb358", - "size": 1325, - "filename": "qBRjZmOmkSNJL0p70zek7odSIzqs_muR4Jk9xYyCP-E=.pem", - "location": "security-state-staging/intermediates/7e2f8245-809f-49f6-806c-ec8122b6742d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "qBRjZmOmkSNJL0p70zek7odSIzqs/muR4Jk9xYyCP+E=", - "crlite_enrolled": true, - "id": "72fca36c-132d-40f7-a7f3-c556b9e5984a", - "last_modified": 1645579198290 - }, { "schema": 1645578769847, "derHash": "wWH1qt5A+8lyPwiS3pY9TRBAVWGmvcaacnmPkYvtGc0=", @@ -13122,24 +15552,6 @@ "id": "4ced6b80-9ab5-40e3-8387-a5e5366d6c64", "last_modified": 1645579198073 }, - { - "schema": 1645578827714, - "derHash": "RAs3QW8t6FLKOGFQ1hHsCvMd1Y2KJ/iCgVp+o+5oSO4=", - "subject": "CN=Bloomberg TLS CA,O=Bloomberg LP,C=US", - "subjectDN": "MD8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxCbG9vbWJlcmcgTFAxGTAXBgNVBAMTEEJsb29tYmVyZyBUTFMgQ0E=", - "whitelist": false, - "attachment": { - "hash": "e48dfa14c978c6bbeb5232c7e711afced2f56d20f367cd0a74a7100aac332138", - "size": 1743, - "filename": "wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A-v0=.pem", - "location": "security-state-staging/intermediates/43057199-ff4b-446b-92ea-98229348456d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A+v0=", - "crlite_enrolled": true, - "id": "4432e157-268f-4cae-a466-d19c020f2fd9", - "last_modified": 1645579198021 - }, { "schema": 1645578775797, "derHash": "9fGowE5c8P22eN0nmZRGPkhQjENJZDsNksv9dSP2xAo=", @@ -13482,24 +15894,6 @@ "id": "c9d98cb3-1e77-460b-87d4-c645e50c2df1", "last_modified": 1645579197697 }, - { - "schema": 1645578812459, - "derHash": "X4hpRhXkxhaG4Qa4TDM4xnIMU19g029hKC7RXhl33UQ=", - "subject": "CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US", - "subjectDN": "MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=", - "whitelist": false, - "attachment": { - "hash": "bd47e7c223bc2e656a7455d83b5877cd3dbf66c20fcb9f464190df0a25d15bdb", - "size": 1760, - "filename": "UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem", - "location": "security-state-staging/intermediates/f1240218-0d6d-400d-80c9-8b1c2957c097.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=", - "crlite_enrolled": true, - "id": "6281445e-ec85-4c90-b36b-61bcd5632598", - "last_modified": 1645579197658 - }, { "schema": 1645578787330, "derHash": "Ek6q8m9XDE+02J9dYQePFbiFNF/K8MV/NHfYxjtasm8=", @@ -13752,24 +16146,6 @@ "id": "f76e0282-0a3d-4444-b1a1-7e599a44f7c8", "last_modified": 1645579197365 }, - { - "schema": 1645578789597, - "derHash": "LRQPILipbitNLxzFrKXloefcVqdJHlEJBpYPONLSGu8=", - "subject": "CN=GeoTrust EV RSA CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVWIFJTQSBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "f01753f65dd631ba19494a777a86712466e7e8b20994d581e672f52716f315bb", - "size": 1873, - "filename": "VHUagq80gsWdvnfHL_-2XSLZrAJk4I9d8fx6N8UvWGM=.pem", - "location": "security-state-staging/intermediates/d4c59c37-246d-42b2-be82-27d3bd8a925c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "VHUagq80gsWdvnfHL/+2XSLZrAJk4I9d8fx6N8UvWGM=", - "crlite_enrolled": true, - "id": "77b25f9d-9ce8-4f46-b2de-55707311daa2", - "last_modified": 1645579197352 - }, { "schema": 1645578821094, "derHash": "Je7RMdcZNZfkjU42U2zFz/v56yBCxiVzrolo2KNpXxw=", @@ -13824,24 +16200,6 @@ "id": "a114ce1e-4757-4407-8ea8-d7421902f389", "last_modified": 1645579197312 }, - { - "schema": 1645578820361, - "derHash": "oUSKAV4TmcWokYEvDojG2EeyIdIfkyamYmukOg62Etk=", - "subject": "CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US", - "subjectDN": "MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB", - "whitelist": false, - "attachment": { - "hash": "efe10561bf3266c3b533e4642fc8dc3f95e0af6b13697751ab9e922af3013c4c", - "size": 1804, - "filename": "0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem", - "location": "security-state-staging/intermediates/bb041e16-96e9-4f59-befa-568ff1d54248.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=", - "crlite_enrolled": true, - "id": "cfed6b6d-ea15-4052-a1a4-8e48153f7f1e", - "last_modified": 1645579197299 - }, { "schema": 1645578809869, "derHash": "ffTT70V5j4xDhPxwK6UqRM571imLFBYo1Kurx2ePZGc=", @@ -14094,60 +16452,6 @@ "id": "0ae7a24d-a084-4832-94f5-f7b373e4faf0", "last_modified": 1645579197021 }, - { - "schema": 1645578757683, - "derHash": "TzXGucEAkF/yW7AcCiDr4zW87vJJzp/6HhHgYu1m/NE=", - "subject": "CN=DigiCert Trusted G4 TLS RSA SHA384 2020 CA1,O=DigiCert Inc,C=US", - "subjectDN": "MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IFRydXN0ZWQgRzQgVExTIFJTQSBTSEEzODQgMjAyMCBDQTE=", - "whitelist": false, - "attachment": { - "hash": "9b316d7bf93b9d342bdd4df71094c0e97165fde2c9cd97a6beca3f212dac4054", - "size": 2479, - "filename": "rjm2hHKNhSnI_7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=.pem", - "location": "security-state-staging/intermediates/8a1654e6-633e-48ce-9372-f151bd48a59e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "rjm2hHKNhSnI/7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=", - "crlite_enrolled": true, - "id": "19600eea-019e-4daa-a78f-5e230337d109", - "last_modified": 1645579196995 - }, - { - "schema": 1645578826623, - "derHash": "JXaHE9O0Wfk4LSpZT4XzRwn9KokwcxVCpBRv+yRr7Gk=", - "subject": "CN=DigiCert TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US", - "subjectDN": "ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBSU0EgU0hBMjU2IDIwMjAgQ0Ex", - "whitelist": false, - "attachment": { - "hash": "7f449f1e3178f1a2603b8177a108b02654caa02203944597174e3f46651ba513", - "size": 1764, - "filename": "RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=.pem", - "location": "security-state-staging/intermediates/2f2b0948-d625-495e-9790-0d944932dd09.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=", - "crlite_enrolled": true, - "id": "7cc6bda1-5b65-4675-8cbe-79283a2d350b", - "last_modified": 1645579196967 - }, - { - "schema": 1645578777260, - "derHash": "15otXgMpXA6f6uNtAh69UglwCrGp6BekPzD6PGb3jSE=", - "subject": "CN=DigiCert TLS Hybrid ECC SHA384 2020 CA1,O=DigiCert Inc,C=US", - "subjectDN": "MFYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBIeWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMQ==", - "whitelist": false, - "attachment": { - "hash": "388fede353d5e81549d7a9a264bceab472ffc7eff4991123ac93299f4a9ebfe3", - "size": 1536, - "filename": "e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=.pem", - "location": "security-state-staging/intermediates/ade40e10-43f7-4f26-b87d-c0831b847505.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=", - "crlite_enrolled": true, - "id": "e69568c5-84ab-4872-b0ef-4e64937b93ad", - "last_modified": 1645579196954 - }, { "schema": 1645578780604, "derHash": "XEUjNNnJyaLqQsx3pxZeF5XunYTrcMt4S0fqnZKlgtk=", @@ -14184,24 +16488,6 @@ "id": "eb2cd267-3056-4c85-aa35-b0985e1c423a", "last_modified": 1645579196885 }, - { - "schema": 1645578823684, - "derHash": "Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=", - "subject": "CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US", - "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=", - "whitelist": false, - "attachment": { - "hash": "94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0", - "size": 1788, - "filename": "nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem", - "location": "security-state-staging/intermediates/59a9a86b-b2f2-41c2-aade-aff4ca1a89e7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=", - "crlite_enrolled": true, - "id": "cbcef7da-3dee-4bee-b40e-cfb083416295", - "last_modified": 1645579196872 - }, { "schema": 1645578775060, "derHash": "SV5mJKFTQMTHSrhgN3SK1i0e9PFOfIGrfNtim+FAR1c=", @@ -14526,24 +16812,6 @@ "id": "e12a234c-f8d9-45ff-ac55-29a269a1f1d2", "last_modified": 1645578269073 }, - { - "schema": 1645577295620, - "derHash": "+2BghIRAqkWU/oEJdB76tAxWcysmxnw21tyUW7L+E88=", - "subject": "CN=Plex Devices High Assurance CA3,O=Plex\\, Inc.,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ez", - "whitelist": false, - "attachment": { - "hash": "cc6eb0f3e51ae41188fd3477d2b097eb3bfd190c1e01766f9836d30c6d379aaa", - "size": 1817, - "filename": "7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu-SVeew9nqo=.pem", - "location": "security-state-staging/intermediates/7e3aeca8-f557-4be1-a518-807373ab7659.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu+SVeew9nqo=", - "crlite_enrolled": false, - "id": "741a18fe-df21-456a-88ba-d8d07874e7c7", - "last_modified": 1645578269052 - }, { "schema": 1645577298288, "derHash": "+dSmwBHpxqj1pM9+0EFoaccjjvk6VhYepso9i0FxYJc=", @@ -14616,24 +16884,6 @@ "id": "d8f2f8d9-847b-449d-bb14-d59326e690d7", "last_modified": 1645578268916 }, - { - "schema": 1645577326440, - "derHash": "YGDqsYASLrFPIu3kZbSppw4p5w+xguvwHVsTM/LnMkI=", - "subject": "CN=RapidSSL TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US", - "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==", - "whitelist": false, - "attachment": { - "hash": "3ba8b83eb97ad48e9de41cf5e2bf4f6fdf72bd92b464134f8a11860b041476ae", - "size": 1902, - "filename": "inFIEiXuCIo8SWXm9sdY-WQwNjNja_ms8JpF3Lq3T2w=.pem", - "location": "security-state-staging/intermediates/9100968d-4c7c-4c12-ab22-068f05323112.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "inFIEiXuCIo8SWXm9sdY+WQwNjNja/ms8JpF3Lq3T2w=", - "crlite_enrolled": false, - "id": "6939de89-9f57-41d7-8ebd-a090e5713d8d", - "last_modified": 1645578268796 - }, { "schema": 1645577327799, "derHash": "kfGc5QPJ/n/5WH2O++9zFarud9wtFFJhJkk7Stb+gB8=", @@ -14868,24 +17118,6 @@ "id": "0eef680a-320d-4964-8f4c-7db3b7cef45c", "last_modified": 1645578268312 }, - { - "schema": 1645577397700, - "derHash": "HYDNGKeU8fSFDtwzxgSPAuhThqR/POg2l0qORSpg1/I=", - "subject": "CN=GeoTrust TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US", - "subjectDN": "MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==", - "whitelist": false, - "attachment": { - "hash": "2e0cee661a4a6fd3b4cc86995b705e916cb3c5b536a617c5d74956b4574cf947", - "size": 1902, - "filename": "WcAfM-6Mq47-SAT2M-PbyDhIlS5ynmlHH9IlN6Jm0AQ=.pem", - "location": "security-state-staging/intermediates/ee11f0a3-ece3-429c-a3ef-ddcb0bc4bff5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "WcAfM+6Mq47+SAT2M+PbyDhIlS5ynmlHH9IlN6Jm0AQ=", - "crlite_enrolled": false, - "id": "c6890723-6266-424a-858e-5123614d5fc2", - "last_modified": 1645578268240 - }, { "schema": 1645577399047, "derHash": "G4NI2aBj2IEPdzWz0gXEXb2EuzqHxnQ/4yKGMNvC1zs=", @@ -15066,24 +17298,6 @@ "id": "8e045253-b803-4d74-b99c-8e5da4c8a8e6", "last_modified": 1645578267856 }, - { - "schema": 1645577454337, - "derHash": "zby+8W43I3cC+sxLVdOrkqF8+heDXhM3eqTSug/UegI=", - "subject": "CN=Cisco Meraki CA2,O=Cisco Systems\\, Inc.,C=US", - "subjectDN": "MEYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRkwFwYDVQQDExBDaXNjbyBNZXJha2kgQ0Ey", - "whitelist": false, - "attachment": { - "hash": "3e5a1329226826601bdcf297eb985c9089c7df20bac76d529770ff0dcdc2bd3e", - "size": 1752, - "filename": "UNvyYoiHE-TJr4GNRJRQQVYLfL7m_X0ULyrRNeeQaKE=.pem", - "location": "security-state-staging/intermediates/cc992b4a-65ed-4ed5-a51b-e14f2e8bad9c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "UNvyYoiHE+TJr4GNRJRQQVYLfL7m/X0ULyrRNeeQaKE=", - "crlite_enrolled": false, - "id": "1e2bb423-8379-4087-9c03-350e389deb03", - "last_modified": 1645578267814 - }, { "schema": 1645577458278, "derHash": "8rw3mx70ViTY+CK241lQLUcPOE5TwIL3riGGnBOl00U=", @@ -15336,24 +17550,6 @@ "id": "e0ee61ba-df22-4ac4-bb33-1ac352ad32e7", "last_modified": 1645578267096 }, - { - "schema": 1645577551045, - "derHash": "R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=", - "subject": "CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US", - "subjectDN": "MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==", - "whitelist": false, - "attachment": { - "hash": "a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f", - "size": 1772, - "filename": "ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem", - "location": "security-state-staging/intermediates/8df83725-1414-485f-8c8d-8f01f455616a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=", - "crlite_enrolled": false, - "id": "a30a8955-8cbe-486e-bc37-eb34e38af6b8", - "last_modified": 1645578267076 - }, { "schema": 1645577552443, "derHash": "kxqqHsmyug+lmoIwL0+DBijIbZstKlCk0bLOiVxMxkg=", @@ -15660,24 +17856,6 @@ "id": "1a5c80bc-9be4-4736-b605-b3611481f15f", "last_modified": 1645578266723 }, - { - "schema": 1645577601095, - "derHash": "EDLGAB7WZKDNNDsTi8toYOIREBHD1fBlQPW+QRR4EqU=", - "subject": "CN=Legacy Technologies Intermediate,O=Legacy Technologies GmbH,C=DE", - "subjectDN": "MFsxCzAJBgNVBAYTAkRFMSEwHwYDVQQKExhMZWdhY3kgVGVjaG5vbG9naWVzIEdtYkgxKTAnBgNVBAMTIExlZ2FjeSBUZWNobm9sb2dpZXMgSW50ZXJtZWRpYXRl", - "whitelist": false, - "attachment": { - "hash": "a9f261d0ad4e87bacd12e03d772b19c478c501880901e13afa12424a3fa0819b", - "size": 1906, - "filename": "1IN_wrqE9VVL4qRI4B5j8xzAQgZ1Wap_tLlGGVYhcEc=.pem", - "location": "security-state-staging/intermediates/8581f65e-dd24-48e7-8156-946ef9ae8d4e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "1IN/wrqE9VVL4qRI4B5j8xzAQgZ1Wap/tLlGGVYhcEc=", - "crlite_enrolled": false, - "id": "bc929d82-b6a0-4c96-9ffa-086f6399faad", - "last_modified": 1645578266713 - }, { "schema": 1645577614499, "derHash": "ugMS97cva2S0zO40tfYoz2Wh87nxa43+etqQxU5HWhw=", @@ -15984,24 +18162,6 @@ "id": "42a054e1-89f9-48cc-b92a-4da9e9c308e3", "last_modified": 1645153040427 }, - { - "schema": 1644367734329, - "derHash": "m/7T2dyVI2vP/LNdSxINsOOGf2Kx/QFako2gswOWZoM=", - "subject": "CN=DigiCert High Assurance TLS RSA SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE4MDYGA1UEAxMvRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTE=", - "whitelist": false, - "attachment": { - "hash": "007b4991e764dfb6fc682cc922b8e457508cb343dfd1edc993260455daaf7c3b", - "size": 1748, - "filename": "KKzhMaY72_nD-ZVShAg153XyomvfRUrrKjaWxh3ZCRo=.pem", - "location": "security-state-staging/intermediates/d3e8c2ab-b791-4d1a-9686-b3075fe8b947.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "KKzhMaY72/nD+ZVShAg153XyomvfRUrrKjaWxh3ZCRo=", - "crlite_enrolled": true, - "id": "44ffb93f-8613-4234-ae12-7682b310843a", - "last_modified": 1644375435376 - }, { "schema": 1644072514566, "derHash": "TM8XwMjBwQ1YduxeMoD+jRNN82rt2ERCibmQvDdB508=", @@ -16038,24 +18198,6 @@ "id": "971a56e0-c3e7-431a-840f-f4f65604621f", "last_modified": 1644073055310 }, - { - "schema": 1643813844073, - "derHash": "KMu04NnE7m0ErI8UcXYFrjpL2Mv40IGyevbtsvPXajI=", - "subject": "CN=DigiCert Grid Trust CA G2,OU=www.digicert.com,O=DigiCert Grid,C=US", - "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSIwIAYDVQQDExlEaWdpQ2VydCBHcmlkIFRydXN0IENBIEcy", - "whitelist": false, - "attachment": { - "hash": "2030c0b03af2fba71a3c252cde6988edc7bbd22d1d2515bf5da0d0ccf16c5a03", - "size": 1796, - "filename": "5TmPqy9bKSAy0zKN0Mz_yBIgKGk_pgZ4TMaSTFRh9xw=.pem", - "location": "security-state-staging/intermediates/062c27f3-e7a5-48a0-8734-535cb038e150.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5TmPqy9bKSAy0zKN0Mz/yBIgKGk/pgZ4TMaSTFRh9xw=", - "crlite_enrolled": false, - "id": "0aee0acd-3e30-437a-b011-55d61c8d46c4", - "last_modified": 1643857049260 - }, { "schema": 1643539721874, "derHash": "itR/bXCkT6gK8PkxEl/+OnaHb/rSGaTUChPAONyF5p4=", @@ -16182,24 +18324,6 @@ "id": "80b7ece4-c29e-4494-ad88-0dd9d4fd72bc", "last_modified": 1643540242374 }, - { - "schema": 1643539748186, - "derHash": "GZ7lgAlVXa4s2gYmkxxkOR1qiMzLH58LLugLZn9YHAY=", - "subject": "CN=Cisco Meraki CA,O=Cisco Systems\\, Inc.,C=US", - "subjectDN": "MEUxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRgwFgYDVQQDEw9DaXNjbyBNZXJha2kgQ0E=", - "whitelist": false, - "attachment": { - "hash": "7342f611caee0df18ce789033dc9e56f170d71c7d12b34b4fc9e466d18ae427d", - "size": 1638, - "filename": "GUIjMNe--V5-Oj0iDybPHPoFZBo3KkQeXR-6l1vJW34=.pem", - "location": "security-state-staging/intermediates/0ccbae70-0f86-469f-b039-43d5e133fcba.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "GUIjMNe++V5+Oj0iDybPHPoFZBo3KkQeXR+6l1vJW34=", - "crlite_enrolled": true, - "id": "b4089320-2338-4364-9003-455eb7c3db79", - "last_modified": 1643540242364 - }, { "schema": 1643539734327, "derHash": "bEDQf0cFpbTwTGrs3Fob9f040rbPLbfyEsolEHW+El0=", @@ -16272,24 +18396,6 @@ "id": "2e43a311-dc6c-4644-b4fd-dabaca2c1929", "last_modified": 1643540242229 }, - { - "schema": 1643539716918, - "derHash": "Ukz3MxxO41PusezXTh+AGg8fCN+gMiCS9CIFr8OhdnU=", - "subject": "CN=DigiCert SHA-2 RADIUS CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFNIQS0yIFJBRElVUyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "27066a171b414ad64061c4d31e5004cbce8f4d7555ba47fca659f81f97acaaf9", - "size": 1674, - "filename": "yZwj8Xi_M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845-xQ=.pem", - "location": "security-state-staging/intermediates/0356953d-ca56-4ed4-b79b-6447b2d907ff.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "yZwj8Xi/M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845+xQ=", - "crlite_enrolled": true, - "id": "2b7210c5-6bef-4469-b9b2-3cf4a91afb14", - "last_modified": 1643540242197 - }, { "schema": 1643539751823, "derHash": "tfYuw4ExzRSx/JW4d/TSEL5L+sx+amqhQi2J40t6xME=", @@ -16362,24 +18468,6 @@ "id": "24d073eb-1380-4a6f-b7e1-f8821cd871c7", "last_modified": 1643540241971 }, - { - "schema": 1643539728848, - "derHash": "jYPWn6YVqiaDsT14lEgsVCsLzxi7ktMPAV+0JHGvu2Y=", - "subject": "CN=TrustAsia ECC EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "02177e95a053529e56a44df11a7524e3b40ddadc426f737c2d9c84e00dc43f28", - "size": 1382, - "filename": "xgkVHlf2XyODr7l-8b1HSx2m_0yRG8ZF5HdfiYwDwaY=.pem", - "location": "security-state-staging/intermediates/5b9163c5-db6d-4370-8fa7-c89bcf81e95b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "xgkVHlf2XyODr7l+8b1HSx2m/0yRG8ZF5HdfiYwDwaY=", - "crlite_enrolled": true, - "id": "b866ec0b-ef71-426c-8709-aab24aae0fbd", - "last_modified": 1643540241836 - }, { "schema": 1643539732198, "derHash": "Xr2YdOa4jaOPSnuVZs5dTfBeDCJNlJhq2MxeugBKDAQ=", @@ -16506,24 +18594,6 @@ "id": "9cb658c6-3e52-4a94-b178-1d2ab7a03ad7", "last_modified": 1643540241604 }, - { - "schema": 1643539731592, - "derHash": "ChY2AGMb1mJn+3rq0lxTiyt9cq1kFqK70oX2VLtkL20=", - "subject": "CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US", - "subjectDN": "MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB", - "whitelist": false, - "attachment": { - "hash": "0be7b4b36e584af7c9c5b112ea58bd9a35c130ac60498f529685f3677950def8", - "size": 1687, - "filename": "0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem", - "location": "security-state-staging/intermediates/944a758d-2190-478d-9aaf-b72d3189ad0c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=", - "crlite_enrolled": true, - "id": "2ebb6e61-790b-44fe-a28c-c32b851f947b", - "last_modified": 1643540241541 - }, { "schema": 1643539717860, "derHash": "DDfUmcRXkpQcYvHhnwbpdVYlzhFjOi6NuGnHqy14wxk=", @@ -16578,24 +18648,6 @@ "id": "e8fae9fd-982a-49f7-8275-54c9628b0d0a", "last_modified": 1643540241315 }, - { - "schema": 1643539743313, - "derHash": "mFFAkZNCI5yJCGsi38qkUIWQsRo94KQj4l68Pdr4kQ0=", - "subject": "CN=DigiCert Secure Site Pro ECC CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MFQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLjAsBgNVBAMTJURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFQ0MgQ04gQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "abadc7dab3aa3ce9c3b3984b57de541e8e2155f1acb9659ec05255d0505f836a", - "size": 1341, - "filename": "ljUnYjVBy0mvbfWJdhWfQmd_OGXEqZ6sBA-BZTbrSVY=.pem", - "location": "security-state-staging/intermediates/69abe7b3-bea5-4ac4-b147-b7a9c256cfae.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ljUnYjVBy0mvbfWJdhWfQmd/OGXEqZ6sBA+BZTbrSVY=", - "crlite_enrolled": true, - "id": "d5251cce-28fd-44ee-97af-2b2fea57506d", - "last_modified": 1643540241284 - }, { "schema": 1643316508186, "derHash": "S9FvSVXz88nI6kjvmZUyTaUSFyT4mRXV8skesLrvIzc=", @@ -16812,60 +18864,6 @@ "id": "355287c5-30e3-4992-b72c-8013c887d757", "last_modified": 1643209046618 }, - { - "schema": 1642600407901, - "derHash": "Y0/fJsmU52opGNnvxMq5xvyzRO9kKnnIkZK82g7VL0w=", - "subject": "CN=DigiCert Assured ID CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "e8fa45fec67bc1318a3819405f1bfb0e74f616a1846f577a9fcdd141b182ce2d", - "size": 1118, - "filename": "PvaHuwE2jRHMyjTCq1y7W0C__z4Wjsb057DegXU0Ars=.pem", - "location": "security-state-staging/intermediates/1b00f9cd-0690-430b-a511-38456b5cf3a6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "PvaHuwE2jRHMyjTCq1y7W0C//z4Wjsb057DegXU0Ars=", - "crlite_enrolled": false, - "id": "7bbbdeb7-763b-47bd-9665-cddbe3976c31", - "last_modified": 1642604267293 - }, - { - "schema": 1642517311221, - "derHash": "13N+Xy0//KQpkC6fOIz9bFlZzTWg/BA87i9+k9HGalI=", - "subject": "CN=DigiCert Assured ID TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENB", - "whitelist": false, - "attachment": { - "hash": "3acfd29ff87e4c65c2f222ef3a9d1cf2386bb9c35bc8466e5ff9d4b21ca177bf", - "size": 1735, - "filename": "wcEQuH5mngysd8OrgXuw0roT-SkrGkVZxVSpoNafgws=.pem", - "location": "security-state-staging/intermediates/0bd20a8e-99cf-4d4b-af90-c59deca2697a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "wcEQuH5mngysd8OrgXuw0roT+SkrGkVZxVSpoNafgws=", - "crlite_enrolled": false, - "id": "1a882256-e765-4db1-820b-0d4c76dcf9a5", - "last_modified": 1642517853895 - }, - { - "schema": 1642167585543, - "derHash": "GR4LSLeLfvpIIqRlrWmzRAW4eNEL2FPY5Xy4udnlC4s=", - "subject": "CN=Trust Technologies Global CA,OU=Digital Identity and Security,O=Telecom Italia Trust Technologies S.r.l.,C=IT", - "subjectDN": "MIGPMQswCQYDVQQGEwJJVDExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuci5sLjEmMCQGA1UECxMdRGlnaXRhbCBJZGVudGl0eSBhbmQgU2VjdXJpdHkxJTAjBgNVBAMTHFRydXN0IFRlY2hub2xvZ2llcyBHbG9iYWwgQ0E=", - "whitelist": false, - "attachment": { - "hash": "564c57bdee05db70d390e6bcb2f79dd54852bdaa6b303ee4de5c564d29d262a2", - "size": 1683, - "filename": "kCvviSGuWkulE1Rv-GhY_fjUuT622_2qjrGk96XfS6A=.pem", - "location": "security-state-staging/intermediates/a8b72e50-2b9d-4f2e-be8d-f11ffd8c9f52.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "kCvviSGuWkulE1Rv+GhY/fjUuT622/2qjrGk96XfS6A=", - "crlite_enrolled": false, - "id": "5c03ce12-486e-4b06-811e-bb3df097bbb5", - "last_modified": 1642172242556 - }, { "schema": 1642150113750, "derHash": "fPY09fr+ndzIizbWsefr+3B4A01kQZ58Z4M15W2CNCE=", @@ -16938,132 +18936,6 @@ "id": "ce70ab41-709c-445f-b102-7cc44cac2d22", "last_modified": 1642107514816 }, - { - "schema": 1641586242459, - "derHash": "bmLL4+QqQcUEBbPi8aRCV2gyZ4VhhK+cAhEgcKyDaTY=", - "subject": "CN=Thawte ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBFQ0MgQ0EgMjAxOA==", - "whitelist": false, - "attachment": { - "hash": "b720fd52f7eed374b2c5902c55a3d185a8cd84a9b4fada7958cae32b764e4368", - "size": 1358, - "filename": "3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0-ig=.pem", - "location": "security-state-staging/intermediates/f9d2835d-36a6-47e4-b9d6-addbf0a8d4cc.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0+ig=", - "crlite_enrolled": true, - "id": "0bc07455-8ec5-41eb-ac5a-22460bb932e5", - "last_modified": 1641589043298 - }, - { - "schema": 1641586242149, - "derHash": "FesKdcZzq/vc0vr8AoI8kf5svDbgB4hELIdU1yvsNxc=", - "subject": "CN=Encryption Everywhere DV TLS CA - G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "6e79684a22734ca75ec32f3adf0f864295161310bce94980a2608da91fbdd285", - "size": 1678, - "filename": "GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=.pem", - "location": "security-state-staging/intermediates/f06c6294-7b8f-48d8-b0f8-2b14682e5159.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=", - "crlite_enrolled": true, - "id": "0c722bda-522b-4e54-86de-6947716f1ec9", - "last_modified": 1641589043287 - }, - { - "schema": 1641586240072, - "derHash": "ml7s7px9iYvYHcO/Bm2vau+42xxZZ2IG0r/daCMSxvY=", - "subject": "CN=Thawte RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBSU0EgQ0EgMjAxOA==", - "whitelist": false, - "attachment": { - "hash": "5ab0596aa7dd3f7d6cf1c6d2df754c46aa3f5872ff617e4f9336bde88379619b", - "size": 1634, - "filename": "S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=.pem", - "location": "security-state-staging/intermediates/289fd54c-d874-4e7c-966c-99955002ec14.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=", - "crlite_enrolled": true, - "id": "d280501b-539b-4cdb-87d5-dd02b98025b3", - "last_modified": 1641589043275 - }, - { - "schema": 1641570346161, - "derHash": "x5C0cShEfsC2DyK/y3ldccMm3ZEO4Sy7TMWoYZHrkbw=", - "subject": "CN=RapidSSL RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIFJTQSBDQSAyMDE4", - "whitelist": false, - "attachment": { - "hash": "8d48a4abde2999b864fb9607b6e2b43144a92714cdf63de21b44d83e923ae297", - "size": 1687, - "filename": "nKWcsYrc-y5I8vLf1VGByjbt-Hnasjl-9h8lNKJytoE=.pem", - "location": "security-state-staging/intermediates/fbead98d-cbd8-4432-90ef-c600588aad52.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "nKWcsYrc+y5I8vLf1VGByjbt+Hnasjl+9h8lNKJytoE=", - "crlite_enrolled": true, - "id": "1bc7f624-5af1-4e32-adc2-850bcbe509c2", - "last_modified": 1641589043265 - }, - { - "schema": 1641586240393, - "derHash": "jMNOEcFnBFgkreYcSQemRA7bLEOY6ZwRKoWdZh+OK8c=", - "subject": "CN=GeoTrust RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IFJTQSBDQSAyMDE4", - "whitelist": false, - "attachment": { - "hash": "a013c9348417f4076dc717cab4baf557d42e0c77d49f5a42c13f09fafee4a167", - "size": 1634, - "filename": "zUIraRNo-4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=.pem", - "location": "security-state-staging/intermediates/be8a1d98-433a-4bf6-941e-c31bcf350d57.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "zUIraRNo+4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=", - "crlite_enrolled": true, - "id": "5fa2fd0c-5f29-4a58-ab51-5fee7d3956b4", - "last_modified": 1641589043255 - }, - { - "schema": 1641586241563, - "derHash": "oNFSOgv2Y1UOuQgem93toSgU+VcLdpfZXfLqU9T/deM=", - "subject": "CN=RapidSSL ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIEVDQyBDQSAyMDE4", - "whitelist": false, - "attachment": { - "hash": "ee5666095b0adbea4d0fc0e22f86c954e59f68c2eb5a347a7c6c3eaf8db0a25f", - "size": 1410, - "filename": "zJax49jXNWVm12ouj-dVmlW_r0Zw4NbjfsoCxV3-blM=.pem", - "location": "security-state-staging/intermediates/79d47d47-5626-42ac-99ee-cfbdac6397b1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "zJax49jXNWVm12ouj+dVmlW/r0Zw4NbjfsoCxV3+blM=", - "crlite_enrolled": true, - "id": "763411e1-8114-46f4-8c40-92fecd1f7cc4", - "last_modified": 1641589043244 - }, - { - "schema": 1641586241853, - "derHash": "2OJppusIy8M3rWV4xyE1eHSEyZ0vsIzO0CnoBr4QQPw=", - "subject": "CN=GeoTrust ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IEVDQyBDQSAyMDE4", - "whitelist": false, - "attachment": { - "hash": "ed3ea6d09c5ea1ee4aff94776f7636c5caa4a1f898b7cf38a7a51186ce041b2e", - "size": 1362, - "filename": "A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=.pem", - "location": "security-state-staging/intermediates/d91f6034-4d0e-4712-b034-11eafafca044.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=", - "crlite_enrolled": true, - "id": "a4d953b4-251b-4c06-931a-1e3ed439794e", - "last_modified": 1641589043234 - }, { "schema": 1641502406176, "derHash": "WkmxWuYP9ifaJyqHQ9ZxYrrKEJYWggMhOs+CJ69MSUI=", @@ -17082,24 +18954,6 @@ "id": "fb272741-7da4-469b-ab59-52ece6f412f9", "last_modified": 1641513441118 }, - { - "schema": 1641502219571, - "derHash": "bo2VL9urrY3j1h4JQ5Nzm1pHNxpSvcsqPC+MQ2IvZA8=", - "subject": "CN=DigiCert Trusted Server CA G4,O=DigiCert Inc,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0ZWQgU2VydmVyIENBIEc0", - "whitelist": false, - "attachment": { - "hash": "1b0227fb528c1325b07b31b6a5fb4aaae403cf52260bf9d9cd10243df1594c27", - "size": 2263, - "filename": "ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=.pem", - "location": "security-state-staging/intermediates/59a98e6a-d170-4c1b-a564-25e3d6f2bade.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=", - "crlite_enrolled": true, - "id": "0af55fad-9862-4ab7-b10a-5e19e0d6a32c", - "last_modified": 1641513441108 - }, { "schema": 1641502406764, "derHash": "cBMXJQIQq5EoBSfDtDaTEBW43O5ppok62k/60lpv5E8=", @@ -17118,42 +18972,6 @@ "id": "dbbc2d12-9a44-48cc-96e6-e877bf97bbda", "last_modified": 1641513441078 }, - { - "schema": 1641502404955, - "derHash": "sm6zEPj68O9bDQtxqmXsBQ+jreKRNPtDirZEAoj6bmc=", - "subject": "CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB", - "whitelist": false, - "attachment": { - "hash": "c9fd1a02e33e6fb6aa966212b051bc01d9763d43207f96cd14bd4d2ab77caf5e", - "size": 1666, - "filename": "3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem", - "location": "security-state-staging/intermediates/3c324156-7f22-4755-bd9d-801f027fb229.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=", - "crlite_enrolled": true, - "id": "a72a5e79-3626-409e-b043-cd067d75f18f", - "last_modified": 1641513440893 - }, - { - "schema": 1641502411557, - "derHash": "IQbMeQfGS4pdovwzjulN//EO9xHe27T8aU7gkuxTKx0=", - "subject": "CN=TrustCubes ICA G1,OU=www.trustcubes.com,O=TRUSTCUBES LIMITED,C=GB", - "subjectDN": "MIGhMQswCQYDVQQGEwJHQjEbMBkGA1UEChMSVFJVU1RDVUJFUyBMSU1JVEVEMRcwFQYIKwYBBAGEBwETCTIyMzAxMzcwMTEjMCEGCSsGAQQBg5gqARMUOTg0NTAwNTA1RkU4MENEME5FNTgxGzAZBgNVBAsTEnd3dy50cnVzdGN1YmVzLmNvbTEaMBgGA1UEAxMRVHJ1c3RDdWJlcyBJQ0EgRzE=", - "whitelist": false, - "attachment": { - "hash": "002d39d549b3edc3243fc8849e44a7320b6faab7fec61dbc7a17973a224b8dd3", - "size": 1756, - "filename": "WQNVf79ywhoSIaihn1jQE-5z8UKENBfhCeJcnklN0YQ=.pem", - "location": "security-state-staging/intermediates/0a4ef028-7d3c-4559-bee0-36cdd53068ab.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "WQNVf79ywhoSIaihn1jQE+5z8UKENBfhCeJcnklN0YQ=", - "crlite_enrolled": true, - "id": "84388c52-0b35-4c7c-aa4f-ad6fe76d6235", - "last_modified": 1641513440862 - }, { "schema": 1641502405565, "derHash": "20djOcy/zJ5L0dbLYGyifwBnnh74pYHnI2MJudY//jc=", @@ -17172,78 +18990,6 @@ "id": "e6c4396d-16a0-4773-a029-036b775926fd", "last_modified": 1641513440851 }, - { - "schema": 1641502408850, - "derHash": "QD4GKiZTBZETKFuvgKDUrkIshIyfePrQH8lLxbh/7xo=", - "subject": "CN=DigiCert SHA2 Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MHUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNDAyBgNVBAMTK0RpZ2lDZXJ0IFNIQTIgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0E=", - "whitelist": false, - "attachment": { - "hash": "a542625d5511b8e15e375edee06b6d656bea32f3a9e2fd08246b0b447f1dea45", - "size": 1695, - "filename": "RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn_yOhI_y-ho=.pem", - "location": "security-state-staging/intermediates/15c21eca-d96f-43c9-94b1-fd4217f81575.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=", - "crlite_enrolled": true, - "id": "ac18b0e8-cf04-4b62-9dde-6c8bb64149e8", - "last_modified": 1641513440840 - }, - { - "schema": 1641502409752, - "derHash": "91Qc9p0d4ayVOrwfrW94B6NO3+nhLBHmahlZMMI61sY=", - "subject": "CN=DigiCert Global CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "caf0ca58fa4e543dbd0a13f2d28c0f3ba36a68e2ce4db8f05cbe1c0cc102e4ce", - "size": 1106, - "filename": "lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=.pem", - "location": "security-state-staging/intermediates/d3b97027-ab86-4c2f-bde3-30d9f0e79337.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=", - "crlite_enrolled": true, - "id": "042596bd-887e-46b0-a897-969aef8e476a", - "last_modified": 1641513440829 - }, - { - "schema": 1641502408251, - "derHash": "umoMEXDhxzI4YHSbXnsO02WXXY/JB0CxXXD4Q6I5SUI=", - "subject": "CN=Secure Site Pro CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElNlY3VyZSBTaXRlIFBybyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "66b49fd854d0f3af5d909f8ce76dcf4b94b573305dd98b683cde0582e3dfb8c4", - "size": 1674, - "filename": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem", - "location": "security-state-staging/intermediates/c371d115-079f-4788-8e8b-6a4ee2c482b2.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=", - "crlite_enrolled": true, - "id": "283d1332-2aae-4370-8412-97de93ae7f53", - "last_modified": 1641513440809 - }, - { - "schema": 1641502407653, - "derHash": "M+ik7UiTB2DOGtei1E8HmyL2YAUnU5dhCeb8dHUlUr0=", - "subject": "CN=TrustAsia OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgT1YgVExTIFBybyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "8f0250802a5effb55f9283f5becfe9736b17e0bdec2123b985d6c547798bc239", - "size": 1666, - "filename": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem", - "location": "security-state-staging/intermediates/2a54b660-4cce-4591-9297-660cc2220117.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=", - "crlite_enrolled": true, - "id": "4f9e9017-56da-4481-8083-248564e69585", - "last_modified": 1641513440798 - }, { "schema": 1641473445388, "derHash": "HMNYpt+gp2u1RwZg1487JfI8zWOVZn5JzPyCAdo9GS0=", @@ -17388,24 +19134,6 @@ "id": "52365c35-c17b-4e16-abb3-36a0687ea4c5", "last_modified": 1641481037779 }, - { - "schema": 1641477725990, - "derHash": "Ut3on91vYQRz+TFMeosaxEL4qoM6pddzAG/adYyf8ew=", - "subject": "CN=GeoTrust ECC CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "e06f12d6e0b15958641d81bbc87c7e33098dcc36413ea0b92cdc4e4543a9f083", - "size": 1321, - "filename": "htzU8zBrdwmMNFLvW_ZzkFTZcn95rIZbtuXmmiR6prc=.pem", - "location": "security-state-staging/intermediates/da92e448-1975-4ac4-8055-a07ffe8cc9d4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "htzU8zBrdwmMNFLvW/ZzkFTZcn95rIZbtuXmmiR6prc=", - "crlite_enrolled": true, - "id": "88abec4b-eb1e-406d-bc4b-5b94bef1b7d9", - "last_modified": 1641481037749 - }, { "schema": 1641477710031, "derHash": "M3xiU3dZLx38xuZWMcYF64uW4AwUa0N/wfBnJoFU6Vk=", @@ -17424,114 +19152,6 @@ "id": "a8fcbf40-670e-4659-b931-283e4034014e", "last_modified": 1641481037739 }, - { - "schema": 1641477718402, - "derHash": "AMDLqVy/4eJwgUJ18ytQXW5ZFsK22mf69N0wnubobL4=", - "subject": "CN=DigiCert Secure Site ECC CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDTiBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "a51772df4a2b835008c2a8c8dc0deb86a5aaec98e9697ee63a20924af248b9b2", - "size": 1337, - "filename": "mpDMzjSYAgr-a1VhfWcSLkk3xG29zzCRDJISnBodNVg=.pem", - "location": "security-state-staging/intermediates/f09648f8-e528-485c-9101-53303017f3fb.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "mpDMzjSYAgr+a1VhfWcSLkk3xG29zzCRDJISnBodNVg=", - "crlite_enrolled": true, - "id": "2e3dc91b-19d5-4380-b3e9-3b54bf59c028", - "last_modified": 1641481037729 - }, - { - "schema": 1641477716886, - "derHash": "tBpIZPDU7E6mMtAbPn8jJ3XlXiKzv9hkLuEpIoDQ5Ho=", - "subject": "CN=DigiCert Basic EV RSA CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIFJTQSBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "d2c3c0eb28e66976ac4acda4193e4e6b8892fa07ec37f9932f19408c824dc0a2", - "size": 1654, - "filename": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=.pem", - "location": "security-state-staging/intermediates/aae99adb-feec-4ec3-b8f8-06e4b7cc8071.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=", - "crlite_enrolled": true, - "id": "1a6503c7-0f5c-4cde-8e28-452c972f857e", - "last_modified": 1641481037719 - }, - { - "schema": 1641477724463, - "derHash": "rshjiY8oTWzUxqP2w+ZSNICjWcM9r2b60zgYSbi7AYs=", - "subject": "CN=Cloudflare Inc RSA CA-2,O=Cloudflare\\, Inc.,C=US", - "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBSU0EgQ0EtMg==", - "whitelist": false, - "attachment": { - "hash": "842301a8382a5def37850ade1e06b5c25ea99a6c56136a48f896bd964b68090f", - "size": 1654, - "filename": "hS5jJ4P-iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=.pem", - "location": "security-state-staging/intermediates/a38d6897-15d6-441e-b9ae-07da1d37dbb3.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "hS5jJ4P+iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=", - "crlite_enrolled": true, - "id": "57692346-8878-48fc-aea7-e7f609f4a9de", - "last_modified": 1641481037709 - }, - { - "schema": 1641477722022, - "derHash": "lRQaNVpaKqPgESIcq5/nOBD9tdiBNYZPA+TYUr0Lvts=", - "subject": "CN=Thawte RSA CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBSU0EgQ04gQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "419f063716d0b08e5119a943e2d8506a67bba9d8b72f725763a5b48b0911dfd3", - "size": 1792, - "filename": "hN3GzHyLopxOn8DxNQIEvpQa-NyS7R_1oQY0xsFsrOA=.pem", - "location": "security-state-staging/intermediates/0d05c78d-0f37-439e-b5d1-08268337d922.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "hN3GzHyLopxOn8DxNQIEvpQa+NyS7R/1oQY0xsFsrOA=", - "crlite_enrolled": true, - "id": "0810cb55-6c6a-4343-a322-9e5c9f7920af", - "last_modified": 1641481037699 - }, - { - "schema": 1641477716289, - "derHash": "igI8COShqsySWzTFx5ZajQUnVlrqEwq7kV5QjNM6+0U=", - "subject": "CN=GeoTrust RSA CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "1c253f34ef8fb2a9d6743df4e53b8c564f86da911d0aee06adf0de306c22beb7", - "size": 1792, - "filename": "Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC-fWQBE=.pem", - "location": "security-state-staging/intermediates/da3b185f-0b51-4749-b8bc-791ebfd15fc9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC+fWQBE=", - "crlite_enrolled": true, - "id": "9c0eb9aa-b6ce-452b-9c28-80f98e51306b", - "last_modified": 1641481037689 - }, - { - "schema": 1641477727214, - "derHash": "TjD4AEwY09eY7Fp3NDRrWl6+jVRCPOmCV/xXc1pvc40=", - "subject": "CN=DigiCert High Assurance CA-3b,O=DigiCert Inc,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTNi", - "whitelist": false, - "attachment": { - "hash": "cc6e9717bc66f910a2529ed604fb79e0564914be23443f51afe962a3afe09891", - "size": 2048, - "filename": "1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=.pem", - "location": "security-state-staging/intermediates/6990bf85-33f3-4e45-a819-27baa0ed7dcb.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=", - "crlite_enrolled": true, - "id": "6fe7a90f-5366-4061-a9ed-581dae6a646b", - "last_modified": 1641481037669 - }, { "schema": 1641477707523, "derHash": "DluAQLOrYKUNLV+xHhmusuRbVkszW3nXc9QrgdghnHU=", @@ -17550,474 +19170,6 @@ "id": "5f3d2450-bc1b-4592-b9c5-d733f00a7357", "last_modified": 1641481037659 }, - { - "schema": 1641477707223, - "derHash": "nbCiDDBVQeFegYqIDQZXmHapyQG47s2WhILFjZun8Kc=", - "subject": "CN=TrustAsia EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "4e4f81e693158e50a56fefb6a5aca6b3e4574f9fe988f6c8784cddc95d070ff8", - "size": 1650, - "filename": "qPCsIegto8XzD_ooUOSN32SyAwuprv0BX_QDRc0K3aI=.pem", - "location": "security-state-staging/intermediates/4ac60b8e-b3bd-4e52-a97e-bd3b83cc2ec5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "qPCsIegto8XzD/ooUOSN32SyAwuprv0BX/QDRc0K3aI=", - "crlite_enrolled": true, - "id": "0b7fb8d7-395a-4a87-bbca-e9f0494cbbd2", - "last_modified": 1641481037649 - }, - { - "schema": 1641477706930, - "derHash": "E5rDa9hTmLu7RYhofCDcNoJ9A6X0Kq34fwK+zEvpv8I=", - "subject": "CN=DigiCert Secure Site EV CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIENOIENBIEcz", - "whitelist": false, - "attachment": { - "hash": "0b1f6ecad39cb939686ab17ee9e4168992c49d49dadf8783292a36743b0eabd0", - "size": 1638, - "filename": "q0mT-mtnAchq7xXJEtVo25yl_8a1e08EqUu2Ww5ybfQ=.pem", - "location": "security-state-staging/intermediates/1ce4670b-c3e7-4e29-9f89-30844efb4ed9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "q0mT+mtnAchq7xXJEtVo25yl/8a1e08EqUu2Ww5ybfQ=", - "crlite_enrolled": true, - "id": "bcd47841-6736-4533-bf49-4312192e3896", - "last_modified": 1641481037630 - }, - { - "schema": 1641477717791, - "derHash": "dWqrkA4/XHYnNLZGH8MqndNB6h1KBCg0CSM8OXh6hn4=", - "subject": "CN=TrustAsia ECC OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "2e493c5d02aaed01f99e9499d09f7808636cd52471c8ddfc79dfb5c64d83b8ac", - "size": 1353, - "filename": "tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=.pem", - "location": "security-state-staging/intermediates/5ea136cd-de72-4386-83f7-76fda17b499d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=", - "crlite_enrolled": true, - "id": "13e82017-a63b-46d6-8df5-d824c3250fcc", - "last_modified": 1641481037529 - }, - { - "schema": 1641477717476, - "derHash": "OrvmPa91bFAWtrhfUgFf2Oisvid8UIexJ6YFY6hB7Yo=", - "subject": "CN=Cloudflare Inc ECC CA-3,O=Cloudflare\\, Inc.,C=US", - "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBFQ0MgQ0EtMw==", - "whitelist": false, - "attachment": { - "hash": "aae889b11427ea641ba5e6fa121be2cea21baf4f6c6e3a4a24696fb45f974223", - "size": 1378, - "filename": "FEzVOUp4dF3gI0ZVPRJhFbSJVXR-uQmMH65xhs1glH4=.pem", - "location": "security-state-staging/intermediates/27a31a42-feae-47ff-8d4e-647a896f9508.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "FEzVOUp4dF3gI0ZVPRJhFbSJVXR+uQmMH65xhs1glH4=", - "crlite_enrolled": true, - "id": "de14e899-d269-4989-b43a-525c56a62193", - "last_modified": 1641481037316 - }, - { - "schema": 1641477719591, - "derHash": "pmyXrlnf+eoBXnPHRO5VIHRfEBo5XEl9GeHxaNOa/NA=", - "subject": "CN=DigiCert Secure Site Pro CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBDTiBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "5aded62775075d08acc444c1de87c126e2389b6c7642ebc86c4a8c12384e4285", - "size": 1808, - "filename": "BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB_bo=.pem", - "location": "security-state-staging/intermediates/721e23ad-72ff-4222-ae1d-d221eb1482a7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB/bo=", - "crlite_enrolled": true, - "id": "7a20a336-c213-4fd2-ad8c-92be449691f2", - "last_modified": 1641481037306 - }, - { - "schema": 1641477721109, - "derHash": "sjopwxKnqAsP5rTnG5CcrpKtZJ6Idm5Wye6OHXwBOUU=", - "subject": "CN=Trust Provider B.V. TLS RSA EV CA G2,O=Trust Provider B.V.,C=NL", - "subjectDN": "MFoxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMS0wKwYDVQQDEyRUcnVzdCBQcm92aWRlciBCLlYuIFRMUyBSU0EgRVYgQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "38af4377ab1fc22658f11e631b7b47777b04bb8fb15d4b189132d8502e7c0990", - "size": 1756, - "filename": "tbS_1veJrHW-X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=.pem", - "location": "security-state-staging/intermediates/5f9c71f9-ea8c-4afb-94cb-c8d606a8933d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tbS/1veJrHW+X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=", - "crlite_enrolled": true, - "id": "784ae2c3-b573-43e8-b16e-5c7524b7e6bc", - "last_modified": 1641481037296 - }, - { - "schema": 1641477727560, - "derHash": "0OilGsqrmvgnZ+LvFlQ8LMY1VRtd4NriXWqsceeGKHA=", - "subject": "CN=TrustAsia OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "f3b5ebd05dd3f189c5ed69f72d96e308522771553df7feb6a4fcdace0c0745b0", - "size": 1821, - "filename": "tv1pIXiJEYFUrzxhRqxCjTL7S9s7y_PZbxYVnDOXeCI=.pem", - "location": "security-state-staging/intermediates/128dd01a-e1a1-4819-bc9a-043a0fa2563c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tv1pIXiJEYFUrzxhRqxCjTL7S9s7y/PZbxYVnDOXeCI=", - "crlite_enrolled": true, - "id": "6d03d111-d670-4e12-9bbd-b3ecad0252cd", - "last_modified": 1641481037286 - }, - { - "schema": 1641477719895, - "derHash": "t1rumDb++8RG8oiilwuE/GCq+e+9LLn4L3WBeQ3kuNw=", - "subject": "CN=DigiCert Secure Site Pro EV CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBDTiBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "8f19662a936c31bb439790a003ca25e57b94197599e34213f653edb625e96dbe", - "size": 1642, - "filename": "2OVT1JHnI_dBAIq49zWtXoFiiSQRI-yC8zdls8oKK38=.pem", - "location": "security-state-staging/intermediates/2d3ad204-0ce2-4d05-9f72-d1c775ffbbf7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "2OVT1JHnI/dBAIq49zWtXoFiiSQRI+yC8zdls8oKK38=", - "crlite_enrolled": true, - "id": "009aa822-146e-46a3-a719-3dcd9bf7e8e3", - "last_modified": 1641481037276 - }, - { - "schema": 1641477711607, - "derHash": "avXE6sGAKJuUp3pdIx44Zf/pNPPmokv0h+tOK/2Amks=", - "subject": "CN=DigiCert Secure Site CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIENOIENBIEcz", - "whitelist": false, - "attachment": { - "hash": "743079f69e24d2afafbe5dd936ba2cfc2f9326699f40d7bb7f26e940a110daa9", - "size": 1804, - "filename": "TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=.pem", - "location": "security-state-staging/intermediates/8026b161-5f15-4e50-9e04-efeab78566fe.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=", - "crlite_enrolled": true, - "id": "ad68756a-4b01-4086-81fb-9969fb748de3", - "last_modified": 1641481037266 - }, - { - "schema": 1641477707833, - "derHash": "y1ez/yBAyyaUl2JbyQ+p17TtSTjG9g9C9pr99QisKZM=", - "subject": "CN=DigiCert Basic RSA CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIFJTQSBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "af11309a3c20fa360cb678f8d6958ba267f86f202af25ff95cae834d95837fe4", - "size": 1821, - "filename": "ZckwC4fqIUCeiz1_ihqLY9TDek4tDc704HFPrhqylPo=.pem", - "location": "security-state-staging/intermediates/a293e696-ef17-4439-8b31-20962f5f352a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ZckwC4fqIUCeiz1/ihqLY9TDek4tDc704HFPrhqylPo=", - "crlite_enrolled": true, - "id": "f921edde-d8b6-430f-aa42-636c604bb2a3", - "last_modified": 1641481037256 - }, - { - "schema": 1641477724159, - "derHash": "iTfpDhSVyaeO+xgYLUP9xz/NKSq2NHoSuQd96HhTDmI=", - "subject": "CN=GeoTrust EV RSA CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIFJTQSBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "dbcead7fd92db8003e615e6ab4e681c29b1f4e1f5a16537b11786c41b180f203", - "size": 1646, - "filename": "AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw_OD7I=.pem", - "location": "security-state-staging/intermediates/4f22de4a-5b44-4d18-bc10-7deaee7abcc7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw/OD7I=", - "crlite_enrolled": true, - "id": "4af8f737-c4f7-4213-a097-781dca9addd3", - "last_modified": 1641481037246 - }, - { - "schema": 1641477703334, - "derHash": "48JCed1qM3+IGxvGkuh49KMa/pWFHyCPlIALDCTYjDg=", - "subject": "CN=GeoTrust RSA CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "ab4a0d2c2f5e08bd7983cd7ef5ded4ca8f1b29963790a87f297d00860979dc97", - "size": 1813, - "filename": "LYxGolhhMxT6m_MXQhVdp6zkEP-xK8sxXN4I4pBqtFs=.pem", - "location": "security-state-staging/intermediates/b2b450c3-0185-461d-8eb2-c785ac2b386e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "LYxGolhhMxT6m/MXQhVdp6zkEP+xK8sxXN4I4pBqtFs=", - "crlite_enrolled": true, - "id": "bb0939ee-0780-4a40-abd6-9461d85b0902", - "last_modified": 1641481037235 - }, - { - "schema": 1641477709380, - "derHash": "fK7saA5kl/xRCQc/g4FueY8n+JaKJmPByVcRtUgZLjU=", - "subject": "CN=GeoTrust ECC CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "253b1b900adc6be80e90ac3862b020d22321e25976cb9c08fa7266318159ad58", - "size": 1374, - "filename": "5hUeeQGevtQx_9LReJqSkj73Yv0TUcld9s9jPFCqJqA=.pem", - "location": "security-state-staging/intermediates/ff6fd4b8-f7d7-4779-922b-29b398cecef6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5hUeeQGevtQx/9LReJqSkj73Yv0TUcld9s9jPFCqJqA=", - "crlite_enrolled": true, - "id": "c542f5dc-33cb-490b-9311-a1dadc26b605", - "last_modified": 1641481037225 - }, - { - "schema": 1641477710651, - "derHash": "29+pGsxNuK2D/MeXjjXWL24y5VEIJzyOyZjjEzWA1mQ=", - "subject": "CN=TrustAsia OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "62f07941ab31ac93b3aa011cf5c969d6144dfa3248c15cf83974bbad7d102dde", - "size": 1821, - "filename": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem", - "location": "security-state-staging/intermediates/01439ed9-c5df-42a3-bd51-09e6f0ab3467.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=", - "crlite_enrolled": true, - "id": "2d04d337-69e3-44ad-9e68-0cfd2a4a4153", - "last_modified": 1641481037206 - }, - { - "schema": 1641477715373, - "derHash": "Av7Tui5qeEOjGKmBvIRwYf0oLZ6IR/+p9U14W2uB1vM=", - "subject": "CN=Secure Site Pro CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVNlY3VyZSBTaXRlIFBybyBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "5c18d3156506cd5355f4d18f1913e2bd2818958dce99153a650e7f3195877f83", - "size": 1829, - "filename": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem", - "location": "security-state-staging/intermediates/69603c20-57db-47e4-8db1-78012f614eb4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=", - "crlite_enrolled": true, - "id": "047bbf71-0e60-47f1-88fb-c8654e3e2fd6", - "last_modified": 1641481037196 - }, - { - "schema": 1641477715681, - "derHash": "9hSuKxAUhPFfZvTdpW7m60InKPF52UOZ7eGawdhai9M=", - "subject": "CN=Secure Site CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVNlY3VyZSBTaXRlIENBIEcy", - "whitelist": false, - "attachment": { - "hash": "ea9ed009cee9ad525cea31b09520df7f3327215055a5f8d38c27bc5eed479ab1", - "size": 1825, - "filename": "3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem", - "location": "security-state-staging/intermediates/f1eaf41b-8ddc-4230-8adb-5920c9c4ef35.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=", - "crlite_enrolled": true, - "id": "0558d609-3bfb-4844-bf88-b93e9bd0dbdb", - "last_modified": 1641481037186 - }, - { - "schema": 1641477711956, - "derHash": "2jvitqbZcVwSlaQr5SbgAB0Q5ddUDwbnYxs05kSTSEg=", - "subject": "CN=Secure Site Pro ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIjAgBgNVBAMTGVNlY3VyZSBTaXRlIFBybyBFQ0MgQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "788b2f3686e8970c3f5cfad0711b04ffb48ca9be4a2d82a766de64e5a7aa6248", - "size": 1394, - "filename": "SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=.pem", - "location": "security-state-staging/intermediates/f6d2b6fc-b4fb-4bad-81b8-9e27104a4e8c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=", - "crlite_enrolled": true, - "id": "8353b3ca-43b2-48d1-87b8-c28fcd0ba0e3", - "last_modified": 1641481037176 - }, - { - "schema": 1641477713558, - "derHash": "A86bxxuR/bfLPFI1yuBwHLSGu9Yo1KreWEH8XwqjekY=", - "subject": "CN=DigiCert CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFURpZ2lDZXJ0IENOIFJTQSBDQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "595bf22b78664a42587deccbb284643462b25d170791f641b0fd546e4050d8f6", - "size": 1829, - "filename": "MIKoeatlSqVA3aCIrE0_JYoP9vF4XSCTPHy-c9vAsKk=.pem", - "location": "security-state-staging/intermediates/d17777aa-b2a4-484e-8441-343c9547032e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "MIKoeatlSqVA3aCIrE0/JYoP9vF4XSCTPHy+c9vAsKk=", - "crlite_enrolled": true, - "id": "03498728-f5b2-439d-81fe-b9e6d9610c07", - "last_modified": 1641481037166 - }, - { - "schema": 1641477703974, - "derHash": "tutPitGXBz/lID+Pzr/VxQnN6co6pl7FnSA4MUJBktQ=", - "subject": "CN=Secure Site Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJVNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "1fe012e3f79fed86fcbc44ecbe0623dc6e29f5661b7a0c3e9fa7227ba2d32481", - "size": 1699, - "filename": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem", - "location": "security-state-staging/intermediates/6a40c4ce-bac6-44bf-8873-e22c2cf6735c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=", - "crlite_enrolled": true, - "id": "d0ac7826-e8f7-4908-96fa-e77d77b7fca2", - "last_modified": 1641481037156 - }, - { - "schema": 1641477712914, - "derHash": "I93wiyI3PYYVjrnJn9tTZrGYBFYFMTct0g3OP7dm9Ww=", - "subject": "CN=GeoTrust CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IENOIFJTQSBDQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "286b2d63e30e027855db802c9e0539ca23b9a9060c9f3e3b810fc02209173191", - "size": 1829, - "filename": "4H6OXny7MqJPbCOTpHyS0fSSUeHk_I5nKbIyuQwnfsA=.pem", - "location": "security-state-staging/intermediates/8e773633-0151-43b1-93be-e2074d328d67.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "4H6OXny7MqJPbCOTpHyS0fSSUeHk/I5nKbIyuQwnfsA=", - "crlite_enrolled": true, - "id": "5e1984cb-9f6f-403f-98dc-ede2f85ccbae", - "last_modified": 1641481037136 - }, - { - "schema": 1641477726301, - "derHash": "yHzgOv+13mMZwhmXHy7S2Pb1OJ4tU7It0sVipcmCf8A=", - "subject": "CN=GeoTrust EV CN RSA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IEVWIENOIFJTQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "d222797c82dd7127576a516cb679acc7149d876ca1871f151665584a65c8958e", - "size": 1678, - "filename": "_AbtYXa2JlKxQyB1FnBObb2Wv8Q-bUxjsGRIXvzcvpQ=.pem", - "location": "security-state-staging/intermediates/018708e8-2e71-4cdd-808d-b307f41e71a2.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "/AbtYXa2JlKxQyB1FnBObb2Wv8Q+bUxjsGRIXvzcvpQ=", - "crlite_enrolled": true, - "id": "dd86d747-415a-4663-841b-9d245710f0eb", - "last_modified": 1641481037126 - }, - { - "schema": 1641477723847, - "derHash": "QNaZIOoFRW+gEX3mCLioATeQtUIJfjQ+wcvOLfuXE7A=", - "subject": "CN=Secure Site Pro Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENBIEcy", - "whitelist": false, - "attachment": { - "hash": "8020f42d89c841697f922651d0d7b35319708585b4dae12e24e03526e2a96f83", - "size": 1703, - "filename": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem", - "location": "security-state-staging/intermediates/adec223e-eda3-4d12-bdab-c4e535e58e79.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=", - "crlite_enrolled": true, - "id": "982fce8e-e441-4c2f-a4a8-2304fb7e2ac2", - "last_modified": 1641481037116 - }, - { - "schema": 1641477704555, - "derHash": "sTGQXMciEnBhO1KayeeGqiMKv+FUoKy+RSvDUL0e/ks=", - "subject": "CN=DigiCert CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IENOIFJTQSBFViBDQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "4faf62df3f53a4fe26ac667c6b9d791fd8d952eec9c249782056ad06c4fead0d", - "size": 1683, - "filename": "mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=.pem", - "location": "security-state-staging/intermediates/20053df1-5626-4ba2-a024-3f6bb49f5e6b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=", - "crlite_enrolled": true, - "id": "5ed1b67e-597a-44c5-bbf4-973e53cc5889", - "last_modified": 1641481037105 - }, - { - "schema": 1641477715075, - "derHash": "GUAL5bejH7czkXcAeJ0vCiRxwMnVBsDlBMBsFtfLF8A=", - "subject": "CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJkRpZ2lDZXJ0IFNIQTIgSGlnaCBBc3N1cmFuY2UgU2VydmVyIENB", - "whitelist": false, - "attachment": { - "hash": "97ebf8501ebeef539292b72802d284d4a90895579053c7ca04829988d01099fd", - "size": 1687, - "filename": "k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K-59sNQws=.pem", - "location": "security-state-staging/intermediates/c00739e2-a5f0-4bfc-bd66-49b848083fe1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K+59sNQws=", - "crlite_enrolled": true, - "id": "6bad67e8-353f-45a0-88bf-f84ca74f9d08", - "last_modified": 1641481037075 - }, - { - "schema": 1641477727874, - "derHash": "RYRGunXZMukU8jwrV7fRku3bwhgdlY4Rga1SUXR6Hug=", - "subject": "CN=DigiCert ECC Secure Server CA,O=DigiCert Inc,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEVDQyBTZWN1cmUgU2VydmVyIENB", - "whitelist": false, - "attachment": { - "hash": "b2bcbebe7e27673d1a6a02cea251d16fb5d61462c14b4e5f2959e1d241a38778", - "size": 1333, - "filename": "PZXN3lRAy-8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=.pem", - "location": "security-state-staging/intermediates/64f57389-f6e8-4703-a733-9ac4ef7d0e9d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "PZXN3lRAy+8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=", - "crlite_enrolled": true, - "id": "ec135dce-52fb-4ab9-b488-075172498a7c", - "last_modified": 1641481037065 - }, - { - "schema": 1641477725083, - "derHash": "+WkIgIGfBs3MCy8iSyB/KvYAP7VzObhnmhYPqVII1i0=", - "subject": "CN=DigiCert Baltimore CA-2 G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0yIEcy", - "whitelist": false, - "attachment": { - "hash": "bd36d2274e9da51b8bdff6a5034236a8cd4be11b09a0484694bb0d5786f90c06", - "size": 1581, - "filename": "56higu_MFWb_c2b0avLE5oN2ECS2C43RvzSUgx_2xIE=.pem", - "location": "security-state-staging/intermediates/95cd362d-50b9-447c-9a65-f2618e6ef5a0.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "56higu/MFWb/c2b0avLE5oN2ECS2C43RvzSUgx/2xIE=", - "crlite_enrolled": true, - "id": "25183d60-3420-4e98-9619-5f0eec8fee1d", - "last_modified": 1641481037034 - }, { "schema": 1641477718698, "derHash": "JTA8/QvxuqHvJIwp8HP//C58gVgu4jtFx/HDsy40Gtg=", @@ -18054,60 +19206,6 @@ "id": "9827f84e-7c8f-4336-952d-450a06e83326", "last_modified": 1641481037014 }, - { - "schema": 1641477714168, - "derHash": "k8OBywezU6kgwqe+1r6/GVxoJ53QUn038gvdDZnDMPo=", - "subject": "CN=DigiCert Assured ID CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "b7c018817ad0fe311c0e3f46cb59e0998110a056304537716c2436a17916b212", - "size": 1654, - "filename": "dnPPE-JM_ZaNCC1Q198LELhQiAdfMsEPXi1LVYU-aPQ=.pem", - "location": "security-state-staging/intermediates/dd6dcf5a-a932-4645-be43-cc51dd5ef65c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "dnPPE+JM/ZaNCC1Q198LELhQiAdfMsEPXi1LVYU+aPQ=", - "crlite_enrolled": true, - "id": "a29b66e0-76d3-421c-90a3-3ed1083fe7a9", - "last_modified": 1641481037004 - }, - { - "schema": 1641477721720, - "derHash": "L2iJlhp8pwZ+i6EDws+bmpJPjKKT8RF44joZeNLxM9M=", - "subject": "CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US", - "subjectDN": "MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=", - "whitelist": false, - "attachment": { - "hash": "a24b6873f5cedd0745b28d5b998ebab8816abfbde4a85fc3dfe456d4dedec97f", - "size": 1646, - "filename": "UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem", - "location": "security-state-staging/intermediates/ba6a6d30-b17d-4b39-9b81-2d721ab76ed4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=", - "crlite_enrolled": true, - "id": "d3fb3bfb-718d-4849-a53c-b80f49b89818", - "last_modified": 1641481036994 - }, - { - "schema": 1641477721412, - "derHash": "vrjv6bGnPIQbN1qQ5f/4BIhI46KvZvbE3XuTjW/oxdg=", - "subject": "CN=TERENA SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", - "subjectDN": "MGQxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEYMBYGA1UEAxMPVEVSRU5BIFNTTCBDQSAz", - "whitelist": false, - "attachment": { - "hash": "9d893e798bf07b02ee964606c0d5c4fc736a3465312d4895a2e8e195edc18959", - "size": 1788, - "filename": "8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=.pem", - "location": "security-state-staging/intermediates/6bd257cc-8279-4f32-8333-4b6a39355c56.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=", - "crlite_enrolled": true, - "id": "1ca7f3e4-205e-41e8-ba7a-68ea492d0f45", - "last_modified": 1641481036974 - }, { "schema": 1641477714770, "derHash": "zW65N+4Xqfz/YKeQ+L3gypq8oHs+9GB03Rl48Lyk1Ek=", @@ -18126,132 +19224,6 @@ "id": "ae24e0ff-b8b9-4d71-8508-3ceac79ef326", "last_modified": 1641481036963 }, - { - "schema": 1641477712285, - "derHash": "/ciYbPrE818azVF+D2G4eYgq4HbiuoC3e9Pw/lzviGI=", - "subject": "CN=DigiCert ECC Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKkRpZ2lDZXJ0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==", - "whitelist": false, - "attachment": { - "hash": "31ecd5e8057fdfa62dc602519feac045085c66fc65b202627b24662a21a6de2f", - "size": 1414, - "filename": "WOINGBsGlG95B7s_6U7XB_KM7U73y-sXgtLqZpn3G88=.pem", - "location": "security-state-staging/intermediates/60a912ac-30e3-4cf3-b9c7-b3c3a357755f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "WOINGBsGlG95B7s/6U7XB/KM7U73y+sXgtLqZpn3G88=", - "crlite_enrolled": true, - "id": "7ea2d3a5-3815-43a7-93ac-94921c661784", - "last_modified": 1641481036953 - }, - { - "schema": 1641477720213, - "derHash": "8SJB7jTAOmCNNNvA6kZeG9GqEwkVVPnU0IYlP/POg9Q=", - "subject": "CN=DC Government SHA2 EV Intermediate CA,OU=Office of the Chief Technology Officer,O=Government of the District of Columbia,C=US", - "subjectDN": "MIGfMQswCQYDVQQGEwJVUzEvMC0GA1UEChMmR292ZXJubWVudCBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExLzAtBgNVBAsTJk9mZmljZSBvZiB0aGUgQ2hpZWYgVGVjaG5vbG9neSBPZmZpY2VyMS4wLAYDVQQDEyVEQyBHb3Zlcm5tZW50IFNIQTIgRVYgSW50ZXJtZWRpYXRlIENB", - "whitelist": false, - "attachment": { - "hash": "14472d3dc922dcba7c834374f5b8121efcd08cab9d0778d052e329913bee403d", - "size": 2073, - "filename": "D6bVPPyHKUFV0WmvSS6nCMgaQId_SQKugGjOOT48QXE=.pem", - "location": "security-state-staging/intermediates/7e3f4ba8-098a-4f7e-a594-d98f5caa1fa9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "D6bVPPyHKUFV0WmvSS6nCMgaQId/SQKugGjOOT48QXE=", - "crlite_enrolled": true, - "id": "2316b3da-de73-40e0-8b36-7f2ad4206eec", - "last_modified": 1641481036943 - }, - { - "schema": 1641477719001, - "derHash": "XSh2HL8wTq/NEns01hT+F5rHdE8VUq8cMSmEJa0FonU=", - "subject": "CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US", - "subjectDN": "MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==", - "whitelist": false, - "attachment": { - "hash": "79fdcd0fdb21095bb95b3fb6c0d2e5a49a456e49968efb573d826c26b3cca0e5", - "size": 1683, - "filename": "NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem", - "location": "security-state-staging/intermediates/f1b50907-9001-4396-aa45-939f75f991c6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=", - "crlite_enrolled": true, - "id": "65d41ecf-d71f-4a7d-bf9b-57d8825ab674", - "last_modified": 1641481036933 - }, - { - "schema": 1641477719298, - "derHash": "z3z6T528y8ptIO/evq1OFzs052vaHrHmGfROBulfwgg=", - "subject": "CN=Wells Fargo Public Trust Certification Authority 01 G2,OU=Organization Validated TLS,O=Wells Fargo & Company,C=US", - "subjectDN": "MIGTMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVV2VsbHMgRmFyZ28gJiBDb21wYW55MSMwIQYDVQQLExpPcmdhbml6YXRpb24gVmFsaWRhdGVkIFRMUzE/MD0GA1UEAxM2V2VsbHMgRmFyZ28gUHVibGljIFRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDAxIEcy", - "whitelist": false, - "attachment": { - "hash": "6a95abe84c8fbfe5c918a8ab12dc0a36ee395740e96f9b6ac44f84ce7b6f2fd0", - "size": 1727, - "filename": "piL8cJbKkJ2PJeful08_TUBtZu6QcnuC-5qgNu13n_c=.pem", - "location": "security-state-staging/intermediates/997b2303-b010-4dfd-b758-6970b5ab0dad.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "piL8cJbKkJ2PJeful08/TUBtZu6QcnuC+5qgNu13n/c=", - "crlite_enrolled": true, - "id": "a1e2fd83-de14-4ea7-89a4-a885aa53e074", - "last_modified": 1641481036923 - }, - { - "schema": 1641477720515, - "derHash": "j6xXZDnJ/T7xU7Ufnt0NOBtd97h1Wc6+ygQpfdRKY5s=", - "subject": "CN=DigiCert Global CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "f974f77c91205dbd3c9e89bb41254df4a42a70a49efa60ce9c07db31dbcc3712", - "size": 1634, - "filename": "njN4rRG-22dNXAi-yb8e3UMypgzPUPHlv4-foULwl1g=.pem", - "location": "security-state-staging/intermediates/d91dd6ee-e83b-47b7-b9dd-835d20657b98.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "njN4rRG+22dNXAi+yb8e3UMypgzPUPHlv4+foULwl1g=", - "crlite_enrolled": true, - "id": "a41a5511-de35-4c5d-af6a-1283493ecab1", - "last_modified": 1641481036912 - }, - { - "schema": 1641477725384, - "derHash": "mZNeIEJFNewBbzN7K+aPE0neZszkylqzZ/jzc4IVuDM=", - "subject": "CN=DigiCert Secure Site ECC CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDQS0x", - "whitelist": false, - "attachment": { - "hash": "c1873c9110b38d6483be9516efcc79cdd751a74f8f10ff176ee411a27f5e6802", - "size": 1374, - "filename": "Z5_2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=.pem", - "location": "security-state-staging/intermediates/63cecafd-26c5-4442-a764-6a7ef05785ca.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Z5/2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=", - "crlite_enrolled": true, - "id": "38a4e0fc-47a6-4351-8c6e-d512e40ea47b", - "last_modified": 1641481036901 - }, - { - "schema": 1641477711295, - "derHash": "FUxDPEkZKcXvaG6DjjI2ZKAOag2CLMyVj7TasD5JoI8=", - "subject": "CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US", - "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==", - "whitelist": false, - "attachment": { - "hash": "6edb4a81fe4f8f9a18de8035d87dad2c701e2cc7fc5ce3832cbdce4468bd31f3", - "size": 1646, - "filename": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem", - "location": "security-state-staging/intermediates/2dade068-5ff0-4ce7-9d2b-b1fca06fd9e1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=", - "crlite_enrolled": true, - "id": "e8a303db-012e-4b10-88d9-69dca19e2f97", - "last_modified": 1641481036891 - }, { "schema": 1641305381754, "derHash": "xCpNjAkEuyEZBvQ7RBu7ybWgA7o2EYef00rldvfC92Q=", @@ -18702,24 +19674,6 @@ "id": "0fdbe9d5-d2f3-4438-9a51-df510e92865a", "last_modified": 1639083515608 }, - { - "schema": 1639059503399, - "derHash": "CFoHFFJN966ZGab1l4hEOeEqUz5hVS0p1qGMNQlvxUg=", - "subject": "CN=DigiCert SHA2 Extended Validation Server CA-3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US", - "subjectDN": "MHkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTE2MDQGA1UEAxMtRGlnaUNlcnQgU0hBMiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQS0z", - "whitelist": false, - "attachment": { - "hash": "15b5964a25d36b4473500f8cf513384d9fa90b6caa77e7007c1d32de791ca6ca", - "size": 1719, - "filename": "lwTPN61Qg5-1qAU-Mik9sFaDX5hLo2AHP80YR-IgN6M=.pem", - "location": "security-state-staging/intermediates/c25c1336-89eb-46c5-9de3-c6b8546dd191.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "lwTPN61Qg5+1qAU+Mik9sFaDX5hLo2AHP80YR+IgN6M=", - "crlite_enrolled": false, - "id": "b1c9f693-7c29-4bbf-bf61-d0546487685b", - "last_modified": 1639061882916 - }, { "schema": 1639016177331, "derHash": "728p9jb2K91HUxIvQfNBnufCh3WHvkqYB631iUZFjn8=", @@ -19098,42 +20052,6 @@ "id": "73e86e8a-47ad-4f60-be1d-64ed2011a0bb", "last_modified": 1636556282862 }, - { - "schema": 1635735519825, - "derHash": "DhC93udRLb156/C09I/u18g8K9PdgXZVZfT/EQt7+kI=", - "subject": "CN=Cybertrust Japan Extended Validation Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", - "subjectDN": "MGsxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjE3MDUGA1UEAxMuQ3liZXJ0cnVzdCBKYXBhbiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==", - "whitelist": false, - "attachment": { - "hash": "e3d590ab4b71fbd20183713733b3253b32ef24a73382153319f8916fc66d3c1d", - "size": 1678, - "filename": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8_yf2AOohCgqgk=.pem", - "location": "security-state-staging/intermediates/222e4d33-ee5a-4885-add5-c30b4495b281.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8/yf2AOohCgqgk=", - "crlite_enrolled": false, - "id": "92292d1f-471b-4db3-ba30-6f423a7d649b", - "last_modified": 1635757203583 - }, - { - "schema": 1635581142762, - "derHash": "M9VzWYMfh3VObnVda1tW5+cSl93f6h1jlwhmBCgPb/w=", - "subject": "CN=Cybertrust Japan Secure Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", - "subjectDN": "MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIENB", - "whitelist": false, - "attachment": { - "hash": "3d3d273966feacef23b9bad6f99c08f1cc7d487295361ce8cc0b10c724baf67a", - "size": 1711, - "filename": "bVyC1r63wwzb47rnbZ46v-604DOoFUXTp4JA0srlZRE=.pem", - "location": "security-state-staging/intermediates/aa91ff40-8753-4ea6-bc6c-9c2f51e7c6a1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "bVyC1r63wwzb47rnbZ46v+604DOoFUXTp4JA0srlZRE=", - "crlite_enrolled": false, - "id": "03556fa4-abec-492c-a31c-149b44f3f991", - "last_modified": 1635584245288 - }, { "schema": 1635516394253, "derHash": "PtCuZ6FDLIPYIQHeabLuXn8gMCcJ2VeQc6MC2pD0hTM=", @@ -19368,24 +20286,6 @@ "id": "b07c6446-0c44-4a00-bb56-ca8b2b55a54e", "last_modified": 1632754668238 }, - { - "schema": 1631843846802, - "derHash": "YHXaXOzRXWWExVYDItXAn8IZnlLep5IdkQQKp1JIZy4=", - "subject": "CN=NCC Group Secure Server CA G2,O=NCC Group,C=US", - "subjectDN": "MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcy", - "whitelist": false, - "attachment": { - "hash": "f12f3260268153b74fe5f7a70e593d2e60ab8a06d81aedc45bbc58dfba23d7b3", - "size": 1593, - "filename": "I00VnH3kFOOpwcnmh-WRlnA_EFwJgSkqGVgxV5O2veg=.pem", - "location": "security-state-staging/intermediates/8e1d6726-9296-4299-8659-1eaa656eb71c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "I00VnH3kFOOpwcnmh+WRlnA/EFwJgSkqGVgxV5O2veg=", - "crlite_enrolled": false, - "id": "9690b65c-a95f-41d0-b2fb-794178af9721", - "last_modified": 1631887048728 - }, { "schema": 1631843450151, "derHash": "Csn+hDix/i/GdkFtyXauj6qXe8xIXXymn60sfr/c6ls=", @@ -19944,42 +20844,6 @@ "id": "44261107-8d3f-48ac-8a0d-8b9ef00b4189", "last_modified": 1622559454515 }, - { - "schema": 1621522643106, - "derHash": "4b5ru7cPWiQec2/ETGohYL9s4ZuV7dZ7976JboN3h0U=", - "subject": "CN=TERENA eScience SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", - "subjectDN": "MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIGVTY2llbmNlIFNTTCBDQSAz", - "whitelist": false, - "attachment": { - "hash": "b0d4a431134fa5326c4d8941ca00bc9e05a182f5314e22010ce190dafef3b64a", - "size": 1800, - "filename": "mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=.pem", - "location": "security-state-staging/intermediates/fb0d63fa-26c1-48ef-b408-173776b4675b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=", - "crlite_enrolled": false, - "id": "788f8e47-0819-4adb-a11b-e91c396886c0", - "last_modified": 1621544230943 - }, - { - "schema": 1621047436820, - "derHash": "/alHIIv6MgOmxXuHFKZHtwCeUWjoiVE0VFCx0tP5Gn0=", - "subject": "CN=TERENA eScience Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", - "subjectDN": "MHIxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEmMCQGA1UEAxMdVEVSRU5BIGVTY2llbmNlIFBlcnNvbmFsIENBIDM=", - "whitelist": false, - "attachment": { - "hash": "7ea6124756c90b6331413e85db4359452c378d63911d5b07dbce10ad0631a783", - "size": 1804, - "filename": "D4s14JIoSBMzTNeUUcWADRb_-SykkRSe9uuLuoU5ots=.pem", - "location": "security-state-staging/intermediates/409968e6-3674-4763-a739-1304627ae2d5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "D4s14JIoSBMzTNeUUcWADRb/+SykkRSe9uuLuoU5ots=", - "crlite_enrolled": false, - "id": "03f1b517-d8b6-4d50-8c17-fb4f5025f7b1", - "last_modified": 1621090640205 - }, { "schema": 1619790597514, "derHash": "aGkkLNitKsd7wCiUe8fQxPbpy/CJnWVwmBDYn5S11w0=", @@ -20214,24 +21078,6 @@ "id": "1d9c258c-3953-4116-8203-74400019183e", "last_modified": 1614628705254 }, - { - "schema": 1614394696175, - "derHash": "8crKarI1CnZowT5BlgkIaB2vzH42jcuNR/7PljE5BIE=", - "subject": "CN=TrustAsia ECC OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0E=", - "whitelist": false, - "attachment": { - "hash": "6c1475f6577a7d8b8cd4032290f9d3b4f16ef261f5dea618390de753433264ba", - "size": 1435, - "filename": "Gk60bmqo_Mr2nOHuGjR4JqFa8B4v-ZsjwYEWTGOxLZ8=.pem", - "location": "security-state-staging/intermediates/80dd276f-7f90-4ae3-bab0-8c263d2a1ebf.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Gk60bmqo/Mr2nOHuGjR4JqFa8B4v+ZsjwYEWTGOxLZ8=", - "crlite_enrolled": false, - "id": "63b7bdc2-0b6c-4e17-a4de-f25eb0e600ee", - "last_modified": 1614455933360 - }, { "schema": 1614390578814, "derHash": "U2dpLs5it1jQTZt+bfsNswf4WevGpstfd/8kVh18wAQ=", @@ -20502,42 +21348,6 @@ "id": "8cc1c1a9-82f5-425d-bc26-7033cc45e093", "last_modified": 1605189460438 }, - { - "schema": 1603789063900, - "derHash": "ogZkT1ev0QuUFpSYhYmBwW1jOFjODIi1fPFPoqkqrP0=", - "subject": "CN=Secure Site Pro ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlNlY3VyZSBTaXRlIFBybyBFQ0MgQ0E=", - "whitelist": false, - "attachment": { - "hash": "e293173433a0678dd0c07a0432db8bc25e796896b84c9cfb996a1234d78528d2", - "size": 1443, - "filename": "jqgpMe3J72LhpK4BfQvcmwg-Oh-RwdZH-swdUvq8F9k=.pem", - "location": "security-state-staging/intermediates/9620ee73-5f68-44bd-b368-b0ca0bcc7153.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "jqgpMe3J72LhpK4BfQvcmwg+Oh+RwdZH+swdUvq8F9k=", - "crlite_enrolled": false, - "id": "d9d951a6-56f3-4229-8405-898b7f223384", - "last_modified": 1603850281659 - }, - { - "schema": 1603241851952, - "derHash": "qmHCkn3InbIlypoX1gA3PQWPaW2G0Q4r17Xo9EqX7tE=", - "subject": "CN=WoSign OV SSL Pro CA,O=WoSign CA Limited,C=CN", - "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIE9WIFNTTCBQcm8gQ0E=", - "whitelist": false, - "attachment": { - "hash": "afb1ffcaed2f65ba6080da16e771b2fd79536ffb5f81dc7fd0f22152661e7331", - "size": 1666, - "filename": "YgNpzwCbB-5jnp9Vn5xVC090y79oIjE_2P8pF1_4DMI=.pem", - "location": "security-state-staging/intermediates/4aef0608-20c1-4fb7-b413-e1f6b8d8ccf9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "YgNpzwCbB+5jnp9Vn5xVC090y79oIjE/2P8pF1/4DMI=", - "crlite_enrolled": false, - "id": "ff45948b-1310-4371-a262-b582c5ad0bbb", - "last_modified": 1603245450595 - }, { "schema": 1601473889131, "derHash": "fOuUWEQnVvQKSFww8rrwAQfB6e6F2wL6APQbpYRDZOU=", @@ -20790,24 +21600,6 @@ "id": "fa4a1c02-26b3-4bf5-8034-bb4cabca2a73", "last_modified": 1601517443010 }, - { - "schema": 1601376750124, - "derHash": "raGI+DDDE/YEZIjsNB8e1K95PG3CjFhgBEXfvrQWN0Y=", - "subject": "CN=Thawte CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlRoYXd0ZSBDTiBSU0EgRVYgQ0EgRzE=", - "whitelist": false, - "attachment": { - "hash": "2e25caf70d87ee67fe15801e44af860291aeeb44a7970edffe70210cf856c3ba", - "size": 1678, - "filename": "Hn_AvJkahgLnROxUs8e4tPKOI2wS-n9H5P_jk0Cf2T4=.pem", - "location": "security-state-staging/intermediates/e792a27d-66e1-40ac-a2be-d23b05217ef8.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Hn/AvJkahgLnROxUs8e4tPKOI2wS+n9H5P/jk0Cf2T4=", - "crlite_enrolled": false, - "id": "2eabd45c-f82e-46d9-84d2-60e3b784ff6f", - "last_modified": 1601517442957 - }, { "schema": 1601376781920, "derHash": "JJBRRb2bm/6ZxgNUtJlRvg5wnxY0z70ONw/rnwaO1sM=", @@ -21222,60 +22014,6 @@ "id": "542da68e-9ecf-40ae-95ca-47a2d82da288", "last_modified": 1591908420041 }, - { - "schema": 1591167089365, - "derHash": "6h87+00ylrRn1LWCVZ1lGNZ21a/H0cJL6AJS95GRBG8=", - "subject": "CN=Thawte EV ECC CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBFQ0MgQ04gQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "6600278f549dbae28e5eccd7c6d67369706158aee73bf69487e3b23a4b7ddaf2", - "size": 1349, - "filename": "3GFGMg3yja_Gu8_Fov8gNPJ7b50vsniti0_Jy-xvY9A=.pem", - "location": "security-state-staging/intermediates/add88934-8005-4e38-b32f-7fc51dfffed1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3GFGMg3yja/Gu8/Fov8gNPJ7b50vsniti0/Jy+xvY9A=", - "crlite_enrolled": false, - "id": "af76e31b-fcae-4185-b725-666687e288ef", - "last_modified": 1591199862513 - }, - { - "schema": 1591167076191, - "derHash": "WOifT3BBDaALQUc8+kE/oHN+0nKfPtd74pp/RwU3cUc=", - "subject": "CN=Thawte ECC CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFQ0MgQ04gQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "4b60a802a42e6e4c05c687e45fc85a906f057a59607855889909b6b0d8b54554", - "size": 1317, - "filename": "0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY-X4H-exCnC0=.pem", - "location": "security-state-staging/intermediates/b6d2ca16-612a-4f12-b4de-bdc927f057ac.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY+X4H+exCnC0=", - "crlite_enrolled": false, - "id": "114db227-c822-4ad8-bc85-78ec38af7372", - "last_modified": 1591199862491 - }, - { - "schema": 1591167085011, - "derHash": "dayOQdmnzHWNOZj+Aw9jjP0ohVgj2k6bVpVM+94FTrY=", - "subject": "CN=DigiCert Trust Service CA,O=DigiCert Inc,C=US", - "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgQ0E=", - "whitelist": false, - "attachment": { - "hash": "a6a66b7af55471e0b38711d7f08e2851582c3a9a4fa4a8c11ffd63d8796ffc4e", - "size": 1849, - "filename": "gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=.pem", - "location": "security-state-staging/intermediates/30d35091-2272-41b0-8d63-8aa9c6a7253d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=", - "crlite_enrolled": false, - "id": "f0d3ef47-0140-4de4-8a17-349ba642faf7", - "last_modified": 1591199862488 - }, { "schema": 1591167087942, "derHash": "8La3WY3yeQRxVSYy66nN5tNJBl/G1mWVf57u9ae7JPI=", @@ -21294,24 +22032,6 @@ "id": "100d0005-d64d-4678-9a8a-b4bdf571825a", "last_modified": 1591199862482 }, - { - "schema": 1591167054203, - "derHash": "6VKbQo+2c5C8ZFXXm6JDToFsVP5PNZkwy3Cdslb935Q=", - "subject": "CN=DigiCert High Assurance Trust Service ECC EV CA,O=DigiCert Inc,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxODA2BgNVBAMTL0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRUNDIEVWIENB", - "whitelist": false, - "attachment": { - "hash": "de06436b3a21e829632e0b079103d0155f88adbdbc35e4184178d5e16626e73e", - "size": 1431, - "filename": "MMkARzLCDka9T1FV6sAvs-cZUAaL2QbYfVCCeg3D0W8=.pem", - "location": "security-state-staging/intermediates/e2efbea3-a3f8-4d7b-9645-ba2d190125e6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "MMkARzLCDka9T1FV6sAvs+cZUAaL2QbYfVCCeg3D0W8=", - "crlite_enrolled": false, - "id": "a9e0d855-db12-4790-a733-58040361f588", - "last_modified": 1591199862458 - }, { "schema": 1591167045220, "derHash": "405TXezfAKo3Tn1CiI5lCHTAOuKxW5oONNKJglXXFuA=", @@ -21366,24 +22086,6 @@ "id": "8b11a693-e60e-4d6d-80ee-c38a1d65c423", "last_modified": 1591199862367 }, - { - "schema": 1591166984645, - "derHash": "l8S0QxYFXyalKh9mTOOFgAqWSoVSyZ0ryv1hjm2AdKA=", - "subject": "CN=DigiCert Basic ECC CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIEVDQyBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "212fb078da2ffbb3ac1149f0dbd37bafc1c192f15595649f27ba9a328c516a96", - "size": 1382, - "filename": "Mg4fdox_AdxNXF8FVxl956AK4z_M3V3fNH5JYxAVfu4=.pem", - "location": "security-state-staging/intermediates/b674bdb2-2b94-4918-8068-2c0bcb83439d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Mg4fdox/AdxNXF8FVxl956AK4z/M3V3fNH5JYxAVfu4=", - "crlite_enrolled": false, - "id": "0c53b0b5-57c7-4119-9ba9-b6a454b96cfd", - "last_modified": 1591199862328 - }, { "schema": 1591166981675, "derHash": "9gbY3rJ8BAHzTntqN8jipR242gJr5YoH6FS2ht50xpo=", @@ -21456,24 +22158,6 @@ "id": "11673ac8-c50e-4666-a891-ff70f87c1a73", "last_modified": 1591199862224 }, - { - "schema": 1591166928355, - "derHash": "vJE3miHnveEbRVvx1RGGMxaCgFpKNTqO4lj3oDcGxmQ=", - "subject": "CN=DigiCert Secure Site Pro EV ECC CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MFcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMTAvBgNVBAMTKERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBFQ0MgQ04gQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "175f55c6e184737a8ef08da7da2ba8eeb68ccb7a8f4c26cb4135728b20cc7228", - "size": 1374, - "filename": "ABohyUv2yKwrj07ViEB9SgfSMpe6-G4RvaB7869gYaQ=.pem", - "location": "security-state-staging/intermediates/62c0ef15-c0da-4ff8-958c-8a5f9420afe1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ABohyUv2yKwrj07ViEB9SgfSMpe6+G4RvaB7869gYaQ=", - "crlite_enrolled": false, - "id": "0197f7a1-e219-43b2-b473-43a75d63a1a6", - "last_modified": 1591199862216 - }, { "schema": 1591166922501, "derHash": "BHeVeFzc/55uCuEiSS5be/CKnlxJdi4ry1J0fGkDFWE=", @@ -21528,60 +22212,6 @@ "id": "75e0caaf-9db0-4002-8fc9-28e0a8675dd8", "last_modified": 1591199862181 }, - { - "schema": 1591166899084, - "derHash": "pLK0dUVVn1//t83aehIg5i+3TRt6mk1NrLKyqDnOdFY=", - "subject": "CN=DigiCert Secure Site EV ECC CN CA G3,O=DigiCert Inc,C=US", - "subjectDN": "MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIEVDQyBDTiBDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "fe2667a1a90e9632c52d9fbaa7270f136842dcb2a58d926acb1094829bab3c83", - "size": 1370, - "filename": "k53DKcmdvTrcweDtMvf_MKTy3iBxavrlU-riK2LCoiQ=.pem", - "location": "security-state-staging/intermediates/b5412eae-7d6f-41c0-89be-66ca27c50b2d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "k53DKcmdvTrcweDtMvf/MKTy3iBxavrlU+riK2LCoiQ=", - "crlite_enrolled": false, - "id": "205d8820-e751-432c-9078-56282ef45802", - "last_modified": 1591199862156 - }, - { - "schema": 1591166903471, - "derHash": "ctD3y/RSm4DDSny7Q4vR0OH8JugOWcvU/XMU/N3w6ZQ=", - "subject": "CN=DigiCert High Assurance Trust Service EV CA,O=DigiCert Inc,C=US", - "subjectDN": "MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRVYgQ0E=", - "whitelist": false, - "attachment": { - "hash": "0aa319cc69c625abdd0fac5d90509c1840a629bc7b17f7130b545c0bfd57c6eb", - "size": 1699, - "filename": "HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=.pem", - "location": "security-state-staging/intermediates/3af22c45-79a8-47ec-b3d0-1aeade14957b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=", - "crlite_enrolled": false, - "id": "581603f2-07f6-428c-bee1-1efb081ee0c2", - "last_modified": 1591199862149 - }, - { - "schema": 1591166890348, - "derHash": "1hnzJXuYdW0ogR087pra2LyuG0Nnu7DHP2teVY+6RWM=", - "subject": "CN=DigiCert Basic EV ECC CN CA G2,O=DigiCert Inc,C=US", - "subjectDN": "ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIEVDQyBDTiBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "41848d17b98767397ec8bf100d1dfe140c4770ad085d9c802b3d8c7b949b96e7", - "size": 1378, - "filename": "yE_naogfFzNf_bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=.pem", - "location": "security-state-staging/intermediates/134279b7-bda6-4c1c-8662-4961873f1071.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "yE/naogfFzNf/bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=", - "crlite_enrolled": false, - "id": "99330272-0e3e-4df5-9535-55e2097b7ee6", - "last_modified": 1591199862124 - }, { "schema": 1591166884523, "derHash": "XdZh08sztQBcvtBFoiPdxERaqkHRrLXfcAiEytm6QZU=", @@ -21600,24 +22230,6 @@ "id": "5f4e1d4e-6a23-4bbc-a9b9-366ff6016a5b", "last_modified": 1591199862121 }, - { - "schema": 1591166886003, - "derHash": "8mmsALQQAD9y3GKK+z2VAnljDHxdDIIUig/STfTaQwE=", - "subject": "CN=DigiCert Trust Service ECC CA,O=DigiCert Inc,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENB", - "whitelist": false, - "attachment": { - "hash": "75b96b01d9b932fb522e5615db087c64e2ee12af68af026235262358e0eeef91", - "size": 1410, - "filename": "447EOyTQJY3PyAbUMHr-SyrdqoPSJsxpM0Nf26eUpV0=.pem", - "location": "security-state-staging/intermediates/82c3a715-65dc-4dc7-9803-8e94ab1605f7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "447EOyTQJY3PyAbUMHr+SyrdqoPSJsxpM0Nf26eUpV0=", - "crlite_enrolled": false, - "id": "2184c07f-101d-4e6e-ab1a-f806fff4f1af", - "last_modified": 1591199862113 - }, { "schema": 1591166882853, "derHash": "abCFmqwMqRvCm0IqPQS5/5D4e4Wje8BtuFMV9d5AvZU=", @@ -21816,24 +22428,6 @@ "id": "5c30def2-02f2-4f59-9e75-fb7cec21fda7", "last_modified": 1591199861716 }, - { - "schema": 1591167115649, - "derHash": "JOnyCsFnu48J3ooemWjMU/C186SUj1G4ZHtAsYbHXr4=", - "subject": "CN=DigiCert Secure Auth CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IFNlY3VyZSBBdXRoIENB", - "whitelist": false, - "attachment": { - "hash": "a64942af324b392768de8a32c2187db5660a414d7e770bda2812f1a9e980d44b", - "size": 1792, - "filename": "tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=.pem", - "location": "security-state-staging/intermediates/0500e928-1f83-4f99-a7e3-24b68820248d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=", - "crlite_enrolled": false, - "id": "6526cd1b-5a23-40c2-b96c-e1680e2c0884", - "last_modified": 1591199861714 - }, { "schema": 1591167133769, "derHash": "wKsH2QcaTMHTRAkXj4vKBYMQqLER3c+mVWWHYCJvUPk=", @@ -21906,24 +22500,6 @@ "id": "07decb3e-5474-49fb-8e4b-b0ce15e562f9", "last_modified": 1591199861471 }, - { - "schema": 1591167113296, - "derHash": "iR7i4jKC5QdsmukEfejqkA4Gb4HW3Nm4Q8WQeLDxBbw=", - "subject": "CN=WoSign EV SSL Pro CA,O=WoSign CA Limited,C=CN", - "subjectDN": "MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIEVWIFNTTCBQcm8gQ0E=", - "whitelist": false, - "attachment": { - "hash": "07c937a29a0a69cd8357438132740524c5f2b962a315e7238630d95a61147284", - "size": 1634, - "filename": "pH1dud9XORPnyq8wyLWWIS773gVEO_1UuyQKQdv4xKg=.pem", - "location": "security-state-staging/intermediates/bfbf0539-e24d-4990-a202-fc97784d7f75.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "pH1dud9XORPnyq8wyLWWIS773gVEO/1UuyQKQdv4xKg=", - "crlite_enrolled": false, - "id": "78e81458-dc94-491e-9bbd-82c797f01706", - "last_modified": 1591199861316 - }, { "schema": 1591167097159, "derHash": "vMOlTXCDEWMWzgO5pAyjbzNvSDmsWBhi1DEahPcBUU0=", @@ -21978,78 +22554,6 @@ "id": "d02db623-261b-4357-8746-76ac75242c86", "last_modified": 1591199861175 }, - { - "schema": 1580831339070, - "derHash": "LarG/frBbFSMU/8RmCVNfpN3YdIqHnzFwalGLpcUYfU=", - "subject": "CN=TrustAsia ECC EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0E=", - "whitelist": false, - "attachment": { - "hash": "97a9ce8bbe9252f62216d67f4991a416a4fcdeaadd410a6256c49e9a395d1a3a", - "size": 1427, - "filename": "FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=.pem", - "location": "security-state-staging/intermediates/d7338706-64ff-461f-8703-a9d2acd7dd78.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=", - "crlite_enrolled": false, - "id": "518e4647-08ec-44a9-941f-366feccac035", - "last_modified": 1580831371575 - }, - { - "schema": 1580831329745, - "derHash": "NU/PxhYqDuIgXb72iTHngDPs6dEl4IJOSbrr+C390Wc=", - "subject": "CN=GeoTrust SupremeSSL 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL", - "subjectDN": "MGIxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xITAfBgNVBAMTGEdlb1RydXN0IFN1cHJlbWVTU0wgMSBDQQ==", - "whitelist": false, - "attachment": { - "hash": "324604ce7c1feb1281d395804fd405d53c1027c74aaaa93ab18d05f841ca2630", - "size": 1707, - "filename": "SM-CBbHgVoJj8KYqNoXbUd-IGEbfvpomZR5lGHQ3qng=.pem", - "location": "security-state-staging/intermediates/a8e9d4d9-73f3-4a4e-a0dc-fdd198240404.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "SM+CBbHgVoJj8KYqNoXbUd+IGEbfvpomZR5lGHQ3qng=", - "crlite_enrolled": false, - "id": "63d1b703-15d1-445c-b43c-64ca8d44bf0a", - "last_modified": 1580831371545 - }, - { - "schema": 1580831336666, - "derHash": "lNTs4u2aVFe5aaE7JgSJ6aX+R5CgQfJ6PrQSbIRBjvk=", - "subject": "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US", - "subjectDN": "MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFNlY3VyZSBTZXJ2ZXIgQ0E=", - "whitelist": false, - "attachment": { - "hash": "c0d77ccda911d76f8c80ebf6c501b4dba9c6a787604981af5b3c3a9f954bac59", - "size": 1642, - "filename": "v2OX1FzmsvhGRs3vKv7P5R4N-Aly9A_qKXxfEauTwao=.pem", - "location": "security-state-staging/intermediates/b3abe3ee-8707-467d-8091-1ab64836b606.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "v2OX1FzmsvhGRs3vKv7P5R4N+Aly9A/qKXxfEauTwao=", - "crlite_enrolled": false, - "id": "86931689-a92f-49d4-a149-95fd2b1d44eb", - "last_modified": 1580831371541 - }, - { - "schema": 1580831331985, - "derHash": "wN0GD/jOVW81aD1WTg5mspBxeICGk/g/OqZCMmv20Mg=", - "subject": "CN=TrustAsia ECC EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "0b22b379557262c177cd0df97c067db059c622c348c2768de211920a4cc62a97", - "size": 1398, - "filename": "6lJqHj6Al12YiHTPXbfLj9_MNtnpjUBiUvHLHqoVkTA=.pem", - "location": "security-state-staging/intermediates/7e4a29a7-3ed7-4e85-8e48-c24ebed06855.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "6lJqHj6Al12YiHTPXbfLj9/MNtnpjUBiUvHLHqoVkTA=", - "crlite_enrolled": false, - "id": "293e0ccd-71f9-42a4-ac96-f21584cc8fa2", - "last_modified": 1580831371521 - }, { "schema": 1579028930299, "derHash": "9NaVrak2Ni3frtpkTHzO8k63TcQ404GiivqqEUd65n8=", @@ -22302,24 +22806,6 @@ "id": "75e1b780-8583-4cab-9027-6f97f24c19ab", "last_modified": 1576536534069 }, - { - "schema": 1576535988714, - "derHash": "cNyG+fd1C3Sx3sjNNS7CWDfDbmQPcUjghGTvWQHlpYk=", - "subject": "CN=Secure Site Pro Extended Validation ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "35bebf4b8ef09fd9c565bc9f3a5ece74886943a8aa8f6a6fd56758beb70fe08c", - "size": 1435, - "filename": "XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=.pem", - "location": "security-state-staging/intermediates/6ae86321-38ae-410a-9975-233f0c20315a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=", - "crlite_enrolled": false, - "id": "41c79e82-ac51-4718-90e4-42e605116e4a", - "last_modified": 1576536534057 - }, { "schema": 1576535984479, "derHash": "Ptv//DTroC4NupzRGdvPmNdJclc3evi8YhDYgQASCng=", @@ -22572,24 +23058,6 @@ "id": "67e2adbf-676e-4de8-b707-4616d1daef65", "last_modified": 1576536533550 }, - { - "schema": 1576535803675, - "derHash": "Hk/DTSbgeT1VnjIv4RHx4ZqdLjS8JdPEJ7AypI0sW2o=", - "subject": "CN=Encryption Everywhere ECC DV TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MG0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLDAqBgNVBAMTI0VuY3J5cHRpb24gRXZlcnl3aGVyZSBFQ0MgRFYgVExTIENB", - "whitelist": false, - "attachment": { - "hash": "b2e5666f89f6d4fcf8a08fb74f9c91de3fd68ec696f62a873e86e4f8f9820119", - "size": 1402, - "filename": "Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54_cJM=.pem", - "location": "security-state-staging/intermediates/e826a1f2-a878-4c8b-a4fe-e7e952f31ace.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54/cJM=", - "crlite_enrolled": false, - "id": "088948ef-fc2d-4e5d-8116-9d744c2d517a", - "last_modified": 1576536533532 - }, { "schema": 1576535764596, "derHash": "xa2jSGvdtUWzqn7JnGnBrtlCdNX+ynkz4BMuIS8CZnE=", @@ -23274,24 +23742,6 @@ "id": "e7caf81b-a272-4ba4-ab9e-23e7d0270c4e", "last_modified": 1576536532002 }, - { - "schema": 1576536119117, - "derHash": "3U4MF5APP8Klt7dzrkAhitcyFrXOXShev/zogw0PA0o=", - "subject": "CN=TERENA Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", - "subjectDN": "MGkxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEdMBsGA1UEAxMUVEVSRU5BIFBlcnNvbmFsIENBIDM=", - "whitelist": false, - "attachment": { - "hash": "ee4661bbdd2c4531f9ec0affb2c8462ab039ea1abc75584561047afbf60517fc", - "size": 1792, - "filename": "HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC_kcr3CVOg0=.pem", - "location": "security-state-staging/intermediates/3efac7ca-1e54-4d12-b5f9-b9a9bcb72512.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC/kcr3CVOg0=", - "crlite_enrolled": false, - "id": "f823a65d-ac05-44a5-adb6-73f57c876206", - "last_modified": 1576536531896 - }, { "schema": 1576536087107, "derHash": "Dve4Y/qrw4SmlP9jLar5vTHO0j6SRlWaWezXRydUzOY=", @@ -23670,24 +24120,6 @@ "id": "0f39cd6a-43ef-4feb-8856-6d300edaa87c", "last_modified": 1562108577246 }, - { - "schema": 1562108558073, - "derHash": "vxyw4hPY08cLrolCn8Ft4sdPdVlj0bm0iL0CYNvJG5w=", - "subject": "CN=DigiCert Baltimore CA-1 G2,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0xIEcy", - "whitelist": false, - "attachment": { - "hash": "8c3b20ef21e5a0850702c5b36f4116d9340de8e2ea3746b1051c95ee4a4615ff", - "size": 1581, - "filename": "EppRiUi9P-L8-u3LNh2t2P4La8TbSH4Xh_DCYKPwqts=.pem", - "location": "security-state-staging/intermediates/bbbed6f4-b330-448c-a685-127194973cd5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "EppRiUi9P+L8+u3LNh2t2P4La8TbSH4Xh/DCYKPwqts=", - "crlite_enrolled": false, - "id": "23c18ab5-afb4-4915-9211-0b1bc495e783", - "last_modified": 1562108558823 - }, { "schema": 1562108557320, "derHash": "CSgpQz0jGUn0qbxmbL9Us6on1768oEjXXlkJPhWnLqU=", @@ -23706,24 +24138,6 @@ "id": "0edb2d0c-78d4-4869-9399-77844e0f7698", "last_modified": 1562108558066 }, - { - "schema": 1562108543508, - "derHash": "kuN3Cx60T4TC8ssAl8L9cSa9IStBwmEOeN39iUZ2Fzg=", - "subject": "CN=Cybertrust Japan ECC EV CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", - "subjectDN": "MFcxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEjMCEGA1UEAxMaQ3liZXJ0cnVzdCBKYXBhbiBFQ0MgRVYgQ0E=", - "whitelist": false, - "attachment": { - "hash": "f1536ae14b59510b0a578ef86b18c2742aeecff181da96be873249c707dce9a0", - "size": 1171, - "filename": "DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz-uWIQs=.pem", - "location": "security-state-staging/intermediates/4177e11b-b581-4577-a6bf-acb75730661d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz+uWIQs=", - "crlite_enrolled": false, - "id": "0792354e-832d-44b5-86f7-9d8759ed1b08", - "last_modified": 1562108544257 - }, { "schema": 1562108515200, "derHash": "Ze7AzGyXDMHNc2WRFdyNkE5vEubcj9Tdo51UyzAiR4A=", @@ -23778,24 +24192,6 @@ "id": "b57ef74e-655f-4231-a30d-f2cfe2066f04", "last_modified": 1562108510628 }, - { - "schema": 1562108476077, - "derHash": "JT48lzLfiHTD1U2lIsFxEULJjCzqdmRjUVKomgPuk2Q=", - "subject": "CN=Optum Public Trust CA 1,O=Optum,L=Minneapolis,ST=Minnesota,C=US", - "subjectDN": "MGkxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlNaW5uZXNvdGExFDASBgNVBAcTC01pbm5lYXBvbGlzMQ4wDAYDVQQKEwVPcHR1bTEgMB4GA1UEAxMXT3B0dW0gUHVibGljIFRydXN0IENBIDE=", - "whitelist": false, - "attachment": { - "hash": "e28866c72d971df063ce52b61094d04901ae33bf5dac1c98cee5f231443b1820", - "size": 1796, - "filename": "vKi3BXeuhSDWdRuvjranv-RWto4k9Z05PXzhtTz0LnA=.pem", - "location": "security-state-staging/intermediates/488fc2c3-5bb3-412f-813e-a4df6c553ea4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "vKi3BXeuhSDWdRuvjranv+RWto4k9Z05PXzhtTz0LnA=", - "crlite_enrolled": false, - "id": "1c890a1b-6c30-4168-b0b3-e6f8888a7ef6", - "last_modified": 1562108476867 - }, { "schema": 1562108474475, "derHash": "SKfJxaNnNPyeIE1jzmu7zZ4hwZeGBHYM2NMNb0xntnw=", @@ -23814,24 +24210,6 @@ "id": "c99ad4f1-7ce1-4835-9f30-07a94e50f3dd", "last_modified": 1562108475266 }, - { - "schema": 1562108441013, - "derHash": "ljBWsNlB2dviesd4BT2F5DzHn0dq00z915nCfjgYQOs=", - "subject": "CN=NCC Group Secure Server CA G3,O=NCC Group,C=US", - "subjectDN": "MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcz", - "whitelist": false, - "attachment": { - "hash": "f16945e38e9d095d6f815613d6e34ba2de58cb018adf71a2eaff1dc03a45d3c5", - "size": 1110, - "filename": "o054ddOknAfLTeuaAC1q42pNk8GmJ-eXYrMMmlOPyUc=.pem", - "location": "security-state-staging/intermediates/75e73199-e46f-4f99-82bd-6bb22c48adc2.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "o054ddOknAfLTeuaAC1q42pNk8GmJ+eXYrMMmlOPyUc=", - "crlite_enrolled": false, - "id": "90a2cf68-57ab-4964-a059-d6e9ca04d487", - "last_modified": 1562108441753 - }, { "schema": 1562108436479, "derHash": "2oVGgW2JHBJB6Th95DbRuffqcNuh6z0l9YJxzoFqerw=", @@ -24264,24 +24642,6 @@ "id": "5ac2630d-d43f-4a21-8de4-363eea88f44e", "last_modified": 1562025683468 }, - { - "schema": 1562025669735, - "derHash": "75E4mTZU35LS+1hg4o3ogYqfSdtW7LaJpnp/wtWIHdI=", - "subject": "CN=DigiCert Secure Site Korea ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVDQyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "4b5bb15272048ea3f749dc2fa5eba0a04f9588364d8744af5fa74ba1eeced218", - "size": 1410, - "filename": "DqywqWwTJGFOkcrnV9IPNGtEO_GJMB1Y28mAQyChmRY=.pem", - "location": "security-state-staging/intermediates/9b369138-ca7e-43fa-806c-9e6cd4beea06.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "DqywqWwTJGFOkcrnV9IPNGtEO/GJMB1Y28mAQyChmRY=", - "crlite_enrolled": false, - "id": "df60b489-c782-4306-b537-e7d0761c45ae", - "last_modified": 1562025670486 - }, { "schema": 1562025668215, "derHash": "VTJKmDJRL8bJnxW/Dp7T1r60OYzO4ZS3/4SdltkTDUQ=", @@ -24624,24 +24984,6 @@ "id": "0fb33d2f-f64b-456b-ac79-80910985aadd", "last_modified": 1562025423424 }, - { - "schema": 1562025396359, - "derHash": "rRSmi+yUnoT2BjQZ1jRl0TfCrdPjqF4A6ePuguW0AY8=", - "subject": "CN=DigiCert Secure Site Japan CA,OU=www.digicert.co.jp,O=DigiCert Japan G.K.,C=JP", - "subjectDN": "MHAxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNEaWdpQ2VydCBKYXBhbiBHLksuMRswGQYDVQQLExJ3d3cuZGlnaWNlcnQuY28uanAxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEphcGFuIENB", - "whitelist": false, - "attachment": { - "hash": "df60eb3da080f2840db9acafe44fcdcacda6ee46054e6e24d7990e36214d5715", - "size": 1658, - "filename": "RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=.pem", - "location": "security-state-staging/intermediates/59fe3a3f-e4cb-48ed-85fc-b4682138e5d2.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=", - "crlite_enrolled": false, - "id": "18f06aa2-9015-4337-ac7b-12dfa481edb4", - "last_modified": 1562025397117 - }, { "schema": 1562025388878, "derHash": "8mA2cL7erR2XfWmS+mVU5spZW8UPOwP0Ftzw8g2sNsI=", @@ -24732,24 +25074,6 @@ "id": "a705c138-e0f7-4581-9978-d55ab5621403", "last_modified": 1562025358063 }, - { - "schema": 1562025352786, - "derHash": "TFbKejwQ61h2Xg/8+ANcV8nzvbAUhi9nZ1bPeJGT8Q4=", - "subject": "CN=Sonavation IoT CA,OU=sonavation.com,O=Sonavation\\, Inc.,C=US", - "subjectDN": "MF0xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBTb25hdmF0aW9uLCBJbmMuMRcwFQYDVQQLEw5zb25hdmF0aW9uLmNvbTEaMBgGA1UEAxMRU29uYXZhdGlvbiBJb1QgQ0E=", - "whitelist": false, - "attachment": { - "hash": "18ab135d1a2faf6a0b5c5c5d02d5b9070887cd3dd8d6c059c6956151b5af592a", - "size": 1695, - "filename": "vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=.pem", - "location": "security-state-staging/intermediates/a3f91b25-e0b3-450f-8129-2c07431d1e59.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=", - "crlite_enrolled": false, - "id": "67cfe98d-cc06-44e2-84e3-4aeab1b20424", - "last_modified": 1562025353534 - }, { "schema": 1562025337064, "derHash": "qlNFLViQaevZFCODT+woinisxqe51NDxQ9jJLguD2Ok=", @@ -24786,24 +25110,6 @@ "id": "8f1617bd-0e32-4828-b630-2a3c510a24ef", "last_modified": 1562025334812 }, - { - "schema": 1562025333317, - "derHash": "wSP1r6zJ+QloCYUDVeW/eMqTdzSBEbUWepZN3twETek=", - "subject": "CN=TERENA Personal CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", - "subjectDN": "MGwxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEgMB4GA1UEAxMXVEVSRU5BIFBlcnNvbmFsIENBIDMgRzM=", - "whitelist": false, - "attachment": { - "hash": "d97fd351c70f4186ab1a1b6d07d4d7cd23c138d05ff6501f8793a7a457d714a0", - "size": 1561, - "filename": "YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=.pem", - "location": "security-state-staging/intermediates/465904a4-0fb5-43d2-a5c9-9857ba6ecc74.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=", - "crlite_enrolled": false, - "id": "834c434b-e007-4e04-818f-bd61ceb2e53a", - "last_modified": 1562025334065 - }, { "schema": 1562025318342, "derHash": "GJWNA6+0CWh6G8Jjhg0Nc1oloASrYODw5F1jM1h0N64=", @@ -25128,42 +25434,6 @@ "id": "b19a4517-16ee-477e-bdf2-a6c9a655f216", "last_modified": 1562025161601 }, - { - "schema": 1562025152565, - "derHash": "Y1r2iJ9JBg/g57q8DyMxT7EY87GCQ90X9H2GR6aWhLE=", - "subject": "CN=Thawte Partner CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVRoYXd0ZSBQYXJ0bmVyIENB", - "whitelist": false, - "attachment": { - "hash": "60ece73007734d78c9e04b93695af5557289e36eb46cfe36246074d65ebbd645", - "size": 1630, - "filename": "W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=.pem", - "location": "security-state-staging/intermediates/b4cae8e4-1f4c-4f8f-8e6b-a5611240bcf7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=", - "crlite_enrolled": false, - "id": "238b8a15-e417-4895-866a-8dc86bb8a4c8", - "last_modified": 1562025153315 - }, - { - "schema": 1562025150329, - "derHash": "w2g/fZF1Qhna2k6Nww5LGL05KLU9Ork9BzhLxYcc41U=", - "subject": "CN=Cybertrust Japan Secure Server ECC CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP", - "subjectDN": "MGIxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEuMCwGA1UEAxMlQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIEVDQyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "4ef5e6f2d2f8ff4b8ddd818cd5d7d27891e39644ea2ce02225a9d9ce00621aa3", - "size": 1187, - "filename": "QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT_YKfPuvVU=.pem", - "location": "security-state-staging/intermediates/e169883d-c67d-422b-9497-6e692391df75.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT/YKfPuvVU=", - "crlite_enrolled": false, - "id": "1add0595-65df-4e38-a378-f1ca21b6bd9f", - "last_modified": 1562025151073 - }, { "schema": 1562025141974, "derHash": "OLJs9FyTLqKAGdk+RArHK66D+cv1LWrZE2mLGPzIcX0=", @@ -25200,24 +25470,6 @@ "id": "08d229d0-4919-4ab4-9baa-f3b645c75af6", "last_modified": 1562025130755 }, - { - "schema": 1562025121762, - "derHash": "Q49HPr/IiE710+DVLSZM2+Vso4LZ6/xonXdIlAn1Wm4=", - "subject": "CN=Google CA1,O=Google\\, Inc.,L=Mountain View,ST=CA,C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEVMBMGA1UEChMMR29vZ2xlLCBJbmMuMRMwEQYDVQQDEwpHb29nbGUgQ0Ex", - "whitelist": false, - "attachment": { - "hash": "3af4c41659b8039f273a6dacdf6c94bac5d0c669051cf7c3193a04011fdc1079", - "size": 1695, - "filename": "JqNL7R3G-I-oNR0Uoa1_QE7RwLsPo10K2QlsnoYQ8eg=.pem", - "location": "security-state-staging/intermediates/f88caf87-4bc1-4a4c-a37c-266f3dbed491.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "JqNL7R3G+I+oNR0Uoa1/QE7RwLsPo10K2QlsnoYQ8eg=", - "crlite_enrolled": false, - "id": "9f917307-df70-4aef-9de2-d3f38129efe8", - "last_modified": 1562025122497 - }, { "schema": 1562025114922, "derHash": "qYyM7ZP5pDYxq+RXOGTgbFGSkAcj6X0e7SwNfGiy0Hk=", @@ -25326,24 +25578,6 @@ "id": "461c30ef-db33-4e0c-bcf1-c4fb264c2a61", "last_modified": 1562025077300 }, - { - "schema": 1562025041146, - "derHash": "ayMo5//1mLKt+Qt/PqQrRfpgbXjisRe31g6Z6CjPdWU=", - "subject": "CN=SecurityMetrics DigiCert EV CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US", - "subjectDN": "MHIxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMScwJQYDVQQDEx5TZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgRVYgQ0E=", - "whitelist": false, - "attachment": { - "hash": "336f835546bcbd7bfe88c38d0c674fd47a6a5c5be1a5486d4daa23f269db4fcd", - "size": 2316, - "filename": "f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=.pem", - "location": "security-state-staging/intermediates/7c79f9fa-67cb-4c11-82e6-64052aec3db6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=", - "crlite_enrolled": false, - "id": "628f9c50-cfa7-4a7f-b0c3-3351d5f5cf3a", - "last_modified": 1562025041897 - }, { "schema": 1562025022401, "derHash": "Jb/bHF/izOBR7G378rsk54yS+WmxuzeGfa7fk9Gnrn4=", @@ -25380,24 +25614,6 @@ "id": "da8c9975-55f9-4df4-8621-e6a574681b68", "last_modified": 1562025021653 }, - { - "schema": 1562025014914, - "derHash": "8y3q8iznJGYfU9UocxGv8lQes47K9J3Yd7lAI+OhGx8=", - "subject": "CN=SecurityMetrics DigiCert CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US", - "subjectDN": "MG8xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMSQwIgYDVQQDExtTZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgQ0E=", - "whitelist": false, - "attachment": { - "hash": "0970375d7d27699620d3d11d4a82a61d6886f73e51c1c1866db791381de6880f", - "size": 2312, - "filename": "m-VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=.pem", - "location": "security-state-staging/intermediates/291f4913-8df6-4e94-90b5-40989c03e635.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "m+VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=", - "crlite_enrolled": false, - "id": "27307236-88cc-41cc-9958-6934903e04cc", - "last_modified": 1562025015669 - }, { "schema": 1562025007428, "derHash": "klO/tmjz50OlJeSLX3UKimYDX4Bil8JfgTTcisljW9g=", @@ -25434,24 +25650,6 @@ "id": "5f1127b1-8e1f-4f9e-9512-92bcde094385", "last_modified": 1562024988606 }, - { - "schema": 1562024973611, - "derHash": "25mk8oTM8Qsm3nt6XWUXJbhXy8hx67MwKNZ7VVEO/Nk=", - "subject": "CN=Abbott Laboratories Secure Authentication CA,O=Abbott Laboratories Inc.,C=US", - "subjectDN": "MGcxCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xNTAzBgNVBAMTLEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIEF1dGhlbnRpY2F0aW9uIENB", - "whitelist": false, - "attachment": { - "hash": "13601b8d2aa24812d2d72f675f124723372e60d0db7dcd9dbd16be20186f8b46", - "size": 1772, - "filename": "S-zMrWUPK-hCylswDO1ieeWHUSws1lexaXMxp-YEjWA=.pem", - "location": "security-state-staging/intermediates/6392bedf-a3cb-40b5-99a3-490d9af06a71.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "S+zMrWUPK+hCylswDO1ieeWHUSws1lexaXMxp+YEjWA=", - "crlite_enrolled": false, - "id": "c68bc179-b841-4682-980d-88ac74913ba3", - "last_modified": 1562024974352 - }, { "schema": 1562024963870, "derHash": "7TyZFGbLxFtf0dooECj5WHuCGVI2R+DKG0fyxSfSkg8=", @@ -25542,24 +25740,6 @@ "id": "34d6c620-1aeb-4e81-b738-dc70ae0d0f79", "last_modified": 1562024931469 }, - { - "schema": 1562024928479, - "derHash": "ydaRPz/t3v8YTJ7h1+F8WuyQiG7tXMPW6YEFgxyMDgs=", - "subject": "CN=TERENA SSL CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL", - "subjectDN": "MGcxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEbMBkGA1UEAxMSVEVSRU5BIFNTTCBDQSAzIEcz", - "whitelist": false, - "attachment": { - "hash": "545222651c83bbd8eccbb5048089e729de4cba6f967e78628258418fa0ea02a4", - "size": 1557, - "filename": "CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=.pem", - "location": "security-state-staging/intermediates/c3c1fb06-2e31-41ec-8ec1-1a01c2fc381f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=", - "crlite_enrolled": false, - "id": "e64924af-35f5-4a17-be7d-7a374e1f9cf9", - "last_modified": 1562024929214 - }, { "schema": 1562024917049, "derHash": "bN+dy/NRCju0AnYdYtDF5OevxR2c/wHwK9UyVtxWet8=", @@ -25650,24 +25830,6 @@ "id": "0b5fdf3a-67b2-4466-b789-59a7d9a1889a", "last_modified": 1562024862308 }, - { - "schema": 1562024856324, - "derHash": "wWhWg/PIWQ6IWAGX8hnKuZ5UgqFWhjX1ltCYZ7L0Bb0=", - "subject": "CN=Postecom CS4,OU=Servizi di Certificazione,O=Postecom S.p.A.,C=IT", - "subjectDN": "MGIxCzAJBgNVBAYTAklUMRgwFgYDVQQKEw9Qb3N0ZWNvbSBTLnAuQS4xIjAgBgNVBAsTGVNlcnZpemkgZGkgQ2VydGlmaWNhemlvbmUxFTATBgNVBAMTDFBvc3RlY29tIENTNA==", - "whitelist": false, - "attachment": { - "hash": "de76f670947dcff8a54c28b36c13874dd66e9d06b895c4db7e7d1a6f868e235c", - "size": 1630, - "filename": "PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=.pem", - "location": "security-state-staging/intermediates/bb160719-35aa-4b66-8da3-d888d2e69d82.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=", - "crlite_enrolled": false, - "id": "cfba4ef3-ee7d-4149-a5c5-2ee13435b22f", - "last_modified": 1562024857057 - }, { "schema": 1562024844261, "derHash": "c2uZbTOWhHKcQ8s5fRuysvP0p4FqXjxdWJID+IXF1Hw=", @@ -25704,24 +25866,6 @@ "id": "9ad29fec-b9bc-433a-96c0-21647e2caaa0", "last_modified": 1562024841250 }, - { - "schema": 1562024830009, - "derHash": "aNCy6Mhb8Am02zmsi14vqOH9n9HlAocE6pKIx+Ryqus=", - "subject": "CN=TrustAsia TLS ECC CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBFQ0MgQ0E=", - "whitelist": false, - "attachment": { - "hash": "7ee8d9739388c554cf3b1e8c694adbfcc8987281bc7d6e0e3f70e444d02785f6", - "size": 1406, - "filename": "x-B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=.pem", - "location": "security-state-staging/intermediates/c71c3a1a-6e42-4bc5-a94e-780ef1d291b0.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "x+B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=", - "crlite_enrolled": false, - "id": "70288a6a-8a68-4abd-90d8-88c8a920eafb", - "last_modified": 1562024830748 - }, { "schema": 1562024826951, "derHash": "ybBswIMYYiBhjmGodyZA+CTfadVhrVa9wVrVbQzghgg=", @@ -25740,24 +25884,6 @@ "id": "acc298cc-782a-430e-96f7-3ba5d0bc27cf", "last_modified": 1562024827724 }, - { - "schema": 1562024814212, - "derHash": "ZVXWYdN/JJSiPC1fg0eeeAUbbedqFHtQbWvqKIK00GY=", - "subject": "CN=DigiCert Secure Site Korea CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIENB", - "whitelist": false, - "attachment": { - "hash": "fc29957f16bdc0486d762dbf5aedac6a8beb9dcb70bffc98c77fdf64a61c982a", - "size": 1646, - "filename": "trjGmNMo7m2JbQME1aNrIcNXkG-fscWHZcrs2zCZOHg=.pem", - "location": "security-state-staging/intermediates/0494e722-cc07-4c6a-9de7-04ad4fe72e28.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "trjGmNMo7m2JbQME1aNrIcNXkG+fscWHZcrs2zCZOHg=", - "crlite_enrolled": false, - "id": "1d1dcdf6-815c-4995-b5e9-5396aa70d4dc", - "last_modified": 1562024814959 - }, { "schema": 1562024800131, "derHash": "Ep+13lAeJAQc0UqBB1/RzeJXQI1KNT5jaRLji92i0/s=", @@ -25776,24 +25902,6 @@ "id": "61249918-c227-4afe-9de6-22348a31422d", "last_modified": 1562024800874 }, - { - "schema": 1562024798615, - "derHash": "sFBb8pR/CAerri1CwZND6vCNHd4/h0WwWJpXNieS5HA=", - "subject": "CN=DigiCert Secure Site Korea EV ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIEVDQyBDQQ==", - "whitelist": false, - "attachment": { - "hash": "8f3ba34bb39284e4eac1c23c6af465a31d3ec30f7896fbb885e6a74b38a9ce11", - "size": 1427, - "filename": "AdP_iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH-6k=.pem", - "location": "security-state-staging/intermediates/8ae1458e-7b25-4f7f-8570-16c7af6e2a7c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "AdP/iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH+6k=", - "crlite_enrolled": false, - "id": "92ca13e1-2098-42b2-aa2b-5dbe4643c974", - "last_modified": 1562024799347 - }, { "schema": 1562024797879, "derHash": "TJGYtnNVCFh5mtJ0TMCDwboAJ+d9O4/W1Wz1NiDQmeI=", @@ -25812,24 +25920,6 @@ "id": "74cd2ebb-684e-40ec-a833-df95792630aa", "last_modified": 1562024798607 }, - { - "schema": 1562024794876, - "derHash": "Hgo6uZMVdxcoHUKr+AHrZN7tUA5BaMpwbWpx2BA8c6I=", - "subject": "CN=DigiCert Grid Trust CA,OU=www.digicert.com,O=DigiCert Grid,C=US", - "subjectDN": "MGExCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMR8wHQYDVQQDExZEaWdpQ2VydCBHcmlkIFRydXN0IENB", - "whitelist": false, - "attachment": { - "hash": "3be9651d72ef4f44fcb67274ba0d3e7ae2eb7c8388fcf0a3ab02a3a2c72077f8", - "size": 2316, - "filename": "TBKoZNHPiEWnnKpVqLc_CHX3Z3iNpZdilsVXHJhcqkw=.pem", - "location": "security-state-staging/intermediates/1ddc95cc-acc5-4a61-b546-b433d299fd22.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "TBKoZNHPiEWnnKpVqLc/CHX3Z3iNpZdilsVXHJhcqkw=", - "crlite_enrolled": false, - "id": "a43ec252-2c43-4461-a2b2-56c2fe1b0e7a", - "last_modified": 1562024795608 - }, { "schema": 1562024792628, "derHash": "cD6goXPiBCNV8d/rEHkpLUHqaMBGydRcxg3FQQEE9Hg=", @@ -25902,24 +25992,6 @@ "id": "760c1e85-d14f-45de-9089-5346d069bb23", "last_modified": 1562024758176 }, - { - "schema": 1562024749130, - "derHash": "efH1q2l96/GV9bfaZflTmWgu2uuAEVudQqauXi+piAI=", - "subject": "CN=TrustAsia TLS RSA CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN", - "subjectDN": "MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBSU0EgQ0E=", - "whitelist": false, - "attachment": { - "hash": "9c4047b27b1b439594f0eb24b088e1d1ed2f32b8eaf4ad49dd4d2745b8add3f5", - "size": 1683, - "filename": "jzqM6_58ozsPRvxUzg0hzjM-GcfwhTbU_G0TCDvL7hU=.pem", - "location": "security-state-staging/intermediates/2c6b0e8d-5db7-43f4-ac20-43f2a3577b50.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "jzqM6/58ozsPRvxUzg0hzjM+GcfwhTbU/G0TCDvL7hU=", - "crlite_enrolled": false, - "id": "985da675-4aa3-4fc4-a366-147d9cc6b52b", - "last_modified": 1562024749914 - }, { "schema": 1562024711406, "derHash": "NEe3S15QClSZg/os7XOlZC5qrseIKVRhWEN99m10Nbg=", @@ -25956,24 +26028,6 @@ "id": "4f00eb7d-2e3c-402b-9dbb-97c1958dac20", "last_modified": 1562024709874 }, - { - "schema": 1562024704660, - "derHash": "wCLVzqonXypiaPp5rDVlOzpzDe+kH5zYgX1tFZvTMJc=", - "subject": "CN=DigiCert Secure Site Korea EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIENB", - "whitelist": false, - "attachment": { - "hash": "f253f14a706e3542ba2225ccb86204637d0ef708b5d912aeccc04e74d10e5e16", - "size": 1699, - "filename": "GU23iW3XanBnTnSB-qHY60G9W7OWfde0SLEvQJL9stY=.pem", - "location": "security-state-staging/intermediates/3311e594-a7f2-4770-9ef8-99ef2e365393.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "GU23iW3XanBnTnSB+qHY60G9W7OWfde0SLEvQJL9stY=", - "crlite_enrolled": false, - "id": "5839e0ee-6dfe-4352-a923-db68e62acab8", - "last_modified": 1562024705394 - }, { "schema": 1562024693355, "derHash": "4SHBaU2nN8F7hkSK7cYU7r15Rqe0uR+zACW2NgcCOeo=", @@ -26046,24 +26100,6 @@ "id": "d0d43bdc-8347-4819-898f-44ee3a2094bc", "last_modified": 1562024646178 }, - { - "schema": 1562024643925, - "derHash": "t9/cJ+X/nzXv7J9LxTLDX3J3ibackKBIm0AkcpnZcDg=", - "subject": "CN=NCC Group Secure Server CA G4,O=NCC Group,C=US", - "subjectDN": "MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEc0", - "whitelist": false, - "attachment": { - "hash": "6bba8a4f7467c485c33229430bcdc46f0a8e260ecda70283cadc4c16d46d3efc", - "size": 2259, - "filename": "MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN-THyz125ar_w=.pem", - "location": "security-state-staging/intermediates/92243c0e-e056-4cbe-8c9c-46b2431e55f5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN+THyz125ar/w=", - "crlite_enrolled": false, - "id": "1be64318-c01e-4e05-9642-ba1a140b8f77", - "last_modified": 1562024644659 - }, { "schema": 1562024619702, "derHash": "EMP0Dpu+F7SPCzx8IpyrCiCHH86+zMz2orsyDwYAxV0=", @@ -26514,24 +26550,6 @@ "id": "ae50a764-96b4-4d80-b152-ecb7f2d01363", "last_modified": 1559866416201 }, - { - "schema": 1559865954402, - "derHash": "bGniAWVkQOuYzQh1dkoe0ZAV7YxEJ2Aaypxor6iXOVk=", - "subject": "CN=Abbott Laboratories Secure Server CA,O=Abbott Laboratories Inc.,C=US", - "subjectDN": "MF8xCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xLTArBgNVBAMTJEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIFNlcnZlciBDQQ==", - "whitelist": false, - "attachment": { - "hash": "eff2021a84dc350c344035f14d9ace98bd2aff4df26812ac44f35532c31dc995", - "size": 1670, - "filename": "WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=.pem", - "location": "security-state-staging/intermediates/fd41a272-a56d-4cc1-8ab0-48e779b64f93.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=", - "crlite_enrolled": false, - "id": "dd1862ea-9ff3-42ff-907f-f83e355dd278", - "last_modified": 1559865955200 - }, { "schema": 1559865922818, "derHash": "eBbHsFZrRng7HBXYoo2LDSDP6yCz0T95RG4VxKUckd8=", @@ -26587,5 +26605,5 @@ "last_modified": 1559865863642 } ], - "timestamp": 1664110623090 + "timestamp": 1664326626009 } diff --git a/services/sync/Weave.jsm b/services/sync/Weave.jsm index 67f7e6540b1..21d07eff5b8 100644 --- a/services/sync/Weave.jsm +++ b/services/sync/Weave.jsm @@ -6,11 +6,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); XPCOMUtils.defineLazyPreferenceGetter( lazy, diff --git a/services/sync/modules-testing/fxa_utils.js b/services/sync/modules-testing/fxa_utils.js index 17fb4bd4727..f55e07c4b8b 100644 --- a/services/sync/modules-testing/fxa_utils.js +++ b/services/sync/modules-testing/fxa_utils.js @@ -6,7 +6,9 @@ var EXPORTED_SYMBOLS = ["initializeIdentityWithTokenServerResponse"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Weave } = ChromeUtils.import("resource://services-sync/main.js"); const { SyncAuthManager } = ChromeUtils.import( "resource://services-sync/sync_auth.js" diff --git a/services/sync/modules/SyncDisconnect.jsm b/services/sync/modules/SyncDisconnect.jsm index 0010f118419..9bcaa274fd8 100644 --- a/services/sync/modules/SyncDisconnect.jsm +++ b/services/sync/modules/SyncDisconnect.jsm @@ -11,8 +11,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - Log: "resource://gre/modules/Log.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm", setTimeout: "resource://gre/modules/Timer.jsm", diff --git a/services/sync/modules/SyncedTabs.jsm b/services/sync/modules/SyncedTabs.jsm index d7d9ee9f0b9..c50ef66fcfb 100644 --- a/services/sync/modules/SyncedTabs.jsm +++ b/services/sync/modules/SyncedTabs.jsm @@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["SyncedTabs"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Weave } = ChromeUtils.import("resource://services-sync/main.js"); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" diff --git a/services/sync/modules/addonsreconciler.js b/services/sync/modules/addonsreconciler.js index c9da4d6f6cf..2a269f97321 100644 --- a/services/sync/modules/addonsreconciler.js +++ b/services/sync/modules/addonsreconciler.js @@ -17,7 +17,9 @@ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js"); const { AddonManager } = ChromeUtils.import( "resource://gre/modules/AddonManager.jsm" diff --git a/services/sync/modules/addonutils.js b/services/sync/modules/addonutils.js index 306821b316a..ff6efee56ce 100644 --- a/services/sync/modules/addonutils.js +++ b/services/sync/modules/addonutils.js @@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["AddonUtils"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Svc } = ChromeUtils.import("resource://services-sync/util.js"); const lazy = {}; diff --git a/services/sync/modules/bridged_engine.js b/services/sync/modules/bridged_engine.js index d1a189a910f..b3c972bedfa 100644 --- a/services/sync/modules/bridged_engine.js +++ b/services/sync/modules/bridged_engine.js @@ -14,9 +14,6 @@ * for your subclass to wrap, and optionally implement and override the tracker. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); const { Changeset, SyncEngine, Tracker } = ChromeUtils.import( "resource://services-sync/engines.js" ); @@ -27,13 +24,10 @@ const { RawCryptoWrapper } = ChromeUtils.import( const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); -XPCOMUtils.defineLazyModuleGetters(lazy, { - Log: "resource://gre/modules/Log.jsm", -}); - var EXPORTED_SYMBOLS = ["BridgeWrapperXPCOM", "BridgedEngine", "LogAdapter"]; /** diff --git a/services/sync/modules/doctor.js b/services/sync/modules/doctor.js index 229df401771..670e0fed35f 100644 --- a/services/sync/modules/doctor.js +++ b/services/sync/modules/doctor.js @@ -11,7 +11,9 @@ var EXPORTED_SYMBOLS = ["Doctor"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Async } = ChromeUtils.import("resource://services-common/async.js"); const { Observers } = ChromeUtils.import( "resource://services-common/observers.js" diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js index 587eaced592..755b68a2630 100644 --- a/services/sync/modules/engines.js +++ b/services/sync/modules/engines.js @@ -14,8 +14,12 @@ var EXPORTED_SYMBOLS = [ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm"); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { JSONFile } = ChromeUtils.importESModule( + "resource://gre/modules/JSONFile.sys.mjs" +); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Async } = ChromeUtils.import("resource://services-common/async.js"); const { Observers } = ChromeUtils.import( "resource://services-common/observers.js" diff --git a/services/sync/modules/engines/forms.js b/services/sync/modules/engines/forms.js index 78eb11560bf..72cd0728aa2 100644 --- a/services/sync/modules/engines/forms.js +++ b/services/sync/modules/engines/forms.js @@ -18,7 +18,9 @@ const { CollectionProblemData, CollectionValidator } = ChromeUtils.import( "resource://services-sync/collection_validator.js" ); const { Async } = ChromeUtils.import("resource://services-common/async.js"); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const lazy = {}; ChromeUtils.defineModuleGetter( lazy, diff --git a/services/sync/modules/engines/tabs.js b/services/sync/modules/engines/tabs.js index a859157c636..78d22392ac4 100644 --- a/services/sync/modules/engines/tabs.js +++ b/services/sync/modules/engines/tabs.js @@ -10,7 +10,9 @@ const TAB_ENTRIES_LIMIT = 5; // How many URLs to include in tab history. const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Store, SyncEngine, Tracker } = ChromeUtils.import( "resource://services-sync/engines.js" ); diff --git a/services/sync/modules/keys.js b/services/sync/modules/keys.js index b45f9fe0cd8..7e5986d8239 100644 --- a/services/sync/modules/keys.js +++ b/services/sync/modules/keys.js @@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["BulkKeyBundle"]; const { CommonUtils } = ChromeUtils.import( "resource://services-common/utils.js" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Weave } = ChromeUtils.import("resource://services-sync/main.js"); const { Utils } = ChromeUtils.import("resource://services-sync/util.js"); diff --git a/services/sync/modules/policies.js b/services/sync/modules/policies.js index 469280642df..e972928a8b2 100644 --- a/services/sync/modules/policies.js +++ b/services/sync/modules/policies.js @@ -7,7 +7,9 @@ var EXPORTED_SYMBOLS = ["ErrorHandler", "SyncScheduler"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { CREDENTIALS_CHANGED, ENGINE_APPLY_FAIL, diff --git a/services/sync/modules/record.js b/services/sync/modules/record.js index 3c6cf9d3f53..69a79dbbc97 100644 --- a/services/sync/modules/record.js +++ b/services/sync/modules/record.js @@ -16,7 +16,9 @@ var EXPORTED_SYMBOLS = [ const CRYPTO_COLLECTION = "crypto"; const KEYS_WBO = "keys"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { DEFAULT_DOWNLOAD_BATCH_SIZE, DEFAULT_KEYBUNDLE_NAME, diff --git a/services/sync/modules/resource.js b/services/sync/modules/resource.js index abdf73edca8..0dac0be33eb 100644 --- a/services/sync/modules/resource.js +++ b/services/sync/modules/resource.js @@ -7,7 +7,9 @@ var EXPORTED_SYMBOLS = ["Resource"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Observers } = ChromeUtils.import( "resource://services-common/observers.js" ); diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js index 269bcc826e1..b05ae3abe8f 100644 --- a/services/sync/modules/service.js +++ b/services/sync/modules/service.js @@ -16,7 +16,9 @@ const KEYS_WBO = "keys"; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Async } = ChromeUtils.import("resource://services-common/async.js"); const { CommonUtils } = ChromeUtils.import( "resource://services-common/utils.js" diff --git a/services/sync/modules/stages/declined.js b/services/sync/modules/stages/declined.js index 92d8e1fb6a5..ca2073aa080 100644 --- a/services/sync/modules/stages/declined.js +++ b/services/sync/modules/stages/declined.js @@ -11,7 +11,9 @@ var EXPORTED_SYMBOLS = ["DeclinedEngines"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { CommonUtils } = ChromeUtils.import( "resource://services-common/utils.js" ); diff --git a/services/sync/modules/stages/enginesync.js b/services/sync/modules/stages/enginesync.js index 1fd8325a9f4..b31b355c308 100644 --- a/services/sync/modules/stages/enginesync.js +++ b/services/sync/modules/stages/enginesync.js @@ -8,7 +8,9 @@ var EXPORTED_SYMBOLS = ["EngineSynchronizer"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { ABORT_SYNC_COMMAND, LOGIN_FAILED_NETWORK_ERROR, diff --git a/services/sync/modules/status.js b/services/sync/modules/status.js index ec4755c849f..08a304c8550 100644 --- a/services/sync/modules/status.js +++ b/services/sync/modules/status.js @@ -16,7 +16,9 @@ const { SYNC_FAILED_PARTIAL, SYNC_SUCCEEDED, } = ChromeUtils.import("resource://services-sync/constants.js"); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { SyncAuthManager } = ChromeUtils.import( "resource://services-sync/sync_auth.js" ); diff --git a/services/sync/modules/sync_auth.js b/services/sync/modules/sync_auth.js index 3fb27992ade..73116cbebff 100644 --- a/services/sync/modules/sync_auth.js +++ b/services/sync/modules/sync_auth.js @@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["SyncAuthManager", "AuthenticationError"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Async } = ChromeUtils.import("resource://services-common/async.js"); const { TokenServerClient } = ChromeUtils.import( "resource://services-common/tokenserverclient.js" diff --git a/services/sync/modules/telemetry.js b/services/sync/modules/telemetry.js index 6bc867da2d5..e44d7297d16 100644 --- a/services/sync/modules/telemetry.js +++ b/services/sync/modules/telemetry.js @@ -23,7 +23,9 @@ var EXPORTED_SYMBOLS = [ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const lazy = {}; diff --git a/services/sync/tests/unit/head_helpers.js b/services/sync/tests/unit/head_helpers.js index e476097e3b8..ca4dad25125 100644 --- a/services/sync/tests/unit/head_helpers.js +++ b/services/sync/tests/unit/head_helpers.js @@ -67,8 +67,8 @@ add_setup(async function head_setup() { }); XPCOMUtils.defineLazyGetter(this, "SyncPingSchema", function() { - let { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" + let { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); let stream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( @@ -92,8 +92,8 @@ XPCOMUtils.defineLazyGetter(this, "SyncPingSchema", function() { }); XPCOMUtils.defineLazyGetter(this, "SyncPingValidator", function() { - const { JsonSchema } = ChromeUtils.import( - "resource://gre/modules/JsonSchema.jsm" + const { JsonSchema } = ChromeUtils.importESModule( + "resource://gre/modules/JsonSchema.sys.mjs" ); return new JsonSchema.Validator(SyncPingSchema); }); diff --git a/services/sync/tests/unit/head_http_server.js b/services/sync/tests/unit/head_http_server.js index 37259420a06..32fea7487f9 100644 --- a/services/sync/tests/unit/head_http_server.js +++ b/services/sync/tests/unit/head_http_server.js @@ -5,7 +5,7 @@ var Cm = Components.manager; // Shared logging for all HTTP server functions. -var { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs"); var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js"); var { TestUtils } = ChromeUtils.import( "resource://testing-common/TestUtils.jsm" diff --git a/services/sync/tests/unit/test_addons_store.js b/services/sync/tests/unit/test_addons_store.js index 8c9ee9e02f0..7a1804f53ef 100644 --- a/services/sync/tests/unit/test_addons_store.js +++ b/services/sync/tests/unit/test_addons_store.js @@ -10,8 +10,8 @@ const { AddonsEngine } = ChromeUtils.import( "resource://services-sync/engines/addons.js" ); const { Service } = ChromeUtils.import("resource://services-sync/service.js"); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const HTTP_PORT = 8888; diff --git a/services/sync/tests/unit/test_engine.js b/services/sync/tests/unit/test_engine.js index 0483584704c..2661a005b08 100644 --- a/services/sync/tests/unit/test_engine.js +++ b/services/sync/tests/unit/test_engine.js @@ -1,8 +1,8 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { Observers } = ChromeUtils.import( "resource://services-common/observers.js" diff --git a/services/sync/tests/unit/test_errorhandler_2.js b/services/sync/tests/unit/test_errorhandler_2.js index 8462f84c839..fedf4f2a47e 100644 --- a/services/sync/tests/unit/test_errorhandler_2.js +++ b/services/sync/tests/unit/test_errorhandler_2.js @@ -3,8 +3,8 @@ const { Service } = ChromeUtils.import("resource://services-sync/service.js"); const { Status } = ChromeUtils.import("resource://services-sync/status.js"); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const fakeServer = new SyncServer(); diff --git a/services/sync/tests/unit/test_errorhandler_filelog.js b/services/sync/tests/unit/test_errorhandler_filelog.js index 7edbecff3c6..db11d537a2a 100644 --- a/services/sync/tests/unit/test_errorhandler_filelog.js +++ b/services/sync/tests/unit/test_errorhandler_filelog.js @@ -7,8 +7,8 @@ const { Service } = ChromeUtils.import("resource://services-sync/service.js"); const { logManager } = ChromeUtils.import( "resource://gre/modules/FxAccountsCommon.js" ); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true); diff --git a/services/sync/tests/unit/test_fxa_node_reassignment.js b/services/sync/tests/unit/test_fxa_node_reassignment.js index 7fa570021ae..6a2b49cbe86 100644 --- a/services/sync/tests/unit/test_fxa_node_reassignment.js +++ b/services/sync/tests/unit/test_fxa_node_reassignment.js @@ -15,8 +15,8 @@ const { Status } = ChromeUtils.import("resource://services-sync/status.js"); const { SyncAuthManager } = ChromeUtils.import( "resource://services-sync/sync_auth.js" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); add_task(async function setup() { diff --git a/services/sync/tests/unit/test_node_reassignment.js b/services/sync/tests/unit/test_node_reassignment.js index f129d19f011..a03cbb9de19 100644 --- a/services/sync/tests/unit/test_node_reassignment.js +++ b/services/sync/tests/unit/test_node_reassignment.js @@ -10,8 +10,8 @@ const { RESTRequest } = ChromeUtils.import( "resource://services-common/rest.js" ); const { Service } = ChromeUtils.import("resource://services-sync/service.js"); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); add_task(async function setup() { diff --git a/services/sync/tests/unit/test_service_cluster.js b/services/sync/tests/unit/test_service_cluster.js index 19a62764e76..5d37ce02be2 100644 --- a/services/sync/tests/unit/test_service_cluster.js +++ b/services/sync/tests/unit/test_service_cluster.js @@ -1,8 +1,8 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { Service } = ChromeUtils.import("resource://services-sync/service.js"); diff --git a/services/sync/tests/unit/test_utils_json.js b/services/sync/tests/unit/test_utils_json.js index 6887d35cfd6..37573435bcc 100644 --- a/services/sync/tests/unit/test_utils_json.js +++ b/services/sync/tests/unit/test_utils_json.js @@ -1,8 +1,8 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); add_task(async function test_roundtrip() { diff --git a/services/sync/tps/extensions/tps/api.js b/services/sync/tps/extensions/tps/api.js index 28970461498..b33d5ad5a03 100644 --- a/services/sync/tps/extensions/tps/api.js +++ b/services/sync/tps/extensions/tps/api.js @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); /* globals ExtensionAPI, Services, XPCOMUtils */ diff --git a/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm b/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm index 455a62cc31a..aed55c1f91a 100644 --- a/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm +++ b/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm @@ -6,7 +6,9 @@ var EXPORTED_SYMBOLS = ["Authentication"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { clearTimeout, setTimeout } = ChromeUtils.import( "resource://gre/modules/Timer.jsm" ); diff --git a/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm b/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm index b0866751cec..7cd17995dd0 100644 --- a/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm +++ b/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm @@ -24,11 +24,9 @@ ChromeUtils.defineModuleGetter( "resource://autofill/FormAutofillStorage.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "OSKeyStore", - "resource://gre/modules/OSKeyStore.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs", +}); class FormAutofillBase { constructor(props, subStorageName, fields) { diff --git a/services/sync/tps/extensions/tps/resource/modules/forms.jsm b/services/sync/tps/extensions/tps/resource/modules/forms.jsm index a58fb60096f..730d9a39438 100644 --- a/services/sync/tps/extensions/tps/resource/modules/forms.jsm +++ b/services/sync/tps/extensions/tps/resource/modules/forms.jsm @@ -14,7 +14,9 @@ const { Logger } = ChromeUtils.import("resource://tps/logger.jsm"); const { FormHistory } = ChromeUtils.import( "resource://gre/modules/FormHistory.jsm" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); /** * FormDB diff --git a/services/sync/tps/extensions/tps/resource/tps.jsm b/services/sync/tps/extensions/tps/resource/tps.jsm index f06d5069cf3..2daaaaa6642 100644 --- a/services/sync/tps/extensions/tps/resource/tps.jsm +++ b/services/sync/tps/extensions/tps/resource/tps.jsm @@ -29,13 +29,16 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs", + Log: "resource://gre/modules/Log.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); @@ -46,9 +49,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserWindows: "resource://tps/modules/windows.jsm", CommonUtils: "resource://services-common/utils.js", extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", - JsonSchema: "resource://gre/modules/JsonSchema.jsm", - Log: "resource://gre/modules/Log.jsm", Logger: "resource://tps/logger.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", Svc: "resource://services-sync/util.js", diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs index 7bb4571cb20..8c9fef0c8f6 100644 --- a/servo/components/style/properties/gecko.mako.rs +++ b/servo/components/style/properties/gecko.mako.rs @@ -1127,7 +1127,7 @@ fn static_assert() { ${impl_copy_animation_value(ident, gecko_ffi_name)} -<% skip_box_longhands= """display clear""" %> +<% skip_box_longhands= """display""" %> <%self:impl_trait style_struct_name="Box" skip_longhands="${skip_box_longhands}"> #[inline] pub fn set_display(&mut self, v: longhands::display::computed_value::T) { @@ -1159,14 +1159,6 @@ fn static_assert() { pub fn clone_display(&self) -> longhands::display::computed_value::T { self.gecko.mDisplay } - - <% clear_keyword = Keyword( - "clear", - "Left Right None Both", - gecko_enum_prefix="StyleClear", - gecko_inexhaustive=True, - ) %> - ${impl_keyword('clear', 'mBreakType', clear_keyword)} <%def name="simple_image_array_property(name, shorthand, field_name)"> diff --git a/servo/components/style/properties/longhands/box.mako.rs b/servo/components/style/properties/longhands/box.mako.rs index 543446458eb..19400a4d880 100644 --- a/servo/components/style/properties/longhands/box.mako.rs +++ b/servo/components/style/properties/longhands/box.mako.rs @@ -80,8 +80,7 @@ ${helpers.predefined_type( "computed::Clear::None", engines="gecko servo-2013", animation_value_type="discrete", - gecko_ffi_name="mBreakType", - spec="https://drafts.csswg.org/css-box/#propdef-clear", + spec="https://drafts.csswg.org/css2/#propdef-clear", servo_restyle_damage="rebuild_and_reflow", )} diff --git a/servo/components/style/values/computed/box.rs b/servo/components/style/values/computed/box.rs index 67b06ac5614..a390d69a029 100644 --- a/servo/components/style/values/computed/box.rs +++ b/servo/components/style/values/computed/box.rs @@ -152,6 +152,7 @@ impl ToComputedValue for SpecifiedFloat { ToResolvedValue, )] /// A computed value for the `clear` property. +#[repr(u8)] pub enum Clear { None, Left, diff --git a/servo/components/style/values/specified/box.rs b/servo/components/style/values/specified/box.rs index bf1a74b683c..6b1c0d3c022 100644 --- a/servo/components/style/values/specified/box.rs +++ b/servo/components/style/values/specified/box.rs @@ -1710,7 +1710,7 @@ pub enum Float { #[derive( Clone, Copy, Debug, Eq, Hash, MallocSizeOf, Parse, PartialEq, SpecifiedValueInfo, ToCss, ToShmem, )] -/// https://drafts.csswg.org/css-box/#propdef-clear +/// https://drafts.csswg.org/css2/#propdef-clear pub enum Clear { None, Left, diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml index 81529aa3929..194bca2c075 100644 --- a/servo/ports/geckolib/cbindgen.toml +++ b/servo/ports/geckolib/cbindgen.toml @@ -110,6 +110,7 @@ include = [ "UnicodeRange", "UserSelect", "Float", + "Clear", "OverscrollBehavior", "ScrollSnapAlign", "ScrollSnapAxis", diff --git a/storage/Variant.h b/storage/Variant.h index a2b580e284d..420ca94b94c 100644 --- a/storage/Variant.h +++ b/storage/Variant.h @@ -10,7 +10,6 @@ #include #include "nsIVariant.h" -#include "nsMemory.h" #include "nsString.h" #include "nsTArray.h" diff --git a/storage/mozStorageArgValueArray.cpp b/storage/mozStorageArgValueArray.cpp index 5526786cf95..56e97aaa8b1 100644 --- a/storage/mozStorageArgValueArray.cpp +++ b/storage/mozStorageArgValueArray.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsError.h" -#include "nsMemory.h" #include "nsString.h" #include "mozStoragePrivateHelpers.h" diff --git a/storage/mozStorageAsyncStatement.cpp b/storage/mozStorageAsyncStatement.cpp index 9b8ff4987a5..d0bd81e69b2 100644 --- a/storage/mozStorageAsyncStatement.cpp +++ b/storage/mozStorageAsyncStatement.cpp @@ -8,7 +8,6 @@ #include #include "nsError.h" -#include "nsMemory.h" #include "nsProxyRelease.h" #include "nsThreadUtils.h" #include "nsIClassInfoImpl.h" diff --git a/storage/mozStorageAsyncStatementJSHelper.cpp b/storage/mozStorageAsyncStatementJSHelper.cpp index 8b94f8df3dc..73366f6604b 100644 --- a/storage/mozStorageAsyncStatementJSHelper.cpp +++ b/storage/mozStorageAsyncStatementJSHelper.cpp @@ -8,7 +8,6 @@ #include "mozStorageAsyncStatement.h" #include "mozStorageService.h" -#include "nsMemory.h" #include "nsString.h" #include "nsServiceManagerUtils.h" diff --git a/storage/mozStorageAsyncStatementParams.cpp b/storage/mozStorageAsyncStatementParams.cpp index bd52173f412..cb8601504e0 100644 --- a/storage/mozStorageAsyncStatementParams.cpp +++ b/storage/mozStorageAsyncStatementParams.cpp @@ -7,7 +7,6 @@ #include "mozStorageAsyncStatementParams.h" #include "nsJSUtils.h" -#include "nsMemory.h" #include "nsString.h" #include "jsapi.h" diff --git a/storage/mozStorageStatement.cpp b/storage/mozStorageStatement.cpp index 21a43cf5da3..e889ad2ff10 100644 --- a/storage/mozStorageStatement.cpp +++ b/storage/mozStorageStatement.cpp @@ -8,7 +8,6 @@ #include #include "nsError.h" -#include "nsMemory.h" #include "nsThreadUtils.h" #include "nsIClassInfoImpl.h" #include "Variant.h" diff --git a/storage/mozStorageStatementJSHelper.cpp b/storage/mozStorageStatementJSHelper.cpp index 762bf4b8405..c891e955a25 100644 --- a/storage/mozStorageStatementJSHelper.cpp +++ b/storage/mozStorageStatementJSHelper.cpp @@ -8,7 +8,6 @@ #include "mozStorageStatement.h" #include "mozStorageService.h" -#include "nsMemory.h" #include "nsString.h" #include "nsServiceManagerUtils.h" diff --git a/storage/mozStorageStatementParams.cpp b/storage/mozStorageStatementParams.cpp index 23e651d4416..2d29e53a878 100644 --- a/storage/mozStorageStatementParams.cpp +++ b/storage/mozStorageStatementParams.cpp @@ -7,7 +7,6 @@ #include "mozStorageStatementParams.h" #include "nsJSUtils.h" -#include "nsMemory.h" #include "nsString.h" #include "jsapi.h" diff --git a/storage/mozStorageStatementRow.cpp b/storage/mozStorageStatementRow.cpp index 33c85430fec..7d203d7513a 100644 --- a/storage/mozStorageStatementRow.cpp +++ b/storage/mozStorageStatementRow.cpp @@ -4,7 +4,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "nsMemory.h" #include "nsString.h" #include "mozilla/ErrorResult.h" diff --git a/storage/test/gtest/storage_test_harness.h b/storage/test/gtest/storage_test_harness.h index e30c4cb85df..51a6fea91da 100644 --- a/storage/test/gtest/storage_test_harness.h +++ b/storage/test/gtest/storage_test_harness.h @@ -14,7 +14,6 @@ #include "nsComponentManagerUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsDirectoryServiceUtils.h" -#include "nsMemory.h" #include "nsServiceManagerUtils.h" #include "nsIThread.h" #include "nsThreadUtils.h" diff --git a/taskcluster/ci/fetch/moz.build b/taskcluster/ci/fetch/moz.build new file mode 100644 index 00000000000..28b8003edf3 --- /dev/null +++ b/taskcluster/ci/fetch/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +with Files("updatebot.yml"): + BUG_COMPONENT = ("Developer Infrastructure", "Mach Vendor & Updatebot") diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index 321e0cebfe0..52a7895c268 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -482,9 +482,9 @@ nodejs-16-linux64: description: nodejs 16 for x64 linux fetch: type: static-url - url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz - sha256: edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec - size: 22051952 + url: https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.xz + sha256: 06ba2eb34aa385967f5f58c87a44753f83212f6cccea892b33f80a2e7fda8384 + size: 22423816 artifact-name: nodejs.tar.zst strip-components: 1 add-prefix: node/ @@ -504,9 +504,9 @@ nodejs-16-macosx64: description: nodejs 16 for x64 macOS fetch: type: static-url - url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-darwin-x64.tar.xz - sha256: a65b2b92ede6be9004eae1ca9da26da2178bc696f35e8cca1840c33b777a5421 - size: 20498416 + url: https://nodejs.org/dist/v16.17.1/node-v16.17.1-darwin-x64.tar.xz + sha256: 8e7089956fa01cf7d0045945c0863d282dc6818fb0476237c1396497e29a4254 + size: 20887472 artifact-name: nodejs.tar.zst strip-components: 1 add-prefix: node/ @@ -515,9 +515,9 @@ nodejs-16-macosx64-arm64: description: nodejs 16 for arm64 macOS fetch: type: static-url - url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-darwin-arm64.tar.xz - sha256: e4468368bf25ee1c504f08ecfd0d9fec17a9e72ef27c4495406b958cd7b4bafd - size: 18889796 + url: https://nodejs.org/dist/v16.17.1/node-v16.17.1-darwin-arm64.tar.xz + sha256: 09a45f60bfb9dfbea4f69044dc733ef983945acd92ca89ccccac267f3d71bd44 + size: 19291192 artifact-name: nodejs.tar.zst strip-components: 1 add-prefix: node/ @@ -537,9 +537,9 @@ nodejs-16-win32: description: nodejs 16 for x86 Windows fetch: type: static-url - url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-win-x86.zip - sha256: 957783527844fcd7da1d0b6dd311b64f92e2c5185112ada2d92e52c1a71fb373 - size: 24587144 + url: https://nodejs.org/dist/v16.17.1/node-v16.17.1-win-x86.zip + sha256: 189b5e8b23226403e7b07a46614de19b444d369e694901e3668e2f549799cbcd + size: 25312816 artifact-name: nodejs.tar.zst strip-components: 1 add-prefix: node/ @@ -559,9 +559,9 @@ nodejs-16-win64: description: nodejs 16 for x64 Windows fetch: type: static-url - url: https://nodejs.org/dist/v16.16.0/node-v16.16.0-win-x64.zip - sha256: c657acc98af55018c8fd6113c7e08d67c8083af75ba0306f9561b0117abc39d4 - size: 26245926 + url: https://nodejs.org/dist/v16.17.1/node-v16.17.1-win-x64.zip + sha256: ed290151efb417262b9808a70738d4ab79e9d53653a6a9f4b8dd97912e279dce + size: 26956744 artifact-name: nodejs.tar.zst strip-components: 1 add-prefix: node/ diff --git a/taskcluster/ci/updatebot/moz.build b/taskcluster/ci/updatebot/moz.build new file mode 100644 index 00000000000..315dc32600c --- /dev/null +++ b/taskcluster/ci/updatebot/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +with Files("**"): + BUG_COMPONENT = ("Developer Infrastructure", "Mach Vendor & Updatebot") diff --git a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js index 62e8aa08bba..065c38f8fa7 100644 --- a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js +++ b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js @@ -20,7 +20,9 @@ if (arguments.length != 2) { } var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm"); +var { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" +); var gCertDB = Cc["@mozilla.org/security/x509certdb;1"].getService( Ci.nsIX509CertDB diff --git a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js index 8e4c7fb8dba..6d5ecbd3af0 100644 --- a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js +++ b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js @@ -12,8 +12,8 @@ var gSSService = Cc["@mozilla.org/ssservice;1"].getService( Ci.nsISiteSecurityService ); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const SOURCE = @@ -435,10 +435,6 @@ function filterForcedInclusions(inHosts, outNotForced, outForced) { function output(statuses) { dump("INFO: Writing output to " + OUTPUT + "\n"); try { - var { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" - ); - let file = new FileUtils.File( PathUtils.join(Services.dirsvc.get("CurWorkD", Ci.nsIFile).path, OUTPUT) ); diff --git a/taskcluster/docker/recipes/install-node.sh b/taskcluster/docker/recipes/install-node.sh index 9581e442550..1a1af4df861 100644 --- a/taskcluster/docker/recipes/install-node.sh +++ b/taskcluster/docker/recipes/install-node.sh @@ -8,8 +8,8 @@ # taskcluster/scripts/misc/repack-node.sh. Later we'll get the ESLint builder # to use the linux64-node toolchain directly. -wget -O node.xz --progress=dot:mega https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz -echo 'edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec' node.xz | sha256sum -c +wget -O node.xz --progress=dot:mega https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.xz +echo '06ba2eb34aa385967f5f58c87a44753f83212f6cccea892b33f80a2e7fda8384' node.xz | sha256sum -c tar -C /usr/local -xJ --strip-components 1 < node.xz node -v # verify npm -v diff --git a/taskcluster/docker/updatebot/moz.build b/taskcluster/docker/updatebot/moz.build new file mode 100644 index 00000000000..315dc32600c --- /dev/null +++ b/taskcluster/docker/updatebot/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +with Files("**"): + BUG_COMPONENT = ("Developer Infrastructure", "Mach Vendor & Updatebot") diff --git a/taskcluster/scripts/misc/moz.build b/taskcluster/scripts/misc/moz.build new file mode 100644 index 00000000000..3b5b0e1e583 --- /dev/null +++ b/taskcluster/scripts/misc/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +with Files("verify-updatebot.py"): + BUG_COMPONENT = ("Developer Infrastructure", "Mach Vendor & Updatebot") diff --git a/testing/modules/FileTestUtils.jsm b/testing/modules/FileTestUtils.jsm index 900b8378b7f..aeb6c5a75ae 100644 --- a/testing/modules/FileTestUtils.jsm +++ b/testing/modules/FileTestUtils.jsm @@ -13,8 +13,8 @@ var EXPORTED_SYMBOLS = ["FileTestUtils"]; const { DownloadPaths } = ChromeUtils.import( "resource://gre/modules/DownloadPaths.jsm" ); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { XPCOMUtils } = ChromeUtils.importESModule( diff --git a/testing/modules/MockRegistrar.jsm b/testing/modules/MockRegistrar.jsm index 93332b4937d..3c9b734b3c5 100644 --- a/testing/modules/MockRegistrar.jsm +++ b/testing/modules/MockRegistrar.jsm @@ -8,7 +8,9 @@ var EXPORTED_SYMBOLS = ["MockRegistrar"]; const Cm = Components.manager; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); var logger = Log.repository.getLogger("MockRegistrar"); var MockRegistrar = Object.freeze({ diff --git a/testing/specialpowers/api.js b/testing/specialpowers/api.js index a668fda7098..2526fe69b71 100644 --- a/testing/specialpowers/api.js +++ b/testing/specialpowers/api.js @@ -4,8 +4,8 @@ /* globals ExtensionAPI, Services, XPCOMUtils */ -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); XPCOMUtils.defineLazyServiceGetter( diff --git a/testing/specialpowers/content/MockFilePicker.jsm b/testing/specialpowers/content/MockFilePicker.jsm index 630c6ca7a2b..473910bd872 100644 --- a/testing/specialpowers/content/MockFilePicker.jsm +++ b/testing/specialpowers/content/MockFilePicker.jsm @@ -16,11 +16,9 @@ const Cm = Components.manager; const CONTRACT_ID = "@mozilla.org/filepicker;1"; -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); /* globals __URI__ */ if (__URI__.includes("specialpowers")) { diff --git a/testing/specialpowers/content/SpecialPowersParent.jsm b/testing/specialpowers/content/SpecialPowersParent.jsm index 08b87878559..737779e850d 100644 --- a/testing/specialpowers/content/SpecialPowersParent.jsm +++ b/testing/specialpowers/content/SpecialPowersParent.jsm @@ -15,13 +15,16 @@ var { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + HiddenFrame: "resource://gre/modules/HiddenFrame.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ExtensionData: "resource://gre/modules/Extension.jsm", ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.jsm", PerTestCoverageUtils: "resource://testing-common/PerTestCoverageUtils.jsm", ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm", SpecialPowersSandbox: "resource://specialpowers/SpecialPowersSandbox.jsm", - HiddenFrame: "resource://gre/modules/HiddenFrame.jsm", }); class SpecialPowersError extends Error { diff --git a/testing/talos/talos/pageloader/chrome/Profiler.js b/testing/talos/talos/pageloader/chrome/Profiler.js index 2bd5806bdea..55b959ea63d 100644 --- a/testing/talos/talos/pageloader/chrome/Profiler.js +++ b/testing/talos/talos/pageloader/chrome/Profiler.js @@ -131,8 +131,8 @@ var Profiler; const { NetUtil } = ChromeUtils.import( "resource://gre/modules/NetUtil.jsm" ); - const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" + const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); var file = Cc["@mozilla.org/file/local;1"].createInstance( diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/api.js b/testing/talos/talos/startup_test/sessionrestore/addon/api.js index 4fb473401af..230579fdbe9 100644 --- a/testing/talos/talos/startup_test/sessionrestore/addon/api.js +++ b/testing/talos/talos/startup_test/sessionrestore/addon/api.js @@ -8,9 +8,12 @@ /* globals Services, XPCOMUtils */ +ChromeUtils.defineESModuleGetters(this, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm", setTimeout: "resource://gre/modules/Timer.jsm", StartupPerformance: "resource:///modules/sessionstore/StartupPerformance.jsm", diff --git a/testing/talos/talos/talos-powers/api.js b/testing/talos/talos/talos-powers/api.js index b6bae1eb694..4489ca91f11 100644 --- a/testing/talos/talos/talos-powers/api.js +++ b/testing/talos/talos/talos-powers/api.js @@ -406,8 +406,8 @@ TalosPowersService.prototype = { }, dumpAboutSupport(arg, callback, win) { - const { Troubleshoot } = ChromeUtils.import( - "resource://gre/modules/Troubleshoot.jsm" + const { Troubleshoot } = ChromeUtils.importESModule( + "resource://gre/modules/Troubleshoot.sys.mjs" ); Troubleshoot.snapshot(function(snapshot) { dump("about:support\t" + JSON.stringify(snapshot) + "\n"); diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/close.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/close.py.ini index 9021849ecbe..d0515da41af 100644 --- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/close.py.ini +++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/close.py.ini @@ -2,8 +2,3 @@ [test_top_level_context[window\]] disabled: if os == "android": Not supported - - [test_top_level_context[tab\]] - bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1789659 - expected: - if os == "android": FAIL diff --git a/testing/web-platform/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js b/testing/web-platform/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js index 4fe120b21fb..07741e03e92 100644 --- a/testing/web-platform/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js +++ b/testing/web-platform/tests/fs/FileSystemFileHandle-sync-access-handle-writable-lock.https.tentative.worker.js @@ -1,4 +1,5 @@ importScripts('/resources/testharness.js'); +importScripts('resources/test-helpers.js'); importScripts('resources/sandboxed-fs-test-helpers.js'); 'use strict'; @@ -36,7 +37,7 @@ directory_test(async (t, root_dir) => { const fooFileHandle = await root_dir.getFileHandle('foo.test', {create: true}); const barFileHandle = await root_dir.getFileHandle('bar.test', {create: true}); - const fooWritable = await fooFileHandle.createWritable(); + const fooWritable = await cleanup_writable(t, await fooFileHandle.createWritable()); t.add_cleanup(() => fooWritable.close()); const barSyncHandle = await barFileHandle.createSyncAccessHandle(); @@ -51,7 +52,7 @@ directory_test(async (t, root_dir) => { const fooSyncHandle = await fooFileHandle.createSyncAccessHandle(); t.add_cleanup(() => fooSyncHandle.close()); - const barWritable = await barFileHandle.createWritable(); + const barWritable = await cleanup_writable(t, await barFileHandle.createWritable()); t.add_cleanup(() => barWritable.close()); }, 'An access handle from one file does not interfere with the creation of a' + ' writable stream on another file'); @@ -61,18 +62,18 @@ directory_test(async (t, root_dir) => { const syncHandle = await fileHandle.createSyncAccessHandle(); await promise_rejects_dom( - t, 'NoModificationAllowedError', fileHandle.createWritable()); + t, 'NoModificationAllowedError', cleanup_writable(t, fileHandle.createWritable())); await syncHandle.close(); - const writable = await fileHandle.createWritable(); + const writable = await cleanup_writable(t, await fileHandle.createWritable()); await writable.close(); }, 'Writable streams cannot be created if there is an open access handle'); directory_test(async (t, root_dir) => { const fileHandle = await root_dir.getFileHandle('OPFS.test', {create: true}); - const writable1 = await fileHandle.createWritable(); - const writable2 = await fileHandle.createWritable(); + const writable1 = await cleanup_writable(t, await fileHandle.createWritable()); + const writable2 = await cleanup_writable(t, await fileHandle.createWritable()); await promise_rejects_dom( t, 'NoModificationAllowedError', fileHandle.createSyncAccessHandle()); diff --git a/testing/web-platform/tests/fs/resources/test-helpers.js b/testing/web-platform/tests/fs/resources/test-helpers.js index 32ec469c2f5..d00631b1263 100644 --- a/testing/web-platform/tests/fs/resources/test-helpers.js +++ b/testing/web-platform/tests/fs/resources/test-helpers.js @@ -113,6 +113,7 @@ async function cleanup(test, value, cleanup_func) { async function cleanup_writable(test, value) { return cleanup(test, value, async () => { - return value.close(); + // in case 'value' was a promise, await it + return (await value).close(); }); } diff --git a/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-getFile.js b/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-getFile.js index 80593418bb1..65298ca93cb 100644 --- a/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-getFile.js +++ b/testing/web-platform/tests/fs/script-tests/FileSystemFileHandle-getFile.js @@ -20,7 +20,7 @@ directory_test(async (t, root) => { }); await timeout; - const writer = await handle.createWritable({keepExistingData: false}); + const writer = await cleanup_writable(t, await handle.createWritable({keepExistingData: false})); await writer.write(new Blob(['foo'])); await writer.close(); diff --git a/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream-piped.js b/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream-piped.js index 64637c9febf..dac844a6e0d 100644 --- a/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream-piped.js +++ b/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream-piped.js @@ -1,6 +1,6 @@ directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'foo_string.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const rs = recordingReadableStream({ start(controller) { @@ -16,7 +16,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'foo_arraybuf.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const buf = new ArrayBuffer(3); const intView = new Uint8Array(buf); intView[0] = 0x66; @@ -37,7 +37,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'foo_blob.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const rs = recordingReadableStream({ start(controller) { @@ -53,7 +53,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'foo_write_param.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const rs = recordingReadableStream({ start(controller) { @@ -69,7 +69,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'foo_write_param.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const rs = recordingReadableStream({ start(controller) { @@ -87,7 +87,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'foo_write_queued.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const rs = recordingReadableStream({ start(controller) { @@ -105,7 +105,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'fetched.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const response = await fetch('data:text/plain,fetched from far'); const body = await response.body; @@ -116,7 +116,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'aborted should_be_empty.txt', root); - const wfs = await handle.createWritable(); + const wfs = await cleanup_writable(t, await handle.createWritable()); const response = await fetch('data:text/plain,fetched from far'); const body = await response.body; diff --git a/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream.js b/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream.js index 1cebb993556..e2c770ad19e 100644 --- a/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream.js +++ b/testing/web-platform/tests/fs/script-tests/FileSystemWritableFileStream.js @@ -1,6 +1,6 @@ directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'trunc_shrink', root); - const stream = await handle.createWritable(); + const stream = await cleanup_writable(t, await handle.createWritable()); await stream.write('1234567890'); await stream.truncate(5); @@ -12,7 +12,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'trunc_grow', root); - const stream = await handle.createWritable(); + const stream = await cleanup_writable(t, await handle.createWritable()); await stream.write('abc'); await stream.truncate(5); @@ -28,14 +28,14 @@ directory_test(async (t, root) => { const handle = await createEmptyFile(t, file_name, dir); await root.removeEntry('parent_dir', {recursive: true}); - await promise_rejects_dom(t, 'NotFoundError', handle.createWritable()); + await promise_rejects_dom(t, 'NotFoundError', cleanup_writable(t, handle.createWritable())); }, 'createWritable() fails when parent directory is removed'); directory_test(async (t, root) => { const dir = await createDirectory(t, 'parent_dir', root); const file_name = 'write_fails_when_dir_removed.txt'; const handle = await createEmptyFile(t, file_name, dir); - const stream = await handle.createWritable(); + const stream = await cleanup_writable(t, await handle.createWritable()); await root.removeEntry('parent_dir', {recursive: true}); await promise_rejects_dom(t, 'NotFoundError', stream.write('foo')); @@ -45,7 +45,7 @@ directory_test(async (t, root) => { const dir = await createDirectory(t, 'parent_dir', root); const file_name = 'truncate_fails_when_dir_removed.txt'; const handle = await createEmptyFile(t, file_name, dir); - const stream = await handle.createWritable(); + const stream = await cleanup_writable(t, await handle.createWritable()); await root.removeEntry('parent_dir', {recursive: true}); await promise_rejects_dom(t, 'NotFoundError', stream.truncate(0)); @@ -54,7 +54,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createFileWithContents( t, 'atomic_file_is_copied.txt', 'fooks', root); - const stream = await handle.createWritable({keepExistingData: true}); + const stream = await cleanup_writable(t, await handle.createWritable({keepExistingData: true})); await stream.write('bar'); await stream.close(); @@ -65,7 +65,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createFileWithContents( t, 'atomic_file_is_not_copied.txt', 'very long string', root); - const stream = await handle.createWritable({keepExistingData: false}); + const stream = await cleanup_writable(t, await handle.createWritable({keepExistingData: false})); await stream.write('bar'); assert_equals(await getFileContents(handle), 'very long string'); @@ -77,7 +77,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createFileWithContents( t, 'trunc_smaller_offset.txt', '1234567890', root); - const stream = await handle.createWritable({keepExistingData: true}); + const stream = await cleanup_writable(t, await handle.createWritable({keepExistingData: true})); await stream.truncate(5); await stream.write('abc'); @@ -90,7 +90,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createFileWithContents( t, 'trunc_bigger_offset.txt', '1234567890', root); - const stream = await handle.createWritable({keepExistingData: true}); + const stream = await cleanup_writable(t, await handle.createWritable({keepExistingData: true})); await stream.seek(6); await stream.truncate(5); @@ -103,7 +103,7 @@ directory_test(async (t, root) => { directory_test(async (t, root) => { const handle = await createEmptyFile(t, 'contents', root); - const stream = await handle.createWritable(); + const stream = await cleanup_writable(t, await handle.createWritable()); assert_false(stream.locked); stream.write('abc'); diff --git a/testing/web-platform/tests/webdriver/tests/bidi/browsing_context/navigate/wait.py b/testing/web-platform/tests/webdriver/tests/bidi/browsing_context/navigate/wait.py index 4c842447604..9a0b14e755e 100644 --- a/testing/web-platform/tests/webdriver/tests/bidi/browsing_context/navigate/wait.py +++ b/testing/web-platform/tests/webdriver/tests/bidi/browsing_context/navigate/wait.py @@ -10,16 +10,17 @@ async def wait_for_navigation(bidi_session, context, url, wait, expect_timeout): if expect_timeout: with pytest.raises(asyncio.TimeoutError): await asyncio.wait_for( - bidi_session.browsing_context.navigate( + asyncio.shield(bidi_session.browsing_context.navigate( context=context, url=url, wait=wait - ), - timeout=1, + )), + timeout=1, ) else: await bidi_session.browsing_context.navigate( context=context, url=url, wait=wait ) + @pytest.mark.parametrize("value", ["none", "interactive", "complete"]) async def test_expected_url(bidi_session, inline, new_tab, value): url = inline("
foo
") @@ -42,13 +43,16 @@ async def test_expected_url(bidi_session, inline, new_tab, value): ("complete", True), ], ) -async def test_slow_image(bidi_session, inline, new_tab, wait, expect_timeout): +async def test_slow_image_blocks_load(bidi_session, inline, new_tab, wait, expect_timeout): script_url = "/webdriver/tests/bidi/browsing_context/navigate/support/empty.svg" url = inline(f"") await wait_for_navigation(bidi_session, new_tab["context"], url, wait, expect_timeout) - if wait != "none": + # We cannot assert the URL for "none" by definition, and for "complete", since + # we expect a timeout. For the timeout case, the wait_for_navigation helper will + # resume after 1 second, there is no guarantee that the URL has been updated. + if wait == "interactive": contexts = await bidi_session.browsing_context.get_tree( root=new_tab["context"], max_depth=0 ) @@ -82,14 +86,13 @@ async def test_slow_page(bidi_session, new_tab, url, wait, expect_timeout): ("complete", True), ], ) -async def test_slow_script(bidi_session, inline, new_tab, wait, expect_timeout): +async def test_slow_script_blocks_domContentLoaded(bidi_session, inline, new_tab, wait, expect_timeout): script_url = "/webdriver/tests/bidi/browsing_context/navigate/support/empty.js" url = inline(f"") await wait_for_navigation(bidi_session, new_tab["context"], url, wait, expect_timeout) - if wait != "none": - contexts = await bidi_session.browsing_context.get_tree( - root=new_tab["context"], max_depth=0 - ) - assert contexts[0]["url"] == url + # In theory we could also assert the top context URL has been updated here, + # but since we expect both "interactive" and "complete" to timeout the + # wait_for_navigation helper will resume arbitrarily after 1 second, and + # there is no guarantee that the URL has been updated. diff --git a/third_party/rust/audioipc2-client/.cargo-checksum.json b/third_party/rust/audioipc2-client/.cargo-checksum.json index 44172d35296..ed34c2bc99b 100644 --- a/third_party/rust/audioipc2-client/.cargo-checksum.json +++ b/third_party/rust/audioipc2-client/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"31dc34fae9951183eaed3511cffe3d830d52ba3c046257454f09a06156d0716b","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"4593aa41ee97b72622b572ad80f0e4c939d8be2ea45fed1f5587f5a109a67735","src/lib.rs":"c4a6797734489280f6b97dd72c9e51a7bd7be4104592eece3929e29d45cbca4a","src/send_recv.rs":"859abe75b521eb4297c84b30423814b5b87f3c7741ad16fe72189212e123e1ac","src/stream.rs":"a6c07796e6fe704cfa6baf8b904e7ffe874d3c884d44d4ed307e668dec25452b"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"31dc34fae9951183eaed3511cffe3d830d52ba3c046257454f09a06156d0716b","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"45d640800e8b287ca0242d867618bf33396fb3a9c270b7fb58adca76e37c72cc","src/lib.rs":"c4a6797734489280f6b97dd72c9e51a7bd7be4104592eece3929e29d45cbca4a","src/send_recv.rs":"859abe75b521eb4297c84b30423814b5b87f3c7741ad16fe72189212e123e1ac","src/stream.rs":"46068bb0da752c9dee489f3620d4588967921000e234110ee066397595700ae0"},"package":null} \ No newline at end of file diff --git a/third_party/rust/audioipc2-client/src/context.rs b/third_party/rust/audioipc2-client/src/context.rs index dc22159a257..c255815ac81 100644 --- a/third_party/rust/audioipc2-client/src/context.rs +++ b/third_party/rust/audioipc2-client/src/context.rs @@ -56,8 +56,8 @@ impl ClientContext { } #[doc(hidden)] - pub fn rpc(&self) -> rpccore::Proxy { - self.rpc.clone() + pub fn rpc(&self) -> Result> { + self.rpc.try_clone().map_err(|_| Error::default()) } #[doc(hidden)] @@ -186,7 +186,7 @@ impl ContextOps for ClientContext { .handle() .bind_client::(server_connection) .map_err(|_| Error::default())?; - let rpc2 = rpc.clone(); + let rpc2 = rpc.try_clone().map_err(|_| Error::default())?; // Don't let errors bubble from here. Later calls against this context // will return errors the caller expects to handle. @@ -225,18 +225,18 @@ impl ContextOps for ClientContext { fn max_channel_count(&mut self) -> Result { assert_not_in_callback(); - send_recv!(self.rpc(), ContextGetMaxChannelCount => ContextMaxChannelCount()) + send_recv!(self.rpc()?, ContextGetMaxChannelCount => ContextMaxChannelCount()) } fn min_latency(&mut self, params: StreamParams) -> Result { assert_not_in_callback(); let params = messages::StreamParams::from(params.as_ref()); - send_recv!(self.rpc(), ContextGetMinLatency(params) => ContextMinLatency()) + send_recv!(self.rpc()?, ContextGetMinLatency(params) => ContextMinLatency()) } fn preferred_sample_rate(&mut self) -> Result { assert_not_in_callback(); - send_recv!(self.rpc(), ContextGetPreferredSampleRate => ContextPreferredSampleRate()) + send_recv!(self.rpc()?, ContextGetPreferredSampleRate => ContextPreferredSampleRate()) } fn enumerate_devices( @@ -246,7 +246,7 @@ impl ContextOps for ClientContext { ) -> Result<()> { assert_not_in_callback(); let v: Vec = send_recv!( - self.rpc(), ContextGetDeviceEnumeration(devtype.bits()) => ContextEnumeratedDevices())? + self.rpc()?, ContextGetDeviceEnumeration(devtype.bits()) => ContextEnumeratedDevices())? .into_iter() .map(|i| i.into()) .collect(); @@ -329,7 +329,7 @@ impl ContextOps for ClientContext { assert_not_in_callback(); if !self.device_collection_rpc { - let mut fd = send_recv!(self.rpc(), + let mut fd = send_recv!(self.rpc()?, ContextSetupDeviceCollectionCallback => ContextSetupDeviceCollectionCallback())?; @@ -358,7 +358,7 @@ impl ContextOps for ClientContext { } let enable = collection_changed_callback.is_some(); - send_recv!(self.rpc(), + send_recv!(self.rpc()?, ContextRegisterDeviceCollectionChanged(devtype.bits(), enable) => ContextRegisteredDeviceCollectionChanged) } @@ -367,7 +367,9 @@ impl ContextOps for ClientContext { impl Drop for ClientContext { fn drop(&mut self) { debug!("ClientContext dropped..."); - let _ = send_recv!(self.rpc(), ClientDisconnect => ClientDisconnected); + let _ = self + .rpc() + .and_then(|rpc| send_recv!(rpc, ClientDisconnect => ClientDisconnected)); } } diff --git a/third_party/rust/audioipc2-client/src/stream.rs b/third_party/rust/audioipc2-client/src/stream.rs index a904f83f06a..315efd79061 100644 --- a/third_party/rust/audioipc2-client/src/stream.rs +++ b/third_party/rust/audioipc2-client/src/stream.rs @@ -93,15 +93,26 @@ impl rpccore::Server for CallbackServer { run_in_callback(|| { let nframes = unsafe { + let input_ptr = if input_frame_size > 0 { + if let Some(buf) = &mut self.duplex_input { + buf.as_ptr() + } else { + self.shm.get_slice(input_nbytes).unwrap().as_ptr() + } + } else { + ptr::null() + }; + let output_ptr = if output_frame_size > 0 { + self.shm.get_mut_slice(output_nbytes).unwrap().as_mut_ptr() + } else { + ptr::null_mut() + }; + self.data_cb.unwrap()( ptr::null_mut(), // https://github.com/kinetiknz/cubeb/issues/518 self.user_ptr as *mut c_void, - if let Some(buf) = &mut self.duplex_input { - buf.as_mut_ptr() - } else { - self.shm.get_slice(input_nbytes).unwrap().as_ptr() - } as *const _, - self.shm.get_mut_slice(output_nbytes).unwrap().as_mut_ptr() as *mut _, + input_ptr as *const _, + output_ptr as *mut _, nframes as _, ) }; @@ -145,7 +156,7 @@ impl<'ctx> ClientStream<'ctx> { ) -> Result { assert_not_in_callback(); - let rpc = ctx.rpc(); + let rpc = ctx.rpc()?; let create_params = StreamCreateParams { input_stream_params: init_params.input_stream_params, output_stream_params: init_params.output_stream_params, @@ -227,8 +238,10 @@ impl<'ctx> ClientStream<'ctx> { impl Drop for ClientStream<'_> { fn drop(&mut self) { debug!("ClientStream drop"); - let rpc = self.context.rpc(); - let _ = send_recv!(rpc, StreamDestroy(self.token) => StreamDestroyed); + let _ = self + .context + .rpc() + .and_then(|rpc| send_recv!(rpc, StreamDestroy(self.token) => StreamDestroyed)); debug!("ClientStream drop - stream destroyed"); // Wait for CallbackServer to shutdown. The remote server drops the RPC // connection during StreamDestroy, which will cause CallbackServer to drop @@ -243,49 +256,49 @@ impl Drop for ClientStream<'_> { impl StreamOps for ClientStream<'_> { fn start(&mut self) -> Result<()> { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; send_recv!(rpc, StreamStart(self.token) => StreamStarted) } fn stop(&mut self) -> Result<()> { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; send_recv!(rpc, StreamStop(self.token) => StreamStopped) } fn position(&mut self) -> Result { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; send_recv!(rpc, StreamGetPosition(self.token) => StreamPosition()) } fn latency(&mut self) -> Result { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; send_recv!(rpc, StreamGetLatency(self.token) => StreamLatency()) } fn input_latency(&mut self) -> Result { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; send_recv!(rpc, StreamGetInputLatency(self.token) => StreamInputLatency()) } fn set_volume(&mut self, volume: f32) -> Result<()> { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; send_recv!(rpc, StreamSetVolume(self.token, volume) => StreamVolumeSet) } fn set_name(&mut self, name: &CStr) -> Result<()> { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; send_recv!(rpc, StreamSetName(self.token, name.to_owned()) => StreamNameSet) } fn current_device(&mut self) -> Result<&DeviceRef> { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; match send_recv!(rpc, StreamGetCurrentDevice(self.token) => StreamCurrentDevice()) { Ok(d) => Ok(unsafe { DeviceRef::from_ptr(Box::into_raw(Box::new(d.into()))) }), Err(e) => Err(e), @@ -309,7 +322,7 @@ impl StreamOps for ClientStream<'_> { device_changed_callback: ffi::cubeb_device_changed_callback, ) -> Result<()> { assert_not_in_callback(); - let rpc = self.context.rpc(); + let rpc = self.context.rpc()?; let enable = device_changed_callback.is_some(); *self.device_change_cb.lock().unwrap() = device_changed_callback; send_recv!(rpc, StreamRegisterDeviceChangeCallback(self.token, enable) => StreamRegisterDeviceChangeCallback) diff --git a/third_party/rust/audioipc2-server/.cargo-checksum.json b/third_party/rust/audioipc2-server/.cargo-checksum.json index c474de6303b..7dcab92007f 100644 --- a/third_party/rust/audioipc2-server/.cargo-checksum.json +++ b/third_party/rust/audioipc2-server/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"7feb495b23148ecc83ec7f480aefe19c9804a8900cdb4ceb005c049cdce82428","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/lib.rs":"d9cc7ca311cceb70acbc63b2190d6205094152e582faaad1b4a6061019f5803f","src/server.rs":"362ec34c541e43befb95204795622b5a2da036f8e417d524c64eb6c6550d094b"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"7feb495b23148ecc83ec7f480aefe19c9804a8900cdb4ceb005c049cdce82428","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/lib.rs":"d9cc7ca311cceb70acbc63b2190d6205094152e582faaad1b4a6061019f5803f","src/server.rs":"744f655486469daa4973d9101bd76a124ab6169b46b540f1c955932f6139e89f"},"package":null} \ No newline at end of file diff --git a/third_party/rust/audioipc2-server/src/server.rs b/third_party/rust/audioipc2-server/src/server.rs index d715c64aada..ff85712847a 100644 --- a/third_party/rust/audioipc2-server/src/server.rs +++ b/third_party/rust/audioipc2-server/src/server.rs @@ -367,13 +367,15 @@ impl Drop for CubebServer { context: Ok(context), }) = state.as_mut() { - let r = manager.unregister( - context, - device_collection_change_callbacks, - cubeb::DeviceType::all(), - ); - if r.is_err() { - debug!("CubebServer: unregister failed: {:?}", r); + for devtype in [cubeb::DeviceType::INPUT, cubeb::DeviceType::OUTPUT] { + let r = manager.unregister( + context, + device_collection_change_callbacks, + devtype, + ); + if r.is_err() { + debug!("CubebServer: unregister failed: {:?}", r); + } } } }) @@ -722,8 +724,8 @@ impl CubebServer { input_frame_size, output_frame_size, shm, - state_callback_rpc: rpc.clone(), - device_change_callback_rpc: rpc.clone(), + state_callback_rpc: rpc.try_clone()?, + device_change_callback_rpc: rpc.try_clone()?, data_callback_rpc: rpc, }); diff --git a/third_party/rust/audioipc2/.cargo-checksum.json b/third_party/rust/audioipc2/.cargo-checksum.json index 8098377aeaf..2847888023b 100644 --- a/third_party/rust/audioipc2/.cargo-checksum.json +++ b/third_party/rust/audioipc2/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"8b2d3abbe023360a24d37b306dbec9e8bd0162025d38ca106ebcc8d7abab4039","benches/serialization.rs":"d56855d868dab6aa22c8b03a61084535351b76c94b68d8b1d20764e352fe473f","build.rs":"65df9a97c6cdaa3faf72581f04ac289197b0b1797d69d22c1796e957ff1089e2","src/codec.rs":"4e029396765db803201249e90bcf724eb56deed3b2e455822d6673f40550a3e1","src/errors.rs":"67a4a994d0724397657581cde153bdfc05ce86e7efc467f23fafc8f64df80fa4","src/ipccore.rs":"eda3629e363124c84d5b826dea03f5551a8adad6c8efbc61b98f7d6572fdfa18","src/lib.rs":"9b107cb52081eeea3fa742d30361db70f7138baa423dfe21d37dcf5087afc338","src/messages.rs":"452362da2cace9a0f2e3134c190ecb6a9997f8be4036cde06643e17c6c238240","src/rpccore.rs":"21568946ca59e0cf1cb0dc6254ebda577a014343438a4fde2556a22e44eea2bf","src/shm.rs":"1d88f19606899e3e477865d6b84bbe3e272f51618a1c2d57b6dab03a4787cde3","src/sys/mod.rs":"e6fa1d260abf093e1f7b50185195e2d3aee0eb8c9774c6f253953b5896d838f3","src/sys/unix/cmsg.rs":"8a27a20383c333c5d033e58a546a530e26b964942a4615793d1ca078c65efb75","src/sys/unix/cmsghdr.c":"d7344b3dc15cdce410c68669b848bb81f7fe36362cd3699668cb613fa05180f8","src/sys/unix/mod.rs":"59835f0d5509940078b1820a54f49fc5514adeb3e45e7d21e3ab917431da2e74","src/sys/unix/msg.rs":"c0103cc058aeb890ab7aa023fcd6d3b9a0135d6b28fdecdec446650957210508","src/sys/windows/mod.rs":"7b1288e42b3ce34c7004b9fe3eeb6d9822c55e2688d3c2a40e55db46a2ca5d76"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"8b2d3abbe023360a24d37b306dbec9e8bd0162025d38ca106ebcc8d7abab4039","benches/serialization.rs":"d56855d868dab6aa22c8b03a61084535351b76c94b68d8b1d20764e352fe473f","build.rs":"65df9a97c6cdaa3faf72581f04ac289197b0b1797d69d22c1796e957ff1089e2","src/codec.rs":"4e029396765db803201249e90bcf724eb56deed3b2e455822d6673f40550a3e1","src/errors.rs":"67a4a994d0724397657581cde153bdfc05ce86e7efc467f23fafc8f64df80fa4","src/ipccore.rs":"be36c9d927a4ea35869163f2a30be77366acfffadb7f67f550b3b9c53b23a201","src/lib.rs":"9b107cb52081eeea3fa742d30361db70f7138baa423dfe21d37dcf5087afc338","src/messages.rs":"452362da2cace9a0f2e3134c190ecb6a9997f8be4036cde06643e17c6c238240","src/rpccore.rs":"9b7199c0e31941c399934c4442e2169fb85c6067810c37879d1c9614ce00bdf5","src/shm.rs":"1d88f19606899e3e477865d6b84bbe3e272f51618a1c2d57b6dab03a4787cde3","src/sys/mod.rs":"e6fa1d260abf093e1f7b50185195e2d3aee0eb8c9774c6f253953b5896d838f3","src/sys/unix/cmsg.rs":"8a27a20383c333c5d033e58a546a530e26b964942a4615793d1ca078c65efb75","src/sys/unix/cmsghdr.c":"d7344b3dc15cdce410c68669b848bb81f7fe36362cd3699668cb613fa05180f8","src/sys/unix/mod.rs":"59835f0d5509940078b1820a54f49fc5514adeb3e45e7d21e3ab917431da2e74","src/sys/unix/msg.rs":"c0103cc058aeb890ab7aa023fcd6d3b9a0135d6b28fdecdec446650957210508","src/sys/windows/mod.rs":"7b1288e42b3ce34c7004b9fe3eeb6d9822c55e2688d3c2a40e55db46a2ca5d76"},"package":null} \ No newline at end of file diff --git a/third_party/rust/audioipc2/src/ipccore.rs b/third_party/rust/audioipc2/src/ipccore.rs index 6e607db2e89..3f31faa021f 100644 --- a/third_party/rust/audioipc2/src/ipccore.rs +++ b/third_party/rust/audioipc2/src/ipccore.rs @@ -66,7 +66,7 @@ impl EventLoopHandle { ::ServerMessage: Serialize + Debug + AssociateHandleForMessage + Send, ::ClientMessage: DeserializeOwned + Debug + AssociateHandleForMessage + Send, { - let (handler, mut proxy) = make_client::(); + let (handler, mut proxy) = make_client::()?; let driver = Box::new(FramedDriver::new(handler)); let r = self.add_connection(connection, driver); trace!("EventLoop::bind_client {:?}", r); @@ -236,7 +236,7 @@ impl EventLoop { debug!("{}: {:?}: done, removing", self.name, token); let mut connection = self.connections.remove(token.0); if let Err(e) = connection.shutdown(self.poll.registry()) { - warn!( + debug!( "{}: EventLoop drop - closing connection for {:?} failed: {:?}", self.name, token, e ); @@ -286,7 +286,7 @@ impl EventLoop { debug!("{}: {:?}: done (wake), removing", self.name, token); let mut connection = self.connections.remove(token.0); if let Err(e) = connection.shutdown(self.poll.registry()) { - warn!( + debug!( "{}: EventLoop drop - closing connection for {:?} failed: {:?}", self.name, token, e ); @@ -309,7 +309,7 @@ impl Drop for EventLoop { self.name, token ); if let Err(e) = connection.shutdown(self.poll.registry()) { - warn!( + debug!( "{}: EventLoop drop - closing connection for {:?} failed: {:?}", self.name, token, e ); @@ -882,6 +882,18 @@ mod test { .expect_err("sending on closed channel"); } + #[test] + fn clone_after_drop() { + init(); + let (server, client, client_proxy) = setup(); + drop(server); + drop(client); + + client_proxy + .try_clone() + .expect_err("cloning a closed proxy"); + } + #[test] fn basic_event_loop_thread_callbacks() { init(); diff --git a/third_party/rust/audioipc2/src/rpccore.rs b/third_party/rust/audioipc2/src/rpccore.rs index bb0a0bc7fe0..2fbd8210074 100644 --- a/third_party/rust/audioipc2/src/rpccore.rs +++ b/third_party/rust/audioipc2/src/rpccore.rs @@ -4,9 +4,9 @@ // accompanying file LICENSE for details use std::collections::VecDeque; -use std::io::{self, Result}; +use std::io::{self, Error, ErrorKind, Result}; use std::mem::ManuallyDrop; -use std::sync::{Arc, Mutex, Weak}; +use std::sync::{Arc, Mutex}; use crossbeam_channel::{self, Receiver, Sender}; use mio::Token; @@ -58,48 +58,49 @@ type ProxyRequest = (ProxyKey, Request); // Each Proxy is registered with the ClientHandler on initialization via the // ProxyManager and unregistered when dropped. // A ClientHandler normally lives until the last Proxy is dropped, but if the ClientHandler -// encounters an internal error, `response_tx` will be closed and `proxy_mgr` can -// no longer be upgraded to register new Proxies. +// encounters an internal error, `handler_tx` and `response_tx` will be closed. #[derive(Debug)] pub struct Proxy { handle: Option<(EventLoopHandle, Token)>, key: ProxyKey, response_rx: Receiver, handler_tx: ManuallyDrop>>, - proxy_mgr: Weak>, + proxy_mgr: Arc>, } impl Proxy { fn new( handler_tx: Sender>, - proxy_mgr: Weak>, - ) -> Self { + proxy_mgr: Arc>, + ) -> Result { let (tx, rx) = crossbeam_channel::bounded(1); - Self { + Ok(Self { handle: None, - key: proxy_mgr.upgrade().unwrap().register_proxy(tx), + key: proxy_mgr.register_proxy(tx)?, response_rx: rx, handler_tx: ManuallyDrop::new(handler_tx), proxy_mgr, - } + }) + } + + pub fn try_clone(&self) -> Result { + let mut clone = Self::new((*self.handler_tx).clone(), self.proxy_mgr.clone())?; + let (handle, token) = self + .handle + .as_ref() + .expect("proxy not connected to event loop"); + clone.connect_event_loop(handle.clone(), *token); + Ok(clone) } pub fn call(&self, request: Request) -> Result { match self.handler_tx.send((self.key, request)) { Ok(_) => self.wake_connection(), - Err(_) => { - return Err(std::io::Error::new( - std::io::ErrorKind::Other, - "proxy send error", - )) - } + Err(_) => return Err(Error::new(ErrorKind::Other, "proxy send error")), } match self.response_rx.recv() { Ok(resp) => Ok(resp), - Err(_) => Err(std::io::Error::new( - std::io::ErrorKind::Other, - "proxy recv error", - )), + Err(_) => Err(Error::new(ErrorKind::Other, "proxy recv error")), } } @@ -116,26 +117,11 @@ impl Proxy { } } -impl Clone for Proxy { - fn clone(&self) -> Self { - let (tx, rx) = crossbeam_channel::bounded(1); - Self { - handle: self.handle.clone(), - key: self.proxy_mgr.upgrade().unwrap().register_proxy(tx), - response_rx: rx, - handler_tx: self.handler_tx.clone(), - proxy_mgr: self.proxy_mgr.clone(), - } - } -} - impl Drop for Proxy { fn drop(&mut self) { trace!("Proxy drop, waking EventLoop"); - if let Some(mgr) = self.proxy_mgr.upgrade() { - mgr.unregister_proxy(self.key) - } - // Must drop Sender before waking the connection, otherwise + let _ = self.proxy_mgr.unregister_proxy(self.key); + // Must drop `handler_tx` before waking the connection, otherwise // the wake may be processed before Sender is closed. unsafe { ManuallyDrop::drop(&mut self.handler_tx); @@ -152,33 +138,72 @@ const RPC_CLIENT_INITIAL_PROXIES: usize = 32; // Initial proxy pre-allocation pe // the manager on initialization. #[derive(Debug)] struct ProxyManager { - proxies: Mutex>>, + proxies: Mutex>>>, } impl ProxyManager { fn new() -> Self { Self { - proxies: Mutex::new(Slab::with_capacity(RPC_CLIENT_INITIAL_PROXIES)), + proxies: Mutex::new(Some(Slab::with_capacity(RPC_CLIENT_INITIAL_PROXIES))), } } // Register a Proxy's response Sender, returning a unique ID identifying // the Proxy to the ClientHandler. - fn register_proxy(&self, tx: Sender) -> ProxyKey { + fn register_proxy(&self, tx: Sender) -> Result { let mut proxies = self.proxies.lock().unwrap(); - let entry = proxies.vacant_entry(); - let key = entry.key(); - entry.insert(tx); - key + match &mut *proxies { + Some(proxies) => { + let entry = proxies.vacant_entry(); + let key = entry.key(); + entry.insert(tx); + Ok(key) + } + None => Err(Error::new( + ErrorKind::Other, + "register: proxy manager disconnected", + )), + } } - fn unregister_proxy(&self, key: ProxyKey) { - let _ = self.proxies.lock().unwrap().remove(key); + fn unregister_proxy(&self, key: ProxyKey) -> Result<()> { + let mut proxies = self.proxies.lock().unwrap(); + match &mut *proxies { + Some(proxies) => match proxies.try_remove(key) { + Some(_) => Ok(()), + None => Err(Error::new( + ErrorKind::Other, + "unregister: unknown proxy key", + )), + }, + None => Err(Error::new( + ErrorKind::Other, + "unregister: proxy manager disconnected", + )), + } } // Deliver ClientHandler's Response to the Proxy associated with `key`. - fn deliver(&self, key: ProxyKey, resp: Response) { - let _ = self.proxies.lock().unwrap()[key].send(resp); + fn deliver(&self, key: ProxyKey, resp: Response) -> Result<()> { + let proxies = self.proxies.lock().unwrap(); + match &*proxies { + Some(proxies) => match proxies.get(key) { + Some(proxy) => { + drop(proxy.send(resp)); + Ok(()) + } + None => Err(Error::new(ErrorKind::Other, "deliver: unknown proxy key")), + }, + None => Err(Error::new( + ErrorKind::Other, + "unregister: proxy manager disconnected", + )), + } + } + + // ClientHandler disconnected, close Proxy Senders to unblock any waiters. + fn disconnect_handler(&self) { + *self.proxies.lock().unwrap() = None; } } @@ -191,9 +216,9 @@ impl ProxyManager { // connected to a ProxyResponse. pub(crate) struct ClientHandler { messages: Receiver>, - // Proxies hold a Weak to register on initialization. + // Proxies hold an Arc to register on initialization. // When ClientHandler drops, any Proxies blocked on a response will - // error due to the Sender closing. + // error due to their Sender closing. proxies: Arc>, in_flight: VecDeque, } @@ -207,8 +232,8 @@ impl ClientHandler { } } - fn proxy_manager(&self) -> Weak::ClientMessage>> { - Arc::downgrade(&self.proxies) + fn proxy_manager(&self) -> &Arc::ClientMessage>> { + &self.proxies } } @@ -220,12 +245,9 @@ impl Handler for ClientHandler { trace!("ClientHandler::consume"); // `proxy` identifies the waiting Proxy expecting `response`. if let Some(proxy) = self.in_flight.pop_front() { - self.proxies.deliver(proxy, response); + self.proxies.deliver(proxy, response)?; } else { - return Err(std::io::Error::new( - std::io::ErrorKind::Other, - "request/response mismatch", - )); + return Err(Error::new(ErrorKind::Other, "request/response mismatch")); } Ok(()) @@ -253,14 +275,21 @@ impl Handler for ClientHandler { } } +impl Drop for ClientHandler { + fn drop(&mut self) { + self.proxies.disconnect_handler(); + } +} + +#[allow(clippy::type_complexity)] pub(crate) fn make_client( -) -> (ClientHandler, Proxy) { +) -> Result<(ClientHandler, Proxy)> { let (tx, rx) = crossbeam_channel::bounded(RPC_CLIENT_INITIAL_PROXIES); let handler = ClientHandler::new(rx); - let proxy_mgr = handler.proxy_manager(); + let proxy_mgr = handler.proxy_manager().clone(); - (handler, Proxy::new(tx, proxy_mgr)) + Ok((handler, Proxy::new(tx, proxy_mgr)?)) } // Server-specific Handler implementation. diff --git a/toolkit/actors/AutoCompleteChild.jsm b/toolkit/actors/AutoCompleteChild.jsm index 3dd5a012ad2..25a79381d90 100644 --- a/toolkit/actors/AutoCompleteChild.jsm +++ b/toolkit/actors/AutoCompleteChild.jsm @@ -9,11 +9,9 @@ var EXPORTED_SYMBOLS = ["AutoCompleteChild"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "LayoutUtils", - "resource://gre/modules/LayoutUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + LayoutUtils: "resource://gre/modules/LayoutUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, diff --git a/toolkit/actors/AutoScrollChild.jsm b/toolkit/actors/AutoScrollChild.jsm index 1e0652385d1..8dbcb28f52d 100644 --- a/toolkit/actors/AutoScrollChild.jsm +++ b/toolkit/actors/AutoScrollChild.jsm @@ -7,11 +7,9 @@ var EXPORTED_SYMBOLS = ["AutoScrollChild"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "BrowserUtils", - "resource://gre/modules/BrowserUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", +}); class AutoScrollChild extends JSWindowActorChild { constructor() { diff --git a/toolkit/actors/DateTimePickerChild.jsm b/toolkit/actors/DateTimePickerChild.jsm index 40ffdc1ba67..7a212c38315 100644 --- a/toolkit/actors/DateTimePickerChild.jsm +++ b/toolkit/actors/DateTimePickerChild.jsm @@ -3,11 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "LayoutUtils", - "resource://gre/modules/LayoutUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + LayoutUtils: "resource://gre/modules/LayoutUtils.sys.mjs", +}); var EXPORTED_SYMBOLS = ["DateTimePickerChild"]; diff --git a/toolkit/actors/DateTimePickerParent.jsm b/toolkit/actors/DateTimePickerParent.jsm index 59425aed4dc..406b7d784ff 100644 --- a/toolkit/actors/DateTimePickerParent.jsm +++ b/toolkit/actors/DateTimePickerParent.jsm @@ -14,11 +14,9 @@ function debug(aStr) { var EXPORTED_SYMBOLS = ["DateTimePickerParent"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "DateTimePickerPanel", - "resource://gre/modules/DateTimePickerPanel.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + DateTimePickerPanel: "resource://gre/modules/DateTimePickerPanel.sys.mjs", +}); /* * DateTimePickerParent receives message from content side (input box) and diff --git a/toolkit/actors/FindBarChild.jsm b/toolkit/actors/FindBarChild.jsm index be15f115b06..17e19c0fe5d 100644 --- a/toolkit/actors/FindBarChild.jsm +++ b/toolkit/actors/FindBarChild.jsm @@ -12,11 +12,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "BrowserUtils", - "resource://gre/modules/BrowserUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", +}); class FindBarChild extends JSWindowActorChild { constructor() { @@ -28,8 +26,8 @@ class FindBarChild extends JSWindowActorChild { this, "FindBarContent", () => { - const { FindBarContent } = ChromeUtils.import( - "resource://gre/modules/FindBarContent.jsm" + const { FindBarContent } = ChromeUtils.importESModule( + "resource://gre/modules/FindBarContent.sys.mjs" ); return new FindBarContent(this); }, diff --git a/toolkit/actors/FinderChild.jsm b/toolkit/actors/FinderChild.jsm index e2e05030008..02dcc0f180c 100644 --- a/toolkit/actors/FinderChild.jsm +++ b/toolkit/actors/FinderChild.jsm @@ -8,11 +8,9 @@ var EXPORTED_SYMBOLS = ["FinderChild"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "Finder", - "resource://gre/modules/Finder.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + Finder: "resource://gre/modules/Finder.sys.mjs", +}); class FinderChild extends JSWindowActorChild { get finder() { diff --git a/toolkit/actors/InlineSpellCheckerChild.jsm b/toolkit/actors/InlineSpellCheckerChild.jsm index 946a1380581..d6837c4f2ae 100644 --- a/toolkit/actors/InlineSpellCheckerChild.jsm +++ b/toolkit/actors/InlineSpellCheckerChild.jsm @@ -10,11 +10,10 @@ var EXPORTED_SYMBOLS = ["InlineSpellCheckerChild"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "InlineSpellCheckerContent", - "resource://gre/modules/InlineSpellCheckerContent.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + InlineSpellCheckerContent: + "resource://gre/modules/InlineSpellCheckerContent.sys.mjs", +}); class InlineSpellCheckerChild extends JSWindowActorChild { receiveMessage(msg) { diff --git a/toolkit/actors/PictureInPictureChild.sys.mjs b/toolkit/actors/PictureInPictureChild.sys.mjs index 442845db5cc..19d522fccc5 100644 --- a/toolkit/actors/PictureInPictureChild.sys.mjs +++ b/toolkit/actors/PictureInPictureChild.sys.mjs @@ -12,15 +12,11 @@ ChromeUtils.defineModuleGetter( ); ChromeUtils.defineESModuleGetters(lazy, { KEYBOARD_CONTROLS: "resource://gre/modules/PictureInPictureControls.sys.mjs", + Rect: "resource://gre/modules/Geometry.sys.mjs", TOGGLE_POLICIES: "resource://gre/modules/PictureInPictureControls.sys.mjs", TOGGLE_POLICY_STRINGS: "resource://gre/modules/PictureInPictureControls.sys.mjs", }); -ChromeUtils.defineModuleGetter( - lazy, - "Rect", - "resource://gre/modules/Geometry.jsm" -); ChromeUtils.defineModuleGetter( lazy, "ContentDOMReference", diff --git a/toolkit/actors/RemotePageChild.jsm b/toolkit/actors/RemotePageChild.jsm index 589fca44318..e3839d7823e 100644 --- a/toolkit/actors/RemotePageChild.jsm +++ b/toolkit/actors/RemotePageChild.jsm @@ -15,21 +15,16 @@ var EXPORTED_SYMBOLS = ["RemotePageChild"]; */ const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "AsyncPrefs", - "resource://gre/modules/AsyncPrefs.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + AsyncPrefs: "resource://gre/modules/AsyncPrefs.sys.mjs", + RemotePageAccessManager: + "resource://gre/modules/RemotePageAccessManager.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "RemotePageAccessManager", - "resource://gre/modules/RemotePageAccessManager.jsm" -); class RemotePageChild extends JSWindowActorChild { actorCreated() { diff --git a/toolkit/actors/SelectChild.jsm b/toolkit/actors/SelectChild.jsm index 81e75639faa..9e43f4b8171 100644 --- a/toolkit/actors/SelectChild.jsm +++ b/toolkit/actors/SelectChild.jsm @@ -12,11 +12,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "LayoutUtils", - "resource://gre/modules/LayoutUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + LayoutUtils: "resource://gre/modules/LayoutUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "DeferredTask", diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js index a7ca0fdccbc..5ec4e9caf7c 100644 --- a/toolkit/components/aboutmemory/content/aboutMemory.js +++ b/toolkit/components/aboutmemory/content/aboutMemory.js @@ -38,11 +38,9 @@ ChromeUtils.defineModuleGetter( "Downloads", "resource://gre/modules/Downloads.jsm" ); -ChromeUtils.defineModuleGetter( - this, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); XPCOMUtils.defineLazyGetter(this, "nsBinaryStream", () => CC( diff --git a/toolkit/components/aboutthirdparty/content/aboutThirdParty.js b/toolkit/components/aboutthirdparty/content/aboutThirdParty.js index f7bdc52c545..d47b84b5045 100644 --- a/toolkit/components/aboutthirdparty/content/aboutThirdParty.js +++ b/toolkit/components/aboutthirdparty/content/aboutThirdParty.js @@ -7,8 +7,8 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { ProcessType } = ChromeUtils.import( - "resource://gre/modules/ProcessType.jsm" +const { ProcessType } = ChromeUtils.importESModule( + "resource://gre/modules/ProcessType.sys.mjs" ); let AboutThirdParty = null; diff --git a/toolkit/components/antitracking/TrackingDBService.jsm b/toolkit/components/antitracking/TrackingDBService.jsm index 68915fd2e16..5220fb6f23e 100644 --- a/toolkit/components/antitracking/TrackingDBService.jsm +++ b/toolkit/components/antitracking/TrackingDBService.jsm @@ -7,7 +7,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm"); +const { Sqlite } = ChromeUtils.importESModule( + "resource://gre/modules/Sqlite.sys.mjs" +); const SCHEMA_VERSION = 1; const TRACKERS_BLOCKED_COUNT = "contentblocking.trackers_blocked_count"; diff --git a/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js b/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js index 4c686e4a07f..eed2a566cec 100644 --- a/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js +++ b/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js @@ -6,7 +6,9 @@ "use strict"; -const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm"); +const { Sqlite } = ChromeUtils.importESModule( + "resource://gre/modules/Sqlite.sys.mjs" +); XPCOMUtils.defineLazyServiceGetter( this, "TrackingDBService", diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.jsm b/toolkit/components/asyncshutdown/AsyncShutdown.jsm index c3dce8b1948..bffedf967a3 100644 --- a/toolkit/components/asyncshutdown/AsyncShutdown.jsm +++ b/toolkit/components/asyncshutdown/AsyncShutdown.jsm @@ -44,11 +44,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); XPCOMUtils.defineLazyServiceGetter( lazy, "gDebug", diff --git a/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js b/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js index 5f8b9a9d2f9..d618a6a53e0 100644 --- a/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js +++ b/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js @@ -2,8 +2,8 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); add_task(async function test_no_condition() { diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm index 25839c020e5..875f5be2048 100644 --- a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm +++ b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm @@ -71,11 +71,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.jsm", ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm", - IndexedDB: "resource://gre/modules/IndexedDB.jsm", RemoteSettings: "resource://services-settings/remote-settings.js", RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm", ToastNotification: "resource://activity-stream/lib/ToastNotification.jsm", diff --git a/toolkit/components/backgroundtasks/tests/browser/browser_xpcom_graph_wait.js b/toolkit/components/backgroundtasks/tests/browser/browser_xpcom_graph_wait.js index 3fb14ce49b4..183930c8295 100644 --- a/toolkit/components/backgroundtasks/tests/browser/browser_xpcom_graph_wait.js +++ b/toolkit/components/backgroundtasks/tests/browser/browser_xpcom_graph_wait.js @@ -35,7 +35,7 @@ const backgroundtaskPhases = { "resource://gre/modules/Console.jsm", "resource://gre/modules/EnterprisePolicies.sys.mjs", "resource://gre/modules/EnterprisePoliciesParent.sys.mjs", - "resource://gre/modules/PromiseUtils.jsm", + "resource://gre/modules/PromiseUtils.sys.mjs", "resource://gre/modules/XPCOMUtils.sys.mjs", "resource://gre/modules/nsAsyncShutdown.jsm", ], diff --git a/toolkit/components/contentprefs/ContentPrefService2.jsm b/toolkit/components/contentprefs/ContentPrefService2.jsm index 611663b6065..b3a5ac64ed6 100644 --- a/toolkit/components/contentprefs/ContentPrefService2.jsm +++ b/toolkit/components/contentprefs/ContentPrefService2.jsm @@ -12,11 +12,9 @@ const { ContentPrefStore } = ChromeUtils.import( "resource://gre/modules/ContentPrefStore.jsm" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "Sqlite", - "resource://gre/modules/Sqlite.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + Sqlite: "resource://gre/modules/Sqlite.sys.mjs", +}); const CACHE_MAX_GROUP_ENTRIES = 100; diff --git a/toolkit/components/contextualidentity/ContextualIdentityService.jsm b/toolkit/components/contextualidentity/ContextualIdentityService.jsm index 1387309de8e..b2f39c82633 100644 --- a/toolkit/components/contextualidentity/ContextualIdentityService.jsm +++ b/toolkit/components/contextualidentity/ContextualIdentityService.jsm @@ -40,11 +40,9 @@ ChromeUtils.defineModuleGetter( "DeferredTask", "resource://gre/modules/DeferredTask.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "NetUtil", diff --git a/toolkit/components/cookiebanners/CookieBannerListService.jsm b/toolkit/components/cookiebanners/CookieBannerListService.jsm index e2a11e0e499..3ff03943e21 100644 --- a/toolkit/components/cookiebanners/CookieBannerListService.jsm +++ b/toolkit/components/cookiebanners/CookieBannerListService.jsm @@ -11,9 +11,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); +ChromeUtils.defineESModuleGetters(lazy, { + JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { RemoteSettings: "resource://services-settings/remote-settings.js", - JsonSchema: "resource://gre/modules/JsonSchema.jsm", }); XPCOMUtils.defineLazyPreferenceGetter( diff --git a/toolkit/components/crashes/CrashManager.in.jsm b/toolkit/components/crashes/CrashManager.in.jsm index c3eceda4d23..6bfef17b7f9 100644 --- a/toolkit/components/crashes/CrashManager.in.jsm +++ b/toolkit/components/crashes/CrashManager.in.jsm @@ -4,8 +4,8 @@ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); const { XPCOMUtils } = ChromeUtils.importESModule( @@ -14,8 +14,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - Log: "resource://gre/modules/Log.jsm", TelemetryController: "resource://gre/modules/TelemetryController.jsm", }); diff --git a/toolkit/components/crashes/CrashManagerTest.jsm b/toolkit/components/crashes/CrashManagerTest.jsm index 19d795b41c4..2225ecc7144 100644 --- a/toolkit/components/crashes/CrashManagerTest.jsm +++ b/toolkit/components/crashes/CrashManagerTest.jsm @@ -25,8 +25,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - Log: "resource://gre/modules/Log.jsm", OS: "resource://gre/modules/osfile.jsm", setTimeout: "resource://gre/modules/Timer.jsm", }); diff --git a/toolkit/components/crashmonitor/CrashMonitor.jsm b/toolkit/components/crashmonitor/CrashMonitor.jsm index b01e7e21ac6..d22d86b887b 100644 --- a/toolkit/components/crashmonitor/CrashMonitor.jsm +++ b/toolkit/components/crashmonitor/CrashMonitor.jsm @@ -36,8 +36,8 @@ var EXPORTED_SYMBOLS = ["CrashMonitor"]; const { PrivateBrowsingUtils } = ChromeUtils.import( "resource://gre/modules/PrivateBrowsingUtils.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const SESSIONSTORE_WINDOWS_RESTORED_TOPIC = "sessionstore-windows-restored"; diff --git a/toolkit/components/downloads/DownloadCore.jsm b/toolkit/components/downloads/DownloadCore.jsm index fd23d956c6d..0338dcbb893 100644 --- a/toolkit/components/downloads/DownloadCore.jsm +++ b/toolkit/components/downloads/DownloadCore.jsm @@ -19,8 +19,8 @@ var EXPORTED_SYMBOLS = [ "DownloadLegacySaver", ]; -const { Integration } = ChromeUtils.import( - "resource://gre/modules/Integration.jsm" +const { Integration } = ChromeUtils.importESModule( + "resource://gre/modules/Integration.sys.mjs" ); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" @@ -31,14 +31,17 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { DownloadHistory: "resource://gre/modules/DownloadHistory.jsm", DownloadPaths: "resource://gre/modules/DownloadPaths.jsm", E10SUtils: "resource://gre/modules/E10SUtils.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", NetUtil: "resource://gre/modules/NetUtil.jsm", OS: "resource://gre/modules/osfile.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/toolkit/components/downloads/DownloadHistory.jsm b/toolkit/components/downloads/DownloadHistory.jsm index 23bce9e9864..f4aec11b25a 100644 --- a/toolkit/components/downloads/DownloadHistory.jsm +++ b/toolkit/components/downloads/DownloadHistory.jsm @@ -25,12 +25,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { Downloads: "resource://gre/modules/Downloads.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", OS: "resource://gre/modules/osfile.jsm", }); diff --git a/toolkit/components/downloads/DownloadIntegration.jsm b/toolkit/components/downloads/DownloadIntegration.jsm index 8ff07237c62..8ab29d77ab7 100644 --- a/toolkit/components/downloads/DownloadIntegration.jsm +++ b/toolkit/components/downloads/DownloadIntegration.jsm @@ -17,8 +17,8 @@ const { AppConstants } = ChromeUtils.import( const { Downloads } = ChromeUtils.import( "resource://gre/modules/Downloads.jsm" ); -const { Integration } = ChromeUtils.import( - "resource://gre/modules/Integration.jsm" +const { Integration } = ChromeUtils.importESModule( + "resource://gre/modules/Integration.sys.mjs" ); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" @@ -46,11 +46,9 @@ ChromeUtils.defineModuleGetter( "DownloadUIHelper", "resource://gre/modules/DownloadUIHelper.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "NetUtil", diff --git a/toolkit/components/downloads/Downloads.jsm b/toolkit/components/downloads/Downloads.jsm index 21bc0e32813..ab1b0d9cdb0 100644 --- a/toolkit/components/downloads/Downloads.jsm +++ b/toolkit/components/downloads/Downloads.jsm @@ -10,8 +10,8 @@ var EXPORTED_SYMBOLS = ["Downloads"]; -const { Integration } = ChromeUtils.import( - "resource://gre/modules/Integration.jsm" +const { Integration } = ChromeUtils.importESModule( + "resource://gre/modules/Integration.sys.mjs" ); const { Download, DownloadError } = ChromeUtils.import( "resource://gre/modules/DownloadCore.jsm" diff --git a/toolkit/components/downloads/test/unit/common_test_Download.js b/toolkit/components/downloads/test/unit/common_test_Download.js index 8f0017b38e2..0ac7cbca197 100644 --- a/toolkit/components/downloads/test/unit/common_test_Download.js +++ b/toolkit/components/downloads/test/unit/common_test_Download.js @@ -18,11 +18,9 @@ const kDeleteTempFileOnExit = "browser.helperApps.deleteTempFileOnExit"; -ChromeUtils.defineModuleGetter( - this, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); /** * Creates and starts a new download, using either DownloadCopySaver or diff --git a/toolkit/components/downloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js index 640334b69ff..906fde8a8e8 100644 --- a/toolkit/components/downloads/test/unit/head.js +++ b/toolkit/components/downloads/test/unit/head.js @@ -9,8 +9,8 @@ "use strict"; -var { Integration } = ChromeUtils.import( - "resource://gre/modules/Integration.jsm" +var { Integration } = ChromeUtils.importESModule( + "resource://gre/modules/Integration.sys.mjs" ); var { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" @@ -20,7 +20,9 @@ const { AppConstants } = ChromeUtils.import( ); ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { @@ -28,12 +30,10 @@ XPCOMUtils.defineLazyModuleGetters(this, { Downloads: "resource://gre/modules/Downloads.jsm", E10SUtils: "resource://gre/modules/E10SUtils.jsm", FileTestUtils: "resource://testing-common/FileTestUtils.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", HttpServer: "resource://testing-common/httpd.js", MockRegistrar: "resource://testing-common/MockRegistrar.jsm", NetUtil: "resource://gre/modules/NetUtil.jsm", OS: "resource://gre/modules/osfile.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm", TestUtils: "resource://testing-common/TestUtils.jsm", }); diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs index ed2e89ab3ef..0a7ba257a4d 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs +++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs @@ -266,8 +266,8 @@ EnterprisePoliciesManager.prototype = { this._callbacks[timing] = []; } - let { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" + let { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); // Simulate the startup process. This step-by-step is a bit ugly but it // tries to emulate the same behavior as of a normal startup. diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm index ce8e49973e6..0abaead8ca0 100644 --- a/toolkit/components/extensions/Extension.jsm +++ b/toolkit/components/extensions/Extension.jsm @@ -49,6 +49,10 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AddonManager: "resource://gre/modules/AddonManager.jsm", AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm", @@ -64,7 +68,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { ExtensionStorageIDB: "resource://gre/modules/ExtensionStorageIDB.jsm", ExtensionTelemetry: "resource://gre/modules/ExtensionTelemetry.jsm", LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm", - Log: "resource://gre/modules/Log.jsm", NetUtil: "resource://gre/modules/NetUtil.jsm", PluralForm: "resource://gre/modules/PluralForm.jsm", Schemas: "resource://gre/modules/Schemas.jsm", diff --git a/toolkit/components/extensions/ExtensionChild.jsm b/toolkit/components/extensions/ExtensionChild.jsm index 80dc2c1caf5..2d67f1d11aa 100644 --- a/toolkit/components/extensions/ExtensionChild.jsm +++ b/toolkit/components/extensions/ExtensionChild.jsm @@ -32,13 +32,16 @@ XPCOMUtils.defineLazyServiceGetter( "nsIFinalizationWitnessService" ); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ExtensionContent: "resource://gre/modules/ExtensionContent.jsm", ExtensionPageChild: "resource://gre/modules/ExtensionPageChild.jsm", ExtensionProcessScript: "resource://gre/modules/ExtensionProcessScript.jsm", NativeApp: "resource://gre/modules/NativeMessaging.jsm", PerformanceCounters: "resource://gre/modules/PerformanceCounters.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", }); // We're using the pref to avoid loading PerformanceCounters.jsm for nothing. diff --git a/toolkit/components/extensions/ExtensionPermissions.jsm b/toolkit/components/extensions/ExtensionPermissions.jsm index ebc3f2237a8..47f1f95ad50 100644 --- a/toolkit/components/extensions/ExtensionPermissions.jsm +++ b/toolkit/components/extensions/ExtensionPermissions.jsm @@ -14,9 +14,13 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ExtensionParent: "resource://gre/modules/ExtensionParent.jsm", - JSONFile: "resource://gre/modules/JSONFile.jsm", }); XPCOMUtils.defineLazyGetter( @@ -31,12 +35,6 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/kvstore.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); - XPCOMUtils.defineLazyGetter( lazy, "Management", diff --git a/toolkit/components/extensions/ExtensionScriptingStore.jsm b/toolkit/components/extensions/ExtensionScriptingStore.jsm index cf0c71bc3e1..ff45991adf0 100644 --- a/toolkit/components/extensions/ExtensionScriptingStore.jsm +++ b/toolkit/components/extensions/ExtensionScriptingStore.jsm @@ -21,8 +21,11 @@ const { StartupCache } = ExtensionParent; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - FileUtils: "resource://gre/modules/FileUtils.jsm", KeyValueService: "resource://gre/modules/kvstore.jsm", }); diff --git a/toolkit/components/extensions/ExtensionSettingsStore.jsm b/toolkit/components/extensions/ExtensionSettingsStore.jsm index ecc76cec8ff..8c397bbb637 100644 --- a/toolkit/components/extensions/ExtensionSettingsStore.jsm +++ b/toolkit/components/extensions/ExtensionSettingsStore.jsm @@ -53,11 +53,9 @@ ChromeUtils.defineModuleGetter( "AddonManager", "resource://gre/modules/AddonManager.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "JSONFile", - "resource://gre/modules/JSONFile.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", +}); // Defined for readability of precedence and selection code. keyInfo.selected will be // one of these defines, or the id of an extension if an extension has been explicitly diff --git a/toolkit/components/extensions/ExtensionShortcuts.jsm b/toolkit/components/extensions/ExtensionShortcuts.jsm index 7413228a2f1..4bde3054df6 100644 --- a/toolkit/components/extensions/ExtensionShortcuts.jsm +++ b/toolkit/components/extensions/ExtensionShortcuts.jsm @@ -12,12 +12,13 @@ const { ExtensionCommon } = ChromeUtils.import( const { ExtensionUtils } = ChromeUtils.import( "resource://gre/modules/ExtensionUtils.jsm" ); -const { ShortcutUtils } = ChromeUtils.import( - "resource://gre/modules/ShortcutUtils.jsm" -); const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", +}); + ChromeUtils.defineModuleGetter( lazy, "ExtensionParent", @@ -504,7 +505,7 @@ class ExtensionShortcuts { // The modifiers are the remaining elements. keyElement.setAttribute( "modifiers", - ShortcutUtils.getModifiersAttribute(parts) + lazy.ShortcutUtils.getModifiersAttribute(parts) ); // A keyElement with key "NumpadX" is created above and isn't from the @@ -514,7 +515,7 @@ class ExtensionShortcuts { keyElement.setAttribute("id", id); } - let [attribute, value] = ShortcutUtils.getKeyAttribute(chromeKey); + let [attribute, value] = lazy.ShortcutUtils.getKeyAttribute(chromeKey); keyElement.setAttribute(attribute, value); if (attribute == "keycode") { keyElement.setAttribute("event", "keydown"); diff --git a/toolkit/components/extensions/ExtensionStorage.jsm b/toolkit/components/extensions/ExtensionStorage.jsm index e48bd30832d..0c45119cc4c 100644 --- a/toolkit/components/extensions/ExtensionStorage.jsm +++ b/toolkit/components/extensions/ExtensionStorage.jsm @@ -18,11 +18,9 @@ ChromeUtils.defineModuleGetter( "ExtensionUtils", "resource://gre/modules/ExtensionUtils.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "JSONFile", - "resource://gre/modules/JSONFile.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", +}); ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm"); function isStructuredCloneHolder(value) { diff --git a/toolkit/components/extensions/ExtensionStorageIDB.jsm b/toolkit/components/extensions/ExtensionStorageIDB.jsm index edd72d07d6f..3f5175e0aaf 100644 --- a/toolkit/components/extensions/ExtensionStorageIDB.jsm +++ b/toolkit/components/extensions/ExtensionStorageIDB.jsm @@ -10,8 +10,8 @@ let ExtensionStorageIDB; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { IndexedDB } = ChromeUtils.import( - "resource://gre/modules/IndexedDB.jsm" +const { IndexedDB } = ChromeUtils.importESModule( + "resource://gre/modules/IndexedDB.sys.mjs" ); const lazy = {}; diff --git a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm index d0d80cb241d..e2ee27d2457 100644 --- a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm +++ b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm @@ -35,7 +35,9 @@ const FXA_OAUTH_OPTIONS = { // Default is 5sec, which seems a bit aggressive on the open internet const KINTO_REQUEST_TIMEOUT = 30000; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/extensions/ExtensionTestCommon.jsm b/toolkit/components/extensions/ExtensionTestCommon.jsm index 7937661fdcd..47b7f45b7b5 100644 --- a/toolkit/components/extensions/ExtensionTestCommon.jsm +++ b/toolkit/components/extensions/ExtensionTestCommon.jsm @@ -53,11 +53,9 @@ ChromeUtils.defineModuleGetter( "ExtensionPermissions", "resource://gre/modules/ExtensionPermissions.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm"); XPCOMUtils.defineLazyGetter( diff --git a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm index 35e7c6e09b7..d7accc897a3 100644 --- a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm +++ b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm @@ -31,11 +31,9 @@ ChromeUtils.defineModuleGetter( "ExtensionTestCommon", "resource://testing-common/ExtensionTestCommon.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "Management", diff --git a/toolkit/components/extensions/FindContent.jsm b/toolkit/components/extensions/FindContent.jsm index 811e70f9ac1..4de2a9f1f54 100644 --- a/toolkit/components/extensions/FindContent.jsm +++ b/toolkit/components/extensions/FindContent.jsm @@ -11,22 +11,15 @@ const lazy = {}; /* exported FindContent */ -ChromeUtils.defineModuleGetter( - lazy, - "FinderIterator", - "resource://gre/modules/FinderIterator.jsm" -); - -ChromeUtils.defineModuleGetter( - lazy, - "FinderHighlighter", - "resource://gre/modules/FinderHighlighter.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + Finder: "resource://gre/modules/Finder.sys.mjs", + FinderHighlighter: "resource://gre/modules/FinderHighlighter.sys.mjs", + FinderIterator: "resource://gre/modules/FinderIterator.sys.mjs", +}); class FindContent { constructor(docShell) { - const { Finder } = ChromeUtils.import("resource://gre/modules/Finder.jsm"); - this.finder = new Finder(docShell); + this.finder = new lazy.Finder(docShell); } get iterator() { diff --git a/toolkit/components/extensions/NativeManifests.jsm b/toolkit/components/extensions/NativeManifests.jsm index 66521d6d7df..8a5df926cd2 100644 --- a/toolkit/components/extensions/NativeManifests.jsm +++ b/toolkit/components/extensions/NativeManifests.jsm @@ -16,10 +16,13 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { OS: "resource://gre/modules/osfile.jsm", Schemas: "resource://gre/modules/Schemas.jsm", - WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm", }); const DASHED = AppConstants.platform === "linux"; diff --git a/toolkit/components/extensions/Schemas.jsm b/toolkit/components/extensions/Schemas.jsm index 780a6b0202b..0442a2f5168 100644 --- a/toolkit/components/extensions/Schemas.jsm +++ b/toolkit/components/extensions/Schemas.jsm @@ -29,11 +29,9 @@ ChromeUtils.defineModuleGetter( "NetUtil", "resource://gre/modules/NetUtil.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "ShortcutUtils", - "resource://gre/modules/ShortcutUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", +}); XPCOMUtils.defineLazyServiceGetter( lazy, "contentPolicyService", diff --git a/toolkit/components/extensions/ext-browser-content.js b/toolkit/components/extensions/ext-browser-content.js index d56efe79dce..6f43856aa63 100644 --- a/toolkit/components/extensions/ext-browser-content.js +++ b/toolkit/components/extensions/ext-browser-content.js @@ -255,21 +255,17 @@ const BrowserListener = { this.oldBackground = background; // Adjust the size of the browser based on its content's preferred size. - let { contentViewer } = docShell; - let ratio = content.devicePixelRatio; - let w = {}, h = {}; - contentViewer.getContentSizeConstrained( - this.maxWidth * ratio, - this.maxHeight * ratio, + docShell.contentViewer.getContentSize( + this.maxWidth, + this.maxHeight, w, h ); - let width = Math.ceil((w.value * zoom) / ratio); - let height = Math.ceil((h.value * zoom) / ratio); - + let width = Math.ceil(w.value * zoom); + let height = Math.ceil(h.value * zoom); result = { width, height, detail }; } diff --git a/toolkit/components/extensions/parent/ext-downloads.js b/toolkit/components/extensions/parent/ext-downloads.js index f755efd22e9..e910a0d9181 100644 --- a/toolkit/components/extensions/parent/ext-downloads.js +++ b/toolkit/components/extensions/parent/ext-downloads.js @@ -15,11 +15,9 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/DownloadPaths.jsm" ); ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); -ChromeUtils.defineModuleGetter( - this, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( this, "DownloadLastDir", diff --git a/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm b/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm index 534df82f1e8..b695706dee1 100644 --- a/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm +++ b/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm @@ -10,9 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", }); const EXPORTED_SYMBOLS = ["StorageSyncService"]; diff --git a/toolkit/components/extensions/test/xpcshell/head.js b/toolkit/components/extensions/test/xpcshell/head.js index 55013bd2a2a..c26d751ec2b 100644 --- a/toolkit/components/extensions/test/xpcshell/head.js +++ b/toolkit/components/extensions/test/xpcshell/head.js @@ -24,14 +24,16 @@ var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import( "resource://testing-common/AddonTestUtils.jsm" ); -// eslint-disable-next-line no-unused-vars +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { ContentTask: "resource://testing-common/ContentTask.jsm", Extension: "resource://gre/modules/Extension.jsm", ExtensionData: "resource://gre/modules/Extension.jsm", ExtensionParent: "resource://gre/modules/ExtensionParent.jsm", ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", MessageChannel: "resource://testing-common/MessageChannel.jsm", NetUtil: "resource://gre/modules/NetUtil.jsm", PromiseTestUtils: "resource://testing-common/PromiseTestUtils.jsm", diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js b/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js index 20ffb71d18e..07b688b4069 100644 --- a/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js +++ b/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js @@ -5,8 +5,8 @@ const { MessageManagerProxy } = ChromeUtils.import( "resource://gre/modules/MessageManagerProxy.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); class TestMessageManagerProxy extends MessageManagerProxy { diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js b/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js index 19e046e12d2..f8dbcb7a74c 100644 --- a/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js +++ b/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js @@ -17,8 +17,8 @@ ChromeUtils.defineModuleGetter( "Preferences", "resource://gre/modules/Preferences.jsm" ); -var { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +var { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js b/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js index d5ee8461ae9..75081a64f9e 100644 --- a/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js +++ b/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js @@ -1,7 +1,7 @@ "use strict"; -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); diff --git a/toolkit/components/extensions/test/xpcshell/test_native_manifests.js b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js index 7cd00359097..5de4dbb2b89 100644 --- a/toolkit/components/extensions/test/xpcshell/test_native_manifests.js +++ b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js @@ -6,8 +6,8 @@ const { AsyncShutdown } = ChromeUtils.import( const { NativeManifests } = ChromeUtils.import( "resource://gre/modules/NativeManifests.jsm" ); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const { Schemas } = ChromeUtils.import("resource://gre/modules/Schemas.jsm"); const { Subprocess } = ChromeUtils.import( diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js b/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js index 8ebc12561f7..e584f142fa0 100644 --- a/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js +++ b/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js @@ -20,8 +20,8 @@ XPCOMUtils.defineLazyGetter(this, "directFailoverDisabled", () => { ); }); -const { ServiceRequest } = ChromeUtils.import( - "resource://gre/modules/ServiceRequest.jsm" +const { ServiceRequest } = ChromeUtils.importESModule( + "resource://gre/modules/ServiceRequest.sys.mjs" ); // Prevent the request from reaching out to the network. diff --git a/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js b/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js index 7c083c78052..2dda1e5e68f 100644 --- a/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js +++ b/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js @@ -3,8 +3,8 @@ var { WebRequest } = ChromeUtils.import( "resource://gre/modules/WebRequest.jsm" ); -var { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +var { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); var { ExtensionParent } = ChromeUtils.import( "resource://gre/modules/ExtensionParent.jsm" diff --git a/toolkit/components/formautofill/CreditCardRuleset.jsm b/toolkit/components/formautofill/CreditCardRuleset.jsm index 118b5d40b31..2eca0a1cbd5 100644 --- a/toolkit/components/formautofill/CreditCardRuleset.jsm +++ b/toolkit/components/formautofill/CreditCardRuleset.jsm @@ -30,20 +30,18 @@ const { fathom } = ChromeUtils.import( "resource://gre/modules/third_party/fathom/fathom.jsm" ); const { element: clickedElement, out, rule, ruleset, score, type } = fathom; -const { CreditCard } = ChromeUtils.import( - "resource://gre/modules/CreditCard.jsm" +const { CreditCard } = ChromeUtils.importESModule( + "resource://gre/modules/CreditCard.sys.mjs" ); -const { NETWORK_NAMES } = ChromeUtils.import( - "resource://gre/modules/CreditCard.jsm" +const { NETWORK_NAMES } = ChromeUtils.importESModule( + "resource://gre/modules/CreditCard.sys.mjs" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "FormLikeFactory", - "resource://gre/modules/FormLikeFactory.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "FormAutofillUtils", diff --git a/toolkit/components/formautofill/FormAutofillContent.jsm b/toolkit/components/formautofill/FormAutofillContent.jsm index 23e1eecfc07..ced5bf9a4ea 100644 --- a/toolkit/components/formautofill/FormAutofillContent.jsm +++ b/toolkit/components/formautofill/FormAutofillContent.jsm @@ -23,6 +23,10 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AddressResult: "resource://autofill/ProfileAutoCompleteResult.jsm", ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", @@ -31,7 +35,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { FormAutofill: "resource://autofill/FormAutofill.jsm", FormAutofillHandler: "resource://autofill/FormAutofillHandler.jsm", FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm", - FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm", InsecurePasswordUtils: "resource://gre/modules/InsecurePasswordUtils.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", }); diff --git a/toolkit/components/formautofill/FormAutofillHandler.jsm b/toolkit/components/formautofill/FormAutofillHandler.jsm index 6080055c233..f47d2c5777d 100644 --- a/toolkit/components/formautofill/FormAutofillHandler.jsm +++ b/toolkit/components/formautofill/FormAutofillHandler.jsm @@ -26,11 +26,14 @@ const { FormAutofillUtils } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", + FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - CreditCard: "resource://gre/modules/CreditCard.jsm", CreditCardTelemetry: "resource://autofill/FormAutofillTelemetryUtils.jsm", FormAutofillHeuristics: "resource://autofill/FormAutofillHeuristics.jsm", - FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm", }); const formFillController = Cc[ @@ -1018,8 +1021,8 @@ class FormAutofillCreditCardSection extends FormAutofillSection { isValidSection() { let ccNumberDetail = null; - let hasExpiryDate = false; - let hasCCName = false; + let ccNameDetail = null; + let ccExpiryDetail = null; for (let detail of this.fieldDetails) { switch (detail.fieldName) { @@ -1030,33 +1033,45 @@ class FormAutofillCreditCardSection extends FormAutofillSection { case "cc-given-name": case "cc-additional-name": case "cc-family-name": - hasCCName = true; + ccNameDetail = detail; break; case "cc-exp": case "cc-exp-month": case "cc-exp-year": - hasExpiryDate = true; + ccExpiryDetail = detail; break; } } + // Always trust autocomplete attribute. A section is considered a valid + // cc section as long as a field has autocomplete=cc-number, cc-name or cc-exp* + if ( + ccNumberDetail?._reason == "autocomplete" || + ccNameDetail?._reason == "autocomplete" || + ccExpiryDetail?._reason == "autocomplete" + ) { + return true; + } + if (ccNumberDetail) { - if ( - ccNumberDetail._reason == "autocomplete" || - hasExpiryDate || - hasCCName - ) { + // For fields that are identified as a cc-number field by our heuristics, + // we consider the associated section a valid section only if one of + // the following conditions meet: + // 1. Our heuristics also identify a cc-name field or a cc-exp* field in this + // section + // 2. Fathom is pretty confident this is a cc-number field (determined by + // check whether confidence is over a certain threshold) AND the field + // is the only non-hidden input field of its + // form (or ownerDocument). + if (ccNameDetail || ccExpiryDetail) { return true; } - // There are cases where sites use a separate form/iframe for a cc-number field - // (either cc-number in one form, other cc-* in another form, OR each cc-* is in its - // own form). For thoses, we don't have cc-name or cc-exp to help us determine - // whether this is a cc form. To support those use cases, we add two - // extra rules to identify valid credit card section: - // 1. Use a higher confidence threshold. - // 2. Check whether the is the only non-hidden input field of its - // form (or ownerDocument). + // Condition #2 is mainly used to address cases when a form (or iframe) only + // contains a cc-number field. Since now the fathom algorithm is not mature + // enough to use it as the only source of truth when determining a cc-number + // field. We increase the confidence threshold for this case and add a + // additional constraint to reduce the false-positive rate. if ( ccNumberDetail.confidence >= FormAutofillUtils.ccHeuristicsNumberOnlyThreshold @@ -1069,8 +1084,8 @@ class FormAutofillCreditCardSection extends FormAutofillSection { } } } else if ( - hasCCName && - hasExpiryDate && + ccNameDetail && + ccExpiryDetail && FormAutofillUtils.ccHeuristicsNameExpirySection ) { return true; diff --git a/toolkit/components/formautofill/FormAutofillHeuristics.jsm b/toolkit/components/formautofill/FormAutofillHeuristics.jsm index a195489142b..c7cbc980b98 100644 --- a/toolkit/components/formautofill/FormAutofillHeuristics.jsm +++ b/toolkit/components/formautofill/FormAutofillHeuristics.jsm @@ -20,8 +20,11 @@ const { FormAutofill } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - CreditCard: "resource://gre/modules/CreditCard.jsm", creditCardRulesets: "resource://autofill/CreditCardRuleset.jsm", FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm", LabelUtils: "resource://autofill/FormAutofillUtils.jsm", diff --git a/toolkit/components/formautofill/FormAutofillParent.jsm b/toolkit/components/formautofill/FormAutofillParent.jsm index 514217e6dea..16e9fdf02e0 100644 --- a/toolkit/components/formautofill/FormAutofillParent.jsm +++ b/toolkit/components/formautofill/FormAutofillParent.jsm @@ -43,12 +43,15 @@ const { FormAutofillUtils } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", + OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", - CreditCard: "resource://gre/modules/CreditCard.jsm", FormAutofillPreferences: "resource://autofill/FormAutofillPreferences.jsm", FormAutofillPrompter: "resource://autofill/FormAutofillPrompter.jsm", - OSKeyStore: "resource://gre/modules/OSKeyStore.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "log", () => diff --git a/toolkit/components/formautofill/FormAutofillPreferences.jsm b/toolkit/components/formautofill/FormAutofillPreferences.jsm index a2051d3f6da..b8d03e16c9c 100644 --- a/toolkit/components/formautofill/FormAutofillPreferences.jsm +++ b/toolkit/components/formautofill/FormAutofillPreferences.jsm @@ -28,11 +28,9 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "OSKeyStore", - "resource://gre/modules/OSKeyStore.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs", +}); const { ENABLED_AUTOFILL_ADDRESSES_PREF, diff --git a/toolkit/components/formautofill/FormAutofillStorageBase.jsm b/toolkit/components/formautofill/FormAutofillStorageBase.jsm index 6b0e6a3c10e..31db8b49997 100644 --- a/toolkit/components/formautofill/FormAutofillStorageBase.jsm +++ b/toolkit/components/formautofill/FormAutofillStorageBase.jsm @@ -139,11 +139,14 @@ const { FormAutofill } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", + OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - CreditCard: "resource://gre/modules/CreditCard.jsm", FormAutofillNameUtils: "resource://autofill/FormAutofillNameUtils.jsm", FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm", - OSKeyStore: "resource://gre/modules/OSKeyStore.jsm", PhoneNumber: "resource://autofill/phonenumberutils/PhoneNumber.jsm", }); diff --git a/toolkit/components/formautofill/FormAutofillSync.jsm b/toolkit/components/formautofill/FormAutofillSync.jsm index bc8044f1c6a..6fd97c4afad 100644 --- a/toolkit/components/formautofill/FormAutofillSync.jsm +++ b/toolkit/components/formautofill/FormAutofillSync.jsm @@ -28,9 +28,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { formAutofillStorage: "resource://autofill/FormAutofillStorage.jsm", - Log: "resource://gre/modules/Log.jsm", }); // A helper to sanitize address and creditcard records suitable for logging. diff --git a/toolkit/components/formautofill/FormAutofillUtils.jsm b/toolkit/components/formautofill/FormAutofillUtils.jsm index 281412805ac..2a77b2092d9 100644 --- a/toolkit/components/formautofill/FormAutofillUtils.jsm +++ b/toolkit/components/formautofill/FormAutofillUtils.jsm @@ -70,9 +70,10 @@ const { FormAutofill } = ChromeUtils.import( "resource://autofill/FormAutofill.jsm" ); const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - CreditCard: "resource://gre/modules/CreditCard.jsm", - OSKeyStore: "resource://gre/modules/OSKeyStore.jsm", + +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", + OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs", }); let AddressDataLoader = { diff --git a/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm b/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm index 322a4b61cd8..5656326d644 100644 --- a/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm +++ b/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm @@ -10,8 +10,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( ); const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - CreditCard: "resource://gre/modules/CreditCard.jsm", FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm", }); diff --git a/toolkit/components/formautofill/android/FormAutofillStorage.jsm b/toolkit/components/formautofill/android/FormAutofillStorage.jsm index 3be7f766875..311de0023c7 100644 --- a/toolkit/components/formautofill/android/FormAutofillStorage.jsm +++ b/toolkit/components/formautofill/android/FormAutofillStorage.jsm @@ -21,7 +21,9 @@ const { CreditCardsBase, AddressesBase, } = ChromeUtils.import("resource://autofill/FormAutofillStorageBase.jsm"); -const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm"); +const { JSONFile } = ChromeUtils.importESModule( + "resource://gre/modules/JSONFile.sys.mjs" +); const lazy = {}; diff --git a/toolkit/components/formautofill/default/FormAutofillPrompter.jsm b/toolkit/components/formautofill/default/FormAutofillPrompter.jsm index a9780ae39fe..c2b57f05620 100644 --- a/toolkit/components/formautofill/default/FormAutofillPrompter.jsm +++ b/toolkit/components/formautofill/default/FormAutofillPrompter.jsm @@ -26,8 +26,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - CreditCard: "resource://gre/modules/CreditCard.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", }); XPCOMUtils.defineLazyGetter(lazy, "log", () => diff --git a/toolkit/components/formautofill/default/FormAutofillStorage.jsm b/toolkit/components/formautofill/default/FormAutofillStorage.jsm index 98fe98822aa..120c3e609ed 100644 --- a/toolkit/components/formautofill/default/FormAutofillStorage.jsm +++ b/toolkit/components/formautofill/default/FormAutofillStorage.jsm @@ -28,11 +28,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", + OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - CreditCard: "resource://gre/modules/CreditCard.jsm", FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm", - JSONFile: "resource://gre/modules/JSONFile.jsm", - OSKeyStore: "resource://gre/modules/OSKeyStore.jsm", }); const PROFILE_JSON_FILE_NAME = "autofill-profiles.json"; diff --git a/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py b/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py index 780a9b2837d..66b3b8ef8cf 100644 --- a/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py +++ b/toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py @@ -101,22 +101,21 @@ def parse_with_options(input_files, options): DEPS_LEN = 16 -def main(output_fd, *args): - args = args[DEPS_LEN:] +def main(cpp_fd, *args): + def open_output(filename): + return FileAvoidWrite(os.path.join(os.path.dirname(cpp_fd.name), filename)) + + [js_h_path, rust_path] = args[-2:] + args = args[DEPS_LEN:-2] all_objs, options = parse(args) - rust.output_rust(all_objs, output_fd, options) + cpp.output_cpp(all_objs, cpp_fd, options) -def cpp_metrics(output_fd, *args): - args = args[DEPS_LEN:] - all_objs, options = parse(args) - cpp.output_cpp(all_objs, output_fd, options) + with open_output(js_h_path) as js_fd: + js.output_js(all_objs, js_fd, options) - -def js_metrics(output_fd, *args): - args = args[DEPS_LEN:] - all_objs, options = parse(args) - js.output_js(all_objs, output_fd, options) + with open_output(rust_path) as rust_fd: + rust.output_rust(all_objs, rust_fd, options) def gifft_map(output_fd, *args): diff --git a/toolkit/components/glean/moz.build b/toolkit/components/glean/moz.build index 72925939bea..ffdfe609989 100644 --- a/toolkit/components/glean/moz.build +++ b/toolkit/components/glean/moz.build @@ -130,48 +130,20 @@ deps = [ ] GeneratedFile( + "GleanMetrics.h", + "GleanJSMetricsLookup.h", "api/src/metrics.rs", script="build_scripts/glean_parser_ext/run_glean_parser.py", - flags=[CONFIG["MOZ_APP_VERSION"]], + flags=[CONFIG["MOZ_APP_VERSION"], "GleanJSMetricsLookup.h", "api/src/metrics.rs"], inputs=deps + metrics_yamls + tags_yamls, ) -GeneratedFile( - "GleanMetrics.h", - script="build_scripts/glean_parser_ext/run_glean_parser.py", - entry_point="cpp_metrics", - flags=[CONFIG["MOZ_APP_VERSION"]], - inputs=deps + metrics_yamls + tags_yamls, -) - -GeneratedFile( - "GleanJSMetricsLookup.h", - script="build_scripts/glean_parser_ext/run_glean_parser.py", - entry_point="js_metrics", - flags=[CONFIG["MOZ_APP_VERSION"]], - inputs=deps + metrics_yamls + tags_yamls, -) - -GeneratedFile( - "api/src/pings.rs", - script="build_scripts/glean_parser_ext/run_glean_parser.py", - flags=[CONFIG["MOZ_APP_VERSION"]], - inputs=deps + pings_yamls + tags_yamls, -) - GeneratedFile( "GleanPings.h", - script="build_scripts/glean_parser_ext/run_glean_parser.py", - entry_point="cpp_metrics", - flags=[CONFIG["MOZ_APP_VERSION"]], - inputs=deps + pings_yamls + tags_yamls, -) - -GeneratedFile( "GleanJSPingsLookup.h", + "api/src/pings.rs", script="build_scripts/glean_parser_ext/run_glean_parser.py", - entry_point="js_metrics", - flags=[CONFIG["MOZ_APP_VERSION"]], + flags=[CONFIG["MOZ_APP_VERSION"], "GleanJSPingsLookup.h", "api/src/pings.rs"], inputs=deps + pings_yamls + tags_yamls, ) diff --git a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js index 6a94cb732b6..0f94f671b83 100644 --- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js +++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js @@ -3,8 +3,8 @@ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const HOMEPAGE_PREF = "browser.startup.homepage"; diff --git a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js index 986409096c1..53e7b21718f 100644 --- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js +++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js @@ -7,8 +7,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); -const { JsonSchema } = ChromeUtils.import( - "resource://gre/modules/JsonSchema.jsm" +const { JsonSchema } = ChromeUtils.importESModule( + "resource://gre/modules/JsonSchema.sys.mjs" ); ChromeUtils.defineModuleGetter( diff --git a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js index e39d3528ea1..e2f038eda84 100644 --- a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js +++ b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js @@ -7,8 +7,8 @@ const { ASRouterTriggerListeners } = ChromeUtils.import( const { CFRMessageProvider } = ChromeUtils.import( "resource://activity-stream/lib/CFRMessageProvider.jsm" ); -const { JsonSchema } = ChromeUtils.import( - "resource://gre/modules/JsonSchema.jsm" +const { JsonSchema } = ChromeUtils.importESModule( + "resource://gre/modules/JsonSchema.sys.mjs" ); XPCOMUtils.defineLazyGetter(this, "fetchTriggerActionSchema", async () => { diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm index 57d5b090158..4bbf6789581 100644 --- a/toolkit/components/narrate/NarrateControls.jsm +++ b/toolkit/components/narrate/NarrateControls.jsm @@ -10,8 +10,8 @@ const { VoiceSelect } = ChromeUtils.import( const { Narrator } = ChromeUtils.import( "resource://gre/modules/narrate/Narrator.jsm" ); -const { AsyncPrefs } = ChromeUtils.import( - "resource://gre/modules/AsyncPrefs.jsm" +const { AsyncPrefs } = ChromeUtils.importESModule( + "resource://gre/modules/AsyncPrefs.sys.mjs" ); var EXPORTED_SYMBOLS = ["NarrateControls"]; diff --git a/toolkit/components/nimbus/lib/ExperimentManager.jsm b/toolkit/components/nimbus/lib/ExperimentManager.jsm index 88fa5e6eaa6..88cc456690a 100644 --- a/toolkit/components/nimbus/lib/ExperimentManager.jsm +++ b/toolkit/components/nimbus/lib/ExperimentManager.jsm @@ -12,6 +12,10 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm", ExperimentStore: "resource://nimbus/lib/ExperimentStore.jsm", @@ -20,7 +24,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { Sampling: "resource://gre/modules/components-utils/Sampling.jsm", TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm", TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm", - FirstStartup: "resource://gre/modules/FirstStartup.jsm", PrefUtils: "resource://normandy/lib/PrefUtils.jsm", }); diff --git a/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm b/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm index 154f917e8f6..293e2a297b0 100644 --- a/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm +++ b/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm @@ -15,6 +15,10 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm", TargetingContext: "resource://messaging-system/targeting/Targeting.jsm", @@ -22,7 +26,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { RemoteSettings: "resource://services-settings/remote-settings.js", CleanupManager: "resource://normandy/lib/CleanupManager.jsm", NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm", - JsonSchema: "resource://gre/modules/JsonSchema.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "log", () => { diff --git a/toolkit/components/nimbus/lib/SharedDataMap.jsm b/toolkit/components/nimbus/lib/SharedDataMap.jsm index c0dbf5323cf..417f2fa5dd8 100644 --- a/toolkit/components/nimbus/lib/SharedDataMap.jsm +++ b/toolkit/components/nimbus/lib/SharedDataMap.jsm @@ -10,20 +10,14 @@ const { EventEmitter } = ChromeUtils.import( "resource://gre/modules/EventEmitter.jsm" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); const IS_MAIN_PROCESS = Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT; -ChromeUtils.defineModuleGetter( - lazy, - "JSONFile", - "resource://gre/modules/JSONFile.jsm" -); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/nimbus/test/NimbusTestUtils.jsm b/toolkit/components/nimbus/test/NimbusTestUtils.jsm index b4972a765c9..14869584778 100644 --- a/toolkit/components/nimbus/test/NimbusTestUtils.jsm +++ b/toolkit/components/nimbus/test/NimbusTestUtils.jsm @@ -18,6 +18,10 @@ const { FileTestUtils } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { _ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm", ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm", @@ -27,7 +31,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm", sinon: "resource://testing-common/Sinon.jsm", FeatureManifest: "resource://nimbus/FeatureManifest.js", - JsonSchema: "resource://gre/modules/JsonSchema.jsm", }); const { SYNC_DATA_PREF_BRANCH, SYNC_DEFAULTS_PREF_BRANCH } = ExperimentStore; diff --git a/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js b/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js index d9131d7dc8c..92993a97719 100644 --- a/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js +++ b/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js @@ -12,11 +12,9 @@ const { ExperimentFakes } = ChromeUtils.import( const { ExperimentFeatures } = ChromeUtils.import( "resource://nimbus/ExperimentAPI.jsm" ); -ChromeUtils.defineModuleGetter( - this, - "JSONFile", - "resource://gre/modules/JSONFile.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", +}); function getPath() { const profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile).path; diff --git a/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js b/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js index ff30e082752..7a7dc4fe478 100644 --- a/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js +++ b/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js @@ -12,11 +12,9 @@ const { ExperimentFakes } = ChromeUtils.import( const { NimbusFeatures, ExperimentAPI } = ChromeUtils.import( "resource://nimbus/ExperimentAPI.jsm" ); -ChromeUtils.defineModuleGetter( - this, - "JSONFile", - "resource://gre/modules/JSONFile.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", +}); const SINGLE_FEATURE_RECIPE = { ...ExperimentFakes.experiment(), diff --git a/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js b/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js index e6ac6efb505..7c4de4ec42e 100644 --- a/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js +++ b/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js @@ -5,8 +5,8 @@ const { _ExperimentFeature: ExperimentFeature, } = ChromeUtils.import("resource://nimbus/ExperimentAPI.jsm"); -const { JsonSchema } = ChromeUtils.import( - "resource://gre/modules/JsonSchema.jsm" +const { JsonSchema } = ChromeUtils.importESModule( + "resource://gre/modules/JsonSchema.sys.mjs" ); Cu.importGlobalProperties(["fetch"]); diff --git a/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js b/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js index c94ba534cc9..b7ac49e9055 100644 --- a/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js +++ b/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js @@ -4,8 +4,8 @@ const { ExperimentFakes } = ChromeUtils.import( "resource://testing-common/NimbusTestUtils.jsm" ); -const { FirstStartup } = ChromeUtils.import( - "resource://gre/modules/FirstStartup.jsm" +const { FirstStartup } = ChromeUtils.importESModule( + "resource://gre/modules/FirstStartup.sys.mjs" ); add_task(async function test_createTargetingContext() { diff --git a/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js b/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js index fde09eff9df..cee62260fc8 100644 --- a/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js +++ b/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js @@ -3,8 +3,8 @@ const { ExperimentFakes } = ChromeUtils.import( "resource://testing-common/NimbusTestUtils.jsm" ); -const { FirstStartup } = ChromeUtils.import( - "resource://gre/modules/FirstStartup.jsm" +const { FirstStartup } = ChromeUtils.importESModule( + "resource://gre/modules/FirstStartup.sys.mjs" ); const { NimbusFeatures } = ChromeUtils.import( "resource://nimbus/ExperimentAPI.jsm" diff --git a/toolkit/components/normandy/Normandy.jsm b/toolkit/components/normandy/Normandy.jsm index 0a4c64a8344..a95752ce3db 100644 --- a/toolkit/components/normandy/Normandy.jsm +++ b/toolkit/components/normandy/Normandy.jsm @@ -3,12 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); diff --git a/toolkit/components/normandy/NormandyMigrations.jsm b/toolkit/components/normandy/NormandyMigrations.jsm index 00f1abac02d..a8a5d28f19a 100644 --- a/toolkit/components/normandy/NormandyMigrations.jsm +++ b/toolkit/components/normandy/NormandyMigrations.jsm @@ -3,7 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { AddonStudies } = ChromeUtils.import( "resource://normandy/lib/AddonStudies.jsm" diff --git a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm index 7f754e70a65..764e20e666e 100644 --- a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm +++ b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm @@ -20,6 +20,10 @@ const { BaseStudyAction } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ActionSchemas: "resource://normandy/actions/schemas/index.js", AddonManager: "resource://gre/modules/AddonManager.jsm", @@ -28,7 +32,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm", NormandyApi: "resource://normandy/lib/NormandyApi.jsm", NormandyUtils: "resource://normandy/lib/NormandyUtils.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", Sampling: "resource://gre/modules/components-utils/Sampling.jsm", TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm", TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm", diff --git a/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm b/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm index dd82c17c22b..a5d84d35af9 100644 --- a/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm +++ b/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm @@ -41,11 +41,9 @@ ChromeUtils.defineModuleGetter( "Storage", "resource://normandy/lib/Storage.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "NormandyUtils", diff --git a/toolkit/components/normandy/lib/AddonRollouts.jsm b/toolkit/components/normandy/lib/AddonRollouts.jsm index ca426124ace..ca947a08768 100644 --- a/toolkit/components/normandy/lib/AddonRollouts.jsm +++ b/toolkit/components/normandy/lib/AddonRollouts.jsm @@ -6,11 +6,9 @@ const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "IndexedDB", - "resource://gre/modules/IndexedDB.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "TelemetryEnvironment", diff --git a/toolkit/components/normandy/lib/AddonStudies.jsm b/toolkit/components/normandy/lib/AddonStudies.jsm index 782c91c2aac..3514a690c0e 100644 --- a/toolkit/components/normandy/lib/AddonStudies.jsm +++ b/toolkit/components/normandy/lib/AddonStudies.jsm @@ -50,11 +50,9 @@ const { LogManager } = ChromeUtils.import( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "IndexedDB", - "resource://gre/modules/IndexedDB.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "AddonManager", diff --git a/toolkit/components/normandy/lib/LogManager.jsm b/toolkit/components/normandy/lib/LogManager.jsm index f57f7e2e279..44f89f4c3c0 100644 --- a/toolkit/components/normandy/lib/LogManager.jsm +++ b/toolkit/components/normandy/lib/LogManager.jsm @@ -4,7 +4,9 @@ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); var EXPORTED_SYMBOLS = ["LogManager"]; diff --git a/toolkit/components/normandy/lib/NormandyAddonManager.jsm b/toolkit/components/normandy/lib/NormandyAddonManager.jsm index a105a278d48..4173d2e1a93 100644 --- a/toolkit/components/normandy/lib/NormandyAddonManager.jsm +++ b/toolkit/components/normandy/lib/NormandyAddonManager.jsm @@ -10,9 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AddonManager: "resource://gre/modules/AddonManager.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", }); var EXPORTED_SYMBOLS = ["NormandyAddonManager"]; diff --git a/toolkit/components/normandy/lib/PreferenceExperiments.jsm b/toolkit/components/normandy/lib/PreferenceExperiments.jsm index bb938cbb761..d4ff52f260e 100644 --- a/toolkit/components/normandy/lib/PreferenceExperiments.jsm +++ b/toolkit/components/normandy/lib/PreferenceExperiments.jsm @@ -89,11 +89,9 @@ const { LogManager } = ChromeUtils.import( ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "JSONFile", - "resource://gre/modules/JSONFile.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "TelemetryEnvironment", diff --git a/toolkit/components/normandy/lib/PreferenceRollouts.jsm b/toolkit/components/normandy/lib/PreferenceRollouts.jsm index 2dbce51451f..670a5b4e050 100644 --- a/toolkit/components/normandy/lib/PreferenceRollouts.jsm +++ b/toolkit/components/normandy/lib/PreferenceRollouts.jsm @@ -8,11 +8,9 @@ const { LogManager } = ChromeUtils.import( "resource://normandy/lib/LogManager.jsm" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "IndexedDB", - "resource://gre/modules/IndexedDB.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "TelemetryEnvironment", diff --git a/toolkit/components/normandy/lib/RecipeRunner.jsm b/toolkit/components/normandy/lib/RecipeRunner.jsm index 8397f829508..2d27d9c2c68 100644 --- a/toolkit/components/normandy/lib/RecipeRunner.jsm +++ b/toolkit/components/normandy/lib/RecipeRunner.jsm @@ -10,8 +10,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const { LogManager } = ChromeUtils.import( "resource://normandy/lib/LogManager.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const lazy = {}; diff --git a/toolkit/components/normandy/lib/Storage.jsm b/toolkit/components/normandy/lib/Storage.jsm index e00f8521480..fb8d5f475b9 100644 --- a/toolkit/components/normandy/lib/Storage.jsm +++ b/toolkit/components/normandy/lib/Storage.jsm @@ -10,11 +10,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "JSONFile", - "resource://gre/modules/JSONFile.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + JSONFile: "resource://gre/modules/JSONFile.sys.mjs", +}); var EXPORTED_SYMBOLS = ["Storage"]; diff --git a/toolkit/components/normandy/test/browser/browser_AddonRollouts.js b/toolkit/components/normandy/test/browser/browser_AddonRollouts.js index 06012860560..6d59f7510ce 100644 --- a/toolkit/components/normandy/test/browser/browser_AddonRollouts.js +++ b/toolkit/components/normandy/test/browser/browser_AddonRollouts.js @@ -1,7 +1,7 @@ "use strict"; -const { IndexedDB } = ChromeUtils.import( - "resource://gre/modules/IndexedDB.jsm" +const { IndexedDB } = ChromeUtils.importESModule( + "resource://gre/modules/IndexedDB.sys.mjs" ); const { TelemetryEnvironment } = ChromeUtils.import( "resource://gre/modules/TelemetryEnvironment.jsm" diff --git a/toolkit/components/normandy/test/browser/browser_AddonStudies.js b/toolkit/components/normandy/test/browser/browser_AddonStudies.js index 5cfc5a90762..e696b86e364 100644 --- a/toolkit/components/normandy/test/browser/browser_AddonStudies.js +++ b/toolkit/components/normandy/test/browser/browser_AddonStudies.js @@ -1,7 +1,7 @@ "use strict"; -const { IndexedDB } = ChromeUtils.import( - "resource://gre/modules/IndexedDB.jsm" +const { IndexedDB } = ChromeUtils.importESModule( + "resource://gre/modules/IndexedDB.sys.mjs" ); const { AddonManager } = ChromeUtils.import( "resource://gre/modules/AddonManager.jsm" diff --git a/toolkit/components/normandy/test/browser/browser_LogManager.js b/toolkit/components/normandy/test/browser/browser_LogManager.js index 630064707a2..cde9549f8c7 100644 --- a/toolkit/components/normandy/test/browser/browser_LogManager.js +++ b/toolkit/components/normandy/test/browser/browser_LogManager.js @@ -1,6 +1,8 @@ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { LogManager } = ChromeUtils.import( "resource://normandy/lib/LogManager.jsm" ); diff --git a/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js b/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js index 3e111561e02..769a47cfbe7 100644 --- a/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js +++ b/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js @@ -1,7 +1,7 @@ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { NormandyAddonManager } = ChromeUtils.import( "resource://normandy/lib/NormandyAddonManager.jsm" diff --git a/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js b/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js index ca355c6f51e..c92037b9665 100644 --- a/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js +++ b/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js @@ -1,7 +1,7 @@ "use strict"; -const { IndexedDB } = ChromeUtils.import( - "resource://gre/modules/IndexedDB.jsm" +const { IndexedDB } = ChromeUtils.importESModule( + "resource://gre/modules/IndexedDB.sys.mjs" ); const { TelemetryEnvironment } = ChromeUtils.import( "resource://gre/modules/TelemetryEnvironment.jsm" diff --git a/toolkit/components/normandy/test/browser/browser_about_studies.js b/toolkit/components/normandy/test/browser/browser_about_studies.js index 537b479ad6e..f2dea7b78ec 100644 --- a/toolkit/components/normandy/test/browser/browser_about_studies.js +++ b/toolkit/components/normandy/test/browser/browser_about_studies.js @@ -15,8 +15,8 @@ const { ExperimentManager } = ChromeUtils.import( const { RemoteSettingsExperimentLoader } = ChromeUtils.import( "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { NormandyTestUtils } = ChromeUtils.import( "resource://testing-common/NormandyTestUtils.jsm" diff --git a/toolkit/components/normandy/test/unit/test_Normandy.js b/toolkit/components/normandy/test/unit/test_Normandy.js index 7792e2727cc..131061b4946 100644 --- a/toolkit/components/normandy/test/unit/test_Normandy.js +++ b/toolkit/components/normandy/test/unit/test_Normandy.js @@ -7,8 +7,8 @@ const { Normandy } = ChromeUtils.import("resource://normandy/Normandy.jsm"); const { NormandyMigrations } = ChromeUtils.import( "resource://normandy/NormandyMigrations.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); ChromeUtils.defineModuleGetter( this, diff --git a/toolkit/components/normandy/test/unit/test_NormandyApi.js b/toolkit/components/normandy/test/unit/test_NormandyApi.js index a07c9eeaaba..790cc0c316b 100644 --- a/toolkit/components/normandy/test/unit/test_NormandyApi.js +++ b/toolkit/components/normandy/test/unit/test_NormandyApi.js @@ -1,8 +1,8 @@ /* globals sinon */ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); /* import-globals-from utils.js */ diff --git a/toolkit/components/normandy/test/unit/test_addon_unenroll.js b/toolkit/components/normandy/test/unit/test_addon_unenroll.js index 26f714260f1..aa9f4d4332b 100644 --- a/toolkit/components/normandy/test/unit/test_addon_unenroll.js +++ b/toolkit/components/normandy/test/unit/test_addon_unenroll.js @@ -19,8 +19,8 @@ const { AddonManager } = ChromeUtils.import( const { AddonStudies } = ChromeUtils.import( "resource://normandy/lib/AddonStudies.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); /* import-globals-from utils.js */ diff --git a/toolkit/components/osfile/modules/osfile_async_front.jsm b/toolkit/components/osfile/modules/osfile_async_front.jsm index f3470188c25..c1d50217414 100644 --- a/toolkit/components/osfile/modules/osfile_async_front.jsm +++ b/toolkit/components/osfile/modules/osfile_async_front.jsm @@ -54,11 +54,9 @@ var Path = ChromeUtils.import("resource://gre/modules/osfile/ospath.jsm"); const lazy = {}; // The library of promises. -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); // The implementation of communications const { BasePromiseWorker } = ChromeUtils.import( diff --git a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js index ab8ce128e5a..0a1fe938d48 100644 --- a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js +++ b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js @@ -5,8 +5,8 @@ const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); // The following are used to compare against a well-tested reference // implementation of file I/O. const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); var myok = ok; diff --git a/toolkit/components/osfile/tests/xpcshell/head.js b/toolkit/components/osfile/tests/xpcshell/head.js index 6223c7045b7..8d162b97679 100644 --- a/toolkit/components/osfile/tests/xpcshell/head.js +++ b/toolkit/components/osfile/tests/xpcshell/head.js @@ -11,11 +11,9 @@ var { XPCOMUtils } = ChromeUtils.importESModule( // CommonJS loader, so we do not want OS.File to be loaded eagerly for // all the tests in this directory. ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); -ChromeUtils.defineModuleGetter( - this, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( this, "NetUtil", diff --git a/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js b/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js index b94f243dffb..41b57414e04 100644 --- a/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js +++ b/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js @@ -4,8 +4,8 @@ function run_test() { const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); - const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" + const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); let isWindows = "@mozilla.org/windows-registry-key;1" in Cc; diff --git a/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js b/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js index d87be22c12f..0c82e542f66 100644 --- a/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js +++ b/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js @@ -1,8 +1,8 @@ "use strict"; const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); diff --git a/toolkit/components/osfile/tests/xpcshell/test_shutdown.js b/toolkit/components/osfile/tests/xpcshell/test_shutdown.js index 8e9f16395ac..9e8c696481b 100644 --- a/toolkit/components/osfile/tests/xpcshell/test_shutdown.js +++ b/toolkit/components/osfile/tests/xpcshell/test_shutdown.js @@ -1,5 +1,5 @@ -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); add_task(function init() { diff --git a/toolkit/components/passwordmgr/LoginCSVImport.jsm b/toolkit/components/passwordmgr/LoginCSVImport.jsm index 20c94b183b6..d54ce58e4f4 100644 --- a/toolkit/components/passwordmgr/LoginCSVImport.jsm +++ b/toolkit/components/passwordmgr/LoginCSVImport.jsm @@ -20,9 +20,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + ResponsivenessMonitor: "resource://gre/modules/ResponsivenessMonitor.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { LoginHelper: "resource://gre/modules/LoginHelper.jsm", - ResponsivenessMonitor: "resource://gre/modules/ResponsivenessMonitor.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "d3", () => { diff --git a/toolkit/components/passwordmgr/LoginFormFactory.jsm b/toolkit/components/passwordmgr/LoginFormFactory.jsm index 4eb95b0142c..ce8483c6fc2 100644 --- a/toolkit/components/passwordmgr/LoginFormFactory.jsm +++ b/toolkit/components/passwordmgr/LoginFormFactory.jsm @@ -17,8 +17,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm", LoginHelper: "resource://gre/modules/LoginHelper.jsm", }); diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm index 1de41f5fc0b..d467a84d913 100644 --- a/toolkit/components/passwordmgr/LoginHelper.jsm +++ b/toolkit/components/passwordmgr/LoginHelper.jsm @@ -18,11 +18,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "OSKeyStore", - "resource://gre/modules/OSKeyStore.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs", +}); /** * A helper class to deal with CSV import rows. diff --git a/toolkit/components/passwordmgr/LoginManagerChild.jsm b/toolkit/components/passwordmgr/LoginManagerChild.jsm index bad3abcfc64..e3307cdd3eb 100644 --- a/toolkit/components/passwordmgr/LoginManagerChild.jsm +++ b/toolkit/components/passwordmgr/LoginManagerChild.jsm @@ -36,15 +36,18 @@ const { AppConstants } = ChromeUtils.import( const { PrivateBrowsingUtils } = ChromeUtils.import( "resource://gre/modules/PrivateBrowsingUtils.jsm" ); -const { CreditCard } = ChromeUtils.import( - "resource://gre/modules/CreditCard.jsm" +const { CreditCard } = ChromeUtils.importESModule( + "resource://gre/modules/CreditCard.sys.mjs" ); const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { DeferredTask: "resource://gre/modules/DeferredTask.jsm", - FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm", LoginFormFactory: "resource://gre/modules/LoginFormFactory.jsm", LoginRecipesContent: "resource://gre/modules/LoginRecipes.jsm", LoginHelper: "resource://gre/modules/LoginHelper.jsm", diff --git a/toolkit/components/passwordmgr/LoginStore.jsm b/toolkit/components/passwordmgr/LoginStore.jsm index 8005ad0bd0e..ce207adb428 100644 --- a/toolkit/components/passwordmgr/LoginStore.jsm +++ b/toolkit/components/passwordmgr/LoginStore.jsm @@ -42,7 +42,9 @@ const EXPORTED_SYMBOLS = ["LoginStore"]; // Globals -const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm"); +const { JSONFile } = ChromeUtils.importESModule( + "resource://gre/modules/JSONFile.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/passwordmgr/test/unit/head.js b/toolkit/components/passwordmgr/test/unit/head.js index 7b4095a1bc0..5d9b4b8292a 100644 --- a/toolkit/components/passwordmgr/test/unit/head.js +++ b/toolkit/components/passwordmgr/test/unit/head.js @@ -30,9 +30,12 @@ const { MockDocument } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { DownloadPaths: "resource://gre/modules/DownloadPaths.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", }); const LoginInfo = Components.Constructor( diff --git a/toolkit/components/pdfjs/content/PdfStreamConverter.jsm b/toolkit/components/pdfjs/content/PdfStreamConverter.jsm index d7d82e9be47..44a09874667 100644 --- a/toolkit/components/pdfjs/content/PdfStreamConverter.jsm +++ b/toolkit/components/pdfjs/content/PdfStreamConverter.jsm @@ -34,11 +34,9 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "AsyncPrefs", - "resource://gre/modules/AsyncPrefs.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + AsyncPrefs: "resource://gre/modules/AsyncPrefs.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "NetUtil", diff --git a/toolkit/components/pdfjs/content/PdfjsParent.jsm b/toolkit/components/pdfjs/content/PdfjsParent.jsm index 1617bbdee43..e6f6766e1f2 100644 --- a/toolkit/components/pdfjs/content/PdfjsParent.jsm +++ b/toolkit/components/pdfjs/content/PdfjsParent.jsm @@ -23,11 +23,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "SetClipboardSearchString", - "resource://gre/modules/Finder.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + SetClipboardSearchString: "resource://gre/modules/Finder.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs index ecf76e15938..8b2a3094c5c 100644 --- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs +++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs @@ -17,9 +17,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", }); -const { Rect, Point } = ChromeUtils.import( - "resource://gre/modules/Geometry.jsm" -); +import { Rect, Point } from "resource://gre/modules/Geometry.sys.mjs"; const PLAYER_URI = "chrome://global/content/pictureinpicture/player.xhtml"; var PLAYER_FEATURES = diff --git a/toolkit/components/pictureinpicture/content/player.js b/toolkit/components/pictureinpicture/content/player.js index a0e68ef39e4..9de62bbab5e 100644 --- a/toolkit/components/pictureinpicture/content/player.js +++ b/toolkit/components/pictureinpicture/content/player.js @@ -5,8 +5,8 @@ const { PictureInPicture } = ChromeUtils.importESModule( "resource://gre/modules/PictureInPicture.sys.mjs" ); -const { ShortcutUtils } = ChromeUtils.import( - "resource://gre/modules/ShortcutUtils.jsm" +const { ShortcutUtils } = ChromeUtils.importESModule( + "resource://gre/modules/ShortcutUtils.sys.mjs" ); const { DeferredTask } = ChromeUtils.import( "resource://gre/modules/DeferredTask.jsm" diff --git a/toolkit/components/pictureinpicture/tests/head.js b/toolkit/components/pictureinpicture/tests/head.js index 5f1c8bf77bd..7ba80382df4 100644 --- a/toolkit/components/pictureinpicture/tests/head.js +++ b/toolkit/components/pictureinpicture/tests/head.js @@ -488,7 +488,9 @@ async function getToggleClientRect( ) { let args = { videoID, toggleID: toggleStyles.rootID }; return ContentTask.spawn(browser, args, async args => { - const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm"); + const { Rect } = ChromeUtils.importESModule( + "resource://gre/modules/Geometry.sys.mjs" + ); let { videoID, toggleID } = args; let video = content.document.getElementById(videoID); diff --git a/toolkit/components/places/BookmarkHTMLUtils.sys.mjs b/toolkit/components/places/BookmarkHTMLUtils.sys.mjs index dfa6df65b79..3310bd079d3 100644 --- a/toolkit/components/places/BookmarkHTMLUtils.sys.mjs +++ b/toolkit/components/places/BookmarkHTMLUtils.sys.mjs @@ -57,9 +57,7 @@ */ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" -); +import { FileUtils } from "resource://gre/modules/FileUtils.sys.mjs"; import { PlacesUtils } from "resource://gre/modules/PlacesUtils.sys.mjs"; const lazy = {}; diff --git a/toolkit/components/places/PlacesDBUtils.sys.mjs b/toolkit/components/places/PlacesDBUtils.sys.mjs index 14ff75f92bd..dc171b74111 100644 --- a/toolkit/components/places/PlacesDBUtils.sys.mjs +++ b/toolkit/components/places/PlacesDBUtils.sys.mjs @@ -13,17 +13,12 @@ const CORRUPT_DB_RETAIN_DAYS = 14; // Seconds between maintenance runs. const MAINTENANCE_INTERVAL_SECONDS = 7 * 86400; -import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; - const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesPreviews: "resource://gre/modules/PlacesPreviews.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(lazy, { - Sqlite: "resource://gre/modules/Sqlite.jsm", + Sqlite: "resource://gre/modules/Sqlite.sys.mjs", }); export var PlacesDBUtils = { diff --git a/toolkit/components/places/PlacesSyncUtils.sys.mjs b/toolkit/components/places/PlacesSyncUtils.sys.mjs index 5ba65c9ad4c..95050060317 100644 --- a/toolkit/components/places/PlacesSyncUtils.sys.mjs +++ b/toolkit/components/places/PlacesSyncUtils.sys.mjs @@ -6,8 +6,8 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; -ChromeUtils.defineModuleGetter(lazy, "Log", "resource://gre/modules/Log.jsm"); ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); diff --git a/toolkit/components/places/PlacesUtils.sys.mjs b/toolkit/components/places/PlacesUtils.sys.mjs index 2604f7d0821..08759c03adf 100644 --- a/toolkit/components/places/PlacesUtils.sys.mjs +++ b/toolkit/components/places/PlacesUtils.sys.mjs @@ -6,9 +6,7 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" -); +import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -17,11 +15,11 @@ ChromeUtils.defineESModuleGetters(lazy, { Bookmarks: "resource://gre/modules/Bookmarks.sys.mjs", History: "resource://gre/modules/History.sys.mjs", PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs", + Sqlite: "resource://gre/modules/Sqlite.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { NetUtil: "resource://gre/modules/NetUtil.jsm", - Sqlite: "resource://gre/modules/Sqlite.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "MOZ_ACTION_REGEX", () => { diff --git a/toolkit/components/places/SyncedBookmarksMirror.sys.mjs b/toolkit/components/places/SyncedBookmarksMirror.sys.mjs index 5d6bc404d57..108c9c2c526 100644 --- a/toolkit/components/places/SyncedBookmarksMirror.sys.mjs +++ b/toolkit/components/places/SyncedBookmarksMirror.sys.mjs @@ -52,13 +52,13 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { Async: "resource://services-common/async.js", - Log: "resource://gre/modules/Log.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "MirrorLog", () => diff --git a/toolkit/components/places/tests/gtest/places_test_harness.h b/toolkit/components/places/tests/gtest/places_test_harness.h index 4ebe3982bd7..f2d3e06c35b 100644 --- a/toolkit/components/places/tests/gtest/places_test_harness.h +++ b/toolkit/components/places/tests/gtest/places_test_harness.h @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "gtest/gtest.h" -#include "nsMemory.h" #include "nsThreadUtils.h" #include "nsDocShellCID.h" diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js index 1beb2ebdcf4..9960be07c49 100644 --- a/toolkit/components/places/tests/head_common.js +++ b/toolkit/components/places/tests/head_common.js @@ -33,18 +33,18 @@ var { PlacesSyncUtils } = ChromeUtils.importESModule( ChromeUtils.defineESModuleGetters(this, { BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.sys.mjs", BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.sys.mjs", + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs", PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs", PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", + Sqlite: "resource://gre/modules/Sqlite.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { - FileUtils: "resource://gre/modules/FileUtils.jsm", NetUtil: "resource://gre/modules/NetUtil.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", - Sqlite: "resource://gre/modules/Sqlite.jsm", TestUtils: "resource://testing-common/TestUtils.jsm", }); diff --git a/toolkit/components/places/tests/history/test_removeVisitsByFilter.js b/toolkit/components/places/tests/history/test_removeVisitsByFilter.js index eb2edadce06..f9722775fe4 100644 --- a/toolkit/components/places/tests/history/test_removeVisitsByFilter.js +++ b/toolkit/components/places/tests/history/test_removeVisitsByFilter.js @@ -5,8 +5,8 @@ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); add_task(async function test_removeVisitsByFilter() { diff --git a/toolkit/components/places/tests/sync/head_sync.js b/toolkit/components/places/tests/sync/head_sync.js index e379f2709cb..7e12dc873f4 100644 --- a/toolkit/components/places/tests/sync/head_sync.js +++ b/toolkit/components/places/tests/sync/head_sync.js @@ -14,7 +14,7 @@ var { CanonicalJSON } = ChromeUtils.import( "resource://gre/modules/CanonicalJSON.jsm" ); -var { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs"); var { ObjectUtils } = ChromeUtils.import( "resource://gre/modules/ObjectUtils.jsm" ); diff --git a/toolkit/components/promiseworker/PromiseWorker.jsm b/toolkit/components/promiseworker/PromiseWorker.jsm index ff0d7232529..1fbafd9f3b5 100644 --- a/toolkit/components/promiseworker/PromiseWorker.jsm +++ b/toolkit/components/promiseworker/PromiseWorker.jsm @@ -21,11 +21,9 @@ var EXPORTED_SYMBOLS = ["BasePromiseWorker"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); /** * An implementation of queues (FIFO). diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm index d82217037de..c0e898ae86c 100644 --- a/toolkit/components/reader/AboutReader.jsm +++ b/toolkit/components/reader/AboutReader.jsm @@ -15,11 +15,9 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "AsyncPrefs", - "resource://gre/modules/AsyncPrefs.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + AsyncPrefs: "resource://gre/modules/AsyncPrefs.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "NarrateControls", diff --git a/toolkit/components/reader/test/head.js b/toolkit/components/reader/test/head.js index f760ab72c0f..bd4f124fd20 100644 --- a/toolkit/components/reader/test/head.js +++ b/toolkit/components/reader/test/head.js @@ -1,8 +1,6 @@ -ChromeUtils.defineModuleGetter( - this, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); /* exported promiseTabLoadEvent, is_element_visible, is_element_hidden */ diff --git a/toolkit/components/remotepagemanager/MessagePort.jsm b/toolkit/components/remotepagemanager/MessagePort.jsm index 943b1818b25..5de2b78a333 100644 --- a/toolkit/components/remotepagemanager/MessagePort.jsm +++ b/toolkit/components/remotepagemanager/MessagePort.jsm @@ -8,11 +8,9 @@ var EXPORTED_SYMBOLS = ["MessagePort", "MessageListener"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); class MessageListener { constructor() { diff --git a/toolkit/components/satchel/FormHistory.jsm b/toolkit/components/satchel/FormHistory.jsm index d11fbab1c08..0510c9664de 100644 --- a/toolkit/components/satchel/FormHistory.jsm +++ b/toolkit/components/satchel/FormHistory.jsm @@ -94,11 +94,9 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "Sqlite", - "resource://gre/modules/Sqlite.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + Sqlite: "resource://gre/modules/Sqlite.sys.mjs", +}); const DB_SCHEMA_VERSION = 5; const DAY_IN_MS = 86400000; // 1 day in milliseconds diff --git a/toolkit/components/satchel/FormHistoryChild.jsm b/toolkit/components/satchel/FormHistoryChild.jsm index 49547945f8e..783a5751d5d 100644 --- a/toolkit/components/satchel/FormHistoryChild.jsm +++ b/toolkit/components/satchel/FormHistoryChild.jsm @@ -12,11 +12,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "CreditCard", - "resource://gre/modules/CreditCard.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + CreditCard: "resource://gre/modules/CreditCard.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "PrivateBrowsingUtils", diff --git a/toolkit/components/satchel/test/unit/head_satchel.js b/toolkit/components/satchel/test/unit/head_satchel.js index 5f42509b025..ededd7c29c4 100644 --- a/toolkit/components/satchel/test/unit/head_satchel.js +++ b/toolkit/components/satchel/test/unit/head_satchel.js @@ -15,10 +15,14 @@ const PR_HOURS = 60 * 60 * 1000000; var { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); + +ChromeUtils.defineESModuleGetters(this, { + Sqlite: "resource://gre/modules/Sqlite.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { FormHistory: "resource://gre/modules/FormHistory.jsm", FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm", - Sqlite: "resource://gre/modules/Sqlite.jsm", }); do_get_profile(); diff --git a/toolkit/components/satchel/test/unit/test_history_api.js b/toolkit/components/satchel/test/unit/test_history_api.js index cd97cc06316..bb1501af6b5 100644 --- a/toolkit/components/satchel/test/unit/test_history_api.js +++ b/toolkit/components/satchel/test/unit/test_history_api.js @@ -5,8 +5,8 @@ var testnum = 0; var dbConnection; // used for deleted table tests -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); function countDeletedEntries(expected) { diff --git a/toolkit/components/search/SearchService.sys.mjs b/toolkit/components/search/SearchService.sys.mjs index a7f1d33f778..a053186b5c0 100644 --- a/toolkit/components/search/SearchService.sys.mjs +++ b/toolkit/components/search/SearchService.sys.mjs @@ -6,9 +6,8 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" -); +import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs"; + const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); @@ -417,6 +416,14 @@ export class SearchService { this._settings._batchTask?.disarm(); } + // Test-only function to reset just the engine selector so that it can + // load a different configuration. + resetEngineSelector() { + this.#engineSelector = new lazy.SearchEngineSelector( + this.#handleConfigurationUpdated.bind(this) + ); + } + resetToAppDefaultEngine() { let appDefaultEngine = this.appDefaultEngine; appDefaultEngine.hidden = false; @@ -1590,8 +1597,8 @@ export class SearchService { * The user's new current default engine. * @param { object } prevCurrentEngine * The user's previous default engine. - * @param { object } prevAppDefaultEngine - * The user's previous app default engine. + * @param { string } prevAppDefaultEngine + * The name of the user's previous app default engine. * @returns { boolean } * Return true if the previous default engine has been removed and * notification box should be displayed. @@ -1615,6 +1622,15 @@ export class SearchService { return false; } + // If the previous engine is still available, don't show the notification + // box. + if (prevCurrentEngine && this._engines.has(prevCurrentEngine.name)) { + return false; + } + if (!prevCurrentEngine && this._engines.has(prevAppDefaultEngine)) { + return false; + } + // If the user's previous engine is different than the new current engine, // or if the user was using the app default engine and the app default // engine is different than the new current engine, we check if the user's @@ -1879,6 +1895,7 @@ export class SearchService { prevMetaData && settings.metaData && !this.#didSettingsMetaDataUpdate(prevMetaData) && + enginesToRemove.includes(prevCurrentEngine) && Services.prefs.getBoolPref("browser.search.removeEngineInfobar.enabled") ) { this._showRemovalOfSearchEngineNotificationBox( @@ -2896,7 +2913,7 @@ export class SearchService { } } - #onSeparateDefaultPrefChanged() { + #onSeparateDefaultPrefChanged(prefName, previousValue, currentValue) { // Clear out the sorted engines settings, so that we re-sort it if necessary. this._cachedSortedEngines = null; // We should notify if the normal default, and the currently saved private @@ -2909,6 +2926,28 @@ export class SearchService { lazy.SearchUtils.MODIFIED_TYPE.DEFAULT_PRIVATE ); } + // Always notify about the change of status of private default if the user + // toggled the UI. + if ( + prefName == + lazy.SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault" + ) { + if (!previousValue && currentValue) { + this.#recordDefaultChangedEvent( + true, + null, + this._getEngineDefault(true), + Ci.nsISearchService.CHANGE_REASON_USER_PRIVATE_SPLIT + ); + } else { + this.#recordDefaultChangedEvent( + true, + this._getEngineDefault(true), + null, + Ci.nsISearchService.CHANGE_REASON_USER_PRIVATE_SPLIT + ); + } + } // Update the telemetry data. this.#recordTelemetryData(); } @@ -2997,9 +3036,9 @@ export class SearchService { * * @param {boolean} isPrivate * True if this is a event about a private engine. - * @param {SearchEngine} previousEngine + * @param {SearchEngine} [previousEngine] * The previously default search engine. - * @param {SearchEngine} newEngine + * @param {SearchEngine} [newEngine] * The new default search engine. * @param {string} changeSource * The source of the change of default. @@ -3012,7 +3051,21 @@ export class SearchService { ) { changeSource = REASON_CHANGE_MAP.get(changeSource) ?? "unknown"; Services.telemetry.setEventRecordingEnabled("search", true); - let [telemetryId, engineInfo] = this.#getEngineInfo(newEngine); + let telemetryId; + let engineInfo; + // If we are toggling the separate private browsing settings, we might not + // have an engine to record. + if (newEngine) { + [telemetryId, engineInfo] = this.#getEngineInfo(newEngine); + } else { + telemetryId = ""; + engineInfo = { + name: "", + loadPath: "", + submissionURL: "", + }; + } + let submissionURL = engineInfo.submissionURL ?? ""; Services.telemetry.recordEvent( "search", @@ -3181,6 +3234,8 @@ export class SearchService { "seperatePrivateDefaultUrlbarResultEnabled" ); + let previousPrivateDefault = this.defaultPrivateEngine; + let uiWasEnabled = this._separatePrivateDefaultEnabledPrefValue; if ( this._separatePrivateDefaultEnabledPrefValue != nimbusPrivateDefaultUIEnabled @@ -3189,6 +3244,24 @@ export class SearchService { `${lazy.SearchUtils.BROWSER_SEARCH_PREF}separatePrivateDefault.ui.enabled`, nimbusPrivateDefaultUIEnabled ); + let newPrivateDefault = this.defaultPrivateEngine; + if (previousPrivateDefault != newPrivateDefault) { + if (!uiWasEnabled) { + this.#recordDefaultChangedEvent( + true, + null, + newPrivateDefault, + Ci.nsISearchService.CHANGE_REASON_EXPERIMENT + ); + } else { + this.#recordDefaultChangedEvent( + true, + previousPrivateDefault, + null, + Ci.nsISearchService.CHANGE_REASON_EXPERIMENT + ); + } + } } if ( this.separatePrivateDefaultUrlbarResultEnabled != diff --git a/toolkit/components/search/SearchSuggestionController.sys.mjs b/toolkit/components/search/SearchSuggestionController.sys.mjs index 5d636881c53..8b50d35a05b 100644 --- a/toolkit/components/search/SearchSuggestionController.sys.mjs +++ b/toolkit/components/search/SearchSuggestionController.sys.mjs @@ -7,13 +7,10 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", }); -XPCOMUtils.defineLazyModuleGetters(lazy, { - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", -}); - const DEFAULT_FORM_HISTORY_PARAM = "searchbar-history"; const HTTP_OK = 200; const BROWSER_SUGGEST_PREF = "browser.search.suggest.enabled"; diff --git a/toolkit/components/search/tests/xpcshell/head_search.js b/toolkit/components/search/tests/xpcshell/head_search.js index 4e5b54e3a83..2c379e83841 100644 --- a/toolkit/components/search/tests/xpcshell/head_search.js +++ b/toolkit/components/search/tests/xpcshell/head_search.js @@ -6,6 +6,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule( ); ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", Region: "resource://gre/modules/Region.sys.mjs", SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs", SearchService: "resource://gre/modules/SearchService.sys.mjs", @@ -16,8 +18,6 @@ ChromeUtils.defineESModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, { clearTimeout: "resource://gre/modules/Timer.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", RemoteSettings: "resource://services-settings/remote-settings.js", RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm", setTimeout: "resource://gre/modules/Timer.jsm", diff --git a/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js b/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js index d2e700ef30e..336ffb1ee5d 100644 --- a/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js +++ b/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js @@ -4,13 +4,10 @@ "use strict"; ChromeUtils.defineESModuleGetters(this, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs", }); -XPCOMUtils.defineLazyModuleGetters(this, { - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", -}); - const TEST_CONFIG = [ { engineName: "aol", diff --git a/toolkit/components/search/tests/xpcshell/test_remove_engine_notification_box.js b/toolkit/components/search/tests/xpcshell/test_remove_engine_notification_box.js index 0dd121a465b..deaf1ee3d32 100644 --- a/toolkit/components/search/tests/xpcshell/test_remove_engine_notification_box.js +++ b/toolkit/components/search/tests/xpcshell/test_remove_engine_notification_box.js @@ -206,6 +206,28 @@ add_task(async function test_current_engine_is_null() { ); }); +add_task(async function test_default_changed_and_metadata_unchanged_exists() { + info("Update region to FR to change engine."); + Region._setHomeRegion("FR", false); + + info("Set user settings metadata to the same properties as cached metadata."); + await Services.search.wrappedJSObject._fetchEngineSelectorEngines(); + userSettings.metaData = { + ...Services.search.wrappedJSObject._settings.getSettingsMetaData(), + appDefaultEngine: "Test search engine", + }; + + await reloadEngines(structuredClone(userSettings)); + Assert.ok( + stub.notCalled, + "_reloadEngines should not show the notification box as the engine still exists." + ); + + // Reset. + Region._setHomeRegion("US", false); + await reloadEngines(structuredClone(userSettings)); +}); + add_task(async function test_default_engine_changed_and_metadata_unchanged() { info("Update region to FR to change engine."); Region._setHomeRegion("FR", false); @@ -219,8 +241,12 @@ add_task(async function test_default_engine_changed_and_metadata_unchanged() { await Services.search.wrappedJSObject._fetchEngineSelectorEngines(); userSettings.metaData = { ...Services.search.wrappedJSObject._settings.getSettingsMetaData(), + appDefaultEngine: "Test search engine", }; + // Update config by removing the app default engine + await setConfigToLoad(CONFIG_UPDATED); + await reloadEngines(structuredClone(userSettings)); Assert.ok( stub.calledOnce, @@ -249,11 +275,8 @@ add_task(async function test_app_default_engine_changed_on_start_up() { // default settings.metaData.current = ""; - let searchSettingsObj = await RemoteSettings(SearchUtils.SETTINGS_KEY); - // Restore the get method in order to stub it again in useTestEngines - searchSettingsObj.get.restore(); // Update config by removing the app default engine - await SearchTestUtils.useTestEngines("data", null, CONFIG_UPDATED); + await setConfigToLoad(CONFIG_UPDATED); await loadEngines(settings); Assert.ok( @@ -261,6 +284,31 @@ add_task(async function test_app_default_engine_changed_on_start_up() { "_loadEngines should show the notification box." ); }); +add_task(async function test_app_default_engine_change_start_up_still_exists() { + stub.resetHistory(); + let settings = structuredClone(userSettings); + + // Set the current engine to "" so we can use the app default engine as + // default + settings.metaData.current = ""; + settings.metaData.appDefaultEngine = "Test search engine"; + + await setConfigToLoad(CONFIG); + + await loadEngines(settings); + Assert.ok( + stub.notCalled, + "_loadEngines should not show the notification box." + ); +}); + +async function setConfigToLoad(config) { + let searchSettingsObj = await RemoteSettings(SearchUtils.SETTINGS_KEY); + // Restore the get method in order to stub it again in useTestEngines + searchSettingsObj.get.restore(); + Services.search.wrappedJSObject.resetEngineSelector(); + await SearchTestUtils.useTestEngines("data", null, config); +} function writeSettings(settings) { return IOUtils.writeJSON(settingsFilePath, settings, { compress: true }); diff --git a/toolkit/components/search/tests/xpcshell/test_searchSuggest.js b/toolkit/components/search/tests/xpcshell/test_searchSuggest.js index 0d352c94a38..ceb4685e9dd 100644 --- a/toolkit/components/search/tests/xpcshell/test_searchSuggest.js +++ b/toolkit/components/search/tests/xpcshell/test_searchSuggest.js @@ -17,8 +17,8 @@ const { FormHistory } = ChromeUtils.import( const { SearchSuggestionController } = ChromeUtils.importESModule( "resource://gre/modules/SearchSuggestionController.sys.mjs" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { TelemetryTestUtils } = ChromeUtils.import( "resource://testing-common/TelemetryTestUtils.jsm" diff --git a/toolkit/components/search/tests/xpcshell/test_telemetry_event_default.js b/toolkit/components/search/tests/xpcshell/test_telemetry_event_default.js index 020a9f515e2..0f0f518c7f7 100644 --- a/toolkit/components/search/tests/xpcshell/test_telemetry_event_default.js +++ b/toolkit/components/search/tests/xpcshell/test_telemetry_event_default.js @@ -98,39 +98,51 @@ function clearTelemetry() { Services.fog.testResetFOG(); } -async function checkTelemetry(source, prevEngine, newEngine) { +async function checkTelemetry( + source, + prevEngine, + newEngine, + checkPrivate = false +) { TelemetryTestUtils.assertEvents( [ { - object: "change_default", + object: checkPrivate ? "change_private" : "change_default", value: source, extra: { - prev_id: prevEngine.id, - new_id: newEngine.id, - new_name: newEngine.name, - new_load_path: newEngine.loadPath, + prev_id: prevEngine?.id ?? "", + new_id: newEngine?.id ?? "", + new_name: newEngine?.name ?? "", + new_load_path: newEngine?.loadPath ?? "", // Telemetry has a limit of 80 characters. - new_sub_url: newEngine.submissionUrl.slice(0, 80), + new_sub_url: newEngine?.submissionUrl.slice(0, 80) ?? "", }, }, ], { category: "search", method: "engine" } ); - let snapshot = await Glean.searchEngineDefault.changed.testGetValue(); + let snapshot; + if (checkPrivate) { + snapshot = await Glean.searchEnginePrivate.changed.testGetValue(); + } else { + snapshot = await Glean.searchEngineDefault.changed.testGetValue(); + } delete snapshot[0].timestamp; Assert.deepEqual( snapshot[0], { - category: "search.engine.default", + category: checkPrivate + ? "search.engine.private" + : "search.engine.default", name: "changed", extra: { change_source: source, - previous_engine_id: prevEngine.id, - new_engine_id: newEngine.id, - new_display_name: newEngine.name, - new_load_path: newEngine.loadPath, - new_submission_url: newEngine.submissionUrl, + previous_engine_id: prevEngine?.id ?? "", + new_engine_id: newEngine?.id ?? "", + new_display_name: newEngine?.name ?? "", + new_load_path: newEngine?.loadPath ?? "", + new_submission_url: newEngine?.submissionUrl ?? "", }, }, "Should have received the correct event details" @@ -213,3 +225,69 @@ add_task(async function test_region_changes_default() { await checkTelemetry("region", testFrEngine, testPrefEngine); }); + +add_task(async function test_user_changes_separate_private_pref() { + Services.prefs.setBoolPref( + SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled", + true + ); + Services.prefs.setBoolPref( + SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault", + true + ); + + await Services.search.setDefaultPrivate( + Services.search.getEngineByName("engine-chromeicon"), + Ci.nsISearchService.CHANGE_REASON_UNKNOWN + ); + + Assert.notEqual( + await Services.search.getDefault(), + await Services.search.getDefaultPrivate(), + "Should have different engines for the pre-condition" + ); + + Services.prefs.setBoolPref( + SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled", + false + ); + + clearTelemetry(); + + Services.prefs.setBoolPref( + SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault", + false + ); + + await checkTelemetry("user_private_split", testChromeIconEngine, null, true); + + getVariableStub.returns(null); +}); + +add_task(async function test_experiment_with_separate_default_notifies() { + Services.prefs.setBoolPref( + SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled", + false + ); + Services.prefs.setBoolPref( + SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault", + true + ); + + clearTelemetry(); + + getVariableStub.callsFake(name => + name == "seperatePrivateDefaultUIEnabled" ? true : null + ); + NimbusFeatures.search.onUpdate.firstCall.args[0](); + + await checkTelemetry("experiment", null, testChromeIconEngine, true); + + clearTelemetry(); + + // Reset the stub so that we are no longer in an experiment. + getVariableStub.returns(null); + NimbusFeatures.search.onUpdate.firstCall.args[0](); + + await checkTelemetry("experiment", testChromeIconEngine, null, true); +}); diff --git a/toolkit/components/telemetry/app/ClientID.jsm b/toolkit/components/telemetry/app/ClientID.jsm index 120c89b0f36..f14b3ef6d56 100644 --- a/toolkit/components/telemetry/app/ClientID.jsm +++ b/toolkit/components/telemetry/app/ClientID.jsm @@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["ClientID"]; const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); diff --git a/toolkit/components/telemetry/app/TelemetryArchive.jsm b/toolkit/components/telemetry/app/TelemetryArchive.jsm index 69a5eb2c459..27ebe2fed9f 100644 --- a/toolkit/components/telemetry/app/TelemetryArchive.jsm +++ b/toolkit/components/telemetry/app/TelemetryArchive.jsm @@ -6,7 +6,9 @@ var EXPORTED_SYMBOLS = ["TelemetryArchive"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" ); diff --git a/toolkit/components/telemetry/app/TelemetryControllerBase.jsm b/toolkit/components/telemetry/app/TelemetryControllerBase.jsm index af25918d678..ec400bb306b 100644 --- a/toolkit/components/telemetry/app/TelemetryControllerBase.jsm +++ b/toolkit/components/telemetry/app/TelemetryControllerBase.jsm @@ -10,7 +10,9 @@ var EXPORTED_SYMBOLS = ["TelemetryControllerBase"]; const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const LOGGER_NAME = "Toolkit.Telemetry"; const LOGGER_PREFIX = "TelemetryController::"; diff --git a/toolkit/components/telemetry/app/TelemetryControllerParent.jsm b/toolkit/components/telemetry/app/TelemetryControllerParent.jsm index 9595ba65be3..00daa446ab9 100644 --- a/toolkit/components/telemetry/app/TelemetryControllerParent.jsm +++ b/toolkit/components/telemetry/app/TelemetryControllerParent.jsm @@ -11,8 +11,8 @@ const { AppConstants } = ChromeUtils.import( const { AsyncShutdown } = ChromeUtils.import( "resource://gre/modules/AsyncShutdown.jsm" ); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { DeferredTask } = ChromeUtils.import( "resource://gre/modules/DeferredTask.jsm" diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm index e8e432f46d7..b11d3409be6 100644 --- a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm +++ b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm @@ -6,7 +6,9 @@ var EXPORTED_SYMBOLS = ["TelemetryEnvironment", "Policy"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { TelemetryUtils } = ChromeUtils.import( "resource://gre/modules/TelemetryUtils.jsm" ); @@ -16,8 +18,8 @@ const { ObjectUtils } = ChromeUtils.import( const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { UpdateUtils } = ChromeUtils.import( - "resource://gre/modules/UpdateUtils.jsm" +const { UpdateUtils } = ChromeUtils.importESModule( + "resource://gre/modules/UpdateUtils.sys.mjs" ); const Utils = TelemetryUtils; @@ -33,16 +35,10 @@ ChromeUtils.defineModuleGetter( "AttributionCode", "resource:///modules/AttributionCode.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "ProfileAge", - "resource://gre/modules/ProfileAge.jsm" -); -ChromeUtils.defineModuleGetter( - lazy, - "WindowsRegistry", - "resource://gre/modules/WindowsRegistry.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs", + WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs", +}); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm b/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm index 13e4e4190ea..bc2c2ee8e3c 100644 --- a/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm +++ b/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm @@ -6,7 +6,9 @@ var EXPORTED_SYMBOLS = ["TelemetryReportingPolicy", "Policy"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { clearTimeout, setTimeout } = ChromeUtils.import( "resource://gre/modules/Timer.jsm" ); diff --git a/toolkit/components/telemetry/app/TelemetryScheduler.jsm b/toolkit/components/telemetry/app/TelemetryScheduler.jsm index 06ab136f7ec..12490df709f 100644 --- a/toolkit/components/telemetry/app/TelemetryScheduler.jsm +++ b/toolkit/components/telemetry/app/TelemetryScheduler.jsm @@ -6,7 +6,9 @@ var EXPORTED_SYMBOLS = ["TelemetryScheduler", "Policy"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { TelemetrySession } = ChromeUtils.import( "resource://gre/modules/TelemetrySession.jsm" ); diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm b/toolkit/components/telemetry/app/TelemetrySend.jsm index c913bca0f99..a4f20d1c61b 100644 --- a/toolkit/components/telemetry/app/TelemetrySend.jsm +++ b/toolkit/components/telemetry/app/TelemetrySend.jsm @@ -25,12 +25,14 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); const { ClientID } = ChromeUtils.import("resource://gre/modules/ClientID.jsm"); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" ); -const { ServiceRequest } = ChromeUtils.import( - "resource://gre/modules/ServiceRequest.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" +); +const { ServiceRequest } = ChromeUtils.importESModule( + "resource://gre/modules/ServiceRequest.sys.mjs" ); const { TelemetryUtils } = ChromeUtils.import( "resource://gre/modules/TelemetryUtils.jsm" diff --git a/toolkit/components/telemetry/app/TelemetryStorage.jsm b/toolkit/components/telemetry/app/TelemetryStorage.jsm index f5796c06cc4..f3712da2246 100644 --- a/toolkit/components/telemetry/app/TelemetryStorage.jsm +++ b/toolkit/components/telemetry/app/TelemetryStorage.jsm @@ -10,7 +10,9 @@ var EXPORTED_SYMBOLS = ["TelemetryStorage", "Policy"]; const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/telemetry/app/TelemetryUtils.jsm b/toolkit/components/telemetry/app/TelemetryUtils.jsm index e1e0aef3d4f..30130db2c93 100644 --- a/toolkit/components/telemetry/app/TelemetryUtils.jsm +++ b/toolkit/components/telemetry/app/TelemetryUtils.jsm @@ -10,11 +10,9 @@ const { TelemetryControllerBase } = ChromeUtils.import( "resource://gre/modules/TelemetryControllerBase.jsm" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", +}); const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000; diff --git a/toolkit/components/telemetry/pings/CoveragePing.jsm b/toolkit/components/telemetry/pings/CoveragePing.jsm index a91d39a277a..6866e888a5c 100644 --- a/toolkit/components/telemetry/pings/CoveragePing.jsm +++ b/toolkit/components/telemetry/pings/CoveragePing.jsm @@ -3,7 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const lazy = {}; @@ -12,21 +14,11 @@ ChromeUtils.defineModuleGetter( "CommonUtils", "resource://services-common/utils.js" ); -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); -ChromeUtils.defineModuleGetter( - lazy, - "ServiceRequest", - "resource://gre/modules/ServiceRequest.jsm" -); -ChromeUtils.defineModuleGetter( - lazy, - "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", + ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs", + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", +}); var EXPORTED_SYMBOLS = ["CoveragePing"]; diff --git a/toolkit/components/telemetry/pings/EventPing.jsm b/toolkit/components/telemetry/pings/EventPing.jsm index 8641c26fd84..79180cfc100 100644 --- a/toolkit/components/telemetry/pings/EventPing.jsm +++ b/toolkit/components/telemetry/pings/EventPing.jsm @@ -20,10 +20,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { TelemetrySession: "resource://gre/modules/TelemetrySession.jsm", TelemetryController: "resource://gre/modules/TelemetryController.jsm", - Log: "resource://gre/modules/Log.jsm", }); ChromeUtils.defineModuleGetter( diff --git a/toolkit/components/telemetry/pings/HealthPing.jsm b/toolkit/components/telemetry/pings/HealthPing.jsm index 088046b759d..22c748ac0af 100644 --- a/toolkit/components/telemetry/pings/HealthPing.jsm +++ b/toolkit/components/telemetry/pings/HealthPing.jsm @@ -34,7 +34,9 @@ ChromeUtils.defineModuleGetter( "clearTimeout", "resource://gre/modules/Timer.jsm" ); -ChromeUtils.defineModuleGetter(lazy, "Log", "resource://gre/modules/Log.jsm"); +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); const Utils = TelemetryUtils; diff --git a/toolkit/components/telemetry/pings/ModulesPing.jsm b/toolkit/components/telemetry/pings/ModulesPing.jsm index 704e5836f6b..73c81e6c969 100644 --- a/toolkit/components/telemetry/pings/ModulesPing.jsm +++ b/toolkit/components/telemetry/pings/ModulesPing.jsm @@ -7,7 +7,9 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/telemetry/pings/PrioPing.jsm b/toolkit/components/telemetry/pings/PrioPing.jsm index 71dc092c268..0bfc5f7f7e3 100644 --- a/toolkit/components/telemetry/pings/PrioPing.jsm +++ b/toolkit/components/telemetry/pings/PrioPing.jsm @@ -17,9 +17,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { TelemetryController: "resource://gre/modules/TelemetryController.jsm", - Log: "resource://gre/modules/Log.jsm", }); const { TelemetryUtils } = ChromeUtils.import( diff --git a/toolkit/components/telemetry/pings/TelemetrySession.jsm b/toolkit/components/telemetry/pings/TelemetrySession.jsm index 3b2304dd601..9ba14a1a406 100644 --- a/toolkit/components/telemetry/pings/TelemetrySession.jsm +++ b/toolkit/components/telemetry/pings/TelemetrySession.jsm @@ -5,7 +5,9 @@ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm index 2e7eedc26d5..027857853ef 100644 --- a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm +++ b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm @@ -13,7 +13,9 @@ var EXPORTED_SYMBOLS = ["TelemetryUntrustedModulesPing"]; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); diff --git a/toolkit/components/telemetry/pings/UpdatePing.jsm b/toolkit/components/telemetry/pings/UpdatePing.jsm index 25d5a9aea0f..d0359c2d9fe 100644 --- a/toolkit/components/telemetry/pings/UpdatePing.jsm +++ b/toolkit/components/telemetry/pings/UpdatePing.jsm @@ -5,7 +5,9 @@ "use strict"; -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); +const { Log } = ChromeUtils.importESModule( + "resource://gre/modules/Log.sys.mjs" +); const { TelemetryUtils } = ChromeUtils.import( "resource://gre/modules/TelemetryUtils.jsm" ); diff --git a/toolkit/components/telemetry/tests/unit/head.js b/toolkit/components/telemetry/tests/unit/head.js index c141a598675..f2be1209a31 100644 --- a/toolkit/components/telemetry/tests/unit/head.js +++ b/toolkit/components/telemetry/tests/unit/head.js @@ -8,18 +8,21 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + Log: "resource://gre/modules/Log.sys.mjs", + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { TelemetryScheduler: "resource://gre/modules/TelemetryScheduler.jsm", TelemetryController: "resource://gre/modules/TelemetryController.jsm", TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm", AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", - Log: "resource://gre/modules/Log.jsm", HttpServer: "resource://testing-common/httpd.js", NetUtil: "resource://gre/modules/NetUtil.jsm", OS: "resource://gre/modules/osfile.jsm", Preferences: "resource://gre/modules/Preferences.jsm", - PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", TelemetrySend: "resource://gre/modules/TelemetrySend.jsm", TelemetryStorage: "resource://gre/modules/TelemetryStorage.jsm", }); diff --git a/toolkit/components/telemetry/tests/unit/test_PingSender.js b/toolkit/components/telemetry/tests/unit/test_PingSender.js index 45eca48360b..2859f872ac5 100644 --- a/toolkit/components/telemetry/tests/unit/test_PingSender.js +++ b/toolkit/components/telemetry/tests/unit/test_PingSender.js @@ -7,8 +7,8 @@ "use strict"; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { TelemetrySend } = ChromeUtils.import( "resource://gre/modules/TelemetrySend.jsm" diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js b/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js index d063a358563..8257c27878f 100644 --- a/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js +++ b/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js @@ -9,8 +9,8 @@ const { TelemetryReportingPolicy } = ChromeUtils.import( "resource://gre/modules/TelemetryReportingPolicy.jsm" ); -const { UpdateUtils } = ChromeUtils.import( - "resource://gre/modules/UpdateUtils.jsm" +const { UpdateUtils } = ChromeUtils.importESModule( + "resource://gre/modules/UpdateUtils.sys.mjs" ); const TEST_CHANNEL = "TestChannelABC"; diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js b/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js index 060ce8ef73f..a40a2ba9b3d 100644 --- a/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js +++ b/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js @@ -7,8 +7,8 @@ const { Preferences } = ChromeUtils.import( const { TelemetryUtils } = ChromeUtils.import( "resource://gre/modules/TelemetryUtils.jsm" ); -const { UpdateUtils } = ChromeUtils.import( - "resource://gre/modules/UpdateUtils.jsm" +const { UpdateUtils } = ChromeUtils.importESModule( + "resource://gre/modules/UpdateUtils.sys.mjs" ); add_task(async function testUpdateChannelOverride() { diff --git a/toolkit/components/telemetry/tests/unit/test_UninstallPing.js b/toolkit/components/telemetry/tests/unit/test_UninstallPing.js index 756ad38da6f..d81302e262f 100644 --- a/toolkit/components/telemetry/tests/unit/test_UninstallPing.js +++ b/toolkit/components/telemetry/tests/unit/test_UninstallPing.js @@ -7,8 +7,8 @@ const { TelemetryStorage } = ChromeUtils.import( "resource://gre/modules/TelemetryStorage.jsm" ); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const gFakeInstallPathHash = "0123456789ABCDEF"; diff --git a/toolkit/components/terminator/TerminatorTelemetry.jsm b/toolkit/components/terminator/TerminatorTelemetry.jsm index fa8a745e577..b771ad341e6 100644 --- a/toolkit/components/terminator/TerminatorTelemetry.jsm +++ b/toolkit/components/terminator/TerminatorTelemetry.jsm @@ -19,11 +19,9 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/Timer.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); function nsTerminatorTelemetry() { this._wasNotified = false; diff --git a/toolkit/components/thumbnails/PageThumbUtils.jsm b/toolkit/components/thumbnails/PageThumbUtils.jsm index c6022c25144..fe5df93348a 100644 --- a/toolkit/components/thumbnails/PageThumbUtils.jsm +++ b/toolkit/components/thumbnails/PageThumbUtils.jsm @@ -11,11 +11,9 @@ var EXPORTED_SYMBOLS = ["PageThumbUtils"]; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "BrowserUtils", - "resource://gre/modules/BrowserUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", +}); var PageThumbUtils = { // The default thumbnail size for images diff --git a/toolkit/components/thumbnails/test/head.js b/toolkit/components/thumbnails/test/head.js index f5ca5e99311..55037b44d6f 100644 --- a/toolkit/components/thumbnails/test/head.js +++ b/toolkit/components/thumbnails/test/head.js @@ -2,13 +2,13 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { BackgroundPageThumbs: "resource://gre/modules/BackgroundPageThumbs.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", - NewTabUtils: "resource://gre/modules/NewTabUtils.jsm", PageThumbs: "resource://gre/modules/PageThumbs.jsm", PageThumbsStorage: "resource://gre/modules/PageThumbs.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp index 2cb75e5a9be..289d03874b3 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp @@ -30,7 +30,6 @@ #include "nsIObserverService.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" -#include "nsMemory.h" #include "nsPIDOMWindow.h" #include "nsServiceManagerUtils.h" #include "nsThreadManager.h" diff --git a/toolkit/components/urlformatter/URLFormatter.jsm b/toolkit/components/urlformatter/URLFormatter.jsm index 036a5a2ec0b..4e37cdab3d1 100644 --- a/toolkit/components/urlformatter/URLFormatter.jsm +++ b/toolkit/components/urlformatter/URLFormatter.jsm @@ -25,14 +25,9 @@ const PREF_APP_DISTRIBUTION_VERSION = "distribution.version"; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm" -); - ChromeUtils.defineESModuleGetters(lazy, { Region: "resource://gre/modules/Region.sys.mjs", + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", }); function nsURLFormatterService() { diff --git a/toolkit/components/utils/ClientEnvironment.jsm b/toolkit/components/utils/ClientEnvironment.jsm index 88120d64606..e358e6bae50 100644 --- a/toolkit/components/utils/ClientEnvironment.jsm +++ b/toolkit/components/utils/ClientEnvironment.jsm @@ -15,7 +15,9 @@ ChromeUtils.defineModuleGetter(lazy, "ShellService", "resource:///modules/ShellS ChromeUtils.defineModuleGetter(lazy, "AddonManager", "resource://gre/modules/AddonManager.jsm"); ChromeUtils.defineModuleGetter(lazy, "TelemetryArchive", "resource://gre/modules/TelemetryArchive.jsm"); ChromeUtils.defineModuleGetter(lazy, "TelemetryController", "resource://gre/modules/TelemetryController.jsm"); -ChromeUtils.defineModuleGetter(lazy, "UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"); +ChromeUtils.defineESModuleGetters(lazy, { + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs" +}); ChromeUtils.defineModuleGetter(lazy, "AttributionCode", "resource:///modules/AttributionCode.jsm"); ChromeUtils.defineModuleGetter(lazy, "WindowsVersionInfo", "resource://gre/modules/components-utils/WindowsVersionInfo.jsm"); ChromeUtils.defineModuleGetter(lazy, "NormandyUtils", "resource://normandy/lib/NormandyUtils.jsm"); diff --git a/toolkit/components/viewsource/test/browser/head.js b/toolkit/components/viewsource/test/browser/head.js index d14b450b743..40b22746677 100644 --- a/toolkit/components/viewsource/test/browser/head.js +++ b/toolkit/components/viewsource/test/browser/head.js @@ -2,8 +2,8 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -var { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" +var { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); const { Preferences } = ChromeUtils.import( "resource://gre/modules/Preferences.jsm" diff --git a/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js b/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js index aa6cf613797..b764b281b43 100644 --- a/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js +++ b/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js @@ -3,8 +3,8 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); add_task( diff --git a/toolkit/content/aboutAbout.js b/toolkit/content/aboutAbout.js index 013aaec7448..d4a1a9c5e34 100644 --- a/toolkit/content/aboutAbout.js +++ b/toolkit/content/aboutAbout.js @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const { AboutPagesUtils } = ChromeUtils.import( - "resource://gre/modules/AboutPagesUtils.jsm" +const { AboutPagesUtils } = ChromeUtils.importESModule( + "resource://gre/modules/AboutPagesUtils.sys.mjs" ); var gContainer; diff --git a/toolkit/content/aboutNetworking.js b/toolkit/content/aboutNetworking.js index 7d110bda587..1c3261b8968 100644 --- a/toolkit/content/aboutNetworking.js +++ b/toolkit/content/aboutNetworking.js @@ -4,8 +4,9 @@ "use strict"; -const FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm") - .FileUtils; +const FileUtils = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" +).FileUtils; const gEnv = Cc["@mozilla.org/process/environment;1"].getService( Ci.nsIEnvironment ); diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index d7c062b9819..1b1f100c07a 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -4,11 +4,11 @@ "use strict"; -const { Troubleshoot } = ChromeUtils.import( - "resource://gre/modules/Troubleshoot.jsm" +const { Troubleshoot } = ChromeUtils.importESModule( + "resource://gre/modules/Troubleshoot.sys.mjs" ); -const { ResetProfile } = ChromeUtils.import( - "resource://gre/modules/ResetProfile.jsm" +const { ResetProfile } = ChromeUtils.importESModule( + "resource://gre/modules/ResetProfile.sys.mjs" ); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" @@ -27,12 +27,8 @@ ChromeUtils.defineModuleGetter( ); ChromeUtils.defineESModuleGetters(this, { PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs", + ProcessType: "resource://gre/modules/ProcessType.sys.mjs", }); -ChromeUtils.defineModuleGetter( - this, - "ProcessType", - "resource://gre/modules/ProcessType.jsm" -); window.addEventListener("load", function onload(event) { try { diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js index 8d4262bf2c2..34ce44c92fc 100644 --- a/toolkit/content/aboutTelemetry.js +++ b/toolkit/content/aboutTelemetry.js @@ -4,8 +4,8 @@ "use strict"; -const { BrowserUtils } = ChromeUtils.import( - "resource://gre/modules/BrowserUtils.jsm" +const { BrowserUtils } = ChromeUtils.importESModule( + "resource://gre/modules/BrowserUtils.sys.mjs" ); const { TelemetryTimestamps } = ChromeUtils.import( "resource://gre/modules/TelemetryTimestamps.jsm" diff --git a/toolkit/content/aboutwebrtc/aboutWebrtc.js b/toolkit/content/aboutwebrtc/aboutWebrtc.js index db14b5a8c48..707cf537d56 100644 --- a/toolkit/content/aboutwebrtc/aboutWebrtc.js +++ b/toolkit/content/aboutwebrtc/aboutWebrtc.js @@ -7,11 +7,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -ChromeUtils.defineModuleGetter( - this, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); XPCOMUtils.defineLazyServiceGetter( this, "FilePicker", diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js index c6bbf434b57..8ab181a5a26 100644 --- a/toolkit/content/contentAreaUtils.js +++ b/toolkit/content/contentAreaUtils.js @@ -9,12 +9,15 @@ var { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); +ChromeUtils.defineESModuleGetters(this, { + BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { - BrowserUtils: "resource://gre/modules/BrowserUtils.jsm", Downloads: "resource://gre/modules/Downloads.jsm", DownloadPaths: "resource://gre/modules/DownloadPaths.jsm", DownloadLastDir: "resource://gre/modules/DownloadLastDir.jsm", - FileUtils: "resource://gre/modules/FileUtils.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", Deprecated: "resource://gre/modules/Deprecated.jsm", NetUtil: "resource://gre/modules/NetUtil.jsm", diff --git a/toolkit/content/tests/browser/browser_save_folder_standalone_image.js b/toolkit/content/tests/browser/browser_save_folder_standalone_image.js index 00820251d56..c3c035ea384 100644 --- a/toolkit/content/tests/browser/browser_save_folder_standalone_image.js +++ b/toolkit/content/tests/browser/browser_save_folder_standalone_image.js @@ -49,8 +49,8 @@ MockFilePicker.init(window); const { DownloadLastDir } = ChromeUtils.import( "resource://gre/modules/DownloadLastDir.jsm" ); -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); add_task(async function() { diff --git a/toolkit/content/widgets/browser-custom-element.js b/toolkit/content/widgets/browser-custom-element.js index e57c9bbfed6..9108be6c98a 100644 --- a/toolkit/content/widgets/browser-custom-element.js +++ b/toolkit/content/widgets/browser-custom-element.js @@ -11,8 +11,8 @@ "resource://gre/modules/AppConstants.jsm" ); - const { BrowserUtils } = ChromeUtils.import( - "resource://gre/modules/BrowserUtils.jsm" + const { BrowserUtils } = ChromeUtils.importESModule( + "resource://gre/modules/BrowserUtils.sys.mjs" ); const { XPCOMUtils } = ChromeUtils.importESModule( @@ -482,8 +482,9 @@ get finder() { if (this.isRemoteBrowser) { if (!this._remoteFinder) { - let jsm = "resource://gre/modules/FinderParent.jsm"; - let { FinderParent } = ChromeUtils.import(jsm); + let { FinderParent } = ChromeUtils.importESModule( + "resource://gre/modules/FinderParent.sys.mjs" + ); this._remoteFinder = new FinderParent(this); } return this._remoteFinder; @@ -493,8 +494,8 @@ return null; } - let { Finder } = ChromeUtils.import( - "resource://gre/modules/Finder.jsm" + let { Finder } = ChromeUtils.importESModule( + "resource://gre/modules/Finder.sys.mjs" ); this._finder = new Finder(this.docShell); } diff --git a/toolkit/content/widgets/editor.js b/toolkit/content/widgets/editor.js index 4f4f4945281..91b3415a064 100644 --- a/toolkit/content/widgets/editor.js +++ b/toolkit/content/widgets/editor.js @@ -50,8 +50,8 @@ return null; } - let { Finder } = ChromeUtils.import( - "resource://gre/modules/Finder.jsm" + let { Finder } = ChromeUtils.importESModule( + "resource://gre/modules/Finder.sys.mjs" ); this._finder = new Finder(this.docShell); } diff --git a/toolkit/content/widgets/findbar.js b/toolkit/content/widgets/findbar.js index 2afcc84721e..d291d8b0d02 100644 --- a/toolkit/content/widgets/findbar.js +++ b/toolkit/content/widgets/findbar.js @@ -1135,8 +1135,8 @@ ); } - let { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" + let { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); this._startFindDeferred = PromiseUtils.defer(); let startFindPromise = this._startFindDeferred.promise; diff --git a/toolkit/content/widgets/menu.js b/toolkit/content/widgets/menu.js index f74168d1eda..0ac0edc7ec9 100644 --- a/toolkit/content/widgets/menu.js +++ b/toolkit/content/widgets/menu.js @@ -8,11 +8,9 @@ // leaking to window scope. { let imports = {}; - ChromeUtils.defineModuleGetter( - imports, - "ShortcutUtils", - "resource://gre/modules/ShortcutUtils.jsm" - ); + ChromeUtils.defineESModuleGetters(imports, { + ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", + }); const MozMenuItemBaseMixin = Base => { class MozMenuItemBase extends MozElements.BaseTextMixin(Base) { diff --git a/toolkit/content/widgets/moz-input-box.js b/toolkit/content/widgets/moz-input-box.js index 596d8f18760..40051b48850 100644 --- a/toolkit/content/widgets/moz-input-box.js +++ b/toolkit/content/widgets/moz-input-box.js @@ -187,8 +187,8 @@ this._spellCheckInitialized = true; try { - const { InlineSpellChecker } = ChromeUtils.import( - "resource://gre/modules/InlineSpellChecker.jsm" + const { InlineSpellChecker } = ChromeUtils.importESModule( + "resource://gre/modules/InlineSpellChecker.sys.mjs" ); this.InlineSpellCheckerUI = new InlineSpellChecker( this._input.editor diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js index 9d9d231cfc9..464b9d59144 100644 --- a/toolkit/content/widgets/tabbox.js +++ b/toolkit/content/widgets/tabbox.js @@ -12,11 +12,9 @@ ); let imports = {}; - ChromeUtils.defineModuleGetter( - imports, - "ShortcutUtils", - "resource://gre/modules/ShortcutUtils.jsm" - ); + ChromeUtils.defineESModuleGetters(imports, { + ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", + }); class MozTabbox extends MozXULElement { constructor() { diff --git a/toolkit/crashreporter/CrashSubmit.jsm b/toolkit/crashreporter/CrashSubmit.jsm index fe42d9f8771..430e83fb871 100644 --- a/toolkit/crashreporter/CrashSubmit.jsm +++ b/toolkit/crashreporter/CrashSubmit.jsm @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const { FileUtils } = ChromeUtils.import( - "resource://gre/modules/FileUtils.jsm" +const { FileUtils } = ChromeUtils.importESModule( + "resource://gre/modules/FileUtils.sys.mjs" ); const lazy = {}; diff --git a/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js b/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js index 3d4bfe89e94..e8efafbf3c1 100644 --- a/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js +++ b/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js @@ -11,8 +11,8 @@ function setup_crash() { const { AsyncShutdown } = ChromeUtils.import( "resource://gre/modules/AsyncShutdown.jsm" ); - const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" + const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); Services.prefs.setBoolPref("toolkit.asyncshutdown.testing", true); @@ -46,8 +46,8 @@ function after_crash(mdump, extra) { function setup_osfile_crash_noerror() { const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); - const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" + const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 1); @@ -83,8 +83,8 @@ function after_osfile_crash_noerror(mdump, extra) { function setup_osfile_crash_exn() { const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); - const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" + const { PromiseUtils } = ChromeUtils.importESModule( + "resource://gre/modules/PromiseUtils.sys.mjs" ); Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 1); diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml index 49544310a3f..abad670a011 100644 --- a/toolkit/library/rust/shared/Cargo.toml +++ b/toolkit/library/rust/shared/Cargo.toml @@ -25,8 +25,8 @@ webrender_bindings = { path = "../../../../gfx/webrender_bindings" } cubeb-coreaudio = { git = "https://github.com/mozilla/cubeb-coreaudio-rs", rev = "ab933e7cbd569f79b37b540412a7990a5352dd66", optional = true } cubeb-pulse = { git = "https://github.com/mozilla/cubeb-pulse-rs", rev="f32b3ef708c0bfb2c414c08971d638527353d376", optional = true, features=["pulse-dlopen"] } cubeb-sys = { version = "0.10.1", optional = true, features=["gecko-in-tree"] } -audioipc2-client = { git = "https://github.com/kinetiknz/audioipc-2", rev = "ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb", optional = true } # macos (v2) branch -audioipc2-server = { git = "https://github.com/kinetiknz/audioipc-2", rev = "ea7cabf8c9dc051a52ffb6cd7d2564b29b7428eb", optional = true } # macos (v2) branch +audioipc2-client = { git = "https://github.com/kinetiknz/audioipc-2", rev = "42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5", optional = true } # macos (v2) branch +audioipc2-server = { git = "https://github.com/kinetiknz/audioipc-2", rev = "42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5", optional = true } # macos (v2) branch audioipc-client = { git = "https://github.com/mozilla/audioipc", rev = "fb7a2b12ced3b43e6a268621989c6191d1ed7e39", optional = true } audioipc-server = { git = "https://github.com/mozilla/audioipc", rev = "fb7a2b12ced3b43e6a268621989c6191d1ed7e39", optional = true } # Force tokio-reactor on an old version to avoid new dependencies of newer versions. diff --git a/toolkit/modules/AboutPagesUtils.jsm b/toolkit/modules/AboutPagesUtils.sys.mjs similarity index 84% rename from toolkit/modules/AboutPagesUtils.jsm rename to toolkit/modules/AboutPagesUtils.sys.mjs index 2f92876e833..5b8ba5e13ca 100644 --- a/toolkit/modules/AboutPagesUtils.jsm +++ b/toolkit/modules/AboutPagesUtils.sys.mjs @@ -4,15 +4,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; -const EXPORTED_SYMBOLS = ["AboutPagesUtils"]; - -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const AboutPagesUtils = {}; +export const AboutPagesUtils = {}; XPCOMUtils.defineLazyGetter(AboutPagesUtils, "visibleAboutUrls", () => { const urls = []; diff --git a/toolkit/modules/ActorManagerParent.jsm b/toolkit/modules/ActorManagerParent.jsm index c2a1c4cd102..78518085a11 100644 --- a/toolkit/modules/ActorManagerParent.jsm +++ b/toolkit/modules/ActorManagerParent.jsm @@ -27,10 +27,10 @@ const { AppConstants } = ChromeUtils.import( let JSPROCESSACTORS = { AsyncPrefs: { parent: { - moduleURI: "resource://gre/modules/AsyncPrefs.jsm", + esModuleURI: "resource://gre/modules/AsyncPrefs.sys.mjs", }, child: { - moduleURI: "resource://gre/modules/AsyncPrefs.jsm", + esModuleURI: "resource://gre/modules/AsyncPrefs.sys.mjs", }, }, @@ -213,7 +213,9 @@ let JSWINDOWACTORS = { DOMContentLoaded: {}, }, }, - + // We only handle cookie banners for HTTP/S scheme. Avoid initializing + // actors for other schemes. + matches: ["https://*/*", "http://*/*"], allFrames: true, enablePreference: "cookiebanners.bannerClicking.enabled", }, diff --git a/toolkit/modules/AppMenuNotifications.jsm b/toolkit/modules/AppMenuNotifications.sys.mjs similarity index 98% rename from toolkit/modules/AppMenuNotifications.jsm rename to toolkit/modules/AppMenuNotifications.sys.mjs index 8c2a561cea9..15a71b03eeb 100644 --- a/toolkit/modules/AppMenuNotifications.jsm +++ b/toolkit/modules/AppMenuNotifications.sys.mjs @@ -2,10 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["AppMenuNotifications"]; - function AppMenuNotification(id, mainAction, secondaryAction, options = {}) { this.id = id; this.mainAction = mainAction; @@ -14,7 +10,7 @@ function AppMenuNotification(id, mainAction, secondaryAction, options = {}) { this.dismissed = this.options.dismissed || false; } -var AppMenuNotifications = { +export var AppMenuNotifications = { _notifications: [], _hasInitialized: false, diff --git a/toolkit/modules/AsanReporter.jsm b/toolkit/modules/AsanReporter.sys.mjs similarity index 94% rename from toolkit/modules/AsanReporter.jsm rename to toolkit/modules/AsanReporter.sys.mjs index 69f553156fa..e7859199e45 100644 --- a/toolkit/modules/AsanReporter.jsm +++ b/toolkit/modules/AsanReporter.sys.mjs @@ -3,19 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const EXPORTED_SYMBOLS = ["AsanReporter"]; - -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - Log: "resource://gre/modules/Log.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + Log: "resource://gre/modules/Log.sys.mjs", }); // Define our prefs @@ -34,7 +29,7 @@ const LOGGER_NAME = "asanreporter"; let logger; -const AsanReporter = { +export const AsanReporter = { init() { if (this.initialized) { return; diff --git a/toolkit/modules/AsyncPrefs.jsm b/toolkit/modules/AsyncPrefs.sys.mjs similarity index 95% rename from toolkit/modules/AsyncPrefs.jsm rename to toolkit/modules/AsyncPrefs.sys.mjs index afb44439c0c..f5adf11b600 100644 --- a/toolkit/modules/AsyncPrefs.jsm +++ b/toolkit/modules/AsyncPrefs.sys.mjs @@ -2,10 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["AsyncPrefs", "AsyncPrefsChild", "AsyncPrefsParent"]; - const kInChildProcess = Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT; @@ -93,7 +89,7 @@ function maybeReturnErrorForSet(pref, value) { return false; } -class AsyncPrefsChild extends JSProcessActorChild { +export class AsyncPrefsChild extends JSProcessActorChild { set(pref, value) { let error = maybeReturnErrorForSet(pref, value); if (error) { @@ -116,7 +112,7 @@ class AsyncPrefsChild extends JSProcessActorChild { } } -var AsyncPrefs = { +export var AsyncPrefs = { set(pref, value) { if (kInChildProcess) { return ChromeUtils.domProcessChild @@ -140,7 +136,7 @@ const methodForType = { string: "setCharPref", }; -class AsyncPrefsParent extends JSProcessActorParent { +export class AsyncPrefsParent extends JSProcessActorParent { static set(pref, value) { let error = maybeReturnErrorForSet(pref, value); if (error) { diff --git a/toolkit/modules/BinarySearch.jsm b/toolkit/modules/BinarySearch.sys.mjs similarity index 96% rename from toolkit/modules/BinarySearch.jsm rename to toolkit/modules/BinarySearch.sys.mjs index 51a85bb60b1..7697b770444 100644 --- a/toolkit/modules/BinarySearch.jsm +++ b/toolkit/modules/BinarySearch.sys.mjs @@ -2,11 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["BinarySearch"]; - -var BinarySearch = Object.freeze({ +export var BinarySearch = Object.freeze({ /** * Returns the index of the given target in the given array or -1 if the * target is not found. diff --git a/toolkit/modules/BrowserTelemetryUtils.jsm b/toolkit/modules/BrowserTelemetryUtils.sys.mjs similarity index 97% rename from toolkit/modules/BrowserTelemetryUtils.jsm rename to toolkit/modules/BrowserTelemetryUtils.sys.mjs index 31dcf266fe1..bacd32686d9 100644 --- a/toolkit/modules/BrowserTelemetryUtils.jsm +++ b/toolkit/modules/BrowserTelemetryUtils.sys.mjs @@ -3,13 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["BrowserTelemetryUtils"]; - -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -62,7 +56,7 @@ XPCOMUtils.defineLazyPreferenceGetter( 0 ); -var BrowserTelemetryUtils = { +export var BrowserTelemetryUtils = { recordSiteOriginTelemetry(aWindows, aIsGeckoView) { Services.tm.idleDispatchToMainThread(() => { this._recordSiteOriginTelemetry(aWindows, aIsGeckoView); diff --git a/toolkit/modules/BrowserUtils.jsm b/toolkit/modules/BrowserUtils.sys.mjs similarity index 98% rename from toolkit/modules/BrowserUtils.jsm rename to toolkit/modules/BrowserUtils.sys.mjs index 7d308df2031..0a614509f27 100644 --- a/toolkit/modules/BrowserUtils.jsm +++ b/toolkit/modules/BrowserUtils.sys.mjs @@ -3,16 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["BrowserUtils"]; - const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; + const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { Region: "resource://gre/modules/Region.sys.mjs", @@ -42,7 +37,7 @@ function stringPrefToSet(prefVal) { ); } -var BrowserUtils = { +export var BrowserUtils = { /** * Return or create a principal with the content of one, and the originAttributes * of an existing principal (e.g. on a docshell, where the originAttributes ought @@ -104,7 +99,7 @@ var BrowserUtils = { /** * Returns true if we can show a find bar, including FAYT, for the specified - * document location. The location must not be in a blacklist of specific + * document location. The location must not be in a blocklist of specific * "about:" pages for which find is disabled. * * This can be called from the parent process or from content processes. diff --git a/toolkit/modules/CertUtils.jsm b/toolkit/modules/CertUtils.sys.mjs similarity index 99% rename from toolkit/modules/CertUtils.jsm rename to toolkit/modules/CertUtils.sys.mjs index ed0a1926a80..523d504abe5 100644 --- a/toolkit/modules/CertUtils.jsm +++ b/toolkit/modules/CertUtils.sys.mjs @@ -2,8 +2,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -var EXPORTED_SYMBOLS = ["CertUtils"]; - const Ce = Components.Exception; /** @@ -222,7 +220,7 @@ BadCertHandler.prototype = { ]), }; -var CertUtils = { +export var CertUtils = { BadCertHandler, checkCert, readCertPrefs, diff --git a/toolkit/modules/Color.jsm b/toolkit/modules/Color.sys.mjs similarity index 98% rename from toolkit/modules/Color.jsm rename to toolkit/modules/Color.sys.mjs index 48d1f510f4c..d00902ef6ba 100644 --- a/toolkit/modules/Color.jsm +++ b/toolkit/modules/Color.sys.mjs @@ -2,10 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["Color"]; - /** * A list of minimum contrast ratio's per WCAG 2.0 conformance level. * Please refer to section 1.4.3 of the WCAG 2.0 spec at http://www.w3.org/TR/WCAG20/. @@ -42,7 +38,7 @@ const CONTRAST_BRIGHTTEXT_THRESHOLD = Math.sqrt(1.05 * 0.05) - 0.05; * @param {Number} g Green color component * @param {Number} b Blue color component */ -class Color { +export class Color { constructor(r, g, b) { this.r = r; this.g = g; diff --git a/toolkit/modules/CreditCard.jsm b/toolkit/modules/CreditCard.sys.mjs similarity index 99% rename from toolkit/modules/CreditCard.jsm rename to toolkit/modules/CreditCard.sys.mjs index ff2baaedb1b..781ce3e8947 100644 --- a/toolkit/modules/CreditCard.jsm +++ b/toolkit/modules/CreditCard.sys.mjs @@ -2,10 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["CreditCard", "NETWORK_NAMES"]; - // The list of known and supported credit card network ids ("types") // This list mirrors the networks from dom/payments/BasicCardPayment.cpp // and is defined by https://www.w3.org/Payments/card-network-ids @@ -23,7 +19,7 @@ const SUPPORTED_NETWORKS = Object.freeze([ // This lists stores lower cased variations of popular credit card network // names for matching against strings. -const NETWORK_NAMES = { +export const NETWORK_NAMES = { "american express": "amex", "master card": "mastercard", "union pay": "unionpay", @@ -62,7 +58,7 @@ const CREDIT_CARD_IIN = [ { type: "visa", start: 4, end: 4, len: 16 }, ].sort((a, b) => b.start - a.start); -class CreditCard { +export class CreditCard { /** * A CreditCard object represents a credit card, with * number, name, expiration, network, and CCV. diff --git a/toolkit/modules/DateTimePickerPanel.jsm b/toolkit/modules/DateTimePickerPanel.sys.mjs similarity index 98% rename from toolkit/modules/DateTimePickerPanel.jsm rename to toolkit/modules/DateTimePickerPanel.sys.mjs index 6422b8a658a..dd629194ab4 100644 --- a/toolkit/modules/DateTimePickerPanel.jsm +++ b/toolkit/modules/DateTimePickerPanel.sys.mjs @@ -2,11 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["DateTimePickerPanel"]; - -var DateTimePickerPanel = class { +export var DateTimePickerPanel = class { constructor(element) { this.element = element; diff --git a/toolkit/modules/DeferredTask.jsm b/toolkit/modules/DeferredTask.jsm index ce68738ec5c..ec4d0b7fe87 100644 --- a/toolkit/modules/DeferredTask.jsm +++ b/toolkit/modules/DeferredTask.jsm @@ -84,11 +84,9 @@ const lazy = {}; // Globals -ChromeUtils.defineModuleGetter( - lazy, - "PromiseUtils", - "resource://gre/modules/PromiseUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", +}); const Timer = Components.Constructor( "@mozilla.org/timer;1", diff --git a/toolkit/modules/E10SUtils.jsm b/toolkit/modules/E10SUtils.jsm index ed68e9687e5..c5d9d40437c 100644 --- a/toolkit/modules/E10SUtils.jsm +++ b/toolkit/modules/E10SUtils.jsm @@ -199,7 +199,7 @@ function validatedWebRemoteType( } } - // If the domain is whitelisted to allow it to use file:// URIs, then we have + // If the domain is allow listed to allow it to use file:// URIs, then we have // to run it in a file content process, in case it uses file:// sub-resources. const sm = Services.scriptSecurityManager; if (!aIsWorker && sm.inFileURIAllowlist(aTargetUri)) { diff --git a/toolkit/modules/FileUtils.jsm b/toolkit/modules/FileUtils.sys.mjs similarity index 99% rename from toolkit/modules/FileUtils.jsm rename to toolkit/modules/FileUtils.sys.mjs index 2da64bfefdd..6d038f97ac8 100644 --- a/toolkit/modules/FileUtils.jsm +++ b/toolkit/modules/FileUtils.sys.mjs @@ -3,8 +3,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -var EXPORTED_SYMBOLS = ["FileUtils"]; - const lazy = {}; ChromeUtils.defineModuleGetter( @@ -13,7 +11,7 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/Deprecated.jsm" ); -var FileUtils = { +export var FileUtils = { MODE_RDONLY: 0x01, MODE_WRONLY: 0x02, MODE_RDWR: 0x04, diff --git a/toolkit/modules/FindBarContent.jsm b/toolkit/modules/FindBarContent.sys.mjs similarity index 93% rename from toolkit/modules/FindBarContent.jsm rename to toolkit/modules/FindBarContent.sys.mjs index a56f82fbcfb..8b34d93f9d4 100644 --- a/toolkit/modules/FindBarContent.jsm +++ b/toolkit/modules/FindBarContent.sys.mjs @@ -2,20 +2,15 @@ // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -"use strict"; -var EXPORTED_SYMBOLS = ["FindBarContent"]; - -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; /* Please keep in sync with toolkit/content/widgets/findbar.js */ const FIND_NORMAL = 0; const FIND_TYPEAHEAD = 1; const FIND_LINKS = 2; -class FindBarContent { +export class FindBarContent { constructor(actor) { this.actor = actor; diff --git a/toolkit/modules/Finder.jsm b/toolkit/modules/Finder.sys.mjs similarity index 97% rename from toolkit/modules/Finder.jsm rename to toolkit/modules/Finder.sys.mjs index c78d392c03b..16bc4b66699 100644 --- a/toolkit/modules/Finder.jsm +++ b/toolkit/modules/Finder.sys.mjs @@ -3,16 +3,9 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -var EXPORTED_SYMBOLS = [ - "Finder", - "GetClipboardSearchString", - "SetClipboardSearchString", -]; +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); -const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm"); +import { Rect } from "resource://gre/modules/Geometry.sys.mjs"; const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" @@ -20,11 +13,9 @@ const { AppConstants } = ChromeUtils.import( const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "FinderIterator", - "resource://gre/modules/FinderIterator.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + FinderIterator: "resource://gre/modules/FinderIterator.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, @@ -44,7 +35,7 @@ const kMatchesCountLimitPref = "accessibility.typeaheadfind.matchesCountLimit"; const activeFinderRoots = new WeakSet(); -function Finder(docShell) { +export function Finder(docShell) { this._fastFind = Cc["@mozilla.org/typeaheadfind;1"].createInstance( Ci.nsITypeAheadFind ); @@ -188,8 +179,8 @@ Finder.prototype = { return this._highlighter; } - const { FinderHighlighter } = ChromeUtils.import( - "resource://gre/modules/FinderHighlighter.jsm" + const { FinderHighlighter } = ChromeUtils.importESModule( + "resource://gre/modules/FinderHighlighter.sys.mjs" ); return (this._highlighter = new FinderHighlighter(this)); }, @@ -822,7 +813,7 @@ Finder.prototype = { ]), }; -function GetClipboardSearchString(aLoadContext) { +export function GetClipboardSearchString(aLoadContext) { let searchString = ""; if (!Services.clipboard.supportsFindClipboard()) { return searchString; @@ -848,7 +839,7 @@ function GetClipboardSearchString(aLoadContext) { return searchString; } -function SetClipboardSearchString(aSearchString) { +export function SetClipboardSearchString(aSearchString) { if (!aSearchString || !Services.clipboard.supportsFindClipboard()) { return; } diff --git a/toolkit/modules/FinderHighlighter.jsm b/toolkit/modules/FinderHighlighter.sys.mjs similarity index 99% rename from toolkit/modules/FinderHighlighter.jsm rename to toolkit/modules/FinderHighlighter.sys.mjs index 53f4e775fde..536c45b7796 100644 --- a/toolkit/modules/FinderHighlighter.jsm +++ b/toolkit/modules/FinderHighlighter.sys.mjs @@ -2,26 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["FinderHighlighter"]; - -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "Color", - "resource://gre/modules/Color.jsm" -); -ChromeUtils.defineModuleGetter( - lazy, - "Rect", - "resource://gre/modules/Geometry.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + Color: "resource://gre/modules/Color.sys.mjs", + Rect: "resource://gre/modules/Geometry.sys.mjs", +}); XPCOMUtils.defineLazyGetter(lazy, "kDebug", () => { const kDebugPref = "findbar.modalHighlight.debug"; return ( @@ -176,7 +164,7 @@ let gWindows = new WeakMap(); * @param {boolean} useTop check and use top-level windows for rectangle * computation, if possible. */ -function FinderHighlighter(finder, useTop = false) { +export function FinderHighlighter(finder, useTop = false) { this._highlightAll = Services.prefs.getBoolPref(kHighlightAllPref); this._modal = Services.prefs.getBoolPref(kModalHighlightPref); this._useSubFrames = false; diff --git a/toolkit/modules/FinderIterator.jsm b/toolkit/modules/FinderIterator.sys.mjs similarity index 99% rename from toolkit/modules/FinderIterator.jsm rename to toolkit/modules/FinderIterator.sys.mjs index 3516f6c67e3..c894b37f589 100644 --- a/toolkit/modules/FinderIterator.jsm +++ b/toolkit/modules/FinderIterator.sys.mjs @@ -2,22 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["FinderIterator"]; - const { clearTimeout, setTimeout } = ChromeUtils.import( "resource://gre/modules/Timer.jsm" ); const lazy = {}; -ChromeUtils.defineModuleGetter(lazy, "NLP", "resource://gre/modules/NLP.jsm"); -ChromeUtils.defineModuleGetter( - lazy, - "Rect", - "resource://gre/modules/Geometry.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + NLP: "resource://gre/modules/NLP.sys.mjs", + Rect: "resource://gre/modules/Geometry.sys.mjs", +}); const kDebug = false; const kIterationSizeMax = 100; @@ -27,7 +21,7 @@ const kTimeoutPref = "findbar.iteratorTimeout"; * FinderIterator. See the documentation for the `start()` method to * learn more. */ -function FinderIterator() { +export function FinderIterator() { this._listeners = new Map(); this._currentParams = null; this._catchingUp = new Set(); diff --git a/toolkit/modules/FinderParent.jsm b/toolkit/modules/FinderParent.sys.mjs similarity index 97% rename from toolkit/modules/FinderParent.jsm rename to toolkit/modules/FinderParent.sys.mjs index 6cce99e9354..3c18a1bab87 100644 --- a/toolkit/modules/FinderParent.jsm +++ b/toolkit/modules/FinderParent.sys.mjs @@ -4,29 +4,18 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -var EXPORTED_SYMBOLS = ["FinderParent"]; - const kModalHighlightPref = "findbar.modalHighlight"; const kSoundEnabledPref = "accessibility.typeaheadfind.enablesound"; const kNotFoundSoundPref = "accessibility.typeaheadfind.soundURL"; -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "GetClipboardSearchString", - "resource://gre/modules/Finder.jsm" -); - -ChromeUtils.defineModuleGetter( - lazy, - "Rect", - "resource://gre/modules/Geometry.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + GetClipboardSearchString: "resource://gre/modules/Finder.sys.mjs", + Rect: "resource://gre/modules/Geometry.sys.mjs", +}); const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing"; @@ -51,7 +40,7 @@ XPCOMUtils.defineLazyPreferenceGetter( "" ); -function FinderParent(browser) { +export function FinderParent(browser) { this._listeners = new Set(); this._searchString = ""; this._foundSearchString = null; diff --git a/toolkit/modules/FirstStartup.jsm b/toolkit/modules/FirstStartup.sys.mjs similarity index 94% rename from toolkit/modules/FirstStartup.jsm rename to toolkit/modules/FirstStartup.sys.mjs index 05088e66a0a..a7add29bcfe 100644 --- a/toolkit/modules/FirstStartup.jsm +++ b/toolkit/modules/FirstStartup.sys.mjs @@ -2,14 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -var EXPORTED_SYMBOLS = ["FirstStartup"]; - const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -29,7 +25,7 @@ const PREF_TIMEOUT = "first-startup.timeout"; * In this scenario, the installer does not exit until the first application window appears, * which gives the user experience of the application starting up quickly on first install. */ -var FirstStartup = { +export var FirstStartup = { NOT_STARTED: 0, IN_PROGRESS: 1, TIMED_OUT: 2, diff --git a/toolkit/modules/FormLikeFactory.jsm b/toolkit/modules/FormLikeFactory.sys.mjs similarity index 97% rename from toolkit/modules/FormLikeFactory.jsm rename to toolkit/modules/FormLikeFactory.sys.mjs index c3a823b86cc..bc20838c289 100644 --- a/toolkit/modules/FormLikeFactory.jsm +++ b/toolkit/modules/FormLikeFactory.sys.mjs @@ -2,20 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["FormLikeFactory"]; - -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; /** * A factory to generate FormLike objects that represent a set of related fields * which aren't necessarily marked up with a
element. FormLike's emulate * the properties of an HTMLFormElement which are relevant to form tasks. */ -let FormLikeFactory = { +export let FormLikeFactory = { _propsFromForm: ["action", "autocomplete", "ownerDocument"], /** diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.sys.mjs similarity index 96% rename from toolkit/modules/GMPInstallManager.jsm rename to toolkit/modules/GMPInstallManager.sys.mjs index 62c236be23b..a4cb2948b73 100644 --- a/toolkit/modules/GMPInstallManager.jsm +++ b/toolkit/modules/GMPInstallManager.sys.mjs @@ -2,52 +2,31 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - // 1 day default const DEFAULT_SECONDS_BETWEEN_CHECKS = 60 * 60 * 24; -const { PromiseUtils } = ChromeUtils.import( - "resource://gre/modules/PromiseUtils.jsm" -); -const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm"); -const { GMPPrefs, GMPUtils, GMP_PLUGIN_IDS, WIDEVINE_ID } = ChromeUtils.import( - "resource://gre/modules/GMPUtils.jsm" -); +import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs"; + +import { Log } from "resource://gre/modules/Log.sys.mjs"; +import { + GMPPrefs, + GMPUtils, + GMP_PLUGIN_IDS, + WIDEVINE_ID, +} from "resource://gre/modules/GMPUtils.sys.mjs"; + const { ProductAddonChecker } = ChromeUtils.import( "resource://gre/modules/addons/ProductAddonChecker.jsm" ); -var EXPORTED_SYMBOLS = [ - "GMPInstallManager", - "GMPExtractor", - "GMPDownloader", - "GMPAddon", -]; - const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "CertUtils", - "resource://gre/modules/CertUtils.jsm" -); -ChromeUtils.defineModuleGetter( - lazy, - "FileUtils", - "resource://gre/modules/FileUtils.jsm" -); -ChromeUtils.defineModuleGetter( - lazy, - "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm" -); - -ChromeUtils.defineModuleGetter( - lazy, - "ServiceRequest", - "resource://gre/modules/ServiceRequest.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + CertUtils: "resource://gre/modules/CertUtils.sys.mjs", + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs", + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", +}); function getScopedLogger(prefix) { // `PARENT_LOGGER_ID.` being passed here effectively links this logger @@ -141,7 +120,8 @@ function downloadLocalConfig() { /** * Provides an easy API for downloading and installing GMP Addons */ -function GMPInstallManager() {} +export function GMPInstallManager() {} + /** * Temp file name used for downloading */ @@ -599,7 +579,7 @@ GMPInstallManager.prototype = { * * @param addon The ProductAddonChecker `addon` object */ -function GMPAddon(addon) { +export function GMPAddon(addon) { let log = getScopedLogger("GMPAddon.constructor"); for (let name of Object.keys(addon)) { this[name] = addon[name]; @@ -664,6 +644,7 @@ GMPAddon.prototype = { ); }, }; + /** * Constructs a GMPExtractor object which is used to extract a GMP zip * into the specified location. @@ -671,10 +652,11 @@ GMPAddon.prototype = { * @param relativePath The relative path components inside the profile directory * to extract the zip to. */ -function GMPExtractor(zipPath, relativeInstallPath) { +export function GMPExtractor(zipPath, relativeInstallPath) { this.zipPath = zipPath; this.relativeInstallPath = relativeInstallPath; } + GMPExtractor.prototype = { /** * Installs the this.zipPath contents into the directory used to store GMP @@ -717,7 +699,7 @@ GMPExtractor.prototype = { * the specified GMPAddon object. * @param gmpAddon The addon to install. */ -function GMPDownloader(gmpAddon) { +export function GMPDownloader(gmpAddon) { this._gmpAddon = gmpAddon; } diff --git a/toolkit/modules/GMPUtils.jsm b/toolkit/modules/GMPUtils.sys.mjs similarity index 95% rename from toolkit/modules/GMPUtils.jsm rename to toolkit/modules/GMPUtils.sys.mjs index 9a76916998e..a9c4c5488e4 100644 --- a/toolkit/modules/GMPUtils.jsm +++ b/toolkit/modules/GMPUtils.sys.mjs @@ -2,32 +2,21 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = [ - "GMP_PLUGIN_IDS", - "GMPPrefs", - "GMPUtils", - "OPEN_H264_ID", - "WIDEVINE_ID", -]; - const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); const lazy = {}; -ChromeUtils.defineModuleGetter( - lazy, - "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", +}); // GMP IDs -const OPEN_H264_ID = "gmp-gmpopenh264"; -const WIDEVINE_ID = "gmp-widevinecdm"; -const GMP_PLUGIN_IDS = [OPEN_H264_ID, WIDEVINE_ID]; +export const OPEN_H264_ID = "gmp-gmpopenh264"; -var GMPUtils = { +export const WIDEVINE_ID = "gmp-widevinecdm"; +export const GMP_PLUGIN_IDS = [OPEN_H264_ID, WIDEVINE_ID]; + +export var GMPUtils = { /** * Checks whether or not a given plugin is hidden. Hidden plugins are neither * downloaded nor displayed in the addons manager. @@ -118,7 +107,7 @@ var GMPUtils = { /** * Manages preferences for GMP addons */ -var GMPPrefs = { +export var GMPPrefs = { KEY_EME_ENABLED: "media.eme.enabled", KEY_PLUGIN_ENABLED: "media.{0}.enabled", KEY_PLUGIN_LAST_DOWNLOAD: "media.{0}.lastDownload", diff --git a/toolkit/modules/Geometry.jsm b/toolkit/modules/Geometry.sys.mjs similarity index 98% rename from toolkit/modules/Geometry.jsm rename to toolkit/modules/Geometry.sys.mjs index 42fff57a368..3c840de6ded 100644 --- a/toolkit/modules/Geometry.jsm +++ b/toolkit/modules/Geometry.sys.mjs @@ -2,14 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -var EXPORTED_SYMBOLS = ["Point", "Rect"]; - /** * Simple Point class. * * Any method that takes an x and y may also take a point. */ -function Point(x, y) { +export function Point(x, y) { this.set(x, y); } @@ -84,7 +82,7 @@ Point.prototype = { * non-positive widths and heights in that case. */ -function Rect(x, y, w, h) { +export function Rect(x, y, w, h) { this.left = x; this.top = y; this.right = x + w; diff --git a/toolkit/modules/HiddenFrame.jsm b/toolkit/modules/HiddenFrame.sys.mjs similarity index 97% rename from toolkit/modules/HiddenFrame.jsm rename to toolkit/modules/HiddenFrame.sys.mjs index aab51375422..d703f1404d7 100644 --- a/toolkit/modules/HiddenFrame.jsm +++ b/toolkit/modules/HiddenFrame.sys.mjs @@ -2,10 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["HiddenFrame"]; - const { PromiseUtils } = ChromeUtils.import( "resource://gre/modules/PromiseUtils.jsm" ); @@ -30,7 +26,7 @@ function ensureCleanupRegistered() { * An hidden frame object. It takes care of creating a windowless browser and * passing the window containing a blank XUL back. */ -function HiddenFrame() {} +export function HiddenFrame() {} HiddenFrame.prototype = { _frame: null, diff --git a/toolkit/modules/Http.jsm b/toolkit/modules/Http.sys.mjs similarity index 96% rename from toolkit/modules/Http.jsm rename to toolkit/modules/Http.sys.mjs index 812da61baf1..c4bb30c7df6 100644 --- a/toolkit/modules/Http.jsm +++ b/toolkit/modules/Http.sys.mjs @@ -2,12 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const EXPORTED_SYMBOLS = ["httpRequest", "percentEncode"]; - // Strictly follow RFC 3986 when encoding URI components. // Accepts a unescaped string and returns the URI encoded string for use in // an HTTP request. -function percentEncode(aString) { +export function percentEncode(aString) { return encodeURIComponent(aString) .replace(/[!'()]/g, escape) .replace(/\*/g, "%2A"); @@ -31,7 +29,7 @@ function percentEncode(aString) { * array the first value is the key and the second is the value, e.g. * [["key1", "value1"], ["key2", "value2"]]. */ -function httpRequest(aUrl, aOptions) { +export function httpRequest(aUrl, aOptions) { let xhr = new XMLHttpRequest(); xhr.mozBackgroundRequest = true; // no error dialogs xhr.open(aOptions.method || (aOptions.postData ? "POST" : "GET"), aUrl); diff --git a/toolkit/modules/IndexedDB.jsm b/toolkit/modules/IndexedDB.sys.mjs similarity index 99% rename from toolkit/modules/IndexedDB.jsm rename to toolkit/modules/IndexedDB.sys.mjs index ecc47361bfb..c2485c7ce02 100644 --- a/toolkit/modules/IndexedDB.jsm +++ b/toolkit/modules/IndexedDB.sys.mjs @@ -3,7 +3,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -"use strict"; /** * @file @@ -13,8 +12,6 @@ */ /* exported IndexedDB */ -var EXPORTED_SYMBOLS = ["IndexedDB"]; - /** * Wraps the given request object, and returns a Promise which resolves when * the requests succeeds or rejects when it fails. @@ -278,7 +275,7 @@ forwardGetters(Transaction, "transaction", [ forwardMethods(Transaction, "transaction", ["abort"]); -class IndexedDB { +export class IndexedDB { /** * Opens the database with the given name, and returns a Promise which * resolves to an IndexedDB instance when the operation completes. diff --git a/toolkit/modules/InlineSpellChecker.jsm b/toolkit/modules/InlineSpellChecker.sys.mjs similarity index 99% rename from toolkit/modules/InlineSpellChecker.jsm rename to toolkit/modules/InlineSpellChecker.sys.mjs index 080e75dda8c..ec0fe3cf000 100644 --- a/toolkit/modules/InlineSpellChecker.jsm +++ b/toolkit/modules/InlineSpellChecker.sys.mjs @@ -2,10 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -var EXPORTED_SYMBOLS = ["InlineSpellChecker", "SpellCheckHelper"]; const MAX_UNDO_STACK_DEPTH = 1; -function InlineSpellChecker(aEditor) { +export function InlineSpellChecker(aEditor) { this.init(aEditor); this.mAddedWordStack = []; // We init this here to preserve it between init/uninit calls } @@ -391,7 +390,7 @@ InlineSpellChecker.prototype = { }, }; -var SpellCheckHelper = { +export var SpellCheckHelper = { // Set when over a non-read-only