-
-
Notifications
You must be signed in to change notification settings - Fork 93
CBOM: add protocol registry schema #1010
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bhess
wants to merge
10
commits into
CycloneDX:2.0-dev
Choose a base branch
from
bhess:bhe-protocol-registry
base: 2.0-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
555294f
Add protocol registry to cryptography-defs
bhess 57c5985
Add sub-protocol references to the protocol registry
bhess 0e18e51
Reference the protocol registry from protocolProperties.type
bhess f578871
Merge branch '2.0-dev' into bhe-protocol-registry
jkowalleck ea34c2d
Merge branch '2.0-dev' into bhe-protocol-registry
jkowalleck 2e8b48a
Split selectedBy into mechanism and selecting party
bhess 0f67c4a
Document the registry join and add protocol type tests
bhess c77c986
add some clarification
bhess ffc4845
Merge branch '2.0-dev' into bhe-protocol-registry
jkowalleck dcd8f24
Merge branch '2.0-dev' into bhe-protocol-registry
jkowalleck File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -754,46 +754,14 @@ | |
| "additionalProperties": false, | ||
| "properties": { | ||
| "type": { | ||
| "type": "string", | ||
| "$ref": "../../cryptography-defs.schema.json#/definitions/protocolFamiliesEnum", | ||
| "title": "Type", | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rename: "Protocol type" |
||
| "description": "The concrete protocol type.", | ||
| "enum": [ | ||
| "tls", | ||
| "ssh", | ||
| "ipsec", | ||
| "ike", | ||
| "sstp", | ||
| "wpa", | ||
| "dtls", | ||
| "quic", | ||
| "eap-aka", | ||
| "eap-aka-prime", | ||
| "prins", | ||
| "5g-aka", | ||
| "other", | ||
| "unknown" | ||
| ], | ||
| "meta:enum": { | ||
| "tls": "Transport Layer Security", | ||
| "ssh": "Secure Shell", | ||
| "ipsec": "Internet Protocol Security", | ||
| "ike": "Internet Key Exchange", | ||
| "sstp": "Secure Socket Tunneling Protocol", | ||
| "wpa": "Wi-Fi Protected Access", | ||
| "dtls": "Datagram Transport Layer Security", | ||
| "quic": "Quick UDP Internet Connections", | ||
| "eap-aka": "Extensible Authentication Protocol variant", | ||
| "eap-aka-prime": "Enhanced version of EAP-AKA", | ||
| "prins": "Protection of Inter-Network Signaling", | ||
| "5g-aka": "Authentication and Key Agreement for 5G", | ||
| "other": "Another protocol type", | ||
| "unknown": "The protocol type is not known" | ||
| } | ||
| "description": "The concrete protocol type. If specified, this value shall be one of the enumeration of valid protocol families defined in the `cryptography-defs.schema.json` subschema." | ||
| }, | ||
| "version": { | ||
| "type": "string", | ||
| "title": "Protocol Version", | ||
| "description": "The version of the protocol.", | ||
| "description": "The version of the protocol. Together with the type, it identifies the corresponding protocol entry, by exact match, in the `cryptography-defs.schema.json` subschema.", | ||
| "examples": [ | ||
| "1.0", | ||
| "1.2", | ||
|
|
@@ -803,7 +771,7 @@ | |
| "cipherSuites": { | ||
| "type": "array", | ||
| "title": "Cipher Suites", | ||
| "description": "A list of cipher suites related to the protocol.", | ||
| "description": "A list of cipher suites related to the protocol, as configured or observed for the subject of this BOM. The protocol entry in the `cryptography-defs.schema.json` subschema describes what the protocol version itself can support or negotiate.", | ||
| "items": { | ||
| "$ref": "#/$defs/cipherSuite", | ||
| "title": "Cipher Suite" | ||
|
|
@@ -812,7 +780,7 @@ | |
| "ikev2TransformTypes": { | ||
| "type": "object", | ||
| "title": "IKEv2 Transform Types", | ||
| "description": "The IKEv2 transform types supported (types 1-4), defined in [RFC 7296 section 3.3.2](https://www.ietf.org/rfc/rfc7296.html#section-3.3.2), and additional properties.", | ||
| "description": "The IKEv2 transform types supported (types 1-4), defined in [RFC 7296 section 3.3.2](https://www.ietf.org/rfc/rfc7296.html#section-3.3.2), and additional properties, as configured or observed for the subject of this BOM. The protocol entry in the `cryptography-defs.schema.json` subschema describes what the protocol version itself can support or negotiate.", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "encr": { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you add new valid/invalid test cases, if needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added.. one simple positive and a negative test case.