reduce duplication in format

js/comment.jsonld

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

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"

js/pastemeta.jsonld

@@ -7,28 +7,7 @@
 		"@container": "@list",
 		"@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"

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"
+			}
+		]
 	}
 }