Date: Tue, 4 Jul 2023 22:20:12 +0200 (CEST) From: Ronald Klop <ronald-lists@klop.ws> To: Mark Johnston <markj@FreeBSD.org> 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: <1622400002.13877.1688502012123@localhost> In-Reply-To: <202307041908.364J8Mjg081038@gitrepo.freebsd.org> References: <202307041908.364J8Mjg081038@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_13876_1125706365.1688502012050 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: quoted-printable Can this compile error be related? cc -target aarch64-unknown-freebsd14.0 --sysroot=3D/home/ronald/dev/freebsd= /obj/home/ronald/dev/freebsd/src/arm64.aarch64/tmp -B/home/ ronald/dev/freebsd/obj/home/ronald/dev/freebsd/src/arm64.aarch64/tmp/usr/bi= n -fpic -DPIC -O2 -pipe -fno-common -DFIPS_MODULE -DL_ENDIAN -DOPENSSL_CPUI= D_OBJ -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DKECCAK16= 00_ASM -DVPAES_ASM -DECP_NISTZ256_ASM -DPOLY1305_ASM -DOPENSSLDIR=3D"\"/etc= /ssl\"" -DENGINESDIR=3D"\"/usr/lib/engines-3\"" -DMODULESDIR=3D"\"/usr/lib/= ossl-modules\"" -DNDEBUG -I/home/ronald/dev/freebsd/src/crypto/openssl -I= /home/ronald/dev/freebsd/src/crypto/openssl/include -I/home/ronald/dev/free= bsd/src/crypto/openssl/providers/common/include -I/home/ronald/dev/freebsd/= src/crypto/openssl/providers/implementations/include -g -gz=3Dzlib -MD -MF= .depend.arm64cpuid.pico -MTarm64cpuid.pico -std=3Dgnu99 -Wno-format-zero-le= ngth -fstack-protector-strong -Wno-pointer-sign -Wdate-time -Wno-empty-body= -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=3Dunused-but-se= t-parameter -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-eq= uality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef = -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promote= d-parameter -Wno-parentheses -Qunused-arguments -march=3Darmv8-a+crypt= o -c /home/ronald/dev/freebsd/src/secure/lib/libcrypto/arch/aarch64/arm64= cpuid.S -o arm64cpuid.pico /home/ronald/dev/freebsd/src/secure/lib/libcrypto/arch/aarch64/arm64cpuid.S= :3:10: fatal error: 'arm_arch.h' file not found #include "arm_arch.h" ^~~~~~~~~~~~ 1 error generated. *** Error code 1 Stop. make[6]: stopped in /home/ronald/dev/freebsd/src/secure/lib/libcrypto/modul= es/fips *** Error code 1 I tried make clean in src/secure/lib but that didn't help. Regards, Ronald. =20 Van: Mark Johnston <markj@FreeBSD.org> Datum: dinsdag, 4 juli 2023 21:08 Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commi= ts-src-main@FreeBSD.org Onderwerp: git: c4b7fe91fcb8 - main - libcrypto: group definitions for libc= rypto and fips >=20 > The branch main has been updated by markj: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc4b7fe91fcb879b6e7fc360c93= 2845e7cc5d78f1 >=20 > commit c4b7fe91fcb879b6e7fc360c932845e7cc5d78f1 > Author: Pierre Pronchery <pierre@freebsdfoundation.org> > AuthorDate: 2023-06-30 17:23:57 +0000 > Commit: Mark Johnston <markj@FreeBSD.org> > CommitDate: 2023-07-04 19:05:01 +0000 >=20 > libcrypto: group definitions for libcrypto and fips > =20 > OpenSSL 3 supports a modular architecture, allowing different provide= rs > to bring specific implementations of cryptographical algorithms. This > change makes sure the FIPS module matches build instructions used for > libcrypto. > =20 > 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/libcrypto/= Makefile.common > new file mode 100644 > index 000000000000..ff9050e72370 > --- /dev/null > +++ b/secure/lib/libcrypto/Makefile.common > @@ -0,0 +1,102 @@ > +# $FreeBSD$ > + > +.include <bsd.endian.mk> > + > +.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 "am= d64" || \ > + ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} =3D=3D "i386" > +ASM_${MACHINE_CPUARCH}=3D > +.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerp= c64" || \ > + ${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/Mak= efile.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 > =20 > -.include <bsd.endian.mk> > - > -.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 "am= d64" || \ > - ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} =3D=3D "i386" > -ASM_${MACHINE_CPUARCH}=3D > -.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerp= c64" || \ > - ${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" > =20 > .for pcfile in ${PCFILES} > ${pcfile}: ${pcfile}.in > diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libc= rypto/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 > =20 > CFLAGS+=3D -DFIPS_MODULE > =20 > -SRCS=3D fips_entry.c fipsprov.c self_test.c self_test_kats.c > - > -# XXX from secure/lib/libcrypto/Makefile.inc > -.include <bsd.own.mk> > - > -#.include <bsd.endian.mk> > -# > -#.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 "am= d64" || \ > - ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} =3D=3D "i386" > -ASM_${MACHINE_CPUARCH}=3D > -.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerp= c64" || \ > - ${MACHINE_ARCH} =3D=3D "powerpc64le" > -ASM_${MACHINE_ARCH}=3D > -.endif > +SRCS+=3D fips_entry.c fipsprov.c self_test.c self_test_kats.c > =20 > -.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" > =20 > # crypto > SRCS+=3D provider_core.c provider_predefined.c \ > core_fetch.c core_algorithm.c core_namemap.c self_test_core.c > =20 > -# 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_st= r.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_chec= k.c dh_backend.c dh_gen.c \ > =20 > # 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 > =20 > # 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_st= r.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 <bsd.opts.mk> > .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 ------=_Part_13876_1125706365.1688502012050 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: quoted-printable <html><head></head><body>Can this compile error be related?<br> <br> cc -target aarch64-unknown-freebsd14.0 --sysroot=3D/home/ronald/dev/freebsd= /obj/home/ronald/dev/freebsd/src/arm64.aarch64/tmp -B/home/<br> ronald/dev/freebsd/obj/home/ronald/dev/freebsd/src/arm64.aarch64/tmp/usr/bi= n -fpic -DPIC -O2 -pipe -fno-common -DFIPS_MODULE -DL_ENDIAN -DOPENSSL_CPUI= D_OBJ -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DKECCAK16= 00_ASM -DVPAES_ASM -DECP_NISTZ256_ASM -DPOLY1305_ASM -DOPENSSLDIR=3D"\"/etc= /ssl\"" -DENGINESDIR=3D"\"/usr/lib/engines-3\"" -DMODULESDIR=3D"\"/usr/lib/= ossl-modules\"" -DNDEBUG -I/home/ronald/dev/freebsd/src/crypto/= openssl -I/home/ronald/dev/freebsd/src/crypto/openssl/include -I/home/ronal= d/dev/freebsd/src/crypto/openssl/providers/common/include -I/home/ronald/de= v/freebsd/src/crypto/openssl/providers/implementations/include -g -gz=3Dzli= b -MD -MF.depend.arm64cpuid.pico -MTarm64cpuid.pico -std=3Dgnu99 -Wno= -format-zero-length -fstack-protector-strong -Wno-pointer-sign -Wdate-time = -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error= =3Dunused-but-set-parameter -Wno-tautological-compare -Wno-unused-value -Wn= o-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unuse= d-local-typedef -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum = -Wno-knr-promoted-parameter -Wno-parentheses -Qunused-arguments = -march=3Darmv8-a+crypto -c /home/ronald/dev/= freebsd/src/secure/lib/libcrypto/arch/aarch64/arm64cpuid.S -o arm64cpuid.pi= co<br> /home/ronald/dev/freebsd/src/secure/lib/libcrypto/arch/aarch64/arm64cpuid.S= :3:10: fatal error: 'arm_arch.h' file not found<br> #include "arm_arch.h"<br> ^~~~~~~~~~~~<br> 1 error generated.<br> *** Error code 1<br> <br> Stop.<br> make[6]: stopped in /home/ronald/dev/freebsd/src/secure/lib/libcrypto/modul= es/fips<br> *** Error code 1<br> <br> <br> I tried make clean in src/secure/lib but that didn't help.<br> <br> Regards,<br> <br> Ronald.<br> <br> <p><strong>Van:</strong> Mark Johnston <markj@FreeBSD.org><br> <strong>Datum:</strong> dinsdag, 4 juli 2023 21:08<br> <strong>Aan:</strong> src-committers@FreeBSD.org, dev-commits-src-all@FreeB= SD.org, dev-commits-src-main@FreeBSD.org<br> <strong>Onderwerp:</strong> git: c4b7fe91fcb8 - main - libcrypto: group def= initions for libcrypto and fips</p> <blockquote style=3D"padding-right: 0px; padding-left: 5px; margin-left: 5p= x; border-left: #000000 2px solid; margin-right: 0px"> <div class=3D"MessageRFC822Viewer" id=3D"P"> <div class=3D"TextPlainViewer" id=3D"P.P">The branch main has been updated = by markj:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dc4b7fe91fcb879b6e= 7fc360c932845e7cc5d78f1">https://cgit.FreeBSD.org/src/commit/?id=3Dc4b7fe91= fcb879b6e7fc360c932845e7cc5d78f1</a><br> <br> commit c4b7fe91fcb879b6e7fc360c932845e7cc5d78f1<br> Author: Pierre Pronchery <pierre@freebsdfoundati= on.org><br> AuthorDate: 2023-06-30 17:23:57 +0000<br> Commit: Mark Johnston <markj@FreeBSD.org><br> CommitDate: 2023-07-04 19:05:01 +0000<br> <br> libcrypto: group definitions for libcrypto and fips= <br> <br> OpenSSL 3 supports a modular architecture, allowing= different providers<br> to bring specific implementations of cryptographica= l algorithms. This<br> change makes sure the FIPS module matches build ins= tructions used for<br> libcrypto.<br> <br> Sponsored by: The FreeBSD Foundation<br= > Pull Request: <a href=3D"https://github= .com/freebsd/freebsd-src/pull/787">https://github.com/freebsd/freebsd-src/p= ull/787</a><br> ---<br> secure/lib/libcrypto/Makefile.common &n= bsp;| 102 ++++++++++++++++++++++<br> secure/lib/libcrypto/Makefile.inc  = ; | 103 +----------------------<br> secure/lib/libcrypto/modules/fips/Makefile | 130 ++++----------------= ---------<br> 3 files changed, 121 insertions(+), 214 deletions(-)<br> <br> diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Ma= kefile.common<br> new file mode 100644<br> index 000000000000..ff9050e72370<br> --- /dev/null<br> +++ b/secure/lib/libcrypto/Makefile.common<br> @@ -0,0 +1,102 @@<br> +# $FreeBSD$<br> +<br> +.include <bsd.endian.mk><br> +<br> +.if ${TARGET_ENDIANNESS} =3D=3D 1234<br> +CFLAGS+=3D -DL_ENDIAN<br> +.elif ${TARGET_ENDIANNESS} =3D=3D 4321<br> +CFLAGS+=3D -DB_ENDIAN<br> +.endif<br> +<br> +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D "amd6= 4" || \<br> + ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} = =3D=3D "i386"<br> +ASM_${MACHINE_CPUARCH}=3D<br> +.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerpc6= 4" || \<br> + ${MACHINE_ARCH} =3D=3D "powerpc64le"<br> +ASM_${MACHINE_ARCH}=3D<br> +.endif<br> +<br> +.if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH})<br> +CFLAGS+=3D -DOPENSSL_CPUID_OBJ<br> +.if defined(ASM_aarch64)<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> +CFLAGS+=3D -DKECCAK1600_ASM<br> +CFLAGS+=3D -DVPAES_ASM<br> +CFLAGS+=3D -DECP_NISTZ256_ASM<br> +CFLAGS+=3D -DPOLY1305_ASM<br> +.elif defined(ASM_amd64)<br> +CFLAGS+=3D -DOPENSSL_IA32_SSE2<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m<br> +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> +CFLAGS+=3D -DKECCAK1600_ASM<br> +CFLAGS+=3D -DRC4_ASM<br> +CFLAGS+=3D -DMD5_ASM<br> +CFLAGS+=3D -DVPAES_ASM<br> +CFLAGS+=3D -DGHASH_ASM<br> +CFLAGS+=3D -DECP_NISTZ256_ASM -DX25519_ASM<br> +CFLAGS+=3D -DPADLOCK_ASM<br> +CFLAGS+=3D -DPOLY1305_ASM<br> +.elif defined(ASM_arm)<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m<br> +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> +CFLAGS+=3D -DKECCAK1600_ASM<br> +CFLAGS+=3D -DBSAES_ASM<br> +CFLAGS+=3D -DGHASH_ASM<br> +CFLAGS+=3D -DECP_NISTZ256_ASM<br> +CFLAGS+=3D -DPOLY1305_ASM<br> +.elif defined(ASM_i386)<br> +CFLAGS+=3D -DOPENSSL_IA32_SSE2<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT<b= r> +CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m<br> +CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> +CFLAGS+=3D -DRC4_ASM<br> +CFLAGS+=3D -DMD5_ASM<br> +CFLAGS+=3D -DRMD160_ASM<br> +CFLAGS+=3D -DVPAES_ASM<br> +CFLAGS+=3D -DWHIRLPOOL_ASM<br> +CFLAGS+=3D -DGHASH_ASM<br> +CFLAGS+=3D -DECP_NISTZ256_ASM<br> +CFLAGS+=3D -DPADLOCK_ASM<br> +CFLAGS+=3D -DPOLY1305_ASM<br> +.elif defined(ASM_powerpc)<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> +CFLAGS+=3D -DAES_ASM<br> +CFLAGS+=3D -DVPAES_ASM<br> +CFLAGS+=3D -DSHA1_ASM<br> +CFLAGS+=3D -DSHA256_ASM<br> +CFLAGS+=3D -DSHA512_ASM<br> +CFLAGS+=3D -DPOLY1305_ASM<br> +.elif defined(ASM_powerpc64)<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> +CFLAGS+=3D -DAES_ASM<br> +CFLAGS+=3D -DVPAES_ASM<br> +CFLAGS+=3D -DSHA1_ASM<br> +CFLAGS+=3D -DSHA256_ASM<br> +CFLAGS+=3D -DSHA512_ASM<br> +CFLAGS+=3D -DPOLY1305_ASM<br> +CFLAGS+=3D -DECP_NISTZ256_ASM<br> +CFLAGS+=3D -DX25519_ASM<br> +CFLAGS+=3D -DKECCAK1600_ASM<br> +.elif defined(ASM_powerpc64le)<br> +CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> +CFLAGS+=3D -DAES_ASM<br> +CFLAGS+=3D -DVPAES_ASM<br> +CFLAGS+=3D -DSHA1_ASM<br> +CFLAGS+=3D -DSHA256_ASM<br> +CFLAGS+=3D -DSHA512_ASM<br> +CFLAGS+=3D -DPOLY1305_ASM<br> +CFLAGS+=3D -DECP_NISTZ256_ASM<br> +CFLAGS+=3D -DX25519_ASM<br> +CFLAGS+=3D -DKECCAK1600_ASM<br> +.endif<br> +.endif<br> +<br> +MANDIR=3D ${SHAREDIR}/openssl/ma= n/man<br> +<br> +CFLAGS+=3D -DOPENSSLDIR=3D"\"/etc/ssl\""<br> +CFLAGS+=3D -DENGINESDIR=3D"\"${LIBDIR}/engines-3\""<br> +CFLAGS+=3D -DMODULESDIR=3D"\"${LIBDIR}/ossl-modules\""<br> +<br> +CFLAGS+=3D -DNDEBUG<br> diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makef= ile.inc<br> index d995fb2a0cb2..d462d9f82857 100644<br> --- a/secure/lib/libcrypto/Makefile.inc<br> +++ b/secure/lib/libcrypto/Makefile.inc<br> @@ -14,108 +14,7 @@ CFLAGS+=3D -I${LCRYPTO_SRC}/include<b= r> CFLAGS+=3D -I${LCRYPTO_SRC}/providers/common/include<br> CFLAGS+=3D -I${LCRYPTO_SRC}/providers/implementations/inc= lude<br> <br> -.include <bsd.endian.mk><br> -<br> -.if ${TARGET_ENDIANNESS} =3D=3D 1234<br> -CFLAGS+=3D -DL_ENDIAN<br> -.elif ${TARGET_ENDIANNESS} =3D=3D 4321<br> -CFLAGS+=3D -DB_ENDIAN<br> -.endif<br> -<br> -.if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D "amd6= 4" || \<br> - ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} = =3D=3D "i386"<br> -ASM_${MACHINE_CPUARCH}=3D<br> -.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerpc6= 4" || \<br> - ${MACHINE_ARCH} =3D=3D "powerpc64le"<br> -ASM_${MACHINE_ARCH}=3D<br> -.endif<br> -<br> -.if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH})<br> -CFLAGS+=3D -DOPENSSL_CPUID_OBJ<br> -.if defined(ASM_aarch64)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_amd64)<br> -CFLAGS+=3D -DOPENSSL_IA32_SSE2<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -CFLAGS+=3D -DRC4_ASM<br> -CFLAGS+=3D -DMD5_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DGHASH_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM -DX25519_ASM<br> -CFLAGS+=3D -DPADLOCK_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_arm)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -CFLAGS+=3D -DBSAES_ASM<br> -CFLAGS+=3D -DGHASH_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_i386)<br> -CFLAGS+=3D -DOPENSSL_IA32_SSE2<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT<b= r> -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DRC4_ASM<br> -CFLAGS+=3D -DMD5_ASM<br> -CFLAGS+=3D -DRMD160_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DWHIRLPOOL_ASM<br> -CFLAGS+=3D -DGHASH_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DPADLOCK_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_powerpc)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DAES_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DSHA1_ASM<br> -CFLAGS+=3D -DSHA256_ASM<br> -CFLAGS+=3D -DSHA512_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_powerpc64)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DAES_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DSHA1_ASM<br> -CFLAGS+=3D -DSHA256_ASM<br> -CFLAGS+=3D -DSHA512_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DX25519_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -.elif defined(ASM_powerpc64le)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DAES_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DSHA1_ASM<br> -CFLAGS+=3D -DSHA256_ASM<br> -CFLAGS+=3D -DSHA512_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DX25519_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -.endif<br> -.endif<br> -<br> -.if defined(LIB)<br> -CFLAGS+=3D -DOPENSSLDIR=3D"\"/etc/ssl\""<br> -CFLAGS+=3D -DENGINESDIR=3D"\"${LIBDIR}/engines-3\""<br> -CFLAGS+=3D -DMODULESDIR=3D"\"${LIBDIR}/ossl-modules\""<br> -.endif<br> -<br> -CFLAGS+=3D -DNDEBUG<br> -<br> -MANDIR=3D ${SHAREDIR}/openssl/ma= n/man<br> +.include "Makefile.common"<br> <br> .for pcfile in ${PCFILES}<br> ${pcfile}: ${pcfile}.in<br> diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcry= pto/modules/fips/Makefile<br> index 510d017d27ab..c8b79e3badfd 100644<br> --- a/secure/lib/libcrypto/modules/fips/Makefile<br> +++ b/secure/lib/libcrypto/modules/fips/Makefile<br> @@ -4,123 +4,14 @@ SHLIB_NAME?=3D fips.so<br> <br> CFLAGS+=3D -DFIPS_MODULE<br> <br> -SRCS=3D fips_entry.c fipsprov.c self_test.c self_test_kats.c<br> -<br> -# XXX from secure/lib/libcrypto/Makefile.inc<br> -.include <bsd.own.mk><br> -<br> -#.include <bsd.endian.mk><br> -#<br> -#.if ${TARGET_ENDIANNESS} =3D=3D 1234<br> -#CFLAGS+=3D -DL_ENDIAN<br> -#.elif ${TARGET_ENDIANNESS} =3D=3D 4321<br> -#CFLAGS+=3D -DB_ENDIAN<br> -#.endif<br> -<br> -.if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D "amd6= 4" || \<br> - ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} = =3D=3D "i386"<br> -ASM_${MACHINE_CPUARCH}=3D<br> -.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerpc6= 4" || \<br> - ${MACHINE_ARCH} =3D=3D "powerpc64le"<br> -ASM_${MACHINE_ARCH}=3D<br> -.endif<br> +SRCS+=3D fips_entry.c fipsprov.c self_test.c self_test_kats.c<br> <br> -.if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH})<br> -CFLAGS+=3D -DOPENSSL_CPUID_OBJ<br> -.if defined(ASM_aarch64)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_amd64)<br> -CFLAGS+=3D -DOPENSSL_IA32_SSE2<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -CFLAGS+=3D -DRC4_ASM<br> -CFLAGS+=3D -DMD5_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DGHASH_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM -DX25519_ASM<br> -CFLAGS+=3D -DPADLOCK_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_arm)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -CFLAGS+=3D -DBSAES_ASM<br> -CFLAGS+=3D -DGHASH_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_i386)<br> -CFLAGS+=3D -DOPENSSL_IA32_SSE2<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT<b= r> -CFLAGS+=3D -DOPENSSL_BN_ASM_GF2m<br> -CFLAGS+=3D -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM<br> -CFLAGS+=3D -DRC4_ASM<br> -CFLAGS+=3D -DMD5_ASM<br> -CFLAGS+=3D -DRMD160_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DWHIRLPOOL_ASM<br> -CFLAGS+=3D -DGHASH_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DPADLOCK_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_powerpc)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DAES_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DSHA1_ASM<br> -CFLAGS+=3D -DSHA256_ASM<br> -CFLAGS+=3D -DSHA512_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -.elif defined(ASM_powerpc64)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DAES_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DSHA1_ASM<br> -CFLAGS+=3D -DSHA256_ASM<br> -CFLAGS+=3D -DSHA512_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DX25519_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -.elif defined(ASM_powerpc64le)<br> -CFLAGS+=3D -DOPENSSL_BN_ASM_MONT<br> -CFLAGS+=3D -DAES_ASM<br> -CFLAGS+=3D -DVPAES_ASM<br> -CFLAGS+=3D -DSHA1_ASM<br> -CFLAGS+=3D -DSHA256_ASM<br> -CFLAGS+=3D -DSHA512_ASM<br> -CFLAGS+=3D -DPOLY1305_ASM<br> -CFLAGS+=3D -DECP_NISTZ256_ASM<br> -CFLAGS+=3D -DX25519_ASM<br> -CFLAGS+=3D -DKECCAK1600_ASM<br> -.endif<br> -.endif<br> +.include "../../Makefile.common"<br> <br> # crypto<br> SRCS+=3D provider_core.c provider_predefined.c \<br> core_fetch.c core_algorithm.c core_namemap.c self_t= est_core.c<br> <br> -# crypto/ec<br> -SRCS+=3D ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \<br= > - ec_curve.c ec_check.c ec_key.c = ec_kmeth.c ecx_key.c ec_asn1.c \<br> - ec2_smpl.c \<br> - ecp_oct.c ec2_oct.c ec_oct.c ec= dh_ossl.c \<br> - ecdsa_ossl.c ecdsa_sign.c ecdsa= _vrf.c curve25519.c \<br> - curve448/f_generic.c curve448/s= calar.c \<br> - curve448/curve448_tables.c curv= e448/eddsa.c curve448/curve448.c \<br> - ec_backend.c ecx_backend.c ecdh= _kdf.c curve448/arch_64/f_impl64.c \<br> - curve448/arch_32/f_impl32.c<br> -SRCS+=3D cryptlib.c params.c params_from_text.c bsearch.c ex_data.c o_str.= c \<br> - threads_pthread.c threads_none.c initthread.c \<br> - context.c sparse_array.c asn1_dsa.c packet.c param_build.c \<= br> - param_build_set.c der_writer.c threads_lib.c params_dup.c<br> -<br> SRCS+=3D cpuid.c ctype.c<br> .if defined(ASM_aarch64)<br> SRCS+=3D arm64cpuid.S armcap.c<br> @@ -172,9 +63,24 @@ SRCS+=3D dh_lib.c dh_key.c dh_group_params.c dh_c= heck.c dh_backend.c dh_gen.c \<br> <br> # crypto/dsa<br> SRCS+=3D dsa_sign.c dsa_vrf.c dsa_lib.c dsa_ossl.c dsa_check.c \<br> - dsa_key.c dsa_backend.c dsa_gen= .c<br> + dsa_key.c dsa_backend.c dsa_gen.c<br> <br> # crypto/ec<br> +SRCS+=3D ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \<br= > + ec_curve.c ec_check.c ec_key.c ec_kmeth.c ecx_key.c ec_asn1.c= \<br> + ec2_smpl.c \<br> + ecp_oct.c ec2_oct.c ec_oct.c ecdh_ossl.c \<br> + ecdsa_ossl.c ecdsa_sign.c ecdsa_vrf.c curve25519.c \<br> + curve448/f_generic.c curve448/scalar.c \<br> + curve448/curve448_tables.c curve448/eddsa.c curve448/curve448= .c \<br> + ec_backend.c ecx_backend.c ecdh_kdf.c curve448/arch_64/f_impl= 64.c \<br> + curve448/arch_32/f_impl32.c<br> +SRCS+=3D cryptlib.c params.c params_from_text.c bsearch.c ex_data.c o_str.= c \<br> + threads_pthread.c threads_none.c initthread.c \<br> + context.c sparse_array.c asn1_dsa.c packet.c param_build.c \<= br> + param_build_set.c der_writer.c threads_lib.c params_dup.c<br> +<br> +.include <bsd.opts.mk><br> .if ${MACHINE_ABI:Mlittle-endian} && ${MACHINE_ABI:Mlong64}<b= r> SRCS+=3D ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c= <br> .endif<br> </div> <hr></div> </blockquote> <br> </body></html> ------=_Part_13876_1125706365.1688502012050--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1622400002.13877.1688502012123>