diff options
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 4095 |
1 files changed, 3170 insertions, 925 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index e628140dfae9..4c7b62e14232 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * Copyright 2005 Nokia. All rights reserved. * @@ -9,9 +9,10 @@ * https://www.openssl.org/source/license.html */ -#include <stdio.h> +#include "internal/e_os.h" +#include "internal/e_winsock.h" #include "ssl_local.h" -#include "e_os.h" + #include <openssl/objects.h> #include <openssl/x509v3.h> #include <openssl/rand.h> @@ -21,37 +22,32 @@ #include <openssl/async.h> #include <openssl/ct.h> #include <openssl/trace.h> +#include <openssl/core_names.h> +#include <openssl/provider.h> #include "internal/cryptlib.h" +#include "internal/nelem.h" #include "internal/refcount.h" +#include "internal/thread_once.h" #include "internal/ktls.h" +#include "internal/to_hex.h" +#include "internal/ssl_unwrap.h" +#include "quic/quic_local.h" -static int ssl_undefined_function_1(SSL *ssl, SSL3_RECORD *r, size_t s, int t, - SSL_MAC_BUF *mac, size_t macsize) -{ - return ssl_undefined_function(ssl); -} - -static int ssl_undefined_function_2(SSL *ssl, SSL3_RECORD *r, unsigned char *s, - int t) -{ - return ssl_undefined_function(ssl); -} - -static int ssl_undefined_function_3(SSL *ssl, unsigned char *r, +static int ssl_undefined_function_3(SSL_CONNECTION *sc, unsigned char *r, unsigned char *s, size_t t, size_t *u) { - return ssl_undefined_function(ssl); + return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc)); } -static int ssl_undefined_function_4(SSL *ssl, int r) +static int ssl_undefined_function_4(SSL_CONNECTION *sc, int r) { - return ssl_undefined_function(ssl); + return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc)); } -static size_t ssl_undefined_function_5(SSL *ssl, const char *r, size_t s, - unsigned char *t) +static size_t ssl_undefined_function_5(SSL_CONNECTION *sc, const char *r, + size_t s, unsigned char *t) { - return ssl_undefined_function(ssl); + return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc)); } static int ssl_undefined_function_6(int r) @@ -59,17 +55,20 @@ static int ssl_undefined_function_6(int r) return ssl_undefined_function(NULL); } -static int ssl_undefined_function_7(SSL *ssl, unsigned char *r, size_t s, - const char *t, size_t u, +static int ssl_undefined_function_7(SSL_CONNECTION *sc, unsigned char *r, + size_t s, const char *t, size_t u, const unsigned char *v, size_t w, int x) { - return ssl_undefined_function(ssl); + return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc)); +} + +static int ssl_undefined_function_8(SSL_CONNECTION *sc) +{ + return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc)); } -SSL3_ENC_METHOD ssl3_undef_enc_method = { - ssl_undefined_function_1, - ssl_undefined_function_2, - ssl_undefined_function, +const SSL3_ENC_METHOD ssl3_undef_enc_method = { + ssl_undefined_function_8, ssl_undefined_function_3, ssl_undefined_function_4, ssl_undefined_function_5, @@ -126,7 +125,6 @@ static int dane_ctx_enable(struct dane_ctx_st *dctx) if (mdord == NULL || mdevp == NULL) { OPENSSL_free(mdord); OPENSSL_free(mdevp); - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); return 0; } @@ -172,7 +170,7 @@ static void dane_final(SSL_DANE *dane) sk_danetls_record_pop_free(dane->trecs, tlsa_free); dane->trecs = NULL; - sk_X509_pop_free(dane->certs, X509_free); + OSSL_STACK_OF_X509_free(dane->certs); dane->certs = NULL; X509_free(dane->mcert); @@ -185,7 +183,7 @@ static void dane_final(SSL_DANE *dane) /* * dane_copy - Copy dane configuration, sans verification state. */ -static int ssl_dane_dup(SSL *to, SSL *from) +static int ssl_dane_dup(SSL_CONNECTION *to, SSL_CONNECTION *from) { int num; int i; @@ -196,19 +194,19 @@ static int ssl_dane_dup(SSL *to, SSL *from) num = sk_danetls_record_num(from->dane.trecs); dane_final(&to->dane); to->dane.flags = from->dane.flags; - to->dane.dctx = &to->ctx->dane; + to->dane.dctx = &SSL_CONNECTION_GET_CTX(to)->dane; to->dane.trecs = sk_danetls_record_new_reserve(NULL, num); if (to->dane.trecs == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); return 0; } for (i = 0; i < num; ++i) { danetls_record *t = sk_danetls_record_value(from->dane.trecs, i); - if (SSL_dane_tlsa_add(to, t->usage, t->selector, t->mtype, - t->data, t->dlen) <= 0) + if (SSL_dane_tlsa_add(SSL_CONNECTION_GET_SSL(to), t->usage, + t->selector, t->mtype, t->data, t->dlen) <= 0) return 0; } return 1; @@ -230,17 +228,13 @@ static int dane_mtype_set(struct dane_ctx_st *dctx, int n = ((int)mtype) + 1; mdevp = OPENSSL_realloc(dctx->mdevp, n * sizeof(*mdevp)); - if (mdevp == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + if (mdevp == NULL) return -1; - } dctx->mdevp = mdevp; mdord = OPENSSL_realloc(dctx->mdord, n * sizeof(*mdord)); - if (mdord == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + if (mdord == NULL) return -1; - } dctx->mdord = mdord; /* Zero-fill any gaps */ @@ -276,6 +270,7 @@ static int dane_tlsa_add(SSL_DANE *dane, int ilen = (int)dlen; int i; int num; + int mdsize; if (dane->trecs == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_DANE_NOT_ENABLED); @@ -305,19 +300,20 @@ static int dane_tlsa_add(SSL_DANE *dane, } } - if (md != NULL && dlen != (size_t)EVP_MD_get_size(md)) { - ERR_raise(ERR_LIB_SSL, SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH); - return 0; + if (md != NULL) { + mdsize = EVP_MD_get_size(md); + if (mdsize <= 0 || dlen != (size_t)mdsize) { + ERR_raise(ERR_LIB_SSL, SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH); + return 0; + } } if (!data) { ERR_raise(ERR_LIB_SSL, SSL_R_DANE_TLSA_NULL_DATA); return 0; } - if ((t = OPENSSL_zalloc(sizeof(*t))) == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + if ((t = OPENSSL_zalloc(sizeof(*t))) == NULL) return -1; - } t->usage = usage; t->selector = selector; @@ -325,7 +321,6 @@ static int dane_tlsa_add(SSL_DANE *dane, t->data = OPENSSL_malloc(dlen); if (t->data == NULL) { tlsa_free(t); - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); return -1; } memcpy(t->data, data, dlen); @@ -357,7 +352,7 @@ static int dane_tlsa_add(SSL_DANE *dane, /* * The Full(0) certificate decodes to a seemingly valid X.509 * object with a plausible key, so the TLSA record is well - * formed. However, we don't actually need the certifiate for + * formed. However, we don't actually need the certificate for * usages PKIX-EE(1) or DANE-EE(3), because at least the EE * certificate is always presented by the peer. We discard the * certificate, and just use the TLSA data as an opaque blob @@ -380,7 +375,7 @@ static int dane_tlsa_add(SSL_DANE *dane, if ((dane->certs == NULL && (dane->certs = sk_X509_new_null()) == NULL) || !sk_X509_push(dane->certs, cert)) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); X509_free(cert); tlsa_free(t); return -1; @@ -442,7 +437,7 @@ static int dane_tlsa_add(SSL_DANE *dane, if (!sk_danetls_record_insert(dane->trecs, t, i)) { tlsa_free(t); - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); return -1; } dane->umask |= DANETLS_USAGE_BIT(usage); @@ -572,15 +567,6 @@ static int ssl_check_allowed_versions(int min_version, int max_version) void OPENSSL_VPROC_FUNC(void) {} #endif - -static void clear_ciphers(SSL *s) -{ - /* clear the current cipher */ - ssl_clear_cipher_ctx(s); - ssl_clear_hash_ctx(&s->read_hash); - ssl_clear_hash_ctx(&s->write_hash); -} - int SSL_clear(SSL *s) { if (s->method == NULL) { @@ -588,73 +574,86 @@ int SSL_clear(SSL *s) return 0; } - if (ssl_clear_bad_session(s)) { - SSL_SESSION_free(s->session); - s->session = NULL; + return s->method->ssl_reset(s); +} + +int ossl_ssl_connection_reset(SSL *s) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (ssl_clear_bad_session(sc)) { + SSL_SESSION_free(sc->session); + sc->session = NULL; } - SSL_SESSION_free(s->psksession); - s->psksession = NULL; - OPENSSL_free(s->psksession_id); - s->psksession_id = NULL; - s->psksession_id_len = 0; - s->hello_retry_request = SSL_HRR_NONE; - s->sent_tickets = 0; + SSL_SESSION_free(sc->psksession); + sc->psksession = NULL; + OPENSSL_free(sc->psksession_id); + sc->psksession_id = NULL; + sc->psksession_id_len = 0; + sc->hello_retry_request = SSL_HRR_NONE; + sc->sent_tickets = 0; - s->error = 0; - s->hit = 0; - s->shutdown = 0; + sc->error = 0; + sc->hit = 0; + sc->shutdown = 0; - if (s->renegotiate) { + if (sc->renegotiate) { ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); return 0; } - ossl_statem_clear(s); + ossl_statem_clear(sc); - s->version = s->method->version; - s->client_version = s->version; - s->rwstate = SSL_NOTHING; + sc->version = s->method->version; + sc->client_version = sc->version; + sc->rwstate = SSL_NOTHING; - BUF_MEM_free(s->init_buf); - s->init_buf = NULL; - clear_ciphers(s); - s->first_packet = 0; + BUF_MEM_free(sc->init_buf); + sc->init_buf = NULL; + sc->first_packet = 0; - s->key_update = SSL_KEY_UPDATE_NONE; + sc->key_update = SSL_KEY_UPDATE_NONE; + memset(sc->ext.compress_certificate_from_peer, 0, + sizeof(sc->ext.compress_certificate_from_peer)); + sc->ext.compress_certificate_sent = 0; - EVP_MD_CTX_free(s->pha_dgst); - s->pha_dgst = NULL; + EVP_MD_CTX_free(sc->pha_dgst); + sc->pha_dgst = NULL; /* Reset DANE verification result state */ - s->dane.mdpth = -1; - s->dane.pdpth = -1; - X509_free(s->dane.mcert); - s->dane.mcert = NULL; - s->dane.mtlsa = NULL; + sc->dane.mdpth = -1; + sc->dane.pdpth = -1; + X509_free(sc->dane.mcert); + sc->dane.mcert = NULL; + sc->dane.mtlsa = NULL; /* Clear the verification result peername */ - X509_VERIFY_PARAM_move_peername(s->param, NULL); + X509_VERIFY_PARAM_move_peername(sc->param, NULL); /* Clear any shared connection state */ - OPENSSL_free(s->shared_sigalgs); - s->shared_sigalgs = NULL; - s->shared_sigalgslen = 0; + OPENSSL_free(sc->shared_sigalgs); + sc->shared_sigalgs = NULL; + sc->shared_sigalgslen = 0; /* * Check to see if we were changed into a different method, if so, revert * back. */ - if (s->method != s->ctx->method) { - s->method->ssl_free(s); - s->method = s->ctx->method; - if (!s->method->ssl_new(s)) + if (s->method != s->defltmeth) { + s->method->ssl_deinit(s); + s->method = s->defltmeth; + if (!s->method->ssl_init(s)) return 0; } else { if (!s->method->ssl_clear(s)) return 0; } - RECORD_LAYER_clear(&s->rlayer); + if (!RECORD_LAYER_reset(&sc->rlayer)) + return 0; return 1; } @@ -665,6 +664,11 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth) { STACK_OF(SSL_CIPHER) *sk; + if (IS_QUIC_CTX(ctx)) { + ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_SSL_VERSION); + return 0; + } + ctx->method = meth; if (!SSL_CTX_set_ciphersuites(ctx, OSSL_default_ciphersuites())) { @@ -686,8 +690,6 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth) SSL *SSL_new(SSL_CTX *ctx) { - SSL *s; - if (ctx == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_NULL_SSL_CTX); return NULL; @@ -696,36 +698,79 @@ SSL *SSL_new(SSL_CTX *ctx) ERR_raise(ERR_LIB_SSL, SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION); return NULL; } + return ctx->method->ssl_new(ctx); +} + +int ossl_ssl_init(SSL *ssl, SSL_CTX *ctx, const SSL_METHOD *method, int type) +{ + if (!SSL_CTX_up_ref(ctx)) + return 0; + + ssl->lock = CRYPTO_THREAD_lock_new(); + + if (ssl->lock == NULL || !CRYPTO_NEW_REF(&ssl->references, 1)) + goto err; + + if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL, ssl, &ssl->ex_data)) { + CRYPTO_FREE_REF(&ssl->references); + goto err; + } + + ssl->ctx = ctx; + ssl->type = type; + ssl->defltmeth = ssl->method = method; + + return 1; + +err: + CRYPTO_THREAD_lock_free(ssl->lock); + ssl->lock = NULL; + SSL_CTX_free(ctx); + return 0; +} + +SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl, + const SSL_METHOD *method) +{ + SSL_CONNECTION *s; + SSL *ssl; s = OPENSSL_zalloc(sizeof(*s)); if (s == NULL) - goto err; + return NULL; + + ssl = &s->ssl; + s->user_ssl = (user_ssl == NULL) ? ssl : user_ssl; - s->references = 1; - s->lock = CRYPTO_THREAD_lock_new(); - if (s->lock == NULL) { + if (!ossl_ssl_init(ssl, ctx, method, SSL_TYPE_SSL_CONNECTION)) { OPENSSL_free(s); s = NULL; - goto err; + ssl = NULL; + goto sslerr; } RECORD_LAYER_init(&s->rlayer, s); s->options = ctx->options; + s->dane.flags = ctx->dane.flags; - s->min_proto_version = ctx->min_proto_version; - s->max_proto_version = ctx->max_proto_version; + if (method->version == ctx->method->version) { + s->min_proto_version = ctx->min_proto_version; + s->max_proto_version = ctx->max_proto_version; + } + s->mode = ctx->mode; s->max_cert_list = ctx->max_cert_list; s->max_early_data = ctx->max_early_data; s->recv_max_early_data = ctx->recv_max_early_data; + s->num_tickets = ctx->num_tickets; s->pha_enabled = ctx->pha_enabled; /* Shallow copy of the ciphersuites stack */ s->tls13_ciphersuites = sk_SSL_CIPHER_dup(ctx->tls13_ciphersuites); if (s->tls13_ciphersuites == NULL) - goto err; + goto cerr; /* * Earlier library versions used to copy the pointer to the CERT, not @@ -738,16 +783,17 @@ SSL *SSL_new(SSL_CTX *ctx) */ s->cert = ssl_cert_dup(ctx->cert); if (s->cert == NULL) - goto err; + goto sslerr; RECORD_LAYER_set_read_ahead(&s->rlayer, ctx->read_ahead); s->msg_callback = ctx->msg_callback; s->msg_callback_arg = ctx->msg_callback_arg; s->verify_mode = ctx->verify_mode; s->not_resumable_session_cb = ctx->not_resumable_session_cb; - s->record_padding_cb = ctx->record_padding_cb; - s->record_padding_arg = ctx->record_padding_arg; - s->block_padding = ctx->block_padding; + s->rlayer.record_padding_cb = ctx->record_padding_cb; + s->rlayer.record_padding_arg = ctx->record_padding_arg; + s->rlayer.block_padding = ctx->block_padding; + s->rlayer.hs_padding = ctx->hs_padding; s->sid_ctx_length = ctx->sid_ctx_length; if (!ossl_assert(s->sid_ctx_length <= sizeof(s->sid_ctx))) goto err; @@ -757,21 +803,18 @@ SSL *SSL_new(SSL_CTX *ctx) s->param = X509_VERIFY_PARAM_new(); if (s->param == NULL) - goto err; + goto asn1err; X509_VERIFY_PARAM_inherit(s->param, ctx->param); - s->quiet_shutdown = ctx->quiet_shutdown; + s->quiet_shutdown = IS_QUIC_CTX(ctx) ? 0 : ctx->quiet_shutdown; + + if (!IS_QUIC_CTX(ctx)) + s->ext.max_fragment_len_mode = ctx->ext.max_fragment_len_mode; - s->ext.max_fragment_len_mode = ctx->ext.max_fragment_len_mode; s->max_send_fragment = ctx->max_send_fragment; s->split_send_fragment = ctx->split_send_fragment; s->max_pipelines = ctx->max_pipelines; - if (s->max_pipelines > 1) - RECORD_LAYER_set_read_ahead(&s->rlayer, 1); - if (ctx->default_read_buf_len > 0) - SSL_set_default_read_buffer_len(s, ctx->default_read_buf_len); + s->rlayer.default_read_buf_len = ctx->default_read_buf_len; - SSL_CTX_up_ref(ctx); - s->ctx = ctx; s->ext.debug_cb = 0; s->ext.debug_arg = NULL; s->ext.ticket_expected = 0; @@ -781,43 +824,83 @@ SSL *SSL_new(SSL_CTX *ctx) s->ext.ocsp.exts = NULL; s->ext.ocsp.resp = NULL; s->ext.ocsp.resp_len = 0; - SSL_CTX_up_ref(ctx); + + if (!SSL_CTX_up_ref(ctx)) + goto err; + s->session_ctx = ctx; - if (ctx->ext.ecpointformats) { + if (ctx->ext.ecpointformats != NULL) { s->ext.ecpointformats = OPENSSL_memdup(ctx->ext.ecpointformats, ctx->ext.ecpointformats_len); - if (!s->ext.ecpointformats) { + if (s->ext.ecpointformats == NULL) { s->ext.ecpointformats_len = 0; goto err; } s->ext.ecpointformats_len = ctx->ext.ecpointformats_len; } - if (ctx->ext.supportedgroups) { + if (ctx->ext.supportedgroups != NULL) { + size_t add = 0; + + if (ctx->ext.supportedgroups_len == 0) + /* Add 1 so allocation won't fail */ + add = 1; s->ext.supportedgroups = OPENSSL_memdup(ctx->ext.supportedgroups, - ctx->ext.supportedgroups_len - * sizeof(*ctx->ext.supportedgroups)); - if (!s->ext.supportedgroups) { + (ctx->ext.supportedgroups_len + add) + * sizeof(*ctx->ext.supportedgroups)); + if (s->ext.supportedgroups == NULL) { s->ext.supportedgroups_len = 0; goto err; } s->ext.supportedgroups_len = ctx->ext.supportedgroups_len; } + if (ctx->ext.keyshares != NULL) { + size_t add = 0; + + if (ctx->ext.keyshares_len == 0) + /* Add 1 so allocation won't fail */ + add = 1; + s->ext.keyshares = + OPENSSL_memdup(ctx->ext.keyshares, + (ctx->ext.keyshares_len + add) + * sizeof(*ctx->ext.keyshares)); + if (s->ext.keyshares == NULL) { + s->ext.keyshares_len = 0; + goto err; + } + s->ext.keyshares_len = ctx->ext.keyshares_len; + } + if (ctx->ext.tuples != NULL) { + size_t add = 0; + + if (ctx->ext.tuples_len == 0) + /* Add 1 so allocation won't fail */ + add = 1; + s->ext.tuples = + OPENSSL_memdup(ctx->ext.tuples, + (ctx->ext.tuples_len + add) + * sizeof(*ctx->ext.tuples)); + if (s->ext.tuples == NULL) { + s->ext.tuples_len = 0; + goto err; + } + s->ext.tuples_len = ctx->ext.tuples_len; + } #ifndef OPENSSL_NO_NEXTPROTONEG s->ext.npn = NULL; #endif - if (s->ctx->ext.alpn) { - s->ext.alpn = OPENSSL_malloc(s->ctx->ext.alpn_len); + if (ctx->ext.alpn != NULL) { + s->ext.alpn = OPENSSL_malloc(ctx->ext.alpn_len); if (s->ext.alpn == NULL) { s->ext.alpn_len = 0; goto err; } - memcpy(s->ext.alpn, s->ctx->ext.alpn, s->ctx->ext.alpn_len); - s->ext.alpn_len = s->ctx->ext.alpn_len; + memcpy(s->ext.alpn, ctx->ext.alpn, ctx->ext.alpn_len); + s->ext.alpn_len = ctx->ext.alpn_len; } s->verified_chain = NULL; @@ -826,23 +909,20 @@ SSL *SSL_new(SSL_CTX *ctx) s->default_passwd_callback = ctx->default_passwd_callback; s->default_passwd_callback_userdata = ctx->default_passwd_callback_userdata; - s->method = ctx->method; - s->key_update = SSL_KEY_UPDATE_NONE; - s->allow_early_data_cb = ctx->allow_early_data_cb; - s->allow_early_data_cb_data = ctx->allow_early_data_cb_data; - - if (!s->method->ssl_new(s)) - goto err; + if (!IS_QUIC_CTX(ctx)) { + s->allow_early_data_cb = ctx->allow_early_data_cb; + s->allow_early_data_cb_data = ctx->allow_early_data_cb_data; + } - s->server = (ctx->method->ssl_accept == ssl_undefined_function) ? 0 : 1; + if (!method->ssl_init(ssl)) + goto sslerr; - if (!SSL_clear(s)) - goto err; + s->server = (method->ssl_accept == ssl_undefined_function) ? 0 : 1; - if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data)) - goto err; + if (!method->ssl_reset(ssl)) + goto sslerr; #ifndef OPENSSL_NO_PSK s->psk_client_callback = ctx->psk_client_callback; @@ -856,32 +936,93 @@ SSL *SSL_new(SSL_CTX *ctx) s->job = NULL; +#ifndef OPENSSL_NO_COMP_ALG + memcpy(s->cert_comp_prefs, ctx->cert_comp_prefs, sizeof(s->cert_comp_prefs)); +#endif + if (ctx->client_cert_type != NULL) { + s->client_cert_type = OPENSSL_memdup(ctx->client_cert_type, + ctx->client_cert_type_len); + if (s->client_cert_type == NULL) + goto sslerr; + s->client_cert_type_len = ctx->client_cert_type_len; + } + if (ctx->server_cert_type != NULL) { + s->server_cert_type = OPENSSL_memdup(ctx->server_cert_type, + ctx->server_cert_type_len); + if (s->server_cert_type == NULL) + goto sslerr; + s->server_cert_type_len = ctx->server_cert_type_len; + } + #ifndef OPENSSL_NO_CT - if (!SSL_set_ct_validation_callback(s, ctx->ct_validation_callback, + if (!SSL_set_ct_validation_callback(ssl, ctx->ct_validation_callback, ctx->ct_validation_callback_arg)) - goto err; + goto sslerr; #endif - return s; + s->ssl_pkey_num = SSL_PKEY_NUM + ctx->sigalg_list_len; + return ssl; + cerr: + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); + goto err; + asn1err: + ERR_raise(ERR_LIB_SSL, ERR_R_ASN1_LIB); + goto err; + sslerr: + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); err: - SSL_free(s); - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + SSL_free(ssl); return NULL; } +SSL *ossl_ssl_connection_new(SSL_CTX *ctx) +{ + return ossl_ssl_connection_new_int(ctx, NULL, ctx->method); +} + int SSL_is_dtls(const SSL *s) { - return SSL_IS_DTLS(s) ? 1 : 0; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) + return 0; +#endif + + if (sc == NULL) + return 0; + + return SSL_CONNECTION_IS_DTLS(sc) ? 1 : 0; +} + +int SSL_is_tls(const SSL *s) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) + return 0; +#endif + + if (sc == NULL) + return 0; + + return SSL_CONNECTION_IS_DTLS(sc) ? 0 : 1; +} + +int SSL_is_quic(const SSL *s) +{ + return IS_QUIC(s); } int SSL_up_ref(SSL *s) { int i; - if (CRYPTO_UP_REF(&s->references, &i, s->lock) <= 0) + if (CRYPTO_UP_REF(&s->references, &i) <= 0) return 0; - REF_PRINT_COUNT("SSL", s); + REF_PRINT_COUNT("SSL", i, s); REF_ASSERT_ISNT(i < 2); return ((i > 1) ? 1 : 0); } @@ -902,12 +1043,17 @@ int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx, int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx, unsigned int sid_ctx_len) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return 0; + if (sid_ctx_len > SSL_MAX_SID_CTX_LENGTH) { ERR_raise(ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG); return 0; } - ssl->sid_ctx_length = sid_ctx_len; - memcpy(ssl->sid_ctx, sid_ctx, sid_ctx_len); + sc->sid_ctx_length = sid_ctx_len; + memcpy(sc->sid_ctx, sid_ctx, sid_ctx_len); return 1; } @@ -923,9 +1069,11 @@ int SSL_CTX_set_generate_session_id(SSL_CTX *ctx, GEN_SESSION_CB cb) int SSL_set_generate_session_id(SSL *ssl, GEN_SESSION_CB cb) { - if (!CRYPTO_THREAD_write_lock(ssl->lock)) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL || !CRYPTO_THREAD_write_lock(ssl->lock)) return 0; - ssl->generate_session_id = cb; + sc->generate_session_id = cb; CRYPTO_THREAD_unlock(ssl->lock); return 1; } @@ -941,18 +1089,19 @@ int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id, * by this SSL. */ SSL_SESSION r, *p; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl); - if (id_len > sizeof(r.session_id)) + if (sc == NULL || id_len > sizeof(r.session_id)) return 0; - r.ssl_version = ssl->version; + r.ssl_version = sc->version; r.session_id_length = id_len; memcpy(r.session_id, id, id_len); - if (!CRYPTO_THREAD_read_lock(ssl->session_ctx->lock)) + if (!CRYPTO_THREAD_read_lock(sc->session_ctx->lock)) return 0; - p = lh_SSL_SESSION_retrieve(ssl->session_ctx->sessions, &r); - CRYPTO_THREAD_unlock(ssl->session_ctx->lock); + p = lh_SSL_SESSION_retrieve(sc->session_ctx->sessions, &r); + CRYPTO_THREAD_unlock(sc->session_ctx->lock); return (p != NULL); } @@ -963,7 +1112,12 @@ int SSL_CTX_set_purpose(SSL_CTX *s, int purpose) int SSL_set_purpose(SSL *s, int purpose) { - return X509_VERIFY_PARAM_set_purpose(s->param, purpose); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + return X509_VERIFY_PARAM_set_purpose(sc->param, purpose); } int SSL_CTX_set_trust(SSL_CTX *s, int trust) @@ -973,25 +1127,40 @@ int SSL_CTX_set_trust(SSL_CTX *s, int trust) int SSL_set_trust(SSL *s, int trust) { - return X509_VERIFY_PARAM_set_trust(s->param, trust); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + return X509_VERIFY_PARAM_set_trust(sc->param, trust); } int SSL_set1_host(SSL *s, const char *hostname) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + /* If a hostname is provided and parses as an IP address, * treat it as such. */ - if (hostname && X509_VERIFY_PARAM_set1_ip_asc(s->param, hostname) == 1) + if (hostname != NULL + && X509_VERIFY_PARAM_set1_ip_asc(sc->param, hostname) == 1) return 1; - return X509_VERIFY_PARAM_set1_host(s->param, hostname, 0); + return X509_VERIFY_PARAM_set1_host(sc->param, hostname, 0); } int SSL_add1_host(SSL *s, const char *hostname) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + /* If a hostname is provided and parses as an IP address, * treat it as such. */ - if (hostname) - { + if (hostname) { ASN1_OCTET_STRING *ip; char *old_ip; @@ -1000,29 +1169,38 @@ int SSL_add1_host(SSL *s, const char *hostname) /* We didn't want it; only to check if it *is* an IP address */ ASN1_OCTET_STRING_free(ip); - old_ip = X509_VERIFY_PARAM_get1_ip_asc(s->param); - if (old_ip) - { + old_ip = X509_VERIFY_PARAM_get1_ip_asc(sc->param); + if (old_ip) { OPENSSL_free(old_ip); /* There can be only one IP address */ return 0; } - return X509_VERIFY_PARAM_set1_ip_asc(s->param, hostname); + return X509_VERIFY_PARAM_set1_ip_asc(sc->param, hostname); } } - return X509_VERIFY_PARAM_add1_host(s->param, hostname, 0); + return X509_VERIFY_PARAM_add1_host(sc->param, hostname, 0); } void SSL_set_hostflags(SSL *s, unsigned int flags) { - X509_VERIFY_PARAM_set_hostflags(s->param, flags); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + X509_VERIFY_PARAM_set_hostflags(sc->param, flags); } const char *SSL_get0_peername(SSL *s) { - return X509_VERIFY_PARAM_get0_peername(s->param); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return NULL; + + return X509_VERIFY_PARAM_get0_peername(sc->param); } int SSL_CTX_dane_enable(SSL_CTX *ctx) @@ -1048,8 +1226,13 @@ unsigned long SSL_CTX_dane_clear_flags(SSL_CTX *ctx, unsigned long flags) int SSL_dane_enable(SSL *s, const char *basedomain) { - SSL_DANE *dane = &s->dane; + SSL_DANE *dane; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + if (sc == NULL) + return 0; + + dane = &sc->dane; if (s->ctx->dane.mdmax == 0) { ERR_raise(ERR_LIB_SSL, SSL_R_CONTEXT_NOT_DANE_ENABLED); return 0; @@ -1061,10 +1244,10 @@ int SSL_dane_enable(SSL *s, const char *basedomain) /* * Default SNI name. This rejects empty names, while set1_host below - * accepts them and disables host name checks. To avoid side-effects with + * accepts them and disables hostname checks. To avoid side-effects with * invalid input, set the SNI name first. */ - if (s->ext.hostname == NULL) { + if (sc->ext.hostname == NULL) { if (!SSL_set_tlsext_host_name(s, basedomain)) { ERR_raise(ERR_LIB_SSL, SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN); return -1; @@ -1072,7 +1255,7 @@ int SSL_dane_enable(SSL *s, const char *basedomain) } /* Primary RFC6125 reference identifier */ - if (!X509_VERIFY_PARAM_set1_host(s->param, basedomain, 0)) { + if (!X509_VERIFY_PARAM_set1_host(sc->param, basedomain, 0)) { ERR_raise(ERR_LIB_SSL, SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN); return -1; } @@ -1083,7 +1266,7 @@ int SSL_dane_enable(SSL *s, const char *basedomain) dane->trecs = sk_danetls_record_new_null(); if (dane->trecs == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); return -1; } return 1; @@ -1091,25 +1274,43 @@ int SSL_dane_enable(SSL *s, const char *basedomain) unsigned long SSL_dane_set_flags(SSL *ssl, unsigned long flags) { - unsigned long orig = ssl->dane.flags; + unsigned long orig; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return 0; + + orig = sc->dane.flags; - ssl->dane.flags |= flags; + sc->dane.flags |= flags; return orig; } unsigned long SSL_dane_clear_flags(SSL *ssl, unsigned long flags) { - unsigned long orig = ssl->dane.flags; + unsigned long orig; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return 0; + + orig = sc->dane.flags; - ssl->dane.flags &= ~flags; + sc->dane.flags &= ~flags; return orig; } int SSL_get0_dane_authority(SSL *s, X509 **mcert, EVP_PKEY **mspki) { - SSL_DANE *dane = &s->dane; + SSL_DANE *dane; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - if (!DANETLS_ENABLED(dane) || s->verify_result != X509_V_OK) + if (sc == NULL) + return -1; + + dane = &sc->dane; + + if (!DANETLS_ENABLED(dane) || sc->verify_result != X509_V_OK) return -1; if (dane->mtlsa) { if (mcert) @@ -1123,9 +1324,15 @@ int SSL_get0_dane_authority(SSL *s, X509 **mcert, EVP_PKEY **mspki) int SSL_get0_dane_tlsa(SSL *s, uint8_t *usage, uint8_t *selector, uint8_t *mtype, const unsigned char **data, size_t *dlen) { - SSL_DANE *dane = &s->dane; + SSL_DANE *dane; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return -1; + + dane = &sc->dane; - if (!DANETLS_ENABLED(dane) || s->verify_result != X509_V_OK) + if (!DANETLS_ENABLED(dane) || sc->verify_result != X509_V_OK) return -1; if (dane->mtlsa) { if (usage) @@ -1144,13 +1351,23 @@ int SSL_get0_dane_tlsa(SSL *s, uint8_t *usage, uint8_t *selector, SSL_DANE *SSL_get0_dane(SSL *s) { - return &s->dane; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return NULL; + + return &sc->dane; } int SSL_dane_tlsa_add(SSL *s, uint8_t usage, uint8_t selector, uint8_t mtype, const unsigned char *data, size_t dlen) { - return dane_tlsa_add(&s->dane, usage, selector, mtype, data, dlen); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + return dane_tlsa_add(&sc->dane, usage, selector, mtype, data, dlen); } int SSL_CTX_dane_mtype_set(SSL_CTX *ctx, const EVP_MD *md, uint8_t mtype, @@ -1166,7 +1383,12 @@ int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm) int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm) { - return X509_VERIFY_PARAM_set1(ssl->param, vpm); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return 0; + + return X509_VERIFY_PARAM_set1(sc->param, vpm); } X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx) @@ -1176,12 +1398,22 @@ X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx) X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl) { - return ssl->param; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return NULL; + + return sc->param; } void SSL_certs_clear(SSL *s) { - ssl_cert_clear_certs(s->cert); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + ssl_cert_clear_certs(sc->cert); } void SSL_free(SSL *s) @@ -1190,25 +1422,41 @@ void SSL_free(SSL *s) if (s == NULL) return; - CRYPTO_DOWN_REF(&s->references, &i, s->lock); - REF_PRINT_COUNT("SSL", s); + CRYPTO_DOWN_REF(&s->references, &i); + REF_PRINT_COUNT("SSL", i, s); if (i > 0) return; REF_ASSERT_ISNT(i < 0); - X509_VERIFY_PARAM_free(s->param); - dane_final(&s->dane); + if (s->method != NULL) + s->method->ssl_free(s); + CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data); + SSL_CTX_free(s->ctx); + CRYPTO_THREAD_lock_free(s->lock); + CRYPTO_FREE_REF(&s->references); - RECORD_LAYER_release(&s->rlayer); + OPENSSL_free(s); +} - /* Ignore return value */ +void ossl_ssl_connection_free(SSL *ssl) +{ + SSL_CONNECTION *s; + + s = SSL_CONNECTION_FROM_SSL_ONLY(ssl); + if (s == NULL) + return; + + /* + * Ignore return values. This could result in user callbacks being called + * e.g. for the QUIC TLS record layer. So we do this early before we have + * freed other things. + */ ssl_free_wbio_buffer(s); + RECORD_LAYER_clear(&s->rlayer); - BIO_free_all(s->wbio); - s->wbio = NULL; - BIO_free_all(s->rbio); - s->rbio = NULL; + X509_VERIFY_PARAM_free(s->param); + dane_final(&s->dane); BUF_MEM_free(s->init_buf); @@ -1235,6 +1483,8 @@ void SSL_free(SSL *s) OPENSSL_free(s->ext.ecpointformats); OPENSSL_free(s->ext.peer_ecpointformats); OPENSSL_free(s->ext.supportedgroups); + OPENSSL_free(s->ext.keyshares); + OPENSSL_free(s->ext.tuples); OPENSSL_free(s->ext.peer_supportedgroups); sk_X509_EXTENSION_pop_free(s->ext.ocsp.exts, X509_EXTENSION_free); #ifndef OPENSSL_NO_OCSP @@ -1256,18 +1506,13 @@ void SSL_free(SSL *s) sk_X509_NAME_pop_free(s->ca_names, X509_NAME_free); sk_X509_NAME_pop_free(s->client_ca_names, X509_NAME_free); - sk_X509_pop_free(s->verified_chain, X509_free); + OPENSSL_free(s->client_cert_type); + OPENSSL_free(s->server_cert_type); - if (s->method != NULL) - s->method->ssl_free(s); + OSSL_STACK_OF_X509_free(s->verified_chain); - /* - * Must occur after s->method->ssl_free(). The DTLS sent_messages queue - * may reference the EVP_CIPHER_CTX/EVP_MD_CTX that are freed here. - */ - clear_ciphers(s); - - SSL_CTX_free(s->ctx); + if (ssl->method != NULL) + ssl->method->ssl_deinit(ssl); ASYNC_WAIT_CTX_free(s->waitctx); @@ -1279,31 +1524,66 @@ void SSL_free(SSL *s) sk_SRTP_PROTECTION_PROFILE_free(s->srtp_profiles); #endif - CRYPTO_THREAD_lock_free(s->lock); - - OPENSSL_free(s); + /* + * We do this late. We want to ensure that any other references we held to + * these BIOs are freed first *before* we call BIO_free_all(), because + * BIO_free_all() will only free each BIO in the chain if the number of + * references to the first BIO have dropped to 0 + */ + BIO_free_all(s->wbio); + s->wbio = NULL; + BIO_free_all(s->rbio); + s->rbio = NULL; + OPENSSL_free(s->s3.tmp.valid_flags); } void SSL_set0_rbio(SSL *s, BIO *rbio) { - BIO_free_all(s->rbio); - s->rbio = rbio; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) { + ossl_quic_conn_set0_net_rbio(s, rbio); + return; + } +#endif + + if (sc == NULL) + return; + + BIO_free_all(sc->rbio); + sc->rbio = rbio; + sc->rlayer.rrlmethod->set1_bio(sc->rlayer.rrl, sc->rbio); } void SSL_set0_wbio(SSL *s, BIO *wbio) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) { + ossl_quic_conn_set0_net_wbio(s, wbio); + return; + } +#endif + + if (sc == NULL) + return; + /* * If the output buffering BIO is still in place, remove it */ - if (s->bbio != NULL) - s->wbio = BIO_pop(s->wbio); + if (sc->bbio != NULL) + sc->wbio = BIO_pop(sc->wbio); - BIO_free_all(s->wbio); - s->wbio = wbio; + BIO_free_all(sc->wbio); + sc->wbio = wbio; /* Re-attach |bbio| to the new |wbio|. */ - if (s->bbio != NULL) - s->wbio = BIO_push(s->bbio, s->wbio); + if (sc->bbio != NULL) + sc->wbio = BIO_push(sc->bbio, sc->wbio); + + sc->rlayer.wrlmethod->set1_bio(sc->rlayer.wrl, sc->wbio); } void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio) @@ -1321,8 +1601,10 @@ void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio) * If the two arguments are equal then one fewer reference is granted by the * caller than we want to take */ - if (rbio != NULL && rbio == wbio) - BIO_up_ref(rbio); + if (rbio != NULL && rbio == wbio) { + if (!BIO_up_ref(rbio)) + return; + } /* * If only the wbio is changed only adopt one reference. @@ -1348,19 +1630,39 @@ void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio) BIO *SSL_get_rbio(const SSL *s) { - return s->rbio; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_conn_get_net_rbio(s); +#endif + + if (sc == NULL) + return NULL; + + return sc->rbio; } BIO *SSL_get_wbio(const SSL *s) { - if (s->bbio != NULL) { + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_conn_get_net_wbio(s); +#endif + + if (sc == NULL) + return NULL; + + if (sc->bbio != NULL) { /* * If |bbio| is active, the true caller-configured BIO is its * |next_bio|. */ - return BIO_next(s->bbio); + return BIO_next(sc->bbio); } - return s->wbio; + return sc->wbio; } int SSL_get_fd(const SSL *s) @@ -1393,12 +1695,27 @@ int SSL_get_wfd(const SSL *s) } #ifndef OPENSSL_NO_SOCK +static const BIO_METHOD *fd_method(SSL *s) +{ +#ifndef OPENSSL_NO_DGRAM + if (IS_QUIC(s)) + return BIO_s_datagram(); +#endif + + return BIO_s_socket(); +} + int SSL_set_fd(SSL *s, int fd) { int ret = 0; BIO *bio = NULL; - bio = BIO_new(BIO_s_socket()); + if (s->type == SSL_TYPE_QUIC_XSO) { + ERR_raise(ERR_LIB_SSL, SSL_R_CONN_USE_ONLY); + goto err; + } + + bio = BIO_new(fd_method(s)); if (bio == NULL) { ERR_raise(ERR_LIB_SSL, ERR_R_BUF_LIB); @@ -1423,10 +1740,16 @@ int SSL_set_fd(SSL *s, int fd) int SSL_set_wfd(SSL *s, int fd) { BIO *rbio = SSL_get_rbio(s); + int desired_type = IS_QUIC(s) ? BIO_TYPE_DGRAM : BIO_TYPE_SOCKET; - if (rbio == NULL || BIO_method_type(rbio) != BIO_TYPE_SOCKET + if (s->type == SSL_TYPE_QUIC_XSO) { + ERR_raise(ERR_LIB_SSL, SSL_R_CONN_USE_ONLY); + return 0; + } + + if (rbio == NULL || BIO_method_type(rbio) != desired_type || (int)BIO_get_fd(rbio, NULL) != fd) { - BIO *bio = BIO_new(BIO_s_socket()); + BIO *bio = BIO_new(fd_method(s)); if (bio == NULL) { ERR_raise(ERR_LIB_SSL, ERR_R_BUF_LIB); @@ -1444,7 +1767,8 @@ int SSL_set_wfd(SSL *s, int fd) ktls_enable(fd); #endif /* OPENSSL_NO_KTLS */ } else { - BIO_up_ref(rbio); + if (!BIO_up_ref(rbio)) + return 0; SSL_set0_wbio(s, rbio); } return 1; @@ -1453,10 +1777,16 @@ int SSL_set_wfd(SSL *s, int fd) int SSL_set_rfd(SSL *s, int fd) { BIO *wbio = SSL_get_wbio(s); + int desired_type = IS_QUIC(s) ? BIO_TYPE_DGRAM : BIO_TYPE_SOCKET; + + if (s->type == SSL_TYPE_QUIC_XSO) { + ERR_raise(ERR_LIB_SSL, SSL_R_CONN_USE_ONLY); + return 0; + } - if (wbio == NULL || BIO_method_type(wbio) != BIO_TYPE_SOCKET + if (wbio == NULL || BIO_method_type(wbio) != desired_type || ((int)BIO_get_fd(wbio, NULL) != fd)) { - BIO *bio = BIO_new(BIO_s_socket()); + BIO *bio = BIO_new(fd_method(s)); if (bio == NULL) { ERR_raise(ERR_LIB_SSL, ERR_R_BUF_LIB); @@ -1465,7 +1795,8 @@ int SSL_set_rfd(SSL *s, int fd) BIO_set_fd(bio, fd, BIO_NOCLOSE); SSL_set0_rbio(s, bio); } else { - BIO_up_ref(wbio); + if (!BIO_up_ref(wbio)) + return 0; SSL_set0_rbio(s, wbio); } @@ -1477,11 +1808,15 @@ int SSL_set_rfd(SSL *s, int fd) size_t SSL_get_finished(const SSL *s, void *buf, size_t count) { size_t ret = 0; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; - ret = s->s3.tmp.finish_md_len; + ret = sc->s3.tmp.finish_md_len; if (count > ret) count = ret; - memcpy(buf, s->s3.tmp.finish_md, count); + memcpy(buf, sc->s3.tmp.finish_md, count); return ret; } @@ -1489,26 +1824,45 @@ size_t SSL_get_finished(const SSL *s, void *buf, size_t count) size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count) { size_t ret = 0; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); - ret = s->s3.tmp.peer_finish_md_len; + if (sc == NULL) + return 0; + + ret = sc->s3.tmp.peer_finish_md_len; if (count > ret) count = ret; - memcpy(buf, s->s3.tmp.peer_finish_md, count); + memcpy(buf, sc->s3.tmp.peer_finish_md, count); return ret; } int SSL_get_verify_mode(const SSL *s) { - return s->verify_mode; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->verify_mode; } int SSL_get_verify_depth(const SSL *s) { - return X509_VERIFY_PARAM_get_depth(s->param); + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return X509_VERIFY_PARAM_get_depth(sc->param); } int (*SSL_get_verify_callback(const SSL *s)) (int, X509_STORE_CTX *) { - return s->verify_callback; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + return sc->verify_callback; } int SSL_CTX_get_verify_mode(const SSL_CTX *ctx) @@ -1528,24 +1882,52 @@ int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx)) (int, X509_STORE_CTX *) { void SSL_set_verify(SSL *s, int mode, int (*callback) (int ok, X509_STORE_CTX *ctx)) { - s->verify_mode = mode; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->verify_mode = mode; if (callback != NULL) - s->verify_callback = callback; + sc->verify_callback = callback; } void SSL_set_verify_depth(SSL *s, int depth) { - X509_VERIFY_PARAM_set_depth(s->param, depth); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + X509_VERIFY_PARAM_set_depth(sc->param, depth); } void SSL_set_read_ahead(SSL *s, int yes) { - RECORD_LAYER_set_read_ahead(&s->rlayer, yes); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + OSSL_PARAM options[2], *opts = options; + + if (sc == NULL) + return; + + RECORD_LAYER_set_read_ahead(&sc->rlayer, yes); + + *opts++ = OSSL_PARAM_construct_int(OSSL_LIBSSL_RECORD_LAYER_PARAM_READ_AHEAD, + &sc->rlayer.read_ahead); + *opts = OSSL_PARAM_construct_end(); + + /* Ignore return value */ + sc->rlayer.rrlmethod->set_options(sc->rlayer.rrl, options); } int SSL_get_read_ahead(const SSL *s) { - return RECORD_LAYER_get_read_ahead(&s->rlayer); + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(s); + + if (sc == NULL) + return 0; + + return RECORD_LAYER_get_read_ahead(&sc->rlayer); } int SSL_pending(const SSL *s) @@ -1575,52 +1957,69 @@ int SSL_has_pending(const SSL *s) * That data may not result in any application data, or we may fail to parse * the records for some reason. */ + const SSL_CONNECTION *sc; + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_has_pending(s); +#endif + + sc = SSL_CONNECTION_FROM_CONST_SSL(s); /* Check buffered app data if any first */ - if (SSL_IS_DTLS(s)) { - DTLS1_RECORD_DATA *rdata; + if (SSL_CONNECTION_IS_DTLS(sc)) { + TLS_RECORD *rdata; pitem *item, *iter; - iter = pqueue_iterator(s->rlayer.d->buffered_app_data.q); + iter = pqueue_iterator(sc->rlayer.d->buffered_app_data); while ((item = pqueue_next(&iter)) != NULL) { rdata = item->data; - if (rdata->rrec.length > 0) + if (rdata->length > 0) return 1; } } - if (RECORD_LAYER_processed_read_pending(&s->rlayer)) + if (RECORD_LAYER_processed_read_pending(&sc->rlayer)) return 1; - return RECORD_LAYER_read_pending(&s->rlayer); + return RECORD_LAYER_read_pending(&sc->rlayer); } X509 *SSL_get1_peer_certificate(const SSL *s) { X509 *r = SSL_get0_peer_certificate(s); - if (r != NULL) - X509_up_ref(r); + if (r != NULL && !X509_up_ref(r)) + return NULL; return r; } X509 *SSL_get0_peer_certificate(const SSL *s) { - if ((s == NULL) || (s->session == NULL)) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + if (sc->session == NULL) return NULL; else - return s->session->peer; + return sc->session->peer; } STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s) { STACK_OF(X509) *r; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; - if ((s == NULL) || (s->session == NULL)) + if (sc->session == NULL) r = NULL; else - r = s->session->peer_chain; + r = sc->session->peer_chain; /* * If we are a client, cert_chain includes the peer's own certificate; if @@ -1637,6 +2036,13 @@ STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s) int SSL_copy_session_id(SSL *t, const SSL *f) { int i; + /* TODO(QUIC FUTURE): Not allowed for QUIC currently. */ + SSL_CONNECTION *tsc = SSL_CONNECTION_FROM_SSL_ONLY(t); + const SSL_CONNECTION *fsc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(f); + + if (tsc == NULL || fsc == NULL) + return 0; + /* Do we need to do SSL locking? */ if (!SSL_set_session(t, SSL_get_session(f))) { return 0; @@ -1646,16 +2052,16 @@ int SSL_copy_session_id(SSL *t, const SSL *f) * what if we are setup for one protocol version but want to talk another */ if (t->method != f->method) { - t->method->ssl_free(t); + t->method->ssl_deinit(t); t->method = f->method; - if (t->method->ssl_new(t) == 0) + if (t->method->ssl_init(t) == 0) return 0; } - CRYPTO_UP_REF(&f->cert->references, &i, f->cert->lock); - ssl_cert_free(t->cert); - t->cert = f->cert; - if (!SSL_set_session_id_context(t, f->sid_ctx, (int)f->sid_ctx_length)) { + CRYPTO_UP_REF(&fsc->cert->references, &i); + ssl_cert_free(tsc->cert); + tsc->cert = fsc->cert; + if (!SSL_set_session_id_context(t, fsc->sid_ctx, (int)fsc->sid_ctx_length)) { return 0; } @@ -1680,25 +2086,32 @@ int SSL_CTX_check_private_key(const SSL_CTX *ctx) /* Fix this function so that it takes an optional type parameter */ int SSL_check_private_key(const SSL *ssl) { - if (ssl == NULL) { + const SSL_CONNECTION *sc; + + if ((sc = SSL_CONNECTION_FROM_CONST_SSL(ssl)) == NULL) { ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER); return 0; } - if (ssl->cert->key->x509 == NULL) { + if (sc->cert->key->x509 == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_NO_CERTIFICATE_ASSIGNED); return 0; } - if (ssl->cert->key->privatekey == NULL) { + if (sc->cert->key->privatekey == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_NO_PRIVATE_KEY_ASSIGNED); return 0; } - return X509_check_private_key(ssl->cert->key->x509, - ssl->cert->key->privatekey); + return X509_check_private_key(sc->cert->key->x509, + sc->cert->key->privatekey); } int SSL_waiting_for_async(SSL *s) { - if (s->job) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->job) return 1; return 0; @@ -1706,9 +2119,13 @@ int SSL_waiting_for_async(SSL *s) int SSL_get_all_async_fds(SSL *s, OSSL_ASYNC_FD *fds, size_t *numfds) { - ASYNC_WAIT_CTX *ctx = s->waitctx; + ASYNC_WAIT_CTX *ctx; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - if (ctx == NULL) + if (sc == NULL) + return 0; + + if ((ctx = sc->waitctx) == NULL) return 0; return ASYNC_WAIT_CTX_get_all_fds(ctx, fds, numfds); } @@ -1716,9 +2133,13 @@ int SSL_get_all_async_fds(SSL *s, OSSL_ASYNC_FD *fds, size_t *numfds) int SSL_get_changed_async_fds(SSL *s, OSSL_ASYNC_FD *addfd, size_t *numaddfds, OSSL_ASYNC_FD *delfd, size_t *numdelfds) { - ASYNC_WAIT_CTX *ctx = s->waitctx; + ASYNC_WAIT_CTX *ctx; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - if (ctx == NULL) + if (sc == NULL) + return 0; + + if ((ctx = sc->waitctx) == NULL) return 0; return ASYNC_WAIT_CTX_get_changed_fds(ctx, addfd, numaddfds, delfd, numdelfds); @@ -1738,21 +2159,35 @@ int SSL_CTX_set_async_callback_arg(SSL_CTX *ctx, void *arg) int SSL_set_async_callback(SSL *s, SSL_async_callback_fn callback) { - s->async_cb = callback; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + sc->async_cb = callback; return 1; } int SSL_set_async_callback_arg(SSL *s, void *arg) { - s->async_cb_arg = arg; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + sc->async_cb_arg = arg; return 1; } int SSL_get_async_status(SSL *s, int *status) { - ASYNC_WAIT_CTX *ctx = s->waitctx; + ASYNC_WAIT_CTX *ctx; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - if (ctx == NULL) + if (sc == NULL) + return 0; + + if ((ctx = sc->waitctx) == NULL) return 0; *status = ASYNC_WAIT_CTX_get_status(ctx); return 1; @@ -1760,7 +2195,17 @@ int SSL_get_async_status(SSL *s, int *status) int SSL_accept(SSL *s) { - if (s->handshake_func == NULL) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return s->method->ssl_accept(s); +#endif + + if (sc == NULL) + return 0; + + if (sc->handshake_func == NULL) { /* Not properly initialized yet */ SSL_set_accept_state(s); } @@ -1770,7 +2215,17 @@ int SSL_accept(SSL *s) int SSL_connect(SSL *s) { - if (s->handshake_func == NULL) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return s->method->ssl_connect(s); +#endif + + if (sc == NULL) + return 0; + + if (sc->handshake_func == NULL) { /* Not properly initialized yet */ SSL_set_connect_state(s); } @@ -1780,48 +2235,57 @@ int SSL_connect(SSL *s) long SSL_get_default_timeout(const SSL *s) { - return s->method->get_timeout(); + return (long int)ossl_time2seconds(s->method->get_timeout()); } static int ssl_async_wait_ctx_cb(void *arg) { SSL *s = (SSL *)arg; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - return s->async_cb(s, s->async_cb_arg); + if (sc == NULL) + return 0; + + return sc->async_cb(s, sc->async_cb_arg); } static int ssl_start_async_job(SSL *s, struct ssl_async_args *args, int (*func) (void *)) { int ret; - if (s->waitctx == NULL) { - s->waitctx = ASYNC_WAIT_CTX_new(); - if (s->waitctx == NULL) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->waitctx == NULL) { + sc->waitctx = ASYNC_WAIT_CTX_new(); + if (sc->waitctx == NULL) return -1; - if (s->async_cb != NULL + if (sc->async_cb != NULL && !ASYNC_WAIT_CTX_set_callback - (s->waitctx, ssl_async_wait_ctx_cb, s)) + (sc->waitctx, ssl_async_wait_ctx_cb, s)) return -1; } - s->rwstate = SSL_NOTHING; - switch (ASYNC_start_job(&s->job, s->waitctx, &ret, func, args, + sc->rwstate = SSL_NOTHING; + switch (ASYNC_start_job(&sc->job, sc->waitctx, &ret, func, args, sizeof(struct ssl_async_args))) { case ASYNC_ERR: - s->rwstate = SSL_NOTHING; + sc->rwstate = SSL_NOTHING; ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_INIT_ASYNC); return -1; case ASYNC_PAUSE: - s->rwstate = SSL_ASYNC_PAUSED; + sc->rwstate = SSL_ASYNC_PAUSED; return -1; case ASYNC_NO_JOBS: - s->rwstate = SSL_ASYNC_NO_JOBS; + sc->rwstate = SSL_ASYNC_NO_JOBS; return -1; case ASYNC_FINISH: - s->job = NULL; + sc->job = NULL; return ret; default: - s->rwstate = SSL_NOTHING; + sc->rwstate = SSL_NOTHING; ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); /* Shouldn't happen */ return -1; @@ -1834,16 +2298,20 @@ static int ssl_io_intern(void *vargs) SSL *s; void *buf; size_t num; + SSL_CONNECTION *sc; args = (struct ssl_async_args *)vargs; s = args->s; buf = args->buf; num = args->num; + if ((sc = SSL_CONNECTION_FROM_SSL(s)) == NULL) + return -1; + switch (args->type) { case READFUNC: - return args->f.func_read(s, buf, num, &s->asyncrw); + return args->f.func_read(s, buf, num, &sc->asyncrw); case WRITEFUNC: - return args->f.func_write(s, buf, num, &s->asyncrw); + return args->f.func_write(s, buf, num, &sc->asyncrw); case OTHERFUNC: return args->f.func_other(s); } @@ -1852,18 +2320,28 @@ static int ssl_io_intern(void *vargs) int ssl_read_internal(SSL *s, void *buf, size_t num, size_t *readbytes) { - if (s->handshake_func == NULL) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return s->method->ssl_read(s, buf, num, readbytes); +#endif + + if (sc == NULL) + return -1; + + if (sc->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; } - if (s->shutdown & SSL_RECEIVED_SHUTDOWN) { - s->rwstate = SSL_NOTHING; + if (sc->shutdown & SSL_RECEIVED_SHUTDOWN) { + sc->rwstate = SSL_NOTHING; return 0; } - if (s->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY - || s->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY) { + if (sc->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY + || sc->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY) { ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } @@ -1871,9 +2349,10 @@ int ssl_read_internal(SSL *s, void *buf, size_t num, size_t *readbytes) * If we are a client and haven't received the ServerHello etc then we * better do that */ - ossl_statem_check_finish_init(s, 0); + if (!ossl_statem_check_finish_init(sc, 0)) + return -1; - if ((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { + if ((sc->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { struct ssl_async_args args; int ret; @@ -1884,7 +2363,7 @@ int ssl_read_internal(SSL *s, void *buf, size_t num, size_t *readbytes) args.f.func_read = s->method->ssl_read; ret = ssl_start_async_job(s, &args, ssl_io_intern); - *readbytes = s->asyncrw; + *readbytes = sc->asyncrw; return ret; } else { return s->method->ssl_read(s, buf, num, readbytes); @@ -1925,13 +2404,15 @@ int SSL_read_ex(SSL *s, void *buf, size_t num, size_t *readbytes) int SSL_read_early_data(SSL *s, void *buf, size_t num, size_t *readbytes) { int ret; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); - if (!s->server) { + /* TODO(QUIC 0RTT): 0-RTT support */ + if (sc == NULL || !sc->server) { ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return SSL_READ_EARLY_DATA_ERROR; } - switch (s->early_data_state) { + switch (sc->early_data_state) { case SSL_EARLY_DATA_NONE: if (!SSL_in_before(s)) { ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); @@ -1940,32 +2421,32 @@ int SSL_read_early_data(SSL *s, void *buf, size_t num, size_t *readbytes) /* fall through */ case SSL_EARLY_DATA_ACCEPT_RETRY: - s->early_data_state = SSL_EARLY_DATA_ACCEPTING; + sc->early_data_state = SSL_EARLY_DATA_ACCEPTING; ret = SSL_accept(s); if (ret <= 0) { /* NBIO or error */ - s->early_data_state = SSL_EARLY_DATA_ACCEPT_RETRY; + sc->early_data_state = SSL_EARLY_DATA_ACCEPT_RETRY; return SSL_READ_EARLY_DATA_ERROR; } /* fall through */ case SSL_EARLY_DATA_READ_RETRY: - if (s->ext.early_data == SSL_EARLY_DATA_ACCEPTED) { - s->early_data_state = SSL_EARLY_DATA_READING; + if (sc->ext.early_data == SSL_EARLY_DATA_ACCEPTED) { + sc->early_data_state = SSL_EARLY_DATA_READING; ret = SSL_read_ex(s, buf, num, readbytes); /* * State machine will update early_data_state to * SSL_EARLY_DATA_FINISHED_READING if we get an EndOfEarlyData * message */ - if (ret > 0 || (ret <= 0 && s->early_data_state + if (ret > 0 || (ret <= 0 && sc->early_data_state != SSL_EARLY_DATA_FINISHED_READING)) { - s->early_data_state = SSL_EARLY_DATA_READ_RETRY; + sc->early_data_state = SSL_EARLY_DATA_READ_RETRY; return ret > 0 ? SSL_READ_EARLY_DATA_SUCCESS : SSL_READ_EARLY_DATA_ERROR; } } else { - s->early_data_state = SSL_EARLY_DATA_FINISHED_READING; + sc->early_data_state = SSL_EARLY_DATA_FINISHED_READING; } *readbytes = 0; return SSL_READ_EARLY_DATA_FINISH; @@ -1978,20 +2459,36 @@ int SSL_read_early_data(SSL *s, void *buf, size_t num, size_t *readbytes) int SSL_get_early_data_status(const SSL *s) { - return s->ext.early_data; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(s); + + /* TODO(QUIC 0RTT): 0-RTT support */ + if (sc == NULL) + return 0; + + return sc->ext.early_data; } static int ssl_peek_internal(SSL *s, void *buf, size_t num, size_t *readbytes) { - if (s->handshake_func == NULL) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return s->method->ssl_peek(s, buf, num, readbytes); +#endif + + if (sc == NULL) + return 0; + + if (sc->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; } - if (s->shutdown & SSL_RECEIVED_SHUTDOWN) { + if (sc->shutdown & SSL_RECEIVED_SHUTDOWN) { return 0; } - if ((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { + if ((sc->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { struct ssl_async_args args; int ret; @@ -2002,7 +2499,7 @@ static int ssl_peek_internal(SSL *s, void *buf, size_t num, size_t *readbytes) args.f.func_read = s->method->ssl_peek; ret = ssl_start_async_job(s, &args, ssl_io_intern); - *readbytes = s->asyncrw; + *readbytes = sc->asyncrw; return ret; } else { return s->method->ssl_peek(s, buf, num, readbytes); @@ -2041,29 +2538,46 @@ int SSL_peek_ex(SSL *s, void *buf, size_t num, size_t *readbytes) return ret; } -int ssl_write_internal(SSL *s, const void *buf, size_t num, size_t *written) +int ssl_write_internal(SSL *s, const void *buf, size_t num, + uint64_t flags, size_t *written) { - if (s->handshake_func == NULL) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_write_flags(s, buf, num, flags, written); +#endif + + if (sc == NULL) + return 0; + + if (sc->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; } - if (s->shutdown & SSL_SENT_SHUTDOWN) { - s->rwstate = SSL_NOTHING; + if (sc->shutdown & SSL_SENT_SHUTDOWN) { + sc->rwstate = SSL_NOTHING; ERR_raise(ERR_LIB_SSL, SSL_R_PROTOCOL_IS_SHUTDOWN); return -1; } - if (s->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY - || s->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY - || s->early_data_state == SSL_EARLY_DATA_READ_RETRY) { + if (flags != 0) { + ERR_raise(ERR_LIB_SSL, SSL_R_UNSUPPORTED_WRITE_FLAG); + return -1; + } + + if (sc->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY + || sc->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY + || sc->early_data_state == SSL_EARLY_DATA_READ_RETRY) { ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } /* If we are a client and haven't sent the Finished we better do that */ - ossl_statem_check_finish_init(s, 1); + if (!ossl_statem_check_finish_init(sc, 1)) + return -1; - if ((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { + if ((sc->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { int ret; struct ssl_async_args args; @@ -2074,7 +2588,7 @@ int ssl_write_internal(SSL *s, const void *buf, size_t num, size_t *written) args.f.func_write = s->method->ssl_write; ret = ssl_start_async_job(s, &args, ssl_io_intern); - *written = s->asyncrw; + *written = sc->asyncrw; return ret; } else { return s->method->ssl_write(s, buf, num, written); @@ -2084,25 +2598,29 @@ int ssl_write_internal(SSL *s, const void *buf, size_t num, size_t *written) ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size, int flags) { ossl_ssize_t ret; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) + return 0; - if (s->handshake_func == NULL) { + if (sc->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; } - if (s->shutdown & SSL_SENT_SHUTDOWN) { - s->rwstate = SSL_NOTHING; + if (sc->shutdown & SSL_SENT_SHUTDOWN) { + sc->rwstate = SSL_NOTHING; ERR_raise(ERR_LIB_SSL, SSL_R_PROTOCOL_IS_SHUTDOWN); return -1; } - if (!BIO_get_ktls_send(s->wbio)) { + if (!BIO_get_ktls_send(sc->wbio)) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; } /* If we have an alert to send, lets send it */ - if (s->s3.alert_dispatch) { + if (sc->s3.alert_dispatch > 0) { ret = (ossl_ssize_t)s->method->ssl_dispatch_alert(s); if (ret <= 0) { /* SSLfatal() already called if appropriate */ @@ -2111,10 +2629,10 @@ ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size, int flags) /* if it went, fall through and send more stuff */ } - s->rwstate = SSL_WRITING; - if (BIO_flush(s->wbio) <= 0) { - if (!BIO_should_retry(s->wbio)) { - s->rwstate = SSL_NOTHING; + sc->rwstate = SSL_WRITING; + if (BIO_flush(sc->wbio) <= 0) { + if (!BIO_should_retry(sc->wbio)) { + sc->rwstate = SSL_NOTHING; } else { #ifdef EAGAIN set_sys_error(EAGAIN); @@ -2134,13 +2652,14 @@ ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size, int flags) if ((get_last_sys_error() == EAGAIN) || (get_last_sys_error() == EINTR) || (get_last_sys_error() == EBUSY)) - BIO_set_retry_write(s->wbio); + BIO_set_retry_write(sc->wbio); else #endif - ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); + ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(), + "ktls_sendfile failure"); return ret; } - s->rwstate = SSL_NOTHING; + sc->rwstate = SSL_NOTHING; return ret; #endif } @@ -2155,7 +2674,7 @@ int SSL_write(SSL *s, const void *buf, int num) return -1; } - ret = ssl_write_internal(s, buf, (size_t)num, &written); + ret = ssl_write_internal(s, buf, (size_t)num, 0, &written); /* * The cast is safe here because ret should be <= INT_MAX because num is @@ -2169,7 +2688,13 @@ int SSL_write(SSL *s, const void *buf, int num) int SSL_write_ex(SSL *s, const void *buf, size_t num, size_t *written) { - int ret = ssl_write_internal(s, buf, num, written); + return SSL_write_ex2(s, buf, num, 0, written); +} + +int SSL_write_ex2(SSL *s, const void *buf, size_t num, uint64_t flags, + size_t *written) +{ + int ret = ssl_write_internal(s, buf, num, flags, written); if (ret < 0) ret = 0; @@ -2181,64 +2706,69 @@ int SSL_write_early_data(SSL *s, const void *buf, size_t num, size_t *written) int ret, early_data_state; size_t writtmp; uint32_t partialwrite; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); - switch (s->early_data_state) { + /* TODO(QUIC 0RTT): This will need special handling for QUIC */ + if (sc == NULL) + return 0; + + switch (sc->early_data_state) { case SSL_EARLY_DATA_NONE: - if (s->server + if (sc->server || !SSL_in_before(s) - || ((s->session == NULL || s->session->ext.max_early_data == 0) - && (s->psk_use_session_cb == NULL))) { + || ((sc->session == NULL || sc->session->ext.max_early_data == 0) + && (sc->psk_use_session_cb == NULL))) { ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); return 0; } /* fall through */ case SSL_EARLY_DATA_CONNECT_RETRY: - s->early_data_state = SSL_EARLY_DATA_CONNECTING; + sc->early_data_state = SSL_EARLY_DATA_CONNECTING; ret = SSL_connect(s); if (ret <= 0) { /* NBIO or error */ - s->early_data_state = SSL_EARLY_DATA_CONNECT_RETRY; + sc->early_data_state = SSL_EARLY_DATA_CONNECT_RETRY; return 0; } /* fall through */ case SSL_EARLY_DATA_WRITE_RETRY: - s->early_data_state = SSL_EARLY_DATA_WRITING; + sc->early_data_state = SSL_EARLY_DATA_WRITING; /* * We disable partial write for early data because we don't keep track * of how many bytes we've written between the SSL_write_ex() call and * the flush if the flush needs to be retried) */ - partialwrite = s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE; - s->mode &= ~SSL_MODE_ENABLE_PARTIAL_WRITE; + partialwrite = sc->mode & SSL_MODE_ENABLE_PARTIAL_WRITE; + sc->mode &= ~SSL_MODE_ENABLE_PARTIAL_WRITE; ret = SSL_write_ex(s, buf, num, &writtmp); - s->mode |= partialwrite; + sc->mode |= partialwrite; if (!ret) { - s->early_data_state = SSL_EARLY_DATA_WRITE_RETRY; + sc->early_data_state = SSL_EARLY_DATA_WRITE_RETRY; return ret; } - s->early_data_state = SSL_EARLY_DATA_WRITE_FLUSH; + sc->early_data_state = SSL_EARLY_DATA_WRITE_FLUSH; /* fall through */ case SSL_EARLY_DATA_WRITE_FLUSH: /* The buffering BIO is still in place so we need to flush it */ - if (statem_flush(s) != 1) + if (statem_flush(sc) != 1) return 0; *written = num; - s->early_data_state = SSL_EARLY_DATA_WRITE_RETRY; + sc->early_data_state = SSL_EARLY_DATA_WRITE_RETRY; return 1; case SSL_EARLY_DATA_FINISHED_READING: case SSL_EARLY_DATA_READ_RETRY: - early_data_state = s->early_data_state; + early_data_state = sc->early_data_state; /* We are a server writing to an unauthenticated client */ - s->early_data_state = SSL_EARLY_DATA_UNAUTH_WRITING; + sc->early_data_state = SSL_EARLY_DATA_UNAUTH_WRITING; ret = SSL_write_ex(s, buf, num, written); /* The buffering BIO is still in place */ if (ret) - (void)BIO_flush(s->wbio); - s->early_data_state = early_data_state; + (void)BIO_flush(sc->wbio); + sc->early_data_state = early_data_state; return ret; default: @@ -2255,14 +2785,23 @@ int SSL_shutdown(SSL *s) * calling it once is usually not enough, even if blocking I/O is used * (see ssl3_shutdown). */ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - if (s->handshake_func == NULL) { +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_conn_shutdown(s, 0, NULL, 0); +#endif + + if (sc == NULL) + return -1; + + if (sc->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_UNINITIALIZED); return -1; } if (!SSL_in_init(s)) { - if ((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { + if ((sc->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { struct ssl_async_args args; memset(&args, 0, sizeof(args)); @@ -2282,7 +2821,17 @@ int SSL_shutdown(SSL *s) int SSL_key_update(SSL *s, int updatetype) { - if (!SSL_IS_TLS13(s)) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_key_update(s, updatetype); +#endif + + if (sc == NULL) + return 0; + + if (!SSL_CONNECTION_IS_TLS13(sc)) { ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_SSL_VERSION); return 0; } @@ -2298,33 +2847,43 @@ int SSL_key_update(SSL *s, int updatetype) return 0; } - if (RECORD_LAYER_write_pending(&s->rlayer)) { + if (RECORD_LAYER_write_pending(&sc->rlayer)) { ERR_raise(ERR_LIB_SSL, SSL_R_BAD_WRITE_RETRY); return 0; } - ossl_statem_set_in_init(s, 1); - s->key_update = updatetype; + ossl_statem_set_in_init(sc, 1); + sc->key_update = updatetype; return 1; } int SSL_get_key_update_type(const SSL *s) { - return s->key_update; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_get_key_update_type(s); +#endif + + if (sc == NULL) + return 0; + + return sc->key_update; } /* * Can we accept a renegotiation request? If yes, set the flag and * return 1 if yes. If not, raise error and return 0. */ -static int can_renegotiate(const SSL *s) +static int can_renegotiate(const SSL_CONNECTION *sc) { - if (SSL_IS_TLS13(s)) { + if (SSL_CONNECTION_IS_TLS13(sc)) { ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_SSL_VERSION); return 0; } - if ((s->options & SSL_OP_NO_RENEGOTIATION) != 0) { + if ((sc->options & SSL_OP_NO_RENEGOTIATION) != 0) { ERR_raise(ERR_LIB_SSL, SSL_R_NO_RENEGOTIATION); return 0; } @@ -2334,153 +2893,203 @@ static int can_renegotiate(const SSL *s) int SSL_renegotiate(SSL *s) { - if (!can_renegotiate(s)) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) return 0; - s->renegotiate = 1; - s->new_session = 1; + if (!can_renegotiate(sc)) + return 0; + + sc->renegotiate = 1; + sc->new_session = 1; return s->method->ssl_renegotiate(s); } int SSL_renegotiate_abbreviated(SSL *s) { - if (!can_renegotiate(s)) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) return 0; - s->renegotiate = 1; - s->new_session = 0; + if (!can_renegotiate(sc)) + return 0; + + sc->renegotiate = 1; + sc->new_session = 0; return s->method->ssl_renegotiate(s); } int SSL_renegotiate_pending(const SSL *s) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) + return 0; + /* * becomes true when negotiation is requested; false again once a * handshake has finished */ - return (s->renegotiate != 0); + return (sc->renegotiate != 0); } int SSL_new_session_ticket(SSL *s) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + /* If we are in init because we're sending tickets, okay to send more. */ - if ((SSL_in_init(s) && s->ext.extra_tickets_expected == 0) - || SSL_IS_FIRST_HANDSHAKE(s) || !s->server - || !SSL_IS_TLS13(s)) + if ((SSL_in_init(s) && sc->ext.extra_tickets_expected == 0) + || SSL_IS_FIRST_HANDSHAKE(sc) || !sc->server + || !SSL_CONNECTION_IS_TLS13(sc)) return 0; - s->ext.extra_tickets_expected++; - if (!RECORD_LAYER_write_pending(&s->rlayer) && !SSL_in_init(s)) - ossl_statem_set_in_init(s, 1); + sc->ext.extra_tickets_expected++; + if (!RECORD_LAYER_write_pending(&sc->rlayer) && !SSL_in_init(s)) + ossl_statem_set_in_init(sc, 1); return 1; } long SSL_ctrl(SSL *s, int cmd, long larg, void *parg) { + return ossl_ctrl_internal(s, cmd, larg, parg, /*no_quic=*/0); +} + +long ossl_ctrl_internal(SSL *s, int cmd, long larg, void *parg, int no_quic) +{ long l; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + /* + * Routing of ctrl calls for QUIC is a little counterintuitive: + * + * - Firstly (no_quic=0), we pass the ctrl directly to our QUIC + * implementation in case it wants to handle the ctrl specially. + * + * - If our QUIC implementation does not care about the ctrl, it + * will reenter this function with no_quic=1 and we will try to handle + * it directly using the QCSO SSL object stub (not the handshake layer + * SSL object). This is important for e.g. the version configuration + * ctrls below, which must use s->defltmeth (and not sc->defltmeth). + * + * - If we don't handle a ctrl here specially, then processing is + * redirected to the handshake layer SSL object. + */ + if (!no_quic && IS_QUIC(s)) + return s->method->ssl_ctrl(s, cmd, larg, parg); + + if (sc == NULL) + return 0; switch (cmd) { case SSL_CTRL_GET_READ_AHEAD: - return RECORD_LAYER_get_read_ahead(&s->rlayer); + return RECORD_LAYER_get_read_ahead(&sc->rlayer); case SSL_CTRL_SET_READ_AHEAD: - l = RECORD_LAYER_get_read_ahead(&s->rlayer); - RECORD_LAYER_set_read_ahead(&s->rlayer, larg); + l = RECORD_LAYER_get_read_ahead(&sc->rlayer); + RECORD_LAYER_set_read_ahead(&sc->rlayer, larg); return l; - case SSL_CTRL_SET_MSG_CALLBACK_ARG: - s->msg_callback_arg = parg; - return 1; - case SSL_CTRL_MODE: - return (s->mode |= larg); + { + OSSL_PARAM options[2], *opts = options; + + sc->mode |= larg; + + *opts++ = OSSL_PARAM_construct_uint32(OSSL_LIBSSL_RECORD_LAYER_PARAM_MODE, + &sc->mode); + *opts = OSSL_PARAM_construct_end(); + + /* Ignore return value */ + sc->rlayer.rrlmethod->set_options(sc->rlayer.rrl, options); + + return sc->mode; + } case SSL_CTRL_CLEAR_MODE: - return (s->mode &= ~larg); + return (sc->mode &= ~larg); case SSL_CTRL_GET_MAX_CERT_LIST: - return (long)s->max_cert_list; + return (long)sc->max_cert_list; case SSL_CTRL_SET_MAX_CERT_LIST: if (larg < 0) return 0; - l = (long)s->max_cert_list; - s->max_cert_list = (size_t)larg; + l = (long)sc->max_cert_list; + sc->max_cert_list = (size_t)larg; return l; case SSL_CTRL_SET_MAX_SEND_FRAGMENT: if (larg < 512 || larg > SSL3_RT_MAX_PLAIN_LENGTH) return 0; #ifndef OPENSSL_NO_KTLS - if (s->wbio != NULL && BIO_get_ktls_send(s->wbio)) + if (sc->wbio != NULL && BIO_get_ktls_send(sc->wbio)) return 0; #endif /* OPENSSL_NO_KTLS */ - s->max_send_fragment = larg; - if (s->max_send_fragment < s->split_send_fragment) - s->split_send_fragment = s->max_send_fragment; + sc->max_send_fragment = larg; + if (sc->max_send_fragment < sc->split_send_fragment) + sc->split_send_fragment = sc->max_send_fragment; + sc->rlayer.wrlmethod->set_max_frag_len(sc->rlayer.wrl, larg); return 1; case SSL_CTRL_SET_SPLIT_SEND_FRAGMENT: - if ((size_t)larg > s->max_send_fragment || larg == 0) + if ((size_t)larg > sc->max_send_fragment || larg == 0) return 0; - s->split_send_fragment = larg; + sc->split_send_fragment = larg; return 1; case SSL_CTRL_SET_MAX_PIPELINES: if (larg < 1 || larg > SSL_MAX_PIPELINES) return 0; - s->max_pipelines = larg; - if (larg > 1) - RECORD_LAYER_set_read_ahead(&s->rlayer, 1); + sc->max_pipelines = larg; + if (sc->rlayer.rrlmethod->set_max_pipelines != NULL) + sc->rlayer.rrlmethod->set_max_pipelines(sc->rlayer.rrl, (size_t)larg); return 1; case SSL_CTRL_GET_RI_SUPPORT: - return s->s3.send_connection_binding; + return sc->s3.send_connection_binding; case SSL_CTRL_SET_RETRY_VERIFY: - s->rwstate = SSL_RETRY_VERIFY; + sc->rwstate = SSL_RETRY_VERIFY; return 1; case SSL_CTRL_CERT_FLAGS: - return (s->cert->cert_flags |= larg); + return (sc->cert->cert_flags |= larg); case SSL_CTRL_CLEAR_CERT_FLAGS: - return (s->cert->cert_flags &= ~larg); + return (sc->cert->cert_flags &= ~larg); case SSL_CTRL_GET_RAW_CIPHERLIST: if (parg) { - if (s->s3.tmp.ciphers_raw == NULL) + if (sc->s3.tmp.ciphers_raw == NULL) return 0; - *(unsigned char **)parg = s->s3.tmp.ciphers_raw; - return (int)s->s3.tmp.ciphers_rawlen; + *(unsigned char **)parg = sc->s3.tmp.ciphers_raw; + return (int)sc->s3.tmp.ciphers_rawlen; } else { return TLS_CIPHER_LEN; } case SSL_CTRL_GET_EXTMS_SUPPORT: - if (!s->session || SSL_in_init(s) || ossl_statem_get_in_handshake(s)) + if (!sc->session || SSL_in_init(s) || ossl_statem_get_in_handshake(sc)) return -1; - if (s->session->flags & SSL_SESS_FLAG_EXTMS) + if (sc->session->flags & SSL_SESS_FLAG_EXTMS) return 1; else return 0; case SSL_CTRL_SET_MIN_PROTO_VERSION: - return ssl_check_allowed_versions(larg, s->max_proto_version) - && ssl_set_version_bound(s->ctx->method->version, (int)larg, - &s->min_proto_version); + return ssl_check_allowed_versions(larg, sc->max_proto_version) + && ssl_set_version_bound(s->defltmeth->version, (int)larg, + &sc->min_proto_version); case SSL_CTRL_GET_MIN_PROTO_VERSION: - return s->min_proto_version; + return sc->min_proto_version; case SSL_CTRL_SET_MAX_PROTO_VERSION: - return ssl_check_allowed_versions(s->min_proto_version, larg) - && ssl_set_version_bound(s->ctx->method->version, (int)larg, - &s->max_proto_version); + return ssl_check_allowed_versions(sc->min_proto_version, larg) + && ssl_set_version_bound(s->defltmeth->version, (int)larg, + &sc->max_proto_version); case SSL_CTRL_GET_MAX_PROTO_VERSION: - return s->max_proto_version; + return sc->max_proto_version; default: - return s->method->ssl_ctrl(s, cmd, larg, parg); + if (IS_QUIC(s)) + return SSL_ctrl((SSL *)sc, cmd, larg, parg); + else + return s->method->ssl_ctrl(s, cmd, larg, parg); } } long SSL_callback_ctrl(SSL *s, int cmd, void (*fp) (void)) { - switch (cmd) { - case SSL_CTRL_SET_MSG_CALLBACK: - s->msg_callback = (void (*) - (int write_p, int version, int content_type, - const void *buf, size_t len, SSL *ssl, - void *arg))(fp); - return 1; - - default: - return s->method->ssl_callback_ctrl(s, cmd, fp); - } + return s->method->ssl_callback_ctrl(s, cmd, fp); } LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx) @@ -2502,14 +3111,15 @@ static int ssl_tsan_load(SSL_CTX *ctx, TSAN_QUALIFIER int *stat) long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) { long l; - /* For some cases with ctx == NULL perform syntax checks */ + + /* For some cases with ctx == NULL or larg == 1 perform syntax checks */ + if (cmd == SSL_CTRL_SET_GROUPS_LIST && larg == 1) + return tls1_set_groups_list(ctx, NULL, NULL, NULL, NULL, NULL, NULL, parg); if (ctx == NULL) { switch (cmd) { - case SSL_CTRL_SET_GROUPS_LIST: - return tls1_set_groups_list(ctx, NULL, NULL, parg); case SSL_CTRL_SET_SIGALGS_LIST: case SSL_CTRL_SET_CLIENT_SIGALGS_LIST: - return tls1_set_sigalgs_list(NULL, parg, 0); + return tls1_set_sigalgs_list(ctx, NULL, parg, 0); default: return 0; } @@ -2651,13 +3261,17 @@ int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap, return 0; } -/** return a STACK of the ciphers available for the SSL and in order of - * preference */ +/* + * return a STACK of the ciphers available for the SSL and in order of + * preference + */ STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s) { - if (s != NULL) { - if (s->cipher_list != NULL) { - return s->cipher_list; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc != NULL) { + if (sc->cipher_list != NULL) { + return sc->cipher_list; } else if ((s->ctx != NULL) && (s->ctx->cipher_list != NULL)) { return s->ctx->cipher_list; } @@ -2667,24 +3281,30 @@ STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s) STACK_OF(SSL_CIPHER) *SSL_get_client_ciphers(const SSL *s) { - if ((s == NULL) || !s->server) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL || !sc->server) return NULL; - return s->peer_ciphers; + return sc->peer_ciphers; } STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s) { STACK_OF(SSL_CIPHER) *sk = NULL, *ciphers; int i; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return NULL; ciphers = SSL_get_ciphers(s); if (!ciphers) return NULL; - if (!ssl_set_client_disabled(s)) + if (!ssl_set_client_disabled(sc)) return NULL; for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { const SSL_CIPHER *c = sk_SSL_CIPHER_value(ciphers, i); - if (!ssl_cipher_disabled(s, c, SSL_SECOP_CIPHER_SUPPORTED, 0)) { + if (!ssl_cipher_disabled(sc, c, SSL_SECOP_CIPHER_SUPPORTED, 0)) { if (!sk) sk = sk_SSL_CIPHER_new_null(); if (!sk) @@ -2700,14 +3320,14 @@ STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s) /** return a STACK of the ciphers available for the SSL and in order of * algorithm id */ -STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s) +STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL_CONNECTION *s) { if (s != NULL) { - if (s->cipher_list_by_id != NULL) { + if (s->cipher_list_by_id != NULL) return s->cipher_list_by_id; - } else if ((s->ctx != NULL) && (s->ctx->cipher_list_by_id != NULL)) { - return s->ctx->cipher_list_by_id; - } + else if (s->ssl.ctx != NULL + && s->ssl.ctx->cipher_list_by_id != NULL) + return s->ssl.ctx->cipher_list_by_id; } return NULL; } @@ -2775,7 +3395,7 @@ int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str) */ if (sk == NULL) return 0; - else if (cipher_list_tls12_num(sk) == 0) { + if (ctx->method->num_ciphers() > 0 && cipher_list_tls12_num(sk) == 0) { ERR_raise(ERR_LIB_SSL, SSL_R_NO_CIPHER_MATCH); return 0; } @@ -2786,14 +3406,20 @@ int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str) int SSL_set_cipher_list(SSL *s, const char *str) { STACK_OF(SSL_CIPHER) *sk; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + SSL_CTX *ctx; + + if (sc == NULL) + return 0; - sk = ssl_create_cipher_list(s->ctx, s->tls13_ciphersuites, - &s->cipher_list, &s->cipher_list_by_id, str, - s->cert); + ctx = s->ctx; + sk = ssl_create_cipher_list(ctx, sc->tls13_ciphersuites, + &sc->cipher_list, &sc->cipher_list_by_id, str, + sc->cert); /* see comment in SSL_CTX_set_cipher_list */ if (sk == NULL) return 0; - else if (cipher_list_tls12_num(sk) == 0) { + if (ctx->method->num_ciphers() > 0 && cipher_list_tls12_num(sk) == 0) { ERR_raise(ERR_LIB_SSL, SSL_R_NO_CIPHER_MATCH); return 0; } @@ -2806,14 +3432,18 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size) STACK_OF(SSL_CIPHER) *clntsk, *srvrsk; const SSL_CIPHER *c; int i; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; - if (!s->server - || s->peer_ciphers == NULL + if (!sc->server + || sc->peer_ciphers == NULL || size < 2) return NULL; p = buf; - clntsk = s->peer_ciphers; + clntsk = sc->peer_ciphers; srvrsk = SSL_get_ciphers(s); if (clntsk == NULL || srvrsk == NULL) return NULL; @@ -2851,16 +3481,23 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size) * - if we are before or during/after the handshake, * - if a resumption or normal handshake is being attempted/has occurred * - whether we have negotiated TLSv1.2 (or below) or TLSv1.3 - * + * * Note that only the host_name type is defined (RFC 3546). */ const char *SSL_get_servername(const SSL *s, const int type) { + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + int server; + + if (sc == NULL) + return NULL; + /* * If we don't know if we are the client or the server yet then we assume * client. */ - int server = s->handshake_func == NULL ? 0 : s->server; + server = sc->handshake_func == NULL ? 0 : sc->server; + if (type != TLSEXT_NAMETYPE_host_name) return NULL; @@ -2881,8 +3518,8 @@ const char *SSL_get_servername(const SSL *s, const int type) * - The function will return the servername requested by the client in * this handshake or NULL if none was requested. */ - if (s->hit && !SSL_IS_TLS13(s)) - return s->session->ext.hostname; + if (sc->hit && !SSL_CONNECTION_IS_TLS13(sc)) + return sc->session->ext.hostname; } else { /** * Client side @@ -2907,17 +3544,18 @@ const char *SSL_get_servername(const SSL *s, const int type) * (or NULL if it was not called). */ if (SSL_in_before(s)) { - if (s->ext.hostname == NULL - && s->session != NULL - && s->session->ssl_version != TLS1_3_VERSION) - return s->session->ext.hostname; + if (sc->ext.hostname == NULL + && sc->session != NULL + && sc->session->ssl_version != TLS1_3_VERSION) + return sc->session->ext.hostname; } else { - if (!SSL_IS_TLS13(s) && s->hit && s->session->ext.hostname != NULL) - return s->session->ext.hostname; + if (!SSL_CONNECTION_IS_TLS13(sc) && sc->hit + && sc->session->ext.hostname != NULL) + return sc->session->ext.hostname; } } - return s->ext.hostname; + return sc->ext.hostname; } int SSL_get_servername_type(const SSL *s) @@ -3014,11 +3652,20 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data, unsigned *len) { - *data = s->ext.npn; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) { + /* We have no other way to indicate error */ + *data = NULL; + *len = 0; + return; + } + + *data = sc->ext.npn; if (*data == NULL) { *len = 0; } else { - *len = (unsigned int)s->ext.npn_len; + *len = (unsigned int)sc->ext.npn_len; } } @@ -3036,6 +3683,10 @@ void SSL_CTX_set_npn_advertised_cb(SSL_CTX *ctx, SSL_CTX_npn_advertised_cb_func cb, void *arg) { + if (IS_QUIC_CTX(ctx)) + /* NPN not allowed for QUIC */ + return; + ctx->ext.npn_advertised_cb = cb; ctx->ext.npn_advertised_cb_arg = arg; } @@ -3054,6 +3705,10 @@ void SSL_CTX_set_npn_select_cb(SSL_CTX *ctx, SSL_CTX_npn_select_cb_func cb, void *arg) { + if (IS_QUIC_CTX(ctx)) + /* NPN not allowed for QUIC */ + return; + ctx->ext.npn_select_cb = cb; ctx->ext.npn_select_cb_arg = arg; } @@ -3093,10 +3748,8 @@ int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos, return 1; alpn = OPENSSL_memdup(protos, protos_len); - if (alpn == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + if (alpn == NULL) return 1; - } OPENSSL_free(ctx->ext.alpn); ctx->ext.alpn = alpn; ctx->ext.alpn_len = protos_len; @@ -3113,11 +3766,15 @@ int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos, unsigned int protos_len) { unsigned char *alpn; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return 1; if (protos_len == 0 || protos == NULL) { - OPENSSL_free(ssl->ext.alpn); - ssl->ext.alpn = NULL; - ssl->ext.alpn_len = 0; + OPENSSL_free(sc->ext.alpn); + sc->ext.alpn = NULL; + sc->ext.alpn_len = 0; return 0; } /* Not valid per RFC */ @@ -3125,13 +3782,11 @@ int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos, return 1; alpn = OPENSSL_memdup(protos, protos_len); - if (alpn == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + if (alpn == NULL) return 1; - } - OPENSSL_free(ssl->ext.alpn); - ssl->ext.alpn = alpn; - ssl->ext.alpn_len = protos_len; + OPENSSL_free(sc->ext.alpn); + sc->ext.alpn = alpn; + sc->ext.alpn_len = protos_len; return 0; } @@ -3158,11 +3813,20 @@ void SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx, void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data, unsigned int *len) { - *data = ssl->s3.alpn_selected; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl); + + if (sc == NULL) { + /* We have no other way to indicate error */ + *data = NULL; + *len = 0; + return; + } + + *data = sc->s3.alpn_selected; if (*data == NULL) *len = 0; else - *len = (unsigned int)ssl->s3.alpn_selected_len; + *len = (unsigned int)sc->s3.alpn_selected_len; } int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, @@ -3170,13 +3834,19 @@ int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, const unsigned char *context, size_t contextlen, int use_context) { - if (s->session == NULL - || (s->version < TLS1_VERSION && s->version != DTLS1_BAD_VER)) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) return -1; - return s->method->ssl3_enc->export_keying_material(s, out, olen, label, - llen, context, - contextlen, use_context); + if (sc->session == NULL + || (sc->version < TLS1_VERSION && sc->version != DTLS1_BAD_VER)) + return -1; + + return sc->ssl.method->ssl3_enc->export_keying_material(sc, out, olen, label, + llen, context, + contextlen, + use_context); } int SSL_export_keying_material_early(SSL *s, unsigned char *out, size_t olen, @@ -3184,10 +3854,15 @@ int SSL_export_keying_material_early(SSL *s, unsigned char *out, size_t olen, const unsigned char *context, size_t contextlen) { - if (s->version != TLS1_3_VERSION) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return -1; + + if (sc->version != TLS1_3_VERSION) return 0; - return tls13_export_keying_material_early(s, out, olen, label, llen, + return tls13_export_keying_material_early(sc, out, olen, label, llen, context, contextlen); } @@ -3227,6 +3902,75 @@ static int ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) return memcmp(a->session_id, b->session_id, a->session_id_length); } +#ifndef OPENSSL_NO_SSLKEYLOG +/** + * @brief Static initialization for a one-time action to initialize the SSL key log. + */ +static CRYPTO_ONCE ssl_keylog_once = CRYPTO_ONCE_STATIC_INIT; + +/** + * @brief Pointer to a read-write lock used to protect access to the key log. + */ +static CRYPTO_RWLOCK *keylog_lock = NULL; + +/** + * @brief Pointer to a BIO structure used for writing the key log information. + */ +static BIO *keylog_bio = NULL; + +/** + * @brief Initializes the SSLKEYLOGFILE lock. + * + * @return 1 on success, 0 on failure. + */ +DEFINE_RUN_ONCE_STATIC(ssl_keylog_init) +{ + keylog_lock = CRYPTO_THREAD_lock_new(); + if (keylog_lock == NULL) + return 0; + return 1; +} + +/** + * @brief checks when a BIO refcount has reached zero, and sets + * keylog_cb to NULL if it has + * + * @returns 1 always + */ +static long check_keylog_bio_free(BIO *b, int oper, const char *argp, + size_t len, int argi, long argl, int ret, + size_t *processed) +{ + + /* + * Note we _dont_ take the keylog_lock here + * This is intentional, because we only free the keylog lock + * During SSL_CTX_free, in which we already posess the lock, so + * Theres no need to grab it again here + */ + if (oper == BIO_CB_FREE) + keylog_bio = NULL; + return ret; +} + +/** + * @brief records ssl secrets to a file + */ +static void do_sslkeylogfile(const SSL *ssl, const char *line) +{ + if (keylog_lock == NULL) + return; + + if (!CRYPTO_THREAD_write_lock(keylog_lock)) + return; + if (keylog_bio != NULL) { + BIO_printf(keylog_bio, "%s\n", line); + (void)BIO_flush(keylog_bio); + } + CRYPTO_THREAD_unlock(keylog_lock); +} +#endif + /* * These wrapper functions should remain rather than redeclaring * SSL_SESSION_hash and SSL_SESSION_cmp for void* types and casting each @@ -3238,6 +3982,12 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, const SSL_METHOD *meth) { SSL_CTX *ret = NULL; +#ifndef OPENSSL_NO_SSLKEYLOG + const char *keylogfile = ossl_safe_getenv("SSLKEYLOGFILE"); +#endif +#ifndef OPENSSL_NO_COMP_ALG + int i; +#endif if (meth == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_NULL_SSL_METHOD_PASSED); @@ -3247,27 +3997,32 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, if (!OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL)) return NULL; + /* Doing this for the run once effect */ if (SSL_get_ex_data_X509_STORE_CTX_idx() < 0) { ERR_raise(ERR_LIB_SSL, SSL_R_X509_VERIFICATION_SETUP_PROBLEMS); goto err; } + ret = OPENSSL_zalloc(sizeof(*ret)); if (ret == NULL) - goto err; + return NULL; /* Init the reference counting before any call to SSL_CTX_free */ - ret->references = 1; - ret->lock = CRYPTO_THREAD_lock_new(); - if (ret->lock == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + if (!CRYPTO_NEW_REF(&ret->references, 1)) { OPENSSL_free(ret); return NULL; } + ret->lock = CRYPTO_THREAD_lock_new(); + if (ret->lock == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); + goto err; + } + #ifdef TSAN_REQUIRES_LOCKING ret->tsan_lock = CRYPTO_THREAD_lock_new(); if (ret->tsan_lock == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; } #endif @@ -3289,34 +4044,57 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, ret->session_timeout = meth->get_timeout(); ret->max_cert_list = SSL_MAX_CERT_LIST_DEFAULT; ret->verify_mode = SSL_VERIFY_NONE; - if ((ret->cert = ssl_cert_new()) == NULL) - goto err; ret->sessions = lh_SSL_SESSION_new(ssl_session_hash, ssl_session_cmp); - if (ret->sessions == NULL) + if (ret->sessions == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; + } ret->cert_store = X509_STORE_new(); - if (ret->cert_store == NULL) + if (ret->cert_store == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_X509_LIB); goto err; + } #ifndef OPENSSL_NO_CT ret->ctlog_store = CTLOG_STORE_new_ex(libctx, propq); - if (ret->ctlog_store == NULL) + if (ret->ctlog_store == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_CT_LIB); goto err; + } #endif /* initialize cipher/digest methods table */ - if (!ssl_load_ciphers(ret)) - goto err2; - /* initialise sig algs */ - if (!ssl_setup_sig_algs(ret)) - goto err2; + if (!ssl_load_ciphers(ret)) { + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); + goto err; + } + + if (!ssl_load_groups(ret)) { + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); + goto err; + } + /* load provider sigalgs */ + if (!ssl_load_sigalgs(ret)) { + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); + goto err; + } - if (!ssl_load_groups(ret)) - goto err2; + /* initialise sig algs */ + if (!ssl_setup_sigalgs(ret)) { + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); + goto err; + } + + if (!SSL_CTX_set_ciphersuites(ret, OSSL_default_ciphersuites())) { + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); + goto err; + } - if (!SSL_CTX_set_ciphersuites(ret, OSSL_default_ciphersuites())) + if ((ret->cert = ssl_cert_new(SSL_PKEY_NUM + ret->sigalg_list_len)) == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); goto err; + } if (!ssl_create_cipher_list(ret, ret->tls13_ciphersuites, @@ -3324,12 +4102,14 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, OSSL_default_cipher_list(), ret->cert) || sk_SSL_CIPHER_num(ret->cipher_list) <= 0) { ERR_raise(ERR_LIB_SSL, SSL_R_LIBRARY_HAS_NO_CIPHERS); - goto err2; + goto err; } ret->param = X509_VERIFY_PARAM_new(); - if (ret->param == NULL) + if (ret->param == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_X509_LIB); goto err; + } /* * If these aren't available from the provider we'll get NULL returns. @@ -3338,14 +4118,20 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, ret->md5 = ssl_evp_md_fetch(libctx, NID_md5, propq); ret->sha1 = ssl_evp_md_fetch(libctx, NID_sha1, propq); - if ((ret->ca_names = sk_X509_NAME_new_null()) == NULL) + if ((ret->ca_names = sk_X509_NAME_new_null()) == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; + } - if ((ret->client_ca_names = sk_X509_NAME_new_null()) == NULL) + if ((ret->client_ca_names = sk_X509_NAME_new_null()) == NULL) { + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; + } - if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_CTX, ret, &ret->ex_data)) + if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_CTX, ret, &ret->ex_data)) { + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; + } if ((ret->ext.secure = OPENSSL_secure_zalloc(sizeof(*ret->ext.secure))) == NULL) goto err; @@ -3367,12 +4153,16 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, ret->options |= SSL_OP_NO_TICKET; if (RAND_priv_bytes_ex(libctx, ret->ext.cookie_hmac_key, - sizeof(ret->ext.cookie_hmac_key), 0) <= 0) + sizeof(ret->ext.cookie_hmac_key), 0) <= 0) { + ERR_raise(ERR_LIB_SSL, ERR_R_RAND_LIB); goto err; + } #ifndef OPENSSL_NO_SRP - if (!ssl_ctx_srp_ctx_init_intern(ret)) + if (!ssl_ctx_srp_ctx_init_intern(ret)) { + ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB); goto err; + } #endif #ifndef OPENSSL_NO_ENGINE # ifdef OPENSSL_SSL_CLIENT_ENGINE_AUTO @@ -3392,6 +4182,21 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, } # endif #endif + +#ifndef OPENSSL_NO_COMP_ALG + /* + * Set the default order: brotli, zlib, zstd + * Including only those enabled algorithms + */ + memset(ret->cert_comp_prefs, 0, sizeof(ret->cert_comp_prefs)); + i = 0; + if (ossl_comp_has_alg(TLSEXT_comp_cert_brotli)) + ret->cert_comp_prefs[i++] = TLSEXT_comp_cert_brotli; + if (ossl_comp_has_alg(TLSEXT_comp_cert_zlib)) + ret->cert_comp_prefs[i++] = TLSEXT_comp_cert_zlib; + if (ossl_comp_has_alg(TLSEXT_comp_cert_zstd)) + ret->cert_comp_prefs[i++] = TLSEXT_comp_cert_zstd; +#endif /* * Disable compression by default to prevent CRIME. Applications can * re-enable compression by configuring @@ -3435,13 +4240,81 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq, /* By default we send two session tickets automatically in TLSv1.3 */ ret->num_tickets = 2; - ssl_ctx_system_config(ret); +# ifndef OPENSSL_NO_QUIC + /* only create a cache for client CTX-es */ + if (meth == OSSL_QUIC_client_method()) + if ((ret->tokencache = ossl_quic_new_token_store()) == NULL) + goto err; + ret->domain_flags = 0; + if (IS_QUIC_METHOD(meth)) { +# if defined(OPENSSL_THREADS) + if (meth == OSSL_QUIC_client_thread_method()) + ret->domain_flags + = SSL_DOMAIN_FLAG_MULTI_THREAD + | SSL_DOMAIN_FLAG_THREAD_ASSISTED + | SSL_DOMAIN_FLAG_BLOCKING; + else + ret->domain_flags + = SSL_DOMAIN_FLAG_MULTI_THREAD + | SSL_DOMAIN_FLAG_LEGACY_BLOCKING; +# else + ret->domain_flags + = SSL_DOMAIN_FLAG_SINGLE_THREAD + | SSL_DOMAIN_FLAG_LEGACY_BLOCKING; +# endif + } +# endif + if (!ssl_ctx_system_config(ret)) { + ERR_raise(ERR_LIB_SSL, SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG); + goto err; + } + +#ifndef OPENSSL_NO_SSLKEYLOG + if (keylogfile != NULL && strlen(keylogfile) != 0) { + /* Make sure we have a global lock allocated */ + if (!RUN_ONCE(&ssl_keylog_once, ssl_keylog_init)) { + /* use a trace message as a warning */ + OSSL_TRACE(TLS, "Unable to initalize keylog data\n"); + goto out; + } + + /* Grab our global lock */ + if (!CRYPTO_THREAD_write_lock(keylog_lock)) { + OSSL_TRACE(TLS, "Unable to acquire keylog write lock\n"); + goto out; + } else { + /* + * If the bio for the requested keylog file hasn't been + * created yet, go ahead and create it, and set it to append + * if its already there. + */ + if (keylog_bio == NULL) { + keylog_bio = BIO_new_file(keylogfile, "a"); + if (keylog_bio == NULL) { + OSSL_TRACE(TLS, "Unable to create keylog bio\n"); + goto out; + } + BIO_set_callback_ex(keylog_bio, check_keylog_bio_free); + } else { + /* up our refcount for the already-created case */ + BIO_up_ref(keylog_bio); + } + /* If we have a bio now, assign the callback handler */ + if (keylog_bio != NULL) + ret->do_sslkeylog = 1; + /* unlock, and we're done */ + CRYPTO_THREAD_unlock(keylog_lock); + } + } +out: +#endif return ret; err: - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); - err2: SSL_CTX_free(ret); +#ifndef OPENSSL_NO_SSLKEYLOG + BIO_free(keylog_bio); +#endif return NULL; } @@ -3454,10 +4327,10 @@ int SSL_CTX_up_ref(SSL_CTX *ctx) { int i; - if (CRYPTO_UP_REF(&ctx->references, &i, ctx->lock) <= 0) + if (CRYPTO_UP_REF(&ctx->references, &i) <= 0) return 0; - REF_PRINT_COUNT("SSL_CTX", ctx); + REF_PRINT_COUNT("SSL_CTX", i, ctx); REF_ASSERT_ISNT(i < 2); return ((i > 1) ? 1 : 0); } @@ -3470,12 +4343,21 @@ void SSL_CTX_free(SSL_CTX *a) if (a == NULL) return; - CRYPTO_DOWN_REF(&a->references, &i, a->lock); - REF_PRINT_COUNT("SSL_CTX", a); + CRYPTO_DOWN_REF(&a->references, &i); + REF_PRINT_COUNT("SSL_CTX", i, a); if (i > 0) return; REF_ASSERT_ISNT(i < 0); +#ifndef OPENSSL_NO_SSLKEYLOG + if (keylog_lock != NULL && CRYPTO_THREAD_write_lock(keylog_lock)) { + if (a->do_sslkeylog == 1) + BIO_free(keylog_bio); + a->do_sslkeylog = 0; + CRYPTO_THREAD_unlock(keylog_lock); + } +#endif + X509_VERIFY_PARAM_free(a->param); dane_ctx_final(&a->dane); @@ -3489,7 +4371,7 @@ void SSL_CTX_free(SSL_CTX *a) * (See ticket [openssl.org #212].) */ if (a->sessions != NULL) - SSL_CTX_flush_sessions(a, 0); + SSL_CTX_flush_sessions_ex(a, 0); CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL_CTX, a, &a->ex_data); lh_SSL_SESSION_free(a->sessions); @@ -3503,7 +4385,7 @@ void SSL_CTX_free(SSL_CTX *a) ssl_cert_free(a->cert); sk_X509_NAME_pop_free(a->ca_names, X509_NAME_free); sk_X509_NAME_pop_free(a->client_ca_names, X509_NAME_free); - sk_X509_pop_free(a->extra_certs, X509_free); + OSSL_STACK_OF_X509_free(a->extra_certs); a->comp_methods = NULL; #ifndef OPENSSL_NO_SRTP sk_SRTP_PROTECTION_PROFILE_free(a->srtp_profiles); @@ -3517,7 +4399,8 @@ void SSL_CTX_free(SSL_CTX *a) OPENSSL_free(a->ext.ecpointformats); OPENSSL_free(a->ext.supportedgroups); - OPENSSL_free(a->ext.supported_groups_default); + OPENSSL_free(a->ext.keyshares); + OPENSSL_free(a->ext.tuples); OPENSSL_free(a->ext.alpn); OPENSSL_secure_free(a->ext.secure); @@ -3534,15 +4417,40 @@ void SSL_CTX_free(SSL_CTX *a) OPENSSL_free(a->group_list[j].algorithm); } OPENSSL_free(a->group_list); + for (j = 0; j < a->sigalg_list_len; j++) { + OPENSSL_free(a->sigalg_list[j].name); + OPENSSL_free(a->sigalg_list[j].sigalg_name); + OPENSSL_free(a->sigalg_list[j].sigalg_oid); + OPENSSL_free(a->sigalg_list[j].sig_name); + OPENSSL_free(a->sigalg_list[j].sig_oid); + OPENSSL_free(a->sigalg_list[j].hash_name); + OPENSSL_free(a->sigalg_list[j].hash_oid); + OPENSSL_free(a->sigalg_list[j].keytype); + OPENSSL_free(a->sigalg_list[j].keytype_oid); + } + OPENSSL_free(a->sigalg_list); + OPENSSL_free(a->ssl_cert_info); OPENSSL_free(a->sigalg_lookup_cache); + OPENSSL_free(a->tls12_sigalgs); + + OPENSSL_free(a->client_cert_type); + OPENSSL_free(a->server_cert_type); CRYPTO_THREAD_lock_free(a->lock); + CRYPTO_FREE_REF(&a->references); #ifdef TSAN_REQUIRES_LOCKING CRYPTO_THREAD_lock_free(a->tsan_lock); #endif OPENSSL_free(a->propq); +#ifndef OPENSSL_NO_QLOG + OPENSSL_free(a->qlog_title); +#endif + +#ifndef OPENSSL_NO_QUIC + ossl_quic_free_token_store(a->tokencache); +#endif OPENSSL_free(a); } @@ -3569,22 +4477,42 @@ void *SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx) void SSL_set_default_passwd_cb(SSL *s, pem_password_cb *cb) { - s->default_passwd_callback = cb; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->default_passwd_callback = cb; } void SSL_set_default_passwd_cb_userdata(SSL *s, void *u) { - s->default_passwd_callback_userdata = u; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->default_passwd_callback_userdata = u; } pem_password_cb *SSL_get_default_passwd_cb(SSL *s) { - return s->default_passwd_callback; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return NULL; + + return sc->default_passwd_callback; } void *SSL_get_default_passwd_cb_userdata(SSL *s) { - return s->default_passwd_callback_userdata; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return NULL; + + return sc->default_passwd_callback_userdata; } void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx, @@ -3614,10 +4542,15 @@ void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb) (SSL *ssl, void *arg), void *arg) void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg) { - ssl_cert_set_cert_cb(s->cert, cb, arg); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + ssl_cert_set_cert_cb(sc->cert, cb, arg); } -void ssl_set_masks(SSL *s) +void ssl_set_masks(SSL_CONNECTION *s) { CERT *c = s->cert; uint32_t *pvalid = s->s3.tmp.valid_flags; @@ -3670,7 +4603,7 @@ void ssl_set_masks(SSL *s) if (rsa_enc || rsa_sign || (ssl_has_cert(s, SSL_PKEY_RSA_PSS_SIGN) && pvalid[SSL_PKEY_RSA_PSS_SIGN] & CERT_PKEY_EXPLICIT_SIGN - && TLS1_get_version(s) == TLS1_2_VERSION)) + && TLS1_get_version(&s->ssl) == TLS1_2_VERSION)) mask_a |= SSL_aRSA; if (dsa_sign) { @@ -3680,6 +4613,24 @@ void ssl_set_masks(SSL *s) mask_a |= SSL_aNULL; /* + * You can do anything with an RPK key, since there's no cert to restrict it + * But we need to check for private keys + */ + if (pvalid[SSL_PKEY_RSA] & CERT_PKEY_RPK) { + mask_a |= SSL_aRSA; + mask_k |= SSL_kRSA; + } + if (pvalid[SSL_PKEY_ECC] & CERT_PKEY_RPK) + mask_a |= SSL_aECDSA; + if (TLS1_get_version(&s->ssl) == TLS1_2_VERSION) { + if (pvalid[SSL_PKEY_RSA_PSS_SIGN] & CERT_PKEY_RPK) + mask_a |= SSL_aRSA; + if (pvalid[SSL_PKEY_ED25519] & CERT_PKEY_RPK + || pvalid[SSL_PKEY_ED448] & CERT_PKEY_RPK) + mask_a |= SSL_aECDSA; + } + + /* * An ECC certificate may be usable for ECDH and/or ECDSA cipher suites * depending on the key usage extension. */ @@ -3695,13 +4646,13 @@ void ssl_set_masks(SSL *s) /* Allow Ed25519 for TLS 1.2 if peer supports it */ if (!(mask_a & SSL_aECDSA) && ssl_has_cert(s, SSL_PKEY_ED25519) && pvalid[SSL_PKEY_ED25519] & CERT_PKEY_EXPLICIT_SIGN - && TLS1_get_version(s) == TLS1_2_VERSION) + && TLS1_get_version(&s->ssl) == TLS1_2_VERSION) mask_a |= SSL_aECDSA; /* Allow Ed448 for TLS 1.2 if peer supports it */ if (!(mask_a & SSL_aECDSA) && ssl_has_cert(s, SSL_PKEY_ED448) && pvalid[SSL_PKEY_ED448] & CERT_PKEY_EXPLICIT_SIGN - && TLS1_get_version(s) == TLS1_2_VERSION) + && TLS1_get_version(&s->ssl) == TLS1_2_VERSION) mask_a |= SSL_aECDSA; mask_k |= SSL_kECDHE; @@ -3721,7 +4672,7 @@ void ssl_set_masks(SSL *s) s->s3.tmp.mask_a = mask_a; } -int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s) +int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL_CONNECTION *s) { if (s->s3.tmp.new_cipher->algorithm_auth & SSL_aECDSA) { /* key usage, if present, must allow signing */ @@ -3733,7 +4684,8 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s) return 1; /* all checks are ok */ } -int ssl_get_server_cert_serverinfo(SSL *s, const unsigned char **serverinfo, +int ssl_get_server_cert_serverinfo(SSL_CONNECTION *s, + const unsigned char **serverinfo, size_t *serverinfo_length) { CERT_PKEY *cpk = s->s3.tmp.cert; @@ -3747,7 +4699,7 @@ int ssl_get_server_cert_serverinfo(SSL *s, const unsigned char **serverinfo, return 1; } -void ssl_update_cache(SSL *s, int mode) +void ssl_update_cache(SSL_CONNECTION *s, int mode) { int i; @@ -3774,7 +4726,7 @@ void ssl_update_cache(SSL *s, int mode) i = s->session_ctx->session_cache_mode; if ((i & mode) != 0 - && (!s->hit || SSL_IS_TLS13(s))) { + && (!s->hit || SSL_CONNECTION_IS_TLS13(s))) { /* * Add the session to the internal cache. In server side TLSv1.3 we * normally don't do this because by default it's a full stateless ticket @@ -3787,7 +4739,7 @@ void ssl_update_cache(SSL *s, int mode) * - SSL_OP_NO_TICKET is set in which case it is a stateful ticket */ if ((i & SSL_SESS_CACHE_NO_INTERNAL_STORE) == 0 - && (!SSL_IS_TLS13(s) + && (!SSL_CONNECTION_IS_TLS13(s) || !s->server || (s->max_early_data > 0 && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0) @@ -3800,9 +4752,9 @@ void ssl_update_cache(SSL *s, int mode) * TLSv1.3 without early data because some applications just want to * know about the creation of a session and aren't doing a full cache. */ - if (s->session_ctx->new_session_cb != NULL) { - SSL_SESSION_up_ref(s->session); - if (!s->session_ctx->new_session_cb(s, s->session)) + if (s->session_ctx->new_session_cb != NULL && SSL_SESSION_up_ref(s->session)) { + if (!s->session_ctx->new_session_cb(SSL_CONNECTION_GET_USER_SSL(s), + s->session)) SSL_SESSION_free(s->session); } } @@ -3816,7 +4768,7 @@ void ssl_update_cache(SSL *s, int mode) else stat = &s->session_ctx->stats.sess_accept_good; if ((ssl_tsan_load(s->session_ctx, stat) & 0xff) == 0xff) - SSL_CTX_flush_sessions(s->session_ctx, (unsigned long)time(NULL)); + SSL_CTX_flush_sessions_ex(s->session_ctx, time(NULL)); } } @@ -3833,93 +4785,126 @@ const SSL_METHOD *SSL_get_ssl_method(const SSL *s) int SSL_set_ssl_method(SSL *s, const SSL_METHOD *meth) { int ret = 1; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + /* Not allowed for QUIC */ + if (sc == NULL + || (s->type != SSL_TYPE_SSL_CONNECTION && s->method != meth) + || (s->type == SSL_TYPE_SSL_CONNECTION && IS_QUIC_METHOD(meth))) + return 0; if (s->method != meth) { const SSL_METHOD *sm = s->method; - int (*hf) (SSL *) = s->handshake_func; + int (*hf) (SSL *) = sc->handshake_func; if (sm->version == meth->version) s->method = meth; else { - sm->ssl_free(s); + sm->ssl_deinit(s); s->method = meth; - ret = s->method->ssl_new(s); + ret = s->method->ssl_init(s); } if (hf == sm->ssl_connect) - s->handshake_func = meth->ssl_connect; + sc->handshake_func = meth->ssl_connect; else if (hf == sm->ssl_accept) - s->handshake_func = meth->ssl_accept; + sc->handshake_func = meth->ssl_accept; } return ret; } int SSL_get_error(const SSL *s, int i) { + return ossl_ssl_get_error(s, i, /*check_err=*/1); +} + +int ossl_ssl_get_error(const SSL *s, int i, int check_err) +{ int reason; unsigned long l; BIO *bio; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); if (i > 0) return SSL_ERROR_NONE; +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) { + reason = ossl_quic_get_error(s, i); + if (reason != SSL_ERROR_NONE) + return reason; + } +#endif + + if (sc == NULL) + return SSL_ERROR_SSL; + /* * Make things return SSL_ERROR_SYSCALL when doing SSL_do_handshake etc, * where we do encode the error */ - if ((l = ERR_peek_error()) != 0) { + if (check_err && (l = ERR_peek_error()) != 0) { if (ERR_GET_LIB(l) == ERR_LIB_SYS) return SSL_ERROR_SYSCALL; else return SSL_ERROR_SSL; } - if (SSL_want_read(s)) { - bio = SSL_get_rbio(s); - if (BIO_should_read(bio)) - return SSL_ERROR_WANT_READ; - else if (BIO_should_write(bio)) - /* - * This one doesn't make too much sense ... We never try to write - * to the rbio, and an application program where rbio and wbio - * are separate couldn't even know what it should wait for. - * However if we ever set s->rwstate incorrectly (so that we have - * SSL_want_read(s) instead of SSL_want_write(s)) and rbio and - * wbio *are* the same, this test works around that bug; so it - * might be safer to keep it. - */ - return SSL_ERROR_WANT_WRITE; - else if (BIO_should_io_special(bio)) { - reason = BIO_get_retry_reason(bio); - if (reason == BIO_RR_CONNECT) - return SSL_ERROR_WANT_CONNECT; - else if (reason == BIO_RR_ACCEPT) - return SSL_ERROR_WANT_ACCEPT; - else - return SSL_ERROR_SYSCALL; /* unknown */ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) +#endif + { + if (SSL_want_read(s)) { + bio = SSL_get_rbio(s); + if (BIO_should_read(bio)) + return SSL_ERROR_WANT_READ; + else if (BIO_should_write(bio)) + /* + * This one doesn't make too much sense ... We never try to + * write to the rbio, and an application program where rbio and + * wbio are separate couldn't even know what it should wait for. + * However if we ever set s->rwstate incorrectly (so that we + * have SSL_want_read(s) instead of SSL_want_write(s)) and rbio + * and wbio *are* the same, this test works around that bug; so + * it might be safer to keep it. + */ + return SSL_ERROR_WANT_WRITE; + else if (BIO_should_io_special(bio)) { + reason = BIO_get_retry_reason(bio); + if (reason == BIO_RR_CONNECT) + return SSL_ERROR_WANT_CONNECT; + else if (reason == BIO_RR_ACCEPT) + return SSL_ERROR_WANT_ACCEPT; + else + return SSL_ERROR_SYSCALL; /* unknown */ + } } - } - if (SSL_want_write(s)) { - /* Access wbio directly - in order to use the buffered bio if present */ - bio = s->wbio; - if (BIO_should_write(bio)) - return SSL_ERROR_WANT_WRITE; - else if (BIO_should_read(bio)) + if (SSL_want_write(s)) { /* - * See above (SSL_want_read(s) with BIO_should_write(bio)) + * Access wbio directly - in order to use the buffered bio if + * present */ - return SSL_ERROR_WANT_READ; - else if (BIO_should_io_special(bio)) { - reason = BIO_get_retry_reason(bio); - if (reason == BIO_RR_CONNECT) - return SSL_ERROR_WANT_CONNECT; - else if (reason == BIO_RR_ACCEPT) - return SSL_ERROR_WANT_ACCEPT; - else - return SSL_ERROR_SYSCALL; + bio = sc->wbio; + if (BIO_should_write(bio)) + return SSL_ERROR_WANT_WRITE; + else if (BIO_should_read(bio)) + /* + * See above (SSL_want_read(s) with BIO_should_write(bio)) + */ + return SSL_ERROR_WANT_READ; + else if (BIO_should_io_special(bio)) { + reason = BIO_get_retry_reason(bio); + if (reason == BIO_RR_CONNECT) + return SSL_ERROR_WANT_CONNECT; + else if (reason == BIO_RR_ACCEPT) + return SSL_ERROR_WANT_ACCEPT; + else + return SSL_ERROR_SYSCALL; + } } } + if (SSL_want_x509_lookup(s)) return SSL_ERROR_WANT_X509_LOOKUP; if (SSL_want_retry_verify(s)) @@ -3931,8 +4916,8 @@ int SSL_get_error(const SSL *s, int i) if (SSL_want_client_hello_cb(s)) return SSL_ERROR_WANT_CLIENT_HELLO_CB; - if ((s->shutdown & SSL_RECEIVED_SHUTDOWN) && - (s->s3.warn_alert == SSL_AD_CLOSE_NOTIFY)) + if ((sc->shutdown & SSL_RECEIVED_SHUTDOWN) && + (sc->s3.warn_alert == SSL_AD_CLOSE_NOTIFY)) return SSL_ERROR_ZERO_RETURN; return SSL_ERROR_SYSCALL; @@ -3940,30 +4925,38 @@ int SSL_get_error(const SSL *s, int i) static int ssl_do_handshake_intern(void *vargs) { - struct ssl_async_args *args; - SSL *s; + struct ssl_async_args *args = (struct ssl_async_args *)vargs; + SSL *s = args->s; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - args = (struct ssl_async_args *)vargs; - s = args->s; + if (sc == NULL) + return -1; - return s->handshake_func(s); + return sc->handshake_func(s); } int SSL_do_handshake(SSL *s) { int ret = 1; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); - if (s->handshake_func == NULL) { +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_do_handshake(s); +#endif + + if (sc->handshake_func == NULL) { ERR_raise(ERR_LIB_SSL, SSL_R_CONNECTION_TYPE_NOT_SET); return -1; } - ossl_statem_check_finish_init(s, -1); + if (!ossl_statem_check_finish_init(sc, -1)) + return -1; s->method->ssl_renegotiate_check(s, 0); if (SSL_in_init(s) || SSL_in_before(s)) { - if ((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { + if ((sc->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) { struct ssl_async_args args; memset(&args, 0, sizeof(args)); @@ -3971,28 +4964,49 @@ int SSL_do_handshake(SSL *s) ret = ssl_start_async_job(s, &args, ssl_do_handshake_intern); } else { - ret = s->handshake_func(s); + ret = sc->handshake_func(s); } } + return ret; } void SSL_set_accept_state(SSL *s) { - s->server = 1; - s->shutdown = 0; - ossl_statem_clear(s); - s->handshake_func = s->method->ssl_accept; - clear_ciphers(s); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) { + ossl_quic_set_accept_state(s); + return; + } +#endif + + sc->server = 1; + sc->shutdown = 0; + ossl_statem_clear(sc); + sc->handshake_func = s->method->ssl_accept; + /* Ignore return value. Its a void public API function */ + RECORD_LAYER_reset(&sc->rlayer); } void SSL_set_connect_state(SSL *s) { - s->server = 0; - s->shutdown = 0; - ossl_statem_clear(s); - s->handshake_func = s->method->ssl_connect; - clear_ciphers(s); + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) { + ossl_quic_set_connect_state(s); + return; + } +#endif + + sc->server = 0; + sc->shutdown = 0; + ossl_statem_clear(sc); + sc->handshake_func = s->method->ssl_connect; + /* Ignore return value. Its a void public API function */ + RECORD_LAYER_reset(&sc->rlayer); } int ssl_undefined_function(SSL *s) @@ -4007,21 +5021,9 @@ int ssl_undefined_void_function(void) return 0; } -int ssl_undefined_const_function(const SSL *s) -{ - return 0; -} - -const SSL_METHOD *ssl_bad_method(int ver) -{ - ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - return NULL; -} - const char *ssl_protocol_to_string(int version) { - switch(version) - { + switch (version) { case TLS1_3_VERSION: return "TLSv1.3"; @@ -4053,7 +5055,33 @@ const char *ssl_protocol_to_string(int version) const char *SSL_get_version(const SSL *s) { - return ssl_protocol_to_string(s->version); + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + /* We only support QUICv1 - so if its QUIC its QUICv1 */ + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) + return "QUICv1"; +#endif + + if (sc == NULL) + return NULL; + + return ssl_protocol_to_string(sc->version); +} + +__owur int SSL_get_handshake_rtt(const SSL *s, uint64_t *rtt) +{ + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return -1; + if (sc->ts_msg_write.t <= 0 || sc->ts_msg_read.t <= 0) + return 0; /* data not (yet) available */ + if (sc->ts_msg_read.t < sc->ts_msg_write.t) + return -1; + + *rtt = ossl_time2us(ossl_time_subtract(sc->ts_msg_read, sc->ts_msg_write)); + return 1; } static int dup_ca_names(STACK_OF(X509_NAME) **dst, STACK_OF(X509_NAME) *src) @@ -4090,10 +5118,16 @@ SSL *SSL_dup(SSL *s) { SSL *ret; int i; + /* TODO(QUIC FUTURE): Add an SSL_METHOD function for duplication */ + SSL_CONNECTION *retsc; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) + return NULL; /* If we're not quiescent, just up_ref! */ if (!SSL_in_init(s) || !SSL_in_before(s)) { - CRYPTO_UP_REF(&s->references, &i, s->lock); + CRYPTO_UP_REF(&s->references, &i); return s; } @@ -4102,8 +5136,10 @@ SSL *SSL_dup(SSL *s) */ if ((ret = SSL_new(SSL_get_SSL_CTX(s))) == NULL) return NULL; + if ((retsc = SSL_CONNECTION_FROM_SSL_ONLY(ret)) == NULL) + goto err; - if (s->session != NULL) { + if (sc->session != NULL) { /* * Arranges to share the same session via up_ref. This "copies" * session-id, SSL_METHOD, sid_ctx, and 'cert' @@ -4120,32 +5156,32 @@ SSL *SSL_dup(SSL *s) if (!SSL_set_ssl_method(ret, s->method)) goto err; - if (s->cert != NULL) { - ssl_cert_free(ret->cert); - ret->cert = ssl_cert_dup(s->cert); - if (ret->cert == NULL) + if (sc->cert != NULL) { + ssl_cert_free(retsc->cert); + retsc->cert = ssl_cert_dup(sc->cert); + if (retsc->cert == NULL) goto err; } - if (!SSL_set_session_id_context(ret, s->sid_ctx, - (int)s->sid_ctx_length)) + if (!SSL_set_session_id_context(ret, sc->sid_ctx, + (int)sc->sid_ctx_length)) goto err; } - if (!ssl_dane_dup(ret, s)) + if (!ssl_dane_dup(retsc, sc)) goto err; - ret->version = s->version; - ret->options = s->options; - ret->min_proto_version = s->min_proto_version; - ret->max_proto_version = s->max_proto_version; - ret->mode = s->mode; + retsc->version = sc->version; + retsc->options = sc->options; + retsc->min_proto_version = sc->min_proto_version; + retsc->max_proto_version = sc->max_proto_version; + retsc->mode = sc->mode; SSL_set_max_cert_list(ret, SSL_get_max_cert_list(s)); SSL_set_read_ahead(ret, SSL_get_read_ahead(s)); - ret->msg_callback = s->msg_callback; - ret->msg_callback_arg = s->msg_callback_arg; + retsc->msg_callback = sc->msg_callback; + retsc->msg_callback_arg = sc->msg_callback_arg; SSL_set_verify(ret, SSL_get_verify_mode(s), SSL_get_verify_callback(s)); SSL_set_verify_depth(ret, SSL_get_verify_depth(s)); - ret->generate_session_id = s->generate_session_id; + retsc->generate_session_id = sc->generate_session_id; SSL_set_info_callback(ret, SSL_get_info_callback(s)); @@ -4153,34 +5189,34 @@ SSL *SSL_dup(SSL *s) if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_SSL, &ret->ex_data, &s->ex_data)) goto err; - ret->server = s->server; - if (s->handshake_func) { - if (s->server) + retsc->server = sc->server; + if (sc->handshake_func) { + if (sc->server) SSL_set_accept_state(ret); else SSL_set_connect_state(ret); } - ret->shutdown = s->shutdown; - ret->hit = s->hit; + retsc->shutdown = sc->shutdown; + retsc->hit = sc->hit; - ret->default_passwd_callback = s->default_passwd_callback; - ret->default_passwd_callback_userdata = s->default_passwd_callback_userdata; + retsc->default_passwd_callback = sc->default_passwd_callback; + retsc->default_passwd_callback_userdata = sc->default_passwd_callback_userdata; - X509_VERIFY_PARAM_inherit(ret->param, s->param); + X509_VERIFY_PARAM_inherit(retsc->param, sc->param); /* dup the cipher_list and cipher_list_by_id stacks */ - if (s->cipher_list != NULL) { - if ((ret->cipher_list = sk_SSL_CIPHER_dup(s->cipher_list)) == NULL) + if (sc->cipher_list != NULL) { + if ((retsc->cipher_list = sk_SSL_CIPHER_dup(sc->cipher_list)) == NULL) goto err; } - if (s->cipher_list_by_id != NULL) - if ((ret->cipher_list_by_id = sk_SSL_CIPHER_dup(s->cipher_list_by_id)) + if (sc->cipher_list_by_id != NULL) + if ((retsc->cipher_list_by_id = sk_SSL_CIPHER_dup(sc->cipher_list_by_id)) == NULL) goto err; /* Dup the client_CA list */ - if (!dup_ca_names(&ret->ca_names, s->ca_names) - || !dup_ca_names(&ret->client_ca_names, s->client_ca_names)) + if (!dup_ca_names(&retsc->ca_names, sc->ca_names) + || !dup_ca_names(&retsc->client_ca_names, sc->client_ca_names)) goto err; return ret; @@ -4190,36 +5226,28 @@ SSL *SSL_dup(SSL *s) return NULL; } -void ssl_clear_cipher_ctx(SSL *s) -{ - if (s->enc_read_ctx != NULL) { - EVP_CIPHER_CTX_free(s->enc_read_ctx); - s->enc_read_ctx = NULL; - } - if (s->enc_write_ctx != NULL) { - EVP_CIPHER_CTX_free(s->enc_write_ctx); - s->enc_write_ctx = NULL; - } -#ifndef OPENSSL_NO_COMP - COMP_CTX_free(s->expand); - s->expand = NULL; - COMP_CTX_free(s->compress); - s->compress = NULL; -#endif -} - X509 *SSL_get_certificate(const SSL *s) { - if (s->cert != NULL) - return s->cert->key->x509; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return NULL; + + if (sc->cert != NULL) + return sc->cert->key->x509; else return NULL; } EVP_PKEY *SSL_get_privatekey(const SSL *s) { - if (s->cert != NULL) - return s->cert->key->privatekey; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + if (sc->cert != NULL) + return sc->cert->key->privatekey; else return NULL; } @@ -4242,20 +5270,35 @@ EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx) const SSL_CIPHER *SSL_get_current_cipher(const SSL *s) { - if ((s->session != NULL) && (s->session->cipher != NULL)) - return s->session->cipher; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + if ((sc->session != NULL) && (sc->session->cipher != NULL)) + return sc->session->cipher; return NULL; } const SSL_CIPHER *SSL_get_pending_cipher(const SSL *s) { - return s->s3.tmp.new_cipher; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + return sc->s3.tmp.new_cipher; } const COMP_METHOD *SSL_get_current_compression(const SSL *s) { #ifndef OPENSSL_NO_COMP - return s->compress ? COMP_CTX_get_method(s->compress) : NULL; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(s); + + if (sc == NULL) + return NULL; + + return sc->rlayer.wrlmethod->get_compression(sc->rlayer.wrl); #else return NULL; #endif @@ -4264,13 +5307,18 @@ const COMP_METHOD *SSL_get_current_compression(const SSL *s) const COMP_METHOD *SSL_get_current_expansion(const SSL *s) { #ifndef OPENSSL_NO_COMP - return s->expand ? COMP_CTX_get_method(s->expand) : NULL; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(s); + + if (sc == NULL) + return NULL; + + return sc->rlayer.rrlmethod->get_compression(sc->rlayer.rrl); #else return NULL; #endif } -int ssl_init_wbio_buffer(SSL *s) +int ssl_init_wbio_buffer(SSL_CONNECTION *s) { BIO *bbio; @@ -4288,16 +5336,20 @@ int ssl_init_wbio_buffer(SSL *s) s->bbio = bbio; s->wbio = BIO_push(bbio, s->wbio); + s->rlayer.wrlmethod->set1_bio(s->rlayer.wrl, s->wbio); + return 1; } -int ssl_free_wbio_buffer(SSL *s) +int ssl_free_wbio_buffer(SSL_CONNECTION *s) { /* callers ensure s is never null */ if (s->bbio == NULL) return 1; s->wbio = BIO_pop(s->wbio); + s->rlayer.wrlmethod->set1_bio(s->rlayer.wrl, s->wbio); + BIO_free(s->bbio); s->bbio = NULL; @@ -4316,32 +5368,81 @@ int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx) void SSL_set_quiet_shutdown(SSL *s, int mode) { - s->quiet_shutdown = mode; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + /* Not supported with QUIC */ + if (sc == NULL) + return; + + sc->quiet_shutdown = mode; } int SSL_get_quiet_shutdown(const SSL *s) { - return s->quiet_shutdown; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(s); + + /* Not supported with QUIC */ + if (sc == NULL) + return 0; + + return sc->quiet_shutdown; } void SSL_set_shutdown(SSL *s, int mode) { - s->shutdown = mode; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + /* Not supported with QUIC */ + if (sc == NULL) + return; + + sc->shutdown = mode; } int SSL_get_shutdown(const SSL *s) { - return s->shutdown; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL_ONLY(s); + +#ifndef OPENSSL_NO_QUIC + /* QUIC: Just indicate whether the connection was shutdown cleanly. */ + if (IS_QUIC(s)) + return ossl_quic_get_shutdown(s); +#endif + + if (sc == NULL) + return 0; + + return sc->shutdown; } int SSL_version(const SSL *s) { - return s->version; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + /* We only support QUICv1 - so if its QUIC its QUICv1 */ + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) + return OSSL_QUIC1_VERSION; +#endif + if (sc == NULL) + return 0; + + return sc->version; } int SSL_client_version(const SSL *s) { - return s->client_version; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + /* We only support QUICv1 - so if its QUIC its QUICv1 */ + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) + return OSSL_QUIC1_VERSION; +#endif + if (sc == NULL) + return 0; + + return sc->client_version; } SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl) @@ -4352,29 +5453,30 @@ SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl) SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx) { CERT *new_cert; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(ssl); + + /* TODO(QUIC FUTURE): Add support for QUIC */ + if (sc == NULL) + return NULL; + if (ssl->ctx == ctx) return ssl->ctx; if (ctx == NULL) - ctx = ssl->session_ctx; + ctx = sc->session_ctx; new_cert = ssl_cert_dup(ctx->cert); - if (new_cert == NULL) { - return NULL; - } - - if (!custom_exts_copy_flags(&new_cert->custext, &ssl->cert->custext)) { - ssl_cert_free(new_cert); - return NULL; - } - - ssl_cert_free(ssl->cert); - ssl->cert = new_cert; + if (new_cert == NULL) + goto err; + if (!custom_exts_copy_flags(&new_cert->custext, &sc->cert->custext)) + goto err; /* * Program invariant: |sid_ctx| has fixed size (SSL_MAX_SID_CTX_LENGTH), * so setter APIs must prevent invalid lengths from entering the system. */ - if (!ossl_assert(ssl->sid_ctx_length <= sizeof(ssl->sid_ctx))) - return NULL; + if (!ossl_assert(sc->sid_ctx_length <= sizeof(sc->sid_ctx))) + goto err; + if (!SSL_CTX_up_ref(ctx)) + goto err; /* * If the session ID context matches that of the parent SSL_CTX, @@ -4383,17 +5485,22 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx) * leave it unchanged. */ if ((ssl->ctx != NULL) && - (ssl->sid_ctx_length == ssl->ctx->sid_ctx_length) && - (memcmp(ssl->sid_ctx, ssl->ctx->sid_ctx, ssl->sid_ctx_length) == 0)) { - ssl->sid_ctx_length = ctx->sid_ctx_length; - memcpy(&ssl->sid_ctx, &ctx->sid_ctx, sizeof(ssl->sid_ctx)); + (sc->sid_ctx_length == ssl->ctx->sid_ctx_length) && + (memcmp(sc->sid_ctx, ssl->ctx->sid_ctx, sc->sid_ctx_length) == 0)) { + sc->sid_ctx_length = ctx->sid_ctx_length; + memcpy(&sc->sid_ctx, &ctx->sid_ctx, sizeof(sc->sid_ctx)); } - SSL_CTX_up_ref(ctx); + ssl_cert_free(sc->cert); + sc->cert = new_cert; SSL_CTX_free(ssl->ctx); /* decrement reference count */ ssl->ctx = ctx; return ssl->ctx; + +err: + ssl_cert_free(new_cert); + return NULL; } int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx) @@ -4489,7 +5596,12 @@ int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, void SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val)) { - ssl->info_callback = cb; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return; + + sc->info_callback = cb; } /* @@ -4499,36 +5611,61 @@ void SSL_set_info_callback(SSL *ssl, void (*SSL_get_info_callback(const SSL *ssl)) (const SSL * /* ssl */ , int /* type */ , int /* val */ ) { - return ssl->info_callback; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl); + + if (sc == NULL) + return NULL; + + return sc->info_callback; } void SSL_set_verify_result(SSL *ssl, long arg) { - ssl->verify_result = arg; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return; + + sc->verify_result = arg; } long SSL_get_verify_result(const SSL *ssl) { - return ssl->verify_result; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl); + + if (sc == NULL) + return 0; + + return sc->verify_result; } size_t SSL_get_client_random(const SSL *ssl, unsigned char *out, size_t outlen) { + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl); + + if (sc == NULL) + return 0; + if (outlen == 0) - return sizeof(ssl->s3.client_random); - if (outlen > sizeof(ssl->s3.client_random)) - outlen = sizeof(ssl->s3.client_random); - memcpy(out, ssl->s3.client_random, outlen); + return sizeof(sc->s3.client_random); + if (outlen > sizeof(sc->s3.client_random)) + outlen = sizeof(sc->s3.client_random); + memcpy(out, sc->s3.client_random, outlen); return outlen; } size_t SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen) { + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl); + + if (sc == NULL) + return 0; + if (outlen == 0) - return sizeof(ssl->s3.server_random); - if (outlen > sizeof(ssl->s3.server_random)) - outlen = sizeof(ssl->s3.server_random); - memcpy(out, ssl->s3.server_random, outlen); + return sizeof(sc->s3.server_random); + if (outlen > sizeof(sc->s3.server_random)) + outlen = sizeof(sc->s3.server_random); + memcpy(out, sc->s3.server_random, outlen); return outlen; } @@ -4588,14 +5725,25 @@ void SSL_CTX_set_cert_store(SSL_CTX *ctx, X509_STORE *store) void SSL_CTX_set1_cert_store(SSL_CTX *ctx, X509_STORE *store) { - if (store != NULL) - X509_STORE_up_ref(store); + if (store != NULL && !X509_STORE_up_ref(store)) + return; + SSL_CTX_set_cert_store(ctx, store); } int SSL_want(const SSL *s) { - return s->rwstate; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_want(s); +#endif + + if (sc == NULL) + return SSL_NOTHING; + + return sc->rwstate; } #ifndef OPENSSL_NO_PSK @@ -4617,40 +5765,53 @@ int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint) int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint) { - if (s == NULL) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) return 0; if (identity_hint != NULL && strlen(identity_hint) > PSK_MAX_IDENTITY_LEN) { ERR_raise(ERR_LIB_SSL, SSL_R_DATA_LENGTH_TOO_LONG); return 0; } - OPENSSL_free(s->cert->psk_identity_hint); + OPENSSL_free(sc->cert->psk_identity_hint); if (identity_hint != NULL) { - s->cert->psk_identity_hint = OPENSSL_strdup(identity_hint); - if (s->cert->psk_identity_hint == NULL) + sc->cert->psk_identity_hint = OPENSSL_strdup(identity_hint); + if (sc->cert->psk_identity_hint == NULL) return 0; } else - s->cert->psk_identity_hint = NULL; + sc->cert->psk_identity_hint = NULL; return 1; } const char *SSL_get_psk_identity_hint(const SSL *s) { - if (s == NULL || s->session == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL || sc->session == NULL) return NULL; - return s->session->psk_identity_hint; + + return sc->session->psk_identity_hint; } const char *SSL_get_psk_identity(const SSL *s) { - if (s == NULL || s->session == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL || sc->session == NULL) return NULL; - return s->session->psk_identity; + + return sc->session->psk_identity; } void SSL_set_psk_client_callback(SSL *s, SSL_psk_client_cb_func cb) { - s->psk_client_callback = cb; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->psk_client_callback = cb; } void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, SSL_psk_client_cb_func cb) @@ -4660,7 +5821,12 @@ void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, SSL_psk_client_cb_func cb) void SSL_set_psk_server_callback(SSL *s, SSL_psk_server_cb_func cb) { - s->psk_server_callback = cb; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->psk_server_callback = cb; } void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx, SSL_psk_server_cb_func cb) @@ -4671,7 +5837,12 @@ void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx, SSL_psk_server_cb_func cb) void SSL_set_psk_find_session_callback(SSL *s, SSL_psk_find_session_cb_func cb) { - s->psk_find_session_cb = cb; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->psk_find_session_cb = cb; } void SSL_CTX_set_psk_find_session_callback(SSL_CTX *ctx, @@ -4682,7 +5853,12 @@ void SSL_CTX_set_psk_find_session_callback(SSL_CTX *ctx, void SSL_set_psk_use_session_callback(SSL *s, SSL_psk_use_session_cb_func cb) { - s->psk_use_session_cb = cb; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->psk_use_session_cb = cb; } void SSL_CTX_set_psk_use_session_callback(SSL_CTX *ctx, @@ -4741,27 +5917,48 @@ void *SSL_CTX_get_record_padding_callback_arg(const SSL_CTX *ctx) return ctx->record_padding_arg; } -int SSL_CTX_set_block_padding(SSL_CTX *ctx, size_t block_size) +int SSL_CTX_set_block_padding_ex(SSL_CTX *ctx, size_t app_block_size, + size_t hs_block_size) { + if (IS_QUIC_CTX(ctx) && (app_block_size > 1 || hs_block_size > 1)) + return 0; + /* block size of 0 or 1 is basically no padding */ - if (block_size == 1) + if (app_block_size == 1) { ctx->block_padding = 0; - else if (block_size <= SSL3_RT_MAX_PLAIN_LENGTH) - ctx->block_padding = block_size; - else + } else if (app_block_size <= SSL3_RT_MAX_PLAIN_LENGTH) { + ctx->block_padding = app_block_size; + } else { + return 0; + } + if (hs_block_size == 1) { + ctx->hs_padding = 0; + } else if (hs_block_size <= SSL3_RT_MAX_PLAIN_LENGTH) { + ctx->hs_padding = hs_block_size; + } else { return 0; + } return 1; } +int SSL_CTX_set_block_padding(SSL_CTX *ctx, size_t block_size) +{ + return SSL_CTX_set_block_padding_ex(ctx, block_size, block_size); +} + int SSL_set_record_padding_callback(SSL *ssl, size_t (*cb) (SSL *ssl, int type, size_t len, void *arg)) { BIO *b; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(ssl); + + if (sc == NULL) + return 0; b = SSL_get_wbio(ssl); if (b == NULL || !BIO_get_ktls_send(b)) { - ssl->record_padding_cb = cb; + sc->rlayer.record_padding_cb = cb; return 1; } return 0; @@ -4769,36 +5966,77 @@ int SSL_set_record_padding_callback(SSL *ssl, void SSL_set_record_padding_callback_arg(SSL *ssl, void *arg) { - ssl->record_padding_arg = arg; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return; + + sc->rlayer.record_padding_arg = arg; } void *SSL_get_record_padding_callback_arg(const SSL *ssl) { - return ssl->record_padding_arg; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl); + + if (sc == NULL) + return NULL; + + return sc->rlayer.record_padding_arg; } -int SSL_set_block_padding(SSL *ssl, size_t block_size) +int SSL_set_block_padding_ex(SSL *ssl, size_t app_block_size, + size_t hs_block_size) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL + || (IS_QUIC(ssl) + && (app_block_size > 1 || hs_block_size > 1))) + return 0; + /* block size of 0 or 1 is basically no padding */ - if (block_size == 1) - ssl->block_padding = 0; - else if (block_size <= SSL3_RT_MAX_PLAIN_LENGTH) - ssl->block_padding = block_size; - else + if (app_block_size == 1) { + sc->rlayer.block_padding = 0; + } else if (app_block_size <= SSL3_RT_MAX_PLAIN_LENGTH) { + sc->rlayer.block_padding = app_block_size; + } else { + return 0; + } + if (hs_block_size == 1) { + sc->rlayer.hs_padding = 0; + } else if (hs_block_size <= SSL3_RT_MAX_PLAIN_LENGTH) { + sc->rlayer.hs_padding = hs_block_size; + } else { return 0; + } return 1; } +int SSL_set_block_padding(SSL *ssl, size_t block_size) +{ + return SSL_set_block_padding_ex(ssl, block_size, block_size); +} + int SSL_set_num_tickets(SSL *s, size_t num_tickets) { - s->num_tickets = num_tickets; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + sc->num_tickets = num_tickets; return 1; } size_t SSL_get_num_tickets(const SSL *s) { - return s->num_tickets; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->num_tickets; } int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets) @@ -4813,34 +6051,9 @@ size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx) return ctx->num_tickets; } -/* - * Allocates new EVP_MD_CTX and sets pointer to it into given pointer - * variable, freeing EVP_MD_CTX previously stored in that variable, if any. - * If EVP_MD pointer is passed, initializes ctx with this |md|. - * Returns the newly allocated ctx; - */ - -EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md) -{ - ssl_clear_hash_ctx(hash); - *hash = EVP_MD_CTX_new(); - if (*hash == NULL || (md && EVP_DigestInit_ex(*hash, md, NULL) <= 0)) { - EVP_MD_CTX_free(*hash); - *hash = NULL; - return NULL; - } - return *hash; -} - -void ssl_clear_hash_ctx(EVP_MD_CTX **hash) -{ - - EVP_MD_CTX_free(*hash); - *hash = NULL; -} - /* Retrieve handshake hashes */ -int ssl_handshake_hash(SSL *s, unsigned char *out, size_t outlen, +int ssl_handshake_hash(SSL_CONNECTION *s, + unsigned char *out, size_t outlen, size_t *hashlen) { EVP_MD_CTX *ctx = NULL; @@ -4875,12 +6088,22 @@ int ssl_handshake_hash(SSL *s, unsigned char *out, size_t outlen, int SSL_session_reused(const SSL *s) { - return s->hit; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->hit; } int SSL_is_server(const SSL *s) { - return s->server; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->server; } #ifndef OPENSSL_NO_DEPRECATED_1_1_0 @@ -4894,12 +6117,22 @@ void SSL_set_debug(SSL *s, int debug) void SSL_set_security_level(SSL *s, int level) { - s->cert->sec_level = level; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->cert->sec_level = level; } int SSL_get_security_level(const SSL *s) { - return s->cert->sec_level; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->cert->sec_level; } void SSL_set_security_callback(SSL *s, @@ -4907,24 +6140,44 @@ void SSL_set_security_callback(SSL *s, int op, int bits, int nid, void *other, void *ex)) { - s->cert->sec_cb = cb; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->cert->sec_cb = cb; } int (*SSL_get_security_callback(const SSL *s)) (const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid, void *other, void *ex) { - return s->cert->sec_cb; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + return sc->cert->sec_cb; } void SSL_set0_security_ex_data(SSL *s, void *ex) { - s->cert->sec_ex = ex; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return; + + sc->cert->sec_ex = ex; } void *SSL_get0_security_ex_data(const SSL *s) { - return s->cert->sec_ex; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + return sc->cert->sec_ex; } void SSL_CTX_set_security_level(SSL_CTX *ctx, int level) @@ -4971,7 +6224,17 @@ uint64_t SSL_CTX_get_options(const SSL_CTX *ctx) uint64_t SSL_get_options(const SSL *s) { - return s->options; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_get_options(s); +#endif + + if (sc == NULL) + return 0; + + return sc->options; } uint64_t SSL_CTX_set_options(SSL_CTX *ctx, uint64_t op) @@ -4981,7 +6244,29 @@ uint64_t SSL_CTX_set_options(SSL_CTX *ctx, uint64_t op) uint64_t SSL_set_options(SSL *s, uint64_t op) { - return s->options |= op; + SSL_CONNECTION *sc; + OSSL_PARAM options[2], *opts = options; + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_set_options(s, op); +#endif + + sc = SSL_CONNECTION_FROM_SSL(s); + if (sc == NULL) + return 0; + + sc->options |= op; + + *opts++ = OSSL_PARAM_construct_uint64(OSSL_LIBSSL_RECORD_LAYER_PARAM_OPTIONS, + &sc->options); + *opts = OSSL_PARAM_construct_end(); + + /* Ignore return value */ + sc->rlayer.rrlmethod->set_options(sc->rlayer.rrl, options); + sc->rlayer.wrlmethod->set_options(sc->rlayer.wrl, options); + + return sc->options; } uint64_t SSL_CTX_clear_options(SSL_CTX *ctx, uint64_t op) @@ -4991,12 +6276,38 @@ uint64_t SSL_CTX_clear_options(SSL_CTX *ctx, uint64_t op) uint64_t SSL_clear_options(SSL *s, uint64_t op) { - return s->options &= ~op; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + OSSL_PARAM options[2], *opts = options; + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_clear_options(s, op); +#endif + + if (sc == NULL) + return 0; + + sc->options &= ~op; + + *opts++ = OSSL_PARAM_construct_uint64(OSSL_LIBSSL_RECORD_LAYER_PARAM_OPTIONS, + &sc->options); + *opts = OSSL_PARAM_construct_end(); + + /* Ignore return value */ + sc->rlayer.rrlmethod->set_options(sc->rlayer.rrl, options); + sc->rlayer.wrlmethod->set_options(sc->rlayer.wrl, options); + + return sc->options; } STACK_OF(X509) *SSL_get0_verified_chain(const SSL *s) { - return s->verified_chain; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return NULL; + + return sc->verified_chain; } IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id); @@ -5021,7 +6332,7 @@ static int ct_move_scts(STACK_OF(SCT) **dst, STACK_OF(SCT) *src, if (*dst == NULL) { *dst = sk_SCT_new_null(); if (*dst == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; } } @@ -5045,7 +6356,7 @@ static int ct_move_scts(STACK_OF(SCT) **dst, STACK_OF(SCT) *src, * Look for data collected during ServerHello and parse if found. * Returns the number of SCTs extracted. */ -static int ct_extract_tls_extension_scts(SSL *s) +static int ct_extract_tls_extension_scts(SSL_CONNECTION *s) { int scts_extracted = 0; @@ -5069,7 +6380,7 @@ static int ct_extract_tls_extension_scts(SSL *s) * - 0 if no OCSP response exists or it contains no SCTs. * - A negative integer if an error occurs. */ -static int ct_extract_ocsp_response_scts(SSL *s) +static int ct_extract_ocsp_response_scts(SSL_CONNECTION *s) { # ifndef OPENSSL_NO_OCSP int scts_extracted = 0; @@ -5120,7 +6431,7 @@ static int ct_extract_ocsp_response_scts(SSL *s) * Return the number of SCTs extracted, or a negative integer if an error * occurs. */ -static int ct_extract_x509v3_extension_scts(SSL *s) +static int ct_extract_x509v3_extension_scts(SSL_CONNECTION *s) { int scts_extracted = 0; X509 *cert = s->session != NULL ? s->session->peer : NULL; @@ -5145,26 +6456,31 @@ static int ct_extract_x509v3_extension_scts(SSL *s) */ const STACK_OF(SCT) *SSL_get0_peer_scts(SSL *s) { - if (!s->scts_parsed) { - if (ct_extract_tls_extension_scts(s) < 0 || - ct_extract_ocsp_response_scts(s) < 0 || - ct_extract_x509v3_extension_scts(s) < 0) + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return NULL; + + if (!sc->scts_parsed) { + if (ct_extract_tls_extension_scts(sc) < 0 || + ct_extract_ocsp_response_scts(sc) < 0 || + ct_extract_x509v3_extension_scts(sc) < 0) goto err; - s->scts_parsed = 1; + sc->scts_parsed = 1; } - return s->scts; + return sc->scts; err: return NULL; } -static int ct_permissive(const CT_POLICY_EVAL_CTX * ctx, +static int ct_permissive(const CT_POLICY_EVAL_CTX *ctx, const STACK_OF(SCT) *scts, void *unused_arg) { return 1; } -static int ct_strict(const CT_POLICY_EVAL_CTX * ctx, +static int ct_strict(const CT_POLICY_EVAL_CTX *ctx, const STACK_OF(SCT) *scts, void *unused_arg) { int count = scts != NULL ? sk_SCT_num(scts) : 0; @@ -5184,6 +6500,11 @@ static int ct_strict(const CT_POLICY_EVAL_CTX * ctx, int SSL_set_ct_validation_callback(SSL *s, ssl_ct_validation_cb callback, void *arg) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + /* * Since code exists that uses the custom extension handler for CT, look * for this and throw an error if they have already registered to use CT. @@ -5203,8 +6524,8 @@ int SSL_set_ct_validation_callback(SSL *s, ssl_ct_validation_cb callback, return 0; } - s->ct_validation_callback = callback; - s->ct_validation_callback_arg = arg; + sc->ct_validation_callback = callback; + sc->ct_validation_callback_arg = arg; return 1; } @@ -5230,7 +6551,12 @@ int SSL_CTX_set_ct_validation_callback(SSL_CTX *ctx, int SSL_ct_is_enabled(const SSL *s) { - return s->ct_validation_callback != NULL; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->ct_validation_callback != NULL; } int SSL_CTX_ct_is_enabled(const SSL_CTX *ctx) @@ -5238,7 +6564,7 @@ int SSL_CTX_ct_is_enabled(const SSL_CTX *ctx) return ctx->ct_validation_callback != NULL; } -int ssl_validate_ct(SSL *s) +int ssl_validate_ct(SSL_CONNECTION *s) { int ret = 0; X509 *cert = s->session != NULL ? s->session->peer : NULL; @@ -5275,20 +6601,22 @@ int ssl_validate_ct(SSL *s) } } - ctx = CT_POLICY_EVAL_CTX_new_ex(s->ctx->libctx, s->ctx->propq); + ctx = CT_POLICY_EVAL_CTX_new_ex(SSL_CONNECTION_GET_CTX(s)->libctx, + SSL_CONNECTION_GET_CTX(s)->propq); if (ctx == NULL) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE); + SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_CT_LIB); goto end; } issuer = sk_X509_value(s->verified_chain, 1); CT_POLICY_EVAL_CTX_set1_cert(ctx, cert); CT_POLICY_EVAL_CTX_set1_issuer(ctx, issuer); - CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(ctx, s->ctx->ctlog_store); + CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(ctx, + SSL_CONNECTION_GET_CTX(s)->ctlog_store); CT_POLICY_EVAL_CTX_set_time( - ctx, (uint64_t)SSL_SESSION_get_time(SSL_get0_session(s)) * 1000); + ctx, (uint64_t)SSL_SESSION_get_time_ex(s->session) * 1000); - scts = SSL_get0_peer_scts(s); + scts = SSL_get0_peer_scts(SSL_CONNECTION_GET_SSL(s)); /* * This function returns success (> 0) only when all the SCTs are valid, 0 @@ -5318,7 +6646,7 @@ int ssl_validate_ct(SSL *s) end: CT_POLICY_EVAL_CTX_free(ctx); /* - * With SSL_VERIFY_NONE the session may be cached and re-used despite a + * With SSL_VERIFY_NONE the session may be cached and reused despite a * failure return code here. Also the application may wish the complete * the handshake, and then disconnect cleanly at a higher layer, after * checking the verification status of the completed connection. @@ -5373,7 +6701,7 @@ int SSL_CTX_set_ctlog_list_file(SSL_CTX *ctx, const char *path) return CTLOG_STORE_load_file(ctx->ctlog_store, path); } -void SSL_CTX_set0_ctlog_store(SSL_CTX *ctx, CTLOG_STORE * logs) +void SSL_CTX_set0_ctlog_store(SSL_CTX *ctx, CTLOG_STORE *logs) { CTLOG_STORE_free(ctx->ctlog_store); ctx->ctlog_store = logs; @@ -5393,54 +6721,91 @@ void SSL_CTX_set_client_hello_cb(SSL_CTX *c, SSL_client_hello_cb_fn cb, c->client_hello_cb_arg = arg; } +void SSL_CTX_set_new_pending_conn_cb(SSL_CTX *c, SSL_new_pending_conn_cb_fn cb, + void *arg) +{ + c->new_pending_conn_cb = cb; + c->new_pending_conn_arg = arg; +} + int SSL_client_hello_isv2(SSL *s) { - if (s->clienthello == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->clienthello == NULL) return 0; - return s->clienthello->isv2; + return sc->clienthello->isv2; } unsigned int SSL_client_hello_get0_legacy_version(SSL *s) { - if (s->clienthello == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->clienthello == NULL) return 0; - return s->clienthello->legacy_version; + return sc->clienthello->legacy_version; } size_t SSL_client_hello_get0_random(SSL *s, const unsigned char **out) { - if (s->clienthello == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->clienthello == NULL) return 0; if (out != NULL) - *out = s->clienthello->random; + *out = sc->clienthello->random; return SSL3_RANDOM_SIZE; } size_t SSL_client_hello_get0_session_id(SSL *s, const unsigned char **out) { - if (s->clienthello == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->clienthello == NULL) return 0; if (out != NULL) - *out = s->clienthello->session_id; - return s->clienthello->session_id_len; + *out = sc->clienthello->session_id; + return sc->clienthello->session_id_len; } size_t SSL_client_hello_get0_ciphers(SSL *s, const unsigned char **out) { - if (s->clienthello == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->clienthello == NULL) return 0; if (out != NULL) - *out = PACKET_data(&s->clienthello->ciphersuites); - return PACKET_remaining(&s->clienthello->ciphersuites); + *out = PACKET_data(&sc->clienthello->ciphersuites); + return PACKET_remaining(&sc->clienthello->ciphersuites); } size_t SSL_client_hello_get0_compression_methods(SSL *s, const unsigned char **out) { - if (s->clienthello == NULL) + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->clienthello == NULL) return 0; if (out != NULL) - *out = s->clienthello->compressions; - return s->clienthello->compressions_len; + *out = sc->clienthello->compressions; + return sc->clienthello->compressions_len; } int SSL_client_hello_get1_extensions_present(SSL *s, int **out, size_t *outlen) @@ -5448,11 +6813,15 @@ int SSL_client_hello_get1_extensions_present(SSL *s, int **out, size_t *outlen) RAW_EXTENSION *ext; int *present; size_t num = 0, i; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; - if (s->clienthello == NULL || out == NULL || outlen == NULL) + if (sc->clienthello == NULL || out == NULL || outlen == NULL) return 0; - for (i = 0; i < s->clienthello->pre_proc_exts_len; i++) { - ext = s->clienthello->pre_proc_exts + i; + for (i = 0; i < sc->clienthello->pre_proc_exts_len; i++) { + ext = sc->clienthello->pre_proc_exts + i; if (ext->present) num++; } @@ -5461,12 +6830,10 @@ int SSL_client_hello_get1_extensions_present(SSL *s, int **out, size_t *outlen) *outlen = 0; return 1; } - if ((present = OPENSSL_malloc(sizeof(*present) * num)) == NULL) { - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + if ((present = OPENSSL_malloc(sizeof(*present) * num)) == NULL) return 0; - } - for (i = 0; i < s->clienthello->pre_proc_exts_len; i++) { - ext = s->clienthello->pre_proc_exts + i; + for (i = 0; i < sc->clienthello->pre_proc_exts_len; i++) { + ext = sc->clienthello->pre_proc_exts + i; if (ext->present) { if (ext->received_order >= num) goto err; @@ -5481,16 +6848,58 @@ int SSL_client_hello_get1_extensions_present(SSL *s, int **out, size_t *outlen) return 0; } +int SSL_client_hello_get_extension_order(SSL *s, uint16_t *exts, size_t *num_exts) +{ + RAW_EXTENSION *ext; + size_t num = 0, i; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (sc->clienthello == NULL || num_exts == NULL) + return 0; + for (i = 0; i < sc->clienthello->pre_proc_exts_len; i++) { + ext = sc->clienthello->pre_proc_exts + i; + if (ext->present) + num++; + } + if (num == 0) { + *num_exts = 0; + return 1; + } + if (exts == NULL) { + *num_exts = num; + return 1; + } + if (*num_exts < num) + return 0; + for (i = 0; i < sc->clienthello->pre_proc_exts_len; i++) { + ext = sc->clienthello->pre_proc_exts + i; + if (ext->present) { + if (ext->received_order >= num) + return 0; + exts[ext->received_order] = ext->type; + } + } + *num_exts = num; + return 1; +} + int SSL_client_hello_get0_ext(SSL *s, unsigned int type, const unsigned char **out, size_t *outlen) { size_t i; RAW_EXTENSION *r; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; - if (s->clienthello == NULL) + if (sc->clienthello == NULL) return 0; - for (i = 0; i < s->clienthello->pre_proc_exts_len; ++i) { - r = s->clienthello->pre_proc_exts + i; + for (i = 0; i < sc->clienthello->pre_proc_exts_len; ++i) { + r = sc->clienthello->pre_proc_exts + i; if (r->present && r->type == type) { if (out != NULL) *out = PACKET_data(&r->data); @@ -5504,21 +6913,34 @@ int SSL_client_hello_get0_ext(SSL *s, unsigned int type, const unsigned char **o int SSL_free_buffers(SSL *ssl) { - RECORD_LAYER *rl = &ssl->rlayer; + RECORD_LAYER *rl; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(ssl); - if (RECORD_LAYER_read_pending(rl) || RECORD_LAYER_write_pending(rl)) + if (sc == NULL) return 0; - if (RECORD_LAYER_data_present(rl)) - return 0; + rl = &sc->rlayer; - RECORD_LAYER_release(rl); - return 1; + return rl->rrlmethod->free_buffers(rl->rrl) + && rl->wrlmethod->free_buffers(rl->wrl); } int SSL_alloc_buffers(SSL *ssl) { - return ssl3_setup_buffers(ssl); + RECORD_LAYER *rl; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + + if (sc == NULL) + return 0; + + /* QUIC always has buffers allocated. */ + if (IS_QUIC(ssl)) + return 1; + + rl = &sc->rlayer; + + return rl->rrlmethod->alloc_buffers(rl->rrl) + && rl->wrlmethod->alloc_buffers(rl->wrl); } void SSL_CTX_set_keylog_callback(SSL_CTX *ctx, SSL_CTX_keylog_cb_func cb) @@ -5532,7 +6954,7 @@ SSL_CTX_keylog_cb_func SSL_CTX_get_keylog_callback(const SSL_CTX *ctx) } static int nss_keylog_int(const char *prefix, - SSL *ssl, + SSL_CONNECTION *sc, const uint8_t *parameter_1, size_t parameter_1_len, const uint8_t *parameter_2, @@ -5540,12 +6962,16 @@ static int nss_keylog_int(const char *prefix, { char *out = NULL; char *cursor = NULL; - size_t out_len = 0; - size_t i; - size_t prefix_len; + size_t out_len = 0, i, prefix_len; + SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(sc); - if (ssl->ctx->keylog_callback == NULL) +#ifndef OPENSSL_NO_SSLKEYLOG + if (sctx->keylog_callback == NULL && sctx->do_sslkeylog == 0) + return 1; +#else + if (sctx->keylog_callback == NULL) return 1; +#endif /* * Our output buffer will contain the following strings, rendered with @@ -5557,61 +6983,59 @@ static int nss_keylog_int(const char *prefix, */ prefix_len = strlen(prefix); out_len = prefix_len + (2 * parameter_1_len) + (2 * parameter_2_len) + 3; - if ((out = cursor = OPENSSL_malloc(out_len)) == NULL) { - SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE); + if ((out = cursor = OPENSSL_malloc(out_len)) == NULL) return 0; - } - strcpy(cursor, prefix); + memcpy(cursor, prefix, prefix_len); cursor += prefix_len; *cursor++ = ' '; - for (i = 0; i < parameter_1_len; i++) { - sprintf(cursor, "%02x", parameter_1[i]); - cursor += 2; - } + for (i = 0; i < parameter_1_len; ++i) + cursor += ossl_to_lowerhex(cursor, parameter_1[i]); *cursor++ = ' '; - for (i = 0; i < parameter_2_len; i++) { - sprintf(cursor, "%02x", parameter_2[i]); - cursor += 2; - } + for (i = 0; i < parameter_2_len; ++i) + cursor += ossl_to_lowerhex(cursor, parameter_2[i]); *cursor = '\0'; - ssl->ctx->keylog_callback(ssl, (const char *)out); +#ifndef OPENSSL_NO_SSLKEYLOG + if (sctx->do_sslkeylog == 1) + do_sslkeylogfile(SSL_CONNECTION_GET_SSL(sc), (const char *)out); +#endif + if (sctx->keylog_callback != NULL) + sctx->keylog_callback(SSL_CONNECTION_GET_USER_SSL(sc), (const char *)out); OPENSSL_clear_free(out, out_len); return 1; - } -int ssl_log_rsa_client_key_exchange(SSL *ssl, +int ssl_log_rsa_client_key_exchange(SSL_CONNECTION *sc, const uint8_t *encrypted_premaster, size_t encrypted_premaster_len, const uint8_t *premaster, size_t premaster_len) { if (encrypted_premaster_len < 8) { - SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); + SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); return 0; } /* We only want the first 8 bytes of the encrypted premaster as a tag. */ return nss_keylog_int("RSA", - ssl, + sc, encrypted_premaster, 8, premaster, premaster_len); } -int ssl_log_secret(SSL *ssl, +int ssl_log_secret(SSL_CONNECTION *sc, const char *label, const uint8_t *secret, size_t secret_len) { return nss_keylog_int(label, - ssl, - ssl->s3.client_random, + sc, + sc->s3.client_random, SSL3_RANDOM_SIZE, secret, secret_len); @@ -5619,14 +7043,14 @@ int ssl_log_secret(SSL *ssl, #define SSLV2_CIPHER_LEN 3 -int ssl_cache_cipherlist(SSL *s, PACKET *cipher_suites, int sslv2format) +int ssl_cache_cipherlist(SSL_CONNECTION *s, PACKET *cipher_suites, int sslv2format) { int n; n = sslv2format ? SSLV2_CIPHER_LEN : TLS_CIPHER_LEN; if (PACKET_remaining(cipher_suites) == 0) { - SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_NO_CIPHERS_SPECIFIED); + SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_NO_CIPHERS_SPECIFIED); return 0; } @@ -5655,7 +7079,7 @@ int ssl_cache_cipherlist(SSL *s, PACKET *cipher_suites, int sslv2format) raw = OPENSSL_malloc(numciphers * TLS_CIPHER_LEN); s->s3.tmp.ciphers_raw = raw; if (raw == NULL) { - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE); + SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_CRYPTO_LIB); return 0; } for (s->s3.tmp.ciphers_rawlen = 0; @@ -5689,16 +7113,20 @@ int SSL_bytes_to_cipher_list(SSL *s, const unsigned char *bytes, size_t len, STACK_OF(SSL_CIPHER) **scsvs) { PACKET pkt; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; if (!PACKET_buf_init(&pkt, bytes, len)) return 0; - return bytes_to_cipher_list(s, &pkt, sk, scsvs, isv2format, 0); + return ossl_bytes_to_cipher_list(sc, &pkt, sk, scsvs, isv2format, 0); } -int bytes_to_cipher_list(SSL *s, PACKET *cipher_suites, - STACK_OF(SSL_CIPHER) **skp, - STACK_OF(SSL_CIPHER) **scsvs_out, - int sslv2format, int fatal) +int ossl_bytes_to_cipher_list(SSL_CONNECTION *s, PACKET *cipher_suites, + STACK_OF(SSL_CIPHER) **skp, + STACK_OF(SSL_CIPHER) **scsvs_out, + int sslv2format, int fatal) { const SSL_CIPHER *c; STACK_OF(SSL_CIPHER) *sk = NULL; @@ -5730,9 +7158,9 @@ int bytes_to_cipher_list(SSL *s, PACKET *cipher_suites, scsvs = sk_SSL_CIPHER_new_null(); if (sk == NULL || scsvs == NULL) { if (fatal) - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE); + SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_CRYPTO_LIB); else - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; } @@ -5751,9 +7179,9 @@ int bytes_to_cipher_list(SSL *s, PACKET *cipher_suites, if ((c->valid && !sk_SSL_CIPHER_push(sk, c)) || (!c->valid && !sk_SSL_CIPHER_push(scsvs, c))) { if (fatal) - SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_MALLOC_FAILURE); + SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_CRYPTO_LIB); else - ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB); goto err; } } @@ -5795,14 +7223,24 @@ uint32_t SSL_CTX_get_max_early_data(const SSL_CTX *ctx) int SSL_set_max_early_data(SSL *s, uint32_t max_early_data) { - s->max_early_data = max_early_data; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) + return 0; + + sc->max_early_data = max_early_data; return 1; } uint32_t SSL_get_max_early_data(const SSL *s) { - return s->max_early_data; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->max_early_data; } int SSL_CTX_set_recv_max_early_data(SSL_CTX *ctx, uint32_t recv_max_early_data) @@ -5819,44 +7257,58 @@ uint32_t SSL_CTX_get_recv_max_early_data(const SSL_CTX *ctx) int SSL_set_recv_max_early_data(SSL *s, uint32_t recv_max_early_data) { - s->recv_max_early_data = recv_max_early_data; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) + return 0; + + sc->recv_max_early_data = recv_max_early_data; return 1; } uint32_t SSL_get_recv_max_early_data(const SSL *s) { - return s->recv_max_early_data; + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (sc == NULL) + return 0; + + return sc->recv_max_early_data; } -__owur unsigned int ssl_get_max_send_fragment(const SSL *ssl) +__owur unsigned int ssl_get_max_send_fragment(const SSL_CONNECTION *sc) { /* Return any active Max Fragment Len extension */ - if (ssl->session != NULL && USE_MAX_FRAGMENT_LENGTH_EXT(ssl->session)) - return GET_MAX_FRAGMENT_LENGTH(ssl->session); + if (sc->session != NULL && USE_MAX_FRAGMENT_LENGTH_EXT(sc->session)) + return GET_MAX_FRAGMENT_LENGTH(sc->session); /* return current SSL connection setting */ - return ssl->max_send_fragment; + return sc->max_send_fragment; } -__owur unsigned int ssl_get_split_send_fragment(const SSL *ssl) +__owur unsigned int ssl_get_split_send_fragment(const SSL_CONNECTION *sc) { /* Return a value regarding an active Max Fragment Len extension */ - if (ssl->session != NULL && USE_MAX_FRAGMENT_LENGTH_EXT(ssl->session) - && ssl->split_send_fragment > GET_MAX_FRAGMENT_LENGTH(ssl->session)) - return GET_MAX_FRAGMENT_LENGTH(ssl->session); + if (sc->session != NULL && USE_MAX_FRAGMENT_LENGTH_EXT(sc->session) + && sc->split_send_fragment > GET_MAX_FRAGMENT_LENGTH(sc->session)) + return GET_MAX_FRAGMENT_LENGTH(sc->session); /* else limit |split_send_fragment| to current |max_send_fragment| */ - if (ssl->split_send_fragment > ssl->max_send_fragment) - return ssl->max_send_fragment; + if (sc->split_send_fragment > sc->max_send_fragment) + return sc->max_send_fragment; /* return current SSL connection setting */ - return ssl->split_send_fragment; + return sc->split_send_fragment; } int SSL_stateless(SSL *s) { int ret; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) + return 0; /* Ensure there is no state left over from a previous invocation */ if (!SSL_clear(s)) @@ -5864,14 +7316,14 @@ int SSL_stateless(SSL *s) ERR_clear_error(); - s->s3.flags |= TLS1_FLAGS_STATELESS; + sc->s3.flags |= TLS1_FLAGS_STATELESS; ret = SSL_accept(s); - s->s3.flags &= ~TLS1_FLAGS_STATELESS; + sc->s3.flags &= ~TLS1_FLAGS_STATELESS; - if (ret > 0 && s->ext.cookieok) + if (ret > 0 && sc->ext.cookieok) return 1; - if (s->hello_retry_request == SSL_HRR_PENDING && !ossl_statem_in_error(s)) + if (sc->hello_retry_request == SSL_HRR_PENDING && !ossl_statem_in_error(sc)) return 0; return -1; @@ -5884,16 +7336,33 @@ void SSL_CTX_set_post_handshake_auth(SSL_CTX *ctx, int val) void SSL_set_post_handshake_auth(SSL *ssl, int val) { - ssl->pha_enabled = val; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(ssl); + + if (sc == NULL) + return; + + sc->pha_enabled = val; } int SSL_verify_client_post_handshake(SSL *ssl) { - if (!SSL_IS_TLS13(ssl)) { + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(ssl)) { ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_SSL_VERSION); return 0; } - if (!ssl->server) { +#endif + + if (sc == NULL) + return 0; + + if (!SSL_CONNECTION_IS_TLS13(sc)) { + ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_SSL_VERSION); + return 0; + } + if (!sc->server) { ERR_raise(ERR_LIB_SSL, SSL_R_NOT_SERVER); return 0; } @@ -5903,7 +7372,7 @@ int SSL_verify_client_post_handshake(SSL *ssl) return 0; } - switch (ssl->post_handshake_auth) { + switch (sc->post_handshake_auth) { case SSL_PHA_NONE: ERR_raise(ERR_LIB_SSL, SSL_R_EXTENSION_NOT_RECEIVED); return 0; @@ -5921,16 +7390,16 @@ int SSL_verify_client_post_handshake(SSL *ssl) return 0; } - ssl->post_handshake_auth = SSL_PHA_REQUEST_PENDING; + sc->post_handshake_auth = SSL_PHA_REQUEST_PENDING; /* checks verify_mode and algorithm_auth */ - if (!send_certificate_request(ssl)) { - ssl->post_handshake_auth = SSL_PHA_EXT_RECEIVED; /* restore on error */ + if (!send_certificate_request(sc)) { + sc->post_handshake_auth = SSL_PHA_EXT_RECEIVED; /* restore on error */ ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_CONFIG); return 0; } - ossl_statem_set_in_init(ssl, 1); + ossl_statem_set_in_init(sc, 1); return 1; } @@ -5957,8 +7426,13 @@ void SSL_set_allow_early_data_cb(SSL *s, SSL_allow_early_data_cb_fn cb, void *arg) { - s->allow_early_data_cb = cb; - s->allow_early_data_cb_data = arg; + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + + if (sc == NULL) + return; + + sc->allow_early_data_cb = cb; + sc->allow_early_data_cb_data = arg; } const EVP_CIPHER *ssl_evp_cipher_fetch(OSSL_LIB_CTX *libctx, @@ -5977,6 +7451,20 @@ const EVP_CIPHER *ssl_evp_cipher_fetch(OSSL_LIB_CTX *libctx, */ ERR_set_mark(); ciph = EVP_CIPHER_fetch(libctx, OBJ_nid2sn(nid), properties); + if (ciph != NULL) { + OSSL_PARAM params[2]; + int decrypt_only = 0; + + params[0] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_DECRYPT_ONLY, + &decrypt_only); + params[1] = OSSL_PARAM_construct_end(); + if (EVP_CIPHER_get_params((EVP_CIPHER *)ciph, params) + && decrypt_only) { + /* If a cipher is decrypt-only, it is unusable */ + EVP_CIPHER_free((EVP_CIPHER *)ciph); + ciph = NULL; + } + } ERR_pop_to_mark(); return ciph; } @@ -6055,13 +7543,18 @@ void ssl_evp_md_free(const EVP_MD *md) int SSL_set0_tmp_dh_pkey(SSL *s, EVP_PKEY *dhpkey) { - if (!ssl_security(s, SSL_SECOP_TMP_DH, + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + if (!ssl_security(sc, SSL_SECOP_TMP_DH, EVP_PKEY_get_security_bits(dhpkey), 0, dhpkey)) { ERR_raise(ERR_LIB_SSL, SSL_R_DH_KEY_TOO_SMALL); return 0; } - EVP_PKEY_free(s->cert->dh_tmp); - s->cert->dh_tmp = dhpkey; + EVP_PKEY_free(sc->cert->dh_tmp); + sc->cert->dh_tmp = dhpkey; return 1; } @@ -6076,3 +7569,755 @@ int SSL_CTX_set0_tmp_dh_pkey(SSL_CTX *ctx, EVP_PKEY *dhpkey) ctx->cert->dh_tmp = dhpkey; return 1; } + +/* QUIC-specific methods which are supported on QUIC connections only. */ +int SSL_handle_events(SSL *s) +{ + SSL_CONNECTION *sc; + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_handle_events(s); +#endif + + sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + if (sc != NULL && SSL_CONNECTION_IS_DTLS(sc)) + /* + * DTLSv1_handle_timeout returns 0 if the timer wasn't expired yet, + * which we consider a success case. Theoretically DTLSv1_handle_timeout + * can also return 0 if s is NULL or not a DTLS object, but we've + * already ruled out those possibilities above, so this is not possible + * here. Thus the only failure cases are where DTLSv1_handle_timeout + * returns -1. + */ + return DTLSv1_handle_timeout(s) >= 0; + + return 1; +} + +int SSL_get_event_timeout(SSL *s, struct timeval *tv, int *is_infinite) +{ + SSL_CONNECTION *sc; + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_get_event_timeout(s, tv, is_infinite); +#endif + + sc = SSL_CONNECTION_FROM_SSL_ONLY(s); + if (sc != NULL && SSL_CONNECTION_IS_DTLS(sc) + && DTLSv1_get_timeout(s, tv)) { + *is_infinite = 0; + return 1; + } + + tv->tv_sec = 1000000; + tv->tv_usec = 0; + *is_infinite = 1; + return 1; +} + +int SSL_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_get_rpoll_descriptor(s, desc); +#endif + + if (sc == NULL || sc->rbio == NULL) + return 0; + + return BIO_get_rpoll_descriptor(sc->rbio, desc); +} + +int SSL_get_wpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_get_wpoll_descriptor(s, desc); +#endif + + if (sc == NULL || sc->wbio == NULL) + return 0; + + return BIO_get_wpoll_descriptor(sc->wbio, desc); +} + +int SSL_net_read_desired(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return SSL_want_read(s); + + return ossl_quic_get_net_read_desired(s); +#else + return SSL_want_read(s); +#endif +} + +int SSL_net_write_desired(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return SSL_want_write(s); + + return ossl_quic_get_net_write_desired(s); +#else + return SSL_want_write(s); +#endif +} + +int SSL_set_blocking_mode(SSL *s, int blocking) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return 0; + + return ossl_quic_conn_set_blocking_mode(s, blocking); +#else + return 0; +#endif +} + +int SSL_get_blocking_mode(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return -1; + + return ossl_quic_conn_get_blocking_mode(s); +#else + return -1; +#endif +} + +int SSL_set1_initial_peer_addr(SSL *s, const BIO_ADDR *peer_addr) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return 0; + + return ossl_quic_conn_set_initial_peer_addr(s, peer_addr); +#else + return 0; +#endif +} + +int SSL_shutdown_ex(SSL *ssl, uint64_t flags, + const SSL_SHUTDOWN_EX_ARGS *args, + size_t args_len) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(ssl)) + return SSL_shutdown(ssl); + + return ossl_quic_conn_shutdown(ssl, flags, args, args_len); +#else + return SSL_shutdown(ssl); +#endif +} + +int SSL_stream_conclude(SSL *ssl, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(ssl)) + return 0; + + return ossl_quic_conn_stream_conclude(ssl); +#else + return 0; +#endif +} + +SSL *SSL_new_stream(SSL *s, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return NULL; + + return ossl_quic_conn_stream_new(s, flags); +#else + return NULL; +#endif +} + +SSL *SSL_get0_connection(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return s; + + return ossl_quic_get0_connection(s); +#else + return s; +#endif +} + +int SSL_is_connection(SSL *s) +{ + return SSL_get0_connection(s) == s; +} + +SSL *SSL_get0_listener(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return NULL; + + return ossl_quic_get0_listener(s); +#else + return NULL; +#endif +} + +SSL *SSL_get0_domain(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return NULL; + + return ossl_quic_get0_domain(s); +#else + return NULL; +#endif +} + +int SSL_is_listener(SSL *s) +{ + return SSL_get0_listener(s) == s; +} + +int SSL_is_domain(SSL *s) +{ + return SSL_get0_domain(s) == s; +} + +int SSL_get_stream_type(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return SSL_STREAM_TYPE_BIDI; + + return ossl_quic_get_stream_type(s); +#else + return SSL_STREAM_TYPE_BIDI; +#endif +} + +uint64_t SSL_get_stream_id(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return UINT64_MAX; + + return ossl_quic_get_stream_id(s); +#else + return UINT64_MAX; +#endif +} + +int SSL_is_stream_local(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return -1; + + return ossl_quic_is_stream_local(s); +#else + return -1; +#endif +} + +int SSL_set_default_stream_mode(SSL *s, uint32_t mode) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return 0; + + return ossl_quic_set_default_stream_mode(s, mode); +#else + return 0; +#endif +} + +int SSL_set_incoming_stream_policy(SSL *s, int policy, uint64_t aec) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return 0; + + return ossl_quic_set_incoming_stream_policy(s, policy, aec); +#else + return 0; +#endif +} + +SSL *SSL_accept_stream(SSL *s, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return NULL; + + return ossl_quic_accept_stream(s, flags); +#else + return NULL; +#endif +} + +size_t SSL_get_accept_stream_queue_len(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return 0; + + return ossl_quic_get_accept_stream_queue_len(s); +#else + return 0; +#endif +} + +int SSL_stream_reset(SSL *s, + const SSL_STREAM_RESET_ARGS *args, + size_t args_len) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return 0; + + return ossl_quic_stream_reset(s, args, args_len); +#else + return 0; +#endif +} + +int SSL_get_stream_read_state(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return SSL_STREAM_STATE_NONE; + + return ossl_quic_get_stream_read_state(s); +#else + return SSL_STREAM_STATE_NONE; +#endif +} + +int SSL_get_stream_write_state(SSL *s) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return SSL_STREAM_STATE_NONE; + + return ossl_quic_get_stream_write_state(s); +#else + return SSL_STREAM_STATE_NONE; +#endif +} + +int SSL_get_stream_read_error_code(SSL *s, uint64_t *app_error_code) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return -1; + + return ossl_quic_get_stream_read_error_code(s, app_error_code); +#else + return -1; +#endif +} + +int SSL_get_stream_write_error_code(SSL *s, uint64_t *app_error_code) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return -1; + + return ossl_quic_get_stream_write_error_code(s, app_error_code); +#else + return -1; +#endif +} + +int SSL_get_conn_close_info(SSL *s, SSL_CONN_CLOSE_INFO *info, + size_t info_len) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(s)) + return -1; + + return ossl_quic_get_conn_close_info(s, info, info_len); +#else + return -1; +#endif +} + +int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, + uint64_t *value) +{ +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_get_value_uint(s, class_, id, value); +#endif + + ERR_raise(ERR_LIB_SSL, SSL_R_UNSUPPORTED_PROTOCOL); + return 0; +} + +int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, + uint64_t value) +{ +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(s)) + return ossl_quic_set_value_uint(s, class_, id, value); +#endif + + ERR_raise(ERR_LIB_SSL, SSL_R_UNSUPPORTED_PROTOCOL); + return 0; +} + +SSL *SSL_new_listener(SSL_CTX *ctx, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC_CTX(ctx)) + return NULL; + + return ossl_quic_new_listener(ctx, flags); +#else + return NULL; +#endif +} + +SSL *SSL_new_listener_from(SSL *ssl, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(ssl)) + return NULL; + + return ossl_quic_new_listener_from(ssl, flags); +#else + return NULL; +#endif +} + +SSL *SSL_new_from_listener(SSL *ssl, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(ssl)) + return NULL; + + return ossl_quic_new_from_listener(ssl, flags); +#else + return NULL; +#endif +} + +SSL *SSL_accept_connection(SSL *ssl, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(ssl)) + return NULL; + + return ossl_quic_accept_connection(ssl, flags); +#else + return NULL; +#endif +} + +size_t SSL_get_accept_connection_queue_len(SSL *ssl) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(ssl)) + return 0; + + return ossl_quic_get_accept_connection_queue_len(ssl); +#else + return 0; +#endif +} + +int SSL_listen(SSL *ssl) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC(ssl)) + return 0; + + return ossl_quic_listen(ssl); +#else + return 0; +#endif +} + +SSL *SSL_new_domain(SSL_CTX *ctx, uint64_t flags) +{ +#ifndef OPENSSL_NO_QUIC + if (!IS_QUIC_CTX(ctx)) + return NULL; + + return ossl_quic_new_domain(ctx, flags); +#else + return NULL; +#endif +} + +int ossl_adjust_domain_flags(uint64_t domain_flags, uint64_t *p_domain_flags) +{ + if ((domain_flags & ~OSSL_QUIC_SUPPORTED_DOMAIN_FLAGS) != 0) { + ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED, + "unsupported domain flag requested"); + return 0; + } + + if ((domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0) + domain_flags |= SSL_DOMAIN_FLAG_MULTI_THREAD; + + if ((domain_flags & (SSL_DOMAIN_FLAG_MULTI_THREAD + | SSL_DOMAIN_FLAG_SINGLE_THREAD)) == 0) + domain_flags |= SSL_DOMAIN_FLAG_MULTI_THREAD; + + if ((domain_flags & SSL_DOMAIN_FLAG_SINGLE_THREAD) != 0 + && (domain_flags & SSL_DOMAIN_FLAG_MULTI_THREAD) != 0) { + ERR_raise_data(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT, + "mutually exclusive domain flags specified"); + return 0; + } + + /* + * Note: We treat MULTI_THREAD as a no-op in non-threaded builds, but + * not THREAD_ASSISTED. + */ +# ifndef OPENSSL_THREADS + if ((domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0) { + ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED, + "thread assisted mode not available in this build"); + return 0; + } +# endif + + *p_domain_flags = domain_flags; + return 1; +} + +int SSL_CTX_set_domain_flags(SSL_CTX *ctx, uint64_t domain_flags) +{ +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC_CTX(ctx)) { + if (!ossl_adjust_domain_flags(domain_flags, &domain_flags)) + return 0; + + ctx->domain_flags = domain_flags; + return 1; + } +#endif + + ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED, + "domain flags unsupported on this kind of SSL_CTX"); + return 0; +} + +int SSL_CTX_get_domain_flags(const SSL_CTX *ctx, uint64_t *domain_flags) +{ +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC_CTX(ctx)) { + if (domain_flags != NULL) + *domain_flags = ctx->domain_flags; + + return 1; + } +#endif + + ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED, + "domain flags unsupported on this kind of SSL_CTX"); + return 0; +} + +int SSL_get_domain_flags(const SSL *ssl, uint64_t *domain_flags) +{ +#ifndef OPENSSL_NO_QUIC + if (IS_QUIC(ssl)) + return ossl_quic_get_domain_flags(ssl, domain_flags); +#endif + + return 0; +} + +int SSL_add_expected_rpk(SSL *s, EVP_PKEY *rpk) +{ + unsigned char *data = NULL; + SSL_DANE *dane = SSL_get0_dane(s); + int ret; + + if (dane == NULL || dane->dctx == NULL) + return 0; + if ((ret = i2d_PUBKEY(rpk, &data)) <= 0) + return 0; + + ret = SSL_dane_tlsa_add(s, DANETLS_USAGE_DANE_EE, + DANETLS_SELECTOR_SPKI, + DANETLS_MATCHING_FULL, + data, (size_t)ret) > 0; + OPENSSL_free(data); + return ret; +} + +EVP_PKEY *SSL_get0_peer_rpk(const SSL *s) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL || sc->session == NULL) + return NULL; + return sc->session->peer_rpk; +} + +int SSL_get_negotiated_client_cert_type(const SSL *s) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + return sc->ext.client_cert_type; +} + +int SSL_get_negotiated_server_cert_type(const SSL *s) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + return sc->ext.server_cert_type; +} + +static int validate_cert_type(const unsigned char *val, size_t len) +{ + size_t i; + int saw_rpk = 0; + int saw_x509 = 0; + + if (val == NULL && len == 0) + return 1; + + if (val == NULL || len == 0) + return 0; + + for (i = 0; i < len; i++) { + switch (val[i]) { + case TLSEXT_cert_type_rpk: + if (saw_rpk) + return 0; + saw_rpk = 1; + break; + case TLSEXT_cert_type_x509: + if (saw_x509) + return 0; + saw_x509 = 1; + break; + case TLSEXT_cert_type_pgp: + case TLSEXT_cert_type_1609dot2: + default: + return 0; + } + } + return 1; +} + +static int set_cert_type(unsigned char **cert_type, + size_t *cert_type_len, + const unsigned char *val, + size_t len) +{ + unsigned char *tmp = NULL; + + if (!validate_cert_type(val, len)) + return 0; + + if (val != NULL && (tmp = OPENSSL_memdup(val, len)) == NULL) + return 0; + + OPENSSL_free(*cert_type); + *cert_type = tmp; + *cert_type_len = len; + return 1; +} + +int SSL_set1_client_cert_type(SSL *s, const unsigned char *val, size_t len) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + return set_cert_type(&sc->client_cert_type, &sc->client_cert_type_len, + val, len); +} + +int SSL_set1_server_cert_type(SSL *s, const unsigned char *val, size_t len) +{ + SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); + + if (sc == NULL) + return 0; + + return set_cert_type(&sc->server_cert_type, &sc->server_cert_type_len, + val, len); +} + +int SSL_CTX_set1_client_cert_type(SSL_CTX *ctx, const unsigned char *val, size_t len) +{ + return set_cert_type(&ctx->client_cert_type, &ctx->client_cert_type_len, + val, len); +} + +int SSL_CTX_set1_server_cert_type(SSL_CTX *ctx, const unsigned char *val, size_t len) +{ + return set_cert_type(&ctx->server_cert_type, &ctx->server_cert_type_len, + val, len); +} + +int SSL_get0_client_cert_type(const SSL *s, unsigned char **t, size_t *len) +{ + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (t == NULL || len == NULL || sc == NULL) + return 0; + + *t = sc->client_cert_type; + *len = sc->client_cert_type_len; + return 1; +} + +int SSL_get0_server_cert_type(const SSL *s, unsigned char **t, size_t *len) +{ + const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s); + + if (t == NULL || len == NULL || sc == NULL) + return 0; + + *t = sc->server_cert_type; + *len = sc->server_cert_type_len; + return 1; +} + +int SSL_CTX_get0_client_cert_type(const SSL_CTX *ctx, unsigned char **t, size_t *len) +{ + if (t == NULL || len == NULL) + return 0; + + *t = ctx->client_cert_type; + *len = ctx->client_cert_type_len; + return 1; +} + +int SSL_CTX_get0_server_cert_type(const SSL_CTX *ctx, unsigned char **t, size_t *len) +{ + if (t == NULL || len == NULL) + return 0; + + *t = ctx->server_cert_type; + *len = ctx->server_cert_type_len; + return 1; +} |