sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

libcli:smb: Don't use forward declartions for GnuTLS typedefs

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14271

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Feb  7 13:48:27 UTC 2020 on sn-devel-184
This commit is contained in:
Stefan Metzmacher 2020-02-06 15:36:35 +01:00 committed by Andreas Schneider
parent beb829d0e6
commit 3894f87818
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcli/smb/smb2_signing.c
View File

@ -20,6 +20,9 @@
#include "includes.h"
#include "system/filesys.h"
#include <gnutls/gnutls.h>
#include <gnutls/crypto.h>
#define SMB2_SIGNING_KEY_GNUTLS_TYPES 1
#include "../libcli/smb/smb_common.h"
#include "../lib/crypto/crypto.h"
#include "lib/util/iov_buf.h"
@ -30,8 +33,6 @@
#endif
#include "lib/crypto/gnutls_helpers.h"
#include <gnutls/gnutls.h>
#include <gnutls/crypto.h>
int smb2_signing_key_destructor(struct smb2_signing_key *key)
{

19
libcli/smb/smb2_signing.h
View File

@ -22,16 +22,21 @@
#define _LIBCLI_SMB_SMB2_SIGNING_H_
struct iovec;
/* Forward declaration of GnuTLS typedefs */
struct hmac_hd_st;
typedef struct hmac_hd_st* gnutls_hmac_hd_t;
struct api_aead_cipher_hd_st;
typedef struct api_aead_cipher_hd_st *gnutls_aead_cipher_hd_t;
struct smb2_signing_key {
gnutls_hmac_hd_t hmac_hnd;
gnutls_aead_cipher_hd_t cipher_hnd;
DATA_BLOB blob;
union {
#ifdef SMB2_SIGNING_KEY_GNUTLS_TYPES
gnutls_hmac_hd_t hmac_hnd;
#endif
void *__hmac_hnd;
};
union {
#ifdef SMB2_SIGNING_KEY_GNUTLS_TYPES
gnutls_aead_cipher_hd_t cipher_hnd;
#endif
void *__cipher_hnd;
};
};
int smb2_signing_key_destructor(struct smb2_signing_key *key);