diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile index cbb79d308744..4ada63c5b0ba 100644 --- a/security/boringssl/Makefile +++ b/security/boringssl/Makefile @@ -1,53 +1,53 @@ PORTNAME= boringssl -PORTVERSION= 0.0.0.0.2022.01.18.01 +PORTVERSION= 0.0.0.0.2022.01.19.01 CATEGORIES= security MAINTAINER= osa@FreeBSD.org COMMENT= Fork of OpenSSL LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:insource cpe go:no_targets localbase perl5 CONFLICTS_INSTALL= security/libressl \ security/libressl-devel \ security/openssl \ security/openssl-devel \ security/openssl-quictls CPE_VENDOR= google USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= 36a41bf +GH_TAGNAME= be04c56 GH_TUPLE= golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \ golang:net:04defd469f4e:golang_net/vendor/golang.org/x/net \ golang:sys:04245dca01da:golang_sys/vendor/golang.org/x/sys \ golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term CMAKE_ARGS+= -DBUILD_SHARED_LIBS=1 \ -DCMAKE_BUILD_TYPE=Release USE_LDCONFIG= yes LDFLAGS+= -Wl,-rpath,${LOCALBASE}/lib TEST_TARGET= run_tests GO_BUILDFLAGS+= -mod=vendor MAKE_ENV+= GOPATH=${WRKSRC}/vendor GOPROXY=off post-patch: @${GREP} -FRl -- '-D_XOPEN_SOURCE=700' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e 's,-D_XOPEN_SOURCE=700,,' @${GREP} -FRl '${GO_EXECUTABLE} run ' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -r -e 's,([$][{]GO_EXECUTABLE[}] run),\1 ${GO_BUILDFLAGS},' @${FIND} ${WRKSRC}/include -name '*.bak' -delete do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tool/bssl ${STAGEDIR}${PREFIX}/bin/ (cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include) ${INSTALL_LIB} ${WRKSRC}/crypto/libcrypto.so ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1.0.0 ${INSTALL_LIB} ${WRKSRC}/ssl/libssl.so ${STAGEDIR}${PREFIX}/lib/libssl.so.1.0.0 ${LN} -sf libcrypto.so.1 ${STAGEDIR}${PREFIX}/lib/libcrypto.so ${LN} -sf libcrypto.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1 ${LN} -sf libssl.so.1 ${STAGEDIR}${PREFIX}/lib/libssl.so ${LN} -sf libssl.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libssl.so.1 .include diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo index 98731b08c5cd..f271a9f877bd 100644 --- a/security/boringssl/distinfo +++ b/security/boringssl/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1642598328 -SHA256 (google-boringssl-0.0.0.0.2022.01.18.01-36a41bf_GH0.tar.gz) = 3b5196f7bd2d40d69fb136d115e2d551891aa1aad50e233a8afa5e827a0ece48 -SIZE (google-boringssl-0.0.0.0.2022.01.18.01-36a41bf_GH0.tar.gz) = 30726833 +TIMESTAMP = 1642779473 +SHA256 (google-boringssl-0.0.0.0.2022.01.19.01-be04c56_GH0.tar.gz) = b84a0821def4a263f49317d7b59982567ac8356eccd9b9ebe84a8a371d71019e +SIZE (google-boringssl-0.0.0.0.2022.01.19.01-be04c56_GH0.tar.gz) = 30729725 SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4 SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023 SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d SIZE (golang-net-04defd469f4e_GH0.tar.gz) = 1252122 SHA256 (golang-sys-04245dca01da_GH0.tar.gz) = b90ec2bae1f7e395eb368638a6627199efdc28fa9c592a72aac0ae32351fd5d7 SIZE (golang-sys-04245dca01da_GH0.tar.gz) = 1231301 SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239 diff --git a/security/boringssl/files/patch-crypto_CMakeLists.txt b/security/boringssl/files/patch-crypto_CMakeLists.txt index dd5cd124c5ed..b32c3e7389fb 100644 --- a/security/boringssl/files/patch-crypto_CMakeLists.txt +++ b/security/boringssl/files/patch-crypto_CMakeLists.txt @@ -1,10 +1,10 @@ ---- crypto/CMakeLists.txt.orig 2022-01-08 15:58:38.096291000 -0500 -+++ crypto/CMakeLists.txt 2022-01-08 15:28:07.210470000 -0500 -@@ -462,6 +462,7 @@ +--- crypto/CMakeLists.txt.orig 2022-01-21 15:36:31 UTC ++++ crypto/CMakeLists.txt +@@ -462,6 +462,7 @@ if(FIPS_DELOCATE OR FIPS_SHARED) endif() SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C) +SET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1) if(NOT WIN32 AND NOT ANDROID) target_link_libraries(crypto pthread) diff --git a/security/boringssl/files/patch-crypto_cpu_aarch64_linux.c b/security/boringssl/files/patch-crypto_cpu__aarch64__linux.c similarity index 91% rename from security/boringssl/files/patch-crypto_cpu_aarch64_linux.c rename to security/boringssl/files/patch-crypto_cpu__aarch64__linux.c index 68403a2b75dd..a5276e203ab0 100644 --- a/security/boringssl/files/patch-crypto_cpu_aarch64_linux.c +++ b/security/boringssl/files/patch-crypto_cpu__aarch64__linux.c @@ -1,79 +1,78 @@ ---- crypto/cpu_aarch64_linux.c.orig 2022-01-05 15:30:33.000000000 -0500 -+++ crypto/cpu_aarch64_linux.c 2022-01-06 10:24:03.703277000 -0500 -@@ -14,10 +14,8 @@ +--- crypto/cpu_aarch64_linux.c.orig 2022-01-18 16:46:15 UTC ++++ crypto/cpu_aarch64_linux.c +@@ -14,51 +14,49 @@ - #include + #include "internal.h" -#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \ - !defined(OPENSSL_STATIC_ARMCAP) +#if defined(OPENSSL_AARCH64) -#include #include -@@ -26,41 +24,41 @@ extern uint32_t OPENSSL_armcap_P; -void OPENSSL_cpuid_setup(void) { - unsigned long hwcap = getauxval(AT_HWCAP); +#if defined(OPENSSL_FREEBSD) +#include +#include +#include +#endif - // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of - // these values. - static const unsigned long kNEON = 1 << 1; - static const unsigned long kAES = 1 << 3; - static const unsigned long kPMULL = 1 << 4; - static const unsigned long kSHA1 = 1 << 5; - static const unsigned long kSHA256 = 1 << 6; - static const unsigned long kSHA512 = 1 << 21; +#ifndef ID_AA64ISAR0_AES_VAL +#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES +#endif +#ifndef ID_AA64ISAR0_SHA1_VAL +#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 +#endif +#ifndef ID_AA64ISAR0_SHA2_VAL +#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 +#endif - if ((hwcap & kNEON) == 0) { - // Matching OpenSSL, if NEON is missing, don't report other features - // either. - return; - } +void OPENSSL_cpuid_setup(void) { + uint64_t id_aa64isar0; + id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); + OPENSSL_armcap_P |= ARMV7_NEON; - if (hwcap & kAES) { + if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) { OPENSSL_armcap_P |= ARMV8_AES; } - if (hwcap & kPMULL) { + if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { OPENSSL_armcap_P |= ARMV8_PMULL; } - if (hwcap & kSHA1) { + if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { OPENSSL_armcap_P |= ARMV8_SHA1; } - if (hwcap & kSHA256) { + if (ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) { OPENSSL_armcap_P |= ARMV8_SHA256; } - if (hwcap & kSHA512) { - OPENSSL_armcap_P |= ARMV8_SHA512; - } } -#endif // OPENSSL_AARCH64 && OPENSSL_LINUX && !OPENSSL_STATIC_ARMCAP +#endif // OPENSSL_AARCH64 diff --git a/security/boringssl/files/patch-ssl_CMakeLists.txt b/security/boringssl/files/patch-ssl_CMakeLists.txt index 44452856f4c0..8738202801f9 100644 --- a/security/boringssl/files/patch-ssl_CMakeLists.txt +++ b/security/boringssl/files/patch-ssl_CMakeLists.txt @@ -1,8 +1,8 @@ ---- ssl/CMakeLists.txt.orig 2022-01-09 08:18:59.300383000 -0500 -+++ ssl/CMakeLists.txt 2022-01-09 08:19:33.506134000 -0500 -@@ -63,3 +63,5 @@ +--- ssl/CMakeLists.txt.orig 2022-01-18 16:46:15 UTC ++++ ssl/CMakeLists.txt +@@ -63,3 +63,5 @@ if(WIN32) target_link_libraries(ssl_test ws2_32) endif() add_dependencies(all_tests ssl_test) + +SET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)