Index: head/security/boringssl/Makefile =================================================================== --- head/security/boringssl/Makefile (revision 518864) +++ head/security/boringssl/Makefile (revision 518865) @@ -1,29 +1,34 @@ # $FreeBSD$ PORTNAME= boringssl -PORTVERSION= 0.0.0.0.2018.10.30.01 +PORTVERSION= 0.0.0.0.2019.12.02.01 CATEGORIES= security MAINTAINER= swills@FreeBSD.org COMMENT= Fork of OpenSSL +LICENSE= OpenSSL +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= cmake:insource go:no_targets localbase perl5 + USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= 144d924 -USES= cmake:insource go:no_targets localbase perl5 -CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 +GH_TAGNAME= f8fcab9 +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=1 \ + -DCMAKE_BUILD_TYPE=Release USE_LDCONFIG= yes LDFLAGS+= -Wl,-rpath,${PREFIX}/lib TEST_TARGET= run_tests 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 Index: head/security/boringssl/distinfo =================================================================== --- head/security/boringssl/distinfo (revision 518864) +++ head/security/boringssl/distinfo (revision 518865) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540910656 -SHA256 (google-boringssl-0.0.0.0.2018.10.30.01-144d924_GH0.tar.gz) = db873a10e44df5dcfde757038c95d1e73a1e270a983a90873e57da8593218380 -SIZE (google-boringssl-0.0.0.0.2018.10.30.01-144d924_GH0.tar.gz) = 17079162 +TIMESTAMP = 1575314030 +SHA256 (google-boringssl-0.0.0.0.2019.12.02.01-f8fcab9_GH0.tar.gz) = 801579716b146956255c44be1354907e46b2832161ff84b60feb935c51c8067a +SIZE (google-boringssl-0.0.0.0.2019.12.02.01-f8fcab9_GH0.tar.gz) = 18027392 Index: head/security/boringssl/files/patch-crypto_cpu-aarch64-linux.c =================================================================== --- head/security/boringssl/files/patch-crypto_cpu-aarch64-linux.c (nonexistent) +++ head/security/boringssl/files/patch-crypto_cpu-aarch64-linux.c (revision 518865) @@ -0,0 +1,74 @@ +--- crypto/cpu-aarch64-linux.c.orig 2019-12-02 17:52:12 UTC ++++ crypto/cpu-aarch64-linux.c +@@ -14,49 +14,46 @@ + + #include + +-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \ +- !defined(OPENSSL_STATIC_ARMCAP) ++#if defined(OPENSSL_AARCH64) + +-#include +- + #include + + #include "internal.h" + +- + extern uint32_t OPENSSL_armcap_P; + +-void OPENSSL_cpuid_setup(void) { +- unsigned long hwcap = getauxval(AT_HWCAP); ++#include ++#include ++#include + +- // 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; ++#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; + } + } +- +-#endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP ++#endif // OPENSSL_AARCH64 Property changes on: head/security/boringssl/files/patch-crypto_cpu-aarch64-linux.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/boringssl/pkg-plist =================================================================== --- head/security/boringssl/pkg-plist (revision 518864) +++ head/security/boringssl/pkg-plist (revision 518865) @@ -1,80 +1,82 @@ bin/bssl include/openssl/aead.h include/openssl/aes.h include/openssl/arm_arch.h include/openssl/asn1.h include/openssl/asn1_mac.h include/openssl/asn1t.h include/openssl/base.h include/openssl/base64.h include/openssl/bio.h include/openssl/blowfish.h include/openssl/bn.h include/openssl/buf.h include/openssl/buffer.h include/openssl/bytestring.h include/openssl/cast.h include/openssl/chacha.h include/openssl/cipher.h include/openssl/cmac.h include/openssl/conf.h include/openssl/cpu.h include/openssl/crypto.h include/openssl/curve25519.h include/openssl/des.h include/openssl/dh.h include/openssl/digest.h include/openssl/dsa.h include/openssl/dtls1.h include/openssl/e_os2.h include/openssl/ec.h include/openssl/ec_key.h include/openssl/ecdh.h include/openssl/ecdsa.h include/openssl/engine.h include/openssl/err.h include/openssl/evp.h include/openssl/ex_data.h include/openssl/hkdf.h include/openssl/hmac.h +include/openssl/hrss.h include/openssl/is_boringssl.h include/openssl/lhash.h include/openssl/md4.h include/openssl/md5.h include/openssl/mem.h include/openssl/nid.h include/openssl/obj.h include/openssl/obj_mac.h include/openssl/objects.h include/openssl/opensslconf.h include/openssl/opensslv.h include/openssl/ossl_typ.h include/openssl/pem.h include/openssl/pkcs12.h include/openssl/pkcs7.h include/openssl/pkcs8.h include/openssl/poly1305.h include/openssl/pool.h include/openssl/rand.h include/openssl/rc4.h include/openssl/ripemd.h include/openssl/rsa.h include/openssl/safestack.h include/openssl/sha.h +include/openssl/siphash.h include/openssl/span.h include/openssl/srtp.h include/openssl/ssl.h include/openssl/ssl3.h include/openssl/stack.h include/openssl/thread.h include/openssl/tls1.h include/openssl/type_check.h include/openssl/x509.h include/openssl/x509_vfy.h include/openssl/x509v3.h lib/libcrypto.so lib/libcrypto.so.1 lib/libcrypto.so.1.0.0 lib/libssl.so lib/libssl.so.1 lib/libssl.so.1.0.0