OpenBIOS October 2007

openbios@openbios.org

11 participants
63 discussions

r697 - cpu/x86/pc/olpc
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:51:59 +0200 (Tue, 23 Oct 2007) New Revision: 697 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - added an error message for the case where there are no signatures matching our public key. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-23 01:27:37 UTC (rev 696) +++ cpu/x86/pc/olpc/security.fth 2007-10-23 01:51:59 UTC (rev 697) @@ -180,6 +180,7 @@ 2dup our-pubkey? if false exit then ( rem$ line$ ) 2drop ( rem$ ) repeat ( rem$ ) + " No signature for our key" ?lease-debug-cr 2drop true ;

1 0

r696 - cpu/x86/pc/olpc
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:27:37 +0200 (Tue, 23 Oct 2007) New Revision: 696 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D02 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-10-23 01:24:49 UTC (rev 695) +++ cpu/x86/pc/olpc/versions.fth 2007-10-23 01:27:37 UTC (rev 696) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 01 +macro: FW_MINOR 02 \ The EC microcode -macro: EC_VERSION d01 +macro: EC_VERSION d02 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp /c/Temp/c2d01-1.bin ec.img +\ macro: GET_EC wget http://dev.laptop.org/~rsmith/shiny6.bin -O ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r695 - cpu/x86/pc/olpc
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:24:49 +0200 (Tue, 23 Oct 2007) New Revision: 695 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac #4396 - Turn off indexed I/O before early interaction to close a security hole. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-23 01:18:40 UTC (rev 694) +++ cpu/x86/pc/olpc/fw.bth 2007-10-23 01:24:49 UTC (rev 695) @@ -269,7 +269,7 @@ [ifdef] rom-loaded d# 300 i-key-wait if -\ " patch false fast-boot? startup" eval + ec-indexed-io-off ." Interacting" cr hex interact then [ifdef] lx-devel

1 0

