Merge branch 'master' of git.ins.jku.at:preisach/ecdaa-issuer

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)

README.md

@@ -30,12 +30,15 @@ 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
 ```
 
 ### 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

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;
-}
+}

verifier.h

@@ -5,7 +5,7 @@
 #ifndef ECDAA_ISSUER_MEMBER_H
 #define ECDAA_ISSUER_MEMBER_H
 #include <ecdaa.h>
-#include <ecdaa-tpm.h>
+// #include <ecdaa-tpm.h>
 #include "server.h"
 #include "client.h"
 #include "common.h"