Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 10717f6

Browse files
Shigeki OhtsuJulien Gilli
Shigeki Ohtsu
authored and
Julien Gilli
committed
deps: replace all headers in openssl
change all openssl/include/openssl/*.h to include resolved symbolic links and openssl/crypto/opensslconf.h to refer config/opensslconf.h PR: #9451 PR-URL: #9451 Reviewed-By: Julien Gilli <[email protected]>
1 parent c6e8a2c commit 10717f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+76
-316
lines changed
Lines changed: 1 addition & 241 deletions
Original file line numberDiff line numberDiff line change
@@ -1,241 +1 @@
1-
/* opensslconf.h */
2-
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
3-
4-
#ifdef __cplusplus
5-
extern "C" {
6-
#endif
7-
/* OpenSSL was configured with the following options: */
8-
#ifndef OPENSSL_DOING_MAKEDEPEND
9-
10-
11-
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
12-
# define OPENSSL_NO_EC_NISTP_64_GCC_128
13-
#endif
14-
#ifndef OPENSSL_NO_GMP
15-
# define OPENSSL_NO_GMP
16-
#endif
17-
#ifndef OPENSSL_NO_JPAKE
18-
# define OPENSSL_NO_JPAKE
19-
#endif
20-
#ifndef OPENSSL_NO_KRB5
21-
# define OPENSSL_NO_KRB5
22-
#endif
23-
#ifndef OPENSSL_NO_MD2
24-
# define OPENSSL_NO_MD2
25-
#endif
26-
#ifndef OPENSSL_NO_RC5
27-
# define OPENSSL_NO_RC5
28-
#endif
29-
#ifndef OPENSSL_NO_RFC3779
30-
# define OPENSSL_NO_RFC3779
31-
#endif
32-
#ifndef OPENSSL_NO_SCTP
33-
# define OPENSSL_NO_SCTP
34-
#endif
35-
#ifndef OPENSSL_NO_STORE
36-
# define OPENSSL_NO_STORE
37-
#endif
38-
#ifndef OPENSSL_NO_UNIT_TEST
39-
# define OPENSSL_NO_UNIT_TEST
40-
#endif
41-
42-
#endif /* OPENSSL_DOING_MAKEDEPEND */
43-
44-
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
45-
# define OPENSSL_NO_DYNAMIC_ENGINE
46-
#endif
47-
48-
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
49-
asks for it. This is a transient feature that is provided for those
50-
who haven't had the time to do the appropriate changes in their
51-
applications. */
52-
#ifdef OPENSSL_ALGORITHM_DEFINES
53-
# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
54-
# define NO_EC_NISTP_64_GCC_128
55-
# endif
56-
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
57-
# define NO_GMP
58-
# endif
59-
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
60-
# define NO_JPAKE
61-
# endif
62-
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
63-
# define NO_KRB5
64-
# endif
65-
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
66-
# define NO_MD2
67-
# endif
68-
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
69-
# define NO_RC5
70-
# endif
71-
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
72-
# define NO_RFC3779
73-
# endif
74-
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
75-
# define NO_SCTP
76-
# endif
77-
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
78-
# define NO_STORE
79-
# endif
80-
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
81-
# define NO_UNIT_TEST
82-
# endif
83-
#endif
84-
85-
/* crypto/opensslconf.h.in */
86-
87-
/* Generate 80386 code? */
88-
#undef I386_ONLY
89-
90-
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
91-
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
92-
#define ENGINESDIR "/usr/local/ssl/lib/engines"
93-
#define OPENSSLDIR "/usr/local/ssl"
94-
#endif
95-
#endif
96-
97-
#undef OPENSSL_UNISTD
98-
#define OPENSSL_UNISTD <unistd.h>
99-
100-
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
101-
102-
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
103-
#define IDEA_INT unsigned int
104-
#endif
105-
106-
#if defined(HEADER_MD2_H) && !defined(MD2_INT)
107-
#define MD2_INT unsigned int
108-
#endif
109-
110-
#if defined(HEADER_RC2_H) && !defined(RC2_INT)
111-
/* I need to put in a mod for the alpha - eay */
112-
#define RC2_INT unsigned int
113-
#endif
114-
115-
#if defined(HEADER_RC4_H)
116-
#if !defined(RC4_INT)
117-
/* using int types make the structure larger but make the code faster
118-
* on most boxes I have tested - up to %20 faster. */
119-
/*
120-
* I don't know what does "most" mean, but declaring "int" is a must on:
121-
* - Intel P6 because partial register stalls are very expensive;
122-
* - elder Alpha because it lacks byte load/store instructions;
123-
*/
124-
#define RC4_INT unsigned int
125-
#endif
126-
#if !defined(RC4_CHUNK)
127-
/*
128-
* This enables code handling data aligned at natural CPU word
129-
* boundary. See crypto/rc4/rc4_enc.c for further details.
130-
*/
131-
#undef RC4_CHUNK
132-
#endif
133-
#endif
134-
135-
#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
136-
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
137-
* %20 speed up (longs are 8 bytes, int's are 4). */
138-
#ifndef DES_LONG
139-
#define DES_LONG unsigned long
140-
#endif
141-
#endif
142-
143-
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
144-
#define CONFIG_HEADER_BN_H
145-
#undef BN_LLONG
146-
147-
/* Should we define BN_DIV2W here? */
148-
149-
/* Only one for the following should be defined */
150-
#undef SIXTY_FOUR_BIT_LONG
151-
#undef SIXTY_FOUR_BIT
152-
#define THIRTY_TWO_BIT
153-
#endif
154-
155-
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
156-
#define CONFIG_HEADER_RC4_LOCL_H
157-
/* if this is defined data[i] is used instead of *data, this is a %20
158-
* speedup on x86 */
159-
#undef RC4_INDEX
160-
#endif
161-
162-
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
163-
#define CONFIG_HEADER_BF_LOCL_H
164-
#undef BF_PTR
165-
#endif /* HEADER_BF_LOCL_H */
166-
167-
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
168-
#define CONFIG_HEADER_DES_LOCL_H
169-
#ifndef DES_DEFAULT_OPTIONS
170-
/* the following is tweaked from a config script, that is why it is a
171-
* protected undef/define */
172-
#ifndef DES_PTR
173-
#undef DES_PTR
174-
#endif
175-
176-
/* This helps C compiler generate the correct code for multiple functional
177-
* units. It reduces register dependancies at the expense of 2 more
178-
* registers */
179-
#ifndef DES_RISC1
180-
#undef DES_RISC1
181-
#endif
182-
183-
#ifndef DES_RISC2
184-
#undef DES_RISC2
185-
#endif
186-
187-
#if defined(DES_RISC1) && defined(DES_RISC2)
188-
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
189-
#endif
190-
191-
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
192-
* Very mucy CPU dependant */
193-
#ifndef DES_UNROLL
194-
#undef DES_UNROLL
195-
#endif
196-
197-
/* These default values were supplied by
198-
* Peter Gutman <[email protected]>
199-
* They are only used if nothing else has been defined */
200-
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
201-
/* Special defines which change the way the code is built depending on the
202-
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
203-
even newer MIPS CPU's, but at the moment one size fits all for
204-
optimization options. Older Sparc's work better with only UNROLL, but
205-
there's no way to tell at compile time what it is you're running on */
206-
207-
#if defined( sun ) /* Newer Sparc's */
208-
# define DES_PTR
209-
# define DES_RISC1
210-
# define DES_UNROLL
211-
#elif defined( __ultrix ) /* Older MIPS */
212-
# define DES_PTR
213-
# define DES_RISC2
214-
# define DES_UNROLL
215-
#elif defined( __osf1__ ) /* Alpha */
216-
# define DES_PTR
217-
# define DES_RISC2
218-
#elif defined ( _AIX ) /* RS6000 */
219-
/* Unknown */
220-
#elif defined( __hpux ) /* HP-PA */
221-
/* Unknown */
222-
#elif defined( __aux ) /* 68K */
223-
/* Unknown */
224-
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
225-
# define DES_UNROLL
226-
#elif defined( __sgi ) /* Newer MIPS */
227-
# define DES_PTR
228-
# define DES_RISC2
229-
# define DES_UNROLL
230-
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
231-
# define DES_PTR
232-
# define DES_RISC1
233-
# define DES_UNROLL
234-
#endif /* Systems-specific speed defines */
235-
#endif
236-
237-
#endif /* DES_DEFAULT_OPTIONS */
238-
#endif /* HEADER_DES_LOCL_H */
239-
#ifdef __cplusplus
240-
}
241-
#endif
1+
#include "../../config/opensslconf.h"

deps/openssl/openssl/include/openssl/aes.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/aes/aes.h"

deps/openssl/openssl/include/openssl/asn1.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/asn1/asn1.h"

deps/openssl/openssl/include/openssl/asn1_mac.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/asn1/asn1_mac.h"

deps/openssl/openssl/include/openssl/asn1t.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/asn1/asn1t.h"

deps/openssl/openssl/include/openssl/bio.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/bio/bio.h"

deps/openssl/openssl/include/openssl/blowfish.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/bf/blowfish.h"

deps/openssl/openssl/include/openssl/bn.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/bn/bn.h"

deps/openssl/openssl/include/openssl/buffer.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/buffer/buffer.h"

deps/openssl/openssl/include/openssl/camellia.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/camellia/camellia.h"

deps/openssl/openssl/include/openssl/cast.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/cast/cast.h"

deps/openssl/openssl/include/openssl/cmac.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/cmac/cmac.h"

deps/openssl/openssl/include/openssl/cms.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/cms/cms.h"

deps/openssl/openssl/include/openssl/comp.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/comp/comp.h"

deps/openssl/openssl/include/openssl/conf.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/conf/conf.h"

deps/openssl/openssl/include/openssl/conf_api.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/conf/conf_api.h"

deps/openssl/openssl/include/openssl/crypto.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/crypto.h"

deps/openssl/openssl/include/openssl/des.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/des/des.h"

deps/openssl/openssl/include/openssl/des_old.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/des/des_old.h"

deps/openssl/openssl/include/openssl/dh.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/dh/dh.h"

deps/openssl/openssl/include/openssl/dsa.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/dsa/dsa.h"

deps/openssl/openssl/include/openssl/dso.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/dso/dso.h"

deps/openssl/openssl/include/openssl/dtls1.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../ssl/dtls1.h"

deps/openssl/openssl/include/openssl/e_os2.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../e_os2.h"

deps/openssl/openssl/include/openssl/ebcdic.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/ebcdic.h"

deps/openssl/openssl/include/openssl/ec.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/ec/ec.h"

deps/openssl/openssl/include/openssl/ecdh.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/ecdh/ecdh.h"

deps/openssl/openssl/include/openssl/ecdsa.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/ecdsa/ecdsa.h"

deps/openssl/openssl/include/openssl/engine.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/engine/engine.h"

deps/openssl/openssl/include/openssl/err.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/err/err.h"

deps/openssl/openssl/include/openssl/evp.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/evp/evp.h"

deps/openssl/openssl/include/openssl/hmac.h

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../crypto/hmac/hmac.h"

0 commit comments

Comments
 (0)