rename Bluefruit.Pairing to Bluefruit.Security

hathach · hathach · commit c322f4c8342c · 2020-03-19T17:39:40.000+07:00
diff --git a/libraries/Bluefruit52Lib/examples/Central/central_hid/central_hid.ino b/libraries/Bluefruit52Lib/examples/Central/central_hid/central_hid.ino
@@ -56,7 +56,7 @@ void setup()
   Bluefruit.Central.setDisconnectCallback(disconnect_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   /* Start Central Scanning
    * - Enable auto scan if disconnected
diff --git a/libraries/Bluefruit52Lib/examples/Central/central_pairing/central_pairing.ino b/libraries/Bluefruit52Lib/examples/Central/central_pairing/central_pairing.ino
@@ -103,14 +103,14 @@ void setup()
   // - Register callback to display/print dynamic passkey for central
   // For complete mapping of the IO Capabilities to Key Generation Method, check out this article
   // https://www.bluetooth.com/blog/bluetooth-pairing-part-2-key-generation-methods/
-  Bluefruit.Pairing.setIOCaps(true, true, false); // display = true, yes/no = true, keyboard = false
-  Bluefruit.Pairing.setPasskeyCallback(pairing_passkey_callback);
+  Bluefruit.Security.setIOCaps(true, true, false); // display = true, yes/no = true, keyboard = false
+  Bluefruit.Security.setPasskeyCallback(pairing_passkey_callback);
 
   // Set complete callback to print the pairing result
-  Bluefruit.Pairing.setCompleteCallback(pairing_complete_callback);
+  Bluefruit.Security.setCompleteCallback(pairing_complete_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   // Init BLE Central Uart Serivce
   clientUart.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/ancs/ancs.ino b/libraries/Bluefruit52Lib/examples/Peripheral/ancs/ancs.ino
@@ -57,7 +57,7 @@ void setup()
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   // Configure DIS client
   bleClientDis.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/ancs_arcada/ancs_arcada.ino b/libraries/Bluefruit52Lib/examples/Peripheral/ancs_arcada/ancs_arcada.ino
@@ -84,7 +84,7 @@ void setup()
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   // Configure and Start Service
   bleancs.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/ancs_oled/ancs_oled.ino b/libraries/Bluefruit52Lib/examples/Peripheral/ancs_oled/ancs_oled.ino
@@ -94,7 +94,7 @@ void setup()
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   // Configure and Start Service
   bleancs.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/client_cts/client_cts.ino b/libraries/Bluefruit52Lib/examples/Peripheral/client_cts/client_cts.ino
@@ -53,7 +53,7 @@ void setup()
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   // Configure CTS client
   bleCTime.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/client_cts_oled/client_cts_oled.ino b/libraries/Bluefruit52Lib/examples/Peripheral/client_cts_oled/client_cts_oled.ino
@@ -59,7 +59,7 @@ void setup()
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   // Configure CTS client
   bleCTime.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/pairing_passkey/pairing_passkey.ino b/libraries/Bluefruit52Lib/examples/Peripheral/pairing_passkey/pairing_passkey.ino
@@ -105,14 +105,14 @@ void setup()
    * For complete mapping of the IO Capabilities to Key Generation Method, check out this article
    * https://www.bluetooth.com/blog/bluetooth-pairing-part-2-key-generation-methods/
    */
-  Bluefruit.Pairing.setIOCaps(true, true, false); // display = true, yes/no = true, keyboard = false
-  Bluefruit.Pairing.setPasskeyCallback(pairing_passkey_callback);
+  Bluefruit.Security.setIOCaps(true, true, false); // display = true, yes/no = true, keyboard = false
+  Bluefruit.Security.setPasskeyCallback(pairing_passkey_callback);
 
   // Set complete callback to print the pairing result
-  Bluefruit.Pairing.setCompleteCallback(pairing_complete_callback);
+  Bluefruit.Security.setCompleteCallback(pairing_complete_callback);
 
   // Set connection secured callback, invoked when connection is encrypted
-  Bluefruit.Pairing.setSecuredCallback(connection_secured_callback);
+  Bluefruit.Security.setSecuredCallback(connection_secured_callback);
 
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/pairing_pin/pairing_pin.ino b/libraries/Bluefruit52Lib/examples/Peripheral/pairing_pin/pairing_pin.ino
@@ -51,7 +51,7 @@ void setup()
   Bluefruit.setName("Bluefruit52");
 
   Serial.println("Setting pairing PIN to: " PAIRING_PIN);
-  Bluefruit.Pairing.setPIN(PAIRING_PIN);
+  Bluefruit.Security.setPIN(PAIRING_PIN);
 
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
diff --git a/libraries/Bluefruit52Lib/src/BLECentral.cpp b/libraries/Bluefruit52Lib/src/BLECentral.cpp
@@ -145,7 +145,7 @@ void BLECentral::_eventHandler(ble_evt_t* evt)
       bond_keys_t ltkey;
       if ( conn->loadBondKey(&ltkey) )
       {
-        Bluefruit.Pairing._encrypt(conn_hdl, &ltkey);
+        Bluefruit.Security._encrypt(conn_hdl, &ltkey);
       }
     }
     break;
