net-mgmt/kismet: Fix OpenSSL build PR: 231931 Submitted by: Nathan Index: net-mgmt/kismet/Makefile =================================================================== --- net-mgmt/kismet/Makefile (revision 481499) +++ net-mgmt/kismet/Makefile (working copy) @@ -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/ Index: net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc =================================================================== --- net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc (revision 481499) +++ net-mgmt/kismet/files/patch-restricted-plugin-ptw_aircrack-crypto.cc (working copy) @@ -1,10 +1,66 @@ ---- restricted-plugin-ptw/aircrack-crypto.cc.orig 2016-07-02 18:06:10 UTC +--- restricted-plugin-ptw/aircrack-crypto.cc.orig 2018-10-10 00:29:38 UTC +++ restricted-plugin-ptw/aircrack-crypto.cc -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "aircrack-crypto.h" - #include "aircrack-crctable.h" - #include "aircrack-ptw2-lib.h" +@@ -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 ) + {