diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-08 14:44:55 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-08 14:44:55 +0000 |
| commit | ffa76736fa7c0f46414db029b7d2a3f2df0e546c (patch) | |
| tree | 1d76916392653ca1446a82f70566484e2f514417 /fips | |
| parent | cbed6cfcaa877acf0a3d15828baf4e03fd905570 (diff) | |
Platform update from HEAD.
Diffstat (limited to 'fips')
| -rw-r--r-- | fips/fips_canister.c | 1 | ||||
| -rw-r--r-- | fips/fips_premain.c | 2 | ||||
| -rw-r--r-- | fips/fips_premain.c.sha1 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/fips/fips_canister.c b/fips/fips_canister.c index 7d67d32d6c..7be48426d9 100644 --- a/fips/fips_canister.c +++ b/fips/fips_canister.c @@ -34,6 +34,7 @@ const void *FIPS_text_end(void); defined(__mips__)|| defined(__mips))) || \ (defined(__linux) && ((defined(__PPC__) && !defined(__PPC64__)) || \ defined(__arm__) || defined(__arm))) || \ + (defined(__APPLE__) /* verified on all MacOS X & iOS flavors */)|| \ (defined(_WIN32) && defined(_MSC_VER)) # define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE # endif diff --git a/fips/fips_premain.c b/fips/fips_premain.c index a7c8b78f8f..7dc5246006 100644 --- a/fips/fips_premain.c +++ b/fips/fips_premain.c @@ -7,7 +7,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if defined(__unix) || defined(__unix__) || defined(__vxworks) || defined(__ANDROID__) +#if defined(__unix) || defined(__unix__) || defined(__vxworks) || defined(__ANDROID__) || defined(__APPLE__) #include <unistd.h> #endif diff --git a/fips/fips_premain.c.sha1 b/fips/fips_premain.c.sha1 index e0332e8afd..b9fb5dfc1d 100644 --- a/fips/fips_premain.c.sha1 +++ b/fips/fips_premain.c.sha1 @@ -1 +1 @@ -HMAC-SHA1(fips_premain.c)= a401afd9c2b57f0f11d2b34b6d0c9815b1fe6a66 +HMAC-SHA1(fips_premain.c)= 1eaf66f76187877ff403708a2948d240f92736a0 |