File tree Expand file tree Collapse file tree 5 files changed +56
-0
lines changed Expand file tree Collapse file tree 5 files changed +56
-0
lines changed Original file line number Diff line number Diff line change @@ -593,6 +593,15 @@ void dds_domain_examples()
593
593
pqos.properties ().properties ().emplace_back (
594
594
" dds.sec.auth.builtin.PKI-DH.password" ,
595
595
" domainParticipantPassword" );
596
+ <<<<<<< HEAD
597
+ =======
598
+ pqos.properties ().properties ().emplace_back (
599
+ " dds.sec.auth.builtin.PKI-DH.preferred_key_agreement" ,
600
+ " ECDH" );
601
+ pqos.properties ().properties ().emplace_back (
602
+ " dds.sec.auth.builtin.PKI-DH.transmit_algorithms_as_legacy" ,
603
+ " true" );
604
+ >>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974 ))
596
605
// !--
597
606
}
598
607
{
@@ -628,6 +637,9 @@ void dds_domain_examples()
628
637
pqos.properties ().properties ().emplace_back (
629
638
" dds.sec.access.builtin.Access-Permissions.permissions" ,
630
639
" file://certs/permissions.smime" );
640
+ pqos.properties ().properties ().emplace_back (
641
+ " dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy" ,
642
+ " true" );
631
643
// !--
632
644
}
633
645
{
Original file line number Diff line number Diff line change 3108
3108
<name >dds.sec.auth.builtin.PKI-DH.password</name >
3109
3109
<value >domainParticipantPassword</value >
3110
3110
</property >
3111
+ <<<<<<< HEAD
3112
+ =======
3113
+ <property >
3114
+ <name >dds.sec.auth.builtin.PKI-DH.preferred_key_agreement</name >
3115
+ <value >ECDH</value >
3116
+ </property >
3117
+ <property >
3118
+ <name >dds.sec.auth.builtin.PKI-DH.transmit_algorithms_as_legacy</name >
3119
+ <value >true</value >
3120
+ </property >
3121
+ >>>>>>> cc95496 (Document new `transmit_algorithms_as_legacy` on builtin security plugins (#974))
3111
3122
</properties >
3112
3123
</propertiesPolicy >
3113
3124
</rtps >
3160
3171
<name >dds.sec.access.builtin.Access-Permissions.permissions</name >
3161
3172
<value >file://permissions.smime</value >
3162
3173
</property >
3174
+ <property >
3175
+ <name >dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy</name >
3176
+ <value >true</value >
3177
+ </property >
3163
3178
</properties >
3164
3179
</propertiesPolicy >
3165
3180
</rtps >
Original file line number Diff line number Diff line change @@ -42,6 +42,19 @@ The following table outlines the properties used for the :ref:`DDS\:Auth\:PKI-DH
42
42
If the *password * property is not present, then the value supplied in the |br |
43
43
*private_key * property must contain the decrypted private key. |br |
44
44
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))
45
58
46
59
.. note ::
47
60
All properties listed above have the ``dds.sec.auth.builtin.PKI-DH." `` prefix.
Original file line number Diff line number Diff line change @@ -55,6 +55,9 @@ The following table outlines the properties used for the DDS\:Access\:Permission
55
55
* - permissions
56
56
- URI to the Participant permissions document signed by the |br | Permissions CA in S/MIME format. |br |
57
57
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.
58
61
59
62
.. note ::
60
63
All listed properties have "dds.sec.access.builtin.Access-Permissions." prefix.
Original file line number Diff line number Diff line change @@ -56,6 +56,19 @@ The following table outlines the properties used for the DDS:\Auth\:PKI-DH plugi
56
56
If the *password * property is not present, then the value supplied in the |br |
57
57
*private_key * property must contain the decrypted private key. |br |
58
58
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))
59
72
60
73
.. note ::
61
74
All listed properties have "dds.sec.auth.builtin.PKI-DH." prefix.
You can’t perform that action at this time.
0 commit comments