Black hat and white hat

docs/jargon.html

@@ -18,7 +18,7 @@ Free Documentation License".
       </p>
       <H2>Generated</H2>
       <p>
-This file last generated Tuesday, 16 October 2018 08:58PM UTC
+This file last generated Tuesday, 16 October 2018 09:11PM UTC
 
       </p>
       <H2>Glossary</H2>
@@ -2735,9 +2735,9 @@ This file last generated Tuesday, 16 October 2018 08:58PM UTC
         n. [common] A collection of arcane, unpublished, and (by implication) mostly ad-hoc techniques developed for a particular application or systems area (compare black magic ). VLSI design and compiler code optimization were (in their beginnings) considered classic examples of black art; as theory developed they became deep magic , and once standard textbooks had been written, became merely heavy wizardry. The huge proliferation of formal and informal channels for spreading around new computer-related technologies during the last twenty years has made both the term black art and what it describes less common than formerly. See also voodoo programming.
         </p>
         <H4>black hat</H4>
-        <p>
-        someone considering a potential business relationship with an ISP or other provider will post a query to a NANA group, asking about the provider's hat color. The term albedo has also been used to describe a provider's spam-friendliness.
-        </p>
+        <p>1. n. A criminal, malicious or offensive security oriented hacker; a cracker. </p>
+
+<p>2. Name of a conference about offensive hacking. Also known as red teaming. Contrast with white hat.</p>
         <H4>black hole</H4>
         <p>
         n.,vt. [common] What data (a piece of email or netnews, or a stream of TCP/IP packets) has fallen into if it disappears mysteriously between its origin and destination sites (that is, without returning a bounce message ). I think there's a black hole at foovax ! conveys suspicion that site foovax has been dropping a lot of stuff on the floor lately (see drop on the floor ). The implied metaphor of email as interstellar travel is interesting in itself.
@@ -3972,7 +3972,7 @@ This file last generated Tuesday, 16 October 2018 08:58PM UTC
         </p>
         <H4>dark-side hacker</H4>
         <p>
-        n. A criminal or malicious hacker; a cracker. From George Lucas's Darth Vader, seduced by the dark side of the Force. The implication that hackers form a sort of elite of technological Jedi Knights is intended. Oppose samurai.
+        See black hat.
         </p>
         <H4>data controller</H4>
         <p>
@@ -10033,7 +10033,7 @@ This file last generated Tuesday, 16 October 2018 08:58PM UTC
         </p>
         <H4>white hat</H4>
         <p>
-        See black hat.
+        A hacker who does not engage in offensive security practices (cracking). White hat hackers may still engage in red teaming or penetration testing but in a strictly legal manner ususlly only on machines which they own or which they are authorized to test. Contrast with black hat.
         </p>
         <H4>whitelist</H4>
         <p>