docs-xml: use upper case for "{client,server} smb3 {signing,encryption} algorithms...

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

diff --git a/docs-xml/smbdotconf/security/clientsmbencryptionalgos.xml b/docs-xml/smbdotconf/security/clientsmbencryptionalgos.xml
index 27da51ad62564c1aeaa1f6808b6bf0452893bcff..78df3f909e9ee1f69230f2e1039190d8d4592ed8 100644 (file)
--- 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 1ad6c09626faa548f6d27486621581d0872546ff..f7c61f3e661a7f0ef312ef1a3810145111a7c031 100644 (file)
--- 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 3217970d4e76c3db28772902272778ef7373be2b..2dd2db98cc59eea51178bae07afd40196e28b942 100644 (file)
--- 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 e73d4f04242885240bd547041aa91f61428f395f..7884e603b5b7bb65ae554d5c60e6b37e0b396f03 100644 (file)
--- 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>

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index a942eaf94728c9a9a2006e0849ea9ade1c440f52..a3331436229a135d2cb323d7ed689063bf81fdb8 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -285,8 +285,8 @@ enum samba_weak_crypto {
 #define DEFAULT_SMB2_MAX_TRANSACT (8*1024*1024)
 #define DEFAULT_SMB2_MAX_CREDITS 8192
 
-#define DEFAULT_SMB3_SIGNING_ALGORITHMS "aes-128-gmac aes-128-cmac hmac-sha-256"
-#define DEFAULT_SMB3_ENCRYPTION_ALGORITHMS "aes-128-gcm aes-128-ccm aes-256-gcm aes-256-ccm"
+#define DEFAULT_SMB3_SIGNING_ALGORITHMS "AES-128-GMAC AES-128-CMAC HMAC-SHA256"
+#define DEFAULT_SMB3_ENCRYPTION_ALGORITHMS "AES-128-GCM AES-128-CCM AES-256-GCM AES-256-CCM"
 
 #define LOADPARM_EXTRA_LOCALS                                          \
        int usershare;                                                  \

diff --git a/libcli/smb/util.c b/libcli/smb/util.c
index 061f478c92d947e67cf1389c02369bb4114adf6a..e1c0f124236a58bff1d667c373a0f9e940796c62 100644 (file)
--- a/libcli/smb/util.c
+++ b/libcli/smb/util.c
@@ -466,9 +466,9 @@ enum smb_encryption_setting smb_encryption_setting_translate(const char *str)
 }
 
 static const struct enum_list enum_smb3_signing_algorithms[] = {
-       {SMB2_SIGNING_AES128_GMAC, "aes-128-gmac"},
-       {SMB2_SIGNING_AES128_CMAC, "aes-128-cmac"},
-       {SMB2_SIGNING_HMAC_SHA256, "hmac-sha-256"},
+       {SMB2_SIGNING_AES128_GMAC, "AES-128-GMAC"},
+       {SMB2_SIGNING_AES128_CMAC, "AES-128-CMAC"},
+       {SMB2_SIGNING_HMAC_SHA256, "HMAC-SHA256"},
        {-1, NULL}
 };
 
@@ -488,10 +488,10 @@ const char *smb3_signing_algorithm_name(uint16_t algo)
 }
 
 static const struct enum_list enum_smb3_encryption_algorithms[] = {
-       {SMB2_ENCRYPTION_AES128_GCM, "aes-128-gcm"},
-       {SMB2_ENCRYPTION_AES128_CCM, "aes-128-ccm"},
-       {SMB2_ENCRYPTION_AES256_GCM, "aes-256-gcm"},
-       {SMB2_ENCRYPTION_AES256_CCM, "aes-256-ccm"},
+       {SMB2_ENCRYPTION_AES128_GCM, "AES-128-GCM"},
+       {SMB2_ENCRYPTION_AES128_CCM, "AES-128-CCM"},
+       {SMB2_ENCRYPTION_AES256_GCM, "AES-256-GCM"},
+       {SMB2_ENCRYPTION_AES256_CCM, "AES-256-CCM"},
        {-1, NULL}
 };