|
 |
b6b438 |
From 8fc821bcdc457b9f22726eb6a83f5a3a08213040 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Date: Fri, 16 Aug 2019 15:45:43 +1200
|
|
|
b6b438 |
Subject: [PATCH 102/187] auth/gensec: Use gnutls_error_to_ntstatus() in
|
|
|
b6b438 |
netsec_do_seal()
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
(cherry picked from commit fa8eddc39b4ea9d316201019b603025df5c2fa5e)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
auth/gensec/schannel.c | 16 ++++------------
|
|
|
b6b438 |
1 file changed, 4 insertions(+), 12 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/auth/gensec/schannel.c b/auth/gensec/schannel.c
|
|
|
b6b438 |
index 20b0a74e37f..b5e6289ef3f 100644
|
|
|
b6b438 |
--- a/auth/gensec/schannel.c
|
|
|
b6b438 |
+++ b/auth/gensec/schannel.c
|
|
|
b6b438 |
@@ -302,10 +302,8 @@ static NTSTATUS netsec_do_seal(struct schannel_state *state,
|
|
|
b6b438 |
confounder,
|
|
|
b6b438 |
8);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- DBG_ERR("ERROR: gnutls_cipher_encrypt: %s\n",
|
|
|
b6b438 |
- gnutls_strerror(errno));
|
|
|
b6b438 |
gnutls_cipher_deinit(cipher_hnd);
|
|
|
b6b438 |
- return NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_CRYPTO_SYSTEM_INVALID);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
/*
|
|
|
b6b438 |
@@ -317,20 +315,16 @@ static NTSTATUS netsec_do_seal(struct schannel_state *state,
|
|
|
b6b438 |
data,
|
|
|
b6b438 |
length);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- DBG_ERR("ERROR: gnutls_cipher_encrypt: %s\n",
|
|
|
b6b438 |
- gnutls_strerror(errno));
|
|
|
b6b438 |
gnutls_cipher_deinit(cipher_hnd);
|
|
|
b6b438 |
- return NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_CRYPTO_SYSTEM_INVALID);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
} else {
|
|
|
b6b438 |
rc = gnutls_cipher_decrypt(cipher_hnd,
|
|
|
b6b438 |
confounder,
|
|
|
b6b438 |
8);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- DBG_ERR("ERROR: gnutls_cipher_decrypt: %s\n",
|
|
|
b6b438 |
- gnutls_strerror(errno));
|
|
|
b6b438 |
gnutls_cipher_deinit(cipher_hnd);
|
|
|
b6b438 |
- return NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_CRYPTO_SYSTEM_INVALID);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
/*
|
|
|
b6b438 |
@@ -342,10 +336,8 @@ static NTSTATUS netsec_do_seal(struct schannel_state *state,
|
|
|
b6b438 |
data,
|
|
|
b6b438 |
length);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- DBG_ERR("ERROR: gnutls_cipher_decrypt: %s\n",
|
|
|
b6b438 |
- gnutls_strerror(errno));
|
|
|
b6b438 |
gnutls_cipher_deinit(cipher_hnd);
|
|
|
b6b438 |
- return NT_STATUS_INTERNAL_ERROR;
|
|
|
b6b438 |
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_CRYPTO_SYSTEM_INVALID);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
}
|
|
|
b6b438 |
gnutls_cipher_deinit(cipher_hnd);
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|