From a43797ca9cfe0f629fac6dd986e5ff9f01a08839 Mon Sep 17 00:00:00 2001 From: Dimitar Tomov Date: Mon, 7 Jun 2021 14:32:47 +0300 Subject: [PATCH] Update all include.am example files Signed-off-by: Dimitar Tomov --- examples/attestation/include.am | 12 ++++++++++++ examples/bench/include.am | 8 +++++++- examples/csr/include.am | 8 +++++++- examples/gpio/include.am | 24 +++++++++++++++++++++--- examples/include.am | 6 ++++++ examples/keygen/include.am | 24 +++++++++++++++++++++--- examples/management/include.am | 8 +++++++- examples/native/include.am | 8 +++++++- examples/nvram/include.am | 16 ++++++++++++++-- examples/pcr/include.am | 19 +++++++++++++++++++ examples/pkcs7/include.am | 6 ++++++ examples/seal/include.am | 16 ++++++++++++++-- examples/timestamp/include.am | 14 +++++++++++++- examples/tls/include.am | 24 +++++++++++++++++++++--- examples/tpm_io_linux.c | 2 +- examples/wrap/include.am | 6 ++++++ 16 files changed, 182 insertions(+), 19 deletions(-) diff --git a/examples/attestation/include.am b/examples/attestation/include.am index b6ce7eb..07d9819 100644 --- a/examples/attestation/include.am +++ b/examples/attestation/include.am @@ -9,12 +9,24 @@ noinst_HEADERS += examples/attestation/credential.h examples_attestation_make_credential_SOURCES = examples/attestation/make_credential.c \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c \ examples/tpm_test_keys.c examples_attestation_make_credential_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_attestation_make_credential_DEPENDENCIES = src/libwolftpm.la examples_attestation_activate_credential_SOURCES = examples/attestation/activate_credential.c \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c \ examples/tpm_test_keys.c examples_attestation_activate_credential_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_attestation_activate_credential_DEPENDENCIES = src/libwolftpm.la diff --git a/examples/bench/include.am b/examples/bench/include.am index 83fce55..2bdc551 100644 --- a/examples/bench/include.am +++ b/examples/bench/include.am @@ -6,7 +6,13 @@ noinst_PROGRAMS += examples/bench/bench noinst_HEADERS += examples/bench/bench.h examples_bench_bench_SOURCES = examples/bench/bench.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_bench_bench_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_bench_bench_DEPENDENCIES = src/libwolftpm.la endif diff --git a/examples/csr/include.am b/examples/csr/include.am index a47da3a..60e0e82 100644 --- a/examples/csr/include.am +++ b/examples/csr/include.am @@ -6,7 +6,13 @@ noinst_PROGRAMS += examples/csr/csr noinst_HEADERS += examples/csr/csr.h examples_csr_csr_SOURCES = examples/csr/csr.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_csr_csr_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_csr_csr_DEPENDENCIES = src/libwolftpm.la endif diff --git a/examples/gpio/include.am b/examples/gpio/include.am index 62de20f..1622ae8 100644 --- a/examples/gpio/include.am +++ b/examples/gpio/include.am @@ -9,17 +9,35 @@ noinst_PROGRAMS += examples/gpio/gpio_config \ noinst_HEADERS += examples/gpio/gpio.h examples_gpio_gpio_config_SOURCES = examples/gpio/gpio_config.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_gpio_gpio_config_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_gpio_gpio_config_DEPENDENCIES = src/libwolftpm.la examples_gpio_gpio_read_SOURCES = examples/gpio/gpio_read.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_gpio_gpio_read_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_gpio_gpio_read_DEPENDENCIES = src/libwolftpm.la examples_gpio_gpio_set_SOURCES = examples/gpio/gpio_set.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_gpio_gpio_set_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_gpio_gpio_set_DEPENDENCIES = src/libwolftpm.la diff --git a/examples/include.am b/examples/include.am index c58c9f1..03bf793 100644 --- a/examples/include.am +++ b/examples/include.am @@ -18,6 +18,12 @@ include examples/attestation/include.am dist_example_DATA+= examples/README.md \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c \ examples/tpm_io.h \ examples/tpm_test_keys.c \ examples/tpm_test_keys.h \ diff --git a/examples/keygen/include.am b/examples/keygen/include.am index 49684d6..9e83765 100644 --- a/examples/keygen/include.am +++ b/examples/keygen/include.am @@ -7,21 +7,39 @@ noinst_HEADERS += examples/keygen/keygen.h bin_PROGRAMS += examples/keygen/keyload examples_keygen_keyload_SOURCES = examples/keygen/keyload.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_keygen_keyload_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_keygen_keyload_DEPENDENCIES = src/libwolftpm.la bin_PROGRAMS += examples/keygen/keygen examples_keygen_keygen_SOURCES = examples/keygen/keygen.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_keygen_keygen_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_keygen_keygen_DEPENDENCIES = src/libwolftpm.la bin_PROGRAMS += examples/keygen/keyimport examples_keygen_keyimport_SOURCES = examples/keygen/keyimport.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_keygen_keyimport_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_keygen_keyimport_DEPENDENCIES = src/libwolftpm.la endif diff --git a/examples/management/include.am b/examples/management/include.am index 278971d..de1c30b 100644 --- a/examples/management/include.am +++ b/examples/management/include.am @@ -7,7 +7,13 @@ noinst_PROGRAMS += examples/management/flush noinst_HEADERS += examples/management/flush.h examples_management_flush_SOURCES = examples/management/flush.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_management_flush_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_management_flush_DEPENDENCIES = src/libwolftpm.la endif diff --git a/examples/native/include.am b/examples/native/include.am index b940993..ecfb497 100644 --- a/examples/native/include.am +++ b/examples/native/include.am @@ -5,7 +5,13 @@ if BUILD_EXAMPLES noinst_PROGRAMS += examples/native/native_test noinst_HEADERS += examples/native/native_test.h examples_native_native_test_SOURCES = examples/native/native_test.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_native_native_test_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_native_native_test_DEPENDENCIES = src/libwolftpm.la endif diff --git a/examples/nvram/include.am b/examples/nvram/include.am index cf401c1..0de6807 100644 --- a/examples/nvram/include.am +++ b/examples/nvram/include.am @@ -7,14 +7,26 @@ noinst_HEADERS += examples/nvram/store.h bin_PROGRAMS += examples/nvram/store examples_nvram_store_SOURCES = examples/nvram/store.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_nvram_store_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_nvram_store_DEPENDENCIES = src/libwolftpm.la bin_PROGRAMS += examples/nvram/read examples_nvram_read_SOURCES = examples/nvram/read.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_nvram_read_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_nvram_read_DEPENDENCIES = src/libwolftpm.la diff --git a/examples/pcr/include.am b/examples/pcr/include.am index da8bf9b..8b8a66b 100644 --- a/examples/pcr/include.am +++ b/examples/pcr/include.am @@ -12,18 +12,37 @@ noinst_HEADERS += examples/pcr/quote.h \ examples_pcr_quote_SOURCES = examples/pcr/quote.c \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c \ examples/tpm_test_keys.c examples_pcr_quote_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_pcr_quote_DEPENDENCIES = src/libwolftpm.la examples_pcr_extend_SOURCES = examples/pcr/extend.c \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c \ examples/tpm_test_keys.c examples_pcr_extend_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_pcr_extend_DEPENDENCIES = src/libwolftpm.la examples_pcr_reset_SOURCES = examples/pcr/reset.c \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c + examples/tpm_test_keys.c examples_pcr_reset_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_pcr_reset_DEPENDENCIES = src/libwolftpm.la diff --git a/examples/pkcs7/include.am b/examples/pkcs7/include.am index 0840784..8f4ac2b 100644 --- a/examples/pkcs7/include.am +++ b/examples/pkcs7/include.am @@ -6,6 +6,12 @@ noinst_PROGRAMS += examples/pkcs7/pkcs7 noinst_HEADERS += examples/pkcs7/pkcs7.h examples_pkcs7_pkcs7_SOURCES = examples/pkcs7/pkcs7.c \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c \ examples/tpm_test_keys.c examples_pkcs7_pkcs7_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_pkcs7_pkcs7_DEPENDENCIES = src/libwolftpm.la diff --git a/examples/seal/include.am b/examples/seal/include.am index 8fc2d24..fd722f7 100644 --- a/examples/seal/include.am +++ b/examples/seal/include.am @@ -9,12 +9,24 @@ noinst_HEADERS += examples/seal/seal.h examples_seal_seal_SOURCES = examples/seal/seal.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_seal_seal_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_seal_seal_DEPENDENCIES = src/libwolftpm.la examples_seal_unseal_SOURCES = examples/seal/unseal.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_seal_unseal_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_seal_unseal_DEPENDENCIES = src/libwolftpm.la diff --git a/examples/timestamp/include.am b/examples/timestamp/include.am index 109bffe..0ef0110 100644 --- a/examples/timestamp/include.am +++ b/examples/timestamp/include.am @@ -6,6 +6,12 @@ noinst_PROGRAMS += examples/timestamp/signed_timestamp noinst_HEADERS += examples/timestamp/signed_timestamp.h examples_timestamp_signed_timestamp_SOURCES = examples/timestamp/signed_timestamp.c \ examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c \ examples/tpm_test_keys.c examples_timestamp_signed_timestamp_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_timestamp_signed_timestamp_DEPENDENCIES = src/libwolftpm.la @@ -18,7 +24,13 @@ if BUILD_EXAMPLES noinst_PROGRAMS += examples/timestamp/clock_set noinst_HEADERS += examples/timestamp/clock_set.h examples_timestamp_clock_set_SOURCES = examples/timestamp/clock_set.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_timestamp_clock_set_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_timestamp_clock_set_DEPENDENCIES = src/libwolftpm.la endif diff --git a/examples/tls/include.am b/examples/tls/include.am index b37e771..772756c 100644 --- a/examples/tls/include.am +++ b/examples/tls/include.am @@ -7,7 +7,13 @@ noinst_HEADERS += examples/tls/tls_client.h \ examples/tls/tls_common.h examples_tls_tls_client_SOURCES = examples/tls/tls_client.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_tls_tls_client_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_tls_tls_client_DEPENDENCIES = src/libwolftpm.la @@ -16,7 +22,13 @@ noinst_HEADERS += examples/tls/tls_client.h \ examples/tls/tls_common.h examples_tls_tls_client_notpm_SOURCES = examples/tls/tls_client_notpm.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_tls_tls_client_notpm_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_tls_tls_client_notpm_DEPENDENCIES = src/libwolftpm.la @@ -25,7 +37,13 @@ noinst_HEADERS += examples/tls/tls_server.h \ examples/tls/tls_common.h examples_tls_tls_server_SOURCES = examples/tls/tls_server.c \ examples/tpm_test_keys.c \ - examples/tpm_io.c + examples/tpm_io.c \ + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_tls_tls_server_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_tls_tls_server_DEPENDENCIES = src/libwolftpm.la diff --git a/examples/tpm_io_linux.c b/examples/tpm_io_linux.c index 1bb16ab..b00a355 100644 --- a/examples/tpm_io_linux.c +++ b/examples/tpm_io_linux.c @@ -293,8 +293,8 @@ return ret; } - #endif /* WOLFTPM_I2C */ +#endif /* __linux__ */ /******************************************************************************/ /* --- END IO Callback Logic -- */ diff --git a/examples/wrap/include.am b/examples/wrap/include.am index d5b621f..3ae2841 100644 --- a/examples/wrap/include.am +++ b/examples/wrap/include.am @@ -6,6 +6,12 @@ noinst_PROGRAMS += examples/wrap/wrap_test noinst_HEADERS += examples/wrap/wrap_test.h examples_wrap_wrap_test_SOURCES = examples/wrap/wrap_test.c \ examples/tpm_io.c + examples/tpm_io_atmel.c \ + examples/tpm_io_barebox.c \ + examples/tpm_io_linux.c \ + examples/tpm_io_st.c \ + examples/tpm_io_qnx.c \ + examples/tpm_io_xilinx.c examples_wrap_wrap_test_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_wrap_wrap_test_DEPENDENCIES = src/libwolftpm.la endif