mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-16 23:57:11 +00:00
community/aircrack-ng to 1.2rc4-4
This commit is contained in:
parent
fbffa35ba0
commit
a0d1118577
2 changed files with 65 additions and 3 deletions
|
@ -0,0 +1,59 @@
|
||||||
|
From 9a1846507ff043c397257206ff21adae90a122f4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas d'Otreppe <tdotreppe@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 )
|
||||||
|
{
|
|
@ -13,25 +13,28 @@
|
||||||
pkgname=aircrack-ng
|
pkgname=aircrack-ng
|
||||||
_pkgver=1.2-rc4
|
_pkgver=1.2-rc4
|
||||||
pkgver=${_pkgver//-/}
|
pkgver=${_pkgver//-/}
|
||||||
pkgrel=2
|
pkgrel=4
|
||||||
pkgdesc="Key cracker for the 802.11 WEP and WPA-PSK protocols"
|
pkgdesc="Key cracker for the 802.11 WEP and WPA-PSK protocols"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.aircrack-ng.org"
|
url="https://www.aircrack-ng.org"
|
||||||
license=('GPL2')
|
license=('GPL2')
|
||||||
depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools' 'ethtool')
|
depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools' 'ethtool')
|
||||||
conflicts=('aircrack-ng-scripts')
|
conflicts=('aircrack-ng-scripts')
|
||||||
replaces=('aircrack-ng-scripts')
|
replaces=('aircrack-ng-scripts')
|
||||||
provides=('aircrack-ng-scripts')
|
provides=('aircrack-ng-scripts')
|
||||||
source=(http://download.aircrack-ng.org/$pkgname-$_pkgver.tar.gz
|
source=(https://download.aircrack-ng.org/$pkgname-$_pkgver.tar.gz
|
||||||
|
9a1846507ff043c397257206ff21adae90a122f4.patch
|
||||||
https://github.com/aircrack-ng/aircrack-ng/commit/252717588f2483a007bbd8bb6ceac3257e8c67e8.patch
|
https://github.com/aircrack-ng/aircrack-ng/commit/252717588f2483a007bbd8bb6ceac3257e8c67e8.patch
|
||||||
https://github.com/aircrack-ng/aircrack-ng/commit/913443c9745f72899fdd75e71217dd7b3d76ce34.patch)
|
https://github.com/aircrack-ng/aircrack-ng/commit/913443c9745f72899fdd75e71217dd7b3d76ce34.patch)
|
||||||
md5sums=('3bbc7d5035a98ec01e78774d05c3fcce'
|
md5sums=('3bbc7d5035a98ec01e78774d05c3fcce'
|
||||||
|
'efeab8202444d183b2fc02f455c1c294'
|
||||||
'872a852ce0e2daffeb5038d81153d97c'
|
'872a852ce0e2daffeb5038d81153d97c'
|
||||||
'5370cdb6889619ff425e74fc58f4b91b')
|
'5370cdb6889619ff425e74fc58f4b91b')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $pkgname-$_pkgver
|
cd $pkgname-$_pkgver
|
||||||
|
|
||||||
|
patch -Np1 -i "$srcdir"/9a1846507ff043c397257206ff21adae90a122f4.patch
|
||||||
patch -p1 -i ../252717588f2483a007bbd8bb6ceac3257e8c67e8.patch
|
patch -p1 -i ../252717588f2483a007bbd8bb6ceac3257e8c67e8.patch
|
||||||
patch -p1 -i ../913443c9745f72899fdd75e71217dd7b3d76ce34.patch
|
patch -p1 -i ../913443c9745f72899fdd75e71217dd7b3d76ce34.patch
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue