|
 |
76842a9 |
--- ./prelude-admin/server.c 2016-09-15 08:49:10.785000884 +0200
|
|
|
76842a9 |
+++ ./prelude-admin/server.c 2017-02-05 10:29:25.051965998 +0100
|
|
|
76842a9 |
@@ -152,9 +152,9 @@
|
|
|
76842a9 |
#endif
|
|
|
b07b343 |
|
|
|
76842a9 |
#ifdef GNUTLS_SRP_ENABLED
|
|
|
b07b343 |
- const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
|
|
|
76842a9 |
+ const char *pstring = "@SYSTEM:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
|
|
|
76842a9 |
#else
|
|
|
b07b343 |
- const char *pstring = "NORMAL:" TLS_DH_STR;
|
|
|
76842a9 |
+ const char *pstring = "@SYSTEM:" TLS_DH_STR;
|
|
|
76842a9 |
#endif
|
|
|
76842a9 |
|
|
|
b07b343 |
gnutls_init(&session, GNUTLS_SERVER);
|
|
|
76842a9 |
--- ./prelude-admin/prelude-admin.c 2016-09-15 08:49:10.785000884 +0200
|
|
|
76842a9 |
+++ ./prelude-admin/prelude-admin.c 2017-02-05 10:30:02.507127046 +0100
|
|
|
76842a9 |
@@ -897,9 +897,9 @@
|
|
|
76842a9 |
#endif
|
|
|
76842a9 |
|
|
|
76842a9 |
#ifdef GNUTLS_SRP_ENABLED
|
|
|
76842a9 |
- const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
|
|
|
76842a9 |
+ const char *pstring = "@SYSTEM:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
|
|
|
76842a9 |
#else
|
|
|
76842a9 |
- const char *pstring = "NORMAL:" TLS_DH_STR;
|
|
|
76842a9 |
+ const char *pstring = "@SYSTEM:" TLS_DH_STR;
|
|
|
76842a9 |
#endif
|
|
|
b07b343 |
|
|
|
76842a9 |
gnutls_init(&session, GNUTLS_CLIENT);
|
|
|
76842a9 |
--- ./client.conf.in 2016-09-15 08:49:10.732000884 +0200
|
|
|
76842a9 |
+++ ./client.conf.in 2017-02-05 10:32:07.132334930 +0100
|
|
|
76842a9 |
@@ -58,7 +58,7 @@
|
|
|
76842a9 |
# Sets priorities for the ciphers, key exchange methods, macs and
|
|
|
76842a9 |
# compression methods.
|
|
|
76842a9 |
#
|
|
|
76842a9 |
-# "NORMAL" option enables all "secure" ciphersuites. The 256-bit
|
|
|
76842a9 |
+# "@SYSTEM" option enables all "secure" ciphersuites. The 256-bit
|
|
|
76842a9 |
# ciphers are included as a fallback only. The ciphers are sorted by
|
|
|
76842a9 |
# security margin.
|
|
|
76842a9 |
#
|
|
|
76842a9 |
@@ -77,5 +77,5 @@
|
|
|
76842a9 |
# Note that much more settings might be enabled or disabled using this
|
|
|
76842a9 |
# option: please see gnutls_priority_init(3) for more details.
|
|
|
76842a9 |
#
|
|
|
76842a9 |
-# The default settings is "NORMAL".
|
|
|
76842a9 |
-# tls-options = NORMAL
|
|
|
76842a9 |
+# The default settings is "@SYSTEM".
|
|
|
76842a9 |
+# tls-options = @SYSTEM
|
|
|
b07b343 |
--- ./src/tls-auth.c 2016-09-15 08:49:10.809000884 +0200
|
|
|
76842a9 |
+++ ./src/tls-auth.c 2017-02-05 10:31:14.194521137 +0100
|
|
|
b07b343 |
@@ -232,7 +232,7 @@
|
|
|
b07b343 |
int ret;
|
|
|
b07b343 |
const char *errptr;
|
|
|
b07b343 |
|
|
|
b07b343 |
- ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "NORMAL", &errptr);
|
|
|
b07b343 |
+ ret = gnutls_priority_init(&tls_priority, (tlsopts) ? tlsopts : "@SYSTEM", &errptr);
|
|
|
b07b343 |
if ( ret < 0 )
|
|
|
b07b343 |
return prelude_error_verbose_make(PRELUDE_ERROR_SOURCE_CLIENT, PRELUDE_ERROR_TLS,
|
|
|
b07b343 |
"TLS options '%s': %s", errptr, gnutls_strerror(ret));
|