cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 6.1.6 -> 6.2.0

Browse Source
This commit is contained in:
sebastia 2021-05-22 21:54:07 +00:00
parent e0dfe9fc79
commit 92af5d1fa8
3 changed files with 4 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/hcxtools/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2021/04/03 21:48:56 sebastia Exp $
# $OpenBSD: Makefile,v 1.12 2021/05/22 21:54:07 sebastia Exp $
COMMENT = convert pcap dumps to hashcat or John the Ripper input
GH_ACCOUNT = ZerBea
GH_PROJECT = hcxtools
GH_TAGNAME = 6.1.6
GH_TAGNAME = 6.2.0
DISTNAME = hcxtools-${GH_TAGNAME}
CATEGORIES = security
@ -15,16 +15,11 @@ MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
PERMIT_PACKAGE= Yes
WANTLIB += c crypto ssl pthread curl z
#WANTLIB += lib/eopenssl11/crypto
#WANTLIB += lib/eopenssl11/ssl
LIB_DEPENDS += net/curl
# security/openssl/1.1
USE_GMAKE = Yes
ALL_TARGET =
#LDFLAGS += -Wl,-rpath=${LOCALBASE}/lib/eopenssl11 -L${LOCALBASE}/lib/eopenssl11 -L${LOCALBASE}/lib
MAKE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
#MAKE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/eopenssl11 -I${LOCALBASE}/include"

4
security/hcxtools/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hcxtools-6.1.6.tar.gz) = J7GxrXIrnYL46Sxr7JLQgRWeW4IlvSpHe/jTBP9K6wM=
SIZE (hcxtools-6.1.6.tar.gz) = 140927
SHA256 (hcxtools-6.2.0.tar.gz) = NENbCDhe4j28EFTpLlsaFjezUqpz/tMB75S0tAphZaE=
SIZE (hcxtools-6.2.0.tar.gz) = 141773

160
security/hcxtools/patches/patch-hcxpmktool_c
View File

