From nobody Mon Nov 16 04:39:26 2026 X-Original-To: dev-commits-src-all@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 4jSZrv1djZz71500 for ; Mon, 16 Nov 2026 04:39:27 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSZrt6QyQz3Cdg for ; Mon, 16 Nov 2026 04:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794803966; 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=10EXXzR9uqPwXbDnQkyVs2irfarMyqncieU7vIY5NVw=; b=huw58CnZUTSaWNT7nYCYYJQ7jOd3I+PK98aUEXyAUTvfedYHVwX2fUDl+M5I7sLeQVaQMn Wo8mFdJQYx8/sV2xOQKoqIT6tJI9KXvuHOGnIi2bWwNnknm887RCxblyqulUNKmAqJKx4E 6UGvgK/5/lNSwAEcfO7RPR27vjDoa77EwcH4HHXxz83woJ5vfCxz/SFaBRiNv8d03sNKAO RZB4pjrwhJY5atq3TzhlQhZmULnglQp8uzPkasZmNE6yfwBLA+CUOn7Fnaq8JYX40eNbTx j9pRGkINWVNPJzbDuMCda5B0lXyMuMMb7WsrJt+Medd9zl22ZEISF7KGPCn+gQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794803966; b=EaituUoVfTNIiZwba14LuAjGG6yZs4XthkO5n98tlCVSpugz5JTLod1HgkMSPDuQrqAdeu xhI7Ft0iAToDnYLAvqDYUv1dwjCU4jBk3CLqvH/lEoLDygRiyIbE+8ZUGzJ+/5vaGMbWFp y1pQyf1k+fiIvQFOxYW7v/cQokeGleMqPLK3INIzzGwBK2m4YDyRAZBdreF6m99IHMlOB9 Hh6HzRcmP2HPpO2DXu/bo+FGej78J71qO59ABXGFufvrsz/VI/cIbZT9ovrHtSljLuBRc3 6vlmOXNJJPwhVjmNj6BbQLxXAKztVOoLWmrAiGpWE/PeO3NAJUevhyv8y5vUZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794803966; 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=10EXXzR9uqPwXbDnQkyVs2irfarMyqncieU7vIY5NVw=; b=l4luotN9EohyvmO7Ms17DSqwlYHSG3M9xhOhj/55y2g3QxwYlmNX1iCeWuYkthHGF7YK7+ RlbNDkqy+jjat01BW+ni24+H5Obbhz7MAGYQReWVS/+osalVlVb7u3Bz6QP4cZfAdKY36g rxQVTf0ASpkm3gTYbPBJDQeHwH3oRoxQnPfOyuW4LXj0VY5EiwMT/+Cui07rcLyMaZnCcr otjddoJwao2bxbzszFRbVviefcRxbf6R9FUciX1vR2CqVetArBvHFskmp4DPgQMK/EpzKf j029RJEWzyLENhRTKKWo+yqNn6LJrW4T/fi/gdHoHAKJf+w/ZrRXys4lVdq/9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSZrt5bgNzfbq for ; Mon, 16 Nov 2026 04:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8dd4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 04:39:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Tetlow Subject: git: 4ce723fb2550 - main - uefisign: use ASN1_STRING_set0() instead of ASN1_STRING_set() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ce723fb2550241970a58491b969ac3a7ac7127b Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 04:39:26 +0000 Message-Id: <6afa88fe.8dd4.2f6881f4@gitrepo.freebsd.org> The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=4ce723fb2550241970a58491b969ac3a7ac7127b commit 4ce723fb2550241970a58491b969ac3a7ac7127b Author: Gordon Tetlow AuthorDate: 2026-11-08 03:50:44 +0000 Commit: Gordon Tetlow CommitDate: 2026-11-16 04:38:33 +0000 uefisign: use ASN1_STRING_set0() instead of ASN1_STRING_set() Prepare for future OpenSSL API changes. OpenSSL 4.1 deprecates ASN1_STRING_set. Move to ASN1_STRING_set0 which requires the DER buffer to be allocated with OPENSSL_zalloc so ownership can be assumed by the string. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D61532 --- usr.sbin/uefisign/uefisign.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/uefisign/uefisign.c index bf6a2c0d0e42..942bf1851f45 100644 --- a/usr.sbin/uefisign/uefisign.c +++ b/usr.sbin/uefisign/uefisign.c @@ -204,9 +204,9 @@ magic(PKCS7 *pkcs7, const char *digest, size_t digest_len) * the actual signing. */ len = i2d_ASN1_TYPE(t, NULL); - tmp = buf = calloc(1, len); + tmp = buf = OPENSSL_zalloc(len); if (tmp == NULL) - err(1, "calloc"); + err(1, "OPENSSL_zalloc"); i2d_ASN1_TYPE(t, &tmp); /* @@ -231,7 +231,8 @@ magic(PKCS7 *pkcs7, const char *digest, size_t digest_len) t = ASN1_TYPE_new(); s = ASN1_STRING_new(); - ASN1_STRING_set(s, buf, len); + /* s takes ownership of buf. */ + ASN1_STRING_set0(s, buf, len); ASN1_TYPE_set(t, V_ASN1_SEQUENCE, s); PKCS7_set0_type_other(pkcs7->d.sign->contents, nid, t);