diff --git a/windows/security/introduction/security-features-edition-requirements.md b/windows/security/introduction/security-features-edition-requirements.md deleted file mode 100644 index 0cffb54f8f..0000000000 --- a/windows/security/introduction/security-features-edition-requirements.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: Windows security features and edition requirements -description: Learn about Windows edition requirements for the feature included in Windows. -ms.prod: windows-client -author: paolomatarazzo -ms.author: paoloma -manager: aaroncz -ms.collection: -- tier3 -ms.topic: conceptual -ms.date: 05/04/2023 -appliesto: -- ✅ Windows 11 -ms.technology: itpro-security ---- - -# Windows security features and edition requirements - -This article lists the security features that are available in Windows, and the Windows editions that support them. - -> [!NOTE] -> The **Windows edition** requirements listed in the following table may be different from the **licensing** requirements. If you're looking for licensing requirements, see [Windows security features and licensing requirements](security-features-licensing-requirements.md). - -[!INCLUDE [_edition-requirements](../../../includes/licensing/_edition-requirements.md)] - -For more information about Windows licensing, see [Windows Commercial Licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/introduction/security-features-licensing-requirements.md b/windows/security/introduction/security-features-licensing-requirements.md deleted file mode 100644 index df7e5bdcec..0000000000 --- a/windows/security/introduction/security-features-licensing-requirements.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: Windows security features and licensing requirements -description: Learn about Windows features and licensing requirements for the feature included in Windows. -ms.prod: windows-client -author: paolomatarazzo -ms.author: paoloma -manager: aaroncz -ms.collection: -- tier3 -ms.topic: conceptual -ms.date: 04/24/2023 -appliesto: -- ✅ Windows 11 -ms.technology: itpro-security ---- - -# Windows security features and licensing requirements - -This article lists the security features that are available in Windows, and the licensing requirements to use them. - -> [!NOTE] -> The **licensing** requirements listed in the following table may be different from the **Windows edition** requirements. If you're looking for Windows edition requirements, see [Windows security features and edition requirements](security-features-edition-requirements.md). - -[!INCLUDE [_licensing-requirements](../../../includes/licensing/_licensing-requirements.md)] - -For more information about Windows licensing, see [Windows Commercial Licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/introduction/licensing-and-edition-requirements.md b/windows/security/licensing-and-edition-requirements.md similarity index 84% rename from windows/security/introduction/licensing-and-edition-requirements.md rename to windows/security/licensing-and-edition-requirements.md index 268cf2538e..c45ca3c9e5 100644 --- a/windows/security/introduction/licensing-and-edition-requirements.md +++ b/windows/security/licensing-and-edition-requirements.md @@ -4,7 +4,7 @@ description: Learn about Windows licensing and edition requirements for the feat ms.collection: - tier2 ms.topic: conceptual -ms.date: 06/13/2023 +ms.date: 06/15/2023 appliesto: - ✅ Windows 11 ms.author: paoloma @@ -20,11 +20,11 @@ Select one of the two tabs to learn about licensing requirements to use the secu #### [:::image type="icon" source="../images/icons/windows-os.svg" border="false"::: **Licensing requirements**](#tab/licensing) -[!INCLUDE [licensing-requirements](../../../includes/licensing/_licensing-requirements.md)] +[!INCLUDE [licensing-requirements](../../includes/licensing/_licensing-requirements.md)] #### [:::image type="icon" source="../images/icons/windows-os.svg" border="false"::: **Edition requirements**](#tab/edition) -[!INCLUDE [_edition-requirements](../../../includes/licensing/_edition-requirements.md)] +[!INCLUDE [_edition-requirements](../../includes/licensing/_edition-requirements.md)] --- diff --git a/windows/security/security-foundations.md b/windows/security/security-foundations/index.md similarity index 85% rename from windows/security/security-foundations.md rename to windows/security/security-foundations/index.md index ceed1cb436..16917b77c8 100644 --- a/windows/security/security-foundations.md +++ b/windows/security/security-foundations/index.md @@ -1,18 +1,13 @@ --- title: Windows security foundations description: Get an overview of security foundations, including the security development lifecycle, common criteria, and the bug bounty program. -ms.reviewer: -ms.topic: article -ms.author: paoloma -author: paolomatarazzo -ms.prod: windows-client -ms.technology: itpro-security -ms.date: 12/31/2017 +ms.topic: conceptual +ms.date: 06/15/2023 --- # Windows security foundations -Microsoft is committed to continuously invest in improving our software development process, building highly secure-by-design software, and addressing security compliance requirements. At Microsoft, we embed security and privacy considerations from the earliest life-cycle phases of all our software development processes. We build in security from the ground for powerful defense in today’s threat environment. +Microsoft is committed to continuously invest in improving our software development process, building highly secure-by-design software, and addressing security compliance requirements. At Microsoft, we embed security and privacy considerations from the earliest life-cycle phases of all our software development processes. We build in security from the ground for powerful defense in today's threat environment. Our strong security foundation uses Microsoft Security Development Lifecycle (SDL) Bug Bounty, support for product security standards and certifications, and Azure Code signing. As a result, we improve security by producing software with fewer defects and vulnerabilities instead of relying on applying updates after vulnerabilities have been identified. @@ -20,7 +15,7 @@ Use the links in the following table to learn more about the security foundation | Concept | Description | |:---|:---| -| FIPS 140-2 Validation | The Federal Information Processing Standard (FIPS) Publication 140-2 is a U.S. government standard. FIPS is based on Section 5131 of the Information Technology Management Reform Act of 1996. It defines the minimum security requirements for cryptographic modules in IT products. Microsoft maintains an active commitment to meeting the requirements of the FIPS 140-2 standard, having validated cryptographic modules against it since it was first established in 2001.

