#include <librb_config.h>
#include <rb_lib.h>
+
+#ifdef HAVE_MBEDTLS
+
#include <commio-int.h>
#include <commio-ssl.h>
#include <stdbool.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"
+#include "mbedtls_ratbox.h"
-#include "mbedtls_embedded_data.h"
+typedef enum
+{
+ RB_FD_TLS_DIRECTION_IN = 0,
+ RB_FD_TLS_DIRECTION_OUT = 1
+} rb_fd_tls_direction;
#define RB_MAX_CIPHERSUITES 512
mbedtls_dhm_context dhp;
mbedtls_ssl_config server_cfg;
mbedtls_ssl_config client_cfg;
- int suites[RB_MAX_CIPHERSUITES + 1];
size_t refcount;
+ int suites[RB_MAX_CIPHERSUITES + 1];
} rb_mbedtls_cfg_context;
typedef struct
int timeout;
};
+static const char *rb_ssl_strerror(int);
static void rb_ssl_connect_realcb(rb_fde_t *, int, struct ssl_connect *);
-static int rb_sock_net_recv(void *, unsigned char *, size_t);
-static int rb_sock_net_xmit(void *, const unsigned char *, size_t);
-
/*
* Internal MbedTLS-specific code
*/
-static const char *
-rb_get_ssl_strerror_internal(int err)
-{
- static char errbuf[512];
-
-#ifdef MBEDTLS_ERROR_C
- char mbed_errbuf[512];
- mbedtls_strerror(err, mbed_errbuf, sizeof mbed_errbuf);
- (void) snprintf(errbuf, sizeof errbuf, "(-0x%x) %s", -err, mbed_errbuf);
-#else
- (void) snprintf(errbuf, sizeof errbuf, "-0x%x", -err);
-#endif
-
- return errbuf;
-}
-
static void
rb_mbedtls_cfg_incref(rb_mbedtls_cfg_context *const cfg)
{
mbedtls_pk_free(&cfg->key);
mbedtls_x509_crt_free(&cfg->crt);
- free(cfg);
+ rb_free(cfg);
+}
+
+static int
+rb_sock_net_recv(void *const context_ptr, unsigned char *const buf, const size_t count)
+{
+ const int fd = rb_get_fd((rb_fde_t *)context_ptr);
+
+ const int ret = (int) read(fd, buf, count);
+
+ if(ret < 0 && rb_ignore_errno(errno))
+ return MBEDTLS_ERR_SSL_WANT_READ;
+
+ return ret;
+}
+
+static int
+rb_sock_net_xmit(void *const context_ptr, const unsigned char *const buf, const size_t count)
+{
+ const int fd = rb_get_fd((rb_fde_t *)context_ptr);
+
+ const int ret = (int) write(fd, buf, count);
+
+ if(ret < 0 && rb_ignore_errno(errno))
+ return MBEDTLS_ERR_SSL_WANT_WRITE;
+
+ return ret;
+}
+
+static void
+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;
+
+ if((ret = mbedtls_ssl_setup(&mbed_ssl_ctx->ssl, mbed_config)) != 0)
+ {
+ 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(&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;
}
static rb_mbedtls_cfg_context *
rb_mbedtls_cfg_new(void)
{
- rb_mbedtls_cfg_context *const cfg = malloc(sizeof *cfg);
+ rb_mbedtls_cfg_context *const cfg = rb_malloc(sizeof *cfg);
if(cfg == NULL)
return NULL;
MBEDTLS_SSL_IS_SERVER, MBEDTLS_SSL_TRANSPORT_STREAM,
MBEDTLS_SSL_PRESET_DEFAULT)) != 0)
{
- rb_lib_log("rb_mbedtls_cfg_new: ssl_config_defaults (server): %s",
- rb_get_ssl_strerror_internal(ret));
-
+ rb_lib_log("%s: ssl_config_defaults (server): %s", __func__, rb_ssl_strerror(ret));
rb_mbedtls_cfg_decref(cfg);
return NULL;
}
MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_TRANSPORT_STREAM,
MBEDTLS_SSL_PRESET_DEFAULT)) != 0)
{
- rb_lib_log("rb_mbedtls_cfg_new: ssl_config_defaults (client): %s",
- rb_get_ssl_strerror_internal(ret));
-
+ rb_lib_log("%s: ssl_config_defaults (client): %s", __func__, rb_ssl_strerror(ret));
rb_mbedtls_cfg_decref(cfg);
return 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
return cfg;
}
-static void
-rb_ssl_setup_mbed_context(rb_fde_t *const F, mbedtls_ssl_config *const mbed_config)
-{
- rb_mbedtls_ssl_context *const mbed_ssl_ctx = malloc(sizeof *mbed_ssl_ctx);
- if(mbed_ssl_ctx == NULL)
- {
- rb_lib_log("rb_ssl_setup_mbed_context: rb_malloc: allocation failure");
- rb_close(F);
- return;
- }
-
- mbedtls_ssl_init(&mbed_ssl_ctx->ssl);
- mbedtls_ssl_set_bio(&mbed_ssl_ctx->ssl, F, rb_sock_net_xmit, rb_sock_net_recv, NULL);
-
- int ret;
-
- if((ret = mbedtls_ssl_setup(&mbed_ssl_ctx->ssl, mbed_config)) != 0)
- {
- rb_lib_log("rb_ssl_setup_mbed_context: ssl_setup: %s",
- rb_get_ssl_strerror_internal(ret));
- mbedtls_ssl_free(&mbed_ssl_ctx->ssl);
- free(mbed_ssl_ctx);
- rb_close(F);
- return;
- }
-
- rb_mbedtls_cfg_incref(rb_mbedtls_cfg);
- mbed_ssl_ctx->cfg = rb_mbedtls_cfg;
- F->ssl = mbed_ssl_ctx;
-}
-
static void
rb_ssl_accept_common(rb_fde_t *const F, void *const data)
{
lrb_assert(F->accept->callback != NULL);
lrb_assert(F->ssl != NULL);
- mbedtls_ssl_context *const ssl_ctx = SSL_P(F);
+ (void) data;
- if(ssl_ctx->state != MBEDTLS_SSL_HANDSHAKE_OVER)
- {
- int ret = mbedtls_ssl_handshake(ssl_ctx);
+ const int ret = mbedtls_ssl_handshake(SSL_P(F));
- 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:
- F->ssl_errno = ret;
- F->accept->callback(F, RB_ERROR_SSL, NULL, 0, F->accept->data);
- return;
- }
+ 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);
struct acceptdata *const ad = F->accept;
F->accept = NULL;
ad->callback(F, RB_OK, (struct sockaddr *)&ad->S, ad->addrlen, ad->data);
- free(ad);
+ rb_free(ad);
}
static void
-rb_ssl_tryconn_cb(rb_fde_t *const F, void *const data)
+rb_ssl_connect_common(rb_fde_t *const F, void *const data)
{
lrb_assert(F != NULL);
lrb_assert(F->ssl != NULL);
- mbedtls_ssl_context *const ssl_ctx = SSL_P(F);
+ const int ret = mbedtls_ssl_handshake(SSL_P(F));
- if(ssl_ctx->state != MBEDTLS_SSL_HANDSHAKE_OVER)
+ switch(ret)
{
- int ret = mbedtls_ssl_handshake(ssl_ctx);
-
- switch(ret)
- {
- case 0:
- F->handshake_count++;
- break;
- case MBEDTLS_ERR_SSL_WANT_READ:
- rb_setselect(F, RB_SELECT_READ, rb_ssl_tryconn_cb, data);
- return;
- case MBEDTLS_ERR_SSL_WANT_WRITE:
- rb_setselect(F, RB_SELECT_WRITE, rb_ssl_tryconn_cb, data);
- return;
- default:
- errno = EIO;
- F->ssl_errno = ret;
- rb_ssl_connect_realcb(F, RB_ERROR_SSL, data);
- return;
- }
+ 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;
}
rb_ssl_connect_realcb(F, RB_OK, data);
}
-static size_t
-rb_make_certfp(const mbedtls_x509_crt *peer_cert, uint8_t certfp[RB_SSL_CERTFP_LEN], int method)
+static const char *
+rb_ssl_strerror(int err)
+{
+ static char errbuf[512];
+
+ 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;
+}
+
+static int
+rb_make_certfp(const mbedtls_x509_crt *const peer_cert, uint8_t certfp[const RB_SSL_CERTFP_LEN], const int method)
{
- mbedtls_md_type_t md_type;
size_t hashlen = 0;
+ mbedtls_md_type_t md_type;
bool spki = false;
- if(peer_cert == NULL)
- return 0;
-
switch(method)
{
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;
}
if(spki)
{
+ // 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_get_ssl_strerror_internal(ret));
+ 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);
if((ret = mbedtls_md(md_info, data, datalen, certfp)) != 0)
{
- rb_lib_log("rb_get_ssl_certfp: mbedtls_md: %s",
- rb_get_ssl_strerror_internal(ret));
+ rb_lib_log("rb_get_ssl_certfp: mbedtls_md: %s", rb_ssl_strerror(ret));
return 0;
}
- return hashlen;
+ return (int) hashlen;
}
if(F == NULL || F->ssl == NULL)
return;
- if(SSL_P(F) != NULL)
+ for(int i = 0; i < 4; i++)
{
- for(int i = 0; i < 4; i++)
- {
- int ret = mbedtls_ssl_close_notify(SSL_P(F));
+ 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_free(SSL_P(F));
+ if(ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE)
+ break;
}
- if(SSL_C(F) != NULL)
- rb_mbedtls_cfg_decref(SSL_C(F));
+ mbedtls_ssl_free(SSL_P(F));
+ rb_mbedtls_cfg_decref(SSL_C(F));
- free(F->ssl);
+ rb_free(F->ssl);
F->ssl = NULL;
}
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_init_ssl: ctr_drbg_seed: %s",
- rb_get_ssl_strerror_internal(ret));
+ rb_lib_log("%s: ctr_drbg_seed: %s", __func__, rb_ssl_strerror(ret));
return 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_init_ssl: x509_crt_parse_der (Dummy CA): %s",
- rb_get_ssl_strerror_internal(ret));
+ rb_lib_log("%s: x509_crt_parse_der (Dummy CA): %s", __func__, rb_ssl_strerror(ret));
return 0;
}
- rb_lib_log("rb_init_ssl: MbedTLS backend initialised");
+ rb_lib_log("%s: MbedTLS backend initialised", __func__);
return 1;
}
{
if(certfile == NULL)
{
- rb_lib_log("rb_setup_ssl_server: no certificate file specified");
+ rb_lib_log("%s: no certificate file specified", __func__);
return 0;
}
if(newcfg == NULL)
{
- rb_lib_log("rb_setup_ssl_server: rb_mbedtls_cfg_new: allocation failed");
+ rb_lib_log("%s: rb_mbedtls_cfg_new: allocation failed", __func__);
return 0;
}
if((ret = mbedtls_x509_crt_parse_file(&newcfg->crt, certfile)) != 0)
{
- rb_lib_log("rb_setup_ssl_server: x509_crt_parse_file ('%s'): %s",
- certfile, rb_get_ssl_strerror_internal(ret));
-
+ 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_pk_parse_keyfile(&newcfg->key, keyfile, NULL)) != 0)
{
- rb_lib_log("rb_setup_ssl_server: pk_parse_keyfile ('%s'): %s",
- keyfile, rb_get_ssl_strerror_internal(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_pk_check_pair(&newcfg->crt.pk, &newcfg->key)) != 0)
+ {
+ 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("rb_setup_ssl_server: no DH parameters file specified");
+ rb_lib_log("%s: no DH parameters file specified", __func__);
}
else
{
if((ret = mbedtls_dhm_parse_dhmfile(&newcfg->dhp, dhfile)) != 0)
{
- rb_lib_log("rb_setup_ssl_server: dhm_parse_dhmfile ('%s'): %s",
- dhfile, rb_get_ssl_strerror_internal(ret));
+ 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("rb_setup_ssl_server: ssl_conf_dh_param_ctx: %s",
- rb_get_ssl_strerror_internal(ret));
+ rb_lib_log("%s: ssl_conf_dh_param_ctx: %s", __func__, rb_ssl_strerror(ret));
}
}
- if((ret = mbedtls_ssl_conf_own_cert(&newcfg->server_cfg, &newcfg->crt, &newcfg->key)) != 0)
- {
- rb_lib_log("rb_setup_ssl_server: ssl_conf_own_cert (server): %s",
- rb_get_ssl_strerror_internal(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("rb_setup_ssl_server: ssl_conf_own_cert (client): %s",
- rb_get_ssl_strerror_internal(ret));
-
- rb_mbedtls_cfg_decref(newcfg);
- return 0;
- }
-
-
const int *rb_ciphersuites = newcfg->suites;
size_t suites_count = 0;
} while(cipher_idx && suites_count < RB_MAX_CIPHERSUITES);
if(suites_count == 0)
- rb_lib_log("rb_setup_ssl_server: Ciphersuites provided, but could not parse any");
+ rb_lib_log("%s: Ciphersuites provided, but could not parse any", __func__);
free(cipherlist_dup);
}
else
{
- rb_lib_log("rb_setup_ssl_server: strdup: %s", strerror(errno));
+ rb_lib_log("%s: strdup: %s", __func__, strerror(errno));
}
}
else
{
- rb_lib_log("rb_setup_ssl_server: No ciphersuite list provided");
+ rb_lib_log("%s: No ciphersuite list provided", __func__);
}
if(suites_count == 0)
{
- rb_lib_log("rb_setup_ssl_server: Using default ciphersuites");
+ 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("rb_setup_ssl_server: Configured %zu ciphersuites", suites_count);
-
+ rb_lib_log("%s: Configured %zu ciphersuites", __func__, suites_count);
rb_mbedtls_cfg_decref(rb_mbedtls_cfg);
rb_mbedtls_cfg = newcfg;
- rb_lib_log("rb_setup_ssl_server: TLS configuration successful");
+ rb_lib_log("%s: TLS configuration successful", __func__);
return 1;
}
int
rb_init_prng(const char *const path, prng_seed_t seed_type)
{
- rb_lib_log("rb_init_prng: Skipping PRNG initialisation; not required by MbedTLS backend");
+ (void) path;
+ (void) seed_type;
+
+ rb_lib_log("%s: Skipping PRNG initialisation; not required by MbedTLS backend", __func__);
return 1;
}
int
-rb_get_random(void *const buf, size_t length)
+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("rb_get_random: ctr_drbg_random: %s",
- rb_get_ssl_strerror_internal(ret));
-
+ rb_lib_log("%s: ctr_drbg_random: %s", __func__, rb_ssl_strerror(ret));
return 0;
}
const char *
rb_get_ssl_strerror(rb_fde_t *const F)
{
- return rb_get_ssl_strerror_internal(F->ssl_errno);
+ const int err = (int) F->ssl_errno;
+ return rb_ssl_strerror(err);
}
int
-rb_get_ssl_certfp(rb_fde_t *F, uint8_t certfp[RB_SSL_CERTFP_LEN], int method)
+rb_get_ssl_certfp(rb_fde_t *const F, uint8_t certfp[const RB_SSL_CERTFP_LEN], const int method)
{
const mbedtls_x509_crt *const peer_cert = mbedtls_ssl_get_peer_cert(SSL_P(F));
- return (int) rb_make_certfp(peer_cert, certfp, method);
+ if(peer_cert == NULL)
+ return 0;
+
+ return rb_make_certfp(peer_cert, certfp, method);
}
int
-rb_get_ssl_certfp_file(const char *filename, uint8_t certfp[RB_SSL_CERTFP_LEN], int method)
+rb_get_ssl_certfp_file(const char *const filename, uint8_t certfp[const RB_SSL_CERTFP_LEN], const int method)
{
mbedtls_x509_crt cert;
+
mbedtls_x509_crt_init(&cert);
- int ret;
- if((ret = mbedtls_x509_crt_parse_file(&cert, filename)) != 0)
+ const int ret = mbedtls_x509_crt_parse_file(&cert, filename);
+
+ if(ret != 0)
return -1;
- size_t len = rb_make_certfp(&cert, certfp, method);
+ const int len = rb_make_certfp(&cert, certfp, method);
mbedtls_x509_crt_free(&cert);
- return (int) len;
+ return len;
}
-
void
-rb_get_ssl_info(char *const buf, size_t len)
+rb_get_ssl_info(char *const buf, const size_t len)
{
char version_str[512];
const char *
rb_ssl_get_cipher(rb_fde_t *const F)
{
- if(F == NULL || F->ssl == NULL || SSL_P(F) == NULL)
+ if(F == NULL || F->ssl == NULL)
return NULL;
static char buf[512];
}
ssize_t
-rb_ssl_read(rb_fde_t *const F, void *const buf, size_t count)
+rb_ssl_read(rb_fde_t *const F, void *const buf, const size_t count)
{
lrb_assert(F != NULL);
lrb_assert(F->ssl != NULL);
- ssize_t ret = (ssize_t) mbedtls_ssl_read(SSL_P(F), buf, count);
+ const int ret = mbedtls_ssl_read(SSL_P(F), buf, count);
- if(ret > 0)
- return ret;
+ if(ret >= 0)
+ return (ssize_t) ret;
switch(ret)
{
return RB_RW_SSL_NEED_WRITE;
default:
errno = EIO;
- F->ssl_errno = ret;
+ F->ssl_errno = (unsigned long) -ret;
return RB_RW_SSL_ERROR;
}
}
ssize_t
-rb_ssl_write(rb_fde_t *const F, const void *const buf, size_t count)
+rb_ssl_write(rb_fde_t *const F, const void *const buf, const size_t count)
{
lrb_assert(F != NULL);
lrb_assert(F->ssl != NULL);
- ssize_t ret = (ssize_t) mbedtls_ssl_write(SSL_P(F), buf, count);
+ const int ret = mbedtls_ssl_write(SSL_P(F), buf, count);
- if(ret > 0)
- return ret;
+ if(ret >= 0)
+ return (ssize_t) ret;
switch(ret)
{
return RB_RW_SSL_NEED_WRITE;
default:
errno = EIO;
- F->ssl_errno = ret;
+ F->ssl_errno = (unsigned long) -ret;
return RB_RW_SSL_ERROR;
}
}
/*
* Internal library-agnostic code
- * Mostly copied from the OpenSSL backend, with some optimisations and complete const-correctness
*/
static void
-rb_ssl_connect_realcb(rb_fde_t *const F, int status, struct ssl_connect *const sconn)
+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);
- free(sconn);
+ rb_free(sconn);
}
static void
rb_ssl_timeout_cb(rb_fde_t *const F, void *const data)
{
+ (void) data;
+
lrb_assert(F->accept != NULL);
lrb_assert(F->accept->callback != NULL);
}
static void
-rb_ssl_tryconn(rb_fde_t *const F, int status, void *const data)
+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, data);
+ rb_ssl_connect_realcb(F, status, sconn);
return;
}
F->type |= RB_FD_SSL;
- struct ssl_connect *const sconn = data;
rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
-
- rb_ssl_setup_mbed_context(F, &rb_mbedtls_cfg->client_cfg);
- rb_ssl_tryconn_cb(F, sconn);
-}
-
-static int
-rb_sock_net_recv(void *const context_ptr, unsigned char *const buf, size_t count)
-{
- rb_fde_t *const F = (rb_fde_t *)context_ptr;
-
- int ret = (int) read(F->fd, buf, count);
-
- if(ret < 0 && rb_ignore_errno(errno))
- return MBEDTLS_ERR_SSL_WANT_READ;
-
- return ret;
-}
-
-static int
-rb_sock_net_xmit(void *const context_ptr, const unsigned char *const buf, size_t count)
-{
- rb_fde_t *const F = (rb_fde_t *)context_ptr;
-
- int ret = (int) write(F->fd, buf, count);
-
- if(ret < 0 && rb_ignore_errno(errno))
- return MBEDTLS_ERR_SSL_WANT_WRITE;
-
- return ret;
+ rb_ssl_init_fd(F, RB_FD_TLS_DIRECTION_OUT);
+ rb_ssl_connect_common(F, sconn);
}
/*
* External library-agnostic code
- * Mostly copied from the OpenSSL backend, with some optimisations and const-correctness
*/
int
}
void
-rb_ssl_start_accepted(rb_fde_t *const F, ACCB *const cb, void *const data, int timeout)
+rb_ssl_start_accepted(rb_fde_t *const F, ACCB *const cb, void *const data, const int timeout)
{
F->type |= RB_FD_SSL;
- F->accept = rb_malloc(sizeof(struct acceptdata));
+ F->accept = rb_malloc(sizeof(struct acceptdata));
F->accept->callback = cb;
F->accept->data = data;
- rb_settimeout(F, timeout, rb_ssl_timeout_cb, NULL);
-
F->accept->addrlen = 0;
(void) memset(&F->accept->S, 0x00, sizeof F->accept->S);
- rb_ssl_setup_mbed_context(F, &rb_mbedtls_cfg->server_cfg);
+ 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);
}
void
-rb_ssl_accept_setup(rb_fde_t *const srv_F, rb_fde_t *const cli_F, struct sockaddr *const st, int addrlen)
+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;
- cli_F->accept = rb_malloc(sizeof(struct acceptdata));
+ cli_F->accept = rb_malloc(sizeof(struct acceptdata));
cli_F->accept->callback = srv_F->accept->callback;
cli_F->accept->data = srv_F->accept->data;
- rb_settimeout(cli_F, 10, rb_ssl_timeout_cb, NULL);
-
- cli_F->accept->addrlen = addrlen;
+ 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, addrlen);
+ (void) memcpy(&cli_F->accept->S, st, (size_t) addrlen);
- rb_ssl_setup_mbed_context(cli_F, &rb_mbedtls_cfg->server_cfg);
+ 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_ssl_listen(rb_fde_t *const F, int backlog, int defer_accept)
+rb_ssl_listen(rb_fde_t *const F, const int backlog, const int defer_accept)
{
int result = rb_listen(F, backlog, defer_accept);
+
F->type = RB_FD_SOCKET | RB_FD_LISTEN | RB_FD_SSL;
return result;
void
rb_connect_tcp_ssl(rb_fde_t *const F, struct sockaddr *const dest, struct sockaddr *const clocal,
- CNCB *const callback, void *const data, int timeout)
+ CNCB *const callback, void *const data, const int timeout)
{
if(F == NULL)
return;
}
void
-rb_ssl_start_connected(rb_fde_t *const F, CNCB *const callback, void *const data, int timeout)
+rb_ssl_start_connected(rb_fde_t *const F, CNCB *const callback, void *const data, const int timeout)
{
if(F == NULL)
return;
- F->connect = rb_malloc(sizeof(struct conndata));
- F->connect->callback = callback;
- F->connect->data = data;
- F->type |= RB_FD_SSL;
-
struct ssl_connect *const sconn = rb_malloc(sizeof *sconn);
sconn->data = data;
sconn->callback = callback;
sconn->timeout = timeout;
- rb_settimeout(F, sconn->timeout, rb_ssl_tryconn_timeout_cb, sconn);
+ F->connect = rb_malloc(sizeof(struct conndata));
+ F->connect->callback = callback;
+ F->connect->data = data;
- rb_ssl_setup_mbed_context(F, &rb_mbedtls_cfg->client_cfg);
- rb_ssl_tryconn_cb(F, sconn);
+ 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_MBEDTLS */
projects / solanum.git / blobdiff