r694 - cpu/x86/pc/olpc dev/usb2/device/wlan
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:18:40 +0200 (Tue, 23 Oct 2007) New Revision: 694 Added: cpu/x86/pc/olpc/wlantest.fth Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/rtcwake.fth dev/usb2/device/wlan/usb8388.fth Log: OLPC - Added rtc-wackup command for suspend-resume testing, and made it slightly easier to include the WLAN version of auto-wakeup. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-23 00:59:11 UTC (rev 693) +++ cpu/x86/pc/olpc/fw.bth 2007-10-23 01:18:40 UTC (rev 694) @@ -336,6 +336,10 @@ fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth +[ifdef] wlan-wackup +fload ${BP}/cpu/x86/pc/olpc/wlantest.fth +[then] +fload ${BP}/cpu/x86/pc/olpc/rtcwake.fth ' gx-power-off to power-off [then] @@ -384,6 +388,7 @@ then ec-reboot \ Tell the EC to reboot us, so the EC can reset too + begin again ; ' dcon-reset-all to reset-all Modified: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth 2007-10-23 00:59:11 UTC (rev 693) +++ cpu/x86/pc/olpc/rtcwake.fth 2007-10-23 01:18:40 UTC (rev 694) @@ -1,16 +1,33 @@ -\ Suspend/resume test with RTC wakeup -d# 2 value rtc-alarm-delay +purpose: Suspend/resume test with RTC wakeup +\ See license at end of file -h# 41 constant cmos-alarm-day \ CMOS offset of day alarm -h# 40 constant cmos-alarm-month \ CMOS offset of month alarm -cmos-alarm-day 0 h# 5140.0055 msr! -cmos-alarm-month 0 h# 5140.0056 msr! +: enable-rtc-irq ( -- ) h# a1 pc@ h# fe and h# a1 pc! ; +: disable-rtc-irq ( -- ) h# a1 pc@ 1 or h# a1 pc! ; +0 value cmos-alarm-day \ Offset of day alarm in CMOS +0 value cmos-alarm-month \ Offset of month alarm in CMOS + +: set-alarm-offsets ( -- ) + h# 10. h# 5140.0055 wrmsr + h# 11. h# 5140.0056 wrmsr + + h# 5140.0055 rdmsr drop to cmos-alarm-day + h# 5140.0056 rdmsr drop to cmos-alarm-month +; + +false value enable-rtc-irq? + +: rtc-handler ( -- ) h# c cmos@ drop ." R" ; \ Clear RTC interrupt flags + : enable-rtc-alarm ( -- ) + ['] rtc-handler 8 interrupt-handler! + + enable-rtc-irq? if enable-rtc-irq then h# c cmos@ drop \ Clear RTC interrupt flags h# b cmos@ h# 20 or h# b cmos! ; : disable-rtc-alarm ( -- ) + disable-rtc-irq h# b cmos@ h# 20 invert and h# b cmos! ; : bcd-cmos! ( binary -- ) " bcd!" clock-node @ $call-method ; @@ -24,13 +41,42 @@ 5 bcd-cmos! 3 bcd-cmos! 1 bcd-cmos! ( ) enable-rtc-alarm ; - -: rs ( -- ) +d# 1 constant rtc-alarm-delay +: pm-sleep-rtc ( -- ) + false to enable-rtc-irq? \ Spec says that IRQ is not necessary rtc-alarm-delay set-rtc-alarm + h# 400.0000 0 acpi-l! \ Enable RTC SCI s disable-rtc-alarm + 0 0 acpi-l! \ Disable RTC SCI ; -patch 500.0000 100.0000 s3 \ Turn on RTC wakeup too -: rss begin d# 50 ms rs ." ." key? until ; +: rtc-wackup + set-alarm-offsets + 0 + begin pm-sleep-rtc space dup . (cr 1+ key? until + key drop +; -.( 'rs' does it once, 'rss' does it until you type a key) cr +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/x86/pc/olpc/wlantest.fth =================================================================== --- cpu/x86/pc/olpc/wlantest.fth (rev 0) +++ cpu/x86/pc/olpc/wlantest.fth 2007-10-23 01:18:40 UTC (rev 694) @@ -0,0 +1,29 @@ +purpose: Wireless LAN auto-wakeup (requires modified WLAN firmware) + +0 value patched? +: wackup + patched? 0= if + " /wlan" find-device + " patch exit link-up? close" evaluate + dend + true to patched? + then + + sci-wakeup + + " /wlan" open-dev >r + " broadcast-wakeup" r@ $call-method + r> close-dev + + 0 + begin + " /wlan" open-dev >r + " autostart" r@ $call-method + " sleep" r@ $call-method + r> close-dev + 5 ms + s + 1+ dup . + d# 500 ms + key? until +; Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2007-10-23 00:59:11 UTC (rev 693) +++ dev/usb2/device/wlan/usb8388.fth 2007-10-23 01:18:40 UTC (rev 694) @@ -1164,7 +1164,7 @@ : broadcast-wakeup ( -- ) wake-on-unicast wake-on-broadcast or host-sleep-config ; : sleep ( -- ) host-sleep-activate ; -[ifdef] notdef \ This is test code that only works with a special debug version of the Libertas firmware +[ifdef] wlan-wackup \ This is test code that only works with a special debug version of the Libertas firmware : autostart ( -- ) h# 82 h# 9b ( CMD_MESH_ACCESS ) prepare-cmd 5 +xw \ CMD_ACT_SET_ANYCAST

1 0

