diff options
| author | Brent Cook <bcook@cvs.openbsd.org> | 2014-08-11 13:29:44 +0000 |
|---|---|---|
| committer | Brent Cook <bcook@cvs.openbsd.org> | 2014-08-11 13:29:44 +0000 |
| commit | adfb6b1b34c4fd997b53d16a46fc66a5664dd2d3 (patch) | |
| tree | 1a47ae5c0a451256116fd9dc02fea83dfc6f1c44 /lib/libcrypto/evp | |
| parent | 03bffcaaf6a5a2fc76e4bf1226392551ac303057 (diff) | |
Guard RSA / RC4-5 ASM when NO_ASM is not defined
Most assembly blocks remain inactive if OPENSSL_NO_ASM is not defined,
only enabling inline assembly, but the RSA / RC4-5 blocks (used only in
amd64 systems) turn on implicitly. Guard these two as well.
This simplifies enabling just inline ASM in portable, no effective
change in OpenBSD.
Diffstat (limited to 'lib/libcrypto/evp')
| -rw-r--r-- | lib/libcrypto/evp/e_rc4_hmac_md5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/evp/e_rc4_hmac_md5.c b/lib/libcrypto/evp/e_rc4_hmac_md5.c index 05c79ff09dc..1f085af4039 100644 --- a/lib/libcrypto/evp/e_rc4_hmac_md5.c +++ b/lib/libcrypto/evp/e_rc4_hmac_md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc4_hmac_md5.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */ +/* $OpenBSD: e_rc4_hmac_md5.c,v 1.5 2014/08/11 13:29:43 bcook Exp $ */ /* ==================================================================== * Copyright (c) 2011 The OpenSSL Project. All rights reserved. * @@ -99,7 +99,7 @@ rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *inkey, return 1; } -#if !defined(OPENSSL_NO_ASM) && ( \ +#if !defined(OPENSSL_NO_ASM) && defined(RC4_MD5_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) || \ defined(__INTEL__) ) && \ |