summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp
diff options
context:
space:
mode:
authorbcook <>2014-08-11 13:29:43 +0000
committerbcook <>2014-08-11 13:29:43 +0000
commit061d595d7859c456aec41e57ebdd900e4087395c (patch)
treea4f8bfaf958a94c17a62073b4dac40939b15d3d8 /src/lib/libcrypto/evp
parent1461f93ca3a5c598009914d6c1e1518f66f3c119 (diff)
downloadopenbsd-061d595d7859c456aec41e57ebdd900e4087395c.tar.gz
openbsd-061d595d7859c456aec41e57ebdd900e4087395c.tar.bz2
openbsd-061d595d7859c456aec41e57ebdd900e4087395c.zip
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 'src/lib/libcrypto/evp')
-rw-r--r--src/lib/libcrypto/evp/e_rc4_hmac_md5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
index 05c79ff09d..1f085af403 100644
--- a/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
+++ b/src/lib/libcrypto/evp/e_rc4_hmac_md5.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_rc4_hmac_md5.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */ 1/* $OpenBSD: e_rc4_hmac_md5.c,v 1.5 2014/08/11 13:29:43 bcook Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -99,7 +99,7 @@ rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *inkey,
99 return 1; 99 return 1;
100} 100}
101 101
102#if !defined(OPENSSL_NO_ASM) && ( \ 102#if !defined(OPENSSL_NO_ASM) && defined(RC4_MD5_ASM) && ( \
103 defined(__x86_64) || defined(__x86_64__) || \ 103 defined(__x86_64) || defined(__x86_64__) || \
104 defined(_M_AMD64) || defined(_M_X64) || \ 104 defined(_M_AMD64) || defined(_M_X64) || \
105 defined(__INTEL__) ) && \ 105 defined(__INTEL__) ) && \