ArduinoIoTCloudTCP: simplify ifdefs for _sslClient initialization

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -208,7 +208,7 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   _ota_img_sha256 = sha256_str;
 #endif /* OTA_ENABLED */
 
-  #ifdef BOARD_HAS_OFFLOADED_ECCX08
+#if defined(BOARD_HAS_ECCX08) || defined(BOARD_HAS_OFFLOADED_ECCX08) || defined(BOARD_HAS_SE050)
   if (!_crypto.begin())
   {
     DEBUG_ERROR("_crypto.begin() failed.");
@@ -219,38 +219,29 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
     DEBUG_ERROR("_crypto.readDeviceId(...) failed.");
     return 0;
   }
-  #endif
+#endif
 
-  #if defined(BOARD_HAS_ECCX08) || defined(BOARD_HAS_SE050)
-  if (!_crypto.begin())
-  {
-    DEBUG_ERROR("Cryptography processor failure. Make sure you have a compatible board.");
-    return 0;
-  }
-  if (!_crypto.readDeviceId(getDeviceId(), CryptoSlot::DeviceId))
-  {
-    DEBUG_ERROR("Cryptography processor read failure.");
-    return 0;
-  }
+#if defined(BOARD_HAS_ECCX08) || defined(BOARD_HAS_SE050)
   if (!_crypto.readCert(_cert, CryptoSlot::CompressedCertificate))
   {
     DEBUG_ERROR("Cryptography certificate reconstruction failure.");
     return 0;
   }
-  #ifndef BOARD_HAS_SE050
+  _sslClient.setEccSlot(static_cast<int>(CryptoSlot::Key), _cert.bytes(), _cert.length());
+#endif
+
+#if defined(BOARD_HAS_ECCX08)
   _sslClient.setClient(_connection->getClient());
-  #else
+#elif defined(BOARD_HAS_SE050)
   _sslClient.appendCustomCACert(AIoTSSCert);
-  #endif
-  _sslClient.setEccSlot(static_cast<int>(CryptoSlot::Key), _cert.bytes(), _cert.length());
-  #elif defined(BOARD_ESP)
+#elif defined(BOARD_ESP)
   _sslClient.setInsecure();
-  #endif
+#endif
 
   _mqttClient.setClient(_sslClient);
-  #ifdef BOARD_ESP
+#ifdef BOARD_ESP
   _mqttClient.setUsernamePassword(getDeviceId(), _password);
-  #endif
+#endif
   _mqttClient.onMessage(ArduinoIoTCloudTCP::onMessage);
   _mqttClient.setKeepAliveInterval(30 * 1000);
   _mqttClient.setConnectionTimeout(1500);