simplernble 1.2.1-dev129 → 1.2.1-dev131

package/native/VERSION

@@ -1 +1 @@
-1.2.1-dev129
+1.2.1-dev131

package/native/dependencies/internal/include/simplejni/VM.hpp

@@ -52,10 +52,12 @@ class VM {
             case JNI_OK:
                 break;
             case JNI_EDETACHED: {
+                // NOTE: Threads attached here are never detached. A desktop JVM only exits once its non-daemon
+                // threads finish, so they attach as daemons there.
 #ifdef __ANDROID__
                 auto result = jvm->AttachCurrentThread(&env, nullptr);
 #else
-                auto result = jvm->AttachCurrentThread(reinterpret_cast<void**>(&env), nullptr);
+                auto result = jvm->AttachCurrentThreadAsDaemon(reinterpret_cast<void**>(&env), nullptr);
 #endif
                 if (result != JNI_OK) {
                     throw std::runtime_error("Failed to attach the current thread to the JVM");

package/native/simpleble/include/simpleble/Advanced.h

@@ -57,6 +57,20 @@ void SIMPLEBLE_EXPORT set_passkey_display_callback(Peripheral& peripheral,
 void SIMPLEBLE_EXPORT set_numeric_comparison_callback(Peripheral& peripheral,
                                                       const std::function<bool(const std::string& passkey)>& callback);
 
+/**
+ * Secure the connection with LE Secure Connections.
+ *
+ * Pairs with the connected peer and waits until the link is encrypted using LE
+ * Secure Connections and a 128-bit key. With mitm set, the peer must also be
+ * authenticated through the passkey or numeric comparison callbacks. If the
+ * link already meets these requirements, for example through an existing bond,
+ * the call returns right away. Pairing started by this call creates no bond.
+ *
+ * Throws if the link can't be secured as requested, in which case the Dongl
+ * disconnects. The Dongl gives up after 30 seconds.
+ */
+void SIMPLEBLE_EXPORT secure_connection(Peripheral& peripheral, bool mitm = false);
+
 }  // namespace SimpleBLE::Advanced::Dongl
 
 /**

package/native/simpleble/src/backends/dongl/AdapterDongl.cpp

@@ -344,5 +344,13 @@ void AdapterDongl::_on_simpleble_event(const simpleble_Event& event) {
             }
             break;
         }
+
+        case simpleble_Event_security_complete_evt_tag: {
+            // Routed by request id: the link might be gone by the time the result arrives.
+            for (auto& [address, peripheral] : this->peripherals_) {
+                peripheral->notify_security_complete(event.evt.security_complete_evt);
+            }
+            break;
+        }
     }
 }

package/native/simpleble/src/backends/dongl/AdvancedDongl.cpp

@@ -19,4 +19,8 @@ void set_numeric_comparison_callback(Peripheral& peripheral,
     Factory::get_internal<PeripheralDongl>(peripheral).set_numeric_comparison_callback(callback);
 }
 
+void secure_connection(Peripheral& peripheral, bool mitm) {
+    Factory::get_internal<PeripheralDongl>(peripheral).secure_connection(mitm);
+}
+
 }  // namespace SimpleBLE::Advanced::Dongl

package/native/simpleble/src/backends/dongl/PeripheralDongl.cpp

@@ -8,6 +8,7 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <cstdlib>
 #include <functional>
 #include <memory>
 #include <thread>
@@ -186,6 +187,53 @@ void PeripheralDongl::set_numeric_comparison_callback(const std::function<bool(c
     }
 }
 
+void PeripheralDongl::secure_connection(bool mitm) {
+    if (!is_connected()) throw Exception::NotConnected();
+
+    // The result can arrive before the response to the command, so register the request first. The id is random so
+    // that a late result from an earlier request isn't taken for this one.
+    const uint8_t request_id = std::rand() % 255 + 1;
+    {
+        std::lock_guard<std::mutex> lock(connection_mutex_);
+        _security_result.reset();
+        _security_request_id = request_id;
+    }
+
+    simpleble_SecureConnectionRsp response;
+    try {
+        response = _serial_protocol->simpleble_secure_connection(_conn_handle, request_id, mitm);
+    } catch (...) {
+        std::lock_guard<std::mutex> lock(connection_mutex_);
+        _security_request_id = 0;
+        throw;
+    }
+    if (response.ret_code != 0) {
+        std::lock_guard<std::mutex> lock(connection_mutex_);
+        _security_request_id = 0;
+        throw Exception::OperationFailed(fmt::format("Failed to secure the connection: {}", response.ret_code));
+    }
+
+    simpleble_SecurityCompleteEvt result;
+    {
+        std::unique_lock<std::mutex> lock(connection_mutex_);
+        connection_cv_.wait_for(lock, SECURITY_RESULT_TIMEOUT,
+                                [this]() { return _security_result.has_value() || _lost; });
+        _security_request_id = 0;
+        if (!_security_result.has_value()) {
+            if (_lost) throw Exception::OperationFailed("Lost the connection to the Dongl");
+            throw Exception::OperationFailed("Dongl did not report the security result");
+        }
+        result = *_security_result;
+    }
+
+    if (result.ret_code != 0) {
+        // The Dongl disconnects when it can't secure the connection, so wait for the disconnection.
+        std::unique_lock<std::mutex> lock(disconnection_mutex_);
+        disconnection_cv_.wait_for(lock, 500ms, [this]() { return !is_connected(); });
+        throw Exception::OperationFailed(fmt::format("Failed to secure the connection: {}", result.ret_code));
+    }
+}
+
 SharedPtrVector<ServiceBase> PeripheralDongl::available_services() {
     SharedPtrVector<ServiceBase> service_list;
     for (auto& service : _services) {
@@ -626,6 +674,16 @@ void PeripheralDongl::notify_auth_key_request(simpleble_AuthKeyRequestEvt const&
     });
 }
 
+void PeripheralDongl::notify_security_complete(simpleble_SecurityCompleteEvt const& evt) {
+    {
+        std::lock_guard<std::mutex> lock(connection_mutex_);
+        // Every peripheral receives this event, so only take the result of our own request.
+        if (evt.request_id != _security_request_id) return;
+        _security_result = evt;
+    }
+    connection_cv_.notify_all();
+}
+
 void PeripheralDongl::_enqueue(std::function<void()> func) {
     std::lock_guard<std::mutex> lock(scheduler_mutex_);
     if (!scheduler_) {

package/native/simpleble/src/backends/dongl/PeripheralDongl.h

@@ -50,6 +50,7 @@ class PeripheralDongl : public PeripheralBase {
     void set_passkey_request_callback(const std::function<std::optional<std::string>()>& callback);
     void set_passkey_display_callback(const std::function<void(const std::string& passkey)>& callback);
     void set_numeric_comparison_callback(const std::function<bool(const std::string& passkey)>& callback);
+    void secure_connection(bool mitm);
 
     virtual std::vector<std::shared_ptr<ServiceBase>> available_services() override;
     virtual std::vector<std::shared_ptr<ServiceBase>> advertised_services() override;
@@ -85,6 +86,7 @@ class PeripheralDongl : public PeripheralBase {
     void notify_value_changed(simpleble_ValueChangedEvt const& value_changed_evt);
     void notify_passkey_display(simpleble_PasskeyDisplayEvt const& passkey_display_evt);
     void notify_auth_key_request(simpleble_AuthKeyRequestEvt const& auth_key_request_evt);
+    void notify_security_complete(simpleble_SecurityCompleteEvt const& security_complete_evt);
 
     const uint16_t BLE_CONN_HANDLE_INVALID = 0xFFFF;
     const uint16_t BLE_CONN_HANDLE_PENDING = 0xFFFE;
@@ -118,6 +120,8 @@ class PeripheralDongl : public PeripheralBase {
 
     static constexpr std::chrono::milliseconds CONNECT_TIMEOUT{10000};
     static constexpr std::chrono::milliseconds CONNECT_RESULT_MARGIN{5000};
+    // The Dongl gives up on securing a connection after 30 seconds.
+    static constexpr std::chrono::milliseconds SECURITY_RESULT_TIMEOUT{35000};
 
     void _resolve_missing_uuids();
 
@@ -156,6 +160,8 @@ class PeripheralDongl : public PeripheralBase {
     std::optional<simpleble_ConnectCompleteEvt> _connect_result;
     bool _connect_pending = false;  // Guarded by connection_mutex_.
     bool _lost = false;             // Guarded by connection_mutex_.
+    std::optional<simpleble_SecurityCompleteEvt> _security_result;
+    uint8_t _security_request_id = 0;  // Guarded by connection_mutex_. Zero when no request is pending.
 
     std::shared_ptr<Dongl::Serial::Protocol> _serial_protocol;
 

package/native/simpleble/src/backends/dongl/protocol/simpleble.pb.c

@@ -78,6 +78,9 @@ PB_BIND(simpleble_GetPairedPeripheralCmd, simpleble_GetPairedPeripheralCmd, AUTO
 PB_BIND(simpleble_GetPairedPeripheralCountCmd, simpleble_GetPairedPeripheralCountCmd, AUTO)
 
 
+PB_BIND(simpleble_SecureConnectionCmd, simpleble_SecureConnectionCmd, AUTO)
+
+
 PB_BIND(simpleble_InitRsp, simpleble_InitRsp, AUTO)
 
 
@@ -117,6 +120,9 @@ PB_BIND(simpleble_GetPairedPeripheralRsp, simpleble_GetPairedPeripheralRsp, AUTO
 PB_BIND(simpleble_GetPairedPeripheralCountRsp, simpleble_GetPairedPeripheralCountRsp, AUTO)
 
 
+PB_BIND(simpleble_SecureConnectionRsp, simpleble_SecureConnectionRsp, AUTO)
+
+
 PB_BIND(simpleble_AdvEvt, simpleble_AdvEvt, 2)
 
 
@@ -147,6 +153,9 @@ PB_BIND(simpleble_PasskeyDisplayEvt, simpleble_PasskeyDisplayEvt, AUTO)
 PB_BIND(simpleble_AuthKeyRequestEvt, simpleble_AuthKeyRequestEvt, AUTO)
 
 
+PB_BIND(simpleble_SecurityCompleteEvt, simpleble_SecurityCompleteEvt, AUTO)
+
+
 PB_BIND(simpleble_Command, simpleble_Command, 2)
 
 

package/native/simpleble/src/backends/dongl/protocol/simpleble.pb.h

@@ -182,6 +182,13 @@ typedef struct _simpleble_GetPairedPeripheralCountCmd {
     char dummy_field;
 } simpleble_GetPairedPeripheralCountCmd;
 
+/* Secures the current link without creating/replacing a bond. One explicit request at a time. */
+typedef struct _simpleble_SecureConnectionCmd {
+    uint16_t conn_handle;
+    uint8_t request_id; /* Random, nonzero correlation key. */
+    bool mitm;
+} simpleble_SecureConnectionCmd;
+
 typedef struct _simpleble_InitRsp {
     uint32_t ret_code;
 } simpleble_InitRsp;
@@ -240,6 +247,10 @@ typedef struct _simpleble_GetPairedPeripheralCountRsp {
     uint16_t count;
 } simpleble_GetPairedPeripheralCountRsp;
 
+typedef struct _simpleble_SecureConnectionRsp {
+    uint32_t ret_code;
+} simpleble_SecureConnectionRsp;
+
 typedef struct _simpleble_AdvEvt {
     char identifier[32];
     simpleble_BluetoothAddressType address_type;
@@ -321,6 +332,17 @@ typedef struct _simpleble_AuthKeyRequestEvt {
     uint32_t request_id;
 } simpleble_AuthKeyRequestEvt;
 
+/* Exactly one completion for an accepted request, within 30 seconds. Failure disconnects the link. */
+typedef struct _simpleble_SecurityCompleteEvt {
+    uint16_t conn_handle;
+    uint8_t request_id;
+    uint32_t ret_code;
+    bool encrypted;
+    bool lesc;
+    bool mitm;
+    uint8_t key_size;
+} simpleble_SecurityCompleteEvt;
+
 typedef struct _simpleble_Command {
     pb_size_t which_cmd;
     union {
@@ -337,6 +359,7 @@ typedef struct _simpleble_Command {
         simpleble_AuthKeyReplyCmd auth_key_reply;
         simpleble_GetPairedPeripheralCmd get_paired_peripheral;
         simpleble_GetPairedPeripheralCountCmd get_paired_peripheral_count;
+        simpleble_SecureConnectionCmd secure_connection;
     } cmd;
 } simpleble_Command;
 
@@ -356,6 +379,7 @@ typedef struct _simpleble_Response {
         simpleble_AuthKeyReplyRsp auth_key_reply;
         simpleble_GetPairedPeripheralRsp get_paired_peripheral;
         simpleble_GetPairedPeripheralCountRsp get_paired_peripheral_count;
+        simpleble_SecureConnectionRsp secure_connection;
     } rsp;
 } simpleble_Response;
 
@@ -372,6 +396,7 @@ typedef struct _simpleble_Event {
         simpleble_ValueChangedEvt value_changed_evt;
         simpleble_PasskeyDisplayEvt passkey_display_evt;
         simpleble_AuthKeyRequestEvt auth_key_request_evt;
+        simpleble_SecurityCompleteEvt security_complete_evt;
     } evt;
 } simpleble_Event;
 
@@ -440,9 +465,11 @@ extern "C" {
 
 
 
+
 #define simpleble_GetPairedPeripheralRsp_address_type_ENUMTYPE simpleble_BluetoothAddressType
 
 
+
 #define simpleble_AdvEvt_address_type_ENUMTYPE simpleble_BluetoothAddressType
 
 
@@ -461,6 +488,7 @@ extern "C" {
 
 
 
+
 /* Initializer values for message structs */
 #define simpleble_UUID16Bit_init_default         {0}
 #define simpleble_UUID32Bit_init_default         {0}
@@ -486,6 +514,7 @@ extern "C" {
 #define simpleble_UnpairCmd_init_default         {_simpleble_BluetoothAddressType_MIN, ""}
 #define simpleble_GetPairedPeripheralCmd_init_default {0}
 #define simpleble_GetPairedPeripheralCountCmd_init_default {0}
+#define simpleble_SecureConnectionCmd_init_default {0, 0, 0}
 #define simpleble_InitRsp_init_default           {0}
 #define simpleble_ScanStartRsp_init_default      {0}
 #define simpleble_ScanStopRsp_init_default       {0}
@@ -499,6 +528,7 @@ extern "C" {
 #define simpleble_UnpairRsp_init_default         {0}
 #define simpleble_GetPairedPeripheralRsp_init_default {0, _simpleble_BluetoothAddressType_MIN, ""}
 #define simpleble_GetPairedPeripheralCountRsp_init_default {0}
+#define simpleble_SecureConnectionRsp_init_default {0}
 #define simpleble_AdvEvt_init_default            {"", _simpleble_BluetoothAddressType_MIN, "", 0, 0, 0, 0, {simpleble_ManufacturerDataEntry_init_default, simpleble_ManufacturerDataEntry_init_default, simpleble_ManufacturerDataEntry_init_default, simpleble_ManufacturerDataEntry_init_default}, 0, {simpleble_ServiceDataEntry_init_default, simpleble_ServiceDataEntry_init_default, simpleble_ServiceDataEntry_init_default, simpleble_ServiceDataEntry_init_default}, 0, 0, 0}
 #define simpleble_ConnectionEvt_init_default     {"", 0}
 #define simpleble_DisconnectionEvt_init_default  {0}
@@ -509,6 +539,7 @@ extern "C" {
 #define simpleble_ValueChangedEvt_init_default   {0, 0, _simpleble_ValueChangedType_MIN, {0, {0}}}
 #define simpleble_PasskeyDisplayEvt_init_default {0, "", 0, 0}
 #define simpleble_AuthKeyRequestEvt_init_default {0, _simpleble_PairingAuthKeyType_MIN, 0}
+#define simpleble_SecurityCompleteEvt_init_default {0, 0, 0, 0, 0, 0, 0}
 #define simpleble_Command_init_default           {0, {simpleble_InitCmd_init_default}}
 #define simpleble_Response_init_default          {0, {simpleble_InitRsp_init_default}}
 #define simpleble_Event_init_default             {0, {simpleble_AdvEvt_init_default}}
@@ -536,6 +567,7 @@ extern "C" {
 #define simpleble_UnpairCmd_init_zero            {_simpleble_BluetoothAddressType_MIN, ""}
 #define simpleble_GetPairedPeripheralCmd_init_zero {0}
 #define simpleble_GetPairedPeripheralCountCmd_init_zero {0}
+#define simpleble_SecureConnectionCmd_init_zero  {0, 0, 0}
 #define simpleble_InitRsp_init_zero              {0}
 #define simpleble_ScanStartRsp_init_zero         {0}
 #define simpleble_ScanStopRsp_init_zero          {0}
@@ -549,6 +581,7 @@ extern "C" {
 #define simpleble_UnpairRsp_init_zero            {0}
 #define simpleble_GetPairedPeripheralRsp_init_zero {0, _simpleble_BluetoothAddressType_MIN, ""}
 #define simpleble_GetPairedPeripheralCountRsp_init_zero {0}
+#define simpleble_SecureConnectionRsp_init_zero  {0}
 #define simpleble_AdvEvt_init_zero               {"", _simpleble_BluetoothAddressType_MIN, "", 0, 0, 0, 0, {simpleble_ManufacturerDataEntry_init_zero, simpleble_ManufacturerDataEntry_init_zero, simpleble_ManufacturerDataEntry_init_zero, simpleble_ManufacturerDataEntry_init_zero}, 0, {simpleble_ServiceDataEntry_init_zero, simpleble_ServiceDataEntry_init_zero, simpleble_ServiceDataEntry_init_zero, simpleble_ServiceDataEntry_init_zero}, 0, 0, 0}
 #define simpleble_ConnectionEvt_init_zero        {"", 0}
 #define simpleble_DisconnectionEvt_init_zero     {0}
@@ -559,6 +592,7 @@ extern "C" {
 #define simpleble_ValueChangedEvt_init_zero      {0, 0, _simpleble_ValueChangedType_MIN, {0, {0}}}
 #define simpleble_PasskeyDisplayEvt_init_zero    {0, "", 0, 0}
 #define simpleble_AuthKeyRequestEvt_init_zero    {0, _simpleble_PairingAuthKeyType_MIN, 0}
+#define simpleble_SecurityCompleteEvt_init_zero  {0, 0, 0, 0, 0, 0, 0}
 #define simpleble_Command_init_zero              {0, {simpleble_InitCmd_init_zero}}
 #define simpleble_Response_init_zero             {0, {simpleble_InitRsp_init_zero}}
 #define simpleble_Event_init_zero                {0, {simpleble_AdvEvt_init_zero}}
@@ -612,6 +646,9 @@ extern "C" {
 #define simpleble_UnpairCmd_address_type_tag     1
 #define simpleble_UnpairCmd_address_tag          2
 #define simpleble_GetPairedPeripheralCmd_index_tag 1
+#define simpleble_SecureConnectionCmd_conn_handle_tag 1
+#define simpleble_SecureConnectionCmd_request_id_tag 2
+#define simpleble_SecureConnectionCmd_mitm_tag   3
 #define simpleble_InitRsp_ret_code_tag           1
 #define simpleble_ScanStartRsp_ret_code_tag      1
 #define simpleble_ScanStopRsp_ret_code_tag       1
@@ -630,6 +667,7 @@ extern "C" {
 #define simpleble_GetPairedPeripheralRsp_address_type_tag 2
 #define simpleble_GetPairedPeripheralRsp_address_tag 3
 #define simpleble_GetPairedPeripheralCountRsp_count_tag 1
+#define simpleble_SecureConnectionRsp_ret_code_tag 1
 #define simpleble_AdvEvt_identifier_tag          1
 #define simpleble_AdvEvt_address_type_tag        2
 #define simpleble_AdvEvt_address_tag             3
@@ -672,6 +710,13 @@ extern "C" {
 #define simpleble_AuthKeyRequestEvt_conn_handle_tag 1
 #define simpleble_AuthKeyRequestEvt_key_type_tag 2
 #define simpleble_AuthKeyRequestEvt_request_id_tag 3
+#define simpleble_SecurityCompleteEvt_conn_handle_tag 1
+#define simpleble_SecurityCompleteEvt_request_id_tag 2
+#define simpleble_SecurityCompleteEvt_ret_code_tag 3
+#define simpleble_SecurityCompleteEvt_encrypted_tag 4
+#define simpleble_SecurityCompleteEvt_lesc_tag   5
+#define simpleble_SecurityCompleteEvt_mitm_tag   6
+#define simpleble_SecurityCompleteEvt_key_size_tag 7
 #define simpleble_Command_init_tag               1
 #define simpleble_Command_scan_start_tag         2
 #define simpleble_Command_scan_stop_tag          3
@@ -685,6 +730,7 @@ extern "C" {
 #define simpleble_Command_auth_key_reply_tag     11
 #define simpleble_Command_get_paired_peripheral_tag 12
 #define simpleble_Command_get_paired_peripheral_count_tag 13
+#define simpleble_Command_secure_connection_tag  14
 #define simpleble_Response_init_tag              1
 #define simpleble_Response_scan_start_tag        2
 #define simpleble_Response_scan_stop_tag         3
@@ -698,6 +744,7 @@ extern "C" {
 #define simpleble_Response_auth_key_reply_tag    11
 #define simpleble_Response_get_paired_peripheral_tag 12
 #define simpleble_Response_get_paired_peripheral_count_tag 13
+#define simpleble_Response_secure_connection_tag 14
 #define simpleble_Event_adv_evt_tag              1
 #define simpleble_Event_connection_evt_tag       2
 #define simpleble_Event_disconnection_evt_tag    3
@@ -708,6 +755,7 @@ extern "C" {
 #define simpleble_Event_value_changed_evt_tag    8
 #define simpleble_Event_passkey_display_evt_tag  9
 #define simpleble_Event_auth_key_request_evt_tag 10
+#define simpleble_Event_security_complete_evt_tag 11
 
 /* Struct field encoding specification for nanopb */
 #define simpleble_UUID16Bit_FIELDLIST(X, a) \
@@ -870,6 +918,13 @@ X(a, STATIC,   SINGULAR, UINT32,   index,             1)
 #define simpleble_GetPairedPeripheralCountCmd_CALLBACK NULL
 #define simpleble_GetPairedPeripheralCountCmd_DEFAULT NULL
 
+#define simpleble_SecureConnectionCmd_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   conn_handle,       1) \
+X(a, STATIC,   SINGULAR, UINT32,   request_id,        2) \
+X(a, STATIC,   SINGULAR, BOOL,     mitm,              3)
+#define simpleble_SecureConnectionCmd_CALLBACK NULL
+#define simpleble_SecureConnectionCmd_DEFAULT NULL
+
 #define simpleble_InitRsp_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   ret_code,          1)
 #define simpleble_InitRsp_CALLBACK NULL
@@ -940,6 +995,11 @@ X(a, STATIC,   SINGULAR, UINT32,   count,             1)
 #define simpleble_GetPairedPeripheralCountRsp_CALLBACK NULL
 #define simpleble_GetPairedPeripheralCountRsp_DEFAULT NULL
 
+#define simpleble_SecureConnectionRsp_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   ret_code,          1)
+#define simpleble_SecureConnectionRsp_CALLBACK NULL
+#define simpleble_SecureConnectionRsp_DEFAULT NULL
+
 #define simpleble_AdvEvt_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   identifier,        1) \
 X(a, STATIC,   SINGULAR, UENUM,    address_type,      2) \
@@ -1028,6 +1088,17 @@ X(a, STATIC,   SINGULAR, UINT32,   request_id,        3)
 #define simpleble_AuthKeyRequestEvt_CALLBACK NULL
 #define simpleble_AuthKeyRequestEvt_DEFAULT NULL
 
+#define simpleble_SecurityCompleteEvt_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   conn_handle,       1) \
+X(a, STATIC,   SINGULAR, UINT32,   request_id,        2) \
+X(a, STATIC,   SINGULAR, UINT32,   ret_code,          3) \
+X(a, STATIC,   SINGULAR, BOOL,     encrypted,         4) \
+X(a, STATIC,   SINGULAR, BOOL,     lesc,              5) \
+X(a, STATIC,   SINGULAR, BOOL,     mitm,              6) \
+X(a, STATIC,   SINGULAR, UINT32,   key_size,          7)
+#define simpleble_SecurityCompleteEvt_CALLBACK NULL
+#define simpleble_SecurityCompleteEvt_DEFAULT NULL
+
 #define simpleble_Command_FIELDLIST(X, a) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,init,cmd.init),   1) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,scan_start,cmd.scan_start),   2) \
@@ -1041,7 +1112,8 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,is_paired,cmd.is_paired),   9) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,unpair,cmd.unpair),  10) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,auth_key_reply,cmd.auth_key_reply),  11) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,get_paired_peripheral,cmd.get_paired_peripheral),  12) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,get_paired_peripheral_count,cmd.get_paired_peripheral_count),  13)
+X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,get_paired_peripheral_count,cmd.get_paired_peripheral_count),  13) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,secure_connection,cmd.secure_connection),  14)
 #define simpleble_Command_CALLBACK NULL
 #define simpleble_Command_DEFAULT NULL
 #define simpleble_Command_cmd_init_MSGTYPE simpleble_InitCmd
@@ -1057,6 +1129,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (cmd,get_paired_peripheral_count,cmd.get_pair
 #define simpleble_Command_cmd_auth_key_reply_MSGTYPE simpleble_AuthKeyReplyCmd
 #define simpleble_Command_cmd_get_paired_peripheral_MSGTYPE simpleble_GetPairedPeripheralCmd
 #define simpleble_Command_cmd_get_paired_peripheral_count_MSGTYPE simpleble_GetPairedPeripheralCountCmd
+#define simpleble_Command_cmd_secure_connection_MSGTYPE simpleble_SecureConnectionCmd
 
 #define simpleble_Response_FIELDLIST(X, a) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,init,rsp.init),   1) \
@@ -1071,7 +1144,8 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,is_paired,rsp.is_paired),   9) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,unpair,rsp.unpair),  10) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,auth_key_reply,rsp.auth_key_reply),  11) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,get_paired_peripheral,rsp.get_paired_peripheral),  12) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,get_paired_peripheral_count,rsp.get_paired_peripheral_count),  13)
+X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,get_paired_peripheral_count,rsp.get_paired_peripheral_count),  13) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,secure_connection,rsp.secure_connection),  14)
 #define simpleble_Response_CALLBACK NULL
 #define simpleble_Response_DEFAULT NULL
 #define simpleble_Response_rsp_init_MSGTYPE simpleble_InitRsp
