diff options
Diffstat (limited to 'epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c')
| -rw-r--r-- | epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c b/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c index bff6cee915..cce82d553b 100644 --- a/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c +++ b/epan/dissectors/asn1/pkcs12/packet-pkcs12-template.c @@ -85,8 +85,6 @@ static void append_oid(proto_tree *tree, const char *oid) proto_item_append_text(tree, " (%s)", name ? name : oid); } -#ifdef HAVE_LIBGCRYPT - static int generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, const char *pw, unsigned int req_keylen, char * keybuf) @@ -209,8 +207,6 @@ generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, } } -#endif - void PBE_reset_parameters(void) { iteration_count = 0; @@ -219,7 +215,6 @@ void PBE_reset_parameters(void) int PBE_decrypt_data(const char *object_identifier_id_param _U_, tvbuff_t *encrypted_tvb _U_, packet_info *pinfo _U_, asn1_ctx_t *actx _U_, proto_item *item _U_) { -#ifdef HAVE_LIBGCRYPT const char *encryption_algorithm; gcry_cipher_hd_t cipher; gcry_error_t err; @@ -373,11 +368,6 @@ int PBE_decrypt_data(const char *object_identifier_id_param _U_, tvbuff_t *encry call_ber_oid_callback(object_identifier_id_param, clear_tvb, 0, actx->pinfo, tree, NULL); return TRUE; -#else - /* we cannot decrypt */ - return FALSE; - -#endif } #include "packet-pkcs12-fn.c" |