From nobody Tue Jul 04 20:39:14 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 4QwZQb5Yrhz4mFv1; Tue, 4 Jul 2023 20:39:19 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QwZQb1dpLz3PL7; Tue, 4 Jul 2023 20:39:19 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-7659dc74d91so635401285a.0; Tue, 04 Jul 2023 13:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688503158; x=1691095158; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=k9W17kwyz5dYNOnPpWfIGiT/IOdlAJLkcD/j+H8C7P0=; b=a8Mny1mvvsKDcSMFVX7/EHxrTyNBdumq2gMGaOxuV71pQsupmuuJkYBK00tlbiE3+4 Kl1R7Xl77BeXqvIeSS1IaVhK9nwA9t7ize6MZmyXG9kvxByBfN+GTllpyNE3FGCu386G VpHG4HH4CLTJzmeDPo8kpKs1/PcUyjroiY55pzj9LSf33DrsLQQB2QS7yuTKCA5ICXbr ckL9D4820Pj7+H1Gj0g/TaPiW7wloNCtDQ+ZqraVZ0wNCC1+8ddA0Mwn6yp12ReQbF6A 3tQ3Lp7HRtEVv75ZKrMn70IFDsvdfqJDkP3T8ljYp2IULirplnB1N0r4mUTGOEb1UR2z kIaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688503158; x=1691095158; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=k9W17kwyz5dYNOnPpWfIGiT/IOdlAJLkcD/j+H8C7P0=; b=cTXE6btqRLzpm/EcrZ6hcpPcHpuUTWMPVCgWoLYDUgy4FwVsNiYZ1aGSxCWyhytUlS rVpRNF7BO5q4k4oY2/wgDDzndB7v3gQKiQEjTe+yR9rcabc6TVENkszZprwerNHzNzdT Bkj9CNbyBwfcQLEe5Lc1CBhGWSoWCfoaAD6r+u/pdTEL+zzBl/jZcX+qCwgmqWMZnV0x tBQvKnseoV4NVncV/B3LAyNnJSphyUIpd2q45artlnW7+OJb7ATCKCMPBmEmQ0JomTCa Qp/HcbWRpBLKYxbOn6MWiicK2n6Jt3JTcAPteWoml8UHHZLDxSGvmfRsYLaTsNNjnl+9 qRIQ== X-Gm-Message-State: ABy/qLbOtFq25XsYdUBd/XADcDftnCaA9LgPUId3HZeYMpXFc1NAbNvO vAzZeJDzoxkn625RwBuLER6x13U5XeA= X-Google-Smtp-Source: APBJJlHn3R2fJ3nx7tiXrkgrX1eG2ZvoaXaLCMVsPe4A6CvqDT+wtkDaAVmRRBOcD5aNZcxfofaaHA== X-Received: by 2002:a05:6214:d0e:b0:629:58a7:9a9d with SMTP id 14-20020a0562140d0e00b0062958a79a9dmr16329076qvh.10.1688503157734; Tue, 04 Jul 2023 13:39:17 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id fb9-20020ad44f09000000b0062b76c29978sm12865925qvb.6.2023.07.04.13.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 13:39:17 -0700 (PDT) Date: Tue, 4 Jul 2023 16:39:14 -0400 From: Mark Johnston To: Ronald Klop Cc: dev-commits-src-all@freebsd.org, src-committers@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c4b7fe91fcb8 - main - libcrypto: group definitions for libcrypto and fips Message-ID: References: <202307041908.364J8Mjg081038@gitrepo.freebsd.org> <1622400002.13877.1688502012123@localhost> 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=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <1622400002.13877.1688502012123@localhost> X-Rspamd-Queue-Id: 4QwZQb1dpLz3PL7 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Tue, Jul 04, 2023 at 10:20:12PM +0200, Ronald Klop wrote: > Can this compile error be related? >=20 > cc -target aarch64-unknown-freebsd14.0 --sysroot=3D/home/ronald/dev/freeb= sd/obj/home/ronald/dev/freebsd/src/arm64.aarch64/tmp -B/home/ > ronald/dev/freebsd/obj/home/ronald/dev/freebsd/src/arm64.aarch64/tmp/usr/= bin -fpic -DPIC -O2 -pipe -fno-common -DFIPS_MODULE -DL_ENDIAN -DOPENSSL_CP= UID_OBJ -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DKECCAK= 1600_ASM -DVPAES_ASM -DECP_NISTZ256_ASM -DPOLY1305_ASM -DOPENSSLDIR=3D"\"/e= tc/ssl\"" -DENGINESDIR=3D"\"/usr/lib/engines-3\"" -DMODULESDIR=3D"\"/usr/li= b/ossl-modules\"" -DNDEBUG -I/home/ronald/dev/freebsd/src/crypto/openssl = -I/home/ronald/dev/freebsd/src/crypto/openssl/include -I/home/ronald/dev/fr= eebsd/src/crypto/openssl/providers/common/include -I/home/ronald/dev/freebs= d/src/crypto/openssl/providers/implementations/include -g -gz=3Dzlib -MD -= MF.depend.arm64cpuid.pico -MTarm64cpuid.pico -std=3Dgnu99 -Wno-format-zero-= length -fstack-protector-strong -Wno-pointer-sign -Wdate-time -Wno-empty-bo= dy -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=3Dunused-but-= set-parameter -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-= equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typede= f -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promo= ted-parameter -Wno-parentheses -Qunused-arguments -march=3Darmv8-a+cry= pto -c /home/ronald/dev/freebsd/src/secure/lib/libcrypto/arch/aarch64/arm= 64cpuid.S -o arm64cpuid.pico > /home/ronald/dev/freebsd/src/secure/lib/libcrypto/arch/aarch64/arm64cpuid= =2ES:3:10: fatal error: 'arm_arch.h' file not found > #include "arm_arch.h" > ^~~~~~~~~~~~ > 1 error generated. > *** Error code 1 >=20 > Stop. > make[6]: stopped in /home/ronald/dev/freebsd/src/secure/lib/libcrypto/mod= ules/fips > *** Error code 1 >=20 >=20 > I tried make clean in src/secure/lib but that didn't help. Indeed, there is something missing in the build glue. The problem isn't immediately obvious to me so I reverted the changes in the meantime. > Regards, >=20 > Ronald. >=20 >=20 > Van: Mark Johnston > Datum: dinsdag, 4 juli 2023 21:08 > Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-com= mits-src-main@FreeBSD.org > Onderwerp: git: c4b7fe91fcb8 - main - libcrypto: group definitions for li= bcrypto and fips > >=20 > > The branch main has been updated by markj: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc4b7fe91fcb879b6e7fc360c= 932845e7cc5d78f1 > >=20 > > commit c4b7fe91fcb879b6e7fc360c932845e7cc5d78f1 > > Author: Pierre Pronchery > > AuthorDate: 2023-06-30 17:23:57 +0000 > > Commit: Mark Johnston > > CommitDate: 2023-07-04 19:05:01 +0000 > >=20 > > libcrypto: group definitions for libcrypto and fips > > OpenSSL 3 supports a modular architecture, allowing different provi= ders > > to bring specific implementations of cryptographical algorithms. Th= is > > change makes sure the FIPS module matches build instructions used f= or > > libcrypto. > > Sponsored by: The FreeBSD Foundation > > Pull Request: https://github.com/freebsd/freebsd-src/pull/787 > > --- > > secure/lib/libcrypto/Makefile.common | 102 ++++++++++++++++++++++ > > secure/lib/libcrypto/Makefile.inc | 103 +--------------------= -- > > secure/lib/libcrypto/modules/fips/Makefile | 130 ++++-----------------= -------- > > 3 files changed, 121 insertions(+), 214 deletions(-) > >=20 > > diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypt= o/Makefile.common > > new file mode 100644 > > index 000000000000..ff9050e72370 > > --- /dev/null > > +++ b/secure/lib/libcrypto/Makefile.common > > @@ -0,0 +1,102 @@ > > +# $FreeBSD$ > > + > > +.include > > + > > +.if ${TARGET_ENDIANNESS} =3D=3D 1234 > > +CFLAGS+=3D -DL_ENDIAN > > +.elif ${TARGET_ENDIANNESS} =3D=3D 4321 > > +CFLAGS+=3D -DB_ENDIAN > > +.endif > > + > > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D "= amd64" || \ > > + ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} =3D=3D "i386" > > +ASM_${MACHINE_CPUARCH}=3D > > +.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powe= rpc64" || \ > > + ${MACHINE_ARCH} =3D=3D "powerpc64le" > > +ASM_${MACHINE_ARCH}=3D > > +.endif > > + > > +.if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH}) > > +CFLAGS+=3D -DOPENSSL_CPUID_OBJ > > +.if defined(ASM_aarch64) > > +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > +CFLAGS+=3D -DKECCAK1600_ASM > > +CFLAGS+=3D -DVPAES_ASM > > +CFLAGS+=3D -DECP_NISTZ256_ASM > > +CFLAGS+=3D -DPOLY1305_ASM > > +.elif defined(ASM_amd64) > > +CFLAGS+=3D -DOPENSSL_IA32_SSE2 > > +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 > > +CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m > > +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > +CFLAGS+=3D -DKECCAK1600_ASM > > +CFLAGS+=3D -DRC4_ASM > > +CFLAGS+=3D -DMD5_ASM > > +CFLAGS+=3D -DVPAES_ASM > > +CFLAGS+=3D -DGHASH_ASM > > +CFLAGS+=3D -DECP_NISTZ256_ASM -DX25519_ASM > > +CFLAGS+=3D -DPADLOCK_ASM > > +CFLAGS+=3D -DPOLY1305_ASM > > +.elif defined(ASM_arm) > > +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m > > +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > +CFLAGS+=3D -DKECCAK1600_ASM > > +CFLAGS+=3D -DBSAES_ASM > > +CFLAGS+=3D -DGHASH_ASM > > +CFLAGS+=3D -DECP_NISTZ256_ASM > > +CFLAGS+=3D -DPOLY1305_ASM > > +.elif defined(ASM_i386) > > +CFLAGS+=3D -DOPENSSL_IA32_SSE2 > > +CFLAGS+=3D -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT > > +CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m > > +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > +CFLAGS+=3D -DRC4_ASM > > +CFLAGS+=3D -DMD5_ASM > > +CFLAGS+=3D -DRMD160_ASM > > +CFLAGS+=3D -DVPAES_ASM > > +CFLAGS+=3D -DWHIRLPOOL_ASM > > +CFLAGS+=3D -DGHASH_ASM > > +CFLAGS+=3D -DECP_NISTZ256_ASM > > +CFLAGS+=3D -DPADLOCK_ASM > > +CFLAGS+=3D -DPOLY1305_ASM > > +.elif defined(ASM_powerpc) > > +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > +CFLAGS+=3D -DAES_ASM > > +CFLAGS+=3D -DVPAES_ASM > > +CFLAGS+=3D -DSHA1_ASM > > +CFLAGS+=3D -DSHA256_ASM > > +CFLAGS+=3D -DSHA512_ASM > > +CFLAGS+=3D -DPOLY1305_ASM > > +.elif defined(ASM_powerpc64) > > +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > +CFLAGS+=3D -DAES_ASM > > +CFLAGS+=3D -DVPAES_ASM > > +CFLAGS+=3D -DSHA1_ASM > > +CFLAGS+=3D -DSHA256_ASM > > +CFLAGS+=3D -DSHA512_ASM > > +CFLAGS+=3D -DPOLY1305_ASM > > +CFLAGS+=3D -DECP_NISTZ256_ASM > > +CFLAGS+=3D -DX25519_ASM > > +CFLAGS+=3D -DKECCAK1600_ASM > > +.elif defined(ASM_powerpc64le) > > +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > +CFLAGS+=3D -DAES_ASM > > +CFLAGS+=3D -DVPAES_ASM > > +CFLAGS+=3D -DSHA1_ASM > > +CFLAGS+=3D -DSHA256_ASM > > +CFLAGS+=3D -DSHA512_ASM > > +CFLAGS+=3D -DPOLY1305_ASM > > +CFLAGS+=3D -DECP_NISTZ256_ASM > > +CFLAGS+=3D -DX25519_ASM > > +CFLAGS+=3D -DKECCAK1600_ASM > > +.endif > > +.endif > > + > > +MANDIR=3D ${SHAREDIR}/openssl/man/man > > + > > +CFLAGS+=3D -DOPENSSLDIR=3D"\"/etc/ssl\"" > > +CFLAGS+=3D -DENGINESDIR=3D"\"${LIBDIR}/engines-3\"" > > +CFLAGS+=3D -DMODULESDIR=3D"\"${LIBDIR}/ossl-modules\"" > > + > > +CFLAGS+=3D -DNDEBUG > > diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/M= akefile.inc > > index d995fb2a0cb2..d462d9f82857 100644 > > --- a/secure/lib/libcrypto/Makefile.inc > > +++ b/secure/lib/libcrypto/Makefile.inc > > @@ -14,108 +14,7 @@ CFLAGS+=3D -I${LCRYPTO_SRC}/include > > CFLAGS+=3D -I${LCRYPTO_SRC}/providers/common/include > > CFLAGS+=3D -I${LCRYPTO_SRC}/providers/implementations/include > > -.include > > - > > -.if ${TARGET_ENDIANNESS} =3D=3D 1234 > > -CFLAGS+=3D -DL_ENDIAN > > -.elif ${TARGET_ENDIANNESS} =3D=3D 4321 > > -CFLAGS+=3D -DB_ENDIAN > > -.endif > > - > > -.if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D "= amd64" || \ > > - ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} =3D=3D "i386" > > -ASM_${MACHINE_CPUARCH}=3D > > -.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powe= rpc64" || \ > > - ${MACHINE_ARCH} =3D=3D "powerpc64le" > > -ASM_${MACHINE_ARCH}=3D > > -.endif > > - > > -.if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH}) > > -CFLAGS+=3D -DOPENSSL_CPUID_OBJ > > -.if defined(ASM_aarch64) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_amd64) > > -CFLAGS+=3D -DOPENSSL_IA32_SSE2 > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 > > -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -CFLAGS+=3D -DRC4_ASM > > -CFLAGS+=3D -DMD5_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DGHASH_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM -DX25519_ASM > > -CFLAGS+=3D -DPADLOCK_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_arm) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -CFLAGS+=3D -DBSAES_ASM > > -CFLAGS+=3D -DGHASH_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_i386) > > -CFLAGS+=3D -DOPENSSL_IA32_SSE2 > > -CFLAGS+=3D -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DRC4_ASM > > -CFLAGS+=3D -DMD5_ASM > > -CFLAGS+=3D -DRMD160_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DWHIRLPOOL_ASM > > -CFLAGS+=3D -DGHASH_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DPADLOCK_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_powerpc) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DAES_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DSHA1_ASM > > -CFLAGS+=3D -DSHA256_ASM > > -CFLAGS+=3D -DSHA512_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_powerpc64) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DAES_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DSHA1_ASM > > -CFLAGS+=3D -DSHA256_ASM > > -CFLAGS+=3D -DSHA512_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DX25519_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -.elif defined(ASM_powerpc64le) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DAES_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DSHA1_ASM > > -CFLAGS+=3D -DSHA256_ASM > > -CFLAGS+=3D -DSHA512_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DX25519_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -.endif > > -.endif > > - > > -.if defined(LIB) > > -CFLAGS+=3D -DOPENSSLDIR=3D"\"/etc/ssl\"" > > -CFLAGS+=3D -DENGINESDIR=3D"\"${LIBDIR}/engines-3\"" > > -CFLAGS+=3D -DMODULESDIR=3D"\"${LIBDIR}/ossl-modules\"" > > -.endif > > - > > -CFLAGS+=3D -DNDEBUG > > - > > -MANDIR=3D ${SHAREDIR}/openssl/man/man > > +.include "Makefile.common" > > .for pcfile in ${PCFILES} > > ${pcfile}: ${pcfile}.in > > diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/li= bcrypto/modules/fips/Makefile > > index 510d017d27ab..c8b79e3badfd 100644 > > --- a/secure/lib/libcrypto/modules/fips/Makefile > > +++ b/secure/lib/libcrypto/modules/fips/Makefile > > @@ -4,123 +4,14 @@ SHLIB_NAME?=3D fips.so > > CFLAGS+=3D -DFIPS_MODULE > > -SRCS=3D fips_entry.c fipsprov.c self_test.c self_test_kats.c > > - > > -# XXX from secure/lib/libcrypto/Makefile.inc > > -.include > > - > > -#.include > > -# > > -#.if ${TARGET_ENDIANNESS} =3D=3D 1234 > > -#CFLAGS+=3D -DL_ENDIAN > > -#.elif ${TARGET_ENDIANNESS} =3D=3D 4321 > > -#CFLAGS+=3D -DB_ENDIAN > > -#.endif > > - > > -.if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D "= amd64" || \ > > - ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} =3D=3D "i386" > > -ASM_${MACHINE_CPUARCH}=3D > > -.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powe= rpc64" || \ > > - ${MACHINE_ARCH} =3D=3D "powerpc64le" > > -ASM_${MACHINE_ARCH}=3D > > -.endif > > +SRCS+=3D fips_entry.c fipsprov.c self_test.c self_test_kats.c > > -.if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH}) > > -CFLAGS+=3D -DOPENSSL_CPUID_OBJ > > -.if defined(ASM_aarch64) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_amd64) > > -CFLAGS+=3D -DOPENSSL_IA32_SSE2 > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 > > -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -CFLAGS+=3D -DRC4_ASM > > -CFLAGS+=3D -DMD5_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DGHASH_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM -DX25519_ASM > > -CFLAGS+=3D -DPADLOCK_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_arm) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -CFLAGS+=3D -DBSAES_ASM > > -CFLAGS+=3D -DGHASH_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_i386) > > -CFLAGS+=3D -DOPENSSL_IA32_SSE2 > > -CFLAGS+=3D -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m > > -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM > > -CFLAGS+=3D -DRC4_ASM > > -CFLAGS+=3D -DMD5_ASM > > -CFLAGS+=3D -DRMD160_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DWHIRLPOOL_ASM > > -CFLAGS+=3D -DGHASH_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DPADLOCK_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_powerpc) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DAES_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DSHA1_ASM > > -CFLAGS+=3D -DSHA256_ASM > > -CFLAGS+=3D -DSHA512_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -.elif defined(ASM_powerpc64) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DAES_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DSHA1_ASM > > -CFLAGS+=3D -DSHA256_ASM > > -CFLAGS+=3D -DSHA512_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DX25519_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -.elif defined(ASM_powerpc64le) > > -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT > > -CFLAGS+=3D -DAES_ASM > > -CFLAGS+=3D -DVPAES_ASM > > -CFLAGS+=3D -DSHA1_ASM > > -CFLAGS+=3D -DSHA256_ASM > > -CFLAGS+=3D -DSHA512_ASM > > -CFLAGS+=3D -DPOLY1305_ASM > > -CFLAGS+=3D -DECP_NISTZ256_ASM > > -CFLAGS+=3D -DX25519_ASM > > -CFLAGS+=3D -DKECCAK1600_ASM > > -.endif > > -.endif > > +.include "../../Makefile.common" > > # crypto > > SRCS+=3D provider_core.c provider_predefined.c \ > > core_fetch.c core_algorithm.c core_namemap.c self_test_core.c > > -# crypto/ec > > -SRCS+=3D ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \ > > - ec_curve.c ec_check.c ec_key.c ec_kmeth.c ecx_key.c ec_asn1.c \ > > - ec2_smpl.c \ > > - ecp_oct.c ec2_oct.c ec_oct.c ecdh_ossl.c \ > > - ecdsa_ossl.c ecdsa_sign.c ecdsa_vrf.c curve25519.c \ > > - curve448/f_generic.c curve448/scalar.c \ > > - curve448/curve448_tables.c curve448/eddsa.c curve448/curve448.= c \ > > - ec_backend.c ecx_backend.c ecdh_kdf.c curve448/arch_64/f_impl6= 4.c \ > > - curve448/arch_32/f_impl32.c > > -SRCS+=3D cryptlib.c params.c params_from_text.c bsearch.c ex_data.c o_= str.c \ > > - threads_pthread.c threads_none.c initthread.c \ > > - context.c sparse_array.c asn1_dsa.c packet.c param_build.c \ > > - param_build_set.c der_writer.c threads_lib.c params_dup.c > > - > > SRCS+=3D cpuid.c ctype.c > > .if defined(ASM_aarch64) > > SRCS+=3D arm64cpuid.S armcap.c > > @@ -172,9 +63,24 @@ SRCS+=3D dh_lib.c dh_key.c dh_group_params.c dh_ch= eck.c dh_backend.c dh_gen.c \ > > # crypto/dsa > > SRCS+=3D dsa_sign.c dsa_vrf.c dsa_lib.c dsa_ossl.c dsa_check.c \ > > - dsa_key.c dsa_backend.c dsa_gen.c > > + dsa_key.c dsa_backend.c dsa_gen.c > > # crypto/ec > > +SRCS+=3D ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \ > > + ec_curve.c ec_check.c ec_key.c ec_kmeth.c ecx_key.c ec_asn1.c \ > > + ec2_smpl.c \ > > + ecp_oct.c ec2_oct.c ec_oct.c ecdh_ossl.c \ > > + ecdsa_ossl.c ecdsa_sign.c ecdsa_vrf.c curve25519.c \ > > + curve448/f_generic.c curve448/scalar.c \ > > + curve448/curve448_tables.c curve448/eddsa.c curve448/curve448.c \ > > + ec_backend.c ecx_backend.c ecdh_kdf.c curve448/arch_64/f_impl64.c \ > > + curve448/arch_32/f_impl32.c > > +SRCS+=3D cryptlib.c params.c params_from_text.c bsearch.c ex_data.c o_= str.c \ > > + threads_pthread.c threads_none.c initthread.c \ > > + context.c sparse_array.c asn1_dsa.c packet.c param_build.c \ > > + param_build_set.c der_writer.c threads_lib.c params_dup.c > > + > > +.include > > .if ${MACHINE_ABI:Mlittle-endian} && ${MACHINE_ABI:Mlong64} > > SRCS+=3D ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c > > .endif > >=20 > >=20 > >=20 >=20 >=20