@@ -1087,6 +1161,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (rsp,get_paired_peripheral_count,rsp.get_pair
 #define simpleble_Response_rsp_auth_key_reply_MSGTYPE simpleble_AuthKeyReplyRsp
 #define simpleble_Response_rsp_get_paired_peripheral_MSGTYPE simpleble_GetPairedPeripheralRsp
 #define simpleble_Response_rsp_get_paired_peripheral_count_MSGTYPE simpleble_GetPairedPeripheralCountRsp
+#define simpleble_Response_rsp_secure_connection_MSGTYPE simpleble_SecureConnectionRsp
 
 #define simpleble_Event_FIELDLIST(X, a) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (evt,adv_evt,evt.adv_evt),   1) \
@@ -1098,7 +1173,8 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (evt,descriptor_discovered_evt,evt.descriptor
 X(a, STATIC,   ONEOF,    MESSAGE,  (evt,connect_complete_evt,evt.connect_complete_evt),   7) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (evt,value_changed_evt,evt.value_changed_evt),   8) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (evt,passkey_display_evt,evt.passkey_display_evt),   9) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (evt,auth_key_request_evt,evt.auth_key_request_evt),  10)
+X(a, STATIC,   ONEOF,    MESSAGE,  (evt,auth_key_request_evt,evt.auth_key_request_evt),  10) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (evt,security_complete_evt,evt.security_complete_evt),  11)
 #define simpleble_Event_CALLBACK NULL
 #define simpleble_Event_DEFAULT NULL
 #define simpleble_Event_evt_adv_evt_MSGTYPE simpleble_AdvEvt
