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: remove deprecated gnutls types.

Browse Source
This commit is contained in:
Tim Ruehsen 2012-05-11 15:45:44 +02:00 committed by Giuseppe Scrivano
parent e41d044e16
commit 0b4c04b583
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2012-05-13 Tim Ruehsen <tim.ruehsen@gmx.de>
* gnutls.c (credentials): Change type to
gnutls_certificate_credentials_t.
(ssl_init): Do not use deprecated types.
(ssl_connect_wget): Likewise.
2012-04-11 Gijs van Tulder <gvtulder@gmail.com> 2012-04-11 Gijs van Tulder <gvtulder@gmail.com>
* init.c: Add --accept-regex, --reject-regex and --regex-type. * init.c: Add --accept-regex, --reject-regex and --regex-type.

12
src/gnutls.c
View File

@ -75,7 +75,7 @@ key_type_to_gnutls_type (enum keyfile_type type)
confused with actual gnutls functions -- such as the gnutls_read confused with actual gnutls functions -- such as the gnutls_read
preprocessor macro. */ preprocessor macro. */
static gnutls_certificate_credentials credentials; static gnutls_certificate_credentials_t credentials;
bool bool
ssl_init (void) ssl_init (void)
{ {
@ -165,7 +165,7 @@ cert to be of the same type.\n"));
struct wgnutls_transport_context struct wgnutls_transport_context
{ {
gnutls_session session; /* GnuTLS session handle */ gnutls_session_t session; /* GnuTLS session handle */
int last_error; /* last error returned by read/write/... */ int last_error; /* last error returned by read/write/... */
/* Since GnuTLS doesn't support the equivalent to recv(..., /* Since GnuTLS doesn't support the equivalent to recv(...,
@ -374,7 +374,7 @@ bool
ssl_connect_wget (int fd, const char *hostname) ssl_connect_wget (int fd, const char *hostname)
{ {
struct wgnutls_transport_context *ctx; struct wgnutls_transport_context *ctx;
gnutls_session session; gnutls_session_t session;
int err; int err;
gnutls_init (&session, GNUTLS_CLIENT); gnutls_init (&session, GNUTLS_CLIENT);
@ -390,7 +390,7 @@ ssl_connect_wget (int fd, const char *hostname)
#ifndef FD_TO_SOCKET #ifndef FD_TO_SOCKET
# define FD_TO_SOCKET(X) (X) # define FD_TO_SOCKET(X) (X)
#endif #endif
gnutls_transport_set_ptr (session, (gnutls_transport_ptr) FD_TO_SOCKET (fd)); gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) FD_TO_SOCKET (fd));
err = 0; err = 0;
#if HAVE_GNUTLS_PRIORITY_SET_DIRECT #if HAVE_GNUTLS_PRIORITY_SET_DIRECT
@ -497,8 +497,8 @@ ssl_check_certificate (int fd, const char *host)
if (gnutls_certificate_type_get (ctx->session) == GNUTLS_CRT_X509) if (gnutls_certificate_type_get (ctx->session) == GNUTLS_CRT_X509)
{ {
time_t now = time (NULL); time_t now = time (NULL);
gnutls_x509_crt cert; gnutls_x509_crt_t cert;
const gnutls_datum *cert_list; const gnutls_datum_t *cert_list;
unsigned int cert_list_size; unsigned int cert_list_size;
if ((err = gnutls_x509_crt_init (&cert)) < 0) if ((err = gnutls_x509_crt_init (&cert)) < 0)