From nobody Tue Jul 04 20:20:12 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 4QwZ0g6ygNz4m48T; Tue, 4 Jul 2023 20:20:19 +0000 (UTC) (envelope-from SRS0=WHe0=CW=klop.ws=ronald-lists@realworks.nl) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [194.109.157.24]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4QwZ0g2jpjz3HYN; Tue, 4 Jul 2023 20:20:19 +0000 (UTC) (envelope-from SRS0=WHe0=CW=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Date: Tue, 4 Jul 2023 22:20:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1688502012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l2L8qpGMy0baTAWWtZGvrH0k/h0B5Y22c4qzgauAuRo=; b=reyr9Tvv6K6spFjIad0S3r934J/UjDG2TzjvDHBGTNTQoNhLqCzTR2S43sRtPDeDkGud/g TZYX9U0EBPijib0S8sw31FZR0yNuAYzG9N2qGpNFcFW0ZBsH82ElawIF2LAswcHYjJ2e4o LhYEFaguBt3cV2NPCKFHJGjsNRou+R+tgPjfqQBBxB3+j2FDWcRmDF+eJPVORMmVekyxrw +C6JUhaabu2opC4Ww2eJQvUZiwD6VGK8Jk3tVzA2t59NS0EWkqVMuNFiBl4wAx2uJCcLuZ 737uDa+3CgwZotcbVH1fp5B7N9ip2m/nHx4/cOgdUjVyfZLJKve0S7a5c4nbIg== From: Ronald Klop To: Mark Johnston Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <1622400002.13877.1688502012123@localhost> In-Reply-To: <202307041908.364J8Mjg081038@gitrepo.freebsd.org> References: <202307041908.364J8Mjg081038@gitrepo.freebsd.org> Subject: Re: git: c4b7fe91fcb8 - main - libcrypto: group definitions for libcrypto and fips 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: multipart/alternative; boundary="----=_Part_13876_1125706365.1688502012050" X-Mailer: Realworks (660.143) Importance: Normal X-Priority: 3 (Normal) X-Rspamd-Queue-Id: 4QwZ0g2jpjz3HYN X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N ------=_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 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 > 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 > =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 > + > +.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 > - > -.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 > - > -#.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 "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 > .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 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/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
/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.

 

Van: Mark Johnston <markj@FreeBSD.org>
Datum: dinsdag, 4 juli 2023 21:08
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeB= SD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: c4b7fe91fcb8 - main - libcrypto: group def= initions for libcrypto and fips

The branch main has been updated = by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc4b7fe91= fcb879b6e7fc360c932845e7cc5d78f1

commit c4b7fe91fcb879b6e7fc360c932845e7cc5d78f1
Author:     Pierre Pronchery <pierre@freebsdfoundati= on.org>
AuthorDate: 2023-06-30 17:23:57 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-07-04 19:05:01 +0000

    libcrypto: group definitions for libcrypto and fips=
    
    OpenSSL 3 supports a modular architecture, allowing= different providers
    to bring specific implementations of cryptographica= l algorithms. This
    change makes sure the FIPS module matches build ins= tructions used for
    libcrypto.
    
    Sponsored by:   The FreeBSD Foundation     Pull Request:   https://github.com/freebsd/freebsd-src/p= ull/787
---
 secure/lib/libcrypto/Makefile.common      &n= bsp;| 102 ++++++++++++++++++++++
 secure/lib/libcrypto/Makefile.inc       = ;   | 103 +----------------------
 secure/lib/libcrypto/modules/fips/Makefile | 130 ++++----------------= ---------
 3 files changed, 121 insertions(+), 214 deletions(-)

diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Ma= kefile.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 "amd6= 4" || \
+    ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} = =3D=3D "i386"
+ASM_${MACHINE_CPUARCH}=3D
+.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerpc6= 4" || \
+    ${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/ma= n/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/Makef= ile.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/inc= lude
 
-.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 "amd6= 4" || \
-    ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} = =3D=3D "i386"
-ASM_${MACHINE_CPUARCH}=3D
-.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerpc6= 4" || \
-    ${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/ma= n/man
+.include "Makefile.common"
 
 .for pcfile in ${PCFILES}
 ${pcfile}: ${pcfile}.in
diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcry= pto/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 <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 "amd6= 4" || \
-    ${MACHINE_CPUARCH} =3D=3D "arm" || ${MACHINE_CPUARCH} = =3D=3D "i386"
-ASM_${MACHINE_CPUARCH}=3D
-.elif ${MACHINE_ARCH} =3D=3D "powerpc" || ${MACHINE_ARCH} =3D=3D "powerpc6= 4" || \
-    ${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_t= est_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 ec= dh_ossl.c \
-        ecdsa_ossl.c ecdsa_sign.c ecdsa= _vrf.c curve25519.c \
-        curve448/f_generic.c curve448/s= calar.c \
-        curve448/curve448_tables.c curv= e448/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 \<= br> -   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_c= heck.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_impl= 64.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 \<= br> +   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
 

  ------=_Part_13876_1125706365.1688502012050--