diff --git a/BUILD.generated.bzl b/BUILD.generated.bzl index d20168275..a1c0229cf 100644 --- a/BUILD.generated.bzl +++ b/BUILD.generated.bzl @@ -331,10 +331,12 @@ crypto_sources = [ "src/crypto/cipher_extra/tls_cbc.c", "src/crypto/conf/conf.c", "src/crypto/cpu_aarch64_apple.c", + "src/crypto/cpu_aarch64_freebsd.c", "src/crypto/cpu_aarch64_fuchsia.c", "src/crypto/cpu_aarch64_linux.c", "src/crypto/cpu_aarch64_win.c", "src/crypto/cpu_arm.c", + "src/crypto/cpu_arm_freebsd.c", "src/crypto/cpu_arm_linux.c", "src/crypto/cpu_intel.c", "src/crypto/cpu_ppc64le.c", diff --git a/CMakeLists.txt b/CMakeLists.txt index 3795614e6..c3dbcc2c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -423,10 +423,12 @@ add_library( src/crypto/cipher_extra/tls_cbc.c src/crypto/conf/conf.c src/crypto/cpu_aarch64_apple.c + src/crypto/cpu_aarch64_freebsd.c src/crypto/cpu_aarch64_fuchsia.c src/crypto/cpu_aarch64_linux.c src/crypto/cpu_aarch64_win.c src/crypto/cpu_arm.c + src/crypto/cpu_arm_freebsd.c src/crypto/cpu_arm_linux.c src/crypto/cpu_intel.c src/crypto/cpu_ppc64le.c diff --git a/sources.json b/sources.json index c12327f3c..96e1b8cb5 100644 --- a/sources.json +++ b/sources.json @@ -66,10 +66,12 @@ "src/crypto/cipher_extra/tls_cbc.c", "src/crypto/conf/conf.c", "src/crypto/cpu_aarch64_apple.c", + "src/crypto/cpu_aarch64_freebsd.c", "src/crypto/cpu_aarch64_fuchsia.c", "src/crypto/cpu_aarch64_linux.c", "src/crypto/cpu_aarch64_win.c", "src/crypto/cpu_arm.c", + "src/crypto/cpu_arm_freebsd.c", "src/crypto/cpu_arm_linux.c", "src/crypto/cpu_intel.c", "src/crypto/cpu_ppc64le.c", diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index 1f6dedc05..b6f08b09d 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -263,9 +263,11 @@ add_library( cipher_extra/tls_cbc.c conf/conf.c cpu_aarch64_apple.c + cpu_aarch64_freebsd.c cpu_aarch64_fuchsia.c cpu_aarch64_linux.c cpu_aarch64_win.c + cpu_arm_freebsd.c cpu_arm_linux.c cpu_arm.c cpu_intel.c diff --git a/src/crypto/cpu_aarch64_freebsd.c b/src/crypto/cpu_aarch64_freebsd.c new file mode 100644 index 000000000..462a0be60 --- /dev/null +++ b/src/crypto/cpu_aarch64_freebsd.c @@ -0,0 +1,59 @@ +/* Copyright (c) 2022, Google Inc. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include "internal.h" + +#if defined(OPENSSL_AARCH64) && defined(OPENSSL_FREEBSD) && \ + !defined(OPENSSL_STATIC_ARMCAP) + +#include +#include + +#include + +extern uint32_t OPENSSL_armcap_P; + +// ID_AA64ISAR0_*_VAL are defined starting FreeBSD 13.0. When FreeBSD +// 12.x is out of support, these compatibility macros can be removed. + +#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 + +void OPENSSL_cpuid_setup(void) { + uint64_t id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); + + OPENSSL_armcap_P |= ARMV7_NEON; + + if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) { + OPENSSL_armcap_P |= ARMV8_AES; + } + if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_PMULL) { + OPENSSL_armcap_P |= ARMV8_PMULL; + } + if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA1_BASE) { + OPENSSL_armcap_P |= ARMV8_SHA1; + } + if (ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) { + OPENSSL_armcap_P |= ARMV8_SHA256; + } +} + +#endif // OPENSSL_AARCH64 && OPENSSL_FREEBSD && !OPENSSL_STATIC_ARMCAP diff --git a/src/crypto/cpu_arm_freebsd.c b/src/crypto/cpu_arm_freebsd.c new file mode 100644 index 000000000..dcc792055 --- /dev/null +++ b/src/crypto/cpu_arm_freebsd.c @@ -0,0 +1,55 @@ +/* Copyright (c) 2022, Google Inc. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include "internal.h" + +#if defined(OPENSSL_ARM) && defined(OPENSSL_FREEBSD) && \ + !defined(OPENSSL_STATIC_ARMCAP) +#include +#include + +#include +#include + +extern uint32_t OPENSSL_armcap_P; + +void OPENSSL_cpuid_setup(void) { + unsigned long hwcap = 0, hwcap2 = 0; + + // |elf_aux_info| may fail, in which case |hwcap| and |hwcap2| will be + // left at zero. The rest of this function will then gracefully report + // the features are absent. + elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); + elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2)); + + // Matching OpenSSL, only report other features if NEON is present. + if (hwcap & HWCAP_NEON) { + OPENSSL_armcap_P |= ARMV7_NEON; + + if (hwcap2 & HWCAP2_AES) { + OPENSSL_armcap_P |= ARMV8_AES; + } + if (hwcap2 & HWCAP2_PMULL) { + OPENSSL_armcap_P |= ARMV8_PMULL; + } + if (hwcap2 & HWCAP2_SHA1) { + OPENSSL_armcap_P |= ARMV8_SHA1; + } + if (hwcap2 & HWCAP2_SHA2) { + OPENSSL_armcap_P |= ARMV8_SHA256; + } + } +} + +#endif // OPENSSL_ARM && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP