From 89da0ac0207074912094747da0d72a1556fe16f7 Mon Sep 17 00:00:00 2001 From: Andreas Nilsen Date: Mon, 1 Jul 2019 19:40:34 +0200 Subject: [PATCH 1/4] hcxtools: Added hcxtools and hcxdumptool, created by: @ZerBea. Signed-off-by: Andreas Nilsen --- net/hcxdumptool/Makefile | 54 ++++++++++++++++++++++++++++++++ net/hcxtools/Makefile | 67 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 net/hcxdumptool/Makefile create mode 100644 net/hcxtools/Makefile diff --git a/net/hcxdumptool/Makefile b/net/hcxdumptool/Makefile new file mode 100644 index 000000000..493b1da19 --- /dev/null +++ b/net/hcxdumptool/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2009-2014 OpenWrt.org +# Copyright (C) 2019 Andreas Nilsen +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=hcxdumptool +PKG_VERSION:=5.1.7 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/github.com/ZerBea/hcxdumptool/releases/download/v$(PKG_VERSION) +PKG_HASH:=6ac996a506cb312a5f1c5987f30a4a80c793993908750f69f2df51056f961269 + +PKG_BUILD_PARALLEL:=1 + +PKG_USE_MIPS16:=0 + +include $(INCLUDE_DIR)/package.mk + +define Package/hcxdumptool + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libpcap + TITLE:=hcxdumptool + URL:=https://github.com/ZerBea/hcxdumptool.git + SUBMENU:=wireless + MAINTAINER:=Andreas Nilsen +endef + +define Package/hcxdumptool/description + Small tool to capture packets from wlan devices. After capturing, upload + the "uncleaned" cap here (https://wpa-sec.stanev.org/?submit) + to see if your ap or the client is vulnerable by using common wordlists. + Convert the cap to hccapx and/or to WPA-PMKID-PBKDF2 hashline (16800) with hcxpcaptool (hcxtools) + and check if wlan-key or plainmasterkey was transmitted unencrypted. +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" +endef + +define Package/hcxdumptool/install + $(INSTALL_DIR) $(1)/sbin + $(CP) $(PKG_BUILD_DIR)/hcxdumptool $(1)/sbin/ +endef + +$(eval $(call BuildPackage,hcxdumptool)) diff --git a/net/hcxtools/Makefile b/net/hcxtools/Makefile new file mode 100644 index 000000000..36aef508f --- /dev/null +++ b/net/hcxtools/Makefile @@ -0,0 +1,67 @@ +# +# Copyright (C) 2009-2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=hcxtools +PKG_VERSION:=5.1.6 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/github.com/ZerBea/hcxtools/releases/download/v$(PKG_VERSION) +PKG_HASH:=19d2800c6f9339dd552ebc3e7195860f208a9856340b4db1aeaeb4a234557ca6 + +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/hcxtools + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libpthread +libpcap +zlib +libcurl +libopenssl + TITLE:= hcxtools + URL:=https://github.com/ZerBea/hcxtools.git + SUBMENU:=wireless + MAINTAINER:=Andreas Nilsen +endef + +define Package/hcxtools/description + Set of tools convert packets from captures (h = hash, c = capture, convert and calculate candidates, x = different hashtypes) + for the use with latest hashcat or John the Ripper. +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" +endef + +define Package/hcxtools/install + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_DIR) $(1)/etc + $(CP) $(PKG_BUILD_DIR)/wlanwkp2hcx $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanpmk2hcx $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanhcxmnc $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanhcx2essid $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanjohn2hcx $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/hcxpcaptool $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanhcx2john $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/hcxpsktool $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlancow2hcxpmk $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanhcxinfo $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/hcxhash2cap $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/hcxhashcattool $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanhashhcx $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlancap2wpasec $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlanhc2hcx $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/hcxwltool $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/whoismac $(1)/sbin/ + $(CP) $(PKG_BUILD_DIR)/wlancap2wpasec $(1)/sbin/ +# $(CP) $(PKG_BUILD_DIR)/usefulscripts/hcxgrep.py $(1)/sbin/hcxgrep +endef + +$(eval $(call BuildPackage,hcxtools)) From 9e4fc185e2db4bcaabeffe08dc4da91802c18f6b Mon Sep 17 00:00:00 2001 From: Andreas Nilsen Date: Mon, 1 Jul 2019 19:52:03 +0200 Subject: [PATCH 2/4] hcxtools: Fixed PKG_SOURCE_URL Signed-off-by: Andreas Nilsen --- net/hcxdumptool/Makefile | 4 ++-- net/hcxtools/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/hcxdumptool/Makefile b/net/hcxdumptool/Makefile index 493b1da19..be3b27dee 100644 --- a/net/hcxdumptool/Makefile +++ b/net/hcxdumptool/Makefile @@ -12,8 +12,8 @@ PKG_NAME:=hcxdumptool PKG_VERSION:=5.1.7 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/github.com/ZerBea/hcxdumptool/releases/download/v$(PKG_VERSION) +PKG_SOURCE:=$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/ZerBea/$(PKG_NAME)/archive/ PKG_HASH:=6ac996a506cb312a5f1c5987f30a4a80c793993908750f69f2df51056f961269 PKG_BUILD_PARALLEL:=1 diff --git a/net/hcxtools/Makefile b/net/hcxtools/Makefile index 36aef508f..b6cf970bf 100644 --- a/net/hcxtools/Makefile +++ b/net/hcxtools/Makefile @@ -11,8 +11,8 @@ PKG_NAME:=hcxtools PKG_VERSION:=5.1.6 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/github.com/ZerBea/hcxtools/releases/download/v$(PKG_VERSION) +PKG_SOURCE:=$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/ZerBea/$(PKG_NAME)/archive/ PKG_HASH:=19d2800c6f9339dd552ebc3e7195860f208a9856340b4db1aeaeb4a234557ca6 PKG_BUILD_PARALLEL:=1 From 6f6457fb373aa71a3546f43019c493f3b15fafc2 Mon Sep 17 00:00:00 2001 From: Andreas Nilsen Date: Tue, 2 Jul 2019 15:23:31 +0200 Subject: [PATCH 3/4] hcxtools: Changes to the Makefile, as suggested. - Now using codeload as suggested. - Removed PKG_BUILD_PARALLEL, and PKG_USE_MIPS16:=0 as it was no longer needed to build the latest version successfully. - Moved PKG_MAINTAINER to top. - Use INSTALL_BIN instead of CP - Added PKG_LICENSE and PKG_LICENSE_FILES - Fixed a typo in TITLE - DCO should be fixed now. Signed-off-by: Andreas Nilsen --- net/hcxdumptool/Makefile | 16 ++++++------- net/hcxtools/Makefile | 52 ++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/net/hcxdumptool/Makefile b/net/hcxdumptool/Makefile index be3b27dee..1eb34b40d 100644 --- a/net/hcxdumptool/Makefile +++ b/net/hcxdumptool/Makefile @@ -1,5 +1,4 @@ # -# Copyright (C) 2009-2014 OpenWrt.org # Copyright (C) 2019 Andreas Nilsen # # This is free software, licensed under the GNU General Public License v2. @@ -12,13 +11,13 @@ PKG_NAME:=hcxdumptool PKG_VERSION:=5.1.7 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/ZerBea/$(PKG_NAME)/archive/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/zerbea/hcxdumptool/tar.gz/$(PKG_VERSION)? PKG_HASH:=6ac996a506cb312a5f1c5987f30a4a80c793993908750f69f2df51056f961269 -PKG_BUILD_PARALLEL:=1 - -PKG_USE_MIPS16:=0 +PKG_MAINTAINER:=Andreas Nilsen +PKG_LICENSE:=MIT +PKG_LICENSE_FILE:=license.txt include $(INCLUDE_DIR)/package.mk @@ -27,9 +26,8 @@ define Package/hcxdumptool CATEGORY:=Network DEPENDS:=+libpcap TITLE:=hcxdumptool - URL:=https://github.com/ZerBea/hcxdumptool.git + URL:=https://github.com/ZerBea/hcxdumptool SUBMENU:=wireless - MAINTAINER:=Andreas Nilsen endef define Package/hcxdumptool/description @@ -48,7 +46,7 @@ endef define Package/hcxdumptool/install $(INSTALL_DIR) $(1)/sbin - $(CP) $(PKG_BUILD_DIR)/hcxdumptool $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxdumptool $(1)/sbin/ endef $(eval $(call BuildPackage,hcxdumptool)) diff --git a/net/hcxtools/Makefile b/net/hcxtools/Makefile index b6cf970bf..6ea883f94 100644 --- a/net/hcxtools/Makefile +++ b/net/hcxtools/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2014 OpenWrt.org +# Copyright (C) 2019 Andreas Nilsen # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,11 +11,13 @@ PKG_NAME:=hcxtools PKG_VERSION:=5.1.6 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/ZerBea/$(PKG_NAME)/archive/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/zerbea/hcxtools/tar.gz/$(PKG_VERSION)? PKG_HASH:=19d2800c6f9339dd552ebc3e7195860f208a9856340b4db1aeaeb4a234557ca6 -PKG_BUILD_PARALLEL:=1 +PKG_MAINTAINER:=Andreas Nilsen +PKG_LICENSE:=MIT +PKG_LICENSE_FILE:=license.txt include $(INCLUDE_DIR)/package.mk @@ -23,10 +25,9 @@ define Package/hcxtools SECTION:=net CATEGORY:=Network DEPENDS:=+libpthread +libpcap +zlib +libcurl +libopenssl - TITLE:= hcxtools - URL:=https://github.com/ZerBea/hcxtools.git + TITLE:=hcxtools + URL:=https://github.com/ZerBea/hcxtools SUBMENU:=wireless - MAINTAINER:=Andreas Nilsen endef define Package/hcxtools/description @@ -43,25 +44,24 @@ endef define Package/hcxtools/install $(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/etc - $(CP) $(PKG_BUILD_DIR)/wlanwkp2hcx $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanpmk2hcx $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanhcxmnc $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanhcx2essid $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanjohn2hcx $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/hcxpcaptool $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanhcx2john $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/hcxpsktool $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlancow2hcxpmk $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanhcxinfo $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/hcxhash2cap $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/hcxhashcattool $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanhashhcx $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlancap2wpasec $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlanhc2hcx $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/hcxwltool $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/whoismac $(1)/sbin/ - $(CP) $(PKG_BUILD_DIR)/wlancap2wpasec $(1)/sbin/ -# $(CP) $(PKG_BUILD_DIR)/usefulscripts/hcxgrep.py $(1)/sbin/hcxgrep + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanwkp2hcx $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanpmk2hcx $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanhcxmnc $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanhcx2essid $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanjohn2hcx $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxpcaptool $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanhcx2john $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxpsktool $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlancow2hcxpmk $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanhcxinfo $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxhash2cap $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxhashcattool $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanhashhcx $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlancap2wpasec $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlanhc2hcx $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hcxwltool $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/whoismac $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlancap2wpasec $(1)/sbin/ endef $(eval $(call BuildPackage,hcxtools)) From 0ae69587409e0b5dc8d3935c8e19d3b8db995019 Mon Sep 17 00:00:00 2001 From: Andreas Nilsen Date: Wed, 3 Jul 2019 08:02:21 +0200 Subject: [PATCH 4/4] hcxtools: Fixed typo in both Makefiles PKG_LICENCE_FILES vas wrongly named PKG_LICENCE_FILE Signed-off-by: Andreas Nilsen --- net/hcxdumptool/Makefile | 2 +- net/hcxtools/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/hcxdumptool/Makefile b/net/hcxdumptool/Makefile index 1eb34b40d..4b58479da 100644 --- a/net/hcxdumptool/Makefile +++ b/net/hcxdumptool/Makefile @@ -17,7 +17,7 @@ PKG_HASH:=6ac996a506cb312a5f1c5987f30a4a80c793993908750f69f2df51056f961269 PKG_MAINTAINER:=Andreas Nilsen PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=license.txt +PKG_LICENSE_FILES:=license.txt include $(INCLUDE_DIR)/package.mk diff --git a/net/hcxtools/Makefile b/net/hcxtools/Makefile index 6ea883f94..370ab685b 100644 --- a/net/hcxtools/Makefile +++ b/net/hcxtools/Makefile @@ -17,7 +17,7 @@ PKG_HASH:=19d2800c6f9339dd552ebc3e7195860f208a9856340b4db1aeaeb4a234557ca6 PKG_MAINTAINER:=Andreas Nilsen PKG_LICENSE:=MIT -PKG_LICENSE_FILE:=license.txt +PKG_LICENSE_FILES:=license.txt include $(INCLUDE_DIR)/package.mk