[arch-commits] Commit in aircrack-ng/trunk (2 files)

[Jelle van der Waa]

    Date: Saturday, March 4, 2017 @ 21:26:33
  Author: jelle
Revision: 214928

upgpkg: aircrack-ng 1.2rc4-3

openssl 1.1 rebuild

Added:
  aircrack-ng/trunk/9a1846507ff043c397257206ff21adae90a122f4.patch
Modified:
  aircrack-ng/trunk/PKGBUILD

------------------------------------------------+
 9a1846507ff043c397257206ff21adae90a122f4.patch |   59 +++++++++++++++++++++++
 PKGBUILD                                       |   12 +++-
 2 files changed, 68 insertions(+), 3 deletions(-)

Added: 9a1846507ff043c397257206ff21adae90a122f4.patch
===================================================================
--- 9a1846507ff043c397257206ff21adae90a122f4.patch	                        (rev 0)
+++ 9a1846507ff043c397257206ff21adae90a122f4.patch	2017-03-04 21:26:33 UTC (rev 214928)
@@ -0,0 +1,59 @@
+From 9a1846507ff043c397257206ff21adae90a122f4 Mon Sep 17 00:00:00 2001
+From: Thomas d'Otreppe <tdotreppe at aircrack-ng.org>
+Date: Wed, 21 Dec 2016 00:18:46 +0000
+Subject: [PATCH] Fixed compilation with OpenSSL 1.1.0 (Closes: #1711).
+
+git-svn-id: http://svn.aircrack-ng.org/trunk@2882 28c6078b-6c39-48e3-add9-af49d547ecab
+---
+ src/crypto.c | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/src/crypto.c b/src/crypto.c
+index c331875..46fa9c5 100644
+--- a/src/crypto.c
++++ b/src/crypto.c
+@@ -288,7 +288,15 @@ void calc_pmk( char *key, char *essid_pre, unsigned char pmk[40] )
+ void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) {
+ 	int i;
+ 	unsigned char pke[100];
++	#if defined(USE_GCRYPT) || OPENSSL_VERSION_NUMBER < 0x10100000L
++		#define HMAC_USE_NO_PTR
++	#endif
++
++	#ifdef HMAC_USE_NO_PTR
+ 	HMAC_CTX ctx;
++	#else
++	HMAC_CTX * ctx;
++	#endif
+ 
+ 	memcpy( pke, "Pairwise key expansion", 23 );
+ 
+@@ -314,6 +322,7 @@ void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80],
+ 		memcpy( pke + 67, ap->wpa.snonce, 32 );
+ 	}
+ 
++	#ifdef HMAC_USE_NO_PTR
+ 	HMAC_CTX_init(&ctx);
+ 	HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL);
+ 	for(i = 0; i < 4; i++ )
+@@ -325,6 +334,20 @@ void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80],
+ 		HMAC_Final(&ctx, ptk + i*20, NULL);
+ 	}
+ 	HMAC_CTX_cleanup(&ctx);
++	#else
++	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_CTX_free(ctx);
++	#endif
++	#undef HMAC_USE_NO_PTR
+ 
+ 	if( ap->wpa.keyver == 1 )
+ 	{

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-04 21:09:16 UTC (rev 214927)
+++ PKGBUILD	2017-03-04 21:26:33 UTC (rev 214928)
@@ -8,7 +8,7 @@
 pkgname=aircrack-ng
 _pkgver=1.2-rc4
 pkgver=${_pkgver//-/}
-pkgrel=2
+pkgrel=3
 pkgdesc="Key cracker for the 802.11 WEP and WPA-PSK protocols"
 arch=('i686' 'x86_64')
 url="http://www.aircrack-ng.org"
@@ -17,9 +17,15 @@
 conflicts=('aircrack-ng-scripts')
 replaces=('aircrack-ng-scripts')
 provides=('aircrack-ng-scripts')
-source=(http://download.aircrack-ng.org/$pkgname-$_pkgver.tar.gz)
-md5sums=('3bbc7d5035a98ec01e78774d05c3fcce')
+source=(http://download.aircrack-ng.org/$pkgname-$_pkgver.tar.gz 9a1846507ff043c397257206ff21adae90a122f4.patch)
+md5sums=('3bbc7d5035a98ec01e78774d05c3fcce'
+         'efeab8202444d183b2fc02f455c1c294')
 
+prepare() {
+  cd $pkgname-$_pkgver
+  patch -Np1 -i $srcdir/9a1846507ff043c397257206ff21adae90a122f4.patch
+}
+
 build() {
   cd $pkgname-$_pkgver