From nobody Sun Sep 24 16:19:23 2023 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 4Rtrmr18pbz4v97D; Sun, 24 Sep 2023 16:19:24 +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 4Rtrmr0gz8z3PTQ; Sun, 24 Sep 2023 16:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695572364; 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=dd173VF0RNeYQP2IK9+l8QSmuDFZTWRwFHX9+k/FZn8=; b=MtxxgyknC1xkM2eNtEw1LYpP2YeXxQkbQMSM5iDZ/CXRofgTxrnfQAygWDjkxwZYLVFy7R DN5l6URlAwXF5sgLXxXfLnQcfW7laLJ6OOcKV9MGb9QCIUSfwehCa+EfDBShjQyK+hcKtd ewXKg0N8Ix3lS1FlfRqtJLVbVrs08MDjY4fBx79TYnRaHdfR4/osaleLfMmiOZFf3YCyue tXG3qxqNaYpNeXNX8OEPxwN0fVBIwwRF0QBHyDLvg3HYF+qUYkK7D4o7AysfRQxR5P6fzb CunBh1otbrdVktjsghDuCeXJcaZgZWb47mi3BMhSlbfiQ8Vut3XlRkuMfGwLzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695572364; a=rsa-sha256; cv=none; b=h75ViYSIafiArBz68LoyYeo8vNX3t7GarXlXLozgVyIkpZC37N2fmrHOT+tmcrDa29ZJj9 CBRpgQPvh8NjsPl49xSS6Vj4KP5rZOh+OQ7X2ndGjA6mgotDJgKLmV4qKFO2SgeSTmi+eh ZNpGffLJySLEW8dSBUBNio76suK4R8blGoaCdy5yZfEwE7nck6IWZ7z8M/qMENaVPY9ESW hIN0Ehz8K5YewImDls2dGjRdcwztPyQH+19AWDAY8mBx85WSXCSQ0zKrBQssLck5FIC//m z2uzIeZ/NHB9RV/Th9WTcIHygvAXEP6W7mwEk8y2NFk20y0liBMWfF9UyspGvQ== 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=1695572364; 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=dd173VF0RNeYQP2IK9+l8QSmuDFZTWRwFHX9+k/FZn8=; b=NOTdg4HvqihtjOeGmSdvsgo8AYXhjvf4Mdn8dI49irmU6e309/7rQso/Au+oeMvIeqWg2t 7zL9y27roINa0kbDTCdPqzNCWv815GLHfTB9pyLihCr4Gwqsm4i3FQpujlNXF9lGBz07nj jxVJ+fTU/gP/HnO1qCI5WkJ8ImEbFmGsnA74S5BOQSC16Zy90PR+MrSPIOUv6/WulbjfhZ M1y1j+cMEgSWj2fOc9npvAKLLLOeBgTCrA8o/bKhRQNcQ4IfA2zhgcez116eeviMGUFdJ3 VKucuZa53DIzvyFWaCWsnxBpzqq/PH5tVKBjklj3KklyswR2pZPbh1r+Uo/ndA== 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 4Rtrmq6tNJztXQ; Sun, 24 Sep 2023 16:19:23 +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 38OGJNiJ079346; Sun, 24 Sep 2023 16:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OGJN7L079343; Sun, 24 Sep 2023 16:19:23 GMT (envelope-from git) Date: Sun, 24 Sep 2023 16:19:23 GMT Message-Id: <202309241619.38OGJN7L079343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f5892bbbaf54 - releng/14.0 - libcrypto: fix the FIPS provider on amd64 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f5892bbbaf54bfd40638359621265c47d1e419c3 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f5892bbbaf54bfd40638359621265c47d1e419c3 commit f5892bbbaf54bfd40638359621265c47d1e419c3 Author: Pierre Pronchery AuthorDate: 2023-09-04 17:57:35 +0000 Commit: Ed Maste CommitDate: 2023-09-24 16:18:20 +0000 libcrypto: fix the FIPS provider on amd64 This corrects the list of source files required for the FIPS provider. To test: ``` INSTALL PASSED enter AES-128-CBC encryption password: Verifying - enter AES-128-CBC encryption password: U2FsdGVkX1+MGm7LbZou29UWU+KAyBX/PxF5T1pO9VM= ``` Reviewed by: emaste Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/837 Differential Revision: https://reviews.freebsd.org/D41720 (cherry picked from commit 8f37b3a142f2f7197896cd283c44c7e4fb64aaf3) (cherry picked from commit abd9da936335eca88d670ad35a94ed67d911bdb1) Approved by: re (gjb) --- secure/lib/libcrypto/modules/fips/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index 145cb5993786..b77bcf785454 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -32,25 +32,25 @@ SRCS+= mem_clr.c .endif # crypto/aes -SRCS+= aes_cbc.c aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c +SRCS+= aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c .if defined(ASM_aarch64) -SRCS+= aes_core.c aesv8-armx.S vpaes-armv8.S +SRCS+= aes_cbc.c aes_core.c aesv8-armx.S vpaes-armv8.S ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto .elif defined(ASM_amd64) -SRCS+= aes_core.c aesni-mb-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S -SRCS+= aesni-x86_64.S vpaes-x86_64.S +SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S +SRCS+= aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S .elif defined(ASM_arm) -SRCS+= aes-armv4.S aesv8-armx.S bsaes-armv7.S +SRCS+= aes_cbc.c aes-armv4.S aesv8-armx.S bsaes-armv7.S .elif defined(ASM_i386) -SRCS+= aes_core.c aesni-x86.S vpaes-x86.S +SRCS+= aes-586.S aesni-x86.S vpaes-x86.S .elif defined(ASM_powerpc) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .elif defined(ASM_powerpc64) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .elif defined(ASM_powerpc64le) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .else -SRCS+= aes_core.c +SRCS+= aes_cbc.c aes_core.c .endif # crypto/bn