misp taxonomies updated

taxonomies.html

@@ -438,6 +438,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_action_taken">action-taken</a></li>
 <li><a href="#_admiralty_scale">admiralty-scale</a></li>
 <li><a href="#_adversary">adversary</a></li>
+<li><a href="#_ais_marking">ais-marking</a></li>
 <li><a href="#_analyst_assessment">analyst-assessment</a></li>
 <li><a href="#_binary_class">binary-class</a></li>
 <li><a href="#_circl">circl</a></li>
@@ -1388,6 +1389,98 @@ adversary namespace available in JSON format at <a href="https://github.com/MISP
 </div>
 </div>
 <div class="sect1">
+<h2 id="_ais_marking">ais-marking</h2>
+<div class="sectionbody">
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+ais-marking namespace available in JSON format at <a href="https://github.com/MISP/misp-taxonomies/blob/master/ais-marking/machinetag.json"><strong>this location</strong></a>. The JSON format can be freely reused in your application or automatically enabled in <a href="https://www.github.com/MISP/MISP">MISP</a> taxonomy.
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>The AIS Marking Schema implementation is maintained by the National Cybersecurity and Communication Integration Center (NCCIC) of the U.S. Department of Homeland Security (DHS)</p>
+</div>
+<div class="sect2">
+<h3 id="_tlpmarking">TLPMarking</h3>
+<div class="sect3">
+<h4 id="_ais_marking_tlpmarking_white">ais-marking:TLPMarking="WHITE"</h4>
+<div class="paragraph">
+<p>WHITE</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_ais_marking_tlpmarking_green">ais-marking:TLPMarking="GREEN"</h4>
+<div class="paragraph">
+<p>GREEN</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_ais_marking_tlpmarking_amber">ais-marking:TLPMarking="AMBER"</h4>
+<div class="paragraph">
+<p>AMBER</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_aisconsent">AISConsent</h3>
+<div class="sect3">
+<h4 id="_ais_marking_aisconsent_everyone">ais-marking:AISConsent="EVERYONE"</h4>
+<div class="paragraph">
+<p>EVERYONE</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_ais_marking_aisconsent_usg">ais-marking:AISConsent="USG"</h4>
+<div class="paragraph">
+<p>USG</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_ais_marking_aisconsent_none">ais-marking:AISConsent="NONE"</h4>
+<div class="paragraph">
+<p>NONE</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_cisa_proprietary">CISA_Proprietary</h3>
+<div class="sect3">
+<h4 id="_ais_marking_cisa_proprietary_true">ais-marking:CISA_Proprietary="true"</h4>
+<div class="paragraph">
+<p>true</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_ais_marking_cisa_proprietary_false">ais-marking:CISA_Proprietary="false"</h4>
+<div class="paragraph">
+<p>false</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_aismarking">AISMarking</h3>
+<div class="sect3">
+<h4 id="_ais_marking_aismarking_is_proprietary">ais-marking:AISMarking="Is_Proprietary"</h4>
+<div class="paragraph">
+<p>Is_Proprietary</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_ais_marking_aismarking_not_proprietary">ais-marking:AISMarking="Not_Proprietary"</h4>
+<div class="paragraph">
+<p>Not_Proprietary</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_analyst_assessment">analyst-assessment</h2>
 <div class="sectionbody">
 <div class="admonitionblock note">
@@ -19712,6 +19805,9 @@ vocabulaire-des-probabilites-estimatives namespace available in JSON format at <
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ms-caro-malware:malware-type="Trojan"</p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ecsirt:malicious-code="trojan"</p></td>
+</tr>
 </tbody>
 </table>
 <table class="tableblock frame-all grid-all spread">
@@ -19729,6 +19825,9 @@ vocabulaire-des-probabilites-estimatives namespace available in JSON format at <
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ms-caro-malware:malware-type="Virus"</p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ecsirt:malicious-code="virus"</p></td>
+</tr>
 </tbody>
 </table>
 <table class="tableblock frame-all grid-all spread">
@@ -19749,6 +19848,9 @@ vocabulaire-des-probabilites-estimatives namespace available in JSON format at <
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ms-caro-malware:malware-type="Worm"</p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ecsirt:malicious-code="worm"</p></td>
+</tr>
 </tbody>
 </table>
 <table class="tableblock frame-all grid-all spread">
@@ -19945,6 +20047,9 @@ vocabulaire-des-probabilites-estimatives namespace available in JSON format at <
 <td class="tableblock halign-left valign-top"><p class="tableblock">circl:incident-classification="scan"</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ecsirt:information-gathering="scanner"</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">europol-incident:information-gathering="scanning"</p></td>
 </tr>
 </tbody>
@@ -20086,7 +20191,7 @@ vocabulaire-des-probabilites-estimatives namespace available in JSON format at <
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2017-10-25 15:20:50 CEST
+Last updated 2017-11-04 10:52:14 CET
 </div>
 </div>
 </body>