/*
* librb: a library used by ircd-ratbox and other things
- * mbedtls.c: mbedtls related code
+ * mbedtls.c: ARM MbedTLS backend
*
* Copyright (C) 2007-2008 ircd-ratbox development team
* Copyright (C) 2007-2008 Aaron Sethman <androsyn@ratbox.org>
* Copyright (C) 2015 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (C) 2016 Aaron Jones <aaronmdjones@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <librb_config.h>
#include <rb_lib.h>
-#include <commio-int.h>
-#include <commio-ssl.h>
#ifdef HAVE_MBEDTLS
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
-#include "mbedtls/x509.h"
-#include "mbedtls/ssl.h"
-#include "mbedtls/net.h"
-#include "mbedtls/error.h"
-#include "mbedtls/debug.h"
-#include "mbedtls/dhm.h"
-#include "mbedtls/version.h"
-
-static mbedtls_x509_crt x509;
-static mbedtls_pk_context serv_pk;
-static mbedtls_dhm_context dh_params;
-static mbedtls_ctr_drbg_context ctr_drbg;
-static mbedtls_entropy_context entropy;
-static mbedtls_ssl_config serv_config;
-static mbedtls_ssl_config client_config;
-
-#define SSL_P(x) ((mbedtls_ssl_context *)F->ssl)
+#include <commio-int.h>
+#include <commio-ssl.h>
+#include <stdbool.h>
-void
-rb_ssl_shutdown(rb_fde_t *F)
-{
- int i;
- if(F == NULL || F->ssl == NULL)
- return;
- for(i = 0; i < 4; i++)
- {
- int r = mbedtls_ssl_close_notify(SSL_P(F));
- if(r != MBEDTLS_ERR_SSL_WANT_READ && r != MBEDTLS_ERR_SSL_WANT_WRITE)
- break;
- }
- mbedtls_ssl_free(SSL_P(F));
- rb_free(F->ssl);
-}
+#include "mbedtls_ratbox.h"
-unsigned int
-rb_ssl_handshake_count(rb_fde_t *F)
+typedef enum
{
- return F->handshake_count;
-}
+ RB_FD_TLS_DIRECTION_IN = 0,
+ RB_FD_TLS_DIRECTION_OUT = 1
+} rb_fd_tls_direction;
-void
-rb_ssl_clear_handshake_count(rb_fde_t *F)
+#define RB_MAX_CIPHERSUITES 512
+
+typedef struct
{
- F->handshake_count = 0;
-}
+ mbedtls_x509_crt crt;
+ mbedtls_pk_context key;
+ mbedtls_dhm_context dhp;
+ mbedtls_ssl_config server_cfg;
+ mbedtls_ssl_config client_cfg;
+ size_t refcount;
+ int suites[RB_MAX_CIPHERSUITES + 1];
+} rb_mbedtls_cfg_context;
-static void
-rb_ssl_timeout(rb_fde_t *F, void *notused)
+typedef struct
{
- lrb_assert(F->accept != NULL);
- F->accept->callback(F, RB_ERR_TIMEOUT, NULL, 0, F->accept->data);
-}
+ rb_mbedtls_cfg_context *cfg;
+ mbedtls_ssl_context ssl;
+} rb_mbedtls_ssl_context;
+#define SSL_C(x) ((rb_mbedtls_ssl_context *) (x)->ssl)->cfg
+#define SSL_P(x) &((rb_mbedtls_ssl_context *) (x)->ssl)->ssl
-static int
-do_ssl_handshake(rb_fde_t *F, PF * callback, void *data)
+static mbedtls_ctr_drbg_context ctr_drbg_ctx;
+static mbedtls_entropy_context entropy_ctx;
+
+static mbedtls_x509_crt dummy_ca_ctx;
+static rb_mbedtls_cfg_context *rb_mbedtls_cfg = NULL;
+
+
+
+struct ssl_connect
{
- int ret;
- int flags;
+ CNCB *callback;
+ void *data;
+ int timeout;
+};
- ret = mbedtls_ssl_handshake(SSL_P(F));
- if(ret < 0)
- {
- if (ret == -1 && rb_ignore_errno(errno))
- ret = MBEDTLS_ERR_SSL_WANT_READ;
+static const char *rb_ssl_strerror(int);
+static void rb_ssl_connect_realcb(rb_fde_t *, int, struct ssl_connect *);
- if((ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE))
- {
- if(ret == MBEDTLS_ERR_SSL_WANT_READ)
- flags = RB_SELECT_READ;
- else
- flags = RB_SELECT_WRITE;
- rb_setselect(F, flags, callback, data);
- return 0;
- }
- F->ssl_errno = ret;
- return -1;
- }
- return 1; /* handshake is finished..go about life */
-}
+
+/*
+ * Internal MbedTLS-specific code
+ */
static void
-rb_ssl_tryaccept(rb_fde_t *F, void *data)
+rb_mbedtls_cfg_incref(rb_mbedtls_cfg_context *const cfg)
{
- int ret;
- struct acceptdata *ad;
+ lrb_assert(cfg->refcount > 0);
- lrb_assert(F->accept != NULL);
-
- ret = do_ssl_handshake(F, rb_ssl_tryaccept, NULL);
+ cfg->refcount++;
+}
- /* do_ssl_handshake does the rb_setselect */
- if(ret == 0)
+static void
+rb_mbedtls_cfg_decref(rb_mbedtls_cfg_context *const cfg)
+{
+ if(cfg == NULL)
return;
- ad = F->accept;
- F->accept = NULL;
- rb_settimeout(F, 0, NULL, NULL);
- rb_setselect(F, RB_SELECT_READ | RB_SELECT_WRITE, NULL, NULL);
+ lrb_assert(cfg->refcount > 0);
- if(ret > 0)
- ad->callback(F, RB_OK, (struct sockaddr *)&ad->S, ad->addrlen, ad->data);
- else
- ad->callback(F, RB_ERROR_SSL, NULL, 0, ad->data);
+ if((--cfg->refcount) > 0)
+ return;
- rb_free(ad);
+ mbedtls_ssl_config_free(&cfg->client_cfg);
+ mbedtls_ssl_config_free(&cfg->server_cfg);
+ mbedtls_dhm_free(&cfg->dhp);
+ mbedtls_pk_free(&cfg->key);
+ mbedtls_x509_crt_free(&cfg->crt);
+
+ rb_free(cfg);
}
static int
-rb_ssl_read_cb(void *opaque, unsigned char *buf, size_t size)
+rb_sock_net_recv(void *const context_ptr, unsigned char *const buf, const size_t count)
{
- int ret;
- rb_fde_t *F = opaque;
+ const int fd = rb_get_fd((rb_fde_t *)context_ptr);
+
+ const int ret = (int) read(fd, buf, count);
- ret = read(F->fd, buf, size);
- if (ret < 0 && rb_ignore_errno(errno))
+ if(ret < 0 && rb_ignore_errno(errno))
return MBEDTLS_ERR_SSL_WANT_READ;
return ret;
}
static int
-rb_ssl_write_cb(void *opaque, const unsigned char *buf, size_t size)
+rb_sock_net_xmit(void *const context_ptr, const unsigned char *const buf, const size_t count)
{
- rb_fde_t *F = opaque;
- int ret;
+ const int fd = rb_get_fd((rb_fde_t *)context_ptr);
+
+ const int ret = (int) write(fd, buf, count);
- ret = write(F->fd, buf, size);
- if (ret < 0 && rb_ignore_errno(errno))
+ if(ret < 0 && rb_ignore_errno(errno))
return MBEDTLS_ERR_SSL_WANT_WRITE;
return ret;
}
static void
-rb_ssl_setup_srv_context(rb_fde_t *F, mbedtls_ssl_context *ssl)
+rb_ssl_init_fd(rb_fde_t *const F, const rb_fd_tls_direction dir)
{
+ rb_mbedtls_ssl_context *const mbed_ssl_ctx = rb_malloc(sizeof *mbed_ssl_ctx);
+
+ if(mbed_ssl_ctx == NULL)
+ {
+ rb_lib_log("%s: rb_malloc: allocation failure", __func__);
+ rb_close(F);
+ return;
+ }
+
+ mbedtls_ssl_config *mbed_config = NULL;
+
+ switch(dir)
+ {
+ case RB_FD_TLS_DIRECTION_IN:
+ mbed_config = &rb_mbedtls_cfg->server_cfg;
+ break;
+ case RB_FD_TLS_DIRECTION_OUT:
+ mbed_config = &rb_mbedtls_cfg->client_cfg;
+ break;
+ }
+
+ mbedtls_ssl_init(&mbed_ssl_ctx->ssl);
+
int ret;
- mbedtls_ssl_init(ssl);
- if ((ret = mbedtls_ssl_setup(ssl, &serv_config)) != 0)
+ if((ret = mbedtls_ssl_setup(&mbed_ssl_ctx->ssl, mbed_config)) != 0)
{
- rb_lib_log("rb_ssl_setup_srv_context: failed to set up ssl context: -0x%x", -ret);
+ rb_lib_log("%s: ssl_setup: %s", __func__, rb_ssl_strerror(ret));
+ mbedtls_ssl_free(&mbed_ssl_ctx->ssl);
+ rb_free(mbed_ssl_ctx);
rb_close(F);
return;
}
- mbedtls_ssl_set_bio(ssl, F, rb_ssl_write_cb, rb_ssl_read_cb, NULL);
+ mbedtls_ssl_set_bio(&mbed_ssl_ctx->ssl, F, rb_sock_net_xmit, rb_sock_net_recv, NULL);
+
+ rb_mbedtls_cfg_incref(rb_mbedtls_cfg);
+ mbed_ssl_ctx->cfg = rb_mbedtls_cfg;
+
+ F->ssl = mbed_ssl_ctx;
}
-void
-rb_ssl_start_accepted(rb_fde_t *new_F, ACCB * cb, void *data, int timeout)
+static rb_mbedtls_cfg_context *
+rb_mbedtls_cfg_new(void)
{
- mbedtls_ssl_context *ssl;
- new_F->type |= RB_FD_SSL;
- ssl = new_F->ssl = rb_malloc(sizeof(mbedtls_ssl_context));
- new_F->accept = rb_malloc(sizeof(struct acceptdata));
+ rb_mbedtls_cfg_context *const cfg = rb_malloc(sizeof *cfg);
+
+ if(cfg == NULL)
+ return NULL;
- new_F->accept->callback = cb;
- new_F->accept->data = data;
- rb_settimeout(new_F, timeout, rb_ssl_timeout, NULL);
+ mbedtls_x509_crt_init(&cfg->crt);
+ mbedtls_pk_init(&cfg->key);
+ mbedtls_dhm_init(&cfg->dhp);
+ mbedtls_ssl_config_init(&cfg->server_cfg);
+ mbedtls_ssl_config_init(&cfg->client_cfg);
- new_F->accept->addrlen = 0;
+ (void) memset(cfg->suites, 0x00, sizeof cfg->suites);
- rb_ssl_setup_srv_context(new_F, ssl);
- if(do_ssl_handshake(new_F, rb_ssl_tryaccept, NULL))
+ cfg->refcount = 1;
+
+ int ret;
+
+ if((ret = mbedtls_ssl_config_defaults(&cfg->server_cfg,
+ MBEDTLS_SSL_IS_SERVER, MBEDTLS_SSL_TRANSPORT_STREAM,
+ MBEDTLS_SSL_PRESET_DEFAULT)) != 0)
{
- struct acceptdata *ad = new_F->accept;
- new_F->accept = NULL;
+ rb_lib_log("%s: ssl_config_defaults (server): %s", __func__, rb_ssl_strerror(ret));
+ rb_mbedtls_cfg_decref(cfg);
+ return NULL;
+ }
- ad->callback(new_F, RB_OK, (struct sockaddr *)&ad->S, ad->addrlen, ad->data);
- rb_free(ad);
+ if((ret = mbedtls_ssl_config_defaults(&cfg->client_cfg,
+ MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_TRANSPORT_STREAM,
+ MBEDTLS_SSL_PRESET_DEFAULT)) != 0)
+ {
+ rb_lib_log("%s: ssl_config_defaults (client): %s", __func__, rb_ssl_strerror(ret));
+ rb_mbedtls_cfg_decref(cfg);
+ return NULL;
}
+
+ mbedtls_ssl_conf_rng(&cfg->server_cfg, mbedtls_ctr_drbg_random, &ctr_drbg_ctx);
+ mbedtls_ssl_conf_rng(&cfg->client_cfg, mbedtls_ctr_drbg_random, &ctr_drbg_ctx);
+
+ mbedtls_ssl_conf_ca_chain(&cfg->server_cfg, &dummy_ca_ctx, NULL);
+ mbedtls_ssl_conf_ca_chain(&cfg->client_cfg, &dummy_ca_ctx, NULL);
+
+ mbedtls_ssl_conf_authmode(&cfg->server_cfg, MBEDTLS_SSL_VERIFY_OPTIONAL);
+ mbedtls_ssl_conf_authmode(&cfg->client_cfg, MBEDTLS_SSL_VERIFY_NONE);
+
+ mbedtls_ssl_conf_min_version(&cfg->server_cfg, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_2);
+ mbedtls_ssl_conf_min_version(&cfg->client_cfg, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_2);
+
+ #ifdef MBEDTLS_SSL_LEGACY_BREAK_HANDSHAKE
+ mbedtls_ssl_conf_legacy_renegotiation(&cfg->client_cfg, MBEDTLS_SSL_LEGACY_BREAK_HANDSHAKE);
+ #endif
+
+ #ifdef MBEDTLS_SSL_SESSION_TICKETS_DISABLED
+ mbedtls_ssl_conf_session_tickets(&cfg->client_cfg, MBEDTLS_SSL_SESSION_TICKETS_DISABLED);
+ #endif
+
+ return cfg;
}
-void
-rb_ssl_accept_setup(rb_fde_t *F, rb_fde_t *new_F, struct sockaddr *st, int addrlen)
+static void
+rb_ssl_accept_common(rb_fde_t *const F, void *const data)
{
- new_F->type |= RB_FD_SSL;
- new_F->ssl = rb_malloc(sizeof(mbedtls_ssl_context));
- new_F->accept = rb_malloc(sizeof(struct acceptdata));
+ lrb_assert(F != NULL);
+ lrb_assert(F->accept != NULL);
+ lrb_assert(F->accept->callback != NULL);
+ lrb_assert(F->ssl != NULL);
- new_F->accept->callback = F->accept->callback;
- new_F->accept->data = F->accept->data;
- rb_settimeout(new_F, 10, rb_ssl_timeout, NULL);
- memcpy(&new_F->accept->S, st, addrlen);
- new_F->accept->addrlen = addrlen;
+ (void) data;
- rb_ssl_setup_srv_context(new_F, new_F->ssl);
- if(do_ssl_handshake(F, rb_ssl_tryaccept, NULL))
- {
- struct acceptdata *ad = F->accept;
- F->accept = NULL;
+ const int ret = mbedtls_ssl_handshake(SSL_P(F));
- ad->callback(F, RB_OK, (struct sockaddr *)&ad->S, ad->addrlen, ad->data);
- rb_free(ad);
+ switch(ret)
+ {
+ case 0:
+ F->handshake_count++;
+ break;
+ case MBEDTLS_ERR_SSL_WANT_READ:
+ rb_setselect(F, RB_SELECT_READ, rb_ssl_accept_common, NULL);
+ return;
+ case MBEDTLS_ERR_SSL_WANT_WRITE:
+ rb_setselect(F, RB_SELECT_WRITE, rb_ssl_accept_common, NULL);
+ return;
+ default:
+ errno = EIO;
+ F->ssl_errno = (unsigned long) -ret;
+ F->accept->callback(F, RB_ERROR_SSL, NULL, 0, F->accept->data);
+ return;
}
+
+ rb_settimeout(F, 0, NULL, NULL);
+ rb_setselect(F, RB_SELECT_READ | RB_SELECT_WRITE, NULL, NULL);
+
+ struct acceptdata *const ad = F->accept;
+ F->accept = NULL;
+ ad->callback(F, RB_OK, (struct sockaddr *)&ad->S, ad->addrlen, ad->data);
+ rb_free(ad);
}
-static ssize_t
-rb_ssl_read_or_write(int r_or_w, rb_fde_t *F, void *rbuf, const void *wbuf, size_t count)
+static void
+rb_ssl_connect_common(rb_fde_t *const F, void *const data)
{
- ssize_t ret;
+ lrb_assert(F != NULL);
+ lrb_assert(F->ssl != NULL);
- if(r_or_w == 0)
- ret = mbedtls_ssl_read(F->ssl, rbuf, count);
- else
- ret = mbedtls_ssl_write(F->ssl, wbuf, count);
+ const int ret = mbedtls_ssl_handshake(SSL_P(F));
- if(ret < 0)
+ switch(ret)
{
- switch (ret)
- {
- case MBEDTLS_ERR_SSL_WANT_READ:
- return RB_RW_SSL_NEED_READ;
- case MBEDTLS_ERR_SSL_WANT_WRITE:
- return RB_RW_SSL_NEED_WRITE;
- default:
- F->ssl_errno = ret;
- errno = EIO;
- return RB_RW_IO_ERROR;
- }
+ case 0:
+ F->handshake_count++;
+ break;
+ case MBEDTLS_ERR_SSL_WANT_READ:
+ rb_setselect(F, RB_SELECT_READ, rb_ssl_connect_common, data);
+ return;
+ case MBEDTLS_ERR_SSL_WANT_WRITE:
+ rb_setselect(F, RB_SELECT_WRITE, rb_ssl_connect_common, data);
+ return;
+ default:
+ errno = EIO;
+ F->ssl_errno = (unsigned long) -ret;
+ rb_ssl_connect_realcb(F, RB_ERROR_SSL, data);
+ return;
}
- return ret;
+ rb_ssl_connect_realcb(F, RB_OK, data);
}
-ssize_t
-rb_ssl_read(rb_fde_t *F, void *buf, size_t count)
+static const char *
+rb_ssl_strerror(int err)
{
- return rb_ssl_read_or_write(0, F, buf, NULL, count);
-}
+ static char errbuf[512];
-ssize_t
-rb_ssl_write(rb_fde_t *F, const void *buf, size_t count)
-{
- return rb_ssl_read_or_write(1, F, NULL, buf, count);
+ if (err < 0)
+ err = -err;
+
+#ifdef MBEDTLS_ERROR_C
+ char mbed_errbuf[512];
+ mbedtls_strerror(err, mbed_errbuf, sizeof mbed_errbuf);
+ (void) snprintf(errbuf, sizeof errbuf, "-0x%X: %s", (unsigned int) err, mbed_errbuf);
+#else
+ (void) snprintf(errbuf, sizeof errbuf, "-0x%X", (unsigned int) err);
+#endif
+
+ return errbuf;
}
-int
-rb_init_ssl(void)
+static int
+rb_make_certfp(const mbedtls_x509_crt *const peer_cert, uint8_t certfp[const RB_SSL_CERTFP_LEN], const int method)
{
- int ret;
-
- mbedtls_entropy_init(&entropy);
- mbedtls_ctr_drbg_init(&ctr_drbg);
+ size_t hashlen = 0;
+ mbedtls_md_type_t md_type;
+ bool spki = false;
- if((ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0)) != 0)
+ switch(method)
{
- rb_lib_log("rb_init_prng: unable to initialize PRNG, mbedtls_ctr_drbg_seed() returned -0x%x", -ret);
+ case RB_SSL_CERTFP_METH_CERT_SHA1:
+ md_type = MBEDTLS_MD_SHA1;
+ hashlen = RB_SSL_CERTFP_LEN_SHA1;
+ break;
+ case RB_SSL_CERTFP_METH_SPKI_SHA256:
+ spki = true;
+ case RB_SSL_CERTFP_METH_CERT_SHA256:
+ md_type = MBEDTLS_MD_SHA256;
+ hashlen = RB_SSL_CERTFP_LEN_SHA256;
+ break;
+ case RB_SSL_CERTFP_METH_SPKI_SHA512:
+ spki = true;
+ case RB_SSL_CERTFP_METH_CERT_SHA512:
+ md_type = MBEDTLS_MD_SHA512;
+ hashlen = RB_SSL_CERTFP_LEN_SHA512;
+ break;
+ default:
return 0;
}
- mbedtls_ssl_config_init(&serv_config);
+ const mbedtls_md_info_t *const md_info = mbedtls_md_info_from_type(md_type);
+ if(md_info == NULL)
+ return 0;
+
+ int ret;
+ void* data = peer_cert->raw.p;
+ size_t datalen = peer_cert->raw.len;
- if ((ret = mbedtls_ssl_config_defaults(&serv_config,
- MBEDTLS_SSL_IS_SERVER,
- MBEDTLS_SSL_TRANSPORT_STREAM,
- MBEDTLS_SSL_PRESET_DEFAULT)) != 0)
+ if(spki)
{
- rb_lib_log("rb_init_ssl: unable to initialize default SSL parameters for server context: -0x%x", -ret);
+ // Compiler may complain about dropping const qualifier on the cast below
+ // See <https://github.com/ARMmbed/mbedtls/issues/396> -- this is okay
+
+ unsigned char der_pubkey[8192];
+ if((ret = mbedtls_pk_write_pubkey_der((mbedtls_pk_context *)&peer_cert->pk,
+ der_pubkey, sizeof der_pubkey)) < 0)
+ {
+ rb_lib_log("rb_get_ssl_certfp: pk_write_pubkey_der: %s", rb_ssl_strerror(ret));
+ return 0;
+ }
+ data = der_pubkey + (sizeof(der_pubkey) - (size_t)ret);
+ datalen = (size_t)ret;
+ }
+
+ if((ret = mbedtls_md(md_info, data, datalen, certfp)) != 0)
+ {
+ rb_lib_log("rb_get_ssl_certfp: mbedtls_md: %s", rb_ssl_strerror(ret));
return 0;
}
- mbedtls_ssl_conf_rng(&serv_config, mbedtls_ctr_drbg_random, &ctr_drbg);
+ return (int) hashlen;
+}
+
- /***************************************************************************************************************/
- mbedtls_ssl_config_init(&client_config);
+/*
+ * External MbedTLS-specific code
+ */
+
+void
+rb_ssl_shutdown(rb_fde_t *const F)
+{
+ if(F == NULL || F->ssl == NULL)
+ return;
- if ((ret = mbedtls_ssl_config_defaults(&client_config,
- MBEDTLS_SSL_IS_CLIENT,
- MBEDTLS_SSL_TRANSPORT_STREAM,
- MBEDTLS_SSL_PRESET_DEFAULT)) != 0)
+ for(int i = 0; i < 4; i++)
{
- rb_lib_log("rb_init_ssl: unable to initialize default SSL parameters for client context: -0x%x", -ret);
- return 0;
+ int ret = mbedtls_ssl_close_notify(SSL_P(F));
+
+ if(ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE)
+ break;
}
- mbedtls_ssl_conf_rng(&client_config, mbedtls_ctr_drbg_random, &ctr_drbg);
- mbedtls_ssl_conf_authmode(&client_config, MBEDTLS_SSL_VERIFY_NONE);
+ mbedtls_ssl_free(SSL_P(F));
+ rb_mbedtls_cfg_decref(SSL_C(F));
- return 1;
+ rb_free(F->ssl);
+ F->ssl = NULL;
}
int
-rb_setup_ssl_server(const char *cert, const char *keyfile, const char *dhfile, const char *cipher_list)
+rb_init_ssl(void)
{
+ mbedtls_ctr_drbg_init(&ctr_drbg_ctx);
+ mbedtls_entropy_init(&entropy_ctx);
+
int ret;
- mbedtls_x509_crt_init(&x509);
- ret = mbedtls_x509_crt_parse_file(&x509, cert);
- if (ret != 0)
+ if((ret = mbedtls_ctr_drbg_seed(&ctr_drbg_ctx, mbedtls_entropy_func, &entropy_ctx,
+ (const unsigned char *)rb_mbedtls_personal_str, sizeof(rb_mbedtls_personal_str))) != 0)
{
- rb_lib_log("rb_setup_ssl_server: failed to parse certificate '%s': -0x%x", cert, -ret);
+ rb_lib_log("%s: ctr_drbg_seed: %s", __func__, rb_ssl_strerror(ret));
return 0;
}
- mbedtls_pk_init(&serv_pk);
- ret = mbedtls_pk_parse_keyfile(&serv_pk, keyfile, NULL);
- if (ret != 0)
+ if((ret = mbedtls_x509_crt_parse_der(&dummy_ca_ctx, rb_mbedtls_dummy_ca_certificate,
+ sizeof(rb_mbedtls_dummy_ca_certificate))) != 0)
{
- rb_lib_log("rb_setup_ssl_server: failed to parse private key '%s': -0x%x", keyfile, -ret);
+ rb_lib_log("%s: x509_crt_parse_der (Dummy CA): %s", __func__, rb_ssl_strerror(ret));
return 0;
}
- mbedtls_dhm_init(&dh_params);
- ret = mbedtls_dhm_parse_dhmfile(&dh_params, dhfile);
- if (ret != 0)
+ rb_lib_log("%s: MbedTLS backend initialised", __func__);
+ return 1;
+}
+
+int
+rb_setup_ssl_server(const char *const certfile, const char *keyfile,
+ const char *const dhfile, const char *const cipherlist)
+{
+ if(certfile == NULL)
{
- rb_lib_log("rb_setup_ssl_server: failed to parse DH parameters '%s': -0x%x", dhfile, -ret);
+ rb_lib_log("%s: no certificate file specified", __func__);
return 0;
}
- ret = mbedtls_ssl_conf_dh_param_ctx(&serv_config, &dh_params);
- if (ret != 0)
+ if(keyfile == NULL)
+ keyfile = certfile;
+
+ rb_mbedtls_cfg_context *const newcfg = rb_mbedtls_cfg_new();
+
+ if(newcfg == NULL)
{
- rb_lib_log("rb_setup_ssl_server: failed to set DH parameters on SSL config context: -0x%x", -ret);
+ rb_lib_log("%s: rb_mbedtls_cfg_new: allocation failed", __func__);
return 0;
}
- if (x509.next)
+ int ret;
+
+ if((ret = mbedtls_x509_crt_parse_file(&newcfg->crt, certfile)) != 0)
{
- mbedtls_ssl_conf_ca_chain(&serv_config, x509.next, NULL);
- mbedtls_ssl_conf_ca_chain(&client_config, x509.next, NULL);
+ rb_lib_log("%s: x509_crt_parse_file ('%s'): %s", __func__, certfile, rb_ssl_strerror(ret));
+ rb_mbedtls_cfg_decref(newcfg);
+ return 0;
}
-
- if ((ret = mbedtls_ssl_conf_own_cert(&serv_config, &x509, &serv_pk)) != 0)
+ if((ret = mbedtls_pk_parse_keyfile(&newcfg->key, keyfile, NULL)) != 0)
{
- rb_lib_log("rb_setup_ssl_server: failed to set up own certificate: -0x%x", -ret);
+ rb_lib_log("%s: pk_parse_keyfile ('%s'): %s", __func__, keyfile, rb_ssl_strerror(ret));
+ rb_mbedtls_cfg_decref(newcfg);
return 0;
}
-
- if ((ret = mbedtls_ssl_conf_own_cert(&client_config, &x509, &serv_pk)) != 0)
+ if((ret = mbedtls_pk_check_pair(&newcfg->crt.pk, &newcfg->key)) != 0)
{
- rb_lib_log("rb_setup_ssl_server: failed to set up own certificate: -0x%x", -ret);
+ rb_lib_log("%s: pk_check_pair: public/private key mismatch", __func__);
+ rb_mbedtls_cfg_decref(newcfg);
return 0;
}
+ if((ret = mbedtls_ssl_conf_own_cert(&newcfg->server_cfg, &newcfg->crt, &newcfg->key)) != 0)
+ {
+ rb_lib_log("%s: ssl_conf_own_cert (server): %s", __func__, rb_ssl_strerror(ret));
+ rb_mbedtls_cfg_decref(newcfg);
+ return 0;
+ }
+ if((ret = mbedtls_ssl_conf_own_cert(&newcfg->client_cfg, &newcfg->crt, &newcfg->key)) != 0)
+ {
+ rb_lib_log("%s: ssl_conf_own_cert (client): %s", __func__, rb_ssl_strerror(ret));
+ rb_mbedtls_cfg_decref(newcfg);
+ return 0;
+ }
+
+
+ /* Absense of DH parameters does not matter with mbedTLS, as it comes with its own defaults
+ Thus, clients can still use DHE- ciphersuites, just over a weaker, common DH group
+ So, we do not consider failure to parse DH parameters as fatal */
+ if(dhfile == NULL)
+ {
+ rb_lib_log("%s: no DH parameters file specified", __func__);
+ }
+ else
+ {
+ if((ret = mbedtls_dhm_parse_dhmfile(&newcfg->dhp, dhfile)) != 0)
+ {
+ rb_lib_log("%s: dhm_parse_dhmfile ('%s'): %s", __func__, dhfile, rb_ssl_strerror(ret));
+ }
+ else if((ret = mbedtls_ssl_conf_dh_param_ctx(&newcfg->server_cfg, &newcfg->dhp)) != 0)
+ {
+ rb_lib_log("%s: ssl_conf_dh_param_ctx: %s", __func__, rb_ssl_strerror(ret));
+ }
+ }
+
+
+ const int *rb_ciphersuites = newcfg->suites;
+ size_t suites_count = 0;
+
+ if(cipherlist != NULL)
+ {
+ // The cipherlist is (const char *) -- we should not modify it
+ char *const cipherlist_dup = strdup(cipherlist);
+
+ if(cipherlist_dup != NULL)
+ {
+ char *cipher_str = cipherlist_dup;
+ char *cipher_idx;
+
+ do
+ {
+ // Arbitrary, but the same separator as OpenSSL uses
+ cipher_idx = strchr(cipher_str, ':');
+
+ // This could legitimately be NULL (last ciphersuite in the list)
+ if(cipher_idx != NULL)
+ *cipher_idx = '\0';
+
+ size_t cipher_len = strlen(cipher_str);
+ int cipher_idn = 0;
+
+ // All MbedTLS ciphersuite names begin with these 4 characters
+ if(cipher_len > 4 && strncmp(cipher_str, "TLS-", 4) == 0)
+ cipher_idn = mbedtls_ssl_get_ciphersuite_id(cipher_str);
+
+ // Prevent the same ciphersuite being added multiple times
+ for(size_t x = 0; cipher_idn != 0 && newcfg->suites[x] != 0; x++)
+ if(newcfg->suites[x] == cipher_idn)
+ cipher_idn = 0;
+
+ // Add the suite to the list
+ if(cipher_idn != 0)
+ newcfg->suites[suites_count++] = cipher_idn;
+
+ // Advance the string to the next entry
+ if(cipher_idx)
+ cipher_str = cipher_idx + 1;
+
+ } while(cipher_idx && suites_count < RB_MAX_CIPHERSUITES);
+
+ if(suites_count == 0)
+ rb_lib_log("%s: Ciphersuites provided, but could not parse any", __func__);
+
+ free(cipherlist_dup);
+ }
+ else
+ {
+ rb_lib_log("%s: strdup: %s", __func__, strerror(errno));
+ }
+ }
+ else
+ {
+ rb_lib_log("%s: No ciphersuite list provided", __func__);
+ }
- /* XXX support cipher lists when added to mbedtls */
+ if(suites_count == 0)
+ {
+ rb_lib_log("%s: Using default ciphersuites", __func__);
+ rb_ciphersuites = rb_mbedtls_ciphersuites;
+ suites_count = (sizeof(rb_mbedtls_ciphersuites) / sizeof(rb_mbedtls_ciphersuites[0])) - 1;
+ }
+
+ mbedtls_ssl_conf_ciphersuites(&newcfg->server_cfg, rb_ciphersuites);
+ mbedtls_ssl_conf_ciphersuites(&newcfg->client_cfg, rb_ciphersuites);
+ rb_lib_log("%s: Configured %zu ciphersuites", __func__, suites_count);
+
+
+ rb_mbedtls_cfg_decref(rb_mbedtls_cfg);
+ rb_mbedtls_cfg = newcfg;
+
+ rb_lib_log("%s: TLS configuration successful", __func__);
return 1;
}
int
-rb_ssl_listen(rb_fde_t *F, int backlog, int defer_accept)
+rb_init_prng(const char *const path, prng_seed_t seed_type)
{
- int result;
+ (void) path;
+ (void) seed_type;
- result = rb_listen(F, backlog, defer_accept);
- F->type = RB_FD_SOCKET | RB_FD_LISTEN | RB_FD_SSL;
+ rb_lib_log("%s: Skipping PRNG initialisation; not required by MbedTLS backend", __func__);
+ return 1;
+}
- return result;
+int
+rb_get_random(void *const buf, const size_t length)
+{
+ int ret;
+
+ if((ret = mbedtls_ctr_drbg_random(&ctr_drbg_ctx, buf, length)) != 0)
+ {
+ rb_lib_log("%s: ctr_drbg_random: %s", __func__, rb_ssl_strerror(ret));
+ return 0;
+ }
+
+ return 1;
}
-struct ssl_connect
+const char *
+rb_get_ssl_strerror(rb_fde_t *const F)
{
- CNCB *callback;
- void *data;
- int timeout;
-};
+ const int err = (int) F->ssl_errno;
+ return rb_ssl_strerror(err);
+}
-static void
-rb_ssl_connect_realcb(rb_fde_t *F, int status, struct ssl_connect *sconn)
+int
+rb_get_ssl_certfp(rb_fde_t *const F, uint8_t certfp[const RB_SSL_CERTFP_LEN], const int method)
{
- F->connect->callback = sconn->callback;
- F->connect->data = sconn->data;
- rb_free(sconn);
- rb_connect_callback(F, status);
+ const mbedtls_x509_crt *const peer_cert = mbedtls_ssl_get_peer_cert(SSL_P(F));
+
+ if(peer_cert == NULL)
+ return 0;
+
+ return rb_make_certfp(peer_cert, certfp, method);
}
-static void
-rb_ssl_tryconn_timeout_cb(rb_fde_t *F, void *data)
+int
+rb_get_ssl_certfp_file(const char *const filename, uint8_t certfp[const RB_SSL_CERTFP_LEN], const int method)
{
- rb_ssl_connect_realcb(F, RB_ERR_TIMEOUT, data);
+ mbedtls_x509_crt cert;
+
+ mbedtls_x509_crt_init(&cert);
+
+ const int ret = mbedtls_x509_crt_parse_file(&cert, filename);
+
+ if(ret != 0)
+ return -1;
+
+ const int len = rb_make_certfp(&cert, certfp, method);
+
+ mbedtls_x509_crt_free(&cert);
+
+ return len;
+}
+void
+rb_get_ssl_info(char *const buf, const size_t len)
+{
+ char version_str[512];
+
+ mbedtls_version_get_string(version_str);
+
+ (void) snprintf(buf, len, "ARM mbedTLS: compiled (v%s), library (v%s)",
+ MBEDTLS_VERSION_STRING, version_str);
}
-static void
-rb_ssl_tryconn_cb(rb_fde_t *F, void *data)
+const char *
+rb_ssl_get_cipher(rb_fde_t *const F)
{
- struct ssl_connect *sconn = data;
- int ret;
+ if(F == NULL || F->ssl == NULL)
+ return NULL;
- ret = do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn);
+ static char buf[512];
- switch (ret)
- {
- case -1:
- rb_ssl_connect_realcb(F, RB_ERROR_SSL, sconn);
- break;
- case 0:
- /* do_ssl_handshake does the rb_setselect stuff */
- return;
- default:
- break;
+ const char *const version = mbedtls_ssl_get_version(SSL_P(F));
+ const char *const cipher = mbedtls_ssl_get_ciphersuite(SSL_P(F));
+ (void) snprintf(buf, sizeof buf, "%s, %s", version, cipher);
- }
- rb_ssl_connect_realcb(F, RB_OK, sconn);
+ return buf;
}
-static void
-rb_ssl_setup_client_context(rb_fde_t *F, mbedtls_ssl_context *ssl)
+ssize_t
+rb_ssl_read(rb_fde_t *const F, void *const buf, const size_t count)
{
- int ret;
+ lrb_assert(F != NULL);
+ lrb_assert(F->ssl != NULL);
+
+ const int ret = mbedtls_ssl_read(SSL_P(F), buf, count);
- mbedtls_ssl_init(ssl);
- if ((ret = mbedtls_ssl_setup(ssl, &client_config)) != 0)
+ if(ret >= 0)
+ return (ssize_t) ret;
+
+ switch(ret)
{
- rb_lib_log("rb_ssl_setup_client_context: failed to set up ssl context: -0x%x", -ret);
- rb_close(F);
- return;
+ case MBEDTLS_ERR_SSL_WANT_READ:
+ errno = EAGAIN;
+ return RB_RW_SSL_NEED_READ;
+ case MBEDTLS_ERR_SSL_WANT_WRITE:
+ errno = EAGAIN;
+ return RB_RW_SSL_NEED_WRITE;
+ default:
+ errno = EIO;
+ F->ssl_errno = (unsigned long) -ret;
+ return RB_RW_SSL_ERROR;
}
-
- mbedtls_ssl_set_bio(ssl, F, rb_ssl_write_cb, rb_ssl_read_cb, NULL);
}
-static void
-rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
+ssize_t
+rb_ssl_write(rb_fde_t *const F, const void *const buf, const size_t count)
{
- struct ssl_connect *sconn = data;
- if(status != RB_OK)
+ lrb_assert(F != NULL);
+ lrb_assert(F->ssl != NULL);
+
+ const int ret = mbedtls_ssl_write(SSL_P(F), buf, count);
+
+ if(ret >= 0)
+ return (ssize_t) ret;
+
+ switch(ret)
{
- rb_ssl_connect_realcb(F, status, sconn);
- return;
+ case MBEDTLS_ERR_SSL_WANT_READ:
+ errno = EAGAIN;
+ return RB_RW_SSL_NEED_READ;
+ case MBEDTLS_ERR_SSL_WANT_WRITE:
+ errno = EAGAIN;
+ return RB_RW_SSL_NEED_WRITE;
+ default:
+ errno = EIO;
+ F->ssl_errno = (unsigned long) -ret;
+ return RB_RW_SSL_ERROR;
}
+}
- F->type |= RB_FD_SSL;
- rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
- F->ssl = rb_malloc(sizeof(mbedtls_ssl_context));
- rb_ssl_setup_client_context(F, F->ssl);
+/*
+ * Internal library-agnostic code
+ */
- do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn);
+static void
+rb_ssl_connect_realcb(rb_fde_t *const F, const int status, struct ssl_connect *const sconn)
+{
+ lrb_assert(F != NULL);
+ lrb_assert(F->connect != NULL);
+
+ F->connect->callback = sconn->callback;
+ F->connect->data = sconn->data;
+
+ rb_connect_callback(F, status);
+ rb_free(sconn);
}
-void
-rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
- struct sockaddr *clocal, int socklen, CNCB * callback, void *data, int timeout)
+static void
+rb_ssl_timeout_cb(rb_fde_t *const F, void *const data)
{
- struct ssl_connect *sconn;
- if(F == NULL)
- return;
+ (void) data;
- sconn = rb_malloc(sizeof(struct ssl_connect));
- sconn->data = data;
- sconn->callback = callback;
- sconn->timeout = timeout;
- rb_connect_tcp(F, dest, clocal, socklen, rb_ssl_tryconn, sconn, timeout);
+ lrb_assert(F->accept != NULL);
+ lrb_assert(F->accept->callback != NULL);
+
+ F->accept->callback(F, RB_ERR_TIMEOUT, NULL, 0, F->accept->data);
}
-void
-rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout)
+static void
+rb_ssl_tryconn_timeout_cb(rb_fde_t *const F, void *const data)
{
- struct ssl_connect *sconn;
- if(F == NULL)
+ rb_ssl_connect_realcb(F, RB_ERR_TIMEOUT, data);
+}
+
+static void
+rb_ssl_tryconn(rb_fde_t *const F, const int status, void *const data)
+{
+ lrb_assert(F != NULL);
+
+ struct ssl_connect *const sconn = data;
+
+ if(status != RB_OK)
+ {
+ rb_ssl_connect_realcb(F, status, sconn);
return;
+ }
- sconn = rb_malloc(sizeof(struct ssl_connect));
- sconn->data = data;
- sconn->callback = callback;
- sconn->timeout = timeout;
- F->connect = rb_malloc(sizeof(struct conndata));
- F->connect->callback = callback;
- F->connect->data = data;
F->type |= RB_FD_SSL;
- F->ssl = rb_malloc(sizeof(mbedtls_ssl_context));
- rb_ssl_setup_client_context(F, F->ssl);
rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
-
- do_ssl_handshake(F, rb_ssl_tryconn_cb, (void *)sconn);
+ rb_ssl_init_fd(F, RB_FD_TLS_DIRECTION_OUT);
+ rb_ssl_connect_common(F, sconn);
}
+
+
+/*
+ * External library-agnostic code
+ */
+
int
-rb_init_prng(const char *path, prng_seed_t seed_type)
+rb_supports_ssl(void)
{
return 1;
}
-int
-rb_get_random(void *buf, size_t length)
+unsigned int
+rb_ssl_handshake_count(rb_fde_t *const F)
{
- if (mbedtls_ctr_drbg_random(&ctr_drbg, buf, length))
- return 0;
-
- return 1;
+ return F->handshake_count;
}
-const char *
-rb_get_ssl_strerror(rb_fde_t *F)
+void
+rb_ssl_clear_handshake_count(rb_fde_t *const F)
{
-#ifdef MBEDTLS_ERROR_C
- static char errbuf[512];
- mbedtls_strerror(F->ssl_errno, errbuf, sizeof errbuf);
- return errbuf;
-#else
- return "???";
-#endif
+ F->handshake_count = 0;
}
-int
-rb_get_ssl_certfp(rb_fde_t *F, uint8_t certfp[RB_SSL_CERTFP_LEN], int method)
+void
+rb_ssl_start_accepted(rb_fde_t *const F, ACCB *const cb, void *const data, const int timeout)
{
- const mbedtls_x509_crt *peer_cert;
- uint8_t hash[RB_SSL_CERTFP_LEN];
- size_t hashlen;
- const mbedtls_md_info_t *md_info;
- mbedtls_md_type_t md_type;
- int ret;
-
- switch (method)
- {
- case RB_SSL_CERTFP_METH_SHA1:
- md_type = MBEDTLS_MD_SHA1;
- hashlen = RB_SSL_CERTFP_LEN_SHA1;
- case RB_SSL_CERTFP_METH_SHA256:
- md_type = MBEDTLS_MD_SHA256;
- hashlen = RB_SSL_CERTFP_LEN_SHA256;
- case RB_SSL_CERTFP_METH_SHA512:
- md_type = MBEDTLS_MD_SHA512;
- hashlen = RB_SSL_CERTFP_LEN_SHA512;
- default:
- return 0;
- }
+ F->type |= RB_FD_SSL;
- peer_cert = mbedtls_ssl_get_peer_cert(SSL_P(F));
- if (peer_cert == NULL)
- return 0;
+ F->accept = rb_malloc(sizeof(struct acceptdata));
+ F->accept->callback = cb;
+ F->accept->data = data;
+ F->accept->addrlen = 0;
+ (void) memset(&F->accept->S, 0x00, sizeof F->accept->S);
- md_info = mbedtls_md_info_from_type(md_type);
- if (md_info == NULL)
- return 0;
+ rb_settimeout(F, timeout, rb_ssl_timeout_cb, NULL);
+ rb_ssl_init_fd(F, RB_FD_TLS_DIRECTION_IN);
+ rb_ssl_accept_common(F, NULL);
+}
- if ((ret = mbedtls_md(md_info, peer_cert->raw.p, peer_cert->raw.len, hash)) != 0)
- {
- rb_lib_log("rb_get_ssl_certfp: unable to get certfp for F: %p, -0x%x", -ret);
- return 0;
- }
+void
+rb_ssl_accept_setup(rb_fde_t *const srv_F, rb_fde_t *const cli_F, struct sockaddr *const st, const int addrlen)
+{
+ cli_F->type |= RB_FD_SSL;
- memcpy(certfp, hash, hashlen);
+ cli_F->accept = rb_malloc(sizeof(struct acceptdata));
+ cli_F->accept->callback = srv_F->accept->callback;
+ cli_F->accept->data = srv_F->accept->data;
+ cli_F->accept->addrlen = (rb_socklen_t) addrlen;
+ (void) memset(&cli_F->accept->S, 0x00, sizeof cli_F->accept->S);
+ (void) memcpy(&cli_F->accept->S, st, (size_t) addrlen);
- return 1;
+ rb_settimeout(cli_F, 10, rb_ssl_timeout_cb, NULL);
+ rb_ssl_init_fd(cli_F, RB_FD_TLS_DIRECTION_IN);
+ rb_ssl_accept_common(cli_F, NULL);
}
int
-rb_supports_ssl(void)
+rb_ssl_listen(rb_fde_t *const F, const int backlog, const int defer_accept)
{
- return 1;
+ int result = rb_listen(F, backlog, defer_accept);
+
+ F->type = RB_FD_SOCKET | RB_FD_LISTEN | RB_FD_SSL;
+
+ return result;
}
void
-rb_get_ssl_info(char *buf, size_t len)
+rb_connect_tcp_ssl(rb_fde_t *const F, struct sockaddr *const dest, struct sockaddr *const clocal,
+ CNCB *const callback, void *const data, const int timeout)
{
- char version_str[512];
- mbedtls_version_get_string(version_str);
+ if(F == NULL)
+ return;
+
+ struct ssl_connect *const sconn = rb_malloc(sizeof *sconn);
+ sconn->data = data;
+ sconn->callback = callback;
+ sconn->timeout = timeout;
- snprintf(buf, len, "MBEDTLS: compiled (%s), library(%s)",
- MBEDTLS_VERSION_STRING, version_str);
+ rb_connect_tcp(F, dest, clocal, rb_ssl_tryconn, sconn, timeout);
}
-const char *
-rb_ssl_get_cipher(rb_fde_t *F)
+void
+rb_ssl_start_connected(rb_fde_t *const F, CNCB *const callback, void *const data, const int timeout)
{
- if(F == NULL || F->ssl == NULL)
- return NULL;
- return mbedtls_ssl_get_ciphersuite(SSL_P(F));
+ if(F == NULL)
+ return;
+
+ struct ssl_connect *const sconn = rb_malloc(sizeof *sconn);
+ sconn->data = data;
+ sconn->callback = callback;
+ sconn->timeout = timeout;
+
+ F->connect = rb_malloc(sizeof(struct conndata));
+ F->connect->callback = callback;
+ F->connect->data = data;
+
+ F->type |= RB_FD_SSL;
+
+ rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
+ rb_ssl_init_fd(F, RB_FD_TLS_DIRECTION_OUT);
+ rb_ssl_connect_common(F, sconn);
}
-#endif /* HAVE_GNUTLS */
+#endif /* HAVE_MBEDTLS */
projects / solanum.git / blobdiff