summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-09-09 15:04:52 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-09-09 15:04:52 +0200
commit7d96b50602e7a897852c9ab51716ee49c58a6f77 (patch)
tree8dad4c16709180849119598903b5744304c2501c
parent91b3c62589a6e58ca87c229bc1fe8503d6e09c38 (diff)
downloadgnutls-7d96b50602e7a897852c9ab51716ee49c58a6f77.tar.gz
gnutls-cli: use gnutls_set_default_priority if no priorities are given
-rw-r--r--src/cli.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/src/cli.c b/src/cli.c
index 8e446f265e..2a65085f17 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -673,14 +673,23 @@ gnutls_session_t init_tls_session(const char *host)
} else
gnutls_init(&session, init_flags);
- if ((ret =
- gnutls_priority_set_direct(session, priorities, &err)) < 0) {
- if (ret == GNUTLS_E_INVALID_REQUEST)
- fprintf(stderr, "Syntax error at: %s\n", err);
- else
- fprintf(stderr, "Error in priorities: %s\n",
- gnutls_strerror(ret));
- exit(1);
+ if (priorities == NULL) {
+ ret = gnutls_set_default_priority(session);
+ if (ret < 0) {
+ fprintf(stderr, "Error in setting priorities: %s\n",
+ gnutls_strerror(ret));
+ exit(1);
+ }
+ } else {
+ ret = gnutls_priority_set_direct(session, priorities, &err);
+ if (ret < 0) {
+ if (ret == GNUTLS_E_INVALID_REQUEST)
+ fprintf(stderr, "Syntax error at: %s\n", err);
+ else
+ fprintf(stderr, "Error in priorities: %s\n",
+ gnutls_strerror(ret));
+ exit(1);
+ }
}
/* allow the use of private ciphersuites.