| Message ID | 1435758087-2213-3-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 2015年07月01日 21:41, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > Makefile.am | 2 + > .../arg-show-tests-0001/arg-show-tests-0001.log | 2 + > .../arg-show-tests-full-0001.log | 6 ++- > fwts-test/slic-0001/acpidump-0001.log | 51 ++++++++++++++++++++++ > fwts-test/slic-0001/acpidump-0002.log | 51 ++++++++++++++++++++++ > fwts-test/slic-0001/slic-0001.log | 15 +++++++ > fwts-test/slic-0001/slic-0002.log | 13 ++++++ > fwts-test/slic-0001/test-0001.sh | 17 ++++++++ > fwts-test/slic-0001/test-0002.sh | 17 ++++++++ > 9 files changed, 173 insertions(+), 1 deletion(-) > create mode 100644 fwts-test/slic-0001/acpidump-0001.log > create mode 100644 fwts-test/slic-0001/acpidump-0002.log > create mode 100644 fwts-test/slic-0001/slic-0001.log > create mode 100644 fwts-test/slic-0001/slic-0002.log > create mode 100755 fwts-test/slic-0001/test-0001.sh > create mode 100755 fwts-test/slic-0001/test-0002.sh > > diff --git a/Makefile.am b/Makefile.am > index cbeaea3..3ae4257 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -81,6 +81,8 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \ > fwts-test/klog-0002/test-0003.sh \ > fwts-test/lpit-0001/test-0001.sh \ > fwts-test/lpit-0001/test-0002.sh \ > + fwts-test/slic-0001/test-0001.sh \ > + fwts-test/slic-0001/test-0002.sh \ > fwts-test/slit-0001/test-0001.sh \ > fwts-test/slit-0001/test-0002.sh \ > fwts-test/madt-0001/test-0001.sh \ > diff --git a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log > index 5a54e51..97b8954 100644 > --- a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log > +++ b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log > @@ -27,6 +27,7 @@ ACPI tests: > rsdp RSDP Root System Description Pointer test. > rsdt RSDT Root System Description Table test. > sbst SBST Smart Battery Specification Table test. > + slic SLIC Software Licensing Description Table test. > slit SLIT System Locality Distance Information test. > spcr SPCR Serial Port Console Redirection Table test. > spmi SPMI Service Processor Management Interface Description Table test. > @@ -91,6 +92,7 @@ Batch tests: > rsdt RSDT Root System Description Table test. > sbst SBST Smart Battery Specification Table test. > securebootcert UEFI secure boot test. > + slic SLIC Software Licensing Description Table test. > slit SLIT System Locality Distance Information test. > spcr SPCR Serial Port Console Redirection Table test. > spmi SPMI Service Processor Management Interface Description Table test. > diff --git a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log > index ac262e6..ced52e0 100644 > --- a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log > +++ b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log > @@ -242,6 +242,8 @@ ACPI tests: > RSDT Root System Description Table test. > sbst (1 test): > SBST Smart Battery Specificiation Table test. > + slic (1 test): > + SLIC Software Licensing Description Table test. > slit (1 test): > SLIT System Locality Distance Information test. > spcr (1 test): > @@ -581,6 +583,8 @@ Batch tests: > SBST Smart Battery Specificiation Table test. > securebootcert (1 test): > UEFI secure boot test. > + slic (1 test): > + SLIC Software Licensing Description Table test. > slit (1 test): > SLIT System Locality Distance Information test. > spcr (1 test): > @@ -802,4 +806,4 @@ UEFI tests: > Test UEFI RT service query variable info interface stress test. > Test UEFI RT service get variable interface, invalid parameters. > > -Total of 655 tests > +Total of 657 tests > diff --git a/fwts-test/slic-0001/acpidump-0001.log b/fwts-test/slic-0001/acpidump-0001.log > new file mode 100644 > index 0000000..088d96e > --- /dev/null > +++ b/fwts-test/slic-0001/acpidump-0001.log > @@ -0,0 +1,51 @@ > +FACS @ 0x00000000 > + 0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00 FACS@........... > + 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + > +FACP @ 0x00000000 > + 0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20 FACP......AMD > + 0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20 GUAM ....AMD > + 0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00 @B.../...G...... > + 0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00 ................ > + 0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00 ................ > + 0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00 ............... > + 0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00 e...........2... > + 0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af ...../.......G.. > + 0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00 ..... .......... > + 00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00 ................ > + 00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00 ................ > + 00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00 . ...........@.. > + 00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............... > + 00f0: 00 00 00 00 .... > + > +SLIC @ 0x00000000 > + 0000: 53 4c 49 43 76 01 00 00 01 99 41 43 52 53 59 53 SLICv.....ACRSYS > + 0010: 41 43 52 50 52 44 43 54 01 00 00 00 31 30 32 35 ACRPRDCT....1025 > + 0020: 00 00 04 00 00 00 00 00 9c 00 00 00 06 02 00 00 ................ > + 0030: 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 .$..RSA1........ > + 0040: b3 6d 83 60 8d 83 65 6e e6 4b a7 6f 38 04 31 c1 .m.`..en.K.o8.1. > + 0050: e2 45 bf 34 66 1f 17 91 7f 5c 15 12 b7 01 4d 57 .E.4f....\....MW > + 0060: 6d 8e ae 6b e4 cc f8 a0 e1 bb 79 ff 08 53 e3 77 m..k......y..S.w > + 0070: e7 d4 70 5e 5c ef 6f 81 dd 1b 5f 30 e2 99 9b b9 ..p^\.o..._0.... > + 0080: d0 93 46 ab d8 27 7a f0 f0 a7 4c 32 d4 91 86 ba ..F...z...L2.... > + 0090: a1 6c a2 3c 73 cf 86 2d 95 9a 06 50 23 f7 7e 06 .l.<s..-...P..~. > + 00a0: 5b 5e 27 66 01 3a 31 9f 0c b1 91 96 49 5c cc 81 [^'f.:1.....I\.. > + 00b0: ba 77 32 52 b2 10 5d 5b ca de 9d 25 90 95 f7 97 .w2R..][...%.... > + 00c0: 01 00 00 00 b6 00 00 00 00 00 02 00 41 43 52 53 ............ACRS > + 00d0: 59 53 41 43 52 50 52 44 43 54 57 49 4e 44 4f 57 YSACRPRDCTWINDOW > + 00e0: 53 20 01 00 02 00 00 00 00 00 00 00 00 00 00 00 S .............. > + 00f0: 00 00 00 00 00 00 49 90 ac 34 3b 98 88 52 62 2c ......I..4;..Rb, > + 0100: fb 25 a8 a9 a0 7d 2d 12 70 ee d5 9a 7c cf 0c 83 .%...}-.p...|... > + 0110: b4 29 1b 55 3b 88 a5 f7 e6 29 a9 2c e7 17 5d 7a .).U;....).,..]z > + 0120: ee 38 4d 72 e2 ff 92 22 11 20 4a 68 0b 5d 83 ad .8M'..i|. Jh.].. > + 0130: e5 d6 6e 49 c1 66 28 e4 e4 ce 72 64 a1 7c be 93 ..nI.f(...rd.|.. > + 0140: ad 64 32 da cd 71 24 43 fe b4 97 87 01 55 a0 5d .d2..r$G.....U.] > + 0150: 2f ef 06 93 e8 87 84 59 d3 9b 25 53 27 e7 ca 75 /......Y..%S'..u > + 0160: 65 cf 0e 40 c9 3b aa 03 f2 83 7e 27 e7 ca 47 a4 e..@.;....~'..G. > + 0170: 4b 1f c5 77 df 8c K..w.. > + > diff --git a/fwts-test/slic-0001/acpidump-0002.log b/fwts-test/slic-0001/acpidump-0002.log > new file mode 100644 > index 0000000..de858d2 > --- /dev/null > +++ b/fwts-test/slic-0001/acpidump-0002.log > @@ -0,0 +1,51 @@ > +FACS @ 0x00000000 > + 0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00 FACS@........... > + 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + > +FACP @ 0x00000000 > + 0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20 FACP......AMD > + 0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20 GUAM ....AMD > + 0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00 @B.../...G...... > + 0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00 ................ > + 0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00 ................ > + 0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00 ............... > + 0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00 e...........2... > + 0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af ...../.......G.. > + 0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00 ..... .......... > + 00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00 ................ > + 00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00 ................ > + 00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00 . ...........@.. > + 00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............... > + 00f0: 00 00 00 00 .... > + > +SLIC @ 0x00000000 > + 0000: 53 4c 49 43 76 01 00 00 01 99 41 43 52 53 59 53 SLICv.....ACRSYS > + 0010: 41 43 52 50 52 44 43 54 01 00 00 00 31 30 32 35 ACRPRDCT....1025 > + 0020: 00 00 04 00 04 00 00 00 9c 00 00 00 06 02 00 00 ................ > + 0030: 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 .$..RSA1........ > + 0040: b3 6d 83 60 8d 83 65 6e e6 4b a7 6f 38 04 31 c1 .m.`..en.K.o8.1. > + 0050: e2 45 bf 34 66 1f 17 91 7f 5c 15 12 b7 01 4d 57 .E.4f....\....MW > + 0060: 6d 8e ae 6b e4 cc f8 a0 e1 bb 79 ff 08 53 e3 77 m..k......y..S.w > + 0070: e7 d4 70 5e 5c ef 6f 81 dd 1b 5f 30 e2 99 9b b9 ..p^\.o..._0.... > + 0080: d0 93 46 ab d8 27 7a f0 f0 a7 4c 32 d4 91 86 ba ..F...z...L2.... > + 0090: a1 6c a2 3c 73 cf 86 2d 95 9a 06 50 23 f7 7e 06 .l.<s..-...P..~. > + 00a0: 5b 5e 27 66 01 3a 31 9f 0c b1 91 96 49 5c cc 81 [^'f.:1.....I\.. > + 00b0: ba 77 32 52 b2 10 5d 5b ca de 9d 25 90 95 f7 97 .w2R..][...%.... > + 00c0: 01 00 00 00 b6 00 00 00 00 00 02 00 41 43 52 53 ............ACRS > + 00d0: 59 53 41 43 52 50 52 44 43 54 57 49 4e 44 4f 57 YSACRPRDCTWINDOW > + 00e0: 53 20 01 00 02 00 00 00 00 00 00 00 00 00 00 00 S .............. > + 00f0: 00 00 00 00 00 00 49 90 ac 34 3b 98 88 52 62 2c ......I..4;..Rb, > + 0100: fb 25 a8 a9 a0 7d 2d 12 70 ee d5 9a 7c cf 0c 83 .%...}-.p...|... > + 0110: b4 29 1b 55 3b 88 a5 f7 e6 29 a9 2c e7 17 5d 7a .).U;....).,..]z > + 0120: ee 38 4d 72 e2 ff 92 22 11 20 4a 68 0b 5d 83 ad .8M'..i|. Jh.].. > + 0130: e5 d6 6e 49 c1 66 28 e4 e4 ce 72 64 a1 7c be 93 ..nI.f(...rd.|.. > + 0140: ad 64 32 da cd 71 24 43 fe b4 97 87 01 55 a0 5d .d2..r$G.....U.] > + 0150: 2f ef 06 93 e8 87 84 59 d3 9b 25 53 27 e7 ca 75 /......Y..%S'..u > + 0160: 65 cf 0e 40 c9 3b aa 03 f2 83 7e 27 e7 ca 47 a4 e..@.;....~'..G. > + 0170: 4b 1f c5 77 df 8c K..w.. > + > diff --git a/fwts-test/slic-0001/slic-0001.log b/fwts-test/slic-0001/slic-0001.log > new file mode 100644 > index 0000000..3d65622 > --- /dev/null > +++ b/fwts-test/slic-0001/slic-0001.log > @@ -0,0 +1,15 @@ > +slic slic: SLIC Software Licensing Description Table test. > +slic ---------------------------------------------------------- > +slic Test 1 of 1: SLIC Software Licensing Description Table > +slic test. > +slic Software Licensing Description Table > +slic SLIC Public Key Structure has had minimal check due to > +slic proprietary nature of the table > +slic SLIC Windows Marker Structure has had minimal check due to > +slic proprietary nature of the table > +slic PASSED: Test 1, No issues found in SLIC table. > +slic > +slic ========================================================== > +slic 1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 > +slic info only. > +slic ========================================================== > diff --git a/fwts-test/slic-0001/slic-0002.log b/fwts-test/slic-0001/slic-0002.log > new file mode 100644 > index 0000000..09429cb > --- /dev/null > +++ b/fwts-test/slic-0001/slic-0002.log > @@ -0,0 +1,13 @@ > +slic slic: SLIC Software Licensing Description Table test. > +slic ---------------------------------------------------------- > +slic Test 1 of 1: SLIC Software Licensing Description Table > +slic test. > +slic Software Licensing Description Table > +slic FAILED [HIGH] SLICInvaldType: Test 1, SLIC subtable type > +slic 0x00000004 is invalid, should be either 0x0000 (Public > +slic Key) or 0x0001 (Windows Marker) > +slic > +slic ========================================================== > +slic 0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0 > +slic info only. > +slic ========================================================== > diff --git a/fwts-test/slic-0001/test-0001.sh b/fwts-test/slic-0001/test-0001.sh > new file mode 100755 > index 0000000..0256563 > --- /dev/null > +++ b/fwts-test/slic-0001/test-0001.sh > @@ -0,0 +1,17 @@ > +#!/bin/bash > +# > +TEST="Test table against SLIC" > +NAME=test-0001.sh > +TMPLOG=$TMP/slic.log.$$ > + > +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0001.log slic - | cut -c7- | grep "^slic" > $TMPLOG > +diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0001.log >> $FAILURE_LOG > +ret=$? > +if [ $ret -eq 0 ]; then > + echo PASSED: $TEST, $NAME > +else > + echo FAILED: $TEST, $NAME > +fi > + > +rm $TMPLOG > +exit $ret > diff --git a/fwts-test/slic-0001/test-0002.sh b/fwts-test/slic-0001/test-0002.sh > new file mode 100755 > index 0000000..5f9bc18 > --- /dev/null > +++ b/fwts-test/slic-0001/test-0002.sh > @@ -0,0 +1,17 @@ > +#!/bin/bash > +# > +TEST="Test table against invalid SLIC" > +NAME=test-0001.sh > +TMPLOG=$TMP/slic.log.$$ > + > +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0002.log slic - | cut -c7- | grep "^slic" > $TMPLOG > +diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0002.log >> $FAILURE_LOG > +ret=$? > +if [ $ret -eq 0 ]; then > + echo PASSED: $TEST, $NAME > +else > + echo FAILED: $TEST, $NAME > +fi > + > +rm $TMPLOG > +exit $ret Acked-by: Ivan Hu<ivan.hu@canonical.com>
On 07/01/2015 09:41 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > Makefile.am | 2 + > .../arg-show-tests-0001/arg-show-tests-0001.log | 2 + > .../arg-show-tests-full-0001.log | 6 ++- > fwts-test/slic-0001/acpidump-0001.log | 51 ++++++++++++++++++++++ > fwts-test/slic-0001/acpidump-0002.log | 51 ++++++++++++++++++++++ > fwts-test/slic-0001/slic-0001.log | 15 +++++++ > fwts-test/slic-0001/slic-0002.log | 13 ++++++ > fwts-test/slic-0001/test-0001.sh | 17 ++++++++ > fwts-test/slic-0001/test-0002.sh | 17 ++++++++ > 9 files changed, 173 insertions(+), 1 deletion(-) > create mode 100644 fwts-test/slic-0001/acpidump-0001.log > create mode 100644 fwts-test/slic-0001/acpidump-0002.log > create mode 100644 fwts-test/slic-0001/slic-0001.log > create mode 100644 fwts-test/slic-0001/slic-0002.log > create mode 100755 fwts-test/slic-0001/test-0001.sh > create mode 100755 fwts-test/slic-0001/test-0002.sh > > diff --git a/Makefile.am b/Makefile.am > index cbeaea3..3ae4257 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -81,6 +81,8 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \ > fwts-test/klog-0002/test-0003.sh \ > fwts-test/lpit-0001/test-0001.sh \ > fwts-test/lpit-0001/test-0002.sh \ > + fwts-test/slic-0001/test-0001.sh \ > + fwts-test/slic-0001/test-0002.sh \ > fwts-test/slit-0001/test-0001.sh \ > fwts-test/slit-0001/test-0002.sh \ > fwts-test/madt-0001/test-0001.sh \ > diff --git a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log > index 5a54e51..97b8954 100644 > --- a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log > +++ b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log > @@ -27,6 +27,7 @@ ACPI tests: > rsdp RSDP Root System Description Pointer test. > rsdt RSDT Root System Description Table test. > sbst SBST Smart Battery Specification Table test. > + slic SLIC Software Licensing Description Table test. > slit SLIT System Locality Distance Information test. > spcr SPCR Serial Port Console Redirection Table test. > spmi SPMI Service Processor Management Interface Description Table test. > @@ -91,6 +92,7 @@ Batch tests: > rsdt RSDT Root System Description Table test. > sbst SBST Smart Battery Specification Table test. > securebootcert UEFI secure boot test. > + slic SLIC Software Licensing Description Table test. > slit SLIT System Locality Distance Information test. > spcr SPCR Serial Port Console Redirection Table test. > spmi SPMI Service Processor Management Interface Description Table test. > diff --git a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log > index ac262e6..ced52e0 100644 > --- a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log > +++ b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log > @@ -242,6 +242,8 @@ ACPI tests: > RSDT Root System Description Table test. > sbst (1 test): > SBST Smart Battery Specificiation Table test. > + slic (1 test): > + SLIC Software Licensing Description Table test. > slit (1 test): > SLIT System Locality Distance Information test. > spcr (1 test): > @@ -581,6 +583,8 @@ Batch tests: > SBST Smart Battery Specificiation Table test. > securebootcert (1 test): > UEFI secure boot test. > + slic (1 test): > + SLIC Software Licensing Description Table test. > slit (1 test): > SLIT System Locality Distance Information test. > spcr (1 test): > @@ -802,4 +806,4 @@ UEFI tests: > Test UEFI RT service query variable info interface stress test. > Test UEFI RT service get variable interface, invalid parameters. > > -Total of 655 tests > +Total of 657 tests > diff --git a/fwts-test/slic-0001/acpidump-0001.log b/fwts-test/slic-0001/acpidump-0001.log > new file mode 100644 > index 0000000..088d96e > --- /dev/null > +++ b/fwts-test/slic-0001/acpidump-0001.log > @@ -0,0 +1,51 @@ > +FACS @ 0x00000000 > + 0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00 FACS@........... > + 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + > +FACP @ 0x00000000 > + 0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20 FACP......AMD > + 0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20 GUAM ....AMD > + 0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00 @B.../...G...... > + 0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00 ................ > + 0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00 ................ > + 0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00 ............... > + 0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00 e...........2... > + 0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af ...../.......G.. > + 0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00 ..... .......... > + 00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00 ................ > + 00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00 ................ > + 00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00 . ...........@.. > + 00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............... > + 00f0: 00 00 00 00 .... > + > +SLIC @ 0x00000000 > + 0000: 53 4c 49 43 76 01 00 00 01 99 41 43 52 53 59 53 SLICv.....ACRSYS > + 0010: 41 43 52 50 52 44 43 54 01 00 00 00 31 30 32 35 ACRPRDCT....1025 > + 0020: 00 00 04 00 00 00 00 00 9c 00 00 00 06 02 00 00 ................ > + 0030: 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 .$..RSA1........ > + 0040: b3 6d 83 60 8d 83 65 6e e6 4b a7 6f 38 04 31 c1 .m.`..en.K.o8.1. > + 0050: e2 45 bf 34 66 1f 17 91 7f 5c 15 12 b7 01 4d 57 .E.4f....\....MW > + 0060: 6d 8e ae 6b e4 cc f8 a0 e1 bb 79 ff 08 53 e3 77 m..k......y..S.w > + 0070: e7 d4 70 5e 5c ef 6f 81 dd 1b 5f 30 e2 99 9b b9 ..p^\.o..._0.... > + 0080: d0 93 46 ab d8 27 7a f0 f0 a7 4c 32 d4 91 86 ba ..F...z...L2.... > + 0090: a1 6c a2 3c 73 cf 86 2d 95 9a 06 50 23 f7 7e 06 .l.<s..-...P..~. > + 00a0: 5b 5e 27 66 01 3a 31 9f 0c b1 91 96 49 5c cc 81 [^'f.:1.....I\.. > + 00b0: ba 77 32 52 b2 10 5d 5b ca de 9d 25 90 95 f7 97 .w2R..][...%.... > + 00c0: 01 00 00 00 b6 00 00 00 00 00 02 00 41 43 52 53 ............ACRS > + 00d0: 59 53 41 43 52 50 52 44 43 54 57 49 4e 44 4f 57 YSACRPRDCTWINDOW > + 00e0: 53 20 01 00 02 00 00 00 00 00 00 00 00 00 00 00 S .............. > + 00f0: 00 00 00 00 00 00 49 90 ac 34 3b 98 88 52 62 2c ......I..4;..Rb, > + 0100: fb 25 a8 a9 a0 7d 2d 12 70 ee d5 9a 7c cf 0c 83 .%...}-.p...|... > + 0110: b4 29 1b 55 3b 88 a5 f7 e6 29 a9 2c e7 17 5d 7a .).U;....).,..]z > + 0120: ee 38 4d 72 e2 ff 92 22 11 20 4a 68 0b 5d 83 ad .8M'..i|. Jh.].. > + 0130: e5 d6 6e 49 c1 66 28 e4 e4 ce 72 64 a1 7c be 93 ..nI.f(...rd.|.. > + 0140: ad 64 32 da cd 71 24 43 fe b4 97 87 01 55 a0 5d .d2..r$G.....U.] > + 0150: 2f ef 06 93 e8 87 84 59 d3 9b 25 53 27 e7 ca 75 /......Y..%S'..u > + 0160: 65 cf 0e 40 c9 3b aa 03 f2 83 7e 27 e7 ca 47 a4 e..@.;....~'..G. > + 0170: 4b 1f c5 77 df 8c K..w.. > + > diff --git a/fwts-test/slic-0001/acpidump-0002.log b/fwts-test/slic-0001/acpidump-0002.log > new file mode 100644 > index 0000000..de858d2 > --- /dev/null > +++ b/fwts-test/slic-0001/acpidump-0002.log > @@ -0,0 +1,51 @@ > +FACS @ 0x00000000 > + 0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00 FACS@........... > + 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + > +FACP @ 0x00000000 > + 0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20 FACP......AMD > + 0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20 GUAM ....AMD > + 0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00 @B.../...G...... > + 0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00 ................ > + 0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00 ................ > + 0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00 ............... > + 0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00 e...........2... > + 0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af ...../.......G.. > + 0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00 ..... .......... > + 00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00 ................ > + 00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ > + 00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00 ................ > + 00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00 . ...........@.. > + 00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............... > + 00f0: 00 00 00 00 .... > + > +SLIC @ 0x00000000 > + 0000: 53 4c 49 43 76 01 00 00 01 99 41 43 52 53 59 53 SLICv.....ACRSYS > + 0010: 41 43 52 50 52 44 43 54 01 00 00 00 31 30 32 35 ACRPRDCT....1025 > + 0020: 00 00 04 00 04 00 00 00 9c 00 00 00 06 02 00 00 ................ > + 0030: 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 .$..RSA1........ > + 0040: b3 6d 83 60 8d 83 65 6e e6 4b a7 6f 38 04 31 c1 .m.`..en.K.o8.1. > + 0050: e2 45 bf 34 66 1f 17 91 7f 5c 15 12 b7 01 4d 57 .E.4f....\....MW > + 0060: 6d 8e ae 6b e4 cc f8 a0 e1 bb 79 ff 08 53 e3 77 m..k......y..S.w > + 0070: e7 d4 70 5e 5c ef 6f 81 dd 1b 5f 30 e2 99 9b b9 ..p^\.o..._0.... > + 0080: d0 93 46 ab d8 27 7a f0 f0 a7 4c 32 d4 91 86 ba ..F...z...L2.... > + 0090: a1 6c a2 3c 73 cf 86 2d 95 9a 06 50 23 f7 7e 06 .l.<s..-...P..~. > + 00a0: 5b 5e 27 66 01 3a 31 9f 0c b1 91 96 49 5c cc 81 [^'f.:1.....I\.. > + 00b0: ba 77 32 52 b2 10 5d 5b ca de 9d 25 90 95 f7 97 .w2R..][...%.... > + 00c0: 01 00 00 00 b6 00 00 00 00 00 02 00 41 43 52 53 ............ACRS > + 00d0: 59 53 41 43 52 50 52 44 43 54 57 49 4e 44 4f 57 YSACRPRDCTWINDOW > + 00e0: 53 20 01 00 02 00 00 00 00 00 00 00 00 00 00 00 S .............. > + 00f0: 00 00 00 00 00 00 49 90 ac 34 3b 98 88 52 62 2c ......I..4;..Rb, > + 0100: fb 25 a8 a9 a0 7d 2d 12 70 ee d5 9a 7c cf 0c 83 .%...}-.p...|... > + 0110: b4 29 1b 55 3b 88 a5 f7 e6 29 a9 2c e7 17 5d 7a .).U;....).,..]z > + 0120: ee 38 4d 72 e2 ff 92 22 11 20 4a 68 0b 5d 83 ad .8M'..i|. Jh.].. > + 0130: e5 d6 6e 49 c1 66 28 e4 e4 ce 72 64 a1 7c be 93 ..nI.f(...rd.|.. > + 0140: ad 64 32 da cd 71 24 43 fe b4 97 87 01 55 a0 5d .d2..r$G.....U.] > + 0150: 2f ef 06 93 e8 87 84 59 d3 9b 25 53 27 e7 ca 75 /......Y..%S'..u > + 0160: 65 cf 0e 40 c9 3b aa 03 f2 83 7e 27 e7 ca 47 a4 e..@.;....~'..G. > + 0170: 4b 1f c5 77 df 8c K..w.. > + > diff --git a/fwts-test/slic-0001/slic-0001.log b/fwts-test/slic-0001/slic-0001.log > new file mode 100644 > index 0000000..3d65622 > --- /dev/null > +++ b/fwts-test/slic-0001/slic-0001.log > @@ -0,0 +1,15 @@ > +slic slic: SLIC Software Licensing Description Table test. > +slic ---------------------------------------------------------- > +slic Test 1 of 1: SLIC Software Licensing Description Table > +slic test. > +slic Software Licensing Description Table > +slic SLIC Public Key Structure has had minimal check due to > +slic proprietary nature of the table > +slic SLIC Windows Marker Structure has had minimal check due to > +slic proprietary nature of the table > +slic PASSED: Test 1, No issues found in SLIC table. > +slic > +slic ========================================================== > +slic 1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 > +slic info only. > +slic ========================================================== > diff --git a/fwts-test/slic-0001/slic-0002.log b/fwts-test/slic-0001/slic-0002.log > new file mode 100644 > index 0000000..09429cb > --- /dev/null > +++ b/fwts-test/slic-0001/slic-0002.log > @@ -0,0 +1,13 @@ > +slic slic: SLIC Software Licensing Description Table test. > +slic ---------------------------------------------------------- > +slic Test 1 of 1: SLIC Software Licensing Description Table > +slic test. > +slic Software Licensing Description Table > +slic FAILED [HIGH] SLICInvaldType: Test 1, SLIC subtable type > +slic 0x00000004 is invalid, should be either 0x0000 (Public > +slic Key) or 0x0001 (Windows Marker) > +slic > +slic ========================================================== > +slic 0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0 > +slic info only. > +slic ========================================================== > diff --git a/fwts-test/slic-0001/test-0001.sh b/fwts-test/slic-0001/test-0001.sh > new file mode 100755 > index 0000000..0256563 > --- /dev/null > +++ b/fwts-test/slic-0001/test-0001.sh > @@ -0,0 +1,17 @@ > +#!/bin/bash > +# > +TEST="Test table against SLIC" > +NAME=test-0001.sh > +TMPLOG=$TMP/slic.log.$$ > + > +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0001.log slic - | cut -c7- | grep "^slic" > $TMPLOG > +diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0001.log >> $FAILURE_LOG > +ret=$? > +if [ $ret -eq 0 ]; then > + echo PASSED: $TEST, $NAME > +else > + echo FAILED: $TEST, $NAME > +fi > + > +rm $TMPLOG > +exit $ret > diff --git a/fwts-test/slic-0001/test-0002.sh b/fwts-test/slic-0001/test-0002.sh > new file mode 100755 > index 0000000..5f9bc18 > --- /dev/null > +++ b/fwts-test/slic-0001/test-0002.sh > @@ -0,0 +1,17 @@ > +#!/bin/bash > +# > +TEST="Test table against invalid SLIC" > +NAME=test-0001.sh > +TMPLOG=$TMP/slic.log.$$ > + > +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0002.log slic - | cut -c7- | grep "^slic" > $TMPLOG > +diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0002.log >> $FAILURE_LOG > +ret=$? > +if [ $ret -eq 0 ]; then > + echo PASSED: $TEST, $NAME > +else > + echo FAILED: $TEST, $NAME > +fi > + > +rm $TMPLOG > +exit $ret > Acked-by: Alex Hung <alex.hung@canonical.com>
diff --git a/Makefile.am b/Makefile.am index cbeaea3..3ae4257 100644 --- a/Makefile.am +++ b/Makefile.am @@ -81,6 +81,8 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \ fwts-test/klog-0002/test-0003.sh \ fwts-test/lpit-0001/test-0001.sh \ fwts-test/lpit-0001/test-0002.sh \ + fwts-test/slic-0001/test-0001.sh \ + fwts-test/slic-0001/test-0002.sh \ fwts-test/slit-0001/test-0001.sh \ fwts-test/slit-0001/test-0002.sh \ fwts-test/madt-0001/test-0001.sh \ diff --git a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log index 5a54e51..97b8954 100644 --- a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log +++ b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log @@ -27,6 +27,7 @@ ACPI tests: rsdp RSDP Root System Description Pointer test. rsdt RSDT Root System Description Table test. sbst SBST Smart Battery Specification Table test. + slic SLIC Software Licensing Description Table test. slit SLIT System Locality Distance Information test. spcr SPCR Serial Port Console Redirection Table test. spmi SPMI Service Processor Management Interface Description Table test. @@ -91,6 +92,7 @@ Batch tests: rsdt RSDT Root System Description Table test. sbst SBST Smart Battery Specification Table test. securebootcert UEFI secure boot test. + slic SLIC Software Licensing Description Table test. slit SLIT System Locality Distance Information test. spcr SPCR Serial Port Console Redirection Table test. spmi SPMI Service Processor Management Interface Description Table test. diff --git a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log index ac262e6..ced52e0 100644 --- a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log +++ b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log @@ -242,6 +242,8 @@ ACPI tests: RSDT Root System Description Table test. sbst (1 test): SBST Smart Battery Specificiation Table test. + slic (1 test): + SLIC Software Licensing Description Table test. slit (1 test): SLIT System Locality Distance Information test. spcr (1 test): @@ -581,6 +583,8 @@ Batch tests: SBST Smart Battery Specificiation Table test. securebootcert (1 test): UEFI secure boot test. + slic (1 test): + SLIC Software Licensing Description Table test. slit (1 test): SLIT System Locality Distance Information test. spcr (1 test): @@ -802,4 +806,4 @@ UEFI tests: Test UEFI RT service query variable info interface stress test. Test UEFI RT service get variable interface, invalid parameters. -Total of 655 tests +Total of 657 tests diff --git a/fwts-test/slic-0001/acpidump-0001.log b/fwts-test/slic-0001/acpidump-0001.log new file mode 100644 index 0000000..088d96e --- /dev/null +++ b/fwts-test/slic-0001/acpidump-0001.log @@ -0,0 +1,51 @@ +FACS @ 0x00000000 + 0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00 FACS@........... + 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +FACP @ 0x00000000 + 0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20 FACP......AMD + 0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20 GUAM ....AMD + 0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00 @B.../...G...... + 0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00 ................ + 0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00 ................ + 0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00 ............... + 0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00 e...........2... + 0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af ...../.......G.. + 0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00 ..... .......... + 00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00 ................ + 00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00 ................ + 00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00 . ...........@.. + 00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............... + 00f0: 00 00 00 00 .... + +SLIC @ 0x00000000 + 0000: 53 4c 49 43 76 01 00 00 01 99 41 43 52 53 59 53 SLICv.....ACRSYS + 0010: 41 43 52 50 52 44 43 54 01 00 00 00 31 30 32 35 ACRPRDCT....1025 + 0020: 00 00 04 00 00 00 00 00 9c 00 00 00 06 02 00 00 ................ + 0030: 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 .$..RSA1........ + 0040: b3 6d 83 60 8d 83 65 6e e6 4b a7 6f 38 04 31 c1 .m.`..en.K.o8.1. + 0050: e2 45 bf 34 66 1f 17 91 7f 5c 15 12 b7 01 4d 57 .E.4f....\....MW + 0060: 6d 8e ae 6b e4 cc f8 a0 e1 bb 79 ff 08 53 e3 77 m..k......y..S.w + 0070: e7 d4 70 5e 5c ef 6f 81 dd 1b 5f 30 e2 99 9b b9 ..p^\.o..._0.... + 0080: d0 93 46 ab d8 27 7a f0 f0 a7 4c 32 d4 91 86 ba ..F...z...L2.... + 0090: a1 6c a2 3c 73 cf 86 2d 95 9a 06 50 23 f7 7e 06 .l.<s..-...P..~. + 00a0: 5b 5e 27 66 01 3a 31 9f 0c b1 91 96 49 5c cc 81 [^'f.:1.....I\.. + 00b0: ba 77 32 52 b2 10 5d 5b ca de 9d 25 90 95 f7 97 .w2R..][...%.... + 00c0: 01 00 00 00 b6 00 00 00 00 00 02 00 41 43 52 53 ............ACRS + 00d0: 59 53 41 43 52 50 52 44 43 54 57 49 4e 44 4f 57 YSACRPRDCTWINDOW + 00e0: 53 20 01 00 02 00 00 00 00 00 00 00 00 00 00 00 S .............. + 00f0: 00 00 00 00 00 00 49 90 ac 34 3b 98 88 52 62 2c ......I..4;..Rb, + 0100: fb 25 a8 a9 a0 7d 2d 12 70 ee d5 9a 7c cf 0c 83 .%...}-.p...|... + 0110: b4 29 1b 55 3b 88 a5 f7 e6 29 a9 2c e7 17 5d 7a .).U;....).,..]z + 0120: ee 38 4d 72 e2 ff 92 22 11 20 4a 68 0b 5d 83 ad .8M'..i|. Jh.].. + 0130: e5 d6 6e 49 c1 66 28 e4 e4 ce 72 64 a1 7c be 93 ..nI.f(...rd.|.. + 0140: ad 64 32 da cd 71 24 43 fe b4 97 87 01 55 a0 5d .d2..r$G.....U.] + 0150: 2f ef 06 93 e8 87 84 59 d3 9b 25 53 27 e7 ca 75 /......Y..%S'..u + 0160: 65 cf 0e 40 c9 3b aa 03 f2 83 7e 27 e7 ca 47 a4 e..@.;....~'..G. + 0170: 4b 1f c5 77 df 8c K..w.. + diff --git a/fwts-test/slic-0001/acpidump-0002.log b/fwts-test/slic-0001/acpidump-0002.log new file mode 100644 index 0000000..de858d2 --- /dev/null +++ b/fwts-test/slic-0001/acpidump-0002.log @@ -0,0 +1,51 @@ +FACS @ 0x00000000 + 0000: 46 41 43 53 40 00 00 00 00 00 00 00 00 00 00 00 FACS@........... + 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +FACP @ 0x00000000 + 0000: 46 41 43 50 f4 00 00 00 03 f9 41 4d 44 20 20 20 FACP......AMD + 0010: 47 55 41 4d 20 20 20 20 00 00 04 06 41 4d 44 20 GUAM ....AMD + 0020: 40 42 0f 00 c0 2f e9 af 92 47 e8 af 00 02 09 00 @B.../...G...... + 0030: b0 00 00 00 f0 f1 00 00 00 80 00 00 00 00 00 00 ................ + 0040: 04 80 00 00 00 00 00 00 00 82 00 00 08 80 00 00 ................ + 0050: 20 80 00 00 00 00 00 00 04 02 01 04 08 00 00 00 ............... + 0060: 65 00 e9 03 00 00 00 00 01 00 0d 00 32 00 00 00 e...........2... + 0070: a5 c1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 0080: 00 00 00 00 c0 2f e9 af 00 00 00 00 92 47 e8 af ...../.......G.. + 0090: 00 00 00 00 01 20 00 00 00 80 00 00 00 00 00 00 ..... .......... + 00a0: 00 00 00 00 00 00 00 00 00 00 00 00 01 10 00 00 ................ + 00b0: 04 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + 00c0: 00 00 00 00 01 08 00 00 00 82 00 00 00 00 00 00 ................ + 00d0: 01 20 00 00 08 80 00 00 00 00 00 00 01 40 00 00 . ...........@.. + 00e0: 20 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............... + 00f0: 00 00 00 00 .... + +SLIC @ 0x00000000 + 0000: 53 4c 49 43 76 01 00 00 01 99 41 43 52 53 59 53 SLICv.....ACRSYS + 0010: 41 43 52 50 52 44 43 54 01 00 00 00 31 30 32 35 ACRPRDCT....1025 + 0020: 00 00 04 00 04 00 00 00 9c 00 00 00 06 02 00 00 ................ + 0030: 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 .$..RSA1........ + 0040: b3 6d 83 60 8d 83 65 6e e6 4b a7 6f 38 04 31 c1 .m.`..en.K.o8.1. + 0050: e2 45 bf 34 66 1f 17 91 7f 5c 15 12 b7 01 4d 57 .E.4f....\....MW + 0060: 6d 8e ae 6b e4 cc f8 a0 e1 bb 79 ff 08 53 e3 77 m..k......y..S.w + 0070: e7 d4 70 5e 5c ef 6f 81 dd 1b 5f 30 e2 99 9b b9 ..p^\.o..._0.... + 0080: d0 93 46 ab d8 27 7a f0 f0 a7 4c 32 d4 91 86 ba ..F...z...L2.... + 0090: a1 6c a2 3c 73 cf 86 2d 95 9a 06 50 23 f7 7e 06 .l.<s..-...P..~. + 00a0: 5b 5e 27 66 01 3a 31 9f 0c b1 91 96 49 5c cc 81 [^'f.:1.....I\.. + 00b0: ba 77 32 52 b2 10 5d 5b ca de 9d 25 90 95 f7 97 .w2R..][...%.... + 00c0: 01 00 00 00 b6 00 00 00 00 00 02 00 41 43 52 53 ............ACRS + 00d0: 59 53 41 43 52 50 52 44 43 54 57 49 4e 44 4f 57 YSACRPRDCTWINDOW + 00e0: 53 20 01 00 02 00 00 00 00 00 00 00 00 00 00 00 S .............. + 00f0: 00 00 00 00 00 00 49 90 ac 34 3b 98 88 52 62 2c ......I..4;..Rb, + 0100: fb 25 a8 a9 a0 7d 2d 12 70 ee d5 9a 7c cf 0c 83 .%...}-.p...|... + 0110: b4 29 1b 55 3b 88 a5 f7 e6 29 a9 2c e7 17 5d 7a .).U;....).,..]z + 0120: ee 38 4d 72 e2 ff 92 22 11 20 4a 68 0b 5d 83 ad .8M'..i|. Jh.].. + 0130: e5 d6 6e 49 c1 66 28 e4 e4 ce 72 64 a1 7c be 93 ..nI.f(...rd.|.. + 0140: ad 64 32 da cd 71 24 43 fe b4 97 87 01 55 a0 5d .d2..r$G.....U.] + 0150: 2f ef 06 93 e8 87 84 59 d3 9b 25 53 27 e7 ca 75 /......Y..%S'..u + 0160: 65 cf 0e 40 c9 3b aa 03 f2 83 7e 27 e7 ca 47 a4 e..@.;....~'..G. + 0170: 4b 1f c5 77 df 8c K..w.. + diff --git a/fwts-test/slic-0001/slic-0001.log b/fwts-test/slic-0001/slic-0001.log new file mode 100644 index 0000000..3d65622 --- /dev/null +++ b/fwts-test/slic-0001/slic-0001.log @@ -0,0 +1,15 @@ +slic slic: SLIC Software Licensing Description Table test. +slic ---------------------------------------------------------- +slic Test 1 of 1: SLIC Software Licensing Description Table +slic test. +slic Software Licensing Description Table +slic SLIC Public Key Structure has had minimal check due to +slic proprietary nature of the table +slic SLIC Windows Marker Structure has had minimal check due to +slic proprietary nature of the table +slic PASSED: Test 1, No issues found in SLIC table. +slic +slic ========================================================== +slic 1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0 +slic info only. +slic ========================================================== diff --git a/fwts-test/slic-0001/slic-0002.log b/fwts-test/slic-0001/slic-0002.log new file mode 100644 index 0000000..09429cb --- /dev/null +++ b/fwts-test/slic-0001/slic-0002.log @@ -0,0 +1,13 @@ +slic slic: SLIC Software Licensing Description Table test. +slic ---------------------------------------------------------- +slic Test 1 of 1: SLIC Software Licensing Description Table +slic test. +slic Software Licensing Description Table +slic FAILED [HIGH] SLICInvaldType: Test 1, SLIC subtable type +slic 0x00000004 is invalid, should be either 0x0000 (Public +slic Key) or 0x0001 (Windows Marker) +slic +slic ========================================================== +slic 0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0 +slic info only. +slic ========================================================== diff --git a/fwts-test/slic-0001/test-0001.sh b/fwts-test/slic-0001/test-0001.sh new file mode 100755 index 0000000..0256563 --- /dev/null +++ b/fwts-test/slic-0001/test-0001.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# +TEST="Test table against SLIC" +NAME=test-0001.sh +TMPLOG=$TMP/slic.log.$$ + +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0001.log slic - | cut -c7- | grep "^slic" > $TMPLOG +diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0001.log >> $FAILURE_LOG +ret=$? +if [ $ret -eq 0 ]; then + echo PASSED: $TEST, $NAME +else + echo FAILED: $TEST, $NAME +fi + +rm $TMPLOG +exit $ret diff --git a/fwts-test/slic-0001/test-0002.sh b/fwts-test/slic-0001/test-0002.sh new file mode 100755 index 0000000..5f9bc18 --- /dev/null +++ b/fwts-test/slic-0001/test-0002.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# +TEST="Test table against invalid SLIC" +NAME=test-0001.sh +TMPLOG=$TMP/slic.log.$$ + +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/slic-0001/acpidump-0002.log slic - | cut -c7- | grep "^slic" > $TMPLOG +diff $TMPLOG $FWTSTESTDIR/slic-0001/slic-0002.log >> $FAILURE_LOG +ret=$? +if [ $ret -eq 0 ]; then + echo PASSED: $TEST, $NAME +else + echo FAILED: $TEST, $NAME +fi + +rm $TMPLOG +exit $ret