Learn more about [FIPS 140-2 Validation](threat-protection/fips-140-validation.md). | -| Common Criteria Certifications | Microsoft supports the Common Criteria certification program, ensures that products incorporate the features and functions required by relevant Common Criteria Protection Profiles, and completes Common Criteria certifications of Microsoft Windows products.

Learn more about [Common Criteria Certifications](threat-protection/windows-platform-common-criteria.md). | -| Microsoft Security Development Lifecycle | The Security Development Lifecycle (SDL) is a security assurance process that is focused on software development. The SDL has played a critical role in embedding security and privacy in software and culture at Microsoft.

Learn more about [Microsoft SDL](threat-protection/msft-security-dev-lifecycle.md).| +| FIPS 140-2 Validation | The Federal Information Processing Standard (FIPS) Publication 140-2 is a U.S. government standard. FIPS is based on Section 5131 of the Information Technology Management Reform Act of 1996. It defines the minimum security requirements for cryptographic modules in IT products. Microsoft maintains an active commitment to meeting the requirements of the FIPS 140-2 standard, having validated cryptographic modules against it since it was first established in 2001.

Learn more about [FIPS 140-2 Validation](../threat-protection/fips-140-validation.md). | +| Common Criteria Certifications | Microsoft supports the Common Criteria certification program, ensures that products incorporate the features and functions required by relevant Common Criteria Protection Profiles, and completes Common Criteria certifications of Microsoft Windows products.

Learn more about [Common Criteria Certifications](../threat-protection/windows-platform-common-criteria.md). | +| Microsoft Security Development Lifecycle | The Security Development Lifecycle (SDL) is a security assurance process that is focused on software development. The SDL has played a critical role in embedding security and privacy in software and culture at Microsoft.

Learn more about [Microsoft SDL](../threat-protection/msft-security-dev-lifecycle.md).| | Microsoft Bug Bounty Program | If you find a vulnerability in a Microsoft product, service, or device, we want to hear from you! If your vulnerability report affects a product or service that is within scope of one of our bounty programs below, you could receive a bounty award according to the program descriptions.

Learn more about the [Microsoft Bug Bounty Program](https://www.microsoft.com/en-us/msrc/bounty?rtc=1). | diff --git a/windows/security/security-foundations/toc.yml b/windows/security/security-foundations/toc.yml index d52c477387..b842d84e0e 100644 --- a/windows/security/security-foundations/toc.yml +++ b/windows/security/security-foundations/toc.yml @@ -1,6 +1,6 @@ items: - name: Overview - href: ../security-foundations.md + href: index.md - name: Microsoft Security Development Lifecycle href: ../threat-protection/msft-security-dev-lifecycle.md - name: Certification diff --git a/windows/security/toc.yml b/windows/security/toc.yml index c0e1fed926..89b96bca30 100644 --- a/windows/security/toc.yml +++ b/windows/security/toc.yml @@ -9,11 +9,7 @@ - name: Zero Trust and Windows href: zero-trust-windows-device-health.md - name: Security features licensing and edition requirements - href: introduction/licensing-and-edition-requirements.md - - name: Security features and edition requirements - href: introduction/security-features-edition-requirements.md - - name: Security features and licensing requirements - href: introduction/security-features-licensing-requirements.md + href: licensing-and-edition-requirements.md - name: Hardware security href: hardware-security/toc.yml - name: Operating system security