From nobody Tue Nov 9 00:25:14 2021
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 7B2C31849158;
Tue, 9 Nov 2021 00:25:14 +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 4Hp7zZ32cdz3Fg5;
Tue, 9 Nov 2021 00:25:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
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 49C971B706;
Tue, 9 Nov 2021 00:25:14 +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 1A90PET8090038;
Tue, 9 Nov 2021 00:25:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A90PETS090037;
Tue, 9 Nov 2021 00:25:14 GMT
(envelope-from git)
Date: Tue, 9 Nov 2021 00:25:14 GMT
Message-Id: <202111090025.1A90PETS090037@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 4cef2da575c5 - stable/12 - openssh: diff reduction against upstream 7.9p1
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 4cef2da575c5f9b54f301d857455b97b96df2c9f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=4cef2da575c5f9b54f301d857455b97b96df2c9f
commit 4cef2da575c5f9b54f301d857455b97b96df2c9f
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-09-02 17:38:30 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-11-08 23:56:32 +0000
openssh: diff reduction against upstream 7.9p1
Clean up whitespace and nonfunctional differences, and unused functions.
(cherry picked from commit 6eac665c8126af387a457ee8a08303c6607a6769)
---
crypto/openssh/auth2.c | 1 -
crypto/openssh/ssh-gss.h | 6 +++---
crypto/openssh/sshbuf-getput-basic.c | 1 -
crypto/openssh/sshbuf.h | 8 --------
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c
index b03822e5f150..d6eb067245b7 100644
--- a/crypto/openssh/auth2.c
+++ b/crypto/openssh/auth2.c
@@ -309,7 +309,6 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
"(%s,%s) -> (%s,%s)",
authctxt->user, authctxt->service, user, service);
}
-
/* reset state */
auth2_challenge_stop(ssh);
diff --git a/crypto/openssh/ssh-gss.h b/crypto/openssh/ssh-gss.h
index 236efa6b23c6..1e2d00e47ff1 100644
--- a/crypto/openssh/ssh-gss.h
+++ b/crypto/openssh/ssh-gss.h
@@ -29,10 +29,10 @@
#ifdef GSSAPI
-#if defined(HAVE_GSSAPI_GSSAPI_H)
-#include <gssapi/gssapi.h>
-#elif defined(HAVE_GSSAPI_H)
+#ifdef HAVE_GSSAPI_H
#include <gssapi.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_H)
+#include <gssapi/gssapi.h>
#endif
#ifdef KRB5
diff --git a/crypto/openssh/sshbuf-getput-basic.c b/crypto/openssh/sshbuf-getput-basic.c
index 9092a7eebf97..50648258f48d 100644
--- a/crypto/openssh/sshbuf-getput-basic.c
+++ b/crypto/openssh/sshbuf-getput-basic.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <string.h>
-#include "xmalloc.h"
#include "ssherr.h"
#include "sshbuf.h"
diff --git a/crypto/openssh/sshbuf.h b/crypto/openssh/sshbuf.h
index 87aa1560eabe..a43598cac4de 100644
--- a/crypto/openssh/sshbuf.h
+++ b/crypto/openssh/sshbuf.h
@@ -176,14 +176,6 @@ int sshbuf_put_u32(struct sshbuf *buf, u_int32_t val);
int sshbuf_put_u16(struct sshbuf *buf, u_int16_t val);
int sshbuf_put_u8(struct sshbuf *buf, u_char val);
-#if defined(__FreeBSD__) && defined(__i386__)
-#define sshbuf_get_time(b, vp) sshbuf_get_u32((b), (u_int32_t *)(vp))
-#define sshbuf_put_time(b, v) sshbuf_put_u32((b), (u_int32_t)(v))
-#else
-#define sshbuf_get_time(b, vp) sshbuf_get_u64((b), (u_int64_t *)(vp))
-#define sshbuf_put_time(b, v) sshbuf_put_u64((b), (u_int64_t)(v))
-#endif
-
/*
* Functions to extract or store SSH wire encoded strings (u32 len || data)
* The "cstring" variants admit no \0 characters in the string contents.