Remove mqtt 8883 fallback logic

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -133,7 +133,7 @@ int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, bool const enable_
     _otaClient.setEccSlot(static_cast<int>(SElementArduinoCloudSlot::Key), _cert.bytes(), _cert.length());
     #endif
   #endif
-    _brokerPort = (brokerPort == DEFAULT_BROKER_PORT_AUTO) ? mqttPort() : brokerPort;
+    _brokerPort = (brokerPort == DEFAULT_BROKER_PORT_AUTO) ? DEFAULT_BROKER_PORT_SECURE_AUTH : brokerPort;
 #endif
   }
   else
@@ -586,15 +586,6 @@ int ArduinoIoTCloudTCP::write(String const topic, byte const data[], int const l
 }
 
 #if defined(BOARD_HAS_SECURE_ELEMENT)
-int ArduinoIoTCloudTCP::mqttPort()
-{
-  if (memcmp(DEPRECATED_BROKER_AUTHORITY_KEY_IDENTIFIER, _cert.authorityKeyIdentifierBytes() , ECP256_CERT_AUTHORITY_KEY_ID_LENGTH) == 0) {
-    return DEPRECATED_BROKER_PORT_SECURE_AUTH;
-  } else {
-    return DEFAULT_BROKER_PORT_SECURE_AUTH;
-  }
-}
-
 int ArduinoIoTCloudTCP::updateCertificate(String authorityKeyIdentifier, String serialNumber, String notBefore, String notAfter, String signature)
 {
   if (!_selement.begin())

src/ArduinoIoTCloudTCP.h

@@ -49,10 +49,6 @@
  ******************************************************************************/
 static constexpr char DEFAULT_BROKER_ADDRESS[] = "iot.arduino.cc";
 static constexpr uint16_t DEFAULT_BROKER_PORT_SECURE_AUTH = 8885;
-static constexpr uint16_t DEPRECATED_BROKER_PORT_SECURE_AUTH = 8883;
-static constexpr uint8_t DEPRECATED_BROKER_AUTHORITY_KEY_IDENTIFIER[] = {
-                  0x5b, 0x3e, 0x2a, 0x6b, 0x8e, 0xc9, 0xb0, 0x1a, 0xa8, 0x54,
-                  0xe6, 0x36, 0x9b, 0x8c, 0x09, 0xf9, 0xfc, 0xe1, 0xb9, 0x80 };
 static constexpr uint16_t DEFAULT_BROKER_PORT_USER_PASS_AUTH = 8884;
 static constexpr uint16_t DEFAULT_BROKER_PORT_AUTO = 0;
 
@@ -189,10 +185,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     void detachThing();
     int write(String const topic, byte const data[], int const length);
 
-#if defined(BOARD_HAS_SECURE_ELEMENT)
-    int mqttPort();
-#endif
-
 };
 
 /******************************************************************************