Merge branch 'main' into ct-drop-38

Author: cartertinney

azure-iot-device/azure/iot/device/common/http_transport.py

@@ -69,7 +69,7 @@ def _create_ssl_context(self):
         This method creates the SSLContext object used to authenticate the connection. The generated context is used by the http_client and is necessary when authenticating using a self-signed X509 cert or trusted X509 cert
         """
         logger.debug("creating a SSL context")
-        ssl_context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLSv1_2)
+        ssl_context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT)
 
         if self._server_verification_cert:
             ssl_context.load_verify_locations(cadata=self._server_verification_cert)

azure-iot-device/azure/iot/device/common/mqtt_transport.py

@@ -321,7 +321,7 @@ def _create_ssl_context(self):
         This method creates the SSLContext object used by Paho to authenticate the connection.
         """
         logger.debug("creating a SSL context")
-        ssl_context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLSv1_2)
+        ssl_context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT)
 
         if self._server_verification_cert:
             logger.debug("configuring SSL context with custom server verification cert")

tests/e2e/iothub_e2e/aio/conftest.py

@@ -70,7 +70,10 @@ async def brand_new_client(device_identity, client_kwargs, service_helper, devic
     # Keep this here.  It is useful to see this info inside the inside devops pipeline test failures.
     logger.info(
         "Connecting device_id={}, module_id={}, to hub={} at {} (UTC)".format(
-            device_id, module_id, test_env.IOTHUB_HOSTNAME, datetime.datetime.utcnow()
+            device_id,
+            module_id,
+            test_env.IOTHUB_HOSTNAME,
+            datetime.datetime.now(datetime.timezone.utc),
         )
     )
 

tests/e2e/iothub_e2e/sync/conftest.py

@@ -20,7 +20,10 @@ def brand_new_client(device_identity, client_kwargs, service_helper, device_id,
     # Keep this here.  It is useful to see this info inside the inside devops pipeline test failures.
     logger.info(
         "Connecting device_id={}, module_id={}, to hub={} at {} (UTC)".format(
-            device_id, module_id, test_env.IOTHUB_HOSTNAME, datetime.datetime.utcnow()
+            device_id,
+            module_id,
+            test_env.IOTHUB_HOSTNAME,
+            datetime.datetime.now(datetime.timezone.utc),
         )
     )
 

tests/unit/common/test_http_transport.py

@@ -105,7 +105,9 @@ def test_configures_tls_context(self, mocker):
         HTTPTransport(hostname=fake_hostname)
         # Verify correctness of TLS/SSL Context
         assert mock_ssl_context_constructor.call_count == 1
-        assert mock_ssl_context_constructor.call_args == mocker.call(protocol=ssl.PROTOCOL_TLSv1_2)
+        assert mock_ssl_context_constructor.call_args == mocker.call(
+            protocol=ssl.PROTOCOL_TLS_CLIENT
+        )
         assert mock_ssl_context.check_hostname is True
         assert mock_ssl_context.verify_mode == ssl.CERT_REQUIRED
 

tests/unit/common/test_mqtt_transport.py

@@ -267,7 +267,9 @@ def test_configures_tls_context(self, mocker):
 
         # Verify correctness of TLS/SSL Context
         assert mock_ssl_context_constructor.call_count == 1
-        assert mock_ssl_context_constructor.call_args == mocker.call(protocol=ssl.PROTOCOL_TLSv1_2)
+        assert mock_ssl_context_constructor.call_args == mocker.call(
+            protocol=ssl.PROTOCOL_TLS_CLIENT
+        )
         assert mock_ssl_context.check_hostname is True
         assert mock_ssl_context.verify_mode == ssl.CERT_REQUIRED