r693 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 02:59:11 +0200 (Tue, 23 Oct 2007) New Revision: 693 Modified: cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/ecio.fth Log: OLPC trac #4397 - Reboot using the new EC command that reset the EC too, thus re-enabling indexed I/O, thus making auto-firmware-update possible. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-20 09:10:33 UTC (rev 692) +++ cpu/x86/pc/olpc/security.fth 2007-10-23 00:59:11 UTC (rev 693) @@ -652,7 +652,7 @@ visible ." Restarting to enable SPI FLASH writing." cr d# 3000 ms - ec-reboot + ec-ixio-reboot security-failure then Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-20 09:10:33 UTC (rev 692) +++ dev/olpc/kb3700/ecio.fth 2007-10-23 00:59:11 UTC (rev 693) @@ -210,8 +210,18 @@ \ This restarts the EC and the CPU, resetting the EC state to its default. \ EC indexed I/O will come up in enabled state. -: ec-reboot ( -- ) h# db ec-cmd66 begin again ; +: ec-reboot ( -- ) h# db ec-cmd66 ; +: ec-ixio-reboot ( -- ) + ['] ec-reboot catch if + ." Automatic restart failed. Remove/reinstall the battery and AC." cr + d# 10,000 ms + power-off + else + begin again \ Just wait for it to happen + then +; + : ec-indexed-io-off? ( -- flag ) h# ff14 ec@ h# ff = ; : ?ixio-restart ( -- ) ec-indexed-io-off? if @@ -219,7 +229,7 @@ ." Restarting to enable SPI FLASH writing. Try again after the system restarts." black-letters cr d# 5000 ms - ec-reboot + ec-ixio-reboot then ;

1 0

r692 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Oct '07

20 Oct '07

Author: wmb Date: 2007-10-20 11:10:33 +0200 (Sat, 20 Oct 2007) New Revision: 692 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC trac #4336 - Fixed bug in signature parsing for developer keys. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-20 09:06:33 UTC (rev 691) +++ cpu/x86/pc/olpc/security.fth 2007-10-20 09:10:33 UTC (rev 692) @@ -146,13 +146,13 @@ : invalid? ( data$ sig01$ exp-hashname$ -- error? ) 2>r parse-sig if - ." Bad signature format in " bundle-name$ type cr + ." Bad signature format" cr 2r> 2drop true exit then ( data$ hashname$ sig$ r: exp$ ) \ Check for duplicate hashname attacks 2swap 2dup 2r> $= 0= if ( data$ sig$ hashname$ ) - ." Wrong hash name in " bundle-name$ type cr + ." Wrong hash name" cr 4drop 2drop true exit then ( data$ sig$ hashname$ ) @@ -164,24 +164,22 @@ then ; +: our-pubkey? ( sig01$ -- flag ) + bl left-parse-string " sig01:" $= 0= if 2drop false exit then ( rem$ ) + bl left-parse-string 2drop \ Discard hash name ( rem$ ) + bl left-parse-string 2nip \ Get key signature ( key$ ) + /sig 2* min hex-decode if 2drop false exit then ( binary-key$ ) + pubkey$ dup 3 pick - 0 max /string $= ( flag ) +; + \ Look for a line that starts with "sig01: " and whose key signature \ matches the trailing bytes of our currently-selected public key. : next-sig01$ ( sig$ -- true | rem$ sig01$ false ) - begin dup while ( rem$ ) - newline left-parse-string ( rem$' line$ ) - 2dup ( rem$' line$ line$ ) - bl left-parse-string " sig01:" $= if ( rem$' line$ rem1$ ) - bl left-parse-string 2drop ( rem$' line$ rem1$ ) \ Discard hash name - bl left-parse-string ( rem$' line$ rem1$ key$ ) - /sig 2* min hex-decode 0= if ( rem$' line$ rem1$ keyb$ ) - pubkey$ dup 3 pick - 0 max /string ( rem$' line$ rem1$ keyb$ pubkey$' ) - $= if ( rem$' line$ rem1$ ) - 2drop false exit - then ( rem$' line$ rem1$ ) - then ( rem$' line$ rem1$ ) - then ( rem$ line$ $ ) - 4drop ( rem$ ) - repeat ( rem$ ) + begin dup while ( rem$ ) + newline left-parse-string ( rem$' line$ ) + 2dup our-pubkey? if false exit then ( rem$ line$ ) + 2drop ( rem$ ) + repeat ( rem$ ) 2drop true ; @@ -364,13 +362,17 @@ \ check-machine-signature verifies the signed object consisting \ of the machine identification info (SN + UUID) plus the expiration \ time "expiration$" against the crypto signature string sig$, -\ returning 1 if valid, -1 if invalid. (The unusual return value -\ encoding is because the caller of check-machine-signature returns -\ a tree-state flag; see check-lease.) +\ returning 1 if valid, -1 if invalid, 0 if the key signature +\ doesn't match our pubkey. : check-machine-signature ( sig$ expiration$ -- -1|1 ) - machine-id-buf d# 51 + swap move ( sig$ ) - machine-id-buf d# 67 2swap " sha256" invalid? if -1 else 1 then + 2over our-pubkey? if ( sig$ exp$ ) + machine-id-buf d# 51 + swap move ( sig$ ) + machine-id-buf d# 67 2swap ( id$ sig$ ) + " sha256" invalid? if -1 else 1 then ( -1|1 ) + else ( sig$ exp$ ) + 4drop 0 ( 0 ) + then ( -1|0|1 ) ; : set-disposition ( adr -- ) c@ machine-id-buf d# 49 + c! ; @@ -407,7 +409,7 @@ " expired" ?lease-debug-cr 4drop -1 exit then ( sig$ expiration$ ) - check-machine-signature ( -1|1 ) + check-machine-signature ( -1|0|1 ) ; \ lease-valid? tries to read a lease file from the currently-selected @@ -569,8 +571,9 @@ bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) set-disposition ( rem$ ) - develkey$ to pubkey$ - " 00000000T000000Z" check-machine-signature + develkey$ to pubkey$ ( rem$ ) + bl left-parse-string ( sig01$ exp$ ) + check-machine-signature ( -1|0|1 ) ; \ has-developer-key? searches for a valid developer key on the

