[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=34d2e0d5318d0a7e9889498c721639e5cbf4ce45
Submitter: "Pascal Quantin <pascal@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

34d2e0d by Pascal Quantin (pascal@xxxxxxxxxxxxx):

    CMS: reset object_identifier_id after dissecting ContentInfo
    
    Bug: 15961
    Change-Id: I3d6b3e96103b69f88fcb512da81fa20ff6a1c40e
    Reviewed-on: https://code.wireshark.org/review/34960
    Petri-Dish: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
    (cherry picked from commit 23850a3342d64b9c9808f14c20bfea6d22b7dc08)
    Conflicts:
    	epan/dissectors/packet-cms.c
    Reviewed-on: https://code.wireshark.org/review/34975
    Reviewed-by: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    

Actions performed:

    from  61b74e1   Show correct format of --display command line parameter
     add  34d2e0d   CMS: reset object_identifier_id after dissecting ContentInfo


Summary of changes:
 epan/dissectors/asn1/cms/cms.cnf               |  1 +
 epan/dissectors/asn1/cms/packet-cms-template.c |  2 +-
 epan/dissectors/packet-cms.c                   | 31 +++++++++++++-------------
 3 files changed, 18 insertions(+), 16 deletions(-)