diff --git a/libraries/Bluefruit52Lib/src/BLEConnection.cpp b/libraries/Bluefruit52Lib/src/BLEConnection.cpp
@@ -120,7 +120,7 @@ uint8_t BLEConnection::getPHY(void)
 
 ble_gap_addr_t BLEConnection::getPeerAddr (void)
 {
-  return _peer_addr;
+  return _bonded ? _bond_id_addr : _peer_addr;
 }
 
 uint16_t BLEConnection::getPeerName(char* buf, uint16_t bufsize)
@@ -270,7 +270,7 @@ bool BLEConnection::requestPairing(void)
   // skip if already paired
   if ( secured() ) return true;
 
-  return Bluefruit.Pairing._authenticate(_conn_hdl);
+  return Bluefruit.Security._authenticate(_conn_hdl);
 }
 
 bool BLEConnection::waitForIndicateConfirm(void)
diff --git a/libraries/Bluefruit52Lib/src/bluefruit.cpp b/libraries/Bluefruit52Lib/src/bluefruit.cpp
@@ -437,7 +437,7 @@ bool AdafruitBluefruit::begin(uint8_t prph_count, uint8_t central_count)
   // Init Peripheral role
   VERIFY( Periph.begin() );
 
-  Pairing.begin();
+  Security.begin();
 
   // Default device name
   ble_gap_conn_sec_mode_t sec_mode = BLE_SECMODE_OPEN;
@@ -748,7 +748,7 @@ void AdafruitBluefruit::_ble_handler(ble_evt_t* evt)
   if ( conn )
   {
     conn->_eventHandler(evt);
-    Pairing._eventHandler(evt);
+    Security._eventHandler(evt);
   }
 
   switch(evt->header.evt_id)
diff --git a/libraries/Bluefruit52Lib/src/bluefruit.h b/libraries/Bluefruit52Lib/src/bluefruit.h
@@ -111,7 +111,7 @@ class AdafruitBluefruit
      *------------------------------------------------------------------*/
     BLEPeriph          Periph;
     BLECentral         Central;
-    BLESecurity         Pairing;
+    BLESecurity        Security;
     BLEGatt            Gatt;
 
     BLEAdvertising     Advertising;
diff --git a/libraries/Bluefruit52Lib/src/utility/bonding.cpp b/libraries/Bluefruit52Lib/src/utility/bonding.cpp
@@ -182,7 +182,7 @@ bool bond_load_keys(uint8_t role, ble_gap_addr_t* addr, bond_keys_t* bkeys)
         if ( keylen == sizeof(bond_keys_t) )
         {
           file.read((uint8_t*) bkeys, keylen);
-          if ( Bluefruit.Pairing.resolveAddress(addr, &bkeys->peer_id.id_info) )
+          if ( Bluefruit.Security.resolveAddress(addr, &bkeys->peer_id.id_info) )
           {
             ret = true;
             BOND_LOG("Loaded keys from file %s/%s", dpath, file.name());

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ void BLECentral::_eventHandler(ble_evt_t* evt)`
`145`	`145`	`bond_keys_t ltkey;`
`146`	`146`	`if ( conn->loadBondKey(&ltkey) )`
`147`	`147`	`{`
`148`		`- Bluefruit.Pairing._encrypt(conn_hdl, &ltkey);`
	`148`	`+ Bluefruit.Security._encrypt(conn_hdl, &ltkey);`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`break;`