initial vcpkg changes and adding option for building examples

wolfSSL · Apr 14, 2022 · b587c0f · b587c0f
1 parent aa366df
commit b587c0f
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(wolfTPM VERSION 1.1.1 LANGUAGES C)
+project(wolfTPM VERSION 2.3.1 LANGUAGES C)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
@@ -41,33 +41,39 @@ target_compile_definitions(wolftpm PRIVATE
     "BUILDING_WOLFTPM"
     )
 
+
 if (WITH_WOLFSSL)
-    target_link_libraries(wolftpm wolfssl)
+    target_link_libraries(wolftpm PUBLIC wolfssl)
     target_include_directories(wolftpm PUBLIC ${WITH_WOLFSSL}/include)
     target_link_directories(wolftpm PUBLIC ${WITH_WOLFSSL}/lib)
 elseif (WITH_WOLFSSL_TREE)
     set(WOLFSSL_TPM "yes" CACHE STRING "")
     add_subdirectory(${WITH_WOLFSSL_TREE} wolfssl)
-    target_link_libraries(wolftpm wolfssl)
+    target_link_libraries(wolftpm PUBLIC wolfssl)
 else()
     find_package(PkgConfig)
     pkg_check_modules(WOLFSSL wolfssl)
 
     if (WOLFSSL_FOUND)
-        target_link_libraries(wolftpm ${WOLFSSL_LIBRARIES})
+        target_link_libraries(wolftpm PUBLIC ${WOLFSSL_LIBRARIES})
         target_include_directories(wolftpm PUBLIC ${WOLFSSL_INCLUDE_DIRS})
         target_link_directories(wolftpm PUBLIC ${WOLFSSL_LIBRARY_DIRS})
         target_compile_options(wolftpm PUBLIC ${WOLFSSL_CFLAGS_OTHER})
     else()
-        target_compile_definitions(wolftpm PUBLIC
-            "WOLFTPM2_NO_WOLFCRYPT"
-            )
+        # For support with vcpkg
+        find_package(wolfssl CONFIG)
+        if (wolfssl_FOUND)
+            target_link_libraries(wolftpm PUBLIC wolfssl)
+        else()
+            target_compile_definitions(wolftpm PUBLIC
+                "WOLFTPM2_NO_WOLFCRYPT"
+                )
+        endif()
     endif()
 endif()
 
 # TODO
 # * Debug/logging
-# * EXAMPLES
 # * wrapper
 # * wolfcrypt
 # * I2C
@@ -81,6 +87,9 @@ set(WOLFTPM_INTERFACE "auto" CACHE STRING
 set_property(CACHE WOLFTPM_INTERFACE
     PROPERTY STRINGS "auto;SWTPM;WINAPI;DEVTPM")
 
+set(WOLFTPM_EXAMPLES "yes" CACHE BOOL
+    "Build examples")
+
 # automatically set
 message("INTERFACE ${WOLFTPM_INTERFACE}")
 if("${WOLFTPM_INTERFACE}" STREQUAL "auto")
@@ -115,7 +124,7 @@ elseif("${WOLFTPM_INTERFACE}" STREQUAL "WINAPI")
     target_compile_definitions(wolftpm PUBLIC
         "WOLFTPM_WINAPI"
         )
-    target_link_libraries(wolftpm tbs)
+    target_link_libraries(wolftpm PRIVATE tbs)
 else()
     get_property(INTERFACE_OPTS CACHE WOLFTPM_INTERFACE
         PROPERTY STRINGS)
@@ -125,16 +134,18 @@ endif("${WOLFTPM_INTERFACE}" STREQUAL "SWTPM")
 
 target_include_directories(wolftpm
     PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}
-    $<INSTALL_INTERFACE:wolftpm>
+    $<INSTALL_INTERFACE:include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     )
 
