Skip to content

Commit db871ed

Browse files
committed
resolve review comments
resolve review comments Signed-off-by: Indivar Mishra <[email protected]>
1 parent 5cc1f50 commit db871ed

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

cyclonedx/model/crypto.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -1309,13 +1309,13 @@ def __init__(
13091309
version: Optional[str] = None,
13101310
cipher_suites: Optional[Iterable[ProtocolPropertiesCipherSuite]] = None,
13111311
ikev2_transform_types: Optional[Ikev2TransformTypes] = None,
1312-
crypto_ref_array: Optional[Iterable[BomRef]] = None,
1312+
crypto_refs: Optional[Iterable[BomRef]] = None,
13131313
) -> None:
13141314
self.type = type
13151315
self.version = version
13161316
self.cipher_suites = cipher_suites or [] # type:ignore[assignment]
13171317
self.ikev2_transform_types = ikev2_transform_types
1318-
self.crypto_ref_array = crypto_ref_array or [] # type:ignore[assignment]
1318+
self.crypto_refs = crypto_refs or [] # type:ignore[assignment]
13191319

13201320
@property
13211321
@serializable.xml_sequence(10)
@@ -1379,20 +1379,20 @@ def ikev2_transform_types(self, ikev2_transform_types: Optional[Ikev2TransformTy
13791379
self._ikev2_transform_types = ikev2_transform_types
13801380

13811381
@property
1382-
@serializable.xml_array(serializable.XmlArraySerializationType.FLAT, 'cryptoRefArray')
1383-
@serializable.xml_sequence(40)
1384-
def crypto_ref_array(self) -> 'SortedSet[BomRef]':
1382+
@serializable.xml_array(serializable.XmlArraySerializationType.FLAT, 'cryptoRef')
1383+
@serializable.json_name('cryptoRefArray')
1384+
def crypto_refs(self) -> 'SortedSet[BomRef]':
13851385
"""
13861386
A list of protocol-related cryptographic assets.
13871387
13881388
Returns:
13891389
`Iterable[BomRef]`
13901390
"""
1391-
return self._crypto_ref_array
1391+
return self._crypto_refs
13921392

1393-
@crypto_ref_array.setter
1394-
def crypto_ref_array(self, crypto_ref_array: Iterable[BomRef]) -> None:
1395-
self._crypto_ref_array = SortedSet(crypto_ref_array)
1393+
@crypto_refs.setter
1394+
def crypto_refs(self, crypto_refs: Iterable[BomRef]) -> None:
1395+
self._crypto_refs = SortedSet(crypto_refs)
13961396

13971397
def __eq__(self, other: object) -> bool:
13981398
if isinstance(other, ProtocolProperties):
@@ -1406,7 +1406,7 @@ def __hash__(self) -> int:
14061406
self.version,
14071407
tuple(self.cipher_suites),
14081408
self.ikev2_transform_types,
1409-
tuple(self.crypto_ref_array)
1409+
tuple(self.crypto_refs)
14101410
)
14111411
)
14121412

cyclonedx/schema/_res/bom-1.6.SNAPSHOT.xsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -7429,7 +7429,7 @@ limitations under the License.
74297429
</xs:sequence>
74307430
</xs:complexType>
74317431
</xs:element>
7432-
<xs:element name="cryptoRefArray" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
7432+
<xs:element name="cryptoRef" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
74337433
<xs:annotation>
74347434
<xs:documentation>A protocol-related cryptographic assets</xs:documentation>
74357435
</xs:annotation>

tests/_data/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ def get_bom_for_issue_692_components() -> Bom:
725725
protocol_properties=ProtocolProperties(
726726
type=ProtocolPropertiesType.TLS,
727727
version='1.2',
728-
crypto_ref_array=[BomRef(value='for-test')]
728+
crypto_refs=[BomRef(value='for-test')]
729729
),
730730
oid='1.3.18.0.2.32.104',
731731
))

0 commit comments

Comments
 (0)