From d6f0f8d05fa063c87ddc0c063df1fe66938bf88b Mon Sep 17 00:00:00 2001 From: Michael Preisach Date: Fri, 14 Aug 2020 21:19:43 +0000 Subject: [PATCH 1/4] fixed class name for newer version of xaptum-ecdaa --- member-tpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/member-tpm.c b/member-tpm.c index 329a8bc..86db99c 100644 --- a/member-tpm.c +++ b/member-tpm.c @@ -44,7 +44,7 @@ int main() { int init_tpm() { TSS2_TCTI_CONTEXT *tctiContext = NULL; - TPM_HANDLE handle = 0; + TPML_HANDLE handle = 0; const char* passwd = "1234"; uint16_t passwdlen = strlen(passwd); TSS2_RC retval = 0; @@ -315,4 +315,4 @@ int member_joinfinish(char *buffer) { } return ret; -} \ No newline at end of file +} From 488f53512f4b296e70b4f58a0dbaa625a2213235 Mon Sep 17 00:00:00 2001 From: Michael Preisach Date: Fri, 14 Aug 2020 23:23:25 +0200 Subject: [PATCH 2/4] added required packages for building tpm2-tss --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5543e6d..ba3ee03 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,9 @@ From Ubuntu 20.10 and later, installing `libtss2-dev` should work. For Ubuntu 20.04, this should be built from source: ``` +# Install further required packages for building this lib +apt install autoconf autoconf-archive libcmocka0 libcmocka-dev procps iproute2 \ + pkg-config libtool libssl-dev uthash-dev libjson-c-dev libini-config-dev # Build the tpm2-tss lib from source ../.travis/install-tpm2-tss.sh ./tpm2-tss /usr ``` From 8a0e6d29d439de8017a4b5f4d7a54421c0bb428e Mon Sep 17 00:00:00 2001 From: Michael Preisach Date: Fri, 14 Aug 2020 23:24:39 +0200 Subject: [PATCH 3/4] Fixed variable name for TPM support --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba3ee03..88884ce 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ apt install autoconf autoconf-archive libcmocka0 libcmocka-dev procps iproute2 \ ``` ### Installing xaptum/ecdaa -When the TPM should be available for use on this host, set `TEST_USE_TCP_TPM` accordingly +When the TPM should be available for use on this host, set `ECDAA_TPM_SUPPORT` accordingly ``` # Build the project from source with TPM support cmake .. -DCMAKE_BUILD_TYPE=Release -DECDAA_CURVES=FP256BN -DCMAKE_INSTALL_PREFIX=/usr -DECDAA_TPM_SUPPORT=ON From 8bcc5fb9b4fdccd104f35692ae4460372e7d33fe Mon Sep 17 00:00:00 2001 From: Michael Preisach Date: Sun, 16 Aug 2020 14:44:28 +0000 Subject: [PATCH 4/4] removed tpm dependencies from verifier --- CMakeLists.txt | 2 +- ecdaa_verifier | Bin 0 -> 22400 bytes verifier.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100755 ecdaa_verifier diff --git a/CMakeLists.txt b/CMakeLists.txt index b61dded..9216280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,4 +31,4 @@ target_include_directories(ecdaa_verifier PUBLIC ${ECDAA_AMCL} ) target_link_libraries(ecdaa_verifier /usr/lib/x86_64-linux-gnu/libecdaa.so) -target_link_libraries(ecdaa_verifier /usr/lib/x86_64-linux-gnu/libecdaa-tpm.so) +# target_link_libraries(ecdaa_verifier /usr/lib/x86_64-linux-gnu/libecdaa-tpm.so) diff --git a/ecdaa_verifier b/ecdaa_verifier new file mode 100755 index 0000000000000000000000000000000000000000..63fba2fbc1dd34fd5909243fe73af1a0ee53d44f GIT binary patch literal 22400 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 literal 0 HcmV?d00001 diff --git a/verifier.h b/verifier.h index cdb5f73..6139cce 100644 --- a/verifier.h +++ b/verifier.h @@ -5,7 +5,7 @@ #ifndef ECDAA_ISSUER_MEMBER_H #define ECDAA_ISSUER_MEMBER_H #include -#include +// #include #include "server.h" #include "client.h" #include "common.h"