-add_library(tpm_test_lib STATIC
-    examples/tpm_io.c
-    examples/tpm_test_keys.c
-    )
-target_link_libraries(tpm_test_lib wolftpm)
+if (${WOLFTPM_EXAMPLES})
+    add_library(tpm_test_lib STATIC
+        examples/tpm_io.c
+        examples/tpm_test_keys.c
+        )
+    target_link_libraries(tpm_test_lib wolftpm)
+endif()
 
 function(add_tpm_example name src)
     add_executable(${name}
@@ -147,40 +158,54 @@ endfunction()
 configure_file(wolftpm/options.h.in wolftpm/options.h)
 
 
-add_tpm_example(activate_credential attestation/activate_credential.c)
-add_tpm_example(make_credential attestation/make_credential.c)
-add_tpm_example(bench bench/bench.c)
-add_tpm_example(csr csr/csr.c)
-add_tpm_example(gpio_config gpio/gpio_config.c)
-add_tpm_example(gpio_read gpio/gpio_read.c)
-add_tpm_example(gpio_set gpio/gpio_set.c)
-add_tpm_example(keygen keygen/keygen.c)
-add_tpm_example(keyimport keygen/keyimport.c)
-add_tpm_example(keyload keygen/keyload.c)
-add_tpm_example(flush management/flush.c)
-add_tpm_example(native_test native/native_test.c)
-add_tpm_example(read nvram/read.c)
-add_tpm_example(store nvram/store.c)
-add_tpm_example(extend pcr/extend.c)
-add_tpm_example(quote pcr/quote.c)
-add_tpm_example(read_pcr pcr/read_pcr.c)
-add_tpm_example(reset pcr/reset.c)
-add_tpm_example(pkcs7 pkcs7/pkcs7.c)
-add_tpm_example(seal seal/seal.c)
-add_tpm_example(unseal seal/unseal.c)
-add_tpm_example(clock_set timestamp/clock_set.c)
-add_tpm_example(signed_timestamp timestamp/signed_timestamp.c)
-add_tpm_example(tls_client tls/tls_client.c)
-add_tpm_example(tls_client_notpm tls/tls_client_notpm.c)
-add_tpm_example(tls_server tls/tls_server.c)
-add_tpm_example(wrap_test wrap/wrap_test.c)
+if (${WOLFTPM_EXAMPLES})
+    add_tpm_example(activate_credential attestation/activate_credential.c)
+    add_tpm_example(make_credential attestation/make_credential.c)
+    add_tpm_example(bench bench/bench.c)
+    add_tpm_example(csr csr/csr.c)
+    add_tpm_example(gpio_config gpio/gpio_config.c)
+    add_tpm_example(gpio_read gpio/gpio_read.c)
+    add_tpm_example(gpio_set gpio/gpio_set.c)
+    add_tpm_example(keygen keygen/keygen.c)
+    add_tpm_example(keyimport keygen/keyimport.c)
+    add_tpm_example(keyload keygen/keyload.c)
+    add_tpm_example(flush management/flush.c)
+    add_tpm_example(native_test native/native_test.c)
+    add_tpm_example(read nvram/read.c)
+    add_tpm_example(store nvram/store.c)
+    add_tpm_example(extend pcr/extend.c)
+    add_tpm_example(quote pcr/quote.c)
+    add_tpm_example(read_pcr pcr/read_pcr.c)
+    add_tpm_example(reset pcr/reset.c)
+    add_tpm_example(pkcs7 pkcs7/pkcs7.c)
+    add_tpm_example(seal seal/seal.c)
+    add_tpm_example(unseal seal/unseal.c)
+    add_tpm_example(clock_set timestamp/clock_set.c)
+    add_tpm_example(signed_timestamp timestamp/signed_timestamp.c)
+    add_tpm_example(tls_client tls/tls_client.c)
+    add_tpm_example(tls_client_notpm tls/tls_client_notpm.c)
+    add_tpm_example(tls_server tls/tls_server.c)
+    add_tpm_example(wrap_test wrap/wrap_test.c)
+endif()
 
 include(GNUInstallDirs)
 
 install(TARGETS wolftpm
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY)
+        EXPORT  wolftpm-targets
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+        RUNTIME DESTINATION bin
+        )
+
+# Install the export set
+install(EXPORT wolftpm-targets
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wolftpm
+        FILE wolftpm-config.cmake)
+
 # Install the headers
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/wolftpm/
+        DESTINATION include/wolftpm
+        FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wolftpm/
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolftpm
+        DESTINATION include/wolftpm
         FILES_MATCHING PATTERN "*.h")
diff --git a/wolftpm/tpm2.h b/wolftpm/tpm2.h
@@ -1665,6 +1665,11 @@ struct wolfTPM_tcpContext {
 struct wolfTPM_winContext {
   TBS_HCONTEXT tbs_context;
 };
+/* may be needed with msys */
+#ifndef TPM_E_COMMAND_BLOCKED
+#define TPM_E_COMMAND_BLOCKED (0x80284000)
+#endif
+
 #define WOLFTPM_IS_COMMAND_UNAVAILABLE(code) ((code) == TPM_RC_COMMAND_CODE || (code) == TPM_E_COMMAND_BLOCKED)
 #else
 #define WOLFTPM_IS_COMMAND_UNAVAILABLE(code) (code == TPM_RC_COMMAND_CODE)
@@ -2802,7 +2807,7 @@ WOLFTPM_API TPM_RC TPM2_NV_Certify(NV_Certify_In* in, NV_Certify_Out* out);
     typedef struct {
         TPM2B_MAX_BUFFER randomBytes;
     } GetRandom2_Out;
-    /* If bytesRequested is longer than TPM2B_MAX_BUFFER can accommodate, no 
+    /* If bytesRequested is longer than TPM2B_MAX_BUFFER can accommodate, no
      * error is returned, but the TPM returns as much data as a TPM2B_DATA
      * buffer can contain. */
     WOLFTPM_API TPM_RC TPM2_GetRandom2(GetRandom2_In* in, GetRandom2_Out* out);