summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-05-04 17:12:19 +0000
committermiod <miod@openbsd.org>2014-05-04 17:12:19 +0000
commit7653c0c18e4be3ac91ffb28d3f0e2e088c24b6ac (patch)
tree1ee95c1f041da6f9f2c955cbdecb43beed648940
parentCreate a new default RSA engine instead of patching the existing one (diff)
downloadwireguard-openbsd-7653c0c18e4be3ac91ffb28d3f0e2e088c24b6ac.tar.xz
wireguard-openbsd-7653c0c18e4be3ac91ffb28d3f0e2e088c24b6ac.zip
Remove the !SSLASM conditional. Either there is an arch-specific Makefile.inc,
or the !SSLASM list of files applies. This allows for an arch-specific Makefile.inc to not specify SSLASM.
-rw-r--r--lib/libcrypto/crypto/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libcrypto/crypto/Makefile b/lib/libcrypto/crypto/Makefile
index 5554b0382c2..5fefdb1cf0b 100644
--- a/lib/libcrypto/crypto/Makefile
+++ b/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2014/05/01 17:08:57 miod Exp $
+# $OpenBSD: Makefile,v 1.31 2014/05/04 17:12:19 miod Exp $
LIB= crypto
@@ -427,9 +427,7 @@ obj_dat.h: obj_mac.h
.if exists (${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc)
.include "${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc"
-.endif
-
-.if !defined(SSLASM)
+.else
CFLAGS+=-DOPENSSL_NO_ASM
SRCS+= aes_core.c aes_cbc.c
SRCS+= bf_enc.c