godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-05 17:15:09 +00:00
Code Releases Wiki Activity

openssl: Sync with pristine upstream 1.0.2h

Browse Source 
Our necessary custom changes will be reapplied in later commits for clarity,
and saved as patches for future updates.

(cherry picked from commit cb0f771aaa)
This commit is contained in:
Rémi Verschelde
2017-05-27 15:35:40 +02:00
parent 8301137b38
commit c2e022c7c9
6 changed files with 11 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
thirdparty/openssl/openssl/opensslconf.h vendored
View File

@@ -1,34 +1,9 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
//sorry godot needs a single file for multiple builds
#ifdef __cplusplus
extern "C" {
#endif
// Check windows
#ifdef USE_64BITS
//weirder platforms that don't use GCC, LLVM or MSVC must define this
# define OPENSSL_USE_64_BITS
#elif _WIN32 || _WIN64
# if _WIN64
# define OPENSSL_USE_64_BITS
# endif
// Check GCC
#elif __GNUC__
# if __x86_64__ || __ppc64__
# define OPENSSL_USE_64_BITS
# endif
#endif
#ifndef OPENSSL_USE_64_BITS
//wqerw
#endif
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
@@ -78,9 +53,6 @@ extern "C" {
#endif /* OPENSSL_DOING_MAKEDEPEND */
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
# define OPENSSL_NO_DYNAMIC_ENGINE
#endif
@@ -134,8 +106,6 @@ extern "C" {
# endif
#endif
//#define OPENSSL_CPUID_OBJ
/* crypto/opensslconf.h.in */
/* Generate 80386 code? */
@@ -175,19 +145,14 @@ extern "C" {
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#ifdef OPENSSL_USE_64_BITS
#define RC4_INT unsigned int
#else
#define RC4_INT unsigned char
#endif
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#define RC4_CHUNK unsigned long
#undef RC4_CHUNK
#endif
#endif
@@ -195,42 +160,20 @@ extern "C" {
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned int
#define DES_LONG unsigned long
#endif
#endif
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#ifdef OPENSSL_USE_64_BITS
#undef BN_LLONG
#else
#define BN_LLONG
#endif
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#ifdef OPENSSL_USE_64_BITS
# ifdef _WIN32
# undef SIXTY_FOUR_BIT_LONG
# define SIXTY_FOUR_BIT
# else
# define SIXTY_FOUR_BIT_LONG
# undef SIXTY_FOUR_BIT
# endif
#undef THIRTY_TWO_BIT
#else
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#endif
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
@@ -272,7 +215,7 @@ extern "C" {
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#define DES_UNROLL
#undef DES_UNROLL
#endif
/* These default values were supplied by