return 0;
}
-#define AES_CIPHERS(v) \
+#define AES_GCM_CIPHERS(v) \
MBEDTLS_TLS_##v##_WITH_AES_128_GCM_SHA256, \
- MBEDTLS_TLS_##v##_WITH_AES_256_GCM_SHA384, \
+ MBEDTLS_TLS_##v##_WITH_AES_256_GCM_SHA384
+
+#define AES_CBC_CIPHERS(v) \
MBEDTLS_TLS_##v##_WITH_AES_128_CBC_SHA, \
MBEDTLS_TLS_##v##_WITH_AES_256_CBC_SHA
+#define AES_CIPHERS(v) \
+ AES_GCM_CIPHERS(v), \
+ AES_CBC_CIPHERS(v)
+
static const int default_ciphersuites_server[] =
{
- AES_CIPHERS(ECDHE_ECDSA),
- AES_CIPHERS(ECDHE_RSA),
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+ AES_GCM_CIPHERS(ECDHE_ECDSA),
+ MBEDTLS_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+ AES_GCM_CIPHERS(ECDHE_RSA),
+ AES_CBC_CIPHERS(ECDHE_RSA),
AES_CIPHERS(RSA),
0
};
static const int default_ciphersuites_client[] =
{
- AES_CIPHERS(ECDHE_ECDSA),
- AES_CIPHERS(ECDHE_RSA),
- AES_CIPHERS(DHE_RSA),
+ MBEDTLS_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+ AES_GCM_CIPHERS(ECDHE_ECDSA),
+ MBEDTLS_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+ AES_GCM_CIPHERS(ECDHE_RSA),
+ MBEDTLS_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+ AES_GCM_CIPHERS(DHE_RSA),
+ AES_CBC_CIPHERS(ECDHE_ECDSA),
+ AES_CBC_CIPHERS(ECDHE_RSA),
+ AES_CBC_CIPHERS(DHE_RSA),
MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
AES_CIPHERS(RSA),
MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA,
if (!ctx->cert.version)
return;
- if (!ctx->server) {
- mbedtls_ssl_conf_ca_chain(&ctx->conf, &ctx->cert, NULL);
- return;
- }
-
if (!ctx->key.pk_info)
return;
- if (ctx->cert.next)
- mbedtls_ssl_conf_ca_chain(&ctx->conf, ctx->cert.next, NULL);
mbedtls_ssl_conf_own_cert(&ctx->conf, &ctx->cert, &ctx->key);
}
return 0;
}
+__hidden int __ustream_ssl_set_ciphers(struct ustream_ssl_ctx *ctx, const char *ciphers)
+{
+ int *ciphersuites = NULL, *tmp, id;
+ char *cipherstr, *p, *last, c;
+ size_t len = 0;
+
+ if (ciphers == NULL)
+ return -1;
+
+ cipherstr = strdup(ciphers);
+
+ if (cipherstr == NULL)
+ return -1;
+
+ for (p = cipherstr, last = p;; p++) {
+ if (*p == ':' || *p == 0) {
+ c = *p;
+ *p = 0;
+
+ id = mbedtls_ssl_get_ciphersuite_id(last);
+
+ if (id != 0) {
+ tmp = realloc(ciphersuites, (len + 2) * sizeof(int));
+
+ if (tmp == NULL) {
+ free(ciphersuites);
+ free(cipherstr);
+
+ return -1;
+ }
+
+ ciphersuites = tmp;
+ ciphersuites[len++] = id;
+ ciphersuites[len] = 0;
+ }
+
+ if (c == 0)
+ break;
+
+ last = p + 1;
+ }
+
+ /*
+ * mbedTLS expects cipher names with dashes while many sources elsewhere
+ * like the Firefox wiki or Wireshark specify ciphers with underscores,
+ * so simply convert all underscores to dashes to accept both notations.
+ */
+ else if (*p == '_') {
+ *p = '-';
+ }
+ }
+
+ free(cipherstr);
+
+ if (len == 0)
+ return -1;
+
+ mbedtls_ssl_conf_ciphersuites(&ctx->conf, ciphersuites);
+ free(ctx->ciphersuites);
+
+ ctx->ciphersuites = ciphersuites;
+
+ return 0;
+}
+
__hidden void __ustream_ssl_context_free(struct ustream_ssl_ctx *ctx)
{
#if defined(MBEDTLS_SSL_CACHE_C)
mbedtls_x509_crt_free(&ctx->ca_cert);
mbedtls_x509_crt_free(&ctx->cert);
mbedtls_ssl_config_free(&ctx->conf);
+ free(ctx->ciphersuites);
free(ctx);
}