docs-xml: offer aes-128-gmac by default

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml b/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml
index 0e0f64ea65709b6047d725672bae79e24cd2b11f..1ad6c09626faa548f6d27486621581d0872546ff 100644 (file)
--- a/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml
+++ b/docs-xml/smbdotconf/security/clientsmbsigningalgos.xml
@@ -16,7 +16,7 @@
        </para>
 </description>
 
-<value type="default">aes-128-cmac, hmac-sha-256</value>
-<value type="example">aes-128-cmac</value>
+<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>
 </samba:parameter>

diff --git a/docs-xml/smbdotconf/security/serversmbsigningalgos.xml b/docs-xml/smbdotconf/security/serversmbsigningalgos.xml
index dadfd8a55942b09e32f78867e60ac5829a1a3870..e73d4f04242885240bd547041aa91f61428f395f 100644 (file)
--- a/docs-xml/smbdotconf/security/serversmbsigningalgos.xml
+++ b/docs-xml/smbdotconf/security/serversmbsigningalgos.xml
@@ -16,7 +16,7 @@
        </para>
 </description>
 
-<value type="default">aes-128-cmac, hmac-sha-256</value>
-<value type="example">aes-128-cmac</value>
+<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>
 </samba:parameter>

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index cae1a2c7de3dbe61dd7066146bc9303b4e1d7cc5..a942eaf94728c9a9a2006e0849ea9ade1c440f52 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -285,7 +285,7 @@ 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-cmac hmac-sha-256"
+#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 LOADPARM_EXTRA_LOCALS                                          \