openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2793 - cpu/x86/pc/olpc
by repository service 31 Dec '11

31 Dec '11

Author: wmb Date: Sat Dec 31 21:53:40 2011 New Revision: 2793 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2793 Log: OLPC trac 11562 - security - RTC anti-rollback - Fixed stack bug that caused boot failures in the face of an invalid rtcreset.sig file. Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Sat Dec 31 21:01:59 2011 (r2792) +++ cpu/x86/pc/olpc/security.fth Sat Dec 31 21:53:40 2011 (r2793) @@ -1075,20 +1075,20 @@ 0 0 2value nonce$ 0 0 2value rtcsig$ : rtc-format-error ( -- done? ) - ." RTC Reset format error" ?lease-error-cr true + " RTC Reset format error" ?lease-error-cr true ; : check-rtc-key ( data$ -- done? ) \ rtc01: SN currentrtc nonce newrtc sig0N: ... \ Isolate data from line newline left-parse-string 2nip ( rem$ ) bl left-parse-string " rtc01:" $= 0= if ( rem$ ) - ." Unknown format" ?lease-error-cr ( rem$ ) + " Unknown format" ?lease-error-cr ( rem$ ) 2drop true exit ( -- true ) then ( rem$ ) bl left-parse-string ( rem$ serial$ ) my-sn$ $= 0= if ( rem$ ) -\ ." Wrong serial number" ?lease-error-cr ( rem$ ) +\ " Wrong serial number" ?lease-error-cr ( rem$ ) 2drop false exit ( -- false ) then ( rem$ ) @@ -1106,7 +1106,7 @@ rtcsig$ " sha256" signature-good? if ( ) newrtc$ nonce$ currentrtc$ fix-rtc-timestamps ( ) else - ." Bad signature " ?lease-error-cr ( ) + " Bad signature " ?lease-error-cr ( ) then ( ) true ( done? ) ; @@ -1116,9 +1116,9 @@ show-dot null$ cn-buf place " rtcreset.sig" open-security? if exit then >r ( r: ih ) - " RTCRESET found - " ?lease-debug - load-started - leasekey$ to pubkey$ + " RTCRESET found - " ?lease-debug + load-started + leasekey$ to pubkey$ begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop exit @@ -1130,7 +1130,7 @@ repeat ( actual ) drop ( ) " No matching records" ?lease-error-cr ( ) - r> close-file drop false ( false ) + r> close-file drop ( ) ; [ifdef] reflash-ec

1 0

[commit] r2792 - ofw/fs
by repository service 31 Dec '11

31 Dec '11

