From owner-svn-src-all@freebsd.org Mon Jul 15 07:39:29 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 305B7B2EB3; Mon, 15 Jul 2019 07:39:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 132AC832FE; Mon, 15 Jul 2019 07:39:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E0CAD1A50C; Mon, 15 Jul 2019 07:39:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6F7dSrq060041; Mon, 15 Jul 2019 07:39:28 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6F7dSme060040; Mon, 15 Jul 2019 07:39:28 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201907150739.x6F7dSme060040@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 15 Jul 2019 07:39:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r349991 - in head/usr.sbin: ntp wpa X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/usr.sbin: ntp wpa X-SVN-Commit-Revision: 349991 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 132AC832FE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.93)[-0.929,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2019 07:39:29 -0000 Author: imp Date: Mon Jul 15 07:39:28 2019 New Revision: 349991 URL: https://svnweb.freebsd.org/changeset/base/349991 Log: 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. Modified: head/usr.sbin/ntp/Makefile.inc head/usr.sbin/wpa/Makefile.crypto Modified: head/usr.sbin/ntp/Makefile.inc ============================================================================== --- head/usr.sbin/ntp/Makefile.inc Mon Jul 15 07:35:46 2019 (r349990) +++ head/usr.sbin/ntp/Makefile.inc Mon Jul 15 07:39:28 2019 (r349991) @@ -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 Modified: head/usr.sbin/wpa/Makefile.crypto ============================================================================== --- head/usr.sbin/wpa/Makefile.crypto Mon Jul 15 07:35:46 2019 (r349990) +++ head/usr.sbin/wpa/Makefile.crypto Mon Jul 15 07:39:28 2019 (r349991) @@ -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