70 lines
1.9 KiB
Diff
70 lines
1.9 KiB
Diff
From efe2ed9aa8d1a1be574149f591015cc063c24fb7 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Fri, 1 Mar 2019 17:41:11 +0100
|
|
Subject: [PATCH 089/187] libcli:auth: Use GnuTLS AES128 CFB for
|
|
netlogon_creds_aes_encrypt()
|
|
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
(cherry picked from commit 054efd118d7500e28f118722312aaae0df2749b0)
|
|
---
|
|
libcli/auth/credentials.c | 36 ++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 36 insertions(+)
|
|
|
|
diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c
|
|
index 3b31d1e0300..5a1692ef436 100644
|
|
--- a/libcli/auth/credentials.c
|
|
+++ b/libcli/auth/credentials.c
|
|
@@ -295,12 +295,48 @@ NTSTATUS netlogon_creds_arcfour_crypt(struct netlogon_creds_CredentialState *cre
|
|
*/
|
|
void netlogon_creds_aes_encrypt(struct netlogon_creds_CredentialState *creds, uint8_t *data, size_t len)
|
|
{
|
|
+#ifdef HAVE_GNUTLS_AES_CFB8
|
|
+ gnutls_cipher_hd_t cipher_hnd = NULL;
|
|
+ gnutls_datum_t key = {
|
|
+ .data = creds->session_key,
|
|
+ .size = sizeof(creds->session_key),
|
|
+ };
|
|
+ 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,
|
|
+ };
|
|
+ int rc;
|
|
+
|
|
+ ZERO_ARRAY(_iv);
|
|
+
|
|
+ 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;
|
|
+ }
|
|
+
|
|
+ rc = gnutls_cipher_encrypt(cipher_hnd, data, len);
|
|
+ gnutls_cipher_deinit(cipher_hnd);
|
|
+ if (rc < 0) {
|
|
+ DBG_ERR("ERROR: gnutls_cipher_encrypt: %s\n",
|
|
+ gnutls_strerror(rc));
|
|
+ return;
|
|
+ }
|
|
+#else /* NOT HAVE_GNUTLS_AES_CFB8 */
|
|
AES_KEY key;
|
|
uint8_t iv[AES_BLOCK_SIZE] = {0};
|
|
|
|
AES_set_encrypt_key(creds->session_key, 128, &key);
|
|
|
|
aes_cfb8_encrypt(data, data, len, &key, iv, AES_ENCRYPT);
|
|
+#endif /* HAVE_GNUTLS_AES_CFB8 */
|
|
}
|
|
|
|
/*
|
|
--
|
|
2.23.0
|
|
|