|
 |
b6b438 |
From 1e72f0d5b636d4f9a5ad39e2ac01230fcb2badd8 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Fri, 6 Dec 2019 08:49:54 +0100
|
|
|
b6b438 |
Subject: [PATCH 163/187] auth:tests: Only enable torture_gnutls_aes_128_cfb()
|
|
|
b6b438 |
on GnuTLS >= 3.6.11
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Reviewed-by: Isaac Boukris <iboukris@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit 01f531ba6ba1306e99d2e4715dadae073eb0a8ec)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
libcli/auth/tests/test_gnutls.c | 4 ++--
|
|
|
b6b438 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/libcli/auth/tests/test_gnutls.c b/libcli/auth/tests/test_gnutls.c
|
|
|
b6b438 |
index 066d5cf0a9d..412a454b762 100644
|
|
|
b6b438 |
--- a/libcli/auth/tests/test_gnutls.c
|
|
|
b6b438 |
+++ b/libcli/auth/tests/test_gnutls.c
|
|
|
b6b438 |
@@ -29,7 +29,7 @@
|
|
|
b6b438 |
#include <gnutls/gnutls.h>
|
|
|
b6b438 |
#include <gnutls/crypto.h>
|
|
|
b6b438 |
|
|
|
b6b438 |
-#ifdef HAVE_GNUTLS_AES_CFB8
|
|
|
b6b438 |
+#if defined(HAVE_GNUTLS_AES_CFB8) && GNUTLS_VERSION_NUMBER > 0x03060a
|
|
|
b6b438 |
static void torture_gnutls_aes_128_cfb_flags(void **state,
|
|
|
b6b438 |
const DATA_BLOB session_key,
|
|
|
b6b438 |
const DATA_BLOB seq_num_initial,
|
|
|
b6b438 |
@@ -135,7 +135,7 @@ static void torture_gnutls_aes_128_cfb_flags(void **state,
|
|
|
b6b438 |
|
|
|
b6b438 |
static void torture_gnutls_aes_128_cfb(void **state)
|
|
|
b6b438 |
{
|
|
|
b6b438 |
-#ifdef HAVE_GNUTLS_AES_CFB8
|
|
|
b6b438 |
+#if defined(HAVE_GNUTLS_AES_CFB8) && GNUTLS_VERSION_NUMBER > 0x03060a
|
|
|
b6b438 |
const uint8_t _session_key[16] = {
|
|
|
b6b438 |
0x8E, 0xE8, 0x27, 0x85, 0x83, 0x41, 0x3C, 0x8D,
|
|
|
b6b438 |
0xC9, 0x54, 0x70, 0x75, 0x8E, 0xC9, 0x69, 0x91
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|