sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-01 05:47:28 +03:00
Code

lib:crypto: Add GNUTLS_FIPS140_SET_(LAX|STRICT)_MODE to helpers

Browse Source 
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>
This commit is contained in:
Andreas Schneider 2019-07-05 10:38:44 +02:00 committed by Andreas Schneider
parent a31a40b41a
commit 31a943fa08
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/crypto/gnutls_helpers.h
View File

@ -18,9 +18,20 @@
#ifndef _GNUTLS_HELPERS_H #ifndef _GNUTLS_HELPERS_H
#define _GNUTLS_HELPERS_H #define _GNUTLS_HELPERS_H
#include <gnutls/gnutls.h>
#include "libcli/util/ntstatus.h" #include "libcli/util/ntstatus.h"
#include "libcli/util/werror.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 _gnutls_error_to_ntstatus(int gnutls_rc,
NTSTATUS blocked_status, NTSTATUS blocked_status,
const char *function, const char *function,

10
source3/modules/hash_inode.c
View File

@ -22,15 +22,7 @@
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/crypto.h> #include <gnutls/crypto.h>
#include "lib/crypto/gnutls_helpers.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
SMB_INO_T hash_inode(const SMB_STRUCT_STAT *sbuf, const char *sname) SMB_INO_T hash_inode(const SMB_STRUCT_STAT *sbuf, const char *sname)
{ {