Mercurial > hg > orthanc

annotate Resources/Patches/openssl-1.1.1-conf.h.in @ 3803:e9834343d327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to openssl 1.1.1f
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 02 Apr 2020 13:25:48 +0200
parents Resources/Patches/openssl-1.1.1d-conf.h.in@a49d49d945c9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3722
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /*
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * {- join("\n * ", @autowarntext) -}
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 *
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * Licensed under the OpenSSL license (the "License"). You may not use
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * this file except in compliance with the License. You can obtain a copy
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * in the file LICENSE in the source distribution or at
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * https://www.openssl.org/source/license.html
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 #include <openssl/opensslv.h>
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 #ifdef __cplusplus
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 extern "C" {
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 #ifdef OPENSSL_ALGORITHM_DEFINES
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 # error OPENSSL_ALGORITHM_DEFINES no longer supported
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 /*
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * don't like that. This will hopefully silence them.
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 #define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 /*
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 * declarations of functions deprecated in or before <version>. Otherwise, they
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 * still won't see them if the library has been built to disable deprecated
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 * functions.
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #ifndef DECLARE_DEPRECATED
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 # define DECLARE_DEPRECATED(f) f;
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 # ifdef __GNUC__
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 # undef DECLARE_DEPRECATED
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 # endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 # endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 #ifndef OPENSSL_FILE
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 # ifdef OPENSSL_NO_FILENAMES
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 # define OPENSSL_FILE ""
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 # define OPENSSL_LINE 0
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 # else
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 # define OPENSSL_FILE __FILE__
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 # define OPENSSL_LINE __LINE__
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 # endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 #ifndef OPENSSL_MIN_API
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 # define OPENSSL_MIN_API 0
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 #if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 # undef OPENSSL_API_COMPAT
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 # define OPENSSL_API_COMPAT OPENSSL_MIN_API
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 /*
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 * Do not deprecate things to be deprecated in version 1.2.0 before the
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 * OpenSSL version number matches.
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 #if OPENSSL_VERSION_NUMBER < 0x10200000L
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 # define DEPRECATEDIN_1_2_0(f) f;
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 #elif OPENSSL_API_COMPAT < 0x10200000L
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 # define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 #else
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 # define DEPRECATEDIN_1_2_0(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 #if OPENSSL_API_COMPAT < 0x10100000L
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 # define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 #else
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 # define DEPRECATEDIN_1_1_0(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 #if OPENSSL_API_COMPAT < 0x10000000L
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 # define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 #else
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 # define DEPRECATEDIN_1_0_0(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 #if OPENSSL_API_COMPAT < 0x00908000L
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 # define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 #else
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 # define DEPRECATEDIN_0_9_8(f)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 #define OPENSSL_UNISTD <unistd.h>
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 #if 0
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 /* Generate 80386 code? */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 {- ${processor} eq "386" ? "#define" : "#undef" -} I386_ONLY
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 #undef OPENSSL_UNISTD
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 #define OPENSSL_UNISTD {- ${unistd} -}
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 {- ${export_var_as_fn} ? "#define" : "#undef" -} OPENSSL_EXPORT_VAR_AS_FUNCTION
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 /*
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 * The following are cipher-specific, but are part of the public API.
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 #if !defined(OPENSSL_SYS_UEFI)
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 {- ${bn_ll} ? "# define" : "# undef" -} BN_LLONG
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 /* Only one for the following should be defined */
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 {- ${b64l} ? "# define" : "# undef" -} SIXTY_FOUR_BIT_LONG
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 {- ${b64} ? "# define" : "# undef" -} SIXTY_FOUR_BIT
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 {- ${b32} ? "# define" : "# undef" -} THIRTY_TWO_BIT
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 #define RC4_INT {- ${rc4_int} -}
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 #endif
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 #ifdef __cplusplus
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 }
a49d49d945c9 fixing openssl compilation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 #endif