diff options
| author | bleichen <bleichen@google.com> | 2023-02-22 01:41:56 -0800 |
|---|---|---|
| committer | Charles Lee <ckl@google.com> | 2023-02-27 16:44:39 -0800 |
| commit | bad935fddf79958e03e3785d028c23077673a583 (patch) | |
| tree | 1aa5406dcfed0655c7eafaf837741c910e2c26a1 | |
| parent | ce45149c3931db8a27df06198a209c69206c9c29 (diff) | |
| download | wycheproof-bad935fddf79958e03e3785d028c23077673a583.tar.gz | |
Simplifying the JSON schemas.
All test vectors currently use only compact serialization.
Other serializations were previously allowed.
NOKEYCHECK=True
PiperOrigin-RevId: 511429694
| -rw-r--r-- | schemas/json_web_encryption_schema.json | 55 | ||||
| -rw-r--r-- | schemas/json_web_key_schema.json | 13 | ||||
| -rw-r--r-- | schemas/json_web_signature_schema.json | 13 |
3 files changed, 6 insertions, 75 deletions
diff --git a/schemas/json_web_encryption_schema.json b/schemas/json_web_encryption_schema.json index 3cab220..dab2122 100644 --- a/schemas/json_web_encryption_schema.json +++ b/schemas/json_web_encryption_schema.json @@ -128,48 +128,6 @@ } } }, - "JsonWebEncryptionSerialization" : { - "type" : "object", - "description" : "General JWE JSON Serialization descripted in Section 7.2.1 of RFC 7516", - "propterties" : { - "protected" : { - "type" : "string", - "format" : "BASE64URL", - "description" : "an integrity protected header" - }, - "unprotected" : { - "type" : "object", - "description" : "unprotected header values" - }, - "iv" : { - "type" : "string", - "format" : "BASE64URL", - "description" : "the IV" - }, - "aad" : { - "type" : "string", - "format" : "BASE64URL", - "description" : "additional authenticated data" - }, - "ciphertext" : { - "type" : "string", - "format" : "BASE64URL", - "description" : "the ciphertext" - }, - "tag" : { - "type" : "string", - "format" : "BASE64URL", - "description" : "the authentication tag" - }, - "recipients" : { - "type": "array", - "items": { - "$ref": "#/definitions/Recipient" - }, - "description" : "a list of recipients" - } - } - }, "JsonWebEncryptionTestVector": { "type": "object", "properties": { @@ -182,17 +140,8 @@ "description": "A brief description of the test case" }, "jwe": { - "oneOf": [ - { - "$ref": "#/definitions/JsonWebEncryptionSerialization", - "description": "The JSON serialization form" - }, - { - "type": "string", - "description": "The compact serialization form" - } - ], - "description": "The JSON Web Encryption" + "type": "string", + "description": "The JSON Web Encryption in compact form" }, "pt": { "type": "string", diff --git a/schemas/json_web_key_schema.json b/schemas/json_web_key_schema.json index 690c54f..2f7db4c 100644 --- a/schemas/json_web_key_schema.json +++ b/schemas/json_web_key_schema.json @@ -140,17 +140,8 @@ "description": "A brief description of the test case" }, "jws": { - "oneOf": [ - { - "type": "object", - "description": "The JSON serialization form" - }, - { - "type": "string", - "description": "The compact serialization form" - } - ], - "description": "The JSON Web Signature" + "type" : "string", + "description": "The JSON Web Signature in compact form" }, "result": { "type": "string", diff --git a/schemas/json_web_signature_schema.json b/schemas/json_web_signature_schema.json index 48589cc..fe9859b 100644 --- a/schemas/json_web_signature_schema.json +++ b/schemas/json_web_signature_schema.json @@ -130,17 +130,8 @@ "description": "A brief description of the test case" }, "jws": { - "oneOf": [ - { - "type": "object", - "description": "The JSON serialization form" - }, - { - "type": "string", - "description": "The compact serialization form" - } - ], - "description": "The JSON Web Signature" + "type": "string", + "description": "The JSON Web Signature in compact form" }, "result": { "type": "string", |