From nobody Mon May 29 00:56:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QTxt35hVfz4Y7Jt; Mon, 29 May 2023 00:56:11 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QTxt351Gcz3HcQ; Mon, 29 May 2023 00:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685321771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGdPGkSuQDh7Eoo9NKxH3B/fMQiFf47HfZmwPvAGOms=; b=jbCbw0sKfC4eXSZplVgwnnsQQo93hW0KTTmWOWkhXPbblexUrf7w8odAGSrsCqBtPGbtzS jD4PWfLPrwLZCm5qr1H3IMnyxzyLHo2fzwdbs6ruABUPynQJqNVqVZLy2NqD5TnAi0XzRf 9fpc+b86109Ul276kBny+cLRBMKyIUZFvWmE4NzYBrDeBDipsGjhCORsAIZgTu/4EmEemF DDiTY36vmpAS9Gfa5Bk+JlzSTifvnaABTm3/sJMgOfmVl/V7nYMenXi5xZBfPcONfJhdn6 4YNcznx42zUBgqV/XTjdra9OS8EAPbwpnRoXttfpnwDoVneZ/mHIiGvlJu4pzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685321771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGdPGkSuQDh7Eoo9NKxH3B/fMQiFf47HfZmwPvAGOms=; b=nVmfiBUHHecFRB3l2nn772GUqw/DjjMGR46ptB/tsB2fzhikugo2+4Em5Do6nWe4yqPCpm mhXOqfwlZduxkTEamxC8/9TDjJjmqfYlH5De0UcX5ZpGxMnad/+xUUD2iJT/hF0qMmIx3i gDdk6SPw2OcCf+GVXNnnzXoXHuKgyA1vLiQfk/03lDQXyLEVWBCc8dPzdW24gbfn2cV2Ve kMVFEqEECunchZr4VPu/LZkvDEukxvvqi1t45kJdhCdmImKlhn6psSrUycXnI+vsE0VBUs lKIbof0KFJtzEUt+7Bq0ZqahHJdC6WSRR2qhS7gb5NzK9GHJodUG3DAojX2qqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685321771; a=rsa-sha256; cv=none; b=iLDbX5idOeJCJ6C5VloER9RIDjGs+oIUjV+ZJ6vUNkRCRIGZ22TeP6ISUjexAdDtG4XPB/ 7fBXPUhEFanUmx03mxeDWNvo1sENE0L8FGZjl9gK90hhNgNl1tXLGCeTCUBaVOOWLlR1Pb JwhD6UKjwxT1F90+mTIOeh5OZzgmHugXLtMjdl9gOP5yvZ1oSoygwu59ii4IkeqiNAPmX9 gSr0ZgHDfBbjUD+3tco0YFDfYeE4m5ZJBtVKP3u68pQe92GP1ok4k7L70TBIXmoggRIoBA Vw75SKGnrG/ndTXxO0EJPuXcpv87RZhjVapDlGyOdoAjiahab4U8WRv5KIMjLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QTxt32qhTzrms; Mon, 29 May 2023 00:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34T0uB97038944; Mon, 29 May 2023 00:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34T0uBN4038943; Mon, 29 May 2023 00:56:11 GMT (envelope-from git) Date: Mon, 29 May 2023 00:56:11 GMT Message-Id: <202305290056.34T0uBN4038943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 3ffa7eff2275 - stable/13 - nvmecontrol: Fix power subcommand output. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ffa7eff2275de05a3defeef859902a66f1d3135 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=3ffa7eff2275de05a3defeef859902a66f1d3135 commit 3ffa7eff2275de05a3defeef859902a66f1d3135 Author: Alexander Motin AuthorDate: 2023-05-15 20:48:50 +0000 Commit: Alexander Motin CommitDate: 2023-05-29 00:56:05 +0000 nvmecontrol: Fix power subcommand output. The returned value consists of two fields. Report them separately. MFC after: 2 weeks (cherry picked from commit f409f11bc556e6da4c4cdb9f20a2ba3b0977fb32) --- sbin/nvmecontrol/power.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c index 47ebc9c8c153..c6d7ad5455ff 100644 --- a/sbin/nvmecontrol/power.c +++ b/sbin/nvmecontrol/power.c @@ -137,7 +137,8 @@ power_show(int fd) if (nvme_completion_is_error(&pt.cpl)) errx(EX_IOERR, "set feature power mgmt request returned error"); - printf("Current Power Mode is %d\n", pt.cpl.cdw0); + printf("Current Power State is %d\n", pt.cpl.cdw0 & 0x1F); + printf("Current Workload Hint is %d\n", pt.cpl.cdw0 >> 5); } static void @@ -189,7 +190,7 @@ static const struct opts power_opts[] = { OPT("power", 'p', arg_uint32, opt, power, "Set the power state"), OPT("workload", 'w', arg_uint32, opt, workload, - "Set the workload"), + "Set the workload hint"), { NULL, 0, arg_none, NULL, NULL } }; #undef OPT From nobody Mon May 29 03:21:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QV15F6c9Nz4WnY0; Mon, 29 May 2023 03:21:05 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QV15F54C4z3j69; Mon, 29 May 2023 03:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685330465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+9IF/y0STOR3CwH0PC2IegKhBk3sCV9aSch9w1JMW4=; b=mvLUF6j0IU2abPjDCuUD+Bq7ZAp8rksFqU8VUAQHts30natQkztobQY/87qrpry/ud7k+t ZTzh56jp4gzpyNy5R6H4sfpbAeA96IaVPMhTWZQZATJubqATeOC3vRsb8DBLX5iLvrzz3i Uxoev/1yNbf3N/WTq3Nl1XVTJg2CvEtgUx9EA4MkRDmKSeUd+07zgsViTLlxvHR2WCeu/O d3pDZhrF0scAjZ4nrIt4Gze77WV+0reP7uM32mzlTMp7ZHy9484avOr6NW1IYgHHsfwK1S kRJMCTlRlSr2a4Q6TmPA6D2jPLk39/7Z3vZwut13KGD7ulxTeLQhyuJgQATKlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685330465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+9IF/y0STOR3CwH0PC2IegKhBk3sCV9aSch9w1JMW4=; b=p1cSaEZfmCnXCt08aqWsOcZCJK/hXTALLG19Zba3sGEMjgcPLlWOMdOhF86kJLZPnwEjE9 97ftZ7dA97mOTzxB64gXDKUTaHBsX4HZLYHhyFkbX6dkF6/F4HLFAgDzgPQQIwA11BGFNY ZVTeEIu96FnwhLcMBbYjaUJ5D3uuhgWtxir6/HaZE0As8CUgPjAhnqrFEvo8FMpj97Nu66 bxOdfZXKiaARBA17MrfyeeOVwcFpUSUnXQKGMa9LpSpwH1TD8EHvhEDyzCYzBnE5Y8cKTS N6lBhd+/2AGYSU0gI7ewtXFQaFGWQO6+qUNprCw5gn+B/ki/tzbf6i7Uq69zxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685330465; a=rsa-sha256; cv=none; b=tXveiOU8aNN2ZdQA7CYEC6aTg1aAhhw9D76cmtEUMCHN451PAP3kBa16tcLLhKViQ2QMwD VB2hiqa1ZXi4FosZbZMeUmaOMXR9I5zh34o6Kk0revdh/4zIcQE9cYtvwPhg4zZ0Q4sy79 Ow3T+8J9D5LCivtBDjTZefYhAXNqjIW9z8N7GDqCRZWpdsZwGxpc0P778hDaA5BnmsK9cR xWdi9UMuSbKCT9J+G2tJGVQ1fuLx6Tdjql+ml89zKG+VL78/+MwYBbgpuMQfc85JtHuyZM YZlt/6g937w4CQ2/AEmDvYGq24jFibZdcXBYuy+QFamiJZUkuNC1vqGmThh9GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QV15F3Yx8zwWV; Mon, 29 May 2023 03:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34T3L5Wx079814; Mon, 29 May 2023 03:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34T3L5ZM079813; Mon, 29 May 2023 03:21:05 GMT (envelope-from git) Date: Mon, 29 May 2023 03:21:05 GMT Message-Id: <202305290321.34T3L5ZM079813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5b45cd83c44e - stable/13 - libthr rtld locks: do not leak URWLOCK_READ_WAITERS into child List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b45cd83c44edb9386eed1155acd3c52f36bf12c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5b45cd83c44edb9386eed1155acd3c52f36bf12c commit 5b45cd83c44edb9386eed1155acd3c52f36bf12c Author: Konstantin Belousov AuthorDate: 2023-05-20 08:11:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-29 03:20:42 +0000 libthr rtld locks: do not leak URWLOCK_READ_WAITERS into child PR: 271490 (cherry picked from commit 6f49eafb056cfa0703dfc97a731cabe4ed2596b8) --- lib/libthr/thread/thr_fork.c | 4 ++++ lib/libthr/thread/thr_private.h | 2 ++ lib/libthr/thread/thr_rtld.c | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c index 9861e93c427d..341afc2b06ec 100644 --- a/lib/libthr/thread/thr_fork.c +++ b/lib/libthr/thread/thr_fork.c @@ -78,6 +78,8 @@ __FBSDID("$FreeBSD$"); __weak_reference(_thr_atfork, _pthread_atfork); __weak_reference(_thr_atfork, pthread_atfork); +bool _thr_after_fork = false; + int _thr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) @@ -243,7 +245,9 @@ thr_fork_impl(const struct thr_fork_args *a) _thr_signal_postfork_child(); if (was_threaded) { + _thr_after_fork = true; _rtld_atfork_post(rtld_locks); + _thr_after_fork = false; __thr_pshared_atfork_post(); } _thr_setthreaded(0); diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 0e88c6711817..910de374accf 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -779,6 +779,8 @@ extern int _suspend_all_waiters __hidden; extern int _suspend_all_cycle __hidden; extern struct pthread *_single_thread __hidden; +extern bool _thr_after_fork __hidden; + /* * Function prototype definitions. */ diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c index 1967ea14859d..fe4fb7ae0602 100644 --- a/lib/libthr/thread/thr_rtld.c +++ b/lib/libthr/thread/thr_rtld.c @@ -158,6 +158,17 @@ _thr_rtld_lock_release(void *lock) l = (struct rtld_lock *)lock; state = l->lock.rw_state; + if (__predict_false(_thr_after_fork)) { + /* + * After fork, only this thread is running, there is no + * waiters. Keeping waiters recorded in rwlock breaks + * wake logic. + */ + atomic_clear_int(&l->lock.rw_state, + URWLOCK_WRITE_WAITERS | URWLOCK_READ_WAITERS); + l->lock.rw_blocked_readers = 0; + l->lock.rw_blocked_writers = 0; + } if (_thr_rwlock_unlock(&l->lock) == 0) { if ((state & URWLOCK_WRITE_OWNER) == 0) curthread->rdlock_count--; From nobody Mon May 29 13:13:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVGFJ1Yz6z4XlWN; Mon, 29 May 2023 13:13:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVGFJ14jFz3FVD; Mon, 29 May 2023 13:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685366036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0AOl9x8Wfx3REa92qJHrxoJPXrOhhdu1mnWeLFoyQU=; b=yyjWP8462yq4isOo2lWg24P9VjELd9S3q2RonPnc2o6fPzFtQkX7rbS7iqSrVYe2T+V+wZ WRWEh1V+SUmpXZthn+o3Snf9USNklKDXzUNiSKZLfZN7qGzl36MmGEuzmrx2DZxDRvVlBL SSoPWP/lQSEenK53SDfxmywVseAS9sgfKMcG2FCMap+w6Lw5yUASZ1+luTRhYCy0epnzi+ 5jJKBSNAPlmJf1+hnl2rvoMJM4iGlHIULurHqzw2m177NwibkCZgk/dVMNNfhOEfRTN/r6 5dgB6Cj8FZg6gGCV1ea3XyNgJe4W5LXLJGmz95F/qzrM2lTEuXr+Pl121bEyQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685366036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0AOl9x8Wfx3REa92qJHrxoJPXrOhhdu1mnWeLFoyQU=; b=EeW7emanfG/dOWtRvDV1OiaAQX5Y+HUst2Ur1JQSm0UYuaSYNMwh+q3HLUMYES1RMqvd97 OVqTV2FEVskgWtntZzS+S7w67zVGViebJd1N7Tool9mPG9jNIMtl+5gIVEJnEYimqSRrS8 EYPKBeWywK145mypGBNu5s3sjVx6YaTz+u7Syc1pT7IwbU+Lc6jbCcqOtfqBStU1ZMoABd 9INphKQAgoSe3XzrV1BDfWK5b0n+lcAAm3NEFz1lYjN0tOsJ3N8Vw7qFhBDlfk+UyUKUKM kpRDJ9l4zoKMxxqTHoTf8XQt6v+mxPgpDSqbZ1WwHzGHH8t4lLn101RgRGKWYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685366036; a=rsa-sha256; cv=none; b=vNNF9tmpcB8XUpxFmosXr43PiQhqzcvQJ2EYauwtZWcJr7Pj/rvc+EE67I+D9korENco99 qh+Oq+N3YlRfMt9hbgj6NhXiTyufaXmnNAsGfMgaIB1gWvK4JBzmKQc/xKKkvMJdLiTnBJ hPqzmZAVHfnGh4diENsWs18aTkYlAsUEvO0vh2FH9THsazCkTN/+b3zxXBrFnBXlChojHr pYFbt4AyD3Zgavrh0AerEOh+6Uc2Yapsn8/FHrX7twJydNyQbubnJyfND28qGuD8O1sIQ6 likU3RKAXapNqndDaz0RS/IlBobAKt/Gsdl5mcStkNLCmZJfsUkDvFcgKwLvkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVGFJ0824z1CQP; Mon, 29 May 2023 13:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34TDDtUr057296; Mon, 29 May 2023 13:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TDDtVr057295; Mon, 29 May 2023 13:13:55 GMT (envelope-from git) Date: Mon, 29 May 2023 13:13:55 GMT Message-Id: <202305291313.34TDDtVr057295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 753f15c24fba - stable/13 - loader.efi: Fix some arm64 PE metadata List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 753f15c24fbac5f445477ea82d3b72b2a7a3d90d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=753f15c24fbac5f445477ea82d3b72b2a7a3d90d commit 753f15c24fbac5f445477ea82d3b72b2a7a3d90d Author: Mark Johnston AuthorDate: 2023-04-18 18:32:04 +0000 Commit: Mark Johnston CommitDate: 2023-05-29 13:12:55 +0000 loader.efi: Fix some arm64 PE metadata - Mark the file as an executable in the COFF header. - Provide separate .text and .data sections. - Provide sane file and section alignment values. These values are the defaults defined in the PE specification. - Set appropriate characteristics for each of .text and .data. This is required for the MS devkit to load our UEFI image. Obtained from: OpenBSD via allanjude MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D37765 (cherry picked from commit 21d56b796634bda628b149c717461bf88c23677d) --- stand/efi/loader/arch/arm64/ldscript.arm64 | 5 +++- stand/efi/loader/arch/arm64/start.S | 46 ++++++++++++++++-------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/stand/efi/loader/arch/arm64/ldscript.arm64 b/stand/efi/loader/arch/arm64/ldscript.arm64 index d0ed320a319c..c10448f4180e 100644 --- a/stand/efi/loader/arch/arm64/ldscript.arm64 +++ b/stand/efi/loader/arch/arm64/ldscript.arm64 @@ -16,7 +16,9 @@ SECTIONS *(.gnu.warning) *(.plt) } =0xD4200000 - . = ALIGN(16); + . = ALIGN(4096); + _etext = .; + __data_start = .; .data : { *(.rodata .rodata.* .gnu.linkonce.r.*) *(.rodata1) @@ -78,6 +80,7 @@ SECTIONS . = ALIGN(16); .dynsym : { *(.dynsym) } _edata = .; + __data_size = . - __data_start; /* Unused sections */ .interp : { *(.interp) } diff --git a/stand/efi/loader/arch/arm64/start.S b/stand/efi/loader/arch/arm64/start.S index 675d4e153f36..0b8537fed30e 100644 --- a/stand/efi/loader/arch/arm64/start.S +++ b/stand/efi/loader/arch/arm64/start.S @@ -34,11 +34,14 @@ #define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#define IMAGE_FILE_EXECUTABLE 0x0002 + #define IMAGE_SCN_CNT_CODE 0x00000020 #define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 #define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 #define IMAGE_SCN_MEM_EXECUTE 0x20000000 #define IMAGE_SCN_MEM_READ 0x40000000 +#define IMAGE_SCN_MEM_WRITE 0x80000000 .section .peheader,"a" efi_start: @@ -60,22 +63,22 @@ coff_head: .long 0 /* No symbol table */ .long 0 /* No symbols */ .short section_table - optional_header /* Optional header size */ - .short 0 /* Characteristics TODO: Fill in */ + .short IMAGE_FILE_EXECUTABLE /* Characteristics */ optional_header: .short 0x020b /* PE32+ (64-bit addressing) */ .byte 0 /* Major linker version */ .byte 0 /* Minor linker version */ - .long _edata - _end_header /* Code size */ - .long 0 /* No initialized data */ + .long _etext - _end_header /* Code size */ + .long __data_size /* Initialized data size */ .long 0 /* No uninitialized data */ .long _start - efi_start /* Entry point */ .long _end_header - efi_start /* Start of code */ optional_windows_header: .quad 0 /* Image base */ - .long 32 /* Section Alignment */ - .long 8 /* File alignment */ + .long 4096 /* Section Alignment */ + .long 512 /* File alignment */ .short 0 /* Major OS version */ .short 0 /* Minor OS version */ .short 0 /* Major image version */ @@ -104,36 +107,37 @@ optional_windows_header: .quad 0 section_table: - /* We need a .reloc section for EFI */ - .ascii ".reloc" + .ascii ".text" + .byte 0 .byte 0 .byte 0 /* Pad to 8 bytes */ - .long 0 /* Virtual size */ - .long 0 /* Virtual address */ - .long 0 /* Size of raw data */ - .long 0 /* Pointer to raw data */ + .long _etext - _end_header /* Virtual size */ + .long _end_header - efi_start /* Virtual address */ + .long _etext - _end_header /* Size of raw data */ + .long _end_header - efi_start /* Pointer to raw data */ .long 0 /* Pointer to relocations */ .long 0 /* Pointer to line numbers */ .short 0 /* Number of relocations */ .short 0 /* Number of line numbers */ - .long (IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | \ - IMAGE_SCN_MEM_DISCARDABLE) /* Characteristics */ + .long (IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | \ + IMAGE_SCN_MEM_READ) /* Characteristics */ - /* The contents of the loader */ - .ascii ".text" + .ascii ".data" .byte 0 .byte 0 .byte 0 /* Pad to 8 bytes */ - .long _edata - _end_header /* Virtual size */ - .long _end_header - efi_start /* Virtual address */ - .long _edata - _end_header /* Size of raw data */ - .long _end_header - efi_start /* Pointer to raw data */ + .long __data_size /* Virtual size */ + .long __data_start - efi_start /* Virtual address */ + .long __data_size /* Size of raw data */ + .long __data_start - efi_start /* Pointer to raw data */ .long 0 /* Pointer to relocations */ .long 0 /* Pointer to line numbers */ .short 0 /* Number of relocations */ .short 0 /* Number of line numbers */ - .long (IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | \ - IMAGE_SCN_MEM_READ) /* Characteristics */ + .long (IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | \ + IMAGE_SCN_MEM_WRITE) /* Characteristics */ + + .align 12 _end_header: .text From nobody Mon May 29 13:13:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVGFK6Xj5z4XlZs; Mon, 29 May 2023 13:13:57 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVGFK1xdLz3FRl; Mon, 29 May 2023 13:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685366037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+eeD4BNOkcr5wxXiJKNVRcUiUtM+7u1pXH8IjXKdkQ=; b=Q2Eddi915ybuLjaU5TsRV7wLkez4ywLdVNPKgEeg+hUjTVB8gonZoQrqc1MTw209qLuMG4 YC01BDJAI2KBcqIfHup+7dou/bIkpUypBaa77qIt5stSPWcgVwcXGymkMR7PDuZhedDyJv ogZpjf0wiKNtAG1h9bNNzKlucsCk4nH6RXvpM7qm8nB48+gvAhTphSlgK+c2uboZf+C8tG CsqPiwvHtrnRO2lmTn2tvMVrhieAHOiIrWHQY7ETwGw+L1EgqWexb1/xLzsbpcm210qqF1 mfgfcXXe5X/P9yT2fr7ousQeEb986m9oVSlC7DYcVtNquBKBpYqM1FCi+xjibw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685366037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+eeD4BNOkcr5wxXiJKNVRcUiUtM+7u1pXH8IjXKdkQ=; b=qFmB2bsDCcSD39xqKNL4xlziXqyp/VKk8J7ja3lXUjYLNi+I8TS9Prrl3peD6M44lfYrMh Ppx5QIh0+WkfO7zkp0vEU9qX2fkisUn5SDc5K0b2o6hMIyqazIaX6hMzLhdRQ4UGXe5ck5 4rFFExRDN63sDFsA71j8RLqrLWiFJ5RR6jV7ppzthbGttNF3cfEh6l3wxQnfbU5DAQGvRT 2T245+AvIHvgpdKE6wpXY1TNgt7/ovJUNTG7CbzV1sbofK3sHJJ6itJYkZ6i54mhWF5mF1 n0Xc4ZwACLTX4Q4PN87Ltx3L/YAl/9tw0KoAW3kLOmKsiNUEzAZMj/5PDSEU5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685366037; a=rsa-sha256; cv=none; b=Z5jF2CZh4fnCXc+n/MjmqLoo3M5W2yKI0V9JDZHk+k+7+xpZ55/RgVWb3L7KMfIDvDOzkd EU8cWEw2d6IESM4tdsTvLJWLStEQuBelvDJ9aXSCih14W8b6n8NOTFdrt9beHw5uIzF52x F+tltQ3H07dskChpcGKWY+JR5CbDceuFZhrYlOIsfWzC2zbt+ZsR/IggJzB+u/06a+4chT o7ciLtYTJvF4UmdgL0GiclZ9Kx1vl2gqMQMqNgiX5+GFPJNl7wbVuzU5ZFi/hb8/c6Vprn QKZEZytY+KfvwqGPjfsG/bCX437mjBJl216iyVHpuzs1MYWoK0RMw8Zex9K9YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVGFK11w0z1CQQ; Mon, 29 May 2023 13:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34TDDv0L057322; Mon, 29 May 2023 13:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TDDvKu057321; Mon, 29 May 2023 13:13:57 GMT (envelope-from git) Date: Mon, 29 May 2023 13:13:57 GMT Message-Id: <202305291313.34TDDvKu057321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d9654675b1c3 - stable/13 - fusefs: Remove an unused pbuf zone List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d9654675b1c31d55497fa6b67795e2811fbf54f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d9654675b1c31d55497fa6b67795e2811fbf54f2 commit d9654675b1c31d55497fa6b67795e2811fbf54f2 Author: Mark Johnston AuthorDate: 2023-05-22 13:33:57 +0000 Commit: Mark Johnston CommitDate: 2023-05-29 13:13:40 +0000 fusefs: Remove an unused pbuf zone The zone has been dead ever since commit b9e20197551d ("fusefs: rewrite vop_getpages and vop_putpages") No functional change intended. Reviewed by: asomers MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40143 (cherry picked from commit e3f7081b1c54fae55cb443a39c2ad44ac3ed4a75) --- sys/fs/fuse/fuse_main.c | 3 --- sys/fs/fuse/fuse_vnops.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/sys/fs/fuse/fuse_main.c b/sys/fs/fuse/fuse_main.c index 824458db72cb..ce40b73f656b 100644 --- a/sys/fs/fuse/fuse_main.c +++ b/sys/fs/fuse/fuse_main.c @@ -96,7 +96,6 @@ struct mtx fuse_mtx; extern struct vfsops fuse_vfsops; extern struct cdevsw fuse_cdevsw; extern struct vop_vector fuse_fifonops; -extern uma_zone_t fuse_pbuf_zone; static struct vfsconf fuse_vfsconf = { .vfc_version = VFS_VERSION, @@ -151,7 +150,6 @@ fuse_loader(struct module *m, int what, void *arg) fuse_file_init(); fuse_internal_init(); fuse_node_init(); - fuse_pbuf_zone = pbuf_zsecond_create("fusepbuf", nswbuf / 2); /* vfs_modevent ignores its first arg */ if ((err = vfs_modevent(NULL, what, &fuse_vfsconf))) @@ -161,7 +159,6 @@ fuse_loader(struct module *m, int what, void *arg) if ((err = vfs_modevent(NULL, what, &fuse_vfsconf))) return (err); fuse_bringdown(eh_tag); - uma_zdestroy(fuse_pbuf_zone); break; default: return (EINVAL); diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 7fd96ff639ff..de990c6f754a 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -227,8 +227,6 @@ struct vop_vector fuse_vnops = { }; VFS_VOP_VECTOR_REGISTER(fuse_vnops); -uma_zone_t fuse_pbuf_zone; - /* Check permission for extattr operations, much like extattr_check_cred */ static int fuse_extattr_check_cred(struct vnode *vp, int ns, struct ucred *cred, From nobody Mon May 29 15:42:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVKYH40sHz4Xxvx; Mon, 29 May 2023 15:42:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVKYH3NfJz3q2J; Mon, 29 May 2023 15:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685374979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lJcIh7pYQfuCx3T4FwMHJUkry0mK9NKHzwJsbDtzFN8=; b=nbNq+FiiZ2RM5Tv9O5KagqpytiwXPsBMnAjOfB2TnfedRketA3gBHc53Qe59ZnUl29+SKt jL27I5/h7WwBKT9nDl8RaivZU9ZoH++x/CgddULad7bhSEYsvLc7nYHo3fUJlsYB2a9ruf k24wySrhVUxtiv/gT/G+GO8aJYKavXlYBf3EnY+qffU9TiHInbKod2HF2PMZDXMBcS9eHP 12XE9DxRei5fktM5Wh1ZAIuiPC1wvWcAGzG4FVDhzXVv6LkKWL6LX8k49mRb6zFO6B0dmu N3+WGoPHRjt1o+NlnqPtRLPn4zI3dDzZIEjjYM6vezICIRxrx4+loEW2uU+Taw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685374979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lJcIh7pYQfuCx3T4FwMHJUkry0mK9NKHzwJsbDtzFN8=; b=ehnZaJIvpM260fc2oUilwd2wGpWVvZbJymBNAmrIHGE66tFN4OHk2MMebkMkwrb1b+6jDw fr4hJPPJ8DEeYq8afvxxZbj5xItbELBhvMw10bfVCChYg2mDvaUvtGP/Kg/xYmy6M8PjfR 45WbaP2ow5YQAvTFJg4CEWzcoOdsp3pbJJvW+GmQ9CT3TQlGk85cjt2UFMx3LnGYdjHoNg RLU1Qo/Nl3k3hIDOqQYrWKMtyQ3mLMWYm8W8YkwYbq2nDRTv5VN8M+USf+Y3ANUyv7U7yO Gk3R41V3bObIX9MqzbOYtHjWGTYVgnyG1ON9ZfqExWHuLPONOuUqkts/8sTsCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685374979; a=rsa-sha256; cv=none; b=px5SdT77DY1QO4AwNHJKqQy5jgnr/uu28Zq1aQIENMsHbJsqSEbB2T9+J4nh6iFW3pkGD8 ERjsedi66U6OzgYaymVxTuxZbXZ91rxqCcja4xXr0DpPqHL8cl76/cAcyXOHq4xIe0/PIH /dfjyNUaw9XaoMDoVbtXfYvsVyTJSAkbaODI8TKjhyqnGEukgBvzPp7CSoEpjOvZwZHUED oRbsNIxGqYdz/zzP1KUkf4LYfF8lH/aaLzzMS5IJbhBoWa/ML1uhDevydltxge4CR+ApuF qWUJWXDCWZopXKBpuXl8ojUHCGVfT7PaiGDlQDMPS2MOIYvVmN2KdT+IfKi/5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVKYH2S8bzHjW; Mon, 29 May 2023 15:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34TFgxvr003937; Mon, 29 May 2023 15:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TFgxjj003936; Mon, 29 May 2023 15:42:59 GMT (envelope-from git) Date: Mon, 29 May 2023 15:42:59 GMT Message-Id: <202305291542.34TFgxjj003936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 097e721ff4f2 - stable/13 - geli: fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 097e721ff4f2be42f1f2705edf6febcf9121d774 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=097e721ff4f2be42f1f2705edf6febcf9121d774 commit 097e721ff4f2be42f1f2705edf6febcf9121d774 Author: Mariusz Zaborski AuthorDate: 2023-05-15 08:44:17 +0000 Commit: Mariusz Zaborski CommitDate: 2023-05-29 15:42:48 +0000 geli: fix typo PR: 271396 Reported by: Tim Chase MFC after: 1 week (cherry picked from commit 06db6a9dce81ceb696ee9c542637a4d80e0316a7) --- lib/geom/eli/geom_eli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c index 8897af15b8f3..890a5955af3c 100644 --- a/lib/geom/eli/geom_eli.c +++ b/lib/geom/eli/geom_eli.c @@ -1469,7 +1469,7 @@ eli_setkey(struct gctl_req *req) if (req->error == NULL || req->error[0] == '\0') { printf("Note, that the master key encrypted with old keys " - "and/or passphrase may still exists in a metadata backup " + "and/or passphrase may still exist in a metadata backup " "file.\n"); } } From nobody Tue May 30 09:06:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVmjq2XV1z4Y8J2; Tue, 30 May 2023 09:06:55 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVmjq247sz3p5R; Tue, 30 May 2023 09:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685437615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+izvLl5SUhbBhpPWKq3W3I7EauBD7vwSOUnArzQuqFE=; b=glRkEf1RZsB5VeIxF13S4EmYM8fad4GUZRs5sNcaZsZ0P1Djwcc6S/B4lU1xk0s+Ujemus UqLbjUzsvxlMnia5zBVJo324JeoLDEVNEYbZcVLWd84R/4qwbp3zzaPHle/qoRSBdThheT ti7aaPEFSPkBZLjN9S1KJ5z5KVI0DYFF+Bvwn4go81lRc4LJ4RNfa0IbODEL40Dgh5rC9d 1eB/Ej4eZMaOoVR92HtOWrDYHkhT26jOD0qiYBFMzACfJ8rx1GuV1Y/4EmMNWw/1AVxwiH +3QX3RZTarf2hZ2P8HpkBdbwE0fTp4+a8xZ4TZeDD5Lo2e5wWlZ8HX1TTz1a1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685437615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+izvLl5SUhbBhpPWKq3W3I7EauBD7vwSOUnArzQuqFE=; b=Zmh51m/ySpqvjYaYWGr/GML0qw7DN0n9bXiJW1Vu2XsGJ0SrPSWkOAOTh+e5rOtVLSbXss YKrflxP7nNjkVgOZt5bt77x9slFgUSgEkxKuGLxQIV3cAfhIqAQTcGYHSxlKahctHgItZM bfK33y9pkJ8eRcgC8VgXcdUiNxsKxai14elsNH8gEel0Mr5LRLg2S4Do8AFJvC/hFk0dwb 6LeuDvWA5CPjP/jnHJV3Y3LQ8sZWQcv4DAhdhwwrO46TBv8INZz3Z9Defnn4XzVtjJFjs1 TLyyYkEnw4nqyTOzyDWHn3f1LtmQ+aDXSyFSApMicB3ev1vIRRkpcJuNhbl/8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685437615; a=rsa-sha256; cv=none; b=w23Jufu6N9XaFnub0nFVWJrhoGBTTOAQ6MuS9qW7CzMKLLAHmsTcOaDu9aINJtNhR93zes 1/uLtMWQetDBRb+46EbFP6xTI6SGGvtqkrcdkyFLhFN4aYVUWwFKCPgmi85ptLYjT++vIG YGgdNVHmidKxbrph9SnR0G9O8srtXNSrtDNM6L2InrY+jsqHIKStdFxY5tdi3BDcanVEtS LMuteBfNLl5pq1QqSWHLwBoGLepY05Z2JI8Qckfuy269e70MW2lWnKFaeGMnnQoYQo+6l7 KWNikhZTb0Q8Ly2E/KZhX6EXILnciaB1W0t2zbF6A3JPY8TsMuoivlrMEV2P6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVmjq131Nzn8T; Tue, 30 May 2023 09:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34U96tH0022490; Tue, 30 May 2023 09:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34U96tVn022489; Tue, 30 May 2023 09:06:55 GMT (envelope-from git) Date: Tue, 30 May 2023 09:06:55 GMT Message-Id: <202305300906.34U96tVn022489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 773c91ccc892 - stable/13 - MFC: listen(2): improve administrator control over logging List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 773c91ccc8922c047d3632ae5849cd824992c313 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=773c91ccc8922c047d3632ae5849cd824992c313 commit 773c91ccc8922c047d3632ae5849cd824992c313 Author: Eugene Grosbein AuthorDate: 2023-04-30 20:14:30 +0000 Commit: Eugene Grosbein CommitDate: 2023-05-30 09:05:46 +0000 MFC: listen(2): improve administrator control over logging As documented in listen.2 manual page, the kernel emits a LOG_DEBUG syslog message if a socket listen queue overflows. For some appliances, it may be desirable to change the priority to some higher value like LOG_INFO while keeping other debugging suppressed. OTOH there are cases when such overflows are normal and expected. Then it may be desirable to suppress overflow logging altogether, so that dmesg buffer is not flooded over long run. In addition to existing sysctl kern.ipc.sooverinterval, introduce new sysctl kern.ipc.sooverprio that defaults to 7 (LOG_DEBUG) to preserve current behavior. It may be changed to any value in a range of 0..7 for corresponding priority or to -1 to suppress logging. Document it in the listen.2 manual page. (cherry picked from commit 4824d788725987bccff53dec8c103cbac455b3ed) --- lib/libc/sys/listen.2 | 15 +++++++++++++-- sys/kern/uipc_socket.c | 40 +++++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2 index 4d0962fd412c..076163548b72 100644 --- a/lib/libc/sys/listen.2 +++ b/lib/libc/sys/listen.2 @@ -28,7 +28,7 @@ .\" From: @(#)listen.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd April 14, 2020 +.Dd April 30, 2023 .Dt LISTEN 2 .Os .Sh NAME @@ -111,10 +111,20 @@ or less than zero is specified, is silently forced to .Va kern.ipc.soacceptqueue . .Pp -If the listen queue overflows, the kernel will emit a LOG_DEBUG syslog message. +If the listen queue overflows, the kernel will emit a syslog message +using default priority LOG_DEBUG (7). The .Xr sysctl 3 MIB variable +.Va kern.ipc.sooverprio +may be used to change this priority to any value in a range of 0..7 +(LOG_EMERG..LOG_DEBUG). +See +.Xr syslog 3 +for details. +It may be set to -1 to disable these messages. +.Pp +The variable .Va kern.ipc.sooverinterval specifies a per-socket limit on how often the kernel will emit these messages. .Sh INTERACTION WITH ACCEPT FILTERS @@ -164,6 +174,7 @@ The socket is not of a type that supports the operation .Xr connect 2 , .Xr socket 2 , .Xr sysctl 3 , +.Xr syslog 3 , .Xr sysctl 8 , .Xr accept_filter 9 .Sh HISTORY diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 5b1e572d786f..32ad819be81b 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -574,6 +574,10 @@ SYSCTL_INT(_regression, OID_AUTO, sonewconn_earlytest, CTLFLAG_RW, ®ression_sonewconn_earlytest, 0, "Perform early sonewconn limit test"); #endif +static int sooverprio = LOG_DEBUG; +SYSCTL_INT(_kern_ipc, OID_AUTO, sooverprio, CTLFLAG_RW, + &sooverprio, 0, "Log priority for listen socket overflows: 0..7 or -1 to disable"); + static struct timeval overinterval = { 60, 0 }; SYSCTL_TIMEVAL_SEC(_kern_ipc, OID_AUTO, sooverinterval, CTLFLAG_RW, &overinterval, @@ -612,7 +616,8 @@ sonewconn(struct socket *head, int connstatus) if (over) { #endif head->sol_overcount++; - dolog = !!ratecheck(&head->sol_lastover, &overinterval); + dolog = (sooverprio >= 0) && + !!ratecheck(&head->sol_lastover, &overinterval); /* * If we're going to log, copy the overflow count and queue @@ -694,12 +699,33 @@ sonewconn(struct socket *head, int connstatus) } KASSERT(sbuf_len(&descrsb) > 0, ("%s: sbuf creation failed", __func__)); - log(LOG_DEBUG, - "%s: pcb %p (%s): Listen queue overflow: " - "%i already in queue awaiting acceptance " - "(%d occurrences)\n", - __func__, head->so_pcb, sbuf_data(&descrsb), - qlen, overcount); + /* + * Preserve the historic listen queue overflow log + * message, that starts with "sonewconn:". It has + * been known to sysadmins for years and also test + * sys/kern/sonewconn_overflow checks for it. + */ + if (head->so_cred == 0) { + log(LOG_PRI(sooverprio), + "sonewconn: pcb %p (%s): " + "Listen queue overflow: %i already in " + "queue awaiting acceptance (%d " + "occurrences)\n", head->so_pcb, + sbuf_data(&descrsb), + qlen, overcount); + } else { + log(LOG_PRI(sooverprio), + "sonewconn: pcb %p (%s): " + "Listen queue overflow: " + "%i already in queue awaiting acceptance " + "(%d occurrences), euid %d, rgid %d, jail %s\n", + head->so_pcb, sbuf_data(&descrsb), qlen, + overcount, head->so_cred->cr_uid, + head->so_cred->cr_rgid, + head->so_cred->cr_prison ? + head->so_cred->cr_prison->pr_name : + "not_jailed"); + } sbuf_delete(&descrsb); overcount = 0; From nobody Tue May 30 09:29:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVnDJ2NkPz4XBWp; Tue, 30 May 2023 09:29:52 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVnDJ1tjPz3srN; Tue, 30 May 2023 09:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685438992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZ+8+ydTHU/KzuC6C+m47paryMBGj0v1F2Ie4Mh4yoI=; b=DjxHM9yq9+VrvTWUJ9I4adkZkcMv/jhCwDWgT6iuETicBGBgFSXHMDYe0edIL2ZHjxiDhQ DmlIuRZSrJkxYrfatytxbVGma3QoaQ78te7dUNuyYBFovA8WGuyQbeM7zmaas9hQ4SnOCl luAwIE9grlELlqJ/eieUB4b2kjh4+YByujkDE4kFAnnTUfZi1hJ0EGDyA/dVBAjyn+CuRU 38UiC1LwLwBprpTCnGRNkPxqqYxB6P5+7P7/8aZ4m/UrKEVSNwcDb/5w2WHYf1i41pXP6n aV++/mkUIUy1/ef4NN2fe3sCzOYQhDBXzpncdjBj1z7nS/BmELVARkc6LwzZKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685438992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZ+8+ydTHU/KzuC6C+m47paryMBGj0v1F2Ie4Mh4yoI=; b=N4F1vSsYRTjcxk5X5QZ0qPuVVdCYTqUs3MFQrAHhQwuvxvoSKRKd5O+6zbq6Y4TIcn9hFN vUSsFJcDZ7nSEMrBvG8gzlLsCa3CnUYhiLtOOEUAhnMNeI91aYDSTrDh0cObSQkN+Rh2oN IyP/tmulMRQQZOfSnl+AX4qHwISLoqlmL9NOCcIwSiS8iBIOt/pgiVsqRGRRZq5lj+ldkQ IhVSR04BkH3Sx8XWtznDvAhx24SJq7MMVYQ614Cm22+OAPms83UZrtDGfZyvsPEnqwNg9I LkQ1Pp1q8kYdZSdT4c81GTGKbT5bqu4vyVwSenTpprtz76Isab+QKgbMP2vPsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685438992; a=rsa-sha256; cv=none; b=n6L9NGXuYJTf1MQp+kMIbpxt73h1sBTMvU2jb/vA5oYgP8CmlGm/NO4vdlBlUEb+1/VS62 dYZNgIXxGuoSPFiH6RkrNqNKmObU0yiXzAqZWXAn4xnR8SXroMCBERzmXINUzd5GzzrdsH 98XxBQdITWChFMeZmHxaqcK63NSL7F5iZzcZatr0ixEqohnL3LuYO1qPXTIcyHj4BDxjXP N+7oCihgJyQqKtV2VOWaM02VHlaYqVOxzhtRjRsjuZJYUNkXIpZODV42b2f4TnCQjf1PA0 Pq0HnMM/oa24w2jGDMUuQYSn8ciGVqjOlHPyT6FkmEtA5RM1PaMbzXEogyAf0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVnDJ0xhZzp69; Tue, 30 May 2023 09:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34U9Tq0N055342; Tue, 30 May 2023 09:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34U9Tqkw055341; Tue, 30 May 2023 09:29:52 GMT (envelope-from git) Date: Tue, 30 May 2023 09:29:52 GMT Message-Id: <202305300929.34U9Tqkw055341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c434383146a2 - stable/13 - listen(2): fix wrong MFC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c434383146a264c396d8bcaafd40507f7bf46e56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c434383146a264c396d8bcaafd40507f7bf46e56 commit c434383146a264c396d8bcaafd40507f7bf46e56 Author: Eugene Grosbein AuthorDate: 2023-05-30 09:27:25 +0000 Commit: Eugene Grosbein CommitDate: 2023-05-30 09:27:25 +0000 listen(2): fix wrong MFC Direct commit: fix wrong conflict resolution in previous MFC: listen(2): improve administrator control over logging Fixes: 773c91ccc8922c047d3632ae5849cd824992c313 --- sys/kern/uipc_socket.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 32ad819be81b..669bddcd629b 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -699,33 +699,12 @@ sonewconn(struct socket *head, int connstatus) } KASSERT(sbuf_len(&descrsb) > 0, ("%s: sbuf creation failed", __func__)); - /* - * Preserve the historic listen queue overflow log - * message, that starts with "sonewconn:". It has - * been known to sysadmins for years and also test - * sys/kern/sonewconn_overflow checks for it. - */ - if (head->so_cred == 0) { - log(LOG_PRI(sooverprio), - "sonewconn: pcb %p (%s): " - "Listen queue overflow: %i already in " - "queue awaiting acceptance (%d " - "occurrences)\n", head->so_pcb, - sbuf_data(&descrsb), - qlen, overcount); - } else { - log(LOG_PRI(sooverprio), - "sonewconn: pcb %p (%s): " - "Listen queue overflow: " - "%i already in queue awaiting acceptance " - "(%d occurrences), euid %d, rgid %d, jail %s\n", - head->so_pcb, sbuf_data(&descrsb), qlen, - overcount, head->so_cred->cr_uid, - head->so_cred->cr_rgid, - head->so_cred->cr_prison ? - head->so_cred->cr_prison->pr_name : - "not_jailed"); - } + log(LOG_PRI(sooverprio), + "%s: pcb %p (%s): Listen queue overflow: " + "%i already in queue awaiting acceptance " + "(%d occurrences)\n", + __func__, head->so_pcb, sbuf_data(&descrsb), + qlen, overcount); sbuf_delete(&descrsb); overcount = 0; From nobody Tue May 30 16:52:35 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVz375cD4z4Xp5C; Tue, 30 May 2023 16:52:35 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVz3758v4z3NMd; Tue, 30 May 2023 16:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685465555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0TikJlexzMC6oz19dMJgM1fo+vk8iXSeB6+d51o/PQ=; b=ebbckaFsYumKDWVCtrJPIJUTWzd3SU0ejQDcLB3xehXYy9iTaSR6ENfaORSJNoQZY+cyGI K8GE6sgGYmPsX3Yq63wTxjG2ak8633dExVhEdCFurCEXTSP2zr1lC99rcOYhdde5iCzUZ+ 2lxfSYa1mcjTfbe0/1fvtY85TuT0PMUJTBGD8wwVo886Lz9ZZiRtDgXoLrzb0K9P3aDHHs wQ1jAn+otJ7XRAwwIkdvHkmjwCo3HEwLegmyWl2lABR2GNiZxZrA2rAmtTC+89FhJ2CYG+ cp0DrFNSWsKNGNRrzCHvlRuU1uCXjlygM97O+CNaIjEY2wXSdTGhEgdvMHymIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685465555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0TikJlexzMC6oz19dMJgM1fo+vk8iXSeB6+d51o/PQ=; b=wHj/gIkCYPP/qsCa9p4tujBYzZHSaHb0E91T+nGJ9BqW2bs1jP1u/3ZUjTDzl1gYi+ULps KSr6mSLc0NwwAEb2J5Swofeb+YIAgOGCVrTNAApHn7rlFCqWMHu8rHENTJvLFpsxKeU02f LVIy+hZOVoW87oItU1e4wZClwvXbtlKDERgSZ9WBbsfmSz4Mjey5w+PY1WnuX5hoDcbfa0 HmNLrudXRvI34T7EmQBjazmQVtINcxIu2Z1Mlqx3m+0Xc8tinUf2OPX1dQX8KfSmu144Lh zeKSp3Ht6yB1lpQWlc8e1+tyaysaLQcEHkubXLNb4Ud2oqtx0ir+tW1RRzR6PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685465555; a=rsa-sha256; cv=none; b=YM4lC/HzhFKNg9LHT2++b5330lainvQcAACTxg457o1ZCm/m3c0XBxkGWbfjQVEi9m/uuD OSXoeD9sPeYXV6dHTvYvj0qJ0anzj6D6pq0FG/i0SUdHeuANNC2HQT5Qy9P48OUdAsMsKe P6i/8oYWu1orC0Ij5i+deL2UF4igouyErprGH08X4DUt5zu+Kc7kXyXL6j64smSz5mFnXJ Ub6CIQjDtgkinaJxeSQITGvBPPgMzJE9stRKsEyqSEfua1jdYRNyv4BPWlsah42g/IS9gB afPIqKyiXcm412rLMcrJIgKgB1d96xvVdWuHPSVNOousKUq2+yr2LI3zkeDv4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVz374CmQz11jw; Tue, 30 May 2023 16:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34UGqZKU096488; Tue, 30 May 2023 16:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UGqZxs096487; Tue, 30 May 2023 16:52:35 GMT (envelope-from git) Date: Tue, 30 May 2023 16:52:35 GMT Message-Id: <202305301652.34UGqZxs096487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: cb56391c165e - stable/13 - OpenSSL: Merge OpenSSL 1.1.1u List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb56391c165ebdc10a80545f025a2d8f09106ed5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=cb56391c165ebdc10a80545f025a2d8f09106ed5 commit cb56391c165ebdc10a80545f025a2d8f09106ed5 Author: Jung-uk Kim AuthorDate: 2023-05-30 14:24:15 +0000 Commit: Jung-uk Kim CommitDate: 2023-05-30 16:51:24 +0000 OpenSSL: Merge OpenSSL 1.1.1u (cherry picked from commit 8ecb489345f08012fdc92a202a40119891cac330) (cherry picked from commit 8f1ef87a6b93af292e68f8e33087e2df6325e9bb) --- crypto/openssl/CHANGES | 58 ++ crypto/openssl/Configure | 2 +- crypto/openssl/NEWS | 9 + crypto/openssl/README | 4 +- crypto/openssl/crypto/aes/asm/bsaes-armv7.pl | 4 +- crypto/openssl/crypto/asn1/a_bitstr.c | 8 +- crypto/openssl/crypto/bio/b_print.c | 1 - crypto/openssl/crypto/bn/bn_asm.c | 108 ++-- crypto/openssl/crypto/bn/bn_blind.c | 17 +- crypto/openssl/crypto/bn/bn_err.c | 2 - crypto/openssl/crypto/bn/bn_lib.c | 24 +- crypto/openssl/crypto/bn/bn_local.h | 40 +- crypto/openssl/crypto/bn/build.info | 3 +- crypto/openssl/crypto/bn/rsa_sup_mul.c | 614 --------------------- crypto/openssl/crypto/conf/conf_sap.c | 7 +- crypto/openssl/crypto/err/openssl.txt | 3 +- crypto/openssl/crypto/objects/obj_dat.c | 21 +- crypto/openssl/crypto/rsa/rsa_ossl.c | 30 +- crypto/openssl/crypto/ui/ui_lib.c | 6 +- crypto/openssl/crypto/ui/ui_util.c | 6 +- crypto/openssl/crypto/x509/x509_vfy.c | 13 +- crypto/openssl/crypto/x509v3/pcy_local.h | 10 +- crypto/openssl/crypto/x509v3/pcy_node.c | 26 +- crypto/openssl/crypto/x509v3/pcy_tree.c | 56 +- crypto/openssl/doc/fingerprints.txt | 5 + .../doc/man3/X509_VERIFY_PARAM_set_flags.pod | 11 +- crypto/openssl/engines/e_padlock.c | 17 +- crypto/openssl/include/crypto/bn.h | 5 - crypto/openssl/include/openssl/opensslv.h | 6 +- 29 files changed, 344 insertions(+), 772 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 459605bf71b6..500b0f653e6a 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,64 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1t and 1.1.1u [30 May 2023] + + *) Mitigate for the time it takes for `OBJ_obj2txt` to translate gigantic + OBJECT IDENTIFIER sub-identifiers to canonical numeric text form. + + OBJ_obj2txt() would translate any size OBJECT IDENTIFIER to canonical + numeric text form. For gigantic sub-identifiers, this would take a very + long time, the time complexity being O(n^2) where n is the size of that + sub-identifier. (CVE-2023-2650) + + To mitigitate this, `OBJ_obj2txt()` will only translate an OBJECT + IDENTIFIER to canonical numeric text form if the size of that OBJECT + IDENTIFIER is 586 bytes or less, and fail otherwise. + + The basis for this restriction is RFC 2578 (STD 58), section 3.5. OBJECT + IDENTIFIER values, which stipulates that OBJECT IDENTIFIERS may have at + most 128 sub-identifiers, and that the maximum value that each sub- + identifier may have is 2^32-1 (4294967295 decimal). + + For each byte of every sub-identifier, only the 7 lower bits are part of + the value, so the maximum amount of bytes that an OBJECT IDENTIFIER with + these restrictions may occupy is 32 * 128 / 7, which is approximately 586 + bytes. + + Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5 + + [Richard Levitte] + + *) Reworked the Fix for the Timing Oracle in RSA Decryption (CVE-2022-4304). + The previous fix for this timing side channel turned out to cause + a severe 2-3x performance regression in the typical use case + compared to 1.1.1s. The new fix uses existing constant time + code paths, and restores the previous performance level while + fully eliminating all existing timing side channels. + The fix was developed by Bernd Edlinger with testing support + by Hubert Kario. + [Bernd Edlinger] + + *) Corrected documentation of X509_VERIFY_PARAM_add0_policy() to mention + that it does not enable policy checking. Thanks to + David Benjamin for discovering this issue. (CVE-2023-0466) + [Tomas Mraz] + + *) Fixed an issue where invalid certificate policies in leaf certificates are + silently ignored by OpenSSL and other certificate policy checks are skipped + for that certificate. A malicious CA could use this to deliberately assert + invalid certificate policies in order to circumvent policy checking on the + certificate altogether. (CVE-2023-0465) + [Matt Caswell] + + *) Limited the number of nodes created in a policy tree to mitigate + against CVE-2023-0464. The default limit is set to 1000 nodes, which + should be sufficient for most installations. If required, the limit + can be adjusted by setting the OPENSSL_POLICY_TREE_NODES_MAX build + time define to a desired maximum number of nodes or zero to allow + unlimited growth. (CVE-2023-0464) + [Paul Dale] + Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. diff --git a/crypto/openssl/Configure b/crypto/openssl/Configure index 37a99d14715c..fc9658371a24 100755 --- a/crypto/openssl/Configure +++ b/crypto/openssl/Configure @@ -1246,7 +1246,7 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) } if ($target =~ /linux.*-mips/ && !$disabled{asm} - && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { + && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { # minimally required architecture flags for assembly modules my $value; $value = '-mips2' if ($target =~ /mips32/); diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index 2724fc4d85ba..f5a2d5ad33f8 100644 --- a/crypto/openssl/NEWS +++ b/crypto/openssl/NEWS @@ -5,6 +5,15 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.1t and OpenSSL 1.1.1u [30 May 2023] + + o Mitigate for very slow `OBJ_obj2txt()` performance with gigantic + OBJECT IDENTIFIER sub-identities. (CVE-2023-2650) + o Fixed documentation of X509_VERIFY_PARAM_add0_policy() (CVE-2023-0466) + o Fixed handling of invalid certificate policies in leaf certificates + (CVE-2023-0465) + o Limited the number of nodes created in a policy tree ([CVE-2023-0464]) + Major changes between OpenSSL 1.1.1s and OpenSSL 1.1.1t [7 Feb 2023] o Fixed X.400 address type confusion in X.509 GeneralName (CVE-2023-0286) diff --git a/crypto/openssl/README b/crypto/openssl/README index b2f806be3a44..b9bf50f4b1e5 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,7 +1,7 @@ - OpenSSL 1.1.1t 7 Feb 2023 + OpenSSL 1.1.1u 30 May 2023 - Copyright (c) 1998-2022 The OpenSSL Project + Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson All rights reserved. diff --git a/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl b/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl index 2b9f241ce8b0..b22db37d4d4c 100755 --- a/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2012-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -14,7 +14,7 @@ # details see http://www.openssl.org/~appro/cryptogams/. # # Specific modes and adaptation for Linux kernel by Ard Biesheuvel -# of Linaro. Permission to use under GPL terms is granted. +# of Linaro. # ==================================================================== # Bit-sliced AES for ARM NEON diff --git a/crypto/openssl/crypto/asn1/a_bitstr.c b/crypto/openssl/crypto/asn1/a_bitstr.c index f462dd107368..14b57265d172 100644 --- a/crypto/openssl/crypto/asn1/a_bitstr.c +++ b/crypto/openssl/crypto/asn1/a_bitstr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -148,6 +148,9 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value) int w, v, iv; unsigned char *c; + if (n < 0) + return 0; + w = n / 8; v = 1 << (7 - (n & 0x07)); iv = ~v; @@ -182,6 +185,9 @@ int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n) { int w, v; + if (n < 0) + return 0; + w = n / 8; v = 1 << (7 - (n & 0x07)); if ((a == NULL) || (a->length < (w + 1)) || (a->data == NULL)) diff --git a/crypto/openssl/crypto/bio/b_print.c b/crypto/openssl/crypto/bio/b_print.c index 45d4e9f004b1..c4ed364d72f6 100644 --- a/crypto/openssl/crypto/bio/b_print.c +++ b/crypto/openssl/crypto/bio/b_print.c @@ -305,7 +305,6 @@ _dopr(char **sbuffer, case 'G': case 'g': /* not implemented for UEFI */ - ERR_raise(ERR_LIB_BIO, ERR_R_UNSUPPORTED); return 0; #endif case 'c': diff --git a/crypto/openssl/crypto/bn/bn_asm.c b/crypto/openssl/crypto/bn/bn_asm.c index 4d83a8cf1115..e5fa81b3a1e3 100644 --- a/crypto/openssl/crypto/bn/bn_asm.c +++ b/crypto/openssl/crypto/bn/bn_asm.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -381,25 +381,33 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, #ifndef OPENSSL_SMALL_FOOTPRINT while (n & ~3) { t1 = a[0]; - t2 = b[0]; - r[0] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[0]; + t1 = (t2 - t1) & BN_MASK2; + r[0] = t1; + c += (t1 > t2); t1 = a[1]; - t2 = b[1]; - r[1] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[1]; + t1 = (t2 - t1) & BN_MASK2; + r[1] = t1; + c += (t1 > t2); t1 = a[2]; - t2 = b[2]; - r[2] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[2]; + t1 = (t2 - t1) & BN_MASK2; + r[2] = t1; + c += (t1 > t2); t1 = a[3]; - t2 = b[3]; - r[3] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[3]; + t1 = (t2 - t1) & BN_MASK2; + r[3] = t1; + c += (t1 > t2); a += 4; b += 4; r += 4; @@ -408,10 +416,12 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, #endif while (n) { t1 = a[0]; - t2 = b[0]; - r[0] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[0]; + t1 = (t2 - t1) & BN_MASK2; + r[0] = t1; + c += (t1 > t2); a++; b++; r++; @@ -446,7 +456,7 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, t += c0; /* no carry */ \ c0 = (BN_ULONG)Lw(t); \ hi = (BN_ULONG)Hw(t); \ - c1 = (c1+hi)&BN_MASK2; if (c1top = (int)(rtop & ~mask) | (ntop & mask); n->flags |= (BN_FLG_FIXED_TOP & ~mask); } - ret = BN_mod_mul_montgomery(n, n, r, b->m_ctx, ctx); + ret = bn_mul_mont_fixed_top(n, n, r, b->m_ctx, ctx); + bn_correct_top_consttime(n); } else { ret = BN_mod_mul(n, n, r, b->mod, ctx); } diff --git a/crypto/openssl/crypto/bn/bn_err.c b/crypto/openssl/crypto/bn/bn_err.c index 6f5464b54054..6ea5fc3d5cf6 100644 --- a/crypto/openssl/crypto/bn/bn_err.c +++ b/crypto/openssl/crypto/bn/bn_err.c @@ -73,8 +73,6 @@ static const ERR_STRING_DATA BN_str_functs[] = { {ERR_PACK(ERR_LIB_BN, BN_F_BN_SET_WORDS, 0), "bn_set_words"}, {ERR_PACK(ERR_LIB_BN, BN_F_BN_STACK_PUSH, 0), "BN_STACK_push"}, {ERR_PACK(ERR_LIB_BN, BN_F_BN_USUB, 0), "BN_usub"}, - {ERR_PACK(ERR_LIB_BN, BN_F_OSSL_BN_RSA_DO_UNBLIND, 0), - "ossl_bn_rsa_do_unblind"}, {0, NULL} }; diff --git a/crypto/openssl/crypto/bn/bn_lib.c b/crypto/openssl/crypto/bn/bn_lib.c index eb4a31849bef..cd6aa3448afd 100644 --- a/crypto/openssl/crypto/bn/bn_lib.c +++ b/crypto/openssl/crypto/bn/bn_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1001,6 +1001,28 @@ BIGNUM *bn_wexpand(BIGNUM *a, int words) return (words <= a->dmax) ? a : bn_expand2(a, words); } +void bn_correct_top_consttime(BIGNUM *a) +{ + int j, atop; + BN_ULONG limb; + unsigned int mask; + + for (j = 0, atop = 0; j < a->dmax; j++) { + limb = a->d[j]; + limb |= 0 - limb; + limb >>= BN_BITS2 - 1; + limb = 0 - limb; + mask = (unsigned int)limb; + mask &= constant_time_msb(j - a->top); + atop = constant_time_select_int(mask, j + 1, atop); + } + + mask = constant_time_eq_int(atop, 0); + a->top = atop; + a->neg = constant_time_select_int(mask, 0, a->neg); + a->flags &= ~BN_FLG_FIXED_TOP; +} + void bn_correct_top(BIGNUM *a) { BN_ULONG *ftl; diff --git a/crypto/openssl/crypto/bn/bn_local.h b/crypto/openssl/crypto/bn/bn_local.h index 30b7614fdbb2..818e34348e1b 100644 --- a/crypto/openssl/crypto/bn/bn_local.h +++ b/crypto/openssl/crypto/bn/bn_local.h @@ -283,20 +283,6 @@ struct bn_gencb_st { } cb; }; -struct bn_blinding_st { - BIGNUM *A; - BIGNUM *Ai; - BIGNUM *e; - BIGNUM *mod; /* just a reference */ - CRYPTO_THREAD_ID tid; - int counter; - unsigned long flags; - BN_MONT_CTX *m_ctx; - int (*bn_mod_exp) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); - CRYPTO_RWLOCK *lock; -}; - /*- * BN_window_bits_for_exponent_size -- macro for sliding window mod_exp functions * @@ -529,10 +515,10 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b, ret = (r); \ BN_UMULT_LOHI(low,high,w,tmp); \ ret += (c); \ - (c) = (ret<(c))?1:0; \ + (c) = (ret<(c)); \ (c) += high; \ ret += low; \ - (c) += (ret>(BN_BITS4-1); \ m =(m&BN_MASK2l)<<(BN_BITS4+1); \ - l=(l+m)&BN_MASK2; if (l < m) h++; \ + l=(l+m)&BN_MASK2; h += (l < m); \ (lo)=l; \ (ho)=h; \ } @@ -637,9 +623,9 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b, mul64(l,h,(bl),(bh)); \ \ /* non-multiply part */ \ - l=(l+(c))&BN_MASK2; if (l < (c)) h++; \ + l=(l+(c))&BN_MASK2; h += (l < (c)); \ (c)=(r); \ - l=(l+(c))&BN_MASK2; if (l < (c)) h++; \ + l=(l+(c))&BN_MASK2; h += (l < (c)); \ (c)=h&BN_MASK2; \ (r)=l; \ } @@ -653,7 +639,7 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b, mul64(l,h,(bl),(bh)); \ \ /* non-multiply part */ \ - l+=(c); if ((l&BN_MASK2) < (c)) h++; \ + l+=(c); h += ((l&BN_MASK2) < (c)); \ (c)=h&BN_MASK2; \ (r)=l&BN_MASK2; \ } @@ -683,7 +669,7 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, int cl, int dl); int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - +void bn_correct_top_consttime(BIGNUM *a); BIGNUM *int_bn_mod_inverse(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx, int *noinv); diff --git a/crypto/openssl/crypto/bn/build.info b/crypto/openssl/crypto/bn/build.info index c9fe2fdada69..b9ed5322fa68 100644 --- a/crypto/openssl/crypto/bn/build.info +++ b/crypto/openssl/crypto/bn/build.info @@ -5,8 +5,7 @@ SOURCE[../../libcrypto]=\ bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c \ {- $target{bn_asm_src} -} \ bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \ - bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c \ - rsa_sup_mul.c + bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c INCLUDE[bn_exp.o]=.. diff --git a/crypto/openssl/crypto/bn/rsa_sup_mul.c b/crypto/openssl/crypto/bn/rsa_sup_mul.c deleted file mode 100644 index acafefd5febf..000000000000 --- a/crypto/openssl/crypto/bn/rsa_sup_mul.c +++ /dev/null @@ -1,614 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include "internal/numbers.h" -#include "internal/constant_time.h" -#include "bn_local.h" - -# if BN_BYTES == 8 -typedef uint64_t limb_t; -# if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16 -/* nonstandard; implemented by gcc on 64-bit platforms */ -typedef __uint128_t limb2_t; -# define HAVE_LIMB2_T -# endif -# define LIMB_BIT_SIZE 64 -# define LIMB_BYTE_SIZE 8 -# elif BN_BYTES == 4 -typedef uint32_t limb_t; -typedef uint64_t limb2_t; -# define LIMB_BIT_SIZE 32 -# define LIMB_BYTE_SIZE 4 -# define HAVE_LIMB2_T -# else -# error "Not supported" -# endif - -/* - * For multiplication we're using schoolbook multiplication, - * so if we have two numbers, each with 6 "digits" (words) - * the multiplication is calculated as follows: - * A B C D E F - * x I J K L M N - * -------------- - * N*F - * N*E - * N*D - * N*C - * N*B - * N*A - * M*F - * M*E - * M*D - * M*C - * M*B - * M*A - * L*F - * L*E - * L*D - * L*C - * L*B - * L*A - * K*F - * K*E - * K*D - * K*C - * K*B - * K*A - * J*F - * J*E - * J*D - * J*C - * J*B - * J*A - * I*F - * I*E - * I*D - * I*C - * I*B - * + I*A - * ========================== - * N*B N*D N*F - * + N*A N*C N*E - * + M*B M*D M*F - * + M*A M*C M*E - * + L*B L*D L*F - * + L*A L*C L*E - * + K*B K*D K*F - * + K*A K*C K*E - * + J*B J*D J*F - * + J*A J*C J*E - * + I*B I*D I*F - * + I*A I*C I*E - * - * 1+1 1+3 1+5 - * 1+0 1+2 1+4 - * 0+1 0+3 0+5 - * 0+0 0+2 0+4 - * - * 0 1 2 3 4 5 6 - * which requires n^2 multiplications and 2n full length additions - * as we can keep every other result of limb multiplication in two separate - * limbs - */ - -#if defined HAVE_LIMB2_T -static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b) -{ - limb2_t t; - /* - * this is idiomatic code to tell compiler to use the native mul - * those three lines will actually compile to single instruction - */ - - t = (limb2_t)a * b; - *hi = t >> LIMB_BIT_SIZE; - *lo = (limb_t)t; -} -#elif (BN_BYTES == 8) && (defined _MSC_VER) -/* https://learn.microsoft.com/en-us/cpp/intrinsics/umul128?view=msvc-170 */ -#pragma intrinsic(_umul128) -static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b) -{ - *lo = _umul128(a, b, hi); -} -#else -/* - * if the compiler doesn't have either a 128bit data type nor a "return - * high 64 bits of multiplication" - */ -static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b) -{ - limb_t a_low = (limb_t)(uint32_t)a; - limb_t a_hi = a >> 32; - limb_t b_low = (limb_t)(uint32_t)b; - limb_t b_hi = b >> 32; - - limb_t p0 = a_low * b_low; - limb_t p1 = a_low * b_hi; - limb_t p2 = a_hi * b_low; - limb_t p3 = a_hi * b_hi; - - uint32_t cy = (uint32_t)(((p0 >> 32) + (uint32_t)p1 + (uint32_t)p2) >> 32); - - *lo = p0 + (p1 << 32) + (p2 << 32); - *hi = p3 + (p1 >> 32) + (p2 >> 32) + cy; -} -#endif - -/* add two limbs with carry in, return carry out */ -static ossl_inline limb_t _add_limb(limb_t *ret, limb_t a, limb_t b, limb_t carry) -{ - limb_t carry1, carry2, t; - /* - * `c = a + b; if (c < a)` is idiomatic code that makes compilers - * use add with carry on assembly level - */ - - *ret = a + carry; - if (*ret < a) - carry1 = 1; - else - carry1 = 0; - - t = *ret; - *ret = t + b; - if (*ret < t) - carry2 = 1; - else - carry2 = 0; - - return carry1 + carry2; -} - -/* - * add two numbers of the same size, return overflow - * - * add a to b, place result in ret; all arrays need to be n limbs long - * return overflow from addition (0 or 1) - */ -static ossl_inline limb_t add(limb_t *ret, limb_t *a, limb_t *b, size_t n) -{ - limb_t c = 0; - ossl_ssize_t i; - - for(i = n - 1; i > -1; i--) - c = _add_limb(&ret[i], a[i], b[i], c); - - return c; -} - -/* - * return number of limbs necessary for temporary values - * when multiplying numbers n limbs large - */ -static ossl_inline size_t mul_limb_numb(size_t n) -{ - return 2 * n * 2; -} - -/* - * multiply two numbers of the same size - * - * multiply a by b, place result in ret; a and b need to be n limbs long - * ret needs to be 2*n limbs long, tmp needs to be mul_limb_numb(n) limbs - * long - */ -static void limb_mul(limb_t *ret, limb_t *a, limb_t *b, size_t n, limb_t *tmp) -{ - limb_t *r_odd, *r_even; - size_t i, j, k; - - r_odd = tmp; - r_even = &tmp[2 * n]; - - memset(ret, 0, 2 * n * sizeof(limb_t)); - - for (i = 0; i < n; i++) { - for (k = 0; k < i + n + 1; k++) { - r_even[k] = 0; - r_odd[k] = 0; - } - for (j = 0; j < n; j++) { - /* - * place results from even and odd limbs in separate arrays so that - * we don't have to calculate overflow every time we get individual - * limb multiplication result - */ - if (j % 2 == 0) - _mul_limb(&r_even[i + j], &r_even[i + j + 1], a[i], b[j]); - else - _mul_limb(&r_odd[i + j], &r_odd[i + j + 1], a[i], b[j]); - } - /* - * skip the least significant limbs when adding multiples of - * more significant limbs (they're zero anyway) - */ - add(ret, ret, r_even, n + i + 1); - add(ret, ret, r_odd, n + i + 1); - } -} - -/* modifies the value in place by performing a right shift by one bit */ -static ossl_inline void rshift1(limb_t *val, size_t n) -{ - limb_t shift_in = 0, shift_out = 0; - size_t i; - - for (i = 0; i < n; i++) { - shift_out = val[i] & 1; - val[i] = shift_in << (LIMB_BIT_SIZE - 1) | (val[i] >> 1); - shift_in = shift_out; - } -} - -/* extend the LSB of flag to all bits of limb */ -static ossl_inline limb_t mk_mask(limb_t flag) -{ - flag |= flag << 1; - flag |= flag << 2; - flag |= flag << 4; - flag |= flag << 8; - flag |= flag << 16; -#if (LIMB_BYTE_SIZE == 8) - flag |= flag << 32; -#endif - return flag; -} - -/* - * copy from either a or b to ret based on flag - * when flag == 0, then copies from b - * when flag == 1, then copies from a - */ -static ossl_inline void cselect(limb_t flag, limb_t *ret, limb_t *a, limb_t *b, size_t n) -{ - /* - * would be more efficient with non volatile mask, but then gcc - * generates code with jumps - */ - volatile limb_t mask; - size_t i; - - mask = mk_mask(flag); - for (i = 0; i < n; i++) { -#if (LIMB_BYTE_SIZE == 8) - ret[i] = constant_time_select_64(mask, a[i], b[i]); -#else - ret[i] = constant_time_select_32(mask, a[i], b[i]); -#endif - } -} - -static limb_t _sub_limb(limb_t *ret, limb_t a, limb_t b, limb_t borrow) -{ - limb_t borrow1, borrow2, t; - /* - * while it doesn't look constant-time, this is idiomatic code - * to tell compilers to use the carry bit from subtraction - */ - - *ret = a - borrow; - if (*ret > a) - borrow1 = 1; - else - borrow1 = 0; - - t = *ret; - *ret = t - b; - if (*ret > t) - borrow2 = 1; - else - borrow2 = 0; - - return borrow1 + borrow2; -} - -/* - * place the result of a - b into ret, return the borrow bit. - * All arrays need to be n limbs long - */ -static limb_t sub(limb_t *ret, limb_t *a, limb_t *b, size_t n) -{ - limb_t borrow = 0; - ossl_ssize_t i; *** 923 LINES SKIPPED *** From nobody Tue May 30 16:52:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVz391Hvpz4XpFK; Tue, 30 May 2023 16:52:37 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVz38637Rz3N5w; Tue, 30 May 2023 16:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685465556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gw1rKO6kGXjxyxz7svleQu/4tKPrwYtXyrObIJNeAcY=; b=uxskJy1U1mkYUiydiaZb9s3xjlQz9qfvpONOfS4SnaE3Eg184LF7J8HGx6Y0wGgXIMObU6 iRfgRd6N9Ezt7ByxTNUin891dWKej3cmlhsJjN0Ss5n+Fa8WWmOAWZpKR8/S6wgP9wo72j 08jcNzwrV1vFJ8qLBBV3Zt+buvxik9h5zy5Bd0EBooZ88pqxmK4+kzywTuTEYvhoQEoBE0 l9p/5btjDjRpDM/yED0e5zj15xNuMkVpga4ww0HsNTQWJ4hXuRiI1Z4hQvKwVmgAPosbRg paCrT0xN4RvrRbOjj6+PlAMg9fl0e54VTu3uCAxeTDZ7TYiMAUhqVmBYSeSS+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685465556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gw1rKO6kGXjxyxz7svleQu/4tKPrwYtXyrObIJNeAcY=; b=s2G4et4D8Vu/pS3JEqvPLJwVLEpeDZ5Va9GQ2XpeLBUpN81p5H6WGxZJkDUxiDLyileFXE Mo6emCtDBzPlZzNugyaLp7GQw6LgHNdrfTnz44VRfnu1aierAWAlagKAy5sDC+UTc6NAF3 rEGvHcMGI1Mysyfnd4vDtRqji/B6467AI5sOZzg2LO+a3jFuI08ZiLho1GmwZLHFYTN73k H8ZlCr00cOx95ExYQhbAvKOUspTHE3P41RfCyNzXMUAwu4wZ1ZWyJvpabxZZDgbp61vCt0 1W438LWIHRnfRilLjvWFxyj5ZXOEqizPLEnQwXrN7j1SBrLSwOESYNLSY4C6bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685465556; a=rsa-sha256; cv=none; b=nXKoCXd72IQ+7r2V1pTNn1fRXZK0mpo/4+CSq4RJr7tdxVw+UTjlY7x1RJLH3BNKzHLKnN /ibMjTtztePIY4YGziZFujEMlQoshagYxIOltqZmboTEy3c4X/j6sprLsWBi3b+vVgbAG1 Gun/NF55DqB2IDtYQpMi5PxEPGIiwYjpI/7Bipne6+PHTgBisb7tmE/Fgk1O3E8dzd7Qju 91oBiwX6AY2U3R86D3qfMvmmSz39J2s314DfVX1Wfl+Ov6JnzfrbybwNK0oMfPx24+lY4a Z2BMWLSn8mH/dWS8wTysCKiXOQYKoKawtGL6fJDDNt0bnzdWvlhKlnMQdIZd4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVz384vfZz11nt; Tue, 30 May 2023 16:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34UGqaDw096507; Tue, 30 May 2023 16:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UGqaMU096506; Tue, 30 May 2023 16:52:36 GMT (envelope-from git) Date: Tue, 30 May 2023 16:52:36 GMT Message-Id: <202305301652.34UGqaMU096506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: b808c85985bf - stable/13 - OpenSSL: Merge OpenSSL 1.1.1u List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b808c85985bf815c80f1cd285fc1612f888e17ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=b808c85985bf815c80f1cd285fc1612f888e17ba commit b808c85985bf815c80f1cd285fc1612f888e17ba Author: Jung-uk Kim AuthorDate: 2023-05-30 15:14:28 +0000 Commit: Jung-uk Kim CommitDate: 2023-05-30 16:51:48 +0000 OpenSSL: Merge OpenSSL 1.1.1u (cherry picked from commit 84ffbd7782d2e98e440782b453f4e64cd1026d33) --- secure/lib/libcrypto/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 8fde4f19d046..d8b8f454122c 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -121,7 +121,6 @@ SRCS+= ppc.S ppc-mont.S .else SRCS+= bn_asm.c .endif -SRCS+= rsa_sup_mul.c # Full of strict aliasing violations that LLVM has been seen to break with # optimisations, which can lead to ECDSA signatures not working. See From nobody Tue May 30 16:52:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVz3B229zz4XpYQ; Tue, 30 May 2023 16:52:38 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVz3B0ZS2z3N66; Tue, 30 May 2023 16:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685465558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLSDSe51miD3jUW/dkAiL6NfD5M8yHvjLZXhUXvZLa0=; b=UGdtuK6k1kEzOG1YqtGPg/EuVBzTKI98FTuNt1SbOPcVLeo369PsY/IXAlaz/DDaAf18cc oB0NvMjmZoU3h9RZuFvDwu5q0nNGIPPlHFSQK5Nr5dBSaiTklk2SB/eDUdQWkYFV9+YS3m HJv2dHIlY7BsQiO9YZMbRH1l1WqGgJ/1SGN7r0IwbD56AY78M1/jvJDycApsCxqDg8JOGE vSmuRlknMJ9CmpkA6FvT3GIKTc7DP7jFKBDRP12X6TAqw0h0Hiy0Wy+LAo48f6Z6Or7LtZ 4PM6QqmU8/p1vj3KR1bpHAHwmauJPrKs2yvuyu3mzOaVvlO69AuBQ8EFdjiKWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685465558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qLSDSe51miD3jUW/dkAiL6NfD5M8yHvjLZXhUXvZLa0=; b=uOnxMysyscp9kE8pGqp++Jh84cEwVvbtqVgr0RP4C5dibVdZDqI6Q+jvp7eYQ/GcEIcTXZ myBJUvpIfUMcpvrinfGk7FsZIiZR+Zqt0vPsqSo/kwZJNYq9YMnES+CgeZEU0gIm4UTCE/ TMla0Nt4jZYSSoJJGI7nb40nqHXmDSOZdi0XrUadChZA0Hud1eq7DjoNxDcutoXMK/E6TF t5PLsAMFCWX9IX2kFD48b7gMIgO3VKxflbvbO52Hm4h8gEa6gc4TULvefT3S1FsxGwv6HE DdMzmm1PsQu2efQfKZa9nQ6qLf050DT2yFJDEiLFjIBVYJSry/pIrq+vkdJnvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685465558; a=rsa-sha256; cv=none; b=pu61oXeAnSqc1wr9vqdLDc3wn8nFCeim2iEFHIcJsjcEn6yrmos4o/1B/bcRQxPSl4477U 5PeA+AaPYYCX4kCkCI3b2E1aYI0ZoF9jpdkPMwD1m8ZpvZUXRbHiP3varfAJUzINuDQeKc TCjTJzjOQ0QvcLWKwAQtBncAEqJ65i/+gulr/L/ixpG/ny/i7sQKYFE1X8Q2h/Fi6rG30I N4NDToZtB5z9vBqW6MThfBPn4EC5oShHkhYUrEwrJ/0uaEdd0DKSNYc/SF0m6QOr4kXCU8 cHGVXzNo1LArR4eTdkpTvIrLNw/5Ad+tGr+3YaYvj2bjjgA9NX5Wm5M9td8Elw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVz396lhnz11ln; Tue, 30 May 2023 16:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34UGqbUg096526; Tue, 30 May 2023 16:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UGqb9x096525; Tue, 30 May 2023 16:52:37 GMT (envelope-from git) Date: Tue, 30 May 2023 16:52:37 GMT Message-Id: <202305301652.34UGqb9x096525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: cf3a76018cad - stable/13 - OpenSSL: Regen manual pages for OpenSSL 1.1.1u List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf3a76018cadf9bb39c90badb13e779415bafe37 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=cf3a76018cadf9bb39c90badb13e779415bafe37 commit cf3a76018cadf9bb39c90badb13e779415bafe37 Author: Jung-uk Kim AuthorDate: 2023-05-30 15:03:10 +0000 Commit: Jung-uk Kim CommitDate: 2023-05-30 16:52:04 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1u (cherry picked from commit 5b1268252c56d96d3858969108a8cd6add9d5776) --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_des.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 +- .../libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 13 +++++++++---- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- secure/lib/libcrypto/man/man7/Ed25519.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/SM2.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/scrypt.7 | 2 +- secure/lib/libcrypto/man/man7/ssl.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/asn1parse.1 | 2 +- secure/usr.bin/openssl/man/ca.1 | 2 +- secure/usr.bin/openssl/man/ciphers.1 | 2 +- secure/usr.bin/openssl/man/cms.1 | 2 +- secure/usr.bin/openssl/man/crl.1 | 2 +- secure/usr.bin/openssl/man/crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/dgst.1 | 2 +- secure/usr.bin/openssl/man/dhparam.1 | 2 +- secure/usr.bin/openssl/man/dsa.1 | 2 +- secure/usr.bin/openssl/man/dsaparam.1 | 2 +- secure/usr.bin/openssl/man/ec.1 | 2 +- secure/usr.bin/openssl/man/ecparam.1 | 2 +- secure/usr.bin/openssl/man/enc.1 | 2 +- secure/usr.bin/openssl/man/engine.1 | 2 +- secure/usr.bin/openssl/man/errstr.1 | 2 +- secure/usr.bin/openssl/man/gendsa.1 | 2 +- secure/usr.bin/openssl/man/genpkey.1 | 2 +- secure/usr.bin/openssl/man/genrsa.1 | 2 +- secure/usr.bin/openssl/man/list.1 | 2 +- secure/usr.bin/openssl/man/nseq.1 | 2 +- secure/usr.bin/openssl/man/ocsp.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/passwd.1 | 2 +- secure/usr.bin/openssl/man/pkcs12.1 | 2 +- secure/usr.bin/openssl/man/pkcs7.1 | 2 +- secure/usr.bin/openssl/man/pkcs8.1 | 2 +- secure/usr.bin/openssl/man/pkey.1 | 2 +- secure/usr.bin/openssl/man/pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/prime.1 | 2 +- secure/usr.bin/openssl/man/rand.1 | 2 +- secure/usr.bin/openssl/man/req.1 | 2 +- secure/usr.bin/openssl/man/rsa.1 | 2 +- secure/usr.bin/openssl/man/rsautl.1 | 2 +- secure/usr.bin/openssl/man/s_client.1 | 2 +- secure/usr.bin/openssl/man/s_server.1 | 2 +- secure/usr.bin/openssl/man/s_time.1 | 2 +- secure/usr.bin/openssl/man/sess_id.1 | 2 +- secure/usr.bin/openssl/man/smime.1 | 2 +- secure/usr.bin/openssl/man/speed.1 | 2 +- secure/usr.bin/openssl/man/spkac.1 | 2 +- secure/usr.bin/openssl/man/srp.1 | 2 +- secure/usr.bin/openssl/man/storeutl.1 | 2 +- secure/usr.bin/openssl/man/ts.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- secure/usr.bin/openssl/man/verify.1 | 2 +- secure/usr.bin/openssl/man/version.1 | 2 +- secure/usr.bin/openssl/man/x509.1 | 2 +- 535 files changed, 544 insertions(+), 539 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 8b89b9e36a08..03e8fd2b118d 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -3,8 +3,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 1.1.1t -OPENSSL_DATE= 2023-02-07 +OPENSSL_VER= 1.1.1u +OPENSSL_DATE= 2023-05-30 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 index 86256c7a2b0b..a9e7033ea78b 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ADMISSIONS 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 index 0c269e1a2c57..1c937e84532a 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 index a282236912de..fbee87f11652 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 index c3ff9addda94..587551817383 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 index 8c7001950daf..4beeac1e8659 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 index d421c56becf7..365e3ca2b137 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 index 1664da0434fe..2f92aad6878d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 index 5cd6f3c9d916..9b6785e0fb0f 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 index 54a8367928de..12ac4d303b97 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 index eed7f68cbe5c..f99049a86da1 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 index 9dbc10923ed2..f3ffef140959 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 index 29d120b2d673..5b40bc64dcaf 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 index dbd50cdebca7..b96ac2792a04 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BF_encrypt.3 b/secure/lib/libcrypto/man/man3/BF_encrypt.3 index 54cbc2c1f127..b108992b96e9 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 index f535ffa1461c..f26c50053b87 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_ADDR 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 index c19447fabf54..ed925f3b92b0 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_connect.3 b/secure/lib/libcrypto/man/man3/BIO_connect.3 index 520bde6a36ba..18be78af930a 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_CONNECT 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 index d0b951703094..7a9ce293565a 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_CTRL 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 index 244affad64c1..ef32b8ab15ae 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 index 85342305399e..1715638ded6a 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 index 2d6f4d9aef76..4a0d7066effa 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_md.3 b/secure/lib/libcrypto/man/man3/BIO_f_md.3 index d9838f76ac56..3d178b1e6339 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_MD 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_null.3 b/secure/lib/libcrypto/man/man3/BIO_f_null.3 index 942955c6b55e..31e95b11c712 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_NULL 3" -.TH BIO_F_NULL 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_NULL 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 index d2c15f86bdc9..8dabf1b4cda7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_SSL 3" -.TH BIO_F_SSL 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_SSL 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_find_type.3 b/secure/lib/libcrypto/man/man3/BIO_find_type.3 index a878b414af9a..bfd069a4727b 100644 --- a/secure/lib/libcrypto/man/man3/BIO_find_type.3 +++ b/secure/lib/libcrypto/man/man3/BIO_find_type.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_FIND_TYPE 3" -.TH BIO_FIND_TYPE 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_FIND_TYPE 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_get_data.3 b/secure/lib/libcrypto/man/man3/BIO_get_data.3 index 815fd66e44e4..c5d571487d72 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_data.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_data.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_DATA 3" -.TH BIO_GET_DATA 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_GET_DATA 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 index 08d894831848..6af7a0480915 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_EX_NEW_INDEX 3" -.TH BIO_GET_EX_NEW_INDEX 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_GET_EX_NEW_INDEX 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_meth_new.3 b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 index 56bd2108ec49..81ef93926bf9 100644 --- a/secure/lib/libcrypto/man/man3/BIO_meth_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_METH_NEW 3" -.TH BIO_METH_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_METH_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_new.3 b/secure/lib/libcrypto/man/man3/BIO_new.3 index 28c9d496d238..d4cbf05176e0 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW 3" -.TH BIO_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 index 75687e8582bb..0dfc6cdd9fa0 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW_CMS 3" -.TH BIO_NEW_CMS 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_NEW_CMS 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 index 7aa82048178b..75ff669669f7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 +++ b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PARSE_HOSTSERV 3" -.TH BIO_PARSE_HOSTSERV 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_PARSE_HOSTSERV 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_printf.3 b/secure/lib/libcrypto/man/man3/BIO_printf.3 index bfdb71cfd6cb..2aa5541f86be 100644 --- a/secure/lib/libcrypto/man/man3/BIO_printf.3 +++ b/secure/lib/libcrypto/man/man3/BIO_printf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PRINTF 3" -.TH BIO_PRINTF 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_PRINTF 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_push.3 b/secure/lib/libcrypto/man/man3/BIO_push.3 index e1e93ad666bd..c4d41b999494 100644 --- a/secure/lib/libcrypto/man/man3/BIO_push.3 +++ b/secure/lib/libcrypto/man/man3/BIO_push.3 @@ -133,7 +133,7 @@ *** 6548 LINES SKIPPED *** From nobody Tue May 30 17:06:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVzLg2Znlz4XqLy; Tue, 30 May 2023 17:06:03 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVzLg0RX5z3h4X; Tue, 30 May 2023 17:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gFluMyDtrO+LNdIE2t2f0oQQtlSxG7bq9AX0x2jA5VI=; b=aT5bbNB3l9MAJhzFulU/3uylfhhVTgtR+dM8Gq8YIQ3wgBniDT5zWzREmBRUIlGflYIhIz nUOZcymQXKB0XW0MAzzTjOX0pQ6JFHdxNwrqltAlv4iDDUW/p+MzlusUxca9j61OX2JY4t epW5YOBRyX7zpCMHmX0IqtkIeNcPM2/jhGZQl82IERrJENS1Sv0fDev6TfXuur8ShQKhda goqM00xmfRO990oLBuw5fljXdElHDVVkN9aVOU0p8ooQsrArLgd/PmG6bYsCHFfxXdtclI +aD669UPOrp389b4oUXtu1A9Ylyi3KfrYtczozJr8Lfgfa+GrpoGK9H/rx+V/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gFluMyDtrO+LNdIE2t2f0oQQtlSxG7bq9AX0x2jA5VI=; b=tDnKte67cZb+hRH0dVwmKDS6xmlbKnAxysnGJ+6Wo64O6ymFBDm0H0JF3+y+mJXoP0Bukh oZT/7ilCkde4pVxd1DiWwC9CX3S7nO4nKeW/c1BL4z3mL38SBO1fM0RQC1+HliEq0VT/f8 6HXjq5gLXsj1DgMJQ0wP1o3c9/bv7wfRo5OGbgmw1QmrlOxXezHlO7osuS+R+90CcVtoLo J2Cx1Q6pRgSIaQESkB7PuAoBt/b+iQBzcRniZtzSV1/GsIZAojRvN3/E/Bp8ZjRv8DwjWs jrmLHsz9nhmH7495gsbZ2jZIWOHIc+pinF+6dU9eXRVjP9kOWzNnlHT8S+d6gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685466363; a=rsa-sha256; cv=none; b=FsgYfACzMxloMS8gqQ/Tz59mm0d8w1k4n2K3qAVsNnm1iw0X3yDZ7IWXcUUrG3IgbB3wGB zWdaRqLAWTkFi418sq1wSc8WpIJaW+KQz/LFt6eeznWIuU6vd+PEjRWUhezr9xJABfyuOU MZc3ewhY4Nawyzi5CysSYCa+9TivPml8QT5ggBv8D+2ZvUPDLWPQDVGDyDqwykxxqMQhNF K2YKkLi62iFsAvr0SgPLIcgwdsZtS+cFqIjNj5vZD/uZDc3JdM39We2Gu7ug4ynLvuKzsZ ig/qi2qBOoGd12f6g3YbsXFmjUPsDUmfLhqeJNEFjeb9nfGCUKFV2IFj3KSXOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVzLf6gJkz12Kn; Tue, 30 May 2023 17:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34UH62wV014326; Tue, 30 May 2023 17:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UH62Gk014325; Tue, 30 May 2023 17:06:02 GMT (envelope-from git) Date: Tue, 30 May 2023 17:06:02 GMT Message-Id: <202305301706.34UH62Gk014325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 53e3243b058b - stable/12 - OpenSSL: Merge OpenSSL 1.1.1u List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 53e3243b058b6b64f136ec7e01301c58e8340df2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=53e3243b058b6b64f136ec7e01301c58e8340df2 commit 53e3243b058b6b64f136ec7e01301c58e8340df2 Author: Jung-uk Kim AuthorDate: 2023-05-30 15:14:28 +0000 Commit: Jung-uk Kim CommitDate: 2023-05-30 17:03:44 +0000 OpenSSL: Merge OpenSSL 1.1.1u (cherry picked from commit 84ffbd7782d2e98e440782b453f4e64cd1026d33) --- secure/lib/libcrypto/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 98c474ea167e..9a57b31a0c87 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -101,7 +101,6 @@ SRCS+= bn-586.S co-586.S x86-gf2m.S x86-mont.S .else SRCS+= bn_asm.c .endif -SRCS+= rsa_sup_mul.c # buffer SRCS+= buf_err.c buffer.c From nobody Tue May 30 17:06:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVzLf5TdCz4XqGZ; Tue, 30 May 2023 17:06:02 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVzLf0Zs9z3RJ8; Tue, 30 May 2023 17:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zo5f7DPL1ojM6Swwre23Rm94sHoQb4NjA5XGKcJPuaQ=; b=XbxlnydtQT9BRPSjiJXE3RcqtdpoTJsbVF+Va6XNxpMFHvrU5w/ah2D2sUMIHgjHBZKky2 eFTUola3afYF52qlV+FuSlrWSvLxUs1Nh1sA1QEUhMzoXffsogiPT1Qp8UNiH4xvQIkb43 jX1RNPoJH+ntylAGu7VA8TbtiIAnDubaUtxRmE4nBlltjKZtKPb6VTCj2d94MHOLoOV9UA zNrdhIX8mLs6AMaWK7m+73I7q3GEpygOkFPgclKhimVwJ06XlrI3IskEb17aaZZspsVBeN UXJyORmzYPSzVHebUmQvy4wFt3/skPQbKs0fxyGM9T2uBQI7u4f9eeStUdfLHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zo5f7DPL1ojM6Swwre23Rm94sHoQb4NjA5XGKcJPuaQ=; b=nxsQnp/CNSnuD5Qz0YH5MbxhIlfqHf4enwUpizBO/SojDw6cRNU1tUSRUbIf1vlJCvha6R /vmBdaDP5OO7ulun9jzhMRp7VlMto/aiHFftj/3tQEePGGH8qpapwovziS/W6HK7E5et8c 8g6llkFeyZnrNhPkoEaBFGkU7+z+EY6cuhRVeNdG5Goau/oHcoirFgd0H/zqYb1/Q+8ILF NnHB700ziE3rswhOoJMIsZMCaaeAWgWRVCmaiQMpgravt5X/aAqrEG2lUsyLsRbhxhjXDy hXCCdoFYV1V0WtCxRth6uS5lXOkgbpIQLJk+ygkpCOGPfEVmOjSOlMy2oasWQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685466362; a=rsa-sha256; cv=none; b=ntJMGRF6dfjU/oiZ7ZsZXWQVh2J5xr4R2rn8uVO1+lOdeJcisiHgu+TzaJ2Flj4yRAImj6 vpZqGYmr7LVquoeoGTfoBCABK/IsT1H7T7cLLkXfjT7r+ygztpIXxspw8RKock1fN6W/dW WiCqsX3INbd3BK1YCEa8rS4Ov5tEBBWm7SgUjfbTNO42z4a02vIvMKJ/1gZ1JBGMhYhp0H wBQv4a8cLMf4yVYGdA2Nvj0eBBxGH0pXjjPdbyG9qmYPEGCDzbqXE3DUs1GVOubWgo3E0B RzAMKXkOySJuUu8hTMDF9/CviOHS8yOVg5snLXKELkD5DlrlleP22D78mxZAIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVzLd6MX4z12Km; Tue, 30 May 2023 17:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34UH616v014300; Tue, 30 May 2023 17:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UH61rt014299; Tue, 30 May 2023 17:06:01 GMT (envelope-from git) Date: Tue, 30 May 2023 17:06:01 GMT Message-Id: <202305301706.34UH61rt014299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 37cf93a96932 - stable/12 - OpenSSL: Merge OpenSSL 1.1.1u List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 37cf93a96932603f49c9b4365b0d5ab019a22dfb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=37cf93a96932603f49c9b4365b0d5ab019a22dfb commit 37cf93a96932603f49c9b4365b0d5ab019a22dfb Author: Jung-uk Kim AuthorDate: 2023-05-30 14:24:15 +0000 Commit: Jung-uk Kim CommitDate: 2023-05-30 17:02:51 +0000 OpenSSL: Merge OpenSSL 1.1.1u (cherry picked from commit 8ecb489345f08012fdc92a202a40119891cac330) (cherry picked from commit 8f1ef87a6b93af292e68f8e33087e2df6325e9bb) --- crypto/openssl/CHANGES | 58 ++ crypto/openssl/Configure | 2 +- crypto/openssl/NEWS | 9 + crypto/openssl/README | 4 +- crypto/openssl/crypto/aes/asm/bsaes-armv7.pl | 4 +- crypto/openssl/crypto/asn1/a_bitstr.c | 8 +- crypto/openssl/crypto/bio/b_print.c | 1 - crypto/openssl/crypto/bn/bn_asm.c | 108 ++-- crypto/openssl/crypto/bn/bn_blind.c | 17 +- crypto/openssl/crypto/bn/bn_err.c | 2 - crypto/openssl/crypto/bn/bn_lib.c | 24 +- crypto/openssl/crypto/bn/bn_local.h | 40 +- crypto/openssl/crypto/bn/build.info | 3 +- crypto/openssl/crypto/bn/rsa_sup_mul.c | 614 --------------------- crypto/openssl/crypto/conf/conf_sap.c | 7 +- crypto/openssl/crypto/err/openssl.txt | 3 +- crypto/openssl/crypto/objects/obj_dat.c | 21 +- crypto/openssl/crypto/rsa/rsa_ossl.c | 30 +- crypto/openssl/crypto/ui/ui_lib.c | 6 +- crypto/openssl/crypto/ui/ui_util.c | 6 +- crypto/openssl/crypto/x509/x509_vfy.c | 13 +- crypto/openssl/crypto/x509v3/pcy_local.h | 10 +- crypto/openssl/crypto/x509v3/pcy_node.c | 26 +- crypto/openssl/crypto/x509v3/pcy_tree.c | 56 +- crypto/openssl/doc/fingerprints.txt | 5 + .../doc/man3/X509_VERIFY_PARAM_set_flags.pod | 11 +- crypto/openssl/engines/e_padlock.c | 17 +- crypto/openssl/include/crypto/bn.h | 5 - crypto/openssl/include/openssl/opensslv.h | 6 +- 29 files changed, 344 insertions(+), 772 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index 1e2d651b7514..8945260c3eaf 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -7,6 +7,64 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. + Changes between 1.1.1t and 1.1.1u [30 May 2023] + + *) Mitigate for the time it takes for `OBJ_obj2txt` to translate gigantic + OBJECT IDENTIFIER sub-identifiers to canonical numeric text form. + + OBJ_obj2txt() would translate any size OBJECT IDENTIFIER to canonical + numeric text form. For gigantic sub-identifiers, this would take a very + long time, the time complexity being O(n^2) where n is the size of that + sub-identifier. (CVE-2023-2650) + + To mitigitate this, `OBJ_obj2txt()` will only translate an OBJECT + IDENTIFIER to canonical numeric text form if the size of that OBJECT + IDENTIFIER is 586 bytes or less, and fail otherwise. + + The basis for this restriction is RFC 2578 (STD 58), section 3.5. OBJECT + IDENTIFIER values, which stipulates that OBJECT IDENTIFIERS may have at + most 128 sub-identifiers, and that the maximum value that each sub- + identifier may have is 2^32-1 (4294967295 decimal). + + For each byte of every sub-identifier, only the 7 lower bits are part of + the value, so the maximum amount of bytes that an OBJECT IDENTIFIER with + these restrictions may occupy is 32 * 128 / 7, which is approximately 586 + bytes. + + Ref: https://datatracker.ietf.org/doc/html/rfc2578#section-3.5 + + [Richard Levitte] + + *) Reworked the Fix for the Timing Oracle in RSA Decryption (CVE-2022-4304). + The previous fix for this timing side channel turned out to cause + a severe 2-3x performance regression in the typical use case + compared to 1.1.1s. The new fix uses existing constant time + code paths, and restores the previous performance level while + fully eliminating all existing timing side channels. + The fix was developed by Bernd Edlinger with testing support + by Hubert Kario. + [Bernd Edlinger] + + *) Corrected documentation of X509_VERIFY_PARAM_add0_policy() to mention + that it does not enable policy checking. Thanks to + David Benjamin for discovering this issue. (CVE-2023-0466) + [Tomas Mraz] + + *) Fixed an issue where invalid certificate policies in leaf certificates are + silently ignored by OpenSSL and other certificate policy checks are skipped + for that certificate. A malicious CA could use this to deliberately assert + invalid certificate policies in order to circumvent policy checking on the + certificate altogether. (CVE-2023-0465) + [Matt Caswell] + + *) Limited the number of nodes created in a policy tree to mitigate + against CVE-2023-0464. The default limit is set to 1000 nodes, which + should be sufficient for most installations. If required, the limit + can be adjusted by setting the OPENSSL_POLICY_TREE_NODES_MAX build + time define to a desired maximum number of nodes or zero to allow + unlimited growth. (CVE-2023-0464) + [Paul Dale] + Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. diff --git a/crypto/openssl/Configure b/crypto/openssl/Configure index 6cb1a84f4b7f..78cc15d18474 100755 --- a/crypto/openssl/Configure +++ b/crypto/openssl/Configure @@ -1244,7 +1244,7 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) } if ($target =~ /linux.*-mips/ && !$disabled{asm} - && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { + && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { # minimally required architecture flags for assembly modules my $value; $value = '-mips2' if ($target =~ /mips32/); diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index 2724fc4d85ba..f5a2d5ad33f8 100644 --- a/crypto/openssl/NEWS +++ b/crypto/openssl/NEWS @@ -5,6 +5,15 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.1.1t and OpenSSL 1.1.1u [30 May 2023] + + o Mitigate for very slow `OBJ_obj2txt()` performance with gigantic + OBJECT IDENTIFIER sub-identities. (CVE-2023-2650) + o Fixed documentation of X509_VERIFY_PARAM_add0_policy() (CVE-2023-0466) + o Fixed handling of invalid certificate policies in leaf certificates + (CVE-2023-0465) + o Limited the number of nodes created in a policy tree ([CVE-2023-0464]) + Major changes between OpenSSL 1.1.1s and OpenSSL 1.1.1t [7 Feb 2023] o Fixed X.400 address type confusion in X.509 GeneralName (CVE-2023-0286) diff --git a/crypto/openssl/README b/crypto/openssl/README index b2f806be3a44..b9bf50f4b1e5 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,7 +1,7 @@ - OpenSSL 1.1.1t 7 Feb 2023 + OpenSSL 1.1.1u 30 May 2023 - Copyright (c) 1998-2022 The OpenSSL Project + Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson All rights reserved. diff --git a/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl b/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl index 2b9f241ce8b0..b22db37d4d4c 100755 --- a/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2012-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -14,7 +14,7 @@ # details see http://www.openssl.org/~appro/cryptogams/. # # Specific modes and adaptation for Linux kernel by Ard Biesheuvel -# of Linaro. Permission to use under GPL terms is granted. +# of Linaro. # ==================================================================== # Bit-sliced AES for ARM NEON diff --git a/crypto/openssl/crypto/asn1/a_bitstr.c b/crypto/openssl/crypto/asn1/a_bitstr.c index f462dd107368..14b57265d172 100644 --- a/crypto/openssl/crypto/asn1/a_bitstr.c +++ b/crypto/openssl/crypto/asn1/a_bitstr.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -148,6 +148,9 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value) int w, v, iv; unsigned char *c; + if (n < 0) + return 0; + w = n / 8; v = 1 << (7 - (n & 0x07)); iv = ~v; @@ -182,6 +185,9 @@ int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n) { int w, v; + if (n < 0) + return 0; + w = n / 8; v = 1 << (7 - (n & 0x07)); if ((a == NULL) || (a->length < (w + 1)) || (a->data == NULL)) diff --git a/crypto/openssl/crypto/bio/b_print.c b/crypto/openssl/crypto/bio/b_print.c index 45d4e9f004b1..c4ed364d72f6 100644 --- a/crypto/openssl/crypto/bio/b_print.c +++ b/crypto/openssl/crypto/bio/b_print.c @@ -305,7 +305,6 @@ _dopr(char **sbuffer, case 'G': case 'g': /* not implemented for UEFI */ - ERR_raise(ERR_LIB_BIO, ERR_R_UNSUPPORTED); return 0; #endif case 'c': diff --git a/crypto/openssl/crypto/bn/bn_asm.c b/crypto/openssl/crypto/bn/bn_asm.c index 4d83a8cf1115..e5fa81b3a1e3 100644 --- a/crypto/openssl/crypto/bn/bn_asm.c +++ b/crypto/openssl/crypto/bn/bn_asm.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -381,25 +381,33 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, #ifndef OPENSSL_SMALL_FOOTPRINT while (n & ~3) { t1 = a[0]; - t2 = b[0]; - r[0] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[0]; + t1 = (t2 - t1) & BN_MASK2; + r[0] = t1; + c += (t1 > t2); t1 = a[1]; - t2 = b[1]; - r[1] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[1]; + t1 = (t2 - t1) & BN_MASK2; + r[1] = t1; + c += (t1 > t2); t1 = a[2]; - t2 = b[2]; - r[2] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[2]; + t1 = (t2 - t1) & BN_MASK2; + r[2] = t1; + c += (t1 > t2); t1 = a[3]; - t2 = b[3]; - r[3] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[3]; + t1 = (t2 - t1) & BN_MASK2; + r[3] = t1; + c += (t1 > t2); a += 4; b += 4; r += 4; @@ -408,10 +416,12 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, #endif while (n) { t1 = a[0]; - t2 = b[0]; - r[0] = (t1 - t2 - c) & BN_MASK2; - if (t1 != t2) - c = (t1 < t2); + t2 = (t1 - c) & BN_MASK2; + c = (t2 > t1); + t1 = b[0]; + t1 = (t2 - t1) & BN_MASK2; + r[0] = t1; + c += (t1 > t2); a++; b++; r++; @@ -446,7 +456,7 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, t += c0; /* no carry */ \ c0 = (BN_ULONG)Lw(t); \ hi = (BN_ULONG)Hw(t); \ - c1 = (c1+hi)&BN_MASK2; if (c1top = (int)(rtop & ~mask) | (ntop & mask); n->flags |= (BN_FLG_FIXED_TOP & ~mask); } - ret = BN_mod_mul_montgomery(n, n, r, b->m_ctx, ctx); + ret = bn_mul_mont_fixed_top(n, n, r, b->m_ctx, ctx); + bn_correct_top_consttime(n); } else { ret = BN_mod_mul(n, n, r, b->mod, ctx); } diff --git a/crypto/openssl/crypto/bn/bn_err.c b/crypto/openssl/crypto/bn/bn_err.c index 6f5464b54054..6ea5fc3d5cf6 100644 --- a/crypto/openssl/crypto/bn/bn_err.c +++ b/crypto/openssl/crypto/bn/bn_err.c @@ -73,8 +73,6 @@ static const ERR_STRING_DATA BN_str_functs[] = { {ERR_PACK(ERR_LIB_BN, BN_F_BN_SET_WORDS, 0), "bn_set_words"}, {ERR_PACK(ERR_LIB_BN, BN_F_BN_STACK_PUSH, 0), "BN_STACK_push"}, {ERR_PACK(ERR_LIB_BN, BN_F_BN_USUB, 0), "BN_usub"}, - {ERR_PACK(ERR_LIB_BN, BN_F_OSSL_BN_RSA_DO_UNBLIND, 0), - "ossl_bn_rsa_do_unblind"}, {0, NULL} }; diff --git a/crypto/openssl/crypto/bn/bn_lib.c b/crypto/openssl/crypto/bn/bn_lib.c index eb4a31849bef..cd6aa3448afd 100644 --- a/crypto/openssl/crypto/bn/bn_lib.c +++ b/crypto/openssl/crypto/bn/bn_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1001,6 +1001,28 @@ BIGNUM *bn_wexpand(BIGNUM *a, int words) return (words <= a->dmax) ? a : bn_expand2(a, words); } +void bn_correct_top_consttime(BIGNUM *a) +{ + int j, atop; + BN_ULONG limb; + unsigned int mask; + + for (j = 0, atop = 0; j < a->dmax; j++) { + limb = a->d[j]; + limb |= 0 - limb; + limb >>= BN_BITS2 - 1; + limb = 0 - limb; + mask = (unsigned int)limb; + mask &= constant_time_msb(j - a->top); + atop = constant_time_select_int(mask, j + 1, atop); + } + + mask = constant_time_eq_int(atop, 0); + a->top = atop; + a->neg = constant_time_select_int(mask, 0, a->neg); + a->flags &= ~BN_FLG_FIXED_TOP; +} + void bn_correct_top(BIGNUM *a) { BN_ULONG *ftl; diff --git a/crypto/openssl/crypto/bn/bn_local.h b/crypto/openssl/crypto/bn/bn_local.h index 30b7614fdbb2..818e34348e1b 100644 --- a/crypto/openssl/crypto/bn/bn_local.h +++ b/crypto/openssl/crypto/bn/bn_local.h @@ -283,20 +283,6 @@ struct bn_gencb_st { } cb; }; -struct bn_blinding_st { - BIGNUM *A; - BIGNUM *Ai; - BIGNUM *e; - BIGNUM *mod; /* just a reference */ - CRYPTO_THREAD_ID tid; - int counter; - unsigned long flags; - BN_MONT_CTX *m_ctx; - int (*bn_mod_exp) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); - CRYPTO_RWLOCK *lock; -}; - /*- * BN_window_bits_for_exponent_size -- macro for sliding window mod_exp functions * @@ -529,10 +515,10 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b, ret = (r); \ BN_UMULT_LOHI(low,high,w,tmp); \ ret += (c); \ - (c) = (ret<(c))?1:0; \ + (c) = (ret<(c)); \ (c) += high; \ ret += low; \ - (c) += (ret>(BN_BITS4-1); \ m =(m&BN_MASK2l)<<(BN_BITS4+1); \ - l=(l+m)&BN_MASK2; if (l < m) h++; \ + l=(l+m)&BN_MASK2; h += (l < m); \ (lo)=l; \ (ho)=h; \ } @@ -637,9 +623,9 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b, mul64(l,h,(bl),(bh)); \ \ /* non-multiply part */ \ - l=(l+(c))&BN_MASK2; if (l < (c)) h++; \ + l=(l+(c))&BN_MASK2; h += (l < (c)); \ (c)=(r); \ - l=(l+(c))&BN_MASK2; if (l < (c)) h++; \ + l=(l+(c))&BN_MASK2; h += (l < (c)); \ (c)=h&BN_MASK2; \ (r)=l; \ } @@ -653,7 +639,7 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b, mul64(l,h,(bl),(bh)); \ \ /* non-multiply part */ \ - l+=(c); if ((l&BN_MASK2) < (c)) h++; \ + l+=(c); h += ((l&BN_MASK2) < (c)); \ (c)=h&BN_MASK2; \ (r)=l&BN_MASK2; \ } @@ -683,7 +669,7 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b, int cl, int dl); int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np, const BN_ULONG *n0, int num); - +void bn_correct_top_consttime(BIGNUM *a); BIGNUM *int_bn_mod_inverse(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx, int *noinv); diff --git a/crypto/openssl/crypto/bn/build.info b/crypto/openssl/crypto/bn/build.info index c9fe2fdada69..b9ed5322fa68 100644 --- a/crypto/openssl/crypto/bn/build.info +++ b/crypto/openssl/crypto/bn/build.info @@ -5,8 +5,7 @@ SOURCE[../../libcrypto]=\ bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c \ {- $target{bn_asm_src} -} \ bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \ - bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c \ - rsa_sup_mul.c + bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c INCLUDE[bn_exp.o]=.. diff --git a/crypto/openssl/crypto/bn/rsa_sup_mul.c b/crypto/openssl/crypto/bn/rsa_sup_mul.c deleted file mode 100644 index acafefd5febf..000000000000 --- a/crypto/openssl/crypto/bn/rsa_sup_mul.c +++ /dev/null @@ -1,614 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include "internal/numbers.h" -#include "internal/constant_time.h" -#include "bn_local.h" - -# if BN_BYTES == 8 -typedef uint64_t limb_t; -# if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16 -/* nonstandard; implemented by gcc on 64-bit platforms */ -typedef __uint128_t limb2_t; -# define HAVE_LIMB2_T -# endif -# define LIMB_BIT_SIZE 64 -# define LIMB_BYTE_SIZE 8 -# elif BN_BYTES == 4 -typedef uint32_t limb_t; -typedef uint64_t limb2_t; -# define LIMB_BIT_SIZE 32 -# define LIMB_BYTE_SIZE 4 -# define HAVE_LIMB2_T -# else -# error "Not supported" -# endif - -/* - * For multiplication we're using schoolbook multiplication, - * so if we have two numbers, each with 6 "digits" (words) - * the multiplication is calculated as follows: - * A B C D E F - * x I J K L M N - * -------------- - * N*F - * N*E - * N*D - * N*C - * N*B - * N*A - * M*F - * M*E - * M*D - * M*C - * M*B - * M*A - * L*F - * L*E - * L*D - * L*C - * L*B - * L*A - * K*F - * K*E - * K*D - * K*C - * K*B - * K*A - * J*F - * J*E - * J*D - * J*C - * J*B - * J*A - * I*F - * I*E - * I*D - * I*C - * I*B - * + I*A - * ========================== - * N*B N*D N*F - * + N*A N*C N*E - * + M*B M*D M*F - * + M*A M*C M*E - * + L*B L*D L*F - * + L*A L*C L*E - * + K*B K*D K*F - * + K*A K*C K*E - * + J*B J*D J*F - * + J*A J*C J*E - * + I*B I*D I*F - * + I*A I*C I*E - * - * 1+1 1+3 1+5 - * 1+0 1+2 1+4 - * 0+1 0+3 0+5 - * 0+0 0+2 0+4 - * - * 0 1 2 3 4 5 6 - * which requires n^2 multiplications and 2n full length additions - * as we can keep every other result of limb multiplication in two separate - * limbs - */ - -#if defined HAVE_LIMB2_T -static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b) -{ - limb2_t t; - /* - * this is idiomatic code to tell compiler to use the native mul - * those three lines will actually compile to single instruction - */ - - t = (limb2_t)a * b; - *hi = t >> LIMB_BIT_SIZE; - *lo = (limb_t)t; -} -#elif (BN_BYTES == 8) && (defined _MSC_VER) -/* https://learn.microsoft.com/en-us/cpp/intrinsics/umul128?view=msvc-170 */ -#pragma intrinsic(_umul128) -static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b) -{ - *lo = _umul128(a, b, hi); -} -#else -/* - * if the compiler doesn't have either a 128bit data type nor a "return - * high 64 bits of multiplication" - */ -static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b) -{ - limb_t a_low = (limb_t)(uint32_t)a; - limb_t a_hi = a >> 32; - limb_t b_low = (limb_t)(uint32_t)b; - limb_t b_hi = b >> 32; - - limb_t p0 = a_low * b_low; - limb_t p1 = a_low * b_hi; - limb_t p2 = a_hi * b_low; - limb_t p3 = a_hi * b_hi; - - uint32_t cy = (uint32_t)(((p0 >> 32) + (uint32_t)p1 + (uint32_t)p2) >> 32); - - *lo = p0 + (p1 << 32) + (p2 << 32); - *hi = p3 + (p1 >> 32) + (p2 >> 32) + cy; -} -#endif - -/* add two limbs with carry in, return carry out */ -static ossl_inline limb_t _add_limb(limb_t *ret, limb_t a, limb_t b, limb_t carry) -{ - limb_t carry1, carry2, t; - /* - * `c = a + b; if (c < a)` is idiomatic code that makes compilers - * use add with carry on assembly level - */ - - *ret = a + carry; - if (*ret < a) - carry1 = 1; - else - carry1 = 0; - - t = *ret; - *ret = t + b; - if (*ret < t) - carry2 = 1; - else - carry2 = 0; - - return carry1 + carry2; -} - -/* - * add two numbers of the same size, return overflow - * - * add a to b, place result in ret; all arrays need to be n limbs long - * return overflow from addition (0 or 1) - */ -static ossl_inline limb_t add(limb_t *ret, limb_t *a, limb_t *b, size_t n) -{ - limb_t c = 0; - ossl_ssize_t i; - - for(i = n - 1; i > -1; i--) - c = _add_limb(&ret[i], a[i], b[i], c); - - return c; -} - -/* - * return number of limbs necessary for temporary values - * when multiplying numbers n limbs large - */ -static ossl_inline size_t mul_limb_numb(size_t n) -{ - return 2 * n * 2; -} - -/* - * multiply two numbers of the same size - * - * multiply a by b, place result in ret; a and b need to be n limbs long - * ret needs to be 2*n limbs long, tmp needs to be mul_limb_numb(n) limbs - * long - */ -static void limb_mul(limb_t *ret, limb_t *a, limb_t *b, size_t n, limb_t *tmp) -{ - limb_t *r_odd, *r_even; - size_t i, j, k; - - r_odd = tmp; - r_even = &tmp[2 * n]; - - memset(ret, 0, 2 * n * sizeof(limb_t)); - - for (i = 0; i < n; i++) { - for (k = 0; k < i + n + 1; k++) { - r_even[k] = 0; - r_odd[k] = 0; - } - for (j = 0; j < n; j++) { - /* - * place results from even and odd limbs in separate arrays so that - * we don't have to calculate overflow every time we get individual - * limb multiplication result - */ - if (j % 2 == 0) - _mul_limb(&r_even[i + j], &r_even[i + j + 1], a[i], b[j]); - else - _mul_limb(&r_odd[i + j], &r_odd[i + j + 1], a[i], b[j]); - } - /* - * skip the least significant limbs when adding multiples of - * more significant limbs (they're zero anyway) - */ - add(ret, ret, r_even, n + i + 1); - add(ret, ret, r_odd, n + i + 1); - } -} - -/* modifies the value in place by performing a right shift by one bit */ -static ossl_inline void rshift1(limb_t *val, size_t n) -{ - limb_t shift_in = 0, shift_out = 0; - size_t i; - - for (i = 0; i < n; i++) { - shift_out = val[i] & 1; - val[i] = shift_in << (LIMB_BIT_SIZE - 1) | (val[i] >> 1); - shift_in = shift_out; - } -} - -/* extend the LSB of flag to all bits of limb */ -static ossl_inline limb_t mk_mask(limb_t flag) -{ - flag |= flag << 1; - flag |= flag << 2; - flag |= flag << 4; - flag |= flag << 8; - flag |= flag << 16; -#if (LIMB_BYTE_SIZE == 8) - flag |= flag << 32; -#endif - return flag; -} - -/* - * copy from either a or b to ret based on flag - * when flag == 0, then copies from b - * when flag == 1, then copies from a - */ -static ossl_inline void cselect(limb_t flag, limb_t *ret, limb_t *a, limb_t *b, size_t n) -{ - /* - * would be more efficient with non volatile mask, but then gcc - * generates code with jumps - */ - volatile limb_t mask; - size_t i; - - mask = mk_mask(flag); - for (i = 0; i < n; i++) { -#if (LIMB_BYTE_SIZE == 8) - ret[i] = constant_time_select_64(mask, a[i], b[i]); -#else - ret[i] = constant_time_select_32(mask, a[i], b[i]); -#endif - } -} - -static limb_t _sub_limb(limb_t *ret, limb_t a, limb_t b, limb_t borrow) -{ - limb_t borrow1, borrow2, t; - /* - * while it doesn't look constant-time, this is idiomatic code - * to tell compilers to use the carry bit from subtraction - */ - - *ret = a - borrow; - if (*ret > a) - borrow1 = 1; - else - borrow1 = 0; - - t = *ret; - *ret = t - b; - if (*ret > t) - borrow2 = 1; - else - borrow2 = 0; - - return borrow1 + borrow2; -} - -/* - * place the result of a - b into ret, return the borrow bit. - * All arrays need to be n limbs long - */ -static limb_t sub(limb_t *ret, limb_t *a, limb_t *b, size_t n) -{ - limb_t borrow = 0; - ossl_ssize_t i; *** 923 LINES SKIPPED *** From nobody Tue May 30 17:06:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVzLh5n6Pz4XqDB; Tue, 30 May 2023 17:06:04 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVzLh3sTpz3hFk; Tue, 30 May 2023 17:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NIeYK9MsKrLoggRt0Exp7pgjtLSFwuHMxwf//bE2n8c=; b=SkTsJSOGoWk4mN3krUF3/4O2WvoEZqzcdK7lCpNRRuQlsRNtG6Wz74NxF4VhWERDxHOvid tehK5+gfCR+L+qKpnWsjsBKDT02+r9uBOXZEaiJp4FHgAudKkmqkM58xmsJfdryPqpTzkT WF0Z3KKqROcRU1ZRFsAQ+pp8JFArzN85wrKTZB3gdp3mNhR2UxC98eEdELmwoJ4Q3iZ5xM /IkOvZYQyEfI2sDZDn1qdub0XbRRS/ODDkd6ESHqogJogB2VM3bzccgzgJJvYkPsJwFjNV WLGqaA6GE7GLjOOIocSk/sUAyG8Z/feD/L5Iw6XLTKk4jHEQ6p3ZYJ3S9ZT2jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NIeYK9MsKrLoggRt0Exp7pgjtLSFwuHMxwf//bE2n8c=; b=Aas81+fkvAdIua8rCxNJjB5Y54HRZcCqYa9i+fpMVyyt7KG1ovXY38a8JG0vUxqBe0aJrU yQW9aT072CNE+flpqyLHW838jg4sV+VfwoY7cNyXlshWpZ9+e61c6t08y8TQj2zFyrdrRX gvCky/XlWU05sJlggXjBLYsNqHoZgdjntHE0i3zwQFwYwAgVm6TtOMslJdYUupPpXQyu1u /ZIziumcvYvl1ApR3jDvPZq7Uf4Z4Ag4GvA5LhXf1IfyprHe0dKUFr9PgY1YhV7GtX3cIh rvSr3lRaWDvVxNYxhA5IpGs7S6pw/onLOjbMLeW1kKztmLGgS2tYi0NsgSxuVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685466364; a=rsa-sha256; cv=none; b=KZx8oaxlk07iUa6E7XDxcUKektKwb6ri7pLShDC2AOOFiyhP2L5XJpTAVBu2DMKIPfqEKd rsmvNDq5GABDV/ogBlvtgrvc2Bh3GuRbz0F2qzH58769YYCr3Tog3RniZzKHf7Rt604jCK hSI6KRbXehSD4f5OYEXhr89dNTsEkjFA/AXhEMjBTrnYf6Hpg6MzxOPvhXNheiVCllEo0O tqmB47OKpzvSpYJfNvBC3ewmjbX7MTVJHNu6APZv5QjQcLVyDtyMl/M3wap7bdfysqWIWO Nhbdj7aSnfwVorhhOGW/+GSObregGCru9EtoEKbRBbMEzt+TeJBNYFMxOFpSRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVzLh1DDkz12Kp; Tue, 30 May 2023 17:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34UH64SE014345; Tue, 30 May 2023 17:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UH63lM014344; Tue, 30 May 2023 17:06:03 GMT (envelope-from git) Date: Tue, 30 May 2023 17:06:03 GMT Message-Id: <202305301706.34UH63lM014344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 48f06dbeb34d - stable/12 - OpenSSL: Regen manual pages for OpenSSL 1.1.1u List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 48f06dbeb34db0df302930cd869676727968743e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=48f06dbeb34db0df302930cd869676727968743e commit 48f06dbeb34db0df302930cd869676727968743e Author: Jung-uk Kim AuthorDate: 2023-05-30 15:03:10 +0000 Commit: Jung-uk Kim CommitDate: 2023-05-30 17:03:56 +0000 OpenSSL: Regen manual pages for OpenSSL 1.1.1u (cherry picked from commit 5b1268252c56d96d3858969108a8cd6add9d5776) --- secure/lib/libcrypto/Makefile.inc | 4 ++-- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_size.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_camellia.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_des.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_VERSION_NUMBER.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_generate.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_get0_master.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_new.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_reseed.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_callbacks.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_DRBG_set_ex_data.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 +- .../libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ex_data.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_ex_data.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 13 +++++++++---- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_DHparams.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- secure/lib/libcrypto/man/man7/Ed25519.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RAND_DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/SM2.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/scrypt.7 | 2 +- secure/lib/libcrypto/man/man7/ssl.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/asn1parse.1 | 2 +- secure/usr.bin/openssl/man/ca.1 | 2 +- secure/usr.bin/openssl/man/ciphers.1 | 2 +- secure/usr.bin/openssl/man/cms.1 | 2 +- secure/usr.bin/openssl/man/crl.1 | 2 +- secure/usr.bin/openssl/man/crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/dgst.1 | 2 +- secure/usr.bin/openssl/man/dhparam.1 | 2 +- secure/usr.bin/openssl/man/dsa.1 | 2 +- secure/usr.bin/openssl/man/dsaparam.1 | 2 +- secure/usr.bin/openssl/man/ec.1 | 2 +- secure/usr.bin/openssl/man/ecparam.1 | 2 +- secure/usr.bin/openssl/man/enc.1 | 2 +- secure/usr.bin/openssl/man/engine.1 | 2 +- secure/usr.bin/openssl/man/errstr.1 | 2 +- secure/usr.bin/openssl/man/gendsa.1 | 2 +- secure/usr.bin/openssl/man/genpkey.1 | 2 +- secure/usr.bin/openssl/man/genrsa.1 | 2 +- secure/usr.bin/openssl/man/list.1 | 2 +- secure/usr.bin/openssl/man/nseq.1 | 2 +- secure/usr.bin/openssl/man/ocsp.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/passwd.1 | 2 +- secure/usr.bin/openssl/man/pkcs12.1 | 2 +- secure/usr.bin/openssl/man/pkcs7.1 | 2 +- secure/usr.bin/openssl/man/pkcs8.1 | 2 +- secure/usr.bin/openssl/man/pkey.1 | 2 +- secure/usr.bin/openssl/man/pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/prime.1 | 2 +- secure/usr.bin/openssl/man/rand.1 | 2 +- secure/usr.bin/openssl/man/req.1 | 2 +- secure/usr.bin/openssl/man/rsa.1 | 2 +- secure/usr.bin/openssl/man/rsautl.1 | 2 +- secure/usr.bin/openssl/man/s_client.1 | 2 +- secure/usr.bin/openssl/man/s_server.1 | 2 +- secure/usr.bin/openssl/man/s_time.1 | 2 +- secure/usr.bin/openssl/man/sess_id.1 | 2 +- secure/usr.bin/openssl/man/smime.1 | 2 +- secure/usr.bin/openssl/man/speed.1 | 2 +- secure/usr.bin/openssl/man/spkac.1 | 2 +- secure/usr.bin/openssl/man/srp.1 | 2 +- secure/usr.bin/openssl/man/storeutl.1 | 2 +- secure/usr.bin/openssl/man/ts.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- secure/usr.bin/openssl/man/verify.1 | 2 +- secure/usr.bin/openssl/man/version.1 | 2 +- secure/usr.bin/openssl/man/x509.1 | 2 +- 535 files changed, 544 insertions(+), 539 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 4496320e4628..1ec6c3d2afa9 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -3,8 +3,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 1.1.1t -OPENSSL_DATE= 2023-02-07 +OPENSSL_VER= 1.1.1u +OPENSSL_DATE= 2023-05-30 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 index 86256c7a2b0b..a9e7033ea78b 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ADMISSIONS 3" -.TH ADMISSIONS 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ADMISSIONS 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 index 0c269e1a2c57..1c937e84532a 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_INTEGER_GET_INT64 3" -.TH ASN1_INTEGER_GET_INT64 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_INTEGER_GET_INT64 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 index a282236912de..fbee87f11652 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_ITEM_LOOKUP 3" -.TH ASN1_ITEM_LOOKUP 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_ITEM_LOOKUP 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 index c3ff9addda94..587551817383 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_OBJECT_NEW 3" -.TH ASN1_OBJECT_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_OBJECT_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 index 8c7001950daf..4beeac1e8659 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_TABLE_ADD 3" -.TH ASN1_STRING_TABLE_ADD 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_TABLE_ADD 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 index d421c56becf7..365e3ca2b137 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_LENGTH 3" -.TH ASN1_STRING_LENGTH 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_LENGTH 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 index 1664da0434fe..2f92aad6878d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_NEW 3" -.TH ASN1_STRING_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 index 5cd6f3c9d916..9b6785e0fb0f 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_STRING_PRINT_EX 3" -.TH ASN1_STRING_PRINT_EX 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_STRING_PRINT_EX 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 index 54a8367928de..12ac4d303b97 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TIME_SET 3" -.TH ASN1_TIME_SET 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_TIME_SET 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 index eed7f68cbe5c..f99049a86da1 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_TYPE_GET 3" -.TH ASN1_TYPE_GET 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_TYPE_GET 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 index 9dbc10923ed2..f3ffef140959 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASN1_GENERATE_NCONF 3" -.TH ASN1_GENERATE_NCONF 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASN1_GENERATE_NCONF 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 index 29d120b2d673..5b40bc64dcaf 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_WAIT_CTX_NEW 3" -.TH ASYNC_WAIT_CTX_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASYNC_WAIT_CTX_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 index dbd50cdebca7..b96ac2792a04 100644 --- a/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 +++ b/secure/lib/libcrypto/man/man3/ASYNC_start_job.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ASYNC_START_JOB 3" -.TH ASYNC_START_JOB 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH ASYNC_START_JOB 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BF_encrypt.3 b/secure/lib/libcrypto/man/man3/BF_encrypt.3 index 54cbc2c1f127..b108992b96e9 100644 --- a/secure/lib/libcrypto/man/man3/BF_encrypt.3 +++ b/secure/lib/libcrypto/man/man3/BF_encrypt.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BF_ENCRYPT 3" -.TH BF_ENCRYPT 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BF_ENCRYPT 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 index f535ffa1461c..f26c50053b87 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDR.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDR.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDR 3" -.TH BIO_ADDR 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_ADDR 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 index c19447fabf54..ed925f3b92b0 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_ADDRINFO 3" -.TH BIO_ADDRINFO 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_ADDRINFO 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_connect.3 b/secure/lib/libcrypto/man/man3/BIO_connect.3 index 520bde6a36ba..18be78af930a 100644 --- a/secure/lib/libcrypto/man/man3/BIO_connect.3 +++ b/secure/lib/libcrypto/man/man3/BIO_connect.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CONNECT 3" -.TH BIO_CONNECT 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_CONNECT 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 index 8e6948cb77a3..50f0f9b6aece 100644 --- a/secure/lib/libcrypto/man/man3/BIO_ctrl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_ctrl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_CTRL 3" -.TH BIO_CTRL 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_CTRL 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 index 244affad64c1..ef32b8ab15ae 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_base64.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_base64.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BASE64 3" -.TH BIO_F_BASE64 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_BASE64 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 index 85342305399e..1715638ded6a 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_buffer.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_BUFFER 3" -.TH BIO_F_BUFFER 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_BUFFER 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 index 2d6f4d9aef76..4a0d7066effa 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_cipher.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_CIPHER 3" -.TH BIO_F_CIPHER 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_CIPHER 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_md.3 b/secure/lib/libcrypto/man/man3/BIO_f_md.3 index d9838f76ac56..3d178b1e6339 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_md.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_md.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_MD 3" -.TH BIO_F_MD 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_MD 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_null.3 b/secure/lib/libcrypto/man/man3/BIO_f_null.3 index 942955c6b55e..31e95b11c712 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_null.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_null.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_NULL 3" -.TH BIO_F_NULL 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_NULL 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 index d2c15f86bdc9..8dabf1b4cda7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 +++ b/secure/lib/libcrypto/man/man3/BIO_f_ssl.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_F_SSL 3" -.TH BIO_F_SSL 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_F_SSL 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_find_type.3 b/secure/lib/libcrypto/man/man3/BIO_find_type.3 index a878b414af9a..bfd069a4727b 100644 --- a/secure/lib/libcrypto/man/man3/BIO_find_type.3 +++ b/secure/lib/libcrypto/man/man3/BIO_find_type.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_FIND_TYPE 3" -.TH BIO_FIND_TYPE 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_FIND_TYPE 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_get_data.3 b/secure/lib/libcrypto/man/man3/BIO_get_data.3 index 815fd66e44e4..c5d571487d72 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_data.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_data.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_DATA 3" -.TH BIO_GET_DATA 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_GET_DATA 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 index 08d894831848..6af7a0480915 100644 --- a/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 +++ b/secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_GET_EX_NEW_INDEX 3" -.TH BIO_GET_EX_NEW_INDEX 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_GET_EX_NEW_INDEX 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_meth_new.3 b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 index 56bd2108ec49..81ef93926bf9 100644 --- a/secure/lib/libcrypto/man/man3/BIO_meth_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_meth_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_METH_NEW 3" -.TH BIO_METH_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_METH_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_new.3 b/secure/lib/libcrypto/man/man3/BIO_new.3 index 28c9d496d238..d4cbf05176e0 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW 3" -.TH BIO_NEW 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_NEW 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 index 75687e8582bb..0dfc6cdd9fa0 100644 --- a/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 +++ b/secure/lib/libcrypto/man/man3/BIO_new_CMS.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_NEW_CMS 3" -.TH BIO_NEW_CMS 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_NEW_CMS 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 index 7aa82048178b..75ff669669f7 100644 --- a/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 +++ b/secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PARSE_HOSTSERV 3" -.TH BIO_PARSE_HOSTSERV 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_PARSE_HOSTSERV 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_printf.3 b/secure/lib/libcrypto/man/man3/BIO_printf.3 index bfdb71cfd6cb..2aa5541f86be 100644 --- a/secure/lib/libcrypto/man/man3/BIO_printf.3 +++ b/secure/lib/libcrypto/man/man3/BIO_printf.3 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BIO_PRINTF 3" -.TH BIO_PRINTF 3 "2023-02-07" "1.1.1t" "OpenSSL" +.TH BIO_PRINTF 3 "2023-05-30" "1.1.1u" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/secure/lib/libcrypto/man/man3/BIO_push.3 b/secure/lib/libcrypto/man/man3/BIO_push.3 index e1e93ad666bd..c4d41b999494 100644 --- a/secure/lib/libcrypto/man/man3/BIO_push.3 +++ b/secure/lib/libcrypto/man/man3/BIO_push.3 @@ -133,7 +133,7 @@ *** 6548 LINES SKIPPED *** From nobody Tue May 30 17:12:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVzVK3x3mz4Xqt9; Tue, 30 May 2023 17:12:41 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVzVK3MkTz3jcg; Tue, 30 May 2023 17:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRObmg/EG251oHyu7hTgyDJZcum9KbaadQmPCxoPSb0=; b=I2tqfsf8WZJLUOgpNcvUe1rK0SlmmmuK423/91V5nmwe55V4RyOs9O7iBMx5qaKozqe0Lo 16rZDpVyOdVO0kwlr1cWrCZtxGo6QsOOS0UYf9mlCXVli8C4FoNe+NK0dgmHg6cap3FK/+ TZ8E6o5RAMjEzKzSL0/dqAg4y0SCTWjwMZSGoqYSEmYP4qEHJgriac7o4z66uPJpzBfv77 ppQQ83rKw23zO203wUpib8QjGjjZpueNe0arjKyrTnk/inMhxlo0z89lEtacmIb8jwPdwD +lOMLRwJpuSWjGn6lIKUjRPr4dPB3y+HUFZAXKPR20fNaW8pHRH4s/N6Arbahw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685466761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRObmg/EG251oHyu7hTgyDJZcum9KbaadQmPCxoPSb0=; b=eAIkDFOeDKZbJ2dXnXKl9QkJE4qB9wUD1wqjy/8dgAhsrnBrPAvdzsmwW89H8YQkK+w1VF PklsKJnELscTLApe4iJOZabt8X/Rj8rx35Pxar3GJ/4I7Rjacfcc74HNZtsbiWBS1h3fA+ sAWkw8DKRPvwQnZkFqIguuGajktnrusEdKJNc71YtmWp2Mnhv5e/UtsS9C4pyVX0SsE1ra vx90Y9wBa1LVXeMmAX/XlrDI2AnMCT3g1NRpS7aBiVbxJirJaTpa6w98zPeqUKBLATsCok azMtfjqVkh3PbA0S/6GFGeh3mRZWCPvUhj+hwGY5ELLjFrOApNm9QQZmm6BxBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685466761; a=rsa-sha256; cv=none; b=fMCheHURoNOtpCOALh6+dOh+K7gkgsALOIyoL2nDA7JO6oFrbKDLYRC4xok+N9PUMhmj/h o0eqBmFhrQbWSZ07TfzhKDw2oih5+FNoBjo4KxTRWWTjdPWjPuBlvghhNjWvnBexHrQD/d XUBBbhJ83fYUPa1/yup0qAPOOHPlyx9D//s0mKBrBpB/0mlIKypIcXiE2lyBh+Kap+5g/K 9utbp2zhQYTIGwplD7Ky4D1H9MQYtSPPu3BNm0SQfJEoWQoLat12z3y0IAzMtRkP0dsW5L ZBZV7WbAix7Zeat8dNTHSxHWOih76SALmLbdm1eeh7f+lH15F8JvfQw/xMDbaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVzVK2QzGz12V1; Tue, 30 May 2023 17:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34UHCfZ6030248; Tue, 30 May 2023 17:12:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UHCfJD030247; Tue, 30 May 2023 17:12:41 GMT (envelope-from git) Date: Tue, 30 May 2023 17:12:41 GMT Message-Id: <202305301712.34UHCfJD030247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: 8fa89d8b1904 - stable/12 - Fix NULL deref in ip_output during route change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8fa89d8b190472778ed07db9d8937cb1ce7b44fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=8fa89d8b190472778ed07db9d8937cb1ce7b44fc commit 8fa89d8b190472778ed07db9d8937cb1ce7b44fc Author: Eric van Gyzen AuthorDate: 2023-05-23 09:46:42 +0000 Commit: Eric van Gyzen CommitDate: 2023-05-30 12:10:03 +0000 Fix NULL deref in ip_output during route change When changing the interface address during a route change, the rtentry's rt_ifa will be NULL briefly. Some parts of ip_output do not handle that NULL. In such case, re-validate the rtentry. That validation does not check the rt_ifa, but it does lock the route, which will synchronize with rtrequest1_fib_change. I would prefer to leave the rt_ifa pointer intact during the route change, but ip6_output is not fully protected by the net_epoch, so that could allow a use-after-free. ip6_output already handles a NULL rt_ifa. This is a direct commit to stable/12 because later branches have nexthop and do not appear to have this bug. PR: 271573 Reported by: Gaurav.Gandhi@dell.com Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D40236 --- sys/netinet/ip_output.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 399afa184999..93b41376f3c2 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -393,6 +393,10 @@ again: goto bad; } ia = ifatoia(rte->rt_ifa); + if (ia == NULL) { + /* race with rtrequest1_fib_change */ + goto again; + } ifp = rte->rt_ifp; counter_u64_add(rte->rt_pksent, 1); rt_update_ro_flags(ro); From nobody Thu Jun 1 15:07:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QX8cV4zMLz4YcmL; Thu, 1 Jun 2023 15:07:06 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QX8cV4YLJz3DS4; Thu, 1 Jun 2023 15:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685632026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fv80C/KHVQnosvbijPdQdtt8yWoRJ3TkcIceboUjIqM=; b=tamLDV3tq5Jd39oDk2nTC66vQeQygPpBgsagOEFgh3wS+tHtziBxEEnntHeNUCHGQ/3Ukp o4erch2K1Q1GdLLALzcZxnueOo5Qjfm7+IdqlJ1nREi2oxDSMm56QjSxPDoVdBzeciwFb8 P3MKHf1rW1bj4y2hVKAO05E+InAMJFhDiznxHRcj/R3p1TZIkSnSYnS4Zma0YHynCFLAvB 7+Q3vblXcpi2FWsQLLKUUuUhlam2YgJ+2fegjSSBOL8sZnurhFnYXscw12cWjq1VBnYgA6 fY28x4eUs+DLyfd7zRYZTIyR3zKlUj0FP39B1ZMwhcBQ3wqSa4nJAcJoFcq7Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685632026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fv80C/KHVQnosvbijPdQdtt8yWoRJ3TkcIceboUjIqM=; b=k+Q0Nqa2DDTNq4ckSfiVCyb+SCUxLH2d6+ImfhBwO9k8oNr6i+cd7PkHOZGrTxFDI8PnUl 6DE2K3k7sFOe0h9LSqmlluapKvT9a5X1KWAQNrlNJe81SbJbVnBedtQeQ0IU2WV0OiPU2Z a1yK89/kIatqw5SqRc81d3ba5tiCGrTdlK9Kwahy8NXMzgQ8/GIkXVd8gXM0qGNkBWcwsN /+6sTmaL7Zz01sqrt4s8RcHqUeUND9aVB1SMgN0KkPhv/6vKY34Ji1XsBQwCEf1cjmDMz/ Idje4m4ltofNH8GTGhwcGGwXUDkMF1OFkoLBPYCLc+vx/EnJiZwkS1Rh8riSGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685632026; a=rsa-sha256; cv=none; b=ZQqrURnagxzlZ0IOLNrXbVljC4HPD5KkzZL76hYhxxWma95Lck9oT5zzloukl4bSIELjFM 55yLl2UBEndGVSGHYmhkutAWcs8QOUWLCPKb/xSqSWrNccOnw8tKOeA5f7qw1u8jp4+XVl w5yHIeSByYCEzg/4MJjfYTFFHjzrzlwMp7Ood2wXlEtL/ba0zkiyqaKeYs7iW4qORPVNoz MV/KYa3pOtY7JX/2SuEUrwcSGmnVjQqjgLmfBAjyqRtEk9GyMhyJ64IVpRiqCHOQDDcndo XfH0ZJFlzzUsQLuw5gcMm4+ECOk1znGNJdbBpxHWo2vRdOyHP0xwaMa+8eWvTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QX8cV3cF6zLxd; Thu, 1 Jun 2023 15:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351F76VY068861; Thu, 1 Jun 2023 15:07:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351F741S068854; Thu, 1 Jun 2023 15:07:04 GMT (envelope-from git) Date: Thu, 1 Jun 2023 15:07:04 GMT Message-Id: <202306011507.351F741S068854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 91ae4636fbf2 - stable/13 - ntp: import ntp-4.2.8p16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 91ae4636fbf299134427aecebbd514fef467cbc6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=91ae4636fbf299134427aecebbd514fef467cbc6 commit 91ae4636fbf299134427aecebbd514fef467cbc6 Author: Cy Schubert AuthorDate: 2023-06-01 14:04:37 +0000 Commit: Cy Schubert CommitDate: 2023-06-01 15:06:46 +0000 ntp: import ntp-4.2.8p16 Security: NtpBUg3767, NtpBug3808, NtpBug3807 (CVE-2023-26555) (cherry picked from commit a466cc55373fc3cf86837f09da729535b57e69a1) --- contrib/ntp/COPYRIGHT | 201 +- contrib/ntp/ChangeLog | 114 +- contrib/ntp/CommitLog | 5757 +++++- contrib/ntp/Makefile.am | 1 - contrib/ntp/Makefile.in | 51 +- contrib/ntp/NEWS | 123 + contrib/ntp/aclocal.m4 | 340 +- contrib/ntp/adjtimed/Makefile.am | 3 +- contrib/ntp/adjtimed/Makefile.in | 96 +- contrib/ntp/check-libntp.mf | 14 + contrib/ntp/check-libntpd.mf | 19 + contrib/ntp/check-libunity.mf | 13 + contrib/ntp/check-scm-rev.mf | 8 + contrib/ntp/clockstuff/Makefile.am | 3 +- contrib/ntp/clockstuff/Makefile.in | 103 +- contrib/ntp/config.h.in | 141 +- contrib/ntp/configure | 17430 ++++++++++--------- contrib/ntp/configure.ac | 70 +- contrib/ntp/deps-ver | 2 +- contrib/ntp/depsver.mf | 9 +- contrib/ntp/html/authentic.html | 15 +- contrib/ntp/html/clockopt.html | 39 + contrib/ntp/html/copyright.html | 9 +- contrib/ntp/html/drivers/driver20.html | 11 +- contrib/ntp/html/drivers/driver46.html | 31 +- contrib/ntp/html/miscopt.html | 9 +- contrib/ntp/html/ntpdc.html | 3 +- contrib/ntp/html/ntpq.html | 3 +- contrib/ntp/html/scripts/clockopt.txt | 1 + contrib/ntp/include/Makefile.in | 28 +- contrib/ntp/include/isc/Makefile.in | 26 +- contrib/ntp/include/ntp.h | 1 + contrib/ntp/include/ntp_config.h | 1 + contrib/ntp/include/ntp_fp.h | 4 +- contrib/ntp/include/ntp_random.h | 1 + contrib/ntp/include/ntp_refclock.h | 13 +- contrib/ntp/include/ntp_stdlib.h | 15 +- contrib/ntp/include/ntp_types.h | 11 +- contrib/ntp/include/ntpd.h | 1 + contrib/ntp/include/ssl_applink.c | 2 +- contrib/ntp/include/vint64ops.h | 2 +- contrib/ntp/includes.mf | 6 +- contrib/ntp/kernel/Makefile.in | 28 +- contrib/ntp/kernel/sys/Makefile.in | 26 +- contrib/ntp/lib/isc/Atffile | 5 - contrib/ntp/lib/isc/alpha/include/isc/atomic.h | 184 - contrib/ntp/lib/isc/api | 8 - contrib/ntp/lib/isc/app_api.c | 136 - contrib/ntp/lib/isc/base32.c | 373 - contrib/ntp/lib/isc/base64.c | 252 - contrib/ntp/lib/isc/bitstring.c | 127 - contrib/ntp/lib/isc/bufferlist.c | 64 - contrib/ntp/lib/isc/commandline.c | 225 - contrib/ntp/lib/isc/entropy.c | 1277 -- contrib/ntp/lib/isc/fsaccess.c | 102 - contrib/ntp/lib/isc/hash.c | 404 - contrib/ntp/lib/isc/heap.c | 265 - contrib/ntp/lib/isc/hex.c | 201 - contrib/ntp/lib/isc/hmacmd5.c | 149 - contrib/ntp/lib/isc/hmacsha.c | 594 - contrib/ntp/lib/isc/httpd.c | 1028 -- contrib/ntp/lib/isc/ia64/include/isc/atomic.h | 100 - contrib/ntp/lib/isc/include/isc/base32.h | 128 - contrib/ntp/lib/isc/include/isc/base64.h | 99 - contrib/ntp/lib/isc/include/isc/bitstring.h | 157 - contrib/ntp/lib/isc/include/isc/bufferlist.h | 86 - contrib/ntp/lib/isc/include/isc/commandline.h | 50 - contrib/ntp/lib/isc/include/isc/entropy.h | 314 - contrib/ntp/lib/isc/include/isc/fsaccess.h | 178 - contrib/ntp/lib/isc/include/isc/heap.h | 170 - contrib/ntp/lib/isc/include/isc/hex.h | 98 - contrib/ntp/lib/isc/include/isc/hmacmd5.h | 72 - contrib/ntp/lib/isc/include/isc/hmacsha.h | 169 - contrib/ntp/lib/isc/include/isc/httpd.h | 64 - contrib/ntp/lib/isc/include/isc/ipv6.h | 148 - contrib/ntp/lib/isc/include/isc/iterated_hash.h | 47 - contrib/ntp/lib/isc/include/isc/lex.h | 431 - contrib/ntp/lib/isc/include/isc/lfsr.h | 130 - contrib/ntp/lib/isc/include/isc/mem.h | 750 - contrib/ntp/lib/isc/include/isc/mutexblock.h | 71 - contrib/ntp/lib/isc/include/isc/os.h | 38 - contrib/ntp/lib/isc/include/isc/parseint.h | 64 - contrib/ntp/lib/isc/include/isc/platform.h.in | 367 - contrib/ntp/lib/isc/include/isc/portset.h | 141 - contrib/ntp/lib/isc/include/isc/queue.h | 100 - contrib/ntp/lib/isc/include/isc/quota.h | 119 - contrib/ntp/lib/isc/include/isc/radix.h | 240 - contrib/ntp/lib/isc/include/isc/ratelimiter.h | 134 - contrib/ntp/lib/isc/include/isc/refcount.h | 233 - contrib/ntp/lib/isc/include/isc/resource.h | 97 - contrib/ntp/lib/isc/include/isc/rwlock.h | 135 - contrib/ntp/lib/isc/include/isc/serial.h | 75 - contrib/ntp/lib/isc/include/isc/sha2.h | 145 - contrib/ntp/lib/isc/include/isc/stats.h | 121 - contrib/ntp/lib/isc/include/isc/stdlib.h | 40 - contrib/ntp/lib/isc/include/isc/symtab.h | 139 - contrib/ntp/lib/isc/include/isc/taskpool.h | 157 - contrib/ntp/lib/isc/include/isc/version.h | 28 - contrib/ntp/lib/isc/inet_aton.c | 195 - contrib/ntp/lib/isc/iterated_hash.c | 48 - contrib/ntp/lib/isc/lex.c | 959 - contrib/ntp/lib/isc/lfsr.c | 161 - contrib/ntp/lib/isc/mem.c | 2477 --- contrib/ntp/lib/isc/mem_api.c | 303 - contrib/ntp/lib/isc/mips/include/isc/atomic.h | 98 - contrib/ntp/lib/isc/mutexblock.c | 58 - contrib/ntp/lib/isc/noatomic/include/isc/atomic.h | 24 - contrib/ntp/lib/isc/nothreads/mutex.c | 25 - contrib/ntp/lib/isc/parseint.c | 72 - contrib/ntp/lib/isc/portset.c | 143 - contrib/ntp/lib/isc/powerpc/include/isc/atomic.h | 197 - contrib/ntp/lib/isc/print.c | 624 - contrib/ntp/lib/isc/quota.c | 101 - contrib/ntp/lib/isc/radix.c | 706 - contrib/ntp/lib/isc/ratelimiter.c | 328 - contrib/ntp/lib/isc/refcount.c | 37 - contrib/ntp/lib/isc/region.c | 45 - contrib/ntp/lib/isc/rwlock.c | 809 - contrib/ntp/lib/isc/serial.c | 59 - contrib/ntp/lib/isc/sha2.c | 1449 -- contrib/ntp/lib/isc/socket_api.c | 231 - contrib/ntp/lib/isc/sparc64/include/isc/atomic.h | 127 - contrib/ntp/lib/isc/stats.c | 326 - contrib/ntp/lib/isc/string.c | 271 - contrib/ntp/lib/isc/strtoul.c | 129 - contrib/ntp/lib/isc/symtab.c | 301 - contrib/ntp/lib/isc/task_api.c | 244 - contrib/ntp/lib/isc/taskpool.c | 185 - contrib/ntp/lib/isc/tests/Atffile | 5 - contrib/ntp/lib/isc/tests/hash_test.c | 1805 -- contrib/ntp/lib/isc/tests/isctest.c | 178 - contrib/ntp/lib/isc/tests/isctest.h | 57 - contrib/ntp/lib/isc/tests/queue_test.c | 144 - contrib/ntp/lib/isc/tests/socket_test.c | 255 - contrib/ntp/lib/isc/tests/symtab_test.c | 147 - contrib/ntp/lib/isc/tests/task_test.c | 416 - contrib/ntp/lib/isc/tests/taskpool_test.c | 211 - contrib/ntp/lib/isc/timer.c | 1072 -- contrib/ntp/lib/isc/timer_api.c | 144 - contrib/ntp/lib/isc/timer_p.h | 31 - contrib/ntp/lib/isc/unix/app.c | 946 - contrib/ntp/lib/isc/unix/entropy.c | 605 - contrib/ntp/lib/isc/unix/fsaccess.c | 93 - contrib/ntp/lib/isc/unix/include/isc/keyboard.h | 52 - contrib/ntp/lib/isc/unix/include/isc/netdb.h | 57 - contrib/ntp/lib/isc/unix/include/isc/syslog.h | 47 - contrib/ntp/lib/isc/unix/ipv6.c | 27 - contrib/ntp/lib/isc/unix/keyboard.c | 126 - contrib/ntp/lib/isc/unix/os.c | 94 - contrib/ntp/lib/isc/unix/resource.c | 231 - contrib/ntp/lib/isc/unix/socket.c | 6011 ------- contrib/ntp/lib/isc/unix/socket_p.h | 33 - contrib/ntp/lib/isc/unix/syslog.c | 84 - contrib/ntp/lib/isc/version.c | 28 - contrib/ntp/lib/isc/win32/DLLMain.c | 58 - contrib/ntp/lib/isc/win32/app.c | 260 - contrib/ntp/lib/isc/win32/dir.c | 312 - contrib/ntp/lib/isc/win32/entropy.c | 307 - contrib/ntp/lib/isc/win32/errno2result.c | 113 - contrib/ntp/lib/isc/win32/errno2result.h | 40 - contrib/ntp/lib/isc/win32/file.c | 619 - contrib/ntp/lib/isc/win32/fsaccess.c | 375 - .../ntp/lib/isc/win32/include/isc/bind_registry.h | 50 - contrib/ntp/lib/isc/win32/include/isc/bindevt.h | 91 - contrib/ntp/lib/isc/win32/include/isc/keyboard.h | 47 - contrib/ntp/lib/isc/win32/include/isc/netdb.h | 54 - contrib/ntp/lib/isc/win32/include/isc/ntgroups.h | 35 - contrib/ntp/lib/isc/win32/include/isc/ntpaths.h | 72 - contrib/ntp/lib/isc/win32/include/isc/syslog.h | 45 - contrib/ntp/lib/isc/win32/ipv6.c | 27 - contrib/ntp/lib/isc/win32/keyboard.c | 89 - contrib/ntp/lib/isc/win32/libgen.h | 25 - contrib/ntp/lib/isc/win32/libisc.def | 583 - contrib/ntp/lib/isc/win32/libisc.dsp | 802 - contrib/ntp/lib/isc/win32/libisc.dsw | 29 - contrib/ntp/lib/isc/win32/libisc.mak | 2055 --- contrib/ntp/lib/isc/win32/netdb.h | 187 - contrib/ntp/lib/isc/win32/ntgroups.c | 186 - contrib/ntp/lib/isc/win32/ntpaths.c | 147 - contrib/ntp/lib/isc/win32/os.c | 45 - contrib/ntp/lib/isc/win32/resource.c | 72 - contrib/ntp/lib/isc/win32/socket.c | 3967 ----- contrib/ntp/lib/isc/win32/stdio.c | 117 - contrib/ntp/lib/isc/win32/syslog.c | 181 - contrib/ntp/lib/isc/win32/syslog.h | 76 - contrib/ntp/lib/isc/win32/unistd.h | 60 - contrib/ntp/lib/isc/win32/version.c | 28 - contrib/ntp/lib/isc/x86_32/include/isc/atomic.h | 176 - contrib/ntp/lib/isc/x86_64/include/isc/atomic.h | 123 - contrib/ntp/libntp/Makefile.am | 195 +- contrib/ntp/libntp/Makefile.in | 1526 +- contrib/ntp/libntp/a_md5encrypt.c | 32 +- contrib/ntp/libntp/authkeys.c | 112 +- contrib/ntp/libntp/authreadkeys.c | 79 +- contrib/ntp/libntp/authusekey.c | 16 +- contrib/ntp/libntp/caltontp.c | 34 +- contrib/ntp/{ => libntp}/lib/isc/assertions.c | 0 .../ntp/{ => libntp}/lib/isc/backtrace-emptytbl.c | 0 contrib/ntp/{ => libntp}/lib/isc/backtrace.c | 0 contrib/ntp/{ => libntp}/lib/isc/buffer.c | 0 contrib/ntp/{ => libntp}/lib/isc/error.c | 0 contrib/ntp/{ => libntp}/lib/isc/event.c | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/app.h | 0 .../{ => libntp}/lib/isc/include/isc/assertions.h | 0 .../{ => libntp}/lib/isc/include/isc/backtrace.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/bind9.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/boolean.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/buffer.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/error.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/event.h | 0 .../{ => libntp}/lib/isc/include/isc/eventclass.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/file.h | 0 .../{ => libntp}/lib/isc/include/isc/formatcheck.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/hash.h | 0 .../lib/isc/include/isc/interfaceiter.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/lang.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/lib.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/list.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/log.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/magic.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/md5.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/msgcat.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/msgs.h | 0 .../{ => libntp}/lib/isc/include/isc/namespace.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/netaddr.h | 0 .../{ => libntp}/lib/isc/include/isc/netscope.h | 0 .../{ => libntp}/lib/isc/include/isc/ondestroy.h | 0 .../{ => libntp}/lib/isc/include/isc/platform.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/print.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/random.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/region.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/result.h | 0 .../{ => libntp}/lib/isc/include/isc/resultclass.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/sha1.h | 0 .../{ => libntp}/lib/isc/include/isc/sockaddr.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/socket.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/stdio.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/string.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/task.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/timer.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/types.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/util.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/xml.h | 0 contrib/ntp/{ => libntp}/lib/isc/inet_ntop.c | 0 contrib/ntp/{ => libntp}/lib/isc/inet_pton.c | 0 contrib/ntp/{ => libntp}/lib/isc/lib.c | 0 contrib/ntp/{ => libntp}/lib/isc/log.c | 0 contrib/ntp/{ => libntp}/lib/isc/md5.c | 0 contrib/ntp/{ => libntp}/lib/isc/netaddr.c | 0 contrib/ntp/{ => libntp}/lib/isc/netscope.c | 0 contrib/ntp/{ => libntp}/lib/isc/nls/msgcat.c | 0 .../ntp/{ => libntp}/lib/isc/nothreads/condition.c | 0 .../lib/isc/nothreads/include/isc/condition.h | 0 .../lib/isc/nothreads/include/isc/mutex.h | 0 .../lib/isc/nothreads/include/isc/once.h | 0 .../lib/isc/nothreads/include/isc/thread.h | 0 .../ntp/{ => libntp}/lib/isc/nothreads/thread.c | 0 contrib/ntp/{ => libntp}/lib/isc/ondestroy.c | 0 .../ntp/{ => libntp}/lib/isc/pthreads/condition.c | 0 .../lib/isc/pthreads/include/isc/condition.h | 0 .../lib/isc/pthreads/include/isc/mutex.h | 0 .../lib/isc/pthreads/include/isc/once.h | 0 .../lib/isc/pthreads/include/isc/thread.h | 0 contrib/ntp/{ => libntp}/lib/isc/pthreads/mutex.c | 0 contrib/ntp/{ => libntp}/lib/isc/pthreads/thread.c | 0 contrib/ntp/{ => libntp}/lib/isc/random.c | 0 contrib/ntp/{ => libntp}/lib/isc/result.c | 0 contrib/ntp/{ => libntp}/lib/isc/sha1.c | 0 contrib/ntp/{ => libntp}/lib/isc/sockaddr.c | 0 contrib/ntp/{ => libntp}/lib/isc/task.c | 0 contrib/ntp/{ => libntp}/lib/isc/task_p.h | 0 contrib/ntp/{ => libntp}/lib/isc/tsmemcmp.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/dir.c | 0 .../ntp/{ => libntp}/lib/isc/unix/errno2result.c | 0 .../ntp/{ => libntp}/lib/isc/unix/errno2result.h | 0 contrib/ntp/{ => libntp}/lib/isc/unix/file.c | 0 .../{ => libntp}/lib/isc/unix/ifiter_getifaddrs.c | 0 .../ntp/{ => libntp}/lib/isc/unix/ifiter_ioctl.c | 0 .../ntp/{ => libntp}/lib/isc/unix/ifiter_sysctl.c | 0 .../{ => libntp}/lib/isc/unix/include/isc/dir.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/int.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/net.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/offset.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/stat.h | 0 .../lib/isc/unix/include/isc/stdtime.h | 0 .../lib/isc/unix/include/isc/strerror.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/time.h | 0 .../ntp/{ => libntp}/lib/isc/unix/interfaceiter.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/net.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/stdio.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/stdtime.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/strerror.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/time.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/condition.c | 0 .../lib/isc/win32/include/isc/condition.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/dir.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/int.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/ipv6.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/mutex.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/net.h | 0 .../lib/isc/win32/include/isc/offset.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/once.h | 0 .../lib/isc/win32/include/isc/platform.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/stat.h | 0 .../lib/isc/win32/include/isc/stdtime.h | 0 .../lib/isc/win32/include/isc/strerror.h | 0 .../lib/isc/win32/include/isc/thread.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/time.h | 0 .../lib/isc/win32/include/isc/win32os.h | 0 .../ntp/{ => libntp}/lib/isc/win32/interfaceiter.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/net.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/once.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/stdtime.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/strerror.c | 2 +- contrib/ntp/{ => libntp}/lib/isc/win32/thread.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/time.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/win32os.c | 0 contrib/ntp/libntp/mktime.c | 4 +- contrib/ntp/libntp/mstolfp.c | 110 +- contrib/ntp/libntp/msyslog.c | 2 +- contrib/ntp/libntp/ntp_crypto_rnd.c | 81 +- contrib/ntp/libntp/ntp_random.c | 15 + contrib/ntp/libntp/ntp_realpath.c | 279 + contrib/ntp/libntp/numtoa.c | 16 + contrib/ntp/libntp/recvbuff.c | 9 +- contrib/ntp/libntp/refnumtoa.c | 2 +- contrib/ntp/libntp/socktoa.c | 2 +- contrib/ntp/libntp/systime.c | 5 +- contrib/ntp/libntp/vint64ops.c | 27 +- contrib/ntp/libntp/work_thread.c | 35 +- contrib/ntp/libntp/xsbprintf.c | 6 +- contrib/ntp/libparse/Makefile.am | 7 +- contrib/ntp/libparse/Makefile.in | 246 +- contrib/ntp/libparse/clk_wharton.c | 7 - contrib/ntp/ntpd/Makefile.am | 112 +- contrib/ntp/ntpd/Makefile.in | 672 +- contrib/ntp/ntpd/cmd_args.c | 6 +- contrib/ntp/ntpd/invoke-ntp.conf.texi | 32 +- contrib/ntp/ntpd/invoke-ntp.keys.texi | 2 +- contrib/ntp/ntpd/invoke-ntpd.texi | 8 +- contrib/ntp/ntpd/keyword-gen-utd | 2 +- contrib/ntp/ntpd/keyword-gen.c | 4 + contrib/ntp/ntpd/ntp.conf.5man | 38 +- contrib/ntp/ntpd/ntp.conf.5mdoc | 40 +- contrib/ntp/ntpd/ntp.conf.def | 32 +- contrib/ntp/ntpd/ntp.conf.html | 219 +- contrib/ntp/ntpd/ntp.conf.man.in | 38 +- contrib/ntp/ntpd/ntp.conf.mdoc.in | 40 +- contrib/ntp/ntpd/ntp.keys.5man | 8 +- contrib/ntp/ntpd/ntp.keys.5mdoc | 10 +- contrib/ntp/ntpd/ntp.keys.html | 66 +- contrib/ntp/ntpd/ntp.keys.man.in | 8 +- contrib/ntp/ntpd/ntp.keys.mdoc.in | 10 +- contrib/ntp/ntpd/ntp_clockdev.c | 187 + contrib/ntp/ntpd/ntp_clockdev.h | 25 + contrib/ntp/ntpd/ntp_config.c | 222 +- contrib/ntp/ntpd/ntp_control.c | 14 +- contrib/ntp/ntpd/ntp_crypto.c | 8 +- contrib/ntp/ntpd/ntp_io.c | 58 +- contrib/ntp/ntpd/ntp_keyword.h | 2051 +-- contrib/ntp/ntpd/ntp_leapsec.c | 15 +- contrib/ntp/ntpd/ntp_loopfilter.c | 12 +- contrib/ntp/ntpd/ntp_monitor.c | 8 +- contrib/ntp/ntpd/ntp_parser.c | 4281 ++--- contrib/ntp/ntpd/ntp_parser.h | 823 +- contrib/ntp/ntpd/ntp_ppsdev.c | 459 + contrib/ntp/ntpd/ntp_proto.c | 124 +- contrib/ntp/ntpd/ntp_refclock.c | 136 +- contrib/ntp/ntpd/ntp_request.c | 2 +- contrib/ntp/ntpd/ntp_util.c | 90 +- contrib/ntp/ntpd/ntpd-opts.c | 251 +- contrib/ntp/ntpd/ntpd-opts.h | 21 +- contrib/ntp/ntpd/ntpd.1ntpdman | 8 +- contrib/ntp/ntpd/ntpd.1ntpdmdoc | 8 +- contrib/ntp/ntpd/ntpd.c | 13 +- contrib/ntp/ntpd/ntpd.html | 420 +- contrib/ntp/ntpd/ntpd.man.in | 8 +- contrib/ntp/ntpd/ntpd.mdoc.in | 8 +- contrib/ntp/ntpd/refclock_acts.c | 30 +- contrib/ntp/ntpd/refclock_arbiter.c | 38 +- contrib/ntp/ntpd/refclock_arc.c | 2 +- contrib/ntp/ntpd/refclock_as2201.c | 7 +- contrib/ntp/ntpd/refclock_chronolog.c | 2 +- contrib/ntp/ntpd/refclock_chu.c | 4 +- contrib/ntp/ntpd/refclock_dumbclock.c | 10 +- contrib/ntp/ntpd/refclock_fg.c | 6 +- contrib/ntp/ntpd/refclock_gpsdjson.c | 47 +- contrib/ntp/ntpd/refclock_heath.c | 4 +- contrib/ntp/ntpd/refclock_hopfser.c | 8 +- contrib/ntp/ntpd/refclock_hpgps.c | 18 +- contrib/ntp/ntpd/refclock_jjy.c | 2 +- contrib/ntp/ntpd/refclock_jupiter.c | 2 +- contrib/ntp/ntpd/refclock_leitch.c | 2 +- contrib/ntp/ntpd/refclock_mx4200.c | 2 +- contrib/ntp/ntpd/refclock_neoclock4x.c | 2 +- contrib/ntp/ntpd/refclock_nmea.c | 71 +- contrib/ntp/ntpd/refclock_oncore.c | 25 +- contrib/ntp/ntpd/refclock_palisade.c | 52 +- contrib/ntp/ntpd/refclock_parse.c | 20 +- contrib/ntp/ntpd/refclock_pst.c | 2 +- contrib/ntp/ntpd/refclock_ripencc.c | 2 +- contrib/ntp/ntpd/refclock_true.c | 10 +- contrib/ntp/ntpd/refclock_ulink.c | 2 +- contrib/ntp/ntpd/refclock_wwvb.c | 2 +- contrib/ntp/ntpd/refclock_zyfer.c | 2 +- contrib/ntp/ntpdate/Makefile.am | 22 +- contrib/ntp/ntpdate/Makefile.in | 131 +- contrib/ntp/ntpdc/Makefile.am | 52 +- contrib/ntp/ntpdc/Makefile.in | 168 +- contrib/ntp/ntpdc/invoke-ntpdc.texi | 17 +- contrib/ntp/ntpdc/ntpdc-opts.c | 351 +- contrib/ntp/ntpdc/ntpdc-opts.def | 10 + contrib/ntp/ntpdc/ntpdc-opts.h | 40 +- contrib/ntp/ntpdc/ntpdc.1ntpdcman | 14 +- contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc | 13 +- contrib/ntp/ntpdc/ntpdc.c | 26 +- contrib/ntp/ntpdc/ntpdc.html | 220 +- contrib/ntp/ntpdc/ntpdc.man.in | 14 +- contrib/ntp/ntpdc/ntpdc.mdoc.in | 13 +- contrib/ntp/ntpq/Makefile.am | 38 +- contrib/ntp/ntpq/Makefile.in | 190 +- contrib/ntp/ntpq/invoke-ntpq.texi | 20 +- contrib/ntp/ntpq/ntpq-opts.c | 367 +- contrib/ntp/ntpq/ntpq-opts.def | 10 + contrib/ntp/ntpq/ntpq-opts.h | 42 +- contrib/ntp/ntpq/ntpq-subs.c | 65 +- contrib/ntp/ntpq/ntpq.1ntpqman | 14 +- contrib/ntp/ntpq/ntpq.1ntpqmdoc | 13 +- contrib/ntp/ntpq/ntpq.c | 211 +- contrib/ntp/ntpq/ntpq.html | 379 +- contrib/ntp/ntpq/ntpq.man.in | 14 +- contrib/ntp/ntpq/ntpq.mdoc.in | 13 +- contrib/ntp/ntpsnmpd/Makefile.am | 12 +- contrib/ntp/ntpsnmpd/Makefile.in | 120 +- contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c | 251 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h | 21 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.c | 2 +- contrib/ntp/ntpsnmpd/ntpsnmpd.html | 43 +- contrib/ntp/ntpsnmpd/ntpsnmpd.man.in | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in | 8 +- contrib/ntp/packageinfo.sh | 2 +- contrib/ntp/parseutil/Makefile.in | 111 +- contrib/ntp/parseutil/dcfd.c | 8 +- contrib/ntp/ports/winnt/vs2015/mkver.props | 25 + contrib/ntp/scripts/Makefile.am | 18 +- contrib/ntp/scripts/Makefile.in | 46 +- contrib/ntp/scripts/build/Makefile.in | 24 +- contrib/ntp/scripts/calc_tickadj/Makefile.am | 10 +- contrib/ntp/scripts/calc_tickadj/Makefile.in | 39 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj-opts | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjman | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.html | 83 +- .../ntp/scripts/calc_tickadj/calc_tickadj.man.in | 4 +- .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +- .../scripts/calc_tickadj/invoke-calc_tickadj.texi | 4 +- contrib/ntp/scripts/invoke-plot_summary.texi | 4 +- contrib/ntp/scripts/invoke-summary.texi | 4 +- contrib/ntp/scripts/lib/Makefile.in | 24 +- contrib/ntp/scripts/ntp-wait/Makefile.am | 10 +- contrib/ntp/scripts/ntp-wait/Makefile.in | 34 +- contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait-opts | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +- .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.html | 100 +- contrib/ntp/scripts/ntp-wait/ntp-wait.man.in | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +- contrib/ntp/scripts/ntpsweep/Makefile.am | 10 +- contrib/ntp/scripts/ntpsweep/Makefile.in | 34 +- contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep-opts | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +- .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.html | 104 +- contrib/ntp/scripts/ntpsweep/ntpsweep.man.in | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +- contrib/ntp/scripts/ntptrace/Makefile.am | 10 +- contrib/ntp/scripts/ntptrace/Makefile.in | 34 +- contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi | 4 +- contrib/ntp/scripts/ntptrace/ntptrace-opts | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman | 4 +- .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.html | 95 +- contrib/ntp/scripts/ntptrace/ntptrace.man.in | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in | 4 +- contrib/ntp/scripts/plot_summary-opts | 4 +- contrib/ntp/scripts/plot_summary.1plot_summaryman | 4 +- contrib/ntp/scripts/plot_summary.1plot_summarymdoc | 4 +- contrib/ntp/scripts/plot_summary.html | 119 +- contrib/ntp/scripts/plot_summary.man.in | 4 +- contrib/ntp/scripts/plot_summary.mdoc.in | 4 +- contrib/ntp/scripts/summary-opts | 4 +- contrib/ntp/scripts/summary.1summaryman | 4 +- contrib/ntp/scripts/summary.1summarymdoc | 4 +- contrib/ntp/scripts/summary.html | 107 +- contrib/ntp/scripts/summary.man.in | 4 +- contrib/ntp/scripts/summary.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/Makefile.am | 10 +- contrib/ntp/scripts/update-leap/Makefile.in | 34 +- .../scripts/update-leap/invoke-update-leap.texi | 2 +- contrib/ntp/scripts/update-leap/update-leap-opts | 4 +- .../update-leap/update-leap.1update-leapman | 4 +- .../update-leap/update-leap.1update-leapmdoc | 4 +- contrib/ntp/scripts/update-leap/update-leap.html | 128 +- contrib/ntp/scripts/update-leap/update-leap.man.in | 4 +- .../ntp/scripts/update-leap/update-leap.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/update-leap.sh | 0 contrib/ntp/sntp/COPYRIGHT | 201 +- contrib/ntp/sntp/Makefile.am | 54 +- contrib/ntp/sntp/Makefile.in | 233 +- contrib/ntp/sntp/aclocal.m4 | 338 +- contrib/ntp/sntp/check-libntp.mf | 13 +- contrib/ntp/sntp/check-libsntp.mf | 13 + contrib/ntp/sntp/check-libunity.mf | 15 + contrib/ntp/sntp/config.h.in | 120 +- contrib/ntp/sntp/configure | 13036 +++++++------- contrib/ntp/sntp/configure.ac | 15 +- contrib/ntp/sntp/crypto.c | 26 +- contrib/ntp/sntp/deps-ver | 2 +- contrib/ntp/sntp/depsver.mf | 9 +- contrib/ntp/sntp/include/Makefile.in | 17 +- contrib/ntp/sntp/include/autogen-version.def | 2 +- contrib/ntp/sntp/include/copyright.def | 4 +- contrib/ntp/sntp/include/version.def | 2 +- contrib/ntp/sntp/include/version.texi | 6 +- contrib/ntp/sntp/includes.mf | 6 +- contrib/ntp/sntp/invoke-sntp.texi | 8 +- contrib/ntp/sntp/libevent/CMakeLists.txt | 1575 ++ contrib/ntp/sntp/libevent/ChangeLog | 760 + contrib/ntp/sntp/libevent/ChangeLog-1.4 | 2 +- contrib/ntp/sntp/libevent/ChangeLog-2.0 | 2 +- contrib/ntp/sntp/libevent/Doxyfile | 46 +- contrib/ntp/sntp/libevent/Makefile.am | 79 +- contrib/ntp/sntp/libevent/Makefile.in | 1747 +- contrib/ntp/sntp/libevent/README.md | 487 + contrib/ntp/sntp/libevent/WIN32-Code/getopt.c | 149 + contrib/ntp/sntp/libevent/WIN32-Code/getopt.h | 33 + contrib/ntp/sntp/libevent/WIN32-Code/getopt_long.c | 234 + .../WIN32-Code/nmake/event2/event-config.h | 26 +- contrib/ntp/sntp/libevent/aclocal.m4 | 224 +- contrib/ntp/sntp/libevent/arc4random.c | 40 +- contrib/ntp/sntp/libevent/autogen.sh | 7 + contrib/ntp/sntp/libevent/buffer.c | 90 +- contrib/ntp/sntp/libevent/buffer_iocp.c | 1 + contrib/ntp/sntp/libevent/bufferevent-internal.h | 76 +- contrib/ntp/sntp/libevent/bufferevent.c | 149 +- contrib/ntp/sntp/libevent/bufferevent_async.c | 66 +- contrib/ntp/sntp/libevent/bufferevent_filter.c | 102 +- contrib/ntp/sntp/libevent/bufferevent_openssl.c | 338 +- contrib/ntp/sntp/libevent/bufferevent_pair.c | 19 +- contrib/ntp/sntp/libevent/bufferevent_ratelim.c | 9 +- contrib/ntp/sntp/libevent/bufferevent_sock.c | 176 +- contrib/ntp/sntp/libevent/build-aux/ltmain.sh | 0 .../ntp/sntp/libevent/cmake/AddCompilerFlags.cmake | 13 + .../ntp/sntp/libevent/cmake/AddEventLibrary.cmake | 193 + .../ntp/sntp/libevent/cmake/COPYING-CMAKE-SCRIPTS | 22 + .../ntp/sntp/libevent/cmake/CheckConstExists.cmake | 25 + .../ntp/sntp/libevent/cmake/CheckFileOffsetBits.c | 14 + .../sntp/libevent/cmake/CheckFileOffsetBits.cmake | 43 + .../libevent/cmake/CheckFunctionKeywords.cmake | 14 + .../libevent/cmake/CheckPrototypeDefinition.c.in | 29 + .../libevent/cmake/CheckPrototypeDefinition.cmake | 82 + .../sntp/libevent/cmake/CheckWorkingKqueue.cmake | 52 + contrib/ntp/sntp/libevent/cmake/CodeCoverage.cmake | 165 + contrib/ntp/sntp/libevent/cmake/Copyright.txt | 57 + .../sntp/libevent/cmake/LibeventConfig.cmake.in | 183 + .../libevent/cmake/LibeventConfigVersion.cmake.in | 11 + contrib/ntp/sntp/libevent/cmake/Macros.cmake | 36 + contrib/ntp/sntp/libevent/cmake/Uninstall.cmake.in | 23 + contrib/ntp/sntp/libevent/cmake/UseDoxygen.cmake | 111 + .../ntp/sntp/libevent/cmake/VersionViaGit.cmake | 66 + contrib/ntp/sntp/libevent/compile | 347 + contrib/ntp/sntp/libevent/config.guess | 1433 ++ contrib/ntp/sntp/libevent/config.h.in | 168 +- contrib/ntp/sntp/libevent/config.sub | 1804 ++ contrib/ntp/sntp/libevent/configure | 11159 ++++++++---- contrib/ntp/sntp/libevent/configure.ac | 337 +- contrib/ntp/sntp/libevent/defer-internal.h | 5 +- contrib/ntp/sntp/libevent/depcomp | 791 + contrib/ntp/sntp/libevent/doxygen.am | 55 + contrib/ntp/sntp/libevent/epoll.c | 54 +- contrib/ntp/sntp/libevent/epolltable-internal.h | 2 +- contrib/ntp/sntp/libevent/evbuffer-internal.h | 2 +- contrib/ntp/sntp/libevent/evconfig-private.h | 49 - contrib/ntp/sntp/libevent/evconfig-private.h.cmake | 40 + contrib/ntp/sntp/libevent/evconfig-private.h.in | 7 + contrib/ntp/sntp/libevent/evdns.c | 239 +- contrib/ntp/sntp/libevent/event-config.h.cmake | 513 + contrib/ntp/sntp/libevent/event-internal.h | 24 +- contrib/ntp/sntp/libevent/event.c | 488 +- contrib/ntp/sntp/libevent/event_iocp.c | 2 +- contrib/ntp/sntp/libevent/event_rpcgen.py | 2057 ++- contrib/ntp/sntp/libevent/event_tagging.c | 9 +- contrib/ntp/sntp/libevent/evmap.c | 43 +- contrib/ntp/sntp/libevent/evrpc.c | 6 +- contrib/ntp/sntp/libevent/evthread-internal.h | 16 +- contrib/ntp/sntp/libevent/evthread.c | 48 +- contrib/ntp/sntp/libevent/evutil.c | 214 +- contrib/ntp/sntp/libevent/evutil_rand.c | 6 +- contrib/ntp/sntp/libevent/evutil_time.c | 93 +- contrib/ntp/sntp/libevent/http-internal.h | 34 +- contrib/ntp/sntp/libevent/http.c | 605 +- contrib/ntp/sntp/libevent/include/event.h | 2 - contrib/ntp/sntp/libevent/include/event2/buffer.h | 3 +- .../sntp/libevent/include/event2/buffer_compat.h | 5 +- .../ntp/sntp/libevent/include/event2/bufferevent.h | 37 +- .../libevent/include/event2/bufferevent_compat.h | 4 + contrib/ntp/sntp/libevent/include/event2/dns.h | 46 +- .../ntp/sntp/libevent/include/event2/dns_compat.h | 24 +- contrib/ntp/sntp/libevent/include/event2/event.h | 81 +- contrib/ntp/sntp/libevent/include/event2/http.h | 54 +- .../ntp/sntp/libevent/include/event2/http_compat.h | 10 +- .../ntp/sntp/libevent/include/event2/listener.h | 12 + contrib/ntp/sntp/libevent/include/event2/rpc.h | 48 +- .../ntp/sntp/libevent/include/event2/rpc_struct.h | 14 + contrib/ntp/sntp/libevent/include/event2/util.h | 63 +- .../ntp/sntp/libevent/include/event2/visibility.h | 48 +- contrib/ntp/sntp/libevent/include/include.am | 7 +- contrib/ntp/sntp/libevent/iocp-internal.h | 14 + contrib/ntp/sntp/libevent/kqueue.c | 24 +- contrib/ntp/sntp/libevent/libevent_core.pc.in | 16 + contrib/ntp/sntp/libevent/libevent_extra.pc.in | 16 + contrib/ntp/sntp/libevent/listener.c | 30 +- contrib/ntp/sntp/libevent/log-internal.h | 25 +- contrib/ntp/sntp/libevent/log.c | 11 +- contrib/ntp/sntp/libevent/ltmain.sh | 11147 ++++++++++++ contrib/ntp/sntp/libevent/m4/ax_check_funcs_ex.m4 | 22 + contrib/ntp/sntp/libevent/m4/ax_prog_doxygen.m4 | 600 + contrib/ntp/sntp/libevent/m4/libevent_openssl.m4 | 26 +- contrib/ntp/sntp/libevent/make-event-config.sed | 10 +- contrib/ntp/sntp/libevent/minheap-internal.h | 6 +- contrib/ntp/sntp/libevent/missing | 215 + contrib/ntp/sntp/libevent/mm-internal.h | 5 + contrib/ntp/sntp/libevent/openssl-compat.h | 47 + contrib/ntp/sntp/libevent/poll.c | 27 +- contrib/ntp/sntp/libevent/sample/dns-example.c | 264 + contrib/ntp/sntp/libevent/sample/event-read-fifo.c | 162 + contrib/ntp/sntp/libevent/sample/hello-world.c | 140 + contrib/ntp/sntp/libevent/sample/hostcheck.c | 217 + contrib/ntp/sntp/libevent/sample/hostcheck.h | 30 + contrib/ntp/sntp/libevent/sample/http-connect.c | 131 + contrib/ntp/sntp/libevent/sample/http-server.c | 582 + contrib/ntp/sntp/libevent/sample/https-client.c | 544 + contrib/ntp/sntp/libevent/sample/include.am | 56 + contrib/ntp/sntp/libevent/sample/le-proxy.c | 305 + .../libevent/sample/openssl_hostname_validation.c | 178 + .../libevent/sample/openssl_hostname_validation.h | 56 + contrib/ntp/sntp/libevent/sample/signal-test.c | 83 + contrib/ntp/sntp/libevent/sample/time-test.c | 110 + contrib/ntp/sntp/libevent/select.c | 2 +- contrib/ntp/sntp/libevent/signal.c | 2 + contrib/ntp/sntp/libevent/strlcpy-internal.h | 2 + contrib/ntp/sntp/libevent/test/bench.c | 62 +- contrib/ntp/sntp/libevent/test/bench_cascade.c | 8 +- contrib/ntp/sntp/libevent/test/bench_http.c | 7 +- contrib/ntp/sntp/libevent/test/bench_httpclient.c | 20 +- contrib/ntp/sntp/libevent/test/check-dumpevents.py | 10 +- contrib/ntp/sntp/libevent/test/include.am | 46 +- .../ntp/sntp/libevent/test/print-winsock-errors.c | 86 + contrib/ntp/sntp/libevent/test/regress.c | 505 +- contrib/ntp/sntp/libevent/test/regress.gen.c | 103 +- contrib/ntp/sntp/libevent/test/regress.gen.h | 5 +- contrib/ntp/sntp/libevent/test/regress.h | 13 + contrib/ntp/sntp/libevent/test/regress_buffer.c | 677 +- .../ntp/sntp/libevent/test/regress_bufferevent.c | 527 +- contrib/ntp/sntp/libevent/test/regress_dns.c | 710 +- contrib/ntp/sntp/libevent/test/regress_et.c | 150 +- contrib/ntp/sntp/libevent/test/regress_finalize.c | 48 + contrib/ntp/sntp/libevent/test/regress_http.c | 1382 +- contrib/ntp/sntp/libevent/test/regress_listener.c | 142 +- contrib/ntp/sntp/libevent/test/regress_main.c | 74 +- contrib/ntp/sntp/libevent/test/regress_minheap.c | 1 - contrib/ntp/sntp/libevent/test/regress_rpc.c | 49 +- contrib/ntp/sntp/libevent/test/regress_ssl.c | 802 +- contrib/ntp/sntp/libevent/test/regress_testutils.c | 22 +- contrib/ntp/sntp/libevent/test/regress_testutils.h | 1 + contrib/ntp/sntp/libevent/test/regress_thread.c | 15 +- contrib/ntp/sntp/libevent/test/regress_thread.h | 34 +- contrib/ntp/sntp/libevent/test/regress_util.c | 272 +- contrib/ntp/sntp/libevent/test/regress_zlib.c | 8 +- contrib/ntp/sntp/libevent/test/rpcgen_wrapper.sh | 11 +- contrib/ntp/sntp/libevent/test/test-changelist.c | 4 +- contrib/ntp/sntp/libevent/test/test-closed.c | 12 +- contrib/ntp/sntp/libevent/test/test-eof.c | 15 +- contrib/ntp/sntp/libevent/test/test-fdleak.c | 15 +- contrib/ntp/sntp/libevent/test/test-init.c | 2 +- contrib/ntp/sntp/libevent/test/test-ratelim.c | 93 +- contrib/ntp/sntp/libevent/test/test-time.c | 28 +- contrib/ntp/sntp/libevent/test/test-weof.c | 9 +- contrib/ntp/sntp/libevent/test/test.sh | 70 +- contrib/ntp/sntp/libevent/test/tinytest.c | 169 +- contrib/ntp/sntp/libevent/test/tinytest.h | 5 +- contrib/ntp/sntp/libevent/test/tinytest_macros.h | 18 +- contrib/ntp/sntp/libevent/time-internal.h | 3 + contrib/ntp/sntp/libevent/util-internal.h | 86 +- contrib/ntp/sntp/libevent/whatsnew-2.1.txt | 88 +- contrib/ntp/sntp/libevent/win32select.c | 5 +- contrib/ntp/sntp/libopts/COPYING.gplv3 | 2 +- contrib/ntp/sntp/libopts/COPYING.lgplv3 | 6 +- contrib/ntp/sntp/libopts/COPYING.mbsd | 2 +- contrib/ntp/sntp/libopts/Makefile.am | 36 +- contrib/ntp/sntp/libopts/Makefile.in | 116 +- contrib/ntp/sntp/libopts/README | 2 +- contrib/ntp/sntp/libopts/{compat => }/_Noreturn.h | 0 contrib/ntp/sntp/libopts/ag-char-map.h | 4 +- contrib/ntp/sntp/libopts/alias.c | 4 +- contrib/ntp/sntp/libopts/ao-strs.c | 281 +- contrib/ntp/sntp/libopts/ao-strs.h | 296 +- contrib/ntp/sntp/libopts/autoopts.c | 22 +- contrib/ntp/sntp/libopts/autoopts.h | 12 +- contrib/ntp/sntp/libopts/autoopts/options.h | 16 +- contrib/ntp/sntp/libopts/autoopts/project.h | 12 +- contrib/ntp/sntp/libopts/autoopts/usage-txt.h | 504 +- contrib/ntp/sntp/libopts/boolean.c | 4 +- contrib/ntp/sntp/libopts/check.c | 4 +- contrib/ntp/sntp/libopts/compat/compat.h | 8 +- contrib/ntp/sntp/libopts/compat/pathfind.c | 13 +- contrib/ntp/sntp/libopts/compat/windows-config.h | 2 +- contrib/ntp/sntp/libopts/configfile.c | 166 +- contrib/ntp/sntp/libopts/cook.c | 53 +- contrib/ntp/sntp/libopts/enum.c | 44 +- contrib/ntp/sntp/libopts/env.c | 12 +- contrib/ntp/sntp/libopts/file.c | 2 +- contrib/ntp/sntp/libopts/find.c | 63 +- contrib/ntp/sntp/libopts/genshell.c | 227 +- contrib/ntp/sntp/libopts/genshell.h | 21 +- contrib/ntp/sntp/libopts/gettext.h | 20 +- contrib/ntp/sntp/libopts/init.c | 18 +- contrib/ntp/sntp/libopts/intprops.h | 267 +- contrib/ntp/sntp/libopts/libopts.c | 6 +- contrib/ntp/sntp/libopts/load.c | 68 +- contrib/ntp/sntp/libopts/m4/libopts.m4 | 26 +- contrib/ntp/sntp/libopts/m4/liboptschk.m4 | 2 +- contrib/ntp/sntp/libopts/m4/stdnoreturn.m4 | 66 +- contrib/ntp/sntp/libopts/makeshell.c | 70 +- contrib/ntp/sntp/libopts/nested.c | 81 +- contrib/ntp/sntp/libopts/numeric.c | 17 +- contrib/ntp/sntp/libopts/option-value-type.c | 10 +- contrib/ntp/sntp/libopts/option-xat-attribute.c | 10 +- contrib/ntp/sntp/libopts/parse-duration.c | 14 +- contrib/ntp/sntp/libopts/parse-duration.h | 6 +- contrib/ntp/sntp/libopts/pgusage.c | 2 +- contrib/ntp/sntp/libopts/proto.h | 508 +- contrib/ntp/sntp/libopts/putshell.c | 42 +- contrib/ntp/sntp/libopts/reset.c | 4 +- contrib/ntp/sntp/libopts/restore.c | 2 +- contrib/ntp/sntp/libopts/save-flags.c | 248 + contrib/ntp/sntp/libopts/save-flags.h | 68 + contrib/ntp/sntp/libopts/save.c | 555 +- contrib/ntp/sntp/libopts/sort.c | 18 +- contrib/ntp/sntp/libopts/stack.c | 4 +- contrib/ntp/sntp/libopts/stdnoreturn.in.h | 32 +- contrib/ntp/sntp/libopts/streqvcmp.c | 4 +- contrib/ntp/sntp/libopts/text_mmap.c | 15 +- contrib/ntp/sntp/libopts/time.c | 8 +- contrib/ntp/sntp/libopts/tokenize.c | 21 +- contrib/ntp/sntp/libopts/usage.c | 83 +- contrib/ntp/sntp/libopts/version.c | 11 +- contrib/ntp/sntp/log.c | 2 +- contrib/ntp/sntp/m4/ntp_cacheversion.m4 | 9 +- contrib/ntp/sntp/m4/ntp_compiler.m4 | 30 +- contrib/ntp/sntp/m4/ntp_crypto_rand.m4 | 5 +- contrib/ntp/sntp/m4/ntp_googletest.m4 | 53 - contrib/ntp/sntp/m4/realpath.m4 | 49 + contrib/ntp/sntp/m4/version.m4 | 2 +- contrib/ntp/sntp/main.c | 1 + contrib/ntp/sntp/scm-rev | 2 +- contrib/ntp/sntp/scripts/Makefile.in | 17 +- contrib/ntp/sntp/sntp-opts.c | 252 +- contrib/ntp/sntp/sntp-opts.h | 21 +- contrib/ntp/sntp/sntp.1sntpman | 10 +- contrib/ntp/sntp/sntp.1sntpmdoc | 8 +- contrib/ntp/sntp/sntp.c | 2 + contrib/ntp/sntp/sntp.html | 246 +- contrib/ntp/sntp/sntp.man.in | 10 +- contrib/ntp/sntp/sntp.mdoc.in | 10 +- contrib/ntp/sntp/tests/Makefile.am | 73 +- contrib/ntp/sntp/tests/Makefile.in | 385 +- contrib/ntp/sntp/tests/packetProcessing.c | 2 - contrib/ntp/sntp/tests/sntptest.c | 4 +- contrib/ntp/sntp/tests/sntptest.h | 1 + contrib/ntp/sntp/tests/t-log.c | 1 - contrib/ntp/sntp/tests/utilities.c | 3 - contrib/ntp/sntp/unity/Makefile.am | 4 +- contrib/ntp/sntp/unity/Makefile.in | 138 +- contrib/ntp/sntp/unity/auto/parseOutput.rb | 0 contrib/ntp/sntp/unity/auto/type_sanitizer.rb | 0 contrib/ntp/sntp/unity/auto/unity_test_summary.py | 0 contrib/ntp/sntp/unity/libpkgver-colcomp.c | 1 + contrib/ntp/sntp/unity/unity_internals.h | 2 +- contrib/ntp/sntp/utilities.c | 25 +- contrib/ntp/sntp/version.c | 5 - contrib/ntp/tests/libntp/realpath.c | 94 + contrib/ntp/tests/libntp/run-realpath.c | 70 + contrib/ntp/tests/ntpd/test-libntp.c | 2 + contrib/ntp/util/Makefile.am | 24 +- contrib/ntp/util/Makefile.in | 211 +- contrib/ntp/util/invoke-ntp-keygen.texi | 10 +- contrib/ntp/util/ntp-keygen-opts.c | 254 +- contrib/ntp/util/ntp-keygen-opts.def | 2 +- contrib/ntp/util/ntp-keygen-opts.h | 21 +- contrib/ntp/util/ntp-keygen.1ntp-keygenman | 10 +- contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc | 10 +- contrib/ntp/util/ntp-keygen.c | 20 +- contrib/ntp/util/ntp-keygen.html | 396 +- contrib/ntp/util/ntp-keygen.man.in | 10 +- contrib/ntp/util/ntp-keygen.mdoc.in | 10 +- usr.sbin/ntp/libntp/Makefile | 17 +- usr.sbin/ntp/libparse/Makefile | 4 +- usr.sbin/ntp/ntp-keygen/Makefile | 8 +- usr.sbin/ntp/ntpd/Makefile | 11 +- usr.sbin/ntp/ntpdate/Makefile | 6 +- usr.sbin/ntp/ntpdc/Makefile | 6 +- usr.sbin/ntp/ntpq/Makefile | 8 +- usr.sbin/ntp/ntptime/Makefile | 6 +- usr.sbin/ntp/sntp/Makefile | 6 +- 820 files changed, 80389 insertions(+), 79821 deletions(-) diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT index 628ee6cc48d3..013202c0fb09 100644 --- a/contrib/ntp/COPYRIGHT +++ b/contrib/ntp/COPYRIGHT @@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html jpg "Clone me," says Dolly sheepishly. - Last update: 4-Feb-2020 23:47 UTC + Last update: 2-Mar-2023 05:21 UTC __________________________________________________________________ The following copyright notice applies to all files collectively called @@ -28,11 +28,11 @@ This file is automatically generated from html/copyright.html * * *********************************************************************** - Content starting in 2011 from Harlan Stenn, Danny Mayer, and Martin - Burnicki is: + Content starting in 2011 from Harlan Stenn, Juergen Perlinger, Dave + Hart, Danny Mayer, Martin Burnicki, and possibly others is: *********************************************************************** * * -* Copyright (c) Network Time Foundation 2011-2020 * +* Copyright (c) Network Time Foundation 2011-2023 * * * * All Rights Reserved * * * @@ -85,73 +85,75 @@ This file is automatically generated from html/copyright.html 13. [14]Steve Clift OMEGA clock driver 14. [15]Casey Crellin vxWorks (Tornado) port and help with target configuration - 15. [16]Sven Dietrich Palisade reference + 15. [16]Philippe De Muyter Wharton reference clock + driver, sysV68 and AIX modifications. + 16. [17]Sven Dietrich Palisade reference clock driver, NT adj. residuals, integrated Greg's Winnt port. - 16. [17]John A. Dundas III Apple A/UX port - 17. [18]Torsten Duwe Linux port - 18. [19]Dennis Ferguson foundation code for + 17. [18]John A. Dundas III Apple A/UX port + 18. [19]Torsten Duwe Linux port + 19. [20]Dennis Ferguson foundation code for NTP Version 2 as specified in RFC-1119 - 19. [20]John Hay IPv6 support and testing - 20. [21]Dave Hart General maintenance, Windows - port interpolation rewrite - 21. [22]Claas Hilbrecht NeoClock4X clock driver - 22. [23]Glenn Hollinger GOES clock driver - 23. [24]Mike Iglesias DEC Alpha port - 24. [25]Jim Jagielski A/UX port - 25. [26]Jeff Johnson massive prototyping + 20. [21]John Hay IPv6 support and testing + 21. [22]Dave Hart General maintenance, IPv6 + cleanup, Windows PPSAPI + 22. [23]Claas Hilbrecht NeoClock4X clock driver + 23. [24]Glenn Hollinger GOES clock driver + 24. [25]Mike Iglesias DEC Alpha port + 25. [26]Jim Jagielski A/UX port + 26. [27]Jeff Johnson massive prototyping overhaul - 26. [27]Hans Lambermont or - [28] ntpsweep - 27. [29]Poul-Henning Kamp Oncore driver (Original + 27. [28]Hans Lambermont or + [29] ntpsweep + 28. [30]Poul-Henning Kamp Oncore driver (Original author) - 28. [30]Frank Kardel [31] PARSE + 29. [31]Frank Kardel [32] PARSE (driver 14 reference clocks), STREAMS modules for PARSE, support scripts, syslog cleanup, dynamic interface handling - 29. [32]Johannes Maximilian Kuehn Rewrote sntp to + 30. [33]Johannes Maximilian Kuehn Rewrote sntp to comply with NTPv4 specification, ntpq saveconfig - 30. [33]William L. Jones RS/6000 AIX + 31. [34]William L. Jones RS/6000 AIX modifications, HPUX modifications - 31. [34]Dave Katz RS/6000 AIX port - 32. [35]Craig Leres 4.4BSD port, ppsclock, Magnavox + 32. [35]Dave Katz RS/6000 AIX port + 33. [36]Craig Leres 4.4BSD port, ppsclock, Magnavox GPS clock driver - 33. [36]George Lindholm SunOS 5.1 port - 34. [37]Louis A. Mamakos MD5-based authentication - 35. [38]Lars H. Mathiesen adaptation of foundation + 34. [37]George Lindholm SunOS 5.1 port + 35. [38]Louis A. Mamakos MD5-based authentication + 36. [39]Lars H. Mathiesen adaptation of foundation code for Version 3 as specified in RFC-1305 - 36. [39]Danny Mayer Network I/O, Windows Port, Code + 37. [40]Danny Mayer Network I/O, Windows Port, Code Maintenance - 37. [40]David L. Mills Version 4 foundation, precision + 38. [41]David L. Mills Version 4 foundation, precision kernel; clock drivers: 1, 3, 4, 6, 7, 11, 13, 18, 19, 22, 36 - 38. [41]Wolfgang Moeller VMS port - 39. [42]Jeffrey Mogul ntptrace utility - 40. [43]Tom Moore i386 svr4 port - 41. [44]Kamal A Mostafa SCO OpenServer port - 42. [45]Derek Mulcahy and [46]Damon + 39. [42]Wolfgang Moeller VMS port + 40. [43]Jeffrey Mogul ntptrace utility + 41. [44]Tom Moore i386 svr4 port + 42. [45]Kamal A Mostafa SCO OpenServer port + 43. [46]Derek Mulcahy and [47]Damon Hart-Davis ARCRON MSF clock driver - 43. [47]Rob Neal Bancomm refclock and config/parse code + 44. [48]Rob Neal Bancomm refclock and config/parse code maintenance - 44. [48]Rainer Pruy + 45. [49]Rainer Pruy monitoring/trap scripts, statistics file handling - 45. [49]Dirce Richards Digital UNIX V4.0 port - 46. [50]Wilfredo Sánchez added support for NetInfo - 47. [51]Nick Sayer SunOS streams modules - 48. [52]Jack Sasportas Saved a Lot of + 46. [50]Dirce Richards Digital UNIX V4.0 port + 47. [51]Wilfredo Sánchez added support for NetInfo + 48. [52]Nick Sayer SunOS streams modules + 49. [53]Jack Sasportas Saved a Lot of space on the stuff in the html/pic/ subdirectory - 49. [53]Ray Schnitzler Unixware1 port - 50. [54]Michael Shields USNO clock driver - 51. [55]Jeff Steinman Datum PTS clock driver - 52. [56]Harlan Stenn GNU automake/autoconfigure + 50. [54]Ray Schnitzler Unixware1 port + 51. [55]Michael Shields USNO clock driver + 52. [56]Jeff Steinman Datum PTS clock driver + 53. [57]Harlan Stenn GNU automake/autoconfigure makeover, various other bits (see the ChangeLog) - 53. [57]Kenneth Stone HP-UX port - 54. [58]Ajit Thyagarajan IP multicast/anycast support - 55. [59]Tomoaki TSURUOKA TRAK clock driver - 56. [60]Brian Utterback General codebase, + 54. [58]Kenneth Stone HP-UX port + 55. [59]Ajit Thyagarajan IP multicast/anycast support + 56. [60]Tomoaki TSURUOKA TRAK clock driver + 57. [61]Brian Utterback General codebase, Solaris issues - 57. [61]Loganaden Velvindron Sandboxing + 58. [62]Loganaden Velvindron Sandboxing (libseccomp) support - 58. [62]Paul A Vixie TrueTime GPS driver, generic + 59. [63]Paul A Vixie TrueTime GPS driver, generic TrueTime clock driver - 59. [63]Ulrich Windl corrected and + 60. [64]Ulrich Windl corrected and validated HTML documents according to the HTML DTD *** 224939 LINES SKIPPED *** From nobody Thu Jun 1 15:07:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QX8d16cjhz4YcnW; Thu, 1 Jun 2023 15:07:33 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QX8d16710z3Dp5; Thu, 1 Jun 2023 15:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685632053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6SnDQmX1r91c/yxQg7uzXP62LTyk+hAjWHq8t3r27TA=; b=fcPMXhwFaUzkICc2qV70UZjIYh1vtSN24NarjL8nkpjFVgmJehjsOmjKFIfgqBb5e8UvmX RYo6DARBstzdMC2QAQ7XFChrrSnUyXZsE+Ja6EKVMx6+ouVlNxcgSyguqBo7FHOzvjA2ji +2sp18I0X+UU45a7IGT3xUjNTiF8eHHyZhrB8T7yJRkojIb+gcxzMyU05OlfVjS+P0WKMp +om0ggTw+LKsM8QSsDTHBpWAPYEFVlN8RGEOZOcwynO0yC9XV9oq7lXZwreHTo5DcM2jPv +g1WBlGHTGd/hY3q7/uydb22FXw2+H8klfOcwKtR55x5q/rOZCbS1dqcSlz7dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685632053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6SnDQmX1r91c/yxQg7uzXP62LTyk+hAjWHq8t3r27TA=; b=WCWQErhVXRlBLJXAvyLSycFxnjR8ep3tG0DlZTIflZjLVuoE0TlL9Nx7tdVv+v9U2KV76C jYbuROMD1ZZtNk9XvOT50jwcgIY4mFHIV6lVgLXr3mfjlDY5rSRJ0dnH/mPtToTedS7L3r yPozsMVeQQ4CFldfxAxZdl25PuVweu9X3JN62Dyaci50YGr+jKAi0ldSquZqMA0E+3d48F bFuoDTNCSpNWcmY5hIhhvh462b58VtSQmtra3g8KzGpwIvK1aVNeIvUS4YqqznFLWjQS0h +JwjYdv0928W7xfr/aCg5agPGCc4r/dKTSUPGEG4HdPNDJ8EERqIpMsD+kAhVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685632053; a=rsa-sha256; cv=none; b=QXrtTw/XMxcGl7je8MUU9tidFAxZ0umrAUxDF2uFdREtnYXrZws7aTb7xCq1RN7ynT3jiQ 2pr5Ig3K1yw2p/Pxr7oiDhdKsURTzXRZQg684eNlHqUuqB801Ct1HIBiMjCnb2ZXqexfHe V38KX3rcyxuIdm/rTw2JHisDjD9gNgLN9lZll6jeb6oOxxyCHai0JxtziPMOUx98z1yPuA edhR2xtUq4I/BmGukYlsoyzshQjabwZ9UofOJ4fq+q1jSHRZMf/A60zu5jkOix078TDtdu nJ2GwTlAjXP6JtBWvM98+UHIZaeAkp/2Pcl1M22WeU4iy8UaiP7jx6NaUeRBDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QX8d15C0DzLvD; Thu, 1 Jun 2023 15:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351F7XCe069015; Thu, 1 Jun 2023 15:07:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351F7VXP069009; Thu, 1 Jun 2023 15:07:31 GMT (envelope-from git) Date: Thu, 1 Jun 2023 15:07:31 GMT Message-Id: <202306011507.351F7VXP069009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: cf960e546bf3 - stable/12 - ntp: import ntp-4.2.8p16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: cf960e546bf3fcce0b068ace950cb53c9f99a9fa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=cf960e546bf3fcce0b068ace950cb53c9f99a9fa commit cf960e546bf3fcce0b068ace950cb53c9f99a9fa Author: Cy Schubert AuthorDate: 2023-06-01 14:04:37 +0000 Commit: Cy Schubert CommitDate: 2023-06-01 14:46:42 +0000 ntp: import ntp-4.2.8p16 Security: NtpBUg3767, NtpBug3808, NtpBug3807 (CVE-2023-26555) (cherry picked from commit a466cc55373fc3cf86837f09da729535b57e69a1) --- contrib/ntp/COPYRIGHT | 201 +- contrib/ntp/ChangeLog | 114 +- contrib/ntp/CommitLog | 5757 +++++- contrib/ntp/Makefile.am | 1 - contrib/ntp/Makefile.in | 51 +- contrib/ntp/NEWS | 123 + contrib/ntp/aclocal.m4 | 340 +- contrib/ntp/adjtimed/Makefile.am | 3 +- contrib/ntp/adjtimed/Makefile.in | 96 +- contrib/ntp/check-libntp.mf | 14 + contrib/ntp/check-libntpd.mf | 19 + contrib/ntp/check-libunity.mf | 13 + contrib/ntp/check-scm-rev.mf | 8 + contrib/ntp/clockstuff/Makefile.am | 3 +- contrib/ntp/clockstuff/Makefile.in | 103 +- contrib/ntp/config.h.in | 141 +- contrib/ntp/configure | 17430 ++++++++++--------- contrib/ntp/configure.ac | 70 +- contrib/ntp/deps-ver | 2 +- contrib/ntp/depsver.mf | 9 +- contrib/ntp/html/authentic.html | 15 +- contrib/ntp/html/clockopt.html | 39 + contrib/ntp/html/copyright.html | 9 +- contrib/ntp/html/drivers/driver20.html | 11 +- contrib/ntp/html/drivers/driver46.html | 31 +- contrib/ntp/html/miscopt.html | 9 +- contrib/ntp/html/ntpdc.html | 3 +- contrib/ntp/html/ntpq.html | 3 +- contrib/ntp/html/scripts/clockopt.txt | 1 + contrib/ntp/include/Makefile.in | 28 +- contrib/ntp/include/isc/Makefile.in | 26 +- contrib/ntp/include/ntp.h | 1 + contrib/ntp/include/ntp_config.h | 1 + contrib/ntp/include/ntp_fp.h | 4 +- contrib/ntp/include/ntp_random.h | 1 + contrib/ntp/include/ntp_refclock.h | 13 +- contrib/ntp/include/ntp_stdlib.h | 15 +- contrib/ntp/include/ntp_types.h | 11 +- contrib/ntp/include/ntpd.h | 1 + contrib/ntp/include/ssl_applink.c | 2 +- contrib/ntp/include/vint64ops.h | 2 +- contrib/ntp/includes.mf | 6 +- contrib/ntp/kernel/Makefile.in | 28 +- contrib/ntp/kernel/sys/Makefile.in | 26 +- contrib/ntp/lib/isc/Atffile | 5 - contrib/ntp/lib/isc/alpha/include/isc/atomic.h | 184 - contrib/ntp/lib/isc/api | 8 - contrib/ntp/lib/isc/app_api.c | 136 - contrib/ntp/lib/isc/base32.c | 373 - contrib/ntp/lib/isc/base64.c | 252 - contrib/ntp/lib/isc/bitstring.c | 127 - contrib/ntp/lib/isc/bufferlist.c | 64 - contrib/ntp/lib/isc/commandline.c | 225 - contrib/ntp/lib/isc/entropy.c | 1277 -- contrib/ntp/lib/isc/fsaccess.c | 102 - contrib/ntp/lib/isc/hash.c | 404 - contrib/ntp/lib/isc/heap.c | 265 - contrib/ntp/lib/isc/hex.c | 201 - contrib/ntp/lib/isc/hmacmd5.c | 149 - contrib/ntp/lib/isc/hmacsha.c | 594 - contrib/ntp/lib/isc/httpd.c | 1028 -- contrib/ntp/lib/isc/ia64/include/isc/atomic.h | 100 - contrib/ntp/lib/isc/include/isc/base32.h | 128 - contrib/ntp/lib/isc/include/isc/base64.h | 99 - contrib/ntp/lib/isc/include/isc/bitstring.h | 157 - contrib/ntp/lib/isc/include/isc/bufferlist.h | 86 - contrib/ntp/lib/isc/include/isc/commandline.h | 50 - contrib/ntp/lib/isc/include/isc/entropy.h | 314 - contrib/ntp/lib/isc/include/isc/fsaccess.h | 178 - contrib/ntp/lib/isc/include/isc/heap.h | 170 - contrib/ntp/lib/isc/include/isc/hex.h | 98 - contrib/ntp/lib/isc/include/isc/hmacmd5.h | 72 - contrib/ntp/lib/isc/include/isc/hmacsha.h | 169 - contrib/ntp/lib/isc/include/isc/httpd.h | 64 - contrib/ntp/lib/isc/include/isc/ipv6.h | 148 - contrib/ntp/lib/isc/include/isc/iterated_hash.h | 47 - contrib/ntp/lib/isc/include/isc/lex.h | 431 - contrib/ntp/lib/isc/include/isc/lfsr.h | 130 - contrib/ntp/lib/isc/include/isc/mem.h | 750 - contrib/ntp/lib/isc/include/isc/mutexblock.h | 71 - contrib/ntp/lib/isc/include/isc/os.h | 38 - contrib/ntp/lib/isc/include/isc/parseint.h | 64 - contrib/ntp/lib/isc/include/isc/platform.h.in | 367 - contrib/ntp/lib/isc/include/isc/portset.h | 141 - contrib/ntp/lib/isc/include/isc/queue.h | 100 - contrib/ntp/lib/isc/include/isc/quota.h | 119 - contrib/ntp/lib/isc/include/isc/radix.h | 240 - contrib/ntp/lib/isc/include/isc/ratelimiter.h | 134 - contrib/ntp/lib/isc/include/isc/refcount.h | 233 - contrib/ntp/lib/isc/include/isc/resource.h | 97 - contrib/ntp/lib/isc/include/isc/rwlock.h | 135 - contrib/ntp/lib/isc/include/isc/serial.h | 75 - contrib/ntp/lib/isc/include/isc/sha2.h | 145 - contrib/ntp/lib/isc/include/isc/stats.h | 121 - contrib/ntp/lib/isc/include/isc/stdlib.h | 40 - contrib/ntp/lib/isc/include/isc/symtab.h | 139 - contrib/ntp/lib/isc/include/isc/taskpool.h | 157 - contrib/ntp/lib/isc/include/isc/version.h | 28 - contrib/ntp/lib/isc/inet_aton.c | 195 - contrib/ntp/lib/isc/iterated_hash.c | 48 - contrib/ntp/lib/isc/lex.c | 959 - contrib/ntp/lib/isc/lfsr.c | 161 - contrib/ntp/lib/isc/mem.c | 2477 --- contrib/ntp/lib/isc/mem_api.c | 303 - contrib/ntp/lib/isc/mips/include/isc/atomic.h | 98 - contrib/ntp/lib/isc/mutexblock.c | 58 - contrib/ntp/lib/isc/noatomic/include/isc/atomic.h | 24 - contrib/ntp/lib/isc/nothreads/mutex.c | 25 - contrib/ntp/lib/isc/parseint.c | 72 - contrib/ntp/lib/isc/portset.c | 143 - contrib/ntp/lib/isc/powerpc/include/isc/atomic.h | 197 - contrib/ntp/lib/isc/print.c | 624 - contrib/ntp/lib/isc/quota.c | 101 - contrib/ntp/lib/isc/radix.c | 706 - contrib/ntp/lib/isc/ratelimiter.c | 328 - contrib/ntp/lib/isc/refcount.c | 37 - contrib/ntp/lib/isc/region.c | 45 - contrib/ntp/lib/isc/rwlock.c | 809 - contrib/ntp/lib/isc/serial.c | 59 - contrib/ntp/lib/isc/sha2.c | 1449 -- contrib/ntp/lib/isc/socket_api.c | 231 - contrib/ntp/lib/isc/sparc64/include/isc/atomic.h | 127 - contrib/ntp/lib/isc/stats.c | 326 - contrib/ntp/lib/isc/string.c | 271 - contrib/ntp/lib/isc/strtoul.c | 129 - contrib/ntp/lib/isc/symtab.c | 301 - contrib/ntp/lib/isc/task_api.c | 244 - contrib/ntp/lib/isc/taskpool.c | 185 - contrib/ntp/lib/isc/tests/Atffile | 5 - contrib/ntp/lib/isc/tests/hash_test.c | 1805 -- contrib/ntp/lib/isc/tests/isctest.c | 178 - contrib/ntp/lib/isc/tests/isctest.h | 57 - contrib/ntp/lib/isc/tests/queue_test.c | 144 - contrib/ntp/lib/isc/tests/socket_test.c | 255 - contrib/ntp/lib/isc/tests/symtab_test.c | 147 - contrib/ntp/lib/isc/tests/task_test.c | 416 - contrib/ntp/lib/isc/tests/taskpool_test.c | 211 - contrib/ntp/lib/isc/timer.c | 1072 -- contrib/ntp/lib/isc/timer_api.c | 144 - contrib/ntp/lib/isc/timer_p.h | 31 - contrib/ntp/lib/isc/unix/app.c | 946 - contrib/ntp/lib/isc/unix/entropy.c | 605 - contrib/ntp/lib/isc/unix/fsaccess.c | 93 - contrib/ntp/lib/isc/unix/include/isc/keyboard.h | 52 - contrib/ntp/lib/isc/unix/include/isc/netdb.h | 57 - contrib/ntp/lib/isc/unix/include/isc/syslog.h | 47 - contrib/ntp/lib/isc/unix/ipv6.c | 27 - contrib/ntp/lib/isc/unix/keyboard.c | 126 - contrib/ntp/lib/isc/unix/os.c | 94 - contrib/ntp/lib/isc/unix/resource.c | 231 - contrib/ntp/lib/isc/unix/socket.c | 6011 ------- contrib/ntp/lib/isc/unix/socket_p.h | 33 - contrib/ntp/lib/isc/unix/syslog.c | 84 - contrib/ntp/lib/isc/version.c | 28 - contrib/ntp/lib/isc/win32/DLLMain.c | 58 - contrib/ntp/lib/isc/win32/app.c | 260 - contrib/ntp/lib/isc/win32/dir.c | 312 - contrib/ntp/lib/isc/win32/entropy.c | 307 - contrib/ntp/lib/isc/win32/errno2result.c | 113 - contrib/ntp/lib/isc/win32/errno2result.h | 40 - contrib/ntp/lib/isc/win32/file.c | 619 - contrib/ntp/lib/isc/win32/fsaccess.c | 375 - .../ntp/lib/isc/win32/include/isc/bind_registry.h | 50 - contrib/ntp/lib/isc/win32/include/isc/bindevt.h | 91 - contrib/ntp/lib/isc/win32/include/isc/keyboard.h | 47 - contrib/ntp/lib/isc/win32/include/isc/netdb.h | 54 - contrib/ntp/lib/isc/win32/include/isc/ntgroups.h | 35 - contrib/ntp/lib/isc/win32/include/isc/ntpaths.h | 72 - contrib/ntp/lib/isc/win32/include/isc/syslog.h | 45 - contrib/ntp/lib/isc/win32/ipv6.c | 27 - contrib/ntp/lib/isc/win32/keyboard.c | 89 - contrib/ntp/lib/isc/win32/libgen.h | 25 - contrib/ntp/lib/isc/win32/libisc.def | 583 - contrib/ntp/lib/isc/win32/libisc.dsp | 802 - contrib/ntp/lib/isc/win32/libisc.dsw | 29 - contrib/ntp/lib/isc/win32/libisc.mak | 2055 --- contrib/ntp/lib/isc/win32/netdb.h | 187 - contrib/ntp/lib/isc/win32/ntgroups.c | 186 - contrib/ntp/lib/isc/win32/ntpaths.c | 147 - contrib/ntp/lib/isc/win32/os.c | 45 - contrib/ntp/lib/isc/win32/resource.c | 72 - contrib/ntp/lib/isc/win32/socket.c | 3967 ----- contrib/ntp/lib/isc/win32/stdio.c | 117 - contrib/ntp/lib/isc/win32/syslog.c | 181 - contrib/ntp/lib/isc/win32/syslog.h | 76 - contrib/ntp/lib/isc/win32/unistd.h | 60 - contrib/ntp/lib/isc/win32/version.c | 28 - contrib/ntp/lib/isc/x86_32/include/isc/atomic.h | 176 - contrib/ntp/lib/isc/x86_64/include/isc/atomic.h | 123 - contrib/ntp/libntp/Makefile.am | 195 +- contrib/ntp/libntp/Makefile.in | 1526 +- contrib/ntp/libntp/a_md5encrypt.c | 32 +- contrib/ntp/libntp/authkeys.c | 112 +- contrib/ntp/libntp/authreadkeys.c | 79 +- contrib/ntp/libntp/authusekey.c | 16 +- contrib/ntp/libntp/caltontp.c | 34 +- contrib/ntp/{ => libntp}/lib/isc/assertions.c | 0 .../ntp/{ => libntp}/lib/isc/backtrace-emptytbl.c | 0 contrib/ntp/{ => libntp}/lib/isc/backtrace.c | 0 contrib/ntp/{ => libntp}/lib/isc/buffer.c | 0 contrib/ntp/{ => libntp}/lib/isc/error.c | 0 contrib/ntp/{ => libntp}/lib/isc/event.c | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/app.h | 0 .../{ => libntp}/lib/isc/include/isc/assertions.h | 0 .../{ => libntp}/lib/isc/include/isc/backtrace.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/bind9.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/boolean.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/buffer.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/error.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/event.h | 0 .../{ => libntp}/lib/isc/include/isc/eventclass.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/file.h | 0 .../{ => libntp}/lib/isc/include/isc/formatcheck.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/hash.h | 0 .../lib/isc/include/isc/interfaceiter.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/lang.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/lib.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/list.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/log.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/magic.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/md5.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/msgcat.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/msgs.h | 0 .../{ => libntp}/lib/isc/include/isc/namespace.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/netaddr.h | 0 .../{ => libntp}/lib/isc/include/isc/netscope.h | 0 .../{ => libntp}/lib/isc/include/isc/ondestroy.h | 0 .../{ => libntp}/lib/isc/include/isc/platform.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/print.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/random.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/region.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/result.h | 0 .../{ => libntp}/lib/isc/include/isc/resultclass.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/sha1.h | 0 .../{ => libntp}/lib/isc/include/isc/sockaddr.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/socket.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/stdio.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/string.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/task.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/timer.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/types.h | 0 .../ntp/{ => libntp}/lib/isc/include/isc/util.h | 0 contrib/ntp/{ => libntp}/lib/isc/include/isc/xml.h | 0 contrib/ntp/{ => libntp}/lib/isc/inet_ntop.c | 0 contrib/ntp/{ => libntp}/lib/isc/inet_pton.c | 0 contrib/ntp/{ => libntp}/lib/isc/lib.c | 0 contrib/ntp/{ => libntp}/lib/isc/log.c | 0 contrib/ntp/{ => libntp}/lib/isc/md5.c | 0 contrib/ntp/{ => libntp}/lib/isc/netaddr.c | 0 contrib/ntp/{ => libntp}/lib/isc/netscope.c | 0 contrib/ntp/{ => libntp}/lib/isc/nls/msgcat.c | 0 .../ntp/{ => libntp}/lib/isc/nothreads/condition.c | 0 .../lib/isc/nothreads/include/isc/condition.h | 0 .../lib/isc/nothreads/include/isc/mutex.h | 0 .../lib/isc/nothreads/include/isc/once.h | 0 .../lib/isc/nothreads/include/isc/thread.h | 0 .../ntp/{ => libntp}/lib/isc/nothreads/thread.c | 0 contrib/ntp/{ => libntp}/lib/isc/ondestroy.c | 0 .../ntp/{ => libntp}/lib/isc/pthreads/condition.c | 0 .../lib/isc/pthreads/include/isc/condition.h | 0 .../lib/isc/pthreads/include/isc/mutex.h | 0 .../lib/isc/pthreads/include/isc/once.h | 0 .../lib/isc/pthreads/include/isc/thread.h | 0 contrib/ntp/{ => libntp}/lib/isc/pthreads/mutex.c | 0 contrib/ntp/{ => libntp}/lib/isc/pthreads/thread.c | 0 contrib/ntp/{ => libntp}/lib/isc/random.c | 0 contrib/ntp/{ => libntp}/lib/isc/result.c | 0 contrib/ntp/{ => libntp}/lib/isc/sha1.c | 0 contrib/ntp/{ => libntp}/lib/isc/sockaddr.c | 0 contrib/ntp/{ => libntp}/lib/isc/task.c | 0 contrib/ntp/{ => libntp}/lib/isc/task_p.h | 0 contrib/ntp/{ => libntp}/lib/isc/tsmemcmp.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/dir.c | 0 .../ntp/{ => libntp}/lib/isc/unix/errno2result.c | 0 .../ntp/{ => libntp}/lib/isc/unix/errno2result.h | 0 contrib/ntp/{ => libntp}/lib/isc/unix/file.c | 0 .../{ => libntp}/lib/isc/unix/ifiter_getifaddrs.c | 0 .../ntp/{ => libntp}/lib/isc/unix/ifiter_ioctl.c | 0 .../ntp/{ => libntp}/lib/isc/unix/ifiter_sysctl.c | 0 .../{ => libntp}/lib/isc/unix/include/isc/dir.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/int.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/net.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/offset.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/stat.h | 0 .../lib/isc/unix/include/isc/stdtime.h | 0 .../lib/isc/unix/include/isc/strerror.h | 0 .../{ => libntp}/lib/isc/unix/include/isc/time.h | 0 .../ntp/{ => libntp}/lib/isc/unix/interfaceiter.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/net.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/stdio.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/stdtime.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/strerror.c | 0 contrib/ntp/{ => libntp}/lib/isc/unix/time.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/condition.c | 0 .../lib/isc/win32/include/isc/condition.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/dir.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/int.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/ipv6.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/mutex.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/net.h | 0 .../lib/isc/win32/include/isc/offset.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/once.h | 0 .../lib/isc/win32/include/isc/platform.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/stat.h | 0 .../lib/isc/win32/include/isc/stdtime.h | 0 .../lib/isc/win32/include/isc/strerror.h | 0 .../lib/isc/win32/include/isc/thread.h | 0 .../{ => libntp}/lib/isc/win32/include/isc/time.h | 0 .../lib/isc/win32/include/isc/win32os.h | 0 .../ntp/{ => libntp}/lib/isc/win32/interfaceiter.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/net.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/once.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/stdtime.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/strerror.c | 2 +- contrib/ntp/{ => libntp}/lib/isc/win32/thread.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/time.c | 0 contrib/ntp/{ => libntp}/lib/isc/win32/win32os.c | 0 contrib/ntp/libntp/mktime.c | 4 +- contrib/ntp/libntp/mstolfp.c | 110 +- contrib/ntp/libntp/msyslog.c | 2 +- contrib/ntp/libntp/ntp_crypto_rnd.c | 81 +- contrib/ntp/libntp/ntp_random.c | 15 + contrib/ntp/libntp/ntp_realpath.c | 279 + contrib/ntp/libntp/numtoa.c | 16 + contrib/ntp/libntp/recvbuff.c | 9 +- contrib/ntp/libntp/refnumtoa.c | 2 +- contrib/ntp/libntp/socktoa.c | 2 +- contrib/ntp/libntp/systime.c | 5 +- contrib/ntp/libntp/vint64ops.c | 27 +- contrib/ntp/libntp/work_thread.c | 35 +- contrib/ntp/libntp/xsbprintf.c | 6 +- contrib/ntp/libparse/Makefile.am | 7 +- contrib/ntp/libparse/Makefile.in | 246 +- contrib/ntp/libparse/clk_wharton.c | 7 - contrib/ntp/ntpd/Makefile.am | 112 +- contrib/ntp/ntpd/Makefile.in | 672 +- contrib/ntp/ntpd/cmd_args.c | 6 +- contrib/ntp/ntpd/invoke-ntp.conf.texi | 32 +- contrib/ntp/ntpd/invoke-ntp.keys.texi | 2 +- contrib/ntp/ntpd/invoke-ntpd.texi | 8 +- contrib/ntp/ntpd/keyword-gen-utd | 2 +- contrib/ntp/ntpd/keyword-gen.c | 4 + contrib/ntp/ntpd/ntp.conf.5man | 38 +- contrib/ntp/ntpd/ntp.conf.5mdoc | 40 +- contrib/ntp/ntpd/ntp.conf.def | 32 +- contrib/ntp/ntpd/ntp.conf.html | 219 +- contrib/ntp/ntpd/ntp.conf.man.in | 38 +- contrib/ntp/ntpd/ntp.conf.mdoc.in | 40 +- contrib/ntp/ntpd/ntp.keys.5man | 8 +- contrib/ntp/ntpd/ntp.keys.5mdoc | 10 +- contrib/ntp/ntpd/ntp.keys.html | 66 +- contrib/ntp/ntpd/ntp.keys.man.in | 8 +- contrib/ntp/ntpd/ntp.keys.mdoc.in | 10 +- contrib/ntp/ntpd/ntp_clockdev.c | 187 + contrib/ntp/ntpd/ntp_clockdev.h | 25 + contrib/ntp/ntpd/ntp_config.c | 222 +- contrib/ntp/ntpd/ntp_control.c | 14 +- contrib/ntp/ntpd/ntp_crypto.c | 8 +- contrib/ntp/ntpd/ntp_io.c | 58 +- contrib/ntp/ntpd/ntp_keyword.h | 2051 +-- contrib/ntp/ntpd/ntp_leapsec.c | 15 +- contrib/ntp/ntpd/ntp_loopfilter.c | 12 +- contrib/ntp/ntpd/ntp_monitor.c | 8 +- contrib/ntp/ntpd/ntp_parser.c | 4281 ++--- contrib/ntp/ntpd/ntp_parser.h | 823 +- contrib/ntp/ntpd/ntp_ppsdev.c | 459 + contrib/ntp/ntpd/ntp_proto.c | 124 +- contrib/ntp/ntpd/ntp_refclock.c | 136 +- contrib/ntp/ntpd/ntp_request.c | 2 +- contrib/ntp/ntpd/ntp_util.c | 90 +- contrib/ntp/ntpd/ntpd-opts.c | 251 +- contrib/ntp/ntpd/ntpd-opts.h | 21 +- contrib/ntp/ntpd/ntpd.1ntpdman | 8 +- contrib/ntp/ntpd/ntpd.1ntpdmdoc | 8 +- contrib/ntp/ntpd/ntpd.c | 13 +- contrib/ntp/ntpd/ntpd.html | 420 +- contrib/ntp/ntpd/ntpd.man.in | 8 +- contrib/ntp/ntpd/ntpd.mdoc.in | 8 +- contrib/ntp/ntpd/refclock_acts.c | 30 +- contrib/ntp/ntpd/refclock_arbiter.c | 38 +- contrib/ntp/ntpd/refclock_arc.c | 2 +- contrib/ntp/ntpd/refclock_as2201.c | 7 +- contrib/ntp/ntpd/refclock_chronolog.c | 2 +- contrib/ntp/ntpd/refclock_chu.c | 4 +- contrib/ntp/ntpd/refclock_dumbclock.c | 10 +- contrib/ntp/ntpd/refclock_fg.c | 6 +- contrib/ntp/ntpd/refclock_gpsdjson.c | 47 +- contrib/ntp/ntpd/refclock_heath.c | 4 +- contrib/ntp/ntpd/refclock_hopfser.c | 8 +- contrib/ntp/ntpd/refclock_hpgps.c | 18 +- contrib/ntp/ntpd/refclock_jjy.c | 2 +- contrib/ntp/ntpd/refclock_jupiter.c | 2 +- contrib/ntp/ntpd/refclock_leitch.c | 2 +- contrib/ntp/ntpd/refclock_mx4200.c | 2 +- contrib/ntp/ntpd/refclock_neoclock4x.c | 2 +- contrib/ntp/ntpd/refclock_nmea.c | 71 +- contrib/ntp/ntpd/refclock_oncore.c | 25 +- contrib/ntp/ntpd/refclock_palisade.c | 52 +- contrib/ntp/ntpd/refclock_parse.c | 20 +- contrib/ntp/ntpd/refclock_pst.c | 2 +- contrib/ntp/ntpd/refclock_ripencc.c | 2 +- contrib/ntp/ntpd/refclock_true.c | 10 +- contrib/ntp/ntpd/refclock_ulink.c | 2 +- contrib/ntp/ntpd/refclock_wwvb.c | 2 +- contrib/ntp/ntpd/refclock_zyfer.c | 2 +- contrib/ntp/ntpdate/Makefile.am | 22 +- contrib/ntp/ntpdate/Makefile.in | 131 +- contrib/ntp/ntpdc/Makefile.am | 52 +- contrib/ntp/ntpdc/Makefile.in | 168 +- contrib/ntp/ntpdc/invoke-ntpdc.texi | 17 +- contrib/ntp/ntpdc/ntpdc-opts.c | 351 +- contrib/ntp/ntpdc/ntpdc-opts.def | 10 + contrib/ntp/ntpdc/ntpdc-opts.h | 40 +- contrib/ntp/ntpdc/ntpdc.1ntpdcman | 14 +- contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc | 13 +- contrib/ntp/ntpdc/ntpdc.c | 26 +- contrib/ntp/ntpdc/ntpdc.html | 220 +- contrib/ntp/ntpdc/ntpdc.man.in | 14 +- contrib/ntp/ntpdc/ntpdc.mdoc.in | 13 +- contrib/ntp/ntpq/Makefile.am | 38 +- contrib/ntp/ntpq/Makefile.in | 190 +- contrib/ntp/ntpq/invoke-ntpq.texi | 20 +- contrib/ntp/ntpq/ntpq-opts.c | 367 +- contrib/ntp/ntpq/ntpq-opts.def | 10 + contrib/ntp/ntpq/ntpq-opts.h | 42 +- contrib/ntp/ntpq/ntpq-subs.c | 65 +- contrib/ntp/ntpq/ntpq.1ntpqman | 14 +- contrib/ntp/ntpq/ntpq.1ntpqmdoc | 13 +- contrib/ntp/ntpq/ntpq.c | 211 +- contrib/ntp/ntpq/ntpq.html | 379 +- contrib/ntp/ntpq/ntpq.man.in | 14 +- contrib/ntp/ntpq/ntpq.mdoc.in | 13 +- contrib/ntp/ntpsnmpd/Makefile.am | 12 +- contrib/ntp/ntpsnmpd/Makefile.in | 120 +- contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c | 251 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h | 21 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.c | 2 +- contrib/ntp/ntpsnmpd/ntpsnmpd.html | 43 +- contrib/ntp/ntpsnmpd/ntpsnmpd.man.in | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in | 8 +- contrib/ntp/packageinfo.sh | 2 +- contrib/ntp/parseutil/Makefile.in | 111 +- contrib/ntp/parseutil/dcfd.c | 8 +- contrib/ntp/ports/winnt/vs2015/mkver.props | 25 + contrib/ntp/scripts/Makefile.am | 18 +- contrib/ntp/scripts/Makefile.in | 46 +- contrib/ntp/scripts/build/Makefile.in | 24 +- contrib/ntp/scripts/calc_tickadj/Makefile.am | 10 +- contrib/ntp/scripts/calc_tickadj/Makefile.in | 39 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj-opts | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjman | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.html | 83 +- .../ntp/scripts/calc_tickadj/calc_tickadj.man.in | 4 +- .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +- .../scripts/calc_tickadj/invoke-calc_tickadj.texi | 4 +- contrib/ntp/scripts/invoke-plot_summary.texi | 4 +- contrib/ntp/scripts/invoke-summary.texi | 4 +- contrib/ntp/scripts/lib/Makefile.in | 24 +- contrib/ntp/scripts/ntp-wait/Makefile.am | 10 +- contrib/ntp/scripts/ntp-wait/Makefile.in | 34 +- contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait-opts | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +- .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.html | 100 +- contrib/ntp/scripts/ntp-wait/ntp-wait.man.in | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +- contrib/ntp/scripts/ntpsweep/Makefile.am | 10 +- contrib/ntp/scripts/ntpsweep/Makefile.in | 34 +- contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep-opts | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +- .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.html | 104 +- contrib/ntp/scripts/ntpsweep/ntpsweep.man.in | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +- contrib/ntp/scripts/ntptrace/Makefile.am | 10 +- contrib/ntp/scripts/ntptrace/Makefile.in | 34 +- contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi | 4 +- contrib/ntp/scripts/ntptrace/ntptrace-opts | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman | 4 +- .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.html | 95 +- contrib/ntp/scripts/ntptrace/ntptrace.man.in | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in | 4 +- contrib/ntp/scripts/plot_summary-opts | 4 +- contrib/ntp/scripts/plot_summary.1plot_summaryman | 4 +- contrib/ntp/scripts/plot_summary.1plot_summarymdoc | 4 +- contrib/ntp/scripts/plot_summary.html | 119 +- contrib/ntp/scripts/plot_summary.man.in | 4 +- contrib/ntp/scripts/plot_summary.mdoc.in | 4 +- contrib/ntp/scripts/summary-opts | 4 +- contrib/ntp/scripts/summary.1summaryman | 4 +- contrib/ntp/scripts/summary.1summarymdoc | 4 +- contrib/ntp/scripts/summary.html | 107 +- contrib/ntp/scripts/summary.man.in | 4 +- contrib/ntp/scripts/summary.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/Makefile.am | 10 +- contrib/ntp/scripts/update-leap/Makefile.in | 34 +- .../scripts/update-leap/invoke-update-leap.texi | 2 +- contrib/ntp/scripts/update-leap/update-leap-opts | 4 +- .../update-leap/update-leap.1update-leapman | 4 +- .../update-leap/update-leap.1update-leapmdoc | 4 +- contrib/ntp/scripts/update-leap/update-leap.html | 128 +- contrib/ntp/scripts/update-leap/update-leap.man.in | 4 +- .../ntp/scripts/update-leap/update-leap.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/update-leap.sh | 0 contrib/ntp/sntp/COPYRIGHT | 201 +- contrib/ntp/sntp/Makefile.am | 54 +- contrib/ntp/sntp/Makefile.in | 233 +- contrib/ntp/sntp/aclocal.m4 | 338 +- contrib/ntp/sntp/check-libntp.mf | 13 +- contrib/ntp/sntp/check-libsntp.mf | 13 + contrib/ntp/sntp/check-libunity.mf | 15 + contrib/ntp/sntp/config.h.in | 120 +- contrib/ntp/sntp/configure | 13036 +++++++------- contrib/ntp/sntp/configure.ac | 15 +- contrib/ntp/sntp/crypto.c | 26 +- contrib/ntp/sntp/deps-ver | 2 +- contrib/ntp/sntp/depsver.mf | 9 +- contrib/ntp/sntp/include/Makefile.in | 17 +- contrib/ntp/sntp/include/autogen-version.def | 2 +- contrib/ntp/sntp/include/copyright.def | 4 +- contrib/ntp/sntp/include/version.def | 2 +- contrib/ntp/sntp/include/version.texi | 6 +- contrib/ntp/sntp/includes.mf | 6 +- contrib/ntp/sntp/invoke-sntp.texi | 8 +- contrib/ntp/sntp/libevent/CMakeLists.txt | 1575 ++ contrib/ntp/sntp/libevent/ChangeLog | 760 + contrib/ntp/sntp/libevent/ChangeLog-1.4 | 2 +- contrib/ntp/sntp/libevent/ChangeLog-2.0 | 2 +- contrib/ntp/sntp/libevent/Doxyfile | 46 +- contrib/ntp/sntp/libevent/Makefile.am | 79 +- contrib/ntp/sntp/libevent/Makefile.in | 1747 +- contrib/ntp/sntp/libevent/README.md | 487 + contrib/ntp/sntp/libevent/WIN32-Code/getopt.c | 149 + contrib/ntp/sntp/libevent/WIN32-Code/getopt.h | 33 + contrib/ntp/sntp/libevent/WIN32-Code/getopt_long.c | 234 + .../WIN32-Code/nmake/event2/event-config.h | 26 +- contrib/ntp/sntp/libevent/aclocal.m4 | 224 +- contrib/ntp/sntp/libevent/arc4random.c | 40 +- contrib/ntp/sntp/libevent/autogen.sh | 7 + contrib/ntp/sntp/libevent/buffer.c | 90 +- contrib/ntp/sntp/libevent/buffer_iocp.c | 1 + contrib/ntp/sntp/libevent/bufferevent-internal.h | 76 +- contrib/ntp/sntp/libevent/bufferevent.c | 149 +- contrib/ntp/sntp/libevent/bufferevent_async.c | 66 +- contrib/ntp/sntp/libevent/bufferevent_filter.c | 102 +- contrib/ntp/sntp/libevent/bufferevent_openssl.c | 338 +- contrib/ntp/sntp/libevent/bufferevent_pair.c | 19 +- contrib/ntp/sntp/libevent/bufferevent_ratelim.c | 9 +- contrib/ntp/sntp/libevent/bufferevent_sock.c | 176 +- contrib/ntp/sntp/libevent/build-aux/ltmain.sh | 0 .../ntp/sntp/libevent/cmake/AddCompilerFlags.cmake | 13 + .../ntp/sntp/libevent/cmake/AddEventLibrary.cmake | 193 + .../ntp/sntp/libevent/cmake/COPYING-CMAKE-SCRIPTS | 22 + .../ntp/sntp/libevent/cmake/CheckConstExists.cmake | 25 + .../ntp/sntp/libevent/cmake/CheckFileOffsetBits.c | 14 + .../sntp/libevent/cmake/CheckFileOffsetBits.cmake | 43 + .../libevent/cmake/CheckFunctionKeywords.cmake | 14 + .../libevent/cmake/CheckPrototypeDefinition.c.in | 29 + .../libevent/cmake/CheckPrototypeDefinition.cmake | 82 + .../sntp/libevent/cmake/CheckWorkingKqueue.cmake | 52 + contrib/ntp/sntp/libevent/cmake/CodeCoverage.cmake | 165 + contrib/ntp/sntp/libevent/cmake/Copyright.txt | 57 + .../sntp/libevent/cmake/LibeventConfig.cmake.in | 183 + .../libevent/cmake/LibeventConfigVersion.cmake.in | 11 + contrib/ntp/sntp/libevent/cmake/Macros.cmake | 36 + contrib/ntp/sntp/libevent/cmake/Uninstall.cmake.in | 23 + contrib/ntp/sntp/libevent/cmake/UseDoxygen.cmake | 111 + .../ntp/sntp/libevent/cmake/VersionViaGit.cmake | 66 + contrib/ntp/sntp/libevent/compile | 347 + contrib/ntp/sntp/libevent/config.guess | 1433 ++ contrib/ntp/sntp/libevent/config.h.in | 168 +- contrib/ntp/sntp/libevent/config.sub | 1804 ++ contrib/ntp/sntp/libevent/configure | 11159 ++++++++---- contrib/ntp/sntp/libevent/configure.ac | 337 +- contrib/ntp/sntp/libevent/defer-internal.h | 5 +- contrib/ntp/sntp/libevent/depcomp | 791 + contrib/ntp/sntp/libevent/doxygen.am | 55 + contrib/ntp/sntp/libevent/epoll.c | 54 +- contrib/ntp/sntp/libevent/epolltable-internal.h | 2 +- contrib/ntp/sntp/libevent/evbuffer-internal.h | 2 +- contrib/ntp/sntp/libevent/evconfig-private.h | 49 - contrib/ntp/sntp/libevent/evconfig-private.h.cmake | 40 + contrib/ntp/sntp/libevent/evconfig-private.h.in | 7 + contrib/ntp/sntp/libevent/evdns.c | 239 +- contrib/ntp/sntp/libevent/event-config.h.cmake | 513 + contrib/ntp/sntp/libevent/event-internal.h | 24 +- contrib/ntp/sntp/libevent/event.c | 488 +- contrib/ntp/sntp/libevent/event_iocp.c | 2 +- contrib/ntp/sntp/libevent/event_rpcgen.py | 2057 ++- contrib/ntp/sntp/libevent/event_tagging.c | 9 +- contrib/ntp/sntp/libevent/evmap.c | 43 +- contrib/ntp/sntp/libevent/evrpc.c | 6 +- contrib/ntp/sntp/libevent/evthread-internal.h | 16 +- contrib/ntp/sntp/libevent/evthread.c | 48 +- contrib/ntp/sntp/libevent/evutil.c | 214 +- contrib/ntp/sntp/libevent/evutil_rand.c | 6 +- contrib/ntp/sntp/libevent/evutil_time.c | 93 +- contrib/ntp/sntp/libevent/http-internal.h | 34 +- contrib/ntp/sntp/libevent/http.c | 605 +- contrib/ntp/sntp/libevent/include/event.h | 2 - contrib/ntp/sntp/libevent/include/event2/buffer.h | 3 +- .../sntp/libevent/include/event2/buffer_compat.h | 5 +- .../ntp/sntp/libevent/include/event2/bufferevent.h | 37 +- .../libevent/include/event2/bufferevent_compat.h | 4 + contrib/ntp/sntp/libevent/include/event2/dns.h | 46 +- .../ntp/sntp/libevent/include/event2/dns_compat.h | 24 +- contrib/ntp/sntp/libevent/include/event2/event.h | 81 +- contrib/ntp/sntp/libevent/include/event2/http.h | 54 +- .../ntp/sntp/libevent/include/event2/http_compat.h | 10 +- .../ntp/sntp/libevent/include/event2/listener.h | 12 + contrib/ntp/sntp/libevent/include/event2/rpc.h | 48 +- .../ntp/sntp/libevent/include/event2/rpc_struct.h | 14 + contrib/ntp/sntp/libevent/include/event2/util.h | 63 +- .../ntp/sntp/libevent/include/event2/visibility.h | 48 +- contrib/ntp/sntp/libevent/include/include.am | 7 +- contrib/ntp/sntp/libevent/iocp-internal.h | 14 + contrib/ntp/sntp/libevent/kqueue.c | 24 +- contrib/ntp/sntp/libevent/libevent_core.pc.in | 16 + contrib/ntp/sntp/libevent/libevent_extra.pc.in | 16 + contrib/ntp/sntp/libevent/listener.c | 30 +- contrib/ntp/sntp/libevent/log-internal.h | 25 +- contrib/ntp/sntp/libevent/log.c | 11 +- contrib/ntp/sntp/libevent/ltmain.sh | 11147 ++++++++++++ contrib/ntp/sntp/libevent/m4/ax_check_funcs_ex.m4 | 22 + contrib/ntp/sntp/libevent/m4/ax_prog_doxygen.m4 | 600 + contrib/ntp/sntp/libevent/m4/libevent_openssl.m4 | 26 +- contrib/ntp/sntp/libevent/make-event-config.sed | 10 +- contrib/ntp/sntp/libevent/minheap-internal.h | 6 +- contrib/ntp/sntp/libevent/missing | 215 + contrib/ntp/sntp/libevent/mm-internal.h | 5 + contrib/ntp/sntp/libevent/openssl-compat.h | 47 + contrib/ntp/sntp/libevent/poll.c | 27 +- contrib/ntp/sntp/libevent/sample/dns-example.c | 264 + contrib/ntp/sntp/libevent/sample/event-read-fifo.c | 162 + contrib/ntp/sntp/libevent/sample/hello-world.c | 140 + contrib/ntp/sntp/libevent/sample/hostcheck.c | 217 + contrib/ntp/sntp/libevent/sample/hostcheck.h | 30 + contrib/ntp/sntp/libevent/sample/http-connect.c | 131 + contrib/ntp/sntp/libevent/sample/http-server.c | 582 + contrib/ntp/sntp/libevent/sample/https-client.c | 544 + contrib/ntp/sntp/libevent/sample/include.am | 56 + contrib/ntp/sntp/libevent/sample/le-proxy.c | 305 + .../libevent/sample/openssl_hostname_validation.c | 178 + .../libevent/sample/openssl_hostname_validation.h | 56 + contrib/ntp/sntp/libevent/sample/signal-test.c | 83 + contrib/ntp/sntp/libevent/sample/time-test.c | 110 + contrib/ntp/sntp/libevent/select.c | 2 +- contrib/ntp/sntp/libevent/signal.c | 2 + contrib/ntp/sntp/libevent/strlcpy-internal.h | 2 + contrib/ntp/sntp/libevent/test/bench.c | 62 +- contrib/ntp/sntp/libevent/test/bench_cascade.c | 8 +- contrib/ntp/sntp/libevent/test/bench_http.c | 7 +- contrib/ntp/sntp/libevent/test/bench_httpclient.c | 20 +- contrib/ntp/sntp/libevent/test/check-dumpevents.py | 10 +- contrib/ntp/sntp/libevent/test/include.am | 46 +- .../ntp/sntp/libevent/test/print-winsock-errors.c | 86 + contrib/ntp/sntp/libevent/test/regress.c | 505 +- contrib/ntp/sntp/libevent/test/regress.gen.c | 103 +- contrib/ntp/sntp/libevent/test/regress.gen.h | 5 +- contrib/ntp/sntp/libevent/test/regress.h | 13 + contrib/ntp/sntp/libevent/test/regress_buffer.c | 677 +- .../ntp/sntp/libevent/test/regress_bufferevent.c | 527 +- contrib/ntp/sntp/libevent/test/regress_dns.c | 710 +- contrib/ntp/sntp/libevent/test/regress_et.c | 150 +- contrib/ntp/sntp/libevent/test/regress_finalize.c | 48 + contrib/ntp/sntp/libevent/test/regress_http.c | 1382 +- contrib/ntp/sntp/libevent/test/regress_listener.c | 142 +- contrib/ntp/sntp/libevent/test/regress_main.c | 74 +- contrib/ntp/sntp/libevent/test/regress_minheap.c | 1 - contrib/ntp/sntp/libevent/test/regress_rpc.c | 49 +- contrib/ntp/sntp/libevent/test/regress_ssl.c | 802 +- contrib/ntp/sntp/libevent/test/regress_testutils.c | 22 +- contrib/ntp/sntp/libevent/test/regress_testutils.h | 1 + contrib/ntp/sntp/libevent/test/regress_thread.c | 15 +- contrib/ntp/sntp/libevent/test/regress_thread.h | 34 +- contrib/ntp/sntp/libevent/test/regress_util.c | 272 +- contrib/ntp/sntp/libevent/test/regress_zlib.c | 8 +- contrib/ntp/sntp/libevent/test/rpcgen_wrapper.sh | 11 +- contrib/ntp/sntp/libevent/test/test-changelist.c | 4 +- contrib/ntp/sntp/libevent/test/test-closed.c | 12 +- contrib/ntp/sntp/libevent/test/test-eof.c | 15 +- contrib/ntp/sntp/libevent/test/test-fdleak.c | 15 +- contrib/ntp/sntp/libevent/test/test-init.c | 2 +- contrib/ntp/sntp/libevent/test/test-ratelim.c | 93 +- contrib/ntp/sntp/libevent/test/test-time.c | 28 +- contrib/ntp/sntp/libevent/test/test-weof.c | 9 +- contrib/ntp/sntp/libevent/test/test.sh | 70 +- contrib/ntp/sntp/libevent/test/tinytest.c | 169 +- contrib/ntp/sntp/libevent/test/tinytest.h | 5 +- contrib/ntp/sntp/libevent/test/tinytest_macros.h | 18 +- contrib/ntp/sntp/libevent/time-internal.h | 3 + contrib/ntp/sntp/libevent/util-internal.h | 86 +- contrib/ntp/sntp/libevent/whatsnew-2.1.txt | 88 +- contrib/ntp/sntp/libevent/win32select.c | 5 +- contrib/ntp/sntp/libopts/COPYING.gplv3 | 2 +- contrib/ntp/sntp/libopts/COPYING.lgplv3 | 6 +- contrib/ntp/sntp/libopts/COPYING.mbsd | 2 +- contrib/ntp/sntp/libopts/Makefile.am | 36 +- contrib/ntp/sntp/libopts/Makefile.in | 116 +- contrib/ntp/sntp/libopts/README | 2 +- contrib/ntp/sntp/libopts/{compat => }/_Noreturn.h | 0 contrib/ntp/sntp/libopts/ag-char-map.h | 4 +- contrib/ntp/sntp/libopts/alias.c | 4 +- contrib/ntp/sntp/libopts/ao-strs.c | 281 +- contrib/ntp/sntp/libopts/ao-strs.h | 296 +- contrib/ntp/sntp/libopts/autoopts.c | 22 +- contrib/ntp/sntp/libopts/autoopts.h | 12 +- contrib/ntp/sntp/libopts/autoopts/options.h | 16 +- contrib/ntp/sntp/libopts/autoopts/project.h | 12 +- contrib/ntp/sntp/libopts/autoopts/usage-txt.h | 504 +- contrib/ntp/sntp/libopts/boolean.c | 4 +- contrib/ntp/sntp/libopts/check.c | 4 +- contrib/ntp/sntp/libopts/compat/compat.h | 8 +- contrib/ntp/sntp/libopts/compat/pathfind.c | 13 +- contrib/ntp/sntp/libopts/compat/windows-config.h | 2 +- contrib/ntp/sntp/libopts/configfile.c | 166 +- contrib/ntp/sntp/libopts/cook.c | 53 +- contrib/ntp/sntp/libopts/enum.c | 44 +- contrib/ntp/sntp/libopts/env.c | 12 +- contrib/ntp/sntp/libopts/file.c | 2 +- contrib/ntp/sntp/libopts/find.c | 63 +- contrib/ntp/sntp/libopts/genshell.c | 227 +- contrib/ntp/sntp/libopts/genshell.h | 21 +- contrib/ntp/sntp/libopts/gettext.h | 20 +- contrib/ntp/sntp/libopts/init.c | 18 +- contrib/ntp/sntp/libopts/intprops.h | 267 +- contrib/ntp/sntp/libopts/libopts.c | 6 +- contrib/ntp/sntp/libopts/load.c | 68 +- contrib/ntp/sntp/libopts/m4/libopts.m4 | 26 +- contrib/ntp/sntp/libopts/m4/liboptschk.m4 | 2 +- contrib/ntp/sntp/libopts/m4/stdnoreturn.m4 | 66 +- contrib/ntp/sntp/libopts/makeshell.c | 70 +- contrib/ntp/sntp/libopts/nested.c | 81 +- contrib/ntp/sntp/libopts/numeric.c | 17 +- contrib/ntp/sntp/libopts/option-value-type.c | 10 +- contrib/ntp/sntp/libopts/option-xat-attribute.c | 10 +- contrib/ntp/sntp/libopts/parse-duration.c | 14 +- contrib/ntp/sntp/libopts/parse-duration.h | 6 +- contrib/ntp/sntp/libopts/pgusage.c | 2 +- contrib/ntp/sntp/libopts/proto.h | 508 +- contrib/ntp/sntp/libopts/putshell.c | 42 +- contrib/ntp/sntp/libopts/reset.c | 4 +- contrib/ntp/sntp/libopts/restore.c | 2 +- contrib/ntp/sntp/libopts/save-flags.c | 248 + contrib/ntp/sntp/libopts/save-flags.h | 68 + contrib/ntp/sntp/libopts/save.c | 555 +- contrib/ntp/sntp/libopts/sort.c | 18 +- contrib/ntp/sntp/libopts/stack.c | 4 +- contrib/ntp/sntp/libopts/stdnoreturn.in.h | 32 +- contrib/ntp/sntp/libopts/streqvcmp.c | 4 +- contrib/ntp/sntp/libopts/text_mmap.c | 15 +- contrib/ntp/sntp/libopts/time.c | 8 +- contrib/ntp/sntp/libopts/tokenize.c | 21 +- contrib/ntp/sntp/libopts/usage.c | 83 +- contrib/ntp/sntp/libopts/version.c | 11 +- contrib/ntp/sntp/log.c | 2 +- contrib/ntp/sntp/m4/ntp_cacheversion.m4 | 9 +- contrib/ntp/sntp/m4/ntp_compiler.m4 | 30 +- contrib/ntp/sntp/m4/ntp_crypto_rand.m4 | 5 +- contrib/ntp/sntp/m4/ntp_googletest.m4 | 53 - contrib/ntp/sntp/m4/realpath.m4 | 49 + contrib/ntp/sntp/m4/version.m4 | 2 +- contrib/ntp/sntp/main.c | 1 + contrib/ntp/sntp/scm-rev | 2 +- contrib/ntp/sntp/scripts/Makefile.in | 17 +- contrib/ntp/sntp/sntp-opts.c | 252 +- contrib/ntp/sntp/sntp-opts.h | 21 +- contrib/ntp/sntp/sntp.1sntpman | 10 +- contrib/ntp/sntp/sntp.1sntpmdoc | 8 +- contrib/ntp/sntp/sntp.c | 2 + contrib/ntp/sntp/sntp.html | 246 +- contrib/ntp/sntp/sntp.man.in | 10 +- contrib/ntp/sntp/sntp.mdoc.in | 10 +- contrib/ntp/sntp/tests/Makefile.am | 73 +- contrib/ntp/sntp/tests/Makefile.in | 385 +- contrib/ntp/sntp/tests/packetProcessing.c | 2 - contrib/ntp/sntp/tests/sntptest.c | 4 +- contrib/ntp/sntp/tests/sntptest.h | 1 + contrib/ntp/sntp/tests/t-log.c | 1 - contrib/ntp/sntp/tests/utilities.c | 3 - contrib/ntp/sntp/unity/Makefile.am | 4 +- contrib/ntp/sntp/unity/Makefile.in | 138 +- contrib/ntp/sntp/unity/auto/parseOutput.rb | 0 contrib/ntp/sntp/unity/auto/type_sanitizer.rb | 0 contrib/ntp/sntp/unity/auto/unity_test_summary.py | 0 contrib/ntp/sntp/unity/libpkgver-colcomp.c | 1 + contrib/ntp/sntp/unity/unity_internals.h | 2 +- contrib/ntp/sntp/utilities.c | 25 +- contrib/ntp/sntp/version.c | 5 - contrib/ntp/tests/libntp/realpath.c | 94 + contrib/ntp/tests/libntp/run-realpath.c | 70 + contrib/ntp/tests/ntpd/test-libntp.c | 2 + contrib/ntp/util/Makefile.am | 24 +- contrib/ntp/util/Makefile.in | 211 +- contrib/ntp/util/invoke-ntp-keygen.texi | 10 +- contrib/ntp/util/ntp-keygen-opts.c | 254 +- contrib/ntp/util/ntp-keygen-opts.def | 2 +- contrib/ntp/util/ntp-keygen-opts.h | 21 +- contrib/ntp/util/ntp-keygen.1ntp-keygenman | 10 +- contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc | 10 +- contrib/ntp/util/ntp-keygen.c | 20 +- contrib/ntp/util/ntp-keygen.html | 396 +- contrib/ntp/util/ntp-keygen.man.in | 10 +- contrib/ntp/util/ntp-keygen.mdoc.in | 10 +- usr.sbin/ntp/libntp/Makefile | 17 +- usr.sbin/ntp/libparse/Makefile | 4 +- usr.sbin/ntp/ntp-keygen/Makefile | 8 +- usr.sbin/ntp/ntpd/Makefile | 11 +- usr.sbin/ntp/ntpdate/Makefile | 6 +- usr.sbin/ntp/ntpdc/Makefile | 6 +- usr.sbin/ntp/ntpq/Makefile | 8 +- usr.sbin/ntp/ntptime/Makefile | 6 +- usr.sbin/ntp/sntp/Makefile | 6 +- 820 files changed, 80389 insertions(+), 79821 deletions(-) diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT index 628ee6cc48d3..013202c0fb09 100644 --- a/contrib/ntp/COPYRIGHT +++ b/contrib/ntp/COPYRIGHT @@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html jpg "Clone me," says Dolly sheepishly. - Last update: 4-Feb-2020 23:47 UTC + Last update: 2-Mar-2023 05:21 UTC __________________________________________________________________ The following copyright notice applies to all files collectively called @@ -28,11 +28,11 @@ This file is automatically generated from html/copyright.html * * *********************************************************************** - Content starting in 2011 from Harlan Stenn, Danny Mayer, and Martin - Burnicki is: + Content starting in 2011 from Harlan Stenn, Juergen Perlinger, Dave + Hart, Danny Mayer, Martin Burnicki, and possibly others is: *********************************************************************** * * -* Copyright (c) Network Time Foundation 2011-2020 * +* Copyright (c) Network Time Foundation 2011-2023 * * * * All Rights Reserved * * * @@ -85,73 +85,75 @@ This file is automatically generated from html/copyright.html 13. [14]Steve Clift OMEGA clock driver 14. [15]Casey Crellin vxWorks (Tornado) port and help with target configuration - 15. [16]Sven Dietrich Palisade reference + 15. [16]Philippe De Muyter Wharton reference clock + driver, sysV68 and AIX modifications. + 16. [17]Sven Dietrich Palisade reference clock driver, NT adj. residuals, integrated Greg's Winnt port. - 16. [17]John A. Dundas III Apple A/UX port - 17. [18]Torsten Duwe Linux port - 18. [19]Dennis Ferguson foundation code for + 17. [18]John A. Dundas III Apple A/UX port + 18. [19]Torsten Duwe Linux port + 19. [20]Dennis Ferguson foundation code for NTP Version 2 as specified in RFC-1119 - 19. [20]John Hay IPv6 support and testing - 20. [21]Dave Hart General maintenance, Windows - port interpolation rewrite - 21. [22]Claas Hilbrecht NeoClock4X clock driver - 22. [23]Glenn Hollinger GOES clock driver - 23. [24]Mike Iglesias DEC Alpha port - 24. [25]Jim Jagielski A/UX port - 25. [26]Jeff Johnson massive prototyping + 20. [21]John Hay IPv6 support and testing + 21. [22]Dave Hart General maintenance, IPv6 + cleanup, Windows PPSAPI + 22. [23]Claas Hilbrecht NeoClock4X clock driver + 23. [24]Glenn Hollinger GOES clock driver + 24. [25]Mike Iglesias DEC Alpha port + 25. [26]Jim Jagielski A/UX port + 26. [27]Jeff Johnson massive prototyping overhaul - 26. [27]Hans Lambermont or - [28] ntpsweep - 27. [29]Poul-Henning Kamp Oncore driver (Original + 27. [28]Hans Lambermont or + [29] ntpsweep + 28. [30]Poul-Henning Kamp Oncore driver (Original author) - 28. [30]Frank Kardel [31] PARSE + 29. [31]Frank Kardel [32] PARSE (driver 14 reference clocks), STREAMS modules for PARSE, support scripts, syslog cleanup, dynamic interface handling - 29. [32]Johannes Maximilian Kuehn Rewrote sntp to + 30. [33]Johannes Maximilian Kuehn Rewrote sntp to comply with NTPv4 specification, ntpq saveconfig - 30. [33]William L. Jones RS/6000 AIX + 31. [34]William L. Jones RS/6000 AIX modifications, HPUX modifications - 31. [34]Dave Katz RS/6000 AIX port - 32. [35]Craig Leres 4.4BSD port, ppsclock, Magnavox + 32. [35]Dave Katz RS/6000 AIX port + 33. [36]Craig Leres 4.4BSD port, ppsclock, Magnavox GPS clock driver - 33. [36]George Lindholm SunOS 5.1 port - 34. [37]Louis A. Mamakos MD5-based authentication - 35. [38]Lars H. Mathiesen adaptation of foundation + 34. [37]George Lindholm SunOS 5.1 port + 35. [38]Louis A. Mamakos MD5-based authentication + 36. [39]Lars H. Mathiesen adaptation of foundation code for Version 3 as specified in RFC-1305 - 36. [39]Danny Mayer Network I/O, Windows Port, Code + 37. [40]Danny Mayer Network I/O, Windows Port, Code Maintenance - 37. [40]David L. Mills Version 4 foundation, precision + 38. [41]David L. Mills Version 4 foundation, precision kernel; clock drivers: 1, 3, 4, 6, 7, 11, 13, 18, 19, 22, 36 - 38. [41]Wolfgang Moeller VMS port - 39. [42]Jeffrey Mogul ntptrace utility - 40. [43]Tom Moore i386 svr4 port - 41. [44]Kamal A Mostafa SCO OpenServer port - 42. [45]Derek Mulcahy and [46]Damon + 39. [42]Wolfgang Moeller VMS port + 40. [43]Jeffrey Mogul ntptrace utility + 41. [44]Tom Moore i386 svr4 port + 42. [45]Kamal A Mostafa SCO OpenServer port + 43. [46]Derek Mulcahy and [47]Damon Hart-Davis ARCRON MSF clock driver - 43. [47]Rob Neal Bancomm refclock and config/parse code + 44. [48]Rob Neal Bancomm refclock and config/parse code maintenance - 44. [48]Rainer Pruy + 45. [49]Rainer Pruy monitoring/trap scripts, statistics file handling - 45. [49]Dirce Richards Digital UNIX V4.0 port - 46. [50]Wilfredo Sánchez added support for NetInfo - 47. [51]Nick Sayer SunOS streams modules - 48. [52]Jack Sasportas Saved a Lot of + 46. [50]Dirce Richards Digital UNIX V4.0 port + 47. [51]Wilfredo Sánchez added support for NetInfo + 48. [52]Nick Sayer SunOS streams modules + 49. [53]Jack Sasportas Saved a Lot of space on the stuff in the html/pic/ subdirectory - 49. [53]Ray Schnitzler Unixware1 port - 50. [54]Michael Shields USNO clock driver - 51. [55]Jeff Steinman Datum PTS clock driver - 52. [56]Harlan Stenn GNU automake/autoconfigure + 50. [54]Ray Schnitzler Unixware1 port + 51. [55]Michael Shields USNO clock driver + 52. [56]Jeff Steinman Datum PTS clock driver + 53. [57]Harlan Stenn GNU automake/autoconfigure makeover, various other bits (see the ChangeLog) - 53. [57]Kenneth Stone HP-UX port - 54. [58]Ajit Thyagarajan IP multicast/anycast support - 55. [59]Tomoaki TSURUOKA TRAK clock driver - 56. [60]Brian Utterback General codebase, + 54. [58]Kenneth Stone HP-UX port + 55. [59]Ajit Thyagarajan IP multicast/anycast support + 56. [60]Tomoaki TSURUOKA TRAK clock driver + 57. [61]Brian Utterback General codebase, Solaris issues - 57. [61]Loganaden Velvindron Sandboxing + 58. [62]Loganaden Velvindron Sandboxing (libseccomp) support - 58. [62]Paul A Vixie TrueTime GPS driver, generic + 59. [63]Paul A Vixie TrueTime GPS driver, generic TrueTime clock driver - 59. [63]Ulrich Windl corrected and + 60. [64]Ulrich Windl corrected and validated HTML documents according to the HTML DTD *** 224939 LINES SKIPPED *** From nobody Thu Jun 1 19:16:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXG8d2Zzvz4YyRP; Thu, 1 Jun 2023 19:16:49 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXG8d2DWDz3w1l; Thu, 1 Jun 2023 19:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685647009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2vrqvEd/TwZ4cawlJ+U1wI0wuy6sMEtzbQuEM8V3OI=; b=A2/bTyej0ck+5iJKXzMpM9PDm//kwMGw9nt2pSX8Xw+7dVzhJOcZmn0CmF7k9YzEZ0fSJs /Ih+vaFpRi0jg/Mvuypi/lKH1R83qWQ8w7f48SYHKbnzVycAwLSWPuHGGwe0rDN7FjdwJ+ FTLFhJyEpzAz9TMNKqOVDMLmVFGLjSf6DR6ruF4ZLp6oED8Qfdu0NYxQYrRpLWAJ5cbpyH +5vzpMl0G+znGYj1V1GARYRvKoy0DpInN83PGSt+b4v6DdJ7ffi/SNzhArk7+oWDL72FtF r/dJb6wz8XWaui/TzuZsTnr6YBuUMBkSKwy/eo2gdYB/ikYQ738mXo/p0cH42Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685647009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2vrqvEd/TwZ4cawlJ+U1wI0wuy6sMEtzbQuEM8V3OI=; b=UTfASNsIq2wyKCSkSAc7N1YN0DxMK6YXuOfSNGWdCRS5EYBV3apAJf3LG2kKbpsARKAwn7 6Rlc4Um287DrPr0wJ9Fz4XQXIFArSIBdzid8CfpF+HBESIQTooNDALnf+U7LT1Vx4JG+mq C2ztgLNbLPX9NEQlAcinPVjOD2vPh18nsdJPL7RaesO8ZAPNfpP37Niurt4/foR02he7/p 4PtLQMxkej/e50gOhLGY0tV+3WVmPFvYzWhnbtY39/DaeKpykhN12dt5AEqzOwVm1r4rD1 u3POwPqjC5rnt1UpzqYJ3nXgJOWfJJ7K5U8ilAKenHHrHPReyMLyrirV83FTvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685647009; a=rsa-sha256; cv=none; b=TjRknb/Iq01VJ8EbfxTjgnXT8WHUqlQimOuAX0KzlaB+am9b6HrV1HMxZF9j2DFLcIsoAw lFFAT38WBOg/r61wrp4sSN9fFDYF9tATr5Dd7Vjltl5lkvv394EBaAJUk05Hd0QMCBPxbe SDujGiogDV7BvDi7Lv6mSMrUSAgcPOywo5ctBxiTVrY3HJegu8izPOZqoA61h2fZHuX9NS nTrawWAgne9KsplBOINv54ynmqVyAlG2qPtok9mZK5OwkG7BCLqP0B56hefG98aY38uXVS QNupRk53EMNsDPn+u8ir5U/R/GJyCu6giHn8LQKRiwsAKXNOx9AvxTcGSiibGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXG8d1GRBzSyS; Thu, 1 Jun 2023 19:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351JGnXq081218; Thu, 1 Jun 2023 19:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351JGnrX081217; Thu, 1 Jun 2023 19:16:49 GMT (envelope-from git) Date: Thu, 1 Jun 2023 19:16:49 GMT Message-Id: <202306011916.351JGnrX081217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9058186bc1fa - stable/13 - Apply libc++ fix for compiling with clang 16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9058186bc1fa513a264fe949375f25f0061528eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9058186bc1fa513a264fe949375f25f0061528eb commit 9058186bc1fa513a264fe949375f25f0061528eb Author: Dimitry Andric AuthorDate: 2023-05-27 16:19:37 +0000 Commit: Dimitry Andric CommitDate: 2023-06-01 19:15:25 +0000 Apply libc++ fix for compiling with clang 16 Merge commit 0e7971154ecb from llvm-project (by Christopher Di Bella): [libcxx][NFC] utilises compiler builtins for unary transform type-traits Depends on D116203 Reviewed By: #libc, philnik Differential Revision: https://reviews.llvm.org/D131732 Clang 16 got new builtins that are equivalent to hand-written parts of . When building world with the devel/llvm16 package installed and CROSS_TOOLCHAIN=llvm16 set, this would lead to -Werror warnings about those builtins being overridden. Reported by: emaste MFC after: 3 days (cherry picked from commit 1f571f8767e6e48e7175cdaa27ed11d0c473d4c2) --- .../include/__type_traits/add_lvalue_reference.h | 12 +++++++++++- .../libcxx/include/__type_traits/add_pointer.h | 15 +++++++++++---- .../include/__type_traits/add_rvalue_reference.h | 12 +++++++++++- .../llvm-project/libcxx/include/__type_traits/decay.h | 9 ++++++++- .../libcxx/include/__type_traits/is_referenceable.h | 18 +++++++++++++----- .../libcxx/include/__type_traits/make_signed.h | 19 +++++++++++++------ .../libcxx/include/__type_traits/make_unsigned.h | 19 +++++++++++++------ .../libcxx/include/__type_traits/remove_all_extents.h | 7 +++++++ .../libcxx/include/__type_traits/remove_const.h | 8 ++++++++ .../libcxx/include/__type_traits/remove_cv.h | 8 ++++++++ .../libcxx/include/__type_traits/remove_cvref.h | 5 +++++ .../libcxx/include/__type_traits/remove_extent.h | 7 +++++++ .../libcxx/include/__type_traits/remove_pointer.h | 7 +++++++ .../libcxx/include/__type_traits/remove_reference.h | 7 +++++++ .../libcxx/include/__type_traits/remove_volatile.h | 8 ++++++++ contrib/llvm-project/libcxx/include/type_traits | 4 ++-- 16 files changed, 139 insertions(+), 26 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h index 0d1ee4185c8c..9126caa9c7e9 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h @@ -18,11 +18,21 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template ::value> struct __add_lvalue_reference_impl { typedef _LIBCPP_NODEBUG _Tp type; }; +#if __has_builtin(__add_lvalue_reference) +template +struct add_lvalue_reference { + using type _LIBCPP_NODEBUG = __add_lvalue_reference(_Tp); +}; +#else +template ::value> +struct __add_lvalue_reference_impl { + typedef _LIBCPP_NODEBUG _Tp type; +}; template struct __add_lvalue_reference_impl<_Tp, true> { typedef _LIBCPP_NODEBUG _Tp& type; }; template struct _LIBCPP_TEMPLATE_VIS add_lvalue_reference {typedef _LIBCPP_NODEBUG typename __add_lvalue_reference_impl<_Tp>::type type;}; +#endif // __has_builtin(__add_lvalue_reference) #if _LIBCPP_STD_VER > 11 template using add_lvalue_reference_t = typename add_lvalue_reference<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h index aea2490c5d0c..be3f758da4af 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h @@ -21,16 +21,23 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__add_pointer) +template +struct add_pointer { + using type _LIBCPP_NODEBUG = __add_pointer(_Tp); +}; +#else template ::value || - _IsSame::type, void>::value> -struct __add_pointer_impl - {typedef _LIBCPP_NODEBUG typename remove_reference<_Tp>::type* type;}; + bool = __libcpp_is_referenceable<_Tp>::value || _IsSame::type, void>::value> +struct __add_pointer_impl { + typedef _LIBCPP_NODEBUG typename remove_reference<_Tp>::type* type; +}; template struct __add_pointer_impl<_Tp, false> {typedef _LIBCPP_NODEBUG _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS add_pointer {typedef _LIBCPP_NODEBUG typename __add_pointer_impl<_Tp>::type type;}; +#endif // __has_builtin(__add_pointer) #if _LIBCPP_STD_VER > 11 template using add_pointer_t = typename add_pointer<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h index b2a1428095d8..be01d4ec5ba8 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h @@ -18,11 +18,21 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template ::value> struct __add_rvalue_reference_impl { typedef _LIBCPP_NODEBUG _Tp type; }; +#if __has_builtin(__add_rvalue_reference) +template +struct add_rvalue_reference { + using type _LIBCPP_NODEBUG = __add_rvalue_reference(_Tp); +}; +#else +template ::value> +struct __add_rvalue_reference_impl { + typedef _LIBCPP_NODEBUG _Tp type; +}; template struct __add_rvalue_reference_impl<_Tp, true> { typedef _LIBCPP_NODEBUG _Tp&& type; }; template struct _LIBCPP_TEMPLATE_VIS add_rvalue_reference {typedef _LIBCPP_NODEBUG typename __add_rvalue_reference_impl<_Tp>::type type;}; +#endif // __has_builtin(__add_rvalue_reference) #if _LIBCPP_STD_VER > 11 template using add_rvalue_reference_t = typename add_rvalue_reference<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/decay.h b/contrib/llvm-project/libcxx/include/__type_traits/decay.h index 2af0c1ca42c3..ced21d81c815 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/decay.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/decay.h @@ -26,6 +26,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__decay) +template +struct decay { + using type _LIBCPP_NODEBUG = __decay(_Tp); +}; +#else template struct __decay { typedef _LIBCPP_NODEBUG typename remove_cv<_Up>::type type; @@ -53,8 +59,9 @@ struct _LIBCPP_TEMPLATE_VIS decay private: typedef _LIBCPP_NODEBUG typename remove_reference<_Tp>::type _Up; public: - typedef _LIBCPP_NODEBUG typename __decay<_Up, __is_referenceable<_Up>::value>::type type; + typedef _LIBCPP_NODEBUG typename __decay<_Up, __libcpp_is_referenceable<_Up>::value>::type type; }; +#endif // __has_builtin(__decay) #if _LIBCPP_STD_VER > 11 template using decay_t = typename decay<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_referenceable.h b/contrib/llvm-project/libcxx/include/__type_traits/is_referenceable.h index b97631cc39dd..4b34ec257231 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_referenceable.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_referenceable.h @@ -19,14 +19,22 @@ _LIBCPP_BEGIN_NAMESPACE_STD -struct __is_referenceable_impl { - template static _Tp& __test(int); - template static false_type __test(...); +#if __has_builtin(__is_referenceable) +template +struct __libcpp_is_referenceable : integral_constant {}; +#else +struct __libcpp_is_referenceable_impl { + template + static _Tp& __test(int); + template + static false_type __test(...); }; template -struct __is_referenceable : integral_constant(0)), false_type>::value> {}; +struct __libcpp_is_referenceable + : integral_constant(0)), false_type>::value> { +}; +#endif // __has_builtin(__is_referenceable) _LIBCPP_END_NAMESPACE_STD diff --git a/contrib/llvm-project/libcxx/include/__type_traits/make_signed.h b/contrib/llvm-project/libcxx/include/__type_traits/make_signed.h index fbc31172a978..c36e2292f16f 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/make_signed.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/make_signed.h @@ -23,19 +23,25 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__make_signed) +template +struct make_signed { + using type _LIBCPP_NODEBUG = __make_signed(_Tp); +}; +#else typedef __type_list -#endif +# endif > > > > > __signed_types; template ::value || is_enum<_Tp>::value> @@ -56,16 +62,17 @@ template <> struct __make_signed< signed long, true> {typedef long ty template <> struct __make_signed {typedef long type;}; template <> struct __make_signed< signed long long, true> {typedef long long type;}; template <> struct __make_signed {typedef long long type;}; -#ifndef _LIBCPP_HAS_NO_INT128 +# ifndef _LIBCPP_HAS_NO_INT128 template <> struct __make_signed<__int128_t, true> {typedef __int128_t type;}; template <> struct __make_signed<__uint128_t, true> {typedef __int128_t type;}; -#endif +# endif template struct _LIBCPP_TEMPLATE_VIS make_signed { typedef typename __apply_cv<_Tp, typename __make_signed::type>::type>::type type; }; +#endif // __has_builtin(__make_signed) #if _LIBCPP_STD_VER > 11 template using make_signed_t = typename make_signed<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/make_unsigned.h b/contrib/llvm-project/libcxx/include/__type_traits/make_unsigned.h index 8110a5ca9609..6d4e482a8d97 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/make_unsigned.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/make_unsigned.h @@ -25,19 +25,25 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__make_unsigned) +template +struct make_unsigned { + using type _LIBCPP_NODEBUG = __make_unsigned(_Tp); +}; +#else typedef __type_list -#endif +# endif > > > > > __unsigned_types; template ::value || is_enum<_Tp>::value> @@ -58,16 +64,17 @@ template <> struct __make_unsigned< signed long, true> {typedef unsigned l template <> struct __make_unsigned {typedef unsigned long type;}; template <> struct __make_unsigned< signed long long, true> {typedef unsigned long long type;}; template <> struct __make_unsigned {typedef unsigned long long type;}; -#ifndef _LIBCPP_HAS_NO_INT128 +# ifndef _LIBCPP_HAS_NO_INT128 template <> struct __make_unsigned<__int128_t, true> {typedef __uint128_t type;}; template <> struct __make_unsigned<__uint128_t, true> {typedef __uint128_t type;}; -#endif +# endif template struct _LIBCPP_TEMPLATE_VIS make_unsigned { typedef typename __apply_cv<_Tp, typename __make_unsigned::type>::type>::type type; }; +#endif // __has_builtin(__make_unsigned) #if _LIBCPP_STD_VER > 11 template using make_unsigned_t = typename make_unsigned<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h index 075e3acabb44..cc00a61c92b3 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h @@ -18,12 +18,19 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_all_extents) +template +struct remove_all_extents { + using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp); +}; +#else template struct _LIBCPP_TEMPLATE_VIS remove_all_extents {typedef _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[]> {typedef typename remove_all_extents<_Tp>::type type;}; template struct _LIBCPP_TEMPLATE_VIS remove_all_extents<_Tp[_Np]> {typedef typename remove_all_extents<_Tp>::type type;}; +#endif // __has_builtin(__remove_all_extents) #if _LIBCPP_STD_VER > 11 template using remove_all_extents_t = typename remove_all_extents<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_const.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_const.h index 8efc893e965a..8eefbd099cb3 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_const.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_const.h @@ -17,8 +17,16 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_const) +template +struct remove_const { + using type _LIBCPP_NODEBUG = __remove_const(_Tp); +}; +#else template struct _LIBCPP_TEMPLATE_VIS remove_const {typedef _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_const {typedef _Tp type;}; +#endif // __has_builtin(__remove_const) + #if _LIBCPP_STD_VER > 11 template using remove_const_t = typename remove_const<_Tp>::type; #endif diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h index ce1e4e45c6d1..9e3dee6c46ed 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -19,8 +19,16 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_cv) +template +struct remove_cv { + using type _LIBCPP_NODEBUG = __remove_cv(_Tp); +}; +#else template struct _LIBCPP_TEMPLATE_VIS remove_cv {typedef typename remove_volatile::type>::type type;}; +#endif // __has_builtin(__remove_cv) + #if _LIBCPP_STD_VER > 11 template using remove_cv_t = typename remove_cv<_Tp>::type; #endif diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h index d937501fedce..3af261db3949 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h @@ -20,8 +20,13 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_cvref) +template +using __uncvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); +#else template using __uncvref_t _LIBCPP_NODEBUG = typename remove_cv::type>::type; +#endif // __has_builtin(__remove_cvref) template struct __is_same_uncvref : _IsSame<__uncvref_t<_Tp>, __uncvref_t<_Up> > {}; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h index e353de361616..88da32a4e265 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h @@ -18,12 +18,19 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_extent) +template +struct remove_extent { + using type _LIBCPP_NODEBUG = __remove_extent(_Tp); +}; +#else template struct _LIBCPP_TEMPLATE_VIS remove_extent {typedef _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[]> {typedef _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_extent<_Tp[_Np]> {typedef _Tp type;}; +#endif // __has_builtin(__remove_extent) #if _LIBCPP_STD_VER > 11 template using remove_extent_t = typename remove_extent<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h index 50cde3829470..9042a5250055 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h @@ -17,11 +17,18 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_pointer) +template +struct remove_pointer { + using type _LIBCPP_NODEBUG = __remove_pointer(_Tp); +}; +#else template struct _LIBCPP_TEMPLATE_VIS remove_pointer {typedef _LIBCPP_NODEBUG _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp*> {typedef _LIBCPP_NODEBUG _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const> {typedef _LIBCPP_NODEBUG _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* volatile> {typedef _LIBCPP_NODEBUG _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const volatile> {typedef _LIBCPP_NODEBUG _Tp type;}; +#endif // __has_builtin(__remove_pointer) #if _LIBCPP_STD_VER > 11 template using remove_pointer_t = typename remove_pointer<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h index a69e48dc584b..7ea7fa52ecc5 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h @@ -18,9 +18,16 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_reference) +template +struct remove_reference { + using type _LIBCPP_NODEBUG = __remove_reference(_Tp); +}; +#else template struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _LIBCPP_NODEBUG _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _LIBCPP_NODEBUG _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _LIBCPP_NODEBUG _Tp type;}; +#endif // __has_builtin(__remove_reference) #if _LIBCPP_STD_VER > 11 template using remove_reference_t = typename remove_reference<_Tp>::type; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_volatile.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_volatile.h index 79f64c46a27d..8c7aa6744193 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_volatile.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_volatile.h @@ -17,8 +17,16 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_volatile) +template +struct remove_volatile { + using type _LIBCPP_NODEBUG = __remove_volatile(_Tp); +}; +#else template struct _LIBCPP_TEMPLATE_VIS remove_volatile {typedef _Tp type;}; template struct _LIBCPP_TEMPLATE_VIS remove_volatile {typedef _Tp type;}; +#endif // __has_builtin(__remove_volatile) + #if _LIBCPP_STD_VER > 11 template using remove_volatile_t = typename remove_volatile<_Tp>::type; #endif diff --git a/contrib/llvm-project/libcxx/include/type_traits b/contrib/llvm-project/libcxx/include/type_traits index 3a086c595f92..dc05f9a44daf 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -679,7 +679,7 @@ struct _LIBCPP_TEMPLATE_VIS is_swappable_with template struct _LIBCPP_TEMPLATE_VIS is_swappable : public conditional< - __is_referenceable<_Tp>::value, + __libcpp_is_referenceable<_Tp>::value, is_swappable_with< typename add_lvalue_reference<_Tp>::type, typename add_lvalue_reference<_Tp>::type>, @@ -697,7 +697,7 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable_with template struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable : public conditional< - __is_referenceable<_Tp>::value, + __libcpp_is_referenceable<_Tp>::value, is_nothrow_swappable_with< typename add_lvalue_reference<_Tp>::type, typename add_lvalue_reference<_Tp>::type>, From nobody Thu Jun 1 19:16:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXG8f3yH1z4YyX4; Thu, 1 Jun 2023 19:16:50 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXG8f2xNKz3w9C; Thu, 1 Jun 2023 19:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685647010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXWXCysP0KNuDFndcmhzhbq+PGtqWsmyTuQRrK6Zem0=; b=NcKXpofZ6EHVB+wAM32+iEwU6YFpHBIIGc7a0qU6PRHBj65UXxBgIqU+4mnmpa9oii/3GO rjuuq/MKY172FJKZwhhH+bG1ICUEaXdj5X5ofC2/93yvp4KestYj2dg7gqxd0O0A5zSuQ6 YyTRCG2unWvNB6EvMr4WQ/+Nm1pa7hlFe03+SeoEpz49f0vbsTu/f2PrdpcW/Yre4jLAsJ WasjoJUIIB/7jqTmWbhLNH7yiM7es36qPPPsMEVHaoxDV6RQhn3MRS1SH8tggAiS96XrJ9 +a6JFY+MSg7k4qs2UrAnIAWjnHrg1XKay64tJrR1fd1gAl1op1dEG3FnhdKJ+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685647010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXWXCysP0KNuDFndcmhzhbq+PGtqWsmyTuQRrK6Zem0=; b=JZVae5RVdsjLBqdtensJHgE3IamSF/teU+vywknicDX9VYrXWMU22OiQceuVxwoX8lgFBk Fe6rhh/NF8Wyk/rYpjTiqG//1KevrIHrWPxwUIejp02JCzL3cf8paAHApz5G6s5HG39ezp tWOvSWX4nzB0w/R7hr/hCWggZe3QpulRWWSKowD5be/Lho+VacSndw5wriw5FGCruj2mhk Y83mTDxxTaNuE25wFqKdWOzMLgI6Y8ghRTgq5NIm30WQ/0SX6gK1VEaEj7Xx/KwH6OB8q0 tdPBOoYN2gB93YqIOehYXtSoz96nZk/0hCpdU1M99NIuV6V4TnHl5Ca1Bz+VeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685647010; a=rsa-sha256; cv=none; b=oSsspVuHKx4NNPR90uisQwYkI3ZoeNw5w57PFaUC7EcEu/hEJaTggGo62XdnEGAyPwF1Mg LOLFQOqeTCqg8XCU9CDiVyqizFWrkNM8T6LlKbf/nM10aoJ/Gol5IVCL4u4yLgplbca4AE KscI8tsWQKQq6JQk1Kqt17TVZJNkJCABSsAWkaRHSv6GvauaKRCGQ0By7yYkxvd1/nIO9n MTRj4K5JiP/P2fJSDGZYyl7G3NXnZ7DJRld/Y/1+bfNRINnsewVSj+p9IcPQWUzFtMSFvI xaY8J5sabGURFbTtuY+HJbrhA3p8RcAQXIXdB3SUEB20qRoXDcxhpyspPfW8iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXG8f1xQpzT6y; Thu, 1 Jun 2023 19:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351JGosv081237; Thu, 1 Jun 2023 19:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351JGoMW081236; Thu, 1 Jun 2023 19:16:50 GMT (envelope-from git) Date: Thu, 1 Jun 2023 19:16:50 GMT Message-Id: <202306011916.351JGoMW081236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3cc4f10db0fe - stable/13 - Apply clang fixes for crashes compiling ARM/AArch64 CRC intrinsics List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cc4f10db0feca9d54bbfc615328b317a5c6b4c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc4f10db0feca9d54bbfc615328b317a5c6b4c8 commit 3cc4f10db0feca9d54bbfc615328b317a5c6b4c8 Author: Dimitry Andric AuthorDate: 2023-05-29 14:27:58 +0000 Commit: Dimitry Andric CommitDate: 2023-06-01 19:15:31 +0000 Apply clang fixes for crashes compiling ARM/AArch64 CRC intrinsics Merge commit 069ecd0c6e2c from llvm-project (by Fangrui Song): [ARM] Check target feature support for __builtin_arm_crc* `__builtin_arm_crc*` requires the target feature crc which is available on armv8 and above. Calling the fuctions for armv7 leads to a SelectionDAG crash. ``` % clang -c --target=armv7-unknown-linux-gnueabi -c a.c fatal error: error in backend: Cannot select: intrinsic %llvm.arm.crc32b PLEASE submit a bug report to ... ``` Add `TARGET_BUILTIN` and define required features for these builtins to report an error in `CodeGenFunction::checkTargetFeatures`. The problem is quite widespread. I will add `TARGET_BUILTIN` for more builtins later. Fix https://github.com/llvm/llvm-project/issues/57802 Differential Revision: https://reviews.llvm.org/D134127 Merge commit b2d7a0dcf1ff from llvm-project (by Fangrui Song): [AArch64] Check target feature support for __builtin_arm_crc* This is the AArch64 counterpart of D134127. Daniel Kiss will change more `BUILTIN` to `TARGET_BUILTIN`. Fix #57802 Note that programs attempting to use ARM/AArch64 CRC intrinsics, when they are not supported by the targeted CPU, will still receive a regular compilation error (instead of a fatal backend error) similar to: 7zCrc.c:4:10: error: '__builtin_arm_crc32b' needs target feature crc return __builtin_arm_crc32b(a, b); ^ Reported by: Alastair Hogge PR: 271624 MFC after: 3 days (cherry picked from commit 8792c03886d9e6df10fbac825819603dc059c7ea) --- .../clang/include/clang/Basic/BuiltinsAArch64.def | 20 ++++++++++++-------- .../clang/include/clang/Basic/BuiltinsARM.def | 20 ++++++++++++-------- .../llvm-project/clang/lib/Basic/Targets/AArch64.cpp | 2 ++ contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp | 2 ++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def index 65ab4fcced9a..3c0a5f12681d 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def +++ b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def @@ -17,6 +17,10 @@ # define LANGBUILTIN(ID, TYPE, ATTRS, BUILTIN_LANG) BUILTIN(ID, TYPE, ATTRS) #endif +#if defined(BUILTIN) && !defined(TARGET_BUILTIN) +# define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) BUILTIN(ID, TYPE, ATTRS) +#endif + #if defined(BUILTIN) && !defined(TARGET_HEADER_BUILTIN) # define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANG, FEATURE) BUILTIN(ID, TYPE, ATTRS) #endif @@ -45,14 +49,14 @@ BUILTIN(__builtin_arm_sev, "v", "") BUILTIN(__builtin_arm_sevl, "v", "") // CRC32 -BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32d, "UiUiWUi", "nc") -BUILTIN(__builtin_arm_crc32cd, "UiUiWUi", "nc") +TARGET_BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32d, "UiUiWUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cd, "UiUiWUi", "nc", "crc") // Memory Tagging Extensions (MTE) BUILTIN(__builtin_arm_irg, "v*v*Ui", "t") diff --git a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def index 0cea0a9051e5..53fe64c317d1 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def +++ b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def @@ -17,6 +17,10 @@ # define LANGBUILTIN(ID, TYPE, ATTRS, BUILTIN_LANG) BUILTIN(ID, TYPE, ATTRS) #endif +#if defined(BUILTIN) && !defined(TARGET_BUILTIN) +# define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) BUILTIN(ID, TYPE, ATTRS) +#endif + #if defined(BUILTIN) && !defined(TARGET_HEADER_BUILTIN) # define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANG, FEATURE) BUILTIN(ID, TYPE, ATTRS) #endif @@ -157,14 +161,14 @@ BUILTIN(__builtin_arm_mrrc, "LLUiUIiUIiUIi", "") BUILTIN(__builtin_arm_mrrc2, "LLUiUIiUIiUIi", "") // CRC32 -BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32d, "UiUiLLUi", "nc") -BUILTIN(__builtin_arm_crc32cd, "UiUiLLUi", "nc") +TARGET_BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32d, "UiUiLLUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cd, "UiUiLLUi", "nc", "crc") // ARMv8-M Security Extensions a.k.a CMSE BUILTIN(__builtin_arm_cmse_TT, "Uiv*", "n") diff --git a/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp b/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp index 8d8972c1613a..22b7cf4d0c7e 100644 --- a/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp +++ b/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp @@ -35,6 +35,8 @@ const Builtin::Info AArch64TargetInfo::BuiltinInfo[] = { {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr}, #define LANGBUILTIN(ID, TYPE, ATTRS, LANG) \ {#ID, TYPE, ATTRS, nullptr, LANG, nullptr}, +#define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) \ + {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE}, #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE) \ {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE}, #include "clang/Basic/BuiltinsAArch64.def" diff --git a/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp b/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp index b2f61cff81c9..159b00dea5bb 100644 --- a/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp +++ b/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp @@ -979,6 +979,8 @@ const Builtin::Info ARMTargetInfo::BuiltinInfo[] = { {#ID, TYPE, ATTRS, nullptr, LANG, nullptr}, #define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) \ {#ID, TYPE, ATTRS, HEADER, ALL_LANGUAGES, nullptr}, +#define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) \ + {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE}, #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE) \ {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE}, #include "clang/Basic/BuiltinsARM.def" From nobody Thu Jun 1 19:17:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXG8t2MF9z4YyTR; Thu, 1 Jun 2023 19:17:02 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXG8t1sfFz3wKq; Thu, 1 Jun 2023 19:17:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685647022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rElVcCtqnv+l3VX4uDC8uxUrJBlcuP3QsPvBst7+oo=; b=eHW9TqaLEbcTC6I0lgs935GcFRHiftFov3lzRN3TJyTVBQOAbldI8GHluaibGbMyEqVNOF ek5wMhUqTe5AvqUdGXKnmT2zcEwMrwm03fxJXWRM9vWk45PSJ5j90w/3dk05Isqm/rtckY +IbWs5rgOQNLw2EGdpbCZQDOy43wa0bsbV0vwMEhp6/Dut/fchyMbTJSKgAfwmhqOLI5hi U/doQSAmTPqUnmMnIRkQXhApwPknsqk6McQLu3McIyk3nTEyl6aRVDqKpLOdZjXdIBYeOP mXwU3A0k6HhCbp0Wc8XK5MrLpFVrqFAlz2zu8NPZTdp2B403qLaefMjDHU8Amw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685647022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rElVcCtqnv+l3VX4uDC8uxUrJBlcuP3QsPvBst7+oo=; b=J/GfhQlE2t8D6l8AIig4kRGCNx+E5NOfGX2X4m0Dk9ASid6YFa4yR14gOVb4KaSq41vOlN 4+WiQ7AL/Ycminq2fVTWHcjVpmV/32eSdpYRwZZ6HsVk69awvsFNuZvYEwjVCawHUFslXN 1Ua9kOSyyI1Q07hys1kPqDVzQBaZJsEb1eeTQP7ibgeaU9DQGbteedIZI4AEtgKXMxhKsP 2emrk49F7uIWLJj9OUBJE1KiuQcy+9ZhGUwkRM74y/ZA/f805geMJXuZCnIFjGBMRuZuH3 sALBMu40pZJSzCT8/zBcYPfq6rGteZKAZBHHyB5BOWtyomFOk800edY63d272g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685647022; a=rsa-sha256; cv=none; b=GlKiZO3f31ViTcoMbaqn9EmN8aKh2OHlafBVnwgpjfH1/pgKCe/Yie/g2ttDklfCh1ohk4 ZVf/L+MY9k8sXFA1IyuMvO5AbfcP7Y7wrtAAaT4UsVd2qqdFMZruc7iqhDe7u9JNQAVY/b B8xizU2NLkCMJbW5hFnxG5pN4sKE35GPUDsQGwdXP1E1qmfREa683KtjeD1BvOHY6CeuW6 0IEP8YjEZ4fZhBRGOWrHGt+6fUFWkYA72Gmd700iI94fw6SJs/9ftaGh8hNrMTLGN+BVTL M3Jvv2jm7hdaQ8q823yekukr65yqV/shymUFKr2ll4p6nErXHFpelX70Q8qSCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXG8t0xjDzT1p; Thu, 1 Jun 2023 19:17:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351JH2lv081385; Thu, 1 Jun 2023 19:17:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351JH2pB081384; Thu, 1 Jun 2023 19:17:02 GMT (envelope-from git) Date: Thu, 1 Jun 2023 19:17:02 GMT Message-Id: <202306011917.351JH2pB081384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: dbbac83e39fa - stable/12 - Apply clang fixes for crashes compiling ARM/AArch64 CRC intrinsics List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: dbbac83e39faca07c6081cd549128c253861cdac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dbbac83e39faca07c6081cd549128c253861cdac commit dbbac83e39faca07c6081cd549128c253861cdac Author: Dimitry Andric AuthorDate: 2023-05-29 14:27:58 +0000 Commit: Dimitry Andric CommitDate: 2023-06-01 19:16:11 +0000 Apply clang fixes for crashes compiling ARM/AArch64 CRC intrinsics Merge commit 069ecd0c6e2c from llvm-project (by Fangrui Song): [ARM] Check target feature support for __builtin_arm_crc* `__builtin_arm_crc*` requires the target feature crc which is available on armv8 and above. Calling the fuctions for armv7 leads to a SelectionDAG crash. ``` % clang -c --target=armv7-unknown-linux-gnueabi -c a.c fatal error: error in backend: Cannot select: intrinsic %llvm.arm.crc32b PLEASE submit a bug report to ... ``` Add `TARGET_BUILTIN` and define required features for these builtins to report an error in `CodeGenFunction::checkTargetFeatures`. The problem is quite widespread. I will add `TARGET_BUILTIN` for more builtins later. Fix https://github.com/llvm/llvm-project/issues/57802 Differential Revision: https://reviews.llvm.org/D134127 Merge commit b2d7a0dcf1ff from llvm-project (by Fangrui Song): [AArch64] Check target feature support for __builtin_arm_crc* This is the AArch64 counterpart of D134127. Daniel Kiss will change more `BUILTIN` to `TARGET_BUILTIN`. Fix #57802 Note that programs attempting to use ARM/AArch64 CRC intrinsics, when they are not supported by the targeted CPU, will still receive a regular compilation error (instead of a fatal backend error) similar to: 7zCrc.c:4:10: error: '__builtin_arm_crc32b' needs target feature crc return __builtin_arm_crc32b(a, b); ^ Reported by: Alastair Hogge PR: 271624 MFC after: 3 days (cherry picked from commit 8792c03886d9e6df10fbac825819603dc059c7ea) --- .../clang/include/clang/Basic/BuiltinsAArch64.def | 20 ++++++++++++-------- .../clang/include/clang/Basic/BuiltinsARM.def | 20 ++++++++++++-------- .../llvm-project/clang/lib/Basic/Targets/AArch64.cpp | 2 ++ contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp | 2 ++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def index 634bcaed20a6..244280a68d75 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def +++ b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsAArch64.def @@ -17,6 +17,10 @@ # define LANGBUILTIN(ID, TYPE, ATTRS, BUILTIN_LANG) BUILTIN(ID, TYPE, ATTRS) #endif +#if defined(BUILTIN) && !defined(TARGET_BUILTIN) +# define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) BUILTIN(ID, TYPE, ATTRS) +#endif + #if defined(BUILTIN) && !defined(TARGET_HEADER_BUILTIN) # define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANG, FEATURE) BUILTIN(ID, TYPE, ATTRS) #endif @@ -45,14 +49,14 @@ BUILTIN(__builtin_arm_sev, "v", "") BUILTIN(__builtin_arm_sevl, "v", "") // CRC32 -BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32d, "UiUiWUi", "nc") -BUILTIN(__builtin_arm_crc32cd, "UiUiWUi", "nc") +TARGET_BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32d, "UiUiWUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cd, "UiUiWUi", "nc", "crc") // Memory Tagging Extensions (MTE) BUILTIN(__builtin_arm_irg, "v*v*Ui", "t") diff --git a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def index be20c24aa28a..0e98f8680063 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def +++ b/contrib/llvm-project/clang/include/clang/Basic/BuiltinsARM.def @@ -17,6 +17,10 @@ # define LANGBUILTIN(ID, TYPE, ATTRS, BUILTIN_LANG) BUILTIN(ID, TYPE, ATTRS) #endif +#if defined(BUILTIN) && !defined(TARGET_BUILTIN) +# define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) BUILTIN(ID, TYPE, ATTRS) +#endif + #if defined(BUILTIN) && !defined(TARGET_HEADER_BUILTIN) # define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANG, FEATURE) BUILTIN(ID, TYPE, ATTRS) #endif @@ -157,14 +161,14 @@ BUILTIN(__builtin_arm_mrrc, "LLUiUIiUIiUIi", "") BUILTIN(__builtin_arm_mrrc2, "LLUiUIiUIiUIi", "") // CRC32 -BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc") -BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc") -BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc") -BUILTIN(__builtin_arm_crc32d, "UiUiLLUi", "nc") -BUILTIN(__builtin_arm_crc32cd, "UiUiLLUi", "nc") +TARGET_BUILTIN(__builtin_arm_crc32b, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cb, "UiUiUc", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32h, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32ch, "UiUiUs", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32w, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cw, "UiUiUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32d, "UiUiLLUi", "nc", "crc") +TARGET_BUILTIN(__builtin_arm_crc32cd, "UiUiLLUi", "nc", "crc") // ARMv8-M Security Extensions a.k.a CMSE BUILTIN(__builtin_arm_cmse_TT, "Uiv*", "n") diff --git a/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp b/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp index e163ebfa2348..c4ab1bc961af 100644 --- a/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp +++ b/contrib/llvm-project/clang/lib/Basic/Targets/AArch64.cpp @@ -35,6 +35,8 @@ const Builtin::Info AArch64TargetInfo::BuiltinInfo[] = { {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr}, #define LANGBUILTIN(ID, TYPE, ATTRS, LANG) \ {#ID, TYPE, ATTRS, nullptr, LANG, nullptr}, +#define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) \ + {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE}, #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE) \ {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE}, #include "clang/Basic/BuiltinsAArch64.def" diff --git a/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp b/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp index 0e4048f8d5ff..36d3b34a897a 100644 --- a/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp +++ b/contrib/llvm-project/clang/lib/Basic/Targets/ARM.cpp @@ -895,6 +895,8 @@ const Builtin::Info ARMTargetInfo::BuiltinInfo[] = { {#ID, TYPE, ATTRS, nullptr, LANG, nullptr}, #define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) \ {#ID, TYPE, ATTRS, HEADER, ALL_LANGUAGES, nullptr}, +#define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) \ + {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE}, #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE) \ {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE}, #include "clang/Basic/BuiltinsARM.def" From nobody Thu Jun 1 22:18:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXL9w4rq6z4YTYy; Thu, 1 Jun 2023 22:18:12 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXL9w3yKgz4MN8; Thu, 1 Jun 2023 22:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685657892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DknudA0OdPczu0jdzjeznoT7P67QqfkHpLmoYWvZiUE=; b=lV8PpSKRzvZ+1f7MGNsP8/93UHkN7/mLx/trSm3nL5WlCC8iLXZmJkmtQ2Y9aAo2A91opv gSsQSyq2z6J8c1mWfO97F5S+EMttZPGSskWk9KJ3Qh0r+SdIHFguTrIbnRgVA9krczXc57 FUIHRqinkEZWLwJpxfKHSs+LmcgfcPmMFzj+B4PbpC4NOrgkJxFd0Mi0bWE8MPPC5236VO ZsDm4Wk9R5Iz9xQotilArg1bLqhKaQUSrElb7ifcRFzt8O8NIMZ/6w44ian7aDv6Fw/xKo Qp95gszHekeokBf1nH/O6KOm/XpzYjmYIAzhqxtZbgkYajdLChQjTo6shV9OVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685657892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DknudA0OdPczu0jdzjeznoT7P67QqfkHpLmoYWvZiUE=; b=gvXPyMIYpmhszdq2UkmbKslHC6pMktZqX84x1F48fDWEKllB/mzNI99vf0fR3hI4RrS9mq 27NY/5vM3QOx4RsN3sruHsPUeT+TwOYAI+n1riM7/1VVOem4gqZHMyt9fkG6MpTVm8tDKz lLRRxuQ88iZd3pYzFk7XKSBnKXjRoTiTpKfr/8v+PULsrY5+HmhiBq7+7zsvp9Ka/zzyf4 CuFE+irPms6gGaAY/BwguY2p8jk573AjFyjmuRhjAWxEvjDSl3Hk5MiqcpMqcuePmSpqtE lNoG67aNo1R3Qgvi3Ew1DDoA9A43/CI4oSUqhjnKEyWBWSuBxBMwu+iWMPXg5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685657892; a=rsa-sha256; cv=none; b=f95nNqTZUFVc6X8ACN5g9sgG+zTwsn7Rhfa9MQA5qG9fK9eXBKFBewPomPX3y0TmfsqzrI GD+onQe/UhCJ6E5GpHwH5mKBWDo3qrtb+URtZXmtPOf6OYdU9ncE9q+FshXeXbss8ki78g cEjlFxjVzEjX+6UWTRMcZmMbQ/J3GCsOmh+KiSc6PlP9zoXOh/ZL0Ztu3vio52tP5Z4wxk vSBfvkOs/XBIFPwX1tQnUDLar7QKJSww764uzPxGiGGh23zQsEPL0YHf6gFW7D5zBWnmfY xdPwQb4P6H6k9GTL1c3uy7Z2RN6SYKWEzOhi2T0ODhUg7QryluDFDSQ/HIgOow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXL9w2v6hzYqb; Thu, 1 Jun 2023 22:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351MICwr078862; Thu, 1 Jun 2023 22:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351MIC4Z078861; Thu, 1 Jun 2023 22:18:12 GMT (envelope-from git) Date: Thu, 1 Jun 2023 22:18:12 GMT Message-Id: <202306012218.351MIC4Z078861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 58df1aed1c18 - stable/12 - ntp: Update version string List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 58df1aed1c18d4a0418fd40ad18d2e930e788bfd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=58df1aed1c18d4a0418fd40ad18d2e930e788bfd commit 58df1aed1c18d4a0418fd40ad18d2e930e788bfd Author: Cy Schubert AuthorDate: 2023-06-01 21:40:00 +0000 Commit: Cy Schubert CommitDate: 2023-06-01 22:18:06 +0000 ntp: Update version string Chase a466cc55373f, updating the version string in the local config.h. Reported by: Trond Endrestol Fixes: a466cc55373f (cherry picked from commit 4d780613774c28a1efe4dc6272ae5fbc09d999f4) --- usr.sbin/ntp/config.h | 6 +++--- usr.sbin/ntp/scripts/mkver | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index c76cc714ac55..34264c0b9759 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1468,7 +1468,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p15" +#define PACKAGE_STRING "ntp 4.2.8p16" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1477,7 +1477,7 @@ #define PACKAGE_URL "http://www.ntp.org./" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.8p15" +#define PACKAGE_VERSION "4.2.8p16" /* data dir */ #define PERLLIBDIR "/usr/share/ntp/lib" @@ -1658,7 +1658,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p15" +#define VERSION "4.2.8p16" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index f193db55f1b4..16eaa39de1cd 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -8,7 +8,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p15" +ConfStr="$ConfStr 4.2.8p16" case "$CSET" in '') ;; From nobody Thu Jun 1 22:18:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXLBF4JTFz4YTLt; Thu, 1 Jun 2023 22:18:29 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXLBF3n50z4MRt; Thu, 1 Jun 2023 22:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685657909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgJ5ZFE+QUZ5fWxBRdmvzIUQim/vl3FQd5TXRVPxQjU=; b=kzKWHU1LmdPoh2M6h5oCNLSs4jyGOrFbg7WqQgxkDXHLF9nzJb/7mo2KkIBqkrXa3W+tOC FnZO5aZXsMQW8tCixmGMdMvE21pdePe+6zMKacuFTBh4pJTFGdbbKyFaaxbwlh8TtG2nOb a3wrUkl0S8iTolyHi7lTkkBwvhoFVatthtTqV7RAqq8VVwHSblEGPHecZfOlzgUzP/KPD+ Pup7dBmcA+Rzx7d3MCt9+wTLC0HMkZ3p/MnSSr/STltm+DOr4968jFgRSuOM2lXrZgVncv wEE28ndmysCIh4FrZFDkQiXiEzfSpQMk5qs/BZhpgJXpImAmRFwKWWlybMitLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685657909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgJ5ZFE+QUZ5fWxBRdmvzIUQim/vl3FQd5TXRVPxQjU=; b=GURKu9//kASj7Ze4KjV776qek6LdDClCiB9PVR+2AfWOsR1NsbnCKhZ+rQRFbZUC6PDgRh 4FTJUFzX22XAePinttY5kzSG6UKx6gJYdTn9Bp7Mv7BKXZUET0xCRntd1GlmRBotp2R7KU VXMMfAMMclwSlD332KAcR+Wb0xq8LhOpYgba/7Y222V3Ko4UEwAj8EgLLkWFtAkVTrtrrU LEtwoHodb9AkUtTgtDbo8p6F6UQTCr+MNTGvV+mJ8CPRX5jv44XgrYPaVuxmZqJAEmmFa0 4vwXKsNGk2SwgYL+6YKfBf8XoxKAVC7cQ0yHIbAqiF7wAvuOpSGVtG4cG3nLqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685657909; a=rsa-sha256; cv=none; b=jTe2tCFtR6IJ9RysANXaZ1XUMJyOF5ZN5Rt/+jzCaZ82F9WjWfgzAuy3R7BQED5OXBLv49 t1RawkCQfFV7jBTYjNt3bsi4rdalijyThvNifiHrvYkz1kzgzmz5CecLSo9sQH2q0TxfY0 HMSsem3Q5T/cva0WSRhvcr+eJ9quXWXiVfoRogiYhYMb7kGLVTVQoWLG7eahu46Vj8Qohy rIExsR7B4fPYytCayOL0Hv2queYxwnlaDts6pEmdJ8rM1r2HHLGYAi3yG/5mgp2fBG+sH/ 0NI+xx4XEPB34aoSVDwCs8MlJF3yBpq8Xy+82kry1h6bSZ6hxFeSsubN5zD8xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXLBF2qQHzZFw; Thu, 1 Jun 2023 22:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351MITjK079001; Thu, 1 Jun 2023 22:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351MITa5079000; Thu, 1 Jun 2023 22:18:29 GMT (envelope-from git) Date: Thu, 1 Jun 2023 22:18:29 GMT Message-Id: <202306012218.351MITa5079000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: b916516fddd4 - stable/13 - ntp: Update version string List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b916516fddd439a2b7ca03c98641c75eb1abffb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b916516fddd439a2b7ca03c98641c75eb1abffb4 commit b916516fddd439a2b7ca03c98641c75eb1abffb4 Author: Cy Schubert AuthorDate: 2023-06-01 21:40:00 +0000 Commit: Cy Schubert CommitDate: 2023-06-01 22:18:21 +0000 ntp: Update version string Chase a466cc55373f, updating the version string in the local config.h. Reported by: Trond Endrestol Fixes: a466cc55373f (cherry picked from commit 4d780613774c28a1efe4dc6272ae5fbc09d999f4) --- usr.sbin/ntp/config.h | 6 +++--- usr.sbin/ntp/scripts/mkver | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 7446d199e16f..ef26b199a5bc 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1468,7 +1468,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p15" +#define PACKAGE_STRING "ntp 4.2.8p16" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1477,7 +1477,7 @@ #define PACKAGE_URL "http://www.ntp.org./" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.8p15" +#define PACKAGE_VERSION "4.2.8p16" /* data dir */ #define PERLLIBDIR "/usr/share/ntp/lib" @@ -1652,7 +1652,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p15" +#define VERSION "4.2.8p16" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index f193db55f1b4..16eaa39de1cd 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -8,7 +8,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p15" +ConfStr="$ConfStr 4.2.8p16" case "$CSET" in '') ;; From nobody Fri Jun 2 13:17:25 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXk7V0nt7z4YKSW; Fri, 2 Jun 2023 13:17:26 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXk7T72Bzz42BS; Fri, 2 Jun 2023 13:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/R6+lSqRxzQJv6bQUvcjJoReGitlq1CKS36TeED+3g=; b=csmJmUGcFD/V1kpkD+il2BH9iYtfDjXtBzjiXY/mg8AAF8KZxqM/zLl0q0kz1M2U5/q40r SmNz1RqF7S1R6gciAJBrOKTDMioVsW6Y5phswswjcfcI9GmIIz1BZMukjcymiMx4mgrvDM T2WuhMnB+FkjwgpDq6hgb9szYHcE65IkneNP76y0CPLtYjJTQ9FVYHIgbxJSzhshLWQsru mWvhx2RvNPHDcz5VDff2TuQ3wp33dLkcwwMUmPBPh6xDTaJ20yjk0E78qhhJanMMl2WAQQ uZ3snmptDWTbrIh6eQ2p8bfeEOyBztaX+QCcfSXjybl8lR1/z+4PyCHqXKB59A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/R6+lSqRxzQJv6bQUvcjJoReGitlq1CKS36TeED+3g=; b=oJOjtg7uJpzyLBYpUyQnxCOOAT/VOOpLfQYIinEsCzOCkPRRmIYeNbtzcCeqCyY3yWHCxs aziLs2wzhbngj6CqTkTN9QFVZiCyfzFWsVFNzlLgBj9b1iKlXqadHy/maYJJOdq58MY28p qHn8hidCUB/gZaDRDU14TyhYKH+18kpv3JLbBbcrhbWthjtb7sdUbid+gptrBUwNrOmX4b 7OSxS1qLtRacBNkxVEmWj8qxBdFt2uN6xEtYW0gaV0bh/UTGCXX3VI7hGN70ZbCzvQs/3w dKohNnBiVVvcL2PKn7doX13bPux7d2wUn24F+uEjeUVxUzBaUpVdlZCYX39F6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685711846; a=rsa-sha256; cv=none; b=A6Zw/QwrLgrdCsg5RdwTmFiLgbMRJt+sy65c1RmKuKxQ9qBejxEreFOZKmHZ68vPgIRNiR 9qMPr2SP384+XuCxbdAPY5j5Qbzy2uynxSSt+XALLGfrWDI8mSR2zlt9lv+kmYAAphYPHH NOMXjmXlolcgDYNoF0SlXLiTbBVWq6JRFxaEcTetEZ+xtEuhDDP93MBEGxvxNZ4WfUhsjf 6lV+qANd9OB4dNEA5udPwmTOY4x6rorfqonGj4aseVDKUg86ixni/+80W8e50u4fbCzv9V 0zqRWtn6m39dGvtneqko2aXpbQwrKuHRlKZxj3Qa/EsJs8MMH0YgGUrWBwTG5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXk7T60Nsz1183; Fri, 2 Jun 2023 13:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352DHPwJ062750; Fri, 2 Jun 2023 13:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352DHPfC062749; Fri, 2 Jun 2023 13:17:25 GMT (envelope-from git) Date: Fri, 2 Jun 2023 13:17:25 GMT Message-Id: <202306021317.352DHPfC062749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1f1c3eb00db6 - stable/13 - posixshmcontrol.1: Document posixshmcontrol create -l List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1f1c3eb00db6123b5b032c6be05fe3a0d08c1aba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f1c3eb00db6123b5b032c6be05fe3a0d08c1aba commit 1f1c3eb00db6123b5b032c6be05fe3a0d08c1aba Author: Mark Johnston AuthorDate: 2023-05-25 21:08:55 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 13:16:42 +0000 posixshmcontrol.1: Document posixshmcontrol create -l Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40270 (cherry picked from commit db289ababf9053236deb945e70167947d36b8692) --- usr.bin/posixshmcontrol/posixshmcontrol.1 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/usr.bin/posixshmcontrol/posixshmcontrol.1 b/usr.bin/posixshmcontrol/posixshmcontrol.1 index 1d8c3438b165..292768c39ce4 100644 --- a/usr.bin/posixshmcontrol/posixshmcontrol.1 +++ b/usr.bin/posixshmcontrol/posixshmcontrol.1 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 26, 2022 +.Dd May 25, 2023 .Dt POSIXSHMCONTROL 1 .Os .Sh NAME @@ -36,6 +36,7 @@ .Sh SYNOPSIS .Nm .Ar create +.Op Fl l Ar pagesize .Op Fl m Ar mode .Op Pa path \&... .Nm @@ -79,10 +80,24 @@ for transient references. The following subcommands are provided: .Bl -tag -width truncate .It Ic create -Create segments with the specified paths, if not exist. +Create segments with the specified paths, if they do not already exist. +.Pp +The optional +.Ar pagesize +argument specifies the size of the virtual pages used to map the +object with +.Xr mmap 2 . +By default, the system page size is used, but on some platforms a +larger page size can be specified. +The size of an object backed by large pages must be a multiple of the +specified page size. The +.Va hw.pagesizes +sysctl variable lists the available page sizes. +.Pp +The optional numerical .Ar mode -optional numerical argument specifies initial access mode. +argument specifies the initial access mode. .It Ic rm Unlink the paths specified. .It Ic ls @@ -138,12 +153,14 @@ and then enlarge it to 1M, use the sequence of commands .Xr hexdump 1 , .Xr stat 1 , .Xr ftruncate 2 , +.Xr mmap 2 , .Xr read 2 , .Xr shm_open 2 , .Xr shm_unlink 2 , .Xr stat 2 , .Xr expand_number 3 , .Xr humanize_number 3 , +.Xr shm_create_largepage 3 , .Xr sysctl 3 .Sh HISTORY The From nobody Fri Jun 2 13:17:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXk7W1C3Hz4YKQD; Fri, 2 Jun 2023 13:17:27 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXk7W0SQtz42HK; Fri, 2 Jun 2023 13:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZeQwk+xS8hUcR2jp0OXmXZe1x7RARn9DhijCZmNzeFc=; b=hgyqykKN/ARXTKIN/Jdc+CqU5BpryrbGYcG+BIKiAbkqpvYxdUFVgZ0ioOj0YUPV1/1key IAk5+l9lNt7LtK1bLuluZ4ua9DsOdpNhby2WikF/ae4kmkClhAGcupvsUp+wCFGeIncXQ9 aRFtvKnDNwFN/nM00DIrNvTGeOLPd9sOXv+lMSp/K5PDcK2lyKHRiJuHRSzU3bXze6jS/F vyC9iA98vXyd787/bbf9lBCJ7k9PtrDA1t8bSfiOgIcpFsuYvy3EeZb02Q9WDQOVry9Yym pNol2h/jewq4okfDgPtgv1PpQ7Husrp9bp3JJLTzmgFwM7zUz4arqjYcmXggTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZeQwk+xS8hUcR2jp0OXmXZe1x7RARn9DhijCZmNzeFc=; b=hWuwnNpSLq2qy0+cPkqIgyXlczj0C9tQe8+7ecb4MqE1sNG1gjhtdqPonM1St09Sbk+joa cYIBHwwzQRUuKl+t0Tfz8cSLuqrJfgvQzmmrhg8tyig8mrulRHTfjLzg0lWBHBve4awUI1 VM7ZqIwJnbDlO9ZAnnSQl6fPttrjBoB5zSzN5JWA0FX6hVNhkX3+Qp1tsxtfa8KInY3yj/ ISxe8rzlWj5qSk76lSAN0mF3UWDfFSBuY8rgt2P2lOfCVqcn12Y0mPBP0BNZ/jZCruyJke w7oQPzSTE/h0XIng6X7FEi5K9YA6nMrjIy2048ipggwGgFwoqMB8OJZWo0yrow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685711847; a=rsa-sha256; cv=none; b=ZuA5d98arYvErgcP/TsOuEtuLH0sfALM1/Bimo/Zy68u0vSm/hFCP/GTwt++nAmJ7/XFYm Bwxvk/5mAn9ACw6qz4+HE9k3WNnsnMkyABdMidfHTy+KgJlMeucAGjic4bZSPLlvvEjdtb hYcMqhZ/Wir7PRK4T/R6mTzrMr1vw31oJXL9Udna77KsK4aGEUNQeEOJf1qm46Nuu6/MC3 zk1MdAmFA4r9HmN07bvAadShnfXS4tDCCLzOXvFLsC2kC/SFwqbP1ipUK6wrJFFLcFSGXt f+uzVaPVoF878F3hQ2ZW7B227c7zYsWASuDKzBs+mx4cidWDfGCXoNTwGG4HBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXk7V6dDsz10rx; Fri, 2 Jun 2023 13:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352DHQxk062769; Fri, 2 Jun 2023 13:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352DHQm0062768; Fri, 2 Jun 2023 13:17:26 GMT (envelope-from git) Date: Fri, 2 Jun 2023 13:17:26 GMT Message-Id: <202306021317.352DHQm0062768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 039be66beb86 - stable/13 - bitset: Remove BITSET_FOREACH_ADVANCE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 039be66beb868c314ef6158c286d63e9a48a8104 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=039be66beb868c314ef6158c286d63e9a48a8104 commit 039be66beb868c314ef6158c286d63e9a48a8104 Author: Mark Johnston AuthorDate: 2023-05-24 17:05:03 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 13:16:46 +0000 bitset: Remove BITSET_FOREACH_ADVANCE __BITSET_FOREACH_ADVANCE is a helper macro for __BITSET_FOREACH_IS(SET|CLR) and wasn't meant to be used directly by consumers. While here, fix some whitespace and move a comment back to where it belongs. Fixes: 5e04571cf3cf ("sys/bitset.h: reduce visibility of BIT_* macros") MFC after: 1 week (cherry picked from commit 44866dfb44178c86b6f380eb713a8f07c3d3b566) --- sys/sys/bitset.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h index 4952d48b1b3c..b00f33249cb7 100644 --- a/sys/sys/bitset.h +++ b/sys/sys/bitset.h @@ -309,9 +309,6 @@ #define __BITSET_SIZE(_s) (__bitset_words((_s)) * sizeof(long)) #if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) -/* - * Dynamically allocate a bitset. - */ #define BIT_AND(_s, d, s) __BIT_AND(_s, d, s) #define BIT_AND2(_s, d, s1, s2) __BIT_AND2(_s, d, s1, s2) #define BIT_ANDNOT(_s, d, s) __BIT_ANDNOT(_s, d, s) @@ -328,8 +325,7 @@ #define BIT_FFS_AT(_s, p, start) __BIT_FFS_AT(_s, p, start) #define BIT_FILL(_s, p) __BIT_FILL(_s, p) #define BIT_FLS(_s, p) __BIT_FLS(_s, p) -#define BIT_FOREACH(_s, i, p, op) __BIT_FOREACH(_s, i, p, op) -#define BIT_FOREACH_ADVANCE(_s, i, p, op) __BIT_FOREACH_ADVANCE(_s, i, p, op) +#define BIT_FOREACH(_s, i, p, op) __BIT_FOREACH(_s, i, p, op) #define BIT_FOREACH_ISCLR(_s, i, p) __BIT_FOREACH_ISCLR(_s, i, p) #define BIT_FOREACH_ISSET(_s, i, p) __BIT_FOREACH_ISSET(_s, i, p) #define BIT_ISFULLSET(_s, p) __BIT_ISFULLSET(_s, p) @@ -350,6 +346,9 @@ #define BIT_ZERO(_s, p) __BIT_ZERO(_s, p) #if defined(_KERNEL) +/* + * Dynamically allocate a bitset. + */ #define BITSET_ALLOC(_s, mt, mf) malloc(__BITSET_SIZE((_s)), mt, (mf)) #define BITSET_FREE(p, mt) free(p, mt) #endif /* _KERNEL */ From nobody Fri Jun 2 13:17:27 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXk7X1sgyz4YKKh; Fri, 2 Jun 2023 13:17:28 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXk7X12VKz42CP; Fri, 2 Jun 2023 13:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QU930VJbbpEVyblaY1YTYCUnnNfEnt9HbJOu/cEi7NQ=; b=fG3rA2tDUwXIrE/1hE/vN9MZeGpLlh1Qp2s+2S3hZfyVjdKeZmrSYlROkCt0xsLfqaxWP8 YbFgsxycn7QDFMazYqbfi/VTXuSuUzu9aZt+NHprV+pQV3rVzv8F6hhX9C8ZEU3CrfVUAy vx5RxGI7n3bhd1D2MZa65PzNGVJYwupClV9FNaFgoThRMa39JjmJf3DzR1fqzXDPoyOa0j oWjwC6Q7It20lnlOOb3lTr+Y1rKBTGVyjEi/7l0BExcrCLV+iF/uaf/CQnmmGUnGxYdWeH xEmfcFcxeNd9uQBWUASP1QGQaH/0jwoY2HaG8LM5zXWBYJsdpyCGtZW5STmOHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QU930VJbbpEVyblaY1YTYCUnnNfEnt9HbJOu/cEi7NQ=; b=H4q2SvItVXuXIesMSuKscQca73SBnr2D2VzoNiurUm8+cTogyw7fRkp1Vsuv7UzWLFsHD5 i/6tDtixh+AXRcuTuPKFAtUnk7FtlJD9/KkefJd1nWKVRMJahAnD+xYjxupk8AVkyVZkY6 UFFp+xo49OMo6HmbAb3+fmqgjHGLErf3epNp8XNk823+HcXt18V544zJsielrOPzFVfsyw /SVXgrnIoXXRZE2E8LWCNDh/alHWxdJ6Sf3ipqFVfQxLb61jWEvfXjX+/2jjwCYganMW9s kKz+vaFeTi8/52QknOkboT/SEulUrE0ZOfae80R5a5eGEqGt4wHNUe6UyIB3Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685711848; a=rsa-sha256; cv=none; b=kqunse66mUTmgSvfoM3pHW+A7t7Aib4sM/KQ8GNEnnNX3rjlOPb8WbGCclF9hmKihagBrT QPVTkUxb6WWGYrqIrBzlWQW/fhfQOGgzVDwKnM51opXkw0SOrLsaxY5gt5i6X/jcbtKcnh 8TsF6uup95gc/0NO/adbzh05H284KjORkCygfkUkMRFP2C262f2eQJRpZlAuwsikhZmnDx 2Scmly6aBe7zHGNkkjFvfUUnBfQy/vaVgaZAuhCXfFm8TgG+iJ+1rnS9PqBm/0AbsZEVao Gq9HxIbKEQybkUgypeB6LxJaDTiYW2KCERDkeKhoZ76LrcVmBOe3qVKFUo14LA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXk7X059jz1184; Fri, 2 Jun 2023 13:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352DHRnD062794; Fri, 2 Jun 2023 13:17:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352DHReF062793; Fri, 2 Jun 2023 13:17:27 GMT (envelope-from git) Date: Fri, 2 Jun 2023 13:17:27 GMT Message-Id: <202306021317.352DHReF062793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 78155442c297 - stable/13 - nexus: Consistently return a pointer in failure paths List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78155442c297272006185a2b3946033ae5d1cd04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=78155442c297272006185a2b3946033ae5d1cd04 commit 78155442c297272006185a2b3946033ae5d1cd04 Author: Mark Johnston AuthorDate: 2023-04-26 21:19:28 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 13:16:55 +0000 nexus: Consistently return a pointer in failure paths No functional change intended. MFC after: 1 week (cherry picked from commit ca4c7859009549975229d854888231e48938035e) --- sys/arm/arm/nexus.c | 2 +- sys/x86/x86/nexus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index d0894f3823ef..a0da03a80328 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -256,7 +256,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, if (needactivate) { if (bus_activate_resource(child, type, *rid, rv)) { rman_release_resource(rv); - return (0); + return (NULL); } } diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c index fc3cdc3c24f3..a8a800fd8b32 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -389,13 +389,13 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == NULL) - return (0); + return (NULL); rman_set_rid(rv, *rid); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv)) { rman_release_resource(rv); - return (0); + return (NULL); } } From nobody Fri Jun 2 13:17:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXk7Y27zdz4YKbQ; Fri, 2 Jun 2023 13:17:29 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXk7Y1J5qz42NZ; Fri, 2 Jun 2023 13:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UheO4tBeL8hBPs51DPhlmndovXI8C4nbn3iEO2mgyA=; b=X90KfDzlkN2BXXkt3ST8/jGHcacwnWaBbM3kznsiW+/aKGc5RsqKyGU7LhJrdHKn6J7aVs h5ghXiRM4syvJXKQeEkqw6CEPShCJWghb11H60MpJvlko8WfSz1QnHAh2udycd+K+2XdCQ O02Fr30eJitshq1K+jR3sevzpoezGt/FdmcJMFv7Sh3livux/oNQFHLMrwh7xJVOnkHwTG Qh63qrggRS7r4rlM5RvUzvViA35PYoB1o44sLz1TGLsAukZXryTyoyVMQFuQw6LWRKZGzs uJ89FU9TpY8k6tlZlZSqvU2t4YItyBxrjrpMvZL+YnDHUkWeri2IhOnp6PWaWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685711849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UheO4tBeL8hBPs51DPhlmndovXI8C4nbn3iEO2mgyA=; b=lzb54q61a01J8KXAcOCd+76lfrZ1PbWnB0NJRfGLOaHLkC4WvTiUdxlASWfFgAPNyFPWJG 1vtjxIJ5ZFcM3x4owRpFYeDN3OHTdwKPmS1P5j0lMhqgtJvPwH5BhQK4mTllCc5STwlxFa yhjHwFHV4IBtHrTkA53nzGYTbsVRg9QnuBQJv+nmOWAp9IdsKBVRjf2NnWLb8ZXJmwf/mG xTCJSUw4NxGWwFaWAGRR+moyu8FvG3/PMPkQCH7sb9aWCUjOzP8kp/21MhWvygtHDM6V2p VcZ04R1LVrPq8zOlnZ+QC/4YeSXGFJlHAxoOylGV1NJa50xcbZhjcdR2FKC0vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685711849; a=rsa-sha256; cv=none; b=hzkaFRRP9OxFY/Fn+jO+c5CBVbZhjyaVhl99IAVD7Xia50bVB80er+48n7wyQvfq9ghU6f blJdw92odSUiarJw+aOgqfwGcejPbdzbrsbVufYNpf2Pec0beY9KV5MOblRSB2wbl6lFcy YJuwJl3AI1IlzAMdqJqnPoEbrJHGeU6r1MwivN1aFxKabY0x/790Mka+todk8tcSss4xo8 ZoKRTd80tw52xTeWse7KpfPXRk789AF1Nm3uRRjcO9WXuC1z55ZoLWT+W7Cqr6Jufe+g3F 4aBZz/Do/5GDAb9b8Iy3NEEcL/xCRqqXTx5K1nSTye4s9HL1tXe8ECYzRViTZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXk7Y0PTHz1185; Fri, 2 Jun 2023 13:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352DHS9E062814; Fri, 2 Jun 2023 13:17:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352DHSRM062813; Fri, 2 Jun 2023 13:17:28 GMT (envelope-from git) Date: Fri, 2 Jun 2023 13:17:28 GMT Message-Id: <202306021317.352DHSRM062813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 797e917ed647 - stable/13 - tests: Add a simple regression test for ptrace(PT_SC_REMOTE) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 797e917ed6478832943a1c1dbec8913fc9ad4aa1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=797e917ed6478832943a1c1dbec8913fc9ad4aa1 commit 797e917ed6478832943a1c1dbec8913fc9ad4aa1 Author: Mark Johnston AuthorDate: 2023-05-26 19:13:20 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 13:17:05 +0000 tests: Add a simple regression test for ptrace(PT_SC_REMOTE) MFC after: 1 week (cherry picked from commit 844942888f7d87885c79d87d808311086c664417) --- tests/sys/kern/ptrace_test.c | 55 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index 3e3a445c6152..fbaca43bb6c4 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -4314,9 +4314,61 @@ ATF_TC_BODY(ptrace__procdesc_reparent_wait_child, tc) REQUIRE_EQ(close(pd), 0); } -ATF_TP_ADD_TCS(tp) +/* + * Try using PT_SC_REMOTE to get the PID of a traced child process. + */ +ATF_TC_WITHOUT_HEAD(ptrace__PT_SC_REMOTE_getpid); +ATF_TC_BODY(ptrace__PT_SC_REMOTE_getpid, tc) { + struct ptrace_sc_remote pscr; + pid_t fpid, wpid; + int status; + + ATF_REQUIRE((fpid = fork()) != -1); + if (fpid == 0) { + trace_me(); + exit(0); + } + + attach_child(fpid); + + pscr.pscr_syscall = SYS_getpid; + pscr.pscr_nargs = 0; + pscr.pscr_args = NULL; + ATF_REQUIRE(ptrace(PT_SC_REMOTE, fpid, (caddr_t)&pscr, sizeof(pscr)) != + -1); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_error == 0, + "remote getpid failed with error %d", pscr.pscr_ret.sr_error); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_retval[0] == fpid, + "unexpected return value %lu instead of %d", + pscr.pscr_ret.sr_retval[0], fpid); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + pscr.pscr_syscall = SYS_getppid; + pscr.pscr_nargs = 0; + pscr.pscr_args = NULL; + ATF_REQUIRE(ptrace(PT_SC_REMOTE, fpid, (caddr_t)&pscr, sizeof(pscr)) != + -1); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_error == 0, + "remote getppid failed with error %d", pscr.pscr_ret.sr_error); + ATF_REQUIRE_MSG(pscr.pscr_ret.sr_retval[0] == getpid(), + "unexpected return value %lu instead of %d", + pscr.pscr_ret.sr_retval[0], fpid); + + wpid = waitpid(fpid, &status, 0); + REQUIRE_EQ(wpid, fpid); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + ATF_REQUIRE(ptrace(PT_DETACH, fpid, (caddr_t)1, 0) != -1); +} + +ATF_TP_ADD_TCS(tp) +{ ATF_TP_ADD_TC(tp, ptrace__parent_wait_after_trace_me); ATF_TP_ADD_TC(tp, ptrace__parent_wait_after_attach); ATF_TP_ADD_TC(tp, ptrace__parent_sees_exit_after_child_debugger); @@ -4380,6 +4432,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, ptrace__proc_reparent); ATF_TP_ADD_TC(tp, ptrace__procdesc_wait_child); ATF_TP_ADD_TC(tp, ptrace__procdesc_reparent_wait_child); + ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_getpid); return (atf_no_error()); } From nobody Fri Jun 2 14:34:47 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXlrl41Xcz4YcVK; Fri, 2 Jun 2023 14:34:47 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXlrl3cC0z4F7S; Fri, 2 Jun 2023 14:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685716487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGgdf1tj3Lx89PZ8FfOT08vSY5bVJKJFhKuTYxVHKWk=; b=k1wN0paSMfPVbNScKGCZ62dZPFLyIlbOH9yGaj3K17A47FqdX6CHEZP78IQmDDKM6QW5Dq eQFSuR/JMA+y/8e7TTfxCxFzvVzpANxP2g9+ZYJ60D2Ythk0y9XyLQAryyLBPBwhp7lMgY YJMb9PrQdvmQrHCqJcBXrqcwsO4kBDyilHOvSOJEZouYIrqyvLywnqL559aDylO7NHVTi9 brz0mxSXBQ3HRm2Vt7uBEVgjEiICfh4Ka8OErypAOsnWc9Fb2Czz23VPVvIXupiMbpNVHH 8PIdks5QJtjp1xIfC5PiMAHkqI1MRhORVHV0xzc+6NkbXJLBPaqe9Zd9Ypiypg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685716487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGgdf1tj3Lx89PZ8FfOT08vSY5bVJKJFhKuTYxVHKWk=; b=FWJK9adrTXFPtr1YK62x2QlbNRYeal7pcQRACSZh7VEIEpzJUO/sZRVb+T7SpIRxzvmVBR mXqjCL6lVBvZe7JmXCJV9DMSbq+tfsx82QUD0wSerpL0nVDObeTRzA0qC3g24r0IlZc1MB 2aGt+/BBfeFLDcnffslMnQFgsN+n1L+U2FQrronORHTdiCF/AVXKshp0r5SvaM15U4OsXo MgfAM3EIz09frbZouoL24CVCHm6H1po9hBpyVTqC/VpA649cgLSchpcHffD0/eXJM7ZFi5 742eQOVWvXydDYPOvog/lqW/+Ap3a3sDi0nPRFH3wXtTtIh0ZmLGOwKxobBKcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685716487; a=rsa-sha256; cv=none; b=xVO/RhymFw+V1cLamvPUbnnEKTwOnUYY+PjWkS5p7v/i4kF+4fTL3ueeVg7lBhH+0aac8q eqqDd7GtJDy6AjQsDjNSK/exY+1dP1gqvBSddMfhbADe0CfY5zYGbH3aOlB1L1u/e7EDyC eAb2zbLOnJaTxf5adlcNOz44n3xBSPegARqp9L379THGu1JoAiuka9BOkQw5J7Xop54hB1 u6xgmUAEHimLd4u4Eq47NlTrO45766janta+s4Ai2+03KwFvFRnxkZLaCL+/NOBbScSxnd 4yLpEweNaTBt0IfMOOu6rSBUX2tGLMJ4fL956kYn5yFHfkZKY6OHRFywI3C8Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXlrl2fmjz12hB; Fri, 2 Jun 2023 14:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352EYlrY093590; Fri, 2 Jun 2023 14:34:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352EYlES093589; Fri, 2 Jun 2023 14:34:47 GMT (envelope-from git) Date: Fri, 2 Jun 2023 14:34:47 GMT Message-Id: <202306021434.352EYlES093589@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cf9f8856eaf1 - stable/13 - tests: Fix format strings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf9f8856eaf1639ef34f63307822ac311ab4b3ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cf9f8856eaf1639ef34f63307822ac311ab4b3ec commit cf9f8856eaf1639ef34f63307822ac311ab4b3ec Author: Mark Johnston AuthorDate: 2023-05-26 21:38:06 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 14:34:37 +0000 tests: Fix format strings Reported by: Jenkins Fixes: 844942888f7d ("tests: Add a simple regression test for ptrace(PT_SC_REMOTE)") (cherry picked from commit da8c3d21490fe791f8e4405216d5490dbea4dbe5) --- tests/sys/kern/ptrace_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index fbaca43bb6c4..2657d8b18ce6 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -4340,8 +4340,8 @@ ATF_TC_BODY(ptrace__PT_SC_REMOTE_getpid, tc) ATF_REQUIRE_MSG(pscr.pscr_ret.sr_error == 0, "remote getpid failed with error %d", pscr.pscr_ret.sr_error); ATF_REQUIRE_MSG(pscr.pscr_ret.sr_retval[0] == fpid, - "unexpected return value %lu instead of %d", - pscr.pscr_ret.sr_retval[0], fpid); + "unexpected return value %jd instead of %d", + (intmax_t)pscr.pscr_ret.sr_retval[0], fpid); wpid = waitpid(fpid, &status, 0); REQUIRE_EQ(wpid, fpid); @@ -4356,8 +4356,8 @@ ATF_TC_BODY(ptrace__PT_SC_REMOTE_getpid, tc) ATF_REQUIRE_MSG(pscr.pscr_ret.sr_error == 0, "remote getppid failed with error %d", pscr.pscr_ret.sr_error); ATF_REQUIRE_MSG(pscr.pscr_ret.sr_retval[0] == getpid(), - "unexpected return value %lu instead of %d", - pscr.pscr_ret.sr_retval[0], fpid); + "unexpected return value %jd instead of %d", + (intmax_t)pscr.pscr_ret.sr_retval[0], fpid); wpid = waitpid(fpid, &status, 0); REQUIRE_EQ(wpid, fpid); From nobody Fri Jun 2 19:05:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXssQ6NwPz4YWH0; Fri, 2 Jun 2023 19:05:46 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXssQ5wDgz3yfL; Fri, 2 Jun 2023 19:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685732746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xcu7+RiKJJIqKvOukJkFXYxCFZm1TvytOGsm224fKug=; b=Ls+5Zm/vPpcKpGycZQCljZeLudokXueamr+AJvfUqNMYwsyfhs3dSz7axOQTi+ybgRObaw GbIYD0fAlK/44pb9ISyKl8D+QyUk6N+BRPhBB+o8DcSpv7DK3toV3y23iF7RMXb8H+oZcx OhHkdpgOJsG/91DQlNpMaX8dwsXnAhxncKld4ywqHtDDMazrfrOoT39eDrXC0bFpl9RyMZ QZZDcG6pALAL6hDet9EeFxjhUkjdR1ONqqw2pr156oNJFKIETL7kUSvJajUQvCbWc4OyxW HaVKgQiS9FWbjdjJM8tUBADattZnucqYkTV9MBXcLwulbhAe1MSrgXrTK+LJdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685732746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xcu7+RiKJJIqKvOukJkFXYxCFZm1TvytOGsm224fKug=; b=OlIW6hTGx+OPPV2DPtZbn4MInkEK1M0m2oyRNGvM4nUI1Iq2fB3g3kXiOsSZ4yOY1nGowP do8VpBvMfwH3v5i4mMo7R8SH26Q/cGN0oGv2uaZKw0ggLrrQ2p7+tpRsBA2keOAZRMcfVj newRb0jaMAEk4FTqEn3NgbVPp05i3BgGXiGV3PkhALOA1XsOX6jF+IVv0Q/e2PpWn+k+LG 8ewFbylGvVURBril4XiTsI0E14/Hp4kfUDpcNcZLS1ZSxjVK+65+aTM+w8snHB0TXwvmBz A4nLazKgcixKo//KXSO7sIXExyZq8L7K/v4ZvzCG3ak0ISURPzhXVL8EKRvBFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685732746; a=rsa-sha256; cv=none; b=OnnkY2yXlehGrG6IWVVKSk4vYnep0rnuM+9uKVauKDdw4LgoQEOmNhiw6CN2HfgBLkvF9B lPpNPnUmZQPyx2HFbdbeHohC7N61Zavi6ri5Erq/jAa8K28rpDEFFX9EqnN7IzhCjWBWrH 9tbd80wLoFn1sLYi/zrkg3AZ+L+bDz+bB7H2vaDM3GEnou2IlWf/XVXkLNzV37CJfe9ARR qQw+3VVrg+HqYFpZtyQeajSaflI4cFYLlM5r3B3laSw4zq/ISB5xhLJqwHGldDowz1Nv6c U/r4ZwBSzUamHz0XkbX8c/0ZrKGj8yeVz3q+sAxG9gRnz31U3trg5xuRPKcd2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXssQ4w0Hz196L; Fri, 2 Jun 2023 19:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352J5kfZ041223; Fri, 2 Jun 2023 19:05:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352J5kFa041222; Fri, 2 Jun 2023 19:05:46 GMT (envelope-from git) Date: Fri, 2 Jun 2023 19:05:46 GMT Message-Id: <202306021905.352J5kFa041222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d0c829d7c73e - stable/13 - linuxkpi: Use modern function declarations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d0c829d7c73e899df0243cbd811d16b04c5b9363 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0c829d7c73e899df0243cbd811d16b04c5b9363 commit d0c829d7c73e899df0243cbd811d16b04c5b9363 Author: Mark Johnston AuthorDate: 2023-06-02 19:03:55 +0000 Commit: Mark Johnston CommitDate: 2023-06-02 19:03:55 +0000 linuxkpi: Use modern function declarations This is a direct commit to stable/13. Reported by: Jenkins --- sys/compat/linuxkpi/common/include/asm/fpu/api.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/fpu/api.h b/sys/compat/linuxkpi/common/include/asm/fpu/api.h index 6fba15d1fd62..f1ca1cedbcf1 100644 --- a/sys/compat/linuxkpi/common/include/asm/fpu/api.h +++ b/sys/compat/linuxkpi/common/include/asm/fpu/api.h @@ -54,12 +54,12 @@ kernel_fpu_end(void) #else static inline void -kernel_fpu_begin() +kernel_fpu_begin(void) { } static inline void -kernel_fpu_end() +kernel_fpu_end(void) { } From nobody Fri Jun 2 19:19:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXt9L5RWzz4YZCk; Fri, 2 Jun 2023 19:19:34 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXt9L5GLhz41F1; Fri, 2 Jun 2023 19:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685733574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9KnxwF8sTrMAE2D9UEpa+3G/w7Th16VEf6KqPblDbZA=; b=gl1SrxvLm0HvB93fwAdRfrXybazQrRzttCEjBGVyuoxQT2IC3i9teoKyfkwZapcumkmhjv 66brXCcUjlNSFEjavkIPuBEiM3gfcCBxy3bKVy6ytZdB1n4Up43LES8nxMDaFkTNJiga3g dlRxB5OnVT81kh++yXS6ak9omgvbk/8ho27Y9F4MorIGmDaUTdJ+OJUb26bba8eCljDZ90 mrFo/HzM6CKtPh5djcJhDFiuMOEi98vjBQ0UUBcmtFBJ0SuZDqtc9gEVWI63Yc5fp/B3vy zzkyl5VYtIkks1AGBKf8tKgr+KCRtSAczuOkHarmtC5V5BiaaUVV481+/JQ2Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685733574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9KnxwF8sTrMAE2D9UEpa+3G/w7Th16VEf6KqPblDbZA=; b=wOjGzUqSwTlAZ6ONT/n5Udp9dyccmpx5kb8My2il5Jb7/PC9G6RyH3TClns+5SXJ4UJkNW Jh8/KwGXY2QF5Qou8cJ3BBndq36VPbscOw8m8H4MgKeUpGW+T/8sMAUSnfCscLsHJSL0LD QK7sQFNViU5+SKdjgcLY2nPkw/PtLEie7fi4XxQYYYM1j5fJg8vEqQT6E6LbK/lF6i3E7X OATzydN45D5q3Qk/9XWrADVxuvJRR8J941SAVyMGRdifs2o5NfRlwVylikhveSJBSDJ7aO p30yUnbhE9sWLW7BH8J1i7U3cfDg7m9Fu8GWwLoNLXfcdl0BgtMX8ykRB9vD2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685733574; a=rsa-sha256; cv=none; b=uXI/LjHkaq0ht/rMFleB0tJpENu6GVpD9+cYt5ZjWAgFzx/urjlQesgx3bA+6eg3HzNJID 7o2GOcISZXGWipsbXRFEcHSx1rNzpNr4uK57ngIhUxrlI88HabSQ2UNSwRoOxtDX0TLbPL YrvQS6otk44y5x/mUDK8OK+6V8cFDTPSwr2xYMe5WiDom3v2FJxtkGZQz0Rrj4h7/0TYKF 6vcb/IaTWtGtc0Eksw03M+ebdfK8KKr6dkYBdtprVrfbCagpy0BlUILRfFxMOJvznwERCa XvjaZxCsBRRszZi85gz2G0Td+Hm8cHqXn2XEBLQZZbV/tfbvFRSh2FWKeXQcOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXt9L4KkLz19h6; Fri, 2 Jun 2023 19:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352JJYsN058001; Fri, 2 Jun 2023 19:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352JJYGt058000; Fri, 2 Jun 2023 19:19:34 GMT (envelope-from git) Date: Fri, 2 Jun 2023 19:19:34 GMT Message-Id: <202306021919.352JJYGt058000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: a138508ef6b0 - stable/13 - ice(4): Update to 1.37.11-k List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a138508ef6b07190904cece1ea29700a731f8b8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=a138508ef6b07190904cece1ea29700a731f8b8c commit a138508ef6b07190904cece1ea29700a731f8b8c Author: Eric Joyner AuthorDate: 2023-05-24 23:38:02 +0000 Commit: Eric Joyner CommitDate: 2023-06-02 19:14:41 +0000 ice(4): Update to 1.37.11-k This driver update has no corresponding ice_ddp update, and doesn't contain very many functional changes: - Some refactoring for future SR-IOV PF support - Various minor fixes Signed-off-by: Eric Joyner Tested by: jeffrey.e.pieper@intel.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D39821 (cherry picked from commit 9dc2f6e26fc24b88f9046667708a5555c63fb461) --- sys/dev/ice/ice_adminq_cmd.h | 3 +- sys/dev/ice/ice_alloc.h | 2 +- sys/dev/ice/ice_bitops.h | 4 +- sys/dev/ice/ice_common.c | 341 +++++++++++++++++++++++----------- sys/dev/ice/ice_common.h | 18 +- sys/dev/ice/ice_common_sysctls.h | 2 +- sys/dev/ice/ice_common_txrx.h | 2 +- sys/dev/ice/ice_controlq.c | 2 +- sys/dev/ice/ice_controlq.h | 2 +- sys/dev/ice/ice_dcb.c | 2 +- sys/dev/ice/ice_dcb.h | 2 +- sys/dev/ice/ice_ddp_common.c | 6 +- sys/dev/ice/ice_ddp_common.h | 8 +- sys/dev/ice/ice_defs.h | 2 +- sys/dev/ice/ice_devids.h | 2 +- sys/dev/ice/ice_drv_info.h | 10 +- sys/dev/ice/ice_features.h | 2 +- sys/dev/ice/ice_flex_pipe.c | 2 +- sys/dev/ice/ice_flex_pipe.h | 2 +- sys/dev/ice/ice_flex_type.h | 2 +- sys/dev/ice/ice_flow.c | 15 +- sys/dev/ice/ice_flow.h | 2 +- sys/dev/ice/ice_fw_logging.c | 2 +- sys/dev/ice/ice_fwlog.c | 2 +- sys/dev/ice/ice_fwlog.h | 2 +- sys/dev/ice/ice_hw_autogen.h | 2 +- sys/dev/ice/ice_iflib.h | 2 +- sys/dev/ice/ice_iflib_recovery_txrx.c | 2 +- sys/dev/ice/ice_iflib_sysctls.h | 2 +- sys/dev/ice/ice_iflib_txrx.c | 2 +- sys/dev/ice/ice_lan_tx_rx.h | 5 +- sys/dev/ice/ice_lib.c | 332 +++++++++++++++++++++++---------- sys/dev/ice/ice_lib.h | 21 ++- sys/dev/ice/ice_nvm.c | 52 ++++-- sys/dev/ice/ice_nvm.h | 2 +- sys/dev/ice/ice_opts.h | 2 +- sys/dev/ice/ice_osdep.c | 2 +- sys/dev/ice/ice_osdep.h | 4 +- sys/dev/ice/ice_protocol_type.h | 41 ++-- sys/dev/ice/ice_rdma.c | 2 +- sys/dev/ice/ice_rdma.h | 2 +- sys/dev/ice/ice_rdma_internal.h | 2 +- sys/dev/ice/ice_resmgr.c | 2 +- sys/dev/ice/ice_resmgr.h | 2 +- sys/dev/ice/ice_rss.h | 2 +- sys/dev/ice/ice_sbq_cmd.h | 2 +- sys/dev/ice/ice_sched.c | 2 +- sys/dev/ice/ice_sched.h | 2 +- sys/dev/ice/ice_status.h | 2 +- sys/dev/ice/ice_strings.c | 2 +- sys/dev/ice/ice_switch.c | 2 +- sys/dev/ice/ice_switch.h | 7 +- sys/dev/ice/ice_type.h | 12 +- sys/dev/ice/ice_vlan_mode.c | 2 +- sys/dev/ice/ice_vlan_mode.h | 2 +- sys/dev/ice/if_ice_iflib.c | 17 +- sys/dev/ice/irdma_di_if.m | 2 +- sys/dev/ice/irdma_if.m | 2 +- sys/dev/ice/virtchnl.h | 105 ++++++++++- sys/dev/ice/virtchnl_inline_ipsec.h | 2 +- 60 files changed, 741 insertions(+), 344 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index 92ad8055b666..56bfbf27cda2 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1987,6 +1987,7 @@ struct ice_aqc_get_port_options { u8 port_options_count; #define ICE_AQC_PORT_OPT_COUNT_S 0 #define ICE_AQC_PORT_OPT_COUNT_M (0xF << ICE_AQC_PORT_OPT_COUNT_S) +#define ICE_AQC_PORT_OPT_MAX 16 u8 innermost_phy_index; u8 port_options; #define ICE_AQC_PORT_OPT_ACTIVE_S 0 diff --git a/sys/dev/ice/ice_alloc.h b/sys/dev/ice/ice_alloc.h index bfcb376d45b2..d84be78b4bc2 100644 --- a/sys/dev/ice/ice_alloc.h +++ b/sys/dev/ice/ice_alloc.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index c29963d0a318..e7b8b19cfe8a 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -461,7 +461,7 @@ ice_bitmap_hweight(ice_bitmap_t *bm, u16 size) } /** - * ice_cmp_bitmaps - compares two bitmaps. + * ice_cmp_bitmap - compares two bitmaps. * @bmp1: the bitmap to compare * @bmp2: the bitmap to compare with bmp1 * @size: Size of the bitmaps in bits diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index c2efddeb4f7c..e4c112d3a3c2 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,81 +37,81 @@ #include "ice_flow.h" #include "ice_switch.h" -#define ICE_PF_RESET_WAIT_COUNT 300 +#define ICE_PF_RESET_WAIT_COUNT 500 static const char * const ice_link_mode_str_low[] = { - [0] = "100BASE_TX", - [1] = "100M_SGMII", - [2] = "1000BASE_T", - [3] = "1000BASE_SX", - [4] = "1000BASE_LX", - [5] = "1000BASE_KX", - [6] = "1G_SGMII", - [7] = "2500BASE_T", - [8] = "2500BASE_X", - [9] = "2500BASE_KX", - [10] = "5GBASE_T", - [11] = "5GBASE_KR", - [12] = "10GBASE_T", - [13] = "10G_SFI_DA", - [14] = "10GBASE_SR", - [15] = "10GBASE_LR", - [16] = "10GBASE_KR_CR1", - [17] = "10G_SFI_AOC_ACC", - [18] = "10G_SFI_C2C", - [19] = "25GBASE_T", - [20] = "25GBASE_CR", - [21] = "25GBASE_CR_S", - [22] = "25GBASE_CR1", - [23] = "25GBASE_SR", - [24] = "25GBASE_LR", - [25] = "25GBASE_KR", - [26] = "25GBASE_KR_S", - [27] = "25GBASE_KR1", - [28] = "25G_AUI_AOC_ACC", - [29] = "25G_AUI_C2C", - [30] = "40GBASE_CR4", - [31] = "40GBASE_SR4", - [32] = "40GBASE_LR4", - [33] = "40GBASE_KR4", - [34] = "40G_XLAUI_AOC_ACC", - [35] = "40G_XLAUI", - [36] = "50GBASE_CR2", - [37] = "50GBASE_SR2", - [38] = "50GBASE_LR2", - [39] = "50GBASE_KR2", - [40] = "50G_LAUI2_AOC_ACC", - [41] = "50G_LAUI2", - [42] = "50G_AUI2_AOC_ACC", - [43] = "50G_AUI2", - [44] = "50GBASE_CP", - [45] = "50GBASE_SR", - [46] = "50GBASE_FR", - [47] = "50GBASE_LR", - [48] = "50GBASE_KR_PAM4", - [49] = "50G_AUI1_AOC_ACC", - [50] = "50G_AUI1", - [51] = "100GBASE_CR4", - [52] = "100GBASE_SR4", - [53] = "100GBASE_LR4", - [54] = "100GBASE_KR4", - [55] = "100G_CAUI4_AOC_ACC", - [56] = "100G_CAUI4", - [57] = "100G_AUI4_AOC_ACC", - [58] = "100G_AUI4", - [59] = "100GBASE_CR_PAM4", - [60] = "100GBASE_KR_PAM4", - [61] = "100GBASE_CP2", - [62] = "100GBASE_SR2", - [63] = "100GBASE_DR", + ice_arr_elem_idx(0, "100BASE_TX"), + ice_arr_elem_idx(1, "100M_SGMII"), + ice_arr_elem_idx(2, "1000BASE_T"), + ice_arr_elem_idx(3, "1000BASE_SX"), + ice_arr_elem_idx(4, "1000BASE_LX"), + ice_arr_elem_idx(5, "1000BASE_KX"), + ice_arr_elem_idx(6, "1G_SGMII"), + ice_arr_elem_idx(7, "2500BASE_T"), + ice_arr_elem_idx(8, "2500BASE_X"), + ice_arr_elem_idx(9, "2500BASE_KX"), + ice_arr_elem_idx(10, "5GBASE_T"), + ice_arr_elem_idx(11, "5GBASE_KR"), + ice_arr_elem_idx(12, "10GBASE_T"), + ice_arr_elem_idx(13, "10G_SFI_DA"), + ice_arr_elem_idx(14, "10GBASE_SR"), + ice_arr_elem_idx(15, "10GBASE_LR"), + ice_arr_elem_idx(16, "10GBASE_KR_CR1"), + ice_arr_elem_idx(17, "10G_SFI_AOC_ACC"), + ice_arr_elem_idx(18, "10G_SFI_C2C"), + ice_arr_elem_idx(19, "25GBASE_T"), + ice_arr_elem_idx(20, "25GBASE_CR"), + ice_arr_elem_idx(21, "25GBASE_CR_S"), + ice_arr_elem_idx(22, "25GBASE_CR1"), + ice_arr_elem_idx(23, "25GBASE_SR"), + ice_arr_elem_idx(24, "25GBASE_LR"), + ice_arr_elem_idx(25, "25GBASE_KR"), + ice_arr_elem_idx(26, "25GBASE_KR_S"), + ice_arr_elem_idx(27, "25GBASE_KR1"), + ice_arr_elem_idx(28, "25G_AUI_AOC_ACC"), + ice_arr_elem_idx(29, "25G_AUI_C2C"), + ice_arr_elem_idx(30, "40GBASE_CR4"), + ice_arr_elem_idx(31, "40GBASE_SR4"), + ice_arr_elem_idx(32, "40GBASE_LR4"), + ice_arr_elem_idx(33, "40GBASE_KR4"), + ice_arr_elem_idx(34, "40G_XLAUI_AOC_ACC"), + ice_arr_elem_idx(35, "40G_XLAUI"), + ice_arr_elem_idx(36, "50GBASE_CR2"), + ice_arr_elem_idx(37, "50GBASE_SR2"), + ice_arr_elem_idx(38, "50GBASE_LR2"), + ice_arr_elem_idx(39, "50GBASE_KR2"), + ice_arr_elem_idx(40, "50G_LAUI2_AOC_ACC"), + ice_arr_elem_idx(41, "50G_LAUI2"), + ice_arr_elem_idx(42, "50G_AUI2_AOC_ACC"), + ice_arr_elem_idx(43, "50G_AUI2"), + ice_arr_elem_idx(44, "50GBASE_CP"), + ice_arr_elem_idx(45, "50GBASE_SR"), + ice_arr_elem_idx(46, "50GBASE_FR"), + ice_arr_elem_idx(47, "50GBASE_LR"), + ice_arr_elem_idx(48, "50GBASE_KR_PAM4"), + ice_arr_elem_idx(49, "50G_AUI1_AOC_ACC"), + ice_arr_elem_idx(50, "50G_AUI1"), + ice_arr_elem_idx(51, "100GBASE_CR4"), + ice_arr_elem_idx(52, "100GBASE_SR4"), + ice_arr_elem_idx(53, "100GBASE_LR4"), + ice_arr_elem_idx(54, "100GBASE_KR4"), + ice_arr_elem_idx(55, "100G_CAUI4_AOC_ACC"), + ice_arr_elem_idx(56, "100G_CAUI4"), + ice_arr_elem_idx(57, "100G_AUI4_AOC_ACC"), + ice_arr_elem_idx(58, "100G_AUI4"), + ice_arr_elem_idx(59, "100GBASE_CR_PAM4"), + ice_arr_elem_idx(60, "100GBASE_KR_PAM4"), + ice_arr_elem_idx(61, "100GBASE_CP2"), + ice_arr_elem_idx(62, "100GBASE_SR2"), + ice_arr_elem_idx(63, "100GBASE_DR"), }; static const char * const ice_link_mode_str_high[] = { - [0] = "100GBASE_KR2_PAM4", - [1] = "100G_CAUI2_AOC_ACC", - [2] = "100G_CAUI2", - [3] = "100G_AUI2_AOC_ACC", - [4] = "100G_AUI2", + ice_arr_elem_idx(0, "100GBASE_KR2_PAM4"), + ice_arr_elem_idx(1, "100G_CAUI2_AOC_ACC"), + ice_arr_elem_idx(2, "100G_CAUI2"), + ice_arr_elem_idx(3, "100G_AUI2_AOC_ACC"), + ice_arr_elem_idx(4, "100G_AUI2"), }; /** @@ -1292,7 +1292,7 @@ static enum ice_status ice_pf_reset(struct ice_hw *hw) * that is occurring during a download package operation. */ for (cnt = 0; cnt < ICE_GLOBAL_CFG_LOCK_TIMEOUT + - ICE_PF_RESET_WAIT_COUNT; cnt++) { + ICE_PF_RESET_WAIT_COUNT; cnt++) { reg = rd32(hw, PFGEN_CTRL); if (!(reg & PFGEN_CTRL_PFSWR_M)) break; @@ -1378,6 +1378,37 @@ ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index) return ICE_SUCCESS; } +/** + * ice_copy_rxq_ctx_from_hw - Copy rxq context register from HW + * @hw: pointer to the hardware structure + * @ice_rxq_ctx: pointer to the rxq context + * @rxq_index: the index of the Rx queue + * + * Copies rxq context from HW register space to dense structure + */ +static enum ice_status +ice_copy_rxq_ctx_from_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index) +{ + u8 i; + + if (!ice_rxq_ctx) + return ICE_ERR_BAD_PTR; + + if (rxq_index > QRX_CTRL_MAX_INDEX) + return ICE_ERR_PARAM; + + /* Copy each dword separately from HW */ + for (i = 0; i < ICE_RXQ_CTX_SIZE_DWORDS; i++) { + u32 *ctx = (u32 *)(ice_rxq_ctx + (i * sizeof(u32))); + + *ctx = rd32(hw, QRX_CONTEXT(i, rxq_index)); + + ice_debug(hw, ICE_DBG_QCTX, "qrxdata[%d]: %08X\n", i, *ctx); + } + + return ICE_SUCCESS; +} + /* LAN Rx Queue Context */ static const struct ice_ctx_ele ice_rlan_ctx_info[] = { /* Field Width LSB */ @@ -1429,6 +1460,32 @@ ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, return ice_copy_rxq_ctx_to_hw(hw, ctx_buf, rxq_index); } +/** + * ice_read_rxq_ctx - Read rxq context from HW + * @hw: pointer to the hardware structure + * @rlan_ctx: pointer to the rxq context + * @rxq_index: the index of the Rx queue + * + * Read rxq context from HW register space and then converts it from dense + * structure to sparse + */ +enum ice_status +ice_read_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, + u32 rxq_index) +{ + u8 ctx_buf[ICE_RXQ_CTX_SZ] = { 0 }; + enum ice_status status; + + if (!rlan_ctx) + return ICE_ERR_BAD_PTR; + + status = ice_copy_rxq_ctx_from_hw(hw, ctx_buf, rxq_index); + if (status) + return status; + + return ice_get_ctx(ctx_buf, (u8 *)rlan_ctx, ice_rlan_ctx_info); +} + /** * ice_clear_rxq_ctx * @hw: pointer to the hardware structure @@ -1450,7 +1507,9 @@ enum ice_status ice_clear_rxq_ctx(struct ice_hw *hw, u32 rxq_index) return ICE_SUCCESS; } -/* LAN Tx Queue Context */ +/* LAN Tx Queue Context used for set Tx config by ice_aqc_opc_add_txqs, + * Bit[0-175] is valid + */ const struct ice_ctx_ele ice_tlan_ctx_info[] = { /* Field Width LSB */ ICE_CTX_STORE(ice_tlan_ctx, base, 57, 0), @@ -3041,7 +3100,6 @@ enum ice_status ice_aq_set_port_params(struct ice_port_info *pi, u16 bad_frame_vsi, bool save_bad_pac, bool pad_short_pac, bool double_vlan, struct ice_sq_cd *cd) - { struct ice_aqc_set_port_params *cmd; struct ice_hw *hw = pi->hw; @@ -3093,8 +3151,8 @@ bool ice_is_100m_speed_supported(struct ice_hw *hw) * Note: In the structure of [phy_type_low, phy_type_high], there should * be one bit set, as this function will convert one PHY type to its * speed. - * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned - * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned + * If no bit gets set, ICE_AQ_LINK_SPEED_UNKNOWN will be returned + * If more than one bit gets set, ICE_AQ_LINK_SPEED_UNKNOWN will be returned */ static u16 ice_get_link_speed_based_on_phy_type(u64 phy_type_low, u64 phy_type_high) @@ -4772,7 +4830,7 @@ ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, * @ce_info: a description of the struct to be filled */ static void -ice_read_byte(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) +ice_read_byte(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) { u8 dest_byte, mask; u8 *src, *target; @@ -4790,7 +4848,7 @@ ice_read_byte(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) ice_memcpy(&dest_byte, src, sizeof(dest_byte), ICE_DMA_TO_NONDMA); - dest_byte &= ~(mask); + dest_byte &= mask; dest_byte >>= shift_width; @@ -4808,7 +4866,7 @@ ice_read_byte(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) * @ce_info: a description of the struct to be filled */ static void -ice_read_word(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) +ice_read_word(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) { u16 dest_word, mask; u8 *src, *target; @@ -4830,7 +4888,7 @@ ice_read_word(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) /* the data in the memory is stored as little endian so mask it * correctly */ - src_word &= ~(CPU_TO_LE16(mask)); + src_word &= CPU_TO_LE16(mask); /* get the data back into host order before shifting */ dest_word = LE16_TO_CPU(src_word); @@ -4851,7 +4909,7 @@ ice_read_word(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) * @ce_info: a description of the struct to be filled */ static void -ice_read_dword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) +ice_read_dword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) { u32 dest_dword, mask; __le32 src_dword; @@ -4881,7 +4939,7 @@ ice_read_dword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) /* the data in the memory is stored as little endian so mask it * correctly */ - src_dword &= ~(CPU_TO_LE32(mask)); + src_dword &= CPU_TO_LE32(mask); /* get the data back into host order before shifting */ dest_dword = LE32_TO_CPU(src_dword); @@ -4902,7 +4960,7 @@ ice_read_dword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) * @ce_info: a description of the struct to be filled */ static void -ice_read_qword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) +ice_read_qword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) { u64 dest_qword, mask; __le64 src_qword; @@ -4932,7 +4990,7 @@ ice_read_qword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) /* the data in the memory is stored as little endian so mask it * correctly */ - src_qword &= ~(CPU_TO_LE64(mask)); + src_qword &= CPU_TO_LE64(mask); /* get the data back into host order before shifting */ dest_qword = LE64_TO_CPU(src_qword); @@ -4953,7 +5011,7 @@ ice_read_qword(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) * @ce_info: a description of the structure to be read from */ enum ice_status -ice_get_ctx(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info) +ice_get_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) { int f; @@ -5789,7 +5847,7 @@ enum ice_fw_modes ice_get_fw_mode(struct ice_hw *hw) } /** - * ice_cfg_get_cur_lldp_persist_status + * ice_get_cur_lldp_persist_status * @hw: pointer to the HW struct * @lldp_status: return value of LLDP persistent status * @@ -6266,6 +6324,8 @@ ice_aq_set_health_status_config(struct ice_hw *hw, u8 event_source, * when PF owns more than 1 port it must be true * @active_option_idx: index of active port option in returned buffer * @active_option_valid: active option in returned buffer is valid + * @pending_option_idx: index of pending port option in returned buffer + * @pending_option_valid: pending option in returned buffer is valid * * Calls Get Port Options AQC (0x06ea) and verifies result. */ @@ -6273,17 +6333,14 @@ enum ice_status ice_aq_get_port_options(struct ice_hw *hw, struct ice_aqc_get_port_options_elem *options, u8 *option_count, u8 lport, bool lport_valid, - u8 *active_option_idx, bool *active_option_valid) + u8 *active_option_idx, bool *active_option_valid, + u8 *pending_option_idx, bool *pending_option_valid) { struct ice_aqc_get_port_options *cmd; struct ice_aq_desc desc; enum ice_status status; - u8 pmd_count; - u8 max_speed; u8 i; - ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__); - /* options buffer shall be able to hold max returned options */ if (*option_count < ICE_AQC_PORT_OPT_COUNT_M) return ICE_ERR_PARAM; @@ -6291,8 +6348,7 @@ ice_aq_get_port_options(struct ice_hw *hw, cmd = &desc.params.get_port_options; ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_port_options); - if (lport_valid) - cmd->lport_num = lport; + cmd->lport_num = lport; cmd->lport_num_valid = lport_valid; status = ice_aq_send_cmd(hw, &desc, options, @@ -6313,34 +6369,59 @@ ice_aq_get_port_options(struct ice_hw *hw, *active_option_idx); } - /* verify indirect FW response & mask output options fields */ + *pending_option_valid = cmd->pending_port_option_status & + ICE_AQC_PENDING_PORT_OPT_VALID; + if (*pending_option_valid) { + *pending_option_idx = cmd->pending_port_option_status & + ICE_AQC_PENDING_PORT_OPT_IDX_M; + if (*pending_option_idx > (*option_count - 1)) + return ICE_ERR_OUT_OF_RANGE; + ice_debug(hw, ICE_DBG_PHY, "pending idx: %x\n", + *pending_option_idx); + } + + /* mask output options fields */ for (i = 0; i < *option_count; i++) { options[i].pmd &= ICE_AQC_PORT_OPT_PMD_COUNT_M; options[i].max_lane_speed &= ICE_AQC_PORT_OPT_MAX_LANE_M; - pmd_count = options[i].pmd; - max_speed = options[i].max_lane_speed; ice_debug(hw, ICE_DBG_PHY, "pmds: %x max speed: %x\n", - pmd_count, max_speed); - - /* check only entries containing valid max pmd speed values, - * other reserved values may be returned, when logical port - * used is unrelated to specific option - */ - if (max_speed <= ICE_AQC_PORT_OPT_MAX_LANE_100G) { - if (pmd_count > ICE_MAX_PORT_PER_PCI_DEV) - return ICE_ERR_OUT_OF_RANGE; - if (pmd_count > 2 && - max_speed > ICE_AQC_PORT_OPT_MAX_LANE_25G) - return ICE_ERR_CFG; - if (pmd_count > 7 && - max_speed > ICE_AQC_PORT_OPT_MAX_LANE_10G) - return ICE_ERR_CFG; - } + options[i].pmd, options[i].max_lane_speed); } return ICE_SUCCESS; } +/** + * ice_aq_set_port_option + * @hw: pointer to the hw struct + * @lport: logical port to call the command with + * @lport_valid: when false, FW uses port owned by the PF instead of lport, + * when PF owns more than 1 port it must be true + * @new_option: new port option to be written + * + * Calls Set Port Options AQC (0x06eb). + */ +enum ice_status +ice_aq_set_port_option(struct ice_hw *hw, u8 lport, u8 lport_valid, + u8 new_option) +{ + struct ice_aqc_set_port_option *cmd; + struct ice_aq_desc desc; + + if (new_option >= ICE_AQC_PORT_OPT_COUNT_M) + return ICE_ERR_PARAM; + + cmd = &desc.params.set_port_option; + ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_port_option); + + cmd->lport_num = lport; + + cmd->lport_num_valid = lport_valid; + cmd->selected_port_option = new_option; + + return ice_aq_send_cmd(hw, &desc, NULL, 0, NULL); +} + /** * ice_aq_set_lldp_mib - Set the LLDP MIB * @hw: pointer to the HW struct @@ -6440,6 +6521,42 @@ bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw) ICE_FW_API_REPORT_DFLT_CFG_PATCH); } +/* each of the indexes into the following array match the speed of a return + * value from the list of AQ returned speeds like the range: + * ICE_AQ_LINK_SPEED_10MB .. ICE_AQ_LINK_SPEED_100GB excluding + * ICE_AQ_LINK_SPEED_UNKNOWN which is BIT(15) The array is defined as 15 + * elements long because the link_speed returned by the firmware is a 16 bit + * value, but is indexed by [fls(speed) - 1] + */ +static const u32 ice_aq_to_link_speed[15] = { + ICE_LINK_SPEED_10MBPS, /* BIT(0) */ + ICE_LINK_SPEED_100MBPS, + ICE_LINK_SPEED_1000MBPS, + ICE_LINK_SPEED_2500MBPS, + ICE_LINK_SPEED_5000MBPS, + ICE_LINK_SPEED_10000MBPS, + ICE_LINK_SPEED_20000MBPS, + ICE_LINK_SPEED_25000MBPS, + ICE_LINK_SPEED_40000MBPS, + ICE_LINK_SPEED_50000MBPS, + ICE_LINK_SPEED_100000MBPS, /* BIT(10) */ + ICE_LINK_SPEED_UNKNOWN, + ICE_LINK_SPEED_UNKNOWN, + ICE_LINK_SPEED_UNKNOWN, + ICE_LINK_SPEED_UNKNOWN /* BIT(14) */ +}; + +/** + * ice_get_link_speed - get integer speed from table + * @index: array index from fls(aq speed) - 1 + * + * Returns: u32 value containing integer speed + */ +u32 ice_get_link_speed(u16 index) +{ + return ice_aq_to_link_speed[index]; +} + /** * ice_fw_supports_fec_dis_auto * @hw: pointer to the hardware structure diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h index 73e051fdda67..01ed55c192a1 100644 --- a/sys/dev/ice/ice_common.h +++ b/sys/dev/ice/ice_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,7 +57,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw); void ice_deinit_hw(struct ice_hw *hw); enum ice_status ice_check_reset(struct ice_hw *hw); enum ice_status ice_reset(struct ice_hw *hw, enum ice_reset_req req); - enum ice_status ice_create_all_ctrlq(struct ice_hw *hw); enum ice_status ice_init_all_ctrlq(struct ice_hw *hw); void ice_shutdown_all_ctrlq(struct ice_hw *hw, bool unloading); @@ -85,7 +84,6 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq, struct ice_aq_desc *desc, void *buf, u16 buf_size, struct ice_sq_cd *cd); void ice_clear_pxe_mode(struct ice_hw *hw); - enum ice_status ice_get_caps(struct ice_hw *hw); void ice_set_safe_mode_caps(struct ice_hw *hw); @@ -109,9 +107,14 @@ enum ice_status ice_set_mac_type(struct ice_hw *hw); */ #define ICE_ALIGN(ptr, align) (((ptr) + ((align) - 1)) & ~((align) - 1)) +#define ice_arr_elem_idx(idx, val) [(idx)] = (val) + enum ice_status ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, u32 rxq_index); +enum ice_status +ice_read_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, + u32 rxq_index); enum ice_status ice_clear_rxq_ctx(struct ice_hw *hw, u32 rxq_index); enum ice_status ice_clear_tx_cmpltnq_ctx(struct ice_hw *hw, u32 tx_cmpltnq_index); @@ -159,6 +162,8 @@ extern const struct ice_ctx_ele ice_tlan_ctx_info[]; enum ice_status ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info); +enum ice_status +ice_get_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info); enum ice_status ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc, @@ -240,6 +245,7 @@ enum ice_status ice_aq_sff_eeprom(struct ice_hw *hw, u16 lport, u8 bus_addr, u16 mem_addr, u8 page, u8 set_page, u8 *data, u8 length, bool write, struct ice_sq_cd *cd); +u32 ice_get_link_speed(u16 index); enum ice_status ice_aq_prog_topo_dev_nvm(struct ice_hw *hw, @@ -255,9 +261,11 @@ enum ice_status ice_aq_get_port_options(struct ice_hw *hw, struct ice_aqc_get_port_options_elem *options, u8 *option_count, u8 lport, bool lport_valid, - u8 *active_option_idx, bool *active_option_valid); + u8 *active_option_idx, bool *active_option_valid, + u8 *pending_option_idx, bool *pending_option_valid); enum ice_status -ice_get_ctx(u8 *src_ctx, u8 *dest_ctx, struct ice_ctx_ele *ce_info); +ice_aq_set_port_option(struct ice_hw *hw, u8 lport, u8 lport_valid, + u8 new_option); enum ice_status __ice_write_sr_word(struct ice_hw *hw, u32 offset, const u16 *data); enum ice_status diff --git a/sys/dev/ice/ice_common_sysctls.h b/sys/dev/ice/ice_common_sysctls.h index 11cfc50848f5..98a1bd6f8df6 100644 --- a/sys/dev/ice/ice_common_sysctls.h +++ b/sys/dev/ice/ice_common_sysctls.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common_txrx.h b/sys/dev/ice/ice_common_txrx.h index dd2b3c5bff0d..4797fe86b835 100644 --- a/sys/dev/ice/ice_common_txrx.h +++ b/sys/dev/ice/ice_common_txrx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c index 76de98dcfafc..aeb651b45fa8 100644 --- a/sys/dev/ice/ice_controlq.c +++ b/sys/dev/ice/ice_controlq.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h index 16d47ae77f8f..c556fcd20255 100644 --- a/sys/dev/ice/ice_controlq.h +++ b/sys/dev/ice/ice_controlq.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.c b/sys/dev/ice/ice_dcb.c index 19ab0d349cf7..244566bca308 100644 --- a/sys/dev/ice/ice_dcb.c +++ b/sys/dev/ice/ice_dcb.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.h b/sys/dev/ice/ice_dcb.h index 504a356221c5..d3f371deed4f 100644 --- a/sys/dev/ice/ice_dcb.h +++ b/sys/dev/ice/ice_dcb.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_ddp_common.c b/sys/dev/ice/ice_ddp_common.c index 730b78b0f81e..91dde8666153 100644 --- a/sys/dev/ice/ice_ddp_common.c +++ b/sys/dev/ice/ice_ddp_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1470,14 +1470,14 @@ struct ice_buf_build *ice_pkg_buf_alloc(struct ice_hw *hw) return bld; } -static bool ice_is_gtp_u_profile(u16 prof_idx) +static bool ice_is_gtp_u_profile(u32 prof_idx) { return (prof_idx >= ICE_PROFID_IPV6_GTPU_TEID && prof_idx <= ICE_PROFID_IPV6_GTPU_IPV6_TCP) || prof_idx == ICE_PROFID_IPV4_GTPU_TEID; } -static bool ice_is_gtp_c_profile(u16 prof_idx) +static bool ice_is_gtp_c_profile(u32 prof_idx) { switch (prof_idx) { case ICE_PROFID_IPV4_GTPC_TEID: diff --git a/sys/dev/ice/ice_ddp_common.h b/sys/dev/ice/ice_ddp_common.h index 621729b03446..f59c0a614888 100644 --- a/sys/dev/ice/ice_ddp_common.h +++ b/sys/dev/ice/ice_ddp_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,8 +30,8 @@ */ /*$FreeBSD$*/ -#ifndef _ICE_DDP_H_ -#define _ICE_DDP_H_ +#ifndef _ICE_DDP_COMMON_H_ +#define _ICE_DDP_COMMON_H_ #include "ice_osdep.h" #include "ice_adminq_cmd.h" @@ -475,4 +475,4 @@ void ice_pkg_buf_free(struct ice_hw *hw, struct ice_buf_build *bld); enum ice_status ice_cfg_tx_topo(struct ice_hw *hw, u8 *buf, u32 len); -#endif /* _ICE_DDP_H_ */ +#endif /* _ICE_DDP_COMMON_H_ */ diff --git a/sys/dev/ice/ice_defs.h b/sys/dev/ice/ice_defs.h index 8a1dda2c492c..5205a3d9b492 100644 --- a/sys/dev/ice/ice_defs.h +++ b/sys/dev/ice/ice_defs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_devids.h b/sys/dev/ice/ice_devids.h index dc8970952b49..1048da7ac5de 100644 --- a/sys/dev/ice/ice_devids.h +++ b/sys/dev/ice/ice_devids.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index f47adb1572c6..407b6d555130 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,16 +63,16 @@ * @var ice_rc_version * @brief driver release candidate version number */ -const char ice_driver_version[] = "1.37.7-k"; +const char ice_driver_version[] = "1.37.11-k"; const uint8_t ice_major_version = 1; const uint8_t ice_minor_version = 37; -const uint8_t ice_patch_version = 7; +const uint8_t ice_patch_version = 11; const uint8_t ice_rc_version = 0; #define PVIDV(vendor, devid, name) \ - PVID(vendor, devid, name " - 1.37.7-k") + PVID(vendor, devid, name " - 1.37.11-k") #define PVIDV_OEM(vendor, devid, svid, sdevid, revid, name) \ - PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.37.7-k") + PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.37.11-k") /** * @var ice_vendor_info_array diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h index efbeb12c3ab1..24404434d162 100644 --- a/sys/dev/ice/ice_features.h +++ b/sys/dev/ice/ice_features.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c index 36c420478131..5a6a77a65c43 100644 --- a/sys/dev/ice/ice_flex_pipe.c +++ b/sys/dev/ice/ice_flex_pipe.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.h b/sys/dev/ice/ice_flex_pipe.h index ada71b2d446a..a20be014763b 100644 --- a/sys/dev/ice/ice_flex_pipe.h +++ b/sys/dev/ice/ice_flex_pipe.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_type.h b/sys/dev/ice/ice_flex_type.h index 145797f34b7a..56587e890a0f 100644 --- a/sys/dev/ice/ice_flex_type.h +++ b/sys/dev/ice/ice_flex_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c index 73abf03d43b8..954ca84175db 100644 --- a/sys/dev/ice/ice_flow.c +++ b/sys/dev/ice/ice_flow.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2022, Intel Corporation +/* Copyright (c) 2023, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1368,6 +1368,7 @@ enum ice_status ice_rem_vsi_rss_cfg(struct ice_hw *hw, u16 vsi_handle) const enum ice_block blk = ICE_BLK_RSS; struct ice_flow_prof *p, *t; enum ice_status status = ICE_SUCCESS; + u16 vsig; if (!ice_is_vsi_valid(hw, vsi_handle)) return ICE_ERR_PARAM; @@ -1377,7 +1378,16 @@ enum ice_status ice_rem_vsi_rss_cfg(struct ice_hw *hw, u16 vsi_handle) ice_acquire_lock(&hw->rss_locks); LIST_FOR_EACH_ENTRY_SAFE(p, t, &hw->fl_profs[blk], ice_flow_prof, - l_entry) + l_entry) { + int ret; + + /* check if vsig is already removed */ + ret = ice_vsig_find_vsi(hw, blk, + ice_get_hw_vsi_num(hw, vsi_handle), + &vsig); + if (!ret && !vsig) + break; *** 1430 LINES SKIPPED *** From nobody Fri Jun 2 19:30:13 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXtPd5MqMz4Yc57; Fri, 2 Jun 2023 19:30:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXtPd3p0Zz42W2; Fri, 2 Jun 2023 19:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685734213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Ioa9GqHJcY3kdZIcHQdxfKNb5TOf7jz2vE6A+GlnAM=; b=yCC4ptJXInMHQKGNU7PA2MDMnXBmllh4NtrWGwgUOqomjUOvLpOxmTzivBremWWqWPKwdN +r49CtrbPnvObTKOhx4k9lTFs7rn75uGKDyJ61i10sWWUDyovAVSg6lWGxSX4LNdQQc8GU ClahpZeAn87jyE80ldXnvyn117rAX2sTgR95vy3AOp/y3F4ENgMea52kDv3Gn3vP7Gs+/S h+ro2PsYcCpWlYVXUAfELLf76x9fEEOUljVTE/xuGuFVNfFZKXJayvhlqoTtyIDVWXtdhc yU6xRYh1UPkq2r+4aQWEhqMEAb8J+BF2US//mSf54enDYQ3OUs8Gsn2ImJcBiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685734213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Ioa9GqHJcY3kdZIcHQdxfKNb5TOf7jz2vE6A+GlnAM=; b=TB3plBnHvmObB8+G8TXYrfihpnN+oMeaZcMiJWwVrBjf8AVXEEvGcpjeKShEtiRcDl3Jpk 7QScTTu/Guvd9JpuVXIeLnZd9hZqO+ElYvIk4+l6OwhNGGUBk6BS/tcJV3JHxD8r/+yWaQ 7FyfIveF1aAs0fCyq09lyIkY3NtlGVWooG91SNsECBqu0WNcq4E0xwQYuPW+b2JG5CGU2f zpkXuru3rSmuZ39LnmD7Y15ohcKJgATzdu3e+DOEU91UYfZJjuTl6NKJ2PXOeabCqmyg00 sSr9XOB7Nps3U5I5k4CdIXz8nLC2PcybiIRK2CHhxMRpf1aKDV2Ja9VedbWBew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685734213; a=rsa-sha256; cv=none; b=oT8JnEL3eH8aCfcUgQJZNz9bf1AYtoq4hM7AvOFEZ3r5pvvn+SuJ4g0JJVxCNa+oQfAMUg PxSxiUsaX+bDmQwtvwRzGIXLNcJtRF9T5gPIqRitWcNV4hErPIXZyoIOQFXm8iA/baII/J ybEZiFwjS/lFW56TZilon0rYUa2dQ/zQ+tZOdHbpZ00gFN7v7LioYI1A1GQD7wX/uFiOuK NYhm+gSwgKRaAswpgVtPX5sKHhlFDoVW/kAQl9wkd741J82nYNQH/dtEhF8fQ3rSKLswGR EvQkn//ulS8iNdP7et2lci3WtvoauhT1+0PPGUB14uniMCfZwgvrZ4goa14BYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXtPd2vtCz19pn; Fri, 2 Jun 2023 19:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352JUDak080651; Fri, 2 Jun 2023 19:30:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352JUDFH080644; Fri, 2 Jun 2023 19:30:13 GMT (envelope-from git) Date: Fri, 2 Jun 2023 19:30:13 GMT Message-Id: <202306021930.352JUDFH080644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 95aced446a8c - stable/13 - ixgbe: Change if condition for RSS and rxcsum List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95aced446a8c6ada94a5a9dead6e2c68ce48ecb3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=95aced446a8c6ada94a5a9dead6e2c68ce48ecb3 commit 95aced446a8c6ada94a5a9dead6e2c68ce48ecb3 Author: Przemyslaw Lewandowski AuthorDate: 2023-05-24 23:24:54 +0000 Commit: Eric Joyner CommitDate: 2023-06-02 19:27:45 +0000 ixgbe: Change if condition for RSS and rxcsum This patch fixes TCP connection hangs for 1 rxq and 1 txq without rxcsum enabled. Documentation for 10G cards and other drivers suggest enabling rxcsum for RSS and disabling otherwise. When PCSD bit is not set then fragment checksum and IP identification are reported in the rx descriptor. When PCSD bit is set then RSS hash value is reported in the rx descriptor. RSS and RX IPP checksum are mutually exclusive. Signed-off-by: Eric Joyner PR: 268910 Reviewed by: erj@ Tested by: jeffrey.e.pieper@intel.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D38621 (cherry picked from commit 156424fce98a0240c702da0a918b027d1979bfdb) --- sys/dev/ixgbe/if_ix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index c985e89b4cca..54bc16e73763 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -755,7 +755,7 @@ ixgbe_initialize_receive_units(if_ctx_t ctx) ixgbe_initialize_rss_mapping(sc); - if (sc->num_rx_queues > 1) { + if (sc->feat_en & IXGBE_FEATURE_RSS) { /* RSS and RX IPP Checksum are mutually exclusive */ rxcsum |= IXGBE_RXCSUM_PCSD; } From nobody Fri Jun 2 19:36:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXtYN6SPxz4YdXK; Fri, 2 Jun 2023 19:36:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXtYN5jWkz44T1; Fri, 2 Jun 2023 19:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685734616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6XwzJKa05Kd/g/4m9tVmqpbzC6x3Duhzbj+u7SL1AY=; b=HL9XXUdmeUq91Uhd3ozR4Fm2pWBJqzgs/pVariG97K7ox2tvkcNntwyIDHTcyuwxF53Dy2 01QY55sFshxn+gIMWoDSDukWUjatFn0VHUIQa3+Qim/2+m9uEkMV6drej9bGqG+H+YF4GR 54TVADlBsA83gn5EYBP+re82PUOMxvy91u3MByto7JSlif3pN/PCYOme8FpPFjatHXyEVm XmNmaoY9DbSAHPMpSCyqvlkCluzSpzIEbLkGReMavqMSFhBKGl+HqAVQWrc6DqxeaGBvqy E4gKPiw8LD2JCF1bX4ImaeqBHAwwGn22NGTiWygnLAL5ekQTJUdkWTB4IfK57A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685734616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6XwzJKa05Kd/g/4m9tVmqpbzC6x3Duhzbj+u7SL1AY=; b=wfT402ork8wtjYGm0J53Kk/0SoFx50/x8H7jpZTEAKJitOmYzBD1SNAZib8yemiblicscd 8qu7+AvjXmlJX4brSvTXoo6ETtwtzvE0wo8kBXEPhvDtftOT0BkK/2hetdex2MHYdZa7uC WAjFXv79rqcsw80o0ywW15ErXIpgUnewtB9K9nisTxRU3buOrRQaM58Chp6091TwLypYXb KwDHEs1WbpqEA5R/404Wa3UpjwLXme2hYMgONGwOmaKAgj5GLn4KyL+r0vVAh0RHPIkW3L uRUnS6K1wOUQQhF08yhblZnGfxZR62bllXoMLvSeGrJWebZBSL6o/42E1qGBRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685734616; a=rsa-sha256; cv=none; b=Rr84dB3B8slGVcMe2R7uKjuc8f8YeEI/IKjZvw3+BWGzBiW5bKKildRSmufb/AQi3U+6lu noHa+YoyAEUAaOvXFaa+XnIJK4cIlB7DHDchsSu2WAjLOAxfxLPJStAniMByrlWPUcQY3u hvD1atikbQQHj5Ps7lZzc88hb25YZbKv7goUict4tYY0spH/fegKN5b7a4RuDvskiMaZcg 6Ss+v9W6nsVgxZffhz612BxihfMS1cOZ42KxnatzyfIrF5VYuuN+dyWF25js72qc/ZXKJR ezk8zZBfg6vWpeRH+fsA/+L/1UedSiIaK4e+Ew6aQH6G6aIYolYaN8UndoA4/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXtYN4nh0z1BJQ; Fri, 2 Jun 2023 19:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352JauQN090547; Fri, 2 Jun 2023 19:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352JauvH090546; Fri, 2 Jun 2023 19:36:56 GMT (envelope-from git) Date: Fri, 2 Jun 2023 19:36:56 GMT Message-Id: <202306021936.352JauvH090546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 197106cf41df - stable/12 - ixgbe: Change if condition for RSS and rxcsum List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 197106cf41dff164a16d09cf84fe10321ca1ebdb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=197106cf41dff164a16d09cf84fe10321ca1ebdb commit 197106cf41dff164a16d09cf84fe10321ca1ebdb Author: Przemyslaw Lewandowski AuthorDate: 2023-05-24 23:24:54 +0000 Commit: Eric Joyner CommitDate: 2023-06-02 19:35:05 +0000 ixgbe: Change if condition for RSS and rxcsum This patch fixes TCP connection hangs for 1 rxq and 1 txq without rxcsum enabled. Documentation for 10G cards and other drivers suggest enabling rxcsum for RSS and disabling otherwise. When PCSD bit is not set then fragment checksum and IP identification are reported in the rx descriptor. When PCSD bit is set then RSS hash value is reported in the rx descriptor. RSS and RX IPP checksum are mutually exclusive. Signed-off-by: Eric Joyner PR: 268910 Reviewed by: erj@ Tested by: jeffrey.e.pieper@intel.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D38621 (cherry picked from commit 156424fce98a0240c702da0a918b027d1979bfdb) --- sys/dev/ixgbe/if_ix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 47f3918fd8ee..e9c79681cd03 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -744,7 +744,7 @@ ixgbe_initialize_receive_units(if_ctx_t ctx) ixgbe_initialize_rss_mapping(sc); - if (sc->num_rx_queues > 1) { + if (sc->feat_en & IXGBE_FEATURE_RSS) { /* RSS and RX IPP Checksum are mutually exclusive */ rxcsum |= IXGBE_RXCSUM_PCSD; } From nobody Sat Jun 3 20:28:24 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QYWfJ73hKz4YR16; Sat, 3 Jun 2023 20:28:24 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QYWfJ6ckrz42P1; Sat, 3 Jun 2023 20:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685824104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KT6xSQQ4XpeLGI6qO+3aBUAlPH6IdFbz245rKHfCvsQ=; b=dEfmqAnumyDUoNkaT7Lm9631dkedt5aGmDXWbHaEIgTU+vaT/pyzRQIC8XgHkY76KVX7K9 1dpH/jw9xVWW3t3H1qfeHS8w5yAP9LI8jd9WbVBEBZcrtKQhmrU8Eg2Ah4U+ZuQA/G1aCa yK1xvLd8H/5CcvS4kUCsZGQO4z+id1Sz9o1T+8ebQ8X2DPcWjD3xazNu0qWsR4jMSy61gy NWXiqw8yYubCCZWvZIbQCVkuW8Kbn7Vn30UD0/7iYqOlNqdeIshOWen94KshGa7GzlXM8L y84FERTgwiuqVwtWmdo4zL0wwO1zzioiDJzdrzV6+r0M1iCVC++MPbFE9cg0IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685824104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KT6xSQQ4XpeLGI6qO+3aBUAlPH6IdFbz245rKHfCvsQ=; b=KHan3VJ46GfZFuXkcMY9H6E2eIKYDz8YT5OnDWADGlg5aUG66pwLc1bKXc5HcnO0CazvBK UTc70R+bf9Zgbi7pMwGZv3FH0TRhlg8frB6390O/MkGg4k2XSLmeBW370GV+k26QcK4wn4 8o9XKPO7oGqykTqdlgs65ORX3nTOTT9ZlFfdozvIS4EP21B+xxISOJex+0CWyM4fGTVzSt mizJXVGGQJzayWfsjsY4xdsRxNuwFAbeTvCLlTYvShBLe0icojsMLiqdc9DxadX/DIP2KU zLGIzwZCNAWUWewTZ3xID5NLnmvxE5X3VL8cR706PBH54krivB2SvVj+Bp7+VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685824104; a=rsa-sha256; cv=none; b=gatGvUFRKsAXBqBYzeVKnpTh9ilXAKEnJ9L5K1gy4DsLEqqS7jAGmbhbYEcmf0pLuKgFlb CkcJ2b9/efuLVGBT5dIcXsnZupUt0Yb/wWVyQaUPvILVoy2SrVBMVzVD4fhmp6K1O4jFob 5I2W9hou++vXiELb2Dll3zBWFefSrlvZgdCjJyYbWkY1JX+x0f/HUzeSPcSPXd+operK05 NrnHYOPEAl/k2BQqUX3XFj3fSAQnH9FjajGzCwr9319HfySwJM7khVRtHzJhT8ra6GUCxj z7caApAIor0qc8OjjYMUgm+dnzxau4AwAHd9elYCHw4XM0C1+8cX35a8m2p/zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QYWfJ5j0pzfV6; Sat, 3 Jun 2023 20:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 353KSOVq051290; Sat, 3 Jun 2023 20:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 353KSOvU051289; Sat, 3 Jun 2023 20:28:24 GMT (envelope-from git) Date: Sat, 3 Jun 2023 20:28:24 GMT Message-Id: <202306032028.353KSOvU051289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b4dd6e1a2837 - stable/13 - ports(7): '*-list' targets: Add/fix doc on whether they are recursive List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4dd6e1a2837f16b1c4ad448976c5d7211ee28fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b4dd6e1a2837f16b1c4ad448976c5d7211ee28fe commit b4dd6e1a2837f16b1c4ad448976c5d7211ee28fe Author: Olivier Certner AuthorDate: 2023-06-03 20:27:49 +0000 Commit: Warner Losh CommitDate: 2023-06-03 20:28:08 +0000 ports(7): '*-list' targets: Add/fix doc on whether they are recursive Signed-off-by: Olivier Certner Reviewed-by: imp Pull-request: https://github.com/freebsd/freebsd-src/pull/691 (cherry picked from commit d0b0bc37a3a5655c4979fbed206cfb6a30210ac0) --- share/man/man7/ports.7 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 771d2ea239a5..fc339f9b88bf 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 22, 2021 +.Dd June 1, 2023 .Dt PORTS 7 .Os .Sh NAME @@ -235,20 +235,20 @@ Configure for this port and all its dependencies using .Xr dialog4ports 1 . .It Cm fetch-list -Show list of files to be fetched in order to build the port. +Show the list of files to fetch in order to build the port (but not its +dependencies). .It Cm fetch-recursive Fetch the distfiles of the port and all its dependencies. .It Cm fetch-recursive-list Show list of files that would be retrieved by .Cm fetch-recursive . -.It Cm run-depends-list , build-depends-list -Print a list of all the compile and run dependencies, and dependencies -of those dependencies, by port directory. +.It Cm build-depends-list , run-depends-list +Print a list of all the direct compile or run dependencies for this port. .It Cm all-depends-list -Print a list of all dependencies for the port. -.It Cm pretty-print-run-depends-list , pretty-print-build-depends-list -Print a list of all the compile and run dependencies, and dependencies -of those dependencies, by port name and version. +Print a list of all recursive dependencies for this port. +.It Cm pretty-print-build-depends-list , pretty-print-run-depends-list +Print a list of all the recursive compile or run dependencies for this port by +port name and version. .It Cm missing Print a list of missing dependencies to be installed for the port. .It Cm clean