diff options
author | Mark Johnston <markj@FreeBSD.org> | 2023-12-04 17:29:11 +0000 |
---|---|---|
committer | Mark Johnston <markj@FreeBSD.org> | 2023-12-04 17:29:11 +0000 |
commit | e655cc70dfcda5cfedb5a1d9bef1e87d55519f64 (patch) | |
tree | 16cbdbc6d66cb59b096e8f4f48cac952cbcb00a1 /sys/crypto | |
parent | 5b36076d28ad1920b178da93d667dcfeae426494 (diff) | |
download | src-e655cc70dfcda5cfedb5a1d9bef1e87d55519f64.tar.gz src-e655cc70dfcda5cfedb5a1d9bef1e87d55519f64.zip |
ossl: Move arm_arch.h to a common subdirectory
OpenSSL itself keeps only a single copy of this header. Do the same in
sys/crypto/openssl to avoid the extra maintenance burden. This requires
adjusting the include paths for generated asm files.
No functional change intended.
Reported by: jrtc27
Reviewed by: jhb
MFC after: 3 months
Differential Revision: https://reviews.freebsd.org/D42866
Diffstat (limited to 'sys/crypto')
-rw-r--r-- | sys/crypto/openssl/arm/arm_arch.h | 84 | ||||
-rw-r--r-- | sys/crypto/openssl/arm/ossl_aes_gcm.c | 2 | ||||
-rw-r--r-- | sys/crypto/openssl/arm_arch.h (renamed from sys/crypto/openssl/aarch64/arm_arch.h) | 0 | ||||
-rw-r--r-- | sys/crypto/openssl/ossl_aarch64.c | 2 | ||||
-rw-r--r-- | sys/crypto/openssl/ossl_aarch64.h | 2 | ||||
-rw-r--r-- | sys/crypto/openssl/ossl_arm.c | 2 |
6 files changed, 4 insertions, 88 deletions
diff --git a/sys/crypto/openssl/arm/arm_arch.h b/sys/crypto/openssl/arm/arm_arch.h deleted file mode 100644 index 8b7105571d78..000000000000 --- a/sys/crypto/openssl/arm/arm_arch.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#ifndef OSSL_CRYPTO_ARM_ARCH_H -# define OSSL_CRYPTO_ARM_ARCH_H - -# if !defined(__ARM_ARCH__) -# if defined(__CC_ARM) -# define __ARM_ARCH__ __TARGET_ARCH_ARM -# if defined(__BIG_ENDIAN) -# define __ARMEB__ -# else -# define __ARMEL__ -# endif -# elif defined(__GNUC__) -# if defined(__aarch64__) -# define __ARM_ARCH__ 8 -# if __BYTE_ORDER__==__ORDER_BIG_ENDIAN__ -# define __ARMEB__ -# else -# define __ARMEL__ -# endif - /* - * Why doesn't gcc define __ARM_ARCH__? Instead it defines - * bunch of below macros. See all_architectures[] table in - * gcc/config/arm/arm.c. On a side note it defines - * __ARMEL__/__ARMEB__ for little-/big-endian. - */ -# elif defined(__ARM_ARCH) -# define __ARM_ARCH__ __ARM_ARCH -# elif defined(__ARM_ARCH_8A__) -# define __ARM_ARCH__ 8 -# elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__) || \ - defined(__ARM_ARCH_7EM__) -# define __ARM_ARCH__ 7 -# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ - defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \ - defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__) || \ - defined(__ARM_ARCH_6T2__) -# define __ARM_ARCH__ 6 -# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ - defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__) || \ - defined(__ARM_ARCH_5TEJ__) -# define __ARM_ARCH__ 5 -# elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) -# define __ARM_ARCH__ 4 -# else -# error "unsupported ARM architecture" -# endif -# endif -# endif - -# if !defined(__ARM_MAX_ARCH__) -# define __ARM_MAX_ARCH__ __ARM_ARCH__ -# endif - -# if __ARM_MAX_ARCH__<__ARM_ARCH__ -# error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__" -# elif __ARM_MAX_ARCH__!=__ARM_ARCH__ -# if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__) -# error "can't build universal big-endian binary" -# endif -# endif - -# ifndef __ASSEMBLER__ -extern unsigned int OPENSSL_armcap_P; -# endif - -# define ARMV7_NEON (1<<0) -# define ARMV7_TICK (1<<1) -# define ARMV8_AES (1<<2) -# define ARMV8_SHA1 (1<<3) -# define ARMV8_SHA256 (1<<4) -# define ARMV8_PMULL (1<<5) -# define ARMV8_SHA512 (1<<6) - -#endif diff --git a/sys/crypto/openssl/arm/ossl_aes_gcm.c b/sys/crypto/openssl/arm/ossl_aes_gcm.c index 71a977c446ae..e51b7b4fbc04 100644 --- a/sys/crypto/openssl/arm/ossl_aes_gcm.c +++ b/sys/crypto/openssl/arm/ossl_aes_gcm.c @@ -15,7 +15,7 @@ #include <crypto/openssl/ossl_arm.h> #include <crypto/openssl/ossl_aes_gcm.h> #include <crypto/openssl/ossl_cipher.h> -#include <crypto/openssl/arm/arm_arch.h> +#include <crypto/openssl/arm_arch.h> #include <opencrypto/cryptodev.h> diff --git a/sys/crypto/openssl/aarch64/arm_arch.h b/sys/crypto/openssl/arm_arch.h index 7bedb385d971..7bedb385d971 100644 --- a/sys/crypto/openssl/aarch64/arm_arch.h +++ b/sys/crypto/openssl/arm_arch.h diff --git a/sys/crypto/openssl/ossl_aarch64.c b/sys/crypto/openssl/ossl_aarch64.c index b53abd905f6d..a9d0b0bbe211 100644 --- a/sys/crypto/openssl/ossl_aarch64.c +++ b/sys/crypto/openssl/ossl_aarch64.c @@ -35,7 +35,7 @@ #include <crypto/openssl/ossl.h> #include <crypto/openssl/ossl_cipher.h> -#include <crypto/openssl/aarch64/arm_arch.h> +#include <crypto/openssl/arm_arch.h> /* * Feature bits defined in arm_arch.h diff --git a/sys/crypto/openssl/ossl_aarch64.h b/sys/crypto/openssl/ossl_aarch64.h index f933f862d009..57183aa9ed69 100644 --- a/sys/crypto/openssl/ossl_aarch64.h +++ b/sys/crypto/openssl/ossl_aarch64.h @@ -12,7 +12,7 @@ #include <crypto/openssl/ossl.h> #include <crypto/openssl/ossl_cipher.h> -#include <crypto/openssl/aarch64/arm_arch.h> +#include <crypto/openssl/arm_arch.h> /* aesv8-armx.S */ ossl_cipher_encrypt_t aes_v8_cbc_encrypt; diff --git a/sys/crypto/openssl/ossl_arm.c b/sys/crypto/openssl/ossl_arm.c index 74dc25586464..97215007c663 100644 --- a/sys/crypto/openssl/ossl_arm.c +++ b/sys/crypto/openssl/ossl_arm.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <crypto/openssl/ossl.h> #include <crypto/openssl/ossl_cipher.h> -#include <crypto/openssl/arm/arm_arch.h> +#include <crypto/openssl/arm_arch.h> ossl_cipher_setkey_t AES_set_encrypt_key; ossl_cipher_setkey_t AES_set_decrypt_key; |