diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-02-09 15:00:19 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-02-13 18:35:47 +0000 |
| commit | 6b84ddee83e70aff944da084129624226b7a32fa (patch) | |
| tree | 7cac052f5b5adb25c301b9974e79a334aa36b13b /epan/dissectors/packet-dvbci.c | |
| parent | b5610a0436f332c664a91b86cb5326f24601bbf1 (diff) | |
Make Libgcrypt a mandatory dependency
Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to
error out if it is not available. Update release notes, developer
documentation and README with the new status. Clarify relation with
GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script.
Motivation for this change is that many dissectors depend on Libgcrypt
and having it optional increases the maintenance burden (there have been
several compile issues in the past due to the optional status).
Furthermore, wsutil has crypto code that can be replaced by Libgcrypt.
Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f
Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html
Reviewed-on: https://code.wireshark.org/review/20030
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-dvbci.c')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 6940ad331f..1207c312ab 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -2356,7 +2356,6 @@ dissect_cc_data_payload(guint32 tag, tvbuff_t *tvb, gint offset, } -#ifdef HAVE_LIBGCRYPT /* convert a 0-terminated preference key_string that contains a hex number * into its binary representation * e.g. key_string "abcd" will be converted into two bytes 0xab, 0xcd @@ -2435,23 +2434,6 @@ end: return clear_tvb; } -#else -/* HAVE_LIBGCRYPT is not set */ -static gint -pref_key_string_to_bin(const gchar *key_string _U_, unsigned char **key_bin _U_) -{ - return 0; -} - -static tvbuff_t * -decrypt_sac_msg_body(packet_info *pinfo _U_, guint8 enc_cip _U_, - tvbuff_t *encrypted_tvb _U_, gint offset _U_, gint len _U_) -{ - return NULL; -} - -#endif - /* dissect a text string that is encoded according to DVB-SI (EN 300 468) */ static void |