diff mbox

[1/2] acpi: add SLIC table test (LP: #1470518)

Message ID 1435758087-2213-2-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King July 1, 2015, 1:41 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

even though this is poory documented and is now out of date
we may as well add support for this test.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/Makefile.am      |   1 +
 src/acpi/slic/slic.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)
 create mode 100644 src/acpi/slic/slic.c

Comments

Ivan Hu July 3, 2015, 8:14 a.m. UTC | #1
On 2015年07月01日 21:41, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> even though this is poory documented and is now out of date
> we may as well add support for this test.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/Makefile.am      |   1 +
>   src/acpi/slic/slic.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++
>   2 files changed, 183 insertions(+)
>   create mode 100644 src/acpi/slic/slic.c
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index bba6301..e178f3f 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -69,6 +69,7 @@ fwts_SOURCES = main.c 				\
>   	acpi/s3power/s3power.c 			\
>   	acpi/s4/s4.c 				\
>   	acpi/sbst/sbst.c			\
> +	acpi/slic/slic.c 			\
>   	acpi/slit/slit.c 			\
>   	acpi/spcr/spcr.c 			\
>   	acpi/spmi/spmi.c 			\
> diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c
> new file mode 100644
> index 0000000..545775f
> --- /dev/null
> +++ b/src/acpi/slic/slic.c
> @@ -0,0 +1,182 @@
> +/*
> + * Copyright (C) 2015 Canonical
> + *
> + * Portions of this code original from the Linux-ready Firmware Developer Kit
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> + *
> + */
> +#include "fwts.h"
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <unistd.h>
> +#include <inttypes.h>
> +#include <string.h>
> +
> +#define	DUMP_SLIC	(0)	/* Disable this, just used it for debugging */
> +
> +fwts_acpi_table_info *table;
> +
> +static int slic_init(fwts_framework *fw)
> +{
> +
> +	if (fwts_acpi_find_table(fw, "SLIC", 0, &table) != FWTS_OK) {
> +		fwts_log_error(fw, "Cannot read ACPI tables.");
> +		return FWTS_ERROR;
> +	}
> +	if (table == NULL || (table && table->length == 0)) {
> +		fwts_log_error(fw, "ACPI SLIC table does not exist, skipping test");
> +		return FWTS_SKIP;
> +	}
> +
> +	return FWTS_OK;
> +}
> +
> +/*
> + *  Software Licensing Description Table
> + *  OEM Activation 2.0 for Windows Vista Operating Systems
> + */
> +static int slic_test1(fwts_framework *fw)
> +{
> +	bool passed = true;
> +	uint8_t *ptr;
> +	size_t const slic_min_hdr_size =
> +		sizeof(fwts_acpi_table_header) +
> +		sizeof(fwts_acpi_table_slic_header);
> +	size_t length = slic_min_hdr_size;
> +
> +	/* Size sanity check #1, got enough table to get initial header */
> +	if (table->length < slic_min_hdr_size) {
> +		passed = false;
> +		fwts_failed(fw, LOG_LEVEL_HIGH,
> +			"SLICTooShort",
> +			"SLIC table too short, must be at least %zu bytes, "
> +			"instead got %zu bytes",
> +			slic_min_hdr_size, table->length);
> +		goto done;
> +	}
> +	ptr = (uint8_t *)table->data + sizeof(fwts_acpi_table_header);
> +
> +	fwts_log_info_verbatum(fw, "Software Licensing Description Table");
> +	while (length < table->length) {
> +		fwts_acpi_table_slic_header *hdr =
> +			(fwts_acpi_table_slic_header *)ptr;
> +		if (hdr->length < sizeof(fwts_acpi_table_slic_header))
> +			break;
> +#if DUMP_SLIC
> +		fwts_log_info_verbatum(fw, "  Type:                     0x%8.8" PRIx32, hdr->type);
> +		fwts_log_info_verbatum(fw, "  Length:                   0x%8.8" PRIx32, hdr->length);
> +#endif
> +
> +		switch (hdr->type) {
> +		case 0x0000:
> +			if (hdr->length < sizeof(fwts_acpi_table_slic_key)) {
> +				passed = false;
> +				fwts_failed(fw, LOG_LEVEL_HIGH,
> +					"SLICShortPublicKeyStructure",
> +					"SLIC Public Key Structure is only %" PRIu32 " bytes and "
> +					"should be %zu bytes in size",
> +					hdr->length, sizeof(fwts_acpi_table_slic_key));
> +			} else {
> +#if DUMP_SLIC
> +				fwts_acpi_table_slic_key *key = (fwts_acpi_table_slic_key *)ptr;
> +#endif
> +				fwts_log_info(fw, "SLIC Public Key Structure has had minimal check due to proprietary nature of the table");
> +#if DUMP_SLIC
> +
> +				fwts_log_info_verbatum(fw, "  SLIC Public Key:\n");
> +				fwts_log_info_verbatum(fw, "    Key Type:               0x%2.2" PRIx8, key->key_type);
> +				fwts_log_info_verbatum(fw, "    Version:                0x%2.2" PRIx8, key->version);
> +				fwts_log_info_verbatum(fw, "    Reserved:               0x%4.4" PRIx16, key->reserved);
> +				fwts_log_info_verbatum(fw, "    Algorithm:              0x%8.8" PRIx32, key->algorithm);
> +				fwts_log_info_verbatum(fw, "    Magic:                  '%c%c%c%c'",
> +					key->magic[0], key->magic[1], key->magic[2], key->magic[3]);
> +				fwts_log_info_verbatum(fw, "    Bit Length:             0x%8.8" PRIx32, key->bit_length);
> +				fwts_log_info_verbatum(fw, "    Exponent:               0x%8.8" PRIx32, key->exponent);
> +				/* For the moment, don't dump the modulus */
> +#endif
> +			}
> +			ptr += hdr->length;
> +			length += hdr->length;
> +			break;
> +		case 0x0001:
> +			if (hdr->length < sizeof(fwts_acpi_table_slic_marker)) {
> +				passed = false;
> +				fwts_failed(fw, LOG_LEVEL_HIGH,
> +					"SLICShortWindowsMarkerStructure",
> +					"SLIC Windows Marker Structure is only %" PRIu32 " bytes and "
> +					"should be %zu bytes in size",
> +					hdr->length, sizeof(fwts_acpi_table_slic_marker));
> +			} else {
> +#if DUMP_SLIC
> +				fwts_acpi_table_slic_marker *marker = (fwts_acpi_table_slic_marker *)ptr;
> +#endif
> +				fwts_log_info(fw, "SLIC Windows Marker Structure has had minimal check due to proprietary nature of the table");
> +#if DUMP_SLIC
> +				fwts_log_info_verbatum(fw, "  SLIC Windows Marker:\n");
> +				fwts_log_info_verbatum(fw, "    Version:                0x%2.2" PRIx8, marker->version);
> +				fwts_log_info_verbatum(fw, "    OEM ID:                 '%6.6s'", marker->oem_id);
> +				fwts_log_info_verbatum(fw, "    OEM Table ID:           '%8.8s'", marker->oem_table_id);
> +				fwts_log_info_verbatum(fw, "    Windows Flag:           '%8.8s'", marker->windows_flag);
> +				fwts_log_info_verbatum(fw, "    SLIC Version:           0x%4.4" PRIx32, marker->slic_version);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[0], marker->reserved[1], marker->reserved[2], marker->reserved[3]);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[4], marker->reserved[5], marker->reserved[6], marker->reserved[7]);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[8], marker->reserved[9], marker->reserved[10], marker->reserved[11]);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[12], marker->reserved[13], marker->reserved[14], marker->reserved[15]);
> +				/* For the moment, don't dump the signature */
> +#endif
> +			}
> +			ptr += hdr->length;
> +			length += hdr->length;
> +			break;
> +		default:
> +			passed = false;
> +			fwts_failed(fw, LOG_LEVEL_HIGH,
> +				"SLICInvaldType",
> +				"SLIC subtable type 0x%8.8" PRIx32 " is invalid, should be "
> +				"either 0x0000 (Public Key) or 0x0001 (Windows Marker)",
> +				hdr->type);
> +			goto done;
> +		}
> +	}
> +
> +done:
> +	if (passed)
> +		fwts_passed(fw, "No issues found in SLIC table.");
> +
> +	return FWTS_OK;
> +}
> +
> +static fwts_framework_minor_test slic_tests[] = {
> +	{ slic_test1, "SLIC Software Licensing Description Table test." },
> +	{ NULL, NULL }
> +};
> +
> +static fwts_framework_ops slic_ops = {
> +	.description = "SLIC Software Licensing Description Table test.",
> +	.init        = slic_init,
> +	.minor_tests = slic_tests
> +};
> +
> +FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI)
Acked-by: Ivan Hu<ivan.hu@canonical.com>
Alex Hung July 6, 2015, 1:41 a.m. UTC | #2
On 07/01/2015 09:41 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> even though this is poory documented and is now out of date
> we may as well add support for this test.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/Makefile.am      |   1 +
>  src/acpi/slic/slic.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 183 insertions(+)
>  create mode 100644 src/acpi/slic/slic.c
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index bba6301..e178f3f 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -69,6 +69,7 @@ fwts_SOURCES = main.c 				\
>  	acpi/s3power/s3power.c 			\
>  	acpi/s4/s4.c 				\
>  	acpi/sbst/sbst.c			\
> +	acpi/slic/slic.c 			\
>  	acpi/slit/slit.c 			\
>  	acpi/spcr/spcr.c 			\
>  	acpi/spmi/spmi.c 			\
> diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c
> new file mode 100644
> index 0000000..545775f
> --- /dev/null
> +++ b/src/acpi/slic/slic.c
> @@ -0,0 +1,182 @@
> +/*
> + * Copyright (C) 2015 Canonical
> + *
> + * Portions of this code original from the Linux-ready Firmware Developer Kit
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> + *
> + */
> +#include "fwts.h"
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <unistd.h>
> +#include <inttypes.h>
> +#include <string.h>
> +
> +#define	DUMP_SLIC	(0)	/* Disable this, just used it for debugging */
> +
> +fwts_acpi_table_info *table;
> +
> +static int slic_init(fwts_framework *fw)
> +{
> +
> +	if (fwts_acpi_find_table(fw, "SLIC", 0, &table) != FWTS_OK) {
> +		fwts_log_error(fw, "Cannot read ACPI tables.");
> +		return FWTS_ERROR;
> +	}
> +	if (table == NULL || (table && table->length == 0)) {
> +		fwts_log_error(fw, "ACPI SLIC table does not exist, skipping test");
> +		return FWTS_SKIP;
> +	}
> +
> +	return FWTS_OK;
> +}
> +
> +/*
> + *  Software Licensing Description Table
> + *  OEM Activation 2.0 for Windows Vista Operating Systems
> + */
> +static int slic_test1(fwts_framework *fw)
> +{
> +	bool passed = true;
> +	uint8_t *ptr;
> +	size_t const slic_min_hdr_size =
> +		sizeof(fwts_acpi_table_header) +
> +		sizeof(fwts_acpi_table_slic_header);
> +	size_t length = slic_min_hdr_size;
> +
> +	/* Size sanity check #1, got enough table to get initial header */
> +	if (table->length < slic_min_hdr_size) {
> +		passed = false;
> +		fwts_failed(fw, LOG_LEVEL_HIGH,
> +			"SLICTooShort",
> +			"SLIC table too short, must be at least %zu bytes, "
> +			"instead got %zu bytes",
> +			slic_min_hdr_size, table->length);
> +		goto done;
> +	}
> +	ptr = (uint8_t *)table->data + sizeof(fwts_acpi_table_header);
> +
> +	fwts_log_info_verbatum(fw, "Software Licensing Description Table");
> +	while (length < table->length) {
> +		fwts_acpi_table_slic_header *hdr =
> +			(fwts_acpi_table_slic_header *)ptr;
> +		if (hdr->length < sizeof(fwts_acpi_table_slic_header))
> +			break;
> +#if DUMP_SLIC
> +		fwts_log_info_verbatum(fw, "  Type:                     0x%8.8" PRIx32, hdr->type);
> +		fwts_log_info_verbatum(fw, "  Length:                   0x%8.8" PRIx32, hdr->length);
> +#endif
> +
> +		switch (hdr->type) {
> +		case 0x0000:
> +			if (hdr->length < sizeof(fwts_acpi_table_slic_key)) {
> +				passed = false;
> +				fwts_failed(fw, LOG_LEVEL_HIGH,
> +					"SLICShortPublicKeyStructure",
> +					"SLIC Public Key Structure is only %" PRIu32 " bytes and "
> +					"should be %zu bytes in size",
> +					hdr->length, sizeof(fwts_acpi_table_slic_key));
> +			} else {
> +#if DUMP_SLIC
> +				fwts_acpi_table_slic_key *key = (fwts_acpi_table_slic_key *)ptr;
> +#endif
> +				fwts_log_info(fw, "SLIC Public Key Structure has had minimal check due to proprietary nature of the table");
> +#if DUMP_SLIC
> +
> +				fwts_log_info_verbatum(fw, "  SLIC Public Key:\n");
> +				fwts_log_info_verbatum(fw, "    Key Type:               0x%2.2" PRIx8, key->key_type);
> +				fwts_log_info_verbatum(fw, "    Version:                0x%2.2" PRIx8, key->version);
> +				fwts_log_info_verbatum(fw, "    Reserved:               0x%4.4" PRIx16, key->reserved);
> +				fwts_log_info_verbatum(fw, "    Algorithm:              0x%8.8" PRIx32, key->algorithm);
> +				fwts_log_info_verbatum(fw, "    Magic:                  '%c%c%c%c'",
> +					key->magic[0], key->magic[1], key->magic[2], key->magic[3]);
> +				fwts_log_info_verbatum(fw, "    Bit Length:             0x%8.8" PRIx32, key->bit_length);
> +				fwts_log_info_verbatum(fw, "    Exponent:               0x%8.8" PRIx32, key->exponent);
> +				/* For the moment, don't dump the modulus */
> +#endif
> +			}
> +			ptr += hdr->length;
> +			length += hdr->length;
> +			break;
> +		case 0x0001:
> +			if (hdr->length < sizeof(fwts_acpi_table_slic_marker)) {
> +				passed = false;
> +				fwts_failed(fw, LOG_LEVEL_HIGH,
> +					"SLICShortWindowsMarkerStructure",
> +					"SLIC Windows Marker Structure is only %" PRIu32 " bytes and "
> +					"should be %zu bytes in size",
> +					hdr->length, sizeof(fwts_acpi_table_slic_marker));
> +			} else {
> +#if DUMP_SLIC
> +				fwts_acpi_table_slic_marker *marker = (fwts_acpi_table_slic_marker *)ptr;
> +#endif
> +				fwts_log_info(fw, "SLIC Windows Marker Structure has had minimal check due to proprietary nature of the table");
> +#if DUMP_SLIC
> +				fwts_log_info_verbatum(fw, "  SLIC Windows Marker:\n");
> +				fwts_log_info_verbatum(fw, "    Version:                0x%2.2" PRIx8, marker->version);
> +				fwts_log_info_verbatum(fw, "    OEM ID:                 '%6.6s'", marker->oem_id);
> +				fwts_log_info_verbatum(fw, "    OEM Table ID:           '%8.8s'", marker->oem_table_id);
> +				fwts_log_info_verbatum(fw, "    Windows Flag:           '%8.8s'", marker->windows_flag);
> +				fwts_log_info_verbatum(fw, "    SLIC Version:           0x%4.4" PRIx32, marker->slic_version);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[0], marker->reserved[1], marker->reserved[2], marker->reserved[3]);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[4], marker->reserved[5], marker->reserved[6], marker->reserved[7]);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[8], marker->reserved[9], marker->reserved[10], marker->reserved[11]);
> +				fwts_log_info_verbatum(fw, "    Reserved:               "
> +					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
> +					marker->reserved[12], marker->reserved[13], marker->reserved[14], marker->reserved[15]);
> +				/* For the moment, don't dump the signature */
> +#endif
> +			}
> +			ptr += hdr->length;
> +			length += hdr->length;
> +			break;
> +		default:
> +			passed = false;
> +			fwts_failed(fw, LOG_LEVEL_HIGH,
> +				"SLICInvaldType",
> +				"SLIC subtable type 0x%8.8" PRIx32 " is invalid, should be "
> +				"either 0x0000 (Public Key) or 0x0001 (Windows Marker)",
> +				hdr->type);
> +			goto done;
> +		}
> +	}
> +
> +done:
> +	if (passed)
> +		fwts_passed(fw, "No issues found in SLIC table.");
> +
> +	return FWTS_OK;
> +}
> +
> +static fwts_framework_minor_test slic_tests[] = {
> +	{ slic_test1, "SLIC Software Licensing Description Table test." },
> +	{ NULL, NULL }
> +};
> +
> +static fwts_framework_ops slic_ops = {
> +	.description = "SLIC Software Licensing Description Table test.",
> +	.init        = slic_init,
> +	.minor_tests = slic_tests
> +};
> +
> +FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI)
> 

