From owner-svn-src-all@freebsd.org  Fri Dec 13 05:54:39 2019
Return-Path: <owner-svn-src-all@freebsd.org>
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 8B5291E3921;
 Fri, 13 Dec 2019 05:54:39 +0000 (UTC) (envelope-from cem@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 47Z0HM3273z4Ylp;
 Fri, 13 Dec 2019 05:54:39 +0000 (UTC) (envelope-from cem@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 5EC477B39;
 Fri, 13 Dec 2019 05:54:39 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBD5sd5h077464;
 Fri, 13 Dec 2019 05:54:39 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBD5sdSU077463;
 Fri, 13 Dec 2019 05:54:39 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201912130554.xBD5sdSU077463@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Fri, 13 Dec 2019 05:54:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355700 - head/usr.sbin/ntp
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/usr.sbin/ntp
X-SVN-Commit-Revision: 355700
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Dec 2019 05:54:39 -0000

Author: cem
Date: Fri Dec 13 05:54:38 2019
New Revision: 355700
URL: https://svnweb.freebsd.org/changeset/base/355700

Log:
  ntpd(8): Don't use OpenSSL's RAND API
  
  The !USE_OPENSSL_CRYPTO_RAND path uses arc4random_buf() correctly.
  
  In general, we should prefer to avoid things OpenSSL does poorly when a good
  alternative exists in libc.

Modified:
  head/usr.sbin/ntp/Makefile.inc

Modified: head/usr.sbin/ntp/Makefile.inc
==============================================================================
--- head/usr.sbin/ntp/Makefile.inc	Fri Dec 13 05:42:57 2019	(r355699)
+++ head/usr.sbin/ntp/Makefile.inc	Fri Dec 13 05:54:38 2019	(r355700)
@@ -11,7 +11,7 @@ NTPDEFS=   -DSYS_FREEBSD
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 
 .if ${MK_OPENSSL} != "no"
-CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY
+CFLAGS+= -DOPENSSL -DAUTOKEY
 .endif
 
 WARNS?=	0