diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-15 12:39:48 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-15 12:39:48 +0000 |
| commit | cd7b854bbbfe368f09204bee105551e7f25a707c (patch) | |
| tree | 7934e15f4152f6b963ef0c683ae60987443ca059 /crypto | |
| parent | aecc0756e8ba3b8ea678f3bcdee84d89a0f88a91 (diff) | |
e_rc4_hmac_md5.c: make it work on darwin64, which is configured with RC4_CHAR.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/e_rc4_hmac_md5.c | 3 | ||||
| -rw-r--r-- | crypto/rc4/rc4test.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 94c011000c..eaa7a5312c 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -101,7 +101,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, #if !defined(OPENSSL_NO_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(__INTEL__) ) && \ + !(defined(__APPLE__) && defined(__MACH__)) #define STITCHED_CALL #endif diff --git a/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c index 633a79e758..4312605ccb 100644 --- a/crypto/rc4/rc4test.c +++ b/crypto/rc4/rc4test.c @@ -120,6 +120,12 @@ int main(int argc, char *argv[]) RC4_KEY key; unsigned char obuf[512]; +#if !defined(OPENSSL_PIC) + void OPENSSL_cpuid_setup(void); + + OPENSSL_cpuid_setup(); +#endif + for (i=0; i<6; i++) { RC4_set_key(&key,keys[i][0],&(keys[i][1])); |