summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorTimur I. Bakeyev <timur@iXsystems.com>2018-03-22 05:47:58 +0100
committerKarolin Seeger <kseeger@samba.org>2018-04-06 08:21:13 +0200
commit25edad412a3d503114a805b434a729d5d2786b3f (patch)
treefc0d2304fddf2dc71eea471018ecd9991080a26d /source4/dsdb
parent8a77ae09ee1522d01746a4cb7fd5661b980b86d7 (diff)
downloadsamba-25edad412a3d503114a805b434a729d5d2786b3f.tar.gz
Fix invocation of gnutls_aead_cipher_encrypt()
Which was failing with GNUTLS_E_SHORT_MEMORY_BUFFER - The given memory buffer is too short to hold parameters. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13352 Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz> Autobuild-User(master): Garming Sam <garming@samba.org> Autobuild-Date(master): Fri Mar 23 07:25:30 CET 2018 on sn-devel-144 (cherry picked from commit b9f0c7f93c058685e24d104432978bd40b94b49f)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/encrypted_secrets.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c b/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c
index 34c44c7bd9f..87ec9e4eb53 100644
--- a/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c
+++ b/source4/dsdb/samdb/ldb_modules/encrypted_secrets.c
@@ -750,16 +750,16 @@ static struct ldb_val gnutls_encrypt_aead(int *err,
* Encrypt the value.
*/
{
- size_t el;
- const unsigned block_size = gnutls_cipher_get_tag_size(
+ const unsigned block_size = gnutls_cipher_get_block_size(
data->encryption_algorithm);
- const unsigned tag_size = gnutls_cipher_get_block_size(
+ const unsigned tag_size = gnutls_cipher_get_tag_size(
data->encryption_algorithm);
const size_t ed_size = round_to_block_size(
block_size,
sizeof(struct PlaintextSecret) + val.length);
const size_t en_size = ed_size + tag_size;
uint8_t *ct = talloc_zero_size(frame, en_size);
+ size_t el = en_size;
if (ct == NULL) {
ldb_set_errstring(ldb,