Skip to content

fix: allow protocol related cryptographic assets in XML #1020

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

Closed
CAOShurong wants to merge 1 commit into from
+68 −1
Closed

fix: allow protocol related cryptographic assets in XML #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 37 additions & 0 deletions schema/bom-1.7.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8298,6 +8298,43 @@ limitations under the License.
<xs:documentation>A protocol-related cryptographic assets</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="relatedCryptographicAssets" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
A list of cryptographic assets related to this component.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="relatedCryptographicAsset" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
A cryptographic asset related to this component.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
Specifies the mechanism by which the cryptographic asset is secured by.
Examples: "publicKey", "privateKey", "algorithm"
</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ref" type="bom:refType" minOccurs="0">
<xs:annotation>
<xs:documentation>
The bom-ref to cryptographic asset.
</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
Expand Down
12 changes: 11 additions & 1 deletion tools/src/test/resources/1.7/valid-cryptography-full-1.7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,17 @@
"algorithm": "ecdsa_secp256r1_sha256"
}
]
}
},
"relatedCryptographicAssets": [
{
"type": "algorithm",
"ref": "asset-1"
},
{
"type": "certificate",
"ref": "asset-2"
}
]
},
"oid": "oid:1.3.6.1.5.5.7.3.1"
}
Expand Down
10 changes: 10 additions & 0 deletions tools/src/test/resources/1.7/valid-cryptography-full-1.7.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ components: {
algorithm: "ecdsa_secp256r1_sha256"
}
}
relatedCryptographicAssets: {
assets: {
type: "algorithm"
ref: "asset-1"
}
assets: {
type: "certificate"
ref: "asset-2"
}
}
}
oid: "oid:1.3.6.1.5.5.7.3.1"
}
Expand Down
10 changes: 10 additions & 0 deletions tools/src/test/resources/1.7/valid-cryptography-full-1.7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,16 @@
<algorithm>ecdsa_secp256r1_sha256</algorithm>
</auth>
</ikev2TransformTypes>
<relatedCryptographicAssets>
<relatedCryptographicAsset>
<type>algorithm</type>
<ref>asset-1</ref>
</relatedCryptographicAsset>
<relatedCryptographicAsset>
<type>certificate</type>
<ref>asset-2</ref>
</relatedCryptographicAsset>
</relatedCryptographicAssets>
</protocolProperties>
<oid>oid:1.3.6.1.5.5.7.3.1</oid>
</cryptoProperties>
Expand Down