1 0

r691 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Oct '07

20 Oct '07

Author: wmb Date: 2007-10-20 11:06:33 +0200 (Sat, 20 Oct 2007) New Revision: 691 Modified: cpu/x86/pc/olpc/countdwn.fth Log: OLPC - Increased countdown to 5 seconds because its harder to catch it with security activated. Modified: cpu/x86/pc/olpc/countdwn.fth =================================================================== --- cpu/x86/pc/olpc/countdwn.fth 2007-10-20 07:42:32 UTC (rev 690) +++ cpu/x86/pc/olpc/countdwn.fth 2007-10-20 09:06:33 UTC (rev 691) @@ -34,7 +34,7 @@ false ; : (interrupt-auto-boot?) ( -- flag ) - 3 + 5 ." Type the Esc key to interrupt automatic startup" cr show-countdown ;

1 0

r690 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 20 Oct '07

20 Oct '07

Author: wmb Date: 2007-10-20 09:42:32 +0200 (Sat, 20 Oct 2007) New Revision: 690 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/ecio.fth Log: OLPC - Use new EC command that permits reflashing after reset-all, without having to remove all power. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-19 07:02:17 UTC (rev 689) +++ cpu/x86/pc/olpc/fw.bth 2007-10-20 07:42:32 UTC (rev 690) @@ -336,12 +336,7 @@ fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth -: olpc-power-off ( -- ) - gx-power-off \ Try the nice way first - d# 20 ms - ec-power-off \ Then try the hard way -; -' olpc-power-off to power-off +' gx-power-off to power-off [then] @@ -388,8 +383,7 @@ 2drop 2drop then - 1. h# 5140.0017 wrmsr \ DIVIL_SOFT_RESET MSR, 5536 page 367 - begin again + ec-reboot \ Tell the EC to reboot us, so the EC can reset too ; ' dcon-reset-all to reset-all Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-19 07:02:17 UTC (rev 689) +++ cpu/x86/pc/olpc/security.fth 2007-10-20 07:42:32 UTC (rev 690) @@ -647,7 +647,9 @@ ec-indexed-io-off? if visible - .ec-ixio-msg + ." Restarting to enable SPI FLASH writing." cr + d# 3000 ms + ec-reboot security-failure then Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-19 07:02:17 UTC (rev 689) +++ dev/olpc/kb3700/ecio.fth 2007-10-20 07:42:32 UTC (rev 690) @@ -189,66 +189,55 @@ \ the port 66 command sequence. : sci-quiet ( -- ) h# 50 h# ff03 ec! ; -\ While accessing the SPI FLASH, we have to turn off the keyboard controller, -\ because it continuously fetches from the SPI FLASH when it's on. That -\ interferes with our accesses. -: ec-indexed-io-off? ( -- flag ) h# ff14 ec@ h# ff = ; -: .ec-ixio-msg ( -- ) - ." Writing to the SPI FLASH is disabled." cr - ." Disconnect/reconnect the battery and AC and try again." cr -; +\ kbc-pause temporarily halts execution of the keyboard controller microcode. +\ kbc-resume makes it run again, picking up where it left off. +\ This is useful for accessing the SPI FLASH in cases where you do not +\ overwrite the keyboard controller microcodes. +: kbc-pause ( -- ) h# dd ec-cmd66 ; +: kbc-resume ( -- ) h# df ec-cmd66 ; + 0 value kbc-off? -: kbc-off ( -- ) - kbc-off? if exit then \ Fast bail out - ec-indexed-io-off? if .ec-ixio-msg abort then - h# d8 ec-cmd66 \ Prepare for reset - h# ff14 ec@ 1 or h# ff14 ec! - true to kbc-off? -; -: ec-power-off ( -- ) - 1 h# ff14 ec! - 1 h# ff01 ec! \ Tell the EC to bounce us on restart - 0 h# ff14 ec! -; - -\ Unfortunately, since the system reset is mediated by the keyboard -\ controller, turning the keyboard controller back on resets the system. - : kbc-on ( -- ) + \ Release the reset line to the 8051 microcontroller in the EC, + \ thus letting it restart with possibly-new microcode. h# ff14 ec@ 1 invert and h# ff14 ec! \ Innocuous if already on false to kbc-off? ; -: fancy-kbc-on ( -- ) - 2 h# ff01 ec! \ Prevent full system reset - h# ff14 ec@ 1 invert and h# ff14 ec! \ Innocuous if already on - d# 400 ms \ Give the EC time to start up - h# 44 h# fc80 ec! \ Re-enable scan code conversion and system flag - h# 43 h# fc81 ec! \ Re-enable fast gate and ibf/obf interrupts - h# f h# fe51 ec! \ Clear pending interrupts - h# f h# fe50 ec! \ Re-enable GPT interrupts - h# 0 h# fea7 ec! \ Clear FLASH write enable - h# 4 h# fead ec! \ fast read mode - h# fe95 ec@ h# 80 or h# fe95 ec! \ Write-protect LPC - h# 3 h# ff04 ec! \ enable IBF/OBF interrupts -\ h# 40 h# ff08 ec! \ Clear some interrupt - h# ff30 ec@ h# 10 or h# ff30 ec! \ Enable interrupt from GPIO04, PCI_RST# +\ This restarts the EC and the CPU, resetting the EC state to its default. +\ EC indexed I/O will come up in enabled state. +: ec-reboot ( -- ) h# db ec-cmd66 begin again ; - false to kbc-off? +: ec-indexed-io-off? ( -- flag ) h# ff14 ec@ h# ff = ; +: ?ixio-restart ( -- ) + ec-indexed-io-off? if + cr red-letters + ." Restarting to enable SPI FLASH writing. Try again after the system restarts." + black-letters cr + d# 5000 ms + ec-reboot + then ; -\ kbc-pause temporarily halts execution of the keyboard controller microcode. -\ kbc-resume makes it run again, picking up where it left off. -\ This is useful for accessing the SPI FLASH in cases where you do not -\ overwrite the keyboard controller microcodes. +\ While accessing the SPI FLASH, we have to turn off the keyboard controller, +\ because it continuously fetches from the SPI FLASH when it's on. That +\ interferes with our accesses. -: kbc-pause ( -- ) h# dd ec-cmd66 ; -: kbc-resume ( -- ) h# df ec-cmd66 ; +\ Unfortunately, since the system reset is mediated by the keyboard +\ controller, turning the keyboard controller back on resets the system. +: kbc-off ( -- ) + kbc-off? if exit then \ Fast bail out + ?ixio-restart + h# d8 ec-cmd66 \ Prepare for reset + h# ff14 ec@ 1 or h# ff14 ec! + true to kbc-off? +; + : io-spi@ ( reg# -- b ) h# fea8 + ec@ ; : io-spi! ( b reg# -- ) h# fea8 + ec! ; @@ -261,9 +250,7 @@ : io-spi-reprogrammed ( -- ) ." Restarting..." d# 2000 ms cr - kbc-on - begin again -\ ." Keyboard back on" cr + kbc-on begin again ; : io-spi-start ( -- ) @@ -281,6 +268,7 @@ ; : use-local-ec ( -- ) ['] io-spi-start to spi-start ; use-local-ec + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r689 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Oct '07

