|
 |
b07b343 |
--- ./prelude-admin/server.c 2016-11-21 16:52:01.839000884 +0100
|
|
|
b07b343 |
+++ ./prelude-admin/server.c 2016-11-26 11:48:52.695000891 +0100
|
|
|
b07b343 |
@@ -145,22 +145,10 @@
|
|
|
b07b343 |
gnutls_session_t session;
|
|
|
b07b343 |
const char *err;
|
|
|
b07b343 |
|
|
|
b07b343 |
-#if defined LIBGNUTLS_VERSION_MAJOR && LIBGNUTLS_VERSION_MAJOR >= 3
|
|
|
b07b343 |
-# define TLS_DH_STR "+ANON-ECDH:+ANON-DH"
|
|
|
b07b343 |
-#else
|
|
|
b07b343 |
-# define TLS_DH_STR "+ANON-DH"
|
|
|
b07b343 |
-#endif
|
|
|
b07b343 |
-
|
|
|
b07b343 |
-#ifdef GNUTLS_SRP_ENABLED
|
|
|
b07b343 |
- const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
|
|
|
b07b343 |
-#else
|
|
|
b07b343 |
- const char *pstring = "NORMAL:" TLS_DH_STR;
|
|
|
b07b343 |
-#endif
|
|
|
b07b343 |
-
|
|
|
b07b343 |
gnutls_init(&session, GNUTLS_SERVER);
|
|
|
b07b343 |
gnutls_set_default_priority(session);
|
|
|
b07b343 |
|
|
|
b07b343 |
- ret = gnutls_priority_set_direct(session, pstring, &err;;
|
|
|
b07b343 |
+ ret = gnutls_priority_set_direct(session, "@SYSTEM", &err;;
|
|
|
b07b343 |
if (ret < 0) {
|
|
|
b07b343 |
fprintf(stderr, "TLS priority syntax error at: %s\n", err);
|
|
|
b07b343 |
return NULL;
|
|
|
b07b343 |
--- ./src/tls-auth.c 2016-09-15 08:49:10.809000884 +0200
|
|
|
b07b343 |
+++ ./src/tls-auth.c 2016-11-30 23:08:58.649439656 +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));
|