From 608034797441cbd97da75f6ec4bd157c7625d1fb Mon Sep 17 00:00:00 2001 From: Bob Clemons Date: Thu, 6 Feb 2025 13:10:34 -0500 Subject: [PATCH] Many updates to schema --- input/crypto-catalog.xml | 318 +++++++++++++++++++-------------------- transforms | 2 +- 2 files changed, 159 insertions(+), 161 deletions(-) diff --git a/input/crypto-catalog.xml b/input/crypto-catalog.xml index eb69eba..2f648b7 100644 --- a/input/crypto-catalog.xml +++ b/input/crypto-catalog.xml @@ -31,8 +31,6 @@
- - This is the section with all the requirements. They are listed alphabetically by class and family.
@@ -158,15 +156,15 @@ - FCS_CKM.2 Cryptographic key distribution - FCS_CKM.5 Cryptographic key derivation - FCS_COP.1 Cryptographic operation + FCS_CKM.2 Cryptographic key distribution + FCS_CKM.5 Cryptographic key derivation + FCS_COP.1 Cryptographic operation - FCS_RBG.1 Random bit generation - FCS_RNG.1 Generation of random numbers + FCS_RBG.1 Random bit generation + FCS_RNG.1 Generation of random numbers - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction @@ -524,15 +522,15 @@ - FCS_CKM.2 Cryptographic key distribution - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic Key Agreement - FCS_COP.1 Cryptographic operation + FCS_CKM.2 Cryptographic key distribution + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic Key Agreement + FCS_COP.1 Cryptographic operation - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_RBG.1 Random bit generation - FCS_RNG.1 Generation of random numbers + FCS_RBG.1 Random bit generation + FCS_RNG.1 Generation of random numbers @@ -591,18 +589,18 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM_EXT.3 Cryptographic Key Access + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.8 Password-based key derivation + FCS_CKM_EXT.3 Cryptographic Key Access - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_COP.1/KeyEncap Key Encapsulation - FCS_COP.1/KeyWrap Key Wrapping - FTP_PRO.1 Trusted Channel Protocol + FCS_COP.1/KeyEncap Key Encapsulation + FCS_COP.1/KeyWrap Key Wrapping + FTP_PRO.1 Trusted Channel Protocol @@ -664,16 +662,16 @@ No other components. - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.8 Password-based key derivation + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_COP.1/KeyEncap Key Encapsulation - FCS_COP.1/KeyWrap Key Wrapping - FCS_COP.1/SKC Symmetric Key Cryptography - FCS_COP.1/AEAD Authenticated Encryption with Associated Data] + FCS_COP.1/KeyEncap Key Encapsulation + FCS_COP.1/KeyWrap Key Wrapping + FCS_COP.1/SKC Symmetric Key Cryptography + FCS_COP.1/AEAD Authenticated Encryption with Associated Data] @@ -727,16 +725,16 @@ - FCS_CKM.2 Cryptographic key distribution - FCS_COP.1 Cryptographic Operation + FCS_CKM.2 Cryptographic key distribution + FCS_COP.1 Cryptographic Operation - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_COP.1/CMAC Cryptographic Operation - CMAC - FCS_COP.1/Hash Cryptographic Operation - Hashing - FCS_COP.1/KeyedHash Cryptographic Operation - Keyed hash - FCS_COP.1/SKC Cryptographic Operation - Symmetric key cryptography - FCS_COP.1/AEAD Authenticated Encryption with Associated Data + FCS_COP.1/CMAC Cryptographic Operation - CMAC + FCS_COP.1/Hash Cryptographic Operation - Hashing + FCS_COP.1/KeyedHash Cryptographic Operation - Keyed hash + FCS_COP.1/SKC Cryptographic Operation - Symmetric key cryptography + FCS_COP.1/AEAD Authenticated Encryption with Associated Data @@ -1002,13 +1000,13 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM_EXT.3 Cryptographic key access - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic key agreement - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM_EXT.3 Cryptographic key access + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic key agreement + FCS_CKM_EXT.8 Password-based key derivation @@ -1311,24 +1309,24 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM.2 Cryptographic key distribution - FCS_COP.1 Cryptographic operation + FCS_CKM.2 Cryptographic key distribution + FCS_COP.1 Cryptographic operation - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_COP.1/AEAD Authenticated encryption with associated data - FCS_COP.1/CMAC CMAC - FCS_COP.1/Hash Hashing - FCS_COP.1/KeyedHash, Keyed Hashing - FCS_COP.1/SKC Symmetric Key Cryptography - no other dependencies + FCS_COP.1/AEAD Authenticated encryption with associated data + FCS_COP.1/CMAC CMAC + FCS_COP.1/Hash Hashing + FCS_COP.1/KeyedHash, Keyed Hashing + FCS_COP.1/SKC Symmetric Key Cryptography + no other dependencies @@ -1468,12 +1466,12 @@ - FCS_CKM.2 Cryptographic key distribution - FCS_COP.1 Cryptographic operation - FCS_CKM_EXT.7 Cryptographic Key Agreement + FCS_CKM.2 Cryptographic key distribution + FCS_COP.1 Cryptographic operation + FCS_CKM_EXT.7 Cryptographic Key Agreement - FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_OTV_EXT.1 One-Time Value Generation + FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_OTV_EXT.1 One-Time Value Generation @@ -1568,15 +1566,15 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic key agreement - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic key agreement + FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_OTV_EXT.1 One-Time Value Generation + FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_OTV_EXT.1 One-Time Value Generation @@ -1772,14 +1770,14 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic key agreement - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic key agreement + FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction @@ -1899,17 +1897,17 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic key agreement - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic key agreement + FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_COP.1/Hash Hashing - FCS_COP.1/XOF Extendable-Output Function + FCS_COP.1/Hash Hashing + FCS_COP.1/XOF Extendable-Output Function @@ -2056,17 +2054,17 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic key agreement - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic key agreement + FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_COP.1/Hash Hashing - FCS_COP.1/XOF Extendable-Output Function + FCS_COP.1/Hash Hashing + FCS_COP.1/XOF Extendable-Output Function @@ -2140,17 +2138,17 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1/AKG Asymmetric cryptographic key generation - FCS_CKM.5 Cryptographic key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1/AKG Asymmetric cryptographic key generation + FCS_CKM.5 Cryptographic key derivation - FCS_COP.1/Hash Hashing - FCS_COP.1/XOF Extendable-Output Function + FCS_COP.1/Hash Hashing + FCS_COP.1/XOF Extendable-Output Function - FCS_OTV_EXT.1 - FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_OTV_EXT.1 + FCS_CKM.6 Timing and event of cryptographic key destruction @@ -2448,15 +2446,15 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - No other components + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + No other components - FCS_COP.1/Hash Hashing - FCS_COP.1/XOF Extendable-Output Function + FCS_COP.1/Hash Hashing + FCS_COP.1/XOF Extendable-Output Function @@ -2763,15 +2761,15 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic key agreement - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic key agreement + FCS_CKM_EXT.8 Password-based key derivation - FCS_COP.1/Hash Hashing - FCS_COP.1/SKC Symmetric key cryptography + FCS_COP.1/Hash Hashing + FCS_COP.1/SKC Symmetric key cryptography @@ -2899,15 +2897,15 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.7 Cryptographic key agreement - FCS_CKM_EXT.8 Password-based key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.7 Cryptographic key agreement + FCS_CKM_EXT.8 Password-based key derivation - FCS_CKM.6 Timing and event of cryptographic key destruction - FCS_OTV_EXT.1 One Time Value + FCS_CKM.6 Timing and event of cryptographic key destruction + FCS_OTV_EXT.1 One Time Value @@ -3227,10 +3225,10 @@ - FDP_ITC.1 Import of user data without security attributes - FDP_ITC.2 Import of user data with security attributes - FCS_CKM.1 Cryptographic key generation - FCS_CKM.5 Cryptographic key derivation + FDP_ITC.1 Import of user data without security attributes + FDP_ITC.2 Import of user data with security attributes + FCS_CKM.1 Cryptographic key generation + FCS_CKM.5 Cryptographic key derivation @@ -3367,16 +3365,16 @@ No other components. - FCS_RBG.1 Random Bit Generators + FCS_RBG.1 Random Bit Generators - FCS_COP.1/HMAC Key Hash - FCS_COP.1/SKC Symmetric key cryptography - FCS_CKM.5 Cryptographic key derivation - FCS_CKM_EXT.8 Password-Based Key Derivation - FCS_COP.1/CMAC CMAC - FCS_COP.1/KeyWrap Key Wrapping - FCS_COP.1/AEAD Authenticated Encryption with Associated Data - FCS_COP.1/KeyEncap Key Encapsulation + FCS_COP.1/HMAC Key Hash + FCS_COP.1/SKC Symmetric key cryptography + FCS_CKM.5 Cryptographic key derivation + FCS_CKM_EXT.8 Password-Based Key Derivation + FCS_COP.1/CMAC CMAC + FCS_COP.1/KeyWrap Key Wrapping + FCS_COP.1/AEAD Authenticated Encryption with Associated Data + FCS_COP.1/KeyEncap Key Encapsulation @@ -3544,13 +3542,13 @@ No other components. - FCS_RBG.2 Random Bit Generation (External Seeding) - FCS_RBG.3 Random Bit Generation (Internal Seeding Single Source) + FCS_RBG.2 Random Bit Generation (External Seeding) + FCS_RBG.3 Random Bit Generation (Internal Seeding Single Source) - FCS_COP.1/Hash Hashing - FCS_COP.1/SKC Symmetric Key Cryptography - FPT_FLS.1 Failure with preservation of secure state - FPT_TST.1 TSF testing + FCS_COP.1/Hash Hashing + FCS_COP.1/SKC Symmetric Key Cryptography + FPT_FLS.1 Failure with preservation of secure state + FPT_TST.1 TSF testing @@ -3690,7 +3688,7 @@ No other components. - FCS_RBG.1 Random Bit Generation (RBG) + FCS_RBG.1 Random Bit Generation (RBG) @@ -3723,8 +3721,8 @@ No other components. - FCS_RBG.1 Random Bit Generation (RBG) - FCS_RBG.5 Random Bit Generation (Combining Entropy Sources) + FCS_RBG.1 Random Bit Generation (RBG) + FCS_RBG.5 Random Bit Generation (Combining Entropy Sources) @@ -3764,8 +3762,8 @@ No other components. - FCS_RBG.1 Random Bit Generation (RBG) - FCS_RBG.5 Random Bit Generation (Combining Entropy Sources) + FCS_RBG.1 Random Bit Generation (RBG) + FCS_RBG.5 Random Bit Generation (Combining Entropy Sources) @@ -3790,11 +3788,11 @@ No other components. - FCS_RBG.1 Random Bit Generation (RBG) + FCS_RBG.1 Random Bit Generation (RBG) - FCS_RBG.2 Random Bit Generation (External Seeding) - FCS_RBG.3 Random Bit Generation (Internal Seeding - Single Source) - FCS_RBG.4 Random Bit Generation (Internal Seeding - Multiple Sources) + FCS_RBG.2 Random Bit Generation (External Seeding) + FCS_RBG.3 Random Bit Generation (Internal Seeding - Single Source) + FCS_RBG.4 Random Bit Generation (Internal Seeding - Multiple Sources) @@ -3847,7 +3845,7 @@ No other components. - FCS_RBG.1 Random Bit Generation (RBG) + FCS_RBG.1 Random Bit Generation (RBG) diff --git a/transforms b/transforms index 5abae71..8769fc1 160000 --- a/transforms +++ b/transforms @@ -1 +1 @@ -Subproject commit 5abae71cc381bf84addca424255f8db8a2a15338 +Subproject commit 8769fc1a04eacdb0b54f9b922262a7bc02f56004