Skip to content

Commit 58b4d30

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 <miguelcompany@eprosima.com> * Refs #19925. Add documentation of new property in Permissions. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Apply suggestions from code review Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> (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 05620a8 commit 58b4d30

File tree

5 files changed

+56
-0
lines changed

5 files changed

+56
-0
lines changed

code/DDSCodeTester.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,15 @@ void dds_domain_examples()
642642
pqos.properties().properties().emplace_back(
643643
"dds.sec.auth.builtin.PKI-DH.password",
644644
"domainParticipantPassword");
645+
<<<<<<< HEAD
646+
=======
647+
pqos.properties().properties().emplace_back(
648+
"dds.sec.auth.builtin.PKI-DH.preferred_key_agreement",
649+
"ECDH");
650+
pqos.properties().properties().emplace_back(
651+
"dds.sec.auth.builtin.PKI-DH.transmit_algorithms_as_legacy",
652+
"true");
653+
>>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974))
645654
//!--
646655
}
647656
{
@@ -677,6 +686,9 @@ void dds_domain_examples()
677686
pqos.properties().properties().emplace_back(
678687
"dds.sec.access.builtin.Access-Permissions.permissions",
679688
"file://certs/permissions.smime");
689+
pqos.properties().properties().emplace_back(
690+
"dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy",
691+
"true");
680692
//!--
681693
}
682694
{

code/XMLTester.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3050,6 +3050,17 @@
30503050
<name>dds.sec.auth.builtin.PKI-DH.password</name>
30513051
<value>domainParticipantPassword</value>
30523052
</property>
3053+
<<<<<<< HEAD
3054+
=======
3055+
<property>
3056+
<name>dds.sec.auth.builtin.PKI-DH.preferred_key_agreement</name>
3057+
<value>ECDH</value>
3058+
</property>
3059+
<property>
3060+
<name>dds.sec.auth.builtin.PKI-DH.transmit_algorithms_as_legacy</name>
3061+
<value>true</value>
3062+
</property>
3063+
>>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974))
30533064
</properties>
30543065
</propertiesPolicy>
30553066
</rtps>
@@ -3102,6 +3113,10 @@
31023113
<name>dds.sec.access.builtin.Access-Permissions.permissions</name>
31033114
<value>file://permissions.smime</value>
31043115
</property>
3116+
<property>
3117+
<name>dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy</name>
3118+
<value>true</value>
3119+
</property>
31053120
</properties>
31063121
</propertiesPolicy>
31073122
</rtps>

docs/fastdds/property_policies/security.rst

Lines changed: 13 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 13 additions & 0 deletions
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)