From 13ec75df29dd4b81c6af4dc776d33ab42a1f9031 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sun, 13 Jan 2019 11:55:00 +0100
Subject: [PATCH 1/2] chg: [data] new types added (hassh-md5 and
 hasshserver-md5)

---
 pymisp/data/describeTypes.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pymisp/data/describeTypes.json b/pymisp/data/describeTypes.json
index 5f2bec3..3019122 100644
--- a/pymisp/data/describeTypes.json
+++ b/pymisp/data/describeTypes.json
@@ -93,6 +93,14 @@
         "default_category": "Network activity",
         "to_ids": 1
       },
+      "hashh-md5": {
+        "default_category": "Network activity",
+        "to_ids": 1
+      },
+      "hashhserver-md5": {
+        "default_category": "Network activity",
+        "to_ids": 1
+      },
       "regkey": {
         "default_category": "Persistence mechanism",
         "to_ids": 1
@@ -642,6 +650,8 @@
       "http-method",
       "user-agent",
       "ja3-fingerprint-md5",
+      "hashh-md5",
+      "hashhserver-md5",
       "regkey",
       "regkey|value",
       "AS",
@@ -882,6 +892,8 @@
         "x509-fingerprint-md5",
         "x509-fingerprint-sha256",
         "ja3-fingerprint-md5",
+        "hassh-md5",
+        "hasshserver-md5",
         "other",
         "hostname|port",
         "email-dst-display-name",
@@ -1038,6 +1050,8 @@
         "x509-fingerprint-sha1",
         "x509-fingerprint-sha256",
         "ja3-fingerprint-md5",
+        "hassh-md5",
+        "hasshserver-md5",
         "other",
         "hex",
         "cookie",
@@ -1104,6 +1118,8 @@
         "x509-fingerprint-md5",
         "x509-fingerprint-sha256",
         "ja3-fingerprint-md5",
+        "hassh-md5",
+        "hasshserver-md5",
         "github-repository",
         "other",
         "cortex"

From f5e621b2a52ee8ab6b0860e4b7d09169be5e1d69 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sun, 13 Jan 2019 12:07:24 +0100
Subject: [PATCH 2/2] chg: [data] fix describeTypes

---
 pymisp/data/describeTypes.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pymisp/data/describeTypes.json b/pymisp/data/describeTypes.json
index 3019122..015b943 100644
--- a/pymisp/data/describeTypes.json
+++ b/pymisp/data/describeTypes.json
@@ -93,11 +93,11 @@
         "default_category": "Network activity",
         "to_ids": 1
       },
-      "hashh-md5": {
+      "hassh-md5": {
         "default_category": "Network activity",
         "to_ids": 1
       },
-      "hashhserver-md5": {
+      "hasshserver-md5": {
         "default_category": "Network activity",
         "to_ids": 1
       },
@@ -650,8 +650,8 @@
       "http-method",
       "user-agent",
       "ja3-fingerprint-md5",
-      "hashh-md5",
-      "hashhserver-md5",
+      "hassh-md5",
+      "hasshserver-md5",
       "regkey",
       "regkey|value",
       "AS",