From nobody Wed Dec 10 14:40:56 2025 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 4dRJLJ5Vbvz6KfWD for ; Wed, 10 Dec 2025 14:40:56 +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 4dRJLJ3D3Hz3D4R for ; Wed, 10 Dec 2025 14:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765377656; 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=3z/ZL7jKN2uEjZEzreJk9sO3Xyl/mET9W/ewnDgjOiU=; b=LjAvxnbR/lBScNtQjhVELme+p/NmAV07Kj8BkPblVCTZcLhhVCZz+ag0zF+Pbf1yDx/iYt P9CsNU2uloZg2T9D/UplWwFtcu/ZnAozbFeYYyhyI14zJ+Bc7she0WxVMF4vFVIwlgZIk4 NGLWxvti8OPTNWw/uFUFq1bWNTeqd4MFtOHhO2Y70JSuko9LtSNeewch1AxFDC+m+oBOUJ pjhpvBB/RJeQgRfH2SoCSucuvWipaF3OBLPpiHikRzTs+rztOw/QNCalKlGi0i++5irpHn GNKSLVLKsKTjrwZteSCQcGQuzFlibsQOfdX/7Rf0nPtF4ukLZjrS+8N48OzLQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765377656; 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=3z/ZL7jKN2uEjZEzreJk9sO3Xyl/mET9W/ewnDgjOiU=; b=vaVG4wQDaqKMfB5Lq8JKZ/DsLSSDcazzA7W8dCaBFk9p51gyRx8Xkma/RWw3iy6SLDNf21 5uGFD+m72fHWzhXElIXg3qN8Yoo9JfzfMDkJ4BbXiDoIl1MsZGpyCTmR54mH9fUJeJb5Bp Ydw1tU9OglmBVDioMxzom+/QLukq8pXBUuDo0R2gi0B00ebjHxVHXbfLjeJX8+d22VVbHN blF0PaD/jRJtInvzA+AHBhFq4OQq8fOinYmtjL75HSLXuhmteoFiutTIX6GRi6T4X6Wyvm QSI1vHzDMTSzA9pK6PFaaxf8jEvQSZ/D5W7/sCyLhXVV5N4hr5xgHHPNO8GhtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765377656; a=rsa-sha256; cv=none; b=TYZhyakXnK82ABxJXkJMfZFYmmGlcKd5mgkEpbMHalOhGXojpgajtlZLEVmLR4K7sdxfWF dqDYBN+d3PcH6gxtg3d6/P9gACQVaTgJH0shAju0uCtUQ8TJccCk0rsqSrzTAJ0VidxGes JuU0CX16V763PJxc8oL6eKZdi66idoY4RSLrApdBMZLjchunUfdjG73kN3MPFkFglTSVvp vRdkQj29Qwv6upjehMkmiQBwFbkEIq4xuamIZrVwrdlytzqlyojrr8au4JP0gznLGoEXa9 G+zOZlAFjBbU5EUN3DUd5u3Hhw6W7NJixB08eMVRGsf9cvv3PRXDBo4m4MZq3w== 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 4dRJLJ2lvhzpvN for ; Wed, 10 Dec 2025 14:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31781 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 14:40:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7ad8cbab66f4 - stable/14 - certctl: Improve option processing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ad8cbab66f4db25be75e7a91c025a50bcab5dc2 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 14:40:56 +0000 Message-Id: <69398678.31781.da915ce@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7ad8cbab66f4db25be75e7a91c025a50bcab5dc2 commit 7ad8cbab66f4db25be75e7a91c025a50bcab5dc2 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-10 14:40:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-10 14:40:28 +0000 certctl: Improve option processing For subcommands that did not take any arguments, we never bothered to check that none were passed. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D54082 --- usr.sbin/certctl/certctl.sh | 93 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 21 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index 696bc4d6a176..bdca2d94ca8d 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -46,7 +46,7 @@ VERBOSE=false info() { - echo "${0##*/}: $@" >&2 + echo "${SCRIPTNAME}: $@" >&2 } verbose() @@ -228,6 +228,15 @@ do_list() cmd_rehash() { + local flag + + while getopts "" flag; do + case "$flag" in + *) usage ;; + esac + done + shift $((OPTIND - 1)) + [ $# -eq 0 ] || usage if [ -e "$CERTDESTDIR" ] ; then perform find "$CERTDESTDIR" \( -type f -or -type l \) -delete @@ -246,31 +255,59 @@ cmd_rehash() cmd_list() { + local flag + + while getopts "" flag; do + case "$flag" in + *) usage ;; + esac + done + shift $((OPTIND - 1)) + [ $# -eq 0 ] || usage + info "Listing Trusted Certificates:" do_list "$CERTDESTDIR" } cmd_untrust() { - local UTFILE + local flag filename + + while getopts "" flag; do + case "$flag" in + *) usage ;; + esac + done + shift $((OPTIND - 1)) + [ $# -gt 0 ] || usage - shift # verb perform install -d -m 0755 "$UNTRUSTDESTDIR" - for UTFILE in "$@"; do - info "Adding $UTFILE to untrusted list" - create_untrusted "$UTFILE" + for filename in "$@"; do + if [ -s "$filename" ] ; then + info "Adding $filename to untrusted list" + create_untrusted "$filename" + else + info "Cannot find $filename" + ERRORS=$((ERRORS + 1)) + fi done } cmd_trust() { - local UTFILE untrustedhash certhash hash + local flag filename untrustedhash certhash hash - shift # verb - for UTFILE in "$@"; do - if [ -s "$UTFILE" ] ; then - hash=$(do_hash "$UTFILE") - certhash=$(openssl x509 -sha1 -in "$UTFILE" -noout -fingerprint) + while getopts "" flag; do + case "$flag" in + *) usage ;; + esac + done + shift $((OPTIND - 1)) + [ $# -gt 0 ] || usage + for filename in "$@"; do + if [ -s "$filename" ] ; then + hash=$(do_hash "$filename") + certhash=$(openssl x509 -sha1 -in "$filename" -noout -fingerprint) for UNTRUSTEDFILE in $(find $UNTRUSTDESTDIR -name "$hash.*") ; do untrustedhash=$(openssl x509 -sha1 -in "$UNTRUSTEDFILE" -noout -fingerprint) if [ "$certhash" = "$untrustedhash" ] ; then @@ -278,11 +315,11 @@ cmd_trust() perform rm -f $UNTRUSTEDFILE fi done - elif [ -e "$UNTRUSTDESTDIR/$UTFILE" ] ; then - info "Removing $UTFILE from untrusted list" - perform rm -f "$UNTRUSTDESTDIR/$UTFILE" + elif [ -e "$UNTRUSTDESTDIR/$filename" ] ; then + info "Removing $filename from untrusted list" + perform rm -f "$UNTRUSTDESTDIR/$filename" else - info "Cannot find $UTFILE" + info "Cannot find $filename" ERRORS=$((ERRORS + 1)) fi done @@ -290,6 +327,16 @@ cmd_trust() cmd_untrusted() { + local flag + + while getopts "" flag; do + case "$flag" in + *) usage ;; + esac + done + shift $((OPTIND - 1)) + [ $# -eq 0 ] || usage + info "Listing Untrusted Certificates:" do_list "$UNTRUSTDESTDIR" } @@ -322,6 +369,7 @@ while getopts cD:d:M:nUv flag; do n) NOOP=true ;; U) UNPRIV=true ;; v) VERBOSE=true ;; + *) usage ;; esac done shift $((OPTIND - 1)) @@ -343,15 +391,18 @@ fi : ${UNTRUSTDESTDIR:=${DESTDIR}${DISTBASE}/etc/ssl/untrusted} [ $# -gt 0 ] || usage -case "$1" in -list) cmd_list ;; -rehash) cmd_rehash ;; +CMD=$1 +shift +OPTIND=1 +case "${CMD}" in +list) cmd_list "$@" ;; +rehash) cmd_rehash "$@" ;; blacklist) cmd_untrust "$@" ;; untrust) cmd_untrust "$@" ;; trust) cmd_trust "$@" ;; unblacklist) cmd_trust "$@" ;; -untrusted) cmd_untrusted ;; -blacklisted) cmd_untrusted ;; +untrusted) cmd_untrusted "$@" ;; +blacklisted) cmd_untrusted "$@" ;; *) usage # NOTREACHED esac