Merge pull request #610 from ExpressionEngine/feature/7.x/email-tls-setting

Added setting for TLS version

Author: TomJaeger

docs/control-panel/settings/email.md

@@ -49,6 +49,14 @@ The username used to log in to your SMTP server. Not all SMTP servers require yo
 
 The password used to log in to your SMTP server. Not all SMTP servers require you to _authenticate_, but many of them do. In those cases you will need to specify the username (above) and password.
 
+### Connection type
+
+Cryptographic protocol for SMTP. Can be set to Unencrypted (not recommended), SSL or TLS
+
+### TLS version
+
+When using TLS, provide the version that you can find in the instructions from your SMTP provider. Version 1.2 is the most commonly used
+
 ### Mail format
 
 When you send email via the Communicate section of your Control Panel, you are able to send HTML formatted emails. This preference sets whether the Communicate section has "Plain text" or "HTML" selected by default.

docs/general/system-configuration-overrides.md

@@ -3062,6 +3062,22 @@ Example Usage:
 
 **Also found in CP:** `Settings --> Access Throttling`: [Time Interval](control-panel/settings/throttling.md#time-interval)
 
+### `tls_crypto_method`
+
+Stream encryption method, when using TLS for sending emails over SMTP.
+
+| Value                                      | Behavior                   |
+| ------------------------------------------ | -------------------------- |
+| STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT        | TLS v1.0                   |
+| STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT        | TLS v1.1                   |
+| STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT        | TLS v1.2 (default)         |
+| STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT        | TLS v1.3 (as of PHP 7.4.0) |
+
+ 
+Example Usage:
+
+    $config['tls_crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
+
 ### `un_min_len`
 
 Set the minimum number of characters allowed for member usernames.