/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
#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>
void *cd);
static int tcpip_set_blocking(COMSTACK p, int blocking);
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
static int ssl_get(COMSTACK h, char **buf, int *bufsize);
static int ssl_put(COMSTACK h, char *buf, int size);
#endif
int (*complete)(const char *buf, int len); /* length/complete. */
#if HAVE_GETADDRINFO
struct addrinfo *ai;
+ struct addrinfo *ai_connect;
#else
struct sockaddr_in addr; /* returned by cs_straddr */
#endif
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;
int connect_response_len;
} tcpip_state;
-#ifdef WIN32
static int tcpip_init(void)
{
+#ifdef WIN32
static int initialized = 0;
+#endif
+ yaz_init_globals();
+#ifdef WIN32
if (!initialized)
{
WORD requested;
return 0;
initialized = 1;
}
+#endif
return 1;
}
-#else
-static int tcpip_init(void)
-{
- return 1;
-}
-#endif
/*
* This function is always called through the cs_create() macro.
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");
#endif
#if HAVE_GETADDRINFO
sp->altbuf = 0;
sp->altsize = sp->altlen = 0;
sp->towrite = sp->written = -1;
- if (protocol == PROTO_WAIS)
- sp->complete = completeWAIS;
- else
- sp->complete = cs_complete_auto;
+ 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"));
+ TRC(fprintf(stderr, "Created new TCPIP comstack h=%p\n", p));
return p;
}
COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
{
-#if !ENABLE_SSL
- return 0;
-#else
+#if HAVE_GNUTLS_H
tcpip_state *sp;
COMSTACK p;
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;
+#else
+ return 0;
#endif
}
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
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),
h->io_pending = dir ? CS_WANT_WRITE : CS_WANT_READ;
return 1;
}
-#endif
h->cerrno = CSERRORSSL;
return 0;
}
#if HAVE_GETADDRINFO
/* resolve using getaddrinfo */
-struct addrinfo *tcpip_getaddrinfo(const char *str, const char *port)
+struct addrinfo *tcpip_getaddrinfo(const char *str, const char *port,
+ int *ipv6_only)
{
struct addrinfo hints, *res;
int error;
if (!strcmp("@", host))
{
hints.ai_flags = AI_PASSIVE;
+ hints.ai_family = AF_UNSPEC;
+ error = getaddrinfo(0, port, &hints, &res);
+ *ipv6_only = 0;
+ }
+ else if (!strcmp("@4", host))
+ {
+ hints.ai_flags = AI_PASSIVE;
hints.ai_family = AF_INET;
error = getaddrinfo(0, port, &hints, &res);
+ *ipv6_only = -1;
}
else if (!strcmp("@6", host))
{
hints.ai_flags = AI_PASSIVE;
hints.ai_family = AF_INET6;
error = getaddrinfo(0, port, &hints, &res);
+ *ipv6_only = 1;
}
else
{
error = getaddrinfo(host, port, &hints, &res);
+ *ipv6_only = -1;
}
if (error)
return 0;
tcpip_state *sp = (tcpip_state *)h->cprivate;
const char *port = "210";
struct addrinfo *ai = 0;
+ int ipv6_only = 0;
if (h->protocol == PROTO_HTTP)
{
if (h->type == ssl_type)
if (sp->ai)
freeaddrinfo(sp->ai);
- sp->ai = tcpip_getaddrinfo(str, port);
+ sp->ai = tcpip_getaddrinfo(str, port, &ipv6_only);
if (sp->ai && h->state == CS_ST_UNBND)
{
int s = -1;
- for (ai = sp->ai; ai; ai = ai->ai_next)
+ if (ipv6_only >= 0)
{
- s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if (s != -1)
- break;
+ for (ai = sp->ai; ai; ai = ai->ai_next)
+ {
+ if (ai->ai_family == AF_INET6)
+ {
+ s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (s != -1)
+ break;
+ }
+ }
+ }
+ if (s == -1)
+ {
+ for (ai = sp->ai; ai; ai = ai->ai_next)
+ {
+ s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (s != -1)
+ break;
+ }
}
if (s == -1)
return 0;
+ TRC(fprintf(stderr, "First socket fd=%d\n", s));
assert(ai);
h->iofile = s;
-
+ if (ai->ai_family == AF_INET6 && ipv6_only >= 0 &&
+ setsockopt(h->iofile,
+ IPPROTO_IPV6,
+ IPV6_V6ONLY, &ipv6_only, sizeof(ipv6_only)))
+ return 0;
if (!tcpip_set_blocking(h, h->flags))
return 0;
}
return sp->altlen && (*sp->complete)(sp->altbuf, sp->altlen);
}
+static int cont_connect(COMSTACK h)
+{
+#if HAVE_GETADDRINFO
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
+ struct addrinfo *ai = sp->ai_connect;
+ while (ai && (ai = ai->ai_next))
+ {
+ int s;
+ s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (s != -1)
+ {
+#if HAVE_GNUTLS_H
+ if (h->type == ssl_type && sp->session)
+ {
+ gnutls_bye(sp->session, GNUTLS_SHUT_WR);
+ gnutls_deinit(sp->session);
+ sp->session = 0;
+ }
+#endif
+#ifdef WIN32
+ closesocket(h->iofile);
+#else
+ close(h->iofile);
+#endif
+ TRC(fprintf(stderr, "Other socket call fd=%d\n", s));
+ h->state = CS_ST_UNBND;
+ h->iofile = s;
+ tcpip_set_blocking(h, h->flags);
+ return tcpip_connect(h, ai);
+ }
+#endif
+ }
+ h->cerrno = CSYSERR;
+ return -1;
+}
+
+
/*
* connect(2) will block (sometimes) - nothing we can do short of doing
* weird things like spawning subprocesses or threading or some weird junk
struct sockaddr_in *add = (struct sockaddr_in *) address;
#endif
int r;
- TRC(fprintf(stderr, "tcpip_connect\n"));
+ TRC(fprintf(stderr, "tcpip_connect h=%p\n", h));
h->io_pending = 0;
if (h->state != CS_ST_UNBND)
{
}
#if HAVE_GETADDRINFO
r = connect(h->iofile, ai->ai_addr, ai->ai_addrlen);
- freeaddrinfo(sp->ai);
- sp->ai = 0;
+ sp->ai_connect = ai;
#else
r = connect(h->iofile, (struct sockaddr *) add, sizeof(*add));
#endif
#else
if (yaz_errno() == EINPROGRESS)
{
+ TRC(fprintf(stderr, "Pending fd=%d\n", h->iofile));
h->event = CS_CONNECT;
h->state = CS_ST_CONNECTING;
h->io_pending = CS_WANT_WRITE|CS_WANT_READ;
return 1;
}
#endif
- h->cerrno = CSYSERR;
- return -1;
+ return cont_connect(h);
}
h->event = CS_CONNECT;
h->state = CS_ST_CONNECTING;
*/
int tcpip_rcvconnect(COMSTACK h)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
tcpip_state *sp = (tcpip_state *)h->cprivate;
#endif
TRC(fprintf(stderr, "tcpip_rcvconnect\n"));
#if HAVE_GNUTLS_H
if (h->type == ssl_type && !sp->session)
{
- gnutls_global_init();
tcpip_create_cred(h);
gnutls_init(&sp->session, GNUTLS_CLIENT);
gnutls_set_default_priority(sp->session);
{
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();
-
- sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_client_method());
- if (!sp->ctx)
- {
- h->cerrno = CSERRORSSL;
- return -1;
- }
- }
- if (sp->ctx)
- {
- int res;
-
- if (!sp->ssl)
- {
- sp->ssl = SSL_new(sp->ctx);
- SSL_set_fd(sp->ssl, h->iofile);
- }
- res = SSL_connect(sp->ssl);
- if (res <= 0)
- {
- if (ssl_check_error(h, sp, res))
- return 1;
- return -1;
+ return cont_connect(h);
}
}
#endif
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)
{
+ fprintf(stderr, "Error 1\n");
h->cerrno = CSERRORSSL;
return -1;
}
}
-#elif HAVE_OPENSSL_SSL_H
- if (h->type == ssl_type && !sp->ctx)
- {
- SSL_library_init();
- SSL_load_error_strings();
-
- sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_server_method());
- if (!sp->ctx)
- {
- h->cerrno = CSERRORSSL;
- return -1;
- }
- }
- if (sp->ctx)
- {
- if (sp->ctx_alloc)
- {
- int res;
- res = SSL_CTX_use_certificate_file(sp->ctx, sp->cert_fname,
- SSL_FILETYPE_PEM);
- if (res <= 0)
- {
- ERR_print_errors_fp(stderr);
- exit(2);
- }
- res = SSL_CTX_use_PrivateKey_file(sp->ctx, sp->cert_fname,
- SSL_FILETYPE_PEM);
- if (res <= 0)
- {
- ERR_print_errors_fp(stderr);
- exit(3);
- }
- res = SSL_CTX_check_private_key(sp->ctx);
- if (res <= 0)
- {
- ERR_print_errors_fp(stderr);
- exit(5);
- }
- }
- TRC(fprintf(stderr, "ssl_bind\n"));
- }
- else
- {
- TRC(fprintf(stderr, "tcpip_bind\n"));
- }
#else
TRC(fprintf(stderr, "tcpip_bind\n"));
#endif
(gnutls_transport_ptr_t)
(size_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);
- }
#endif
state->connect_request_buf = 0;
state->connect_response_buf = 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))
- {
- return h;
- }
- cs_close(h);
- return 0;
- }
- TRC(fprintf(stderr, "SSL_accept complete\n"));
- }
#endif
}
else
int tmpi, berlen, rest, req, tomove;
int hasread = 0, res;
- TRC(fprintf(stderr, "tcpip_get: bufsize=%d\n", *bufsize));
+ TRC(fprintf(stderr, "tcpip_get: h=%p bufsize=%d\n", h, *bufsize));
if (sp->altlen) /* switch buffers */
{
TRC(fprintf(stderr, " %d bytes in altbuf (%p)\n", sp->altlen,
}
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
/*
* Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer,
* 0=connection closed.
else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
return -1;
-#if HAVE_GNUTLS_H
res = gnutls_record_recv(sp->session, *buf + hasread,
CS_TCPIP_BUFCHUNK);
if (res == 0)
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)
- {
- if (ssl_check_error(h, sp, res))
- break;
- return -1;
- }
-#endif
hasread += res;
}
TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n",
int res;
struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
- TRC(fprintf(stderr, "tcpip_put: size=%d\n", size));
+ TRC(fprintf(stderr, "tcpip_put: h=%p size=%d\n", h, size));
h->io_pending = 0;
h->event = CS_DATA;
if (state->towrite < 0)
h->io_pending = CS_WANT_WRITE;
return 1;
}
- h->cerrno = CSYSERR;
- return -1;
+ return cont_connect(h);
}
state->written += res;
TRC(fprintf(stderr, " Wrote %d, written=%d, nbytes=%d\n",
}
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
/*
* Returns 1, 0 or -1
* In nonblocking mode, you must call again with same buffer while
}
while (state->towrite > state->written)
{
-#if HAVE_GNUTLS_H
res = gnutls_record_send(state->session, buf + state->written,
size - state->written);
if (res <= 0)
return 1;
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;
- 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 h=%p pid=%d\n", h, getpid()));
+ TRC(fprintf(stderr, "tcpip_close: h=%p pid=%d\n", h, getpid()));
if (h->iofile != -1)
{
#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);
- }
+ gnutls_bye(sp->session, GNUTLS_SHUT_WR);
#endif
#ifdef WIN32
closesocket(h->iofile);
}
sp->cred_ptr = 0;
}
-#elif HAVE_OPENSSL_SSL_H
- if (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);
#endif
#if HAVE_GETADDRINFO
if (sp->ai)
else
sprintf(buf, "ssl:%s", r);
}
-#elif HAVE_OPENSSL_SSL_H
- if (sp->ctx)
- {
- if (h->protocol == PROTO_HTTP)
- sprintf(buf, "https:%s", r);
- else
- sprintf(buf, "ssl:%s", r);
- }
#endif
return buf;
}
}
}
-#elif HAVE_OPENSSL_SSL_H
- if (cs->type == ssl_type)
- {
- 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
- if (cs && cs->type == ssl_type)
- {
- struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
- return sp->ssl;
- }
-#endif
+ /* doesn't do anything for GNUTLS */
return 0;
}
int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
if (cs && cs->type == ssl_type)
{
-#if HAVE_OPENSSL_SSL_H
- struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
- if (sp->ctx_alloc)
- return 0;
- sp->ctx = (SSL_CTX *) ctx;
-#endif
+ /* doesn't do anything for GNUTLS */
return 1;
}
#endif
int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
if (cs && cs->type == ssl_type)
{
struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
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)
+
+#if HAVE_GNUTLS_H
+#if USE_GNUTLS_X509_CRT_PRINT
+ struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;
+ if (cs->type == ssl_type && sp->session)
{
- X509 *server_cert = SSL_get_peer_certificate(ssl);
- if (server_cert)
+ const gnutls_datum_t *cert_list;
+ unsigned cert_list_size;
+ if (gnutls_certificate_type_get(sp->session) != GNUTLS_CRT_X509)
+ return 0;
+ cert_list = gnutls_certificate_get_peers(sp->session, &cert_list_size);
+ if (cert_list_size > 0)
{
- BIO *bio = BIO_new(BIO_s_mem());
- char *pem_buf;
- /* get PEM buffer in memory */
- PEM_write_bio_X509(bio, server_cert);
- *len = BIO_get_mem_data(bio, &pem_buf);
- *buf = (char *) xmalloc(*len);
- memcpy(*buf, pem_buf, *len);
- BIO_free(bio);
- return 1;
+ gnutls_x509_crt_t cert;
+ int ret;
+ gnutls_datum_t cinfo;
+
+ gnutls_x509_crt_init(&cert);
+ gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER);
+
+ ret = gnutls_x509_crt_print(cert, GNUTLS_CRT_PRINT_FULL, &cinfo);
+ if (ret == 0)
+ {
+ *buf = xstrdup((char *) cinfo.data);
+ *len = strlen(*buf);
+ gnutls_free(cinfo.data);
+ gnutls_x509_crt_deinit(cert);
+ return 1;
+ }
+ gnutls_x509_crt_deinit(cert);
}
}
#endif
+#endif
return 0;
}
projects / yaz-moved-to-github.git / blobdiff