diff --git a/js/comment.jsonld b/js/comment.jsonld index fa6958c..199f75d 100644 --- a/js/comment.jsonld +++ b/js/comment.jsonld @@ -23,10 +23,10 @@ "@type": "pb:CipherText" }, "adata": { - "@type": "cm:AuthenticatedData" + "@type": "pb:CipherParameters" }, "meta": { "@type": "cm:MetaData" - }, + } } } \ No newline at end of file diff --git a/js/commentmeta.jsonld b/js/commentmeta.jsonld index 1dde0c2..136b70d 100644 --- a/js/commentmeta.jsonld +++ b/js/commentmeta.jsonld @@ -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" diff --git a/js/pastemeta.jsonld b/js/pastemeta.jsonld index 2c4efc5..b0e07f6 100644 --- a/js/pastemeta.jsonld +++ b/js/pastemeta.jsonld @@ -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" diff --git a/js/types.jsonld b/js/types.jsonld index be4279a..d586226 100644 --- a/js/types.jsonld +++ b/js/types.jsonld @@ -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" + } + ] } } \ No newline at end of file