2019-11-08 12:17:18 +08:00
|
|
|
/***************************************************************************
|
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2023-01-02 20:51:48 +08:00
|
|
|
* Copyright (C) Michael Forney, <mforney@mforney.org>
|
2019-11-08 12:17:18 +08:00
|
|
|
*
|
|
|
|
* This software is licensed as described in the file COPYING, which
|
|
|
|
* you should have received as part of this distribution. The terms
|
2020-11-04 21:02:01 +08:00
|
|
|
* are also available at https://curl.se/docs/copyright.html.
|
2019-11-08 12:17:18 +08:00
|
|
|
*
|
|
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
|
|
*
|
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: curl
|
2022-05-17 17:16:50 +08:00
|
|
|
*
|
2019-11-08 12:17:18 +08:00
|
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
|
|
|
|
#ifdef USE_BEARSSL
|
|
|
|
|
|
|
|
#include <bearssl.h>
|
|
|
|
|
|
|
|
#include "bearssl.h"
|
|
|
|
#include "urldata.h"
|
|
|
|
#include "sendf.h"
|
|
|
|
#include "inet_pton.h"
|
|
|
|
#include "vtls.h"
|
2022-11-11 18:45:34 +08:00
|
|
|
#include "vtls_int.h"
|
2019-11-08 12:17:18 +08:00
|
|
|
#include "connect.h"
|
|
|
|
#include "select.h"
|
|
|
|
#include "multiif.h"
|
|
|
|
#include "curl_printf.h"
|
2021-12-07 01:36:03 +08:00
|
|
|
#include "strcase.h"
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2022-11-11 18:45:34 +08:00
|
|
|
/* The last #include files should be: */
|
|
|
|
#include "curl_memory.h"
|
|
|
|
#include "memdebug.h"
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
struct x509_context {
|
|
|
|
const br_x509_class *vtable;
|
|
|
|
br_x509_minimal_context minimal;
|
2021-12-07 01:36:01 +08:00
|
|
|
br_x509_decoder_context decoder;
|
2019-11-08 12:17:18 +08:00
|
|
|
bool verifyhost;
|
|
|
|
bool verifypeer;
|
2021-12-07 01:36:01 +08:00
|
|
|
int cert_num;
|
2019-11-08 12:17:18 +08:00
|
|
|
};
|
|
|
|
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data {
|
2019-11-08 12:17:18 +08:00
|
|
|
br_ssl_client_context ctx;
|
|
|
|
struct x509_context x509;
|
|
|
|
unsigned char buf[BR_SSL_BUFSIZE_BIDI];
|
|
|
|
br_x509_trust_anchor *anchors;
|
|
|
|
size_t anchors_len;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
const char *protocols[ALPN_ENTRIES_MAX];
|
2019-11-08 12:17:18 +08:00
|
|
|
/* SSL client context is active */
|
|
|
|
bool active;
|
2019-12-21 11:20:18 +08:00
|
|
|
/* size of pending write, yet to be flushed */
|
|
|
|
size_t pending_write;
|
2019-11-08 12:17:18 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct cafile_parser {
|
|
|
|
CURLcode err;
|
|
|
|
bool in_cert;
|
|
|
|
br_x509_decoder_context xc;
|
|
|
|
/* array of trust anchors loaded from CAfile */
|
|
|
|
br_x509_trust_anchor *anchors;
|
|
|
|
size_t anchors_len;
|
|
|
|
/* buffer for DN data */
|
|
|
|
unsigned char dn[1024];
|
|
|
|
size_t dn_len;
|
|
|
|
};
|
|
|
|
|
2021-07-21 22:11:13 +08:00
|
|
|
#define CAFILE_SOURCE_PATH 1
|
|
|
|
#define CAFILE_SOURCE_BLOB 2
|
|
|
|
struct cafile_source {
|
2022-09-21 16:32:54 +08:00
|
|
|
int type;
|
|
|
|
const char *data;
|
|
|
|
size_t len;
|
2021-07-21 22:11:13 +08:00
|
|
|
};
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
static void append_dn(void *ctx, const void *buf, size_t len)
|
|
|
|
{
|
|
|
|
struct cafile_parser *ca = ctx;
|
|
|
|
|
|
|
|
if(ca->err != CURLE_OK || !ca->in_cert)
|
|
|
|
return;
|
|
|
|
if(sizeof(ca->dn) - ca->dn_len < len) {
|
|
|
|
ca->err = CURLE_FAILED_INIT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
memcpy(ca->dn + ca->dn_len, buf, len);
|
|
|
|
ca->dn_len += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void x509_push(void *ctx, const void *buf, size_t len)
|
|
|
|
{
|
|
|
|
struct cafile_parser *ca = ctx;
|
|
|
|
|
|
|
|
if(ca->in_cert)
|
|
|
|
br_x509_decoder_push(&ca->xc, buf, len);
|
|
|
|
}
|
|
|
|
|
2021-07-21 22:11:13 +08:00
|
|
|
static CURLcode load_cafile(struct cafile_source *source,
|
|
|
|
br_x509_trust_anchor **anchors,
|
2019-11-08 12:17:18 +08:00
|
|
|
size_t *anchors_len)
|
|
|
|
{
|
|
|
|
struct cafile_parser ca;
|
|
|
|
br_pem_decoder_context pc;
|
|
|
|
br_x509_trust_anchor *ta;
|
|
|
|
size_t ta_size;
|
|
|
|
br_x509_trust_anchor *new_anchors;
|
|
|
|
size_t new_anchors_len;
|
|
|
|
br_x509_pkey *pkey;
|
2021-07-21 22:11:13 +08:00
|
|
|
FILE *fp = 0;
|
|
|
|
unsigned char buf[BUFSIZ];
|
|
|
|
const unsigned char *p;
|
2019-11-08 12:17:18 +08:00
|
|
|
const char *name;
|
|
|
|
size_t n, i, pushed;
|
|
|
|
|
2021-07-21 22:11:13 +08:00
|
|
|
DEBUGASSERT(source->type == CAFILE_SOURCE_PATH
|
|
|
|
|| source->type == CAFILE_SOURCE_BLOB);
|
|
|
|
|
|
|
|
if(source->type == CAFILE_SOURCE_PATH) {
|
|
|
|
fp = fopen(source->data, "rb");
|
|
|
|
if(!fp)
|
|
|
|
return CURLE_SSL_CACERT_BADFILE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(source->type == CAFILE_SOURCE_BLOB && source->len > (size_t)INT_MAX)
|
2019-11-08 12:17:18 +08:00
|
|
|
return CURLE_SSL_CACERT_BADFILE;
|
|
|
|
|
|
|
|
ca.err = CURLE_OK;
|
|
|
|
ca.in_cert = FALSE;
|
|
|
|
ca.anchors = NULL;
|
|
|
|
ca.anchors_len = 0;
|
|
|
|
br_pem_decoder_init(&pc);
|
|
|
|
br_pem_decoder_setdest(&pc, x509_push, &ca);
|
2021-07-21 22:11:13 +08:00
|
|
|
do {
|
|
|
|
if(source->type == CAFILE_SOURCE_PATH) {
|
|
|
|
n = fread(buf, 1, sizeof(buf), fp);
|
|
|
|
if(n == 0)
|
|
|
|
break;
|
|
|
|
p = buf;
|
|
|
|
}
|
|
|
|
else if(source->type == CAFILE_SOURCE_BLOB) {
|
|
|
|
n = source->len;
|
|
|
|
p = (unsigned char *) source->data;
|
|
|
|
}
|
2019-11-08 12:17:18 +08:00
|
|
|
while(n) {
|
|
|
|
pushed = br_pem_decoder_push(&pc, p, n);
|
|
|
|
if(ca.err)
|
|
|
|
goto fail;
|
|
|
|
p += pushed;
|
|
|
|
n -= pushed;
|
|
|
|
|
|
|
|
switch(br_pem_decoder_event(&pc)) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case BR_PEM_BEGIN_OBJ:
|
|
|
|
name = br_pem_decoder_name(&pc);
|
|
|
|
if(strcmp(name, "CERTIFICATE") && strcmp(name, "X509 CERTIFICATE"))
|
|
|
|
break;
|
|
|
|
br_x509_decoder_init(&ca.xc, append_dn, &ca);
|
2021-12-07 01:35:55 +08:00
|
|
|
ca.in_cert = TRUE;
|
|
|
|
ca.dn_len = 0;
|
|
|
|
break;
|
|
|
|
case BR_PEM_END_OBJ:
|
|
|
|
if(!ca.in_cert)
|
|
|
|
break;
|
|
|
|
ca.in_cert = FALSE;
|
|
|
|
if(br_x509_decoder_last_error(&ca.xc)) {
|
|
|
|
ca.err = CURLE_SSL_CACERT_BADFILE;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
/* add trust anchor */
|
2019-11-08 12:17:18 +08:00
|
|
|
if(ca.anchors_len == SIZE_MAX / sizeof(ca.anchors[0])) {
|
|
|
|
ca.err = CURLE_OUT_OF_MEMORY;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
new_anchors_len = ca.anchors_len + 1;
|
|
|
|
new_anchors = realloc(ca.anchors,
|
|
|
|
new_anchors_len * sizeof(ca.anchors[0]));
|
|
|
|
if(!new_anchors) {
|
|
|
|
ca.err = CURLE_OUT_OF_MEMORY;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
ca.anchors = new_anchors;
|
|
|
|
ca.anchors_len = new_anchors_len;
|
|
|
|
ta = &ca.anchors[ca.anchors_len - 1];
|
|
|
|
ta->dn.data = NULL;
|
|
|
|
ta->flags = 0;
|
|
|
|
if(br_x509_decoder_isCA(&ca.xc))
|
|
|
|
ta->flags |= BR_X509_TA_CA;
|
|
|
|
pkey = br_x509_decoder_get_pkey(&ca.xc);
|
|
|
|
if(!pkey) {
|
|
|
|
ca.err = CURLE_SSL_CACERT_BADFILE;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
ta->pkey = *pkey;
|
|
|
|
|
|
|
|
/* calculate space needed for trust anchor data */
|
|
|
|
ta_size = ca.dn_len;
|
|
|
|
switch(pkey->key_type) {
|
|
|
|
case BR_KEYTYPE_RSA:
|
|
|
|
ta_size += pkey->key.rsa.nlen + pkey->key.rsa.elen;
|
|
|
|
break;
|
|
|
|
case BR_KEYTYPE_EC:
|
|
|
|
ta_size += pkey->key.ec.qlen;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ca.err = CURLE_FAILED_INIT;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fill in trust anchor DN and public key data */
|
|
|
|
ta->dn.data = malloc(ta_size);
|
|
|
|
if(!ta->dn.data) {
|
|
|
|
ca.err = CURLE_OUT_OF_MEMORY;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
memcpy(ta->dn.data, ca.dn, ca.dn_len);
|
|
|
|
ta->dn.len = ca.dn_len;
|
|
|
|
switch(pkey->key_type) {
|
|
|
|
case BR_KEYTYPE_RSA:
|
|
|
|
ta->pkey.key.rsa.n = ta->dn.data + ta->dn.len;
|
|
|
|
memcpy(ta->pkey.key.rsa.n, pkey->key.rsa.n, pkey->key.rsa.nlen);
|
|
|
|
ta->pkey.key.rsa.e = ta->pkey.key.rsa.n + ta->pkey.key.rsa.nlen;
|
|
|
|
memcpy(ta->pkey.key.rsa.e, pkey->key.rsa.e, pkey->key.rsa.elen);
|
|
|
|
break;
|
|
|
|
case BR_KEYTYPE_EC:
|
|
|
|
ta->pkey.key.ec.q = ta->dn.data + ta->dn.len;
|
|
|
|
memcpy(ta->pkey.key.ec.q, pkey->key.ec.q, pkey->key.ec.qlen);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ca.err = CURLE_SSL_CACERT_BADFILE;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2021-07-21 22:11:13 +08:00
|
|
|
} while(source->type != CAFILE_SOURCE_BLOB);
|
|
|
|
if(fp && ferror(fp))
|
2019-11-08 12:17:18 +08:00
|
|
|
ca.err = CURLE_READ_ERROR;
|
2021-12-07 01:35:55 +08:00
|
|
|
else if(ca.in_cert)
|
|
|
|
ca.err = CURLE_SSL_CACERT_BADFILE;
|
2019-11-08 12:17:18 +08:00
|
|
|
|
|
|
|
fail:
|
2021-07-21 22:11:13 +08:00
|
|
|
if(fp)
|
|
|
|
fclose(fp);
|
2019-11-08 12:17:18 +08:00
|
|
|
if(ca.err == CURLE_OK) {
|
|
|
|
*anchors = ca.anchors;
|
|
|
|
*anchors_len = ca.anchors_len;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for(i = 0; i < ca.anchors_len; ++i)
|
|
|
|
free(ca.anchors[i].dn.data);
|
|
|
|
free(ca.anchors);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ca.err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void x509_start_chain(const br_x509_class **ctx,
|
|
|
|
const char *server_name)
|
|
|
|
{
|
|
|
|
struct x509_context *x509 = (struct x509_context *)ctx;
|
|
|
|
|
2021-12-07 01:36:01 +08:00
|
|
|
if(!x509->verifypeer) {
|
|
|
|
x509->cert_num = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
if(!x509->verifyhost)
|
|
|
|
server_name = NULL;
|
|
|
|
x509->minimal.vtable->start_chain(&x509->minimal.vtable, server_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void x509_start_cert(const br_x509_class **ctx, uint32_t length)
|
|
|
|
{
|
|
|
|
struct x509_context *x509 = (struct x509_context *)ctx;
|
|
|
|
|
2021-12-07 01:36:01 +08:00
|
|
|
if(!x509->verifypeer) {
|
|
|
|
/* Only decode the first cert in the chain to obtain the public key */
|
|
|
|
if(x509->cert_num == 0)
|
|
|
|
br_x509_decoder_init(&x509->decoder, NULL, NULL);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
x509->minimal.vtable->start_cert(&x509->minimal.vtable, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void x509_append(const br_x509_class **ctx, const unsigned char *buf,
|
|
|
|
size_t len)
|
|
|
|
{
|
|
|
|
struct x509_context *x509 = (struct x509_context *)ctx;
|
|
|
|
|
2021-12-07 01:36:01 +08:00
|
|
|
if(!x509->verifypeer) {
|
|
|
|
if(x509->cert_num == 0)
|
|
|
|
br_x509_decoder_push(&x509->decoder, buf, len);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
x509->minimal.vtable->append(&x509->minimal.vtable, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void x509_end_cert(const br_x509_class **ctx)
|
|
|
|
{
|
|
|
|
struct x509_context *x509 = (struct x509_context *)ctx;
|
|
|
|
|
2021-12-07 01:36:01 +08:00
|
|
|
if(!x509->verifypeer) {
|
|
|
|
x509->cert_num++;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
x509->minimal.vtable->end_cert(&x509->minimal.vtable);
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned x509_end_chain(const br_x509_class **ctx)
|
|
|
|
{
|
|
|
|
struct x509_context *x509 = (struct x509_context *)ctx;
|
|
|
|
|
2021-12-07 01:36:01 +08:00
|
|
|
if(!x509->verifypeer) {
|
|
|
|
return br_x509_decoder_last_error(&x509->decoder);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
2021-12-07 01:36:01 +08:00
|
|
|
return x509->minimal.vtable->end_chain(&x509->minimal.vtable);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static const br_x509_pkey *x509_get_pkey(const br_x509_class *const *ctx,
|
|
|
|
unsigned *usages)
|
|
|
|
{
|
|
|
|
struct x509_context *x509 = (struct x509_context *)ctx;
|
|
|
|
|
2021-12-07 01:36:01 +08:00
|
|
|
if(!x509->verifypeer) {
|
|
|
|
/* Nothing in the chain is verified, just return the public key of the
|
|
|
|
first certificate and allow its usage for both TLS_RSA_* and
|
|
|
|
TLS_ECDHE_* */
|
|
|
|
if(usages)
|
|
|
|
*usages = BR_KEYTYPE_KEYX | BR_KEYTYPE_SIGN;
|
|
|
|
return br_x509_decoder_get_pkey(&x509->decoder);
|
|
|
|
}
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
return x509->minimal.vtable->get_pkey(&x509->minimal.vtable, usages);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const br_x509_class x509_vtable = {
|
|
|
|
sizeof(struct x509_context),
|
|
|
|
x509_start_chain,
|
|
|
|
x509_start_cert,
|
|
|
|
x509_append,
|
|
|
|
x509_end_cert,
|
|
|
|
x509_end_chain,
|
|
|
|
x509_get_pkey
|
|
|
|
};
|
|
|
|
|
2021-12-07 01:36:03 +08:00
|
|
|
struct st_cipher {
|
|
|
|
const char *name; /* Cipher suite IANA name. It starts with "TLS_" prefix */
|
|
|
|
const char *alias_name; /* Alias name is the same as OpenSSL cipher name */
|
|
|
|
uint16_t num; /* BearSSL cipher suite */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Macro to initialize st_cipher data structure */
|
|
|
|
#define CIPHER_DEF(num, alias) { #num, alias, BR_##num }
|
|
|
|
|
|
|
|
static const struct st_cipher ciphertable[] = {
|
|
|
|
/* RFC 2246 TLS 1.0 */
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_3DES_EDE_CBC_SHA, /* 0x000A */
|
|
|
|
"DES-CBC3-SHA"),
|
|
|
|
|
|
|
|
/* RFC 3268 TLS 1.0 AES */
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_128_CBC_SHA, /* 0x002F */
|
|
|
|
"AES128-SHA"),
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_256_CBC_SHA, /* 0x0035 */
|
|
|
|
"AES256-SHA"),
|
|
|
|
|
|
|
|
/* RFC 5246 TLS 1.2 */
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_128_CBC_SHA256, /* 0x003C */
|
|
|
|
"AES128-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_256_CBC_SHA256, /* 0x003D */
|
|
|
|
"AES256-SHA256"),
|
|
|
|
|
|
|
|
/* RFC 5288 TLS 1.2 AES GCM */
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_128_GCM_SHA256, /* 0x009C */
|
|
|
|
"AES128-GCM-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_256_GCM_SHA384, /* 0x009D */
|
|
|
|
"AES256-GCM-SHA384"),
|
|
|
|
|
|
|
|
/* RFC 4492 TLS 1.0 ECC */
|
|
|
|
CIPHER_DEF(TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, /* 0xC003 */
|
|
|
|
"ECDH-ECDSA-DES-CBC3-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, /* 0xC004 */
|
|
|
|
"ECDH-ECDSA-AES128-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA, /* 0xC005 */
|
|
|
|
"ECDH-ECDSA-AES256-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, /* 0xC008 */
|
|
|
|
"ECDHE-ECDSA-DES-CBC3-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, /* 0xC009 */
|
|
|
|
"ECDHE-ECDSA-AES128-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, /* 0xC00A */
|
|
|
|
"ECDHE-ECDSA-AES256-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, /* 0xC00D */
|
|
|
|
"ECDH-RSA-DES-CBC3-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, /* 0xC00E */
|
|
|
|
"ECDH-RSA-AES128-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, /* 0xC00F */
|
|
|
|
"ECDH-RSA-AES256-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, /* 0xC012 */
|
|
|
|
"ECDHE-RSA-DES-CBC3-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, /* 0xC013 */
|
|
|
|
"ECDHE-RSA-AES128-SHA"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, /* 0xC014 */
|
|
|
|
"ECDHE-RSA-AES256-SHA"),
|
|
|
|
|
|
|
|
/* RFC 5289 TLS 1.2 ECC HMAC SHA256/384 */
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256, /* 0xC023 */
|
|
|
|
"ECDHE-ECDSA-AES128-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, /* 0xC024 */
|
|
|
|
"ECDHE-ECDSA-AES256-SHA384"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256, /* 0xC025 */
|
|
|
|
"ECDH-ECDSA-AES128-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384, /* 0xC026 */
|
|
|
|
"ECDH-ECDSA-AES256-SHA384"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, /* 0xC027 */
|
|
|
|
"ECDHE-RSA-AES128-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, /* 0xC028 */
|
|
|
|
"ECDHE-RSA-AES256-SHA384"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256, /* 0xC029 */
|
|
|
|
"ECDH-RSA-AES128-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384, /* 0xC02A */
|
|
|
|
"ECDH-RSA-AES256-SHA384"),
|
|
|
|
|
|
|
|
/* RFC 5289 TLS 1.2 GCM */
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, /* 0xC02B */
|
|
|
|
"ECDHE-ECDSA-AES128-GCM-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, /* 0xC02C */
|
|
|
|
"ECDHE-ECDSA-AES256-GCM-SHA384"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256, /* 0xC02D */
|
|
|
|
"ECDH-ECDSA-AES128-GCM-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384, /* 0xC02E */
|
|
|
|
"ECDH-ECDSA-AES256-GCM-SHA384"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, /* 0xC02F */
|
|
|
|
"ECDHE-RSA-AES128-GCM-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, /* 0xC030 */
|
|
|
|
"ECDHE-RSA-AES256-GCM-SHA384"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256, /* 0xC031 */
|
|
|
|
"ECDH-RSA-AES128-GCM-SHA256"),
|
|
|
|
CIPHER_DEF(TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384, /* 0xC032 */
|
|
|
|
"ECDH-RSA-AES256-GCM-SHA384"),
|
|
|
|
#ifdef BR_TLS_RSA_WITH_AES_128_CCM
|
|
|
|
|
|
|
|
/* RFC 6655 TLS 1.2 CCM
|
|
|
|
Supported since BearSSL 0.6 */
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_128_CCM, /* 0xC09C */
|
|
|
|
"AES128-CCM"),
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_256_CCM, /* 0xC09D */
|
|
|
|
"AES256-CCM"),
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_128_CCM_8, /* 0xC0A0 */
|
|
|
|
"AES128-CCM8"),
|
|
|
|
CIPHER_DEF(TLS_RSA_WITH_AES_256_CCM_8, /* 0xC0A1 */
|
|
|
|
"AES256-CCM8"),
|
|
|
|
|
|
|
|
/* RFC 7251 TLS 1.2 ECC CCM
|
|
|
|
Supported since BearSSL 0.6 */
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_128_CCM, /* 0xC0AC */
|
|
|
|
"ECDHE-ECDSA-AES128-CCM"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_256_CCM, /* 0xC0AD */
|
|
|
|
"ECDHE-ECDSA-AES256-CCM"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8, /* 0xC0AE */
|
|
|
|
"ECDHE-ECDSA-AES128-CCM8"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8, /* 0xC0AF */
|
|
|
|
"ECDHE-ECDSA-AES256-CCM8"),
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* RFC 7905 TLS 1.2 ChaCha20-Poly1305
|
|
|
|
Supported since BearSSL 0.2 */
|
|
|
|
CIPHER_DEF(TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, /* 0xCCA8 */
|
|
|
|
"ECDHE-RSA-CHACHA20-POLY1305"),
|
|
|
|
CIPHER_DEF(TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, /* 0xCCA9 */
|
|
|
|
"ECDHE-ECDSA-CHACHA20-POLY1305"),
|
|
|
|
};
|
|
|
|
|
|
|
|
#define NUM_OF_CIPHERS (sizeof(ciphertable) / sizeof(ciphertable[0]))
|
|
|
|
#define CIPHER_NAME_BUF_LEN 64
|
|
|
|
|
|
|
|
static bool is_separator(char c)
|
|
|
|
{
|
|
|
|
/* Return whether character is a cipher list separator. */
|
|
|
|
switch(c) {
|
|
|
|
case ' ':
|
|
|
|
case '\t':
|
|
|
|
case ':':
|
|
|
|
case ',':
|
|
|
|
case ';':
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CURLcode bearssl_set_selected_ciphers(struct Curl_easy *data,
|
|
|
|
br_ssl_engine_context *ssl_eng,
|
|
|
|
const char *ciphers)
|
|
|
|
{
|
|
|
|
uint16_t selected_ciphers[NUM_OF_CIPHERS];
|
|
|
|
size_t selected_count = 0;
|
|
|
|
char cipher_name[CIPHER_NAME_BUF_LEN];
|
|
|
|
const char *cipher_start = ciphers;
|
|
|
|
const char *cipher_end;
|
|
|
|
size_t i, j;
|
|
|
|
|
|
|
|
if(!cipher_start)
|
|
|
|
return CURLE_SSL_CIPHER;
|
|
|
|
|
|
|
|
while(true) {
|
|
|
|
/* Extract the next cipher name from the ciphers string */
|
|
|
|
while(is_separator(*cipher_start))
|
|
|
|
++cipher_start;
|
|
|
|
if(*cipher_start == '\0')
|
|
|
|
break;
|
|
|
|
cipher_end = cipher_start;
|
|
|
|
while(*cipher_end != '\0' && !is_separator(*cipher_end))
|
|
|
|
++cipher_end;
|
|
|
|
j = cipher_end - cipher_start < CIPHER_NAME_BUF_LEN - 1 ?
|
|
|
|
cipher_end - cipher_start : CIPHER_NAME_BUF_LEN - 1;
|
|
|
|
strncpy(cipher_name, cipher_start, j);
|
|
|
|
cipher_name[j] = '\0';
|
|
|
|
cipher_start = cipher_end;
|
|
|
|
|
|
|
|
/* Lookup the cipher name in the table of available ciphers. If the cipher
|
|
|
|
name starts with "TLS_" we do the lookup by IANA name. Otherwise, we try
|
|
|
|
to match cipher name by an (OpenSSL) alias. */
|
|
|
|
if(strncasecompare(cipher_name, "TLS_", 4)) {
|
|
|
|
for(i = 0; i < NUM_OF_CIPHERS &&
|
|
|
|
!strcasecompare(cipher_name, ciphertable[i].name); ++i);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for(i = 0; i < NUM_OF_CIPHERS &&
|
|
|
|
!strcasecompare(cipher_name, ciphertable[i].alias_name); ++i);
|
|
|
|
}
|
|
|
|
if(i == NUM_OF_CIPHERS) {
|
|
|
|
infof(data, "BearSSL: unknown cipher in list: %s", cipher_name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No duplicates allowed */
|
|
|
|
for(j = 0; j < selected_count &&
|
|
|
|
selected_ciphers[j] != ciphertable[i].num; j++);
|
|
|
|
if(j < selected_count) {
|
|
|
|
infof(data, "BearSSL: duplicate cipher in list: %s", cipher_name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
DEBUGASSERT(selected_count < NUM_OF_CIPHERS);
|
|
|
|
selected_ciphers[selected_count] = ciphertable[i].num;
|
|
|
|
++selected_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(selected_count == 0) {
|
|
|
|
failf(data, "BearSSL: no supported cipher in list");
|
|
|
|
return CURLE_SSL_CIPHER;
|
|
|
|
}
|
|
|
|
|
|
|
|
br_ssl_engine_set_suites(ssl_eng, selected_ciphers, selected_count);
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static CURLcode bearssl_connect_step1(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
|
|
|
|
struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);
|
|
|
|
const struct curl_blob *ca_info_blob = conn_config->ca_info_blob;
|
2021-07-21 22:11:13 +08:00
|
|
|
const char * const ssl_cafile =
|
|
|
|
/* CURLOPT_CAINFO_BLOB overrides CURLOPT_CAINFO */
|
2022-11-22 16:55:41 +08:00
|
|
|
(ca_info_blob ? NULL : conn_config->CAfile);
|
|
|
|
const char *hostname = connssl->hostname;
|
|
|
|
const bool verifypeer = conn_config->verifypeer;
|
|
|
|
const bool verifyhost = conn_config->verifyhost;
|
2019-11-08 12:17:18 +08:00
|
|
|
CURLcode ret;
|
|
|
|
unsigned version_min, version_max;
|
2023-08-17 17:16:11 +08:00
|
|
|
int session_set = 0;
|
2019-11-08 12:17:18 +08:00
|
|
|
#ifdef ENABLE_IPV6
|
|
|
|
struct in6_addr addr;
|
|
|
|
#else
|
|
|
|
struct in_addr addr;
|
|
|
|
#endif
|
|
|
|
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step1");
|
2022-02-18 00:48:48 +08:00
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
switch(conn_config->version) {
|
2019-11-08 12:17:18 +08:00
|
|
|
case CURL_SSLVERSION_SSLv2:
|
|
|
|
failf(data, "BearSSL does not support SSLv2");
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
case CURL_SSLVERSION_SSLv3:
|
|
|
|
failf(data, "BearSSL does not support SSLv3");
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
case CURL_SSLVERSION_TLSv1_0:
|
|
|
|
version_min = BR_TLS10;
|
|
|
|
version_max = BR_TLS10;
|
|
|
|
break;
|
|
|
|
case CURL_SSLVERSION_TLSv1_1:
|
|
|
|
version_min = BR_TLS11;
|
|
|
|
version_max = BR_TLS11;
|
|
|
|
break;
|
|
|
|
case CURL_SSLVERSION_TLSv1_2:
|
|
|
|
version_min = BR_TLS12;
|
|
|
|
version_max = BR_TLS12;
|
|
|
|
break;
|
|
|
|
case CURL_SSLVERSION_DEFAULT:
|
|
|
|
case CURL_SSLVERSION_TLSv1:
|
|
|
|
version_min = BR_TLS10;
|
|
|
|
version_max = BR_TLS12;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
failf(data, "BearSSL: unknown CURLOPT_SSLVERSION");
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
}
|
|
|
|
|
2023-07-21 15:26:14 +08:00
|
|
|
if(verifypeer) {
|
|
|
|
if(ca_info_blob) {
|
|
|
|
struct cafile_source source;
|
|
|
|
source.type = CAFILE_SOURCE_BLOB;
|
|
|
|
source.data = ca_info_blob->data;
|
|
|
|
source.len = ca_info_blob->len;
|
|
|
|
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step1, load ca_info_blob");
|
2023-07-21 15:26:14 +08:00
|
|
|
ret = load_cafile(&source, &backend->anchors, &backend->anchors_len);
|
|
|
|
if(ret != CURLE_OK) {
|
2021-07-21 22:11:13 +08:00
|
|
|
failf(data, "error importing CA certificate blob");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-21 15:26:14 +08:00
|
|
|
if(ssl_cafile) {
|
|
|
|
struct cafile_source source;
|
|
|
|
source.type = CAFILE_SOURCE_PATH;
|
|
|
|
source.data = ssl_cafile;
|
|
|
|
source.len = 0;
|
2022-09-21 16:32:54 +08:00
|
|
|
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step1, load cafile");
|
2023-07-21 15:26:14 +08:00
|
|
|
ret = load_cafile(&source, &backend->anchors, &backend->anchors_len);
|
|
|
|
if(ret != CURLE_OK) {
|
2020-12-24 06:41:13 +08:00
|
|
|
failf(data, "error setting certificate verify locations."
|
|
|
|
" CAfile: %s", ssl_cafile);
|
2019-11-08 12:17:18 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* initialize SSL context */
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_client_init_full(&backend->ctx, &backend->x509.minimal,
|
|
|
|
backend->anchors, backend->anchors_len);
|
|
|
|
br_ssl_engine_set_versions(&backend->ctx.eng, version_min, version_max);
|
|
|
|
br_ssl_engine_set_buffer(&backend->ctx.eng, backend->buf,
|
|
|
|
sizeof(backend->buf), 1);
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
if(conn_config->cipher_list) {
|
2021-12-07 01:36:03 +08:00
|
|
|
/* Override the ciphers as specified. For the default cipher list see the
|
|
|
|
BearSSL source code of br_ssl_client_init_full() */
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step1, set ciphers");
|
2021-12-07 01:36:03 +08:00
|
|
|
ret = bearssl_set_selected_ciphers(data, &backend->ctx.eng,
|
2022-11-22 16:55:41 +08:00
|
|
|
conn_config->cipher_list);
|
2021-12-07 01:36:03 +08:00
|
|
|
if(ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
/* initialize X.509 context */
|
2020-03-19 06:18:33 +08:00
|
|
|
backend->x509.vtable = &x509_vtable;
|
|
|
|
backend->x509.verifypeer = verifypeer;
|
|
|
|
backend->x509.verifyhost = verifyhost;
|
|
|
|
br_ssl_engine_set_x509(&backend->ctx.eng, &backend->x509.vtable);
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
if(ssl_config->primary.sessionid) {
|
2019-11-08 12:17:18 +08:00
|
|
|
void *session;
|
|
|
|
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step1, check session cache");
|
2021-01-14 00:01:31 +08:00
|
|
|
Curl_ssl_sessionid_lock(data);
|
2022-11-22 16:55:41 +08:00
|
|
|
if(!Curl_ssl_getsessionid(cf, data, &session, NULL)) {
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_engine_set_session_parameters(&backend->ctx.eng, session);
|
2023-08-17 17:16:11 +08:00
|
|
|
session_set = 1;
|
2023-08-23 20:47:45 +08:00
|
|
|
infof(data, "BearSSL: reusing session ID");
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
2021-01-14 00:01:31 +08:00
|
|
|
Curl_ssl_sessionid_unlock(data);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
if(connssl->alpn) {
|
|
|
|
struct alpn_proto_buf proto;
|
|
|
|
size_t i;
|
2019-11-08 12:17:18 +08:00
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
for(i = 0; i < connssl->alpn->count; ++i) {
|
|
|
|
backend->protocols[i] = connssl->alpn->entries[i];
|
2022-12-31 00:37:11 +08:00
|
|
|
}
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
br_ssl_engine_set_protocol_names(&backend->ctx.eng, backend->protocols,
|
|
|
|
connssl->alpn->count);
|
|
|
|
Curl_alpn_to_proto_str(&proto, connssl->alpn);
|
|
|
|
infof(data, VTLS_INFOF_ALPN_OFFER_1STR, proto.data);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if((1 == Curl_inet_pton(AF_INET, hostname, &addr))
|
|
|
|
#ifdef ENABLE_IPV6
|
|
|
|
|| (1 == Curl_inet_pton(AF_INET6, hostname, &addr))
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
if(verifyhost) {
|
|
|
|
failf(data, "BearSSL: "
|
|
|
|
"host verification of IP address is not supported");
|
|
|
|
return CURLE_PEER_FAILED_VERIFICATION;
|
|
|
|
}
|
|
|
|
hostname = NULL;
|
|
|
|
}
|
2022-01-23 06:44:00 +08:00
|
|
|
else {
|
|
|
|
char *snihost = Curl_ssl_snihost(data, hostname, NULL);
|
|
|
|
if(!snihost) {
|
|
|
|
failf(data, "Failed to set SNI");
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
}
|
|
|
|
hostname = snihost;
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step1, SNI set");
|
2022-01-23 06:44:00 +08:00
|
|
|
}
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2022-02-19 22:34:47 +08:00
|
|
|
/* give application a chance to interfere with SSL set up. */
|
|
|
|
if(data->set.ssl.fsslctx) {
|
|
|
|
Curl_set_in_callback(data, true);
|
|
|
|
ret = (*data->set.ssl.fsslctx)(data, &backend->ctx,
|
|
|
|
data->set.ssl.fsslctxp);
|
|
|
|
Curl_set_in_callback(data, false);
|
|
|
|
if(ret) {
|
|
|
|
failf(data, "BearSSL: error signaled by ssl ctx callback");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-08-17 17:16:11 +08:00
|
|
|
if(!br_ssl_client_reset(&backend->ctx, hostname, session_set))
|
2019-11-08 12:17:18 +08:00
|
|
|
return CURLE_FAILED_INIT;
|
2020-03-19 06:18:33 +08:00
|
|
|
backend->active = TRUE;
|
2019-11-08 12:17:18 +08:00
|
|
|
|
|
|
|
connssl->connecting_state = ssl_connect_2;
|
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2023-08-17 17:16:11 +08:00
|
|
|
static int bearssl_get_select_socks(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
curl_socket_t *socks)
|
|
|
|
{
|
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
|
|
|
curl_socket_t sock = Curl_conn_cf_get_socket(cf->next, data);
|
|
|
|
|
|
|
|
if(sock == CURL_SOCKET_BAD)
|
|
|
|
return GETSOCK_BLANK;
|
|
|
|
else {
|
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
|
|
|
unsigned state = br_ssl_engine_current_state(&backend->ctx.eng);
|
|
|
|
if(state & BR_SSL_SENDREC) {
|
|
|
|
socks[0] = sock;
|
|
|
|
return GETSOCK_WRITESOCK(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
socks[0] = sock;
|
|
|
|
return GETSOCK_READSOCK(0);
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static CURLcode bearssl_run_until(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
2019-12-21 11:20:18 +08:00
|
|
|
unsigned target)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2019-11-08 12:17:18 +08:00
|
|
|
unsigned state;
|
|
|
|
unsigned char *buf;
|
|
|
|
size_t len;
|
|
|
|
ssize_t ret;
|
2022-11-25 21:06:43 +08:00
|
|
|
CURLcode result;
|
2019-11-08 12:17:18 +08:00
|
|
|
int err;
|
|
|
|
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
for(;;) {
|
2020-03-19 06:18:33 +08:00
|
|
|
state = br_ssl_engine_current_state(&backend->ctx.eng);
|
2019-11-08 12:17:18 +08:00
|
|
|
if(state & BR_SSL_CLOSED) {
|
2020-03-19 06:18:33 +08:00
|
|
|
err = br_ssl_engine_last_error(&backend->ctx.eng);
|
2019-11-08 12:17:18 +08:00
|
|
|
switch(err) {
|
2019-12-21 11:20:18 +08:00
|
|
|
case BR_ERR_OK:
|
|
|
|
/* TLS close notify */
|
|
|
|
if(connssl->state != ssl_connection_complete) {
|
|
|
|
failf(data, "SSL: connection closed during handshake");
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
}
|
|
|
|
return CURLE_OK;
|
2019-11-08 12:17:18 +08:00
|
|
|
case BR_ERR_X509_EXPIRED:
|
|
|
|
failf(data, "SSL: X.509 verification: "
|
|
|
|
"certificate is expired or not yet valid");
|
|
|
|
return CURLE_PEER_FAILED_VERIFICATION;
|
|
|
|
case BR_ERR_X509_BAD_SERVER_NAME:
|
|
|
|
failf(data, "SSL: X.509 verification: "
|
|
|
|
"expected server name was not found in the chain");
|
|
|
|
return CURLE_PEER_FAILED_VERIFICATION;
|
|
|
|
case BR_ERR_X509_NOT_TRUSTED:
|
|
|
|
failf(data, "SSL: X.509 verification: "
|
|
|
|
"chain could not be linked to a trust anchor");
|
|
|
|
return CURLE_PEER_FAILED_VERIFICATION;
|
|
|
|
}
|
|
|
|
/* X.509 errors are documented to have the range 32..63 */
|
|
|
|
if(err >= 32 && err < 64)
|
|
|
|
return CURLE_PEER_FAILED_VERIFICATION;
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
}
|
2019-12-21 11:20:18 +08:00
|
|
|
if(state & target)
|
2019-11-08 12:17:18 +08:00
|
|
|
return CURLE_OK;
|
|
|
|
if(state & BR_SSL_SENDREC) {
|
2020-03-19 06:18:33 +08:00
|
|
|
buf = br_ssl_engine_sendrec_buf(&backend->ctx.eng, &len);
|
2022-11-25 21:06:43 +08:00
|
|
|
ret = Curl_conn_cf_send(cf->next, data, (char *)buf, len, &result);
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "ssl_send(len=%zu) -> %zd, %d", len, ret, result);
|
2022-11-25 21:06:43 +08:00
|
|
|
if(ret <= 0) {
|
|
|
|
return result;
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_engine_sendrec_ack(&backend->ctx.eng, ret);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
else if(state & BR_SSL_RECVREC) {
|
2020-03-19 06:18:33 +08:00
|
|
|
buf = br_ssl_engine_recvrec_buf(&backend->ctx.eng, &len);
|
2022-11-25 21:06:43 +08:00
|
|
|
ret = Curl_conn_cf_recv(cf->next, data, (char *)buf, len, &result);
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "ssl_recv(len=%zu) -> %zd, %d", len, ret, result);
|
2019-12-21 11:20:18 +08:00
|
|
|
if(ret == 0) {
|
|
|
|
failf(data, "SSL: EOF without close notify");
|
|
|
|
return CURLE_READ_ERROR;
|
|
|
|
}
|
2022-11-25 21:06:43 +08:00
|
|
|
if(ret <= 0) {
|
|
|
|
return result;
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_engine_recvrec_ack(&backend->ctx.eng, ret);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static CURLcode bearssl_connect_step2(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
2019-12-21 11:20:18 +08:00
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2019-12-21 11:20:18 +08:00
|
|
|
CURLcode ret;
|
|
|
|
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step2");
|
2022-02-18 00:48:48 +08:00
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
ret = bearssl_run_until(cf, data, BR_SSL_SENDAPP | BR_SSL_RECVAPP);
|
2019-12-21 11:20:18 +08:00
|
|
|
if(ret == CURLE_AGAIN)
|
|
|
|
return CURLE_OK;
|
|
|
|
if(ret == CURLE_OK) {
|
2023-08-17 17:16:11 +08:00
|
|
|
unsigned int tver;
|
2020-03-19 06:18:33 +08:00
|
|
|
if(br_ssl_engine_current_state(&backend->ctx.eng) == BR_SSL_CLOSED) {
|
2019-12-21 11:20:18 +08:00
|
|
|
failf(data, "SSL: connection closed during handshake");
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
}
|
|
|
|
connssl->connecting_state = ssl_connect_3;
|
2023-08-17 17:16:11 +08:00
|
|
|
/* Informational message */
|
|
|
|
tver = br_ssl_engine_get_version(&backend->ctx.eng);
|
|
|
|
if(tver == 0x0303)
|
|
|
|
infof(data, "SSL connection using TLSv1.2");
|
|
|
|
else if(tver == 0x0304)
|
|
|
|
infof(data, "SSL connection using TLSv1.3");
|
|
|
|
else
|
|
|
|
infof(data, "SSL connection using TLS 0x%x", tver);
|
2019-12-21 11:20:18 +08:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static CURLcode bearssl_connect_step3(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);
|
2019-11-08 12:17:18 +08:00
|
|
|
CURLcode ret;
|
|
|
|
|
|
|
|
DEBUGASSERT(ssl_connect_3 == connssl->connecting_state);
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_step3");
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2023-04-06 15:54:57 +08:00
|
|
|
if(connssl->alpn) {
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
const char *proto;
|
2019-11-08 12:17:18 +08:00
|
|
|
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
proto = br_ssl_engine_get_selected_protocol(&backend->ctx.eng);
|
|
|
|
Curl_alpn_set_negotiated(cf, data, (const unsigned char *)proto,
|
|
|
|
proto? strlen(proto) : 0);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
if(ssl_config->primary.sessionid) {
|
2019-11-08 12:17:18 +08:00
|
|
|
bool incache;
|
2021-09-22 18:04:25 +08:00
|
|
|
bool added = FALSE;
|
2019-11-08 12:17:18 +08:00
|
|
|
void *oldsession;
|
|
|
|
br_ssl_session_parameters *session;
|
|
|
|
|
|
|
|
session = malloc(sizeof(*session));
|
|
|
|
if(!session)
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_engine_get_session_parameters(&backend->ctx.eng, session);
|
2021-01-14 00:01:31 +08:00
|
|
|
Curl_ssl_sessionid_lock(data);
|
2022-11-22 16:55:41 +08:00
|
|
|
incache = !(Curl_ssl_getsessionid(cf, data, &oldsession, NULL));
|
2019-11-08 12:17:18 +08:00
|
|
|
if(incache)
|
2021-01-14 00:01:31 +08:00
|
|
|
Curl_ssl_delsessionid(data, oldsession);
|
2022-11-22 16:55:41 +08:00
|
|
|
ret = Curl_ssl_addsessionid(cf, data, session, 0, &added);
|
2021-01-14 00:01:31 +08:00
|
|
|
Curl_ssl_sessionid_unlock(data);
|
2021-09-22 18:04:25 +08:00
|
|
|
if(!added)
|
2019-11-08 12:17:18 +08:00
|
|
|
free(session);
|
2021-09-22 18:04:25 +08:00
|
|
|
if(ret) {
|
2019-11-08 12:17:18 +08:00
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
connssl->connecting_state = ssl_connect_done;
|
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static ssize_t bearssl_send(struct Curl_cfilter *cf, struct Curl_easy *data,
|
2019-11-08 12:17:18 +08:00
|
|
|
const void *buf, size_t len, CURLcode *err)
|
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2019-12-21 11:20:18 +08:00
|
|
|
unsigned char *app;
|
|
|
|
size_t applen;
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
|
|
|
|
2019-11-08 12:17:18 +08:00
|
|
|
for(;;) {
|
2022-11-22 16:55:41 +08:00
|
|
|
*err = bearssl_run_until(cf, data, BR_SSL_SENDAPP);
|
2023-04-27 22:29:45 +08:00
|
|
|
if(*err)
|
2019-12-21 11:20:18 +08:00
|
|
|
return -1;
|
2020-03-19 06:18:33 +08:00
|
|
|
app = br_ssl_engine_sendapp_buf(&backend->ctx.eng, &applen);
|
2019-12-21 11:20:18 +08:00
|
|
|
if(!app) {
|
|
|
|
failf(data, "SSL: connection closed during write");
|
2019-11-08 12:17:18 +08:00
|
|
|
*err = CURLE_SEND_ERROR;
|
|
|
|
return -1;
|
|
|
|
}
|
2020-03-19 06:18:33 +08:00
|
|
|
if(backend->pending_write) {
|
|
|
|
applen = backend->pending_write;
|
|
|
|
backend->pending_write = 0;
|
2019-12-21 11:20:18 +08:00
|
|
|
return applen;
|
|
|
|
}
|
|
|
|
if(applen > len)
|
|
|
|
applen = len;
|
|
|
|
memcpy(app, buf, applen);
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_engine_sendapp_ack(&backend->ctx.eng, applen);
|
|
|
|
br_ssl_engine_flush(&backend->ctx.eng, 0);
|
|
|
|
backend->pending_write = applen;
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static ssize_t bearssl_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
|
2019-11-08 12:17:18 +08:00
|
|
|
char *buf, size_t len, CURLcode *err)
|
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2019-12-21 11:20:18 +08:00
|
|
|
unsigned char *app;
|
|
|
|
size_t applen;
|
|
|
|
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
*err = bearssl_run_until(cf, data, BR_SSL_RECVAPP);
|
2019-12-21 11:20:18 +08:00
|
|
|
if(*err != CURLE_OK)
|
|
|
|
return -1;
|
2020-03-19 06:18:33 +08:00
|
|
|
app = br_ssl_engine_recvapp_buf(&backend->ctx.eng, &applen);
|
2019-12-21 11:20:18 +08:00
|
|
|
if(!app)
|
|
|
|
return 0;
|
|
|
|
if(applen > len)
|
|
|
|
applen = len;
|
|
|
|
memcpy(buf, app, applen);
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_engine_recvapp_ack(&backend->ctx.eng, applen);
|
2019-11-08 12:17:18 +08:00
|
|
|
|
|
|
|
return applen;
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static CURLcode bearssl_connect_common(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
2019-11-08 12:17:18 +08:00
|
|
|
bool nonblocking,
|
|
|
|
bool *done)
|
|
|
|
{
|
|
|
|
CURLcode ret;
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
connections: introduce http/3 happy eyeballs
New cfilter HTTP-CONNECT for h3/h2/http1.1 eyeballing.
- filter is installed when `--http3` in the tool is used (or
the equivalent CURLOPT_ done in the library)
- starts a QUIC/HTTP/3 connect right away. Should that not
succeed after 100ms (subject to change), a parallel attempt
is started for HTTP/2 and HTTP/1.1 via TCP
- both attempts are subject to IPv6/IPv4 eyeballing, same
as happens for other connections
- tie timeout to the ip-version HAPPY_EYEBALLS_TIMEOUT
- use a `soft` timeout at half the value. When the soft timeout
expires, the HTTPS-CONNECT filter checks if the QUIC filter
has received any data from the server. If not, it will start
the HTTP/2 attempt.
HTTP/3(ngtcp2) improvements.
- setting call_data in all cfilter calls similar to http/2 and vtls filters
for use in callback where no stream data is available.
- returning CURLE_PARTIAL_FILE for prematurely terminated transfers
- enabling pytest test_05 for h3
- shifting functionality to "connect" UDP sockets from ngtcp2
implementation into the udp socket cfilter. Because unconnected
UDP sockets are weird. For example they error when adding to a
pollset.
HTTP/3(quiche) improvements.
- fixed upload bug in quiche implementation, now passes 251 and pytest
- error codes on stream RESET
- improved debug logs
- handling of DRAIN during connect
- limiting pending event queue
HTTP/2 cfilter improvements.
- use LOG_CF macros for dynamic logging in debug build
- fix CURLcode on RST streams to be CURLE_PARTIAL_FILE
- enable pytest test_05 for h2
- fix upload pytests and improve parallel transfer performance.
GOAWAY handling for ngtcp2/quiche
- during connect, when the remote server refuses to accept new connections
and closes immediately (so the local conn goes into DRAIN phase), the
connection is torn down and a another attempt is made after a short grace
period.
This is the behaviour observed with nghttpx when we tell it to shut
down gracefully. Tested in pytest test_03_02.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
- new tests/tests-httpd/scorecard.py for testing h3/h2 protocol implementation.
Invoke:
python3 tests/tests-httpd/scorecard.py --help
for usage.
Improvements on gathering connect statistics and socket access.
- new CF_CTRL_CONN_REPORT_STATS cfilter control for having cfilters
report connection statistics. This is triggered when the connection
has completely connected.
- new void Curl_pgrsTimeWas(..) method to report a timer update with
a timestamp of when it happend. This allows for updating timers
"later", e.g. a connect statistic after full connectivity has been
reached.
- in case of HTTP eyeballing, the previous changes will update
statistics only from the filter chain that "won" the eyeballing.
- new cfilter query CF_QUERY_SOCKET for retrieving the socket used
by a filter chain.
Added methods Curl_conn_cf_get_socket() and Curl_conn_get_socket()
for convenient use of this query.
- Change VTLS backend to query their sub-filters for the socket when
checks during the handshake are made.
HTTP/3 documentation on how https eyeballing works.
TLS improvements
- ALPN selection for SSL/SSL-PROXY filters in one vtls set of functions, replaces
copy of logic in all tls backends.
- standardized the infof logging of offered ALPNs
- ALPN negotiated: have common function for all backends that sets alpn proprty
and connection related things based on the negotiated protocol (or lack thereof).
Scorecard with Caddy.
- configure can be run with `--with-test-caddy=path` to specify which caddy to use for testing
- tests/tests-httpd/scorecard.py now measures download speeds with caddy
pytest improvements
- adding Makfile to clean gen dir
- adding nghttpx rundir creation on start
- checking httpd version 2.4.55 for test_05 cases where it is needed. Skipping with message if too old.
- catch exception when checking for caddy existance on system.
Closes #10349
2023-02-02 00:13:12 +08:00
|
|
|
curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
|
2020-05-29 06:08:03 +08:00
|
|
|
timediff_t timeout_ms;
|
2019-11-08 12:17:18 +08:00
|
|
|
int what;
|
|
|
|
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_common(blocking=%d)", !nonblocking);
|
2019-11-08 12:17:18 +08:00
|
|
|
/* check if the connection has already been established */
|
|
|
|
if(ssl_connection_complete == connssl->state) {
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_common, connected");
|
2019-11-08 12:17:18 +08:00
|
|
|
*done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ssl_connect_1 == connssl->connecting_state) {
|
2022-11-22 16:55:41 +08:00
|
|
|
ret = bearssl_connect_step1(cf, data);
|
2019-11-08 12:17:18 +08:00
|
|
|
if(ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
while(ssl_connect_2 == connssl->connecting_state ||
|
|
|
|
ssl_connect_2_reading == connssl->connecting_state ||
|
|
|
|
ssl_connect_2_writing == connssl->connecting_state) {
|
|
|
|
/* check allowed time left */
|
|
|
|
timeout_ms = Curl_timeleft(data, NULL, TRUE);
|
|
|
|
|
|
|
|
if(timeout_ms < 0) {
|
|
|
|
/* no need to continue if time already is up */
|
|
|
|
failf(data, "SSL connection timeout");
|
|
|
|
return CURLE_OPERATION_TIMEDOUT;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if ssl is expecting something, check if it's available. */
|
|
|
|
if(ssl_connect_2_reading == connssl->connecting_state ||
|
|
|
|
ssl_connect_2_writing == connssl->connecting_state) {
|
|
|
|
|
|
|
|
curl_socket_t writefd = ssl_connect_2_writing ==
|
|
|
|
connssl->connecting_state?sockfd:CURL_SOCKET_BAD;
|
|
|
|
curl_socket_t readfd = ssl_connect_2_reading ==
|
|
|
|
connssl->connecting_state?sockfd:CURL_SOCKET_BAD;
|
|
|
|
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_common, check socket");
|
2019-11-08 12:17:18 +08:00
|
|
|
what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
|
|
|
|
nonblocking?0:timeout_ms);
|
2023-08-17 17:16:11 +08:00
|
|
|
CURL_TRC_CF(data, cf, "connect_common, check socket -> %d", what);
|
2019-11-08 12:17:18 +08:00
|
|
|
if(what < 0) {
|
|
|
|
/* fatal error */
|
|
|
|
failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
|
|
|
|
return CURLE_SSL_CONNECT_ERROR;
|
|
|
|
}
|
|
|
|
else if(0 == what) {
|
|
|
|
if(nonblocking) {
|
|
|
|
*done = FALSE;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* timeout */
|
|
|
|
failf(data, "SSL connection timeout");
|
|
|
|
return CURLE_OPERATION_TIMEDOUT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* socket is readable or writable */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Run transaction, and return to the caller if it failed or if this
|
|
|
|
* connection is done nonblocking and this loop would execute again. This
|
|
|
|
* permits the owner of a multi handle to abort a connection attempt
|
|
|
|
* before step2 has completed while ensuring that a client using select()
|
|
|
|
* or epoll() will always have a valid fdset to wait on.
|
|
|
|
*/
|
2022-11-22 16:55:41 +08:00
|
|
|
ret = bearssl_connect_step2(cf, data);
|
2019-11-08 12:17:18 +08:00
|
|
|
if(ret || (nonblocking &&
|
|
|
|
(ssl_connect_2 == connssl->connecting_state ||
|
|
|
|
ssl_connect_2_reading == connssl->connecting_state ||
|
|
|
|
ssl_connect_2_writing == connssl->connecting_state)))
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ssl_connect_3 == connssl->connecting_state) {
|
2022-11-22 16:55:41 +08:00
|
|
|
ret = bearssl_connect_step3(cf, data);
|
2019-11-08 12:17:18 +08:00
|
|
|
if(ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(ssl_connect_done == connssl->connecting_state) {
|
|
|
|
connssl->state = ssl_connection_complete;
|
|
|
|
*done = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*done = FALSE;
|
|
|
|
|
|
|
|
/* Reset our connect state machine */
|
|
|
|
connssl->connecting_state = ssl_connect_1;
|
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2021-01-13 15:53:40 +08:00
|
|
|
static size_t bearssl_version(char *buffer, size_t size)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
|
|
|
return msnprintf(buffer, size, "BearSSL");
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static bool bearssl_data_pending(struct Curl_cfilter *cf,
|
|
|
|
const struct Curl_easy *data)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *ctx = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend;
|
2022-11-22 16:55:41 +08:00
|
|
|
|
|
|
|
(void)data;
|
|
|
|
DEBUGASSERT(ctx && ctx->backend);
|
2023-05-09 18:10:40 +08:00
|
|
|
backend = (struct bearssl_ssl_backend_data *)ctx->backend;
|
|
|
|
return br_ssl_engine_current_state(&backend->ctx.eng) & BR_SSL_RECVAPP;
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
2021-01-13 15:53:40 +08:00
|
|
|
static CURLcode bearssl_random(struct Curl_easy *data UNUSED_PARAM,
|
|
|
|
unsigned char *entropy, size_t length)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
|
|
|
static br_hmac_drbg_context ctx;
|
|
|
|
static bool seeded = FALSE;
|
|
|
|
|
|
|
|
if(!seeded) {
|
|
|
|
br_prng_seeder seeder;
|
|
|
|
|
|
|
|
br_hmac_drbg_init(&ctx, &br_sha256_vtable, NULL, 0);
|
|
|
|
seeder = br_prng_seeder_system(NULL);
|
|
|
|
if(!seeder || !seeder(&ctx.vtable))
|
|
|
|
return CURLE_FAILED_INIT;
|
|
|
|
seeded = TRUE;
|
|
|
|
}
|
|
|
|
br_hmac_drbg_generate(&ctx, entropy, length);
|
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static CURLcode bearssl_connect(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
|
|
|
CURLcode ret;
|
|
|
|
bool done = FALSE;
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
ret = bearssl_connect_common(cf, data, FALSE, &done);
|
2019-11-08 12:17:18 +08:00
|
|
|
if(ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
DEBUGASSERT(done);
|
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static CURLcode bearssl_connect_nonblocking(struct Curl_cfilter *cf,
|
|
|
|
struct Curl_easy *data,
|
|
|
|
bool *done)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
return bearssl_connect_common(cf, data, TRUE, done);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
2021-01-13 15:53:40 +08:00
|
|
|
static void *bearssl_get_internals(struct ssl_connect_data *connssl,
|
|
|
|
CURLINFO info UNUSED_PARAM)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
2020-03-19 06:18:33 +08:00
|
|
|
return &backend->ctx;
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
2022-11-22 16:55:41 +08:00
|
|
|
static void bearssl_close(struct Curl_cfilter *cf, struct Curl_easy *data)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
2022-11-22 16:55:41 +08:00
|
|
|
struct ssl_connect_data *connssl = cf->ctx;
|
2023-05-09 18:10:40 +08:00
|
|
|
struct bearssl_ssl_backend_data *backend =
|
|
|
|
(struct bearssl_ssl_backend_data *)connssl->backend;
|
2019-12-21 11:20:18 +08:00
|
|
|
size_t i;
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2022-02-18 00:48:48 +08:00
|
|
|
DEBUGASSERT(backend);
|
|
|
|
|
2020-03-19 06:18:33 +08:00
|
|
|
if(backend->active) {
|
2022-11-11 18:45:34 +08:00
|
|
|
backend->active = FALSE;
|
2020-03-19 06:18:33 +08:00
|
|
|
br_ssl_engine_close(&backend->ctx.eng);
|
2022-11-22 16:55:41 +08:00
|
|
|
(void)bearssl_run_until(cf, data, BR_SSL_CLOSED);
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
2022-11-11 18:45:34 +08:00
|
|
|
if(backend->anchors) {
|
|
|
|
for(i = 0; i < backend->anchors_len; ++i)
|
|
|
|
free(backend->anchors[i].dn.data);
|
|
|
|
Curl_safefree(backend->anchors);
|
|
|
|
}
|
2019-11-08 12:17:18 +08:00
|
|
|
}
|
|
|
|
|
2021-01-13 15:53:40 +08:00
|
|
|
static void bearssl_session_free(void *ptr)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
|
|
|
free(ptr);
|
|
|
|
}
|
|
|
|
|
2021-01-13 15:53:40 +08:00
|
|
|
static CURLcode bearssl_sha256sum(const unsigned char *input,
|
|
|
|
size_t inputlen,
|
|
|
|
unsigned char *sha256sum,
|
|
|
|
size_t sha256len UNUSED_PARAM)
|
2019-11-08 12:17:18 +08:00
|
|
|
{
|
|
|
|
br_sha256_context ctx;
|
|
|
|
|
|
|
|
br_sha256_init(&ctx);
|
|
|
|
br_sha256_update(&ctx, input, inputlen);
|
|
|
|
br_sha256_out(&ctx, sha256sum);
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
const struct Curl_ssl Curl_ssl_bearssl = {
|
2021-05-26 15:43:46 +08:00
|
|
|
{ CURLSSLBACKEND_BEARSSL, "bearssl" }, /* info */
|
2022-11-25 21:06:43 +08:00
|
|
|
SSLSUPP_CAINFO_BLOB | SSLSUPP_SSL_CTX | SSLSUPP_HTTPS_PROXY,
|
2023-05-09 18:10:40 +08:00
|
|
|
sizeof(struct bearssl_ssl_backend_data),
|
2019-11-08 12:17:18 +08:00
|
|
|
|
2021-05-26 15:43:46 +08:00
|
|
|
Curl_none_init, /* init */
|
|
|
|
Curl_none_cleanup, /* cleanup */
|
|
|
|
bearssl_version, /* version */
|
|
|
|
Curl_none_check_cxn, /* check_cxn */
|
|
|
|
Curl_none_shutdown, /* shutdown */
|
|
|
|
bearssl_data_pending, /* data_pending */
|
|
|
|
bearssl_random, /* random */
|
|
|
|
Curl_none_cert_status_request, /* cert_status_request */
|
|
|
|
bearssl_connect, /* connect */
|
|
|
|
bearssl_connect_nonblocking, /* connect_nonblocking */
|
2023-08-17 17:16:11 +08:00
|
|
|
bearssl_get_select_socks, /* getsock */
|
2021-05-26 15:43:46 +08:00
|
|
|
bearssl_get_internals, /* get_internals */
|
|
|
|
bearssl_close, /* close_one */
|
|
|
|
Curl_none_close_all, /* close_all */
|
|
|
|
bearssl_session_free, /* session_free */
|
|
|
|
Curl_none_set_engine, /* set_engine */
|
|
|
|
Curl_none_set_engine_default, /* set_engine_default */
|
|
|
|
Curl_none_engines_list, /* engines_list */
|
|
|
|
Curl_none_false_start, /* false_start */
|
|
|
|
bearssl_sha256sum, /* sha256sum */
|
|
|
|
NULL, /* associate_connection */
|
2022-09-28 22:51:44 +08:00
|
|
|
NULL, /* disassociate_connection */
|
2022-11-11 18:45:34 +08:00
|
|
|
NULL, /* free_multi_ssl_backend_data */
|
|
|
|
bearssl_recv, /* recv decrypted data */
|
|
|
|
bearssl_send, /* send data to encrypt */
|
2019-11-08 12:17:18 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
#endif /* USE_BEARSSL */
|