From 8fd4da1b803d95899014f8451c28943ca4006eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 6 Dec 2018 15:16:22 +0100
Subject: [PATCH] chg: Bump misp-objects & describeTypes

---
 pymisp/data/describeTypes.json | 288 +++++++++++++++++----------------
 pymisp/data/misp-objects       |   2 +-
 2 files changed, 146 insertions(+), 144 deletions(-)

diff --git a/pymisp/data/describeTypes.json b/pymisp/data/describeTypes.json
index 497c44b..cb90814 100644
--- a/pymisp/data/describeTypes.json
+++ b/pymisp/data/describeTypes.json
@@ -1,22 +1,22 @@
 {
   "result": {
     "categories": [
+      "Internal reference",
+      "Targeting data",
       "Antivirus detection",
+      "Payload delivery",
       "Artifacts dropped",
+      "Payload installation",
+      "Persistence mechanism",
+      "Network activity",
+      "Payload type",
       "Attribution",
       "External analysis",
       "Financial fraud",
-      "Internal reference",
-      "Network activity",
-      "Other",
-      "Payload delivery",
-      "Payload installation",
-      "Payload type",
-      "Persistence mechanism",
-      "Person",
-      "Social network",
       "Support Tool",
-      "Targeting data"
+      "Social network",
+      "Person",
+      "Other"
     ],
     "category_type_mappings": {
       "Antivirus detection": [
@@ -186,7 +186,9 @@
         "attachment",
         "comment",
         "text",
+        "x509-fingerprint-md5",
         "x509-fingerprint-sha1",
+        "x509-fingerprint-sha256",
         "other",
         "hex",
         "cookie",
@@ -1019,158 +1021,158 @@
       }
     },
     "types": [
-      "AS",
-      "aba-rtn",
-      "attachment",
-      "authentihash",
-      "bank-account-nr",
-      "bic",
-      "bin",
-      "boolean",
-      "bro",
-      "btc",
-      "campaign-id",
-      "campaign-name",
-      "cc-number",
-      "comment",
-      "cookie",
-      "cortex",
-      "counter",
-      "country-of-residence",
-      "cpe",
-      "date-of-birth",
-      "datetime",
-      "dns-soa-email",
+      "md5",
+      "sha1",
+      "sha256",
+      "filename",
+      "pdb",
+      "filename|md5",
+      "filename|sha1",
+      "filename|sha256",
+      "ip-src",
+      "ip-dst",
+      "hostname",
       "domain",
       "domain|ip",
+      "email-src",
+      "email-dst",
+      "email-subject",
       "email-attachment",
       "email-body",
-      "email-dst",
-      "email-dst-display-name",
-      "email-header",
-      "email-message-id",
-      "email-mime-boundary",
-      "email-reply-to",
-      "email-src",
-      "email-src-display-name",
-      "email-subject",
-      "email-thread-index",
-      "email-x-mailer",
-      "filename",
-      "filename|authentihash",
-      "filename|impfuzzy",
-      "filename|imphash",
-      "filename|md5",
-      "filename|pehash",
-      "filename|sha1",
-      "filename|sha224",
-      "filename|sha256",
-      "filename|sha384",
-      "filename|sha512",
-      "filename|sha512/224",
-      "filename|sha512/256",
-      "filename|ssdeep",
-      "filename|tlsh",
-      "first-name",
       "float",
-      "frequent-flyer-number",
-      "gender",
-      "gene",
-      "github-organisation",
-      "github-repository",
-      "github-username",
-      "hex",
-      "hostname",
-      "hostname|port",
+      "url",
       "http-method",
-      "iban",
-      "identity-card-number",
-      "impfuzzy",
-      "imphash",
-      "ip-dst",
-      "ip-dst|port",
-      "ip-src",
-      "ip-src|port",
-      "issue-date-of-the-visa",
-      "jabber-id",
-      "last-name",
-      "link",
-      "mac-address",
-      "mac-eui-64",
-      "malware-sample",
-      "malware-type",
-      "md5",
-      "middle-name",
-      "mime-type",
-      "mobile-application-id",
-      "mutex",
-      "named pipe",
-      "nationality",
-      "other",
-      "passenger-name-record-locator-number",
-      "passport-country",
-      "passport-expiration",
-      "passport-number",
-      "pattern-in-file",
-      "pattern-in-memory",
-      "pattern-in-traffic",
-      "payment-details",
-      "pdb",
-      "pehash",
-      "phone-number",
-      "place-of-birth",
-      "place-port-of-clearance",
-      "place-port-of-onward-foreign-destination",
-      "place-port-of-original-embarkation",
-      "port",
-      "primary-residence",
-      "prtn",
-      "redress-number",
+      "user-agent",
       "regkey",
       "regkey|value",
-      "sha1",
+      "AS",
+      "snort",
+      "bro",
+      "pattern-in-file",
+      "pattern-in-traffic",
+      "pattern-in-memory",
+      "yara",
+      "stix2-pattern",
+      "sigma",
+      "gene",
+      "mime-type",
+      "identity-card-number",
+      "cookie",
+      "vulnerability",
+      "attachment",
+      "malware-sample",
+      "link",
+      "comment",
+      "text",
+      "hex",
+      "other",
+      "named pipe",
+      "mutex",
+      "target-user",
+      "target-email",
+      "target-machine",
+      "target-org",
+      "target-location",
+      "target-external",
+      "btc",
+      "xmr",
+      "iban",
+      "bic",
+      "bank-account-nr",
+      "aba-rtn",
+      "bin",
+      "cc-number",
+      "prtn",
+      "phone-number",
+      "threat-actor",
+      "campaign-name",
+      "campaign-id",
+      "malware-type",
+      "uri",
+      "authentihash",
+      "ssdeep",
+      "imphash",
+      "pehash",
+      "impfuzzy",
       "sha224",
-      "sha256",
       "sha384",
       "sha512",
       "sha512/224",
       "sha512/256",
-      "sigma",
-      "size-in-bytes",
-      "snort",
-      "special-service-request",
-      "ssdeep",
-      "stix2-pattern",
-      "target-email",
-      "target-external",
-      "target-location",
-      "target-machine",
-      "target-org",
-      "target-user",
-      "text",
-      "threat-actor",
       "tlsh",
-      "travel-details",
-      "twitter-id",
-      "uri",
-      "url",
-      "user-agent",
-      "visa-number",
-      "vulnerability",
-      "whois-creation-date",
+      "filename|authentihash",
+      "filename|ssdeep",
+      "filename|imphash",
+      "filename|impfuzzy",
+      "filename|pehash",
+      "filename|sha224",
+      "filename|sha384",
+      "filename|sha512",
+      "filename|sha512/224",
+      "filename|sha512/256",
+      "filename|tlsh",
+      "windows-scheduled-task",
+      "windows-service-name",
+      "windows-service-displayname",
       "whois-registrant-email",
+      "whois-registrant-phone",
       "whois-registrant-name",
       "whois-registrant-org",
-      "whois-registrant-phone",
       "whois-registrar",
-      "windows-scheduled-task",
-      "windows-service-displayname",
-      "windows-service-name",
-      "x509-fingerprint-md5",
+      "whois-creation-date",
       "x509-fingerprint-sha1",
+      "x509-fingerprint-md5",
       "x509-fingerprint-sha256",
-      "xmr",
-      "yara"
+      "dns-soa-email",
+      "size-in-bytes",
+      "counter",
+      "datetime",
+      "cpe",
+      "port",
+      "ip-dst|port",
+      "ip-src|port",
+      "hostname|port",
+      "mac-address",
+      "mac-eui-64",
+      "email-dst-display-name",
+      "email-src-display-name",
+      "email-header",
+      "email-reply-to",
+      "email-x-mailer",
+      "email-mime-boundary",
+      "email-thread-index",
+      "email-message-id",
+      "github-username",
+      "github-repository",
+      "github-organisation",
+      "jabber-id",
+      "twitter-id",
+      "first-name",
+      "middle-name",
+      "last-name",
+      "date-of-birth",
+      "place-of-birth",
+      "gender",
+      "passport-number",
+      "passport-country",
+      "passport-expiration",
+      "redress-number",
+      "nationality",
+      "visa-number",
+      "issue-date-of-the-visa",
+      "primary-residence",
+      "country-of-residence",
+      "special-service-request",
+      "frequent-flyer-number",
+      "travel-details",
+      "payment-details",
+      "place-port-of-original-embarkation",
+      "place-port-of-clearance",
+      "place-port-of-onward-foreign-destination",
+      "passenger-name-record-locator-number",
+      "mobile-application-id",
+      "cortex",
+      "boolean"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/pymisp/data/misp-objects b/pymisp/data/misp-objects
index 6cc29aa..11a462e 160000
--- a/pymisp/data/misp-objects
+++ b/pymisp/data/misp-objects
@@ -1 +1 @@
-Subproject commit 6cc29aad3dda895de95fe9f0d86bb9a7007af7c2
+Subproject commit 11a462e79b02428a08b11698d45aa8aa5ab6887d