Annotation of /trunk/proftpd/patches/proftpd-1.3.3-config-tls-fixup.patch
Parent Directory | Revision Log
Revision 999 -
(hide annotations)
(download)
Thu Mar 4 13:37:20 2010 UTC (14 years, 6 months ago) by niro
File size: 3105 byte(s)
Thu Mar 4 13:37:20 2010 UTC (14 years, 6 months ago) by niro
File size: 3105 byte(s)
-more tls fixes
1 | niro | 999 | diff -Naur proftpd-1.3.3/sample-configurations/anonymous.conf proftpd-1.3.3-magellan/sample-configurations/anonymous.conf |
2 | --- proftpd-1.3.3/sample-configurations/anonymous.conf 2010-03-04 14:27:35.000000000 +0100 | ||
3 | +++ proftpd-1.3.3-magellan/sample-configurations/anonymous.conf 2010-03-04 14:30:51.000000000 +0100 | ||
4 | @@ -65,6 +65,9 @@ | ||
5 | TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
6 | TLSCipherSuite ALL:!ADH:!DES | ||
7 | TLSOptions NoCertRequest | ||
8 | + # You may want to add 'NoSessionReuseRequired' to TLSOptions, as there | ||
9 | + # are some clients (e.g. curl) which do not reuse SSL sessions. | ||
10 | + #TLSOptions NoCertRequest NoSessionReuseRequired | ||
11 | TLSVerifyClient off | ||
12 | #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 | ||
13 | TLSLog /var/log/proftpd/tls.log | ||
14 | diff -Naur proftpd-1.3.3/sample-configurations/basic.conf proftpd-1.3.3-magellan/sample-configurations/basic.conf | ||
15 | --- proftpd-1.3.3/sample-configurations/basic.conf 2010-03-04 14:27:35.000000000 +0100 | ||
16 | +++ proftpd-1.3.3-magellan/sample-configurations/basic.conf 2010-03-04 14:31:19.000000000 +0100 | ||
17 | @@ -66,6 +66,9 @@ | ||
18 | TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
19 | TLSCipherSuite ALL:!ADH:!DES | ||
20 | TLSOptions NoCertRequest | ||
21 | + # You may want to add 'NoSessionReuseRequired' to TLSOptions, as there | ||
22 | + # are some clients (e.g. curl) which do not reuse SSL sessions. | ||
23 | + #TLSOptions NoCertRequest NoSessionReuseRequired | ||
24 | TLSVerifyClient off | ||
25 | #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 | ||
26 | TLSLog /var/log/proftpd/tls.log | ||
27 | diff -Naur proftpd-1.3.3/sample-configurations/mod_sql.conf proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf | ||
28 | --- proftpd-1.3.3/sample-configurations/mod_sql.conf 2010-03-04 14:27:35.000000000 +0100 | ||
29 | +++ proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf 2010-03-04 14:31:36.000000000 +0100 | ||
30 | @@ -96,6 +96,9 @@ | ||
31 | TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
32 | TLSCipherSuite ALL:!ADH:!DES | ||
33 | TLSOptions NoCertRequest | ||
34 | + # You may want to add 'NoSessionReuseRequired' to TLSOptions, as there | ||
35 | + # are some clients (e.g. curl) which do not reuse SSL sessions. | ||
36 | + #TLSOptions NoCertRequest NoSessionReuseRequired | ||
37 | TLSVerifyClient off | ||
38 | #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 | ||
39 | TLSLog /var/log/proftpd/tls.log | ||
40 | diff -Naur proftpd-1.3.3/sample-configurations/virtual.conf proftpd-1.3.3-magellan/sample-configurations/virtual.conf | ||
41 | --- proftpd-1.3.3/sample-configurations/virtual.conf 2010-03-04 14:27:35.000000000 +0100 | ||
42 | +++ proftpd-1.3.3-magellan/sample-configurations/virtual.conf 2010-03-04 14:31:48.000000000 +0100 | ||
43 | @@ -61,6 +61,9 @@ | ||
44 | TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.pem | ||
45 | TLSCipherSuite ALL:!ADH:!DES | ||
46 | TLSOptions NoCertRequest | ||
47 | + # You may want to add 'NoSessionReuseRequired' to TLSOptions, as there | ||
48 | + # are some clients (e.g. curl) which do not reuse SSL sessions. | ||
49 | + #TLSOptions NoCertRequest NoSessionReuseRequired | ||
50 | TLSVerifyClient off | ||
51 | #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300 | ||
52 | TLSLog /var/log/proftpd/tls.log |