[kismac] [binaervarianz] r113 - in KisMACng: . KisMAC.xcodeproj Sources/Core
- From: svn@xxxxxxxxxxxxxxxx
- To: kismac@xxxxxxxxxxxxx
- Date: Wed, 22 Mar 2006 21:17:09 +0100
Author: mick
Date: 2006-03-22 21:17:08 +0100 (Wed, 22 Mar 2006)
New Revision: 113
Modified:
KisMACng/CHANGES
KisMACng/KisMAC.xcodeproj/mick.mode1
KisMACng/KisMAC.xcodeproj/mick.pbxuser
KisMACng/Sources/Core/WavePacket.mm
Log:
- fixing a severe securtiy issue, found by stefan esser
Modified: KisMACng/CHANGES
===================================================================
--- KisMACng/CHANGES 2006-03-21 18:06:20 UTC (rev 112)
+++ KisMACng/CHANGES 2006-03-22 20:17:08 UTC (rev 113)
@@ -1,3 +1,5 @@
+R112: - fixing a security issue, discovered by Stefan Esser. was introduced
with R54
+
R111: - Added Austrailan Map Server Closes #70
R108: - Fixed #35, #36 and #54. When not hopping, still set channel in
hopping method. This avoids a nasty race condition.
Modified: KisMACng/KisMAC.xcodeproj/mick.mode1
===================================================================
--- KisMACng/KisMAC.xcodeproj/mick.mode1 2006-03-21 18:06:20 UTC (rev
112)
+++ KisMACng/KisMAC.xcodeproj/mick.mode1 2006-03-22 20:17:08 UTC (rev
113)
@@ -264,7 +264,9 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
-
<integer>1</integer>
+
<integer>19</integer>
+
<integer>7</integer>
+
<integer>3</integer>
<integer>0</integer>
</array>
</array>
@@ -308,7 +310,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>CHANGES</string>
+
<string>WavePacket.mm</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -316,14 +318,13 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>CHANGES</string>
+
<string>WavePacket.mm</string>
<key>_historyCapacity</key>
<integer>20</integer>
<key>bookmark</key>
-
<string>00340D8209CA089800B78602</string>
+
<string>00F7E73C09D1D5FE00055E8E</string>
<key>history</key>
<array>
-
<string>00D5638409C4834000FB787B</string>
<string>00D5638509C4834000FB787B</string>
<string>00D563DD09C4948100FB787B</string>
<string>00D5662D09C7343700FB787B</string>
@@ -341,16 +342,15 @@
<string>00D569EB09C7689100FB787B</string>
<string>00340D4909CA013100B78602</string>
<string>00340D5E09CA049700B78602</string>
-
<string>00340D7F09CA089800B78602</string>
-
<string>00340D8009CA089800B78602</string>
+
<string>00F7E73609D1D5DF00055E8E</string>
+
<string>00F7E73709D1D5DF00055E8E</string>
+
<string>00F7E73809D1D5DF00055E8E</string>
</array>
<key>prevStack</key>
<array>
<string>0076353C09A26CAC002A5BEF</string>
-
<string>00D5630809C44A4800FB787B</string>
<string>00D5634A09C47AA400FB787B</string>
<string>00D5639109C4834000FB787B</string>
-
<string>00D5639609C4834000FB787B</string>
<string>00D563DF09C4948100FB787B</string>
<string>00D5663009C7343700FB787B</string>
<string>00D5663D09C734DD00FB787B</string>
@@ -365,7 +365,8 @@
<string>00D569ED09C7689100FB787B</string>
<string>00340D4B09CA013100B78602</string>
<string>00340D6009CA049700B78602</string>
-
<string>00340D8109CA089800B78602</string>
+
<string>00F7E73909D1D5DF00055E8E</string>
+
<string>00F7E73A09D1D5DF00055E8E</string>
</array>
</dict>
<key>SplitCount</key>
@@ -423,9 +424,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>00340D1509C9FFB400B78602</string>
+ <string>00F7E72E09D1D57F00055E8E</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>00340D1609C9FFB400B78602</string>
+ <string>00F7E72F09D1D57F00055E8E</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -559,13 +560,6 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>00340D4D09CA013100B78602</string>
- <string>00340D4E09CA013100B78602</string>
- <string>00A3E93108243E5F003CD96A</string>
- <string>1CD10A99069EF8BA00B06720</string>
- <string>00340D4409CA011600B78602</string>
- <string>1C0AD2B3069F1EA900FABCE6</string>
- <string>00A3E66608242A87003CD96A</string>
<string>/Users/mick/openDev/KisMACng/KisMAC.xcodeproj</string>
</array>
<key>WindowString</key>
Modified: KisMACng/KisMAC.xcodeproj/mick.pbxuser
===================================================================
--- KisMACng/KisMAC.xcodeproj/mick.pbxuser 2006-03-21 18:06:20 UTC (rev
112)
+++ KisMACng/KisMAC.xcodeproj/mick.pbxuser 2006-03-22 20:17:08 UTC (rev
113)
@@ -218,46 +218,6 @@
modificationTime = 164235262.769046;
state = 2;
};
- 00340D7F09CA089800B78602 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 003533BA06A5DD8500AB4577 /* WaveContainer.m */;
- name = "WaveContainer.m: 826";
- rLen = 0;
- rLoc = 25034;
- rType = 0;
- vrLen = 1305;
- vrLoc = 24610;
- };
- 00340D8009CA089800B78602 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
- name = "CHANGES: 1";
- rLen = 154;
- rLoc = 120;
- rType = 0;
- vrLen = 2641;
- vrLoc = 0;
- };
- 00340D8109CA089800B78602 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 003533BA06A5DD8500AB4577 /* WaveContainer.m */;
- name = "WaveContainer.m: 826";
- rLen = 0;
- rLoc = 25034;
- rType = 0;
- vrLen = 1305;
- vrLoc = 24610;
- };
- 00340D8209CA089800B78602 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
- name = "CHANGES: 1";
- rLen = 106;
- rLoc = 6;
- rType = 0;
- vrLen = 2709;
- vrLoc = 0;
- };
0035332F06A5DD5700AB4577 /* KisMAC.scriptSuite */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {938, 2758}}";
@@ -584,8 +544,8 @@
003533C206A5DD8500AB4577 /* WavePacket.mm */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {2096, 12824}}";
- sepNavSelRange = "{4701, 19}";
- sepNavVisRect = "{{0, 1956}, {705, 666}}";
+ sepNavSelRange = "{1686, 0}";
+ sepNavVisRect = "{{0, 1318}, {932, 662}}";
sepNavWindowFrame = "{{15, 32}, {750, 795}}";
};
};
@@ -1298,6 +1258,9 @@
0093D1EE09B08C370046F830 /*
ScanControllerScriptable.m:508 */,
00D5629009C2151100FB787B /* GrowlController.m:1 */,
00D5629209C2151100FB787B /* GrowlController.m:1 */,
+ 00340D5809CA047200B78602 /* WaveContainer.m:821 */,
+ 00340D6409CA051A00B78602 /* WaveContainer.m:825 */,
+ 00340D6609CA065100B78602 /* WaveContainer.m:836 */,
);
};
00875D190708ADB300CACFCB /* WaveHelper.h */ = {
@@ -1794,16 +1757,6 @@
modificationTime = 164235196.43352;
state = 2;
};
- 00D5630809C44A4800FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
- name = "CHANGES: 1";
- rLen = 0;
- rLoc = 114;
- rType = 0;
- vrLen = 1864;
- vrLoc = 0;
- };
00D5634A09C47AA400FB787B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
@@ -1814,16 +1767,6 @@
vrLen = 1388;
vrLoc = 0;
};
- 00D5638409C4834000FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 0035341806A5DD8500AB4577 /* WaveDriverMacJack.m */;
- name = driverName;
- rLen = 10;
- rLoc = 1792;
- rType = 0;
- vrLen = 2108;
- vrLoc = 1321;
- };
00D5638509C4834000FB787B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
@@ -1844,16 +1787,6 @@
vrLen = 1865;
vrLoc = 1412;
};
- 00D5639609C4834000FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 0035341806A5DD8500AB4577 /* WaveDriverMacJack.m */;
- name = driverName;
- rLen = 10;
- rLoc = 1792;
- rType = 0;
- vrLen = 2108;
- vrLoc = 1321;
- };
00D563DD09C4948100FB787B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
@@ -2215,8 +2148,8 @@
};
00F57CAB06A8887F0035AE2F /* CHANGES */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1850, 5250}}";
- sepNavSelRange = "{6, 106}";
+ sepNavIntBoundsRect = "{{0, 0}, {1850, 5306}}";
+ sepNavSelRange = "{0, 85}";
sepNavVisRect = "{{0, 0}, {932, 662}}";
};
};
@@ -2240,6 +2173,66 @@
modificationTime = 164235221.671345;
state = 1;
};
+ 00F7E73609D1D5DF00055E8E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533BA06A5DD8500AB4577 /* WaveContainer.m */;
+ name = "WaveContainer.m: 826";
+ rLen = 0;
+ rLoc = 25034;
+ rType = 0;
+ vrLen = 1271;
+ vrLoc = 24610;
+ };
+ 00F7E73709D1D5DF00055E8E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+ name = "CHANGES: 1";
+ rLen = 0;
+ rLoc = 4;
+ rType = 0;
+ vrLen = 2736;
+ vrLoc = 0;
+ };
+ 00F7E73809D1D5DF00055E8E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533C206A5DD8500AB4577 /* WavePacket.mm */;
+ name = IEEE80211_TYPE_MASK;
+ rLen = 19;
+ rLoc = 4702;
+ rType = 0;
+ vrLen = 1759;
+ vrLoc = 4132;
+ };
+ 00F7E73909D1D5DF00055E8E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533BA06A5DD8500AB4577 /* WaveContainer.m */;
+ name = "WaveContainer.m: 826";
+ rLen = 0;
+ rLoc = 25034;
+ rType = 0;
+ vrLen = 1271;
+ vrLoc = 24610;
+ };
+ 00F7E73A09D1D5DF00055E8E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+ name = "CHANGES: 1";
+ rLen = 0;
+ rLoc = 4;
+ rType = 0;
+ vrLen = 2736;
+ vrLoc = 0;
+ };
+ 00F7E73C09D1D5FE00055E8E /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533C206A5DD8500AB4577 /* WavePacket.mm */;
+ name = "WavePacket.mm: 56";
+ rLen = 0;
+ rLoc = 1686;
+ rType = 0;
+ vrLen = 1293;
+ vrLoc = 2877;
+ };
00FF593C06C630CC006C7F1E /* WaveDriverPrismGT.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {964, 587}}";
@@ -2448,7 +2441,7 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 164233123;
+ PBXPerProjectTemplateStateSaveDate = 164746613;
PBXPrepackagedSmartGroups_v2 = (
{
PBXTransientLocationAtTop = bottom;
@@ -2879,24 +2872,17 @@
PBXModuleWindowStatusBarHidden = YES;
RubberWindowFrame = "267 358 745 464 0 0 1280
832 ";
};
- PBXWorkspaceStateSaveDate = 164233123;
+ PBXWorkspaceStateSaveDate = 164746613;
};
perUserProjectItems = {
00340D4909CA013100B78602 /* PBXTextBookmark */ =
00340D4909CA013100B78602 /* PBXTextBookmark */;
00340D4B09CA013100B78602 /* PBXTextBookmark */ =
00340D4B09CA013100B78602 /* PBXTextBookmark */;
00340D5E09CA049700B78602 /* PBXTextBookmark */ =
00340D5E09CA049700B78602 /* PBXTextBookmark */;
00340D6009CA049700B78602 /* PBXTextBookmark */ =
00340D6009CA049700B78602 /* PBXTextBookmark */;
- 00340D7F09CA089800B78602 /* PBXTextBookmark */ =
00340D7F09CA089800B78602 /* PBXTextBookmark */;
- 00340D8009CA089800B78602 /* PBXTextBookmark */ =
00340D8009CA089800B78602 /* PBXTextBookmark */;
- 00340D8109CA089800B78602 /* PBXTextBookmark */ =
00340D8109CA089800B78602 /* PBXTextBookmark */;
- 00340D8209CA089800B78602 /* PBXTextBookmark */ =
00340D8209CA089800B78602 /* PBXTextBookmark */;
0076353C09A26CAC002A5BEF /* PBXTextBookmark */ =
0076353C09A26CAC002A5BEF /* PBXTextBookmark */;
- 00D5630809C44A4800FB787B /* PBXTextBookmark */ =
00D5630809C44A4800FB787B /* PBXTextBookmark */;
00D5634A09C47AA400FB787B /* PBXTextBookmark */ =
00D5634A09C47AA400FB787B /* PBXTextBookmark */;
- 00D5638409C4834000FB787B /* PBXTextBookmark */ =
00D5638409C4834000FB787B /* PBXTextBookmark */;
00D5638509C4834000FB787B /* PBXTextBookmark */ =
00D5638509C4834000FB787B /* PBXTextBookmark */;
00D5639109C4834000FB787B /* PBXTextBookmark */ =
00D5639109C4834000FB787B /* PBXTextBookmark */;
- 00D5639609C4834000FB787B /* PBXTextBookmark */ =
00D5639609C4834000FB787B /* PBXTextBookmark */;
00D563DD09C4948100FB787B /* PBXTextBookmark */ =
00D563DD09C4948100FB787B /* PBXTextBookmark */;
00D563DF09C4948100FB787B /* PBXTextBookmark */ =
00D563DF09C4948100FB787B /* PBXTextBookmark */;
00D5662D09C7343700FB787B /* PBXTextBookmark */ =
00D5662D09C7343700FB787B /* PBXTextBookmark */;
@@ -2923,6 +2909,12 @@
00D5674009C764FE00FB787B /* PBXTextBookmark */ =
00D5674009C764FE00FB787B /* PBXTextBookmark */;
00D569EB09C7689100FB787B /* PBXTextBookmark */ =
00D569EB09C7689100FB787B /* PBXTextBookmark */;
00D569ED09C7689100FB787B /* PBXTextBookmark */ =
00D569ED09C7689100FB787B /* PBXTextBookmark */;
+ 00F7E73609D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73609D1D5DF00055E8E /* PBXTextBookmark */;
+ 00F7E73709D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73709D1D5DF00055E8E /* PBXTextBookmark */;
+ 00F7E73809D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73809D1D5DF00055E8E /* PBXTextBookmark */;
+ 00F7E73909D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73909D1D5DF00055E8E /* PBXTextBookmark */;
+ 00F7E73A09D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73A09D1D5DF00055E8E /* PBXTextBookmark */;
+ 00F7E73C09D1D5FE00055E8E /* PBXTextBookmark */ =
00F7E73C09D1D5FE00055E8E /* PBXTextBookmark */;
};
sourceControlManager = 009F5C6006A5C8FF004BB18E /* Source
Control */;
userBuildSettings = {
Modified: KisMACng/Sources/Core/WavePacket.mm
===================================================================
--- KisMACng/Sources/Core/WavePacket.mm 2006-03-21 18:06:20 UTC (rev 112)
+++ KisMACng/Sources/Core/WavePacket.mm 2006-03-22 20:17:08 UTC (rev 113)
@@ -53,7 +53,7 @@
-(void) parseTaggedData:(unsigned char*) packet length:(int) length {
int len;
UInt32 *vendorID;
- char ssid[33];
+ char ssid[256];
_primaryChannel = 0;
Other related posts:
- » [kismac] [binaervarianz] r113 - in KisMACng: . KisMAC.xcodeproj Sources/Core