From 6ad02f6509bfe7a10d059149c114d556ec7d422f Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 8 May 2009 06:11:18 +0000
Subject: [PATCH] Merge from /nmap-exp/david/ncat-ssl. This adds automatic
 generation of temporary SSL keys and certificates in Ncat's listen mode.

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 85badcd15..921be5494 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Ncat] Ncat now automatically generates a temporary keypair and
+  certificate in memory when you don't use the --ssl-key and
+  --ssl-cert options. [David]
+
 o [Zenmap] There is now a little indicator that animates while a scan
   is running, to provide some reassurance for thos long-running scans.
   [David]