From nobody Sun Sep 06 19:19:00 2026 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 4hdKkX5C0gz6rYvB for ; Sun, 06 Sep 2026 19:19:00 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hdKkX3NHtz3bJB for ; Sun, 06 Sep 2026 19:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788722340; 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=thFNMuNkLj1wCu9SpAUK+UWp1O3LjJ4LQQCxJkmZD/M=; b=sy4ZkzA9Yg1jvJVFDa9hlg0yLRiahwCXt+jv5YDSAkdC5ly/wf/YggttKzYlw2TUkEY8VU b+DQ1wembFJELSBqQnvNsbT2Spit1OD6IVQ2uZ17VG+QqADwUQpEMnj78Qbxai7pnn7K9k jvUR+NQUbaWTBRkXOY4WJrqvXoG/xREPKAofkJDQzx3eo7nDCGPaV2CZ4B6/ImobKqYT+A oK36XEaEMCqpzo9CKqNFvZAZPuZrfvqreo7UoIl9BQQ0zUyVZb6JHwMslnTTVNlii3BoKy 6FCae0n8Q655Z/IUwx+u38b2Ni4rmgc2hY8RF0eG3b7rW73VfEhcu+vwdZLtOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788722340; a=rsa-sha256; cv=none; b=ASs0ufhVuhuc2RK6Gyj59UiEfUcvhqsvj8QqwsizBEkxb+kw3xK6kazAja97S1ZUBIuXE2 KQl77A30ZQL63tx07G7raD7YDRTM52MzpJVeuifzgGi4fQf+m7LPNcYtxprKTBZ1FM2wxw gGomSgWyYQ1wu4R2FSDFmxLIzlfUQhPpuZRrup8OYZL6lLAT6/Mp41N/X6Uq9eUs1YY+E0 LmfC6VvmB7zo5hzLSAZkK+Ha7P5t5uf22pxVyDVYkkGgbDVGNPMhZsQ7Ml23/QedCV+k9M BhpzDeE+U63x6dyP1/cY9ulZPiN6knbi3d6NBfyCI0ZyW6pH8VYHTHuQwzwl8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788722340; 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=thFNMuNkLj1wCu9SpAUK+UWp1O3LjJ4LQQCxJkmZD/M=; b=v8thnLVB69osYRDaREo75Grnk846f5PSDZ4r4tgncgDnNOn6w1dlPNnaVeT+H9Y+asvYPK YaVX2xlJbKtoQOJ+xD+Fq8+QI7+3QPgWclMi4bFFTauvp8DQYeME9C/fsx3yn5RDW5h5rp ABk5qY1y/GNIgUveQkgkuxgVGwjgwj+jHTwpUps3NMqeMc1j9SGyXeMDp5ctjEeoaXHh5n Y1fZlJSc4kbUy445tdD4CTH6UQ50mF67W9/dJE4aZjQb48w1292vgFV0xylyiyKWg2rZCK dGbXnVrhZrO9Az+9g45nEQwiu9ajhmIjzLXFkog77ADxlrnOhKBItBi8HwIWjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdKkX0kS4zlYv for ; Sun, 06 Sep 2026 19:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 397c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 06 Sep 2026 19:19:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 0cf1002113b9 - main - tests/sys/kern/ssl_sendfile: fix the build with ATF 0.22+ 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cf1002113b90b74ac2c1973ca649632c8c7552a Auto-Submitted: auto-generated Date: Sun, 06 Sep 2026 19:19:00 +0000 Message-Id: <6a9dbca4.397c9.3d3ce0af@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0cf1002113b90b74ac2c1973ca649632c8c7552a commit 0cf1002113b90b74ac2c1973ca649632c8c7552a Author: Enji Cooper AuthorDate: 2026-08-19 15:21:25 +0000 Commit: Enji Cooper CommitDate: 2026-09-06 19:18:26 +0000 tests/sys/kern/ssl_sendfile: fix the build with ATF 0.22+ Code that assigned variables as part of ATF_\* are no longer permitted due to changes introduced in [ATF 0.22][1]. MFC after: 2 weeks Reported by: clang/gcc (-Wparenthesis) Differential Revision: https://reviews.freebsd.org/D59286 [1]: https://github.com/freebsd/atf/pull/72 --- tests/sys/kern/ssl_sendfile.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c index c16640572bb1..3b93b3beef28 100644 --- a/tests/sys/kern/ssl_sendfile.c +++ b/tests/sys/kern/ssl_sendfile.c @@ -99,8 +99,10 @@ common_init(struct ctx *c) SSL_library_init(); OpenSSL_add_all_algorithms(); SSL_load_error_strings(); - ATF_REQUIRE(c->pkey = EVP_RSA_gen(2048)); - ATF_REQUIRE(c->cert = X509_new()); + c->pkey = EVP_RSA_gen(2048); + ATF_REQUIRE(c->pkey != NULL); + c->cert = X509_new(); + ATF_REQUIRE(c->cert != NULL); ASN1_INTEGER_set(X509_get_serialNumber(c->cert), 1); X509_set_version(c->cert, 2); X509_gmtime_adj(X509_get_notBefore(c->cert), 0); @@ -142,10 +144,12 @@ common_init(struct ctx *c) /* * Connect client. */ - ATF_REQUIRE(c->ctx = SSL_CTX_new(TLS_client_method())); + c->ctx = SSL_CTX_new(TLS_client_method()); + ATF_REQUIRE(c->ctx != NULL); ATF_REQUIRE(X509_STORE_add_cert(SSL_CTX_get_cert_store(c->ctx), c->cert)); - ATF_REQUIRE(ssl = c->cln = SSL_new(c->ctx)); + ssl = c->cln = SSL_new(c->ctx); + ATF_REQUIRE(c->cln != NULL); ATF_REQUIRE((c->cs = socket(AF_INET, SOCK_STREAM, 0)) > 0); ATF_REQUIRE(connect(c->cs, (struct sockaddr *)&(struct sockaddr_in) { .sin_family = AF_INET, .sin_len = sizeof(struct sockaddr_in), @@ -192,7 +196,8 @@ server_thread(void *arg) { }; int s; - ATF_REQUIRE(srv = SSL_CTX_new(TLS_server_method())); + srv = SSL_CTX_new(TLS_server_method()); + ATF_REQUIRE(srv != NULL); ATF_REQUIRE(SSL_CTX_set_options(srv, SSL_OP_ENABLE_KTLS) & SSL_OP_ENABLE_KTLS); SSL_CTX_use_PrivateKey(srv, c->pkey);