From ef1048c62138dac987f97a7d4955ef88fdda3b03 Mon Sep 17 00:00:00 2001 From: ravindk89 Date: Thu, 21 Oct 2021 12:52:23 -0400 Subject: [PATCH] Additional formatting fixups --- .../security/network-encryption/minio-tls.rst | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/source/security/network-encryption/minio-tls.rst b/source/security/network-encryption/minio-tls.rst index a1b0907c..26cff97c 100644 --- a/source/security/network-encryption/minio-tls.rst +++ b/source/security/network-encryption/minio-tls.rst @@ -215,28 +215,12 @@ supported by .. admonition:: Use ECDSA/EdDSA over RSA when when generating certificates :class: note -<<<<<<< HEAD - TLS certificates created using Elliptic Curve Cryptography (ECC) - cipher suites have lower computation requirements compared to RSA cipher - suites. Specifically, MinIO recommends using certificates created with any of - the following supported TLS 1.2 cipher suites wherever possible: - - - ``TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305`` - - ``TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256`` - - ``TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384`` - - All TLS 1.3 cipher suites use ECC by default. -======= - TLS certificates created using - :wiki:`Elliptic Curve Cryptography (ECC) ` have - lower computation requirements compared to - :wikI:`RSA `. Specifically, MinIO - recommends generating - ECDSA (e.g. `NIST P-256 curve - `__) or - EdDSA (e.g. :rfc:`Curve25519 <7748>`) TLS private keys/certificates wherever + TLS certificates created using Elliptic Curve Cryptography (ECC) have lower + computation requirements compared to RSA. Specifically, MinIO recommends + generating ECDSA (e.g. `NIST P-256 curve + `__) or EdDSA + (e.g. :rfc:`Curve25519 <7748>`) TLS private keys/certificates wherever possible. ->>>>>>> 3cb1c9e (Final pass) Third-Party Certificate Authorities -----------------------------------