Author: wmb Date: Sat Dec 31 21:01:59 2011 New Revision: 2792 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2792 Log: OLPC trac #11563 - fixed longstanding problem with Unix timestamp conversion routines - leap year adjustment was badly broken. Modified: ofw/fs/unixtime.fth Modified: ofw/fs/unixtime.fth ============================================================================== --- ofw/fs/unixtime.fth Sat Dec 31 21:01:56 2011 (r2791) +++ ofw/fs/unixtime.fth Sat Dec 31 21:01:59 2011 (r2792) @@ -2,39 +2,112 @@ purpose: Convert Unix seconds to time and date decimal -\ date&time is number of seconds since 1970 +\ February is given 29 days so the loop in >d/m will exit at the "unloop". +\ The array begins at March so that the leap day falls at the end. create days/month -\ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec - 31 c, 28 c, 31 c, 30 c, 31 c, 30 c, 31 c, 31 c, 30 c, 31 c, 30 c, 31 c, +\ Mar Apr May Jun Jul Aug Sep Oct Nov Dec Jan Feb + 31 c, 30 c, 31 c, 30 c, 31 c, 31 c, 30 c, 31 c, 30 c, 31 c, 31 c, 29 c, -: >d/m ( day-in-year -- day month ) - 12 0 do - days/month i ca+ c@ 2dup < if - drop 1+ i 1+ leave - then - - - loop +\ In >d/m and d/m>, the yearly period starts on March 1. day-in-year is +\ relative to March 1, and month-index 0 is March, 9 is December, 10 is January, +\ 11 is February. This representation simplifies the calculations by +\ putting the optional leap day at the end, i.e. day-of-year=365. + +\ Convert day-in-year to day-of-month and month-index. + +: >d/m ( day-in-year0..365 -- day1..31 month-index0..11 ) + d# 12 0 do ( days-left ) + days/month i ca+ c@ 2dup < if ( days-left ) + drop 1+ i unloop exit ( -- day1..31 month-index0..11 ) + then ( days-left ) + - ( days-left' ) + loop ( days-left ) + \ This is reached only if the argument is >365 + 1+ d# 12 ( day1..31 month-index0..11 ) ; -: unix-seconds> ( seconds -- s m h d m y ) - 60 u/mod 60 u/mod 24 u/mod ( s m h days ) - [ 365 4 * 1+ ] literal /mod >r ( s m h day-in-cycle ) ( r: cycles ) - dup [ 365 365 + 31 + 29 + ] literal - 2dup = if \ exactly leap year Feb 29 - 3drop 2 29 2 ( s m h year-in-cycle d m ) - else - > if 1- then \ after leap year - 365 u/mod ( s m h day-in-year year-in-cycle ) - swap >d/m ( s m h year-in-cycle d m ) - then - rot r> 4 * + 1970 + ( s m h d m y ) + +\ Convert day-of-month and month-index to day-in-year. + +: d/m> ( day1..31 month-index0..11 -- day-in-year0..365 ) + swap 1- swap 0 ?do i days/month + c@ + loop ( day-in-year ) ; -: >unix-seconds ( s m h d m y -- seconds ) \ since 1970 - d# 1970 - 4 /mod [ d# 365 4 * 1+ ] literal * ( s m h d m yrs days ) - swap d# 365 * + ( s m h d m days ) - swap 1 max d# 12 min ( s m h d days m' ) - 1- 0 ?do i days/month + c@ + loop ( s m h d days ) - + 1- ( s m h days ) - d# 24 * + d# 60 * + d# 60 * + + +\ +d# 365 constant d/y +d/y d# 30 * \ Years from 1970 to 2000 +d# 7 + \ Leap days from 1970 to 2000 +d# 31 + \ Days in January 2000 +d# 28 + \ Days in February 2000 (not a leap year) +constant days-to-break + +: unix-seconds> ( seconds -- s m h d m y ) + \ Changing the 3 /mod's below to u/mod's would "fix" the year 2038 problem + \ at the expense of breaking dates before 1970. + d# 60 /mod d# 60 /mod d# 24 /mod ( s m h days ) + + \ Rotate the number space so that day 0 is March 1, 2000 + \ That's convenient because it begins a 4 year + 1 day leap cycle + days-to-break - + + \ Adjust days before day 0 for the fact that 2000, unlike other + \ 0mod4 years, is not a leap year + dup 0< if 1- then ( s m h days' ) + + \ Reduce modulo the number of days in a 4-year leap cycle + \ This depends on floored division + [ d/y 4 * 1+ ] literal /mod >r ( s m h day-in-cycle r: cycles ) + + \ Reduce by the number of days in a normal year + d/y /mod ( s m h day-in-year year-in-cycle r: cycles ) + + \ If year-in-cycle is 4, it's Feb 29 + dup 4 = if ( s m h day-in-year year-in-cycle r: cycles ) + \ Leap day Feb 29 at end of cycle + swap d/y + swap 1- ( s m h day-in-year' year-in-cycle' r: cycles ) + then ( s m h day-in-year year-in-cycle r: cycles ) + r> 4 * + >r ( s m h day-in-year r: year ) + + >d/m ( s m h day-in-month month-index r: year ) + + \ Adjust the month number - at this point March is 0 and we want it to be 3 + 3 + ( s m h d month' r: year ) + + \ Months 13 and 14 are January and February of the following year + dup d# 13 >= if ( s m h d month r: year ) + d# 12 - r> 1+ >r ( s m h d month' r: year' ) + then ( s m h d month r: year ) + + r> d# 2000 + ( s m h d m y ) +; + +: >unix-seconds ( s m h d m y -- seconds ) \ since 1970 + d# 2000 - >r ( s m h d m r: y' ) + + \ Move January and February to the end so the leap day is day number 365 + dup 3 < if ( s m h d month' r: y ) + d# 12 + r> 1- >r ( s m h d month' r: y' ) + then ( s m h d month r: y ) + + \ Convert month numbers 3..14 to 0..11 + 3 - ( s m h d month-index r: y ) + + \ Convert day and month to day in year + d/m> ( s m h day-in-year r: y ) + + r@ 4 / ( s m h day-in-year leap-years r: y ) + r> d/y * + ( s m h day-in-year year-days ) + + ( s m h days ) + + \ Adjust for the missing leap day in 2000 + dup 0< if 1+ then ( s m h days' ) + + \ Adjust to 1970 + days-to-break + ( s m h days' ) + + + \ Changing the 3 *'s below to u*'s would "fix" the year 2038 problem + \ at the expense of breaking dates before 1970. + d# 24 * + d# 60 * + d# 60 * + ( seconds ) ; \ e.g. time&date >unix-seconds