@ -1,160 +0,0 @@
$OpenBSD: patch-hcxpmktool_c,v 1.1 2021/04/04 12:45:17 sebastia Exp $
from upstream
Index: hcxpmktool.c
--- hcxpmktool.c.orig
+++ hcxpmktool.c
@@ -45,10 +45,13 @@ static size_t testmiclen;
static EVP_MD_CTX *mdctx;
static EVP_PKEY *pkey;
+static hashlist_t hashlisttmp;
+
static uint8_t pkedata[102];
static uint8_t testptk[EVP_MAX_MD_SIZE];
-wpak = (wpakey_t*)&hashlist.eapol[EAPAUTH_SIZE];
+memcpy(&hashlisttmp, &hashlist, sizeof(hashlist));
+wpak = (wpakey_t*)&hashlisttmp.eapol[EAPAUTH_SIZE];
keyver = ntohs(wpak->keyinfo) & WPA_KEY_INFO_TYPE_MASK;
if(keyver == 2)
{
@@ -57,25 +60,25 @@ if(keyver == 2)
memset(&miccalculated, 0, sizeof(testptk));
pkeptr = pkedata;
memcpy(pkeptr, "Pairwise key expansion", 23);
- if(memcmp(hashlist.ap, hashlist.client, 6) < 0)
+ if(memcmp(hashlisttmp.ap, hashlisttmp.client, 6) < 0)
{
- memcpy(pkeptr +23, hashlist.ap, 6);
- memcpy(pkeptr +29, hashlist.client, 6);
+ memcpy(pkeptr +23, hashlisttmp.ap, 6);
+ memcpy(pkeptr +29, hashlisttmp.client, 6);
}
else
{
- memcpy(pkeptr +23, hashlist.client, 6);
- memcpy(pkeptr +29, hashlist.ap, 6);
+ memcpy(pkeptr +23, hashlisttmp.client, 6);
+ memcpy(pkeptr +29, hashlisttmp.ap, 6);
}
- if(memcmp(hashlist.nonce, wpak->nonce, 32) < 0)
+ if(memcmp(hashlisttmp.nonce, wpak->nonce, 32) < 0)
{
- memcpy (pkeptr +35, hashlist.nonce, 32);
+ memcpy (pkeptr +35, hashlisttmp.nonce, 32);
memcpy (pkeptr +67, wpak->nonce, 32);
}
else
{
memcpy (pkeptr +35, wpak->nonce, 32);
- memcpy (pkeptr +67, hashlist.nonce, 32);
+ memcpy (pkeptr +67, hashlisttmp.nonce, 32);
}
testptklen = 32;
mdctx = EVP_MD_CTX_new();
@@ -119,7 +122,7 @@ if(keyver == 2)
EVP_MD_CTX_free(mdctx);
return false;
}
- if(EVP_DigestSignUpdate(mdctx, hashlist.eapol, hashlist.eapauthlen) != 1)
+ if(EVP_DigestSignUpdate(mdctx, hashlisttmp.eapol, hashlisttmp.eapauthlen) != 1)
{
EVP_PKEY_free(pkey);
EVP_MD_CTX_free(mdctx);
@@ -142,25 +145,25 @@ else if(keyver == 1)
memset(&miccalculated, 0, sizeof(testptk));
pkeptr = pkedata;
memcpy(pkeptr, "Pairwise key expansion", 23);
- if(memcmp(hashlist.ap, hashlist.client, 6) < 0)
+ if(memcmp(hashlisttmp.ap, hashlisttmp.client, 6) < 0)
{
- memcpy(pkeptr +23, hashlist.ap, 6);
- memcpy(pkeptr +29, hashlist.client, 6);
+ memcpy(pkeptr +23, hashlisttmp.ap, 6);
+ memcpy(pkeptr +29, hashlisttmp.client, 6);
}
else
{
- memcpy(pkeptr +23, hashlist.client, 6);
- memcpy(pkeptr +29, hashlist.ap, 6);
+ memcpy(pkeptr +23, hashlisttmp.client, 6);
+ memcpy(pkeptr +29, hashlisttmp.ap, 6);
}
- if(memcmp(hashlist.nonce, wpak->nonce, 32) < 0)
+ if(memcmp(hashlisttmp.nonce, wpak->nonce, 32) < 0)
{
- memcpy (pkeptr +35, hashlist.nonce, 32);
+ memcpy (pkeptr +35, hashlisttmp.nonce, 32);
memcpy (pkeptr +67, wpak->nonce, 32);
}
else
{
memcpy (pkeptr +35, wpak->nonce, 32);
- memcpy (pkeptr +67, hashlist.nonce, 32);
+ memcpy (pkeptr +67, hashlisttmp.nonce, 32);
}
testptklen = 32;
mdctx = EVP_MD_CTX_new();
@@ -204,7 +207,7 @@ else if(keyver == 1)
EVP_MD_CTX_free(mdctx);
return false;
}
- if(EVP_DigestSignUpdate(mdctx, hashlist.eapol, hashlist.eapauthlen) != 1)
+ if(EVP_DigestSignUpdate(mdctx, hashlisttmp.eapol, hashlisttmp.eapauthlen) != 1)
{
EVP_PKEY_free(pkey);
EVP_MD_CTX_free(mdctx);
@@ -229,25 +232,25 @@ else if(keyver == 3)
pkedata[1] = 0;
pkeptr = pkedata +2;
memcpy(pkeptr, "Pairwise key expansion", 22);
- if(memcmp(hashlist.ap, hashlist.client, 6) < 0)
+ if(memcmp(hashlisttmp.ap, hashlisttmp.client, 6) < 0)
{
- memcpy(pkeptr +22, hashlist.ap, 6);
- memcpy(pkeptr +28, hashlist.client, 6);
+ memcpy(pkeptr +22, hashlisttmp.ap, 6);
+ memcpy(pkeptr +28, hashlisttmp.client, 6);
}
else
{
- memcpy(pkeptr +22, hashlist.client, 6);
- memcpy(pkeptr +28, hashlist.ap, 6);
+ memcpy(pkeptr +22, hashlisttmp.client, 6);
+ memcpy(pkeptr +28, hashlisttmp.ap, 6);
}
- if(memcmp(hashlist.nonce, wpak->nonce, 32) < 0)
+ if(memcmp(hashlisttmp.nonce, wpak->nonce, 32) < 0)
{
- memcpy (pkeptr +34, hashlist.nonce, 32);
+ memcpy (pkeptr +34, hashlisttmp.nonce, 32);
memcpy (pkeptr +66, wpak->nonce, 32);
}
else
{
memcpy (pkeptr +34, wpak->nonce, 32);
- memcpy (pkeptr +66, hashlist.nonce, 32);
+ memcpy (pkeptr +66, hashlisttmp.nonce, 32);
}
pkedata[100] = 0x80;
pkedata[101] = 1;
@@ -293,7 +296,7 @@ else if(keyver == 3)
EVP_MD_CTX_free(mdctx);
return false;
}
- if(EVP_DigestSignUpdate(mdctx, hashlist.eapol, hashlist.eapauthlen) != 1)
+ if(EVP_DigestSignUpdate(mdctx, hashlisttmp.eapol, hashlisttmp.eapauthlen) != 1)
{
EVP_PKEY_free(pkey);
EVP_MD_CTX_free(mdctx);
@@ -437,7 +440,7 @@ for(p = 7; p < len; p++)
{
if((!isxdigit(hashlinestring[p])) && (hashlinestring[p] != '*')) return false;
}
-hashlinedupa = strdupa(hashlinestring);
+hashlinedupa = strndup(hashlinestring, len +1);
if(hashlinedupa == NULL) return false;
token = strsep(&hashlinedupa, "*");
if(token == NULL) return false;