Commit d351a631 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

ALternative way of adding signature block

parent eea9133c
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@
  },
  "signatures": [
    {
      "someohterranfomstring" : "foo",
      "hash_algorithm": "sha-256",
      "algorithm": "Ed448",
      "public_key": "MEMwBQYDK2VxAzoAPTyXPyIqU1VWCuEml1VjvnBYv2I+AvNteIGsTtVc2pT7erIVLDdJRq18tDhZifqW0WGYSy0yVYQA",
+8 −65
Original line number Diff line number Diff line
@@ -14,32 +14,6 @@
        "Payload": {
          "$ref": "#/$defs/MessagePayload"
        },
        "Signatures": {
          "type": "array",
          "minItems": 1,
          "items": {
            "type": "object",
              "properties": {
                "hash_algorithm": {
                  "type": "string"
                },
                "algorithm": {
                  "type": "string"
                },
                "public_key": {
                  "type": "string"
                },
                "value": {
                  "type": "string"
                }
              },
              "required": [
                "hash_algorithm",
                "algorithm",
                "value"
              ]
            }
          },
        "Signature": {
          "properties": {
            "protected": {
@@ -53,46 +27,9 @@
            "protected",
            "signature"
          ]
        }
      },
      "oneOf": [
        {
          "required": [
            "Signatures"
          ],
          "not": {
            "required": [
              "Signature"
            ]
          }
        },
        {
          "required": [
            "Signature"
          ],
          "not": {
            "required": [
              "Signatures"
            ]
          }
        "signatures": {}
      },
        {
          "not": {
            "anyOf": [
              {
                "required": [
                  "Signatures"
                ]
              },
              {
                "required": [
                  "Signature"
                ]
              }
            ]
          }
        }
      ],
      "required": [
        "Header",
        "Payload"
@@ -739,6 +676,12 @@
      ],
      "additionalProperties": false
    },
    "Signatures": {
      "type": "object",
      "properties": {},
      "required": [],
      "additionalProperties": false
    },
    "ConcreteHI1Object": {
      "oneOf": [
        {
+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@
            <xs:element name="Signature" minOccurs="0"/>
            <!-- Use of the Signature element is discouraged – implementers are encouraged use the digsig:Signature element below instead -->
            <xs:element ref="digsig:Signature" minOccurs="0"/>
            <!-- The Signatures element is introduced for JSS support, and is not intended for use in XML-format instance documents.-->
            <xs:element name="signatures" minOccurs="0"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="MessageHeader">
@@ -204,4 +206,5 @@
            <xs:element name="CountryCode" type="etsi:ISOCountryCode"/>
        </xs:sequence>
    </xs:complexType>
    <xs:complexType name="Signatures"></xs:complexType>
</xs:schema>