Add CSR parsing

Author: gpotter2

scapy/asn1/mib.py

@@ -296,6 +296,7 @@ def load_mib(filenames):
 pkcs7_oids = {
     "1.2.840.113549.1.7": "pkcs-7",
     "1.2.840.113549.1.7.2": "id-signedData",
+    "1.2.840.113549.1.7.3": "id-envelopedData",
 }
 
 #       pkcs9       #
@@ -328,6 +329,13 @@ def load_mib(filenames):
     "1.2.840.113549.1.9.52": "id-aa-CMSAlgorithmProtection"
 }
 
+#     enc algs     #
+
+encAlgs_oids = {
+    "1.2.840.113549.3.4": "rc4",
+    "1.2.840.113549.3.7": "des-ede3-cbc",
+}
+
 #       x509       #
 
 attributeType_oids = {
@@ -500,10 +508,21 @@ def load_mib(filenames):
     "2.5.29.67": "id-ce-allowedAttAss",
     "2.5.29.68": "id-ce-attributeMappings",
     "2.5.29.69": "id-ce-holderNameConstraints",
-    # [MS-WCCE]
-    "1.3.6.1.4.1.311.2.1.14": "CERT_EXTENSIONS",
-    "1.3.6.1.4.1.311.10.3.4": "szOID_EFS_CRYPTO",
+    # [MS-WCCE] + wincrypt.h
+    "1.3.6.1.4.1.311.2.1.14": "OID_CERT_EXTENSIONS",
+    "1.3.6.1.4.1.311.10.3.4": "OID_EFS_CRYPTO",
+    "1.3.6.1.4.1.311.13.2.1": "OID_ENROLLMENT_NAME_VALUE_PAIR",
+    "1.3.6.1.4.1.311.13.2.2": "OID_ENROLLMENT_CSP_PROVIDER",
+    "1.3.6.1.4.1.311.13.2.3": "OID_OS_VERSION",
+    "1.3.6.1.4.1.311.10.10.1": "OID_CMC_ADD_ATTRIBUTES",
     "1.3.6.1.4.1.311.20.2": "ENROLL_CERTTYPE",
+    "1.3.6.1.4.1.311.21.10": "OID_APPLICATION_CERT_POLICIES",
+    "1.3.6.1.4.1.311.21.20": "OID_REQUEST_CLIENT_INFO",
+    "1.3.6.1.4.1.311.21.23": "OID_ENROLL_EK_INFO",
+    "1.3.6.1.4.1.311.21.24": "OID_ENROLL_ATTESTATION_STATEMENT",
+    "1.3.6.1.4.1.311.21.25": "OID_ENROLL_KSP_NAME",
+    "1.3.6.1.4.1.311.21.39": "OID_ENROLL_AIK_INFO",
+    "1.3.6.1.4.1.311.21.7": "OID_CERTIFICATE_TEMPLATE",
     "1.3.6.1.4.1.311.25.1": "NTDS_REPLICATION",
     "1.3.6.1.4.1.311.25.2": "NTDS_CA_SECURITY_EXT",
     "1.3.6.1.4.1.311.25.2.1": "NTDS_OBJECTSID",
@@ -559,6 +578,15 @@ def load_mib(filenames):
     "1.3.6.1.5.5.7.3.22": "secureShellServer"
 }
 
+certPkixCmc_oids = {
+    "1.3.6.1.5.5.7.7.8": "id-cmc-addExtensions",
+}
+
+certPkixCct_oids = {
+    "1.3.6.1.5.5.7.12.2": "id-cct-PKIData",
+    "1.3.6.1.5.5.7.12.3": "id-cct-PKIResponse",
+}
+
 certPkixAd_oids = {
     "1.3.6.1.5.5.7.48.1": "ocsp",
     "1.3.6.1.5.5.7.48.2": "caIssuers",
@@ -571,6 +599,11 @@ def load_mib(filenames):
     "1.3.6.1.5.5.7.48.1.1": "basic-response"
 }
 
+certIpsec_oids = {
+    "1.3.6.1.5.5.8.2.1": "iKEEnd",
+    "1.3.6.1.5.5.8.2.2": "iKEIntermediate",
+}
+
 certTransp_oids = {
     '1.3.6.1.4.1.11129.2.4.2': "SignedCertificateTimestampList",
 }
@@ -735,14 +768,18 @@ def load_mib(filenames):
     pkcs3_oids,
     pkcs7_oids,
     pkcs9_oids,
+    encAlgs_oids,
     attributeType_oids,
     certificateExtension_oids,
     certExt_oids,
     certPkixAd_oids,
     certPkixKp_oids,
+    certPkixCmc_oids,
+    certPkixCct_oids,
     certPkixPe_oids,
     certPkixQt_oids,
     certPolicy_oids,
+    certIpsec_oids,
     certTransp_oids,
     evPolicy_oids,
     x962KeyType_oids,