From 91f5df38c9a40edd9fd218ef8356018fc601495e Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 15 Jul 2019 07:39:28 +0000 Subject: [PATCH] MK_OPENSSL makes RELEASE_CRUNCH redundant here Since these things are more completely controlled by the MK_OPENSSL knob, remove RELEASE_CRUNCH here. It's no longer needed for the release and other users can use the more proper knob if they so desire. --- usr.sbin/ntp/Makefile.inc | 2 +- usr.sbin/wpa/Makefile.crypto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index 274ec39e2e2d..7f81ec390954 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -10,7 +10,7 @@ NTPDEFS= -DSYS_FREEBSD # -DMX4200 -DNMEA -DBOEDER CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY .endif diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto index 8f7965d1dece..1b67c79650af 100644 --- a/usr.sbin/wpa/Makefile.crypto +++ b/usr.sbin/wpa/Makefile.crypto @@ -1,6 +1,6 @@ # $FreeBSD$ -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" SRCS+= crypto_openssl.c random.c sha1-prf.c sha256-prf.c sha256-tlsprf.c \ sha512.c LIBADD+= ssl crypto