tests/qtest/tpm: Declare input buffers const and static
PATCH 1/1 tests/qtest/tpm: Declare input buffers const and static
The functions using these arrays expect a "const unsigned char *" argument, it is safe to declare these as 'static const'.
--- tests/qtest/tpm-tests.c | 4 ++-- tests/qtest/tpm-util.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
tests/qtest/tpm-tests.c +2 -2
@@ -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"
tests/qtest/tpm-util.c +5 -5
@@ -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" ;
Signature · 1 line
2.26.2
Quoted 4 lines · Philippe Mathieu-Daudé
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é <[email protected]>
Quoted 71 lines
--- tests/qtest/tpm-tests.c | 4 ++-- tests/qtest/tpm-util.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)tests/qtest/tpm-tests.c +2
-2@@ -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" tests/qtest/tpm-util.c +5
-5@@ -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" ;Signature · 1 line
2.26.2
Stefan Berger
Reviewed-byQuoted 6 lines · Darren Kenny
Quoted 4 lines · Philippe Mathieu-Daudé
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é <[email protected]>Reviewed-by Darren Kenny <[email protected]>
Would this qualify for qemu-trivial?
Quoted 11 lines · Stefan Berger
Quoted 6 lines · Darren Kenny
Quoted 4 lines · Philippe Mathieu-Daudé
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é <[email protected]>Reviewed-by Darren Kenny <[email protected]>Would this qualify for qemu-trivial?
Reviewed-by Stefan Berger <[email protected]>
I can take it through the qtest tree.
Thomas
Quoted 66 lines · Philippe Mathieu-Daudé
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é <[email protected]>--- tests/qtest/tpm-tests.c | 4 ++-- tests/qtest/tpm-util.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)tests/qtest/tpm-tests.c +2
-2@@ -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" tests/qtest/tpm-util.c +4
-4@@ -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" ;
tests/qtest/tpm-util.c void tpm_util_pcrread(QTestState *s, tx_func *tx, · line 139
Quoted 8 lines
tests/qtest/tpm-util.c +1
-1@@ -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" ;
and queued (together with your ahci patch) to my qtest-next branch.