Wireshark-commits: [Wireshark-commits] rev 54975: /trunk/ /trunk/asn1/cms/: cms.cnf /trunk/epan/dis

Date: Mon, 27 Jan 2014 09:02:07 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54975

User: stig
Date: 2014/01/27 09:02 AM

Log:
 Added back x509af_get_last_algorithm_id() removed in revision 54647 to 
 restore usage in cms and pkcs12.  They never got a valid value in 
 actx->external.direct_reference because they use another actx in this case.
 
 This will add back the global variable in x509af, but this is needed
 until we manage to pass the value in another way.
 
 See comments in bug 9573.

Directory: /trunk/asn1/cms/
  Changes    Path          Action
  +2 -2      cms.cnf       Modified

Directory: /trunk/epan/dissectors/
  Changes    Path               Action
  +2 -2      packet-cms.c       Modified
  +1 -1      packet-pkcs12.c    Modified
  +16 -8     packet-x509af.c    Modified
  +2 -0      packet-x509af.h    Modified

Directory: /trunk/asn1/pkcs12/
  Changes    Path                        Action
  +1 -1      packet-pkcs12-template.c    Modified

Directory: /trunk/asn1/x509af/
  Changes    Path                        Action
  +6 -0      packet-x509af-template.c    Modified
  +2 -0      packet-x509af-template.h    Modified
  +2 -0      x509af.cnf                  Modified