system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 10:19:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

openssh: diff reduction against upstream 7.9p1

Browse source 
Clean up whitespace and nonfunctional differences, and unused functions.
This commit is contained in:
Ed Maste 2021-09-02 13:38:30 -04:00
parent 5cc82c563e
commit 6eac665c81
4 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crypto/openssh/auth2.c
View file

@ -313,7 +313,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);

6
crypto/openssh/ssh-gss.h
View file

@ -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

1
crypto/openssh/sshbuf-getput-basic.c
View file

@ -25,7 +25,6 @@
#include <stdio.h>
#include <string.h>
#include "xmalloc.h"
#include "ssherr.h"
#include "sshbuf.h"

8
crypto/openssh/sshbuf.h
View file

@ -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.