diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/CMakeLists.txt | 15 | ||||
-rw-r--r-- | include/Makefile.am | 16 | ||||
-rw-r--r-- | include/arch/loongarch64/opensslconf.h | 131 | ||||
-rw-r--r-- | include/arch/mips/opensslconf.h | 131 | ||||
-rw-r--r-- | include/compat/sys/stat.h | 8 |
5 files changed, 39 insertions, 262 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 11ab7c2..04160af 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt | |||
@@ -1,3 +1,18 @@ | |||
1 | # | ||
2 | # Copyright (c) 2016 Jeff Davey | ||
3 | # | ||
4 | # Permission to use, copy, modify, and distribute this software for any | ||
5 | # purpose with or without fee is hereby granted, provided that the above | ||
6 | # copyright notice and this permission notice appear in all copies. | ||
7 | # | ||
8 | # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
9 | # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
10 | # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
11 | # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
12 | # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
13 | # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
14 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
15 | |||
1 | if(ENABLE_LIBRESSL_INSTALL) | 16 | if(ENABLE_LIBRESSL_INSTALL) |
2 | install(DIRECTORY . | 17 | install(DIRECTORY . |
3 | DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | 18 | DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
diff --git a/include/Makefile.am b/include/Makefile.am index feaaa60..a3e1c19 100644 --- a/include/Makefile.am +++ b/include/Makefile.am | |||
@@ -1,3 +1,18 @@ | |||
1 | # | ||
2 | # Copyright (c) 2014 Brent Cook | ||
3 | # | ||
4 | # Permission to use, copy, modify, and distribute this software for any | ||
5 | # purpose with or without fee is hereby granted, provided that the above | ||
6 | # copyright notice and this permission notice appear in all copies. | ||
7 | # | ||
8 | # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
9 | # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
10 | # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
11 | # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
12 | # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
13 | # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
14 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
15 | |||
1 | include $(top_srcdir)/Makefile.am.common | 16 | include $(top_srcdir)/Makefile.am.common |
2 | 17 | ||
3 | EXTRA_DIST = CMakeLists.txt | 18 | EXTRA_DIST = CMakeLists.txt |
@@ -52,6 +67,7 @@ noinst_HEADERS += arch/amd64/opensslconf.h | |||
52 | noinst_HEADERS += arch/arm/opensslconf.h | 67 | noinst_HEADERS += arch/arm/opensslconf.h |
53 | noinst_HEADERS += arch/hppa/opensslconf.h | 68 | noinst_HEADERS += arch/hppa/opensslconf.h |
54 | noinst_HEADERS += arch/i386/opensslconf.h | 69 | noinst_HEADERS += arch/i386/opensslconf.h |
70 | noinst_HEADERS += arch/loongarch64/opensslconf.h | ||
55 | noinst_HEADERS += arch/m88k/opensslconf.h | 71 | noinst_HEADERS += arch/m88k/opensslconf.h |
56 | noinst_HEADERS += arch/mips/opensslconf.h | 72 | noinst_HEADERS += arch/mips/opensslconf.h |
57 | noinst_HEADERS += arch/mips64/opensslconf.h | 73 | noinst_HEADERS += arch/mips64/opensslconf.h |
diff --git a/include/arch/loongarch64/opensslconf.h b/include/arch/loongarch64/opensslconf.h index 731b06a..868066c 100644 --- a/include/arch/loongarch64/opensslconf.h +++ b/include/arch/loongarch64/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/include/arch/mips/opensslconf.h b/include/arch/mips/opensslconf.h index a5d26b6..dcbe113 100644 --- a/include/arch/mips/opensslconf.h +++ b/include/arch/mips/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/include/compat/sys/stat.h b/include/compat/sys/stat.h index b88da1d..57aa521 100644 --- a/include/compat/sys/stat.h +++ b/include/compat/sys/stat.h | |||
@@ -118,4 +118,12 @@ | |||
118 | 118 | ||
119 | #endif | 119 | #endif |
120 | 120 | ||
121 | #ifdef _WIN32 | ||
122 | int libressl_fstat(int fd, struct stat *statbuf); | ||
123 | |||
124 | #ifndef NO_REDEF_POSIX_FUNCTIONS | ||
125 | #define fstat(fd, statbuf) libressl_fstat(fd, statbuf) | ||
126 | #endif | ||
127 | #endif | ||
128 | |||
121 | #endif | 129 | #endif |