diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-02-26 14:29:17 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-02-26 19:38:21 +0000 |
| commit | 1dff4e309d036e23c316f2cf9a6d05d5a4449ff2 (patch) | |
| tree | a7ff0816c598def87e246a2ebbd2d80fa47365fc /asn1/pkcs12/pkcs12.cnf | |
| parent | b4850149dd877375c1d8da3a2d20bddca1d91780 (diff) | |
| download | wireshark-1dff4e309d036e23c316f2cf9a6d05d5a4449ff2.tar.gz wireshark-1dff4e309d036e23c316f2cf9a6d05d5a4449ff2.tar.bz2 wireshark-1dff4e309d036e23c316f2cf9a6d05d5a4449ff2.zip | |
Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'asn1/pkcs12/pkcs12.cnf')
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index fc5b14ebb5..e8d008f998 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -21,7 +21,7 @@ SafeContents B "1.2.840.113549.1.12.10.1.6" "safeContentsBag" # PKCS#9 Attributes - see master list in x509sat.cnf PFX B "2.16.840.1.113730.3.1.216" "pkcs-9-at-PKCS12" -EncryptedPrivateKeyInfo B "1.2.840.113549.1.9.25.2" "pkcs-9-at-encryptedPrivateKeyInfo" +EncryptedPrivateKeyInfo B "1.2.840.113549.1.9.25.2" "pkcs-9-at-encryptedPrivateKeyInfo" # Password Based Encryption PBEParameter B "1.2.840.113549.1.12.1.1" "pbeWithSHAAnd128BitRC4" @@ -104,11 +104,11 @@ PrivateKeyInfo append_oid(tree, object_identifier_id); #.END -#.FN_BODY SafeBag/bagValue +#.FN_BODY SafeBag/bagValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); -#.FN_BODY PKCS12Attribute/attrValues/_item +#.FN_BODY PKCS12Attribute/attrValues/_item if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); @@ -123,7 +123,7 @@ PrivateKeyInfo #.FN_BODY SecretBag/secretValue if(object_identifier_id) offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, NULL); - + #.FN_HDR PBEParameter /* initialise the encryption parameters */ PBE_reset_parameters(); @@ -138,21 +138,21 @@ PrivateKeyInfo #.FN_HDR EncryptedData tvbuff_t *encrypted_tvb; dissector_handle_t dissector_handle; - + #.END #.FN_FTR EncryptedData - + dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); dissector_change_string("ber.oid", object_identifier_id, dissector_handle); - + PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item); - + /* restore the original dissector */ dissector_reset_string("ber.oid", object_identifier_id); - + #.END |