diff --git a/CHANGELOG b/CHANGELOG index b0e16f49e..1d857f550 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Nmap Changelog ($Id$); -*-text-*- +o [Zenmap] Selecting one of the scan targets in the left pane is + supposed to jump to that host in the Nmap Output in the right pane + (but it wasn't). Brian Krebs reported this bug. [David] + o The -V and --version options now show the platform Nmap was compiled on, which features are compiled in, and the version numbers of libraries it is linked against. [Ambarisha B., David] diff --git a/scripts/oracle-brute.nse b/scripts/oracle-brute.nse index 7500b9941..49b0f613a 100644 --- a/scripts/oracle-brute.nse +++ b/scripts/oracle-brute.nse @@ -37,7 +37,15 @@ categories = {"intrusive", "auth"} require 'shortport' require 'brute' -require 'tns' +if pcall(require,"openssl") then + require("tns") +else + portrule = function() return false end + action = function() end + stdnse.print_debug( 3, "Skipping %s script because OpenSSL is missing.", + SCRIPT_NAME) + return; +end portrule = shortport.port_or_service(1521, "oracle-tns", "tcp", "open") @@ -134,4 +142,4 @@ action = function(host, port) status, result = engine:start() return result -end \ No newline at end of file +end diff --git a/scripts/oracle-enum-users.nse b/scripts/oracle-enum-users.nse index 87804847d..a1a7b6b99 100644 --- a/scripts/oracle-enum-users.nse +++ b/scripts/oracle-enum-users.nse @@ -33,8 +33,16 @@ license = "Same as Nmap--See http://nmap.org/book/man-legal.html" categories = {"intrusive", "auth"} require 'shortport' -require 'tns' require 'unpwdb' +if pcall(require,"openssl") then + require("tns") +else + portrule = function() return false end + action = function() end + stdnse.print_debug( 3, "Skipping %s script because OpenSSL is missing.", + SCRIPT_NAME) + return; +end portrule = shortport.port_or_service(1521, 'oracle-tns' ) @@ -156,4 +164,4 @@ action = function( host, port ) end return stdnse.format_output(true, result) -end \ No newline at end of file +end diff --git a/scripts/ssh2-enum-algos.nse b/scripts/ssh2-enum-algos.nse index 66f1ec2f7..f1f3d9111 100644 --- a/scripts/ssh2-enum-algos.nse +++ b/scripts/ssh2-enum-algos.nse @@ -57,7 +57,15 @@ categories = {"safe", "discovery"} require "shortport" require "stdnse" -require "ssh2" +if pcall(require,"openssl") then + require("ssh2") +else + portrule = function() return false end + action = function() end + stdnse.print_debug( 3, "Skipping %s script because OpenSSL is missing.", + SCRIPT_NAME) + return; +end portrule = shortport.port_or_service(22, "ssh")