From nobody Thu Sep 21 15:38:32 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 4Rs01467Dtz4tbKx; Thu, 21 Sep 2023 15:38:32 +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 4Rs0145h75z4Pch; Thu, 21 Sep 2023 15:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310712; 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=bIW0w2F66pxBUmDosymSgIfkDJ9gYiQ7IsRlYjwp4iI=; b=r4ctkC/kGqY9OJ4WpJjs9kQN1WM31ae/cHbi+CCRk/LOPFiuMiUG9YkoxJ1ZPyD3AY5Lvn aQgzsRXlL4Wi+vY3JdcQP/fQT3WGTEFu82l/HQdSOOpFnX5W1+2Q5dlhHNlarw/7ebb4Wb CUOzO3Ov+ODZPQKzFEtJ0i7wsMi279JnMZOr/uWxNmEtlHnIZRsEa2ttQxGvCvYwqloKb1 dELwr1/QGk4r71Qxb9HEIjSHHDRTIwh9Ex53J7Z6+QR/hOgLGKILxzDay1br7px8zrsk12 ucleB8i829HSkxZCr1oBIUCz2u6EbeskXsk8GUEkEd7R7btbr008G1HMjuEhcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310712; a=rsa-sha256; cv=none; b=gtQMxYNu7kt+CCcqVDDdj0BJPvNlLcVb5S9c63TquGCQD8KyjtZNF17+KMEFzNNW1bxhcD Cq7Ch8h+YylftdjLLUc0WfWSotQGirga09GgqiADrH/1wPaG34ok13U/qskjRSoEZaGW2S kyDKh89tIzWXEBeEl8kkkRmI1EvlaOScYu20BUShBhOGoPACkkwo+GxSdAUBAr9NywKeu6 BokfpKZFK0n7Ib2ZKsQuKnQkq6y1SeVCy5qmF7Cd5uWGZ+ApaI891JBUiEv/ImZsOgApYz JG2nxBT+Jo8IdNMETJNfz1KxSPU2LLtRLRk1Cj2/jNMYLi0agzE9NSe4KC5pCQ== 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=1695310712; 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=bIW0w2F66pxBUmDosymSgIfkDJ9gYiQ7IsRlYjwp4iI=; b=eFpAAMYYTWBSjR6N7FTioOYDLPdX3SaAVlwM55hgLoimf+pKexGHQkQ4G577UNtwY/icOw xInUHBHd/qLZnkg2JEJ26bqOWKfmtnaNAxpDrceU7yzhNEy8DTp5jeK5er589BsNtxWN9M 5/atr8JNMFYp1nVjrSWaVsHFzOsqE6eL0nfoq0iznyS7irf/8W/wdLKAG76hwNmoUFqmkl jCQL5aShV+I9KDjC9QCw4dE/ZM9BpTrXc+WGoxXeqE83Q583mOUNwiEi3va7t9RC4URs09 0Gu+EUjbIWh9IVY29HnoVgWLpSemsejDiHzr0tFY3RSub0NycI0/b9JYjhqJ4A== 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 4Rs0144RvWzkmT; Thu, 21 Sep 2023 15:38:32 +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 38LFcWiT008047; Thu, 21 Sep 2023 15:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFcWEe008044; Thu, 21 Sep 2023 15:38:32 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:38:32 GMT Message-Id: <202309211538.38LFcWEe008044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8f37b3a142f2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 commit 8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 Author: Pierre Pronchery AuthorDate: 2023-09-04 17:57:35 +0000 Commit: Ed Maste CommitDate: 2023-09-21 15:38:02 +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 --- 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 b674126bb6cf..8843cb9717c9 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