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"
},
"adata": {
"@type": "cm:AuthenticatedData"
"@type": "pb:CipherParameters"
},
"meta": {
"@type": "cm:MetaData"
},
}
}
}

View file

@ -3,35 +3,6 @@
"so": "https://schema.org/",
"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": {
"created": {
"@type": "CreationTime"

View file

@ -7,28 +7,7 @@
"@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"
"@type": "pb:CipherParameters"
},
{
"@type": "pb:Formatter"

View file

@ -91,5 +91,34 @@
"RemainingSeconds": {
"@type": "dp:Second",
"@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"
}
]
}
}