aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2014-04-11 22:24:23 +0200
committerStig Bjørlykke <stig@bjorlykke.org>2014-04-11 20:31:21 +0000
commit2afa065d6201202c3804d8857c2f462e6dcde55f (patch)
tree7ec856a87d88d5297b34b65309c5af81a83f92d9 /epan
parentb642a280cb74b94e62815dde98c038f54c4ad2ff (diff)
Fix compilation if not HAVE_LIBGNUTLS and not HAVE_LIBGCRYPT
This was introduced in the previous compilation fix. Change-Id: I4ec652a2708d90f35f3f00ec2c3261acb3e68397 Reviewed-on: https://code.wireshark.org/review/1074 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ssl-utils.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index e26f323b33..914bf10459 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -32,9 +32,9 @@
#include <epan/tvbuff.h>
#include <epan/proto.h>
#include <epan/expert.h>
+#include <wsutil/wsgcrypt.h>
#ifdef HAVE_LIBGNUTLS
-#include <wsutil/wsgcrypt.h>
#include <gnutls/x509.h>
#include <gnutls/pkcs12.h>
@@ -43,6 +43,7 @@
/* #define SSL_FAST 1 */
#define SSL_DECRYPT_DEBUG
+#endif /* HAVE_LIBGNUTLS */
#ifdef HAVE_LIBGCRYPT
#define SSL_CIPHER_CTX gcry_cipher_hd_t
@@ -55,7 +56,6 @@
#define SSL_CIPHER_CTX void*
#define SSL_PRIVATE_KEY void
#endif /* HAVE_LIBGCRYPT */
-#endif /* HAVE_LIBGNUTLS */
/* version state tables */