Merge pull request #8202 from frankroj/fr-add-tpm-files

Add back in TPM docs

.openpublishing.redirection.json

@@ -20720,11 +20720,6 @@
       "redirect_url": "/windows/security/identity-protection/credential-guard/credential-guard",
       "redirect_document_id": false
     },
-    {
-      "source_path": "windows/security/information-protection/tpm/change-the-tpm-owner-password.md",
-      "redirect_url": "/windows/security",
-      "redirect_document_id": false
-    },
     {
       "source_path": "windows/security/threat-protection/get-support-for-security-baselines.md",
       "redirect_url": "/windows/security",
@@ -20740,16 +20735,6 @@
       "redirect_url": "/windows/security",
       "redirect_document_id": false
     },
-    {
-      "source_path": "windows/security/information-protection/tpm/manage-tpm-commands.md",
-      "redirect_url": "/windows/security",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "windows/security/information-protection/tpm/manage-tpm-lockout.md",
-      "redirect_url": "/windows/security",
-      "redirect_document_id": false
-    },
     {
       "source_path": "windows/security/threat-protection/device-guard/requirements-and-deployment-planning-guidelines-for-virtualization-based-protection-of-code-integrity.md",
       "redirect_url": "/windows/security",

windows/security/TOC.yml

@@ -23,6 +23,12 @@
           href: information-protection/tpm/tpm-fundamentals.md
         - name: How Windows uses the TPM
           href: information-protection/tpm/how-windows-uses-the-tpm.md
+        - name: Manage TPM commands
+          href: information-protection/tpm/manage-tpm-commands.md
+        - name: Manager TPM Lockout
+          href: information-protection/tpm/manage-tpm-lockout.md
+        - name: Change the TPM password
+          href: information-protection/tpm/change-the-tpm-owner-password.md
         - name: TPM Group Policy settings
           href: information-protection/tpm/trusted-platform-module-services-group-policy-settings.md
         - name: Back up the TPM recovery information to AD DS
@@ -33,6 +39,7 @@
           href: information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md
         - name: TPM recommendations
           href: information-protection/tpm/tpm-recommendations.md
+          
     - name: Hardware-based root of trust
       href: threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md
     - name: System Guard Secure Launch and SMM protection

windows/security/information-protection/tpm/change-the-tpm-owner-password.md

@@ -0,0 +1,66 @@
+---
+title: Change the TPM owner password (Windows)
+description: This topic for the IT professional describes how to change the password or PIN for the owner of the Trusted Platform Module (TPM) that is installed on your system.
+ms.prod: windows-client
+author: paolomatarazzo
+ms.author: paoloma
+manager: aaroncz
+ms.topic: conceptual
+ms.date: 04/26/2023
+ms.technology: itpro-security
+appliesto:
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 11</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 10</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2022</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2019</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2016</a>
+---
+
+# Change the TPM owner password
+
+This article for the IT professional describes how to change the password or PIN for the owner of the Trusted Platform Module (TPM) that is installed on your system.
+
+## About the TPM owner password
+
+Starting with Windows 10, version 1607, Windows doesn't retain the TPM owner password when provisioning the TPM. The password is set to a random high entropy value and then discarded.
+
+> [!IMPORTANT]
+>
+> Although the TPM owner password isn't retained starting with Windows 10, version 1607, you can change a default registry key to retain it. However, we strongly recommend that you don't make this change. To retain the TPM owner password, under the registry key of
+>
+> `HKLM\Software\Policies\Microsoft\TPM`
+>
+> create a `REG_DWORD` value of `OSManagedAuthLevel` and set it to `4`.
+>
+> For Windows versions newer than Windows 10 1703, the default value for this key is 5. A value of 5 means:
+>
+> - **TPM 2.0**: Keep the lockout authorization.
+> - **TPM 1.2**: Discard the Full TPM owner authorization and retain only the Delegated authorization.
+>
+> Unless the registry key value is changed from 5 to 4 before the TPM is provisioned, the owner password isn't saved.
+
+Only one owner password exists for each TPM. The TPM owner password allows the ability to enable, disable, or clear the TPM without having physical access to the computer, for example, by using the command-line tools remotely. The TPM owner password also allows manipulation of the TPM dictionary attack logic. Windows takes ownership of the TPM as part of the provisioning process on each boot. Ownership can change when you share the password or clear your ownership of the TPM so someone else can initialize it.
+
+Without the owner password, you can still perform all the preceding actions with a physical presence confirmation from UEFI.
+
+### Other TPM management options
+
+Instead of changing your owner password, you can also use the following options to manage your TPM:
+
+- **Clear the TPM** - If you want to invalidate all of the existing keys that have been created since you took ownership of the TPM, you can clear it. For important precautions for this process, and instructions for completing it, see [Clear all the keys from the TPM](initialize-and-configure-ownership-of-the-tpm.md#clear-all-the-keys-from-the-tpm).
+
+- **Turn off the TPM** - With TPM 1.2 and Windows 10, versions 1507 and 1511, you can turn off the TPM. Turn off the TPM if you want to keep all existing keys and data intact and disable the services that are provided by the TPM. For more info, see [Turn off the TPM](initialize-and-configure-ownership-of-the-tpm.md#turn-off-the-tpm).
+
+## Changing the TPM owner password
+
+With Windows 10, version 1507 or 1511, if you have opted specifically to preserve the TPM owner password, you can use the saved password to change to a new password.
+
+To change to a new TPM owner password, in `TPM.msc`, select **Change Owner Password**, and follow the instructions. It prompts to provide the owner password file or to type the password. Then you can create a new password, either automatically or manually, and save the password in a file or as a printout.
+
+## Use the TPM cmdlets
+
+You can manage the TPM using Windows PowerShell. For details, see [TPM Cmdlets in Windows PowerShell](/powershell/module/trustedplatformmodule).
+
+## Related articles
+
+- [Trusted Platform Module](trusted-platform-module-top-node.md)

windows/security/information-protection/tpm/manage-tpm-commands.md

@@ -0,0 +1,83 @@
+---
+title: Manage TPM commands (Windows)
+description: This article for the IT professional describes how to manage which Trusted Platform Module (TPM) commands are available to domain users and to local users.
+ms.prod: windows-client
+author: paolomatarazzo
+ms.author: paoloma
+manager: aaroncz
+ms.topic: conceptual
+ms.date: 04/26/2023
+ms.technology: itpro-security
+appliesto:
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 11</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 10</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2022</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2019</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2016</a>
+---
+
+# Manage TPM commands
+
+This article for the IT professional describes how to manage which Trusted Platform Module (TPM) commands are available to domain users and to local users.
+
+After a computer user takes ownership of the TPM, the TPM owner can limit which TPM commands can be run by creating a list of blocked TPM commands. The list can be created and applied to all computers in a domain by using Group Policy, or a list can be created for individual computers by using the TPM MMC. Because some hardware vendors might provide additional commands or the Trusted Computing Group may decide to add commands in the future, the TPM MMC also supports the ability to block new commands.
+
+The following procedures describe how to manage the TPM command lists. You must be a member of the local Administrators group.
+
+## Block TPM commands by using the Local Group Policy Editor
+
+1. Open the Local Group Policy Editor (gpedit.msc). If the **User Account Control** dialog box appears, confirm that the action it displays is what you want, and then select **Yes**.
+
+    > [!NOTE]
+    >
+    > Administrators with appropriate rights in a domain can configure a Group Policy Object (GPO) that can be applied through Active Directory Domain Services (AD DS).
+
+1. In the console tree, under **Computer Configuration**, expand **Administrative Templates**, and then expand **System**.
+
+1. Under **System**, select **Trusted Platform Module Services**.
+
+1. In the details pane, double-click **Configure the list of blocked TPM commands**.
+
+1. Select **Enabled**, and then select **Show**.
+
+1. For each command that you want to block, select **Add**, enter the command number, and then select **OK**.
+
+    > [!NOTE]
+    >
+    > For a list of commands, see links in the [TPM Specification](https://www.trustedcomputinggroup.org/tpm-main-specification/).
+
+1. After you have added numbers for each command that you want to block, select **OK** twice.
+
+1. Close the Local Group Policy Editor.
+
+## Block or allow TPM commands by using the TPM MMC
+
+1. Open the TPM MMC (tpm.msc)
+
+1. If the **User Account Control** dialog box appears, confirm that the action it displays is what you want, and then select **Yes**.
+
+1. In the console tree, select **Command Management**. A list of TPM commands is displayed.
+
+1. In the list, select a command that you want to block or allow.
+
+1. Under **Actions**, select **Block Selected Command** or **Allow Selected Command** as needed. If **Allow Selected Command** is unavailable, that command is currently blocked by Group Policy.
+
+## Block new commands
+
+1. Open the TPM MMC (tpm.msc).
+
+    If the **User Account Control** dialog box appears, confirm that the action it displays is what you want, and then select **Yes**.
+
+1. In the console tree, select **Command Management**. A list of TPM commands is displayed.
+
+1. In the **Action** pane, select **Block New Command**. The **Block New Command** dialog box is displayed.
+
+1. In the **Command Number** text box, type the number of the new command that you want to block, and then select **OK**. The command number you entered is added to the blocked list.
+
+## Use the TPM cmdlets
+
+You can manage the TPM using Windows PowerShell. For details, see [TrustedPlatformModule PowerShell cmdlets](/powershell/module/trustedplatformmodule/?view=win10-ps&preserve-view=true).
+
+## Related articles
+
+- [Trusted Platform Module](trusted-platform-module-top-node.md)

windows/security/information-protection/tpm/manage-tpm-lockout.md

@@ -0,0 +1,90 @@
+---
+title: Manage TPM lockout (Windows)
+description: This article for the IT professional describes how to manage the lockout feature for the Trusted Platform Module (TPM) in Windows.
+ms.prod: windows-client
+author: paolomatarazzo
+ms.author: paoloma
+manager: aaroncz
+ms.topic: conceptual
+ms.date: 04/26/2023
+ms.technology: itpro-security
+appliesto:
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 11</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 10</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2022</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2019</a>
+  - ✅ <a href="https://learn.microsoft.com/windows/release-health/windows-server-release-info" target="_blank">Windows Server 2016</a>
+---
+# Manage TPM lockout
+
+This article for the IT professional describes how to manage the lockout feature for the Trusted Platform Module (TPM) in Windows.
+
+## About TPM lockout
+
+The TPM locks itself to prevent tampering or malicious attacks. TPM lockout often lasts for a variable amount of time or until the computer is turned off. While the TPM is in lockout mode, it generally returns an error message when it receives commands that require an authorization value. One exception is that the TPM always allows the owner at least one attempt to reset the TPM lockout when it is in lockout mode.
+
+Windows takes ownership of the TPM ownership upon first boot. By default, Windows doesn't retain the TPM owner password.
+
+In some cases, encryption keys are protected by a TPM by requiring a valid authorization value to access the key. A common example is configuring BitLocker Drive Encryption to use the TPM plus PIN key protector. In this scenario, the user must type the correct PIN during the boot process to access the volume encryption key protected by the TPM. To prevent malicious users or software from discovering authorization values, TPMs implement protection logic. The protection logic is designed to slow or stop responses from the TPM if it detects that an entity might be trying to guess authorization values.
+
+### TPM 1.2
+
+The industry standards from the Trusted Computing Group (TCG) specify that TPM manufacturers must implement some form of protection logic in TPM 1.2 and TPM 2.0 chips. TPM 1.2 devices implement different protection mechanisms and behavior. In general, the TPM chip takes exponentially longer to respond if incorrect authorization values are sent to the TPM. Some TPM chips may not store failed attempts over time. Other TPM chips may store every failed attempt indefinitely. Therefore, some users may experience increasingly longer delays when they mistype an authorization value that is sent to the TPM. These delays can prevent them from using the TPM for a period of time.
+
+### TPM 2.0
+
+TPM 2.0 devices have standardized lockout behavior which Windows configures. TPM 2.0 devices have a maximum count threshold and a healing time. Windows configures the maximum count to be 32 and the healing time to be 10 minutes. This configuration means that every continuous 10 minutes of powered on operation without an event causes the counter to decrease by 1.
+
+If your TPM has entered lockout mode or is responding slowly to commands, you can reset the lockout value by using the following procedures. Resetting the TPM lockout requires the TPM owner's authorization. This value is no longer retained by default starting with Windows 10 version 1607 and higher.
+
+## Reset the TPM lockout by using the TPM MMC
+
+> [!NOTE]
+>
+> This procedure is only available if you have configured Windows to retain the TPM Owner Password. By default, this password isn't available in Windows 10 starting with version 1607 and higher.
+
+The following procedure explains the steps to reset the TPM lockout by using the TPM MMC.
+
+### Reset the TPM lockout
+
+1. Open the TPM MMC (tpm.msc).
+
+1 In the **Action** pane, select **Reset TPM Lockout** to start the Reset TPM Lockout Wizard.
+
+1. Choose one of the following methods to enter the TPM owner password:
+
+   - If you saved your TPM owner password to a `.tpm` file, select **I have the owner password file**, and then type the path to the file, or select **Browse** to navigate to the file location.
+
+   - If you want to manually enter your TPM owner password, select **I want to enter the owner password**, and then type the password in the text box provided.
+
+   > [!NOTE]
+   >
+   > If you enabled BitLocker and your TPM at the same time, and you printed your BitLocker recovery password when you turned on BitLocker, your TPM owner password may have printed with it.
+
+## Use Group Policy to manage TPM lockout settings
+
+The TPM Group Policy settings in the following list are located at:
+
+**Computer Configuration** > **Administrative Templates** > **System** > **Trusted Platform Module Services**
+
+- [Standard User Lockout Duration](trusted-platform-module-services-group-policy-settings.md#standard-user-lockout-duration)
+
+    This policy setting allows you to manage the duration in minutes for counting standard user authorization failures for TPM commands that require authorization. An authorization failure occurs each time a user sends a command to the TPM and receives an error message that indicates an authorization failure occurred. Authorization failures that are older than the duration you set are ignored. If the number of TPM commands with an authorization failure within the lockout duration equals a threshold, the user is prevented from sending commands to the TPM that require authorization.
+
+- [Standard User Individual Lockout Threshold](trusted-platform-module-services-group-policy-settings.md#standard-user-individual-lockout-threshold)
+
+    This policy setting allows you to manage the maximum number of authorization failures for the TPM for each user. This value is the maximum number of authorization failures that each user can have before the user isn't allowed to send commands to the TPM that require authorization. If the number of authorization failures equals the duration that is set for the policy setting, the user is prevented from sending commands to the TPM that require authorization.
+
+- [Standard User Total Lockout Threshold](trusted-platform-module-services-group-policy-settings.md#standard-user-total-lockout-threshold)
+
+    This policy setting allows you to manage the maximum number of authorization failures for the TPM for all standard users. If the total number of authorization failures for all users equals the duration that is set for the policy, all users are prevented from sending commands to the TPM that require authorization.
+
+For information about mitigating dictionary attacks that use the lockout settings, see [TPM fundamentals](tpm-fundamentals.md#anti-hammering).
+
+## Use the TPM cmdlets
+
+You can manage the TPM using Windows PowerShell. For details, see [TPM Cmdlets in Windows PowerShell](/powershell/module/trustedplatformmodule/).
+
+## Related articles
+
+- [Trusted Platform Module](trusted-platform-module-top-node.md)