diff --git a/libnetutil/HopByHopHeader.cc b/libnetutil/HopByHopHeader.cc index 735c66ea5..c3b8cc450 100644 --- a/libnetutil/HopByHopHeader.cc +++ b/libnetutil/HopByHopHeader.cc @@ -427,7 +427,7 @@ int HopByHopHeader::addOption(u8 type, u8 len, const u8 *data){ /* If the current length of the extension header is not a multiple of 8 octets, - * this method adds the neccessary padding (either PadN or Pad1 options)*/ + * this method adds the necessary padding (either PadN or Pad1 options)*/ int HopByHopHeader::addPadding(){ u8 zeroes[8]={0,0,0,0,0,0,0,0}; int required_octets=8-(this->length%8); diff --git a/libnetutil/ICMPv4Header.cc b/libnetutil/ICMPv4Header.cc index e5b8a4537..ef9cc0a83 100755 --- a/libnetutil/ICMPv4Header.cc +++ b/libnetutil/ICMPv4Header.cc @@ -1029,7 +1029,7 @@ u32 ICMPv4Header::getOutputLinkMTU() const { } /* End of getOutputLinkMTU() */ -/* Miscellanious *************************************************************/ +/* Miscellaneous *************************************************************/ /** Returns the standard ICMP header length for the supplied ICMP message type. * @warning Return value corresponds strictly to the ICMP header, this is, * the minimum length of the ICMP header, variable length payload is never diff --git a/libnetutil/IPv4Header.cc b/libnetutil/IPv4Header.cc index 2ee893840..81ec9e063 100644 --- a/libnetutil/IPv4Header.cc +++ b/libnetutil/IPv4Header.cc @@ -665,7 +665,7 @@ int IPv4Header::setOpts(const char *txt){ int IPv4Header::setOpts(u8 *opts_buff, u32 opts_len){ if(opts_buff==NULL || opts_len==0) return OP_FAILURE; - assert(opts_len<=MAX_IP_OPTIONS_LEN); /* Max lenght for IP options */ + assert(opts_len<=MAX_IP_OPTIONS_LEN); /* Max length for IP options */ memcpy(this->h.options, opts_buff, opts_len); this->ipoptlen=opts_len; this->length += opts_len; diff --git a/libnetutil/IPv4Header.h b/libnetutil/IPv4Header.h index c54a03ec2..eb488ee57 100644 --- a/libnetutil/IPv4Header.h +++ b/libnetutil/IPv4Header.h @@ -130,7 +130,7 @@ #include "NetworkLayerElement.h" #define IP_RF 0x8000 /* Reserved fragment flag */ -#define IP_DF 0x4000 /* Dont fragment flag */ +#define IP_DF 0x4000 /* Don't fragment flag */ #define IP_MF 0x2000 /* More fragments flag */ #define IP_OFFMASK 0x1fff /* Mask for fragmenting bits */ #define IP_HEADER_LEN 20 /* Length of the standard header */ @@ -213,7 +213,7 @@ class IPv4Header : public NetworkLayerElement { int setTOS(u8 v); u8 getTOS() const; - /* Total lenght of the datagram */ + /* Total length of the datagram */ int setTotalLength(); int setTotalLength(u16 l); u16 getTotalLength() const; diff --git a/libnetutil/PacketElement.h b/libnetutil/PacketElement.h index be0477981..9d1c23bfe 100644 --- a/libnetutil/PacketElement.h +++ b/libnetutil/PacketElement.h @@ -253,7 +253,7 @@ class PacketElement { } /* End of getBinaryBuffer() */ - /** Returns the lenght of this PacketElement + the length of all the + /** Returns the length of this PacketElement + the length of all the * PacketElements that are next to it (are linked trough the "next" * attribute). So for example, if we have IPv4Header p1, linked to * a TCPHeader p2, representing a simple TCP SYN with no options, diff --git a/libnetutil/RoutingHeader.cc b/libnetutil/RoutingHeader.cc index bfbb2be19..0b1cd4e3c 100644 --- a/libnetutil/RoutingHeader.cc +++ b/libnetutil/RoutingHeader.cc @@ -169,7 +169,7 @@ int RoutingHeader::storeRecvData(const u8 *buf, size_t len){ this->length=0; return OP_FAILURE; }else{ - /* Store the first 4 bytes, so we can access lenght and routing type */ + /* Store the first 4 bytes, so we can access length and routing type */ memcpy(&(this->h), buf, 4); /* Our behaviour is different depending on the routing type. */ diff --git a/libnetutil/UDPHeader.cc b/libnetutil/UDPHeader.cc index ae058dea4..997e01ad9 100644 --- a/libnetutil/UDPHeader.cc +++ b/libnetutil/UDPHeader.cc @@ -338,26 +338,26 @@ int UDPHeader::setTotalLength(){ * here because UDP is supposed to be independent of IPv4, IPv6 or * whatever other network layer protocol is used to carry the UDP datagrams.*/ if ((mylen+otherslen) > 65535 || (mylen+otherslen)<8 ){ - printf("UDPHeader::setTotalLenght(): Invalid length.\n"); + printf("UDPHeader::setTotalLength(): Invalid length.\n"); return OP_FAILURE; } h.uh_ulen=htons( mylen+otherslen ); return OP_SUCCESS; -} /* End of setTotalLenght() */ +} /* End of setTotalLength() */ /** @warning Supplied value MUST be in HOST byte order */ int UDPHeader::setTotalLength(u16 l){ this->h.uh_ulen=htons(l); return OP_SUCCESS; -} /* End of setTotalLenght() */ +} /* End of setTotalLength() */ /** @warning Returned value is in HOST byte order */ u16 UDPHeader::getTotalLength() const { return ntohs(this->h.uh_ulen); -} /* End of getTotalLenght() */ +} /* End of getTotalLength() */ diff --git a/mswin32/NETINET/IP.H b/mswin32/NETINET/IP.H index fc3721d56..e32d5ae9f 100644 --- a/mswin32/NETINET/IP.H +++ b/mswin32/NETINET/IP.H @@ -69,7 +69,7 @@ struct ip { short ip_len; /* total length */ u_short ip_id; /* identification */ short ip_off; /* fragment offset field */ -#define IP_DF 0x4000 /* dont fragment flag */ +#define IP_DF 0x4000 /* don't fragment flag */ #define IP_MF 0x2000 /* more fragments flag */ #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ u_char ip_ttl; /* time to live */ diff --git a/mswin32/packet_types.h b/mswin32/packet_types.h index ff7db82c8..90b5301ca 100644 --- a/mswin32/packet_types.h +++ b/mswin32/packet_types.h @@ -17,7 +17,7 @@ struct ip u_short ip_id; /* identification */ u_short ip_off; /* fragment offset field */ #define IP_RF 0x8000 /* reserved fragment flag */ -#define IP_DF 0x4000 /* dont fragment flag */ +#define IP_DF 0x4000 /* don't fragment flag */ #define IP_MF 0x2000 /* more fragments flag */ #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ u_char ip_ttl; /* time to live */ @@ -151,7 +151,7 @@ struct iphdr { short ip_len; /* total length */ u_short ip_id; /* identification */ short ip_off; /* fragment offset field */ -#define IP_DF 0x4000 /* dont fragment flag */ +#define IP_DF 0x4000 /* don't fragment flag */ #define IP_MF 0x2000 /* more fragments flag */ u_char ip_ttl; /* time to live */ u_char ip_p; /* protocol */ diff --git a/mswin32/pcap-include/Packet32.h b/mswin32/pcap-include/Packet32.h index 64be055d9..c821d2951 100644 --- a/mswin32/pcap-include/Packet32.h +++ b/mswin32/pcap-include/Packet32.h @@ -284,7 +284,7 @@ struct _PACKET_OID_DATA { ULONG Oid; ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h ///< for a complete list of valid codes. ULONG Length; ///< Length of the data field - UCHAR Data[1]; ///< variable-lenght field that contains the information passed to or received + UCHAR Data[1]; ///< variable-length field that contains the information passed to or received ///< from the adapter. }; typedef struct _PACKET_OID_DATA PACKET_OID_DATA, *PPACKET_OID_DATA; diff --git a/mswin32/pcap-include/pcap/bpf.h b/mswin32/pcap-include/pcap/bpf.h index 9f4ca33e3..8a25c406f 100644 --- a/mswin32/pcap-include/pcap/bpf.h +++ b/mswin32/pcap-include/pcap/bpf.h @@ -446,7 +446,7 @@ struct bpf_version { * interface (irdaX), but not on a raw serial port. * Note the capture is done in "Linux-cooked" mode, so each packet include * a fake packet header (struct sll_header). This is because IrDA packet - * decoding is dependant on the direction of the packet (incomming or + * decoding is dependent on the direction of the packet (incoming or * outgoing). * When/if other platform implement IrDA capture, we may revisit the * issue and define a real DLT_IRDA... diff --git a/mswin32/pcap-include/remote-ext.h b/mswin32/pcap-include/remote-ext.h index 35a2fff6c..e03eede09 100644 --- a/mswin32/pcap-include/remote-ext.h +++ b/mswin32/pcap-include/remote-ext.h @@ -395,7 +395,7 @@ struct pcap_samp -//! Maximum lenght of an host name (needed for the RPCAP active mode) +//! Maximum length of an host name (needed for the RPCAP active mode) #define RPCAP_HOSTLIST_SIZE 1024 diff --git a/mswin32/winclude.h b/mswin32/winclude.h index d3f6dc5ae..8fefe57b6 100644 --- a/mswin32/winclude.h +++ b/mswin32/winclude.h @@ -1,6 +1,6 @@ /*************************************************************************** * winclude.h -- some windows include files and * - * windows-compatabilty-related functions that are specific to Nmap. Most * + * windows-compatibility-related functions that are specific to Nmap. Most * * of this has been moved into nbase so it can be shared. * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index 5cb0f5fa3..63858ad7d 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -1,6 +1,6 @@ /*************************************************************************** - * winfix.cc -- A few trivial windows-compatabilty-related functions that * + * winfix.cc -- A few trivial windows-compatibility-related functions that * * are specific to Nmap. Most of this has been moved into nbase so it can * * be shared. * * * diff --git a/nmap-os-db b/nmap-os-db index e5a3681cb..57fd535b5 100644 --- a/nmap-os-db +++ b/nmap-os-db @@ -14,7 +14,7 @@ # LLC. It is distributed under the Nmap Open Source license as # provided in the COPYING file of the source distribution or at # http://nmap.org/data/COPYING . Note that this license -# requires you to license your own work under a compatable open source +# requires you to license your own work under a compatible open source # license. If you wish to embed Nmap technology into proprietary # software, we sell alternative licenses (contact sales@insecure.com). # Dozens of software vendors already license Nmap technology such as @@ -56121,7 +56121,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z) # Windows 5.1 (Build 2600.xpsp_sp3_gdr.090804-1435 : Service Pack 3) # AT&T Uverse home DVR # AT&T U-Verse Motorola set top boxes -# Media Reciever 300, Vendor: T-Home (Germany), CE 5.0 +# Media Receiver 300, Vendor: T-Home (Germany), CE 5.0 # XP64 with all available Windows updates Fingerprint AT&T U-Verse set-top box (Windows CE 5.0) Class Microsoft | Windows | PocketPC/CE | media device diff --git a/nmap-payloads b/nmap-payloads index a9b71e2ae..d356ca1b8 100644 --- a/nmap-payloads +++ b/nmap-payloads @@ -11,7 +11,7 @@ # LLC. It is distributed under the Nmap Open Source license as # provided in the COPYING file of the source distribution or at # http://nmap.org/data/COPYING . Note that this license -# requires you to license your own work under a compatable open source +# requires you to license your own work under a compatible open source # license. If you wish to embed Nmap technology into proprietary # software, we sell alternative licenses (contact sales@insecure.com). # Dozens of software vendors already license Nmap technology such as diff --git a/nmap-service-probes b/nmap-service-probes index 2f3d351ce..753f6c24a 100644 --- a/nmap-service-probes +++ b/nmap-service-probes @@ -22,7 +22,7 @@ # LLC. It is distributed under the Nmap Open Source license as # provided in the COPYING file of the source distribution or at # http://nmap.org/data/COPYING . Note that this license -# requires you to license your own work under a compatable open source +# requires you to license your own work under a compatible open source # license. If you wish to embed Nmap technology into proprietary # software, we sell alternative licenses (contact sales@insecure.com). # Dozens of software vendors already license Nmap technology such as @@ -2544,7 +2544,7 @@ match smtp m|^220 CheckPoint FireWall-1 secure SMTP server\r\n$| p/Checkpoint Fi match smtp m|^220 ([-.+\w]+) running IBM AS/400 SMTP V([\w]+)| p|IBM AS/400 smtpd| v/$2/ h/$1/ match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: (\d[\w.]+)- ready at | p/MailEnable smptd/ v/$2/ o/Windows/ h/$1/ cpe:/o:microsoft:windows/a match smtp m|^220 ([-.+\w]+) ESMTP Mail Enable SMTP Service, Version: (\d[\w.]+)-- ready at| p/MailEnable smptd/ v/$2/ o/Windows/ h/$1/ cpe:/o:microsoft:windows/a -# Enterprise version number seems to be preceeded by "0--"; Professional with "0-" +# Enterprise version number seems to be preceded by "0--"; Professional with "0-" match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: \d+--([\d.]+) ready at| p/MailEnable Enterprise smptd/ v/$2/ o/Windows/ h/$1/ cpe:/o:microsoft:windows/a # Catch-alls. Hyphens aren't making sense -Doug match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: ([\w._-]+) ready at| p/MailEnable smptd/ v/$2/ o/Windows/ h/$1/ cpe:/o:microsoft:windows/a @@ -4540,7 +4540,7 @@ match http m|^HTTP/1\.0 400 msg=Bad%20Request&rc=%00%00%03%1b\r\n| p/TimesTen ht match http m|^HTTP/1\.1 400 Bad request\r\nContent-Type: text/html; charset=ISO-8859-1\r\n\r\n
errorMessage and resultCode entries set with the error information.
diff --git a/nselib/msrpc.lua b/nselib/msrpc.lua
index 36ef66eaf..7c862f93f 100644
--- a/nselib/msrpc.lua
+++ b/nselib/msrpc.lua
@@ -1086,7 +1086,7 @@ end
-- http://msdn.microsoft.com/en-us/library/cc244831%28v=prot.10%29
--@param smbstate The SMB state table
--@param printer_handle Printer handle returned by spoolss_open_printer()
---@param data Actuall data to write to a file
+--@param data Actual data to write to a file
--@return (status, result) If status is false, result is an error message. Otherwise, result is number of bytes written.
function spoolss_write_printer(smbstate,printer_handle,data)
stdnse.print_debug("len %d", #data)
@@ -1928,7 +1928,7 @@ end
--
--@param smbstate The SMB state table
--@param alias_handle The alias_handle, already marshaled
---@param args Actuall data to send, already marshaled
+--@param args Actual data to send, already marshaled
--@return (status, result) If status is false, result is an error message. Otherwise, result is a table of values.
function samr_getaliasmembership(smbstate, alias_handle,args)
local status, result
diff --git a/nselib/tftp.lua b/nselib/tftp.lua
index 8779b41f2..2f81e99a1 100644
--- a/nselib/tftp.lua
+++ b/nselib/tftp.lua
@@ -304,7 +304,7 @@ end
local function waitLast()
-- The thread that started the server needs to wait here until the rest
- -- of the scripts finnish running. We know we are done once the state
+ -- of the scripts finish running. We know we are done once the state
-- shifts to STOPPED and we get a signal from the condvar in the
-- dispatcher
local s_condvar = nmap.condvar(state)
diff --git a/scan_engine.h b/scan_engine.h
index 06db23fd0..c8d958633 100644
--- a/scan_engine.h
+++ b/scan_engine.h
@@ -1,7 +1,7 @@
/***************************************************************************
* scan_engine.h -- Includes much of the "engine" functions for scanning, *
- * such as ultra_scan. It also includes dependant functions such as *
+ * such as ultra_scan. It also includes dependent functions such as *
* those for collecting SYN/connect scan responses. *
* *
***********************IMPORTANT NMAP LICENSE TERMS************************
diff --git a/scripts/afp-brute.nse b/scripts/afp-brute.nse
index d963074d3..c032b480e 100644
--- a/scripts/afp-brute.nse
+++ b/scripts/afp-brute.nse
@@ -29,7 +29,7 @@ Performs password guessing against Apple Filing Protocol (AFP).
-- Snow Leopard
-- ------------
-- - Delay 10 seconds for accounts with more than 5 incorrect login attempts (good)
--- - Instant response if password is successfull
+-- - Instant response if password is successful
--
-- Netatalk
-- --------
diff --git a/scripts/domino-enum-users.nse b/scripts/domino-enum-users.nse
index bfafaf2e1..d54619c08 100644
--- a/scripts/domino-enum-users.nse
+++ b/scripts/domino-enum-users.nse
@@ -18,8 +18,8 @@ Attempts to discover valid IBM Lotus Domino users and download their ID files by
-- 1352/tcp open lotusnotes
-- | domino-enum-users:
-- | User "Patrik Karlsson" found, but not ID file could be downloaded
--- | Succesfully stored "FFlintstone" in /tmp/FFlintstone.id
--- |_ Succesfully stored "MJacksson" in /tmp/MJacksson.id
+-- | Successfully stored "FFlintstone" in /tmp/FFlintstone.id
+-- |_ Successfully stored "MJacksson" in /tmp/MJacksson.id
--
--
-- @args domino-id.path the location to which any retrieved ID files are stored
@@ -107,13 +107,13 @@ action = function(host, port)
local status, err = saveIDFile( filename, data )
if ( status ) then
- table.insert(result, ("Succesfully stored \"%s\" in %s"):format(username, filename) )
+ table.insert(result, ("Successfully stored \"%s\" in %s"):format(username, filename) )
else
stdnse.print_debug( err )
table.insert(result, ("Failed to store \"%s\" to %s"):format(username, filename) )
end
elseif( status and data ) then
- table.insert(result, ("Succesfully retrieved ID for \"%s\" (to store set the domino-enum-users.path argument)"):format(username) )
+ table.insert(result, ("Successfully retrieved ID for \"%s\" (to store set the domino-enum-users.path argument)"):format(username) )
elseif ( status ) then
table.insert(result, ("User \"%s\" found, but no ID file could be downloaded"):format(username) )
end
diff --git a/scripts/drda-brute.nse b/scripts/drda-brute.nse
index ca6302cb4..8982b0f53 100644
--- a/scripts/drda-brute.nse
+++ b/scripts/drda-brute.nse
@@ -163,7 +163,7 @@ action = function( host, port )
threads[co] = true
end
- -- wait for all threads to finnish running
+ -- wait for all threads to finish running
while threadCount(threads)>0 do
condvar("wait")
end
diff --git a/scripts/http-domino-enum-passwords.nse b/scripts/http-domino-enum-passwords.nse
index 28b6571c5..1f03b780e 100644
--- a/scripts/http-domino-enum-passwords.nse
+++ b/scripts/http-domino-enum-passwords.nse
@@ -122,7 +122,7 @@ end
-- @return true on valid access, false on failure
local function isValidCredential( host, port, path, user, pass )
-- we need to supply the no_cache directive, or else the http library
- -- incorrectly tells us that the authentication was successfull
+ -- incorrectly tells us that the authentication was successful
local result = http.get( host, port, path, { auth = { username = user, password = pass }, no_cache = true })
if ( result.status == 401 ) then
diff --git a/scripts/http-fileupload-exploiter.nse b/scripts/http-fileupload-exploiter.nse
index 3b6dfabc4..56c47b190 100644
--- a/scripts/http-fileupload-exploiter.nse
+++ b/scripts/http-fileupload-exploiter.nse
@@ -45,7 +45,7 @@ payload in the comment.
-- 80/tcp open http syn-ack
-- | Testing page /post.html
-- |
--- | Succesfully uploaded and executed payloads:
+-- | Successfully uploaded and executed payloads:
-- | Filename: 1.php, MIME: text/plain
-- |_ Filename: 1.php3, MIME: text/plain
---
@@ -152,7 +152,7 @@ end
local makeAndCheckRequests = function(uploadspaths)
local exit = 0
- local output = {"Succesfully uploaded and executed payloads: "}
+ local output = {"Successfully uploaded and executed payloads: "}
for i=1, #listofrequests, 1 do
listofrequests[i]:make()
diff --git a/scripts/http-form-brute.nse b/scripts/http-form-brute.nse
index ca167bb8e..edaee71ca 100644
--- a/scripts/http-form-brute.nse
+++ b/scripts/http-form-brute.nse
@@ -104,7 +104,7 @@ Driver = {
login = function( self, username, password )
-- we need to supply the no_cache directive, or else the http library
- -- incorrectly tells us that the authentication was successfull
+ -- incorrectly tells us that the authentication was successful
local postparams = { [self.options.passvar] = password }
if ( self.options.uservar ) then postparams[self.options.uservar] = username end
diff --git a/scripts/http-open-proxy.nse b/scripts/http-open-proxy.nse
index 33e636a95..ebf3f3394 100644
--- a/scripts/http-open-proxy.nse
+++ b/scripts/http-open-proxy.nse
@@ -89,7 +89,7 @@ end
-- Seconde: Request to wikipedia.org and checks for wikimedia pattern
-- Third: Request to computerhistory.org and checks for museum pattern
--
--- If any of the requests is succesful, the proxy is considered open
+-- If any of the requests is successful, the proxy is considered open
-- If all get requests return the same result, the user is alerted that
-- the proxy might be redirecting his requests (very common on wi-fi
-- connections at airports, cafes, etc.)
diff --git a/scripts/ntp-monlist.nse b/scripts/ntp-monlist.nse
index f95618693..cdb38c49e 100644
--- a/scripts/ntp-monlist.nse
+++ b/scripts/ntp-monlist.nse
@@ -407,7 +407,7 @@ function check(status, response, track)
-- NoOp
elseif err == 1 then
fail = true
- msg = 'Incompatable Implementation Number'
+ msg = 'Incompatible Implementation Number'
elseif err == 2 then
fail = true
msg = 'Unimplemented Request Code'