diff options
| author | Stefan Metzmacher <metze@samba.org> | 2021-09-08 15:10:14 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2021-09-08 16:37:07 +0000 |
| commit | 867c6ff9f3f28ab4bfa0cb1660889f3f5be0d111 (patch) | |
| tree | c4c16561e7075fbeddd19912394fc427c1feaa2c /docs-xml | |
| parent | 16e907f8415ed28e678112f22d1813f09da136f9 (diff) | |
| download | samba-867c6ff9f3f28ab4bfa0cb1660889f3f5be0d111.tar.gz | |
docs-xml: use upper case for "{client,server} smb3 {signing,encryption} algorithms" values
This matches what smbstatus prints out. Note there's also the removal of
an '-' in "hmac-sha-256" => HMAC-SHA256".
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14825
RN: "{client,server} smb3 {signing,encryption} algorithms" should use the same strings as smbstatus output
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Sep 8 16:37:07 UTC 2021 on sn-devel-184
Diffstat (limited to 'docs-xml')
4 files changed, 18 insertions, 18 deletions
diff --git a/docs-xml/smbdotconf/security/clientsmbencryptionalgos.xml b/docs-xml/smbdotconf/security/clientsmbencryptionalgos.xml index 27da51ad625..78df3f909e9 100644 --- a/docs-xml/smbdotconf/security/clientsmbencryptionalgos.xml +++ b/docs-xml/smbdotconf/security/clientsmbencryptionalgos.xml @@ -9,13 +9,13 @@ <para>It is also possible to remove individual algorithms from the default list, by prefixing them with '-'. This can avoid having to specify a hardcoded list. </para> - <para>Note: that the removal of aes-128-ccm from the list will result + <para>Note: that the removal of AES-128-CCM from the list will result in SMB3_00 and SMB3_02 being unavailable, as it is the default and only available algorithm for these dialects. </para> </description> -<value type="default">aes-128-gcm, aes-128-ccm, aes-256-gcm, aes-256-ccm</value> -<value type="example">aes-256-gcm</value> -<value type="example">-aes-128-gcm -aes-128-ccm</value> +<value type="default">AES-128-GCM, AES-128-CCM, AES-256-GCM, AES-256-CCM</value> +<value type="example">AES-256-GCM</value> +<value type="example">-AES-128-GCM -AES-128-CCM</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml b/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml index 1ad6c09626f..f7c61f3e661 100644 --- a/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml +++ b/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml @@ -9,14 +9,14 @@ <para>It is also possible to remove individual algorithms from the default list, by prefixing them with '-'. This can avoid having to specify a hardcoded list. </para> - <para>Note: that the removal of aes-128-cmac from the list will result - in SMB3_00 and SMB3_02 being unavailable, and the removal od hmac-sha-256 + <para>Note: that the removal of AES-128-CMAC from the list will result + in SMB3_00 and SMB3_02 being unavailable, and the removal of HMAC-SHA256 will result in SMB2_02 and SMB2_10 being unavailable, as these are the default and only available algorithms for these dialects. </para> </description> -<value type="default">aes-128-gmac, aes-128-cmac, hmac-sha-256</value> -<value type="example">aes-128-cmac, hmac-sha-256</value> -<value type="example">-aes-128-cmac</value> +<value type="default">AES-128-GMAC, AES-128-CMAC, HMAC-SHA256</value> +<value type="example">AES-128-CMAC, HMAC-SHA256</value> +<value type="example">-AES-128-CMAC</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/security/serversmbencryptionalgos.xml b/docs-xml/smbdotconf/security/serversmbencryptionalgos.xml index 3217970d4e7..2dd2db98cc5 100644 --- a/docs-xml/smbdotconf/security/serversmbencryptionalgos.xml +++ b/docs-xml/smbdotconf/security/serversmbencryptionalgos.xml @@ -9,13 +9,13 @@ <para>It is also possible to remove individual algorithms from the default list, by prefixing them with '-'. This can avoid having to specify a hardcoded list. </para> - <para>Note: that the removal of aes-128-ccm from the list will result + <para>Note: that the removal of AES-128-CCM from the list will result in SMB3_00 and SMB3_02 being unavailable, as it is the default and only available algorithm for these dialects. </para> </description> -<value type="default">aes-128-gcm, aes-128-ccm, aes-256-gcm, aes-256-ccm</value> -<value type="example">aes-256-gcm</value> -<value type="example">-aes-128-gcm -aes-128-ccm</value> +<value type="default">AES-128-GCM, AES-128-CCM, AES-256-GCM, AES-256-CCM</value> +<value type="example">AES-256-GCM</value> +<value type="example">-AES-128-GCM -AES-128-CCM</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/security/serversmbsigningalgos.xml b/docs-xml/smbdotconf/security/serversmbsigningalgos.xml index e73d4f04242..7884e603b5b 100644 --- a/docs-xml/smbdotconf/security/serversmbsigningalgos.xml +++ b/docs-xml/smbdotconf/security/serversmbsigningalgos.xml @@ -9,14 +9,14 @@ <para>It is also possible to remove individual algorithms from the default list, by prefixing them with '-'. This can avoid having to specify a hardcoded list. </para> - <para>Note: that the removal of aes-128-cmac from the list will result - in SMB3_00 and SMB3_02 being unavailable, and the removal od hmac-sha-256 + <para>Note: that the removal of AES-128-CMAC from the list will result + in SMB3_00 and SMB3_02 being unavailable, and the removal of HMAC-SHA256 will result in SMB2_02 and SMB2_10 being unavailable, as these are the default and only available algorithms for these dialects. </para> </description> -<value type="default">aes-128-gmac, aes-128-cmac, hmac-sha-256</value> -<value type="example">aes-128-cmac, hmac-sha-256</value> -<value type="example">-aes-128-cmac</value> +<value type="default">AES-128-GMAC, AES-128-CMAC, HMAC-SHA256</value> +<value type="example">AES-128-CMAC, HMAC-SHA256</value> +<value type="example">-AES-128-CMAC</value> </samba:parameter> |