moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

gnutls: do not use a deprecated function.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-08-05 21:36:08 +02:00
parent 473ec526d2
commit c6cf57d215
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-05 Giuseppe Scrivano <giuseppe@southpole.se>
* gnutls.c (ssl_connect_wget): Use `gnutls_priority_set_direct' instead
of the deprecated `gnutls_protocol_set_priority'.
2011-08-02 Giuseppe Scrivano <giuseppe@southpole.se> 2011-08-02 Giuseppe Scrivano <giuseppe@southpole.se>
* cookies.c (parse_set_cookie): If the value is quoted, do not modify * cookies.c (parse_set_cookie): If the value is quoted, do not modify

9
src/gnutls.c
View File

@ -246,7 +246,6 @@ ssl_connect_wget (int fd)
struct wgnutls_transport_context *ctx; struct wgnutls_transport_context *ctx;
gnutls_session session; gnutls_session session;
int err; int err;
int allowed_protocols[4] = {0, 0, 0, 0};
gnutls_init (&session, GNUTLS_CLIENT); gnutls_init (&session, GNUTLS_CLIENT);
gnutls_set_default_priority (session); gnutls_set_default_priority (session);
gnutls_certificate_type_set_priority (session, cert_type_priority); gnutls_certificate_type_set_priority (session, cert_type_priority);
@ -263,14 +262,10 @@ ssl_connect_wget (int fd)
break; break;
case secure_protocol_sslv2: case secure_protocol_sslv2:
case secure_protocol_sslv3: case secure_protocol_sslv3:
allowed_protocols[0] = GNUTLS_SSL3; err = gnutls_priority_set_direct (session, "NORMAL:-VERS-TLS-ALL", NULL);
err = gnutls_protocol_set_priority (session, allowed_protocols);
break; break;
case secure_protocol_tlsv1: case secure_protocol_tlsv1:
allowed_protocols[0] = GNUTLS_TLS1_0; err = gnutls_priority_set_direct (session, "NORMAL:-VERS-SSL3.0", NULL);
allowed_protocols[1] = GNUTLS_TLS1_1;
allowed_protocols[2] = GNUTLS_TLS1_2;
err = gnutls_protocol_set_priority (session, allowed_protocols);
break; break;
default: default:
abort (); abort ();