diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-05-12 20:51:53 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-05-12 20:51:53 +0000 |
| commit | 4a90e977e0492d4538a8cba3517fedcde9f8913d (patch) | |
| tree | d37428a966d0a7f47f1122c36f8af9db0ba3d8e1 /epan/dissectors/packet-ssl-utils.c | |
| parent | 86f69833bfb7439ccec0745fdcfa199225c16b05 (diff) | |
| download | wireshark-4a90e977e0492d4538a8cba3517fedcde9f8913d.tar.gz | |
From Richard Brodie via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800 :
Fix compilation if we HAVE_LIBGNUTLS but we do not HAVE_LIBGCRYPT. (The
former can be built using libnettle instead of the latter.)
svn path=/trunk/; revision=37102
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 4489ba6db6..fd936daa25 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -946,7 +946,7 @@ ssl_data_set(StringInfo* str, const guchar* data, guint len) str->data_len = len; } -#ifdef HAVE_LIBGNUTLS +#if defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT) static gint ver_major, ver_minor, ver_patch; @@ -2747,7 +2747,7 @@ ssl_lib_init(void) sscanf(str, "%d.%d.%d", &ver_major, &ver_minor, &ver_patch); } -#else /* HAVE_LIBGNUTLS */ +#else /* defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT) */ /* no libgnutl: dummy operation to keep interface consistent*/ void ssl_lib_init(void) |