Acked-by: Alex Hung <alex.hung@canonical.com>
diff mbox

Patch

diff --git a/src/Makefile.am b/src/Makefile.am
index bba6301..e178f3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,6 +69,7 @@  fwts_SOURCES = main.c 				\
 	acpi/s3power/s3power.c 			\
 	acpi/s4/s4.c 				\
 	acpi/sbst/sbst.c			\
+	acpi/slic/slic.c 			\
 	acpi/slit/slit.c 			\
 	acpi/spcr/spcr.c 			\
 	acpi/spmi/spmi.c 			\
diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c
new file mode 100644
index 0000000..545775f
--- /dev/null
+++ b/src/acpi/slic/slic.c
@@ -0,0 +1,182 @@ 
+/*
+ * Copyright (C) 2015 Canonical
+ *
+ * Portions of this code original from the Linux-ready Firmware Developer Kit
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+#include "fwts.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <string.h>
+
+#define	DUMP_SLIC	(0)	/* Disable this, just used it for debugging */
+
+fwts_acpi_table_info *table;
+
+static int slic_init(fwts_framework *fw)
+{
+
+	if (fwts_acpi_find_table(fw, "SLIC", 0, &table) != FWTS_OK) {
+		fwts_log_error(fw, "Cannot read ACPI tables.");
+		return FWTS_ERROR;
+	}
+	if (table == NULL || (table && table->length == 0)) {
+		fwts_log_error(fw, "ACPI SLIC table does not exist, skipping test");
+		return FWTS_SKIP;
+	}
+
+	return FWTS_OK;
+}
+
+/*
+ *  Software Licensing Description Table
+ *  OEM Activation 2.0 for Windows Vista Operating Systems
+ */
+static int slic_test1(fwts_framework *fw)
+{
+	bool passed = true;
+	uint8_t *ptr;
+	size_t const slic_min_hdr_size =
+		sizeof(fwts_acpi_table_header) +
+		sizeof(fwts_acpi_table_slic_header);
+	size_t length = slic_min_hdr_size;
+
+	/* Size sanity check #1, got enough table to get initial header */
+	if (table->length < slic_min_hdr_size) {
+		passed = false;
+		fwts_failed(fw, LOG_LEVEL_HIGH,
+			"SLICTooShort",
+			"SLIC table too short, must be at least %zu bytes, "
+			"instead got %zu bytes",
+			slic_min_hdr_size, table->length);
+		goto done;
+	}
+	ptr = (uint8_t *)table->data + sizeof(fwts_acpi_table_header);
+
+	fwts_log_info_verbatum(fw, "Software Licensing Description Table");
+	while (length < table->length) {
+		fwts_acpi_table_slic_header *hdr =
+			(fwts_acpi_table_slic_header *)ptr;
+		if (hdr->length < sizeof(fwts_acpi_table_slic_header))
+			break;
+#if DUMP_SLIC
+		fwts_log_info_verbatum(fw, "  Type:                     0x%8.8" PRIx32, hdr->type);
+		fwts_log_info_verbatum(fw, "  Length:                   0x%8.8" PRIx32, hdr->length);
+#endif
+
+		switch (hdr->type) {
+		case 0x0000:
+			if (hdr->length < sizeof(fwts_acpi_table_slic_key)) {
+				passed = false;
+				fwts_failed(fw, LOG_LEVEL_HIGH,
+					"SLICShortPublicKeyStructure",
+					"SLIC Public Key Structure is only %" PRIu32 " bytes and "
+					"should be %zu bytes in size",
+					hdr->length, sizeof(fwts_acpi_table_slic_key));
+			} else {
+#if DUMP_SLIC
+				fwts_acpi_table_slic_key *key = (fwts_acpi_table_slic_key *)ptr;
+#endif
+				fwts_log_info(fw, "SLIC Public Key Structure has had minimal check due to proprietary nature of the table");
+#if DUMP_SLIC
+
+				fwts_log_info_verbatum(fw, "  SLIC Public Key:\n");
+				fwts_log_info_verbatum(fw, "    Key Type:               0x%2.2" PRIx8, key->key_type);
+				fwts_log_info_verbatum(fw, "    Version:                0x%2.2" PRIx8, key->version);
+				fwts_log_info_verbatum(fw, "    Reserved:               0x%4.4" PRIx16, key->reserved);
+				fwts_log_info_verbatum(fw, "    Algorithm:              0x%8.8" PRIx32, key->algorithm);
+				fwts_log_info_verbatum(fw, "    Magic:                  '%c%c%c%c'",
+					key->magic[0], key->magic[1], key->magic[2], key->magic[3]);
+				fwts_log_info_verbatum(fw, "    Bit Length:             0x%8.8" PRIx32, key->bit_length);
+				fwts_log_info_verbatum(fw, "    Exponent:               0x%8.8" PRIx32, key->exponent);
+				/* For the moment, don't dump the modulus */
+#endif
+			}
+			ptr += hdr->length;
+			length += hdr->length;
+			break;
+		case 0x0001:
+			if (hdr->length < sizeof(fwts_acpi_table_slic_marker)) {
+				passed = false;
+				fwts_failed(fw, LOG_LEVEL_HIGH,
+					"SLICShortWindowsMarkerStructure",
+					"SLIC Windows Marker Structure is only %" PRIu32 " bytes and "
+					"should be %zu bytes in size",
+					hdr->length, sizeof(fwts_acpi_table_slic_marker));
+			} else {
+#if DUMP_SLIC
+				fwts_acpi_table_slic_marker *marker = (fwts_acpi_table_slic_marker *)ptr;
+#endif
+				fwts_log_info(fw, "SLIC Windows Marker Structure has had minimal check due to proprietary nature of the table");
+#if DUMP_SLIC
+				fwts_log_info_verbatum(fw, "  SLIC Windows Marker:\n");
+				fwts_log_info_verbatum(fw, "    Version:                0x%2.2" PRIx8, marker->version);
+				fwts_log_info_verbatum(fw, "    OEM ID:                 '%6.6s'", marker->oem_id);
+				fwts_log_info_verbatum(fw, "    OEM Table ID:           '%8.8s'", marker->oem_table_id);
+				fwts_log_info_verbatum(fw, "    Windows Flag:           '%8.8s'", marker->windows_flag);
+				fwts_log_info_verbatum(fw, "    SLIC Version:           0x%4.4" PRIx32, marker->slic_version);
+				fwts_log_info_verbatum(fw, "    Reserved:               "
+					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+					marker->reserved[0], marker->reserved[1], marker->reserved[2], marker->reserved[3]);
+				fwts_log_info_verbatum(fw, "    Reserved:               "
+					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+					marker->reserved[4], marker->reserved[5], marker->reserved[6], marker->reserved[7]);
+				fwts_log_info_verbatum(fw, "    Reserved:               "
+					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+					marker->reserved[8], marker->reserved[9], marker->reserved[10], marker->reserved[11]);
+				fwts_log_info_verbatum(fw, "    Reserved:               "
+					"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+					marker->reserved[12], marker->reserved[13], marker->reserved[14], marker->reserved[15]);
+				/* For the moment, don't dump the signature */
+#endif
+			}
+			ptr += hdr->length;
+			length += hdr->length;
+			break;
+		default:
+			passed = false;
+			fwts_failed(fw, LOG_LEVEL_HIGH,
+				"SLICInvaldType",
+				"SLIC subtable type 0x%8.8" PRIx32 " is invalid, should be "
+				"either 0x0000 (Public Key) or 0x0001 (Windows Marker)",
+				hdr->type);
+			goto done;
+		}
+	}
+
+done:
+	if (passed)
+		fwts_passed(fw, "No issues found in SLIC table.");
+
+	return FWTS_OK;
+}
+
+static fwts_framework_minor_test slic_tests[] = {
+	{ slic_test1, "SLIC Software Licensing Description Table test." },
+	{ NULL, NULL }
+};
+
+static fwts_framework_ops slic_ops = {
+	.description = "SLIC Software Licensing Description Table test.",
+	.init        = slic_init,
+	.minor_tests = slic_tests
+};
+
+FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI)