diff options
| author | Timothy Geiser <slimshady007@inbox.lv> | 2015-08-05 15:19:48 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-07 20:32:18 +0000 |
| commit | 817d9bd621caf809b9e6c6d93ab26d7d4f76a33f (patch) | |
| tree | b3e2ccd676c9719b20667bac0917bd74107d1ad2 /asn1 | |
| parent | 240105eaecddb44bebde2f9b470bade395131416 (diff) | |
| download | wireshark-817d9bd621caf809b9e6c6d93ab26d7d4f76a33f.tar.gz | |
Add SHA2 algos to certificate dissection in SSL
Change-Id: If1315496d231e5c8efc44b9235ec8ffb3ce9d8a9
Reviewed-on: https://code.wireshark.org/review/9880
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/cmp/packet-cmp-template.c | 2 | ||||
| -rw-r--r-- | asn1/pkcs1/packet-pkcs1-template.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c index 43d4d59926..2741de431f 100644 --- a/asn1/cmp/packet-cmp-template.c +++ b/asn1/cmp/packet-cmp-template.c @@ -397,8 +397,6 @@ void proto_reg_handoff_cmp(void) { oid_add_from_string("HMAC TIGER","1.3.6.1.5.5.8.1.3"); oid_add_from_string("HMAC RIPEMD-160","1.3.6.1.5.5.8.1.4"); - oid_add_from_string("sha256WithRSAEncryption","1.2.840.113549.1.1.11"); - #include "packet-cmp-dis-tab.c" inited = TRUE; } diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c index 9bea7df4ae..8ea89414a3 100644 --- a/asn1/pkcs1/packet-pkcs1-template.c +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -87,9 +87,15 @@ void proto_reg_handoff_pkcs1(void) { /* these two are not from RFC2313 but pulled in from http://www.alvestrand.no/objectid/1.2.840.113549.1.1.html */ - register_ber_oid_dissector("1.2.840.113549.1.1.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "shaWithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha1WithRSAEncryption"); register_ber_oid_dissector("1.2.840.113549.1.1.6", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaOAEPEncryptionSET"); + /* these sha2 algorithms are from RFC3447 */ + register_ber_oid_dissector("1.2.840.113549.1.1.11", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha256WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.12", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha384WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.13", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha512WithRSAEncryption"); + register_ber_oid_dissector("1.2.840.113549.1.1.14", dissect_ber_oid_NULL_callback, proto_pkcs1, "sha224WithRSAEncryption"); + oid_add_from_string("secp192r1","1.2.840.10045.3.1.1"); oid_add_from_string("sect163k1","1.3.132.0.1"); oid_add_from_string("sect163r2","1.3.132.0.15"); @@ -108,6 +114,9 @@ void proto_reg_handoff_pkcs1(void) { /* sha2 family, see RFC3447 and http://www.oid-info.com/get/2.16.840.1.101.3.4.2 */ oid_add_from_string("sha256", "2.16.840.1.101.3.4.2.1"); + oid_add_from_string("sha384", "2.16.840.1.101.3.4.2.2"); + oid_add_from_string("sha512", "2.16.840.1.101.3.4.2.3"); + oid_add_from_string("sha224", "2.16.840.1.101.3.4.2.4"); } |