Skip to content

Commit 188805a

Browse files
committed
Removed TLSv1 and TLSv1.1 from default ssl_protocols and friends.
1 parent 01cd773 commit 188805a

17 files changed

+58
-44
lines changed

xml/en/docs/http/configuring_https_servers.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<article name="Configuring HTTPS servers"
99
link="/en/docs/http/configuring_https_servers.html"
1010
lang="en"
11-
rev="14"
11+
rev="15"
1212
author="Igor Sysoev"
1313
editor="Brian Mercer">
1414

@@ -31,7 +31,7 @@ server {
3131
server_name www.example.com;
3232
ssl_certificate <b>www.example.com.crt</b>;
3333
ssl_certificate_key <b>www.example.com.key</b>;
34-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
34+
ssl_protocols TLSv1.2 TLSv1.3;
3535
ssl_ciphers HIGH:!aNULL:!MD5;
3636
...
3737
}
@@ -59,7 +59,7 @@ The directives <link doc="ngx_http_ssl_module.xml" id="ssl_protocols"/> and
5959
can be used to limit connections
6060
to include only the strong versions and ciphers of SSL/TLS.
6161
By default nginx uses
62-
“<literal>ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</literal>”
62+
“<literal>ssl_protocols TLSv1.2 TLSv1.3</literal>”
6363
and “<literal>ssl_ciphers HIGH:!aNULL:!MD5</literal>”,
6464
so configuring them explicitly is generally not needed.
6565
Note that default values of these directives were
@@ -110,7 +110,7 @@ http {
110110

111111
ssl_certificate www.example.com.crt;
112112
ssl_certificate_key www.example.com.key;
113-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
113+
ssl_protocols TLSv1.2 TLSv1.3;
114114
ssl_ciphers HIGH:!aNULL:!MD5;
115115
...
116116
</programlisting>
@@ -445,6 +445,13 @@ The shared SSL session cache has been supported since 0.5.6.
445445
<para>
446446
<list type="bullet">
447447

448+
<listitem>
449+
Version 1.27.3 and later: the default SSL protocols are
450+
TLSv1.2 and TLSv1.3 (if supported by the OpenSSL library).
451+
Otherwise, when OpenSSL 1.0.0 or older is used,
452+
the default SSL protocols are TLSv1 and TLSv1.1.
453+
</listitem>
454+
448455
<listitem>
449456
Version 1.23.4 and later: the default SSL protocols are TLSv1,
450457
TLSv1.1, TLSv1.2, and TLSv1.3 (if supported by the OpenSSL library).

xml/en/docs/http/ngx_http_grpc_module.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<module name="Module ngx_http_grpc_module"
1111
link="/en/docs/http/ngx_http_grpc_module.html"
1212
lang="en"
13-
rev="10">
13+
rev="11">
1414

1515
<section id="summary">
1616

@@ -661,7 +661,7 @@ Passphrases are tried in turn when loading the key.
661661
[<literal>TLSv1.1</literal>]
662662
[<literal>TLSv1.2</literal>]
663663
[<literal>TLSv1.3</literal>]</syntax>
664-
<default>TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</default>
664+
<default>TLSv1.2 TLSv1.3</default>
665665
<context>http</context>
666666
<context>server</context>
667667
<context>location</context>

xml/en/docs/http/ngx_http_proxy_module.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<module name="Module ngx_http_proxy_module"
1111
link="/en/docs/http/ngx_http_proxy_module.html"
1212
lang="en"
13-
rev="78">
13+
rev="79">
1414

1515
<section id="summary">
1616

@@ -2156,7 +2156,7 @@ Passphrases are tried in turn when loading the key.
21562156
[<literal>TLSv1.1</literal>]
21572157
[<literal>TLSv1.2</literal>]
21582158
[<literal>TLSv1.3</literal>]</syntax>
2159-
<default>TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</default>
2159+
<default>TLSv1.2 TLSv1.3</default>
21602160
<context>http</context>
21612161
<context>server</context>
21622162
<context>location</context>

xml/en/docs/http/ngx_http_ssl_module.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<module name="Module ngx_http_ssl_module"
1111
link="/en/docs/http/ngx_http_ssl_module.html"
1212
lang="en"
13-
rev="63">
13+
rev="64">
1414

1515
<section id="summary">
1616

@@ -76,7 +76,7 @@ http {
7676
listen 443 ssl;
7777
<emphasis>keepalive_timeout 70;</emphasis>
7878

79-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
79+
ssl_protocols TLSv1.2 TLSv1.3;
8080
ssl_ciphers AES128-SHA:AES256-SHA:RC4-SHA:DES-CBC3-SHA:RC4-MD5;
8181
ssl_certificate /usr/local/nginx/conf/cert.pem;
8282
ssl_certificate_key /usr/local/nginx/conf/cert.key;
@@ -621,7 +621,7 @@ ciphers when using the SSLv3 and TLS protocols.
621621
[<literal>TLSv1.1</literal>]
622622
[<literal>TLSv1.2</literal>]
623623
[<literal>TLSv1.3</literal>]</syntax>
624-
<default>TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</default>
624+
<default>TLSv1.2 TLSv1.3</default>
625625
<context>http</context>
626626
<context>server</context>
627627

xml/en/docs/http/ngx_http_uwsgi_module.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<module name="Module ngx_http_uwsgi_module"
1111
link="/en/docs/http/ngx_http_uwsgi_module.html"
1212
lang="en"
13-
rev="51">
13+
rev="52">
1414

1515
<section id="summary">
1616

@@ -1573,7 +1573,7 @@ Passphrases are tried in turn when loading the key.
15731573
[<literal>TLSv1.1</literal>]
15741574
[<literal>TLSv1.2</literal>]
15751575
[<literal>TLSv1.3</literal>]</syntax>
1576-
<default>TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</default>
1576+
<default>TLSv1.2 TLSv1.3</default>
15771577
<context>http</context>
15781578
<context>server</context>
15791579
<context>location</context>

xml/en/docs/mail/ngx_mail_ssl_module.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<module name="Module ngx_mail_ssl_module"
1111
link="/en/docs/mail/ngx_mail_ssl_module.html"
1212
lang="en"
13-
rev="28">
13+
rev="29">
1414

1515
<section id="summary">
1616

@@ -69,7 +69,7 @@ mail {
6969
server {
7070
listen 993 ssl;
7171

72-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
72+
ssl_protocols TLSv1.2 TLSv1.3;
7373
ssl_ciphers AES128-SHA:AES256-SHA:RC4-SHA:DES-CBC3-SHA:RC4-MD5;
7474
ssl_certificate /usr/local/nginx/conf/cert.pem;
7575
ssl_certificate_key /usr/local/nginx/conf/cert.key;
@@ -421,7 +421,7 @@ when the SSLv3 and TLS protocols are used.
421421
[<literal>TLSv1.1</literal>]
422422
[<literal>TLSv1.2</literal>]
423423
[<literal>TLSv1.3</literal>]</syntax>
424-
<default>TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</default>
424+
<default>TLSv1.2 TLSv1.3</default>
425425
<context>mail</context>
426426
<context>server</context>
427427

xml/en/docs/stream/ngx_stream_proxy_module.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<module name="Module ngx_stream_proxy_module"
1010
link="/en/docs/stream/ngx_stream_proxy_module.html"
1111
lang="en"
12-
rev="32">
12+
rev="33">
1313

1414
<section id="summary">
1515

@@ -568,7 +568,7 @@ Passphrases are tried in turn when loading the key.
568568
[<literal>TLSv1.1</literal>]
569569
[<literal>TLSv1.2</literal>]
570570
[<literal>TLSv1.3</literal>]</syntax>
571-
<default>TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</default>
571+
<default>TLSv1.2 TLSv1.3</default>
572572
<context>stream</context>
573573
<context>server</context>
574574

xml/en/docs/stream/ngx_stream_ssl_module.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<module name="Module ngx_stream_ssl_module"
1010
link="/en/docs/stream/ngx_stream_ssl_module.html"
1111
lang="en"
12-
rev="36">
12+
rev="37">
1313

1414
<section id="summary">
1515

@@ -62,7 +62,7 @@ stream {
6262
server {
6363
listen 12345 ssl;
6464

65-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
65+
ssl_protocols TLSv1.2 TLSv1.3;
6666
ssl_ciphers AES128-SHA:AES256-SHA:RC4-SHA:DES-CBC3-SHA:RC4-MD5;
6767
ssl_certificate /usr/local/nginx/conf/cert.pem;
6868
ssl_certificate_key /usr/local/nginx/conf/cert.key;
@@ -556,7 +556,7 @@ when the SSLv3 and TLS protocols are used.
556556
[<literal>TLSv1.1</literal>]
557557
[<literal>TLSv1.2</literal>]
558558
[<literal>TLSv1.3</literal>]</syntax>
559-
<default>TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</default>
559+
<default>TLSv1.2 TLSv1.3</default>
560560
<context>stream</context>
561561
<context>server</context>
562562

xml/en/docs/stream/ngx_stream_zone_sync_module.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<module name="Module ngx_stream_zone_sync_module"
1010
link="/en/docs/stream/ngx_stream_zone_sync_module.html"
1111
lang="en"
12-
rev="7">
12+
rev="8">
1313

1414
<section id="summary">
1515

@@ -417,7 +417,7 @@ Passphrases are tried in turn when loading the key.
417417
[<literal>TLSv1.1</literal>]
418418
[<literal>TLSv1.2</literal>]
419419
[<literal>TLSv1.3</literal>]</syntax>
420-
<default>TLSv1 TLSv1.1 TLSv1.2</default>
420+
<default>TLSv1.2 TLSv1.3</default>
421421
<context>stream</context>
422422
<context>server</context>
423423

xml/ru/docs/http/configuring_https_servers.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<article name="Настройка HTTPS-серверов"
99
link="/ru/docs/http/configuring_https_servers.html"
1010
lang="ru"
11-
rev="14"
11+
rev="15"
1212
author="Игорь Сысоев"
1313
editor="Brian Mercer">
1414

@@ -30,7 +30,7 @@ server {
3030
server_name www.example.com;
3131
ssl_certificate <b>www.example.com.crt</b>;
3232
ssl_certificate_key <b>www.example.com.key</b>;
33-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
33+
ssl_protocols TLSv1.2 TLSv1.3;
3434
ssl_ciphers HIGH:!aNULL:!MD5;
3535
...
3636
}
@@ -58,7 +58,7 @@ server {
5858
можно ограничить соединения
5959
использованием только “сильных” версий и шифров SSL/TLS.
6060
По умолчанию nginx использует
61-
“<literal>ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3</literal>” и
61+
“<literal>ssl_protocols TLSv1.2 TLSv1.3</literal>” и
6262
“<literal>ssl_ciphers HIGH:!aNULL:!MD5</literal>”,
6363
поэтому их явная настройка в общем случае не требуется.
6464
Следует отметить, что значения по умолчанию этих директив несколько раз
@@ -108,7 +108,7 @@ http {
108108

109109
ssl_certificate www.example.com.crt;
110110
ssl_certificate_key www.example.com.key;
111-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
111+
ssl_protocols TLSv1.2 TLSv1.3;
112112
ssl_ciphers HIGH:!aNULL:!MD5;
113113
...
114114
</programlisting>
@@ -444,6 +444,13 @@ SNI поддерживается начиная с версии 0.5.23.
444444
<para>
445445
<list type="bullet">
446446

447+
<listitem>
448+
Версия 1.27.3 и более поздние: протоколами SSL по умолчанию являются
449+
TLSv1.2 и TLSv1.3 (если поддерживается библиотекой OpenSSL).
450+
В противном случае, при использовании OpenSSL 1.0.0 и более старых версий,
451+
протоколами SSL по умолчанию являются TLSv1 и TLSv1.1.
452+
</listitem>
453+
447454
<listitem>
448455
Версия 1.23.4 и более поздние: протоколами SSL по умолчанию являются
449456
TLSv1, TLSv1.1, TLSv1.2 и TLSv1.3 (если поддерживается библиотекой OpenSSL).

0 commit comments

Comments
 (0)