Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Signed-off-by: Basil Hess <bhe@zurich.ibm.com>

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Signed-off-by: Basil Hess <bhe@zurich.ibm.com>

Signed-off-by: Steve Springett <steve@springett.us>

This PR follows our CBOM WG call from Oct 12. It removes the
`detectionContext` property from components and merges them with
`componentEvidence`. The following properties are added to evidence:
- `lineNumber`
- `offset`
- `symbol`
- `additionalContext`

The plan is to make a separate proposal/PR for `keyword`

The PR also removes the extra fields for confidence levels since they
are already covered by `componentEvidence`.

Tagging @stevespringett @n1ckl0sk0rtge @mrutkows

This addresses the use case described in
IBM/CBOM#31:
- Expiry and life cycle of any relatedCryptoMaterial (e.g. keys, tokens,
password) should be expressible.

This is done by merging the "key" asset type and "relatedCryptoMaterial"
to "relatedCryptoMaterial", which contains the needed properties.

goal: improve documentation by consolidating elements regarding
"version".
pure refactoring, no new functionality was added, nor removed, nor
changed.


- [x] consolidate `version`
- [x] consolidate `range`
- [x] rename `range` definition to `version-range`
- [x] add more examples
- [x] review rendered documentation

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Signed-off-by: Basil Hess <bhe@zurich.ibm.com>

The new property 'parameterSetIdentifier' replaces 'variant' and
contains information about the parameter set identifying an algorithm.
This can be, for example, the key length (in AES), the digest length (in
SHA2), or the hash algorithm used internally (in SLH-DSA / FIPS205). The
"description" field contains some examples.

This PR is motivated by IBM/CBOM#37 and
intends to address its use case.

Tagging @stevespringett, @n1ckl0sk0rtge, @mrutkows, @GeroDittmann

Signed-off-by: steve.springett <steve.springett@servicenow.com>

Signed-off-by: andreas hilti <andreas.hilti@bluewin.ch>

Move comment in `$comment` to description for increased visibility.

Closes: #336

Signed-off-by: Basil Hess <bhe@zurich.ibm.com>

Reviews the description fields and addresses my TODOs.

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Basil Hess <bhe@zurich.ibm.com>

Adds 'combiner' as enum entry in 'primitive'.

Addresses the use case when combinations of (e.g.) classical crypto like
RSA is used together with QSC like Dilithium. An entry of this primitive
allows to express the combiner used. Adding dependencies to
RSA/Dilithium then allows to express the algorithms used in the
combiner. Note: "combiners" are also known as "hybrids", but this term
can be ambiguous so I prefer the term combiner.

Signed-off-by: steve.springett <steve.springett@servicenow.com>

Signed-off-by: Steve Springett <steve@springett.us>

…ev-attestations

… schemas.

Signed-off-by: Steve Springett <steve@springett.us>

… schemas.

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

…ings in some parsers.

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

… linking. Adding deprecation check to tabs (oneOf, anyOf, allOf).

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

…hanges.

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Closes #361

Signed-off-by: Thomas Jensen <tsjensen@users.noreply.github.com>

Resolves #98

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

fixes #192


task list for spec enhacement
- [x] schema: JSON
- [x] schema: XML  
- [x] schema: protobuff
- [x] examples/test cases

Signed-off-by: Steve Springett <steve@springett.us>

#	schema/bom-1.6.schema.json
#	tools/src/test/js/json-schema-lint-tests.js

This reverts commit 1302628.

This reverts commit 76bf8f9.

Fixed issue with evidence identity that restricted identity to only a
single object. The defect was found in JSON and XML schemas but was
correct in protobuf. Updated JSON and XML schemas in a way where they
are backward compatible. Updated test cases in v1.6 that support BOTH
methods (single object and array of objects) of specifying identity
evidence.

Closes #272

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

# Conflicts:
#	docgen/json/templates/cyclonedx/content.html
#	schema/bom-1.6.proto
#	schema/bom-1.6.schema.json
#	schema/bom-1.6.xsd
#	tools/src/test/js/json-schema-lint-tests.js

…ting. Minor changes to JSON schema.

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

…k/frames.

Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

changes as discussed here:
#347 (comment)

specific goals:
- fixes #171
- fixes #291

task list for spec enhacement
- [x] schema: JSON
- [x] schema: XML
- [x] schema: protobuff 
- [x] examples/test cases

Signed-off-by: Mark Symons <mark.symons@fujitsu.com>

Signed-off-by: Mark Symons <mark.symons@fujitsu.com>

Signed-off-by: Mark Symons <mark.symons@fujitsu.com>

Signed-off-by: Mark Symons <mark.symons@fujitsu.com>

Correct the spelling of `compliment` & `complimentary` to `complement` &
`complementary` respectively.

* Compliment = a polite expression of praise or admiration.
* Complement = a thing that contributes extra features to something else
in such a way as to improve or emphasize its' quality

Correct spelling makes for easier translation to other languages.

Signed-off-by: Mark Symons <mark.symons@fujitsu.com>

proposed fix for #288 
and regression tests

in contrast to #289

Signed-off-by: Ian Dunbar-Hall <ian.dunbar-hall@lmco.com>

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

…Properties

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

Signed-off-by: Matt Rutkowski <mrutkows@us.ibm.com>

fixes #371 

- [x] fixed JSON
- [x] added examples and tests

Fixes #373 which addresses a small typo in the `counterClaim` field
title in the Attestation 1.6