mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
nmap: Update to 7.80, add full variant, switch to Python 3
* Update to 7.80 * Add "full" variants for nmap and ncat that support Lua scripts (and OpenSSL) * Replace libcxx fix with upstream patch[1] (CHANGELOG change was removed) * Switch ndiff to use Python 3 (using a patch from Debian[2], which comes from an upstream PR[3] plus a port of ndiff/setup.py) [1]: https://github.com/nmap/nmap/commit/ea4e2d6657103a2c3d6f543a1a8619eb4d4472c8 [2]: https://salsa.debian.org/pkg-security-team/nmap/-/blob/0510c602dd45f4dc0b06a6f422a9b0855564ddbb/debian/patches/0004-Python3-port-of-ndiff.patch [3]: https://github.com/nmap/nmap/pull/1807 Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To
committed by
Nuno Goncalves
Nuno Goncalves
parent
59513531e1
commit
067c93b028
@@ -0,0 +1,135 @@
|
||||
From ea4e2d6657103a2c3d6f543a1a8619eb4d4472c8 Mon Sep 17 00:00:00 2001
|
||||
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
|
||||
Date: Mon, 30 Dec 2019 04:03:03 +0000
|
||||
Subject: [PATCH] Avoid 'using namespace std' causing name conflicts. Fixes
|
||||
#1363, fixes #1867
|
||||
|
||||
---
|
||||
CHANGELOG | 4 ++++
|
||||
nping/EchoServer.cc | 2 +-
|
||||
nping/EchoServer.h | 4 +---
|
||||
nping/NEPContext.h | 3 +--
|
||||
nping/NpingTargets.h | 4 +---
|
||||
nping/ProbeMode.h | 2 --
|
||||
nping/nping.cc | 1 -
|
||||
nping/utils.h | 2 --
|
||||
8 files changed, 8 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc
|
||||
index ccdcf9c2d0..a824340cd2 100644
|
||||
--- a/nping/EchoServer.cc
|
||||
+++ b/nping/EchoServer.cc
|
||||
@@ -199,7 +199,7 @@ NEPContext *EchoServer::getClientContext(nsock_iod iod){
|
||||
* the context could not be found. */
|
||||
int EchoServer::destroyClientContext(clientid_t clnt){
|
||||
bool deleted=false;
|
||||
- vector<NEPContext>::iterator it;
|
||||
+ std::vector<NEPContext>::iterator it;
|
||||
/* Iterate through the context array and delete the one that belongs to clnt */
|
||||
for ( it=this->client_ctx.begin(); it<this->client_ctx.end(); it++){
|
||||
if(it->getIdentifier()==clnt){
|
||||
diff --git a/nping/EchoServer.h b/nping/EchoServer.h
|
||||
index c3dece6341..c9fee6de9e 100644
|
||||
--- a/nping/EchoServer.h
|
||||
+++ b/nping/EchoServer.h
|
||||
@@ -136,15 +136,13 @@
|
||||
#include <vector>
|
||||
#include "NEPContext.h"
|
||||
|
||||
-using namespace std;
|
||||
-
|
||||
#define LISTEN_QUEUE_SIZE 10
|
||||
|
||||
class EchoServer {
|
||||
|
||||
private:
|
||||
/* Attributes */
|
||||
- vector<NEPContext> client_ctx;
|
||||
+ std::vector<NEPContext> client_ctx;
|
||||
clientid_t client_id_count;
|
||||
|
||||
/* Methods */
|
||||
diff --git a/nping/NEPContext.h b/nping/NEPContext.h
|
||||
index 5e470d7551..32b8be48d6 100644
|
||||
--- a/nping/NEPContext.h
|
||||
+++ b/nping/NEPContext.h
|
||||
@@ -135,7 +135,6 @@
|
||||
#include "nsock.h"
|
||||
#include "EchoHeader.h"
|
||||
#include <vector>
|
||||
-using namespace std;
|
||||
|
||||
/* SERVER STATE MACHINE */
|
||||
/* _ */
|
||||
@@ -204,7 +203,7 @@ class NEPContext {
|
||||
u8 client_nonce[NONCE_LEN];
|
||||
bool server_nonce_set;
|
||||
bool client_nonce_set;
|
||||
- vector<fspec_t> fspecs;
|
||||
+ std::vector<fspec_t> fspecs;
|
||||
struct sockaddr_storage clnt_addr;
|
||||
|
||||
u8 *generateKey(int key_type, size_t *final_len);
|
||||
diff --git a/nping/NpingTargets.h b/nping/NpingTargets.h
|
||||
index 61bb356f39..3a9a2145af 100644
|
||||
--- a/nping/NpingTargets.h
|
||||
+++ b/nping/NpingTargets.h
|
||||
@@ -137,8 +137,6 @@
|
||||
#include "NpingTarget.h"
|
||||
#include <vector>
|
||||
|
||||
-using namespace std;
|
||||
-
|
||||
#define MAX_NPING_HOSTNAME_LEN 512 /**< Max length for named hosts */
|
||||
|
||||
class NpingTargets {
|
||||
@@ -176,7 +174,7 @@ class NpingTargets {
|
||||
|
||||
/* TODO: Make private */
|
||||
NpingTarget *currenths;
|
||||
- vector<NpingTarget *> Targets;
|
||||
+ std::vector<NpingTarget *> Targets;
|
||||
|
||||
}; /* End of class NpingTargets */
|
||||
|
||||
diff --git a/nping/ProbeMode.h b/nping/ProbeMode.h
|
||||
index aa86939e02..313776d862 100644
|
||||
--- a/nping/ProbeMode.h
|
||||
+++ b/nping/ProbeMode.h
|
||||
@@ -135,11 +135,9 @@
|
||||
|
||||
#include "nping.h"
|
||||
#include "nsock.h"
|
||||
-#include <vector>
|
||||
#include "NpingTarget.h"
|
||||
#include "utils_net.h"
|
||||
#include "utils.h"
|
||||
-using namespace std;
|
||||
|
||||
#define PKT_TYPE_TCP_CONNECT 1
|
||||
#define PKT_TYPE_UDP_NORMAL 2
|
||||
diff --git a/nping/nping.cc b/nping/nping.cc
|
||||
index 9de151a7be..40df912a88 100644
|
||||
--- a/nping/nping.cc
|
||||
+++ b/nping/nping.cc
|
||||
@@ -150,7 +150,6 @@
|
||||
#include <signal.h>
|
||||
#include <time.h>
|
||||
|
||||
-using namespace std;
|
||||
NpingOps o;
|
||||
EchoClient ec;
|
||||
EchoServer es;
|
||||
diff --git a/nping/utils.h b/nping/utils.h
|
||||
index c3516cf29f..5de6b64b89 100644
|
||||
--- a/nping/utils.h
|
||||
+++ b/nping/utils.h
|
||||
@@ -143,8 +143,6 @@
|
||||
#endif
|
||||
|
||||
#include "global_structures.h"
|
||||
-#include <vector>
|
||||
-using namespace std;
|
||||
|
||||
/* Function prototypes */
|
||||
bool contains(const char *source, const char *substring);
|
||||
@@ -1,80 +0,0 @@
|
||||
--- a/nmap_error.cc
|
||||
+++ b/nmap_error.cc
|
||||
@@ -135,6 +135,7 @@
|
||||
#include "xml.h"
|
||||
|
||||
#include <errno.h>
|
||||
+#include <time.h>
|
||||
|
||||
extern NmapOps o;
|
||||
|
||||
--- a/nping/EchoServer.cc
|
||||
+++ b/nping/EchoServer.cc
|
||||
@@ -131,6 +131,7 @@
|
||||
#include "EchoServer.h"
|
||||
#include "EchoHeader.h"
|
||||
#include "NEPContext.h"
|
||||
+#include <ctime>
|
||||
#include <vector>
|
||||
#include "nsock.h"
|
||||
#include "output.h"
|
||||
@@ -281,12 +282,12 @@ int EchoServer::nep_listen_socket(){
|
||||
server_addr6.sin6_len = sizeof(struct sockaddr_in6);
|
||||
#endif
|
||||
/* Bind to local address and the specified port */
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr6.sin6_addr), port);
|
||||
/* If the bind failed for the supplied address, just try again with in6addr_any */
|
||||
if( o.spoofSource() ){
|
||||
server_addr6.sin6_addr = in6addr_any;
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
|
||||
nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
|
||||
}else{
|
||||
nping_print(VB_1, "Server bound to port %d", port);
|
||||
@@ -319,12 +320,12 @@ int EchoServer::nep_listen_socket(){
|
||||
#endif
|
||||
|
||||
/* Bind to local address and the specified port */
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr4.sin_addr), port);
|
||||
/* If the bind failed for the supplied address, just try again with in6addr_any */
|
||||
if( o.spoofSource() ){
|
||||
server_addr4.sin_addr.s_addr=INADDR_ANY;
|
||||
- if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
+ if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
|
||||
nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
|
||||
}else{
|
||||
nping_print(VB_1, "Server bound to port %d", port);
|
||||
--- a/osscan.cc
|
||||
+++ b/osscan.cc
|
||||
@@ -151,6 +151,7 @@
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
+#include <ctime>
|
||||
#include <list>
|
||||
#include <set>
|
||||
|
||||
--- a/osscan2.cc
|
||||
+++ b/osscan2.cc
|
||||
@@ -145,6 +145,7 @@
|
||||
|
||||
#include "struct_ip.h"
|
||||
|
||||
+#include <ctime>
|
||||
#include <list>
|
||||
#include <math.h>
|
||||
|
||||
--- a/service_scan.cc
|
||||
+++ b/service_scan.cc
|
||||
@@ -173,6 +173,7 @@
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
+#include <ctime>
|
||||
#include <list>
|
||||
|
||||
extern NmapOps o;
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user