From nobody Tue Nov 23 23:13:11 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 55C9418A24C0; Tue, 23 Nov 2021 23:13:16 +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 4HzKgZ1Wywz3w1X; Tue, 23 Nov 2021 23:13:13 +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 7050F1F727; Tue, 23 Nov 2021 23:13:11 +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 1ANNDBhf038065; Tue, 23 Nov 2021 23:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANNDBXa038064; Tue, 23 Nov 2021 23:13:11 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:13:11 GMT Message-Id: <202111232313.1ANNDBXa038064@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: 6987f78ea136 - stable/13 - ktls: Add tests ensuring unsupported receive cipher suites are rejected. 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: 6987f78ea136389bfc0c117273e75ee68ee445f0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637709195; 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=cquyAvb+lRmAbSM8tQ3ep+Z+O76zMJeAENFsF6GEjlw=; b=uS0sSWVPDb9ugRtwqs5vvIym53oEVWfD5JCJ7xrP1U4CBsXOkG5lTLpKE3KJmZzzXAjUXz A4fi6uKX5iDjjaq/M3/qoiYdEY/97bGlShyu1Flf12P62C2MR8H3raVLA7xjZVx693OSVD 4u1B0HlYpHGZ17E9gP4gze4nfnIzJ99T8HdfHF0jWHPR7v5ZB+OJqqeAFVQdSjQVTCSuGy U9zg22CTqEfEdcHveKtapjF+OkRcF2sLTT8Dwq6lAvfxHWdvsRj0s+N6jQyjq083dryl7y 3/gBkNaX/3dtfmwqSAnn5gVc4zsNVzPEdmQ6dztyXUEvOldANK7xO5TQ4oSRrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637709195; a=rsa-sha256; cv=none; b=s1jtlTLmQB3mrXGOjTYlYYtcGXJukh38YbbPW9CYC4dWxWDVVsF3pNskoQNWgQ9LafPSyp KJjUB4A1qiSM+DzDAFCsTSwuuPHqXrT22xB8pLks304R7nM0PsUSg9LhSthSzn+8ypHz+G gdIGzmB1zyV3WIpnbhbwV3huvqYGlDSSh29o/m8kZo1l1Tuj2xQVWG8Zsgs+ZPJy+Hnrzh xym9Gx+SQ0Ns2FXaBiEKQOrAnJTluhWs1lDgCUbLSyOfuAswZASRzyxPpfa6w4REuSm2LU Uh5aXeftAWdG/uMvCQLRgMWs40E9hQK8CtEcKsWgSWgxFc56FmCC23/YCKQ2fQ== 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=6987f78ea136389bfc0c117273e75ee68ee445f0 commit 6987f78ea136389bfc0c117273e75ee68ee445f0 Author: John Baldwin AuthorDate: 2021-11-15 19:32:49 +0000 Commit: John Baldwin CommitDate: 2021-11-23 23:11:54 +0000 ktls: Add tests ensuring unsupported receive cipher suites are rejected. Reviewed by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D32982 (cherry picked from commit 83a54b582f89ff63f9076eb7d50b5cdbd009905f) --- tests/sys/kern/ktls_test.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index 5aea56baa91f..21e3213a8634 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -1237,6 +1237,14 @@ test_ktls_receive_app_data(struct tls_enable *en, uint64_t seqno, size_t len) M(chacha20_poly1305_1_2, CRYPTO_CHACHA20_POLY1305, 256 / 8, 0, \ TLS_MINOR_VER_TWO) +#define TLS_13_TESTS(M) \ + M(aes128_gcm_1_3, CRYPTO_AES_NIST_GCM_16, 128 / 8, 0, \ + TLS_MINOR_VER_THREE) \ + M(aes256_gcm_1_3, CRYPTO_AES_NIST_GCM_16, 256 / 8, 0, \ + TLS_MINOR_VER_THREE) \ + M(chacha20_poly1305_1_3, CRYPTO_CHACHA20_POLY1305, 256 / 8, 0, \ + TLS_MINOR_VER_THREE) + #define AES_CBC_TESTS(M) \ M(aes128_cbc_1_0_sha1, CRYPTO_AES_CBC, 128 / 8, \ CRYPTO_SHA1_HMAC, TLS_MINOR_VER_ZERO) \ @@ -1612,6 +1620,48 @@ ATF_TC_BODY(ktls_receive_invalid_##name, tc) \ */ INVALID_CIPHER_SUITES(GEN_INVALID_RECEIVE_TEST); +static void +test_ktls_unsupported_receive_cipher_suite(struct tls_enable *en) +{ + int sockets[2]; + + ATF_REQUIRE_MSG(socketpair_tcp(sockets), "failed to create sockets"); + + ATF_REQUIRE(setsockopt(sockets[1], IPPROTO_TCP, TCP_RXTLS_ENABLE, en, + sizeof(*en)) == -1); + ATF_REQUIRE(errno == EPROTONOSUPPORT || errno == ENOTSUP); + + close(sockets[1]); + close(sockets[0]); +} + +#define GEN_UNSUPPORTED_RECEIVE_TEST(name, cipher_alg, key_size, \ + auth_alg, minor) \ +ATF_TC_WITHOUT_HEAD(ktls_receive_unsupported_##name); \ +ATF_TC_BODY(ktls_receive_unsupported_##name, tc) \ +{ \ + struct tls_enable en; \ + uint64_t seqno; \ + \ + ATF_REQUIRE_KTLS(); \ + seqno = random(); \ + build_tls_enable(cipher_alg, key_size, auth_alg, minor, seqno, \ + &en); \ + test_ktls_unsupported_receive_cipher_suite(&en); \ + free_tls_enable(&en); \ +} + +#define ADD_UNSUPPORTED_RECEIVE_TEST(name, cipher_alg, key_size, \ + auth_alg, minor) \ + ATF_TP_ADD_TC(tp, ktls_receive_unsupported_##name); + +/* + * Ensure that valid cipher suites not supported for receive are + * rejected. + */ +AES_CBC_TESTS(GEN_UNSUPPORTED_RECEIVE_TEST); +TLS_13_TESTS(GEN_UNSUPPORTED_RECEIVE_TEST); + ATF_TP_ADD_TCS(tp) { /* Transmit tests */ @@ -1623,7 +1673,9 @@ ATF_TP_ADD_TCS(tp) INVALID_CIPHER_SUITES(ADD_INVALID_TRANSMIT_TEST); /* Receive tests */ + AES_CBC_TESTS(ADD_UNSUPPORTED_RECEIVE_TEST); TLS_12_TESTS(ADD_RECEIVE_TESTS); + TLS_13_TESTS(ADD_UNSUPPORTED_RECEIVE_TEST); INVALID_CIPHER_SUITES(ADD_INVALID_RECEIVE_TEST); return (atf_no_error());