[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 10/15] tests/qtest/tpm: Declare input buffers const and static
From: |
Thomas Huth |
Subject: |
[PULL v2 10/15] tests/qtest/tpm: Declare input buffers const and static |
Date: |
Wed, 2 Sep 2020 17:49:27 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The functions using these arrays expect a "const unsigned char *"
argument, it is safe to declare these as 'static const'.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200902080909.161034-1-philmd@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/tpm-tests.c | 4 ++--
tests/qtest/tpm-util.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c
index a2f2838e15..70c80f8379 100644
--- a/tests/qtest/tpm-tests.c
+++ b/tests/qtest/tpm-tests.c
@@ -59,7 +59,7 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func
*tx,
tpm_util_startup(s, tx);
tpm_util_pcrextend(s, tx);
- unsigned char tpm_pcrread_resp[] =
+ static const unsigned char tpm_pcrread_resp[] =
"\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"
"\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"
"\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"
@@ -107,7 +107,7 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path,
tpm_util_startup(src_qemu, tx);
tpm_util_pcrextend(src_qemu, tx);
- unsigned char tpm_pcrread_resp[] =
+ static const unsigned char tpm_pcrread_resp[] =
"\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"
"\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"
"\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"
diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
index e2b29ef0f8..3ed6c8548a 100644
--- a/tests/qtest/tpm-util.c
+++ b/tests/qtest/tpm-util.c
@@ -98,9 +98,9 @@ void tpm_util_tis_transfer(QTestState *s,
void tpm_util_startup(QTestState *s, tx_func *tx)
{
unsigned char buffer[1024];
- unsigned char tpm_startup[] =
+ static const unsigned char tpm_startup[] =
"\x80\x01\x00\x00\x00\x0c\x00\x00\x01\x44\x00\x00";
- unsigned char tpm_startup_resp[] =
+ static const unsigned char tpm_startup_resp[] =
"\x80\x01\x00\x00\x00\x0a\x00\x00\x00\x00";
tx(s, tpm_startup, sizeof(tpm_startup), buffer, sizeof(buffer));
@@ -112,14 +112,14 @@ void tpm_util_startup(QTestState *s, tx_func *tx)
void tpm_util_pcrextend(QTestState *s, tx_func *tx)
{
unsigned char buffer[1024];
- unsigned char tpm_pcrextend[] =
+ static const unsigned char tpm_pcrextend[] =
"\x80\x02\x00\x00\x00\x41\x00\x00\x01\x82\x00\x00\x00\x0a\x00\x00"
"\x00\x09\x40\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00"
"\x0b\x74\x65\x73\x74\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
"\x00";
- unsigned char tpm_pcrextend_resp[] =
+ static const unsigned char tpm_pcrextend_resp[] =
"\x80\x02\x00\x00\x00\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
"\x01\x00\x00";
@@ -133,7 +133,7 @@ void tpm_util_pcrread(QTestState *s, tx_func *tx,
const unsigned char *exp_resp, size_t exp_resp_size)
{
unsigned char buffer[1024];
- unsigned char tpm_pcrread[] =
+ static const unsigned char tpm_pcrread[] =
"\x80\x01\x00\x00\x00\x14\x00\x00\x01\x7e\x00\x00\x00\x01\x00\x0b"
"\x03\x00\x04\x00";
--
2.18.2
- [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k, Thomas Huth, 2020/09/02
- [PULL v2 02/15] cirrus.yml: Compile FreeBSD with -Werror, Thomas Huth, 2020/09/02
- [PULL v2 03/15] cirrus.yml: Compile macOS with -Werror, Thomas Huth, 2020/09/02
- [PULL v2 01/15] configure: Fix atomic64 test for --enable-werror on macOS, Thomas Huth, 2020/09/02
- [PULL v2 05/15] cirrus.yml: Split FreeBSD job into two parts, Thomas Huth, 2020/09/02
- [PULL v2 08/15] hw/m68k: QOMify the mcf5206 system integration module, Thomas Huth, 2020/09/02
- [PULL v2 09/15] tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS), Thomas Huth, 2020/09/02
- [PULL v2 04/15] cirrus.yml: Update the macOS jobs to Catalina, Thomas Huth, 2020/09/02
- [PULL v2 10/15] tests/qtest/tpm: Declare input buffers const and static,
Thomas Huth <=
- [PULL v2 07/15] configure: Add system = 'linux' for meson when cross-compiling, Thomas Huth, 2020/09/02
- [PULL v2 06/15] meson: fix keymaps without qemu-keymap, Thomas Huth, 2020/09/02
- [PULL v2 11/15] tests/qtest/ipmi-kcs: Fix assert side-effect, Thomas Huth, 2020/09/02
- [PULL v2 12/15] libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref(), Thomas Huth, 2020/09/02
- [PULL v2 13/15] gitlab/travis: Rework the disabled features tests, Thomas Huth, 2020/09/02
- [PULL v2 14/15] gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job, Thomas Huth, 2020/09/02
- [PULL v2 15/15] gitlab-ci.yml: Set artifacts expiration time, Thomas Huth, 2020/09/02
- Re: [PULL v2 00/15] Cirrus-CI improvements, and other CI-related fixes, m68k, Peter Maydell, 2020/09/02