Browse Source

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.
OPENBSD_5_7
bcook 10 years ago
parent
commit
1b243f2530
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      src/lib/libcrypto/crypto/arch/amd64/Makefile.inc

+ 3
- 1
src/lib/libcrypto/crypto/arch/amd64/Makefile.inc View File

@ -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 # amd64-specific libcrypto build rules
@ -15,6 +15,7 @@ SSLASM+= aes aesni-sha1-x86_64
SRCS+= bf_enc.c SRCS+= bf_enc.c
# bn # bn
CFLAGS+= -DOPENSSL_IA32_SSE2 CFLAGS+= -DOPENSSL_IA32_SSE2
CFLAGS+= -DRSA_ASM
SSLASM+= bn modexp512-x86_64 SSLASM+= bn modexp512-x86_64
CFLAGS+= -DOPENSSL_BN_ASM_MONT CFLAGS+= -DOPENSSL_BN_ASM_MONT
SSLASM+= bn x86_64-mont SSLASM+= bn x86_64-mont
@ -31,6 +32,7 @@ SSLASM+= md5 md5-x86_64
CFLAGS+= -DGHASH_ASM CFLAGS+= -DGHASH_ASM
SSLASM+= modes ghash-x86_64 SSLASM+= modes ghash-x86_64
# rc4 # rc4
CFLAGS+= -DRC4_MD5_ASM
SSLASM+= rc4 rc4-x86_64 SSLASM+= rc4 rc4-x86_64
SSLASM+= rc4 rc4-md5-x86_64 SSLASM+= rc4 rc4-md5-x86_64
# ripemd # ripemd


Loading…
Cancel
Save