66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From bd6da0ff651385f14f8414ecb440e228d5a8a7d1 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Fri, 5 Jul 2019 10:38:44 +0200
|
|
Subject: [PATCH 003/187] lib:crypto: Add GNUTLS_FIPS140_SET_(LAX|STRICT)_MODE
|
|
to helpers
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14031
|
|
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
Reviewed-by: Ralph Boehme <slow@samba.org>
|
|
(cherry picked from commit 31a943fa0890438cffc67a566373f36c94c0a5a8)
|
|
---
|
|
lib/crypto/gnutls_helpers.h | 11 +++++++++++
|
|
source3/modules/hash_inode.c | 10 +---------
|
|
2 files changed, 12 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/lib/crypto/gnutls_helpers.h b/lib/crypto/gnutls_helpers.h
|
|
index 7c950c79525..8a2a49baf73 100644
|
|
--- a/lib/crypto/gnutls_helpers.h
|
|
+++ b/lib/crypto/gnutls_helpers.h
|
|
@@ -18,9 +18,20 @@
|
|
#ifndef _GNUTLS_HELPERS_H
|
|
#define _GNUTLS_HELPERS_H
|
|
|
|
+#include <gnutls/gnutls.h>
|
|
+
|
|
#include "libcli/util/ntstatus.h"
|
|
#include "libcli/util/werror.h"
|
|
|
|
+/* Those macros are only available in GnuTLS >= 3.6.4 */
|
|
+#ifndef GNUTLS_FIPS140_SET_LAX_MODE
|
|
+#define GNUTLS_FIPS140_SET_LAX_MODE()
|
|
+#endif
|
|
+
|
|
+#ifndef GNUTLS_FIPS140_SET_STRICT_MODE
|
|
+#define GNUTLS_FIPS140_SET_STRICT_MODE()
|
|
+#endif
|
|
+
|
|
NTSTATUS _gnutls_error_to_ntstatus(int gnutls_rc,
|
|
NTSTATUS blocked_status,
|
|
const char *function,
|
|
diff --git a/source3/modules/hash_inode.c b/source3/modules/hash_inode.c
|
|
index 231538c72cb..a9144621901 100644
|
|
--- a/source3/modules/hash_inode.c
|
|
+++ b/source3/modules/hash_inode.c
|
|
@@ -22,15 +22,7 @@
|
|
|
|
#include <gnutls/gnutls.h>
|
|
#include <gnutls/crypto.h>
|
|
-
|
|
-/* Those macros are only available in GnuTLS >= 3.6.4 */
|
|
-#ifndef GNUTLS_FIPS140_SET_LAX_MODE
|
|
-#define GNUTLS_FIPS140_SET_LAX_MODE()
|
|
-#endif
|
|
-
|
|
-#ifndef GNUTLS_FIPS140_SET_STRICT_MODE
|
|
-#define GNUTLS_FIPS140_SET_STRICT_MODE()
|
|
-#endif
|
|
+#include "lib/crypto/gnutls_helpers.h"
|
|
|
|
SMB_INO_T hash_inode(const SMB_STRUCT_STAT *sbuf, const char *sname)
|
|
{
|
|
--
|
|
2.23.0
|
|
|