diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-12-29 13:15:05 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-12-29 14:14:59 +0000 |
| commit | f31e9b31545b814e77e30b9a0f70e2f0e3f0afa4 (patch) | |
| tree | 53d424b8b44df1bb9b8ccdf2bd07c82c26c13911 /epan/dissectors | |
| parent | 95bb65ff258e2c818a1233887f3932fa9a0e856a (diff) | |
Use gcry_strerror() to get crypt error description.
It seems using gcry_strerror() should be correct,
it also fix building when --without-gnutls (when -lgpg-error is not added):
/usr/bin/ld: epan/.libs/libwireshark.a(packet-ipsec.o): undefined reference to symbol 'gpg_strerror@@GPG_ERROR_1.0'
Change-Id: I142e2e553fd7da501bd57635b8826ff42e114085
Reviewed-on: https://code.wireshark.org/review/25064
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/asn1/snmp/packet-snmp-template.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ipsec.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-snmp.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/asn1/snmp/packet-snmp-template.c b/epan/dissectors/asn1/snmp/packet-snmp-template.c index 1a8b745cdf..ebe8cbab3f 100644 --- a/epan/dissectors/asn1/snmp/packet-snmp-template.c +++ b/epan/dissectors/asn1/snmp/packet-snmp-template.c @@ -1674,7 +1674,7 @@ snmp_usm_priv_des(snmp_usm_params_t* p, tvbuff_t* encryptedData, packet_info *pi return clear_tvb; on_gcry_error: - *error = (const gchar *)gpg_strerror(err); + *error = (const gchar *)gcry_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; } @@ -1739,7 +1739,7 @@ snmp_usm_priv_aes_common(snmp_usm_params_t* p, tvbuff_t* encryptedData, packet_i return clear_tvb; on_gcry_error: - *error = (const gchar *)gpg_strerror(err); + *error = (const gchar *)gcry_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; } diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index f5d38e9344..487980b595 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1548,7 +1548,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (err) { fprintf (stderr, "<IPsec/ESP Dissector> Error in Algorithm %s, gcry_md_open failed: %s\n", - gcry_md_algo_name(auth_algo_libgcrypt), gpg_strerror (err)); + gcry_md_algo_name(auth_algo_libgcrypt), gcry_strerror(err)); authentication_ok = FALSE; } else @@ -1931,7 +1931,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (err) { fprintf(stderr, "<IPsec/ESP Dissector> Error in Algorithm %s Mode %d, grcy_open_cipher failed: %s\n", - gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, gpg_strerror(err)); + gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, gcry_strerror(err)); } else { @@ -1951,7 +1951,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (err) { fprintf(stderr, "<IPsec/ESP Dissector> Error in Algorithm %s Mode %d, gcry_cipher_setkey(key_len=%u) failed: %s\n", - gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, esp_crypt_key_len, gpg_strerror (err)); + gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, esp_crypt_key_len, gcry_strerror(err)); gcry_cipher_close(*cipher_hd); } } @@ -1986,7 +1986,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) if (err) { fprintf(stderr, "<IPsec/ESP Dissector> Error in Algorithm %s, Mode %d, gcry_cipher_decrypt failed: %s\n", - gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, gpg_strerror (err)); + gcry_cipher_algo_name(crypt_algo_libgcrypt), crypt_mode_libgcrypt, gcry_strerror(err)); gcry_cipher_close(*cipher_hd); decrypt_ok = FALSE; } diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 21cfb6685b..9b53e04863 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -1776,7 +1776,7 @@ snmp_usm_priv_des(snmp_usm_params_t* p, tvbuff_t* encryptedData, packet_info *pi return clear_tvb; on_gcry_error: - *error = (const gchar *)gpg_strerror(err); + *error = (const gchar *)gcry_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; } @@ -1841,7 +1841,7 @@ snmp_usm_priv_aes_common(snmp_usm_params_t* p, tvbuff_t* encryptedData, packet_i return clear_tvb; on_gcry_error: - *error = (const gchar *)gpg_strerror(err); + *error = (const gchar *)gcry_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; } |