openfirmware December 2009

openfirmware@openfirmware.info

1 participants
114 discussions

r1581 - cpu/x86/pc/olpc
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 14:54:04 +0100 (Fri, 11 Dec 2009) New Revision: 1581 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC trac 9868 - Reinstated "Signature [in]valid" messages that inadvertently got lost when support for delegated signatures was added. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2009-12-11 09:33:46 UTC (rev 1580) +++ cpu/x86/pc/olpc/security.fth 2009-12-11 13:54:04 UTC (rev 1581) @@ -441,50 +441,6 @@ true ; -0 [if] -\ parse-sig parses a "sig01:" format signature string, returning its -\ hashname and signature substrings. It converts the signature -\ substring from ASCII hex to binary bytes. - -: parse-sig ( sig01$ -- true | hashname$ sig$ false ) - dup d# 89 < if 2drop true exit then - bl left-parse-string " sig01:" $= 0= if 2drop true exit then ( rem$ ) - bl left-parse-string dup d# 6 <> if 4drop true exit then 2swap ( hash$ rem$ ) - bl left-parse-string nip d# 64 <> if 4drop true exit then ( hash$ rem$ ) - newline left-parse-string 2swap nip 0<> if 4drop true exit then ( hash$ data$ ) - dup /sig 2* <> if ( ." Bad signature length" cr ) 2drop true exit then ( hash$ data$ ) - - hex-decode if 2drop true else false then -; - -\ signature-invalid? checks the validity of data$ against the ASCII signature -\ record sig0N$, using the public key that thiskey$ points to. -\ It also verifies that the hashname contained in sig01$ is the -\ expected one. - -: signature-invalid? ( data$ sig0N$ exp-hashname$ -- error? ) - 2>r - parse-sig if - ." 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" cr - 4drop 2drop true exit - then ( data$ sig$ hashname$ ) - - 2>r 2>r 2>r 0 2r> 2r> 2r> ( 0 data$ sig$ hashname$ ) - pubkey$ 2swap signature-bad? ( error? ) - dup if - " Signature invalid" ?lease-error-cr - else - " Signature valid" ?lease-debug-cr - then -; -[then] - \ exp-hashname$ remembers the most recently used hashname to guard against \ attacks based on reuse of the same (presumably compromized) hash. @@ -623,10 +579,12 @@ newline left-parse-string ( rem$' line$ ) this-sig-line-good? if ( rem$ ) + " Signature valid" ?lease-debug-cr 2drop true exit then ( rem$ ) repeat ( rem$ ) + " Signature invalid" ?lease-error-cr 2drop false ( good? ) ;

1 0

r1580 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 10:33:46 +0100 (Fri, 11 Dec 2009) New Revision: 1580 Modified: cpu/x86/pc/olpc/via/versions.fth Log: Q3A22 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-12-11 09:31:05 UTC (rev 1579) +++ cpu/x86/pc/olpc/via/versions.fth 2009-12-11 09:33:46 UTC (rev 1580) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 21 +macro: FW_MINOR 22 \ The EC microcode macro: EC_VERSION 1_9_16

1 0

