Skip to content

Commit edcd7c0

Browse files
authored
Merge pull request #104152 from msmbaldwin/ssltls-tlsssl
Ssltls tlsssl
2 parents 5e4c4dc + 6ffe434 commit edcd7c0

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

articles/sql-database/sql-database-security-controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SQL Database includes both [single database](sql-database-single-index.yml) and
5151
| Encryption in transit:<ul><li>Azure ExpressRoute encryption</li><li>Encryption in a virtual network</li><li>Encryption between virtual networks</ul>| Yes | Using HTTPS. |
5252
| Encryption-key handling, such as CMK or BYOK| Yes | Both service-managed and customer-managed key handling are offered. The latter is offered through [Azure Key Vault](../key-vault/index.yml). |
5353
| Column-level encryption provided by Azure data services| Yes | Through [Always Encrypted](sql-database-always-encrypted.md). |
54-
| Encrypted API calls| Yes | Using HTTPS/SSL. |
54+
| Encrypted API calls| Yes | Using HTTPS/TLS. |
5555

5656
## Configuration management
5757

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-security-controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This article documents the security controls built into Azure Virtual Machine Sc
4747
| Encryption in transit (such as ExpressRoute encryption, in VNet encryption, and VNet-VNet encryption )| Yes | Azure Virtual Machines supports [ExpressRoute](/azure/expressroute) and VNet encryption. See [In-transit encryption in VMs](/azure/security/security-azure-encryption-overview#in-transit-encryption-in-vms). |
4848
| Server-side encryption at rest: customer-managed keys (BYOK) | Yes | Customer-managed keys is a supported Azure encryption scenario; see See [Azure Disk Encryption for Virtual Machine Scale Sets](disk-encryption-overview.md)|
4949
| Column level encryption (Azure Data Services)| N/A | |
50-
| API calls encrypted| Yes | Via HTTPS and SSL. |
50+
| API calls encrypted| Yes | Via HTTPS and TLS. |
5151

5252
## Configuration management
5353

articles/virtual-machines/linux/virtual-machines-linux-security-controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ This article documents the security controls built into Linux Virtual Machines.
5050
| Encryption in transit (such as ExpressRoute encryption, in VNet encryption, and VNet-VNet encryption )| Yes | Azure Virtual Machines supports [ExpressRoute](/azure/expressroute) and VNet encryption. See [In-transit encryption in VMs](/azure/security/security-azure-encryption-overview#in-transit-encryption-in-vms). |
5151
| Server-side encryption at rest: customer-managed keys (BYOK) | Yes | Customer-managed keys is a supported Azure encryption scenario; see [Azure encryption overview](/azure/security/security-azure-encryption-overview#in-transit-encryption-in-vms).|
5252
| Column level encryption (Azure Data Services)| N/A | |
53-
| API calls encrypted| Yes | Via HTTPS and SSL. |
53+
| API calls encrypted| Yes | Via HTTPS and TLS. |
5454

5555
## Configuration management
5656

articles/virtual-machines/windows/virtual-machines-windows-security-controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ This article documents the security controls built into Windows Virtual Machines
5050
| Encryption in transit (such as ExpressRoute encryption, in VNet encryption, and VNet-VNet encryption )| Yes | Azure Virtual Machines supports [ExpressRoute](/azure/expressroute) and VNet encryption. See [In-transit encryption in VMs](/azure/security/security-azure-encryption-overview#in-transit-encryption-in-vms). |
5151
| Server-side encryption at rest: customer-managed keys (BYOK) | Yes | Customer-managed keys is a supported Azure encryption scenario; see [Azure encryption overview](/azure/security/security-azure-encryption-overview#in-transit-encryption-in-vms).|
5252
| Column level encryption (Azure Data Services)| N/A | |
53-
| API calls encrypted| Yes | Via HTTPS and SSL. |
53+
| API calls encrypted| Yes | Via HTTPS and TLS. |
5454

5555

5656

0 commit comments

Comments
 (0)