summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/arch/aarch64/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/alpha/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/amd64/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/arm/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/hppa/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/i386/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/m88k/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/mips64/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/powerpc/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/powerpc64/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/riscv64/opensslconf.h32
-rw-r--r--src/lib/libcrypto/arch/sh/opensslconf.h24
-rw-r--r--src/lib/libcrypto/arch/sparc64/opensslconf.h32
-rw-r--r--src/lib/libcrypto/crypto_local.h6
-rw-r--r--src/lib/libcrypto/des/des.h11
-rw-r--r--src/lib/libcrypto/idea/idea.h9
-rw-r--r--src/lib/libcrypto/rc2/rc2.h9
-rw-r--r--src/lib/libcrypto/rc4/rc4.h9
18 files changed, 36 insertions, 416 deletions
diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/arch/aarch64/opensslconf.h
index 59555fa1df..3aaa6bd0b8 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#undef BN_LLONG 27#undef BN_LLONG
diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h
index e079b1bc6f..47756e45ef 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#undef BN_LLONG 27#undef BN_LLONG
diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h
index 59555fa1df..3aaa6bd0b8 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#undef BN_LLONG 27#undef BN_LLONG
diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h
index 576f49b0ec..ee2111390a 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#define BN_LLONG 27#define BN_LLONG
diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h
index 576f49b0ec..ee2111390a 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#define BN_LLONG 27#define BN_LLONG
diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h
index 538b5c9104..ee2111390a 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned long
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#define BN_LLONG 27#define BN_LLONG
diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h
index 576f49b0ec..ee2111390a 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#define BN_LLONG 27#define BN_LLONG
diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h
index e079b1bc6f..47756e45ef 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#undef BN_LLONG 27#undef BN_LLONG
diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h
index 576f49b0ec..ee2111390a 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#define BN_LLONG 27#define BN_LLONG
diff --git a/src/lib/libcrypto/arch/powerpc64/opensslconf.h b/src/lib/libcrypto/arch/powerpc64/opensslconf.h
index 59555fa1df..3aaa6bd0b8 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#undef BN_LLONG 27#undef BN_LLONG
diff --git a/src/lib/libcrypto/arch/riscv64/opensslconf.h b/src/lib/libcrypto/arch/riscv64/opensslconf.h
index 59555fa1df..3aaa6bd0b8 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#undef BN_LLONG 27#undef BN_LLONG
diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h
index 576f49b0ec..57e562d776 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h
index e079b1bc6f..47756e45ef 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,26 +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_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H) 15#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK) 16#if !defined(RC4_CHUNK)
41/* 17/*
42 * This enables code handling data aligned at natural CPU word 18 * This enables code handling data aligned at natural CPU word
@@ -46,14 +22,6 @@
46#endif 22#endif
47#endif 23#endif
48 24
49#if defined(HEADER_DES_H) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 25#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H 26#define CONFIG_HEADER_BN_H
59#undef BN_LLONG 27#undef BN_LLONG
diff --git a/src/lib/libcrypto/crypto_local.h b/src/lib/libcrypto/crypto_local.h
index d549102da0..606f17cefb 100644
--- a/src/lib/libcrypto/crypto_local.h
+++ b/src/lib/libcrypto/crypto_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: crypto_local.h,v 1.5 2025/05/24 07:23:14 jsing Exp $ */ 1/* $OpenBSD: crypto_local.h,v 1.6 2025/06/09 14:37:48 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -65,6 +65,10 @@
65extern "C" { 65extern "C" {
66#endif 66#endif
67 67
68#ifndef OPENSSLDIR
69#define OPENSSLDIR "/etc/ssl"
70#endif
71
68#define X509_CERT_AREA OPENSSLDIR 72#define X509_CERT_AREA OPENSSLDIR
69#define X509_CERT_DIR OPENSSLDIR "/certs" 73#define X509_CERT_DIR OPENSSLDIR "/certs"
70#define X509_CERT_FILE OPENSSLDIR "/cert.pem" 74#define X509_CERT_FILE OPENSSLDIR "/cert.pem"
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index 277702f87b..4ff4ceca19 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: des.h,v 1.24 2025/06/05 06:37:26 tb Exp $ */ 1/* $OpenBSD: des.h,v 1.25 2025/06/09 14:37:49 tb Exp $ */
2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -61,6 +61,15 @@
61 61
62#include <openssl/opensslconf.h> 62#include <openssl/opensslconf.h>
63 63
64#ifndef DES_LONG
65/* XXX - typedef to int everywhere. */
66#ifdef __i386__
67#define DES_LONG unsigned long
68#else
69#define DES_LONG unsigned int
70#endif
71#endif
72
64#ifdef __cplusplus 73#ifdef __cplusplus
65extern "C" { 74extern "C" {
66#endif 75#endif
diff --git a/src/lib/libcrypto/idea/idea.h b/src/lib/libcrypto/idea/idea.h
index 2bdd3647fd..fccef8fc73 100644
--- a/src/lib/libcrypto/idea/idea.h
+++ b/src/lib/libcrypto/idea/idea.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: idea.h,v 1.13 2025/01/25 17:59:44 tb Exp $ */ 1/* $OpenBSD: idea.h,v 1.14 2025/06/09 14:37:49 tb Exp $ */
2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -59,7 +59,12 @@
59#ifndef HEADER_IDEA_H 59#ifndef HEADER_IDEA_H
60#define HEADER_IDEA_H 60#define HEADER_IDEA_H
61 61
62#include <openssl/opensslconf.h> /* IDEA_INT, OPENSSL_NO_IDEA */ 62#include <openssl/opensslconf.h> /* OPENSSL_NO_IDEA */
63
64#ifndef IDEA_INT
65/* XXX - typedef */
66#define IDEA_INT unsigned int
67#endif
63 68
64#define IDEA_ENCRYPT 1 69#define IDEA_ENCRYPT 1
65#define IDEA_DECRYPT 0 70#define IDEA_DECRYPT 0
diff --git a/src/lib/libcrypto/rc2/rc2.h b/src/lib/libcrypto/rc2/rc2.h
index 96e395f32d..ead308cf51 100644
--- a/src/lib/libcrypto/rc2/rc2.h
+++ b/src/lib/libcrypto/rc2/rc2.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: rc2.h,v 1.13 2025/01/25 17:59:44 tb Exp $ */ 1/* $OpenBSD: rc2.h,v 1.14 2025/06/09 14:37:49 tb Exp $ */
2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -59,7 +59,12 @@
59#ifndef HEADER_RC2_H 59#ifndef HEADER_RC2_H
60#define HEADER_RC2_H 60#define HEADER_RC2_H
61 61
62#include <openssl/opensslconf.h> /* OPENSSL_NO_RC2, RC2_INT */ 62#include <openssl/opensslconf.h> /* OPENSSL_NO_RC2 */
63
64#ifndef RC2_INT
65/* XXX - typedef */
66#define RC2_INT unsigned int
67#endif
63 68
64#define RC2_ENCRYPT 1 69#define RC2_ENCRYPT 1
65#define RC2_DECRYPT 0 70#define RC2_DECRYPT 0
diff --git a/src/lib/libcrypto/rc4/rc4.h b/src/lib/libcrypto/rc4/rc4.h
index a20472372b..c994b39a31 100644
--- a/src/lib/libcrypto/rc4/rc4.h
+++ b/src/lib/libcrypto/rc4/rc4.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: rc4.h,v 1.16 2025/01/25 17:59:44 tb Exp $ */ 1/* $OpenBSD: rc4.h,v 1.17 2025/06/09 14:37:49 tb Exp $ */
2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -59,10 +59,15 @@
59#ifndef HEADER_RC4_H 59#ifndef HEADER_RC4_H
60#define HEADER_RC4_H 60#define HEADER_RC4_H
61 61
62#include <openssl/opensslconf.h> /* OPENSSL_NO_RC4, RC4_INT */ 62#include <openssl/opensslconf.h> /* OPENSSL_NO_RC4 */
63 63
64#include <stddef.h> 64#include <stddef.h>
65 65
66#ifndef RC4_INT
67/* XXX - typedef */
68#define RC4_INT unsigned int
69#endif
70
66#ifdef __cplusplus 71#ifdef __cplusplus
67extern "C" { 72extern "C" {
68#endif 73#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-22 16:38:05 +0000