diff --git a/windows/security/includes/sections/operating-system-data-protection-overview.md b/windows/security/includes/sections/operating-system-encryption-and-data-protection-overview.md similarity index 100% rename from windows/security/includes/sections/operating-system-data-protection-overview.md rename to windows/security/includes/sections/operating-system-encryption-and-data-protection-overview.md diff --git a/windows/security/includes/sections/operating-system.md b/windows/security/includes/sections/operating-system.md index 9cc73a7b96..bbe119bce4 100644 --- a/windows/security/includes/sections/operating-system.md +++ b/windows/security/includes/sections/operating-system.md @@ -42,7 +42,7 @@ ms.topic: include | **[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)** | SMB Encryption provides end-to-end encryption of SMB data and protects data from eavesdropping occurrences on internal networks. In Windows 11, the SMB protocol has significant security updates, including AES-256 bits encryption, accelerated SMB signing, Remote Directory Memory Access (RDMA) network encryption, and SMB over QUIC for untrusted networks. Windows 11 introduces AES-256-GCM and AES-256-CCM cryptographic suites for SMB 3.1.1 encryption. Windows administrators can mandate the use of more advanced security or continue to use the more compatible, and still-safe, AES-128 encryption. | | **[Server Message Block Direct (SMB Direct)](/windows-server/storage/file-server/smb-direct)** | SMB Direct (SMB over remote direct memory access) is a storage protocol that enables direct memory-to-memory data transfers between device and storage, with minimal CPU usage, while using standard RDMA-capable network adapters.

SMB Direct supports encryption, and now you can operate with the same safety as traditional TCP and the performance of RDMA. Previously, enabling SMB encryption disabled direct data placement, making RDMA as slow as TCP. Now data is encrypted before placement, leading to relatively minor performance degradation while adding AES-128 and AES-256 protected packet privacy. | -## Data Protection +## Encryption And Data Protection | Security Measures | Features & Capabilities | |:---|:---| diff --git a/windows/security/operating-system-security/data-protection/index.md b/windows/security/operating-system-security/data-protection/index.md deleted file mode 100644 index b180e2ff7a..0000000000 --- a/windows/security/operating-system-security/data-protection/index.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -title: Encryption and data protection in Windows -description: Get an overview encryption and data protection in Windows 11 and Windows 10 -ms.topic: overview -ms.date: 09/22/2022 -ms.reviewer: rafals ---- - -# Encryption and data protection in Windows client - -When people travel with their computers and devices, their confidential information travels with them. Wherever confidential data is stored, it must be protected against unauthorized access, whether through physical device theft or from malicious applications. -Encryption and data protection features include: - -- Encrypted Hard Drive -- BitLocker - -## Encrypted Hard Drive - -Encrypted Hard Drive uses the rapid encryption provided by BitLocker Drive Encryption to enhance data security and management. -By offloading the cryptographic operations to hardware, encrypted hard drives increase BitLocker performance and reduce CPU usage and power consumption. Because encrypted hard drives encrypt data quickly, enterprise devices can expand BitLocker deployment with minimal impact on productivity. - -Encrypted hard drives provide: - -- Better performance: Encryption hardware, integrated into the drive controller, allows the drive to operate at full data rate with no performance degradation. -- Strong security based in hardware: Encryption is always "on" and the keys for encryption never leave the hard drive. User authentication is performed by the drive before it will unlock, independently of the operating system. -- Ease of use: Encryption is transparent to the user, and the user doesn't need to enable it. Encrypted hard drives are easily erased using on-board encryption key; there's no need to re-encrypt data on the drive. -- Lower cost of ownership: There's no need for new infrastructure to manage encryption keys, since BitLocker uses your existing infrastructure to store recovery information. Your device operates more efficiently because processor cycles don't need to be used for the encryption process. - -Encrypted hard drives are a new class of hard drives that are self-encrypted at a hardware level and allow for full disk hardware encryption. - -## BitLocker - -BitLocker Drive Encryption is a data protection feature that integrates with the operating system and addresses the threats of data theft or exposure from lost, stolen, or inappropriately decommissioned computers. - -BitLocker provides encryption for the operating system, fixed data, and removable data drives, using technologies like hardware security test interface (HSTI), Modern Standby, UEFI Secure Boot, and TPM. - -Windows consistently improves data protection by improving existing options and providing new strategies. - -## Personal Data Encryption (PDE) - -(*Applies to: Windows 11, version 22H2 and later*) - -[!INCLUDE [Personal Data Encryption (PDE) description](personal-data-encryption/includes/pde-description.md)] - -## See also - -- [Encrypted Hard Drive](encrypted-hard-drive.md) -- [BitLocker](bitlocker/index.md) -- [Personal Data Encryption (PDE)](personal-data-encryption/index.md) diff --git a/windows/security/operating-system-security/data-protection/toc.yml b/windows/security/operating-system-security/data-protection/toc.yml index 18c78e5665..0131f73784 100644 --- a/windows/security/operating-system-security/data-protection/toc.yml +++ b/windows/security/operating-system-security/data-protection/toc.yml @@ -1,13 +1,11 @@ items: -- name: Overview - href: index.md - name: BitLocker href: bitlocker/toc.yml - name: Encrypted Hard Drive href: encrypted-hard-drive.md -- name: Personal Data Encryption (PDE) +- name: Personal data encryption (PDE) href: personal-data-encryption/toc.yml -- name: Configure S/MIME for Windows +- name: Email Encryption (S/MIME) href: configure-s-mime.md - name: Windows Information Protection (WIP) href: ../../information-protection/windows-information-protection/protect-enterprise-data-using-wip.md