From a4a3adb1a8912c9960672929a047ba097f33c000 Mon Sep 17 00:00:00 2001 From: zrj Date: Tue, 16 Apr 2019 11:15:32 +0300 Subject: [PATCH] OpenSSH: Revert few local modifications. Some are already in newer version. Others will be re-applied. --- crypto/openssh/auth-pam.c | 2 +- crypto/openssh/openbsd-compat/port-tun.c | 2 +- crypto/openssh/servconf.c | 8 ++++---- crypto/openssh/session.c | 2 +- crypto/openssh/sftp-common.c | 2 +- crypto/openssh/sshconnect.c | 1 - crypto/openssh/sshlogin.c | 1 - crypto/openssh/umac128.c | 13 ------------- 8 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 crypto/openssh/umac128.c diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c index de877abdbe..de29c04c9c 100644 --- a/crypto/openssh/auth-pam.c +++ b/crypto/openssh/auth-pam.c @@ -284,7 +284,7 @@ sshpam_chauthtok_ruid(pam_handle_t *pamh, int flags) # define pam_chauthtok(a,b) (sshpam_chauthtok_ruid((a), (b))) #endif -static void +void sshpam_password_change_required(int reqd) { debug3("%s %d", __func__, reqd); diff --git a/crypto/openssh/openbsd-compat/port-tun.c b/crypto/openssh/openbsd-compat/port-tun.c index b2b5c408cb..7579c6084a 100644 --- a/crypto/openssh/openbsd-compat/port-tun.c +++ b/crypto/openssh/openbsd-compat/port-tun.c @@ -112,7 +112,7 @@ sys_tun_open(int tun, int mode) #include #ifdef HAVE_NET_IF_TUN_H -#include +#include #endif int diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 9568629594..2c321a4ad4 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line, if (!arg || *arg == '\0') fatal("%s line %d: missing PermitOpen specification", filename, linenum); - value = options->num_permitted_opens; /* modified later */ + i = options->num_permitted_opens; /* modified later */ if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { - if (*activep && value == 0) { + if (*activep && i == 0) { options->num_permitted_opens = 1; options->permitted_opens = xcalloc(1, sizeof(*options->permitted_opens)); @@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line, if (arg == NULL || ((port = permitopen_port(arg)) < 0)) fatal("%s line %d: bad port number in " "PermitOpen", filename, linenum); - if (*activep && value == 0) { + if (*activep && i == 0) { options->permitted_opens = xrecallocarray( options->permitted_opens, options->num_permitted_opens, diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 9bcdbf1ed3..5c985e62f9 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -1237,7 +1237,7 @@ do_nologin(struct passwd *pw) #ifdef HAVE_LOGIN_CAP if (login_getcapbool(lc, "ignorenologin", 0) || pw->pw_uid == 0) return; - nl = strdup(login_getcapstr(lc, "nologin", def_nl, def_nl)); + nl = login_getcapstr(lc, "nologin", def_nl, def_nl); #else if (pw->pw_uid == 0) return; diff --git a/crypto/openssh/sftp-common.c b/crypto/openssh/sftp-common.c index ccc3bce02d..13a7f5becc 100644 --- a/crypto/openssh/sftp-common.c +++ b/crypto/openssh/sftp-common.c @@ -215,7 +215,7 @@ ls_file(const char *name, const struct stat *st, int remote, int si_units) { int ulen, glen, sz = 0; struct tm *ltime = localtime(&st->st_mtime); - const char *user, *group; + char *user, *group; char buf[1024], lc[8], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1]; char sbuf[FMT_SCALED_STRSIZE]; time_t now; diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index edf9b8c46d..dc7a704d2a 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/crypto/openssh/sshlogin.c b/crypto/openssh/sshlogin.c index bbf95b5223..cea3e76974 100644 --- a/crypto/openssh/sshlogin.c +++ b/crypto/openssh/sshlogin.c @@ -60,7 +60,6 @@ #include "buffer.h" #include "misc.h" #include "servconf.h" -#include "sshlogin.h" extern Buffer loginmsg; extern ServerOptions options; diff --git a/crypto/openssh/umac128.c b/crypto/openssh/umac128.c deleted file mode 100644 index 628fcf64d2..0000000000 --- a/crypto/openssh/umac128.c +++ /dev/null @@ -1,13 +0,0 @@ -/* $FreeBSD: head/crypto/openssh/umac128.c 255767 2013-09-21 21:36:09Z des $ */ -#define UMAC_OUTPUT_LEN 16 -#undef umac_ctx -#define umac_ctx umac128_ctx -#undef umac_new -#define umac_new umac128_new -#undef umac_update -#define umac_update umac128_update -#undef umac_final -#define umac_final umac128_final -#undef umac_delete -#define umac_delete umac128_delete -#include "umac.c" -- 2.41.0