Your message dated Wed, 18 Jul 2012 20:04:48 +0200 with message-id <20120718180448.GY7369@radis.cristau.org> and subject line Re: Bug#682005: unblock: aircrack-ng/1:1.1-4 has caused the Debian Bug report #682005, regarding unblock: aircrack-ng/1:1.1-4 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 682005: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682005 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: aircrack-ng/1:1.1-4
- From: Carlos Alberto Lopez Perez <clopez@igalia.com>
- Date: Wed, 18 Jul 2012 17:55:17 +0200
- Message-id: <5006DC65.5000308@igalia.com>
Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: unblock Severity: normal Please unblock package aircrack-ng Hello, I want to upload a new version of aircrack-ng to unstable, but before doing it I would like to get the unblock approval from the release team. Attached is the debdiff. The new version fixes the following: * fixes a FTBFS and RC bug (#600753) This is the bigger change, it removes the patch 007-Add-support-for-GnuTLS.patch that broke aircrack-ng on all non-SSE2 CPUs and adds a rewrote version of this patch with a new name 011-add-support-for-gcrypt.diff that makes aircrack-ng work on all architectures fixing the bug #600753. The build-dependency on GnuTLS is removed since is not longer needed with this new patch and the build-dependency on zlib1g-dev is added (zlib1g-dev was a dependency of GnuTLS). It also changes the makefile switch on debian/rules from "gnutls=true" to "gcrypt=true" (for coherence reasons) * fixes building on GNU/Hurd (new patch 012-fix-hurd-ftbfs.diff) * fixes building on kFreeBSD (new patch 013-workaround-681113-kfreebsd.diff) The rest of the changes are documentation/cosmetic: * Updates DEP-3 headers on patches {004,005,006,009,010} * Refreshes patches {005,010} * Updates MAC-Vendor txt file mappings (airodump-ng-oui.txt) * Adds a new entry on README.Debian explaining the changes * Fixes formatting on a man page (new patch 014-man_page_formatting.diff) (Closes: #570986) Thanks! unblock aircrack-ng/1:1.1-4diff -Nru aircrack-ng-1.1/debian/airodump-ng-oui/airodump-ng-oui.txt aircrack-ng-1.1/debian/airodump-ng-oui/airodump-ng-oui.txt --- aircrack-ng-1.1/debian/airodump-ng-oui/airodump-ng-oui.txt 2012-06-16 19:12:08.000000000 +0200 +++ aircrack-ng-1.1/debian/airodump-ng-oui/airodump-ng-oui.txt 2012-07-16 23:19:49.000000000 +0200 @@ -3244,7 +3244,7 @@ 00-0C-C7 (hex) Intelligent Computer Solutions Inc. 00-0C-C8 (hex) Xytronix Research & Design, Inc. 00-0C-C9 (hex) ILWOO DATA & TECHNOLOGY CO.,LTD -00-0C-CA (hex) Hitachi Global Storage Technologies +00-0C-CA (hex) HGST a Western Digital Company 00-0C-CB (hex) Design Combus Ltd 00-0C-CC (hex) Aeroscout Ltd. 00-0C-CD (hex) IEC - TC57 @@ -9435,7 +9435,7 @@ 00-24-FA (hex) Hilger u. Kern GMBH 00-24-FB (hex) PRIVATE 00-24-FC (hex) QuoPin Co., Ltd. -00-24-FD (hex) Prosilient Technologies AB +00-24-FD (hex) Accedian Networks Inc 00-24-FE (hex) AVM GmbH 00-24-FF (hex) QLogic Corporation 00-25-00 (hex) Apple, Inc @@ -10759,6 +10759,7 @@ 00-52-18 (hex) Wuxi Keboda Electron Co.Ltd 00-54-AF (hex) Continental Automotive Systems Inc. 00-5C-B1 (hex) Gospell DIGITAL TECHNOLOGY CO., LTD +00-5D-03 (hex) Xilinx, Inc 00-60-00 (hex) XYCOM INC. 00-60-01 (hex) InnoSys, Inc. 00-60-02 (hex) SCREEN SUBTITLING SYSTEMS, LTD @@ -12376,6 +12377,7 @@ 00-D1-1C (hex) ACETEL 00-D3-8D (hex) Hotel Technology Next Generation 00-D6-32 (hex) GE Energy +00-DB-1E (hex) Albedo Telecom SL 00-DB-45 (hex) THAMWAY CO.,LTD. 00-DB-DF (hex) Intel Corporate 00-DD-00 (hex) UNGERMANN-BASS INC. @@ -12714,6 +12716,7 @@ 04-94-A1 (hex) CATCH THE WIND INC 04-98-F3 (hex) ALPS Electric Co,. Ltd. 04-9C-62 (hex) BMT Medical Technology s.r.o. +04-9F-06 (hex) Smobile Co., Ltd. 04-9F-81 (hex) Simena, LLC 04-A3-F3 (hex) Emicon 04-A8-2A (hex) Nokia Corporation @@ -12883,6 +12886,7 @@ 08-00-8F (hex) CHIPCOM CORPORATION 08-00-90 (hex) SONOMA SYSTEMS 08-08-EA (hex) AMSC +08-0C-0B (hex) SysMik GmbH Dresden 08-0C-C9 (hex) Mission Technology Group, dba Magma 08-0D-84 (hex) GECO, Inc. 08-11-96 (hex) Intel Corporate @@ -12904,10 +12908,12 @@ 08-4E-BF (hex) Broad Net Mux Corporation 08-51-2E (hex) Orion Diagnostica Oy 08-5B-0E (hex) Fortinet, Inc. +08-68-EA (hex) EITO ELECTRONICS CO., LTD. 08-75-72 (hex) Obelux Oy 08-76-18 (hex) ViE Technologies Sdn. Bhd. 08-76-95 (hex) Auto Industrial Co., Ltd. 08-76-FF (hex) Thomson Telecom Belgium +08-7C-BE (hex) Quintic Corp. 08-7D-21 (hex) Altasec technology corporation 08-86-3B (hex) Belkin International, Inc. 08-8D-C8 (hex) Ryowa Electronics Co.,Ltd @@ -12973,6 +12979,8 @@ 0C-BF-15 (hex) Genetec 0C-C0-C0 (hex) MAGNETI MARELLI SISTEMAS ELECTRONICOS MEXICO 0C-C3-A7 (hex) Meritec +0C-C4-7E (hex) EUCAST Co., Ltd. +0C-C6-6A (hex) Nokia Corporation 0C-C6-AC (hex) DAGS 0C-C9-C6 (hex) Samwin Hong Kong Limited 0C-CD-D3 (hex) EASTRIVER TECHNOLOGY CO., LTD. @@ -12983,6 +12991,7 @@ 0C-D7-C2 (hex) Axium Technologies, Inc. 0C-D9-96 (hex) Cisco Systems 0C-D9-C1 (hex) Johnson Controls-ASG +0C-DA-41 (hex) Hangzhou H3C Technologies Co., Limited 0C-DC-CC (hex) Inala Technologies 0C-DD-EF (hex) Nokia Corporation 0C-DF-A4 (hex) Samsung Electronics Co.,Ltd @@ -13007,6 +13016,7 @@ 10-0E-2B (hex) NEC CASIO Mobile Communications 10-10-B6 (hex) McCain Inc 10-12-12 (hex) Vivo International Corporation Pty Ltd +10-12-48 (hex) ITG, Inc. 10-13-EE (hex) Justec International Technology INC. 10-18-9E (hex) Elmo Motion Control 10-1B-54 (hex) HUAWEI TECHNOLOGIES CO.,LTD @@ -13021,12 +13031,15 @@ 10-45-BE (hex) Norphonic AS 10-45-F8 (hex) LNT-Automation GmbH 10-47-80 (hex) HUAWEI TECHNOLOGIES CO.,LTD +10-48-B1 (hex) Beijing Duokan Technology Limited 10-56-CA (hex) Peplink International Ltd. 10-5F-49 (hex) Cisco SPVTG +10-60-4B (hex) Hewlett Packard 10-62-C9 (hex) Adatis GmbH & Co. KG 10-64-E2 (hex) ADFweb.com s.r.l. 10-65-A3 (hex) Panamax Inc. 10-6F-3F (hex) Buffalo Inc. +10-6F-EF (hex) Ad-Sol Nissin Corp 10-71-F9 (hex) Cloud Telecomputers, LLC 10-76-8A (hex) EoCell 10-78-D2 (hex) ELITEGROUP COMPUTER SYSTEM CO., LTD. @@ -13056,12 +13069,14 @@ 10-E6-AE (hex) Source Technologies, LLC 10-E8-EE (hex) PhaseSpace 10-EE-D9 (hex) Canoga Perkins Corporation +10-F3-DB (hex) Gridco Systems, Inc. 10-F9-6F (hex) LG Electronics 10-F9-EE (hex) Nokia Corporation 10-FC-54 (hex) Shany Electronic Co., Ltd. 11-00-AA (hex) PRIVATE 14-07-08 (hex) PRIVATE 14-07-E0 (hex) Abrantix AG +14-10-9F (hex) Apple Inc 14-14-4B (hex) FUJIAN STAR-NET COMMUNICATION CO.,LTD 14-1A-51 (hex) Treetech Sistemas Digitais 14-1B-BD (hex) Volex Inc. @@ -13114,6 +13129,7 @@ 18-06-75 (hex) DILAX Intelcom GmbH 18-0B-52 (hex) Nanotron Technologies GmbH 18-0C-77 (hex) Westinghouse Electric Company, LLC +18-0C-AC (hex) CANON INC. 18-14-20 (hex) TEB SAS 18-14-56 (hex) Nokia Corporation 18-17-14 (hex) DAEWOOIS @@ -13196,6 +13212,7 @@ 1C-62-B8 (hex) Samsung Electronics Co.,Ltd 1C-65-9D (hex) Liteon Technology Corporation 1C-66-6D (hex) Hon Hai Precision Ind.Co.Ltd +1C-66-AA (hex) Samsung Electronics 1C-69-A5 (hex) Research In Motion 1C-6B-CA (hex) Mitsunami Co., Ltd. 1C-6F-65 (hex) GIGA-BYTE TECHNOLOGY CO.,LTD. @@ -13219,6 +13236,7 @@ 1C-BD-0E (hex) Amplified Engineering Pty Ltd 1C-BD-B9 (hex) D-LINK INTERNATIONAL PTE LIMITED 1C-C1-DE (hex) Hewlett-Packard Company +1C-C3-16 (hex) MileSight Technology Co., Ltd. 1C-C6-3C (hex) Arcadyan Technology Corporation 1C-D4-0C (hex) Kriwan Industrie-Elektronik GmbH 1C-DF-0F (hex) Cisco Systems @@ -13226,7 +13244,7 @@ 1C-E1-92 (hex) Qisda Corporation 1C-E2-CC (hex) Texas Instruments 1C-F0-61 (hex) SCAPS GmbH -1C-F4-CA (hex) Aviwest +1C-F4-CA (hex) PRIVATE 1C-F5-E7 (hex) Turtle Industry Co., Ltd. 1C-FE-A7 (hex) IDentytech Solutins Ltd. 20-01-4F (hex) Linea Research Ltd @@ -13260,6 +13278,7 @@ 20-6A-8A (hex) Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd. 20-6A-FF (hex) Atlas Elektronik UK Limited 20-6F-EC (hex) Braemac CA LLC +20-74-CF (hex) Shenzhen Voxtech Co.,Ltd 20-76-00 (hex) Actiontec Electronics, Inc 20-7C-8F (hex) Quanta Microsystems,Inc. 20-89-84 (hex) COMPAL INFORMATION (KUNSHAN) CO., LTD @@ -13341,6 +13360,7 @@ 24-DB-AD (hex) ShopperTrak RCT Corporation 24-E6-BA (hex) JSC Zavod im. Kozitsky 24-EC-99 (hex) Askey Computer Corp +24-EE-3A (hex) Chengdu Yingji Electronic Hi-tech Co Ltd 24-F0-FF (hex) GHT Co., Ltd. 28-04-E0 (hex) FERMAX ELECTRONICA S.A.U. 28-06-1E (hex) NINGBO GLOBAL USEFUL ELECTRIC CO.,LTD @@ -13380,9 +13400,12 @@ 28-93-FE (hex) Cisco Systems 28-94-0F (hex) Cisco Systems 28-98-7B (hex) Samsung Electronics Co.,Ltd +28-9A-4B (hex) SteelSeries ApS +28-9E-DF (hex) Danfoss Turbocor Compressors, Inc 28-A5-74 (hex) Miller Electric Mfg. Co. 28-AF-0A (hex) Sirius XM Radio Inc 28-B0-CC (hex) Xenya d.o.o. +28-B3-AB (hex) Genmark Automation 28-BA-18 (hex) NextNav, LLC 28-BE-9B (hex) Technicolor USA Inc. 28-C0-DA (hex) Juniper Networks @@ -13426,6 +13449,7 @@ 2C-41-38 (hex) Hewlett-Packard Company 2C-44-01 (hex) Samsung Electronics Co.,Ltd 2C-54-2D (hex) Cisco Systems +2C-62-5A (hex) Finest Security Systems Co., Ltd 2C-62-89 (hex) Regenersis (Glenrothes) Ltd 2C-67-FB (hex) ShenZhen Zhengjili Electronics Co., LTD 2C-6B-F5 (hex) Juniper networks @@ -13443,6 +13467,7 @@ 2C-A1-57 (hex) ACROMATE, INC. 2C-A7-80 (hex) True Technologies Inc. 2C-A8-35 (hex) RIM +2C-AB-25 (hex) Shenzhen Gongjin Electronics Co.,Ltd 2C-B0-5D (hex) NETGEAR 2C-B0-DF (hex) Soliton Technologies Pvt Ltd 2C-B6-9D (hex) RED Digital Cinema @@ -13488,6 +13513,7 @@ 30-6C-BE (hex) Skymotion Technology (HK) Limited 30-6E-5C (hex) Validus Technologies 30-71-B2 (hex) Hangzhou Prevail Optoelectronic Equipment Co.,LTD. +30-78-C2 (hex) Innowireless, Co. Ltd. 30-7C-30 (hex) RIM 30-7E-CB (hex) SFR 30-85-A9 (hex) Asustek Computer Inc @@ -13539,6 +13565,7 @@ 34-A7-BA (hex) Fischer International Systems Corporation 34-AA-99 (hex) Alcatel-Lucent 34-AA-EE (hex) Mikrovisatos Servisas UAB +34-AF-2C (hex) Nintendo Co., Ltd. 34-B5-71 (hex) PLDS 34-BA-51 (hex) Se-Kure Controls, Inc. 34-BA-9A (hex) Asiatelco Technologies Co. @@ -13591,6 +13618,7 @@ 38-A5-B6 (hex) SHENZHEN MEGMEET ELECTRICAL CO.,LTD 38-A8-51 (hex) Quickset International Inc 38-A9-5F (hex) Actifio Inc +38-AA-3C (hex) SAMSUNG ELECTRO-MECHANICS 38-B1-2D (hex) Sonotronic Nagel GmbH 38-BB-23 (hex) OzVision America LLC 38-BF-33 (hex) NEC CASIO Mobile Communications @@ -13727,6 +13755,7 @@ 40-AC-8D (hex) Data Management, Inc. 40-B2-C8 (hex) Nortel Networks 40-B3-FC (hex) Logital Co. Limited +40-B4-F0 (hex) Juniper Networks 40-B7-F3 (hex) Motorola Mobility, Inc. 40-BA-61 (hex) Arima Communications Corp. 40-BC-8B (hex) itelio GmbH @@ -13795,6 +13824,7 @@ 44-B3-82 (hex) Kuang-chi Institute of Advanced Technology 44-C1-5C (hex) Texas Instruments 44-C2-33 (hex) Guangzhou Comet Technology Development Co.Ltd +44-C3-9B (hex) OOO RUBEZH NPO 44-C9-A2 (hex) Greenwald Industries 44-D1-5E (hex) Shanghai Kingto Information Technology Ltd 44-D2-CA (hex) Anvia TV Oy @@ -13924,6 +13954,7 @@ 50-2D-F4 (hex) Phytec Messtechnik GmbH 50-2E-CE (hex) Asahi Electronics Co.,Ltd 50-3D-E5 (hex) Cisco Systems +50-3F-56 (hex) Syncmold Enterprise Corp 50-48-EB (hex) BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD. 50-4A-5E (hex) Masimo Corporation 50-56-63 (hex) Texas Instruments @@ -13934,9 +13965,11 @@ 50-67-F0 (hex) ZyXEL Communications Corporation 50-6F-9A (hex) Wi-Fi Alliance 50-70-E5 (hex) He Shan World Fair Electronics Technology Limited +50-72-4D (hex) BEG Brueck Electronic GmbH 50-76-A6 (hex) Ecil Informatica Ind. Com. Ltda 50-79-5B (hex) Interexport Telecomunicaciones S.A. 50-7D-02 (hex) BIODIT +50-7E-5D (hex) Arcadyan Technology Corporation 50-87-B8 (hex) Nuvyyo Inc 50-8A-42 (hex) Uptmate Technology Co., LTD 50-8A-CB (hex) SHENZHEN MAXMADE TECHNOLOGY CO., LTD. @@ -13946,6 +13979,7 @@ 50-A6-E3 (hex) David Clark Company 50-A7-33 (hex) Ruckus Wireless 50-AF-73 (hex) Shenzhen Bitland Information Technology Co., Ltd. +50-B7-C3 (hex) Samsung Electronics Co.,LTD 50-C5-8D (hex) Juniper Networks 50-C9-71 (hex) GN Netcom A/S 50-CC-F8 (hex) Samsung Electro Mechanics @@ -14039,6 +14073,7 @@ 58-93-96 (hex) Ruckus Wireless 58-94-6B (hex) Intel Corporate 58-98-35 (hex) Technicolor +58-98-6F (hex) Revolution Display 58-A7-6F (hex) iD corporation 58-B0-35 (hex) Apple, Inc 58-B0-D4 (hex) ZuniData Systems Inc. @@ -14046,6 +14081,7 @@ 58-BC-27 (hex) Cisco Systems 58-BD-A3 (hex) Nintendo Co., Ltd. 58-BF-EA (hex) Cisco Systems +58-C2-32 (hex) NEC Corporation 58-C3-8B (hex) Samsung Electronics 58-CF-4B (hex) Lufkin Industries 58-D0-8F (hex) IEEE 1904.1 Working Group @@ -14075,9 +14111,11 @@ 5C-35-3B (hex) Compal Broadband Networks Inc. 5C-35-DA (hex) There Corporation Oy 5C-40-58 (hex) Jefferson Audio Video Systems, Inc. +5C-4A-26 (hex) Enguity Technology Corp 5C-4C-A9 (hex) Huawei Device Co., Ltd 5C-50-15 (hex) Cisco Systems 5C-56-ED (hex) 3pleplay Electronics Private Limited +5C-57-1A (hex) ARRIS Group, Inc. 5C-57-C8 (hex) Nokia Corporation 5C-59-48 (hex) Apple, Inc. 5C-5E-AB (hex) Juniper Networks @@ -14101,6 +14139,7 @@ 5C-CA-32 (hex) Theben AG 5C-CE-AD (hex) CDYNE Corporation 5C-D1-35 (hex) Xtreme Power Systems +5C-D4-1B (hex) UCZOON Technology Co., LTD 5C-D4-AB (hex) Zektor 5C-D9-98 (hex) D-Link Corporation 5C-DA-D4 (hex) Murata Manufacturing Co., Ltd. @@ -14138,6 +14177,8 @@ 60-67-20 (hex) Intel Corporate 60-6B-BD (hex) Samsung Electronics Co., LTD 60-6C-66 (hex) Intel Corporate +60-73-5C (hex) Cisco +60-74-8D (hex) Atmaca Elektronik 60-76-88 (hex) Velodyne 60-83-B2 (hex) GkWare e.K. 60-84-3B (hex) Soladigm, Inc. @@ -14205,6 +14246,7 @@ 64-55-7F (hex) NSFOCUS Information Technology Co., Ltd. 64-5D-D7 (hex) Shenzhen Lifesense Medical Electronics Co., Ltd. 64-5E-BE (hex) Yahoo! JAPAN +64-5F-FF (hex) Nicolet Neuro 64-65-C0 (hex) Nuvon, Inc 64-66-B3 (hex) TP-LINK TECHNOLOGIES CO., LTD. 64-67-07 (hex) Beijing Omnific Technology, Ltd. @@ -14262,6 +14304,7 @@ 68-05-CA (hex) Intel Corporation 68-09-27 (hex) Apple, Inc. 68-12-2D (hex) Special Instrument Development Co., Ltd. +68-15-D3 (hex) Zaklady Elektroniki i Mechaniki Precyzyjnej R&G S.A. 68-16-05 (hex) Systems And Electronic Development FZCO 68-1A-B2 (hex) zte corporation 68-1F-D8 (hex) Advanced Telemetry @@ -14326,6 +14369,7 @@ 6C-3A-84 (hex) Shenzhen Aero-Startech. Co.Ltd 6C-3E-6D (hex) Apple Inc 6C-3E-9C (hex) KE Knestel Elektronik GmbH +6C-40-C6 (hex) Nimbus Data Systems, Inc. 6C-50-4D (hex) Cisco Systems 6C-5C-DE (hex) SunReports, Inc. 6C-5D-63 (hex) ShenZhen Rapoo Technology Co., Ltd. @@ -14391,6 +14435,7 @@ 70-6F-81 (hex) PRIVATE 70-70-4C (hex) Purple Communications, Inc 70-71-BC (hex) PEGATRON CORPORATION +70-72-3C (hex) Huawei Technologies Co., Ltd 70-72-CF (hex) EdgeCore Networks 70-73-CB (hex) Apple, Inc. 70-76-F0 (hex) LevelOne Communications (India) Private Limited @@ -14400,6 +14445,7 @@ 70-81-05 (hex) Cisco Systems 70-82-8E (hex) OleumTech Corporation 70-8B-78 (hex) citygrow technology co., ltd +70-93-F8 (hex) Space Monkey, Inc. 70-97-56 (hex) Happyelectronics Co.,Ltd 70-9A-0B (hex) Italian Institute of Technology 70-9B-A5 (hex) Shenzhen Y&D Electronics Co.,LTD. @@ -14432,6 +14478,7 @@ 74-14-89 (hex) SRT Wireless 74-15-E2 (hex) Tri-Sen Systems Corporation 74-1E-93 (hex) Fiberhome Telecommunication Tech.Co.,Ltd. +74-27-3C (hex) ChangYang Technology (Nanjing) Co., LTD 74-2B-0F (hex) Infinidat Ltd. 74-2F-68 (hex) Azurewave Technologies, Inc. 74-31-70 (hex) Arcadyan Technology Corporation @@ -14457,6 +14504,7 @@ 74-90-50 (hex) Renesas Electronics Corporation 74-91-1A (hex) Ruckus Wireless 74-93-A4 (hex) Zebra Technologies Corp. +74-94-3D (hex) Hemisphere GPS 74-99-75 (hex) IBM Corporation 74-9D-DC (hex) 2Wire 74-A4-A7 (hex) QRS Music Technologies, Inc. @@ -14501,6 +14549,7 @@ 78-2B-CB (hex) Dell Inc 78-2E-EF (hex) Nokia Corporation 78-30-E1 (hex) UltraClenz, LLC +78-3C-E3 (hex) Kai-EE 78-3F-15 (hex) EasySYNC Ltd. 78-44-05 (hex) FUJITU(HONG KONG) ELECTRONIC Co.,LTD. 78-44-76 (hex) Zioncom technology co.,ltd @@ -14530,6 +14579,7 @@ 78-A6-83 (hex) Precidata 78-A6-BD (hex) DAEYEON Control&Instrument Co,.Ltd 78-A7-14 (hex) Amphenol +78-AB-60 (hex) ABB Australia 78-AC-C0 (hex) Hewlett-Packard Company 78-B6-C1 (hex) AOBO Telecom Co.,Ltd 78-B8-1A (hex) INTER SALES A/S @@ -14544,6 +14594,7 @@ 78-CA-39 (hex) Apple, Inc. 78-CD-8E (hex) SMC Networks Inc 78-D0-04 (hex) Neousys Technology Inc. +78-D1-29 (hex) Vicos 78-D3-4F (hex) Pace-O-Matic, Inc. 78-D6-F0 (hex) Samsung Electro Mechanics 78-DD-08 (hex) Hon Hai Precision Ind. Co.,Ltd. @@ -14561,6 +14612,7 @@ 7C-03-4C (hex) SAGEMCOM 7C-05-1E (hex) RAFAEL LTD. 7C-08-D9 (hex) Shanghai Engineering Research Center for Broadband Technologies and Applications +7C-09-2B (hex) Bekey A/S 7C-11-BE (hex) Apple, Inc. 7C-14-76 (hex) Damall Technologies S.A.S. Di Ludovic Anselme Glaglanon & C. 7C-16-0D (hex) Saia-Burgess Controls AG @@ -14605,6 +14657,7 @@ 7C-BF-B1 (hex) Motorola Mobility, Inc. 7C-C3-A1 (hex) Apple, Inc. 7C-C5-37 (hex) Apple, Inc. +7C-C8-AB (hex) Acro Associates, Inc. 7C-C8-D0 (hex) TIANJIN YAAN TECHNOLOGY CO., LTD. 7C-C8-D7 (hex) Damalisk 7C-CB-0D (hex) Aaxeon Technologies Inc. @@ -14633,6 +14686,7 @@ 80-16-B7 (hex) Brunel University 80-17-7D (hex) Nortel Networks 80-18-A7 (hex) Samsung Eletronics Co., Ltd +80-1D-AA (hex) Avaya Inc 80-1F-02 (hex) Edimax Technology Co. Ltd. 80-20-AF (hex) Trade FIDES, a.s. 80-22-75 (hex) Beijing Beny Wave Technology Co Ltd @@ -14644,6 +14698,7 @@ 80-39-E5 (hex) PATLITE CORPORATION 80-3B-9A (hex) ghe-ces electronic ag 80-3F-5D (hex) Winstars Technology Ltd +80-3F-D6 (hex) bytes at work AG 80-42-7C (hex) Adolf Tedsen GmbH & Co. KG 80-47-31 (hex) Packet Design, Inc. 80-49-71 (hex) Apple Inc @@ -14713,6 +14768,8 @@ 84-6E-B1 (hex) Park Assist LLC 84-74-2A (hex) zte corporation 84-7E-40 (hex) Texas Instruments +84-82-F4 (hex) Beijing Huasun Unicreate Technology Co., Ltd +84-85-06 (hex) Apple Inc 84-8D-84 (hex) Rajant Corporation 84-8F-69 (hex) Dell Inc. 84-90-00 (hex) Arnold & Richter Cine Technik @@ -14728,6 +14785,7 @@ 84-D9-C8 (hex) Unipattern Co., 84-DB-2F (hex) Sierra Wireless Inc 84-DE-3D (hex) Crystal Vision Ltd +84-DF-0C (hex) NET2GRID BV 84-EA-99 (hex) Vieworks 84-F6-4C (hex) Cross Point BV 88-10-36 (hex) Panodic(ShenZhen) Electronics Limted @@ -14745,6 +14803,7 @@ 88-5C-4F (hex) Alcatel Lucent 88-61-5A (hex) Siano Mobile Silicon Ltd. 88-6B-76 (hex) CHINA HOPEFUL GROUP HOPEFUL ELECTRIC CO.,LTD +88-75-56 (hex) Cisco 88-86-A0 (hex) Simton Technologies, Ltd. 88-87-17 (hex) CANON INC. 88-8B-5D (hex) Storage Appliance Corporation @@ -14782,6 +14841,7 @@ 8C-21-0A (hex) TP-LINK TECHNOLOGIES CO., LTD. 8C-27-1D (hex) QuantHouse 8C-27-8A (hex) Vocollect Inc +8C-2D-AA (hex) Apple Inc 8C-3C-4A (hex) NAKAYO TELECOMMUNICATIONS,INC. 8C-44-35 (hex) Shanghai BroadMobi Communication Technology Co., Ltd. 8C-4D-EA (hex) Cerio Corporation @@ -14832,6 +14892,7 @@ 8C-DE-52 (hex) ISSC Technologies Corp. 8C-E7-48 (hex) PRIVATE 8C-E7-B3 (hex) Sonardyne International Ltd +8C-EE-C6 (hex) Precepscion Pty. Ltd. 8C-F9-C9 (hex) MESADA Technology Co.,Ltd. 8C-FA-BA (hex) Apple Inc 8C-FD-F0 (hex) QUALCOMM Incorporated @@ -14864,6 +14925,7 @@ 90-54-46 (hex) TES ELECTRONIC SOLUTIONS 90-55-AE (hex) Ericsson, EAB/RWI/K 90-56-82 (hex) Lenbrook Industries Limited +90-59-AF (hex) Texas Instruments 90-5F-8D (hex) modas GmbH 90-61-0C (hex) Fida International (S) Pte Ltd 90-67-B5 (hex) Alcatel-Lucent @@ -14886,6 +14948,7 @@ 90-A7-83 (hex) JSW PACIFIC CORPORATION 90-A7-C1 (hex) Pakedge Device and Software Inc. 90-AC-3F (hex) BrightSign LLC +90-B1-1C (hex) Dell Inc. 90-B1-34 (hex) Motorola Mobility, Inc. 90-B8-D0 (hex) Joyent, Inc. 90-B9-7D (hex) Johnson Outdoors Marine Electronics d/b/a Minnkota @@ -14993,6 +15056,7 @@ 98-6D-C8 (hex) TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION 98-73-C4 (hex) Sage Electronic Engineering LLC 98-82-17 (hex) Disruptive Ltd +98-86-B1 (hex) Flyaudio corporation (China) 98-89-ED (hex) Anadem Information Inc. 98-8B-5D (hex) SAGEM COMMUNICATION 98-8B-AD (hex) Corintech Ltd. @@ -15016,6 +15080,7 @@ 98-F8-DB (hex) Marini Impianti Industriali s.r.l. 98-FC-11 (hex) Cisco-Linksys, LLC 98-FE-03 (hex) Ericsson - North America +98-FE-94 (hex) Apple Inc 9C-01-11 (hex) Shenzhen Newabel Electronic Co., Ltd. 9C-02-98 (hex) Samsung Electronics Co.,Ltd 9C-06-6E (hex) Hytera Communications Corporation Limited @@ -15086,6 +15151,7 @@ A0-23-1B (hex) TeleComp R&D Corp. A0-2E-F3 (hex) United Integrated Services Co., Led. A0-36-9F (hex) Intel Corporation +A0-36-F0 (hex) Comprehensive Power A0-36-FA (hex) Ettus Research LLC A0-3A-75 (hex) PSS Belgium N.V. A0-40-25 (hex) Actioncable, Inc. @@ -15283,6 +15349,7 @@ AC-5E-8C (hex) Utillink AC-61-23 (hex) Drivven, Inc. AC-67-06 (hex) Ruckus Wireless +AC-6E-1A (hex) Shenzhen Gongjin Electronics Co.,Ltd AC-6F-4F (hex) Enspert Inc AC-6F-BB (hex) TATUNG Technology Inc. AC-6F-D9 (hex) Valueplus Inc. @@ -15303,6 +15370,7 @@ AC-9C-E4 (hex) Alcatel-Lucent Shanghai Bell Co., Ltd AC-A0-16 (hex) Cisco Systems AC-AB-8D (hex) Lyngso Marine A/S +AC-BD-0B (hex) IMAC CO.,LTD AC-BE-75 (hex) Ufine Technologies Co.,Ltd. AC-BE-B6 (hex) Visualedge Technology Co., Ltd. AC-C2-EC (hex) CLT INT'L IND. CORP. @@ -15318,6 +15386,7 @@ AC-D3-64 (hex) ABB SPA, ABB SACE DIV. AC-D9-D6 (hex) tci GmbH AC-DE-48 (hex) PRIVATE +AC-E2-15 (hex) Huawei Technologies Co., Ltd AC-E3-48 (hex) MadgeTech, Inc AC-E8-7B (hex) Huawei Technologies Co., Ltd AC-E9-AA (hex) Hay Systems Ltd @@ -15325,11 +15394,13 @@ AC-EE-3B (hex) 6harmonics Inc AC-F0-B2 (hex) Becker Electronics Taiwan Ltd. AC-F9-7E (hex) ELESYS INC. +B0-12-03 (hex) Dynamics Hong Kong Limited B0-12-66 (hex) Futaba-Kikaku B0-1B-7C (hex) Ontrol A.S. B0-1C-91 (hex) Elim Co B0-38-29 (hex) Siliconware Precision Industries Co., Ltd. B0-43-5D (hex) NuLEDs, Inc. +B0-46-FC (hex) MitraStar Technology Corp. B0-48-7A (hex) TP-LINK TECHNOLOGIES CO., LTD. B0-51-8E (hex) Holl technology CO.Ltd. B0-58-C4 (hex) Broadcast Microwave Services, Inc @@ -15361,6 +15432,7 @@ B0-BD-A1 (hex) ZAKLAD ELEKTRONICZNY SIMS B0-BF-99 (hex) WIZITDONGDO B0-C6-9A (hex) Juniper Networks +B0-C7-45 (hex) Buffalo Inc. B0-C8-3F (hex) Jiangsu Cynray IOT Co., Ltd. B0-C8-AD (hex) People Power Company B0-CF-4D (hex) MI-Zone Technology Ireland @@ -15433,6 +15505,7 @@ B4-ED-19 (hex) Pie Digital, Inc. B4-ED-54 (hex) Wohler Technologies B4-EE-D4 (hex) Texas Instruments +B4-F2-E8 (hex) Pace plc B4-F3-23 (hex) PETATEL INC. B4-FC-75 (hex) SEMA Electronics(HK) CO.,LTD B8-03-05 (hex) Intel Corporate @@ -15451,6 +15524,7 @@ B8-3D-4E (hex) Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch B8-41-5F (hex) ASP AG B8-55-10 (hex) Zioncom Electronics (Shenzhen) Ltd. +B8-58-10 (hex) NUMERA, INC. B8-61-6F (hex) Accton Wireless Broadband(AWB), Corp. B8-62-1F (hex) Cisco Systems B8-64-91 (hex) CK Telecom Ltd @@ -15469,6 +15543,7 @@ B8-94-D2 (hex) Retail Innovation HTT AB B8-96-74 (hex) AllDSP GmbH & Co. KG B8-97-5A (hex) BIOSTAR Microtech Int'l Corp. +B8-98-B0 (hex) Atlona Inc. B8-9A-ED (hex) OceanServer Technology, Inc B8-9B-C9 (hex) SMC Networks Inc B8-A3-86 (hex) D-Link International @@ -15478,11 +15553,13 @@ B8-AF-67 (hex) Hewlett-Packard Company B8-B1-C7 (hex) BT&COM CO.,LTD B8-B4-2E (hex) Gionee Communication Equipment Co,Ltd.ShenZhen +B8-B7-D7 (hex) 2GIG Technologies B8-B9-4E (hex) Shenzhen iBaby Labs, Inc. B8-BA-68 (hex) Xi'an Jizhong Digital Communication Co.,Ltd B8-BA-72 (hex) Cynove B8-BB-6D (hex) ENERES Co.,Ltd. B8-BE-BF (hex) Cisco Systems +B8-C6-8E (hex) Samsung Electronics Co.,Ltd B8-C7-16 (hex) Fiberhome Telecommunication Technologies Co.,LTD B8-C7-5D (hex) Apple, Inc. B8-CD-A7 (hex) Maxeler Technologies Ltd. @@ -15660,6 +15737,7 @@ C4-95-A2 (hex) SHENZHEN WEIJIU INDUSTRY AND TRADE DEVELOPMENT CO., LTD C4-98-05 (hex) Minieum Networks, Inc C4-AA-A1 (hex) SUMMIT DEVELOPMENT, spol.s r.o. +C4-AD-21 (hex) MEDIAEDGE Corporation C4-B5-12 (hex) General Electric Digital Energy C4-BA-99 (hex) I+ME Actia Informatik und Mikro-Elektronik GmbH C4-C1-9F (hex) National Oilwell Varco Instrumentation, Monitoring, and Optimization (NOV IMO) @@ -15667,7 +15745,9 @@ C4-CD-45 (hex) Beijing Boomsense Technology CO.,LTD. C4-D4-89 (hex) JiangSu Joyque Information Industry Co.,Ltd C4-D9-87 (hex) Intel Corporate +C4-DA-26 (hex) NOBLEX SA C4-E1-7C (hex) U2S co. +C4-E7-BE (hex) SCSpro Co.,Ltd C4-EE-AE (hex) VSS Monitoring C4-EE-F5 (hex) Oclaro, Inc. C4-F4-64 (hex) Spica international @@ -15717,6 +15797,7 @@ C8-9C-1D (hex) Cisco Systems C8-9C-DC (hex) ELITEGROUP COMPUTER SYSTEM CO., LTD. C8-9F-42 (hex) VDII Innovation AB +C8-A0-30 (hex) Texas Instruments C8-A1-B6 (hex) Shenzhen Longway Technologies Co., Ltd C8-A1-BA (hex) Neul Ltd C8-A6-20 (hex) Nebula, Inc @@ -15731,6 +15812,8 @@ C8-BE-19 (hex) D-Link International C8-C1-26 (hex) ZPM Industria e Comercio Ltda C8-C1-3C (hex) RuggedTek Hangzhou Co., Ltd +C8-C7-91 (hex) Zero1.tv GmbH +C8-CB-B8 (hex) Hewlett Packard C8-CD-72 (hex) SAGEMCOM C8-D1-5E (hex) Huawei Technologies Co., Ltd C8-D1-D1 (hex) AGAiT Technology Corporation @@ -15746,6 +15829,7 @@ C8-F7-33 (hex) Intel Corporate C8-F9-81 (hex) Seneca s.r.l. C8-F9-F9 (hex) Cisco Systems +C8-FB-26 (hex) Cisco SPVTG C8-FE-30 (hex) Bejing DAYO Mobile Communication Technology Ltd. CC-00-80 (hex) TRUST SYSTEM Co., CC-05-1B (hex) Samsung Electronics Co.,Ltd @@ -15782,6 +15866,7 @@ CC-96-A0 (hex) Huawei Device Co., Ltd CC-9E-00 (hex) Nintendo Co., Ltd. CC-A3-74 (hex) Guangdong Guanglian Electronic Technology Co.Ltd +CC-A4-62 (hex) ARRIS Group, Inc CC-AF-78 (hex) Hon Hai Precision Ind. Co.,Ltd. CC-B2-55 (hex) D-Link International CC-B5-5A (hex) Fraunhofer ITWM @@ -15798,6 +15883,7 @@ CC-CE-40 (hex) Janteq Corp CC-D8-11 (hex) Aiconn Technology Corporation CC-D9-E9 (hex) SCR Engineers Ltd. +CC-E7-98 (hex) My Social Stuff CC-E7-DF (hex) American Magnetics, Inc. CC-EA-1C (hex) DCONWORKS Co., Ltd CC-EE-D9 (hex) Deto Mechatronic GmbH @@ -15821,6 +15907,7 @@ D0-27-88 (hex) Hon Hai Precision Ind.Co.Ltd D0-31-10 (hex) Ingenic Semiconductor Co.,Ltd D0-37-61 (hex) Texas Instruments +D0-4C-C1 (hex) SINTRONES Technology Corp. D0-54-2D (hex) Cambridge Industries(Group) Co.,Ltd. D0-57-4C (hex) Cisco Systems D0-57-85 (hex) Pantech Co., Ltd. @@ -15932,6 +16019,7 @@ D4-F6-3F (hex) IEA S.R.L. D8-05-2E (hex) Skyviia Corporation D8-06-D1 (hex) Honeywell Fire System (Shanghai) Co,. Ltd. +D8-08-F5 (hex) Arcadia Networks Co. Ltd. D8-0D-E3 (hex) FXI TECHNOLOGIES AS D8-16-0A (hex) Nippon Electro-Sensory Devices D8-1B-FE (hex) TWINLINX CORPORATION @@ -15981,6 +16069,7 @@ D8-C6-91 (hex) Hichan Technology Corp. D8-C7-C8 (hex) Aruba Networks D8-C9-9D (hex) EA DISPLAY LIMITED +D8-D2-7C (hex) JEMA ENERGY, SA D8-D3-85 (hex) Hewlett-Packard Company D8-D6-7E (hex) GSK CNC EQUIPMENT CO.,LTD D8-DF-0D (hex) beroNet GmbH @@ -16011,6 +16100,7 @@ DC-3C-2E (hex) Manufacturing System Insights, Inc. DC-3C-84 (hex) Ticom Geomatics, Inc. DC-3E-51 (hex) Solberg & Andersen AS +DC-45-17 (hex) Motorola Mobility, Inc. DC-49-C9 (hex) CASCO SIGNAL LTD DC-4E-DE (hex) SHINYEI TECHNOLOGY CO., LTD. DC-71-44 (hex) Samsung Electro Mechanics @@ -16018,12 +16108,14 @@ DC-85-DE (hex) Azurewave Technologies., inc. DC-9B-1E (hex) Intercom, Inc. DC-9C-52 (hex) Sapphire Technology Limited. +DC-9F-A4 (hex) Nokia Corporation DC-9F-DB (hex) Ubiquiti Networks, Inc. DC-A6-BD (hex) Beijing Lanbo Technology Co., Ltd. DC-A7-D9 (hex) Compressor Controls Corp DC-A8-CF (hex) New Spin Golf, LLC. DC-A9-71 (hex) Intel Corporate DC-B4-C4 (hex) Microsoft XCG +DC-BF-90 (hex) HUIZHOU QIAOXING TELECOMMUNICATION INDUSTRY CO.,LTD. DC-C1-01 (hex) SOLiD Technologies, Inc. DC-CB-A8 (hex) Explora Technologies Inc DC-CE-41 (hex) FE GLOBAL HONG KONG LIMITED @@ -16155,6 +16247,7 @@ E8-03-9A (hex) Samsung Electronics Co.,LTD E8-04-0B (hex) Apple, Inc. E8-04-62 (hex) Cisco Systems +E8-04-F3 (hex) Throughtek Co., Ltd. E8-05-6D (hex) Nortel Networks E8-06-88 (hex) Apple, Inc. E8-0B-13 (hex) Akib Systems Taiwan, INC @@ -16170,6 +16263,7 @@ E8-3A-97 (hex) OCZ Technology Group E8-3E-B6 (hex) RIM E8-3E-FB (hex) GEODESIC LTD. +E8-3E-FC (hex) ARRIS Group, Inc E8-40-40 (hex) Cisco Systems E8-40-F2 (hex) PEGATRON CORPORATION E8-43-B6 (hex) QNAP Systems, Inc. @@ -16186,7 +16280,9 @@ E8-75-7F (hex) FIRS Technologies(Shenzhen) Co., Ltd E8-78-A1 (hex) BEOVIEW INTERCOM DOO E8-7A-F3 (hex) S5 Tech S.r.l. +E8-89-2C (hex) ARRIS Group, Inc E8-8D-F5 (hex) ZNYX Networks, Inc. +E8-92-A4 (hex) LG Electronics E8-94-4C (hex) Cogent Healthcare Systems Ltd E8-99-5A (hex) PiiGAB, Processinformation i Goteborg AB E8-99-C4 (hex) HTC Corporation @@ -16261,6 +16357,8 @@ EC-CD-6D (hex) Allied Telesis, Inc. EC-D0-0E (hex) MiraeRecognition Co., Ltd. EC-D1-9A (hex) Zhuhai Liming Industries Co., Ltd +EC-D9-25 (hex) RAMI +EC-D9-50 (hex) IRT SA EC-DE-3D (hex) Lamprey Networks, Inc. EC-E0-9B (hex) Samsung electronics CO., LTD EC-E5-55 (hex) Hirschmann Automation @@ -16398,6 +16496,7 @@ F8-1A-67 (hex) TP-LINK TECHNOLOGIES CO., LTD. F8-1D-93 (hex) Longdhua(Beijing) Controls Technology Co.,Ltd F8-1E-DF (hex) Apple, Inc +F8-22-85 (hex) Cypress Technology CO., LTD. F8-2F-5B (hex) eGauge Systems LLC F8-30-94 (hex) Alcatel-Lucent Telecom Limited F8-31-3E (hex) endeavour GmbH @@ -16419,6 +16518,7 @@ F8-81-1A (hex) OVERKIZ F8-8C-1C (hex) KAISHUN ELECTRONIC TECHNOLOGY CO., LTD. BEIJING F8-8D-EF (hex) Tenebraex +F8-8E-85 (hex) COMTREND CORPORATION F8-8F-CA (hex) Google Fiber, Inc F8-91-2A (hex) GLP German Light Products GmbH F8-93-F3 (hex) VOLANS @@ -16471,6 +16571,7 @@ FC-48-EF (hex) HUAWEI TECHNOLOGIES CO.,LTD FC-4D-D4 (hex) Universal Global Scientific Industrial Co., Ltd. FC-50-90 (hex) SIMEX Sp. z o.o. +FC-52-CE (hex) Control iD FC-5B-24 (hex) Weibel Scientific A/S FC-5B-26 (hex) MikroBits FC-61-98 (hex) NEC Personal Products, Ltd diff -Nru aircrack-ng-1.1/debian/changelog aircrack-ng-1.1/debian/changelog --- aircrack-ng-1.1/debian/changelog 2012-06-18 15:15:48.000000000 +0200 +++ aircrack-ng-1.1/debian/changelog 2012-07-17 00:29:38.000000000 +0200 @@ -1,3 +1,21 @@ +aircrack-ng (1:1.1-4) unstable; urgency=low + + * Rewrote 007-Add-support-for-GnuTLS.patch to 011-add-support-for-gcrypt.diff + * Removed build-dependency on GnuTLS, now we only build-depend on Libgcrypt + * Added missing build-depend on zlib1g-dev (it was a dependency of GnuTLS) + * Changed the Make parameter from gnutls=true to gcrypt=true for coherence + * Fixes FTBFS on non SSE2 archs (Closes: #680414) + * Tested sqlite support (Really closes: #610688) (Really closes: #600753) + * Add 012-fix-hurd-ftbfs.diff (Closes: #680414) + * Add 013-workaround-681113-kfreebsd.diff (Really closes: #642698) + * Add 014-man_page_formatting.diff (Closes: #570986) + * Update DEP-3 headers on patches {004,005,006,009,010} + * Refresh patches {005,010} + * Updated MAC:Vendor mappings (airodump-ng-oui.txt) + * Updated README.Debian + + -- Carlos Alberto Lopez Perez <clopez@igalia.com> Mon, 16 Jul 2012 23:22:23 +0200 + aircrack-ng (1:1.1-3) unstable; urgency=low * Summarize the changes introduced on (1:1.1-2) and document how diff -Nru aircrack-ng-1.1/debian/control aircrack-ng-1.1/debian/control --- aircrack-ng-1.1/debian/control 2012-06-17 01:20:51.000000000 +0200 +++ aircrack-ng-1.1/debian/control 2012-07-10 02:30:51.000000000 +0200 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Carlos Alberto Lopez Perez <clopez@igalia.com> Homepage: http://www.aircrack-ng.org/ -Build-Depends: debhelper (>= 8.0.0), libpcap0.8-dev, libgnutls-dev, - libsqlite3-dev (>= 3.4), libnl-dev (>= 1.1) [linux-any], +Build-Depends: debhelper (>= 8.0.0), libpcap0.8-dev, libgcrypt11-dev, + libsqlite3-dev (>= 3.4), libnl-dev (>= 1.1) [linux-any], zlib1g-dev, python (>= 2.6.6-3~), hardening-includes Standards-Version: 3.9.3 diff -Nru aircrack-ng-1.1/debian/patches/004-fix-license-issues.diff aircrack-ng-1.1/debian/patches/004-fix-license-issues.diff --- aircrack-ng-1.1/debian/patches/004-fix-license-issues.diff 2012-06-17 00:32:54.000000000 +0200 +++ aircrack-ng-1.1/debian/patches/004-fix-license-issues.diff 2012-07-16 02:12:19.000000000 +0200 @@ -2,7 +2,7 @@ Some files were missing copyright owners and/or license type. Origin: upstream Bug-Debian: http://bugs.debian.org/588588 -Applied-Upstream: http://trac.aircrack-ng.org/svn/trunk@2074 +Applied-Upstream: http://trac.aircrack-ng.org/changeset/2074 --- diff -ruN 1.1/src/pcap.h svn/src/pcap.h --- 1.1/src/pcap.h 2012-06-16 18:08:52.704677018 +0200 diff -Nru aircrack-ng-1.1/debian/patches/005-fix-issues-cppcheck-r2008.diff aircrack-ng-1.1/debian/patches/005-fix-issues-cppcheck-r2008.diff --- aircrack-ng-1.1/debian/patches/005-fix-issues-cppcheck-r2008.diff 2012-06-17 00:41:41.000000000 +0200 +++ aircrack-ng-1.1/debian/patches/005-fix-issues-cppcheck-r2008.diff 2012-07-16 02:12:30.000000000 +0200 @@ -2,13 +2,11 @@ Origin: upstream Bug-Debian: http://bugs.debian.org/642934 Forwarded: http://trac.aircrack-ng.org/ticket/957 -Applied-Upstream: http://trac.aircrack-ng.org/svn/trunk@2008 +Applied-Upstream: http://trac.aircrack-ng.org/changeset/2008 -- -diff --git a/src/airbase-ng.c b/src/airbase-ng.c -index de0e11f..8bbb73e 100644 --- a/src/airbase-ng.c +++ b/src/airbase-ng.c -@@ -1450,6 +1450,7 @@ int read_prga(unsigned char **dest, char *file) +@@ -1453,6 +1453,7 @@ if( fread( (*dest), size, 1, f ) != 1 ) { @@ -16,11 +14,9 @@ fprintf( stderr, "fread failed\n" ); return( 1 ); } -diff --git a/src/aircrack-ng.c b/src/aircrack-ng.c -index 2477a3c..753b596 100644 --- a/src/aircrack-ng.c +++ b/src/aircrack-ng.c -@@ -4721,7 +4721,6 @@ int crack_wep_dict() +@@ -4381,7 +4381,6 @@ int i, origlen, keysize; char *key; @@ -28,7 +24,7 @@ keysize = opt.keylen+1; update_ivbuf(); -@@ -4732,6 +4731,7 @@ int crack_wep_dict() +@@ -4392,6 +4391,7 @@ return( FAILURE ); } @@ -36,7 +32,7 @@ gettimeofday( &t_last, NULL ); t_last.tv_sec--; -@@ -4767,7 +4767,10 @@ int crack_wep_dict() +@@ -4427,7 +4427,10 @@ } if(check_wep_key(wep.key, opt.keylen, 0) == SUCCESS) @@ -47,11 +43,9 @@ } } -diff --git a/src/airdecloak-ng.c b/src/airdecloak-ng.c -index c82915e..a1b2fb2 100644 --- a/src/airdecloak-ng.c +++ b/src/airdecloak-ng.c -@@ -1126,6 +1126,8 @@ int CFC_filter_duplicate_iv() { +@@ -1125,6 +1125,8 @@ } } while (next_packet_pointer() == true); @@ -60,11 +54,9 @@ return nb_packets; } -diff --git a/src/aireplay-ng.c b/src/aireplay-ng.c -index 76a6bf0..7eb379e 100644 --- a/src/aireplay-ng.c +++ b/src/aireplay-ng.c -@@ -1120,6 +1120,7 @@ int capture_ask_packet( int *caplen, int just_grab ) +@@ -1103,6 +1103,7 @@ if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 ) { @@ -72,7 +64,7 @@ perror( "fwrite failed\n" ); return( 1 ); } -@@ -1133,6 +1134,7 @@ int capture_ask_packet( int *caplen, int just_grab ) +@@ -1116,6 +1117,7 @@ if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) { @@ -80,7 +72,7 @@ perror( "fwrite failed" ); return( 1 ); } -@@ -1141,6 +1143,7 @@ int capture_ask_packet( int *caplen, int just_grab ) +@@ -1124,6 +1126,7 @@ if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) { @@ -88,7 +80,7 @@ perror( "fwrite failed" ); return( 1 ); } -@@ -1175,6 +1178,7 @@ int read_prga(unsigned char **dest, char *file) +@@ -1158,6 +1161,7 @@ if( fread( (*dest), size, 1, f ) != 1 ) { @@ -96,11 +88,9 @@ fprintf( stderr, "fread failed\n" ); return( 1 ); } -diff --git a/src/airodump-ng.c b/src/airodump-ng.c -index 487d81f..bb3ca3d 100644 --- a/src/airodump-ng.c +++ b/src/airodump-ng.c -@@ -400,13 +400,15 @@ struct oui * load_oui_file(void) { +@@ -397,13 +397,15 @@ if (sscanf(buffer, "%2c-%2c-%2c", a, b, c) == 3) { if (oui_ptr == NULL) { if (!(oui_ptr = (struct oui *)malloc(sizeof(struct oui)))) { @@ -117,11 +107,9 @@ } oui_ptr = oui_ptr->next; } -diff --git a/src/airtun-ng.c b/src/airtun-ng.c -index afbb071..be78b93 100644 --- a/src/airtun-ng.c +++ b/src/airtun-ng.c -@@ -671,6 +671,7 @@ int read_prga(unsigned char **dest, char *file) +@@ -673,6 +673,7 @@ if( fread( (*dest), size, 1, f ) != 1 ) { @@ -129,11 +117,9 @@ fprintf( stderr, "fread failed\n" ); return( 1 ); } -diff --git a/src/ivstools.c b/src/ivstools.c -index ab81720..766413f 100644 --- a/src/ivstools.c +++ b/src/ivstools.c -@@ -158,36 +158,47 @@ int merge( int argc, char *argv[] ) +@@ -158,36 +158,47 @@ if( ( f_in = fopen( argv[i], "rb" ) ) == NULL ) { @@ -181,11 +167,9 @@ printf( "Error, wrong %s version: %d. Supported up to version %d.\n", IVS2_EXTENSION, fivs2.version, IVS2_VERSION ); return( 1 ); } -diff --git a/src/kstats.c b/src/kstats.c -index d2352e6..83d5c0c 100644 --- a/src/kstats.c +++ b/src/kstats.c -@@ -318,18 +318,23 @@ int main( int argc, char *argv[] ) +@@ -318,18 +318,23 @@ if( ( f = fopen( argv[1], "rb" ) ) == NULL ) { @@ -209,7 +193,7 @@ fprintf( stderr, "Not an .IVS file\n" ); return( 1 ); } -@@ -406,5 +411,8 @@ int main( int argc, char *argv[] ) +@@ -406,5 +411,8 @@ printf( "\n\n" ); } @@ -218,11 +202,9 @@ + return( 0 ); } -diff --git a/src/tkiptun-ng.c b/src/tkiptun-ng.c -index f6ab1eb..c508699 100644 --- a/src/tkiptun-ng.c +++ b/src/tkiptun-ng.c -@@ -1320,6 +1320,7 @@ int capture_ask_packet( int *caplen, int just_grab ) +@@ -1322,6 +1322,7 @@ if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 ) { @@ -230,7 +212,7 @@ perror( "fwrite failed\n" ); return( 1 ); } -@@ -1333,6 +1334,7 @@ int capture_ask_packet( int *caplen, int just_grab ) +@@ -1335,6 +1336,7 @@ if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) { @@ -238,7 +220,7 @@ perror( "fwrite failed" ); return( 1 ); } -@@ -1341,6 +1343,7 @@ int capture_ask_packet( int *caplen, int just_grab ) +@@ -1343,6 +1345,7 @@ if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) { @@ -246,7 +228,7 @@ perror( "fwrite failed" ); return( 1 ); } -@@ -1375,6 +1378,7 @@ int read_prga(unsigned char **dest, char *file) +@@ -1377,6 +1380,7 @@ if( fread( (*dest), size, 1, f ) != 1 ) { diff -Nru aircrack-ng-1.1/debian/patches/006-fix-ftbfs-and-man-path.diff aircrack-ng-1.1/debian/patches/006-fix-ftbfs-and-man-path.diff --- aircrack-ng-1.1/debian/patches/006-fix-ftbfs-and-man-path.diff 2012-06-17 00:12:25.000000000 +0200 +++ aircrack-ng-1.1/debian/patches/006-fix-ftbfs-and-man-path.diff 2012-07-16 02:12:39.000000000 +0200 @@ -1,7 +1,7 @@ Description: Manpage dir was not following FSHS. Fix 'no-unused-but-set-variable' that appeared with/after gcc 4.5 Origin: upstream -Applied-Upstream: http://trac.aircrack-ng.org/svn/trunk@2146 +Applied-Upstream: http://trac.aircrack-ng.org/changeset/2146 --- --- a/common.mak 2010-02-13 23:32:28.000000000 +0100 +++ b/common.mak 2012-05-01 03:36:04.812545847 +0200 diff -Nru aircrack-ng-1.1/debian/patches/007-Add-support-for-GnuTLS.diff aircrack-ng-1.1/debian/patches/007-Add-support-for-GnuTLS.diff --- aircrack-ng-1.1/debian/patches/007-Add-support-for-GnuTLS.diff 2012-06-17 00:20:27.000000000 +0200 +++ aircrack-ng-1.1/debian/patches/007-Add-support-for-GnuTLS.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,239 +0,0 @@ -Description: Add support for GnuTLS - * It adds a wrapper that translates the OpenSSL primitives to the - GnuTLS counterparts using macro definitions. - * Compile with: - make gnutls=true - * The following tests done with this patch were successful: - * Cracking WEP key with Koreak attack - * Cracking WEP key with PTW attack - * Cracking WPA key (using a dictionary) - * Aireplay-ng attacks: -1, -3, -4 (chopchop), -5 - * Packetforge ARP generation and injection (based on xor file - obtained with aireplay-ng chopchop attack) -Author: Carlos Alberto Lopez Perez <clopez@igalia.com> -Bug-Debian: http://bugs.debian.org/642934 -Forwarded: http://trac.aircrack-ng.org/ticket/953 ---- -diff -ruN a/INSTALLING b/INSTALLING ---- a/INSTALLING 2012-05-28 23:27:02.837053644 +0200 -+++ b/INSTALLING 2012-05-28 23:27:16.156564309 +0200 -@@ -1,6 +1,6 @@ - === Requirements === - -- * OpenSSL development package -+ * OpenSSL development package or GnuTLS development package - * If you want to use airolib-ng and '-r' option in aircrack-ng, - SQLite development package >= 3.3.17 (3.6.X version or better is recommended): - - libsqlite3-devel -@@ -38,11 +38,16 @@ - * unstable: needed to compile tkiptun-ng, easside-ng (and buddy-ng) and - wesside-ng - -+* gnutls: Use GnuTLS crypto library instead of the default OpenSSL. -+ - Example: - - * Compiling: - make sqlite=true unstable=true - -+ * Compiling with GnuTLS -+ make gnutls=true -+ - * Installing: - make sqlite=true unstable=true install - -diff -ruN a/src/airbase-ng.c b/src/airbase-ng.c ---- a/src/airbase-ng.c 2012-05-28 23:27:02.837053644 +0200 -+++ b/src/airbase-ng.c 2012-05-28 23:27:16.156564309 +0200 -@@ -68,6 +68,10 @@ - #include "osdep/osdep.h" - #include "osdep/common.h" - -+#ifdef USE_GNUTLS -+ GCRY_THREAD_OPTION_PTHREAD_IMPL; -+#endif -+ - static struct wif *_wi_in, *_wi_out; - - #define CRYPT_NONE 0 -@@ -3907,6 +3911,11 @@ - rCF = (pCF_t) malloc(sizeof(struct CF_packet)); - memset(rCF, 0, sizeof(struct CF_packet)); - -+#ifdef USE_GNUTLS -+ // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt. -+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); -+ gnutls_global_init(); -+#endif - pthread_mutex_init( &mx_cf, NULL ); - pthread_mutex_init( &mx_cap, NULL ); - -diff -ruN a/src/aircrack-ng.c b/src/aircrack-ng.c ---- a/src/aircrack-ng.c 2012-05-28 23:27:02.837053644 +0200 -+++ b/src/aircrack-ng.c 2012-05-28 23:27:16.156564309 +0200 -@@ -75,6 +75,10 @@ - sqlite3 *db; - #endif - -+#ifdef USE_GNUTLS -+ GCRY_THREAD_OPTION_PTHREAD_IMPL; -+#endif -+ - extern int get_nb_cpus(); - - static uchar ZERO[32] = -@@ -4546,6 +4550,11 @@ - char *sql; - #endif - -+#ifdef USE_GNUTLS -+ // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt. -+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); -+ gnutls_global_init(); -+#endif - ret = FAILURE; - showhelp = 0; - -diff -ruN a/src/airodump-ng.c b/src/airodump-ng.c ---- a/src/airodump-ng.c 2012-05-28 23:27:02.837053644 +0200 -+++ b/src/airodump-ng.c 2012-05-28 23:27:16.160564161 +0200 -@@ -69,6 +69,10 @@ - #include "osdep/common.h" - #include "common.h" - -+#ifdef USE_GNUTLS -+ GCRY_THREAD_OPTION_PTHREAD_IMPL; -+#endif -+ - void dump_sort( void ); - void dump_print( int ws_row, int ws_col, int if_num ); - -@@ -5234,6 +5238,11 @@ - }; - - -+#ifdef USE_GNUTLS -+ // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt. -+ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); -+ gnutls_global_init(); -+#endif - pthread_mutex_init( &(G.mx_print), NULL ); - pthread_mutex_init( &(G.mx_sort), NULL ); - -diff -ruN a/src/crypto.h b/src/crypto.h ---- a/src/crypto.h 2012-05-28 23:27:02.837053644 +0200 -+++ b/src/crypto.h 2012-05-28 23:27:16.160564161 +0200 -@@ -9,11 +9,15 @@ - #define uint32 unsigned long int - #endif - -+#ifdef USE_GNUTLS -+#include "gnutls-openssl-wrapper.h" -+#else - #include <openssl/hmac.h> - #include <openssl/sha.h> - // We don't use EVP. Bite me - #include <openssl/rc4.h> - #include <openssl/aes.h> -+#endif - - #define S_LLC_SNAP "\xAA\xAA\x03\x00\x00\x00" - #define S_LLC_SNAP_ARP (S_LLC_SNAP "\x08\x06") -diff -ruN a/src/gnutls-openssl-wrapper.h b/src/gnutls-openssl-wrapper.h ---- a/src/gnutls-openssl-wrapper.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/src/gnutls-openssl-wrapper.h 2012-05-28 23:27:16.160564161 +0200 -@@ -0,0 +1,76 @@ -+#ifndef _GNUTLS_OPENSSL_WRAPPERS_H -+#define _GNUTLS_OPENSSL_WRAPPERS_H -+/* -+ * -+ * gnutls-openssl-wrapper.h -+ * -+ * Copyright (C) 2012 Carlos Alberto Lopez Perez <clopez@igalia.com> -+ * -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. -+ * -+ */ -+#include <gcrypt.h> -+#include <gnutls/gnutls.h> -+#include <gnutls/crypto.h> -+// RC4_* -+#define RC4_KEY gcry_cipher_hd_t -+#define RC4_set_key(h, l, k) gcry_cipher_setkey((void *)h, k, l) -+#define RC4(h, l, s, d) gcry_cipher_encrypt((void *)h, (void *)d, l, (void *)s, l) -+// SHA_* -+#define SHA_CTX gcry_md_hd_t -+#define SHA1_Init(c) gnutls_hash_init((gnutls_hash_hd_t *)c, GNUTLS_DIG_SHA1) -+#define SHA1_Update(c,b,l) gnutls_hash((gnutls_hash_hd_t )c, b, l) -+#define SHA1_Final(b,c) gnutls_hash_deinit((gnutls_hash_hd_t )b, c) -+// EVP_* -+#define EVP_md5() GCRY_MD_MD5 -+#define EVP_sha1() GCRY_MD_SHA1 -+// AES_* -+#define AES_KEY gcry_cipher_hd_t -+#define AES_encrypt(ctx, plain, crypt) gcry_cipher_encrypt((gcry_cipher_hd_t )ctx, crypt, 16, plain, 16) -+#define AES_set_encrypt_key(key, len, trash) do { \ -+ gcry_cipher_hd_t hd; \ -+ gcry_cipher_open(&hd, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_ECB, 0); \ -+ gcry_cipher_setkey(hd, &key, len); \ -+ } while (0) -+// HMAC_* -+#define HMAC_CTX gcry_md_hd_t -+#define HMAC_CTX_cleanup(c) gcry_md_close((gcry_md_hd_t )c) -+#define HMAC_CTX_init(c) ; // noop -+#define HMAC_Init_ex(ctx, key, len, md, engine) HMAC_Init(ctx, key, len, md) -+#define HMAC_Init(ctx, key, len, md) do { \ -+ gcry_md_open(ctx, md, GCRY_MD_FLAG_SECURE | GCRY_MD_FLAG_HMAC); \ -+ gcry_md_setkey(*ctx, key, len); \ -+ } while (0) -+#define HMAC_Update(ctx, data, len) gcry_md_write(*ctx, data, len) -+#define HMAC_Final(ctx, md, len) do { \ -+ int algo; algo = gcry_md_get_algo(*ctx); \ -+ memcpy( md, \ -+ gcry_md_read((gcry_md_hd_t )*ctx, algo), \ -+ gcry_md_get_algo_dlen(algo) \ -+ ); \ -+ } while (0) -+#define HMAC(algo, key, klen, data, dlen, res, rlen) do { \ -+ gcry_md_hd_t mdh; \ -+ gcry_md_open(&mdh, algo, GCRY_MD_FLAG_HMAC); \ -+ gcry_md_setkey(mdh, key, klen); \ -+ gcry_md_write(mdh, data, dlen); \ -+ memcpy(res, gcry_md_read(mdh, algo), \ -+ gcry_md_get_algo_dlen (algo)); \ -+ gcry_md_close(mdh); \ -+ } while (0) -+// http://tumblr.spantz.org/post/214737529/the-use-of-do-while-0-in-c-macros -+#endif // _GNUTLS_OPENSSL_WRAPPERS_H -diff -ruN a/src/Makefile b/src/Makefile ---- a/src/Makefile 2012-05-28 23:27:02.837053644 +0200 -+++ b/src/Makefile 2012-05-28 23:29:44.391118719 +0200 -@@ -96,7 +96,13 @@ - endif - LIBOSD = $(OSD)/lib$(OSD).a - --LIBSSL = -lssl -lcrypto $(LDFLAGS) -+ifeq ($(gnutls), true) -+ LIBSSL = -lgnutls -lgcrypt $(LDFLAGS) -+ CFLAGS += -DUSE_GNUTLS -+else -+ LIBSSL = -lssl -lcrypto $(LDFLAGS) -+endif -+ - LIBSQL = - ifeq ($(SQLITE), true) - LIBSQL = -L/usr/local/lib -lsqlite3 diff -Nru aircrack-ng-1.1/debian/patches/009-airodump-ng-oui-update-manpage.diff aircrack-ng-1.1/debian/patches/009-airodump-ng-oui-update-manpage.diff --- aircrack-ng-1.1/debian/patches/009-airodump-ng-oui-update-manpage.diff 2012-06-17 00:10:23.000000000 +0200 +++ aircrack-ng-1.1/debian/patches/009-airodump-ng-oui-update-manpage.diff 2012-07-16 02:12:47.000000000 +0200 @@ -1,6 +1,6 @@ Description: Add airodump-ng-oui-update manpage Origin: upstream -Applied-Upstream: http://trac.aircrack-ng.org/svn/trunk@2054 +Applied-Upstream: http://trac.aircrack-ng.org/changeset/2054 --- Index: aircrack-ng-1.1/manpages/airodump-ng-oui-update.1 =================================================================== diff -Nru aircrack-ng-1.1/debian/patches/010-add-freebsd-support.diff aircrack-ng-1.1/debian/patches/010-add-freebsd-support.diff --- aircrack-ng-1.1/debian/patches/010-add-freebsd-support.diff 2012-06-17 00:39:43.000000000 +0200 +++ aircrack-ng-1.1/debian/patches/010-add-freebsd-support.diff 2012-07-16 02:16:10.000000000 +0200 @@ -3,12 +3,11 @@ Bug-Debian: http://bugs.debian.org/642698 Forwarded: http://trac.aircrack-ng.org/ticket/944 http://trac.aircrack-ng.org/ticket/945 -Applied-Upstream: http://trac.aircrack-ng.org/svn/trunk@2074 +Applied-Upstream: http://trac.aircrack-ng.org/changeset/1973 + http://trac.aircrack-ng.org/changeset/1974 --- -Index: aircrack-ng-1.1/common.mak -=================================================================== ---- aircrack-ng-1.1.orig/common.mak 2012-06-16 23:51:30.000000000 +0200 -+++ aircrack-ng-1.1/common.mak 2012-06-17 00:00:38.248933485 +0200 +--- a/common.mak ++++ b/common.mak @@ -2,7 +2,7 @@ TOOL_PREFIX = endif @@ -18,10 +17,8 @@ endif ifndef SQLITE SQLITE = false -Index: aircrack-ng-1.1/scripts/Makefile -=================================================================== ---- aircrack-ng-1.1.orig/scripts/Makefile 2009-07-25 00:45:38.000000000 +0200 -+++ aircrack-ng-1.1/scripts/Makefile 2012-06-17 00:00:38.248933485 +0200 +--- a/scripts/Makefile ++++ b/scripts/Makefile @@ -1,7 +1,7 @@ AC_ROOT = .. include $(AC_ROOT)/common.mak @@ -45,10 +42,8 @@ uninstall: -rm -f $(DESTDIR)$(sbindir)/airmon-ng -Index: aircrack-ng-1.1/scripts/airmon-ng.freebsd -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ aircrack-ng-1.1/scripts/airmon-ng.freebsd 2012-06-17 00:00:38.248933485 +0200 +--- /dev/null ++++ b/scripts/airmon-ng.freebsd @@ -0,0 +1,12 @@ +#!/bin/sh + @@ -62,10 +57,8 @@ +EOF + +exit 0 -Index: aircrack-ng-1.1/src/osdep/Makefile -=================================================================== ---- aircrack-ng-1.1.orig/src/osdep/Makefile 2010-01-06 23:02:09.000000000 +0100 -+++ aircrack-ng-1.1/src/osdep/Makefile 2012-06-17 00:00:38.248933485 +0200 +--- a/src/osdep/Makefile ++++ b/src/osdep/Makefile @@ -41,6 +41,11 @@ $(RANLIB) $(LIB) touch $(@) @@ -78,10 +71,8 @@ .os.OpenBSD: $(OBJS_OBSD) $(AR) cru $(LIB) $(OBJS_OBSD) $(RANLIB) $(LIB) -Index: aircrack-ng-1.1/src/osdep/freebsd.c -=================================================================== ---- aircrack-ng-1.1.orig/src/osdep/freebsd.c 2008-02-26 19:12:19.000000000 +0100 -+++ aircrack-ng-1.1/src/osdep/freebsd.c 2012-06-17 00:00:38.248933485 +0200 +--- a/src/osdep/freebsd.c ++++ b/src/osdep/freebsd.c @@ -560,7 +560,7 @@ int get_battery_state(void) diff -Nru aircrack-ng-1.1/debian/patches/011-add-support-for-gcrypt.diff aircrack-ng-1.1/debian/patches/011-add-support-for-gcrypt.diff --- aircrack-ng-1.1/debian/patches/011-add-support-for-gcrypt.diff 1970-01-01 01:00:00.000000000 +0100 +++ aircrack-ng-1.1/debian/patches/011-add-support-for-gcrypt.diff 2012-07-16 23:28:17.000000000 +0200 @@ -0,0 +1,709 @@ +Description: Add support for libgcrypt+sha1-git + * It adds a wrapper that translates the OpenSSL primitives to the + libgcrypt counterparts using macro definitions. + * For the SHA1 functions instead of relying on Libgcrypt, it uses + an internal SHA1 Implementation that was borrowed from GIT. + * Compile with: + make gcrypt=true + * Extensive tests were done with this patch. + For more info check: http://trac.aircrack-ng.org/ticket/1012 +Author: Carlos Alberto Lopez Perez <clopez@igalia.com> +Bug-Debian: http://bugs.debian.org/642934 + http://bugs.debian.org/680414 +Forwarded: http://trac.aircrack-ng.org/ticket/1012 +--- +--- a/INSTALLING ++++ b/INSTALLING +@@ -1,6 +1,6 @@ + === Requirements === + +- * OpenSSL development package ++ * OpenSSL development package or libgcrypt development package + * If you want to use airolib-ng and '-r' option in aircrack-ng, + SQLite development package >= 3.3.17 (3.6.X version or better is recommended): + - libsqlite3-devel +@@ -38,11 +38,17 @@ + * unstable: needed to compile tkiptun-ng, easside-ng (and buddy-ng) and + wesside-ng + ++* gcrypt: Use libgcrypt crypto library instead of the default OpenSSL. ++ And also use internal fast sha1 implementation (borrowed from GIT) ++ + Example: + + * Compiling: + make sqlite=true unstable=true + ++ * Compiling with gcrypt ++ make gcrypt=true ++ + * Installing: + make sqlite=true unstable=true install + +--- a/src/Makefile ++++ b/src/Makefile +@@ -96,7 +96,24 @@ + endif + LIBOSD = $(OSD)/lib$(OSD).a + +-LIBSSL = -lssl -lcrypto $(LDFLAGS) ++ifeq ($(filter true, $(gcrypt) $(GCRYPT)), true) ++ LIBSSL = -lgcrypt $(LDFLAGS) ++ CFLAGS += -DUSE_GCRYPT ++ OBJS_AC += sha1-git.o ++ OBJS_AD += sha1-git.o ++ OBJS_PF += sha1-git.o ++ OBJS_IV += sha1-git.o ++ OBJS_AR += sha1-git.o ++ OBJS_ADU += sha1-git.o ++ OBJS_AT += sha1-git.o ++ OBJS_AB += sha1-git.o ++ OBJS_AL += sha1-git.o ++ OBJS_WS += sha1-git.o ++ OBJS_TT += sha1-git.o ++else ++ LIBSSL = -lssl -lcrypto $(LDFLAGS) ++endif ++ + LIBSQL = + ifeq ($(SQLITE), true) + LIBSQL = -L/usr/local/lib -lsqlite3 +--- a/src/airbase-ng.c ++++ b/src/airbase-ng.c +@@ -68,6 +68,10 @@ + #include "osdep/osdep.h" + #include "osdep/common.h" + ++#ifdef USE_GCRYPT ++ GCRY_THREAD_OPTION_PTHREAD_IMPL; ++#endif ++ + static struct wif *_wi_in, *_wi_out; + + #define CRYPT_NONE 0 +@@ -3907,6 +3911,14 @@ + rCF = (pCF_t) malloc(sizeof(struct CF_packet)); + memset(rCF, 0, sizeof(struct CF_packet)); + ++#ifdef USE_GCRYPT ++ // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt. ++ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); ++ // Disable secure memory. ++ gcry_control (GCRYCTL_DISABLE_SECMEM, 0); ++ // Tell Libgcrypt that initialization has completed. ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++#endif + pthread_mutex_init( &mx_cf, NULL ); + pthread_mutex_init( &mx_cap, NULL ); + +--- a/src/aircrack-ng.c ++++ b/src/aircrack-ng.c +@@ -75,6 +75,10 @@ + sqlite3 *db; + #endif + ++#ifdef USE_GCRYPT ++ GCRY_THREAD_OPTION_PTHREAD_IMPL; ++#endif ++ + extern int get_nb_cpus(); + + static uchar ZERO[32] = +@@ -4546,6 +4550,14 @@ + char *sql; + #endif + ++#ifdef USE_GCRYPT ++ // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt. ++ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); ++ // Disable secure memory. ++ gcry_control (GCRYCTL_DISABLE_SECMEM, 0); ++ // Tell Libgcrypt that initialization has completed. ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++#endif + ret = FAILURE; + showhelp = 0; + +--- a/src/airodump-ng.c ++++ b/src/airodump-ng.c +@@ -69,6 +69,10 @@ + #include "osdep/common.h" + #include "common.h" + ++#ifdef USE_GCRYPT ++ GCRY_THREAD_OPTION_PTHREAD_IMPL; ++#endif ++ + void dump_sort( void ); + void dump_print( int ws_row, int ws_col, int if_num ); + +@@ -5234,6 +5238,14 @@ + }; + + ++#ifdef USE_GCRYPT ++ // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt. ++ gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); ++ // Disable secure memory. ++ gcry_control (GCRYCTL_DISABLE_SECMEM, 0); ++ // Tell Libgcrypt that initialization has completed. ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++#endif + pthread_mutex_init( &(G.mx_print), NULL ); + pthread_mutex_init( &(G.mx_sort), NULL ); + +--- a/src/crypto.c ++++ b/src/crypto.c +@@ -1208,6 +1208,11 @@ + offset += n; + } + ++ // We need to free the ctx when using gcrypt to avoid memory leaks ++ #ifdef USE_GCRYPT ++ gcry_cipher_close(aes_ctx); ++ #endif ++ + return( memcmp( h80211 + offset, MIC, 8 ) == 0 ); + } + +--- a/src/crypto.h ++++ b/src/crypto.h +@@ -9,11 +9,16 @@ + #define uint32 unsigned long int + #endif + ++#ifdef USE_GCRYPT ++#include "gcrypt-openssl-wrapper.h" ++#include "sha1-git.h" ++#else + #include <openssl/hmac.h> + #include <openssl/sha.h> + // We don't use EVP. Bite me + #include <openssl/rc4.h> + #include <openssl/aes.h> ++#endif + + #define S_LLC_SNAP "\xAA\xAA\x03\x00\x00\x00" + #define S_LLC_SNAP_ARP (S_LLC_SNAP "\x08\x06") +--- /dev/null ++++ b/src/gcrypt-openssl-wrapper.h +@@ -0,0 +1,86 @@ ++#ifndef _GCRYPT_OPENSSL_WRAPPER_H ++#define _GCRYPT_OPENSSL_WRAPPER_H ++/* ++ * ++ * gcrypt-openssl-wrapper.h ++ * ++ * Copyright (C) 2012 Carlos Alberto Lopez Perez <clopez@igalia.com> ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ * ++ */ ++#include <gcrypt.h> ++// RC4_* ++#define RC4_KEY gcry_cipher_hd_t ++#define RC4_set_key(h, l, k) do { \ ++ gcry_cipher_open(h, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0); \ ++ gcry_cipher_setkey(*h, k, l); \ ++ } while (0) ++ // we need to release the handle to avoid memory leaks. ++ // And in the actual code there are not repeat calls to RC4() without calling ++ // RC4_set_key() first, so we can encapsulate the call to gcry_cipher_close() inside RC4() ++ // This should be changed if you call RC4() without calling RC4_set_key before ++#define RC4(h, l, s, d) do { \ ++ gcry_cipher_encrypt(*h, d, l, s, l) ; \ ++ gcry_cipher_close(*h); \ ++ } while(0) ++// SHA_* (We use the sha1-git implementation because is much faster) ++#define SHA_CTX blk_SHA_CTX ++#define SHA1_Init(ctx) blk_SHA1_Init(ctx) ++#define SHA1_Update(ctx,buffer,len) blk_SHA1_Update(ctx,buffer,len) ++#define SHA1_Final(digest,ctx) blk_SHA1_Final(digest,ctx) ++// EVP_* ++#define EVP_md5() GCRY_MD_MD5 ++#define EVP_sha1() GCRY_MD_SHA1 ++// AES_* ++#define AES_KEY gcry_cipher_hd_t ++#define AES_encrypt(text, enc_out, ctx) gcry_cipher_encrypt(*ctx, enc_out, 16, text, 16) ++#define AES_set_encrypt_key(key, len, ctx) do { \ ++ gcry_cipher_open(ctx, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_ECB, 0); \ ++ gcry_cipher_setkey(*ctx, key, len/8); \ ++ } while (0) ++// HMAC_* ++#define HMAC_CTX gcry_md_hd_t ++#define HMAC_CTX_cleanup(ctx) gcry_md_close(*ctx) ++#define HMAC_CTX_init(ctx) ; // noop ++#define HMAC_Init_ex(ctx, key, len, md, engine) HMAC_Init(ctx, key, len, md) ++#define HMAC_Init(ctx, key, len, md) do { \ ++ if ((len==0)||(key==NULL)||(md==0)) { \ ++ gcry_md_reset(*ctx); \ ++ } else { \ ++ gcry_md_open(ctx, md, GCRY_MD_FLAG_HMAC); \ ++ gcry_md_setkey(*ctx, key, len); \ ++ } \ ++ } while (0) ++#define HMAC_Update(ctx, data, len) gcry_md_write(*ctx, data, len) ++#define HMAC_Final(ctx, md, len) do { \ ++ memcpy( md, \ ++ gcry_md_read(*ctx, 0), \ ++ gcry_md_get_algo_dlen(gcry_md_get_algo(*ctx)) \ ++ ); \ ++ } while (0) ++#define HMAC(algo, key, klen, data, dlen, res, rlen) do { \ ++ gcry_md_hd_t mdh; \ ++ gcry_md_open(&mdh, algo, GCRY_MD_FLAG_HMAC); \ ++ gcry_md_setkey(mdh, key, klen); \ ++ gcry_md_write(mdh, data, dlen); \ ++ memcpy(res, gcry_md_read(mdh, algo), \ ++ gcry_md_get_algo_dlen (algo)); \ ++ gcry_md_close(mdh); \ ++ } while (0) ++// http://tumblr.spantz.org/post/214737529/the-use-of-do-while-0-in-c-macros ++#endif // _GCRYPT_OPENSSL_WRAPPER_H +--- /dev/null ++++ b/src/sha1-git.c +@@ -0,0 +1,316 @@ ++#ifndef _SHA1_GIT ++/* ++ * sha1-git.c ++ * ++ * This code is based on the GIT SHA1 Implementation. ++ * ++ * Copyright (C) 2009 Linus Torvalds <torvalds@linux-foundation.org> ++ * Copyright (C) 2009 Nicolas Pitre <nico@cam.org> ++ * Copyright (C) 2009 Junio C Hamano <gitster@pobox.com> ++ * Copyright (C) 2009 Brandon Casey <drafnel@gmail.com> ++ * Copyright (C) 2010 Ramsay Jones <ramsay@ramsay1.demon.co.uk> ++ * Copyright (C) 2012 Carlos Alberto Lopez Perez <clopez@igalia.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ * ++ */ ++ ++/* ++ * SHA1 routine optimized to do word accesses rather than byte accesses, ++ * and to avoid unnecessary copies into the context array. ++ * ++ * This was initially based on the Mozilla SHA1 implementation, although ++ * none of the original Mozilla code remains. ++ */ ++ ++/* this is only to get definitions for memcpy(), ntohl() and htonl() */ ++//#include "../git-compat-util.h" ++#include <string.h> ++#include <arpa/inet.h> ++#include "sha1-git.h" ++ ++#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) ++ ++/* ++ * Force usage of rol or ror by selecting the one with the smaller constant. ++ * It _can_ generate slightly smaller code (a constant of 1 is special), but ++ * perhaps more importantly it's possibly faster on any uarch that does a ++ * rotate with a loop. ++ */ ++ ++#define SHA_ASM(op, x, n) ({ unsigned int __res; __asm__(op " %1,%0":"=r" (__res):"i" (n), "0" (x)); __res; }) ++#define SHA_ROL(x,n) SHA_ASM("rol", x, n) ++#define SHA_ROR(x,n) SHA_ASM("ror", x, n) ++ ++#else ++ ++#define SHA_ROT(X,l,r) (((X) << (l)) | ((X) >> (r))) ++#define SHA_ROL(X,n) SHA_ROT(X,n,32-(n)) ++#define SHA_ROR(X,n) SHA_ROT(X,32-(n),n) ++ ++#endif ++ ++/* ++ * If you have 32 registers or more, the compiler can (and should) ++ * try to change the array[] accesses into registers. However, on ++ * machines with less than ~25 registers, that won't really work, ++ * and at least gcc will make an unholy mess of it. ++ * ++ * So to avoid that mess which just slows things down, we force ++ * the stores to memory to actually happen (we might be better off ++ * with a 'W(t)=(val);asm("":"+m" (W(t))' there instead, as ++ * suggested by Artur Skawina - that will also make gcc unable to ++ * try to do the silly "optimize away loads" part because it won't ++ * see what the value will be). ++ * ++ * Ben Herrenschmidt reports that on PPC, the C version comes close ++ * to the optimized asm with this (ie on PPC you don't want that ++ * 'volatile', since there are lots of registers). ++ * ++ * On ARM we get the best code generation by forcing a full memory barrier ++ * between each SHA_ROUND, otherwise gcc happily get wild with spilling and ++ * the stack frame size simply explode and performance goes down the drain. ++ */ ++ ++#if defined(__i386__) || defined(__x86_64__) ++ #define setW(x, val) (*(volatile unsigned int *)&W(x) = (val)) ++#elif defined(__GNUC__) && defined(__arm__) ++ #define setW(x, val) do { W(x) = (val); __asm__("":::"memory"); } while (0) ++#else ++ #define setW(x, val) (W(x) = (val)) ++#endif ++ ++/* ++ * Performance might be improved if the CPU architecture is OK with ++ * unaligned 32-bit loads and a fast ntohl() is available. ++ * Otherwise fall back to byte loads and shifts which is portable, ++ * and is faster on architectures with memory alignment issues. ++ */ ++ ++#if defined(__i386__) || defined(__x86_64__) || \ ++ defined(_M_IX86) || defined(_M_X64) || \ ++ defined(__ppc__) || defined(__ppc64__) || \ ++ defined(__powerpc__) || defined(__powerpc64__) || \ ++ defined(__s390__) || defined(__s390x__) ++ ++#define get_be32(p) ntohl(*(unsigned int *)(p)) ++#define put_be32(p, v) do { *(unsigned int *)(p) = htonl(v); } while (0) ++ ++#else ++ ++#define get_be32(p) ( \ ++ (*((unsigned char *)(p) + 0) << 24) | \ ++ (*((unsigned char *)(p) + 1) << 16) | \ ++ (*((unsigned char *)(p) + 2) << 8) | \ ++ (*((unsigned char *)(p) + 3) << 0) ) ++#define put_be32(p, v) do { \ ++ unsigned int __v = (v); \ ++ *((unsigned char *)(p) + 0) = __v >> 24; \ ++ *((unsigned char *)(p) + 1) = __v >> 16; \ ++ *((unsigned char *)(p) + 2) = __v >> 8; \ ++ *((unsigned char *)(p) + 3) = __v >> 0; } while (0) ++ ++#endif ++ ++/* This "rolls" over the 512-bit array */ ++#define W(x) (array[(x)&15]) ++ ++/* ++ * Where do we get the source from? The first 16 iterations get it from ++ * the input data, the next mix it from the 512-bit array. ++ */ ++#define SHA_SRC(t) get_be32(data + t) ++#define SHA_MIX(t) SHA_ROL(W(t+13) ^ W(t+8) ^ W(t+2) ^ W(t), 1) ++ ++#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \ ++ unsigned int TEMP = input(t); setW(t, TEMP); \ ++ E += TEMP + SHA_ROL(A,5) + (fn) + (constant); \ ++ B = SHA_ROR(B, 2); } while (0) ++ ++#define T_0_15(t, A, B, C, D, E) SHA_ROUND(t, SHA_SRC, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) ++#define T_16_19(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) ++#define T_20_39(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0x6ed9eba1, A, B, C, D, E ) ++#define T_40_59(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, ((B&C)+(D&(B^C))) , 0x8f1bbcdc, A, B, C, D, E ) ++#define T_60_79(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0xca62c1d6, A, B, C, D, E ) ++ ++static void blk_SHA1_Block(blk_SHA_CTX *ctx, const unsigned int *data) ++{ ++ unsigned int A,B,C,D,E; ++ unsigned int array[16]; ++ ++ A = ctx->H[0]; ++ B = ctx->H[1]; ++ C = ctx->H[2]; ++ D = ctx->H[3]; ++ E = ctx->H[4]; ++ ++ /* Round 1 - iterations 0-16 take their input from 'data' */ ++ T_0_15( 0, A, B, C, D, E); ++ T_0_15( 1, E, A, B, C, D); ++ T_0_15( 2, D, E, A, B, C); ++ T_0_15( 3, C, D, E, A, B); ++ T_0_15( 4, B, C, D, E, A); ++ T_0_15( 5, A, B, C, D, E); ++ T_0_15( 6, E, A, B, C, D); ++ T_0_15( 7, D, E, A, B, C); ++ T_0_15( 8, C, D, E, A, B); ++ T_0_15( 9, B, C, D, E, A); ++ T_0_15(10, A, B, C, D, E); ++ T_0_15(11, E, A, B, C, D); ++ T_0_15(12, D, E, A, B, C); ++ T_0_15(13, C, D, E, A, B); ++ T_0_15(14, B, C, D, E, A); ++ T_0_15(15, A, B, C, D, E); ++ ++ /* Round 1 - tail. Input from 512-bit mixing array */ ++ T_16_19(16, E, A, B, C, D); ++ T_16_19(17, D, E, A, B, C); ++ T_16_19(18, C, D, E, A, B); ++ T_16_19(19, B, C, D, E, A); ++ ++ /* Round 2 */ ++ T_20_39(20, A, B, C, D, E); ++ T_20_39(21, E, A, B, C, D); ++ T_20_39(22, D, E, A, B, C); ++ T_20_39(23, C, D, E, A, B); ++ T_20_39(24, B, C, D, E, A); ++ T_20_39(25, A, B, C, D, E); ++ T_20_39(26, E, A, B, C, D); ++ T_20_39(27, D, E, A, B, C); ++ T_20_39(28, C, D, E, A, B); ++ T_20_39(29, B, C, D, E, A); ++ T_20_39(30, A, B, C, D, E); ++ T_20_39(31, E, A, B, C, D); ++ T_20_39(32, D, E, A, B, C); ++ T_20_39(33, C, D, E, A, B); ++ T_20_39(34, B, C, D, E, A); ++ T_20_39(35, A, B, C, D, E); ++ T_20_39(36, E, A, B, C, D); ++ T_20_39(37, D, E, A, B, C); ++ T_20_39(38, C, D, E, A, B); ++ T_20_39(39, B, C, D, E, A); ++ ++ /* Round 3 */ ++ T_40_59(40, A, B, C, D, E); ++ T_40_59(41, E, A, B, C, D); ++ T_40_59(42, D, E, A, B, C); ++ T_40_59(43, C, D, E, A, B); ++ T_40_59(44, B, C, D, E, A); ++ T_40_59(45, A, B, C, D, E); ++ T_40_59(46, E, A, B, C, D); ++ T_40_59(47, D, E, A, B, C); ++ T_40_59(48, C, D, E, A, B); ++ T_40_59(49, B, C, D, E, A); ++ T_40_59(50, A, B, C, D, E); ++ T_40_59(51, E, A, B, C, D); ++ T_40_59(52, D, E, A, B, C); ++ T_40_59(53, C, D, E, A, B); ++ T_40_59(54, B, C, D, E, A); ++ T_40_59(55, A, B, C, D, E); ++ T_40_59(56, E, A, B, C, D); ++ T_40_59(57, D, E, A, B, C); ++ T_40_59(58, C, D, E, A, B); ++ T_40_59(59, B, C, D, E, A); ++ ++ /* Round 4 */ ++ T_60_79(60, A, B, C, D, E); ++ T_60_79(61, E, A, B, C, D); ++ T_60_79(62, D, E, A, B, C); ++ T_60_79(63, C, D, E, A, B); ++ T_60_79(64, B, C, D, E, A); ++ T_60_79(65, A, B, C, D, E); ++ T_60_79(66, E, A, B, C, D); ++ T_60_79(67, D, E, A, B, C); ++ T_60_79(68, C, D, E, A, B); ++ T_60_79(69, B, C, D, E, A); ++ T_60_79(70, A, B, C, D, E); ++ T_60_79(71, E, A, B, C, D); ++ T_60_79(72, D, E, A, B, C); ++ T_60_79(73, C, D, E, A, B); ++ T_60_79(74, B, C, D, E, A); ++ T_60_79(75, A, B, C, D, E); ++ T_60_79(76, E, A, B, C, D); ++ T_60_79(77, D, E, A, B, C); ++ T_60_79(78, C, D, E, A, B); ++ T_60_79(79, B, C, D, E, A); ++ ++ ctx->H[0] += A; ++ ctx->H[1] += B; ++ ctx->H[2] += C; ++ ctx->H[3] += D; ++ ctx->H[4] += E; ++} ++ ++void blk_SHA1_Init(blk_SHA_CTX *ctx) ++{ ++ ctx->size = 0; ++ ++ /* Initialize H with the magic constants (see FIPS180 for constants) */ ++ ctx->H[0] = 0x67452301; ++ ctx->H[1] = 0xefcdab89; ++ ctx->H[2] = 0x98badcfe; ++ ctx->H[3] = 0x10325476; ++ ctx->H[4] = 0xc3d2e1f0; ++} ++ ++void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len) ++{ ++ unsigned int lenW = ctx->size & 63; ++ ++ ctx->size += len; ++ ++ /* Read the data into W and process blocks as they get full */ ++ if (lenW) { ++ unsigned int left = 64 - lenW; ++ if (len < left) ++ left = len; ++ memcpy(lenW + (char *)ctx->W, data, left); ++ lenW = (lenW + left) & 63; ++ len -= left; ++ data = ((const char *)data + left); ++ if (lenW) ++ return; ++ blk_SHA1_Block(ctx, ctx->W); ++ } ++ while (len >= 64) { ++ blk_SHA1_Block(ctx, data); ++ data = ((const char *)data + 64); ++ len -= 64; ++ } ++ if (len) ++ memcpy(ctx->W, data, len); ++} ++ ++void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx) ++{ ++ static const unsigned char pad[64] = { 0x80 }; ++ unsigned int padlen[2]; ++ int i; ++ ++ /* Pad with a binary 1 (ie 0x80), then zeroes, then length */ ++ padlen[0] = htonl((uint32_t)(ctx->size >> 29)); ++ padlen[1] = htonl((uint32_t)(ctx->size << 3)); ++ ++ i = ctx->size & 63; ++ blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i))); ++ blk_SHA1_Update(ctx, padlen, 8); ++ ++ /* Output hash */ ++ for (i = 0; i < 5; i++) ++ put_be32(hashout + i*4, ctx->H[i]); ++} ++#define _SHA1_GIT ++#endif +--- /dev/null ++++ b/src/sha1-git.h +@@ -0,0 +1,47 @@ ++/* ++ * sha1-git.h ++ * ++ * This code is based on the GIT SHA1 Implementation. ++ * ++ * Copyright (C) 2009 Linus Torvalds <torvalds@linux-foundation.org> ++ * Copyright (C) 2009 Nicolas Pitre <nico@cam.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ * ++ */ ++ ++/* ++ * SHA1 routine optimized to do word accesses rather than byte accesses, ++ * and to avoid unnecessary copies into the context array. ++ * ++ * This was initially based on the Mozilla SHA1 implementation, although ++ * none of the original Mozilla code remains. ++ */ ++ ++typedef struct { ++ unsigned long long size; ++ unsigned int H[5]; ++ unsigned int W[16]; ++} blk_SHA_CTX; ++ ++void blk_SHA1_Init(blk_SHA_CTX *ctx); ++void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, unsigned long len); ++void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx); ++ ++#define git_SHA_CTX blk_SHA_CTX ++#define git_SHA1_Init blk_SHA1_Init ++#define git_SHA1_Update blk_SHA1_Update ++#define git_SHA1_Final blk_SHA1_Final +--- a/src/airdecap-ng.c ++++ b/src/airdecap-ng.c +@@ -215,6 +215,13 @@ + struct pcap_file_header pfh; + struct pcap_pkthdr pkh; + ++ #ifdef USE_GCRYPT ++ // Disable secure memory. ++ gcry_control (GCRYCTL_DISABLE_SECMEM, 0); ++ // Tell Libgcrypt that initialization has completed. ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++ #endif ++ + /* parse the arguments */ + + memset( ZERO, 0, sizeof( ZERO ) ); +--- a/src/airtun-ng.c ++++ b/src/airtun-ng.c +@@ -1132,6 +1132,13 @@ + char *s, buf[128]; + int caplen; + ++ #ifdef USE_GCRYPT ++ // Disable secure memory. ++ gcry_control (GCRYCTL_DISABLE_SECMEM, 0); ++ // Tell Libgcrypt that initialization has completed. ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++ #endif ++ + /* check the arguments */ + + memset( &opt, 0, sizeof( opt ) ); +--- a/src/tkiptun-ng.c ++++ b/src/tkiptun-ng.c +@@ -3737,6 +3737,13 @@ + int packet1_len, packet2_len; + struct timeval mic_fail; + ++ #ifdef USE_GCRYPT ++ // Disable secure memory. ++ gcry_control (GCRYCTL_DISABLE_SECMEM, 0); ++ // Tell Libgcrypt that initialization has completed. ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++ #endif ++ + /* check the arguments */ + + memset( &opt, 0, sizeof( opt ) ); +--- a/src/airolib-ng.c ++++ b/src/airolib-ng.c +@@ -904,6 +904,13 @@ + {0, 0, 0, 0 } + }; + ++#ifdef USE_GCRYPT ++ // Disable secure memory. ++ gcry_control (GCRYCTL_DISABLE_SECMEM, 0); ++ // Tell Libgcrypt that initialization has completed. ++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); ++#endif ++ + option = getopt_long( argc, argv, "bc:d:e:hi:s:t:v:", long_options, &option_index ); + + if( option > 0 ) diff -Nru aircrack-ng-1.1/debian/patches/012-fix-hurd-ftbfs.diff aircrack-ng-1.1/debian/patches/012-fix-hurd-ftbfs.diff --- aircrack-ng-1.1/debian/patches/012-fix-hurd-ftbfs.diff 1970-01-01 01:00:00.000000000 +0100 +++ aircrack-ng-1.1/debian/patches/012-fix-hurd-ftbfs.diff 2012-07-16 02:18:14.000000000 +0200 @@ -0,0 +1,17 @@ +Description: Fix FTBFS on GNU/Hurd +Author: Carlos Alberto Lopez Perez <clopez@igalia.com> +Bug-Debian: http://bugs.debian.org/680414 +Forwarded: http://trac.aircrack-ng.org/ticket/1010 +Applied-Upstream: http://trac.aircrack-ng.org/changeset/2162 +--- +--- a/src/osdep/byteorder.h ++++ b/src/osdep/byteorder.h +@@ -197,7 +197,7 @@ + /* + * Custom stuff + */ +- #if defined(__MACH__) && !defined(__APPLE_CC__) ++ #if defined(__MACH__) && !defined(__APPLE_CC__) && !defined(__GNU__) + #include <libkern/OSByteOrder.h> + #define __cpu_to_be64(x) = OSSwapHostToBigInt64(x) + #define __cpu_to_be32(x) = OSSwapHostToBigInt32(x) diff -Nru aircrack-ng-1.1/debian/patches/013-workaround-681113-kfreebsd.diff aircrack-ng-1.1/debian/patches/013-workaround-681113-kfreebsd.diff --- aircrack-ng-1.1/debian/patches/013-workaround-681113-kfreebsd.diff 1970-01-01 01:00:00.000000000 +0100 +++ aircrack-ng-1.1/debian/patches/013-workaround-681113-kfreebsd.diff 2012-07-13 21:58:11.000000000 +0200 @@ -0,0 +1,24 @@ +Description: Work-around Debian bug #681113 + * On Debian/kfreebsd machines libpthread causes the stdout to fall in + a blackhole when it is piped. This breaks the tests on aircrack-ng. + * Workaround it by forcing line buffer when running aircrack-ng on the + tests +Author: Carlos Alberto Lopez Perez <clopez@igalia.com> +Bug-Debian: http://bugs.debian.org/680414 +Forwarded: http://bugs.debian.org/681113 +--- +Index: aircrack-ng-1.1/src/Makefile +=================================================================== +--- aircrack-ng-1.1.orig/src/Makefile 2012-07-10 20:23:22.000000000 +0200 ++++ aircrack-ng-1.1/src/Makefile 2012-07-10 20:27:12.000000000 +0200 +@@ -245,5 +245,10 @@ + -rm -rf $(DESTDIR)$(etcdir) + + check: aircrack-ng$(EXE) ++ifeq ($(filter FreeBSD GNU-kFreeBSD, $(OSNAME)),) + ./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e Harkonen -q $(TEST_DIR)/wpa2.eapol.cap | grep 'KEY FOUND! \[ 12345678 \]' + ./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e test -q $(TEST_DIR)/wpa.cap | grep 'KEY FOUND! \[ biscotte \]' ++else ++ stdbuf -oL ./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e Harkonen -q $(TEST_DIR)/wpa2.eapol.cap | grep 'KEY FOUND! \[ 12345678 \]' ++ stdbuf -oL ./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e test -q $(TEST_DIR)/wpa.cap | grep 'KEY FOUND! \[ biscotte \]' ++endif diff -Nru aircrack-ng-1.1/debian/patches/014-man_page_formatting.diff aircrack-ng-1.1/debian/patches/014-man_page_formatting.diff --- aircrack-ng-1.1/debian/patches/014-man_page_formatting.diff 1970-01-01 01:00:00.000000000 +0100 +++ aircrack-ng-1.1/debian/patches/014-man_page_formatting.diff 2012-07-13 22:36:24.000000000 +0200 @@ -0,0 +1,18 @@ +Description: Fix aircrack-ng manpage. Closes: #570986 +Forwarded: yes +Author: Daniel Echeverry <epsilon77@gmail.com> +Origin: vendor +Last-Update: 2011-01-30 +-- +Index: aircrack-ng-1.1/manpages/aircrack-ng.1 +=================================================================== +--- aircrack-ng-1.1.orig/manpages/aircrack-ng.1 2011-01-30 12:44:02.000000000 -0500 ++++ aircrack-ng-1.1/manpages/aircrack-ng.1 2011-01-30 12:44:33.000000000 -0500 +@@ -112,6 +112,7 @@ + .TP + .I -w <words> + Path to a dictionary file for wpa cracking. Specify "-" to use stdin. Here is a list of wordlists: http://www.aircrack-ng.org/doku.php?id=faq#where_can_i_find_good_wordlists ++.TP + .I -r <database> + Path to the airolib-ng database. Cannot be used with '-w'. + .SH AUTHOR diff -Nru aircrack-ng-1.1/debian/patches/series aircrack-ng-1.1/debian/patches/series --- aircrack-ng-1.1/debian/patches/series 2012-06-17 00:12:00.000000000 +0200 +++ aircrack-ng-1.1/debian/patches/series 2012-07-13 22:34:28.000000000 +0200 @@ -4,7 +4,10 @@ 004-fix-license-issues.diff 005-fix-issues-cppcheck-r2008.diff 006-fix-ftbfs-and-man-path.diff -007-Add-support-for-GnuTLS.diff 008-fix_path_airodump-ng-oui.diff 009-airodump-ng-oui-update-manpage.diff 010-add-freebsd-support.diff +011-add-support-for-gcrypt.diff +012-fix-hurd-ftbfs.diff +013-workaround-681113-kfreebsd.diff +014-man_page_formatting.diff diff -Nru aircrack-ng-1.1/debian/README.Debian aircrack-ng-1.1/debian/README.Debian --- aircrack-ng-1.1/debian/README.Debian 2012-06-18 12:40:44.000000000 +0200 +++ aircrack-ng-1.1/debian/README.Debian 2012-07-16 23:25:00.000000000 +0200 @@ -1,6 +1,30 @@ Aircrack-ng for Debian ---------------------- +The previous version (1:1.1-2) of Aircrack-ng on Debian was patched to +add support for using GnuTLS and Libgcrypt instead of OpenSSL. + +Because of some problems found (#680414) the previous patch was rewrote, +and now it not longer uses any function from GnuTLS. Instead the GIT's SHA1 +implementation was borrowed and integrated with Aircrack-ng. + +This means that now for the SHA1 calculations we use an internal SHA1 +implementation, and for the rest of the crypto code we rely on Libgcrypt. + +With this change the speed has improved quite a bit, and now the overall +speed is more or less the same with this patch than with OpenSSL. +On SSE2 CPUs Aircrack-ng with this patch is still [1-4]% slower, meanwhile +on the rest of CPUs aircrack-ng is [1-3]% faster with this patch enabled. +For more details about this you can check out +http://trac.aircrack-ng.org/ticket/1012 + +If you still wish to rebuild Aircrack-ng to use OpenSSL instead of this +Libgcrypt+git-sha1 alternative, you only need to comment (or remove) +the lines "gcrypt=true" on debian/rules and replace "libgcrypt11-dev" +with "libssl-dev" on debian/control + + -- Carlos Alberto Lopez Perez <clopez@igalia.com> Mon, 16 Jul 2012 23:22:23 +0200 + Aircrack-ng on Debian has been patched to use GnuTLS instead of OpenSSL. This change has been motivated because of the incompatibilities between the GPL and OpenSSL licenses. See http://bugs.debian.org/642934 and diff -Nru aircrack-ng-1.1/debian/rules aircrack-ng-1.1/debian/rules --- aircrack-ng-1.1/debian/rules 2012-06-17 01:15:45.000000000 +0200 +++ aircrack-ng-1.1/debian/rules 2012-07-09 12:40:36.000000000 +0200 @@ -12,7 +12,7 @@ override_dh_auto_build: CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) \ - gnutls=true \ + gcrypt=true \ sqlite=true \ unstable=true @@ -20,6 +20,6 @@ $(MAKE) install \ DESTDIR=$(CURDIR)/debian/aircrack-ng \ prefix=/usr \ - gnutls=true \ + gcrypt=true \ sqlite=true \ unstable=trueAttachment: signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
- To: Carlos Alberto Lopez Perez <clopez@igalia.com>, 682005-done@bugs.debian.org
- Subject: Re: Bug#682005: unblock: aircrack-ng/1:1.1-4
- From: Julien Cristau <jcristau@debian.org>
- Date: Wed, 18 Jul 2012 20:04:48 +0200
- Message-id: <20120718180448.GY7369@radis.cristau.org>
- In-reply-to: <5006DC65.5000308@igalia.com>
- References: <5006DC65.5000308@igalia.com>
On Wed, Jul 18, 2012 at 17:55:17 +0200, Carlos Alberto Lopez Perez wrote: > Package: release.debian.org > User: release.debian.org@packages.debian.org > Usertags: unblock > Severity: normal > > Please unblock package aircrack-ng > > Hello, I want to upload a new version of aircrack-ng to unstable, > but before doing it I would like to get the unblock approval from > the release team. > aircrack-ng hasn't been in testing for a year and a half, and isn't in stable. I'm afraid that's not going to happen. Cheers, JulienAttachment: signature.asc
Description: Digital signature
--- End Message ---