From owner-svn-src-all@freebsd.org Thu Jan 3 22:51:15 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C621143A3D6; Thu, 3 Jan 2019 22:51:15 +0000 (UTC) (envelope-from jhb@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 E70186D3F7; Thu, 3 Jan 2019 22:51:14 +0000 (UTC) (envelope-from jhb@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 DB6AF27DBD; Thu, 3 Jan 2019 22:51:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x03MpE5r052844; Thu, 3 Jan 2019 22:51:14 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x03MpE3d052843; Thu, 3 Jan 2019 22:51:14 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201901032251.x03MpE3d052843@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 3 Jan 2019 22:51:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r342748 - stable/12/tools/tools/crypto X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: stable/12/tools/tools/crypto X-SVN-Commit-Revision: 342748 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E70186D3F7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; NEURAL_HAM_LONG(-1.00)[-0.998,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: Thu, 03 Jan 2019 22:51:15 -0000 Author: jhb Date: Thu Jan 3 22:51:14 2019 New Revision: 342748 URL: https://svnweb.freebsd.org/changeset/base/342748 Log: MFC 340018: Compile cryptocheck with in-tree openssl again. Modified: stable/12/tools/tools/crypto/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/tools/tools/crypto/Makefile ============================================================================== --- stable/12/tools/tools/crypto/Makefile Thu Jan 3 22:49:11 2019 (r342747) +++ stable/12/tools/tools/crypto/Makefile Thu Jan 3 22:51:14 2019 (r342748) @@ -32,10 +32,7 @@ MAN= BINDIR?= /usr/local/bin # cryptocheck: test symmetric crypto functions -# Use openssl from ports for Blake2 algorithms -CFLAGS.cryptocheck.c+= $$(pkg-config --cflags openssl) -LDFLAGS.cryptocheck+= $$(pkg-config --libs openssl) -LIBADD.cryptocheck+= util +LIBADD.cryptocheck+= crypto util # cryptokeytest: test asymmetric crypto functions LIBADD.cryptokeytest+= crypto