From: Alon Bar-Lev Date: Fri, 13 Apr 2007 16:44:44 +0000 (+0000) Subject: Added security patch, downgrade from upstream, bug#174340 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7292985b4339595a82c5c72ae7b485775c4f39e2;p=gentoo.git Added security patch, downgrade from upstream, bug#174340 Package-Manager: portage-2.1.2.3 --- diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog index e173de384666..48df9b92ea15 100644 --- a/net-wireless/aircrack-ng/ChangeLog +++ b/net-wireless/aircrack-ng/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-wireless/aircrack-ng # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.20 2007/03/18 08:52:51 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.21 2007/04/13 16:44:44 alonbl Exp $ + +*aircrack-ng-0.7-r2 (13 Apr 2007) + + 13 Apr 2007; Alon Bar-Lev + +files/aircrack-ng-0.7-security.patch, +aircrack-ng-0.7-r2.ebuild: + Added security patch, downgrade from upstream, bug#174340 18 Mar 2007; Peter Weller aircrack-ng-0.7-r1.ebuild: Keyworded ~x86-fbsd wrt bug 171217 diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest index 34aa6e9cbaa0..1c418a096a40 100644 --- a/net-wireless/aircrack-ng/Manifest +++ b/net-wireless/aircrack-ng/Manifest @@ -2,6 +2,10 @@ AUX aircrack-ng-0.7-make.patch 1261 RMD160 e46aa33ac2e3b57caa8f7f14305983968578a MD5 c62a367c069d6ed958fae26027883921 files/aircrack-ng-0.7-make.patch 1261 RMD160 e46aa33ac2e3b57caa8f7f14305983968578ac83 files/aircrack-ng-0.7-make.patch 1261 SHA256 6317e46d78ef6780ec3e2fbe50b796256bea109da18f4519244d73495d9642d1 files/aircrack-ng-0.7-make.patch 1261 +AUX aircrack-ng-0.7-security.patch 1180 RMD160 641d29781ab58b4c42a210cfb296192c1107df2c SHA1 ea521cfc4d5539f34ced247c99015acc78a1b08b SHA256 42f7e54eeae252594e54a76c6e7112c0f2ebef415385595a3fc91e3be4f800db +MD5 baead82b5fa4868f149955a90aa64142 files/aircrack-ng-0.7-security.patch 1180 +RMD160 641d29781ab58b4c42a210cfb296192c1107df2c files/aircrack-ng-0.7-security.patch 1180 +SHA256 42f7e54eeae252594e54a76c6e7112c0f2ebef415385595a3fc91e3be4f800db files/aircrack-ng-0.7-security.patch 1180 AUX process-group-leader.c 373 RMD160 2ce7341f5a58d2223590f1edfbcd1230a909024b SHA1 4653e2329b901dbb96f1380b478ea1de63d2a08b SHA256 153666625e942384648dafedbc8f37577fdf6a24060b04237913fd7f693f7bf7 MD5 60c2b836aec96d43a5c9e681256d7d42 files/process-group-leader.c 373 RMD160 2ce7341f5a58d2223590f1edfbcd1230a909024b files/process-group-leader.c 373 @@ -11,10 +15,14 @@ EBUILD aircrack-ng-0.7-r1.ebuild 1415 RMD160 eeb9c996915e745b05103af794969d70172 MD5 cc03d2352f561deb46c0f7f3e496eb58 aircrack-ng-0.7-r1.ebuild 1415 RMD160 eeb9c996915e745b05103af794969d701720af72 aircrack-ng-0.7-r1.ebuild 1415 SHA256 9ba1d66ce1092164521dd2c9c942bd2f1b1d0c3b43eb9ec548e52bb4a9136470 aircrack-ng-0.7-r1.ebuild 1415 -MISC ChangeLog 3435 RMD160 388b9773f5e087bd5e18dd722f6125a9dfbacda4 SHA1 9567131d1b795c00c7acf59c2663773d77e2ec7c SHA256 64d263f0604fad79ab9ddf6a046b4111f61d4f86bbf0ce620071a02a3cfb8fb0 -MD5 d4acea459a1122effea8c1bb97f5bc4b ChangeLog 3435 -RMD160 388b9773f5e087bd5e18dd722f6125a9dfbacda4 ChangeLog 3435 -SHA256 64d263f0604fad79ab9ddf6a046b4111f61d4f86bbf0ce620071a02a3cfb8fb0 ChangeLog 3435 +EBUILD aircrack-ng-0.7-r2.ebuild 1460 RMD160 7dd4bb47092b5bcbfd6d25482052bb757db612f3 SHA1 170945e805359bfae442839d463f629353be34e5 SHA256 3461c736d2dc6c4b942070c42243328cf4284ffaea00dc12dfa20ef274a24631 +MD5 3a3610b1470ec42a6916b8d579e32a7c aircrack-ng-0.7-r2.ebuild 1460 +RMD160 7dd4bb47092b5bcbfd6d25482052bb757db612f3 aircrack-ng-0.7-r2.ebuild 1460 +SHA256 3461c736d2dc6c4b942070c42243328cf4284ffaea00dc12dfa20ef274a24631 aircrack-ng-0.7-r2.ebuild 1460 +MISC ChangeLog 3650 RMD160 9520c4e9182ac6826c57ffe32b8c63da07bc3fdb SHA1 fae67d85746526ce2b9a0d25d8cf7b19219224e4 SHA256 26471a76934874ee93b0c40cb7a6057ff2e199ae2ad53a82162481247d2f8007 +MD5 7d82531160dea3d4fb09b6bcdc439baf ChangeLog 3650 +RMD160 9520c4e9182ac6826c57ffe32b8c63da07bc3fdb ChangeLog 3650 +SHA256 26471a76934874ee93b0c40cb7a6057ff2e199ae2ad53a82162481247d2f8007 ChangeLog 3650 MISC metadata.xml 545 RMD160 74b28f94434b9af081b71806679b128b42cb8068 SHA1 b9b41decbf07297e72c3f682be1c13415df1f402 SHA256 af8903a9f2e95968febae6760b251c2145e3a26569f71ff64266ae2b4fcbbb2a MD5 fa1e307730dae389bd54c27130c69ec5 metadata.xml 545 RMD160 74b28f94434b9af081b71806679b128b42cb8068 metadata.xml 545 @@ -22,3 +30,6 @@ SHA256 af8903a9f2e95968febae6760b251c2145e3a26569f71ff64266ae2b4fcbbb2a metadata MD5 8d3179b71b0c57b3cfb122ce978fbc6c files/digest-aircrack-ng-0.7-r1 247 RMD160 469e602cbf5f66005fd7d159bbedc5781a820d69 files/digest-aircrack-ng-0.7-r1 247 SHA256 c8e3bdc87423c0f14a7a2701747ec72e78ca847f664c192f4a2310b8aa71412c files/digest-aircrack-ng-0.7-r1 247 +MD5 8d3179b71b0c57b3cfb122ce978fbc6c files/digest-aircrack-ng-0.7-r2 247 +RMD160 469e602cbf5f66005fd7d159bbedc5781a820d69 files/digest-aircrack-ng-0.7-r2 247 +SHA256 c8e3bdc87423c0f14a7a2701747ec72e78ca847f664c192f4a2310b8aa71412c files/digest-aircrack-ng-0.7-r2 247 diff --git a/net-wireless/aircrack-ng/aircrack-ng-0.7-r2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-0.7-r2.ebuild new file mode 100644 index 000000000000..12742b8942bc --- /dev/null +++ b/net-wireless/aircrack-ng/aircrack-ng-0.7-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-0.7-r2.ebuild,v 1.1 2007/04/13 16:44:44 alonbl Exp $ + +inherit toolchain-funcs eutils + +DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys" +HOMEPAGE="http://www.aircrack-ng.org" +SRC_URI="http://download.aircrack-ng.org/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="wifi" + +DEPEND="wifi? ( net-libs/libpcap )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-make.patch" + epatch "${FILESDIR}/${P}-security.patch" +} + +src_compile() { + local target + use wifi || target="userland" + emake -e CC="$(tc-getCC)" ${target} || die "emake failed" +} + +src_install() { + local target + use wifi && target="install" || target="install_userland" + emake \ + prefix=/usr \ + docdir="/usr/share/doc/${PF}" \ + mandir="/usr/share/man/man1" \ + destdir="${D}" \ + ${target} \ + doc \ + || die "emake install failed" +} + +src_test() { + #./makeivs wep.ivs 11111111111111111111111111 || die 'generating ivs file failed' + #./aircrack-ng wep.ivs || die 'cracking WEP key failed' + + # Upstream uses signal in order to quit, + # So protect busybox with process group leader. + "$(tc-getCC)" -o process-group-leader "${FILESDIR}/process-group-leader.c" + ./process-group-leader ./aircrack-ng -w test/password.lst test/wpa.cap || die 'cracking WPA key failed' +} + diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-0.7-security.patch b/net-wireless/aircrack-ng/files/aircrack-ng-0.7-security.patch new file mode 100644 index 000000000000..4a8c371338ad --- /dev/null +++ b/net-wireless/aircrack-ng/files/aircrack-ng-0.7-security.patch @@ -0,0 +1,37 @@ +diff -urNp aircrack-ng-0.7.org/src/airodump-ng.c aircrack-ng-0.7/src/airodump-ng.c +--- aircrack-ng-0.7.org/src/airodump-ng.c 2007-01-07 18:11:06.000000000 +0200 ++++ aircrack-ng-0.7/src/airodump-ng.c 2007-04-13 19:41:34.000000000 +0300 +@@ -261,6 +261,8 @@ int check_shared_key(unsigned char *h802 + char prga[512]; + unsigned int long crc; + ++ if((unsigned)caplen > sizeof(h80211)) return 1; ++ + if( time(NULL) - G.sk_start > 5) + { + /* timeout(5sec) - remove all packets, restart timer */ +@@ -323,6 +325,8 @@ int check_shared_key(unsigned char *h802 + + textlen = G.sk_len; + ++ if((unsigned)textlen > sizeof(text)) return 1; ++ + memcpy(text, G.sharedkey[0]+24, textlen); + + +@@ -970,6 +974,7 @@ skip_station: + { + // n = ( p[1] > 32 ) ? 32 : p[1]; + n = p[1]; ++ n &= 0xff; + + for( i = 0; i < n; i++ ) + if( p[2 + i] > 0 && p[2 + i] < ' ' ) +@@ -1029,6 +1034,7 @@ skip_probe: + + // n = ( p[1] > 32 ) ? 32 : p[1]; + n = p[1]; ++ n &= 0xff; + + memset( ap_cur->essid, 0, 256 ); + memcpy( ap_cur->essid, p + 2, n ); diff --git a/net-wireless/aircrack-ng/files/digest-aircrack-ng-0.7-r2 b/net-wireless/aircrack-ng/files/digest-aircrack-ng-0.7-r2 new file mode 100644 index 000000000000..1087c741de77 --- /dev/null +++ b/net-wireless/aircrack-ng/files/digest-aircrack-ng-0.7-r2 @@ -0,0 +1,3 @@ +MD5 34c0447951d438d76fa32d08eab5da01 aircrack-ng-0.7.tar.gz 172998 +RMD160 a1828d93ab6433319176f7884ab4f607053018da aircrack-ng-0.7.tar.gz 172998 +SHA256 90cbd5030938ce1622a8e399c95088bf464bceb95adc290640d4610eb8522aeb aircrack-ng-0.7.tar.gz 172998