Skip to content

Commit df00d39

Browse files
MiguelCompanymergify[bot]
authored andcommitted
Document new transmit_algorithms_as_legacy on builtin security plugins (#974)
* Refs #19925. Add documentation of new property in PKIDH. Signed-off-by: Miguel Company <[email protected]> * Refs #19925. Add documentation of new property in Permissions. Signed-off-by: Miguel Company <[email protected]> * Apply suggestions from code review Co-authored-by: Mario Domínguez López <[email protected]> Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]> Co-authored-by: Mario Domínguez López <[email protected]> (cherry picked from commit cc95496) # Conflicts: # code/DDSCodeTester.cpp # code/XMLTester.xml # docs/fastdds/property_policies/security.rst # docs/fastdds/security/auth_plugin/auth_plugin.rst
1 parent 67dc7a0 commit df00d39

File tree

5 files changed

+56
-0
lines changed

5 files changed

+56
-0
lines changed

code/DDSCodeTester.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,15 @@ void dds_domain_examples()
588588
pqos.properties().properties().emplace_back(
589589
"dds.sec.auth.builtin.PKI-DH.password",
590590
"domainParticipantPassword");
591+
<<<<<<< HEAD
592+
=======
593+
pqos.properties().properties().emplace_back(
594+
"dds.sec.auth.builtin.PKI-DH.preferred_key_agreement",
595+
"ECDH");
596+
pqos.properties().properties().emplace_back(
597+
"dds.sec.auth.builtin.PKI-DH.transmit_algorithms_as_legacy",
598+
"true");
599+
>>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974))
591600
//!--
592601
}
593602
{
@@ -623,6 +632,9 @@ void dds_domain_examples()
623632
pqos.properties().properties().emplace_back(
624633
"dds.sec.access.builtin.Access-Permissions.permissions",
625634
"file://certs/permissions.smime");
635+
pqos.properties().properties().emplace_back(
636+
"dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy",
637+
"true");
626638
//!--
627639
}
628640
{

code/XMLTester.xml

+15
Original file line numberDiff line numberDiff line change
@@ -2641,6 +2641,17 @@
26412641
<name>dds.sec.auth.builtin.PKI-DH.password</name>
26422642
<value>domainParticipantPassword</value>
26432643
</property>
2644+
<<<<<<< HEAD
2645+
=======
2646+
<property>
2647+
<name>dds.sec.auth.builtin.PKI-DH.preferred_key_agreement</name>
2648+
<value>ECDH</value>
2649+
</property>
2650+
<property>
2651+
<name>dds.sec.auth.builtin.PKI-DH.transmit_algorithms_as_legacy</name>
2652+
<value>true</value>
2653+
</property>
2654+
>>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974))
26442655
</properties>
26452656
</propertiesPolicy>
26462657
</rtps>
@@ -2693,6 +2704,10 @@
26932704
<name>dds.sec.access.builtin.Access-Permissions.permissions</name>
26942705
<value>file://permissions.smime</value>
26952706
</property>
2707+
<property>
2708+
<name>dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy</name>
2709+
<value>true</value>
2710+
</property>
26962711
</properties>
26972712
</propertiesPolicy>
26982713
</rtps>

docs/fastdds/property_policies/security.rst

+13
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,19 @@ The following table outlines the properties used for the :ref:`DDS\:Auth\:PKI-DH
4242
If the *password* property is not present, then the value supplied in the |br|
4343
*private_key* property must contain the decrypted private key. |br|
4444
The *password* property is ignored if the *private_key* is given in PKCS#11 scheme.
45+
<<<<<<< HEAD
46+
=======
47+
* - ``preferred_key_agreement`` *(optional)*
48+
- The preferred algorithm to use for generating the session's shared secret |br|
49+
at the end of the authentication phase. Supported values are: |br|
50+
a) ``DH``, ``DH+MODP-2048-256`` for Diffie-Hellman Ephemeral with 2048-bit MODP Group parameters. |br|
51+
b) ``ECDH``, ``ECDH+prime256v1-CEUM`` for Elliptic Curve Diffie-Hellman Ephemeral with the NIST P-256 curve. |br|
52+
c) ``AUTO`` for selecting the key agreement based on the signature algorithm in the Identity CA's certificate. |br|
53+
Will default to ``AUTO`` if the property is not present.
54+
* - ``transmit_algorithms_as_legacy`` *(optional)*
55+
- Whether to transmit algorithm identifiers in non-standard legacy format. |br|
56+
Will default to ``false`` if the property is not present.
57+
>>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974))
4558

4659
.. note::
4760
All properties listed above have the ``dds.sec.auth.builtin.PKI-DH."`` prefix.

docs/fastdds/security/access_control_plugin/access_control_plugin.rst

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ The following table outlines the properties used for the DDS\:Access\:Permission
5555
* - permissions
5656
- URI to the Participant permissions document signed by the |br| Permissions CA in S/MIME format. |br|
5757
Supported URI schemes: file.
58+
* - transmit_algorithms_as_legacy *(optional)*
59+
- Whether to transmit algorithm identifiers in non-standard legacy format. |br|
60+
Will default to ``false`` if the property is not present.
5861

5962
.. note::
6063
All listed properties have "dds.sec.access.builtin.Access-Permissions." prefix.

docs/fastdds/security/auth_plugin/auth_plugin.rst

+13
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,19 @@ The following table outlines the properties used for the DDS:\Auth\:PKI-DH plugi
5656
If the *password* property is not present, then the value supplied in the |br|
5757
*private_key* property must contain the decrypted private key. |br|
5858
The *password* property is ignored if the *private_key* is given in PKCS#11 scheme.
59+
<<<<<<< HEAD
60+
=======
61+
* - preferred_key_agreement *(optional)*
62+
- The preferred algorithm to use for generating the session's shared secret |br|
63+
at the end of the authentication phase. Supported values are: |br|
64+
a) ``DH``, ``DH+MODP-2048-256`` for Diffie-Hellman Ephemeral with 2048-bit MODP Group parameters. |br|
65+
b) ``ECDH``, ``ECDH+prime256v1-CEUM`` for Elliptic Curve Diffie-Hellman Ephemeral with the NIST P-256 curve. |br|
66+
c) ``AUTO`` for selecting the key agreement based on the signature algorithm in the Identity CA's certificate. |br|
67+
Will default to ``AUTO`` if the property is not present.
68+
* - transmit_algorithms_as_legacy *(optional)*
69+
- Whether to transmit algorithm identifiers in non-standard legacy format. |br|
70+
Will default to ``false`` if the property is not present.
71+
>>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974))
5972

6073
.. note::
6174
All listed properties have "dds.sec.auth.builtin.PKI-DH." prefix.

0 commit comments

Comments
 (0)