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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a0b0f37a627d4cb0efdd7ab18a9310c17ffb1a64
Submitter: Stig Bjørlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

a0b0f37 by Etienne Millon (etienne@xxxxxxxxxxxxxxx):

    PKCS12: fix a duplicate OID
    
    The value for OID 1.2.840.113549.1.12.1.6 was copy-pasted from the line above.
    Its correct definition can be found in  RFC7292, whose relevant parts are in
    pkcs12.asn.
    
    Note that the capitalization is not consistent in the RFC (pbeWith/pbewith).
    I used the same convention.
    
    Change-Id: I702c2b698660a7ea8df043775d37cadfa6d3ca72
    Reviewed-on: https://code.wireshark.org/review/8928
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    

Actions performed:

    from  c392db5   TLS Decryption is now possible with a user provided PMS and Client Random values
    adds  a0b0f37   PKCS12: fix a duplicate OID


Summary of changes:
 asn1/pkcs12/pkcs12.cnf          |    2 +-
 epan/dissectors/packet-pkcs12.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)