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/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/b7a9e131f652
branches: trunk
changeset: 340061:b7a9e131f652
user: christos <christos%NetBSD.org@localhost>
date: Fri Aug 21 08:20:59 2015 +0000
description:
merge conflicts
diffstat:
crypto/external/bsd/openssh/dist/auth.c | 8 ++++----
crypto/external/bsd/openssh/dist/compat.c | 19 +++++++++++++++----
crypto/external/bsd/openssh/dist/dns.c | 8 ++++----
crypto/external/bsd/openssh/dist/mux.c | 10 +++++++---
crypto/external/bsd/openssh/dist/packet.c | 6 +++---
crypto/external/bsd/openssh/dist/sftp-server.c | 10 +++++-----
crypto/external/bsd/openssh/dist/sftp.c | 10 +++++-----
crypto/external/bsd/openssh/dist/ssh-keygen.1 | 10 +++++-----
crypto/external/bsd/openssh/dist/ssh-keygen.c | 9 +++++----
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c | 10 +++++-----
crypto/external/bsd/openssh/dist/ssh_config.5 | 8 ++++----
crypto/external/bsd/openssh/dist/sshconnect.c | 8 ++++----
crypto/external/bsd/openssh/dist/sshd.c | 8 ++++----
crypto/external/bsd/openssh/dist/sshd_config.5 | 12 ++++++------
crypto/external/bsd/openssh/dist/sshkey.c | 7 +++----
crypto/external/bsd/openssh/dist/version.h | 8 ++++----
16 files changed, 83 insertions(+), 68 deletions(-)
diffs (truncated from 505 to 300 lines):
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/auth.c
--- a/crypto/external/bsd/openssh/dist/auth.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth.c,v 1.14 2015/08/13 10:33:21 christos Exp $ */
-/* $OpenBSD: auth.c,v 1.112 2015/08/06 14:53:21 deraadt Exp $ */
+/* $NetBSD: auth.c,v 1.15 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: auth.c,v 1.113 2015/08/21 03:42:19 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.14 2015/08/13 10:33:21 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.15 2015/08/21 08:20:59 christos Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -392,7 +392,7 @@
case PERMIT_NO_PASSWD:
if (strcmp(method, "publickey") == 0 ||
strcmp(method, "hostbased") == 0 ||
- strcmp(method, "gssapi-with-mic"))
+ strcmp(method, "gssapi-with-mic") == 0)
return 1;
break;
case PERMIT_FORCED_ONLY:
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/compat.c
--- a/crypto/external/bsd/openssh/dist/compat.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/compat.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: compat.c,v 1.12 2015/08/13 10:33:21 christos Exp $ */
-/* $OpenBSD: compat.c,v 1.96 2015/07/28 23:20:42 djm Exp $ */
+/* $NetBSD: compat.c,v 1.13 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: compat.c,v 1.97 2015/08/19 23:21:42 djm Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: compat.c,v 1.12 2015/08/13 10:33:21 christos Exp $");
+__RCSID("$NetBSD: compat.c,v 1.13 2015/08/21 08:20:59 christos Exp $");
#include <sys/types.h>
#include <stdlib.h>
@@ -177,6 +177,7 @@
"PuTTY_Release_0.63*,"
"PuTTY_Release_0.64*",
SSH_OLD_DHGEX },
+ { "FuTTY*", SSH_OLD_DHGEX }, /* Putty Fork */
{ "Probe-*",
SSH_BUG_PROBE },
{ "TeraTerm SSH*,"
@@ -190,7 +191,17 @@
"TTSSH/2.70*,"
"TTSSH/2.71*,"
"TTSSH/2.72*", SSH_BUG_HOSTKEYS },
- { "WinSCP*", SSH_OLD_DHGEX },
+ { "WinSCP_release_4*,"
+ "WinSCP_release_5.0*,"
+ "WinSCP_release_5.1*,"
+ "WinSCP_release_5.5*,"
+ "WinSCP_release_5.6*,"
+ "WinSCP_release_5.7,"
+ "WinSCP_release_5.7.1,"
+ "WinSCP_release_5.7.2,"
+ "WinSCP_release_5.7.3,"
+ "WinSCP_release_5.7.4",
+ SSH_OLD_DHGEX },
{ NULL, 0 }
};
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/dns.c
--- a/crypto/external/bsd/openssh/dist/dns.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/dns.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: dns.c,v 1.11 2015/04/03 23:58:19 christos Exp $ */
-/* $OpenBSD: dns.c,v 1.34 2015/01/28 22:36:00 djm Exp $ */
+/* $NetBSD: dns.c,v 1.12 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: dns.c,v 1.35 2015/08/20 22:32:42 deraadt Exp $ */
/*
* Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: dns.c,v 1.11 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: dns.c,v 1.12 2015/08/21 08:20:59 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
@@ -155,7 +155,7 @@
*digest_len = rdata_len - 2;
if (*digest_len > 0) {
- *digest = (u_char *) xmalloc(*digest_len);
+ *digest = xmalloc(*digest_len);
memcpy(*digest, rdata + 2, *digest_len);
} else {
*digest = (u_char *)xstrdup("");
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/mux.c
--- a/crypto/external/bsd/openssh/dist/mux.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/mux.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: mux.c,v 1.12 2015/07/03 01:00:00 christos Exp $ */
-/* $OpenBSD: mux.c,v 1.53 2015/05/01 04:03:20 djm Exp $ */
+/* $NetBSD: mux.c,v 1.13 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: mux.c,v 1.54 2015/08/19 23:18:26 djm Exp $ */
/*
* Copyright (c) 2002-2008 Damien Miller <djm%openbsd.org@localhost>
*
@@ -32,7 +32,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: mux.c,v 1.12 2015/07/03 01:00:00 christos Exp $");
+__RCSID("$NetBSD: mux.c,v 1.13 2015/08/21 08:20:59 christos Exp $");
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
@@ -655,6 +655,8 @@
u_int lport, cport;
int i, ret = 0, freefwd = 1;
+ memset(&fwd, 0, sizeof(fwd));
+
/* XXX - lport/cport check redundant */
if (buffer_get_int_ret(&ftype, m) != 0 ||
(listen_addr = buffer_get_string_ret(m, NULL)) == NULL ||
@@ -822,6 +824,8 @@
int i, ret = 0;
u_int lport, cport;
+ memset(&fwd, 0, sizeof(fwd));
+
if (buffer_get_int_ret(&ftype, m) != 0 ||
(listen_addr = buffer_get_string_ret(m, NULL)) == NULL ||
buffer_get_int_ret(&lport, m) != 0 ||
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/packet.c
--- a/crypto/external/bsd/openssh/dist/packet.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/packet.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: packet.c,v 1.20 2015/08/13 10:33:21 christos Exp $ */
-/* $OpenBSD: packet.c,v 1.213 2015/07/29 04:43:06 djm Exp $ */
+/* $NetBSD: packet.c,v 1.21 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: packet.c,v 1.214 2015/08/20 22:32:42 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: packet.c,v 1.20 2015/08/13 10:33:21 christos Exp $");
+__RCSID("$NetBSD: packet.c,v 1.21 2015/08/21 08:20:59 christos Exp $");
#include <sys/param.h> /* MIN roundup */
#include <sys/types.h>
#include <sys/queue.h>
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/sftp-server.c
--- a/crypto/external/bsd/openssh/dist/sftp-server.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/sftp-server.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: sftp-server.c,v 1.12 2015/07/03 01:00:00 christos Exp $ */
-/* $OpenBSD: sftp-server.c,v 1.106 2015/04/24 01:36:01 deraadt Exp $ */
+/* $NetBSD: sftp-server.c,v 1.13 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.107 2015/08/20 22:32:42 deraadt Exp $ */
/*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
*
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sftp-server.c,v 1.12 2015/07/03 01:00:00 christos Exp $");
+__RCSID("$NetBSD: sftp-server.c,v 1.13 2015/08/21 08:20:59 christos Exp $");
#include <sys/param.h> /* MIN */
#include <sys/types.h>
#include <sys/stat.h>
@@ -1588,8 +1588,8 @@
fatal("%s: sshbuf_new failed", __func__);
set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask);
- rset = (fd_set *)xmalloc(set_size);
- wset = (fd_set *)xmalloc(set_size);
+ rset = xmalloc(set_size);
+ wset = xmalloc(set_size);
if (homedir != NULL) {
if (chdir(homedir) != 0) {
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/sftp.c
--- a/crypto/external/bsd/openssh/dist/sftp.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/sftp.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: sftp.c,v 1.15 2015/04/13 17:35:16 christos Exp $ */
-/* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */
+/* $NetBSD: sftp.c,v 1.16 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: sftp.c,v 1.171 2015/08/20 22:32:42 deraadt Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm%openbsd.org@localhost>
*
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sftp.c,v 1.15 2015/04/13 17:35:16 christos Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.16 2015/08/21 08:20:59 christos Exp $");
#include <sys/param.h> /* MIN MAX */
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -1964,7 +1964,7 @@
/* Figure out which argument the cursor points to */
cursor = lf->cursor - lf->buffer;
- line = (char *)xmalloc(cursor + 1);
+ line = xmalloc(cursor + 1);
memcpy(line, lf->buffer, cursor);
line[cursor] = '\0';
argv = makeargv(line, &carg, 1, "e, &terminated);
@@ -1972,7 +1972,7 @@
/* Get all the arguments on the line */
len = lf->lastchar - lf->buffer;
- line = (char *)xmalloc(len + 1);
+ line = xmalloc(len + 1);
memcpy(line, lf->buffer, len);
line[len] = '\0';
argv = makeargv(line, &argc, 1, NULL, NULL);
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/ssh-keygen.1
--- a/crypto/external/bsd/openssh/dist/ssh-keygen.1 Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-keygen.1 Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-.\" $NetBSD: ssh-keygen.1,v 1.14 2015/08/13 10:33:21 christos Exp $
-.\" $OpenBSD: ssh-keygen.1,v 1.126 2015/07/03 03:49:45 djm Exp $
+.\" $NetBSD: ssh-keygen.1,v 1.15 2015/08/21 08:20:59 christos Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.127 2015/08/20 19:20:06 naddy Exp $
.\"
.\" -*- nroff -*-
.\"
@@ -38,7 +38,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 3 2015
+.Dd August 20 2015
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -686,7 +686,7 @@
to
.Fl s :
.Pp
-.Dl $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id host_key.pub
+.Dl $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id user_key.pub
.Pp
In all cases,
.Ar key_id
@@ -699,7 +699,7 @@
To generate a certificate for a specified set of principals:
.Pp
.Dl $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub
-.Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain user_key.pub"
+.Dl "$ ssh-keygen -s ca_key -I key_id -h -n host.domain host_key.pub"
.Pp
Additional limitations on the validity and use of user certificates may
be specified through certificate options.
diff -r 46b28d4f2c20 -r b7a9e131f652 crypto/external/bsd/openssh/dist/ssh-keygen.c
--- a/crypto/external/bsd/openssh/dist/ssh-keygen.c Fri Aug 21 08:19:28 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-keygen.c Fri Aug 21 08:20:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: ssh-keygen.c,v 1.18 2015/08/13 10:33:21 christos Exp $ */
-/* $OpenBSD: ssh-keygen.c,v 1.276 2015/07/03 03:49:45 djm Exp $ */
+/* $NetBSD: ssh-keygen.c,v 1.19 2015/08/21 08:20:59 christos Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.277 2015/08/19 23:17:51 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1994 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: ssh-keygen.c,v 1.18 2015/08/13 10:33:21 christos Exp $");
+__RCSID("$NetBSD: ssh-keygen.c,v 1.19 2015/08/21 08:20:59 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
@@ -1189,7 +1189,8 @@
exit(1);
} else if (delete_host && !ctx.found_key) {
logit("Host %s not found in %s", name, identity_file);
- unlink(tmp);
+ if (inplace)
+ unlink(tmp);
} else if (inplace) {
/* Backup existing file */
if (unlink(old) == -1 && errno != ENOENT)
Home |
Main Index |
Thread Index |
Old Index