From nobody Tue Nov 23 23:12:56 2021 X-Original-To: dev-commits-src-branches@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 ADDB718A19D5; Tue, 23 Nov 2021 23:12: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 4HzKgG174qz3vYH; Tue, 23 Nov 2021 23:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A79D21F54F; Tue, 23 Nov 2021 23:12:56 +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 1ANNCu9t037741; Tue, 23 Nov 2021 23:12:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANNCu3f037740; Tue, 23 Nov 2021 23:12:56 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:12:56 GMT Message-Id: <202111232312.1ANNCu3f037740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 81b6dba1a08b - stable/13 - ktls: Fix assertion for TLS 1.0 CBC when using non-zero starting seqno. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 81b6dba1a08b031bdf7463c1704d27ae1e0daa0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637709178; 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=OSG11pQmayKoQ6xBWGvXxyFRZohzYzbDnu5Dwr3LZKg=; b=qXYDZqD7XpUa+agf1zYW67FUAU4V/FIh9n9tUMKMFcH/68dOKgg0Qjz10yA6rVH2dwmya6 sPV6kexHGre/154qL2wdyB3Y8VISS5dKAoWuCMGc5whg79xxy5iN118y2k3kGmxaQSkxx3 Zlew8F7uQFtO+70aa8lQ8YBSreApUO/QlGal7oBHBv/LnDOOBP2O2EsU7kNxi+T4Ni3K62 q6CWWWAdXK0iIqh18LJXEVWM9d2vhYB7iBfLuLSYBHgCZjH4EKBANn0Sb1Q9h0jDdzwH82 8HTYh93s8BzjAaTBu5GziNQiDfcpdM+IUMHYKRtI6arC43v0mn1naGuL3tv5aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637709178; a=rsa-sha256; cv=none; b=ECv9ipk5N85ilMPwyY7bGZmWHtDHoY6USBYhfPnQ8UQ9UDf/HNHEXQXMqdc0rPgc8uQvOX WyiXAL1lSnmgRnzqi36/rkOt98tBI9Ie1r3tus+R85PagaKCKxm0hL6Je7FF+Cw2J33Agj 3E6Q1Erf9m4LGyeGuI00/A8gZnrk7WXwRXkqAtCyoNRoiOsD8am6Y3hotPfT/Bl8G8U7tw 4YlUPEb0U1EvK+ostZ8yUGaOqMnOR1BD4cgy2/j1aPoQW8+C+dPyofGFc16/igPSZY8Oiv FJAAXyKOy7XqQLDC2uuYjARZjvO/c6dhtfV8mRsxmVWG2NcstYxF4lBt0qdgtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=81b6dba1a08b031bdf7463c1704d27ae1e0daa0f commit 81b6dba1a08b031bdf7463c1704d27ae1e0daa0f Author: John Baldwin AuthorDate: 2021-10-27 23:35:56 +0000 Commit: John Baldwin CommitDate: 2021-11-23 23:11:45 +0000 ktls: Fix assertion for TLS 1.0 CBC when using non-zero starting seqno. The starting sequence number used to verify that TLS 1.0 CBC records are encrypted in-order in the OCF layer was always set to 0 and not to the initial sequence number from the struct tls_enable. In practice, OpenSSL always starts TLS transmit offload with a sequence number of zero, so this only matters for tests that use a random starting sequence number. Reviewed by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D32676 (cherry picked from commit 4827bf76bce8814b9d9a0d883467a3d2366e59a2) --- sys/opencrypto/ktls_ocf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/opencrypto/ktls_ocf.c b/sys/opencrypto/ktls_ocf.c index 78331b76abd7..71f6339e02ad 100644 --- a/sys/opencrypto/ktls_ocf.c +++ b/sys/opencrypto/ktls_ocf.c @@ -756,6 +756,9 @@ ktls_ocf_try(struct socket *so, struct ktls_session *tls, int direction) if (tls->params.tls_vminor == TLS_MINOR_VER_ZERO) { os->implicit_iv = true; memcpy(os->iv, tls->params.iv, AES_BLOCK_LEN); +#ifdef INVARIANTS + os->next_seqno = tls->next_seqno; +#endif } } tls->free = ktls_ocf_free;