Skip to content

Commit f9bc760

Browse files
ajnelson-nistajnelson-nist
committed
Bump case-prov to 0.14.0; adapt examples for CASE 1.4.0
A follow-on patch will regenerate Make-managed files. Signed-off-by: Alex Nelson <[email protected]>
1 parent ae6aa0f commit f9bc760

18 files changed

+76
-311
lines changed

‎examples/illustrations/Oresteia/src/Oresteia_base.json‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"uco-role": "https://ontology.unifiedcyberontology.org/uco/role/",
1717
"uco-tool": "https://ontology.unifiedcyberontology.org/uco/tool/",
1818
"uco-types": "https://ontology.unifiedcyberontology.org/uco/types/",
19-
"uco-vocabulary": "https://ontology.unifiedcyberontology.org/uco/vocabulary/",
2019
"xsd": "http://www.w3.org/2001/XMLSchema#"
2120
},
2221
"@id": "kb:bundle-3b13e958a-d975-41aa-b1bb-029d2b6707cd",
@@ -1069,10 +1068,7 @@
10691068
{
10701069
"@id": "kb:hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d",
10711070
"@type": "uco-types:Hash",
1072-
"uco-types:hashMethod": {
1073-
"@type": "uco-vocabulary:HashNameVocab",
1074-
"@value": "SHA256"
1075-
},
1071+
"uco-types:hashMethod": "SHA256",
10761072
"uco-types:hashValue": {
10771073
"@type": "xsd:hexBinary",
10781074
"@value": "7ea081166336119da78ee4bbdbd06840b94efe28988a2bdb0bcf2387a481e283"
@@ -1138,10 +1134,7 @@
11381134
{
11391135
"@id": "kb:hash-c6cc7dd6-1bf9-5454-9653-37caff09411d",
11401136
"@type": "uco-types:Hash",
1141-
"uco-types:hashMethod": {
1142-
"@type": "uco-vocabulary:HashNameVocab",
1143-
"@value": "SHA256"
1144-
},
1137+
"uco-types:hashMethod": "SHA256",
11451138
"uco-types:hashValue": {
11461139
"@type": "xsd:hexBinary",
11471140
"@value": "a13225720074371d56a4f4d5117fbb4953c5b1d316b31f21edcb7ed8fdf66c6e"
@@ -1205,10 +1198,7 @@
12051198
{
12061199
"@id": "kb:hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603",
12071200
"@type": "uco-types:Hash",
1208-
"uco-types:hashMethod": {
1209-
"@type": "uco-vocabulary:HashNameVocab",
1210-
"@value": "SHA256"
1211-
},
1201+
"uco-types:hashMethod": "SHA256",
12121202
"uco-types:hashValue": {
12131203
"@type": "xsd:hexBinary",
12141204
"@value": "0611ea093d19b1c73a5285ff43741dd77f2a8d983c1c71044eb072e44f5dcb0a"

‎examples/illustrations/bulk_extractor_forensic_path/bulk_extractor_forensic_path.json‎

Lines changed: 10 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
66
"uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
77
"uco-types": "https://ontology.unifiedcyberontology.org/uco/types/",
8-
"uco-vocabulary": "https://ontology.unifiedcyberontology.org/uco/vocabulary/",
98
"xsd": "http://www.w3.org/2001/XMLSchema#"
109
},
1110
"@graph": [
@@ -16,20 +15,14 @@
1615
{
1716
"@id": "kb:content-data-facet-ccebaca3-4485-46d8-bdf2-d2905a08d0c9",
1817
"@type": "uco-observable:ContentDataFacet",
19-
"uco-observable:byteOrder": {
20-
"@type": "uco-vocabulary:EndiannessTypeVocab",
21-
"@value": "Big-endian"
22-
},
18+
"uco-observable:byteOrder": "Big-endian",
2319
"uco-observable:sizeInBytes": 17,
2420
"uco-observable:dataPayload": "bmVsc29uQGNyeW53ci5jb20=",
2521
"uco-observable:hash": [
2622
{
2723
"@id": "kb:hash-f9eebfa7-ce0e-513f-b4be-f3fe7512c79a",
2824
"@type": "uco-types:Hash",
29-
"uco-types:hashMethod": {
30-
"@type": "uco-vocabulary:HashNameVocab",
31-
"@value": "SHA256"
32-
},
25+
"uco-types:hashMethod": "SHA256",
3326
"uco-types:hashValue": {
3427
"@type": "xsd:hexBinary",
3528
"@value": "8fabebdaf41b54014f6c3507c44ae160547d05d31bd50d6a12234c5bc4bdb45c"
@@ -66,20 +59,14 @@
6659
{
6760
"@id": "kb:content-data-facet-fa866136-c537-4b25-a481-364c7859f8f0",
6861
"@type": "uco-observable:ContentDataFacet",
69-
"uco-observable:byteOrder": {
70-
"@type": "uco-vocabulary:EndiannessTypeVocab",
71-
"@value": "Big-endian"
72-
},
62+
"uco-observable:byteOrder": "Big-endian",
7363
"uco-observable:sizeInBytes": 15,
7464
"uco-observable:dataPayload": "c3Rya0BrZXliaXQubmV0",
7565
"uco-observable:hash": [
7666
{
7767
"@id": "kb:hash-59bd11fd-af49-5e39-ba3b-54ba31f3c8d6",
7868
"@type": "uco-types:Hash",
79-
"uco-types:hashMethod": {
80-
"@type": "uco-vocabulary:HashNameVocab",
81-
"@value": "SHA256"
82-
},
69+
"uco-types:hashMethod": "SHA256",
8370
"uco-types:hashValue": {
8471
"@type": "xsd:hexBinary",
8572
"@value": "9a6c11d66829bf429efe5ef4c066d50272394481cc3f8ae8116a006c81dc6cf9"
@@ -116,21 +103,15 @@
116103
{
117104
"@id": "kb:content-data-facet-ed051828-45e7-47b3-82ca-be5b9a88d5f7",
118105
"@type": "uco-observable:ContentDataFacet",
119-
"uco-observable:byteOrder": {
120-
"@type": "uco-vocabulary:EndiannessTypeVocab",
121-
"@value": "Big-endian"
122-
},
106+
"uco-observable:byteOrder": "Big-endian",
123107
"uco-observable:magicNumber": "H4s=",
124108
"uco-observable:mimeType": "application/x-compressed",
125109
"uco-observable:sizeInBytes": 17605,
126110
"uco-observable:hash": [
127111
{
128112
"@id": "kb:hash-7a2f290f-2944-5520-816a-85f722e64525",
129113
"@type": "uco-types:Hash",
130-
"uco-types:hashMethod": {
131-
"@type": "uco-vocabulary:HashNameVocab",
132-
"@value": "SHA256"
133-
},
114+
"uco-types:hashMethod": "SHA256",
134115
"uco-types:hashValue": {
135116
"@type": "xsd:hexBinary",
136117
"@value": "8c8b39473c4064f6b4db11a67251ffdf65c42ebadc5c3e02a009f95f6cf7c9e8"
@@ -172,10 +153,7 @@
172153
{
173154
"@id": "kb:hash-47323085-5f5a-5252-82b3-347183525558",
174155
"@type": "uco-types:Hash",
175-
"uco-types:hashMethod": {
176-
"@type": "uco-vocabulary:HashNameVocab",
177-
"@value": "SHA256"
178-
},
156+
"uco-types:hashMethod": "SHA256",
179157
"uco-types:hashValue": {
180158
"@type": "xsd:hexBinary",
181159
"@value": "a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
@@ -218,10 +196,7 @@
218196
{
219197
"@id": "kb:hash-9c9f1145-243a-58d6-b420-bd38101cb511",
220198
"@type": "uco-types:Hash",
221-
"uco-types:hashMethod": {
222-
"@type": "uco-vocabulary:HashNameVocab",
223-
"@value": "SHA256"
224-
},
199+
"uco-types:hashMethod": "SHA256",
225200
"uco-types:hashValue": {
226201
"@type": "xsd:hexBinary",
227202
"@value": "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4"
@@ -263,10 +238,7 @@
263238
{
264239
"@id": "kb:hash-84b82467-019e-53cf-a1e6-e8a394379916",
265240
"@type": "uco-types:Hash",
266-
"uco-types:hashMethod": {
267-
"@type": "uco-vocabulary:HashNameVocab",
268-
"@value": "SHA256"
269-
},
241+
"uco-types:hashMethod": "SHA256",
270242
"uco-types:hashValue": {
271243
"@type": "xsd:hexBinary",
272244
"@value": "5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5"
@@ -312,10 +284,7 @@
312284
{
313285
"@id": "kb:hash-c492a39d-88e4-51f1-9f80-31524494f877",
314286
"@type": "uco-types:Hash",
315-
"uco-types:hashMethod": {
316-
"@type": "uco-vocabulary:HashNameVocab",
317-
"@value": "SHA256"
318-
},
287+
"uco-types:hashMethod": "SHA256",
319288
"uco-types:hashValue": {
320289
"@type": "xsd:hexBinary",
321290
"@value": "8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92"

‎examples/illustrations/exif_data/exif_data.json‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
1111
"uco-tool": "https://ontology.unifiedcyberontology.org/uco/tool/",
1212
"uco-types": "https://ontology.unifiedcyberontology.org/uco/types/",
13-
"uco-vocabulary": "https://ontology.unifiedcyberontology.org/uco/vocabulary/",
1413
"xsd": "http://www.w3.org/2001/XMLSchema#"
1514
},
1615
"@graph": [
@@ -70,10 +69,7 @@
7069
{
7170
"@id": "kb:content-data-facet-79503339-556a-4e23-ae5c-c2c948bde088",
7271
"@type": "uco-observable:ContentDataFacet",
73-
"uco-observable:byteOrder": {
74-
"@type": "uco-vocabulary:EndiannessTypeVocab",
75-
"@value": "Big-endian"
76-
},
72+
"uco-observable:byteOrder": "Big-endian",
7773
"uco-observable:magicNumber": "/9j/ww==",
7874
"uco-observable:mimeType": "image/jpg",
7975
"uco-observable:sizeInBytes": 35000,
@@ -82,10 +78,7 @@
8278
{
8379
"@id": "kb:hash-77fbf31d-c4f0-51bd-b04e-c50d13312fba",
8480
"@type": "uco-types:Hash",
85-
"uco-types:hashMethod": {
86-
"@type": "uco-vocabulary:HashNameVocab",
87-
"@value": "SHA256"
88-
},
81+
"uco-types:hashMethod": "SHA256",
8982
"uco-types:hashValue": {
9083
"@type": "xsd:hexBinary",
9184
"@value": "6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b"

‎examples/illustrations/file/file.json‎

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"uco-identity": "https://ontology.unifiedcyberontology.org/uco/identity/",
99
"uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
1010
"uco-types": "https://ontology.unifiedcyberontology.org/uco/types/",
11-
"uco-vocabulary": "https://ontology.unifiedcyberontology.org/uco/vocabulary/",
1211
"xsd": "http://www.w3.org/2001/XMLSchema#"
1312
},
1413
"@graph": [
@@ -19,20 +18,14 @@
1918
{
2019
"@id": "kb:content-data-facet-fa1faab5-f212-4ab5-ae09-6937ca06e847",
2120
"@type": "uco-observable:ContentDataFacet",
22-
"uco-observable:byteOrder": {
23-
"@type": "uco-vocabulary:EndiannessTypeVocab",
24-
"@value": "Big-endian"
25-
},
21+
"uco-observable:byteOrder": "Big-endian",
2622
"uco-observable:sizeInBytes": 29,
2723
"uco-observable:dataPayload": "Q0FTRSBpcyBhbiBhd2Vzb21lIG9udG9sb2d5IQ=",
2824
"uco-observable:hash": [
2925
{
3026
"@id": "kb:hash-fbd39b90-551d-5a80-8f3d-70e91c5fe472",
3127
"@type": "uco-types:Hash",
32-
"uco-types:hashMethod": {
33-
"@type": "uco-vocabulary:HashNameVocab",
34-
"@value": "SHA256"
35-
},
28+
"uco-types:hashMethod": "SHA256",
3629
"uco-types:hashValue": {
3730
"@type": "xsd:hexBinary",
3831
"@value": "6b51d431df5d7f141cbececcf79edf3dd861c3b4069f0b11661a3eefacbba918"
@@ -69,10 +62,7 @@
6962
{
7063
"@id": "kb:content-data-facet-51084177-f4e8-4955-8475-52dc4222e4be",
7164
"@type": "uco-observable:ContentDataFacet",
72-
"uco-observable:byteOrder": {
73-
"@type": "uco-vocabulary:EndiannessTypeVocab",
74-
"@value": "Big-endian"
75-
},
65+
"uco-observable:byteOrder": "Big-endian",
7666
"uco-observable:sizeInBytes": 3500,
7767
"uco-observable:magicNumber": "/9j/ww==",
7868
"uco-observable:mimeType": "image/jpg",
@@ -81,10 +71,7 @@
8171
{
8272
"@id": "kb:hash-29cbd7b8-e404-55f0-b667-c1762b73cdcd",
8373
"@type": "uco-types:Hash",
84-
"uco-types:hashMethod": {
85-
"@type": "uco-vocabulary:HashNameVocab",
86-
"@value": "MD5"
87-
},
74+
"uco-types:hashMethod": "MD5",
8875
"uco-types:hashValue": {
8976
"@type": "xsd:hexBinary",
9077
"@value": "3d137a188c1e82247b815209ce44af2c"
@@ -93,10 +80,7 @@
9380
{
9481
"@id": "kb:hash-7a2f290f-2944-5520-816a-85f722e64525",
9582
"@type": "uco-types:Hash",
96-
"uco-types:hashMethod": {
97-
"@type": "uco-vocabulary:HashNameVocab",
98-
"@value": "SHA256"
99-
},
83+
"uco-types:hashMethod": "SHA256",
10084
"uco-types:hashValue": {
10185
"@type": "xsd:hexBinary",
10286
"@value": "8c8b39473c4064f6b4db11a67251ffdf65c42ebadc5c3e02a009f95f6cf7c9e8"
@@ -156,10 +140,7 @@
156140
{
157141
"@id": "kb:hash-47323085-5f5a-5252-82b3-347183525558",
158142
"@type": "uco-types:Hash",
159-
"uco-types:hashMethod": {
160-
"@type": "uco-vocabulary:HashNameVocab",
161-
"@value": "SHA256"
162-
},
143+
"uco-types:hashMethod": "SHA256",
163144
"uco-types:hashValue": {
164145
"@type": "xsd:hexBinary",
165146
"@value": "a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
@@ -208,10 +189,7 @@
208189
{
209190
"@id": "kb:hash-9c9f1145-243a-58d6-b420-bd38101cb511",
210191
"@type": "uco-types:Hash",
211-
"uco-types:hashMethod": {
212-
"@type": "uco-vocabulary:HashNameVocab",
213-
"@value": "SHA256"
214-
},
192+
"uco-types:hashMethod": "SHA256",
215193
"uco-types:hashValue": {
216194
"@type": "xsd:hexBinary",
217195
"@value": "03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4"
@@ -256,10 +234,7 @@
256234
{
257235
"@id": "kb:hash-84b82467-019e-53cf-a1e6-e8a394379916",
258236
"@type": "uco-types:Hash",
259-
"uco-types:hashMethod": {
260-
"@type": "uco-vocabulary:HashNameVocab",
261-
"@value": "SHA256"
262-
},
237+
"uco-types:hashMethod": "SHA256",
263238
"uco-types:hashValue": {
264239
"@type": "xsd:hexBinary",
265240
"@value": "5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5"
@@ -334,10 +309,7 @@
334309
{
335310
"@id": "kb:hash-c492a39d-88e4-51f1-9f80-31524494f877",
336311
"@type": "uco-types:Hash",
337-
"uco-types:hashMethod": {
338-
"@type": "uco-vocabulary:HashNameVocab",
339-
"@value": "SHA256"
340-
},
312+
"uco-types:hashMethod": "SHA256",
341313
"uco-types:hashValue": {
342314
"@type": "xsd:hexBinary",
343315
"@value": "8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92"
@@ -379,10 +351,7 @@
379351
{
380352
"@id": "kb:hash-ecccf09c-feb3-5feb-89bc-c7ab13b54605",
381353
"@type": "uco-types:Hash",
382-
"uco-types:hashMethod": {
383-
"@type": "uco-vocabulary:HashNameVocab",
384-
"@value": "SHA256"
385-
},
354+
"uco-types:hashMethod": "SHA256",
386355
"uco-types:hashValue": {
387356
"@type": "xsd:hexBinary",
388357
"@value": "8bb0cf6eb9b17d0f7d22b456f121257dc1254e1f01665370476383ea776df414"
@@ -445,10 +414,7 @@
445414
{
446415
"@id": "kb:hash-7c6c42be-0c5b-592f-91a2-c509af290369",
447416
"@type": "uco-types:Hash",
448-
"uco-types:hashMethod": {
449-
"@type": "uco-vocabulary:HashNameVocab",
450-
"@value": "SHA256"
451-
},
417+
"uco-types:hashMethod": "SHA256",
452418
"uco-types:hashValue": {
453419
"@type": "xsd:hexBinary",
454420
"@value": "ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f"

0 commit comments

Comments
 (0)