@@ -1111,6 +1187,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (evt,auth_key_request_evt,evt.auth_key_reques
 #define simpleble_Event_evt_value_changed_evt_MSGTYPE simpleble_ValueChangedEvt
 #define simpleble_Event_evt_passkey_display_evt_MSGTYPE simpleble_PasskeyDisplayEvt
 #define simpleble_Event_evt_auth_key_request_evt_MSGTYPE simpleble_AuthKeyRequestEvt
+#define simpleble_Event_evt_security_complete_evt_MSGTYPE simpleble_SecurityCompleteEvt
 
 extern const pb_msgdesc_t simpleble_UUID16Bit_msg;
 extern const pb_msgdesc_t simpleble_UUID32Bit_msg;
@@ -1136,6 +1213,7 @@ extern const pb_msgdesc_t simpleble_IsPairedCmd_msg;
 extern const pb_msgdesc_t simpleble_UnpairCmd_msg;
 extern const pb_msgdesc_t simpleble_GetPairedPeripheralCmd_msg;
 extern const pb_msgdesc_t simpleble_GetPairedPeripheralCountCmd_msg;
+extern const pb_msgdesc_t simpleble_SecureConnectionCmd_msg;
 extern const pb_msgdesc_t simpleble_InitRsp_msg;
 extern const pb_msgdesc_t simpleble_ScanStartRsp_msg;
 extern const pb_msgdesc_t simpleble_ScanStopRsp_msg;
@@ -1149,6 +1227,7 @@ extern const pb_msgdesc_t simpleble_IsPairedRsp_msg;
 extern const pb_msgdesc_t simpleble_UnpairRsp_msg;
 extern const pb_msgdesc_t simpleble_GetPairedPeripheralRsp_msg;
 extern const pb_msgdesc_t simpleble_GetPairedPeripheralCountRsp_msg;
+extern const pb_msgdesc_t simpleble_SecureConnectionRsp_msg;
 extern const pb_msgdesc_t simpleble_AdvEvt_msg;
 extern const pb_msgdesc_t simpleble_ConnectionEvt_msg;
 extern const pb_msgdesc_t simpleble_DisconnectionEvt_msg;
@@ -1159,6 +1238,7 @@ extern const pb_msgdesc_t simpleble_ConnectCompleteEvt_msg;
 extern const pb_msgdesc_t simpleble_ValueChangedEvt_msg;
 extern const pb_msgdesc_t simpleble_PasskeyDisplayEvt_msg;
 extern const pb_msgdesc_t simpleble_AuthKeyRequestEvt_msg;
+extern const pb_msgdesc_t simpleble_SecurityCompleteEvt_msg;
 extern const pb_msgdesc_t simpleble_Command_msg;
 extern const pb_msgdesc_t simpleble_Response_msg;
 extern const pb_msgdesc_t simpleble_Event_msg;
@@ -1188,6 +1268,7 @@ extern const pb_msgdesc_t simpleble_Event_msg;
 #define simpleble_UnpairCmd_fields &simpleble_UnpairCmd_msg
 #define simpleble_GetPairedPeripheralCmd_fields &simpleble_GetPairedPeripheralCmd_msg
 #define simpleble_GetPairedPeripheralCountCmd_fields &simpleble_GetPairedPeripheralCountCmd_msg
+#define simpleble_SecureConnectionCmd_fields &simpleble_SecureConnectionCmd_msg
 #define simpleble_InitRsp_fields &simpleble_InitRsp_msg
 #define simpleble_ScanStartRsp_fields &simpleble_ScanStartRsp_msg
 #define simpleble_ScanStopRsp_fields &simpleble_ScanStopRsp_msg
@@ -1201,6 +1282,7 @@ extern const pb_msgdesc_t simpleble_Event_msg;
 #define simpleble_UnpairRsp_fields &simpleble_UnpairRsp_msg
 #define simpleble_GetPairedPeripheralRsp_fields &simpleble_GetPairedPeripheralRsp_msg
 #define simpleble_GetPairedPeripheralCountRsp_fields &simpleble_GetPairedPeripheralCountRsp_msg
+#define simpleble_SecureConnectionRsp_fields &simpleble_SecureConnectionRsp_msg
 #define simpleble_AdvEvt_fields &simpleble_AdvEvt_msg
 #define simpleble_ConnectionEvt_fields &simpleble_ConnectionEvt_msg
 #define simpleble_DisconnectionEvt_fields &simpleble_DisconnectionEvt_msg
@@ -1211,6 +1293,7 @@ extern const pb_msgdesc_t simpleble_Event_msg;
 #define simpleble_ValueChangedEvt_fields &simpleble_ValueChangedEvt_msg
 #define simpleble_PasskeyDisplayEvt_fields &simpleble_PasskeyDisplayEvt_msg
 #define simpleble_AuthKeyRequestEvt_fields &simpleble_AuthKeyRequestEvt_msg
+#define simpleble_SecurityCompleteEvt_fields &simpleble_SecurityCompleteEvt_msg
 #define simpleble_Command_fields &simpleble_Command_msg
 #define simpleble_Response_fields &simpleble_Response_msg
 #define simpleble_Event_fields &simpleble_Event_msg
@@ -1255,6 +1338,9 @@ extern const pb_msgdesc_t simpleble_Event_msg;
 #define simpleble_ScanStartRsp_size              6
 #define simpleble_ScanStopCmd_size               0
 #define simpleble_ScanStopRsp_size               6
+#define simpleble_SecureConnectionCmd_size       9
+#define simpleble_SecureConnectionRsp_size       6
+#define simpleble_SecurityCompleteEvt_size       22
 #define simpleble_ServiceDataEntry_size          51
 #define simpleble_ServiceDiscoveredEvt_size      34
 #define simpleble_Service_size                   30

package/native/simpleble/src/backends/dongl/serial/Protocol.cpp

@@ -236,3 +236,16 @@ simpleble_GetPairedPeripheralCountRsp Protocol::simpleble_get_paired_peripheral_
     dongl_Response response = exchange(command);
     return response.rsp.simpleble.rsp.get_paired_peripheral_count;
 }
