From nobody Wed Sep 24 04:49:34 2025 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 4cWksV3wcLz68TQy; Wed, 24 Sep 2025 04:49:34 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWksV351Tz3T5L; Wed, 24 Sep 2025 04:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758689374; 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=t40GR1DCbulGOs7eyPqMcA98oXVRNHQpwp+wiYlRrDQ=; b=n76CGpePj9hXfy/vSbKHlI1n2ERTQb9gzbrcJ0UWCCG9US09rdW3XHOuV2U5gZPHQo2mQS 7JIJQQHcoMXUTpdIuf72jNLLkb9ThVc8Mqf67J/jsYD6CVRMZfaqqJivpjB+nqyByFU7a7 f2XTUgB5vr+WPL8Jp4XUjSwnK64LlqEjL7fFen0rOyGH0sho9gl0EbbiNtNYFPd+ArST0F oAlsDCYNXAhjZw0sueVPc9s8I5yP23B8ney9pP5vmc9t44/uWuTKmVKaCcyDZp18b/s3aY mi1OsGnfx2Uv/j0NK5wkHDOdpZC5kdyFNPG46yf0ycaNiqfnP5KA9HwUyefXCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758689374; 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=t40GR1DCbulGOs7eyPqMcA98oXVRNHQpwp+wiYlRrDQ=; b=UY6jNr5DvTWV8U+KgitWfxr0RXjNDFjfu9uTpHSGL2lBEH+6pUvK1VAq58M3tRa9T1zJGf vR1LI8kmetOXxL8g8B0Z5ZSMjZP7dQcvaNfoRAn29wNXadi6zX+hCHvAwD6ZW4FMAL9Q28 CC9noxTd7jIPaJOZeL/JuJrfUIrlkaFo26geKT/JppH9of35Y+8zqj20AIvxih6uYnIkN1 QZgUwBJ38Erpq9YG0CgJMIZhzLkgKaDm/cnw1FJOMKRI1qtuNSz2L1QbfnJjul3FWFr3c0 /p1USWbKGl2D5AW8msDkeFIPgAauc76bbsWFYH0CwABrAcNZhTboI9XRSsJPCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758689374; a=rsa-sha256; cv=none; b=MJCQxW18JZDPa34PF5ie0fGZvuWHK2wSGmhQz/GQADdh1CQrKCwS9SCZmCynfc1bP2TPTA 8YTOjTReSFXLUews5FE+tCceiUP6ZzYuDgSUZSHzBdJwXt0HlQJZo27svLLeUt4q1q5I4W ZIcto32nZtxaDcju3sWpSJ8cXMEUa19j+lUwwm97qC94NbeOylos7MNCId6gFWrOR8PsXH 6Nuie0/WgRRYRl/b7oXORWOOvqNcI2yJomeacGuMTSVai1MWZ1ZgxNoeURsKE94V5sMzEU gr8C/QfB6yuf5buznsRjwhB14P3ifGOW+VQv/lnJyOSc/a9HCOjTd2m3S0AtlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWksV2gmjz2Lv; Wed, 24 Sep 2025 04:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58O4nYwr093621; Wed, 24 Sep 2025 04:49:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58O4nYK8093618; Wed, 24 Sep 2025 04:49:34 GMT (envelope-from git) Date: Wed, 24 Sep 2025 04:49:34 GMT Message-Id: <202509240449.58O4nYK8093618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 6ff0347e8f0f - stable/13 - Unbreak usr.bin/dc with OpenSSL 3 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ff0347e8f0f64a3dade6e522d565b5f73edfbef Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=6ff0347e8f0f64a3dade6e522d565b5f73edfbef commit 6ff0347e8f0f64a3dade6e522d565b5f73edfbef Author: Enji Cooper AuthorDate: 2023-08-11 03:36:48 +0000 Commit: Enji Cooper CommitDate: 2025-09-24 04:49:26 +0000 Unbreak usr.bin/dc with OpenSSL 3 OpenSSL's BN_zero API has had a void return value since 1.1.x: chase the change to unbreak the build on OpenSSL 3.x with MK_GH_BC == no. MFC after: 2 weeks Reviewed by: emaste, kevans Differential Revision: https://reviews.freebsd.org/D41410 (cherry picked from commit c45e66dca3e4f3073132b6f3e94623c2314f679c) --- usr.bin/dc/bcode.c | 6 +++--- usr.bin/dc/inout.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/dc/bcode.c b/usr.bin/dc/bcode.c index 37fc5a7b32fc..0e34f0399035 100644 --- a/usr.bin/dc/bcode.c +++ b/usr.bin/dc/bcode.c @@ -376,7 +376,7 @@ split_number(const struct number *n, BIGNUM *i, BIGNUM *f) bn_checkp(BN_copy(i, n->number)); if (n->scale == 0 && f != NULL) - bn_check(BN_zero(f)); + BN_zero(f); else if (n->scale < sizeof(factors)/sizeof(factors[0])) { rem = BN_div_word(i, factors[n->scale]); if (f != NULL) @@ -809,7 +809,7 @@ load(void) v = stack_tos(&bmachine.reg[idx]); if (v == NULL) { n = new_number(); - bn_check(BN_zero(n->number)); + BN_zero(n->number); push_number(n); } else push(stack_dup_value(v, ©)); @@ -894,7 +894,7 @@ load_array(void) v = frame_retrieve(stack, idx); if (v == NULL || v->type == BCODE_NONE) { n = new_number(); - bn_check(BN_zero(n->number)); + BN_zero(n->number); push_number(n); } else diff --git a/usr.bin/dc/inout.c b/usr.bin/dc/inout.c index 20eeb5961683..a91531b2c769 100644 --- a/usr.bin/dc/inout.c +++ b/usr.bin/dc/inout.c @@ -190,7 +190,7 @@ readnumber(struct source *src, u_int base, u_int bscale) bool dot = false, sign = false; n = new_number(); - bn_check(BN_zero(n->number)); + BN_zero(n->number); while ((ch = (*src->vtable->readchar)(src)) != EOF) { @@ -228,8 +228,8 @@ readnumber(struct source *src, u_int base, u_int bscale) base_n = BN_new(); exponent = BN_new(); divisor = new_number(); - bn_check(BN_zero(base_n)); - bn_check(BN_zero(exponent)); + BN_zero(base_n); + BN_zero(exponent); bn_check(BN_add_word(base_n, base)); bn_check(BN_add_word(exponent, iscale));