sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

lib/param: offer aes-256-{gcm,ccm} encryption by default

Browse Source 
We match Windows and keep aes-128-{gcm,ccm} first...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2020-11-10 01:28:03 +01:00
parent d10153c851
commit 033716d9fd
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs-xml/smbdotconf/security/clientsmbencryptionalgos.xml
View File

@ -15,7 +15,7 @@
</para> </para>
</description> </description>
<value type="default">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-128-gcm</value> <value type="example">aes-256-gcm</value>
<value type="example">-aes-128-ccm</value> <value type="example">-aes-128-gcm -aes-128-ccm</value>
</samba:parameter> </samba:parameter>

6
docs-xml/smbdotconf/security/serversmbencryptionalgos.xml
View File

@ -15,7 +15,7 @@
</para> </para>
</description> </description>
<value type="default">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-128-gcm</value> <value type="example">aes-256-gcm</value>
<value type="example">-aes-128-ccm</value> <value type="example">-aes-128-gcm -aes-128-ccm</value>
</samba:parameter> </samba:parameter>

2
lib/param/loadparm.h
View File

@ -285,7 +285,7 @@ enum samba_weak_crypto {
#define DEFAULT_SMB2_MAX_TRANSACT (8*1024*1024) #define DEFAULT_SMB2_MAX_TRANSACT (8*1024*1024)
#define DEFAULT_SMB2_MAX_CREDITS 8192 #define DEFAULT_SMB2_MAX_CREDITS 8192
#define DEFAULT_SMB3_ENCRYPTION_ALGORITHMS "aes-128-gcm aes-128-ccm" #define DEFAULT_SMB3_ENCRYPTION_ALGORITHMS "aes-128-gcm aes-128-ccm aes-256-gcm aes-256-ccm"
#define LOADPARM_EXTRA_LOCALS \ #define LOADPARM_EXTRA_LOCALS \
int usershare; \ int usershare; \