Date: Saturday, March 4, 2017 @ 21:26:51
Author: jelle
Revision: 214929
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
aircrack-ng/repos/community-staging-i686/
aircrack-ng/repos/community-staging-i686/9a1846507ff043c397257206ff21adae90a122f4.patch
(from rev 214928,
aircrack-ng/trunk/9a1846507ff043c397257206ff21adae90a122f4.patch)
aircrack-ng/repos/community-staging-i686/PKGBUILD
(from rev 214928, aircrack-ng/trunk/PKGBUILD)
aircrack-ng/repos/community-staging-x86_64/
aircrack-ng/repos/community-staging-x86_64/9a1846507ff043c397257206ff21adae90a122f4.patch
(from rev 214928,
aircrack-ng/trunk/9a1846507ff043c397257206ff21adae90a122f4.patch)
aircrack-ng/repos/community-staging-x86_64/PKGBUILD
(from rev 214928, aircrack-ng/trunk/PKGBUILD)
-------------------------------------------------------------------------+
community-staging-i686/9a1846507ff043c397257206ff21adae90a122f4.patch | 59
++++++++++
community-staging-i686/PKGBUILD | 41
++++++
community-staging-x86_64/9a1846507ff043c397257206ff21adae90a122f4.patch | 59
++++++++++
community-staging-x86_64/PKGBUILD | 41
++++++
4 files changed, 200 insertions(+)
Copied:
aircrack-ng/repos/community-staging-i686/9a1846507ff043c397257206ff21adae90a122f4.patch
(from rev 214928,
aircrack-ng/trunk/9a1846507ff043c397257206ff21adae90a122f4.patch)
===================================================================
--- community-staging-i686/9a1846507ff043c397257206ff21adae90a122f4.patch
(rev 0)
+++ community-staging-i686/9a1846507ff043c397257206ff21adae90a122f4.patch
2017-03-04 21:26:51 UTC (rev 214929)
@@ -0,0 +1,59 @@
+From 9a1846507ff043c397257206ff21adae90a122f4 Mon Sep 17 00:00:00 2001
+From: Thomas d'Otreppe <[email protected]>
+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 )
+ {
Copied: aircrack-ng/repos/community-staging-i686/PKGBUILD (from rev 214928,
aircrack-ng/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-03-04 21:26:51 UTC (rev 214929)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Brad Fanella <[email protected]>
+# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
+# Contributor: Corrado Primier <[email protected]>
+# Contributor: ice-man <[email protected]>
+
+pkgname=aircrack-ng
+_pkgver=1.2-rc4
+pkgver=${_pkgver//-/}
+pkgrel=3
+pkgdesc="Key cracker for the 802.11 WEP and WPA-PSK protocols"
+arch=('i686' 'x86_64')
+url="http://www.aircrack-ng.org";
+license=('GPL2')
+depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools' 'ethtool')
+conflicts=('aircrack-ng-scripts')
+replaces=('aircrack-ng-scripts')
+provides=('aircrack-ng-scripts')
+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
+
+ make sqlite=true experimental=true
+}
+
+package() {
+ cd $pkgname-$_pkgver
+
+ make DESTDIR="$pkgdir" sqlite=true experimental=true \
+ bindir=/usr/bin sbindir=/usr/bin mandir=/usr/share/man/man1/ \
+ smandir=/usr/share/man/man8/ install
+}
Copied:
aircrack-ng/repos/community-staging-x86_64/9a1846507ff043c397257206ff21adae90a122f4.patch
(from rev 214928,
aircrack-ng/trunk/9a1846507ff043c397257206ff21adae90a122f4.patch)
===================================================================
--- community-staging-x86_64/9a1846507ff043c397257206ff21adae90a122f4.patch
(rev 0)
+++ community-staging-x86_64/9a1846507ff043c397257206ff21adae90a122f4.patch
2017-03-04 21:26:51 UTC (rev 214929)
@@ -0,0 +1,59 @@
+From 9a1846507ff043c397257206ff21adae90a122f4 Mon Sep 17 00:00:00 2001
+From: Thomas d'Otreppe <[email protected]>
+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 )
+ {
Copied: aircrack-ng/repos/community-staging-x86_64/PKGBUILD (from rev 214928,
aircrack-ng/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-03-04 21:26:51 UTC (rev 214929)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Brad Fanella <[email protected]>
+# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
+# Contributor: Corrado Primier <[email protected]>
+# Contributor: ice-man <[email protected]>
+
+pkgname=aircrack-ng
+_pkgver=1.2-rc4
+pkgver=${_pkgver//-/}
+pkgrel=3
+pkgdesc="Key cracker for the 802.11 WEP and WPA-PSK protocols"
+arch=('i686' 'x86_64')
+url="http://www.aircrack-ng.org";
+license=('GPL2')
+depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools' 'ethtool')
+conflicts=('aircrack-ng-scripts')
+replaces=('aircrack-ng-scripts')
+provides=('aircrack-ng-scripts')
+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
+
+ make sqlite=true experimental=true
+}
+
+package() {
+ cd $pkgname-$_pkgver
+
+ make DESTDIR="$pkgdir" sqlite=true experimental=true \
+ bindir=/usr/bin sbindir=/usr/bin mandir=/usr/share/man/man1/ \
+ smandir=/usr/share/man/man8/ install
+}
