gnutls/gnutls-3.5.1-default-policy...

32 lines
864 B
Diff
Raw Normal View History

2016-06-15 07:52:19 +00:00
diff --git a/lib/priority.c b/lib/priority.c
index 767312c..0657940 100644
--- a/lib/priority.c
+++ b/lib/priority.c
@@ -1215,6 +1215,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
2015-05-04 11:01:32 +00:00
bulk_rmadd_func *bulk_fn;
bulk_rmadd_func *bulk_given_fn;
const cipher_entry_st *centry;
2016-06-15 07:52:19 +00:00
+ unsigned dset;
2015-05-04 11:01:32 +00:00
if (err_pos)
*err_pos = priorities;
2016-06-15 07:52:19 +00:00
@@ -1232,10 +1233,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache,
2015-05-04 11:01:32 +00:00
(*priority_cache)->sr = SR_PARTIAL;
(*priority_cache)->min_record_version = 1;
- if (priorities == NULL)
- priorities = "NORMAL";
+ if (priorities == NULL) {
+ priorities = "@SYSTEM";
+ dset = 1;
+ }
2016-06-15 07:52:19 +00:00
darg = _gnutls_resolve_priorities(priorities);
2015-05-04 11:01:32 +00:00
+ if (darg == NULL && dset == 1) {
+ priorities = "NORMAL";
2016-06-15 07:52:19 +00:00
+ darg = _gnutls_resolve_priorities(priorities);
2015-05-04 11:01:32 +00:00
+ }
if (darg == NULL) {
gnutls_assert();
goto error;