diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-10-30 10:28:20 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-10-30 11:27:19 +0100 |
commit | 99d891d21ba6e556dce8003924c1ac579cf122b0 (patch) | |
tree | ba78e841d23a451c2aa531b0e38a5c649090d7f7 | |
parent | ff242afece37072927dde1428aa920b5417c43cb (diff) | |
download | gnutls-tmp-fix-serv.tar.gz |
gnutls-serv: use default priorities when none are giventmp-fix-serv
This makes it in par with gnutls-cli.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r-- | src/serv.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/serv.c b/src/serv.c index ffaffc98ae..af58edd9cb 100644 --- a/src/serv.c +++ b/src/serv.c @@ -376,9 +376,6 @@ gnutls_session_t initialize_session(int dtls) gnutls_datum_t alpn[MAX_ALPN_PROTOCOLS]; unsigned alpn_size; - if (priorities == NULL) - priorities = "NORMAL"; - if (dtls) gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM | GNUTLS_POST_HANDSHAKE_AUTH); else @@ -406,9 +403,18 @@ gnutls_session_t initialize_session(int dtls) gnutls_handshake_set_post_client_hello_function(session, &post_client_hello); - if (gnutls_priority_set_direct(session, priorities, &err) < 0) { - fprintf(stderr, "Syntax error at: %s\n", err); - exit(1); + if (priorities == NULL) { + ret = gnutls_set_default_priority(session); + if (ret < 0) { + fprintf(stderr, "Could not set default policy: %s\n", gnutls_strerror(ret)); + exit(1); + } + } else { + ret = gnutls_priority_set_direct(session, priorities, &err); + if (ret < 0) { + fprintf(stderr, "Syntax error at: %s\n", err); + exit(1); + } } alpn_size = MIN(MAX_ALPN_PROTOCOLS,alpn_protos_size); |