Skip to content

Commit 1f3aae4

Browse files
ajnelson-nistajnelson-nist
committed
Bump case-utils, and adjust examples for CASE 1.4.0 updates
A follow-on patch will regenerate Make-managed files. Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
1 parent ffe3fe9 commit 1f3aae4

20 files changed

Lines changed: 78 additions & 309 deletions

‎examples/asgard/src/asgard-2.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@
109109
{
110110
"@id": "kb:hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d",
111111
"@type": "uco-types:Hash",
112-
"uco-types:hashMethod": {
113-
"@type": "uco-vocabulary:HashNameVocab",
114-
"@value": "SHA256"
115-
},
112+
"uco-types:hashMethod": "SHA256",
116113
"uco-types:hashValue": {
117114
"@type": "xsd:hexBinary",
118115
"@value": "7ea081166336119da78ee4bbdbd06840b94efe28988a2bdb0bcf2387a481e283"

‎examples/asgard/src/asgard-3.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
{
2525
"@id": "kb:hash-c6cc7dd6-1bf9-5454-9653-37caff09411d",
2626
"@type": "uco-types:Hash",
27-
"uco-types:hashMethod": {
28-
"@type": "uco-vocabulary:HashNameVocab",
29-
"@value": "SHA256"
30-
},
27+
"uco-types:hashMethod": "SHA256",
3128
"uco-types:hashValue": {
3229
"@type": "xsd:hexBinary",
3330
"@value": "a13225720074371d56a4f4d5117fbb4953c5b1d316b31f21edcb7ed8fdf66c6e"

‎examples/crossover_heist/src/crossover_heist-acquisition.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@
100100
{
101101
"@id": "kb:hash-12a9f855-c237-51d8-8239-0bb130374fde",
102102
"@type": "uco-types:Hash",
103-
"uco-types:hashMethod": {
104-
"@type": "uco-vocabulary:HashNameVocab",
105-
"@value": "MD5"
106-
},
103+
"uco-types:hashMethod": "MD5",
107104
"uco-types:hashValue": {
108105
"@type": "xsd:hexBinary",
109106
"@value": "058f03317c1612eadd624342b7fde511"

‎examples/crossover_heist/src/crossover_heist-supplemental.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
{
77
"@id": "kb:hash-128996fc-3823-54a5-9ca4-cf6e21fca62f",
88
"@type": "uco-types:Hash",
9-
"uco-types:hashMethod": {
10-
"@type": "uco-vocabulary:HashNameVocab",
11-
"@value": "SHA1"
12-
},
9+
"uco-types:hashMethod": "SHA1",
1310
"uco-types:hashValue": {
1411
"@type": "xsd:hexBinary",
1512
"@value": "a1ecc7523855f23f3f9a96e3ec0f53ece109cd7d"

‎examples/crossover_heist/src/crossover_heist-usb_hdd_links_recovery.json‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,37 +48,22 @@
4848
{
4949
"@id": "kb:recovered-object-facet-0a916246-a9a0-43ad-a158-ae76cc2c1bb7",
5050
"@type": "uco-observable:RecoveredObjectFacet",
51-
"uco-observable:contentRecoveredStatus": {
52-
"@type": "uco-vocabulary:RecoveredObjectStatusVocab",
53-
"@value": "recovered"
54-
},
55-
"uco-observable:metadataRecoveredStatus": {
56-
"@type": "uco-vocabulary:RecoveredObjectStatusVocab",
57-
"@value": "recovered"
58-
},
59-
"uco-observable:nameRecoveredStatus": {
60-
"@type": "uco-vocabulary:RecoveredObjectStatusVocab",
61-
"@value": "recovered"
62-
}
51+
"uco-observable:contentRecoveredStatus": "recovered",
52+
"uco-observable:metadataRecoveredStatus": "recovered",
53+
"uco-observable:nameRecoveredStatus": "recovered"
6354
},
6455
{
6556
"@id": "kb:content-data-facet-17d9f5ea-d00b-4130-866f-e7399332ae5e",
6657
"@type": "uco-observable:ContentDataFacet",
67-
"uco-observable:byteOrder": {
68-
"@type": "uco-vocabulary:EndiannessTypeVocab",
69-
"@value": "Big-endian"
70-
},
58+
"uco-observable:byteOrder": "Big-endian",
7159
"uco-observable:sizeInBytes": 11633,
7260
"uco-observable:mimeType": "application/application/vnd.openxmlformats-officedocument.wordprocessingml.document",
7361
"uco-observable:hash": [
7462
{
7563
"@id": "kb:hash-adece2a7-0017-5e25-be76-f6b78386186b",
7664
"@type": "uco-types:Hash",
7765
"rdfs:comment": "TODO: From the hash length, the algorithm appears to be MD5, not SHA2-256.",
78-
"uco-types:hashMethod": {
79-
"@type": "uco-vocabulary:HashNameVocab",
80-
"@value": "SHA256"
81-
},
66+
"uco-types:hashMethod": "SHA256",
8267
"uco-types:hashValue": {
8368
"@type": "xsd:hexBinary",
8469
"@value": "701ad15009b0e79af524336f7d069ed1"

‎examples/crossover_heist/src/crossover_heist-usb_hdd_links_usb_thebatplan.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
{
1111
"@id": "kb:hash-c5761f3a-a741-5d06-a668-91e308ef19ef",
1212
"@type": "uco-types:Hash",
13-
"uco-types:hashMethod": {
14-
"@type": "uco-vocabulary:HashNameVocab",
15-
"@value": "MD5"
16-
},
13+
"uco-types:hashMethod": "MD5",
1714
"uco-types:hashValue": {
1815
"@type": "xsd:hexBinary",
1916
"@value": "2282dddf9378cd1dd0497a3484adf768"

‎examples/crossover_wmd/src/crossover_wmd-elder_wand_png.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@
4545
{
4646
"@id": "kb:hash-cb86489c-4d91-5261-adcd-4cf377726d94",
4747
"@type": "uco-types:Hash",
48-
"uco-types:hashMethod": {
49-
"@type": "uco-vocabulary:HashNameVocab",
50-
"@value": "MD5"
51-
},
48+
"uco-types:hashMethod": "MD5",
5249
"uco-types:hashValue": {
5350
"@type": "xsd:hexBinary",
5451
"@value": "13f1393bfe548620da920fac9865965e"

‎examples/crossover_wmd/src/crossover_wmd-file_in_file_system.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@
4949
{
5050
"@id": "kb:hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603",
5151
"@type": "uco-types:Hash",
52-
"uco-types:hashMethod": {
53-
"@type": "uco-vocabulary:HashNameVocab",
54-
"@value": "SHA256"
55-
},
52+
"uco-types:hashMethod": "SHA256",
5653
"uco-types:hashValue": {
5754
"@type": "xsd:hexBinary",
5855
"@value": "0611ea093d19b1c73a5285ff43741dd77f2a8d983c1c71044eb072e44f5dcb0a"

‎examples/crossover_wmd/src/crossover_wmd-integrity_details.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
{
3737
"@id": "kb:hash-c92fc112-d6d0-512c-964f-92d907dd645e",
3838
"@type": "uco-types:Hash",
39-
"uco-types:hashMethod": {
40-
"@type": "uco-vocabulary:HashNameVocab",
41-
"@value": "MD5"
42-
},
39+
"uco-types:hashMethod": "MD5",
4340
"uco-types:hashValue": {
4441
"@type": "xsd:hexBinary",
4542
"@value": "569D5663179237798264E2669281DCD7"
@@ -48,10 +45,7 @@
4845
{
4946
"@id": "kb:hash-1a37ec6e-565a-5393-92c9-42fff2d7361a",
5047
"@type": "uco-types:Hash",
51-
"uco-types:hashMethod": {
52-
"@type": "uco-vocabulary:HashNameVocab",
53-
"@value": "SHA1"
54-
},
48+
"uco-types:hashMethod": "SHA1",
5549
"uco-types:hashValue": {
5650
"@type": "xsd:hexBinary",
5751
"@value": "F46EE05CE1A2210501EA512ED9E4C7EC59222CCA"

‎examples/crossover_wmd/src/crossover_wmd-url_history.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,7 @@
115115
{
116116
"@id": "kb:hash-768aafec-34be-53fb-b4ee-a32666c26145",
117117
"@type": "uco-types:Hash",
118-
"uco-types:hashMethod": {
119-
"@type": "uco-vocabulary:HashNameVocab",
120-
"@value": "MD5"
121-
},
118+
"uco-types:hashMethod": "MD5",
122119
"uco-types:hashValue": {
123120
"@type": "xsd:hexBinary",
124121
"@value": "7434d3a6c61c2244d6f3a0491c144568"

0 commit comments

Comments
 (0)