osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ECDSA+DSA SHA2 algorithm OIDs added to PKCS1 dissector 

Those algorithms are e.g. used to sign X.509 certificates, or in CMP (RFC4210)
messages.

It is not fully deterministic to which dissector those OIDs should be added,
PKCS1 is chosen as there are already the OIDs for the ECC curves and the OIDs
in question are also listed in PKIXAlgs-2009.asn.

Change-Id: I4fc41d27220400c37695ecce5d7f05726ad39af2
Reviewed-on: https://code.wireshark.org/review/22049
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Martin Peylo 2017-06-09 11:34:40 +03:00 committed by Pascal Quantin
parent 12e8e6dcc0
commit 6d91721390
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c
View File

@ -96,6 +96,16 @@ void proto_reg_handoff_pkcs1(void) {
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");
/* ECDSA SHA2 algorithms from X9.62, RFC5480, RFC 5758, RFC 5912 */
register_ber_oid_dissector("1.2.840.10045.4.3.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA224");
register_ber_oid_dissector("1.2.840.10045.4.3.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA256");
register_ber_oid_dissector("1.2.840.10045.4.3.3", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA384");
register_ber_oid_dissector("1.2.840.10045.4.3.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA512");
/* DSA SHA2 algorithms from FIPS186-3, RFC5480, RFC 5758, RFC 5912 */
register_ber_oid_dissector("2.16.840.1.101.3.4.3.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-dsa-with-sha224");
register_ber_oid_dissector("2.16.840.1.101.3.4.3.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-dsa-with-sha256");
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");

10
epan/dissectors/packet-pkcs1.c
View File

@ -524,6 +524,16 @@ void proto_reg_handoff_pkcs1(void) {
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");
/* ECDSA SHA2 algorithms from X9.62, RFC5480, RFC 5758, RFC 5912 */
register_ber_oid_dissector("1.2.840.10045.4.3.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA224");
register_ber_oid_dissector("1.2.840.10045.4.3.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA256");
register_ber_oid_dissector("1.2.840.10045.4.3.3", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA384");
register_ber_oid_dissector("1.2.840.10045.4.3.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA512");
/* DSA SHA2 algorithms from FIPS186-3, RFC5480, RFC 5758, RFC 5912 */
register_ber_oid_dissector("2.16.840.1.101.3.4.3.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-dsa-with-sha224");
register_ber_oid_dissector("2.16.840.1.101.3.4.3.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-dsa-with-sha256");
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");