You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

49 lines
1.9 KiB

  1. commit 54aecf18aeabe09bccf8db5e34b99bc36d468088
  2. Author: Bertrand Jacquin <bertrand@jacquin.bzh>
  3. Date: Tue Aug 14 00:56:13 2018 +0100
  4. DOC: ssl: Use consistent naming for TLS protocols
  5. In most cases, "TLSv1.x" naming is used across and documentation, lazy
  6. people tend to grep too much and may not find what they are looking for.
  7. Fixing people is hard.
  8. (cherry picked from commit a25282bb399bfad8ed04b494b567fe97f0a58d65)
  9. Signed-off-by: Willy Tarreau <w@1wt.eu>
  10. diff --git a/doc/configuration.txt b/doc/configuration.txt
  11. index 1973bbf2..43e28785 100644
  12. --- a/doc/configuration.txt
  13. +++ b/doc/configuration.txt
  14. @@ -10447,7 +10447,7 @@ accept-proxy
  15. setting of which client is allowed to use the protocol.
  16. allow-0rtt
  17. - Allow receiving early data when using TLS 1.3. This is disabled by default,
  18. + Allow receiving early data when using TLSv1.3. This is disabled by default,
  19. due to security considerations.
  20. alpn <protocols>
  21. diff --git a/src/ssl_sock.c b/src/ssl_sock.c
  22. index 9be2fc4c..0b49e0b4 100644
  23. --- a/src/ssl_sock.c
  24. +++ b/src/ssl_sock.c
  25. @@ -1986,7 +1986,7 @@ static void ctx_set_TLSv12_func(SSL_CTX *ctx, set_context_func c) {
  26. : SSL_CTX_set_ssl_version(ctx, TLSv1_2_client_method());
  27. #endif
  28. }
  29. -/* TLS 1.2 is the last supported version in this context. */
  30. +/* TLSv1.2 is the last supported version in this context. */
  31. static void ctx_set_TLSv13_func(SSL_CTX *ctx, set_context_func c) {}
  32. /* Unusable in this context. */
  33. static void ssl_set_SSLv3_func(SSL *ssl, set_context_func c) {}
  34. @@ -2187,7 +2187,7 @@ static int ssl_sock_switchctx_cbk(SSL *ssl, int *al, void *arg)
  35. break;
  36. }
  37. } else {
  38. - /* without TLSEXT_TYPE_signature_algorithms extension (< TLS 1.2) */
  39. + /* without TLSEXT_TYPE_signature_algorithms extension (< TLSv1.2) */
  40. has_rsa = 1;
  41. }
  42. if (has_ecdsa_sig) { /* in very rare case: has ecdsa sign but not a ECDSA cipher */