reduce duplication in format

This commit is contained in:
El RIDO 2018-12-17 21:42:49 +01:00
parent e64eaf45ee
commit 1de57c874e
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
4 changed files with 32 additions and 53 deletions

View File

@ -23,10 +23,10 @@
"@type": "pb:CipherText" "@type": "pb:CipherText"
}, },
"adata": { "adata": {
"@type": "cm:AuthenticatedData" "@type": "pb:CipherParameters"
}, },
"meta": { "meta": {
"@type": "cm:MetaData" "@type": "cm:MetaData"
}, }
} }
} }

View File

@ -3,35 +3,6 @@
"so": "https://schema.org/", "so": "https://schema.org/",
"pb": "?jsonld=types#" "pb": "?jsonld=types#"
}, },
"AuthenticatedData": {
"@container": "@list",
"@value": [
{
"@type": "pb:InitializationVector"
},
{
"@type": "pb:Salt"
},
{
"@type": "pb:Iterations"
},
{
"@type": "pb:KeySize"
},
{
"@type": "pb:TagSize"
},
{
"@type": "pb:Algorithm"
},
{
"@type": "pb:Mode"
},
{
"@type": "pb:Compression"
}
]
},
"MetaData": { "MetaData": {
"created": { "created": {
"@type": "CreationTime" "@type": "CreationTime"

View File

@ -7,28 +7,7 @@
"@container": "@list", "@container": "@list",
"@value": [ "@value": [
{ {
"@type": "pb:InitializationVector" "@type": "pb:CipherParameters"
},
{
"@type": "pb:Salt"
},
{
"@type": "pb:Iterations"
},
{
"@type": "pb:KeySize"
},
{
"@type": "pb:TagSize"
},
{
"@type": "pb:Algorithm"
},
{
"@type": "pb:Mode"
},
{
"@type": "pb:Compression"
}, },
{ {
"@type": "pb:Formatter" "@type": "pb:Formatter"

View File

@ -91,5 +91,34 @@
"RemainingSeconds": { "RemainingSeconds": {
"@type": "dp:Second", "@type": "dp:Second",
"@minimum": 1 "@minimum": 1
},
"CipherParameters": {
"@container": "@list",
"@value": [
{
"@type": "pb:InitializationVector"
},
{
"@type": "pb:Salt"
},
{
"@type": "pb:Iterations"
},
{
"@type": "pb:KeySize"
},
{
"@type": "pb:TagSize"
},
{
"@type": "pb:Algorithm"
},
{
"@type": "pb:Mode"
},
{
"@type": "pb:Compression"
}
]
} }
} }