32 lines
880 B
Diff
32 lines
880 B
Diff
|
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
|
||
|
index 06e6cf4..17d830e 100644
|
||
|
--- a/lib/gnutls_priority.c
|
||
|
+++ b/lib/gnutls_priority.c
|
||
|
@@ -1060,6 +1060,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
|
||
|
bulk_rmadd_func *bulk_fn;
|
||
|
bulk_rmadd_func *bulk_given_fn;
|
||
|
const cipher_entry_st *centry;
|
||
|
+ unsigned dset = 0;
|
||
|
|
||
|
if (err_pos)
|
||
|
*err_pos = priorities;
|
||
|
@@ -1077,10 +1078,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
|
||
|
(*priority_cache)->sr = SR_PARTIAL;
|
||
|
(*priority_cache)->min_record_version = 1;
|
||
|
|
||
|
- if (priorities == NULL)
|
||
|
- priorities = "NORMAL";
|
||
|
+ if (priorities == NULL) {
|
||
|
+ priorities = "@SYSTEM";
|
||
|
+ dset = 1;
|
||
|
+ }
|
||
|
|
||
|
darg = resolve_priorities(priorities);
|
||
|
+ if (darg == NULL && dset == 1) {
|
||
|
+ priorities = "NORMAL";
|
||
|
+ darg = resolve_priorities(priorities);
|
||
|
+ }
|
||
|
if (darg == NULL) {
|
||
|
gnutls_assert();
|
||
|
goto error;
|