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

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

diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index 7b33a42526ef57470ebb398b38e9eed3e1c6e854..623fc23fb18a6aafb6633f688192085ec2b78902 100644 (file)
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -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)
 {

diff --git a/libcli/smb/smb2_signing.h b/libcli/smb/smb2_signing.h
index e28b5c8de9ac415ff3aba2eae269096d54320047..ca22de9dbfa90704b895e13d61b799a4258a68ee 100644 (file)
--- a/libcli/smb/smb2_signing.h
+++ b/libcli/smb/smb2_signing.h
@@ -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);