diff -up filezilla-3.8.0/src/engine/tlssocket.cpp.no-sign-all filezilla-3.8.0/src/engine/tlssocket.cpp
old
|
new
|
|
6 | 6 | #include <gnutls/x509.h> |
7 | 7 | #include <errno.h> |
8 | 8 | |
9 | | #if GNUTLS_VERSION_NUMBER >= 0x030100 |
10 | | char const ciphers[] = "SECURE256:+SECURE128:+ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-ALL:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP"; |
11 | | #else |
| 9 | #if GNUTLS_VERSION_NUMBER < 0x020b05 |
| 10 | // Versions before 2.11.5 don't support SIGN-ALL |
| 11 | char const ciphers[] = "SECURE128:+ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-RSA-SHA512:+SIGN-RSA-SHA384:+SIGN-RSA-SHA256:+SIGN-RSA-SHA:+SIGN-RSA-RMD160:+SIGN-DSA-SHA:+CTYPE-X509:-CTYPE-OPENPGP"; |
| 12 | #elif GNUTLS_VERSION_NUMBER < 0x030100 |
12 | 13 | // Versions before 3.1.0 cannot combine level keywords |
13 | 14 | char const ciphers[] = "SECURE128:+ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-ALL:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP"; |
| 15 | #else |
| 16 | char const ciphers[] = "SECURE256:+SECURE128:+ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-ALL:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP"; |
14 | 17 | #endif |
15 | 18 | |
16 | 19 | //#define TLSDEBUG 1 |