|
 |
b6b438 |
From b72fbb819de245fe77b4d5bdb2465fc65488cc62 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Fri, 23 Aug 2019 09:28:28 +0200
|
|
|
b6b438 |
Subject: [PATCH 129/187] libcli:smb: Use gnutls_error_to_ntstatus() in
|
|
|
b6b438 |
smb2_signing_encrypt_pdu()
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit f24f26aaa58b9223e2c0cfd3e5086278b27903f1)
|
|
|
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 682327bb21b..c39f8e4780a 100644
|
|
|
b6b438 |
--- a/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
+++ b/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
@@ -470,7 +470,7 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_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 |
@@ -523,10 +523,9 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
|
|
|
b6b438 |
ctext,
|
|
|
b6b438 |
&ctext_size);
|
|
|
b6b438 |
if (rc < 0 || ctext_size != m_total + tag_size) {
|
|
|
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 |
|