#include <sys/wait.h>
#endif
+#if HAVE_GNUTLS_H
+#include <gnutls/openssl.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 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
struct sockaddr_in addr; /* returned by cs_straddr */
#endif
char buf[128]; /* returned by cs_addrstr */
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
SSL_CTX *ctx; /* current CTX. */
SSL_CTX *ctx_alloc; /* If =ctx it is owned by CS. If 0 it is not owned */
SSL *ssl;
p->stackerr = 0;
p->user = 0;
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
sp->ctx = sp->ctx_alloc = 0;
sp->ssl = 0;
strcpy(sp->cert_fname, "yaz.pem");
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
{
*/
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 ENABLE_SSL
if (h->type == ssl_type && !sp->ctx)
{
SSL_library_init();
SSL_load_error_strings();
- 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;
sp->ssl = SSL_new (sp->ctx);
SSL_set_fd (sp->ssl, h->iofile);
}
- res = SSL_connect (sp->ssl);
+ res = SSL_connect(sp->ssl);
+#if HAVE_OPENSSL_SSL_H
if (res <= 0)
{
int err = SSL_get_error(sp->ssl, res);
h->cerrno = CSERRORSSL;
return -1;
}
+#else
+ TRC(fprintf(stderr, "SSL_connect res=%d last_error=%d\n",
+ res, sp->ssl->last_error));
+ if (res == 0 && sp->ssl->last_error == GNUTLS_E_AGAIN)
+ {
+ h->io_pending = CS_WANT_READ;
+ return 1;
+ }
+ else if (res <= 0)
+ {
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
+#endif
}
#endif
h->event = CS_DATA;
}
#endif
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (h->type == ssl_type && !sp->ctx)
{
SSL_library_init();
SSL_load_error_strings();
- 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)
{
+#if HAVE_OPENSSL_SSL_H
ERR_print_errors_fp(stderr);
+#else
+ fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n",
+ sp->cert_fname);
+#endif
exit (2);
}
res = SSL_CTX_use_PrivateKey_file (sp->ctx, sp->cert_fname,
SSL_FILETYPE_PEM);
if (res <= 0)
{
+#if HAVE_OPENSSL_SSL_H
ERR_print_errors_fp(stderr);
+#else
+ fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n",
+ sp->cert_fname);
+#endif
exit (3);
}
+#if HAVE_OPENSSL_SSL_H
res = SSL_CTX_check_private_key (sp->ctx);
if (res <= 0)
{
ERR_print_errors_fp(stderr);
exit(5);
}
+#endif
}
TRC (fprintf (stderr, "ssl_bind\n"));
}
cnew->state = CS_ST_ACCEPT;
h->state = CS_ST_IDLE;
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
state->ctx = st->ctx;
state->ctx_alloc = 0;
state->ssl = st->ssl;
}
if (h->state == CS_ST_ACCEPT)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
tcpip_state *state = (tcpip_state *)h->cprivate;
if (state->ctx)
{
- int res = SSL_accept (state->ssl);
+ int res;
TRC(fprintf(stderr, "SSL_accept\n"));
+ res = SSL_accept (state->ssl);
+#if HAVE_OPENSSL_SSL_H
if (res <= 0)
{
int err = SSL_get_error(state->ssl, res);
cs_close (h);
return 0;
}
+#else
+ TRC(fprintf(stderr, "SSL_accept res=%d last_error=%d\n",
+ res, state->ssl->last_error));
+ if (res == 0 && state->ssl->last_error == GNUTLS_E_AGAIN)
+ {
+ h->io_pending = CS_WANT_READ;
+ return h;
+ }
+ else if (res <= 0) /* assume real error */
+ {
+ cs_close(h);
+ return 0;
+ }
+#endif
}
#endif
}
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
/*
* Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer,
* 0=connection closed.
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
/*
* Returns 1, 0 or -1
* In nonblocking mode, you must call again with same buffer while
TRC(fprintf(stderr, "tcpip_close\n"));
if (h->iofile != -1)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (sp->ssl)
{
SSL_shutdown (sp->ssl);
}
if (sp->altbuf)
xfree(sp->altbuf);
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (sp->ssl)
{
TRC (fprintf(stderr, "SSL_free\n"));
sprintf(buf, "http:%s", r);
else
sprintf(buf, "tcp:%s", r);
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (sp->ctx)
{
if (h->protocol == PROTO_HTTP)
return 1;
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
{
struct tcpip_state *sp;
SSL *ssl = (SSL *) cs_get_ssl(cs);
if (ssl)
{
+#if HAVE_OPENSSL_SSL_H
X509 *server_cert = SSL_get_peer_certificate (ssl);
if (server_cert)
{
BIO_free(bio);
return 1;
}
+#endif
}
return 0;
}