diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 0f240751e8..55496de2a8 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -11,6 +11,76 @@ "redirect_document_id": true }, { +"source_path": "windows/security/hardware-protection/how-hardware-based-containers-help-protect-windows.md", +"redirect_url": "/windows/security/identity-protection/how-hardware-based-containers-help-protect-windows", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/encrypted-hard-drive.md", +"redirect_url": "/windows/security/identity-protection/encrypted-hard-drived", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md", +"redirect_url": "/windows/security/identity-protection/tpm/backup-tpm-recovery-information-to-ad-ds", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/change-the-tpm-owner-password.md", +"redirect_url": "/windows/security/identity-protection/tpm/change-the-tpm-owner-password", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/how-windows-uses-the-tpm.md", +"redirect_url": "/windows/security/identity-protection/tpm/how-windows-uses-the-tpm", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md", +"redirect_url": "/windows/security/identity-protection/tpm/initialize-and-configure-ownership-of-the-tpm", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/manage-tpm-commands.md", +"redirect_url": "/windows/security/identity-protection/tpm/manage-tpm-commands", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/manage-tpm-lockout.md", +"redirect_url": "/windows/security/identity-protection/tpm/manage-tpm-lockout", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md", +"redirect_url": "/windows/security/identity-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/tpm-fundamentals.md", +"redirect_url": "/windows/security/identity-protection/tpm/tpm-fundamentals", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/tpm-recommendations.md", +"redirect_url": "/windows/security/identity-protection/tpm/tpm-recommendations", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/trusted-platform-module-overview.md", +"redirect_url": "/windows/security/identity-protection/tpm/trusted-platform-module-overview", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/trusted-platform-module-services-group-policy-settings.md", +"redirect_url": "/windows/security/identity-protection/tpm/trusted-platform-module-services-group-policy-settings", +"redirect_document_id": true +}, +{ +"source_path": "windows/security/hardware-protection/tpm/trusted-platform-module-top-node.md", +"redirect_url": "/windows/security/identity-protection/tpm/trusted-platform-module-top-node", +"redirect_document_id": true +}, +{ "source_path": "windows/deployment/update/waas-windows-insider-for-business.md", "redirect_url": "/windows-insider/at-work-pro/wip-4-biz-get-started", "redirect_document_id": true diff --git a/windows/security/TOC.md b/windows/security/TOC.md index ad302db477..6ac5b43506 100644 --- a/windows/security/TOC.md +++ b/windows/security/TOC.md @@ -1,7 +1,6 @@ # [Security](index.yml) ## [Identity and access management](identity-protection/index.md) ## [Information protection](information-protection/index.md) -## [Hardware-based protection](hardware-protection/index.md) ## [Threat protection](threat-protection/index.md) diff --git a/windows/security/hardware-protection/TOC.md b/windows/security/hardware-protection/TOC.md deleted file mode 100644 index 3dac21b0fa..0000000000 --- a/windows/security/hardware-protection/TOC.md +++ /dev/null @@ -1,21 +0,0 @@ -# [Hardware-based protection](index.md) - -## [Encrypted Hard Drive](encrypted-hard-drive.md) - -## [Windows Defender System Guard](how-hardware-based-containers-help-protect-windows.md) - -## [Secure the Windows 10 boot process](secure-the-windows-10-boot-process.md) - -## [Trusted Platform Module](tpm/trusted-platform-module-top-node.md) -### [Trusted Platform Module Overview](tpm/trusted-platform-module-overview.md) -### [TPM fundamentals](tpm/tpm-fundamentals.md) -### [How Windows 10 uses the TPM](tpm/how-windows-uses-the-tpm.md) -### [TPM Group Policy settings](tpm/trusted-platform-module-services-group-policy-settings.md) -### [Back up the TPM recovery information to AD DS](tpm/backup-tpm-recovery-information-to-ad-ds.md) -### [Manage TPM commands](tpm/manage-tpm-commands.md) -### [Manage TPM lockout](tpm/manage-tpm-lockout.md) -### [Change the TPM owner password](tpm/change-the-tpm-owner-password.md) -### [View status, clear, or troubleshoot the TPM](tpm/initialize-and-configure-ownership-of-the-tpm.md) -### [Understanding PCR banks on TPM 2.0 devices](tpm/switch-pcr-banks-on-tpm-2-0-devices.md) -### [TPM recommendations](tpm/tpm-recommendations.md) - diff --git a/windows/security/hardware-protection/images/application-guard-and-system-guard.png b/windows/security/hardware-protection/images/application-guard-and-system-guard.png deleted file mode 100644 index b4b883db90..0000000000 Binary files a/windows/security/hardware-protection/images/application-guard-and-system-guard.png and /dev/null differ diff --git a/windows/security/hardware-protection/images/traditional-windows-software-stack.png b/windows/security/hardware-protection/images/traditional-windows-software-stack.png deleted file mode 100644 index 0da610c368..0000000000 Binary files a/windows/security/hardware-protection/images/traditional-windows-software-stack.png and /dev/null differ diff --git a/windows/security/hardware-protection/images/windows-defender-system-guard.png b/windows/security/hardware-protection/images/windows-defender-system-guard.png deleted file mode 100644 index 865af86b19..0000000000 Binary files a/windows/security/hardware-protection/images/windows-defender-system-guard.png and /dev/null differ diff --git a/windows/security/hardware-protection/index.md b/windows/security/hardware-protection/index.md deleted file mode 100644 index 454b0ec4e1..0000000000 --- a/windows/security/hardware-protection/index.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -title: Hardware-based Protection (Windows 10) -description: Learn more about how to help protect against threats in Windows 10 and Windows 10 Mobile. -ms.prod: w10 -ms.mktglfcycl: deploy -ms.sitesec: library -ms.pagetype: security -author: brianlic-msft -ms.date: 02/05/2018 ---- - -# Hardware-based protection - -Windows 10 leverages these hardware-based security features to protect and maintain system integrity. - -| Section | Description | -|-|-| -| [Encrypted Hard Drive](encrypted-hard-drive.md) | Provides information about Encrypted Hard Drive, which uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management.| -|[How hardware-based containers help protect Windows 10](how-hardware-based-containers-help-protect-windows.md) |Learn about how hardware-based containers can isolate sensitive system services and data, enabling them to remain secure even when the operating system has been compromised.| -|[Secure the Windows 10 boot process](secure-the-windows-10-boot-process.md) |Learn about the Windows 10 security features that help to protect your PC from malware, including rootkits and other applications.| -| [Trusted Platform Module](tpm/trusted-platform-module-top-node.md)| Provides links to information about the Trusted Platform Module (TPM), which is a secure crypto-processor that helps you with actions such as generating, storing, and limiting the use of cryptographic keys. | diff --git a/windows/security/identity-protection/TOC.md b/windows/security/identity-protection/TOC.md index 0df114bab3..61c2b1d12b 100644 --- a/windows/security/identity-protection/TOC.md +++ b/windows/security/identity-protection/TOC.md @@ -13,6 +13,8 @@ ## [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md) +## [Encrypted Hard Drive](encrypted-hard-drive.md) + ## [Enterprise Certificate Pinning](enterprise-certificate-pinning.md) ## [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md) @@ -31,6 +33,8 @@ ## [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md) +## [Secure the Windows 10 boot process](secure-the-windows-10-boot-process.md) + ## [Smart Cards](smart-cards/smart-card-windows-smart-card-technical-reference.md) ### [How Smart Card Sign-in Works in Windows](smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md) #### [Smart Card Architecture](smart-cards/smart-card-architecture.md) @@ -44,6 +48,19 @@ #### [Smart Card Group Policy and Registry Settings](smart-cards/smart-card-group-policy-and-registry-settings.md) #### [Smart Card Events](smart-cards/smart-card-events.md) +## [Trusted Platform Module](tpm/trusted-platform-module-top-node.md) +### [Trusted Platform Module Overview](tpm/trusted-platform-module-overview.md) +### [TPM fundamentals](tpm/tpm-fundamentals.md) +### [How Windows 10 uses the TPM](tpm/how-windows-uses-the-tpm.md) +### [TPM Group Policy settings](tpm/trusted-platform-module-services-group-policy-settings.md) +### [Back up the TPM recovery information to AD DS](tpm/backup-tpm-recovery-information-to-ad-ds.md) +### [Manage TPM commands](tpm/manage-tpm-commands.md) +### [Manage TPM lockout](tpm/manage-tpm-lockout.md) +### [Change the TPM owner password](tpm/change-the-tpm-owner-password.md) +### [View status, clear, or troubleshoot the TPM](tpm/initialize-and-configure-ownership-of-the-tpm.md) +### [Understanding PCR banks on TPM 2.0 devices](tpm/switch-pcr-banks-on-tpm-2-0-devices.md) +### [TPM recommendations](tpm/tpm-recommendations.md) + ### [User Account Control](user-account-control\user-account-control-overview.md) #### [How User Account Control works](user-account-control\how-user-account-control-works.md) #### [User Account Control security policy settings](user-account-control\user-account-control-security-policy-settings.md) diff --git a/windows/security/hardware-protection/encrypted-hard-drive.md b/windows/security/identity-protection/encrypted-hard-drive.md similarity index 100% rename from windows/security/hardware-protection/encrypted-hard-drive.md rename to windows/security/identity-protection/encrypted-hard-drive.md diff --git a/windows/security/hardware-protection/images/dn168167.boot_process(en-us,MSDN.10).png b/windows/security/identity-protection/images/dn168167.boot_process(en-us,MSDN.10).png similarity index 100% rename from windows/security/hardware-protection/images/dn168167.boot_process(en-us,MSDN.10).png rename to windows/security/identity-protection/images/dn168167.boot_process(en-us,MSDN.10).png diff --git a/windows/security/hardware-protection/images/dn168167.measure_boot(en-us,MSDN.10).png b/windows/security/identity-protection/images/dn168167.measure_boot(en-us,MSDN.10).png similarity index 100% rename from windows/security/hardware-protection/images/dn168167.measure_boot(en-us,MSDN.10).png rename to windows/security/identity-protection/images/dn168167.measure_boot(en-us,MSDN.10).png diff --git a/windows/security/hardware-protection/images/windows-defender-system-guard-boot-time-integrity.png b/windows/security/identity-protection/images/windows-defender-system-guard-boot-time-integrity.png similarity index 100% rename from windows/security/hardware-protection/images/windows-defender-system-guard-boot-time-integrity.png rename to windows/security/identity-protection/images/windows-defender-system-guard-boot-time-integrity.png diff --git a/windows/security/hardware-protection/images/windows-defender-system-guard-validate-system-integrity.png b/windows/security/identity-protection/images/windows-defender-system-guard-validate-system-integrity.png similarity index 100% rename from windows/security/hardware-protection/images/windows-defender-system-guard-validate-system-integrity.png rename to windows/security/identity-protection/images/windows-defender-system-guard-validate-system-integrity.png diff --git a/windows/security/hardware-protection/secure-the-windows-10-boot-process.md b/windows/security/identity-protection/secure-the-windows-10-boot-process.md similarity index 100% rename from windows/security/hardware-protection/secure-the-windows-10-boot-process.md rename to windows/security/identity-protection/secure-the-windows-10-boot-process.md diff --git a/windows/security/hardware-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md b/windows/security/identity-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md similarity index 100% rename from windows/security/hardware-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md rename to windows/security/identity-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md diff --git a/windows/security/hardware-protection/tpm/change-the-tpm-owner-password.md b/windows/security/identity-protection/tpm/change-the-tpm-owner-password.md similarity index 100% rename from windows/security/hardware-protection/tpm/change-the-tpm-owner-password.md rename to windows/security/identity-protection/tpm/change-the-tpm-owner-password.md diff --git a/windows/security/hardware-protection/tpm/how-windows-uses-the-tpm.md b/windows/security/identity-protection/tpm/how-windows-uses-the-tpm.md similarity index 100% rename from windows/security/hardware-protection/tpm/how-windows-uses-the-tpm.md rename to windows/security/identity-protection/tpm/how-windows-uses-the-tpm.md diff --git a/windows/security/hardware-protection/tpm/images/process-to-create-evidence-of-boot-software-and-configuration-using-tpm.png b/windows/security/identity-protection/tpm/images/process-to-create-evidence-of-boot-software-and-configuration-using-tpm.png similarity index 100% rename from windows/security/hardware-protection/tpm/images/process-to-create-evidence-of-boot-software-and-configuration-using-tpm.png rename to windows/security/identity-protection/tpm/images/process-to-create-evidence-of-boot-software-and-configuration-using-tpm.png diff --git a/windows/security/hardware-protection/tpm/images/tpm-capabilities.png b/windows/security/identity-protection/tpm/images/tpm-capabilities.png similarity index 100% rename from windows/security/hardware-protection/tpm/images/tpm-capabilities.png rename to windows/security/identity-protection/tpm/images/tpm-capabilities.png diff --git a/windows/security/hardware-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md b/windows/security/identity-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md similarity index 100% rename from windows/security/hardware-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md rename to windows/security/identity-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md diff --git a/windows/security/hardware-protection/tpm/manage-tpm-commands.md b/windows/security/identity-protection/tpm/manage-tpm-commands.md similarity index 100% rename from windows/security/hardware-protection/tpm/manage-tpm-commands.md rename to windows/security/identity-protection/tpm/manage-tpm-commands.md diff --git a/windows/security/hardware-protection/tpm/manage-tpm-lockout.md b/windows/security/identity-protection/tpm/manage-tpm-lockout.md similarity index 100% rename from windows/security/hardware-protection/tpm/manage-tpm-lockout.md rename to windows/security/identity-protection/tpm/manage-tpm-lockout.md diff --git a/windows/security/hardware-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md b/windows/security/identity-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md similarity index 100% rename from windows/security/hardware-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md rename to windows/security/identity-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md diff --git a/windows/security/hardware-protection/tpm/tpm-fundamentals.md b/windows/security/identity-protection/tpm/tpm-fundamentals.md similarity index 100% rename from windows/security/hardware-protection/tpm/tpm-fundamentals.md rename to windows/security/identity-protection/tpm/tpm-fundamentals.md diff --git a/windows/security/hardware-protection/tpm/tpm-recommendations.md b/windows/security/identity-protection/tpm/tpm-recommendations.md similarity index 100% rename from windows/security/hardware-protection/tpm/tpm-recommendations.md rename to windows/security/identity-protection/tpm/tpm-recommendations.md diff --git a/windows/security/hardware-protection/tpm/trusted-platform-module-overview.md b/windows/security/identity-protection/tpm/trusted-platform-module-overview.md similarity index 100% rename from windows/security/hardware-protection/tpm/trusted-platform-module-overview.md rename to windows/security/identity-protection/tpm/trusted-platform-module-overview.md diff --git a/windows/security/hardware-protection/tpm/trusted-platform-module-services-group-policy-settings.md b/windows/security/identity-protection/tpm/trusted-platform-module-services-group-policy-settings.md similarity index 100% rename from windows/security/hardware-protection/tpm/trusted-platform-module-services-group-policy-settings.md rename to windows/security/identity-protection/tpm/trusted-platform-module-services-group-policy-settings.md diff --git a/windows/security/hardware-protection/tpm/trusted-platform-module-top-node.md b/windows/security/identity-protection/tpm/trusted-platform-module-top-node.md similarity index 100% rename from windows/security/hardware-protection/tpm/trusted-platform-module-top-node.md rename to windows/security/identity-protection/tpm/trusted-platform-module-top-node.md