Merge pull request #209 from gallypette/master

chg: [x509, crypto-material] several changes:

objects/crypto-material/definition.json

@@ -3,7 +3,8 @@
     "text",
     "private",
     "p",
-    "q"
+    "q",
+    "modulus"
   ],
   "attributes": {
     "text": {
@@ -18,15 +19,21 @@
       "ui-priority": 1,
       "misp-attribute": "text"
     },
+    "modulus": {
+      "description": "Modulus Parameter - in hexadecimal - no 0x, no :",
+      "disable_correlation": false,
+      "ui-priority": 1,
+      "misp-attribute": "text"
+    },
     "p": {
       "description": "Prime Parameter - P in decimal",
-      "disable_correlation": true,
+      "disable_correlation": false,
       "ui-priority": 1,
       "misp-attribute": "text"
     },
     "q": {
       "description": "Prime Parameter - Q in decimal",
-      "disable_correlation": true,
+      "disable_correlation": false,
       "ui-priority": 1,
       "misp-attribute": "text"
     },
@@ -140,7 +147,7 @@
       ]
     }
   },
-  "version": 1,
+  "version": 2,
   "description": "Cryptographic materials such as public or/and private keys.",
   "meta-category": "misc",
   "uuid": "50677f82-ec9c-4484-bb29-2519cfe56823",

objects/x509/definition.json

@@ -19,18 +19,18 @@
       "disable_correlation": true
     },
     "pubkey-info-size": {
-      "description": "Length of the public key (in bits)",
+      "description": "Length of the public key (in bits expressed in decimal: eg. 256 bits)",
       "ui-priority": 0,
       "misp-attribute": "text",
       "disable_correlation": true
     },
     "pubkey-info-exponent": {
-      "description": "Exponent of the public key",
+      "description": "Exponent of the public key - in decimal",
       "ui-priority": 0,
       "misp-attribute": "text"
     },
     "pubkey-info-modulus": {
-      "description": "Modulus of the public key",
+      "description": "Modulus of the public key - in Hexadecimal - no 0x, no :",
       "ui-priority": 0,
       "misp-attribute": "text"
     },
@@ -148,7 +148,7 @@
       ]
     }
   },
-  "version": 10,
+  "version": 11,
   "description": "x509 object describing a X.509 certificate",
   "meta-category": "network",
   "uuid": "d1ab756a-26b5-4349-9f43-765630f0911c",