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/arch/amd64/Makefile.inc | |
| 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/arch/amd64/Makefile.inc')
| -rw-r--r-- | lib/libcrypto/arch/amd64/Makefile.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc index 24f16d0a812..fe7e17df0eb 100644 --- a/lib/libcrypto/arch/amd64/Makefile.inc +++ b/lib/libcrypto/arch/amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2014/05/06 19:55:06 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2014/08/11 13:29:43 bcook Exp $ # amd64-specific libcrypto build rules @@ -15,6 +15,7 @@ SSLASM+= aes aesni-sha1-x86_64 SRCS+= bf_enc.c # bn CFLAGS+= -DOPENSSL_IA32_SSE2 +CFLAGS+= -DRSA_ASM SSLASM+= bn modexp512-x86_64 CFLAGS+= -DOPENSSL_BN_ASM_MONT SSLASM+= bn x86_64-mont @@ -31,6 +32,7 @@ SSLASM+= md5 md5-x86_64 CFLAGS+= -DGHASH_ASM SSLASM+= modes ghash-x86_64 # rc4 +CFLAGS+= -DRC4_MD5_ASM SSLASM+= rc4 rc4-x86_64 SSLASM+= rc4 rc4-md5-x86_64 # ripemd |