Skip to content

Merges detectionContext properties with component evidence #325

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.

Sign up for GitHub

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

Merged
stevespringett merged 3 commits into from
Oct 21, 2023
Merged

Merges detectionContext properties with component evidence #325

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d1c9a4
Merges detectionContext properties with component evidence
bhess Oct 18, 2023
29373d7
remove remaining confidenceLevel
bhess Oct 19, 2023
fae707b
Merge branch '1.6-dev-cbom' into bhe-cbom-evidence
stevespringett Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 20 additions & 123 deletions schema/bom-1.6.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,6 +1576,26 @@
"type": "string",
"title": "Location",
"description": "The location or path to where the component was found."
},
"lineNumber": {
"type": "integer",
"title": "Line Number",
"description": "The line number where the component was found."
},
"offset": {
"type": "integer",
"title": "Offset",
"description": "The offset where the component was found."
},
"symbol": {
"type": "string",
"title": "Symbol",
"description": "The symbol name that was found associated with the component."
},
"additionalContext": {
"type": "string",
"title": "Additional Context",
"description": "Any additional context of the detected component (e.g. a code snippet)."
}
}
}
Expand Down Expand Up @@ -4432,124 +4452,6 @@
"type": "string",
"title": "OID",
"description": "OID of crypto asset"
},
"confidenceLevels": {
"type": "object",
"title": "confidence levels",
"description": "confidence levels of the reported crypto properties",
"additionalProperties": false,
"properties": {
"assetType": {
"$ref": "#/definitions/confidenceLevel",
"title": "assetType confidence level"
},
"primitive": {
"$ref": "#/definitions/confidenceLevel",
"title": "primitive confidence level"
},
"relatedCryptoMaterialType": {
"$ref": "#/definitions/confidenceLevel",
"title": "related crypto material confidence level"
},
"variant": {
"$ref": "#/definitions/confidenceLevel",
"title": "variant confidence level"
},
"mode": {
"$ref": "#/definitions/confidenceLevel",
"title": "mode of opreation confidence level"
},
"padding": {
"$ref": "#/definitions/confidenceLevel",
"title": "padding confidence level"
},
"cryptoFunctions": {
"$ref": "#/definitions/confidenceLevel",
"title": "related crypto material confidence level"
},
"subjectName": {
"$ref": "#/definitions/confidenceLevel",
"title": "subjectName confidence level"
},
"issuerName": {
"$ref": "#/definitions/confidenceLevel",
"title": "issuerName confidence level"
},
"notValidBefore": {
"$ref": "#/definitions/confidenceLevel",
"title": "notValidBefore confidence level"
},
"notValidAfter": {
"$ref": "#/definitions/confidenceLevel",
"title": "notValidAfter confidence level"
},
"certificateAlgorithm": {
"$ref": "#/definitions/confidenceLevel",
"title": "certificateAlgorithm confidence level"
},
"certificateSignatureAlgorithm": {
"$ref": "#/definitions/confidenceLevel",
"title": "certificateSignatureAlgorithm confidence level"
},
"certificateFormat": {
"$ref": "#/definitions/confidenceLevel",
"title": "certificateFormat confidence level"
},
"certificateExtension": {
"$ref": "#/definitions/confidenceLevel",
"title": "certificateExtension confidence level"
},
"tlsCipherSuites": {
"$ref": "#/definitions/confidenceLevel",
"title": "tlsCipherSuites confidence level"
},
"ikev2TransformTypes": {
"$ref": "#/definitions/confidenceLevel",
"title": "ikev2TransformTypes confidence level"
}
}
},
"detectionContext": {
"type": "array",
"title": "detection context",
"description": "Defines additional context metadata related to the detected crypto asset",
"items": {
"type": "object",
"title": "detection context",
"additionalProperties": false,
"properties": {
"filePath": {
"type": "string",
"title": "filePath",
"description": "File path of the detected crypto asset"
},
"lineNumbers": {
"type": "array",
"title": "lineNumbers",
"description": "Line numbers of the detected crypto asset"
},
"offsets": {
"type": "array",
"title": "offsets",
"description": "Offsets of the detected crypto asset"
},
"symbols": {
"type": "array",
"title": "symbols",
"description": "symbol names detected for the crypto asset"
},
"keywords": {
"type": "array",
"title": "keywords",
"description": "keywords detected for the crypto asset"
},
"additionalContext": {
"type": "string",
"title": "additionalContext",
"description": "additional context of the detected crypto asset (e.g. code snippet)"
}
}
}
}
}
},
Expand All @@ -4558,11 +4460,6 @@
"title": "Reference to a crypto asset",
"description": "Reference (bom-ref) to the crypto asset used in this context"
},
"confidenceLevel": {
"title": "ConfidenceLevel",
"description": "The ConfidenceLevel related to a property",
"type": "number"
},
"cipherSuite": {
"type": "object",
"title": "Cipher suite",
Expand Down