diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-08-26 09:59:55 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-08-26 21:19:18 +0200 |
| commit | 06a549c435d6095b33d78f136904c5fc2f7bcf24 (patch) | |
| tree | 072fc043b405b90b0b71e4111be21ad5ac6df09e /crypto | |
| parent | a404656a8b40d9f1172e5e330f7e2d9d87cabab8 (diff) | |
Improve the definition of STITCHED_CALL in e_rc4_hmac_md5.c
The definition of STITCHED_CALL relies on OPENSSL_NO_ASM. However,
when a configuration simply lacks the assembler implementation for RC4
(which is where we have implemented the stitched call), OPENSSL_NO_ASM
isn't implemented. Better, then, to rely on specific macros that
indicated that RC4 (and MD5) are implemented in assembler.
For this to work properly, we must also make sure Configure adds the
definition of RC4_ASM among the C flags.
(partly cherry picked from commit 216e8d91033d237880cff7da0d02d46d47bae41b)
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/e_rc4_hmac_md5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index ba5979d47a..5e92855dfd 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -99,7 +99,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, return 1; } -# if !defined(OPENSSL_NO_ASM) && ( \ +# if defined(RC4_ASM) && defined(MD5_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) || \ defined(__INTEL__) ) && \ |