+
+simpleble_SecureConnectionRsp Protocol::simpleble_secure_connection(uint16_t conn_handle, uint8_t request_id,
+                                                                    bool mitm) {
+    dongl_Command command = dongl_Command_init_zero;
+    command.which_cmd = dongl_Command_simpleble_tag;
+    command.cmd.simpleble.which_cmd = simpleble_Command_secure_connection_tag;
+    command.cmd.simpleble.cmd.secure_connection.conn_handle = conn_handle;
+    command.cmd.simpleble.cmd.secure_connection.request_id = request_id;
+    command.cmd.simpleble.cmd.secure_connection.mitm = mitm;
+
+    dongl_Response response = exchange(command);
+    return response.rsp.simpleble.rsp.secure_connection;
+}

package/native/simpleble/src/backends/dongl/serial/Protocol.h

@@ -42,6 +42,7 @@ class Protocol : public ProtocolBase {
                                                        const std::vector<uint8_t>& key, bool accept);
     simpleble_GetPairedPeripheralRsp simpleble_get_paired_peripheral(uint16_t index);
     simpleble_GetPairedPeripheralCountRsp simpleble_get_paired_peripheral_count();
+    simpleble_SecureConnectionRsp simpleble_secure_connection(uint16_t conn_handle, uint8_t request_id, bool mitm);
 };
 
 }  // namespace Serial

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplernble",
-  "version": "1.2.1-dev129",
+  "version": "1.2.1-dev131",
   "description": "SimpleBLE for React Native: a cross-platform Bluetooth Low Energy library for iOS and Android",
   "keywords": [
     "react-native",

package/prebuilt/release/SimpleBLE.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libsimpleble.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsimpleble.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsimpleble.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsimpleble.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/prebuilt/release/include/simpleble/Advanced.h

@@ -57,6 +57,20 @@ void SIMPLEBLE_EXPORT set_passkey_display_callback(Peripheral& peripheral,
 void SIMPLEBLE_EXPORT set_numeric_comparison_callback(Peripheral& peripheral,
                                                       const std::function<bool(const std::string& passkey)>& callback);
 
+/**
+ * Secure the connection with LE Secure Connections.
+ *
+ * Pairs with the connected peer and waits until the link is encrypted using LE
+ * Secure Connections and a 128-bit key. With mitm set, the peer must also be
+ * authenticated through the passkey or numeric comparison callbacks. If the
+ * link already meets these requirements, for example through an existing bond,
+ * the call returns right away. Pairing started by this call creates no bond.
+ *
+ * Throws if the link can't be secured as requested, in which case the Dongl
+ * disconnects. The Dongl gives up after 30 seconds.
+ */
+void SIMPLEBLE_EXPORT secure_connection(Peripheral& peripheral, bool mitm = false);
+
 }  // namespace SimpleBLE::Advanced::Dongl
 
 /**