- update to 7.30

Changelog:
https://nmap.org/changelog.html

7 files changed, 14 insertions, 147 deletions

diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index f779c8495edf..e509561afd92 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	7.25BETA2
+DISTVERSION=	7.30
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		LOCAL/ohauer
diff --git a/security/nmap/distinfo b/security/nmap/distinfo
index de4f12ef9885..743d9ffb6472 100644
--- a/security/nmap/distinfo
+++ b/security/nmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472762117
-SHA256 (nmap-7.25BETA2.tar.bz2) = 6c66a150c9e346ccdca0aa16ef8c2a5310449444fe15cf5ec3f3a151978378d0
-SIZE (nmap-7.25BETA2.tar.bz2) = 8874592
+TIMESTAMP = 1475172408
+SHA256 (nmap-7.30.tar.bz2) = ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f
+SIZE (nmap-7.30.tar.bz2) = 9003761
diff --git a/security/nmap/files/patch-ncat_ncat__ssl.c b/security/nmap/files/patch-ncat_ncat__ssl.c
deleted file mode 100644
index db7b5f4366e3..000000000000
--- a/security/nmap/files/patch-ncat_ncat__ssl.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- ncat/ncat_ssl.c.orig	2016-08-01 09:34:56 UTC
-+++ ncat/ncat_ssl.c
-@@ -315,7 +315,7 @@ static int cert_match_dnsname(X509 *cert
- 
-     /* We must copy this address into a temporary variable because ASN1_item_d2i
-        increments it. We don't want it to corrupt ext->value->data. */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     data = ext->value->data;
- #else
-     ASN1_OCTET_STRING* asn1_str = X509_EXTENSION_get_data(ext);
-@@ -328,7 +328,7 @@ static int cert_match_dnsname(X509 *cert
-        presence of null bytes. */
- #if (OPENSSL_VERSION_NUMBER > 0x00907000L)
-     if (method->it != NULL) {
--    #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         gen_names = (STACK_OF(GENERAL_NAME) *) ASN1_item_d2i(NULL,
-             (const unsigned char **) &data,
-             ext->value->length, ASN1_ITEM_ptr(method->it));
-@@ -339,7 +339,7 @@ static int cert_match_dnsname(X509 *cert
-             asn1_str_a->length, ASN1_ITEM_ptr(method->it));
-     #endif
-     } else {
--    #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         gen_names = (STACK_OF(GENERAL_NAME) *) method->d2i(NULL,
-             (const unsigned char **) &data,
-             ext->value->length);
diff --git a/security/nmap/files/patch-nping_Crypto.cc b/security/nmap/files/patch-nping_Crypto.cc
deleted file mode 100644
index 1094a929eb16..000000000000
--- a/security/nmap/files/patch-nping_Crypto.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- nping/Crypto.cc.orig	2016-08-01 09:34:56 UTC
-+++ nping/Crypto.cc
-@@ -178,7 +178,7 @@ int Crypto::aes128_cbc_encrypt(u8 *inbuf
-   #ifdef HAVE_OPENSSL
-     if( o.doCrypto() ){
-         int flen=0, flen2=0;
--        #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+        #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-           EVP_CIPHER_CTX ctx;
-           EVP_CIPHER_CTX_init(&ctx);
-           EVP_CIPHER_CTX_set_padding(&ctx, 0);
-@@ -231,7 +231,7 @@ int Crypto::aes128_cbc_decrypt(u8 *inbuf
-   #ifdef HAVE_OPENSSL
-     if( o.doCrypto() ){
-         int flen1=0, flen2=0;
--        #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+        #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-           EVP_CIPHER_CTX ctx;
-           EVP_CIPHER_CTX_init(&ctx);
-           EVP_CIPHER_CTX_set_padding(&ctx, 0);
-@@ -286,7 +286,7 @@ int Crypto::aes128_cbc_decrypt(u8 *inbuf
-             //ERR_free_strings();
-             //ERR_pop_to_mark();
-         }
--        #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+        #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-           EVP_CIPHER_CTX_cleanup(&ctx);
-         #else
-           EVP_CIPHER_CTX_reset(ctx);
-@@ -327,7 +327,7 @@ u8 *Crypto::deriveKey(const u8 *from, si
-         static u8 hash[MAX(SHA256_HASH_LEN, EVP_MAX_MD_SIZE)];
-         static u8 next[MAX(SHA256_HASH_LEN, EVP_MAX_MD_SIZE)];
-         unsigned int lastlen;
--      #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+      #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         EVP_MD_CTX ctx;
-         EVP_MD_CTX_init(&ctx);
- 
diff --git a/security/nmap/files/patch-nse__openssl.cc b/security/nmap/files/patch-nse__openssl.cc
deleted file mode 100644
index b652b7f38a94..000000000000
--- a/security/nmap/files/patch-nse__openssl.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- nse_openssl.cc.orig	2016-08-01 09:34:56 UTC
-+++ nse_openssl.cc
-@@ -281,7 +281,7 @@ static int l_digest(lua_State *L)     /*
-   const unsigned char *msg = (unsigned char *) luaL_checklstring( L, 2, &msg_len );
-   unsigned char digest[EVP_MAX_MD_SIZE];
-   const EVP_MD * evp_md;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_MD_CTX mdctx;
- #else
-   EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
-@@ -291,7 +291,7 @@ static int l_digest(lua_State *L)     /*
- 
-   if (!evp_md) return luaL_error( L, "Unknown digest algorithm: %s", algorithm );
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_MD_CTX_init(&mdctx);
-   if (!(
-       EVP_DigestInit_ex( &mdctx, evp_md, NULL ) &&
-@@ -394,7 +394,7 @@ static int l_encrypt(lua_State *L) /** e
-   if (iv[0] == '\0')
-     iv = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX cipher_ctx;
-   EVP_CIPHER_CTX_init( &cipher_ctx );
- 
-@@ -496,7 +496,7 @@ static int l_decrypt(lua_State *L) /** d
-   if (iv[0] == '\0')
-     iv = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX cipher_ctx;
-   EVP_CIPHER_CTX_init( &cipher_ctx );
- 
-@@ -684,7 +684,7 @@ static const struct luaL_Reg openssllib[
- LUALIB_API int luaopen_openssl(lua_State *L) {
- 
-   OpenSSL_add_all_algorithms();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ERR_load_crypto_strings();
- #else
-   /* This is now deprecated in OpenSSL 1.1.0 _ No explicit initialisation 
diff --git a/security/nmap/files/patch-nse__ssl__cert.cc b/security/nmap/files/patch-nse__ssl__cert.cc
deleted file mode 100644
index 97c43d3ccb23..000000000000
--- a/security/nmap/files/patch-nse__ssl__cert.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- nse_ssl_cert.cc.orig	2016-08-30 16:07:08 UTC
-+++ nse_ssl_cert.cc
-@@ -528,7 +528,7 @@ static int parse_ssl_cert(lua_State *L, 
-     lua_setfield(L, -2, "subject");
-   }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   const char *sig_algo = OBJ_nid2ln(OBJ_obj2nid(cert->sig_alg->algorithm));
- #else
-   const char *sig_algo = OBJ_nid2ln(X509_get_signature_nid(cert));
-@@ -555,7 +555,7 @@ static int parse_ssl_cert(lua_State *L, 
-     return 2;
-   }
-   lua_newtable(L);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   pkey_type = EVP_PKEY_type(pubkey->type);
- #else
-   pkey_type = EVP_PKEY_base_id(pubkey);
-@@ -572,7 +572,7 @@ static int parse_ssl_cert(lua_State *L, 
-     bignum_data_t * data = (bignum_data_t *) lua_newuserdata( L, sizeof(bignum_data_t));
-     luaL_getmetatable( L, "BIGNUM" );
-     lua_setmetatable( L, -2 );
--  #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     data->bn = rsa->e;
-   #elif OPENSSL_VERSION_NUMBER < 0x10100006L
-     BIGNUM *n, *e, *d;
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 1af707a11a42..87076b8927bc 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -47,6 +47,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/brute.lua
 %%DATADIR%%/nselib/cassandra.lua
 %%DATADIR%%/nselib/citrixxml.lua
+%%DATADIR%%/nselib/coap.lua
 %%DATADIR%%/nselib/comm.lua
 %%DATADIR%%/nselib/creds.lua
 %%DATADIR%%/nselib/cvs.lua
@@ -115,6 +116,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/imap.lua
 %%DATADIR%%/nselib/informix.lua
 %%DATADIR%%/nselib/ipOps.lua
+%%DATADIR%%/nselib/ipmi.lua
 %%DATADIR%%/nselib/ipp.lua
 %%DATADIR%%/nselib/iscsi.lua
 %%DATADIR%%/nselib/isns.lua
@@ -130,6 +132,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/nselib/membase.lua
 %%DATADIR%%/nselib/mobileme.lua
 %%DATADIR%%/nselib/mongodb.lua
+%%DATADIR%%/nselib/mqtt.lua
 %%DATADIR%%/nselib/msrpc.lua
 %%DATADIR%%/nselib/msrpcperformance.lua
 %%DATADIR%%/nselib/msrpctypes.lua
@@ -262,6 +265,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/citrix-enum-servers.nse
 %%DATADIR%%/scripts/clamav-exec.nse
 %%DATADIR%%/scripts/clock-skew.nse
+%%DATADIR%%/scripts/coap-resources.nse
 %%DATADIR%%/scripts/couchdb-databases.nse
 %%DATADIR%%/scripts/couchdb-stats.nse
 %%DATADIR%%/scripts/creds-summary.nse
@@ -310,6 +314,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/firewalk.nse
 %%DATADIR%%/scripts/firewall-bypass.nse
 %%DATADIR%%/scripts/flume-master-info.nse
+%%DATADIR%%/scripts/fox-info.nse
 %%DATADIR%%/scripts/freelancer-info.nse
 %%DATADIR%%/scripts/ftp-anon.nse
 %%DATADIR%%/scripts/ftp-bounce.nse
@@ -474,6 +479,9 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/ip-geolocation-maxmind.nse
 %%DATADIR%%/scripts/ip-https-discover.nse
 %%DATADIR%%/scripts/ipidseq.nse
+%%DATADIR%%/scripts/ipmi-brute.nse
+%%DATADIR%%/scripts/ipmi-cipher-zero.nse
+%%DATADIR%%/scripts/ipmi-version.nse
 %%DATADIR%%/scripts/ipv6-multicast-mld-list.nse
 %%DATADIR%%/scripts/ipv6-node-info.nse
 %%DATADIR%%/scripts/ipv6-ra-flood.nse
@@ -514,6 +522,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/mongodb-brute.nse
 %%DATADIR%%/scripts/mongodb-databases.nse
 %%DATADIR%%/scripts/mongodb-info.nse
+%%DATADIR%%/scripts/mqtt-subscribe.nse
 %%DATADIR%%/scripts/mrinfo.nse
 %%DATADIR%%/scripts/ms-sql-brute.nse
 %%DATADIR%%/scripts/ms-sql-config.nse
@@ -577,6 +586,7 @@ man/zh/man1/nmap.1.gz
 %%DATADIR%%/scripts/p2p-conficker.nse
 %%DATADIR%%/scripts/path-mtu.nse
 %%DATADIR%%/scripts/pcanywhere-brute.nse
+%%DATADIR%%/scripts/pcworx-info.nse
 %%DATADIR%%/scripts/pgsql-brute.nse
 %%DATADIR%%/scripts/pjl-ready-message.nse
 %%DATADIR%%/scripts/pop3-brute.nse