r1579 - cpu/x86/pc/olpc/via dev/olpc/kb3700
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 10:31:05 +0100 (Fri, 11 Dec 2009) New Revision: 1579 Modified: cpu/x86/pc/olpc/via/factory.fth dev/olpc/kb3700/battery.fth Log: OLPC selftests - fixed booting bug introduced by 1575 and 1576. Modified: cpu/x86/pc/olpc/via/factory.fth =================================================================== --- cpu/x86/pc/olpc/via/factory.fth 2009-12-11 07:32:02 UTC (rev 1578) +++ cpu/x86/pc/olpc/via/factory.fth 2009-12-11 09:31:05 UTC (rev 1579) @@ -25,9 +25,6 @@ 0 ( station# ) then ( station# ) to test-station - test-station 6 <> if - ['] test-station to (diagnostic-mode?) - then ; : set-boot-device ( -- ) Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2009-12-11 07:32:02 UTC (rev 1578) +++ dev/olpc/kb3700/battery.fth 2009-12-11 09:31:05 UTC (rev 1579) @@ -863,7 +863,8 @@ : interactive-test ( -- error? ) test-battery if true exit then - diagnostic-mode? 1 <> if \ Skip this test in SMT + " test-station" $find if execute else 2drop 0 then ( station# ) + 1 <> if \ Skip this test in SMT test-discharging if true exit then then test-charging if true exit then

1 0

r1578 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: pgf Date: 2009-12-11 08:32:02 +0100 (Fri, 11 Dec 2009) New Revision: 1578 Modified: cpu/x86/pc/olpc/via/versions.fth Log: version bump to q3a21 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-12-11 06:26:24 UTC (rev 1577) +++ cpu/x86/pc/olpc/via/versions.fth 2009-12-11 07:32:02 UTC (rev 1578) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 20 +macro: FW_MINOR 21 \ The EC microcode macro: EC_VERSION 1_9_16

1 0

r1577 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 07:26:24 +0100 (Fri, 11 Dec 2009) New Revision: 1577 Modified: cpu/x86/pc/olpc/via/runin.fth Log: OLPC manufacturing test scripts - simplified runin script by omitting definitions that have been added to OFW. Modified: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2009-12-11 06:22:37 UTC (rev 1576) +++ cpu/x86/pc/olpc/via/runin.fth 2009-12-11 06:26:24 UTC (rev 1577) @@ -8,36 +8,6 @@ \ the failure log (if int:\runin\fail.log is present) or modifies the \ manufacturing data tags to cause the next boot to enter final test. -[ifndef] $read-file -\ Read entire file into allocated memory -: $read-file ( filename$ -- true | data$ false ) - open-dev ?dup 0= if true exit then >r ( r: ih ) - " size" r@ $call-method drop ( len r: ih ) - dup alloc-mem swap ( adr len r: ih ) - 2dup " read" r@ $call-method ( adr len actual r: ih ) - r> close-dev ( adr len actual ) - over <> if ( adr len ) - free-mem true exit - then ( adr len ) - false -; -[then] - -[ifndef] $(delete-tag) -: ($delete-tag) ( adr len -- ) - 2dup ram-find-tag 0= if 2drop exit then ( tagname$ ram-value$ ) - 2nip ( ram-value$ ) - - 2dup + c@ h# 80 and ( ram-value$ tag-style ) - if 4 else 5 then + >r ( tag-adr tag-len ) - ram-last-mfg-data >r ( tag-adr r: len bot-adr ) - r@ 2r@ + ( tag-adr src-adr dst-adr r: len bot-adr ) - rot r@ - ( src-adr dst-adr copy-len r: len bot-adr ) - move ( r: len bot-adr ) - r> r> h# ff fill ( ) -; -[then] - d# 20 buffer: sn-buf : sn$ ( -- adr len ) sn-buf count ; @@ -176,7 +146,6 @@ power-off ; - d# 15 to #mfgtests : final-tests ( -- ) @@ -201,12 +170,6 @@ : doit-once ( -- ) do-key final-tests ; patch doit-once do-key menu-interact -: silent-probe-usb ( -- ) - " /" ['] (probe-usb2) scan-subtree - " /" ['] (probe-usb1) scan-subtree - report-disk report-net report-keyboard -; - : scanner? ( -- flag ) " usb-keyboard" expand-alias if 2drop true else false then ; @@ -254,8 +217,6 @@ \ set-tags-for-fqa \ " int:\runin\olpc.fth" $delete-all - 5 to test-station - true to diag-switch? " patch final-tests play-item mfgtest-menu" evaluate menu \ Shouldn't get here because the menu never exits

1 0

r1576 - dev/olpc/kb3700
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 07:22:37 +0100 (Fri, 11 Dec 2009) New Revision: 1576 Modified: dev/olpc/kb3700/battery.fth Log: OLPC battery test - use diagnostic-mode? instead of test-station because the latter is a forward reference. Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2009-12-11 06:21:05 UTC (rev 1575) +++ dev/olpc/kb3700/battery.fth 2009-12-11 06:22:37 UTC (rev 1576) @@ -863,7 +863,7 @@ : interactive-test ( -- error? ) test-battery if true exit then - smt-test? 0= if \ Skip this test in SMT + diagnostic-mode? 1 <> if \ Skip this test in SMT test-discharging if true exit then then test-charging if true exit then

1 0

r1575 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 07:21:05 +0100 (Fri, 11 Dec 2009) New Revision: 1575 Modified: cpu/x86/pc/olpc/via/factory.fth Log: OLPC Via - made diagnostic-mode? return the test-station value so selftests can distinguish the phases. Modified: cpu/x86/pc/olpc/via/factory.fth =================================================================== --- cpu/x86/pc/olpc/via/factory.fth 2009-12-11 06:19:28 UTC (rev 1574) +++ cpu/x86/pc/olpc/via/factory.fth 2009-12-11 06:21:05 UTC (rev 1575) @@ -3,7 +3,7 @@ 0 value test-station : smt-test? ( -- ) test-station 1 = ; -: final-test? ( -- ) test-station 5 = ; +: final-test? ( -- ) test-station 4 5 between ; : decode-ts ( adr len -- station# ) 2dup " SMT" $= if 2drop 1 exit then 2dup " ASSY" $= if 2drop 2 exit then @@ -25,6 +25,9 @@ 0 ( station# ) then ( station# ) to test-station + test-station 6 <> if + ['] test-station to (diagnostic-mode?) + then ; : set-boot-device ( -- )

1 0

r1574 - ofw/core
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 07:19:28 +0100 (Fri, 11 Dec 2009) New Revision: 1574 Modified: ofw/core/filecmds.fth Log: OFW core - added $read-file word. Modified: ofw/core/filecmds.fth =================================================================== --- ofw/core/filecmds.fth 2009-12-11 06:18:41 UTC (rev 1573) +++ ofw/core/filecmds.fth 2009-12-11 06:19:28 UTC (rev 1574) @@ -669,6 +669,20 @@ r> close-dev ( len ) load-base swap list ; + +\ Read entire file into allocated memory +: $read-file ( filename$ -- true | data$ false ) + open-dev ?dup 0= if true exit then >r ( r: ih ) + " size" r@ $call-method drop ( len r: ih ) + dup alloc-mem swap ( adr len r: ih ) + 2dup " read" r@ $call-method ( adr len actual r: ih ) + r> close-dev ( adr len actual ) + over <> if ( adr len ) + free-mem true exit + then ( adr len ) + false +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r1573 - cpu/x86/pc/olpc/via dev/geode
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 07:18:41 +0100 (Fri, 11 Dec 2009) New Revision: 1573 Modified: cpu/x86/pc/olpc/via/usb.fth dev/geode/usb.fth Log: OLPC - added silent-probe-usb command. Modified: cpu/x86/pc/olpc/via/usb.fth =================================================================== --- cpu/x86/pc/olpc/via/usb.fth 2009-12-11 06:14:07 UTC (rev 1572) +++ cpu/x86/pc/olpc/via/usb.fth 2009-12-11 06:18:41 UTC (rev 1573) @@ -45,18 +45,19 @@ then ; +: silent-probe-usb ( -- ) + " /" ['] (probe-usb2) scan-subtree + " /" ['] (probe-usb1) scan-subtree + report-disk report-net report-keyboard +; : probe-usb ( -- ) + silent-probe-usb + ." USB2 devices:" cr - " /" ['] (probe-usb2) scan-subtree " /" ['] (show-usb2) scan-subtree ." USB1 devices:" cr - " /" ['] (probe-usb1) scan-subtree " /" ['] (show-usb1) scan-subtree - - report-disk - report-net - report-keyboard ; alias p2 probe-usb Modified: dev/geode/usb.fth =================================================================== --- dev/geode/usb.fth 2009-12-11 06:14:07 UTC (rev 1572) +++ dev/geode/usb.fth 2009-12-11 06:18:41 UTC (rev 1573) @@ -31,19 +31,22 @@ r> to exit? ; -: probe-usb ( -- ) - ." USB2 devices:" cr +: silent-probe-usb ( -- ) " /usb@f,5" open-dev ?dup if close-dev then - " /usb@f,5" $nopage-show-devs - - ." USB1 devices:" cr " /usb@f,4" open-dev ?dup if close-dev then - " /usb@f,4" $nopage-show-devs report-disk report-net report-keyboard ; +: probe-usb ( -- ) + silent-probe-usb + + ." USB2 devices:" cr + " /usb@f,5" $nopage-show-devs + ." USB1 devices:" cr + " /usb@f,4" $nopage-show-devs +; alias probe-usb2 probe-usb alias p2 probe-usb2

1 0

r1572 - cpu/x86/pc/olpc
by svn＠openfirmware.info 11 Dec '09

11 Dec '09

Author: wmb Date: 2009-12-11 07:14:07 +0100 (Fri, 11 Dec 2009) New Revision: 1572 Modified: cpu/x86/pc/olpc/setwp.fth Log: OLPC - added ($delete-tag) for batch-editing mfg tag arrays. Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2009-12-11 05:29:47 UTC (rev 1571) +++ cpu/x86/pc/olpc/setwp.fth 2009-12-11 06:14:07 UTC (rev 1572) @@ -182,6 +182,20 @@ safe-parse-word 0 parse add-null 2swap $add-tag ; +\ Deletes a tag from a RAM image of the mfg data +: ($delete-tag) ( adr len -- ) + 2dup ram-find-tag 0= if 2drop exit then ( tagname$ ram-value$ ) + 2nip ( ram-value$ ) + + 2dup + c@ h# 80 and ( ram-value$ tag-style ) + if 4 else 5 then + >r ( tag-adr tag-len ) + ram-last-mfg-data >r ( tag-adr r: len bot-adr ) + r@ 2r@ + ( tag-adr src-adr dst-adr r: len bot-adr ) + rot r@ - ( src-adr dst-adr copy-len r: len bot-adr ) + move ( r: len bot-adr ) + r> r> h# ff fill ( ) +; + : $delete-tag ( name$ -- ) tag-setup ( ram-value$ ) 2dup + c@ h# 80 and ( ram-value$ tag-style )

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware December 2009