|
 |
b6b438 |
From c75283e42d0758247fca67b6f59ac5a76ace2dd7 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Fri, 23 Aug 2019 09:27:35 +0200
|
|
|
b6b438 |
Subject: [PATCH 127/187] libcli:smb: Use gnutls_error_to_ntstatus() in
|
|
|
b6b438 |
smb2_signing_decrypt_pdu()
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit b9c4990f57aa778942c310b802437e6df1d17e04)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
libcli/smb/smb2_signing.c | 5 ++---
|
|
|
b6b438 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
index 9f40e8bbea5..15dbf3d8b2a 100644
|
|
|
b6b438 |
--- a/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
+++ b/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
@@ -652,7 +652,7 @@ NTSTATUS smb2_signing_decrypt_pdu(struct smb2_signing_key *decryption_key,
|
|
|
b6b438 |
algo,
|
|
|
b6b438 |
&key);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- status = NT_STATUS_NO_MEMORY;
|
|
|
b6b438 |
+ status = gnutls_error_to_ntstatus(rc, NT_STATUS_INTERNAL_ERROR);
|
|
|
b6b438 |
goto out;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
}
|
|
|
b6b438 |
@@ -710,10 +710,9 @@ NTSTATUS smb2_signing_decrypt_pdu(struct smb2_signing_key *decryption_key,
|
|
|
b6b438 |
ptext,
|
|
|
b6b438 |
&ptext_size);
|
|
|
b6b438 |
if (rc < 0 || ptext_size != m_total) {
|
|
|
b6b438 |
- DBG_ERR("ERROR: %s\n", gnutls_strerror(rc));
|
|
|
b6b438 |
TALLOC_FREE(ptext);
|
|
|
b6b438 |
TALLOC_FREE(ctext);
|
|
|
b6b438 |
- status = NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ status = gnutls_error_to_ntstatus(rc, NT_STATUS_INTERNAL_ERROR);
|
|
|
b6b438 |
goto out;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|