1 0

[commit] r2791 - cpu/arm/olpc/3.0
by repository service 31 Dec '11

31 Dec '11

Author: wmb Date: Sat Dec 31 21:01:56 2011 New Revision: 2791 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2791 Log: OLPC XO-3 - upgrade to EC version 0.2.01 Modified: cpu/arm/olpc/3.0/ec-version.fth Modified: cpu/arm/olpc/3.0/ec-version.fth ============================================================================== --- cpu/arm/olpc/3.0/ec-version.fth Sat Dec 31 21:01:51 2011 (r2790) +++ cpu/arm/olpc/3.0/ec-version.fth Sat Dec 31 21:01:56 2011 (r2791) @@ -1,6 +1,6 @@ \ The EC microcode macro: EC_PLATFORM cl3 -macro: EC_VERSION 5_0_1_02 +macro: EC_VERSION 5_0_2_01 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r2790 - in cpu/arm/olpc: . 1.75 3.0
by repository service 31 Dec '11

31 Dec '11

Author: wmb Date: Sat Dec 31 21:01:51 2011 New Revision: 2790 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2790 Log: OLPC XO-1.75 and XO-3 - trac #11547 - Fixed problem with Linux not booting when a USB keyboard is attached. Modified: cpu/arm/olpc/1.75/usb.fth cpu/arm/olpc/3.0/usb.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Sat Dec 31 21:01:45 2011 (r2789) +++ cpu/arm/olpc/1.75/usb.fth Sat Dec 31 21:01:51 2011 (r2790) @@ -124,6 +124,11 @@ then ; +: usb-quiet ( -- ) + detach-usb-keyboard + " /usb" " reset-usb" execute-device-method drop +; + : suspend-usb ( -- ) detach-usb-keyboard " /usb" " sleep" execute-device-method drop Modified: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- cpu/arm/olpc/3.0/usb.fth Sat Dec 31 21:01:45 2011 (r2789) +++ cpu/arm/olpc/3.0/usb.fth Sat Dec 31 21:01:51 2011 (r2790) @@ -164,6 +164,12 @@ then ; +: usb-quiet ( -- ) + detach-usb-keyboard + " /usb@f0003000" " reset-usb" execute-device-method drop + " /usb@d4208000" " reset-usb" execute-device-method drop +; + : suspend-usb ( -- ) detach-usb-keyboard " /usb" " sleep" execute-device-method drop Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Sat Dec 31 21:01:45 2011 (r2789) +++ cpu/arm/olpc/build-fw.fth Sat Dec 31 21:01:51 2011 (r2790) @@ -361,6 +361,8 @@ fload ${BP}/cpu/arm/marvell/utmiphy.fth +fload ${BP}/cpu/arm/linux.fth + \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/usb.fth \+ olpc-cl3 fload ${BP}/cpu/arm/mmp2/ulpiphy.fth \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/usb.fth @@ -424,19 +426,11 @@ warning on [then] -fload ${BP}/cpu/arm/linux.fth - \ The bottom of extra-mem is the top of DMA memory. \ We give everything up to that address to Linux. : olpc-memory-limit ( -- adr ) extra-mem-va >physical ; ' olpc-memory-limit to memory-limit -: usb-quiet ( -- ) - [ ' linux-hook behavior compile, ] \ Chain to old behavior - unload-crypto - " /usb" " reset-usb" execute-device-method drop -; - \+ olpc-cl2 d# 9999 to arm-linux-machine-type \ XO-1.75 \+ olpc-cl3 d# 10000 to arm-linux-machine-type \ XO-3 @@ -599,9 +593,10 @@ out-mux-ih close-dev ; : quiesce ( -- ) + usb-quiet teardown-mux-io timers-off - usb-quiet + unload-crypto close-ec \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) d# 125 af@ h# 100 invert and d# 125 af!

1 0

[commit] r2789 - cpu/arm/olpc
by repository service 31 Dec '11

