diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2011-07-14 13:47:13 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2011-07-14 13:47:13 +0000 |
| commit | 9e4afbfd497f48dd18fd1b7c0ccf4e548a576f2e (patch) | |
| tree | 89d9ffdd065858541d5080d118ebc6f09ea1ea39 /asn1/pkcs1/packet-pkcs1-template.c | |
| parent | a7fac381ca74a9f21308f4a8db8cefade6470101 (diff) | |
| download | wireshark-9e4afbfd497f48dd18fd1b7c0ccf4e548a576f2e.tar.gz | |
Update the algorithms in line with RFC 5912 including support for eliptic curve algorithms.
svn path=/trunk/; revision=38017
Diffstat (limited to 'asn1/pkcs1/packet-pkcs1-template.c')
| -rw-r--r-- | asn1/pkcs1/packet-pkcs1-template.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c index c110bb27b1..a98cbca71b 100644 --- a/asn1/pkcs1/packet-pkcs1-template.c +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -29,6 +29,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/oids.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -73,6 +74,8 @@ void proto_register_pkcs1(void) { /*--- proto_reg_handoff_pkcs1 -------------------------------------------*/ void proto_reg_handoff_pkcs1(void) { +#include "packet-pkcs1-dis-tab.c" + register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); register_ber_oid_dissector("1.2.840.113549.2.5", dissect_ber_oid_NULL_callback, proto_pkcs1, "md5"); @@ -88,5 +91,22 @@ void proto_reg_handoff_pkcs1(void) { */ 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.6", dissect_ber_oid_NULL_callback, proto_pkcs1, "rsaOAEPEncryptionSET"); + + 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"); + oid_add_from_string("secp224r1","1.3.132.0.33"); + oid_add_from_string("sect233k1","1.3.132.0.26"); + oid_add_from_string("sect233r1","1.3.132.0.27"); + oid_add_from_string("secp256r1","1.2.840.10045.3.1.7"); + oid_add_from_string("sect283k1","1.3.132.0.16"); + oid_add_from_string("sect283r1","1.3.132.0.17"); + oid_add_from_string("secp384r1","1.3.132.0.34"); + oid_add_from_string("sect409k1","1.3.132.0.36"); + oid_add_from_string("sect409r1","1.3.132.0.37"); + oid_add_from_string("sect521r1","1.3.132.0.35") +; oid_add_from_string("sect571k1","1.3.132.0.38"); + oid_add_from_string("sect571r1","1.3.132.0.39"); + } |