Wireshark-commits: [Wireshark-commits] master-2.0 263ff53: ssl-utils: load RSA keys based on their
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=263ff53723d6188503ae5d059c7f4a9e5aac8670
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
263ff53 by Peter Wu (peter@xxxxxxxxxxxxx):
ssl-utils: load RSA keys based on their modulus+exponent
Load RSA private keys based on their public key instead of relying on
the user to specify a valid address and port mapping. This is more
reliable and prepares for simplification of the SSL Keys dialog.
After this change, the "address" part of the UAT dialog will be ignored
when loading the private key. The port+protocol mapping is still
imported, but should probably be removed too.
Change-Id: I4d7a2bfcf63d17e66e336ef770759f20510fc176
Reviewed-on: https://code.wireshark.org/review/10766
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 877fd03cbffa96bfb6c4c030ce9f8bade57cfc75)
Reviewed-on: https://code.wireshark.org/review/10852
Actions performed:
from 9d4080b ssl-utils: simplify private key storage, fix resource leaks
adds 263ff53 ssl-utils: load RSA keys based on their modulus+exponent
Summary of changes:
asn1/x509af/packet-x509af-template.c | 21 +++
asn1/x509af/x509af.cnf | 6 +
epan/dissectors/packet-dtls.c | 7 +-
epan/dissectors/packet-ssl-utils.c | 293 +++++++++++++---------------------
epan/dissectors/packet-ssl-utils.h | 14 +-
epan/dissectors/packet-ssl.c | 8 +-
epan/dissectors/packet-x509af.c | 45 ++++--
7 files changed, 179 insertions(+), 215 deletions(-)