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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1f4977b27ea4e3a0d95902ce1f5dea1edb546b5e
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

1f4977b by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    X509AF: make a local copy of algorithm_id in file scope for later use
    
    Bug: 12002
    Change-Id: Iff48863c1954f76d6fc34150d315d15295dc1f5c
    Reviewed-on: https://code.wireshark.org/review/13406
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 5a8020a1b6bb73fcb8bb7eb7d53177bc8a9fc703)
    Conflicts:
    	epan/dissectors/packet-x509af.c
    Reviewed-on: https://code.wireshark.org/review/13417
    

Actions performed:

    from  83dd13c   [iseries] fix iseries_check_file_type()
    adds  1f4977b   X509AF: make a local copy of algorithm_id in file scope for later use


Summary of changes:
 asn1/x509af/packet-x509af-template.c |    2 +-
 asn1/x509af/x509af.cnf               |    8 +++++++-
 epan/dissectors/packet-x509af.c      |   22 ++++++++++++++--------
 3 files changed, 22 insertions(+), 10 deletions(-)