From nobody Wed May 4 20:33:58 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A5A191AB4F33; Wed, 4 May 2022 20:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KtpT32LBZz3nwX; Wed, 4 May 2022 20:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651696439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+VEWFvTOUQXyjBZTu+1ZmFB8V6Mp9qQ2G50Zf3R6zg=; b=ds9FqHvIqSEGSnenzZ6E3U20e+8q4tf0xnkEI+s0kDvp+2lRLM7UA5ElrHRLZesR+1KqDs eGga4FjYAekLBap+gboKHFDqWfLLKId/SVVX1YK8jxj0CkIvlQHdzjWI1Xks5HX+J/fWNF rwtvzqqKTSXnXuwZMtxmT3rCDLbr2smQDBYFLfFa0QbcHhv9HvRXY8Qpw3dwyCguMIFj1/ vxWErxVeNVSH9pFGdak3CcdX2OJ/z1CW5xrQh5cpk7WEjCfGGu79Sm8OEAiAVY2r7FcZKR OPknHeVYMDUb2R2y8ZruUddFpqqJ8iLb6hvc6w/hehKuPoDtKnYJvEm1USKUgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAC9A19E97; Wed, 4 May 2022 20:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 244KXwWq053176; Wed, 4 May 2022 20:33:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244KXw7n053175; Wed, 4 May 2022 20:33:58 GMT (envelope-from git) Date: Wed, 4 May 2022 20:33:58 GMT Message-Id: <202205042033.244KXw7n053175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 913616b88505 - main - OpenSSL: KTLS: Enable KTLS for receiving as well in TLS 1.3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 913616b88505b2a5ff40f3d0a4b504d39ee563bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651696439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+VEWFvTOUQXyjBZTu+1ZmFB8V6Mp9qQ2G50Zf3R6zg=; b=wo+46qahNml55bhuW+zdg4tz5MwkLQ1HAIlbHv6hcgG4u/ioymPQ0iLwOnMgPaq27EKAIW e59vwW2bezMGZdfTKbioRk2fMs/V+fehy5SF6+hKaLnPxMHYjJF/lHYjM/41VZ5CxHjAWM A8hAMRwZL7PFLJIsZhel7W9NQZe5IiQDrSLjqTbPPqO/pabu0bVDNApIM461/DFR+mx4xk lNUf1FlInzcI4u3lEvTe/2a2H+ub+JsWSqrpV0QtoLB2XYIuX0p1vChZEDWMz3lBlmpkMo VRaONUHmvDBM8KkJN5BkVV3O2jOvKZBP8Gpihf4EpqI0Kv6hMqjvNQaWAVSLKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651696439; a=rsa-sha256; cv=none; b=j3f1OoFu+Pflhq4bTILozYVjOBtE4kU1QNIzKmmnF012Jkc3lJVTJfQLlD7+TMR66SZSpS byK1Eej3ldMmI2DaabPJhW8rHQ1IJHaGkDfFjB9K5saJ8ASY+QpMjHP8VN/R7gm4YSRjn0 wlhjlq7wS+KAXXqR+88ECodVYDN9JEwI7Zt4HqGeEWwDO1COzXUQpKqW2q+jVRzhLjSg7G /ikAa68sNt5SvPhafc9YUQwHOpyzFzHksVF/Ngn+8v96Y4T9yMRICUOpTOMBX+KhzlS06H JRrIsEcknye2wmrNd+Z80Oj7/SVnOa2jCM1tSJ1jCB/WEIDqCeNTv3hWveocBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=913616b88505b2a5ff40f3d0a4b504d39ee563bb commit 913616b88505b2a5ff40f3d0a4b504d39ee563bb Author: John Baldwin AuthorDate: 2022-05-04 20:08:36 +0000 Commit: John Baldwin CommitDate: 2022-05-04 20:08:36 +0000 OpenSSL: KTLS: Enable KTLS for receiving as well in TLS 1.3 This removes a guard condition that prevents KTLS being enabled for receiving in TLS 1.3. Use the correct sequence number and BIO for receive vs transmit offload. Approved by: jkim Obtained from: OpenSSL commit 7c78932b9a4330fb7c8db72b3fb37cbff1401f8b MFC after: 1 week Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D34976 --- crypto/openssl/ssl/tls13_enc.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/crypto/openssl/ssl/tls13_enc.c b/crypto/openssl/ssl/tls13_enc.c index cc1435ec55c2..109227e55666 100644 --- a/crypto/openssl/ssl/tls13_enc.c +++ b/crypto/openssl/ssl/tls13_enc.c @@ -471,6 +471,7 @@ int tls13_change_cipher_state(SSL *s, int which) const EVP_CIPHER *cipher = NULL; #if !defined(OPENSSL_NO_KTLS) && defined(OPENSSL_KTLS_TLS13) ktls_crypto_info_t crypto_info; + void *rl_sequence; BIO *bio; #endif @@ -724,8 +725,7 @@ int tls13_change_cipher_state(SSL *s, int which) s->statem.enc_write_state = ENC_WRITE_STATE_VALID; #ifndef OPENSSL_NO_KTLS # if defined(OPENSSL_KTLS_TLS13) - if (!(which & SSL3_CC_WRITE) - || !(which & SSL3_CC_APPLICATION) + if (!(which & SSL3_CC_APPLICATION) || (s->options & SSL_OP_ENABLE_KTLS) == 0) goto skip_ktls; @@ -741,7 +741,10 @@ int tls13_change_cipher_state(SSL *s, int which) if (!ktls_check_supported_cipher(s, cipher, ciph_ctx)) goto skip_ktls; - bio = s->wbio; + if (which & SSL3_CC_WRITE) + bio = s->wbio; + else + bio = s->rbio; if (!ossl_assert(bio != NULL)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_CHANGE_CIPHER_STATE, @@ -750,19 +753,26 @@ int tls13_change_cipher_state(SSL *s, int which) } /* All future data will get encrypted by ktls. Flush the BIO or skip ktls */ - if (BIO_flush(bio) <= 0) - goto skip_ktls; + if (which & SSL3_CC_WRITE) { + if (BIO_flush(bio) <= 0) + goto skip_ktls; + } /* configure kernel crypto structure */ - if (!ktls_configure_crypto(s, cipher, ciph_ctx, - RECORD_LAYER_get_write_sequence(&s->rlayer), - &crypto_info, which & SSL3_CC_WRITE, iv, key, - NULL, 0)) + if (which & SSL3_CC_WRITE) + rl_sequence = RECORD_LAYER_get_write_sequence(&s->rlayer); + else + rl_sequence = RECORD_LAYER_get_read_sequence(&s->rlayer); + + if (!ktls_configure_crypto(s, cipher, ciph_ctx, rl_sequence, &crypto_info, + which & SSL3_CC_WRITE, iv, key, NULL, 0)) goto skip_ktls; /* ktls works with user provided buffers directly */ - if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) - ssl3_release_write_buffer(s); + if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) { + if (which & SSL3_CC_WRITE) + ssl3_release_write_buffer(s); + } skip_ktls: # endif #endif