diff options
| -rw-r--r-- | asn1/cmp/packet-cmp-template.c | 2 | ||||
| -rw-r--r-- | asn1/pkcs1/packet-pkcs1-template.c | 11 | ||||
| -rw-r--r-- | epan/dissectors/packet-cmp.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkcs1.c | 11 |
4 files changed, 21 insertions, 7 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"); } diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 11eff8e2c8..cff8e15f93 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -2496,8 +2496,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"); - /*--- Included file: packet-cmp-dis-tab.c ---*/ #line 1 "../../asn1/cmp/packet-cmp-dis-tab.c" @@ -2520,7 +2518,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 403 "../../asn1/cmp/packet-cmp-template.c" +#line 401 "../../asn1/cmp/packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index 8563604551..78456b8166 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -584,9 +584,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"); @@ -605,6 +611,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"); } |