diff options
Diffstat (limited to 'src/lib/libcrypto/engine')
| -rw-r--r-- | src/lib/libcrypto/engine/eng_aesni.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/eng_padlock.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/eng_rsax.c | 4 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/libcrypto/engine/eng_aesni.c b/src/lib/libcrypto/engine/eng_aesni.c index 5fdb33bfde..d547d7f465 100644 --- a/src/lib/libcrypto/engine/eng_aesni.c +++ b/src/lib/libcrypto/engine/eng_aesni.c | |||
| @@ -309,11 +309,7 @@ static void aesni_ofb128_encrypt(const unsigned char *in, unsigned char *out, | |||
| 309 | } | 309 | } |
| 310 | /* ===== Engine "management" functions ===== */ | 310 | /* ===== Engine "management" functions ===== */ |
| 311 | 311 | ||
| 312 | #if defined(_WIN32) | ||
| 313 | typedef unsigned __int64 IA32CAP; | ||
| 314 | #else | ||
| 315 | typedef unsigned long long IA32CAP; | 312 | typedef unsigned long long IA32CAP; |
| 316 | #endif | ||
| 317 | 313 | ||
| 318 | /* Prepare the ENGINE structure for registration */ | 314 | /* Prepare the ENGINE structure for registration */ |
| 319 | static int | 315 | static int |
diff --git a/src/lib/libcrypto/engine/eng_padlock.c b/src/lib/libcrypto/engine/eng_padlock.c index c27181ba75..5a80b2b16d 100644 --- a/src/lib/libcrypto/engine/eng_padlock.c +++ b/src/lib/libcrypto/engine/eng_padlock.c | |||
| @@ -129,12 +129,7 @@ void ENGINE_load_padlock (void) | |||
| 129 | /* We do these includes here to avoid header problems on platforms that | 129 | /* We do these includes here to avoid header problems on platforms that |
| 130 | do not have the VIA padlock anyway... */ | 130 | do not have the VIA padlock anyway... */ |
| 131 | #include <stdlib.h> | 131 | #include <stdlib.h> |
| 132 | #ifdef _WIN32 | 132 | #if defined(__GNUC__) |
| 133 | # include <malloc.h> | ||
| 134 | # ifndef alloca | ||
| 135 | # define alloca _alloca | ||
| 136 | # endif | ||
| 137 | #elif defined(__GNUC__) | ||
| 138 | # ifndef alloca | 133 | # ifndef alloca |
| 139 | # define alloca(s) __builtin_alloca(s) | 134 | # define alloca(s) __builtin_alloca(s) |
| 140 | # endif | 135 | # endif |
diff --git a/src/lib/libcrypto/engine/eng_rsax.c b/src/lib/libcrypto/engine/eng_rsax.c index c0f6851601..1b15b6f1a3 100644 --- a/src/lib/libcrypto/engine/eng_rsax.c +++ b/src/lib/libcrypto/engine/eng_rsax.c | |||
| @@ -217,11 +217,7 @@ static int e_rsax_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void)) | |||
| 217 | 217 | ||
| 218 | #ifndef OPENSSL_NO_RSA | 218 | #ifndef OPENSSL_NO_RSA |
| 219 | 219 | ||
| 220 | #ifdef _WIN32 | ||
| 221 | typedef unsigned __int64 UINT64; | ||
| 222 | #else | ||
| 223 | typedef unsigned long long UINT64; | 220 | typedef unsigned long long UINT64; |
| 224 | #endif | ||
| 225 | typedef unsigned short UINT16; | 221 | typedef unsigned short UINT16; |
| 226 | 222 | ||
| 227 | /* Table t is interleaved in the following manner: | 223 | /* Table t is interleaved in the following manner: |
