From 0cc2e3a4a47887dd5a59fbf3aa44e48bc31924e0 Mon Sep 17 00:00:00 2001 From: Dmitry Volk Date: Thu, 26 Sep 2024 16:40:28 +0300 Subject: [PATCH 1/3] Added support for STREEBOG-256 and STREEBOG-512 hashing algorithms (#485) Signed-off-by: Dmitry Volk --- schema/bom-1.7.proto | 2 ++ schema/bom-1.7.schema.json | 4 +++- schema/bom-1.7.xsd | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto index d582e605..142d9507 100644 --- a/schema/bom-1.7.proto +++ b/schema/bom-1.7.proto @@ -314,6 +314,8 @@ enum HashAlg { HASH_ALG_BLAKE_2_B_384 = 10; HASH_ALG_BLAKE_2_B_512 = 11; HASH_ALG_BLAKE_3 = 12; + STREEBOG_256 = 13; + STREEBOG_512 = 14; } // Specifies the file hash of the component diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json index 6adf03a2..12bbde25 100644 --- a/schema/bom-1.7.schema.json +++ b/schema/bom-1.7.schema.json @@ -1220,7 +1220,9 @@ "BLAKE2b-256", "BLAKE2b-384", "BLAKE2b-512", - "BLAKE3" + "BLAKE3", + "STREEBOG-256", + "STREEBOG-512" ] }, "hash-content": { diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd index 00d98963..761a9fbb 100644 --- a/schema/bom-1.7.xsd +++ b/schema/bom-1.7.xsd @@ -1131,6 +1131,8 @@ limitations under the License. + + From 1d0a1d5597d7a221dc70e4111ccc0ef6b293d213 Mon Sep 17 00:00:00 2001 From: Dmitry Volk Date: Thu, 26 Sep 2024 17:59:03 +0300 Subject: [PATCH 2/3] Add "HASH_ALG_" prefix to algorithm name Signed-off-by: Dmitry Volk --- schema/bom-1.7.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/bom-1.7.proto b/schema/bom-1.7.proto index 142d9507..f795f1d6 100644 --- a/schema/bom-1.7.proto +++ b/schema/bom-1.7.proto @@ -314,8 +314,8 @@ enum HashAlg { HASH_ALG_BLAKE_2_B_384 = 10; HASH_ALG_BLAKE_2_B_512 = 11; HASH_ALG_BLAKE_3 = 12; - STREEBOG_256 = 13; - STREEBOG_512 = 14; + HASH_ALG_STREEBOG_256 = 13; + HASH_ALG_STREEBOG_512 = 14; } // Specifies the file hash of the component From fec8c4c35a6deee371ae37ca531ac187c0dd28e3 Mon Sep 17 00:00:00 2001 From: Dmitry Volk Date: Thu, 26 Sep 2024 18:07:18 +0300 Subject: [PATCH 3/3] Fix hashing algorithm name, because Streebog is not an abbreviation, but a name. Signed-off-by: Dmitry Volk --- schema/bom-1.7.schema.json | 4 ++-- schema/bom-1.7.xsd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schema/bom-1.7.schema.json b/schema/bom-1.7.schema.json index 12bbde25..bb5fd2ad 100644 --- a/schema/bom-1.7.schema.json +++ b/schema/bom-1.7.schema.json @@ -1221,8 +1221,8 @@ "BLAKE2b-384", "BLAKE2b-512", "BLAKE3", - "STREEBOG-256", - "STREEBOG-512" + "Streebog-256", + "Streebog-512" ] }, "hash-content": { diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd index 761a9fbb..07161a1d 100644 --- a/schema/bom-1.7.xsd +++ b/schema/bom-1.7.xsd @@ -1131,8 +1131,8 @@ limitations under the License. - - + +