diff options
Diffstat (limited to '')
26 files changed, 72 insertions, 1986 deletions
diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc index d93cb815ef..d1f22d87cd 100644 --- a/src/lib/libcrypto/arch/aarch64/Makefile.inc +++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc | |||
@@ -1,9 +1,11 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.16 2025/03/12 14:13:41 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.17 2025/06/28 12:51:08 jsing Exp $ |
2 | 2 | ||
3 | # aarch64-specific libcrypto build rules | 3 | # aarch64-specific libcrypto build rules |
4 | 4 | ||
5 | SRCS += crypto_cpu_caps.c | 5 | SRCS += crypto_cpu_caps.c |
6 | 6 | ||
7 | SRCS += sha1_aarch64.c | ||
8 | SRCS += sha1_aarch64_ce.S | ||
7 | SRCS += sha256_aarch64.c | 9 | SRCS += sha256_aarch64.c |
8 | SRCS += sha256_aarch64_ce.S | 10 | SRCS += sha256_aarch64_ce.S |
9 | SRCS += sha512_aarch64.c | 11 | SRCS += sha512_aarch64.c |
diff --git a/src/lib/libcrypto/arch/aarch64/crypto_arch.h b/src/lib/libcrypto/arch/aarch64/crypto_arch.h index 35ecba9394..51c8d79e2d 100644 --- a/src/lib/libcrypto/arch/aarch64/crypto_arch.h +++ b/src/lib/libcrypto/arch/aarch64/crypto_arch.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_arch.h,v 1.4 2025/03/12 14:13:41 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.5 2025/06/28 12:51:08 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -35,6 +35,7 @@ extern uint64_t crypto_cpu_caps_aarch64; | |||
35 | 35 | ||
36 | #ifndef OPENSSL_NO_ASM | 36 | #ifndef OPENSSL_NO_ASM |
37 | 37 | ||
38 | #define HAVE_SHA1_BLOCK_DATA_ORDER | ||
38 | #define HAVE_SHA256_BLOCK_DATA_ORDER | 39 | #define HAVE_SHA256_BLOCK_DATA_ORDER |
39 | #define HAVE_SHA512_BLOCK_DATA_ORDER | 40 | #define HAVE_SHA512_BLOCK_DATA_ORDER |
40 | 41 | ||
diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/arch/aarch64/opensslconf.h index 731b06aecc..868066c75e 100644 --- a/src/lib/libcrypto/arch/aarch64/opensslconf.h +++ b/src/lib/libcrypto/arch/aarch64/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #define RC4_CHUNK unsigned long | 21 | #define RC4_CHUNK unsigned long |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #undef BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #define SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #undef THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #undef DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h index 0ec9c25891..868066c75e 100644 --- a/src/lib/libcrypto/arch/alpha/opensslconf.h +++ b/src/lib/libcrypto/arch/alpha/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,104 +21,3 @@ | |||
49 | #define RC4_CHUNK unsigned long | 21 | #define RC4_CHUNK unsigned long |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #undef BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #define SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #undef THIRTY_TWO_BIT | ||
74 | #endif | ||
75 | |||
76 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
77 | #define CONFIG_HEADER_BF_LOCL_H | ||
78 | #define BF_PTR | ||
79 | #endif /* HEADER_BF_LOCL_H */ | ||
80 | |||
81 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
82 | #define CONFIG_HEADER_DES_LOCL_H | ||
83 | #ifndef DES_DEFAULT_OPTIONS | ||
84 | /* the following is tweaked from a config script, that is why it is a | ||
85 | * protected undef/define */ | ||
86 | #ifndef DES_PTR | ||
87 | #define DES_PTR | ||
88 | #endif | ||
89 | |||
90 | /* This helps C compiler generate the correct code for multiple functional | ||
91 | * units. It reduces register dependencies at the expense of 2 more | ||
92 | * registers */ | ||
93 | #ifndef DES_RISC1 | ||
94 | #undef DES_RISC1 | ||
95 | #endif | ||
96 | |||
97 | #ifndef DES_RISC2 | ||
98 | #define DES_RISC2 | ||
99 | #endif | ||
100 | |||
101 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
102 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
103 | #endif | ||
104 | |||
105 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
106 | * Very much CPU dependent */ | ||
107 | #ifndef DES_UNROLL | ||
108 | #undef DES_UNROLL | ||
109 | #endif | ||
110 | |||
111 | /* These default values were supplied by | ||
112 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
113 | * They are only used if nothing else has been defined */ | ||
114 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
115 | /* Special defines which change the way the code is built depending on the | ||
116 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
117 | even newer MIPS CPU's, but at the moment one size fits all for | ||
118 | optimization options. Older Sparc's work better with only UNROLL, but | ||
119 | there's no way to tell at compile time what it is you're running on */ | ||
120 | |||
121 | #if defined( sun ) /* Newer Sparc's */ | ||
122 | # define DES_PTR | ||
123 | # define DES_RISC1 | ||
124 | # define DES_UNROLL | ||
125 | #elif defined( __ultrix ) /* Older MIPS */ | ||
126 | # define DES_PTR | ||
127 | # define DES_RISC2 | ||
128 | # define DES_UNROLL | ||
129 | #elif defined( __osf1__ ) /* Alpha */ | ||
130 | # define DES_PTR | ||
131 | # define DES_RISC2 | ||
132 | #elif defined ( _AIX ) /* RS6000 */ | ||
133 | /* Unknown */ | ||
134 | #elif defined( __hpux ) /* HP-PA */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __aux ) /* 68K */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
139 | # define DES_UNROLL | ||
140 | #elif defined( __sgi ) /* Newer MIPS */ | ||
141 | # define DES_PTR | ||
142 | # define DES_RISC2 | ||
143 | # define DES_UNROLL | ||
144 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
145 | # define DES_PTR | ||
146 | # define DES_RISC1 | ||
147 | # define DES_UNROLL | ||
148 | #endif /* Systems-specific speed defines */ | ||
149 | #endif | ||
150 | |||
151 | #endif /* DES_DEFAULT_OPTIONS */ | ||
152 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc index b1a6563931..649c507189 100644 --- a/src/lib/libcrypto/arch/amd64/Makefile.inc +++ b/src/lib/libcrypto/arch/amd64/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.37 2025/02/14 12:01:58 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.41 2025/06/28 12:39:10 jsing Exp $ |
2 | 2 | ||
3 | # amd64-specific libcrypto build rules | 3 | # amd64-specific libcrypto build rules |
4 | 4 | ||
@@ -10,13 +10,10 @@ SRCS += crypto_cpu_caps.c | |||
10 | # aes | 10 | # aes |
11 | CFLAGS+= -DAES_ASM | 11 | CFLAGS+= -DAES_ASM |
12 | SSLASM+= aes aes-x86_64 | 12 | SSLASM+= aes aes-x86_64 |
13 | CFLAGS+= -DBSAES_ASM | ||
14 | SSLASM+= aes bsaes-x86_64 | ||
15 | CFLAGS+= -DVPAES_ASM | ||
16 | SSLASM+= aes vpaes-x86_64 | ||
17 | SSLASM+= aes aesni-x86_64 | 13 | SSLASM+= aes aesni-x86_64 |
14 | SRCS += aes_amd64.c | ||
15 | |||
18 | # bn | 16 | # bn |
19 | CFLAGS+= -DOPENSSL_IA32_SSE2 | ||
20 | CFLAGS+= -DRSA_ASM | 17 | CFLAGS+= -DRSA_ASM |
21 | SSLASM+= bn modexp512-x86_64 | 18 | SSLASM+= bn modexp512-x86_64 |
22 | CFLAGS+= -DOPENSSL_BN_ASM_MONT | 19 | CFLAGS+= -DOPENSSL_BN_ASM_MONT |
@@ -41,11 +38,15 @@ SRCS += word_clz.S | |||
41 | # md5 | 38 | # md5 |
42 | CFLAGS+= -DMD5_ASM | 39 | CFLAGS+= -DMD5_ASM |
43 | SRCS+= md5_amd64_generic.S | 40 | SRCS+= md5_amd64_generic.S |
41 | |||
44 | # modes | 42 | # modes |
45 | CFLAGS+= -DGHASH_ASM | 43 | CFLAGS+= -DGHASH_ASM |
46 | SSLASM+= modes ghash-x86_64 | 44 | SSLASM+= modes ghash-x86_64 |
45 | SRCS += gcm128_amd64.c | ||
46 | |||
47 | # rc4 | 47 | # rc4 |
48 | SSLASM+= rc4 rc4-x86_64 | 48 | SSLASM+= rc4 rc4-x86_64 |
49 | |||
49 | # ripemd | 50 | # ripemd |
50 | # sha | 51 | # sha |
51 | SRCS+= sha1_amd64.c | 52 | SRCS+= sha1_amd64.c |
diff --git a/src/lib/libcrypto/arch/amd64/crypto_arch.h b/src/lib/libcrypto/arch/amd64/crypto_arch.h index 951374250d..e869fbba35 100644 --- a/src/lib/libcrypto/arch/amd64/crypto_arch.h +++ b/src/lib/libcrypto/arch/amd64/crypto_arch.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_arch.h,v 1.5 2025/02/14 12:01:58 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.13 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -21,21 +21,28 @@ | |||
21 | #define HEADER_CRYPTO_ARCH_H | 21 | #define HEADER_CRYPTO_ARCH_H |
22 | 22 | ||
23 | #define HAVE_CRYPTO_CPU_CAPS_INIT | 23 | #define HAVE_CRYPTO_CPU_CAPS_INIT |
24 | #define HAVE_CRYPTO_CPU_CAPS_IA32 | ||
25 | 24 | ||
26 | #ifndef __ASSEMBLER__ | 25 | #ifndef __ASSEMBLER__ |
27 | extern uint64_t crypto_cpu_caps_amd64; | 26 | extern uint64_t crypto_cpu_caps_amd64; |
28 | #endif | 27 | #endif |
29 | 28 | ||
30 | #define CRYPTO_CPU_CAPS_AMD64_SHA (1ULL << 0) | 29 | #define CRYPTO_CPU_CAPS_AMD64_AES (1ULL << 0) |
30 | #define CRYPTO_CPU_CAPS_AMD64_CLMUL (1ULL << 1) | ||
31 | #define CRYPTO_CPU_CAPS_AMD64_SHA (1ULL << 2) | ||
31 | 32 | ||
32 | #ifndef OPENSSL_NO_ASM | 33 | #ifndef OPENSSL_NO_ASM |
33 | 34 | ||
34 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL | ||
35 | #define HAVE_AES_SET_ENCRYPT_KEY_INTERNAL | 35 | #define HAVE_AES_SET_ENCRYPT_KEY_INTERNAL |
36 | #define HAVE_AES_SET_DECRYPT_KEY_INTERNAL | 36 | #define HAVE_AES_SET_DECRYPT_KEY_INTERNAL |
37 | #define HAVE_AES_ENCRYPT_INTERNAL | 37 | #define HAVE_AES_ENCRYPT_INTERNAL |
38 | #define HAVE_AES_DECRYPT_INTERNAL | 38 | #define HAVE_AES_DECRYPT_INTERNAL |
39 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL | ||
40 | #define HAVE_AES_CCM64_ENCRYPT_INTERNAL | ||
41 | #define HAVE_AES_CTR32_ENCRYPT_INTERNAL | ||
42 | #define HAVE_AES_ECB_ENCRYPT_INTERNAL | ||
43 | #define HAVE_AES_XTS_ENCRYPT_INTERNAL | ||
44 | |||
45 | #define HAVE_GCM128_INIT | ||
39 | 46 | ||
40 | #define HAVE_RC4_INTERNAL | 47 | #define HAVE_RC4_INTERNAL |
41 | #define HAVE_RC4_SET_KEY_INTERNAL | 48 | #define HAVE_RC4_SET_KEY_INTERNAL |
diff --git a/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c b/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c index 63b7b64cda..0bc440d34f 100644 --- a/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c +++ b/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.4 2024/11/16 13:05:35 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.7 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -98,10 +98,14 @@ crypto_cpu_caps_init(void) | |||
98 | if ((edx & IA32CAP_MASK0_SSE2) != 0) | 98 | if ((edx & IA32CAP_MASK0_SSE2) != 0) |
99 | caps |= CPUCAP_MASK_SSE2; | 99 | caps |= CPUCAP_MASK_SSE2; |
100 | 100 | ||
101 | if ((ecx & IA32CAP_MASK1_AESNI) != 0) | 101 | if ((ecx & IA32CAP_MASK1_AESNI) != 0) { |
102 | caps |= CPUCAP_MASK_AESNI; | 102 | caps |= CPUCAP_MASK_AESNI; |
103 | if ((ecx & IA32CAP_MASK1_PCLMUL) != 0) | 103 | crypto_cpu_caps_amd64 |= CRYPTO_CPU_CAPS_AMD64_AES; |
104 | } | ||
105 | if ((ecx & IA32CAP_MASK1_PCLMUL) != 0) { | ||
104 | caps |= CPUCAP_MASK_PCLMUL; | 106 | caps |= CPUCAP_MASK_PCLMUL; |
107 | crypto_cpu_caps_amd64 |= CRYPTO_CPU_CAPS_AMD64_CLMUL; | ||
108 | } | ||
105 | if ((ecx & IA32CAP_MASK1_SSSE3) != 0) | 109 | if ((ecx & IA32CAP_MASK1_SSSE3) != 0) |
106 | caps |= CPUCAP_MASK_SSSE3; | 110 | caps |= CPUCAP_MASK_SSSE3; |
107 | 111 | ||
@@ -126,9 +130,3 @@ crypto_cpu_caps_init(void) | |||
126 | 130 | ||
127 | OPENSSL_ia32cap_P = caps; | 131 | OPENSSL_ia32cap_P = caps; |
128 | } | 132 | } |
129 | |||
130 | uint64_t | ||
131 | crypto_cpu_caps_ia32(void) | ||
132 | { | ||
133 | return OPENSSL_ia32cap_P; | ||
134 | } | ||
diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h index cc193762f1..868066c75e 100644 --- a/src/lib/libcrypto/arch/amd64/opensslconf.h +++ b/src/lib/libcrypto/arch/amd64/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,101 +21,3 @@ | |||
49 | #define RC4_CHUNK unsigned long | 21 | #define RC4_CHUNK unsigned long |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #undef BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | #define SIXTY_FOUR_BIT_LONG | ||
69 | #undef SIXTY_FOUR_BIT | ||
70 | #undef THIRTY_TWO_BIT | ||
71 | #endif | ||
72 | |||
73 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
74 | #define CONFIG_HEADER_BF_LOCL_H | ||
75 | #undef BF_PTR | ||
76 | #endif /* HEADER_BF_LOCL_H */ | ||
77 | |||
78 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
79 | #define CONFIG_HEADER_DES_LOCL_H | ||
80 | #ifndef DES_DEFAULT_OPTIONS | ||
81 | /* the following is tweaked from a config script, that is why it is a | ||
82 | * protected undef/define */ | ||
83 | #ifndef DES_PTR | ||
84 | #undef DES_PTR | ||
85 | #endif | ||
86 | |||
87 | /* This helps C compiler generate the correct code for multiple functional | ||
88 | * units. It reduces register dependencies at the expense of 2 more | ||
89 | * registers */ | ||
90 | #ifndef DES_RISC1 | ||
91 | #undef DES_RISC1 | ||
92 | #endif | ||
93 | |||
94 | #ifndef DES_RISC2 | ||
95 | #undef DES_RISC2 | ||
96 | #endif | ||
97 | |||
98 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
99 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
100 | #endif | ||
101 | |||
102 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
103 | * Very much CPU dependent */ | ||
104 | #ifndef DES_UNROLL | ||
105 | #define DES_UNROLL | ||
106 | #endif | ||
107 | |||
108 | /* These default values were supplied by | ||
109 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
110 | * They are only used if nothing else has been defined */ | ||
111 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
112 | /* Special defines which change the way the code is built depending on the | ||
113 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
114 | even newer MIPS CPU's, but at the moment one size fits all for | ||
115 | optimization options. Older Sparc's work better with only UNROLL, but | ||
116 | there's no way to tell at compile time what it is you're running on */ | ||
117 | |||
118 | #if defined( sun ) /* Newer Sparc's */ | ||
119 | # define DES_PTR | ||
120 | # define DES_RISC1 | ||
121 | # define DES_UNROLL | ||
122 | #elif defined( __ultrix ) /* Older MIPS */ | ||
123 | # define DES_PTR | ||
124 | # define DES_RISC2 | ||
125 | # define DES_UNROLL | ||
126 | #elif defined( __osf1__ ) /* Alpha */ | ||
127 | # define DES_PTR | ||
128 | # define DES_RISC2 | ||
129 | #elif defined ( _AIX ) /* RS6000 */ | ||
130 | /* Unknown */ | ||
131 | #elif defined( __hpux ) /* HP-PA */ | ||
132 | /* Unknown */ | ||
133 | #elif defined( __aux ) /* 68K */ | ||
134 | /* Unknown */ | ||
135 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
136 | # define DES_UNROLL | ||
137 | #elif defined( __sgi ) /* Newer MIPS */ | ||
138 | # define DES_PTR | ||
139 | # define DES_RISC2 | ||
140 | # define DES_UNROLL | ||
141 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
142 | # define DES_PTR | ||
143 | # define DES_RISC1 | ||
144 | # define DES_UNROLL | ||
145 | #endif /* Systems-specific speed defines */ | ||
146 | #endif | ||
147 | |||
148 | #endif /* DES_DEFAULT_OPTIONS */ | ||
149 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc index e078c51d98..271dff04f6 100644 --- a/src/lib/libcrypto/arch/arm/Makefile.inc +++ b/src/lib/libcrypto/arch/arm/Makefile.inc | |||
@@ -1,28 +1,3 @@ | |||
1 | # $oPenBSD: Makefile.inc,v 1.2 2014/05/02 18:21:39 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.20 2025/05/24 07:07:18 jsing Exp $ |
2 | 2 | ||
3 | # arm-specific libcrypto build rules | 3 | # arm-specific libcrypto build rules |
4 | |||
5 | # aes | ||
6 | CFLAGS+= -DAES_ASM | ||
7 | SSLASM+= aes aes-armv4 | ||
8 | # bn | ||
9 | CFLAGS+= -DOPENSSL_BN_ASM_MONT | ||
10 | SSLASM+= bn armv4-mont | ||
11 | # modes | ||
12 | CFLAGS+= -DGHASH_ASM | ||
13 | SSLASM+= modes ghash-armv4 | ||
14 | # sha | ||
15 | SSLASM+= sha sha1-armv4-large | ||
16 | SSLASM+= sha sha256-armv4 | ||
17 | SSLASM+= sha sha512-armv4 | ||
18 | |||
19 | .for dir f in ${SSLASM} | ||
20 | SRCS+= ${f}.S | ||
21 | GENERATED+=${f}.S | ||
22 | ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl | ||
23 | /usr/bin/perl \ | ||
24 | ${LCRYPTO_SRC}/${dir}/asm/${f}.pl void ${.TARGET} > ${.TARGET} | ||
25 | .endfor | ||
26 | |||
27 | CFLAGS+= -DOPENSSL_CPUID_OBJ | ||
28 | SRCS+= armv4cpuid.S armcap.c | ||
diff --git a/src/lib/libcrypto/arch/arm/arm_arch.h b/src/lib/libcrypto/arch/arm/arm_arch.h deleted file mode 100644 index 5ac3b935f1..0000000000 --- a/src/lib/libcrypto/arch/arm/arm_arch.h +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | /* $OpenBSD: arm_arch.h,v 1.1 2022/03/23 15:13:31 tb Exp $ */ | ||
2 | #ifndef __ARM_ARCH_H__ | ||
3 | #define __ARM_ARCH_H__ | ||
4 | |||
5 | #if !defined(__ARM_ARCH__) | ||
6 | # if defined(__CC_ARM) | ||
7 | # define __ARM_ARCH__ __TARGET_ARCH_ARM | ||
8 | # if defined(__BIG_ENDIAN) | ||
9 | # define __ARMEB__ | ||
10 | # else | ||
11 | # define __ARMEL__ | ||
12 | # endif | ||
13 | # elif defined(__GNUC__) | ||
14 | /* | ||
15 | * Why doesn't gcc define __ARM_ARCH__? Instead it defines | ||
16 | * bunch of below macros. See all_architectures[] table in | ||
17 | * gcc/config/arm/arm.c. On a side note it defines | ||
18 | * __ARMEL__/__ARMEB__ for little-/big-endian. | ||
19 | */ | ||
20 | # if defined(__ARM_ARCH) | ||
21 | # define __ARM_ARCH__ __ARM_ARCH | ||
22 | # elif defined(__ARM_ARCH_8A__) | ||
23 | # define __ARM_ARCH__ 8 | ||
24 | # elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ | ||
25 | defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__) || \ | ||
26 | defined(__ARM_ARCH_7EM__) | ||
27 | # define __ARM_ARCH__ 7 | ||
28 | # elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ | ||
29 | defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \ | ||
30 | defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__) || \ | ||
31 | defined(__ARM_ARCH_6T2__) | ||
32 | # define __ARM_ARCH__ 6 | ||
33 | # elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ | ||
34 | defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__) || \ | ||
35 | defined(__ARM_ARCH_5TEJ__) | ||
36 | # define __ARM_ARCH__ 5 | ||
37 | # elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) | ||
38 | # define __ARM_ARCH__ 4 | ||
39 | # else | ||
40 | # error "unsupported ARM architecture" | ||
41 | # endif | ||
42 | # endif | ||
43 | #endif | ||
44 | |||
45 | #if !defined(__ASSEMBLER__) | ||
46 | extern unsigned int OPENSSL_armcap_P; | ||
47 | |||
48 | #define ARMV7_NEON (1<<0) | ||
49 | #define ARMV8_AES (1<<1) | ||
50 | #define ARMV8_SHA1 (1<<2) | ||
51 | #define ARMV8_SHA256 (1<<3) | ||
52 | #define ARMV8_PMULL (1<<4) | ||
53 | #endif | ||
54 | |||
55 | #if defined(__OpenBSD__) | ||
56 | #define __STRICT_ALIGNMENT | ||
57 | #endif | ||
58 | |||
59 | #endif | ||
diff --git a/src/lib/libcrypto/arch/arm/armcap.c b/src/lib/libcrypto/arch/arm/armcap.c deleted file mode 100644 index 0238195397..0000000000 --- a/src/lib/libcrypto/arch/arm/armcap.c +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | /* $OpenBSD: armcap.c,v 1.3 2024/08/29 03:30:05 deraadt Exp $ */ | ||
2 | #include <stdio.h> | ||
3 | #include <stdlib.h> | ||
4 | #include <string.h> | ||
5 | #include <setjmp.h> | ||
6 | #include <signal.h> | ||
7 | #include <openssl/crypto.h> | ||
8 | |||
9 | #include "arm_arch.h" | ||
10 | |||
11 | unsigned int OPENSSL_armcap_P; | ||
12 | |||
13 | #if __ARM_ARCH__ >= 7 | ||
14 | static sigset_t all_masked; | ||
15 | |||
16 | static sigjmp_buf ill_jmp; | ||
17 | |||
18 | static void | ||
19 | ill_handler(int sig) | ||
20 | { | ||
21 | siglongjmp(ill_jmp, sig); | ||
22 | } | ||
23 | |||
24 | /* | ||
25 | * Following subroutines could have been inlined, but it's not all | ||
26 | * ARM compilers support inline assembler... | ||
27 | */ | ||
28 | void _armv7_neon_probe(void); | ||
29 | void _armv8_aes_probe(void); | ||
30 | void _armv8_sha1_probe(void); | ||
31 | void _armv8_sha256_probe(void); | ||
32 | void _armv8_pmull_probe(void); | ||
33 | #endif | ||
34 | |||
35 | void | ||
36 | OPENSSL_cpuid_setup(void) | ||
37 | { | ||
38 | #if __ARM_ARCH__ >= 7 | ||
39 | struct sigaction ill_oact, ill_act; | ||
40 | sigset_t oset; | ||
41 | #endif | ||
42 | static int trigger = 0; | ||
43 | |||
44 | if (trigger) | ||
45 | return; | ||
46 | trigger = 1; | ||
47 | |||
48 | OPENSSL_armcap_P = 0; | ||
49 | |||
50 | #if __ARM_ARCH__ >= 7 | ||
51 | sigfillset(&all_masked); | ||
52 | sigdelset(&all_masked, SIGILL); | ||
53 | sigdelset(&all_masked, SIGTRAP); | ||
54 | sigdelset(&all_masked, SIGFPE); | ||
55 | sigdelset(&all_masked, SIGBUS); | ||
56 | sigdelset(&all_masked, SIGSEGV); | ||
57 | |||
58 | memset(&ill_act, 0, sizeof(ill_act)); | ||
59 | ill_act.sa_handler = ill_handler; | ||
60 | ill_act.sa_mask = all_masked; | ||
61 | |||
62 | sigprocmask(SIG_SETMASK, &ill_act.sa_mask, &oset); | ||
63 | sigaction(SIGILL, &ill_act, &ill_oact); | ||
64 | |||
65 | if (sigsetjmp(ill_jmp, 1) == 0) { | ||
66 | _armv7_neon_probe(); | ||
67 | OPENSSL_armcap_P |= ARMV7_NEON; | ||
68 | if (sigsetjmp(ill_jmp, 1) == 0) { | ||
69 | _armv8_pmull_probe(); | ||
70 | OPENSSL_armcap_P |= ARMV8_PMULL | ARMV8_AES; | ||
71 | } else if (sigsetjmp(ill_jmp, 1) == 0) { | ||
72 | _armv8_aes_probe(); | ||
73 | OPENSSL_armcap_P |= ARMV8_AES; | ||
74 | } | ||
75 | if (sigsetjmp(ill_jmp, 1) == 0) { | ||
76 | _armv8_sha1_probe(); | ||
77 | OPENSSL_armcap_P |= ARMV8_SHA1; | ||
78 | } | ||
79 | if (sigsetjmp(ill_jmp, 1) == 0) { | ||
80 | _armv8_sha256_probe(); | ||
81 | OPENSSL_armcap_P |= ARMV8_SHA256; | ||
82 | } | ||
83 | } | ||
84 | |||
85 | sigaction (SIGILL, &ill_oact, NULL); | ||
86 | sigprocmask(SIG_SETMASK, &oset, NULL); | ||
87 | #endif | ||
88 | } | ||
diff --git a/src/lib/libcrypto/arch/arm/armv4cpuid.S b/src/lib/libcrypto/arch/arm/armv4cpuid.S deleted file mode 100644 index db0b54e496..0000000000 --- a/src/lib/libcrypto/arch/arm/armv4cpuid.S +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | #include "arm_arch.h" | ||
2 | |||
3 | .text | ||
4 | #if defined(__thumb2__) && !defined(__APPLE__) | ||
5 | .syntax unified | ||
6 | .thumb | ||
7 | #else | ||
8 | .code 32 | ||
9 | #undef __thumb2__ | ||
10 | #endif | ||
11 | |||
12 | #if __ARM_ARCH__>=7 | ||
13 | .arch armv7-a | ||
14 | .fpu neon | ||
15 | |||
16 | .align 5 | ||
17 | .globl _armv7_neon_probe | ||
18 | .type _armv7_neon_probe,%function | ||
19 | _armv7_neon_probe: | ||
20 | vorr q0,q0,q0 | ||
21 | bx lr | ||
22 | .size _armv7_neon_probe,.-_armv7_neon_probe | ||
23 | |||
24 | .globl _armv8_aes_probe | ||
25 | .type _armv8_aes_probe,%function | ||
26 | _armv8_aes_probe: | ||
27 | #if defined(__thumb2__) && !defined(__APPLE__) | ||
28 | .byte 0xb0,0xff,0x00,0x03 @ aese.8 q0,q0 | ||
29 | #else | ||
30 | .byte 0x00,0x03,0xb0,0xf3 @ aese.8 q0,q0 | ||
31 | #endif | ||
32 | bx lr | ||
33 | .size _armv8_aes_probe,.-_armv8_aes_probe | ||
34 | |||
35 | .globl _armv8_sha1_probe | ||
36 | .type _armv8_sha1_probe,%function | ||
37 | _armv8_sha1_probe: | ||
38 | #if defined(__thumb2__) && !defined(__APPLE__) | ||
39 | .byte 0x00,0xef,0x40,0x0c @ sha1c.32 q0,q0,q0 | ||
40 | #else | ||
41 | .byte 0x40,0x0c,0x00,0xf2 @ sha1c.32 q0,q0,q0 | ||
42 | #endif | ||
43 | bx lr | ||
44 | .size _armv8_sha1_probe,.-_armv8_sha1_probe | ||
45 | |||
46 | .globl _armv8_sha256_probe | ||
47 | .type _armv8_sha256_probe,%function | ||
48 | _armv8_sha256_probe: | ||
49 | #if defined(__thumb2__) && !defined(__APPLE__) | ||
50 | .byte 0x00,0xff,0x40,0x0c @ sha256h.32 q0,q0,q0 | ||
51 | #else | ||
52 | .byte 0x40,0x0c,0x00,0xf3 @ sha256h.32 q0,q0,q0 | ||
53 | #endif | ||
54 | bx lr | ||
55 | .size _armv8_sha256_probe,.-_armv8_sha256_probe | ||
56 | .globl _armv8_pmull_probe | ||
57 | .type _armv8_pmull_probe,%function | ||
58 | _armv8_pmull_probe: | ||
59 | #if defined(__thumb2__) && !defined(__APPLE__) | ||
60 | .byte 0xa0,0xef,0x00,0x0e @ vmull.p64 q0,d0,d0 | ||
61 | #else | ||
62 | .byte 0x00,0x0e,0xa0,0xf2 @ vmull.p64 q0,d0,d0 | ||
63 | #endif | ||
64 | bx lr | ||
65 | .size _armv8_pmull_probe,.-_armv8_pmull_probe | ||
66 | #endif | ||
67 | |||
68 | .comm OPENSSL_armcap_P,4,4 | ||
69 | .hidden OPENSSL_armcap_P | ||
diff --git a/src/lib/libcrypto/arch/arm/crypto_arch.h b/src/lib/libcrypto/arch/arm/crypto_arch.h index 07d7829fe3..732a59cf72 100644 --- a/src/lib/libcrypto/arch/arm/crypto_arch.h +++ b/src/lib/libcrypto/arch/arm/crypto_arch.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_arch.h,v 1.2 2025/02/14 12:01:58 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.3 2025/05/24 07:07:18 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -20,20 +20,6 @@ | |||
20 | 20 | ||
21 | #ifndef OPENSSL_NO_ASM | 21 | #ifndef OPENSSL_NO_ASM |
22 | 22 | ||
23 | #define HAVE_AES_SET_ENCRYPT_KEY_INTERNAL | ||
24 | #define HAVE_AES_SET_DECRYPT_KEY_INTERNAL | ||
25 | #define HAVE_AES_ENCRYPT_INTERNAL | ||
26 | #define HAVE_AES_DECRYPT_INTERNAL | ||
27 | |||
28 | #define HAVE_SHA1_BLOCK_DATA_ORDER | ||
29 | #define HAVE_SHA1_BLOCK_GENERIC | ||
30 | |||
31 | #define HAVE_SHA256_BLOCK_DATA_ORDER | ||
32 | #define HAVE_SHA256_BLOCK_GENERIC | ||
33 | |||
34 | #define HAVE_SHA512_BLOCK_DATA_ORDER | ||
35 | #define HAVE_SHA512_BLOCK_GENERIC | ||
36 | |||
37 | #endif | 23 | #endif |
38 | 24 | ||
39 | #endif | 25 | #endif |
diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h index a5d26b6fdc..dcbe113864 100644 --- a/src/lib/libcrypto/arch/arm/opensslconf.h +++ b/src/lib/libcrypto/arch/arm/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #undef RC4_CHUNK | 21 | #undef RC4_CHUNK |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #define BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #undef SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #define THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #undef DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h index a5d26b6fdc..dcbe113864 100644 --- a/src/lib/libcrypto/arch/hppa/opensslconf.h +++ b/src/lib/libcrypto/arch/hppa/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #undef RC4_CHUNK | 21 | #undef RC4_CHUNK |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #define BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #undef SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #define THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #undef DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc index 6989b35686..bfc701687e 100644 --- a/src/lib/libcrypto/arch/i386/Makefile.inc +++ b/src/lib/libcrypto/arch/i386/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.27 2025/02/14 12:01:58 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.31 2025/06/28 12:39:10 jsing Exp $ |
2 | 2 | ||
3 | # i386-specific libcrypto build rules | 3 | # i386-specific libcrypto build rules |
4 | 4 | ||
@@ -10,23 +10,27 @@ SRCS += crypto_cpu_caps.c | |||
10 | # aes | 10 | # aes |
11 | CFLAGS+= -DAES_ASM | 11 | CFLAGS+= -DAES_ASM |
12 | SSLASM+= aes aes-586 | 12 | SSLASM+= aes aes-586 |
13 | CFLAGS+= -DVPAES_ASM | ||
14 | SSLASM+= aes vpaes-x86 | ||
15 | SSLASM+= aes aesni-x86 | 13 | SSLASM+= aes aesni-x86 |
14 | SRCS += aes_i386.c | ||
15 | |||
16 | # bn | 16 | # bn |
17 | CFLAGS+= -DOPENSSL_IA32_SSE2 | ||
18 | SSLASM+= bn bn-586 | 17 | SSLASM+= bn bn-586 |
19 | SSLASM+= bn co-586 | 18 | SSLASM+= bn co-586 |
20 | CFLAGS+= -DOPENSSL_BN_ASM_MONT | 19 | CFLAGS+= -DOPENSSL_BN_ASM_MONT |
21 | SSLASM+= bn x86-mont | 20 | SSLASM+= bn x86-mont |
21 | |||
22 | # md5 | 22 | # md5 |
23 | CFLAGS+= -DMD5_ASM | 23 | CFLAGS+= -DMD5_ASM |
24 | SSLASM+= md5 md5-586 | 24 | SSLASM+= md5 md5-586 |
25 | |||
25 | # modes | 26 | # modes |
26 | CFLAGS+= -DGHASH_ASM | 27 | CFLAGS+= -DGHASH_ASM |
27 | SSLASM+= modes ghash-x86 | 28 | SSLASM+= modes ghash-x86 |
29 | SRCS += gcm128_i386.c | ||
30 | |||
28 | # rc4 | 31 | # rc4 |
29 | SSLASM+= rc4 rc4-586 | 32 | SSLASM+= rc4 rc4-586 |
33 | |||
30 | # sha | 34 | # sha |
31 | SSLASM+= sha sha1-586 | 35 | SSLASM+= sha sha1-586 |
32 | SSLASM+= sha sha256-586 | 36 | SSLASM+= sha sha256-586 |
diff --git a/src/lib/libcrypto/arch/i386/crypto_arch.h b/src/lib/libcrypto/arch/i386/crypto_arch.h index 3df3963d0b..d2faa36e2e 100644 --- a/src/lib/libcrypto/arch/i386/crypto_arch.h +++ b/src/lib/libcrypto/arch/i386/crypto_arch.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_arch.h,v 1.4 2025/02/14 12:01:58 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.12 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -15,19 +15,34 @@ | |||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <stdint.h> | ||
19 | |||
18 | #ifndef HEADER_CRYPTO_ARCH_H | 20 | #ifndef HEADER_CRYPTO_ARCH_H |
19 | #define HEADER_CRYPTO_ARCH_H | 21 | #define HEADER_CRYPTO_ARCH_H |
20 | 22 | ||
21 | #define HAVE_CRYPTO_CPU_CAPS_INIT | 23 | #define HAVE_CRYPTO_CPU_CAPS_INIT |
22 | #define HAVE_CRYPTO_CPU_CAPS_IA32 | 24 | |
25 | #ifndef __ASSEMBLER__ | ||
26 | extern uint64_t crypto_cpu_caps_i386; | ||
27 | #endif | ||
28 | |||
29 | #define CRYPTO_CPU_CAPS_I386_AES (1ULL << 0) | ||
30 | #define CRYPTO_CPU_CAPS_I386_CLMUL (1ULL << 1) | ||
31 | #define CRYPTO_CPU_CAPS_I386_MMX (1ULL << 2) | ||
23 | 32 | ||
24 | #ifndef OPENSSL_NO_ASM | 33 | #ifndef OPENSSL_NO_ASM |
25 | 34 | ||
26 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL | ||
27 | #define HAVE_AES_SET_ENCRYPT_KEY_INTERNAL | 35 | #define HAVE_AES_SET_ENCRYPT_KEY_INTERNAL |
28 | #define HAVE_AES_SET_DECRYPT_KEY_INTERNAL | 36 | #define HAVE_AES_SET_DECRYPT_KEY_INTERNAL |
29 | #define HAVE_AES_ENCRYPT_INTERNAL | 37 | #define HAVE_AES_ENCRYPT_INTERNAL |
30 | #define HAVE_AES_DECRYPT_INTERNAL | 38 | #define HAVE_AES_DECRYPT_INTERNAL |
39 | #define HAVE_AES_CBC_ENCRYPT_INTERNAL | ||
40 | #define HAVE_AES_CCM64_ENCRYPT_INTERNAL | ||
41 | #define HAVE_AES_CTR32_ENCRYPT_INTERNAL | ||
42 | #define HAVE_AES_ECB_ENCRYPT_INTERNAL | ||
43 | #define HAVE_AES_XTS_ENCRYPT_INTERNAL | ||
44 | |||
45 | #define HAVE_GCM128_INIT | ||
31 | 46 | ||
32 | #define HAVE_RC4_INTERNAL | 47 | #define HAVE_RC4_INTERNAL |
33 | #define HAVE_RC4_SET_KEY_INTERNAL | 48 | #define HAVE_RC4_SET_KEY_INTERNAL |
diff --git a/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c b/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c index 6bb77411af..07d60f9a3f 100644 --- a/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c +++ b/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.3 2024/11/12 13:14:57 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.6 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -19,11 +19,15 @@ | |||
19 | 19 | ||
20 | #include <openssl/crypto.h> | 20 | #include <openssl/crypto.h> |
21 | 21 | ||
22 | #include "crypto_arch.h" | ||
22 | #include "x86_arch.h" | 23 | #include "x86_arch.h" |
23 | 24 | ||
24 | /* Legacy architecture specific capabilities, used by perlasm. */ | 25 | /* Legacy architecture specific capabilities, used by perlasm. */ |
25 | uint64_t OPENSSL_ia32cap_P; | 26 | uint64_t OPENSSL_ia32cap_P; |
26 | 27 | ||
28 | /* Machine dependent CPU capabilities. */ | ||
29 | uint64_t crypto_cpu_caps_i386; | ||
30 | |||
27 | /* Machine independent CPU capabilities. */ | 31 | /* Machine independent CPU capabilities. */ |
28 | extern uint64_t crypto_cpu_caps; | 32 | extern uint64_t crypto_cpu_caps; |
29 | 33 | ||
@@ -85,17 +89,23 @@ crypto_cpu_caps_init(void) | |||
85 | caps |= CPUCAP_MASK_FXSR; | 89 | caps |= CPUCAP_MASK_FXSR; |
86 | if ((edx & IA32CAP_MASK0_HT) != 0) | 90 | if ((edx & IA32CAP_MASK0_HT) != 0) |
87 | caps |= CPUCAP_MASK_HT; | 91 | caps |= CPUCAP_MASK_HT; |
88 | if ((edx & IA32CAP_MASK0_MMX) != 0) | 92 | if ((edx & IA32CAP_MASK0_MMX) != 0) { |
89 | caps |= CPUCAP_MASK_MMX; | 93 | caps |= CPUCAP_MASK_MMX; |
94 | crypto_cpu_caps_i386 |= CRYPTO_CPU_CAPS_I386_MMX; | ||
95 | } | ||
90 | if ((edx & IA32CAP_MASK0_SSE) != 0) | 96 | if ((edx & IA32CAP_MASK0_SSE) != 0) |
91 | caps |= CPUCAP_MASK_SSE; | 97 | caps |= CPUCAP_MASK_SSE; |
92 | if ((edx & IA32CAP_MASK0_SSE2) != 0) | 98 | if ((edx & IA32CAP_MASK0_SSE2) != 0) |
93 | caps |= CPUCAP_MASK_SSE2; | 99 | caps |= CPUCAP_MASK_SSE2; |
94 | 100 | ||
95 | if ((ecx & IA32CAP_MASK1_AESNI) != 0) | 101 | if ((ecx & IA32CAP_MASK1_AESNI) != 0) { |
96 | caps |= CPUCAP_MASK_AESNI; | 102 | caps |= CPUCAP_MASK_AESNI; |
97 | if ((ecx & IA32CAP_MASK1_PCLMUL) != 0) | 103 | crypto_cpu_caps_i386 |= CRYPTO_CPU_CAPS_I386_AES; |
104 | } | ||
105 | if ((ecx & IA32CAP_MASK1_PCLMUL) != 0) { | ||
98 | caps |= CPUCAP_MASK_PCLMUL; | 106 | caps |= CPUCAP_MASK_PCLMUL; |
107 | crypto_cpu_caps_i386 |= CRYPTO_CPU_CAPS_I386_CLMUL; | ||
108 | } | ||
99 | if ((ecx & IA32CAP_MASK1_SSSE3) != 0) | 109 | if ((ecx & IA32CAP_MASK1_SSSE3) != 0) |
100 | caps |= CPUCAP_MASK_SSSE3; | 110 | caps |= CPUCAP_MASK_SSSE3; |
101 | 111 | ||
@@ -112,9 +122,3 @@ crypto_cpu_caps_init(void) | |||
112 | 122 | ||
113 | OPENSSL_ia32cap_P = caps; | 123 | OPENSSL_ia32cap_P = caps; |
114 | } | 124 | } |
115 | |||
116 | uint64_t | ||
117 | crypto_cpu_caps_ia32(void) | ||
118 | { | ||
119 | return OPENSSL_ia32cap_P; | ||
120 | } | ||
diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h index 03cf31b940..dcbe113864 100644 --- a/src/lib/libcrypto/arch/i386/opensslconf.h +++ b/src/lib/libcrypto/arch/i386/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #undef RC4_CHUNK | 21 | #undef RC4_CHUNK |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned long | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #define BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #undef SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #define THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #define DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #define DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h index a5d26b6fdc..dcbe113864 100644 --- a/src/lib/libcrypto/arch/m88k/opensslconf.h +++ b/src/lib/libcrypto/arch/m88k/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #undef RC4_CHUNK | 21 | #undef RC4_CHUNK |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #define BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #undef SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #define THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #undef DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h index 36cdd2840b..868066c75e 100644 --- a/src/lib/libcrypto/arch/mips64/opensslconf.h +++ b/src/lib/libcrypto/arch/mips64/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #define RC4_CHUNK unsigned long | 21 | #define RC4_CHUNK unsigned long |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #undef BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #define SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #undef THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #define BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #define DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #define DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #undef DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h index a5d26b6fdc..dcbe113864 100644 --- a/src/lib/libcrypto/arch/powerpc/opensslconf.h +++ b/src/lib/libcrypto/arch/powerpc/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #undef RC4_CHUNK | 21 | #undef RC4_CHUNK |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #define BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #undef SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #define THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #undef DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/powerpc64/opensslconf.h b/src/lib/libcrypto/arch/powerpc64/opensslconf.h index cc193762f1..868066c75e 100644 --- a/src/lib/libcrypto/arch/powerpc64/opensslconf.h +++ b/src/lib/libcrypto/arch/powerpc64/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,101 +21,3 @@ | |||
49 | #define RC4_CHUNK unsigned long | 21 | #define RC4_CHUNK unsigned long |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #undef BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | #define SIXTY_FOUR_BIT_LONG | ||
69 | #undef SIXTY_FOUR_BIT | ||
70 | #undef THIRTY_TWO_BIT | ||
71 | #endif | ||
72 | |||
73 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
74 | #define CONFIG_HEADER_BF_LOCL_H | ||
75 | #undef BF_PTR | ||
76 | #endif /* HEADER_BF_LOCL_H */ | ||
77 | |||
78 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
79 | #define CONFIG_HEADER_DES_LOCL_H | ||
80 | #ifndef DES_DEFAULT_OPTIONS | ||
81 | /* the following is tweaked from a config script, that is why it is a | ||
82 | * protected undef/define */ | ||
83 | #ifndef DES_PTR | ||
84 | #undef DES_PTR | ||
85 | #endif | ||
86 | |||
87 | /* This helps C compiler generate the correct code for multiple functional | ||
88 | * units. It reduces register dependencies at the expense of 2 more | ||
89 | * registers */ | ||
90 | #ifndef DES_RISC1 | ||
91 | #undef DES_RISC1 | ||
92 | #endif | ||
93 | |||
94 | #ifndef DES_RISC2 | ||
95 | #undef DES_RISC2 | ||
96 | #endif | ||
97 | |||
98 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
99 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
100 | #endif | ||
101 | |||
102 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
103 | * Very much CPU dependent */ | ||
104 | #ifndef DES_UNROLL | ||
105 | #define DES_UNROLL | ||
106 | #endif | ||
107 | |||
108 | /* These default values were supplied by | ||
109 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
110 | * They are only used if nothing else has been defined */ | ||
111 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
112 | /* Special defines which change the way the code is built depending on the | ||
113 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
114 | even newer MIPS CPU's, but at the moment one size fits all for | ||
115 | optimization options. Older Sparc's work better with only UNROLL, but | ||
116 | there's no way to tell at compile time what it is you're running on */ | ||
117 | |||
118 | #if defined( sun ) /* Newer Sparc's */ | ||
119 | # define DES_PTR | ||
120 | # define DES_RISC1 | ||
121 | # define DES_UNROLL | ||
122 | #elif defined( __ultrix ) /* Older MIPS */ | ||
123 | # define DES_PTR | ||
124 | # define DES_RISC2 | ||
125 | # define DES_UNROLL | ||
126 | #elif defined( __osf1__ ) /* Alpha */ | ||
127 | # define DES_PTR | ||
128 | # define DES_RISC2 | ||
129 | #elif defined ( _AIX ) /* RS6000 */ | ||
130 | /* Unknown */ | ||
131 | #elif defined( __hpux ) /* HP-PA */ | ||
132 | /* Unknown */ | ||
133 | #elif defined( __aux ) /* 68K */ | ||
134 | /* Unknown */ | ||
135 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
136 | # define DES_UNROLL | ||
137 | #elif defined( __sgi ) /* Newer MIPS */ | ||
138 | # define DES_PTR | ||
139 | # define DES_RISC2 | ||
140 | # define DES_UNROLL | ||
141 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
142 | # define DES_PTR | ||
143 | # define DES_RISC1 | ||
144 | # define DES_UNROLL | ||
145 | #endif /* Systems-specific speed defines */ | ||
146 | #endif | ||
147 | |||
148 | #endif /* DES_DEFAULT_OPTIONS */ | ||
149 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/riscv64/opensslconf.h b/src/lib/libcrypto/arch/riscv64/opensslconf.h index 731b06aecc..868066c75e 100644 --- a/src/lib/libcrypto/arch/riscv64/opensslconf.h +++ b/src/lib/libcrypto/arch/riscv64/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #define RC4_CHUNK unsigned long | 21 | #define RC4_CHUNK unsigned long |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #undef BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #define SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #undef THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #undef DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h index a5d26b6fdc..dcbe113864 100644 --- a/src/lib/libcrypto/arch/sh/opensslconf.h +++ b/src/lib/libcrypto/arch/sh/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #undef RC4_CHUNK | 21 | #undef RC4_CHUNK |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #define BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #undef SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #define THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #undef BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #undef DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #undef DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #define DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h index 36cdd2840b..868066c75e 100644 --- a/src/lib/libcrypto/arch/sparc64/opensslconf.h +++ b/src/lib/libcrypto/arch/sparc64/opensslconf.h | |||
@@ -1,9 +1,4 @@ | |||
1 | #include <openssl/opensslfeatures.h> | 1 | #include <openssl/opensslfeatures.h> |
2 | /* crypto/opensslconf.h.in */ | ||
3 | |||
4 | #if defined(HEADER_CRYPTO_LOCAL_H) && !defined(OPENSSLDIR) | ||
5 | #define OPENSSLDIR "/etc/ssl" | ||
6 | #endif | ||
7 | 2 | ||
8 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | 3 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION |
9 | 4 | ||
@@ -17,30 +12,7 @@ | |||
17 | #endif | 12 | #endif |
18 | #endif | 13 | #endif |
19 | 14 | ||
20 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
21 | #define IDEA_INT unsigned int | ||
22 | #endif | ||
23 | |||
24 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
25 | #define MD2_INT unsigned int | ||
26 | #endif | ||
27 | |||
28 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
29 | /* I need to put in a mod for the alpha - eay */ | ||
30 | #define RC2_INT unsigned int | ||
31 | #endif | ||
32 | |||
33 | #if defined(HEADER_RC4_H) | 15 | #if defined(HEADER_RC4_H) |
34 | #if !defined(RC4_INT) | ||
35 | /* using int types make the structure larger but make the code faster | ||
36 | * on most boxes I have tested - up to %20 faster. */ | ||
37 | /* | ||
38 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
39 | * - Intel P6 because partial register stalls are very expensive; | ||
40 | * - elder Alpha because it lacks byte load/store instructions; | ||
41 | */ | ||
42 | #define RC4_INT unsigned int | ||
43 | #endif | ||
44 | #if !defined(RC4_CHUNK) | 16 | #if !defined(RC4_CHUNK) |
45 | /* | 17 | /* |
46 | * This enables code handling data aligned at natural CPU word | 18 | * This enables code handling data aligned at natural CPU word |
@@ -49,106 +21,3 @@ | |||
49 | #define RC4_CHUNK unsigned long | 21 | #define RC4_CHUNK unsigned long |
50 | #endif | 22 | #endif |
51 | #endif | 23 | #endif |
52 | |||
53 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
54 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
55 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
56 | #ifndef DES_LONG | ||
57 | #define DES_LONG unsigned int | ||
58 | #endif | ||
59 | #endif | ||
60 | |||
61 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
62 | #define CONFIG_HEADER_BN_H | ||
63 | #undef BN_LLONG | ||
64 | |||
65 | /* Should we define BN_DIV2W here? */ | ||
66 | |||
67 | /* Only one for the following should be defined */ | ||
68 | /* The prime number generation stuff may not work when | ||
69 | * EIGHT_BIT but I don't care since I've only used this mode | ||
70 | * for debugging the bignum libraries */ | ||
71 | #define SIXTY_FOUR_BIT_LONG | ||
72 | #undef SIXTY_FOUR_BIT | ||
73 | #undef THIRTY_TWO_BIT | ||
74 | #undef SIXTEEN_BIT | ||
75 | #undef EIGHT_BIT | ||
76 | #endif | ||
77 | |||
78 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
79 | #define CONFIG_HEADER_BF_LOCL_H | ||
80 | #define BF_PTR | ||
81 | #endif /* HEADER_BF_LOCL_H */ | ||
82 | |||
83 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
84 | #define CONFIG_HEADER_DES_LOCL_H | ||
85 | #ifndef DES_DEFAULT_OPTIONS | ||
86 | /* the following is tweaked from a config script, that is why it is a | ||
87 | * protected undef/define */ | ||
88 | #ifndef DES_PTR | ||
89 | #define DES_PTR | ||
90 | #endif | ||
91 | |||
92 | /* This helps C compiler generate the correct code for multiple functional | ||
93 | * units. It reduces register dependencies at the expense of 2 more | ||
94 | * registers */ | ||
95 | #ifndef DES_RISC1 | ||
96 | #undef DES_RISC1 | ||
97 | #endif | ||
98 | |||
99 | #ifndef DES_RISC2 | ||
100 | #define DES_RISC2 | ||
101 | #endif | ||
102 | |||
103 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
104 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
105 | #endif | ||
106 | |||
107 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
108 | * Very much CPU dependent */ | ||
109 | #ifndef DES_UNROLL | ||
110 | #undef DES_UNROLL | ||
111 | #endif | ||
112 | |||
113 | /* These default values were supplied by | ||
114 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
115 | * They are only used if nothing else has been defined */ | ||
116 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
117 | /* Special defines which change the way the code is built depending on the | ||
118 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
119 | even newer MIPS CPU's, but at the moment one size fits all for | ||
120 | optimization options. Older Sparc's work better with only UNROLL, but | ||
121 | there's no way to tell at compile time what it is you're running on */ | ||
122 | |||
123 | #if defined( sun ) /* Newer Sparc's */ | ||
124 | # define DES_PTR | ||
125 | # define DES_RISC1 | ||
126 | # define DES_UNROLL | ||
127 | #elif defined( __ultrix ) /* Older MIPS */ | ||
128 | # define DES_PTR | ||
129 | # define DES_RISC2 | ||
130 | # define DES_UNROLL | ||
131 | #elif defined( __osf1__ ) /* Alpha */ | ||
132 | # define DES_PTR | ||
133 | # define DES_RISC2 | ||
134 | #elif defined ( _AIX ) /* RS6000 */ | ||
135 | /* Unknown */ | ||
136 | #elif defined( __hpux ) /* HP-PA */ | ||
137 | /* Unknown */ | ||
138 | #elif defined( __aux ) /* 68K */ | ||
139 | /* Unknown */ | ||
140 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
141 | # define DES_UNROLL | ||
142 | #elif defined( __sgi ) /* Newer MIPS */ | ||
143 | # define DES_PTR | ||
144 | # define DES_RISC2 | ||
145 | # define DES_UNROLL | ||
146 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
147 | # define DES_PTR | ||
148 | # define DES_RISC1 | ||
149 | # define DES_UNROLL | ||
150 | #endif /* Systems-specific speed defines */ | ||
151 | #endif | ||
152 | |||
153 | #endif /* DES_DEFAULT_OPTIONS */ | ||
154 | #endif /* HEADER_DES_LOCL_H */ | ||