fix(crypto): missing key with TinyDTLS backend, clippy fixes

Author: pulsastrix

libcoap/src/context.rs

@@ -305,7 +305,17 @@ impl CoapContext<'_> {
                         reserved: [0; 7],
                         validate_id_call_back: Some(dtls_server_id_callback),
                         id_call_back_arg: inner_ref.raw_context as *mut c_void,
-                        validate_sni_call_back: Some(dtls_server_sni_callback),
+                        validate_sni_call_back: {
+                            // Unsupported by TinyDTLS
+                            #[cfg(not(feature = "dtls_tinydtls"))]
+                            {
+                                Some(dtls_server_sni_callback)
+                            }
+                            #[cfg(feature = "dtls_tinydtls")]
+                            {
+                                None
+                            }
+                        },
                         sni_call_back_arg: inner_ref.raw_context as *mut c_void,
                         psk_info: initial_data,
                     })),
@@ -533,6 +543,13 @@ impl CoapContext<'_> {
                         .unwrap()
                         .apply_to_spsk_info(&mut inner_ref.crypto_last_info_ref);
                     Some(&inner_ref.crypto_last_info_ref.key)
+                } else if inner_ref.crypto_default_info.is_some() {
+                    inner_ref
+                        .crypto_default_info
+                        .as_ref()
+                        .unwrap()
+                        .apply_to_spsk_info(&mut inner_ref.crypto_last_info_ref);
+                    Some(&inner_ref.crypto_last_info_ref.key)
                 } else {
                     None
                 }

libcoap/src/crypto.rs

@@ -79,6 +79,8 @@ pub trait CoapClientCryptoProvider: Debug {
     ///
     /// Return a CoapCryptoProviderResponse corresponding to the cryptographic information that
     /// should be used.
+    ///
+    /// Note: Unsupported by the MBedTLS DTLS backend.
     fn provide_key_for_hint(
         &mut self,
         hint: &CoapCryptoPskIdentity,
@@ -110,6 +112,8 @@ pub trait CoapServerCryptoProvider: Debug {
     /// hint.
     ///
     /// Return None if the provided SNI is unacceptable, i.e. you have no key for this server name.
+    ///
+    /// Note: Unsupported by the TinyDTLS DTLS backend.
     #[allow(unused_variables)]
     fn provide_hint_for_sni(&mut self, sni: &str) -> CoapCryptoProviderResponse<CoapCryptoPskInfo> {
         CoapCryptoProviderResponse::UseCurrent

libcoap/src/message/request.rs

@@ -509,7 +509,7 @@ impl CoapRequest {
         }
         pdu.clear_options();
         for opt in additional_opts {
-            (&mut pdu).add_option(opt);
+            pdu.add_option(opt);
         }
         if proxy_scheme.is_some() && proxy_uri.is_some() {
             return Err(MessageConversionError::InvalidOptionCombination(

libcoap/src/resource.rs

@@ -244,9 +244,11 @@ impl<D: Any + ?Sized + Debug> CoapResource<D> {
             let raw_resource = coap_resource_init(
                 uri_path,
                 (COAP_RESOURCE_FLAGS_RELEASE_URI
-                    | (notify_con
-                        .then(|| COAP_RESOURCE_FLAGS_NOTIFY_CON)
-                        .unwrap_or(COAP_RESOURCE_FLAGS_NOTIFY_NON))) as i32,
+                    | if notify_con {
+                        COAP_RESOURCE_FLAGS_NOTIFY_CON
+                    } else {
+                        COAP_RESOURCE_FLAGS_NOTIFY_NON
+                    }) as i32,
             );
             let inner = CoapFfiRcCell::new(CoapResourceInner {
                 raw_resource,

libcoap/src/session/client.rs

@@ -55,8 +55,8 @@ impl CoapClientSession<'_> {
     /// Will return a [SessionCreationError] if libcoap was unable to create a session (most likely
     /// because it was not possible to bind to a port).
     #[cfg(feature = "dtls")]
-    pub fn connect_dtls<'a, 'b, P: 'static + CoapClientCryptoProvider>(
-        ctx: &'b mut CoapContext<'a>,
+    pub fn connect_dtls<'a, P: 'static + CoapClientCryptoProvider>(
+        ctx: &mut CoapContext<'a>,
         addr: SocketAddr,
         mut crypto_provider: P,
     ) -> Result<CoapClientSession<'a>, SessionCreationError> {
@@ -65,7 +65,17 @@ impl CoapClientSession<'_> {
         let client_setup_data = Box::into_raw(Box::new(coap_dtls_cpsk_t {
             version: COAP_DTLS_SPSK_SETUP_VERSION as u8,
             reserved: [0; 7],
-            validate_ih_call_back: Some(dtls_ih_callback),
+            validate_ih_call_back: {
+                // Unsupported by MbedTLS
+                #[cfg(not(feature = "dtls_mbedtls"))]
+                {
+                    Some(dtls_ih_callback)
+                }
+                #[cfg(feature = "dtls_mbedtls")]
+                {
+                    None
+                }
+            },
             ih_call_back_arg: std::ptr::null_mut(),
             client_sni: std::ptr::null_mut(),
             psk_info: coap_dtls_cpsk_info_t {

libcoap/src/transport/tcp.rs

@@ -5,5 +5,6 @@
  * See the README as well as the LICENSE file for more information.
  */
 /// TODO
+#[allow(dead_code)]
 #[cfg(feature = "tcp")]
 pub struct CoapTcpEndpoint {}

libcoap/src/transport/tls.rs

@@ -5,5 +5,6 @@
  * See the README as well as the LICENSE file for more information.
  */
 /// TODO
+#[allow(dead_code)]
 #[cfg(feature = "tcp")]
 pub struct CoapTlsEndpoint {}