gnutls_global_init ();
gnutls_certificate_allocate_credentials (&credentials);
+ gnutls_certificate_set_verify_flags(credentials,
+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
ca_directory = opt.ca_directory ? opt.ca_directory : "/etc/ssl/certs";
do
ret = gnutls_record_recv (ctx->session, buf, bufsize);
- while (ret == GNUTLS_E_INTERRUPTED);
+ while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
if (ret < 0)
ctx->last_error = ret;
struct wgnutls_transport_context *ctx = arg;
do
ret = gnutls_record_send (ctx->session, buf, bufsize);
- while (ret == GNUTLS_E_INTERRUPTED);
+ while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
if (ret < 0)
ctx->last_error = ret;
return ret;
static int
wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
{
- int ret = 0;
+ int ret = 0, read = 0;
struct wgnutls_transport_context *ctx = arg;
int offset = MIN (bufsize, ctx->peeklen);
if (bufsize > sizeof ctx->peekbuf)
return ret;
#else
/* XXX: Assume it was blocking before. */
- const int zero = 0;
- ret = ioctl (fd, FIONBIO, &zero);
+ const int one = 1;
+ ret = ioctl (fd, FIONBIO, &one);
if (ret < 0)
return ret;
#endif
- do
- {
- ret = gnutls_record_recv (ctx->session, buf + offset,
- bufsize - offset);
- }
- while (ret == GNUTLS_E_INTERRUPTED);
-
- if (ret < 0)
+ read = gnutls_record_recv (ctx->session, buf + offset,
+ bufsize - offset);
+ if (read < 0)
{
if (offset)
- ret = 0;
+ read = 0;
else
- return ret;
+ return read;
}
- if (ret > 0)
+ if (read > 0)
{
memcpy (ctx->peekbuf + offset, buf + offset,
- ret);
- ctx->peeklen += ret;
+ read);
+ ctx->peeklen += read;
}
#ifdef F_GETFL
- fcntl (fd, F_SETFL, flags);
+ ret = fcntl (fd, F_SETFL, flags);
if (ret < 0)
return ret;
#else
- const int one = 1;
- ret = ioctl (fd, FIONBIO, &one);
+ const int zero = 0;
+ ret = ioctl (fd, FIONBIO, &zero);
if (ret < 0)
return ret;
#endif
}
- return offset + ret;
+ return offset + read;
}
static const char *