Support for Microsoft-defined enhancedKeyUsage OIDs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21152 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf
index 122453e4a87a8c961aa4a54329d4a4e7fba48d19..d567a0e4f6bb68442eb99ef03a09d560dc1bb829 100644 (file)
--- a/asn1/pkix1implicit/pkix1implicit.cnf
+++ b/asn1/pkix1implicit/pkix1implicit.cnf
@@ -28,6 +28,37 @@ Dummy         B "1.3.6.1.5.5.7.3.7"  "id-kp-ipsecUser"
 Dummy         B "1.3.6.1.5.5.7.3.8"  "id-kp-timeStamping"
 Dummy         B "1.3.6.1.5.5.7.3.9"  "OCSPSigning"
 
+# Additional MS Enhanced Key Usage OIDs (see http://msdn2.microsoft.com/en-us/library/aa378155.aspx)
+
+Dummy          B "1.3.6.1.4.1.311.10.12.1" "id-ms-any-application-policy" 
+Dummy          B "1.3.6.1.4.1.311.10.3.1" "id-ms-kp-ctl-usage-signing" 
+Dummy          B "1.3.6.1.4.1.311.10.3.2" "id-ms-kp-time-stamp-signing" 
+Dummy          B "1.3.6.1.4.1.311.10.3.4" "id-ms-kp-efs" 
+Dummy          B "1.3.6.1.4.1.311.10.3.4.1" "id-ms-efs-recovery" 
+Dummy          B "1.3.6.1.4.1.311.10.3.5" "id-ms-whql-crypto" 
+Dummy          B "1.3.6.1.4.1.311.10.3.6" "id-ms-nt5-crypto" 
+Dummy          B "1.3.6.1.4.1.311.10.3.7" "id-ms-oem-whql-crypto" 
+Dummy          B "1.3.6.1.4.1.311.10.3.8" "id-ms-embedded-nt-crypto" 
+Dummy          B "1.3.6.1.4.1.311.10.3.9" "id-ms-root-list-signer" 
+Dummy          B "1.3.6.1.4.1.311.10.3.10" "id-ms-kp-qualified-subordination" 
+Dummy          B "1.3.6.1.4.1.311.10.3.11" "id-ms-kp-key-recovery" 
+Dummy          B "1.3.6.1.4.1.311.10.3.12" "id-ms-kp-document-signing" 
+Dummy          B "1.3.6.1.4.1.311.10.3.13" "id-ms-kp-lifetime-signing" 
+
+Dummy          B "1.3.6.1.4.1.311.10.5.1" "id-ms-drm" 
+
+Dummy          B "1.3.6.1.4.1.311.10.6.1" "id-ms-licenses" 
+Dummy          B "1.3.6.1.4.1.311.10.6.2" "id-ms-license-server" 
+
+Dummy          B "1.3.6.1.4.1.311.20.1" "id-ms-auto-enroll-ctl-usage" 
+Dummy          B "1.3.6.1.4.1.311.20.2.1" "id-ms-enrollment-agent" 
+Dummy          B "1.3.6.1.4.1.311.20.2.2" "id-ms-kp-smartcard-logon" 
+Dummy          B "1.3.6.1.4.1.311.21.5" "id-ms-kp-ca-exchange" 
+Dummy          B "1.3.6.1.4.1.311.21.6" "id-ms-kp-key-recovery-agent" 
+Dummy          B "1.3.6.1.4.1.311.21.19" "id-ms-ds-email-replication" 
+
+Dummy          B "1.3.6.1.5.5.8.2.2" "id-ms-ipsec-kp-ike-intermediate" 
+
 #.NO_EMIT
 
 #.TYPE_RENAME

diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index 0dbecf7e6c70940721e897e3415bae6f407eb86a..395167b764db928544beaa8d87c4da1f13a0a1cd 100644 (file)
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -448,6 +448,29 @@ void proto_reg_handoff_pkix1implicit(void) {
   register_ber_oid_dissector("1.3.6.1.5.5.7.3.7", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ipsecUser");
   register_ber_oid_dissector("1.3.6.1.5.5.7.3.8", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-timeStamping");
   register_ber_oid_dissector("1.3.6.1.5.5.7.3.9", dissect_Dummy_PDU, proto_pkix1implicit, "OCSPSigning");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.12.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-any-application-policy");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-ctl-usage-signing");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-time-stamp-signing");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.4", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-efs");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.4.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-efs-recovery");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.5", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-whql-crypto");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.6", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-nt5-crypto");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.7", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-oem-whql-crypto");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.8", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-embedded-nt-crypto");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.9", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-root-list-signer");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.10", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-qualified-subordination");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.11", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-key-recovery");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.12", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-document-signing");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.3.13", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-lifetime-signing");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.5.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-drm");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.6.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-licenses");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.10.6.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-license-server");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.20.2.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-enrollment-agent");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.20.2.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-smartcard-logon");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.21.5", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-ca-exchange");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.21.6", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-kp-key-recovery-agent");
+  register_ber_oid_dissector("1.3.6.1.4.1.311.21.19", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-ds-email-replication");
+  register_ber_oid_dissector("1.3.6.1.5.5.8.2.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-ms-ipsec-kp-ike-intermediate");
 
 
 /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/