Date: Tue, 9 Nov 2021 00:25:14 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4cef2da575c5 - stable/12 - openssh: diff reduction against upstream 7.9p1 Message-ID: <202111090025.1A90PETS090037@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111090025.1A90PETS090037>