Skip to content

Commit 3a5a9b9

Browse files
authored
Merge pull request #109844 from TimShererWithAquent/us1679050cs
Change SSL to TLS per 1679050
2 parents de1e162 + d473e0b commit 3a5a9b9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

articles/event-hubs/event-hubs-java-get-started-send.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Create a singular event by transforming a string into its UTF-8 byte encoding. T
107107
// handling different flavors of ingestion to Event Hubs here.
108108
final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(4);
109109

110-
// Each EventHubClient instance spins up a new TCP/SSL connection, which is expensive.
110+
// Each EventHubClient instance spins up a new TCP/TLS connection, which is expensive.
111111
// It is always a best practice to reuse these instances. The following sample shows this.
112112
final EventHubClient ehClient = EventHubClient.createSync(connStr.toString(), executorService);
113113

articles/lab-services/configure-lab-remote-desktop-gateway.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This approach is more secure because the lab user authenticates directly to the
4040
To work with the DevTest Labs token authentication feature, there are a few configuration requirements for the gateway machines, domain name services (DNS), and functions.
4141

4242
### Requirements for remote desktop gateway machines
43-
- SSL certificate must be installed on the gateway machine to handle HTTPS traffic. The certificate must match the fully qualified domain name (FQDN) of the load balancer for the gateway farm or the FQDN of the machine itself if there's only one machine. Wild-card SSL certificates don't work.
43+
- TLS/SSL certificate must be installed on the gateway machine to handle HTTPS traffic. The certificate must match the fully qualified domain name (FQDN) of the load balancer for the gateway farm or the FQDN of the machine itself if there's only one machine. Wild-card TLS/SSL certificates don't work.
4444
- A signing certificate installed on gateway machine(s). Create a signing certificate by using [Create-SigningCertificate.ps1](https://github.com/Azure/azure-devtestlab/blob/master/samples/DevTestLabs/GatewaySample/tools/Create-SigningCertificate.ps1) script.
4545
- Install the [Pluggable Authentication](https://code.msdn.microsoft.com/windowsdesktop/Remote-Desktop-Gateway-517d6273) module that supports token authentication for the remote desktop gateway. One example of such a module is `RDGatewayFedAuth.msi` that comes with [System Center Virtual Machine Manager (VMM) images](/system-center/vmm/install-console?view=sc-vmm-1807). For more information about System Center, see [System Center documentation](https://docs.microsoft.com/system-center/) and [pricing details](https://www.microsoft.com/cloud-platform/system-center-pricing).
4646
- The gateway server can handle requests made to `https://{gateway-hostname}/api/host/{lab-machine-name}/port/{port-number}`.
@@ -55,7 +55,7 @@ Azure function handles request with format of `https://{function-app-uri}/app/ho
5555

5656
## Requirements for network
5757

58-
- DNS for the FQDN associated with the SSL certificate installed on the gateway machines must direct traffic to the gateway machine or the load balancer of the gateway machine farm.
58+
- DNS for the FQDN associated with the TLS/SSL certificate installed on the gateway machines must direct traffic to the gateway machine or the load balancer of the gateway machine farm.
5959
- If the lab machine uses private IPs, there must be a network path from the gateway machine to the lab machine, either through sharing the same virtual network or using peered virtual networks.
6060

6161
## Configure the lab to use token authentication
@@ -76,7 +76,7 @@ Configure the lab to use the token authentication by using these steps:
7676
1. From the list of labs, select your **lab**.
7777
1. On the lab's page, select **Configuration and policies**.
7878
1. On the left menu, in the **Settings** section, select **Lab settings**.
79-
1. In the **Remote desktop** section, enter the fully qualified domain name (FQDN) or IP address of the remote desktop services gateway machine or farm for the **Gateway hostname** field. This value must match the FQDN of the SSL certificate used on gateway machines.
79+
1. In the **Remote desktop** section, enter the fully qualified domain name (FQDN) or IP address of the remote desktop services gateway machine or farm for the **Gateway hostname** field. This value must match the FQDN of the TLS/SSL certificate used on gateway machines.
8080

8181
![Remote desktop options in lab settings](./media/configure-lab-remote-desktop-gateway/remote-desktop-options-in-lab-settings.png)
8282
1. In the **Remote desktop** section, for **Gateway token** secret, enter the name of the secret created earlier. This value isn't the function key itself, but the name of the secret in the lab’s key vault that holds the function key.
@@ -107,7 +107,7 @@ The [Azure DevTest Labs GitHub repository](https://github.com/Azure/azure-devtes
107107
Follow these steps to set up a sample solution for the remote desktop gateway farm.
108108

109109
1. Create a signing certificate. Run [Create-SigningCertificate.ps1](https://github.com/Azure/azure-devtestlab/blob/master/samples/DevTestLabs/GatewaySample/tools/Create-SigningCertificate.ps1). Save the thumbprint, password, and Base64 encoding of the created certificate.
110-
2. Get an SSL certificate. FQDN associated with the SSL certificate must be for the domain you control. Save the thumbprint, password, and Base64 encoding for this certificate. To get thumbprint using PowerShell, use the following commands.
110+
2. Get a TLS/SSL certificate. FQDN associated with the TLS/SSL certificate must be for the domain you control. Save the thumbprint, password, and Base64 encoding for this certificate. To get thumbprint using PowerShell, use the following commands.
111111

112112
```powershell
113113
$cer = New-Object System.Security.Cryptography.X509Certificates.X509Certificate;
@@ -129,9 +129,9 @@ Follow these steps to set up a sample solution for the remote desktop gateway fa
129129
- instanceCount – Number of gateway machines to create.
130130
- alwaysOn – Indicates whether to keep the created Azure Functions app in a warm state or not. Keeping the Azure Functions app will avoid delays when users first try to connect to their lab VM, but it does have cost implications.
131131
- tokenLifetime – The length of time the created token will be valid. Format is HH:MM:SS.
132-
- sslCertificate – The Base64 encoding of the SSL certificate for the gateway machine.
133-
- sslCertificatePassword – The password of the SSL certificate for the gateway machine.
134-
- sslCertificateThumbprint - The certificate thumbprint for identification in the local certificate store of the SSL certificate.
132+
- sslCertificate – The Base64 encoding of the TLS/SSL certificate for the gateway machine.
133+
- sslCertificatePassword – The password of the TLS/SSL certificate for the gateway machine.
134+
- sslCertificateThumbprint - The certificate thumbprint for identification in the local certificate store of the TLS/SSL certificate.
135135
- signCertificate – The Base64 encoding for signing certificate for the gateway machine.
136136
- signCertificatePassword – The password for signing certificate for the gateway machine.
137137
- signCertificateThumbprint - The certificate thumbprint for identification in the local certificate store of the signing certificate.
@@ -154,7 +154,7 @@ Follow these steps to set up a sample solution for the remote desktop gateway fa
154154
- The {utc-expiration-date} is the date, in UTC, at which the SAS token will expire and the SAS token can no longer be used to access the storage account.
155155
156156
Record the values for gatewayFQDN and gatewayIP from the template deployment output. You'll also need to save the value of the function key for the newly created function, which can be found in the [Function app settings](../azure-functions/functions-how-to-use-azure-function-app-settings.md) tab.
157-
5. Configure DNS so that FQDN of SSL cert directs to IP address of gatewayIP from previous step.
157+
5. Configure DNS so that FQDN of TLS/SSL cert directs to IP address of gatewayIP from previous step.
158158
159159
After the Remote Desktop Gateway farm is created and appropriate DNS updates are made, it's ready to be used by a lab in DevTest Labs. The **gateway hostname** and **gateway token secret** settings must be configured to use the gateway machine(s) you deployed.
160160

articles/service-bus-relay/relay-port-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The following table describes the required configuration for port values for Azu
2424

2525
## Hybrid Connections
2626

27-
Hybrid Connections uses WebSockets on port 443 with SSL as the underlying transport mechanism, which uses **HTTPS** only.
27+
Hybrid Connections uses WebSockets on port 443 with TLS as the underlying transport mechanism, which uses **HTTPS** only.
2828

2929
## WCF Relays
3030

0 commit comments

Comments
 (0)