Wrap prints with #ifdef _BLE_TRACE_

Author: pennam

src/utility/HCI.cpp

@@ -482,6 +482,7 @@ void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress,
     addDevice.peerIRK[15-i]  = peerIrk[i];
     addDevice.localIRK[15-i] = localIrk[i];
   }
+#ifdef _BLE_TRACE_
   Serial.print("ADDTYPE    :");
   btct.printBytes(&addDevice.peerAddressType,1);
   Serial.print("adddddd    :");
@@ -490,6 +491,7 @@ void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress,
   btct.printBytes(addDevice.peerIRK,16);
   Serial.print("localIRK   :");
   btct.printBytes(addDevice.localIRK,16);
+#endif
   sendCommand(OGF_LE_CTL << 10 | 0x27, sizeof(addDevice), &addDevice);
 
   leStartResolvingAddresses();
@@ -512,17 +514,21 @@ int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peer
 
 
   int res = sendCommand(OGF_LE_CTL << 10 | 0x2B, sizeof(request), &request);
+#ifdef _BLE_TRACE_
   Serial.print("res: 0x");
   Serial.println(res, HEX);
+#endif
   if(res==0){
     struct __attribute__ ((packed)) Response {
       uint8_t status;
       uint8_t peerResolvableAddress[6];
     } *response = (Response*)_cmdResponse;
+#ifdef _BLE_TRACE_
     Serial.print("Address resolution status: 0x");
     Serial.println(response->status, HEX);
     Serial.print("peer resolvable address: ");
     btct.printBytes(response->peerResolvableAddress,6);
+#endif
   }
   return res;
 }
@@ -562,7 +568,9 @@ int HCIClass::tryResolveAddress(uint8_t* BDAddr, uint8_t* address){
 
 
     if(!HCI._getIRKs(&nIRKs, BDAddrType, BADDRs, IRKs)){
+#ifdef _BLE_TRACE_
       Serial.println("error getting IRKs.");
+#endif
     }
     for(int i=0; i<nIRKs; i++){
       if(!foundMatch){

src/utility/btct.cpp

@@ -26,6 +26,7 @@ unsigned char const_Rb[16] = {
 #define LEN_LTK 16
 #define LEN_MAC_KEY 16
 
+#ifdef _BLE_TRACE_
 void BluetoothCryptoToolbox::printBytes(uint8_t bytes[], uint8_t length){
     for(int i=0; i<length; i++){
         if(i>0){
@@ -37,6 +38,8 @@ void BluetoothCryptoToolbox::printBytes(uint8_t bytes[], uint8_t length){
     }
     Serial.print('\n');
 }
+#endif
+
 int BluetoothCryptoToolbox::f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_slave[],
             uint8_t BD_ADDR_master[], uint8_t BD_ADDR_slave[], uint8_t MacKey[], uint8_t LTK[])
 {
@@ -128,15 +131,15 @@ void BluetoothCryptoToolbox::testAh()
 {
     uint8_t irk[16] = {0xec,0x02,0x34,0xa3,0x57,0xc8,0xad,0x05,0x34,0x10,0x10,0xa6,0x0a,0x39,0x7d,0x9b};         
     uint8_t expected_final[3] = {0x0d,0xfb,0xaa};
-    
     uint8_t ourResult[3];
     ah(irk, expected_final, ourResult);
 
-
+#ifdef _BLE_TRACE_
     Serial.print("Expected   : ");
     printBytes(&expected_final[3], 3);
     Serial.print("Actual     : ");
     printBytes(ourResult, 3);
+#endif
 }
 
 int BluetoothCryptoToolbox::g2(uint8_t U[], uint8_t V[], uint8_t X[], uint8_t Y[], uint8_t out[4])
@@ -160,19 +163,19 @@ void BluetoothCryptoToolbox::testg2(){
     uint8_t X[16] = {0xd5,0xcb,0x84,0x54,0xd1,0x77,0x73,0x3e,0xff,0xff,0xb2,0xec,0x71,0x2b,0xae,0xab};
     uint8_t Y[16] = {0xa6,0xe8,0xe7,0xcc,0x25,0xa7,0x5f,0x6e,0x21,0x65,0x83,0xf7,0xff,0x3d,0xc4,0xcf};
     uint8_t out[4];
-    
-    
+
     uint32_t expected = 0;
     g2(U,V,X,Y,out);
     uint32_t result = 0;
     for(int i=0; i<4; i++) result += out[i] << 8*i;
 
+#ifdef _BLE_TRACE_
     Serial.print("Expected :     ");
     Serial.println(expected);
     Serial.print("Result   : ");
     Serial.println(result);
     Serial.println();
-
+#endif
 }
 
 void BluetoothCryptoToolbox::AES_CMAC ( unsigned char *key, unsigned char *input, int length,
@@ -264,16 +267,20 @@ int BluetoothCryptoToolbox::AES_128(uint8_t* key, uint8_t* data_in, uint8_t* dat
     int n = 0;
     int tries = 30;
     while(HCI.leEncrypt(key,data_in, &status, data_out)!=1&&n<tries){
+#ifdef _BLE_TRACE_
         Serial.print("AES failed... retrying: ");
         Serial.println(n);
+#endif
         BLE.end();
         delay(200);
         BLE.begin();
         n++;
         delay(100*n);
     }
     if(n==tries){
+#ifdef _BLE_TRACE_
         Serial.println("something went wrong with AES.");
+#endif
         return 0;
     }
     return 1;
@@ -288,7 +295,7 @@ void BluetoothCryptoToolbox::test(){
 
     for ( i=0; i<16; i++ ) Z[i] = 0x00;
     uint8_t k[16]            = {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c};
-    
+
     Serial.println("AES Plaintext:");
     for(int i=0; i<16; i++){
         Serial.print(" 0x");
@@ -352,7 +359,7 @@ void BluetoothCryptoToolbox::test(){
     }
     Serial.println(".");
 }
-#endif
+#endif //_BLE_TRACE_
 // From RFC
 void BluetoothCryptoToolbox::leftshift_onebit(unsigned char *input,unsigned char *output)
 {

src/utility/btct.h

@@ -6,7 +6,9 @@
 class BluetoothCryptoToolbox{
 public:
     BluetoothCryptoToolbox();
+#ifdef _BLE_TRACE_
     void printBytes(uint8_t bytes[], uint8_t length);
+#endif
     void generateSubkey(uint8_t* K, uint8_t* K1, uint8_t* K2);
     void AES_CMAC ( unsigned char *key, unsigned char *input, int length,
                   unsigned char *mac );