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 conflicts.
details: https://anonhg.NetBSD.org/src/rev/65c438771534
branches: trunk
changeset: 791211:65c438771534
user: christos <christos%NetBSD.org@localhost>
date: Fri Nov 08 19:18:24 2013 +0000
description:
merge conflicts.
diffstat:
crypto/external/bsd/openssh/dist/addrmatch.c | 10 +-
crypto/external/bsd/openssh/dist/auth-chall.c | 16 +-
crypto/external/bsd/openssh/dist/auth-krb5.c | 28 +-
crypto/external/bsd/openssh/dist/auth-options.c | 72 ++--
crypto/external/bsd/openssh/dist/auth-pam.c | 42 +-
crypto/external/bsd/openssh/dist/auth-rsa.c | 31 +-
crypto/external/bsd/openssh/dist/auth.c | 48 ++-
crypto/external/bsd/openssh/dist/auth.h | 18 +-
crypto/external/bsd/openssh/dist/auth1.c | 63 +--
crypto/external/bsd/openssh/dist/auth2-chall.c | 43 +-
crypto/external/bsd/openssh/dist/auth2-gss.c | 21 +-
crypto/external/bsd/openssh/dist/auth2-hostbased.c | 22 +-
crypto/external/bsd/openssh/dist/auth2-jpake.c | 26 +-
crypto/external/bsd/openssh/dist/auth2-kbdint.c | 10 +-
crypto/external/bsd/openssh/dist/auth2-krb5.c | 10 +-
crypto/external/bsd/openssh/dist/auth2-passwd.c | 10 +-
crypto/external/bsd/openssh/dist/auth2-pubkey.c | 91 ++++-
crypto/external/bsd/openssh/dist/auth2.c | 95 ++++--
crypto/external/bsd/openssh/dist/authfd.c | 16 +-
crypto/external/bsd/openssh/dist/authfile.c | 18 +-
crypto/external/bsd/openssh/dist/bufaux.c | 16 +-
crypto/external/bsd/openssh/dist/bufbn.c | 22 +-
crypto/external/bsd/openssh/dist/bufec.c | 10 +-
crypto/external/bsd/openssh/dist/buffer.c | 8 +-
crypto/external/bsd/openssh/dist/buffer.h | 6 +-
crypto/external/bsd/openssh/dist/canohost.c | 14 +-
crypto/external/bsd/openssh/dist/channels.c | 137 ++++-----
crypto/external/bsd/openssh/dist/channels.h | 9 +-
crypto/external/bsd/openssh/dist/cipher-3des1.c | 12 +-
crypto/external/bsd/openssh/dist/cipher-ctr-mt.c | 4 +-
crypto/external/bsd/openssh/dist/cipher-ctr.c | 139 ---------
crypto/external/bsd/openssh/dist/cipher.c | 67 +++-
crypto/external/bsd/openssh/dist/cipher.h | 15 +-
crypto/external/bsd/openssh/dist/clientloop.c | 101 +++---
crypto/external/bsd/openssh/dist/clientloop.h | 5 +-
crypto/external/bsd/openssh/dist/compat.c | 10 +-
crypto/external/bsd/openssh/dist/dh.c | 78 +++--
crypto/external/bsd/openssh/dist/dns.c | 14 +-
crypto/external/bsd/openssh/dist/fmt_scaled.c | 11 +-
crypto/external/bsd/openssh/dist/fmt_scaled.h | 3 +-
crypto/external/bsd/openssh/dist/groupaccess.c | 9 +-
crypto/external/bsd/openssh/dist/gss-genr.c | 20 +-
crypto/external/bsd/openssh/dist/gss-serv-krb5.c | 71 +---
crypto/external/bsd/openssh/dist/gss-serv.c | 6 +-
crypto/external/bsd/openssh/dist/hostfile.c | 35 +-
crypto/external/bsd/openssh/dist/hostfile.h | 6 +-
crypto/external/bsd/openssh/dist/jpake.c | 12 +-
crypto/external/bsd/openssh/dist/kex.c | 102 ++++--
crypto/external/bsd/openssh/dist/kex.h | 17 +-
crypto/external/bsd/openssh/dist/kexdhc.c | 12 +-
crypto/external/bsd/openssh/dist/kexdhs.c | 20 +-
crypto/external/bsd/openssh/dist/kexecdh.c | 24 +-
crypto/external/bsd/openssh/dist/kexecdhc.c | 17 +-
crypto/external/bsd/openssh/dist/kexecdhs.c | 25 +-
crypto/external/bsd/openssh/dist/kexgexc.c | 12 +-
crypto/external/bsd/openssh/dist/kexgexs.c | 21 +-
crypto/external/bsd/openssh/dist/key.c | 273 ++++++++----------
crypto/external/bsd/openssh/dist/key.h | 11 +-
crypto/external/bsd/openssh/dist/krl.c | 52 +-
crypto/external/bsd/openssh/dist/log.c | 32 +-
crypto/external/bsd/openssh/dist/log.h | 5 +-
crypto/external/bsd/openssh/dist/mac.c | 85 +++--
crypto/external/bsd/openssh/dist/mac.h | 5 +-
crypto/external/bsd/openssh/dist/match.c | 19 +-
crypto/external/bsd/openssh/dist/misc.c | 48 ++-
crypto/external/bsd/openssh/dist/misc.h | 5 +-
crypto/external/bsd/openssh/dist/moduli.c | 14 +-
crypto/external/bsd/openssh/dist/monitor.c | 220 ++++++++------
crypto/external/bsd/openssh/dist/monitor_mm.c | 22 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 42 +-
crypto/external/bsd/openssh/dist/mux.c | 156 +++++-----
crypto/external/bsd/openssh/dist/namespace.h | 3 +-
crypto/external/bsd/openssh/dist/packet.c | 88 ++++--
crypto/external/bsd/openssh/dist/packet.h | 9 +-
crypto/external/bsd/openssh/dist/pathnames.h | 24 +-
crypto/external/bsd/openssh/dist/progressmeter.c | 11 +-
crypto/external/bsd/openssh/dist/readconf.c | 130 ++++----
crypto/external/bsd/openssh/dist/readconf.h | 7 +-
crypto/external/bsd/openssh/dist/readpass.c | 8 +-
crypto/external/bsd/openssh/dist/roaming_client.c | 13 +-
crypto/external/bsd/openssh/dist/roaming_common.c | 6 +-
crypto/external/bsd/openssh/dist/rsa.c | 14 +-
crypto/external/bsd/openssh/dist/schnorr.c | 24 +-
crypto/external/bsd/openssh/dist/scp.1 | 6 +-
crypto/external/bsd/openssh/dist/scp.c | 97 +++--
crypto/external/bsd/openssh/dist/servconf.c | 80 ++++-
crypto/external/bsd/openssh/dist/servconf.h | 8 +-
crypto/external/bsd/openssh/dist/serverloop.c | 50 +-
crypto/external/bsd/openssh/dist/session.c | 119 ++++----
crypto/external/bsd/openssh/dist/sftp-client.c | 149 ++++++----
crypto/external/bsd/openssh/dist/sftp-client.h | 8 +-
crypto/external/bsd/openssh/dist/sftp-common.c | 10 +-
crypto/external/bsd/openssh/dist/sftp-glob.c | 14 +-
crypto/external/bsd/openssh/dist/sftp-server.8 | 10 +-
crypto/external/bsd/openssh/dist/sftp-server.c | 62 ++--
crypto/external/bsd/openssh/dist/sftp.1 | 34 ++-
crypto/external/bsd/openssh/dist/sftp.c | 219 +++++++++------
crypto/external/bsd/openssh/dist/ssh-add.c | 24 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 99 +++---
crypto/external/bsd/openssh/dist/ssh-dss.c | 14 +-
crypto/external/bsd/openssh/dist/ssh-ecdsa.c | 14 +-
crypto/external/bsd/openssh/dist/ssh-keygen.1 | 9 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 120 ++++----
crypto/external/bsd/openssh/dist/ssh-keyscan.1 | 6 +-
crypto/external/bsd/openssh/dist/ssh-keyscan.c | 20 +-
crypto/external/bsd/openssh/dist/ssh-keysign.8 | 6 +-
crypto/external/bsd/openssh/dist/ssh-keysign.c | 24 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c | 13 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.8 | 6 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c | 27 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.c | 41 +-
crypto/external/bsd/openssh/dist/ssh-rsa.c | 27 +-
crypto/external/bsd/openssh/dist/ssh.1 | 38 +-
crypto/external/bsd/openssh/dist/ssh.c | 104 ++++--
crypto/external/bsd/openssh/dist/ssh_config | 6 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 48 ++-
crypto/external/bsd/openssh/dist/sshconnect.c | 52 ++-
crypto/external/bsd/openssh/dist/sshconnect1.c | 34 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 170 +++++-----
crypto/external/bsd/openssh/dist/sshd.8 | 19 +-
crypto/external/bsd/openssh/dist/sshd.c | 126 +++++++-
crypto/external/bsd/openssh/dist/sshd_config | 7 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 99 ++++--
crypto/external/bsd/openssh/dist/umac.c | 82 ++--
crypto/external/bsd/openssh/dist/umac.h | 16 +-
crypto/external/bsd/openssh/dist/uuencode.c | 11 +-
crypto/external/bsd/openssh/dist/version.h | 8 +-
crypto/external/bsd/openssh/dist/xmalloc.c | 14 +-
crypto/external/bsd/openssh/dist/xmalloc.h | 5 +-
crypto/external/bsd/openssh/lib/Makefile | 3 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
131 files changed, 2848 insertions(+), 2420 deletions(-)
diffs (truncated from 14818 to 300 lines):
diff -r 061cd3a0ff61 -r 65c438771534 crypto/external/bsd/openssh/dist/addrmatch.c
--- a/crypto/external/bsd/openssh/dist/addrmatch.c Fri Nov 08 19:05:52 2013 +0000
+++ b/crypto/external/bsd/openssh/dist/addrmatch.c Fri Nov 08 19:18:24 2013 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: addrmatch.c,v 1.5 2012/12/12 17:42:39 christos Exp $ */
-/* $OpenBSD: addrmatch.c,v 1.6 2012/06/21 00:16:07 dtucker Exp $ */
+/* $NetBSD: addrmatch.c,v 1.6 2013/11/08 19:18:24 christos Exp $ */
+/* $OpenBSD: addrmatch.c,v 1.7 2013/05/17 00:13:13 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.5 2012/12/12 17:42:39 christos Exp $");
+__RCSID("$NetBSD: addrmatch.c,v 1.6 2013/11/08 19:18:24 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -419,7 +419,7 @@
goto foundit;
}
}
- xfree(o);
+ free(o);
return ret;
}
@@ -493,7 +493,7 @@
continue;
}
}
- xfree(o);
+ free(o);
return ret;
}
diff -r 061cd3a0ff61 -r 65c438771534 crypto/external/bsd/openssh/dist/auth-chall.c
--- a/crypto/external/bsd/openssh/dist/auth-chall.c Fri Nov 08 19:05:52 2013 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-chall.c Fri Nov 08 19:18:24 2013 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-chall.c,v 1.3 2011/07/25 03:03:10 christos Exp $ */
-/* $OpenBSD: auth-chall.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */
+/* $NetBSD: auth-chall.c,v 1.4 2013/11/08 19:18:24 christos Exp $ */
+/* $OpenBSD: auth-chall.c,v 1.13 2013/05/17 00:13:13 djm Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-chall.c,v 1.3 2011/07/25 03:03:10 christos Exp $");
+__RCSID("$NetBSD: auth-chall.c,v 1.4 2013/11/08 19:18:24 christos Exp $");
#include <sys/types.h>
#include "xmalloc.h"
@@ -72,11 +72,11 @@
fatal("get_challenge: numprompts < 1");
challenge = xstrdup(prompts[0]);
for (i = 0; i < numprompts; i++)
- xfree(prompts[i]);
- xfree(prompts);
- xfree(name);
- xfree(echo_on);
- xfree(info);
+ free(prompts[i]);
+ free(prompts);
+ free(name);
+ free(echo_on);
+ free(info);
return (challenge);
}
diff -r 061cd3a0ff61 -r 65c438771534 crypto/external/bsd/openssh/dist/auth-krb5.c
--- a/crypto/external/bsd/openssh/dist/auth-krb5.c Fri Nov 08 19:05:52 2013 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-krb5.c Fri Nov 08 19:18:24 2013 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-krb5.c,v 1.4 2011/07/25 03:03:10 christos Exp $ */
-/* $OpenBSD: auth-krb5.c,v 1.19 2006/08/03 03:34:41 deraadt Exp $ */
+/* $NetBSD: auth-krb5.c,v 1.5 2013/11/08 19:18:24 christos Exp $ */
+/* $OpenBSD: auth-krb5.c,v 1.20 2013/07/20 01:55:13 djm Exp $ */
/*
* Kerberos v5 authentication and ticket-passing routines.
*
@@ -30,7 +30,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-krb5.c,v 1.4 2011/07/25 03:03:10 christos Exp $");
+__RCSID("$NetBSD: auth-krb5.c,v 1.5 2013/11/08 19:18:24 christos Exp $");
#include <sys/types.h>
#include <pwd.h>
#include <stdarg.h>
@@ -139,7 +139,7 @@
if (ticket)
krb5_free_ticket(authctxt->krb5_ctx, ticket);
if (!ret && reply->length) {
- xfree(reply->data);
+ free(reply->data);
memset(reply, 0, sizeof(*reply));
}
@@ -229,7 +229,7 @@
{
krb5_error_code problem;
krb5_ccache ccache = NULL;
- const char *errtxt;
+ const char *errmsg;
temporarily_use_uid(authctxt->pw);
@@ -242,8 +242,8 @@
if (problem)
goto out;
- problem = krb5_cc_new_unique(authctxt->krb5_ctx, "MEMORY", NULL,
- &ccache);
+ problem = krb5_cc_new_unique(authctxt->krb5_ctx,
+ krb5_mcc_ops.prefix, NULL, &ccache);
if (problem)
goto out;
@@ -262,8 +262,8 @@
if (problem)
goto out;
- problem = krb5_cc_new_unique(authctxt->krb5_ctx, "FILE", NULL,
- &authctxt->krb5_fwd_ccache);
+ problem = krb5_cc_new_unique(authctxt->krb5_ctx,
+ krb5_fcc_ops.prefix, NULL, &authctxt->krb5_fwd_ccache);
if (problem)
goto out;
@@ -284,14 +284,12 @@
if (ccache)
krb5_cc_destroy(authctxt->krb5_ctx, ccache);
- errtxt = NULL;
- if (authctxt->krb5_ctx != NULL)
- errtxt = krb5_get_error_message(authctxt->krb5_ctx,
+ if (authctxt->krb5_ctx != NULL) {
+ errmsg = krb5_get_error_message(authctxt->krb5_ctx,
problem);
- if (errtxt != NULL) {
debug("Kerberos password authentication failed: %s",
- errtxt);
- krb5_free_error_message(authctxt->krb5_ctx, errtxt);
+ errmsg);
+ krb5_free_error_message(authctxt->krb5_ctx, errmsg);
} else
debug("Kerberos password authentication failed: %d",
problem);
diff -r 061cd3a0ff61 -r 65c438771534 crypto/external/bsd/openssh/dist/auth-options.c
--- a/crypto/external/bsd/openssh/dist/auth-options.c Fri Nov 08 19:05:52 2013 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.c Fri Nov 08 19:18:24 2013 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-options.c,v 1.6 2013/03/29 16:19:44 christos Exp $ */
-/* $OpenBSD: auth-options.c,v 1.57 2012/12/02 20:46:11 djm Exp $ */
+/* $NetBSD: auth-options.c,v 1.7 2013/11/08 19:18:24 christos Exp $ */
+/* $OpenBSD: auth-options.c,v 1.59.2.1 2013/11/08 01:33:56 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth-options.c,v 1.6 2013/03/29 16:19:44 christos Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.7 2013/11/08 19:18:24 christos Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -74,15 +74,15 @@
while (custom_environment) {
struct envstring *ce = custom_environment;
custom_environment = ce->next;
- xfree(ce->s);
- xfree(ce);
+ free(ce->s);
+ free(ce);
}
if (forced_command) {
- xfree(forced_command);
+ free(forced_command);
forced_command = NULL;
}
if (authorized_principals) {
- xfree(authorized_principals);
+ free(authorized_principals);
authorized_principals = NULL;
}
forced_tun_device = -1;
@@ -152,7 +152,7 @@
if (strncasecmp(opts, cp, strlen(cp)) == 0) {
opts += strlen(cp);
if (forced_command != NULL)
- xfree(forced_command);
+ free(forced_command);
forced_command = xmalloc(strlen(opts) + 1);
i = 0;
while (*opts) {
@@ -170,7 +170,7 @@
file, linenum);
auth_debug_add("%.100s, line %lu: missing end quote",
file, linenum);
- xfree(forced_command);
+ free(forced_command);
forced_command = NULL;
goto bad_option;
}
@@ -183,7 +183,7 @@
if (strncasecmp(opts, cp, strlen(cp)) == 0) {
opts += strlen(cp);
if (authorized_principals != NULL)
- xfree(authorized_principals);
+ free(authorized_principals);
authorized_principals = xmalloc(strlen(opts) + 1);
i = 0;
while (*opts) {
@@ -201,7 +201,7 @@
file, linenum);
auth_debug_add("%.100s, line %lu: missing end quote",
file, linenum);
- xfree(authorized_principals);
+ free(authorized_principals);
authorized_principals = NULL;
goto bad_option;
}
@@ -235,14 +235,14 @@
file, linenum);
auth_debug_add("%.100s, line %lu: missing end quote",
file, linenum);
- xfree(s);
+ free(s);
goto bad_option;
}
s[i] = '\0';
auth_debug_add("Adding to environment: %.900s", s);
debug("Adding to environment: %.900s", s);
opts++;
- new_envstring = xmalloc(sizeof(struct envstring));
+ new_envstring = xcalloc(1, sizeof(struct envstring));
new_envstring->s = s;
new_envstring->next = custom_environment;
custom_environment = new_envstring;
@@ -272,7 +272,7 @@
file, linenum);
auth_debug_add("%.100s, line %lu: missing end quote",
file, linenum);
- xfree(patterns);
+ free(patterns);
goto bad_option;
}
patterns[i] = '\0';
@@ -280,7 +280,7 @@
switch (match_host_and_ip(remote_host, remote_ip,
patterns)) {
case 1:
- xfree(patterns);
+ free(patterns);
/* Host name matches. */
goto next_option;
case -1:
@@ -290,7 +290,7 @@
"invalid criteria", file, linenum);
/* FALLTHROUGH */
case 0:
- xfree(patterns);
+ free(patterns);
logit("Authentication tried for %.100s with "
"correct key but not from a permitted "
"host (host=%.200s, ip=%.200s).",
@@ -326,7 +326,7 @@
file, linenum);
auth_debug_add("%.100s, line %lu: missing "
"end quote", file, linenum);
- xfree(patterns);
+ free(patterns);
goto bad_option;
}
patterns[i] = '\0';
@@ -340,7 +340,7 @@
auth_debug_add("%.100s, line %lu: "
"Bad permitopen specification", file,
linenum);
- xfree(patterns);
+ free(patterns);
goto bad_option;
}
host = cleanhostname(host);
@@ -349,12 +349,12 @@
"<%.100s>", file, linenum, p ? p : "");
auth_debug_add("%.100s, line %lu: "
"Bad permitopen port", file, linenum);
- xfree(patterns);
+ free(patterns);
goto bad_option;
}
Home |
Main Index |
Thread Index |
Old Index