diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 20:31:08 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 18:42:28 +0000 |
| commit | d0ac93756794ed29650dc91f7f8304b11504c61b (patch) | |
| tree | ca84581f86ad0d451a9600533a57b4f56e261fa0 /asn1/pkcs12/packet-pkcs12-template.c | |
| parent | 7398779206eb53ec17bf2f4f4f7fad414b0c7391 (diff) | |
Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b.
Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1/pkcs12/packet-pkcs12-template.c')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 103252e1e2..690ac6c36b 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -112,7 +112,7 @@ generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, cur_keylen = 0; - salt_size = tvb_captured_length(salt_tvb); + salt_size = tvb_length(salt_tvb); salt_p = (char *)tvb_memdup(wmem_packet_scope(), salt_tvb, 0, salt_size); if (pw == NULL) @@ -313,7 +313,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted } } - datalen = tvb_captured_length(encrypted_tvb); + datalen = tvb_length(encrypted_tvb); clear_data = (char *)g_malloc(datalen); err = gcry_cipher_decrypt (cipher, clear_data, datalen, (char *)tvb_memdup(wmem_packet_scope(), encrypted_tvb, 0, datalen), datalen); |