diff --git a/CHANGELOG b/CHANGELOG index 6c69e6a0b..bc420273e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ # Nmap Changelog ($Id$); -*-text-*- +o [NSE] Add support to citrix-enum-apps-xml for reporting if Citrix + published applications in the list are enforcing/requiring the level + of ICA/session data encryption shown in the script result. + [Tom Sellers] + o [NSE] Added targets-ipv6-wordlist to generate target IPv6 addresses from a wordlist made of hexadecimal characters. [Raúl Fuentes] diff --git a/nselib/citrixxml.lua b/nselib/citrixxml.lua index c53df2a4d..87d31bf62 100644 --- a/nselib/citrixxml.lua +++ b/nselib/citrixxml.lua @@ -234,6 +234,7 @@ local function extract_appdata_settings(xmldata) for s in xmldata:gmatch("(.-)") do settings['Encryption'] = s:match("(.-)") + settings['EncryptionEnforced'] = s:match("") settings['AppOnDesktop'] = s:match("") settings['AppInStartmenu'] = s:match("") settings['PublisherName'] = s:match("(.-)") diff --git a/scripts/citrix-enum-apps-xml.nse b/scripts/citrix-enum-apps-xml.nse index 78949e07a..ecf10b8e5 100644 --- a/scripts/citrix-enum-apps-xml.nse +++ b/scripts/citrix-enum-apps-xml.nse @@ -31,6 +31,7 @@ The script returns more output with higher verbosity. -- | Desktop: false -- | On Desktop: false -- | Encryption: basic +-- | Encryption enforced: true -- | In start menu: false -- | Publisher: labb1farm -- | SSL: false @@ -41,6 +42,7 @@ The script returns more output with higher verbosity. -- | Desktop: false -- | On Desktop: false -- | Encryption: basic +-- | Encryption enforced: true -- | In start menu: false -- | Publisher: labb1farm -- | SSL: false @@ -51,6 +53,7 @@ The script returns more output with higher verbosity. -- | Desktop: false -- | On Desktop: false -- | Encryption: basic +-- | Encryption enforced: true -- | In start menu: false -- | Publisher: labb1farm -- | SSL: false @@ -61,6 +64,7 @@ The script returns more output with higher verbosity. -- Version 0.2 -- Created 11/26/2009 - v0.1 - created by Patrik Karlsson -- Revised 12/02/2009 - v0.2 - Use stdnse.format_ouput for output +-- Revised 12/16/2014 - v0.3 - Detect if encryption settings are minimum requirements author = "Patrik Karlsson" license = "Same as Nmap--See http://nmap.org/book/man-legal.html" @@ -78,7 +82,7 @@ function format_output(appdata, mode) local result = {} local setting_titles = { {appisdisabled="Disabled"}, {appisdesktop="Desktop"}, {AppOnDesktop="On Desktop"}, - {Encryption="Encryption"}, {AppInStartmenu="In start menu"}, + {Encryption="Encryption"}, {EncryptionEnforced="Encryption enforced"}, {AppInStartmenu="In start menu"}, {PublisherName="Publisher"}, {SSLEnabled="SSL"}, {RemoteAccessEnabled="Remote Access"} }