diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-03 22:27:46 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-03 22:27:46 +0000 |
| commit | 52e47754f12d5eaf6f5f3b62797cad7489504264 (patch) | |
| tree | 673c57be702dc76eaf8c0c3bfd45bf1a00fb057d /epan/dissectors/packet-pkcs12.c | |
| parent | 727ed6838137a0825e65c50a0073304a60a17974 (diff) | |
Fix [-Wshadow] warnings.
svn path=/trunk/; revision=46357
Diffstat (limited to 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 3d2547f837..3eff6e0c3e 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -190,7 +190,7 @@ generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, gcry_mpi_t num_b1 = NULL; size_t pwlen; char hash[20], buf_b[64], buf_i[128], *p; - char *salt; + char *salt_p; int salt_size; size_t cur_keylen; size_t n; @@ -199,7 +199,7 @@ generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, cur_keylen = 0; salt_size = tvb_length(salt_tvb); - salt = tvb_get_ephemeral_string(salt_tvb, 0, salt_size); + salt_p = tvb_get_ephemeral_string(salt_tvb, 0, salt_size); if (pw == NULL) pwlen = 0; @@ -214,7 +214,7 @@ generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, /* Store salt and password in BUF_I */ p = buf_i; for (i = 0; i < 64; i++) - *p++ = salt[i % salt_size]; + *p++ = salt_p[i % salt_size]; if (pw) { for (i = j = 0; i < 64; i += 2) @@ -303,7 +303,7 @@ void PBE_reset_parameters(void) salt = NULL; } -int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_tvb _U_, asn1_ctx_t *actx _U_, proto_item *item _U_) +int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted_tvb, asn1_ctx_t *actx, proto_item *item) { #ifdef HAVE_LIBGCRYPT const char *encryption_algorithm; @@ -450,8 +450,8 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t tvb_set_free_cb(clear_tvb, g_free); name = g_string_new(""); - oidname = oid_resolved_from_string(object_identifier_id); - g_string_printf(name, "Decrypted %s", oidname ? oidname : object_identifier_id); + oidname = oid_resolved_from_string(object_identifier_id_param); + g_string_printf(name, "Decrypted %s", oidname ? oidname : object_identifier_id_param); /* add it as a new source */ add_new_data_source(actx->pinfo, clear_tvb, name->str); @@ -459,7 +459,7 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t g_string_free(name, TRUE); /* now try and decode it */ - call_ber_oid_callback(object_identifier_id, clear_tvb, 0, actx->pinfo, tree); + call_ber_oid_callback(object_identifier_id_param, clear_tvb, 0, actx->pinfo, tree); return TRUE; #else |