diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-04-11 15:20:00 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-04-11 14:07:39 +0000 |
| commit | b642a280cb74b94e62815dde98c038f54c4ad2ff (patch) | |
| tree | 087139484a588ab7ce78f914630a7f6e46530594 /epan | |
| parent | 48c05a4f8e61998478e8be44cb4819989b1bfd99 (diff) | |
Fix compilation if HAVE_LIBGNUTLS but not HAVE_LIBGCRYPT.
Also fixed a comment for a #endif for the same defines.
Change-Id: Icbbf619dbaeb1d4d154a5f1a8273f252d35c6981
Reviewed-on: https://code.wireshark.org/review/1070
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 25e252efec..f3b76c1177 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3811,7 +3811,7 @@ ssl_cipher_setiv(SSL_CIPHER_CTX *cipher _U_, guchar* iv _U_, gint iv_len _U_) return 0; } -#endif /* HAVE_LIBGNUTLS */ +#endif /* defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT) */ /* get ssl data for this session. if no ssl data is found allocate a new one*/ void diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index f472af33fa..e26f323b33 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -44,15 +44,17 @@ /* #define SSL_FAST 1 */ #define SSL_DECRYPT_DEBUG +#ifdef HAVE_LIBGCRYPT #define SSL_CIPHER_CTX gcry_cipher_hd_t #ifdef SSL_FAST #define SSL_PRIVATE_KEY gcry_mpi_t #else /* SSL_FAST */ #define SSL_PRIVATE_KEY struct gcry_sexp #endif /* SSL_FAST */ -#else /* HAVE_LIBGNUTLS */ +#else /* HAVE_LIBGCRYPT */ #define SSL_CIPHER_CTX void* #define SSL_PRIVATE_KEY void +#endif /* HAVE_LIBGCRYPT */ #endif /* HAVE_LIBGNUTLS */ |