Skip to content

Commit 1a6ae86

Browse files
Added back in broken ikev2 behavior for XML and JSON
Signed-off-by: Steve Springett <[email protected]>
1 parent 1ce2c8f commit 1a6ae86

File tree

2 files changed

+175
-135
lines changed

2 files changed

+175
-135
lines changed

schema/bom-1.7.schema.json

Lines changed: 70 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5810,54 +5810,99 @@
58105810
"additionalProperties": false,
58115811
"properties": {
58125812
"encr": {
5813-
"type": "array",
58145813
"title": "Encryption Algorithms (ENCR)",
58155814
"description": "Transform Type 1: encryption algorithms",
5816-
"items": {
5817-
"$ref": "#/definitions/ikeV2Enc",
5818-
"title": "Encryption Algorithm (ENCR)"
5819-
}
5815+
"anyOf": [
5816+
{
5817+
"type": "array",
5818+
"items": {
5819+
"$ref": "#/definitions/ikeV2Enc",
5820+
"title": "Encryption Algorithm (ENCR)"
5821+
}
5822+
},
5823+
{
5824+
"deprecated": true,
5825+
"$ref": "#/definitions/cryptoRefArray",
5826+
"description": "[DEPRECATED] This will be removed in a future version. Transform Type 1: encryption algorithms"
5827+
}
5828+
]
58205829
},
58215830
"prf": {
5822-
"type": "array",
58235831
"title": "Pseudorandom Functions (PRF)",
58245832
"description": "Transform Type 2: pseudorandom functions",
5825-
"items": {
5826-
"$ref": "#/definitions/ikeV2Prf",
5827-
"title": "Pseudorandom Function (PRF)"
5828-
}
5833+
"anyOf": [
5834+
{
5835+
"type": "array",
5836+
"items": {
5837+
"$ref": "#/definitions/ikeV2Prf",
5838+
"title": "Pseudorandom Function (PRF)"
5839+
}
5840+
},
5841+
{
5842+
"deprecated": true,
5843+
"$ref": "#/definitions/cryptoRefArray",
5844+
"description": "[DEPRECATED] This will be removed in a future version. Transform Type 2: pseudorandom functions"
5845+
}
5846+
]
58295847
},
58305848
"integ": {
5831-
"type": "array",
58325849
"title": "Integrity Algorithms (INTEG)",
58335850
"description": "Transform Type 3: integrity algorithms",
5834-
"items": {
5835-
"$ref": "#/definitions/ikeV2Integ",
5836-
"title": "Integrity Algorithm (INTEG)"
5837-
}
5851+
"anyOf": [
5852+
{
5853+
"type": "array",
5854+
"items": {
5855+
"$ref": "#/definitions/ikeV2Integ",
5856+
"title": "Integrity Algorithm (INTEG)"
5857+
}
5858+
},
5859+
{
5860+
"deprecated": true,
5861+
"$ref": "#/definitions/cryptoRefArray",
5862+
"description": "[DEPRECATED] This will be removed in a future version. Transform Type 3: integrity algorithms"
5863+
}
5864+
]
58385865
},
58395866
"ke": {
5840-
"type": "array",
58415867
"title": "Key Exchange Methods (KE)",
58425868
"description": "Transform Type 4: Key Exchange Method (KE) per [RFC 9370](https://www.ietf.org/rfc/rfc9370.html), formerly called Diffie-Hellman Group (D-H).",
5843-
"items": {
5844-
"$ref": "#/definitions/ikeV2Ke",
5845-
"title": "Key Exchange Method (KE)"
5846-
}
5869+
"anyOf": [
5870+
{
5871+
"type": "array",
5872+
"items": {
5873+
"$ref": "#/definitions/ikeV2Ke",
5874+
"title": "Key Exchange Method (KE)"
5875+
}
5876+
},
5877+
{
5878+
"deprecated": true,
5879+
"$ref": "#/definitions/cryptoRefArray",
5880+
"description": "[DEPRECATED] This will be removed in a future version. Transform Type 4: Key Exchange Method (KE) per [RFC 9370](https://www.ietf.org/rfc/rfc9370.html), formerly called Diffie-Hellman Group (D-H)."
5881+
}
5882+
]
58475883
},
58485884
"esn": {
58495885
"type": "boolean",
58505886
"title": "Extended Sequence Number (ESN)",
58515887
"description": "Specifies if an Extended Sequence Number (ESN) is used."
58525888
},
58535889
"auth": {
5854-
"type": "array",
58555890
"title": "IKEv2 Authentication methods",
58565891
"description": "IKEv2 Authentication method per [RFC9593](https://www.ietf.org/rfc/rfc9593.html).",
5857-
"items": {
5858-
"$ref": "#/definitions/ikeV2Auth",
5859-
"title": "IKEv2 Authentication Method"
5860-
}
5892+
"anyOf": [
5893+
{
5894+
"type": "array",
5895+
"items": {
5896+
"$ref": "#/definitions/ikeV2Auth",
5897+
"title": "IKEv2 Authentication Method"
5898+
}
5899+
},
5900+
{
5901+
"deprecated": true,
5902+
"$ref": "#/definitions/cryptoRefArray",
5903+
"description": "[DEPRECATED] This will be removed in a future version. IKEv2 Authentication method"
5904+
}
5905+
]
58615906
}
58625907
}
58635908
},

0 commit comments

Comments
 (0)