File tree 5 files changed +56
-0
lines changed
5 files changed +56
-0
lines changed Original file line number Diff line number Diff line change @@ -588,6 +588,15 @@ void dds_domain_examples()
588
588
pqos.properties ().properties ().emplace_back (
589
589
" dds.sec.auth.builtin.PKI-DH.password" ,
590
590
" 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 ))
591
600
// !--
592
601
}
593
602
{
@@ -623,6 +632,9 @@ void dds_domain_examples()
623
632
pqos.properties ().properties ().emplace_back (
624
633
" dds.sec.access.builtin.Access-Permissions.permissions" ,
625
634
" file://certs/permissions.smime" );
635
+ pqos.properties ().properties ().emplace_back (
636
+ " dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy" ,
637
+ " true" );
626
638
// !--
627
639
}
628
640
{
Original file line number Diff line number Diff line change 2641
2641
<name >dds.sec.auth.builtin.PKI-DH.password</name >
2642
2642
<value >domainParticipantPassword</value >
2643
2643
</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))
2644
2655
</properties >
2645
2656
</propertiesPolicy >
2646
2657
</rtps >
2693
2704
<name >dds.sec.access.builtin.Access-Permissions.permissions</name >
2694
2705
<value >file://permissions.smime</value >
2695
2706
</property >
2707
+ <property >
2708
+ <name >dds.sec.access.builtin.Access-Permissions.transmit_algorithms_as_legacy</name >
2709
+ <value >true</value >
2710
+ </property >
2696
2711
</properties >
2697
2712
</propertiesPolicy >
2698
2713
</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