svn commit: r483692 - in branches/2018Q4/net-mgmt/kismet: . files
Antoine Brodin
antoine at FreeBSD.org
Thu Nov 1 17:58:48 UTC 2018
Author: antoine
Date: Thu Nov 1 17:58:46 2018
New Revision: 483692
URL: https://svnweb.freebsd.org/changeset/ports/483692
Log:
MFH: r483399
net-mgmt/kismet: fix build on 12 with OpenSSL 1.1.1
PR: 232140
Submitted by: Nathan <ndowens at yahoo.com>
Added:
branches/2018Q4/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc
- copied unchanged from r483399, head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc
Deleted:
branches/2018Q4/net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc
Modified:
branches/2018Q4/net-mgmt/kismet/Makefile
Directory Properties:
branches/2018Q4/ (props changed)
Modified: branches/2018Q4/net-mgmt/kismet/Makefile
==============================================================================
--- branches/2018Q4/net-mgmt/kismet/Makefile Thu Nov 1 17:54:30 2018 (r483691)
+++ branches/2018Q4/net-mgmt/kismet/Makefile Thu Nov 1 17:58:46 2018 (r483692)
@@ -3,7 +3,7 @@
PORTNAME= kismet
DISTVERSION= 2016-07-R1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.kismetwireless.net/code/
@@ -13,8 +13,9 @@ COMMENT= 802.11 layer2 wireless network detector, snif
LICENSE= GPLv2
-GNU_CONFIGURE= yes
USES= gmake tar:xz
+
+GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -63,6 +64,12 @@ PLIST_SUB+= PLUGINS=""
PLIST_SUB+= PLUGINS="@comment "
.endif
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000
+EXTRA_PATCHES=${FILESDIR}/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc
+.endif
+
post-patch:
@${REINPLACE_CMD} -e "/gps=/s/true/false/" \
-e "/ouifile=/{/wireshark/d;s|/etc|${DOCSDIR}|;}" \
@@ -99,4 +106,4 @@ post-install:
${MV} ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf \
${STAGEDIR}${PREFIX}/etc/kismet_drone.conf.sample
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Copied: branches/2018Q4/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc (from r483399, head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q4/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc Thu Nov 1 17:58:46 2018 (r483692, copy of r483399, head/net-mgmt/kismet/files/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc)
@@ -0,0 +1,66 @@
+--- restricted-plugin-ptw/aircrack-crypto.cc.orig 2018-10-10 00:29:38 UTC
++++ restricted-plugin-ptw/aircrack-crypto.cc
+@@ -232,7 +232,7 @@ void calc_pmk( char *key, char *essid_pre, uchar pmk[4
+ // void calc_ptk (struct WPA_hdsk *wpa, unsigned char bssid[6], unsigned char pmk[32], unsigned char ptk[80]) {
+ // int i;
+ // uchar pke[100];
+-// HMAC_CTX ctx;
++// HMAC_CTX *ctx;
+ //
+ // memcpy( pke, "Pairwise key expansion", 23 );
+ //
+@@ -258,23 +258,23 @@ void calc_pmk( char *key, char *essid_pre, uchar pmk[4
+ // memcpy( pke + 67, wpa->snonce, 32 );
+ // }
+ //
+-// HMAC_CTX_init(&ctx);
+-// HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL);
++// ctx = HMAC_CTX_new();
++// HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL);
+ // for(i = 0; i < 4; i++ )
+ // {
+ // pke[99] = i;
+ // //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL);
+-// HMAC_Init_ex(&ctx, 0, 0, 0, 0);
+-// HMAC_Update(&ctx, pke, 100);
+-// HMAC_Final(&ctx, ptk + i*20, NULL);
++// HMAC_Init_ex(ctx, 0, 0, 0, 0);
++// HMAC_Update(ctx, pke, 100);
++// HMAC_Final(ctx, ptk + i*20, NULL);
+ // }
+-// HMAC_CTX_cleanup(&ctx);
++// HMAC_CTX_free(ctx);
+ // }
+
+ void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) {
+ int i;
+ uchar pke[100];
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+
+ memcpy( pke, "Pairwise key expansion", 23 );
+
+@@ -300,17 +300,17 @@ void calc_mic (struct AP_info *ap, unsigned char pmk[3
+ memcpy( pke + 67, ap->wpa.snonce, 32 );
+ }
+
+- HMAC_CTX_init(&ctx);
+- HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL);
++ ctx = HMAC_CTX_new();
++ HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL);
+ for(i = 0; i < 4; i++ )
+ {
+ pke[99] = i;
+ //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL);
+- HMAC_Init_ex(&ctx, 0, 0, 0, 0);
+- HMAC_Update(&ctx, pke, 100);
+- HMAC_Final(&ctx, ptk + i*20, NULL);
++ HMAC_Init_ex(ctx, 0, 0, 0, 0);
++ HMAC_Update(ctx, pke, 100);
++ HMAC_Final(ctx, ptk + i*20, NULL);
+ }
+- HMAC_CTX_cleanup(&ctx);
++ HMAC_CTX_free(ctx);
+
+ if( ap->wpa.keyver == 1 )
+ {
More information about the svn-ports-branches
mailing list