The branch, master has been updated via 1432314f5c1 libcli smb smb2: Use correct enumeration type from b448eae5e98 smb2_tcon: also try to cancel pending compound requests on tdis
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1432314f5c16d0504d77acbe188a1990822d61e9 Author: Gary Lockyer <g...@catalyst.net.nz> Date: Thu Mar 25 14:36:50 2021 +1300 libcli smb smb2: Use correct enumeration type Clang gives the following error: ../../libcli/smb/smb2_signing.c:547:48: error: implicit conversion from enumeration type 'gnutls_mac_algorithm_t' to different enumeration type 'gnutls_digest_algorithm_t' [-Werror,-Wenum-conversion] const size_t digest_len = gnutls_hash_get_len(GNUTLS_MAC_SHA256); ~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~ Should be using GNUTLS_DIG_SHA256, which is set to GNUTLS_MAC_SHA256. Signed-off-by: Gary Lockyer <g...@catalyst.net.nz> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Gary Lockyer <g...@samba.org> Autobuild-Date(master): Mon Mar 29 23:19:24 UTC 2021 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: libcli/smb/smb2_signing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c index bfcd6ea233a..4d74085721a 100644 --- a/libcli/smb/smb2_signing.c +++ b/libcli/smb/smb2_signing.c @@ -544,7 +544,7 @@ NTSTATUS smb2_key_derivation(const uint8_t *KI, size_t KI_len, gnutls_hmac_hd_t hmac_hnd = NULL; uint8_t buf[4]; static const uint8_t zero = 0; - const size_t digest_len = gnutls_hash_get_len(GNUTLS_MAC_SHA256); + const size_t digest_len = gnutls_hash_get_len(GNUTLS_DIG_SHA256); uint8_t digest[digest_len]; uint32_t i = 1; uint32_t L = KO_len * 8; -- Samba Shared Repository