Skip to content

Commit 89254fb

Browse files
sthagensthagen
authored
Merge pull request #1332 from tschmidtb51/fix-1330
Test 6.1.25 - add missing word "file"
2 parents 82d43f7 + 124b99d commit 89254fb

File tree

5 files changed

+142
-2
lines changed

5 files changed

+142
-2
lines changed

‎csaf_2.0/known_issues.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@
3939
See [#1265](https://github.com/oasis-tcs/csaf/issues/1265).
4040
- Confusion could occur around the depth of PURL checking in test [6.1.13](https://docs.oasis-open.org/csaf/csaf/v2.0/os/csaf-v2.0-os.html#6113-purl).
4141
See [#1303](https://github.com/oasis-tcs/csaf/issues/1303).
42+
- The test [6.1.25](https://docs.oasis-open.org/csaf/csaf/v2.0/os/csaf-v2.0-os.html#6125-multiple-use-of-same-hash-algorithm)
43+
is missing the word "file" in the description and explanation but shows the correct relevant paths.
44+
See [#1330](https://github.com/oasis-tcs/csaf/issues/1330).

‎csaf_2.1/prose/edit/src/tests-01-mndtr-25-multiple-use-of-same-hash-algorithm.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Multiple Use of Same Hash Algorithm
22

3-
It MUST be tested that the same hash algorithm is not used multiple times in one item of hashes.
3+
It MUST be tested that the same hash algorithm is not used multiple times in one item of file hashes.
44

55
The relevant paths for this test are:
66

@@ -40,4 +40,4 @@ The relevant paths for this test are:
4040
}
4141
```
4242

43-
> The hash algorithm `sha256` is used two times in one item of hashes.
43+
> The hash algorithm `sha256` is used two times in one item of file hashes.

‎csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-25-11.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/csaf.json",
3+
"document": {
4+
"category": "csaf_base",
5+
"csaf_version": "2.1",
6+
"distribution": {
7+
"tlp": {
8+
"label": "CLEAR"
9+
}
10+
},
11+
"publisher": {
12+
"category": "other",
13+
"name": "OASIS CSAF TC",
14+
"namespace": "https://csaf.io"
15+
},
16+
"title": "Mandatory Test: Multiple Use of Same Hash Algorithm (valid example 1)",
17+
"tracking": {
18+
"current_release_date": "2024-01-24T10:00:00.000Z",
19+
"id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-25-11",
20+
"initial_release_date": "2024-01-24T10:00:00.000Z",
21+
"revision_history": [
22+
{
23+
"date": "2024-01-24T10:00:00.000Z",
24+
"number": "1",
25+
"summary": "Initial version."
26+
}
27+
],
28+
"status": "final",
29+
"version": "1"
30+
}
31+
},
32+
"product_tree": {
33+
"full_product_names": [
34+
{
35+
"name": "Product A",
36+
"product_id": "CSAFPID-9080700",
37+
"product_identification_helper": {
38+
"hashes": [
39+
{
40+
"file_hashes": [
41+
{
42+
"algorithm": "sha256",
43+
"value": "026a37919b182ef7c63791e82c9645e2f897a3f0b73c7a6028c7febf62e93838"
44+
},
45+
{
46+
"algorithm": "sha384",
47+
"value": "35fe8d330025569f903b84f434fb0cbbc5bb5706bc89e101de3eb2aef36c8328b62f3bbc1bb5685bd383465ddb764632"
48+
}
49+
],
50+
"filename": "product_a.so"
51+
}
52+
]
53+
}
54+
}
55+
]
56+
}
57+
}

‎csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-25-12.json‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"$schema": "https://docs.oasis-open.org/csaf/csaf/v2.1/schema/csaf.json",
3+
"document": {
4+
"category": "csaf_base",
5+
"csaf_version": "2.1",
6+
"distribution": {
7+
"tlp": {
8+
"label": "CLEAR"
9+
}
10+
},
11+
"publisher": {
12+
"category": "other",
13+
"name": "OASIS CSAF TC",
14+
"namespace": "https://csaf.io"
15+
},
16+
"title": "Mandatory Test: Multiple Use of Same Hash Algorithm (valid example 2)",
17+
"tracking": {
18+
"current_release_date": "2024-01-24T10:00:00.000Z",
19+
"id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-25-12",
20+
"initial_release_date": "2024-01-24T10:00:00.000Z",
21+
"revision_history": [
22+
{
23+
"date": "2024-01-24T10:00:00.000Z",
24+
"number": "1",
25+
"summary": "Initial version."
26+
}
27+
],
28+
"status": "final",
29+
"version": "1"
30+
}
31+
},
32+
"product_tree": {
33+
"full_product_names": [
34+
{
35+
"name": "Product A",
36+
"product_id": "CSAFPID-9080700",
37+
"product_identification_helper": {
38+
"hashes": [
39+
{
40+
"file_hashes": [
41+
{
42+
"algorithm": "sha256",
43+
"value": "026a37919b182ef7c63791e82c9645e2f897a3f0b73c7a6028c7febf62e93838"
44+
},
45+
{
46+
"algorithm": "sha384",
47+
"value": "35fe8d330025569f903b84f434fb0cbbc5bb5706bc89e101de3eb2aef36c8328b62f3bbc1bb5685bd383465ddb764632"
48+
}
49+
],
50+
"filename": "product_a-one-file.so"
51+
},
52+
{
53+
"file_hashes": [
54+
{
55+
"algorithm": "sha384",
56+
"value": "25222e538a6c9256ee1e876414f8d4fc443f7b7ade2b1ab81d43d007e159fbbca21bb54bfbc7c1ca9bf93a95b73bd6ed"
57+
},
58+
{
59+
"algorithm": "sha256",
60+
"value": "af13a3ac44eb4e528246608f5dc18b5403b51046e7a6a32828fa4349345afcda"
61+
}
62+
],
63+
"filename": "product_a-another-file.so"
64+
}
65+
]
66+
}
67+
}
68+
]
69+
}
70+
}

‎csaf_2.1/test/validator/data/testcases.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,16 @@
778778
"name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-25-01.json",
779779
"valid": false
780780
}
781+
],
782+
"valid": [
783+
{
784+
"name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-25-11.json",
785+
"valid": true
786+
},
787+
{
788+
"name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-25-12.json",
789+
"valid": true
790+
}
781791
]
782792
},
783793
{

0 commit comments

Comments
 (0)