19 Oct '07

Author: wmb Date: 2007-10-19 09:02:17 +0200 (Fri, 19 Oct 2007) New Revision: 689 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - When searching for a signature string, look for one whose key signature matches the trailing portion of our pubkey, instead of just taking the first line with a "sig01:" format. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-18 22:53:21 UTC (rev 688) +++ cpu/x86/pc/olpc/security.fth 2007-10-19 07:02:17 UTC (rev 689) @@ -164,14 +164,23 @@ then ; -\ Look for a line that starts with "sig01: " +\ Look for a line that starts with "sig01: " and whose key signature +\ matches the trailing bytes of our currently-selected public key. : next-sig01$ ( sig$ -- true | rem$ sig01$ false ) begin dup while ( rem$ ) newline left-parse-string ( rem$' line$ ) - 2dup 7 min " sig01: " $= if ( rem$ line$ ) - false exit - then ( rem$ line$ ) - 2drop ( rem$ ) + 2dup ( rem$' line$ line$ ) + bl left-parse-string " sig01:" $= if ( rem$' line$ rem1$ ) + bl left-parse-string 2drop ( rem$' line$ rem1$ ) \ Discard hash name + bl left-parse-string ( rem$' line$ rem1$ key$ ) + /sig 2* min hex-decode 0= if ( rem$' line$ rem1$ keyb$ ) + pubkey$ dup 3 pick - 0 max /string ( rem$' line$ rem1$ keyb$ pubkey$' ) + $= if ( rem$' line$ rem1$ ) + 2drop false exit + then ( rem$' line$ rem1$ ) + then ( rem$' line$ rem1$ ) + then ( rem$ line$ $ ) + 4drop ( rem$ ) repeat ( rem$ ) 2drop true ; @@ -182,7 +191,7 @@ 2nip " sha256" invalid? 0= ; -\ Find two sig01: lines, the first with sha256 and the seconcd with rmd160, +\ Find two sig01: lines, the first with sha256 and the second with rmd160, \ and check their signatures : fw-valid? ( data$ sig$ -- okay? ) 2swap 2>r ( sig$ r: data$ )

1 0

r688 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Oct '07

19 Oct '07

Author: wmb Date: 2007-10-19 00:53:21 +0200 (Fri, 19 Oct 2007) New Revision: 688 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - disable X-button reversion from secure to non-secure mode. The X button now forces secure mode when in non-secure mode, instead of going in either direction. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-18 22:43:46 UTC (rev 687) +++ cpu/x86/pc/olpc/security.fth 2007-10-18 22:53:21 UTC (rev 688) @@ -586,7 +586,7 @@ r> close-file drop false ; -: ?toggle-secure ( -- ) button-x game-key? if secure? 0= to secure? then ; +: ?force-secure ( -- ) button-x game-key? if true to secure? then ; 6 buffer: fw#buf : (fw-version) ( base-adr -- n ) @@ -735,7 +735,7 @@ button-rotate game-key? if show-warnings then show-child - ?toggle-secure + ?force-secure secure? 0= if unfreeze visible exit then

1 0