31 Dec '11

Author: wmb Date: Sat Dec 31 21:01:45 2011 New Revision: 2789 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2789 Log: OLPC XO-3 - exc7200 touchscreen driver - made the X and Y axis inversion controllable by a "TI" mfg-data tag, by default not inverted, to handle the fact that the real XO touchscreen is not inverted, but a few of the development touchscreens are inverted. Modified: cpu/arm/olpc/exc7200-touchscreen.fth Modified: cpu/arm/olpc/exc7200-touchscreen.fth ============================================================================== --- cpu/arm/olpc/exc7200-touchscreen.fth Wed Dec 28 11:10:39 2011 (r2788) +++ cpu/arm/olpc/exc7200-touchscreen.fth Sat Dec 31 21:01:45 2011 (r2789) @@ -7,6 +7,8 @@ 0 value screen-w 0 value screen-h +0 instance value invert-x? +0 instance value invert-y? : dimensions ( -- w h ) screen-w screen-h ; @@ -19,11 +21,11 @@ : invert-y ( y -- y' ) touchscreen-max-y swap - ; : scale-x ( x -- x' ) - invert-x + invert-x? if invert-x then screen-w touchscreen-max-x */ ; : scale-y ( y -- y' ) - invert-y + invert-y? if invert-y then screen-h touchscreen-max-y */ ; @@ -252,6 +254,21 @@ \ Read once to prime the interrupt d# 10 " get" $call-parent 4drop 4drop 2drop " dimensions" $call-screen to screen-h to screen-w + + \ The "TI" tag controls the inverson of X and Y axes. + \ If the tag is missing, axes are not inverted. If present + \ and the value contains either of the letters x or y, the + \ corresponding axis is inverted. This is primarily for + \ development, using prototype touchscreens. + " TI" find-tag if ( adr len ) + begin dup while ( adr len ) + over c@ upc [char] x = if true to invert-x? then + over c@ upc [char] y = if true to invert-y? then + 1 /string ( adr' len' ) + repeat ( adr len ) + 2drop ( ) + then ( ) + flush ;

1 0

[commit] r2788 - in cpu/arm/olpc: . 1.75
by repository service 28 Dec '11

28 Dec '11

Author: quozl Date: Wed Dec 28 11:10:39 2011 New Revision: 2788 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2788 Log: Q4C11 Modified: cpu/arm/olpc/1.75/fw-version.fth cpu/arm/olpc/testitems.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Wed Dec 28 03:13:56 2011 (r2787) +++ cpu/arm/olpc/1.75/fw-version.fth Wed Dec 28 11:10:39 2011 (r2788) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR C -macro: FW_MINOR 10 +macro: FW_MINOR 11 Modified: cpu/arm/olpc/testitems.fth ============================================================================== --- cpu/arm/olpc/testitems.fth Wed Dec 28 03:13:56 2011 (r2787) +++ cpu/arm/olpc/testitems.fth Wed Dec 28 11:10:39 2011 (r2788) @@ -39,7 +39,7 @@ : camera-item ( -- ) " /camera" gfx-test-dev ; : wlan-item ( -- ) " /wlan" mfg-test-dev ; : timer-item ( -- ) " /timer" mfg-test-dev ; -\- olpc-cl3 : touchpad-item ( -- ) " /touchpad" mfg-test-dev ; +\- olpc-cl3 : touchpad-item ( -- ) " mouse" mfg-test-dev ; \+ olpc-cl3 : touchscreen-item ( -- ) " /touchscreen" gfx-test-dev ; \- olpc-cl3 : keyboard-item ( -- ) " keyboard" gfx-test-dev ; : switch-item ( -- ) " /accelerometer" mfg-test-dev " /switches" mfg-test-dev ;

1 0

[commit] r2787 - cpu/arm/olpc/1.75
by repository service 28 Dec '11

28 Dec '11

Author: wmb Date: Wed Dec 28 03:13:56 2011 New Revision: 2787 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2787 Log: Q4C10 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Wed Dec 28 03:13:51 2011 (r2786) +++ cpu/arm/olpc/1.75/fw-version.fth Wed Dec 28 03:13:56 2011 (r2787) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR C -macro: FW_MINOR 09 +macro: FW_MINOR 10

1 0

[commit] r2786 - cpu/arm/olpc
by repository service 28 Dec '11

28 Dec '11

Author: wmb Date: Wed Dec 28 03:13:51 2011 New Revision: 2786 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2786 Log: OLPC XO-1.75 - fixed typo that affected the LEDs test in manufacturing. Modified: cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Fri Dec 23 00:59:35 2011 (r2785) +++ cpu/arm/olpc/build-fw.fth Wed Dec 28 03:13:51 2011 (r2786) @@ -627,7 +627,7 @@ \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/switches.fth \ Lid and ebook switches fload ${BP}/cpu/arm/mmp2/rtc.fth \ Internal RTC, used for wakeups \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/leds.fth \ LEDs -\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/3.0/leds.fth \ LEDs +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools fload ${BP}/cpu/arm/olpc/accelerometer.fth

1 0

[commit] r2785 - cpu/arm/olpc/1.75
by repository service 22 Dec '11

22 Dec '11

Author: wmb Date: Fri Dec 23 00:59:35 2011 New Revision: 2785 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2785 Log: Q4C09 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Fri Dec 23 00:59:30 2011 (r2784) +++ cpu/arm/olpc/1.75/fw-version.fth Fri Dec 23 00:59:35 2011 (r2785) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR C -macro: FW_MINOR 08ma +macro: FW_MINOR 09

1 0

[commit] r2784 - ofw/wifi
by repository service 22 Dec '11

22 Dec '11

Author: wmb Date: Fri Dec 23 00:59:30 2011 New Revision: 2784 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2784 Log: WiFi supplicant code - various tweaks. The major developer-visible one is that the debug? flag is now a static variable so it is easier to set. The rcnt variable is now accessed as a 64-bit data type instead of as an 8-byte array. Modified: ofw/wifi/data.fth ofw/wifi/eapol.fth Modified: ofw/wifi/data.fth ============================================================================== --- ofw/wifi/data.fth Fri Dec 23 00:59:27 2011 (r2783) +++ ofw/wifi/data.fth Fri Dec 23 00:59:30 2011 (r2784) @@ -153,7 +153,7 @@ 3 max country-ie-buf swap move ( ) ; -false instance value debug? +false value debug? false instance value scan? 0 instance value wifi \ Current wifi-node @@ -177,12 +177,12 @@ : my-mac! ( adr -- ) wifi >my-mac /mac-adr move ; : ssid$ ( -- $ ) wifi >ssid cscount ; : ssid! ( $ -- ) /ssid 1- min wifi >ssid dup /ssid erase swap move ; -: last-rcnt ( -- adr ) wifi >last-rcnt ; -: last-rcnt! ( adr -- ) wifi >last-rcnt /rcnt move ; -: last-rcnt++ ( -- ) - wifi >last-rcnt 4 + dup be-l@ 1+ dup rot be-l! - 0= if wifi >last-rcnt dup be-l@ 1+ swap be-l! then -; +32\ : be-x! ( d adr -- ) tuck be-l! la1+ be-l! ; +32\ : be-x@ ( adr -- d ) dup la1+ be-l@ swap be-l@ ; +: last-rcnt@ ( -- d ) wifi >last-rcnt be-x@ ; +: last-rcnt! ( d -- ) wifi >last-rcnt be-x! ; + +: last-rcnt++ ( -- ) last-rcnt@ 1. d+ last-rcnt! ; : init-wifi-node ( mac$ -- ) drop my-mac! @@ -206,7 +206,7 @@ swap insert-after init-wifi-node then - last-rcnt /rcnt ff fill + -1. last-rcnt! ; \ LICENSE_BEGIN Modified: ofw/wifi/eapol.fth ============================================================================== --- ofw/wifi/eapol.fth Fri Dec 23 00:59:27 2011 (r2783) +++ ofw/wifi/eapol.fth Fri Dec 23 00:59:30 2011 (r2784) @@ -131,7 +131,12 @@ randomize rn /n init-cnt$ mac-time$ snonce$ sha1-prf ; -: compute-snonce ( -- ) snonce 8 + dup @ over 4 + @ 1 0 d+ 2 pick 4 + ! swap ! ; +: compute-snonce ( -- ) + snonce 8 + ( adr ) + dup d@ ( adr d ) + 1. d+ ( adr d' ) + rot d! ( ) +; \ ======================================================================= \ Pairwise temporal keys (PTK) @@ -199,7 +204,8 @@ \ For TKIP, mic = hmac-md5 (adr len) \ For AES, mic = hmac-sha1 (adr len) : compute-mic ( adr len ct -- ) - >r 1 ptk >kck d# 16 + >r ( adr len r: ct ) + 1 ptk >kck d# 16 ( adr len 1 'ptk-kck 16 r: ct ) r> ct-tkip = if hmac-md5 else hmac-sha1 then ( madr mlen ) /mic min mic swap move ; @@ -359,7 +365,7 @@ eapol-key eapolbuf >ptype c! \ EAPOL-key kt>dtype eapolbuf >dtype c! \ Descriptor type ctype-p ct>klen eapolbuf >klen be-w! \ Key length - last-rcnt eapolbuf >rcnt /rcnt move \ Replay counter + last-rcnt@ eapolbuf >rcnt be-x! \ Replay counter ; : resync-gtk ( -- ) @@ -406,13 +412,17 @@ eapolbuf /eapol-key send-eapol-msg ; : 1/4-valid? ( -- ok? ) - data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch - data >klen be-w@ ctype-p ct>klen <> if false exit then \ Bad key len + data >dtype c@ kt>dtype <> if " 1d" vtype false exit then \ Descriptor type mismatch + data >klen be-w@ ctype-p ct>klen <> if " 1k" vtype false exit then \ Bad key len true ; : process-1/4 ( -- ) " Process EAPOL-key message 1 of 4" vtype - eapol-state s1/4 <> if " Unexpected pairwise key message 1 of 4" vtype then + data /eapol-key vdump + eapol-state s1/4 <> if + " Unexpected pairwise key message 1 of 4" vtype +\ ." Possible bad WPA password" cr abort + then 1/4-valid? if data >ver c@ to eapol-ver data >knonce anonce$ move @@ -420,10 +430,10 @@ then ; : 3/4-valid? ( -- ok? ) - data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch - data >klen be-w@ ctype-p ct>klen <> if false exit then \ Bad key len - data >knonce anonce /nonce comp if false exit then \ Nonce differ - data ctype-p mic-ok? 0= if false exit then \ Bad mic + data >dtype c@ kt>dtype <> if " 3d" vtype false exit then \ Descriptor type mismatch + data >klen be-w@ ctype-p ct>klen <> if " 3k" vtype false exit then \ Bad key len + data >knonce anonce /nonce comp if " 3n" vtype false exit then \ Nonce differ + data ctype-p mic-ok? 0= if " 3m" vtype false exit then \ Bad mic data >kinfo be-w@ ki-encr-key and if data decrypt-parse-ie else true then ; : process-3/4 ( -- ) @@ -450,9 +460,9 @@ then ; : 1/2-valid? ( -- ok? ) - data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch - data >klen be-w@ ctype-g ct>klen <> if false exit then \ Bad key len - data ctype-p mic-ok? 0= if false exit then \ Bad MIC + data >dtype c@ kt>dtype <> if " 2d" vtype false exit then \ Descriptor type mismatch + data >klen be-w@ ctype-g ct>klen <> if " 2k" vtype false exit then \ Bad key len + data ctype-p mic-ok? 0= if " 2m" vtype false exit then \ Bad MIC data decrypt-gtk ; : process-1/2 ( -- ) @@ -490,8 +500,8 @@ data >etype be-w@ eapol-type = \ EAPOL frame data >ptype c@ eapol-key = and if \ EAPOL-key data >ver c@ to eapol-ver - data >rcnt last-rcnt /rcnt comp 0> if \ A new eapol-key record - data >rcnt last-rcnt! \ Update last replay counter + data >rcnt be-x@ last-rcnt@ d> if \ A new eapol-key record + data >rcnt be-x@ last-rcnt! \ Update last replay counter process-eapol-key else " Same replay count; packet discarded" vtype @@ -591,7 +601,7 @@ : .bss-type ( n -- ) 1 = if ." Infrastructure" else ." Adhoc" then ; : .cap ( cap -- ) ." Type: " dup 3 and .bss-type cr - ." WEP: " dup h# 10 and .on/off + ." Security: " dup h# 10 and .on/off ." Short preamble: " dup h# 20 and .on/off ." Packet binary convolution coding: " dup h# 40 and .on/off ." Channel agility: " dup h# 80 and .on/off @@ -865,8 +875,11 @@ channel ssid$ target-mac$ associate 0= if false exit then cr ktype=wpa? if - do-key-handshakes - done? + ['] do-key-handshakes catch if + false + else + done? + then else true then

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware