From nobody Thu Jun 27 15:31:16 2024 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 4W92bT22fXz5Pth8; Thu, 27 Jun 2024 15:31:17 +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 4W92bS3CR0z4CZn; Thu, 27 Jun 2024 15:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502276; 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=siJKRIq+EsH4neb+M+dxoLf0N5UhJLa0xj/iJXKbxyg=; b=qqhr7uhfRMF1qSoixCbeGN08mxl2AX3qGS22psxJv0QO5Nc2bRyF6IA2nh+NyuKFaQqpMs 8DsIsYFIl6HZeW2gpqukgVay9/4Vqdsb2RIo1xeyhgt4qpAIz8C783DFDCWFAxlg78qBkG 43aKId0dunbqgs6O3yNj97Go7P9y2K8vWxHhF/XlwN2wlAcw9SzXFDQGtsYBtjpDYcK/ua AD4t3hr2xnXhXtGh1Ai2fZw4xXFqNRlBMj1tiG+2IpzPdbGQ9sh4rLa+aAM7XkePzIpta9 l8yi7yoHh+MPxvs5rUEIm839t3uZo+6qsUXecf2ORFyQN9Z/a17Y/y5HoH+RMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502276; a=rsa-sha256; cv=none; b=LFJS1+0WPx4sjmV8yL96u2+TgUKqArDpK4OO+F9xgRnW4UDrmWDDmag1ckGOdCWKVwNqCy p9ktNcKUnwdttkJNthrKDf0370psan6zNsDMU1kg1WuWyREiCotT5RdTy7m07NLF4giTmz O7ty3RkFCYpsr3LhjDuWsmTJmHRt5p29SPcFAsirEp0QpGBvf2T6RA7VLMzb1SmctcTDNi nFmkspOhj/+2pq8jTqRkirx7dB+TAzQqr63nUag6a0/lMQvQ9RyXq6WUsa0SwEGJDS2Cet qtUE4kbD2/b2qdzrNIZlZJDX08iOpeFsXhViiV7uKE6HplgzPcPs3G1UjJsLGA== 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=1719502276; 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=siJKRIq+EsH4neb+M+dxoLf0N5UhJLa0xj/iJXKbxyg=; b=SFPJw61gjO6Pqrx/fA66YDD1bfuBAfmCMaBdBjSQ6r7d9wl3PITJRxZrHNX7AuvfqrpSDD iLTOEt2jGzK8bAqEVyEwE17th41eON8PUd1oou82QGkikevKyaYxzkI8SvMwnVHoiLhqQW L39/W/f9WuQ1yiVRuX3SyunlrgIm8vFLI2PBERuwSrkEylCRcx1RnB2EIsi507Hv5IrMjf Kl2pVRAiELLepxFUz+KGQXTVEP9UaR7E0wpOV16DIRHjXCYjDHKdrgfDkkTAFA92R7NSSh oWHjnbz3OADkc+czY+/0/8nHgrDB7j2+2oVVUahb0X05NuHZ9477bVltDDLTOw== 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 4W92bS2KLWzJDJ; Thu, 27 Jun 2024 15:31:16 +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 45RFVGAP079096; Thu, 27 Jun 2024 15:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVGCf079093; Thu, 27 Jun 2024 15:31:16 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:16 GMT Message-Id: <202406271531.45RFVGCf079093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 48d60dd3ac32 - stable/14 - padlock: Use device_set_descf() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 48d60dd3ac325b61bf7d07c024ce83b84da97e14 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48d60dd3ac325b61bf7d07c024ce83b84da97e14 commit 48d60dd3ac325b61bf7d07c024ce83b84da97e14 Author: Mark Johnston AuthorDate: 2024-06-05 19:33:59 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 padlock: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 131c8ee7331af701c78e694c9c7051f53600c4fe) --- sys/crypto/via/padlock.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c index b8dae256dbf4..2acdefd75bc6 100644 --- a/sys/crypto/via/padlock.c +++ b/sys/crypto/via/padlock.c @@ -80,31 +80,14 @@ padlock_identify(driver_t *drv, device_t parent) static int padlock_probe(device_t dev) { - char capp[256]; - #if defined(__amd64__) || defined(__i386__) /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { device_printf(dev, "No ACE support.\n"); return (EINVAL); } - strlcpy(capp, "AES-CBC", sizeof(capp)); -#if 0 - strlcat(capp, ",AES-EBC", sizeof(capp)); - strlcat(capp, ",AES-CFB", sizeof(capp)); - strlcat(capp, ",AES-OFB", sizeof(capp)); -#endif - if (via_feature_xcrypt & VIA_HAS_SHA) { - strlcat(capp, ",SHA1", sizeof(capp)); - strlcat(capp, ",SHA256", sizeof(capp)); - } -#if 0 - if (via_feature_xcrypt & VIA_HAS_AESCTR) - strlcat(capp, ",AES-CTR", sizeof(capp)); - if (via_feature_xcrypt & VIA_HAS_MM) - strlcat(capp, ",RSA", sizeof(capp)); -#endif - device_set_desc_copy(dev, capp); + device_set_descf(dev, "AES-CBC%s", + (via_feature_xcrypt & VIA_HAS_SHA) ? ",SHA1,SHA256" : ""); return (0); #else return (EINVAL);