Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssh Merge local changes between 8.5 ...
details: https://anonhg.NetBSD.org/src/rev/ed7742b460f6
branches: trunk
changeset: 961439:ed7742b460f6
user: christos <christos%NetBSD.org@localhost>
date: Mon Apr 19 14:40:15 2021 +0000
description:
Merge local changes between 8.5 and 8.6
diffstat:
crypto/external/bsd/openssh/dist/addrmatch.c | 8 +-
crypto/external/bsd/openssh/dist/auth-krb5.c | 10 +-
crypto/external/bsd/openssh/dist/auth-options.c | 8 +-
crypto/external/bsd/openssh/dist/auth.c | 8 +-
crypto/external/bsd/openssh/dist/auth2-pubkey.c | 11 +-
crypto/external/bsd/openssh/dist/auth2.c | 10 +-
crypto/external/bsd/openssh/dist/chacha.h | 6 +-
crypto/external/bsd/openssh/dist/channels.c | 12 +-
crypto/external/bsd/openssh/dist/channels.h | 10 +-
crypto/external/bsd/openssh/dist/cipher.c | 46 +++-
crypto/external/bsd/openssh/dist/clientloop.c | 8 +-
crypto/external/bsd/openssh/dist/dh.c | 29 ++-
crypto/external/bsd/openssh/dist/dh.h | 5 +-
crypto/external/bsd/openssh/dist/hostfile.c | 8 +-
crypto/external/bsd/openssh/dist/kex.c | 8 +-
crypto/external/bsd/openssh/dist/kexgen.c | 6 +-
crypto/external/bsd/openssh/dist/log.c | 28 +-
crypto/external/bsd/openssh/dist/log.h | 13 +-
crypto/external/bsd/openssh/dist/misc.c | 17 +-
crypto/external/bsd/openssh/dist/misc.h | 11 +-
crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 | 148 ++++++++------
crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 | 152 ++++++++------
crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 | 144 ++++++-------
crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 | 152 +++++++------
crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 | 128 ++++++-----
crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 | 126 +++++------
crypto/external/bsd/openssh/dist/monitor.c | 26 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 13 +-
crypto/external/bsd/openssh/dist/monitor_wrap.h | 7 +-
crypto/external/bsd/openssh/dist/mux.c | 14 +-
crypto/external/bsd/openssh/dist/packet.c | 20 +-
crypto/external/bsd/openssh/dist/readconf.c | 12 +-
crypto/external/bsd/openssh/dist/scp.c | 11 +-
crypto/external/bsd/openssh/dist/servconf.c | 28 +-
crypto/external/bsd/openssh/dist/servconf.h | 13 +-
crypto/external/bsd/openssh/dist/serverloop.c | 8 +-
crypto/external/bsd/openssh/dist/session.c | 8 +-
crypto/external/bsd/openssh/dist/sftp-client.c | 122 ++++++++++-
crypto/external/bsd/openssh/dist/sftp-client.h | 15 +-
crypto/external/bsd/openssh/dist/sftp-server.c | 164 +++++++++------
crypto/external/bsd/openssh/dist/sftp.c | 17 +-
crypto/external/bsd/openssh/dist/srclimit.c | 6 +-
crypto/external/bsd/openssh/dist/ssh-add.c | 10 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 12 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 21 +-
crypto/external/bsd/openssh/dist/ssh-sk-client.c | 12 +-
crypto/external/bsd/openssh/dist/ssh.c | 10 +-
crypto/external/bsd/openssh/dist/ssh_api.c | 8 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 15 +-
crypto/external/bsd/openssh/dist/sshconnect.c | 22 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 10 +-
crypto/external/bsd/openssh/dist/sshd.8 | 8 +-
crypto/external/bsd/openssh/dist/sshd.c | 18 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 21 +-
crypto/external/bsd/openssh/dist/sshkey-xmss.c | 10 +-
crypto/external/bsd/openssh/dist/sshkey-xmss.h | 14 +-
crypto/external/bsd/openssh/dist/sshkey.c | 30 +-
crypto/external/bsd/openssh/dist/umac.c | 9 +-
crypto/external/bsd/openssh/dist/utf8.h | 11 +-
crypto/external/bsd/openssh/dist/version.h | 8 +-
crypto/external/bsd/openssh/dist/xmalloc.h | 11 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
62 files changed, 1057 insertions(+), 803 deletions(-)
diffs (truncated from 3671 to 300 lines):
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/addrmatch.c
--- a/crypto/external/bsd/openssh/dist/addrmatch.c Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/addrmatch.c Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: addrmatch.c,v 1.14 2021/03/05 17:47:15 christos Exp $ */
-/* $OpenBSD: addrmatch.c,v 1.16 2021/01/09 11:58:50 dtucker Exp $ */
+/* $NetBSD: addrmatch.c,v 1.15 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: addrmatch.c,v 1.17 2021/04/03 06:18:40 djm Exp $ */
/*
* Copyright (c) 2004-2008 Damien Miller <djm%mindrot.org@localhost>
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: addrmatch.c,v 1.14 2021/03/05 17:47:15 christos Exp $");
+__RCSID("$NetBSD: addrmatch.c,v 1.15 2021/04/19 14:40:15 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -77,7 +77,7 @@
break;
} else if (r == 0) {
if (addr != NULL && addr_netmatch(&try_addr,
- &match_addr, masklen) == 0) {
+ &match_addr, masklen) == 0) {
foundit:
if (neg) {
ret = -1;
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/auth-krb5.c
--- a/crypto/external/bsd/openssh/dist/auth-krb5.c Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-krb5.c Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-krb5.c,v 1.15 2021/03/05 17:47:15 christos Exp $ */
-/* $OpenBSD: auth-krb5.c,v 1.23 2018/07/09 21:35:50 markus Exp $ */
+/* $NetBSD: auth-krb5.c,v 1.16 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: auth-krb5.c,v 1.24 2021/04/03 06:18:40 djm Exp $ */
/*
* Kerberos v5 authentication and ticket-passing routines.
@@ -31,7 +31,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-krb5.c,v 1.15 2021/03/05 17:47:15 christos Exp $");
+__RCSID("$NetBSD: auth-krb5.c,v 1.16 2021/04/19 14:40:15 christos Exp $");
#include <sys/types.h>
#include <stdio.h>
#include <pwd.h>
@@ -246,7 +246,7 @@
goto out;
problem = krb5_cc_new_unique(authctxt->krb5_ctx,
- krb5_mcc_ops.prefix, NULL, &ccache);
+ krb5_mcc_ops.prefix, NULL, &ccache);
if (problem)
goto out;
@@ -266,7 +266,7 @@
goto out;
problem = krb5_cc_new_unique(authctxt->krb5_ctx,
- krb5_fcc_ops.prefix, NULL, &authctxt->krb5_fwd_ccache);
+ krb5_fcc_ops.prefix, NULL, &authctxt->krb5_fwd_ccache);
if (problem)
goto out;
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/auth-options.c
--- a/crypto/external/bsd/openssh/dist/auth-options.c Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.c Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-options.c,v 1.25 2021/03/05 17:47:15 christos Exp $ */
-/* $OpenBSD: auth-options.c,v 1.94 2020/10/18 11:32:01 djm Exp $ */
+/* $NetBSD: auth-options.c,v 1.26 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: auth-options.c,v 1.95 2021/04/03 06:18:40 djm Exp $ */
/*
* Copyright (c) 2018 Damien Miller <djm%mindrot.org@localhost>
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-options.c,v 1.25 2021/03/05 17:47:15 christos Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.26 2021/04/19 14:40:15 christos Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -812,7 +812,7 @@
(r = serialise_nullable_string(m,
untrusted ? NULL : opts->required_from_host_cert)) != 0 ||
(r = serialise_nullable_string(m,
- untrusted ? NULL : opts->required_from_host_keys)) != 0)
+ untrusted ? NULL : opts->required_from_host_keys)) != 0)
return r;
/* Array options */
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/auth.c
--- a/crypto/external/bsd/openssh/dist/auth.c Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.c Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth.c,v 1.29 2021/03/05 17:47:15 christos Exp $ */
-/* $OpenBSD: auth.c,v 1.151 2020/12/22 00:12:22 djm Exp $ */
+/* $NetBSD: auth.c,v 1.30 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: auth.c,v 1.152 2021/04/03 06:18:40 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.29 2021/03/05 17:47:15 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.30 2021/04/19 14:40:15 christos Exp $");
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -553,7 +553,7 @@
if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) {
if (log_missing || errno != ENOENT)
debug("Could not open %s '%s': %s", file_type, file,
- strerror(errno));
+ strerror(errno));
return NULL;
}
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/auth2-pubkey.c
--- a/crypto/external/bsd/openssh/dist/auth2-pubkey.c Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-pubkey.c Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth2-pubkey.c,v 1.27 2021/03/05 17:47:15 christos Exp $ */
-/* $OpenBSD: auth2-pubkey.c,v 1.106 2021/01/27 10:05:28 djm Exp $ */
+/* $NetBSD: auth2-pubkey.c,v 1.28 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.107 2021/04/03 06:18:40 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth2-pubkey.c,v 1.27 2021/03/05 17:47:15 christos Exp $");
+__RCSID("$NetBSD: auth2-pubkey.c,v 1.28 2021/04/19 14:40:15 christos Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -680,7 +680,8 @@
goto fail_reason;
}
if (sshkey_cert_check_authority(key, 0, 0, 0,
- keyopts->cert_principals == NULL ? pw->pw_name : NULL, &reason) != 0)
+ keyopts->cert_principals == NULL ? pw->pw_name : NULL,
+ &reason) != 0)
goto fail_reason;
verbose("Accepted certificate ID \"%s\" (serial %llu) "
@@ -869,7 +870,7 @@
found_principal = 1;
/* If principals file or command is specified, then require a match */
use_authorized_principals = principals_file != NULL ||
- options.authorized_principals_command != NULL;
+ options.authorized_principals_command != NULL;
if (!found_principal && use_authorized_principals) {
reason = "Certificate does not contain an authorized principal";
goto fail_reason;
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/auth2.c
--- a/crypto/external/bsd/openssh/dist/auth2.c Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2.c Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth2.c,v 1.23 2021/03/05 17:47:15 christos Exp $ */
-/* $OpenBSD: auth2.c,v 1.160 2021/01/27 10:05:28 djm Exp $ */
+/* $NetBSD: auth2.c,v 1.24 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: auth2.c,v 1.161 2021/04/03 06:18:40 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth2.c,v 1.23 2021/03/05 17:47:15 christos Exp $");
+__RCSID("$NetBSD: auth2.c,v 1.24 2021/04/19 14:40:15 christos Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -250,7 +250,7 @@
double delay;
(void)snprintf(b, sizeof b, "%llu%s",
- (unsigned long long)options.timing_secret, user);
+ (unsigned long long)options.timing_secret, user);
if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0)
fatal_f("ssh_digest_memory");
/* 0-4.2 ms of delay */
@@ -725,7 +725,7 @@
auth2_record_info(Authctxt *authctxt, const char *fmt, ...)
{
va_list ap;
- int i;
+ int i;
free(authctxt->auth_method_info);
authctxt->auth_method_info = NULL;
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/chacha.h
--- a/crypto/external/bsd/openssh/dist/chacha.h Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/chacha.h Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: chacha.h,v 1.2 2018/04/06 18:58:59 christos Exp $ */
-/* $OpenBSD: chacha.h,v 1.4 2016/08/27 04:04:56 guenther Exp $ */
+/* $NetBSD: chacha.h,v 1.3 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: chacha.h,v 1.5 2021/04/03 05:54:14 djm Exp $ */
/*
chacha-merged.c version 20080118
@@ -17,7 +17,7 @@
u_int input[16];
};
-#define CHACHA_MINKEYLEN 16
+#define CHACHA_MINKEYLEN 16
#define CHACHA_NONCELEN 8
#define CHACHA_CTRLEN 8
#define CHACHA_STATELEN (CHACHA_NONCELEN+CHACHA_CTRLEN)
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/channels.c
--- a/crypto/external/bsd/openssh/dist/channels.c Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/channels.c Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: channels.c,v 1.29 2021/03/05 17:47:16 christos Exp $ */
-/* $OpenBSD: channels.c,v 1.405 2021/02/15 20:43:15 markus Exp $ */
+/* $NetBSD: channels.c,v 1.30 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: channels.c,v 1.406 2021/04/03 06:18:40 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: channels.c,v 1.29 2021/03/05 17:47:16 christos Exp $");
+__RCSID("$NetBSD: channels.c,v 1.30 2021/04/19 14:40:15 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -2318,7 +2318,7 @@
chan_fn **pre, **post;
if ((pre = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*pre))) == NULL ||
- (post = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*post))) == NULL)
+ (post = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*post))) == NULL)
fatal_f("allocation failed");
pre[SSH_CHANNEL_OPEN] = &channel_pre_open;
@@ -2718,7 +2718,7 @@
goto out;
}
c = channel_new(ssh, "mux proxy", SSH_CHANNEL_MUX_PROXY,
- -1, -1, -1, 0, 0, 0, ctype, 1);
+ -1, -1, -1, 0, 0, 0, ctype, 1);
c->mux_ctx = downstream; /* point to mux client */
c->mux_downstream_id = id; /* original downstream id */
if ((r = sshbuf_put_cstring(modified, ctype)) != 0 ||
@@ -2745,7 +2745,7 @@
goto out;
}
c = channel_new(ssh, "mux proxy", SSH_CHANNEL_MUX_PROXY,
- -1, -1, -1, 0, 0, 0, "mux-down-connect", 1);
+ -1, -1, -1, 0, 0, 0, "mux-down-connect", 1);
c->mux_ctx = downstream; /* point to mux client */
c->mux_downstream_id = id;
c->remote_id = remote_id;
diff -r 15c16202f46b -r ed7742b460f6 crypto/external/bsd/openssh/dist/channels.h
--- a/crypto/external/bsd/openssh/dist/channels.h Mon Apr 19 14:07:36 2021 +0000
+++ b/crypto/external/bsd/openssh/dist/channels.h Mon Apr 19 14:40:15 2021 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: channels.h,v 1.18 2020/12/04 18:42:50 christos Exp $ */
-/* $OpenBSD: channels.h,v 1.135 2020/09/20 05:47:25 djm Exp $ */
+/* $NetBSD: channels.h,v 1.19 2021/04/19 14:40:15 christos Exp $ */
+/* $OpenBSD: channels.h,v 1.137 2021/04/03 06:18:40 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -178,7 +178,7 @@
channel_filter_cleanup_fn *filter_cleanup;
/* keep boundaries */
- int datagram;
+ int datagram;
/* non-blocking connect */
/* XXX make this a pointer so the structure can be opaque */
@@ -188,7 +188,7 @@
mux_callback_fn *mux_rcb;
void *mux_ctx;
int mux_pause;
- int mux_downstream_id;
+ int mux_downstream_id;
};
#define CHAN_EXTENDED_IGNORE 0
@@ -292,7 +292,7 @@
/* file descriptor handling (read/write) */
Home |
Main Index |
Thread Index |
Old Index