From nobody Thu Aug 10 23:33:35 2023 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 4RMNXb6HYmz4Tk5B; Thu, 10 Aug 2023 23:33:35 +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 4RMNXb2hjBz3YdY; Thu, 10 Aug 2023 23:33:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691710415; 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=A62JLDb5pCHuusHK09aKfslqFE/uNILzS8Wo4vIMHfA=; b=YHZZFCrf0vFvfnPpoMKW+PwBY5pGEM12agxzrS5N1Uu0bTOEaUSV/XGumpeM4uaXdMMocg OItmldu64Z10uNXoGrnMlyG+lJ0OL1GGuLeNzPoHdLaQ85bN52jlWVZyrbQC6Vzmr6kW32 InprlOwvhughc4qSeISzgJfsGO3uqPmeudWm9COUZdN72cWjAxe9Ucp1gtiNMO+ZyYg0Oa q01q0iznIC9F8whZ9LvP0oqqgXcyJzS9uAES3I3LfIfQsRa4xYYJgQcFHToHmD734zC8ZI C4iRPSVb+TjcKs/9EJWzlnZf8RHZ6Hp0U2f0UkNdVM6t3QM+78Tm2hIizfoSRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691710415; 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=A62JLDb5pCHuusHK09aKfslqFE/uNILzS8Wo4vIMHfA=; b=S3eyox81C5TO1HTXm24RDajld1s5oSeFxA5p4KS5tW8L+7wxEXhXfz5ZGn0fXP2j8T7BH/ iqQquwAJC6n3qMgHaMMVX/kL9C+pcndW7sa5XMIydjay+mAWegD+KeoVy7gSYku0KlEpvB OctcSD2UVzPDWtSGrVNf5rZXSdk2jluOLTNXyXUZiwhMBjmeZiKiTGpbRU5QOJPh21OSXK rN5YxWGVOSmf/2CKZwHPJjJ0zyBMj5xaSkrzLp6FCkALKZ9sBK4FqQzZ/Qlp+NDZ/xRGCT W/PPseluwKHEvmAO6xfA0Z7L6PePTE3Hd10bjzEMFfVjIlOKfVQNWrs003EnrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691710415; a=rsa-sha256; cv=none; b=sxH12ubDR2K0VyxWbZS6osq45oLb25LR/2QsyiigcToPsztWo2p6es1tycj0L8dghyuB/N dSzDtqX7D/tPmb78v+kRn4OwxEg+ZF3pFwgXlTHfi/WcdCY1OZDhqBvcAfY4DrjrlehrON c4osz8ycwOiePMDr9Sr+SvYxCaHKncr+0PSWApHMHyl3+ziiL06dsU8s93PeAfXEp7KMQx isgu7GIzTMtsCw4xjq9EhRyoFssrzFpyWY92f6zYTB5Gpkn+/gtCBPsRJoBdXo3/tzGmDA mtoIDu3EPzIfxf2R7tcOkm75UIqjeMxkW8KVfz8vEtCfFxAV+y2olp6lKfGSHg== 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 4RMNXb18zzz2dc; Thu, 10 Aug 2023 23:33:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ANXZeK041600; Thu, 10 Aug 2023 23:33:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ANXZrZ041597; Thu, 10 Aug 2023 23:33:35 GMT (envelope-from git) Date: Thu, 10 Aug 2023 23:33:35 GMT Message-Id: <202308102333.37ANXZrZ041597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: c45e66dca3e4 - main - Unbreak usr.bin/dc with OpenSSL 3 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c45e66dca3e4f3073132b6f3e94623c2314f679c Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c45e66dca3e4f3073132b6f3e94623c2314f679c commit c45e66dca3e4f3073132b6f3e94623c2314f679c Author: Enji Cooper AuthorDate: 2023-08-11 03:36:48 +0000 Commit: Enji Cooper CommitDate: 2023-08-11 06:33:44 +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 --- 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 ded130facc81..d9a42073e6b3 100644 --- a/usr.bin/dc/bcode.c +++ b/usr.bin/dc/bcode.c @@ -378,7 +378,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) @@ -811,7 +811,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, ©)); @@ -896,7 +896,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 e2461923d819..29d8d147e9e7 100644 --- a/usr.bin/dc/inout.c +++ b/usr.bin/dc/inout.c @@ -192,7 +192,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) { @@ -230,8 +230,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));