merge: pull request #15 from namib-project/add_vendored_features_for_dtls

Update libcoap to 4.3.5 development version, bump dependencies, improve linking, allow compilation on ESP32.

Author: pulsastrix

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         crate: [libcoap-sys, libcoap-rs]
-        dtls_backend: [openssl, gnutls, tinydtls]
+        dtls_backend: [openssl, gnutls, tinydtls, mbedtls]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -33,9 +33,13 @@ jobs:
         with:
           packages: libgnutls28-dev libgnutls30
           version: 1.0
-      - if: matrix.crate == 'libcoap-rs'
+      - if: matrix.crate == 'libcoap-rs' && matrix.dtls_backend != 'gnutls'
+        run: cargo test -p ${{ matrix.crate }} --no-default-features --features dtls,tcp,vendored --features dtls_${{ matrix.dtls_backend }} --features dtls_${{ matrix.dtls_backend }}_vendored --no-fail-fast -- -Z unstable-options --report-time --ensure-time
+      - if: matrix.crate == 'libcoap-rs' && matrix.dtls_backend == 'gnutls'
         run: cargo test -p ${{ matrix.crate }} --no-default-features --features dtls,tcp,vendored --features dtls_${{ matrix.dtls_backend }} --no-fail-fast -- -Z unstable-options --report-time --ensure-time
-      - if: matrix.crate == 'libcoap-sys'
+      - if: matrix.crate == 'libcoap-sys' && matrix.dtls_backend != 'gnutls'
+        run: cargo test -p ${{ matrix.crate }} --features dtls,dtls_backend_${{ matrix.dtls_backend }},dtls_backend_${{ matrix.dtls_backend }}_vendored --no-fail-fast -- -Z unstable-options --report-time --ensure-time
+      - if: matrix.crate == 'libcoap-sys' && matrix.dtls_backend == 'gnutls'
         run: cargo test -p ${{ matrix.crate }} --features dtls,dtls_backend_${{ matrix.dtls_backend }} --no-fail-fast -- -Z unstable-options --report-time --ensure-time
 
   lint:

.idea/libcoap-rs.iml

@@ -9,3 +9,4 @@ members = [
     "libcoap",
     "libcoap-sys",
 ]
+resolver = "2"

.idea/runConfigurations/Test.xml

@@ -17,6 +17,7 @@ authors = ["Hugo Hakim Damer <[email protected]>"]
 categories = ["external-ffi-bindings", "network-programming", "embedded"]
 keywords = ["coap", "libcoap"]
 exclude = ["src/libcoap/ext/"]
+resolver = "2"
 
 [features]
 # The default features match those of libcoaps configure script, except for dtls, which is disabled here because it
@@ -34,10 +35,13 @@ default = ["server", "client", "tcp", "async", "epoll", "vendored", "static"]
 # different backends), we select one based on the auto-detection order specified in
 # https://github.com/obgm/libcoap/blob/develop/configure.ac#L494 (gnutls > openssl > mbedtls > tinydtls).
 dtls = []
-dtls_backend_openssl = ["dtls", "openssl-sys"]
-dtls_backend_gnutls = ["dtls", "gnutls-sys"]
-dtls_backend_mbedtls = ["dtls", "mbedtls-sys-auto"]
-dtls_backend_tinydtls = ["dtls", "tinydtls-sys"]
+dtls_backend_openssl = ["dtls", "dep:openssl-sys"]
+dtls_backend_openssl_vendored = ["dtls_backend_openssl", "openssl-sys/vendored"]
+dtls_backend_gnutls = ["dtls"]
+dtls_backend_mbedtls = ["dtls"] # can't use mbedtls-sys-auto to generate linker flags here, as the crate doesn't support mbedtls >= 3.0.0
+dtls_backend_mbedtls_vendored = ["dep:mbedtls-sys-auto", "dtls_backend_mbedtls"]
+dtls_backend_tinydtls = ["dtls", "dep:tinydtls-sys", "tinydtls-sys/ecc", "tinydtls-sys/psk"]
+dtls_backend_tinydtls_vendored = ["dtls_backend_tinydtls", "tinydtls-sys/vendored"]
 # Enabling this feature will force libcoap-sys to be built with and statically linked to a vendored version of libcoap,
 # which will be built by the build-script before building libcoap-sys.
 # This way, it is no longer required to have libcoap installed to use this crate.
@@ -61,17 +65,26 @@ client = []
 epoll = []
 
 [dependencies]
-gnutls-sys = {version = "^0.1.2", optional = true}
-openssl-sys = {version = "^0.9.74", optional = true}
-mbedtls-sys-auto = {version = "^2.26", optional = true}
+openssl-sys = { version = "^0.9.74", optional = true }
+mbedtls-sys-auto = { version = "^2.26", optional = true }
 libc = "^0.2.126"
-tinydtls-sys = {version = "^0.1.2", optional = true}
+tinydtls-sys = { version = "^0.2.0", default-features = false, optional = true }
+
+[target.'cfg(target_os="espidf")'.dependencies]
+esp-idf-sys = { version = "0.35.0" }
 
 [build-dependencies]
-bindgen = "^0.65.1"
+bindgen = "0.69.4"
 autotools = "^0.2.3"
 fs_extra = "^1.2"
 pkg-config = "^0.3.24"
+regex = "1.10.5"
+embuild = { version = "0.32.0", features = ["bindgen", "espidf", "cmake"] }
+version-compare = "0.2.0"
 
 [package.metadata.docs.rs]
 features = ["dtls", "dtls_backend_openssl", "vendored"]
+
+[[package.metadata.esp-idf-sys.extra_components]]
+remote_component = { name = "espressif/coap", version = "4.3.4~3" }
+bindings_header = "src/wrapper.h"