projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d954057
)
e_rc4_hmac_md5.c: reapply commit#21726, which was erroneously omitted.
author
Andy Polyakov
<appro@openssl.org>
Fri, 20 Apr 2012 21:45:17 +0000
(21:45 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Fri, 20 Apr 2012 21:45:17 +0000
(21:45 +0000)
PR: 2797, 2792
crypto/evp/e_rc4_hmac_md5.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_rc4_hmac_md5.c
b/crypto/evp/e_rc4_hmac_md5.c
index 649fcadd98a2a807ab006fc051fa51b732b00c84..56563191ba161b2e875038fa94fc0da05422acc5 100644
(file)
--- a/
crypto/evp/e_rc4_hmac_md5.c
+++ b/
crypto/evp/e_rc4_hmac_md5.c
@@
-103,7
+103,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