138 lines
3.8 KiB
Diff
138 lines
3.8 KiB
Diff
From a156d18abb509a48c45525da2f4e4db9cfdd1f30 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Mon, 18 Mar 2019 16:24:54 +0100
|
|
Subject: [PATCH 101/187] auth:gensec: Use GnuTLS AES CFB8 in netsec_do_seal()
|
|
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
(cherry picked from commit 025f6a135f930264ddcf1cd1b9e1004464618194)
|
|
---
|
|
auth/gensec/schannel.c | 95 +++++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 94 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/auth/gensec/schannel.c b/auth/gensec/schannel.c
|
|
index 2a36d0cfa7d..20b0a74e37f 100644
|
|
--- a/auth/gensec/schannel.c
|
|
+++ b/auth/gensec/schannel.c
|
|
@@ -33,9 +33,12 @@
|
|
#include "librpc/gen_ndr/dcerpc.h"
|
|
#include "param/param.h"
|
|
#include "auth/gensec/gensec_toplevel_proto.h"
|
|
-#include "lib/crypto/aes.h"
|
|
#include "libds/common/roles.h"
|
|
|
|
+#ifndef HAVE_GNUTLS_AES_CFB8
|
|
+#include "lib/crypto/aes.h"
|
|
+#endif
|
|
+
|
|
#include "lib/crypto/gnutls_helpers.h"
|
|
#include <gnutls/gnutls.h>
|
|
#include <gnutls/crypto.h>
|
|
@@ -258,6 +261,95 @@ static NTSTATUS netsec_do_seal(struct schannel_state *state,
|
|
bool forward)
|
|
{
|
|
if (state->creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
|
|
+#ifdef HAVE_GNUTLS_AES_CFB8
|
|
+ gnutls_cipher_hd_t cipher_hnd = NULL;
|
|
+ uint8_t sess_kf0[16] = {0};
|
|
+ gnutls_datum_t key = {
|
|
+ .data = sess_kf0,
|
|
+ .size = sizeof(sess_kf0),
|
|
+ };
|
|
+ uint32_t iv_size =
|
|
+ gnutls_cipher_get_iv_size(GNUTLS_CIPHER_AES_128_CFB8);
|
|
+ uint8_t _iv[iv_size];
|
|
+ gnutls_datum_t iv = {
|
|
+ .data = _iv,
|
|
+ .size = iv_size,
|
|
+ };
|
|
+ uint32_t i;
|
|
+ int rc;
|
|
+
|
|
+ for (i = 0; i < key.size; i++) {
|
|
+ key.data[i] = state->creds->session_key[i] ^ 0xf0;
|
|
+ }
|
|
+
|
|
+ ZERO_ARRAY(_iv);
|
|
+
|
|
+ memcpy(iv.data + 0, seq_num, 8);
|
|
+ memcpy(iv.data + 8, seq_num, 8);
|
|
+
|
|
+ rc = gnutls_cipher_init(&cipher_hnd,
|
|
+ GNUTLS_CIPHER_AES_128_CFB8,
|
|
+ &key,
|
|
+ &iv);
|
|
+ if (rc < 0) {
|
|
+ DBG_ERR("ERROR: gnutls_cipher_init: %s\n",
|
|
+ gnutls_strerror(rc));
|
|
+ return NT_STATUS_NO_MEMORY;
|
|
+ }
|
|
+
|
|
+ if (forward) {
|
|
+ rc = gnutls_cipher_encrypt(cipher_hnd,
|
|
+ confounder,
|
|
+ 8);
|
|
+ if (rc < 0) {
|
|
+ DBG_ERR("ERROR: gnutls_cipher_encrypt: %s\n",
|
|
+ gnutls_strerror(errno));
|
|
+ gnutls_cipher_deinit(cipher_hnd);
|
|
+ return NT_STATUS_INTERNAL_ERROR;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * Looks like we have to reuse the initial IV which is
|
|
+ * cryptographically wrong!
|
|
+ */
|
|
+ gnutls_cipher_set_iv(cipher_hnd, iv.data, iv.size);
|
|
+ rc = gnutls_cipher_encrypt(cipher_hnd,
|
|
+ data,
|
|
+ length);
|
|
+ if (rc < 0) {
|
|
+ DBG_ERR("ERROR: gnutls_cipher_encrypt: %s\n",
|
|
+ gnutls_strerror(errno));
|
|
+ gnutls_cipher_deinit(cipher_hnd);
|
|
+ return NT_STATUS_INTERNAL_ERROR;
|
|
+ }
|
|
+ } else {
|
|
+ rc = gnutls_cipher_decrypt(cipher_hnd,
|
|
+ confounder,
|
|
+ 8);
|
|
+ if (rc < 0) {
|
|
+ DBG_ERR("ERROR: gnutls_cipher_decrypt: %s\n",
|
|
+ gnutls_strerror(errno));
|
|
+ gnutls_cipher_deinit(cipher_hnd);
|
|
+ return NT_STATUS_INTERNAL_ERROR;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * Looks like we have to reuse the initial IV which is
|
|
+ * cryptographically wrong!
|
|
+ */
|
|
+ gnutls_cipher_set_iv(cipher_hnd, iv.data, iv.size);
|
|
+ rc = gnutls_cipher_decrypt(cipher_hnd,
|
|
+ data,
|
|
+ length);
|
|
+ if (rc < 0) {
|
|
+ DBG_ERR("ERROR: gnutls_cipher_decrypt: %s\n",
|
|
+ gnutls_strerror(errno));
|
|
+ gnutls_cipher_deinit(cipher_hnd);
|
|
+ return NT_STATUS_INTERNAL_ERROR;
|
|
+ }
|
|
+ }
|
|
+ gnutls_cipher_deinit(cipher_hnd);
|
|
+#else /* NOT HAVE_GNUTLS_AES_CFB8 */
|
|
AES_KEY key;
|
|
uint8_t iv[AES_BLOCK_SIZE];
|
|
uint8_t sess_kf0[16];
|
|
@@ -279,6 +371,7 @@ static NTSTATUS netsec_do_seal(struct schannel_state *state,
|
|
aes_cfb8_encrypt(confounder, confounder, 8, &key, iv, AES_DECRYPT);
|
|
aes_cfb8_encrypt(data, data, length, &key, iv, AES_DECRYPT);
|
|
}
|
|
+#endif /* HAVE_GNUTLS_AES_CFB8 */
|
|
} else {
|
|
gnutls_cipher_hd_t cipher_hnd;
|
|
uint8_t _sealing_key[16];
|
|
--
|
|
2.23.0
|
|
|