Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest main into PnP staging branch #2254

Merged
merged 30 commits into from
Mar 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e3f6b26
longhaul: handle IoTHubDeviceTwin_GetTwin network error (#2189)
ericwolz Jan 10, 2022
42078ed
Fix valgrind issues in E2E tests (#2192)
ericwolz Jan 14, 2022
88d7c08
update RIoT to update bouncycastle dependency (#2197)
ericwolz Jan 21, 2022
7329f70
Bump version from 1.8.0 to 1.9.0. Add LTS Table entry for LTS_01_2022…
momuno Jan 22, 2022
ad54051
update RIoT to update bouncycastle dependency (#2202)
ericwolz Jan 24, 2022
15a1cca
update Component Governance for pip dependencies (#2203)
ericwolz Jan 24, 2022
a785c6e
add codeowner file (#2204)
danewalton-msft Jan 25, 2022
b9fe3bc
Add vaavva to CODEOWNERS (#2208)
momuno Jan 27, 2022
5b7dec7
Refactor of device twin e2e tests (#2158)
momuno Jan 28, 2022
e156b90
shutdown of AMQP - logging causes crash due to status_description is …
ericwolz Jan 28, 2022
8a27d76
Update CMake Linux samples to remove warnings (#2212)
momuno Feb 1, 2022
52fed81
add ios notice for authentication (#2217)
danewalton-msft Feb 7, 2022
e22911a
Add macros includes to the build include directories (#2218)
ericwolz Feb 8, 2022
62d5466
added telemetry timeout filter to statistics (#2221)
ericwolz Feb 9, 2022
8dfba55
Ericwol/longhaul3 (#2223)
ericwolz Feb 9, 2022
e45c605
Improve blob unit test performance (#2225)
jspaith Feb 10, 2022
8ec24f1
Added documentation on device application CMAKE (#2224)
ericwolz Feb 11, 2022
54e345e
remove old hsm devices from iot hub (#2232)
ericwolz Feb 15, 2022
7997430
remove dash from device model ID (#2237)
ericwolz Feb 18, 2022
1de399f
Adding X509 PEM support for Provisioning Client (#2229)
CIPop Feb 19, 2022
ecfe487
Test fixes (#2240)
CIPop Feb 23, 2022
1ea6b01
Add more e2e tests service client retries (#2241)
CIPop Feb 23, 2022
bb4dfae
Updating Parson to v1.3.1. (#2242)
CIPop Feb 24, 2022
08373c5
Test stabilization (#2245)
CIPop Feb 25, 2022
78c734d
Update setting-up-vcpkg documentation (#2246)
momuno Feb 28, 2022
11c3da7
Adding retries to the DPS test. (#2250)
CIPop Mar 1, 2022
bba2267
Adding -Wstrict-prototypes gate validation (#2251)
CIPop Mar 2, 2022
9a5c9ca
Add instruction to sign certs with intermediate CA (#2186)
nkgami Mar 3, 2022
d7ed4f5
Merge from main
jspaith Mar 4, 2022
59e013e
Fix merge typo && fix issue found by more gate tests brought in by merge
jspaith Mar 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
###########
# Azure IoT SDK C
###########

# Catch all for whole project
* @CIPop @danewalton @ericwol-msft @ewertons @jspaith @momuno @preethi826 @vaavva

# README Files
*.md @CIPop @danewalton @ericwol-msft @ewertons @jspaith @momuno @preethi826 @vaavva @wduraes
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ common/tools/macro_utils_h_generator/macro_utils_h_generator.exe
build_all/windows/nuget.exe

/cmake
/build
**/build
*.cert
/.vs

Expand Down
25 changes: 19 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ IF(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif()


########### CMake Options ###########
# Testing
option(run_e2e_tests "set run_e2e_tests to ON to run e2e tests (default is OFF)" OFF)
Expand All @@ -56,18 +57,20 @@ option(dont_use_uploadtoblob "set dont_use_uploadtoblob to ON if the functionali
option(no_logging "disable logging" OFF)
option(use_installed_dependencies "set use_installed_dependencies to ON to use installed packages instead of building dependencies from submodules" OFF)
option(warnings_as_errors "enable strict compiler warnings-as-errors" ON)
option(strict_prototypes "enable GCC strict-prototypes compiler option. This is not supported with test code enabled." OFF)
option(build_as_dynamic "build the IoT SDK libaries as dynamic" OFF)
# Turn on/off IoT features
option(use_prov_client "Enable provisioning client" OFF)
option(use_prov_client "Enable provisioning client" ON)
option(use_tpm_simulator "tpm simulator type of hsm used with the provisioning client" OFF)
option(use_edge_modules "Enable support for running modules against Azure IoT Edge" OFF)
option(use_custom_heap "use externally defined heap functions instead of the malloc family" OFF)
option(build_service_client "controls whether the iothub_service_client is built or not" ON)
option(build_provisioning_service_client "controls whether the provisioning_service_client is built or not" ON)
# HSM Type
option(hsm_type_x509 "x509 type of hsm used with the Provisioning client" OFF)
option(hsm_type_sastoken "tpm type of hsm used with the Provisioning client" OFF)
option(hsm_type_symm_key "Symmetric key type of hsm used with the Provisioning client" OFF)
option(hsm_type_x509 "x509 type of hsm used with the Provisioning client" ON)
option(hsm_type_riot "DICE/RIoT x509 type of hsm used with the Provisioning client" OFF)
option(hsm_type_sastoken "tpm type of hsm used with the Provisioning client" ON)
option(hsm_type_symm_key "Symmetric key type of hsm used with the Provisioning client" ON)
option(hsm_type_custom "hsm type of custom used with the Provisioning client" OFF)
# Transport
option(use_amqp "set use_amqp to ON if amqp is to be used, set to OFF to not use amqp" ON)
Expand Down Expand Up @@ -131,11 +134,17 @@ if (${warnings_as_errors})
endif()
endif()

if (${strict_prototypes})
if (NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-prototypes")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes")
endif()
endif()

if(${use_custom_heap})
add_definitions(-DGB_USE_CUSTOM_HEAP)
endif()

########## Enable Specific Root Certs ##########
if (${use_azure_cloud_rsa_cert})
add_definitions(-DUSE_AZURE_CLOUD_RSA_CERT)
endif()
Expand Down Expand Up @@ -176,7 +185,7 @@ if (${use_prov_client})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_PROV_MODULE_FULL")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_PROV_MODULE_FULL")
if ("${hsm_custom_lib}" STREQUAL "")
if ((NOT ${hsm_type_x509}) AND (NOT ${hsm_type_sastoken}) AND (NOT ${hsm_type_symm_key}))
if ((NOT ${hsm_type_x509}) AND (NOT ${hsm_type_sastoken}) AND (NOT ${hsm_type_symm_key}) AND (NOT ${hsm_type_riot}))
# If the cmake option did not explicitly configure an hsm type, then enable them all.
set(hsm_type_x509 ON)
set(hsm_type_sastoken ON)
Expand Down Expand Up @@ -204,6 +213,10 @@ if (NOT ${use_amqp} AND NOT ${use_http} AND NOT ${use_mqtt})
message(FATAL_ERROR "CMAKE Failure: AMQP, HTTP & MQTT are all disabled, IoT Hub Client must have one protocol enabled.")
endif()

if (${hsm_type_x509} AND ${hsm_type_riot})
message(FATAL_ERROR "CMAKE Failure: hsm_type_x509 and hsm_type_riot are incompatible. Select only one X509 HSM type.")
endif()

if (${dont_use_uploadtoblob})
add_definitions(-DDONT_USE_UPLOADTOBLOB)
endif()
Expand Down
Loading