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

pkcs1: recognize the ecdsa-with-SHA1 OID 

Change-Id: I8c82086570032c862ec1ca6ea25b4e40d1bc3e78
Reviewed-on: https://code.wireshark.org/review/27589
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Роман Донченко 2018-05-08 02:58:34 +03:00 committed by Alexis La Goutte
parent d8ab5676dc
commit 88f7dae986
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,9 @@ 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 SHA-1 algorithm from RFC 3279 */
register_ber_oid_dissector("1.2.840.10045.4.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA1");
/* 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");

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

@ -512,6 +512,9 @@ 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 SHA-1 algorithm from RFC 3279 */
register_ber_oid_dissector("1.2.840.10045.4.1", dissect_ber_oid_NULL_callback, proto_pkcs1, "ecdsa-with-SHA1");
/* 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");