aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-06-24 23:52:24 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-06-24 23:52:24 +0000
commit753d90e57e4946110bfd5faf0468314aa35cd604 (patch)
tree5822bb54834187801de2f0f09589bee210bb3bb5 /epan
parent06e81d59b4536db2df019a09ed188df09622c44a (diff)
From Martin Kaiser:
add oid for sha256. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7395 svn path=/trunk/; revision=43469
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-pkcs1.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index 41f7286f72..400418a97e 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -593,5 +593,8 @@ void proto_reg_handoff_pkcs1(void) {
; oid_add_from_string("sect571k1","1.3.132.0.38");
oid_add_from_string("sect571r1","1.3.132.0.39");
+ /* sha2 family, see 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");
+
}