|
 |
b6b438 |
From 1aa93773ac48915c8eaabc959ae2bf65037a368c Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Date: Fri, 16 Aug 2019 15:50:03 +1200
|
|
|
b6b438 |
Subject: [PATCH 122/187] libcli/smb: Use gnutls_error_to_ntstatus() in
|
|
|
b6b438 |
smb2_signing_check_pdu()
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
(cherry picked from commit 70ff03ecb6826525727d87ef8807428f91f4e506)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
libcli/smb/smb2_signing.c | 8 ++++----
|
|
|
b6b438 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
index 5bf61bd477b..1ec60a4f9a5 100644
|
|
|
b6b438 |
--- a/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
+++ b/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
@@ -229,18 +229,18 @@ NTSTATUS smb2_signing_check_pdu(struct smb2_signing_key *signing_key,
|
|
|
b6b438 |
key.data,
|
|
|
b6b438 |
key.size);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- return NT_STATUS_NO_MEMORY;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
rc = gnutls_hmac(signing_key->hmac_hnd, hdr, SMB2_HDR_SIGNATURE);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- return NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
rc = gnutls_hmac(signing_key->hmac_hnd, zero_sig, 16);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- return NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
for (i = 1; i < count; i++) {
|
|
|
b6b438 |
@@ -248,7 +248,7 @@ NTSTATUS smb2_signing_check_pdu(struct smb2_signing_key *signing_key,
|
|
|
b6b438 |
vector[i].iov_base,
|
|
|
b6b438 |
vector[i].iov_len);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- return NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
}
|
|
|
b6b438 |
gnutls_hmac_output(signing_key->hmac_hnd, res);
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|