-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: tcpip.c,v 1.30 2006-09-15 09:06:28 adam Exp $
*/
/**
* \file tcpip.c
#include <stdio.h>
#include <string.h>
+#include <assert.h>
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
#endif
#ifdef WIN32
+/* VS 2003 or later has getaddrinfo; older versions do not */
#include <winsock2.h>
+#if _MSC_VER >= 1300
#include <ws2tcpip.h>
#define HAVE_GETADDRINFO 1
#else
+#define HAVE_GETADDRINFO 0
+#endif
+#endif
+
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#if HAVE_NETDB_H
#include <netdb.h>
+#endif
+#if HAVE_ARPA_INET_H
#include <arpa/inet.h>
+#endif
+#if HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
-
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#if HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+#if HAVE_GNUTLS_H
+#include <gnutls/x509.h>
+#include <gnutls/gnutls.h>
+#define ENABLE_SSL 1
+#endif
+
#if HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h>
#include <openssl/err.h>
+#define ENABLE_SSL 1
#endif
#include <yaz/comstack.h>
static int tcpip_close(COMSTACK h);
static int tcpip_put(COMSTACK h, char *buf, int size);
static int tcpip_get(COMSTACK h, char **buf, int *bufsize);
+static int tcpip_put_connect(COMSTACK h, char *buf, int size);
+static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize);
static int tcpip_connect(COMSTACK h, void *address);
static int tcpip_more(COMSTACK h);
static int tcpip_rcvconnect(COMSTACK h);
void *cd);
static int tcpip_set_blocking(COMSTACK p, int blocking);
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
static int ssl_get(COMSTACK h, char **buf, int *bufsize);
static int ssl_put(COMSTACK h, char *buf, int size);
#endif
#define YAZ_SOCKLEN_T int
#endif
+#if HAVE_GNUTLS_H
+struct tcpip_cred_ptr {
+ gnutls_certificate_credentials_t xcred;
+ int ref;
+};
+
+#endif
/* this state is used for both SSL and straight TCP/IP */
typedef struct tcpip_state
{
int written; /* -1 if we aren't writing */
int towrite; /* to verify against user input */
- int (*complete)(const unsigned char *buf, int len); /* length/comple. */
+ int (*complete)(const char *buf, int len); /* length/complete. */
#if HAVE_GETADDRINFO
struct addrinfo *ai;
#else
struct sockaddr_in addr; /* returned by cs_straddr */
#endif
char buf[128]; /* returned by cs_addrstr */
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ struct tcpip_cred_ptr *cred_ptr;
+ gnutls_session_t session;
+ char cert_fname[256];
+#elif HAVE_OPENSSL_SSL_H
SSL_CTX *ctx; /* current CTX. */
SSL_CTX *ctx_alloc; /* If =ctx it is owned by CS. If 0 it is not owned */
SSL *ssl;
char cert_fname[256];
#endif
+ char *connect_request_buf;
+ int connect_request_len;
+ char *connect_response_buf;
+ int connect_response_len;
} tcpip_state;
#ifdef WIN32
-static int tcpip_init (void)
+static int tcpip_init(void)
{
static int initialized = 0;
if (!initialized)
return 1;
}
#else
-static int tcpip_init (void)
+static int tcpip_init(void)
{
return 1;
}
COMSTACK p;
tcpip_state *sp;
- if (!tcpip_init ())
+ if (!tcpip_init())
return 0;
if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack))))
return 0;
p->stackerr = 0;
p->user = 0;
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ sp->cred_ptr = 0;
+ sp->session = 0;
+ strcpy(sp->cert_fname, "yaz.pem");
+#elif HAVE_OPENSSL_SSL_H
sp->ctx = sp->ctx_alloc = 0;
sp->ssl = 0;
strcpy(sp->cert_fname, "yaz.pem");
else
sp->complete = cs_complete_auto;
+ sp->connect_request_buf = 0;
+ sp->connect_request_len = 0;
+ sp->connect_response_buf = 0;
+ sp->connect_response_len = 0;
+
p->timeout = COMSTACK_DEFAULT_TIMEOUT;
TRC(fprintf(stderr, "Created new TCPIP comstack\n"));
return p;
}
-#if HAVE_OPENSSL_SSL_H
+COMSTACK yaz_tcpip_create(int s, int flags, int protocol,
+ const char *connect_host)
+{
+ COMSTACK p = tcpip_type(s, flags, protocol, 0);
+ if (!p)
+ return 0;
+ if (connect_host)
+ {
+ tcpip_state *sp = (tcpip_state *) p->cprivate;
+ sp->connect_request_buf = (char *) xmalloc(strlen(connect_host) + 30);
+ sprintf(sp->connect_request_buf, "CONNECT %s HTTP/1.0\r\n\r\n",
+ connect_host);
+ sp->connect_request_len = strlen(sp->connect_request_buf);
+ p->f_put = tcpip_put_connect;
+ p->f_get = tcpip_get_connect;
+ sp->complete = cs_complete_auto_head; /* only want HTTP header */
+ }
+ return p;
+}
+
+#if HAVE_GNUTLS_H
+static void tcpip_create_cred(COMSTACK cs)
+{
+ tcpip_state *sp = (tcpip_state *) cs->cprivate;
+ sp->cred_ptr = (struct tcpip_cred_ptr *) xmalloc(sizeof(*sp->cred_ptr));
+ sp->cred_ptr->ref = 1;
+ gnutls_certificate_allocate_credentials(&sp->cred_ptr->xcred);
+}
+
+#endif
COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
{
+#if !ENABLE_SSL
+ return 0;
+#else
tcpip_state *sp;
COMSTACK p;
- p = tcpip_type (s, flags, protocol, 0);
+ p = tcpip_type(s, flags, protocol, 0);
if (!p)
return 0;
p->f_get = ssl_get;
p->type = ssl_type;
sp = (tcpip_state *) p->cprivate;
+#if HAVE_GNUTLS_H
+ sp->session = (gnutls_session_t) vp;
+#elif HAVE_OPENSSL_SSL_H
sp->ctx = (SSL_CTX *) vp; /* may be NULL */
-
+#endif
/* note: we don't handle already opened socket in SSL mode - yet */
return p;
+#endif
+}
+
+#if ENABLE_SSL
+static int ssl_check_error(COMSTACK h, tcpip_state *sp, int res)
+{
+#if HAVE_OPENSSL_SSL_H
+ int err = SSL_get_error(sp->ssl, res);
+ TRC(fprintf(stderr, "got err=%d\n", err));
+ if (err == SSL_ERROR_WANT_READ)
+ {
+ TRC(fprintf(stderr, " -> SSL_ERROR_WANT_READ\n"));
+ h->io_pending = CS_WANT_READ;
+ return 1;
+ }
+ if (err == SSL_ERROR_WANT_WRITE)
+ {
+ TRC(fprintf(stderr, " -> SSL_ERROR_WANT_WRITE\n"));
+ h->io_pending = CS_WANT_WRITE;
+ return 1;
+ }
+#elif HAVE_GNUTLS_H
+ TRC(fprintf(stderr, "ssl_check_error error=%d fatal=%d msg=%s\n",
+ res,
+ gnutls_error_is_fatal(res),
+ gnutls_strerror(res)));
+ if (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED)
+ {
+ int dir = gnutls_record_get_direction(sp->session);
+ TRC(fprintf(stderr, " -> incomplete dir=%d\n", dir));
+ h->io_pending = dir ? CS_WANT_WRITE : CS_WANT_READ;
+ return 1;
+ }
+#endif
+ h->cerrno = CSERRORSSL;
+ return 0;
}
#endif
return 1;
}
-
#if HAVE_GETADDRINFO
+/** \brief Creates socket using particular address family (AF_)
+ \param ai getaddrinfo result
+ \param mask family mask
+ \returns socket or -1 if none could be created
+
+*/
+static int create_socket_family(struct addrinfo *ai, unsigned mask)
+{
+ for (; ai; ai = ai->ai_next)
+ {
+ if ((ai->ai_family & mask) == mask)
+ {
+ int s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (s != -1)
+ return s;
+ }
+ }
+ return -1;
+}
+
void *tcpip_straddr(COMSTACK h, const char *str)
{
tcpip_state *sp = (tcpip_state *)h->cprivate;
const char *port = "210";
if (h->protocol == PROTO_HTTP)
port = "80";
- if (!tcpip_init ())
+ if (!tcpip_init())
return 0;
if (sp->ai)
sp->ai = tcpip_getaddrinfo(str, port);
if (sp->ai && h->state == CS_ST_UNBND)
{
- int s = -1;
- struct addrinfo *ai = sp->ai;
- for (; ai; ai = ai->ai_next)
- {
- s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if (s != -1)
- break;
- }
+ /* The getaddrinfo call may return multiple addresses when passive
+ flags are used (AI_PASSIVE). This function picks the IPV6 if a
+ socket can be created for it. Otherwise IPV4 is used.
+ See also bug #2350 */
+ int s = create_socket_family(sp->ai, AF_INET6);
+ if (s == -1)
+ s = create_socket_family(sp->ai, AF_INET);
if (s == -1)
return 0;
h->iofile = s;
if (h->protocol == PROTO_HTTP)
port = 80;
- if (!tcpip_init ())
+ if (!tcpip_init())
return 0;
- if (!tcpip_strtoaddr_ex (str, &sp->addr, port))
+ if (!tcpip_strtoaddr_ex(str, &sp->addr, port))
return 0;
if (h->state == CS_ST_UNBND)
{
{
tcpip_state *sp = (tcpip_state *)h->cprivate;
- return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
- sp->altlen);
+ return sp->altlen && (*sp->complete)(sp->altbuf, sp->altlen);
}
/*
* This gives the connect a chance to negotiate with the other side
* (see 'man tcp')
*/
- if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) < 0 )
+ if (getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) < 0 )
{
h->cerrno = CSYSERR;
return -1;
TRC(fprintf( stderr, "Current Size of TCP Receive Buffer= %d\n",
recbuflen ));
recbuflen *= 10; /* lets be optimistic */
- if ( setsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, rbufsize ) < 0 )
+ if (setsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, rbufsize ) < 0 )
{
h->cerrno = CSYSERR;
return -1;
}
- if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) )
+ if (getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) )
{
h->cerrno = CSYSERR;
return -1;
}
- TRC(fprintf( stderr, "New Size of TCP Receive Buffer = %d\n",
- recbuflen ));
+ TRC(fprintf(stderr, "New Size of TCP Receive Buffer = %d\n",
+ recbuflen ));
#endif
#if HAVE_GETADDRINFO
h->event = CS_CONNECT;
h->state = CS_ST_CONNECTING;
- return tcpip_rcvconnect (h);
+ return tcpip_rcvconnect(h);
}
/*
*/
int tcpip_rcvconnect(COMSTACK h)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
tcpip_state *sp = (tcpip_state *)h->cprivate;
#endif
TRC(fprintf(stderr, "tcpip_rcvconnect\n"));
h->cerrno = CSOUTSTATE;
return -1;
}
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ if (h->type == ssl_type && !sp->session)
+ {
+ int res;
+ gnutls_global_init();
+
+ tcpip_create_cred(h);
+
+ gnutls_init(&sp->session, GNUTLS_CLIENT);
+ gnutls_set_default_priority(sp->session);
+ gnutls_credentials_set (sp->session, GNUTLS_CRD_CERTIFICATE,
+ sp->cred_ptr->xcred);
+
+ gnutls_transport_set_ptr(sp->session, (gnutls_transport_ptr_t) h->iofile);
+
+ res = gnutls_handshake(sp->session);
+ if (res < 0)
+ {
+ if (ssl_check_error(h, sp, res))
+ return 1;
+ return -1;
+ }
+ }
+#elif HAVE_OPENSSL_SSL_H
if (h->type == ssl_type && !sp->ctx)
{
+ SSL_library_init();
SSL_load_error_strings();
- SSLeay_add_all_algorithms();
- sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
+ sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_client_method());
if (!sp->ctx)
{
h->cerrno = CSERRORSSL;
if (!sp->ssl)
{
- sp->ssl = SSL_new (sp->ctx);
- SSL_set_fd (sp->ssl, h->iofile);
+ sp->ssl = SSL_new(sp->ctx);
+ SSL_set_fd(sp->ssl, h->iofile);
}
- res = SSL_connect (sp->ssl);
+ res = SSL_connect(sp->ssl);
if (res <= 0)
{
- int err = SSL_get_error(sp->ssl, res);
- if (err == SSL_ERROR_WANT_READ)
- {
- h->io_pending = CS_WANT_READ;
- return 1;
- }
- if (err == SSL_ERROR_WANT_WRITE)
- {
- h->io_pending = CS_WANT_WRITE;
+ if (ssl_check_error(h, sp, res))
return 1;
- }
- h->cerrno = CSERRORSSL;
return -1;
}
}
#define CERTF "ztest.pem"
#define KEYF "ztest.pem"
-static void tcpip_setsockopt (int fd)
+static void tcpip_setsockopt(int fd)
{
#if 0
int len = 4096;
#ifdef WIN32
BOOL one = 1;
#else
- unsigned long one = 1;
+ int one = 1;
#endif
#if HAVE_GETADDRINFO
}
#endif
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ if (h->type == ssl_type && !sp->session)
+ {
+ int res;
+ gnutls_global_init();
+
+ tcpip_create_cred(h);
+
+ res = gnutls_certificate_set_x509_key_file(sp->cred_ptr->xcred,
+ sp->cert_fname,
+ sp->cert_fname,
+ GNUTLS_X509_FMT_PEM);
+ if (res != GNUTLS_E_SUCCESS)
+ {
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
+ }
+#elif HAVE_OPENSSL_SSL_H
if (h->type == ssl_type && !sp->ctx)
{
+ SSL_library_init();
SSL_load_error_strings();
- SSLeay_add_all_algorithms();
- sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
+ sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_server_method());
if (!sp->ctx)
{
h->cerrno = CSERRORSSL;
if (sp->ctx_alloc)
{
int res;
- res = SSL_CTX_use_certificate_chain_file(sp->ctx, sp->cert_fname);
+ res = SSL_CTX_use_certificate_file(sp->ctx, sp->cert_fname,
+ SSL_FILETYPE_PEM);
if (res <= 0)
{
ERR_print_errors_fp(stderr);
- exit (2);
+ exit(2);
}
- res = SSL_CTX_use_PrivateKey_file (sp->ctx, sp->cert_fname,
+ res = SSL_CTX_use_PrivateKey_file(sp->ctx, sp->cert_fname,
SSL_FILETYPE_PEM);
if (res <= 0)
{
ERR_print_errors_fp(stderr);
- exit (3);
+ exit(3);
}
- res = SSL_CTX_check_private_key (sp->ctx);
+ res = SSL_CTX_check_private_key(sp->ctx);
if (res <= 0)
{
ERR_print_errors_fp(stderr);
exit(5);
}
}
- TRC (fprintf (stderr, "ssl_bind\n"));
+ TRC(fprintf(stderr, "ssl_bind\n"));
}
else
{
- TRC (fprintf (stderr, "tcpip_bind\n"));
+ TRC(fprintf(stderr, "tcpip_bind\n"));
}
#else
- TRC (fprintf (stderr, "tcpip_bind\n"));
+ TRC(fprintf(stderr, "tcpip_bind\n"));
#endif
#ifndef WIN32
if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*)
)
h->cerrno = CSNODATA;
else
+ {
+#ifdef WIN32
+ shutdown(h->iofile, SD_RECEIVE);
+#else
+ shutdown(h->iofile, SHUT_RD);
+#endif
+ listen(h->iofile, SOMAXCONN);
h->cerrno = CSYSERR;
+ }
return -1;
}
if (addrlen && (size_t) (*addrlen) >= sizeof(struct sockaddr_in))
return -1;
}
h->state = CS_ST_INCON;
- tcpip_setsockopt (h->newfd);
+ tcpip_setsockopt(h->newfd);
return 0;
}
COMSTACK tcpip_accept(COMSTACK h)
{
COMSTACK cnew;
- tcpip_state *state, *st = (tcpip_state *)h->cprivate;
#ifdef WIN32
unsigned long tru = 1;
#endif
- TRC(fprintf(stderr, "tcpip_accept\n"));
+ TRC(fprintf(stderr, "tcpip_accept h=%p pid=%d\n", h, getpid()));
if (h->state == CS_ST_INCON)
{
+ tcpip_state *state, *st = (tcpip_state *)h->cprivate;
if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew))))
{
h->cerrno = CSYSERR;
memcpy(cnew, h, sizeof(*h));
cnew->iofile = h->newfd;
cnew->io_pending = 0;
+
if (!(state = (tcpip_state *)
(cnew->cprivate = xmalloc(sizeof(tcpip_state)))))
{
#endif
h->newfd = -1;
}
- xfree (cnew);
- xfree (state);
+ xfree(cnew);
+ xfree(state);
return 0;
}
h->newfd = -1;
cnew->state = CS_ST_ACCEPT;
h->state = CS_ST_IDLE;
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ state->cred_ptr = st->cred_ptr;
+ state->session = 0;
+ if (st->cred_ptr)
+ {
+ int res;
+
+ (state->cred_ptr->ref)++;
+ gnutls_init(&state->session, GNUTLS_SERVER);
+ if (!state->session)
+ {
+ xfree(cnew);
+ xfree(state);
+ return 0;
+ }
+ res = gnutls_set_default_priority(state->session);
+ if (res != GNUTLS_E_SUCCESS)
+ {
+ xfree(cnew);
+ xfree(state);
+ return 0;
+ }
+ res = gnutls_credentials_set(state->session,
+ GNUTLS_CRD_CERTIFICATE,
+ st->cred_ptr->xcred);
+ if (res != GNUTLS_E_SUCCESS)
+ {
+ xfree(cnew);
+ xfree(state);
+ return 0;
+ }
+ gnutls_transport_set_ptr(state->session,
+ (gnutls_transport_ptr_t) cnew->iofile);
+ }
+#elif HAVE_OPENSSL_SSL_H
state->ctx = st->ctx;
state->ctx_alloc = 0;
state->ssl = st->ssl;
if (state->ctx)
{
- state->ssl = SSL_new (state->ctx);
- SSL_set_fd (state->ssl, cnew->iofile);
+ state->ssl = SSL_new(state->ctx);
+ SSL_set_fd(state->ssl, cnew->iofile);
}
#endif
+ state->connect_request_buf = 0;
+ state->connect_response_buf = 0;
h = cnew;
}
if (h->state == CS_ST_ACCEPT)
{
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
tcpip_state *state = (tcpip_state *)h->cprivate;
- if (state->ctx)
+ if (state->session)
{
- int res = SSL_accept (state->ssl);
- TRC(fprintf(stderr, "SSL_accept\n"));
- if (res <= 0)
+ int res = gnutls_handshake(state->session);
+ if (res < 0)
{
- int err = SSL_get_error(state->ssl, res);
- if (err == SSL_ERROR_WANT_READ)
+ if (ssl_check_error(h, state, res))
{
- h->io_pending = CS_WANT_READ;
+ TRC(fprintf(stderr, "gnutls_handshake int in tcpip_accept\n"));
return h;
}
- if (err == SSL_ERROR_WANT_WRITE)
+ TRC(fprintf(stderr, "gnutls_handshake failed in tcpip_accept\n"));
+ cs_close(h);
+ return 0;
+ }
+ TRC(fprintf(stderr, "SSL_accept complete. gnutls\n"));
+ }
+#elif HAVE_OPENSSL_SSL_H
+ tcpip_state *state = (tcpip_state *)h->cprivate;
+ if (state->ctx)
+ {
+ int res;
+ errno = 0;
+ res = SSL_accept(state->ssl);
+ TRC(fprintf(stderr, "SSL_accept res=%d\n", res));
+ if (res <= 0)
+ {
+ if (ssl_check_error(h, state, res))
{
- h->io_pending = CS_WANT_WRITE;
return h;
}
- cs_close (h);
+ cs_close(h);
return 0;
}
+ TRC(fprintf(stderr, "SSL_accept complete\n"));
}
#endif
}
sp->altsize = tmpi;
}
h->io_pending = 0;
- while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread)))
+ while (!(berlen = (*sp->complete)(*buf, hasread)))
{
if (!*bufsize)
{
return -1;
}
}
- TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n",
- hasread, berlen));
+ TRC(fprintf(stderr, " Out of read loop with hasread=%d, berlen=%d\n",
+ hasread, berlen));
/* move surplus buffer (or everything if we didn't get a BER rec.) */
if (hasread > berlen)
{
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
/*
* Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer,
* 0=connection closed.
sp->altsize = tmpi;
}
h->io_pending = 0;
- while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread)))
+ while (!(berlen = (*sp->complete)(*buf, hasread)))
{
if (!*bufsize)
{
else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
return -1;
- res = SSL_read (sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK);
+#if HAVE_GNUTLS_H
+ res = gnutls_record_recv(sp->session, *buf + hasread,
+ CS_TCPIP_BUFCHUNK);
+ if (res < 0)
+ {
+ if (ssl_check_error(h, sp, res))
+ break;
+ return -1;
+ }
+#else
+ res = SSL_read(sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK);
TRC(fprintf(stderr, " SSL_read res=%d, hasread=%d\n", res, hasread));
if (res <= 0)
{
- int ssl_err = SSL_get_error(sp->ssl, res);
- if (ssl_err == SSL_ERROR_WANT_READ)
- {
- h->io_pending = CS_WANT_READ;
+ if (ssl_check_error(h, sp, res))
break;
- }
- if (ssl_err == SSL_ERROR_WANT_WRITE)
- {
- h->io_pending = CS_WANT_WRITE;
- break;
- }
- if (res == 0)
- return 0;
- h->cerrno = CSERRORSSL;
return -1;
}
+#endif
hasread += res;
}
TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n",
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
/*
* Returns 1, 0 or -1
* In nonblocking mode, you must call again with same buffer while
}
while (state->towrite > state->written)
{
- res = SSL_write (state->ssl, buf + state->written,
- size - state->written);
+#if HAVE_GNUTLS_H
+ res = gnutls_record_send(state->session, buf + state->written,
+ size - state->written);
if (res <= 0)
{
- int ssl_err = SSL_get_error(state->ssl, res);
- if (ssl_err == SSL_ERROR_WANT_READ)
- {
- h->io_pending = CS_WANT_READ;
+ if (ssl_check_error(h, state, res))
return 1;
- }
- if (ssl_err == SSL_ERROR_WANT_WRITE)
- {
- h->io_pending = CS_WANT_WRITE;
+ return -1;
+ }
+#else
+ res = SSL_write(state->ssl, buf + state->written,
+ size - state->written);
+ if (res <= 0)
+ {
+ if (ssl_check_error(h, state, res))
return 1;
- }
- h->cerrno = CSERRORSSL;
return -1;
}
+#endif
state->written += res;
TRC(fprintf(stderr, " Wrote %d, written=%d, nbytes=%d\n",
res, state->written, size));
{
tcpip_state *sp = (struct tcpip_state *)h->cprivate;
- TRC(fprintf(stderr, "tcpip_close\n"));
+ TRC(fprintf(stderr, "tcpip_close h=%p pid=%d\n", h, getpid()));
if (h->iofile != -1)
{
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ if (sp->session)
+ gnutls_bye(sp->session, GNUTLS_SHUT_RDWR);
+#elif HAVE_OPENSSL_SSL_H
if (sp->ssl)
{
- SSL_shutdown (sp->ssl);
+ SSL_shutdown(sp->ssl);
}
#endif
#ifdef WIN32
}
if (sp->altbuf)
xfree(sp->altbuf);
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ if (sp->session)
+ {
+ gnutls_deinit(sp->session);
+ }
+ if (sp->cred_ptr)
+ {
+ assert(sp->cred_ptr->ref > 0);
+
+ if (--(sp->cred_ptr->ref) == 0)
+ {
+ TRC(fprintf(stderr, "Removed credentials %p pid=%d\n",
+ sp->cred_ptr->xcred, getpid()));
+ gnutls_certificate_free_credentials(sp->cred_ptr->xcred);
+ xfree(sp->cred_ptr);
+ }
+ sp->cred_ptr = 0;
+ }
+#elif HAVE_OPENSSL_SSL_H
if (sp->ssl)
{
- TRC (fprintf(stderr, "SSL_free\n"));
- SSL_free (sp->ssl);
+ TRC(fprintf(stderr, "SSL_free\n"));
+ SSL_free(sp->ssl);
}
sp->ssl = 0;
if (sp->ctx_alloc)
- SSL_CTX_free (sp->ctx_alloc);
+ SSL_CTX_free(sp->ctx_alloc);
#endif
#if HAVE_GETADDRINFO
if (sp->ai)
freeaddrinfo(sp->ai);
#endif
+ xfree(sp->connect_request_buf);
+ xfree(sp->connect_response_buf);
xfree(sp);
xfree(h);
return 0;
sprintf(buf, "http:%s", r);
else
sprintf(buf, "tcp:%s", r);
-#if HAVE_OPENSSL_SSL_H
+#if HAVE_GNUTLS_H
+ if (sp->session)
+ {
+ if (h->protocol == PROTO_HTTP)
+ sprintf(buf, "https:%s", r);
+ else
+ sprintf(buf, "ssl:%s", r);
+ }
+#elif HAVE_OPENSSL_SSL_H
if (sp->ctx)
{
if (h->protocol == PROTO_HTTP)
return buf;
}
-int static tcpip_set_blocking(COMSTACK p, int flags)
+static int tcpip_set_blocking(COMSTACK p, int flags)
{
unsigned long flag;
return 1;
}
-#if HAVE_OPENSSL_SSL_H
-int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
+void cs_print_session_info(COMSTACK cs)
+{
+#if HAVE_GNUTLS_H
+ struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
+ if (sp->session)
+ {
+ if (gnutls_certificate_type_get(sp->session) != GNUTLS_CRT_X509)
+ return;
+ printf("X509 certificate\n");
+ }
+#elif HAVE_OPENSSL_SSL_H
+ struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
+ SSL *ssl = (SSL *) sp->ssl;
+ if (ssl)
+ {
+ X509 *server_cert = SSL_get_peer_certificate(ssl);
+
+ if (server_cert)
+ {
+ char *pem_buf;
+ int pem_len;
+ BIO *bio = BIO_new(BIO_s_mem());
+
+ /* get PEM buffer in memory */
+ PEM_write_bio_X509(bio, server_cert);
+ pem_len = BIO_get_mem_data(bio, &pem_buf);
+ fwrite(pem_buf, pem_len, 1, stdout);
+
+ /* print all info on screen .. */
+ X509_print_fp(stdout, server_cert);
+ BIO_free(bio);
+
+ X509_free(server_cert);
+ }
+ }
+#endif
+}
+
+void *cs_get_ssl(COMSTACK cs)
{
+#if HAVE_OPENSSL_SSL_H
struct tcpip_state *sp;
if (!cs || cs->type != ssl_type)
return 0;
sp = (struct tcpip_state *) cs->cprivate;
- if (sp->ctx_alloc)
- return 0;
- sp->ctx = (SSL_CTX *) ctx;
- return 1;
+ return sp->ssl;
+#else
+ return 0;
+#endif
}
-void *cs_get_ssl(COMSTACK cs)
+int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
{
+#if ENABLE_SSL
struct tcpip_state *sp;
if (!cs || cs->type != ssl_type)
return 0;
sp = (struct tcpip_state *) cs->cprivate;
- return sp->ssl;
+#if HAVE_OPENSSL_SSL_H
+ if (sp->ctx_alloc)
+ return 0;
+ sp->ctx = (SSL_CTX *) ctx;
+#endif
+ return 1;
+#else
+ return 0;
+#endif
}
int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
{
+#if ENABLE_SSL
struct tcpip_state *sp;
if (!cs || cs->type != ssl_type)
return 0;
strncpy(sp->cert_fname, fname, sizeof(sp->cert_fname)-1);
sp->cert_fname[sizeof(sp->cert_fname)-1] = '\0';
return 1;
+#else
+ return 0;
+#endif
}
int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
{
+#if HAVE_OPENSSL_SSL_H
SSL *ssl = (SSL *) cs_get_ssl(cs);
if (ssl)
{
- X509 *server_cert = SSL_get_peer_certificate (ssl);
+ X509 *server_cert = SSL_get_peer_certificate(ssl);
if (server_cert)
{
BIO *bio = BIO_new(BIO_s_mem());
return 1;
}
}
- return 0;
-}
-#else
-int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
-{
+#endif
return 0;
}
-void *cs_get_ssl(COMSTACK cs)
+static int tcpip_put_connect(COMSTACK h, char *buf, int size)
{
- return 0;
-}
+ struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
-int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len)
-{
- return 0;
+ int r = tcpip_put(h, state->connect_request_buf,
+ state->connect_request_len);
+ if (r == 0)
+ {
+ /* it's sent */
+ h->f_put = tcpip_put; /* switch to normal tcpip put */
+ r = tcpip_put(h, buf, size);
+ }
+ return r;
}
-int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
+static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize)
{
- return 0;
+ struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
+ int r;
+
+ r = tcpip_get(h, &state->connect_response_buf,
+ &state->connect_response_len);
+ if (r < 1)
+ return r;
+ /* got the connect response completely */
+ state->complete = cs_complete_auto; /* switch to normal tcpip get */
+ h->f_get = tcpip_get;
+ return tcpip_get(h, buf, bufsize);
}
-#endif
+
/*
* Local variables:
projects / yaz-moved-to-github.git / blobdiff