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/cad1ec05c568
branches: trunk
changeset: 809330:cad1ec05c568
user: christos <christos%NetBSD.org@localhost>
date: Fri Jul 03 00:59:59 2015 +0000
description:
merge conflicts
diffstat:
crypto/external/bsd/openssh/dist/PROTOCOL | 6 +-
crypto/external/bsd/openssh/dist/PROTOCOL.agent | 6 +-
crypto/external/bsd/openssh/dist/auth-options.c | 29 +-
crypto/external/bsd/openssh/dist/auth-pam.c | 6 +-
crypto/external/bsd/openssh/dist/auth.c | 21 +-
crypto/external/bsd/openssh/dist/auth.h | 8 +-
crypto/external/bsd/openssh/dist/auth1.c | 14 +-
crypto/external/bsd/openssh/dist/auth2-hostbased.c | 9 +-
crypto/external/bsd/openssh/dist/auth2-pubkey.c | 638 ++++++++++++---
crypto/external/bsd/openssh/dist/authfd.c | 12 +-
crypto/external/bsd/openssh/dist/authfile.c | 12 +-
crypto/external/bsd/openssh/dist/channels.c | 67 +-
crypto/external/bsd/openssh/dist/channels.h | 7 +-
crypto/external/bsd/openssh/dist/clientloop.c | 36 +-
crypto/external/bsd/openssh/dist/compat.c | 62 +-
crypto/external/bsd/openssh/dist/compat.h | 9 +-
crypto/external/bsd/openssh/dist/dh.c | 53 +-
crypto/external/bsd/openssh/dist/dh.h | 5 +-
crypto/external/bsd/openssh/dist/digest-libc.c | 6 +-
crypto/external/bsd/openssh/dist/dispatch.c | 26 +-
crypto/external/bsd/openssh/dist/dns.h | 6 +-
crypto/external/bsd/openssh/dist/groupaccess.c | 10 +-
crypto/external/bsd/openssh/dist/gss-serv.c | 46 +-
crypto/external/bsd/openssh/dist/hmac.c | 6 +-
crypto/external/bsd/openssh/dist/hostfile.c | 15 +-
crypto/external/bsd/openssh/dist/kex.c | 8 +-
crypto/external/bsd/openssh/dist/kexc25519.c | 9 +-
crypto/external/bsd/openssh/dist/kexc25519s.c | 7 +-
crypto/external/bsd/openssh/dist/kexgexc.c | 38 +-
crypto/external/bsd/openssh/dist/kexgexs.c | 53 +-
crypto/external/bsd/openssh/dist/krl.c | 9 +-
crypto/external/bsd/openssh/dist/match.c | 18 +-
crypto/external/bsd/openssh/dist/match.h | 8 +-
crypto/external/bsd/openssh/dist/misc.c | 8 +-
crypto/external/bsd/openssh/dist/moduli-gen/moduli | 295 -------
crypto/external/bsd/openssh/dist/moduli-gen/moduli.1024 | 48 -
crypto/external/bsd/openssh/dist/monitor.c | 28 +-
crypto/external/bsd/openssh/dist/monitor_wrap.c | 19 +-
crypto/external/bsd/openssh/dist/monitor_wrap.h | 8 +-
crypto/external/bsd/openssh/dist/mux.c | 27 +-
crypto/external/bsd/openssh/dist/myproposal.h | 23 +-
crypto/external/bsd/openssh/dist/opacket.c | 12 +-
crypto/external/bsd/openssh/dist/openssh2netbsd | 38 -
crypto/external/bsd/openssh/dist/packet.c | 54 +-
crypto/external/bsd/openssh/dist/readconf.c | 41 +-
crypto/external/bsd/openssh/dist/scp.c | 8 +-
crypto/external/bsd/openssh/dist/servconf.c | 177 +++-
crypto/external/bsd/openssh/dist/servconf.h | 17 +-
crypto/external/bsd/openssh/dist/session.c | 12 +-
crypto/external/bsd/openssh/dist/sftp-client.c | 15 +-
crypto/external/bsd/openssh/dist/sftp-client.h | 8 +-
crypto/external/bsd/openssh/dist/sftp-server.c | 10 +-
crypto/external/bsd/openssh/dist/ssh-add.1 | 20 +-
crypto/external/bsd/openssh/dist/ssh-add.c | 24 +-
crypto/external/bsd/openssh/dist/ssh-agent.1 | 15 +-
crypto/external/bsd/openssh/dist/ssh-agent.c | 91 +-
crypto/external/bsd/openssh/dist/ssh-keygen.c | 397 ++++-----
crypto/external/bsd/openssh/dist/ssh-keyscan.c | 14 +-
crypto/external/bsd/openssh/dist/ssh-keysign.c | 8 +-
crypto/external/bsd/openssh/dist/ssh-pkcs11.c | 38 +-
crypto/external/bsd/openssh/dist/ssh-rsa.c | 8 +-
crypto/external/bsd/openssh/dist/ssh.1 | 34 +-
crypto/external/bsd/openssh/dist/ssh.c | 16 +-
crypto/external/bsd/openssh/dist/ssh_config.5 | 27 +-
crypto/external/bsd/openssh/dist/sshbuf-misc.c | 6 +-
crypto/external/bsd/openssh/dist/sshconnect.c | 11 +-
crypto/external/bsd/openssh/dist/sshconnect2.c | 9 +-
crypto/external/bsd/openssh/dist/sshd.8 | 8 +-
crypto/external/bsd/openssh/dist/sshd.c | 29 +-
crypto/external/bsd/openssh/dist/sshd_config | 6 +-
crypto/external/bsd/openssh/dist/sshd_config.5 | 102 ++-
crypto/external/bsd/openssh/dist/sshkey.c | 209 +++--
crypto/external/bsd/openssh/dist/uidswap.c | 6 +-
crypto/external/bsd/openssh/dist/uuencode.c | 8 +-
crypto/external/bsd/openssh/dist/version.h | 8 +-
crypto/external/bsd/openssh/dist/xmalloc.c | 22 +-
crypto/external/bsd/openssh/dist/xmalloc.h | 6 +-
crypto/external/bsd/openssh/lib/shlib_version | 4 +-
crypto/external/bsd/openssh/openssh2netbsd | 38 +
79 files changed, 1855 insertions(+), 1422 deletions(-)
diffs (truncated from 6692 to 300 lines):
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/PROTOCOL
--- a/crypto/external/bsd/openssh/dist/PROTOCOL Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL Fri Jul 03 00:59:59 2015 +0000
@@ -175,7 +175,7 @@
OpenSSH supports layer 2 and layer 3 tunnelling via the "tun%openssh.com@localhost"
channel type. This channel type supports forwarding of network packets
-with datagram boundaries intact between endpoints equipped with
+with datagram boundaries intact between endpoints equipped with
interfaces like the BSD tun(4) device. Tunnel forwarding channels are
requested by the client with the following packet:
@@ -453,5 +453,5 @@
This extension is advertised in the SSH_FXP_VERSION hello with version
"1".
-$OpenBSD: PROTOCOL,v 1.27 2015/02/20 22:17:21 djm Exp $
-$NetBSD: PROTOCOL,v 1.5 2015/04/03 23:58:19 christos Exp $
+$OpenBSD: PROTOCOL,v 1.28 2015/05/08 03:56:51 djm Exp $
+$NetBSD: PROTOCOL,v 1.6 2015/07/03 00:59:59 christos Exp $
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/PROTOCOL.agent
--- a/crypto/external/bsd/openssh/dist/PROTOCOL.agent Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/PROTOCOL.agent Fri Jul 03 00:59:59 2015 +0000
@@ -413,7 +413,7 @@
"rsa_e" and "rsa_n" are used to identify which private key to use.
"encrypted_challenge" is a challenge blob that has (presumably)
-been encrypted with the public key and must be in the range
+been encrypted with the public key and must be in the range
1 <= encrypted_challenge < 2^256. "session_id" is the SSH protocol 1
session ID (computed from the server host key, the server semi-ephemeral
key and the session cookie).
@@ -557,5 +557,5 @@
SSH_AGENT_CONSTRAIN_LIFETIME 1
SSH_AGENT_CONSTRAIN_CONFIRM 2
-$OpenBSD: PROTOCOL.agent,v 1.7 2013/01/02 00:33:49 djm Exp $
-$NetBSD: PROTOCOL.agent,v 1.5 2015/04/03 23:58:19 christos Exp $
+$OpenBSD: PROTOCOL.agent,v 1.8 2015/05/08 03:56:51 djm Exp $
+$NetBSD: PROTOCOL.agent,v 1.6 2015/07/03 00:59:59 christos Exp $
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/auth-options.c
--- a/crypto/external/bsd/openssh/dist/auth-options.c Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-options.c Fri Jul 03 00:59:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth-options.c,v 1.9 2015/04/03 23:58:19 christos Exp $ */
-/* $OpenBSD: auth-options.c,v 1.65 2015/01/14 10:30:34 markus Exp $ */
+/* $NetBSD: auth-options.c,v 1.10 2015/07/03 00:59:59 christos Exp $ */
+/* $OpenBSD: auth-options.c,v 1.67 2015/05/01 03:20:54 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.9 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: auth-options.c,v 1.10 2015/07/03 00:59:59 christos Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -211,8 +211,7 @@
goto next_option;
}
cp = "environment=\"";
- if (options.permit_user_env &&
- strncasecmp(opts, cp, strlen(cp)) == 0) {
+ if (strncasecmp(opts, cp, strlen(cp)) == 0) {
char *s;
struct envstring *new_envstring;
@@ -238,13 +237,19 @@
goto bad_option;
}
s[i] = '\0';
- auth_debug_add("Adding to environment: %.900s", s);
- debug("Adding to environment: %.900s", s);
opts++;
- new_envstring = xcalloc(1, sizeof(struct envstring));
- new_envstring->s = s;
- new_envstring->next = custom_environment;
- custom_environment = new_envstring;
+ if (options.permit_user_env) {
+ auth_debug_add("Adding to environment: "
+ "%.900s", s);
+ debug("Adding to environment: %.900s", s);
+ new_envstring = xcalloc(1,
+ sizeof(*new_envstring));
+ new_envstring->s = s;
+ new_envstring->next = custom_environment;
+ custom_environment = new_envstring;
+ s = NULL;
+ }
+ free(s);
goto next_option;
}
cp = "from=\"";
@@ -605,7 +610,7 @@
&cert_source_address_done) == -1)
return -1;
if (parse_option_list(k->cert->extensions, pw,
- OPTIONS_EXTENSIONS, 1,
+ OPTIONS_EXTENSIONS, 0,
&cert_no_port_forwarding_flag,
&cert_no_agent_forwarding_flag,
&cert_no_x11_forwarding_flag,
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/auth-pam.c
--- a/crypto/external/bsd/openssh/dist/auth-pam.c Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth-pam.c Fri Jul 03 00:59:59 2015 +0000
@@ -50,7 +50,7 @@
/*
* NetBSD local changes
*/
-__RCSID("$NetBSD: auth-pam.c,v 1.6 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: auth-pam.c,v 1.7 2015/07/03 00:59:59 christos Exp $");
#undef USE_POSIX_THREADS /* Not yet */
#define HAVE_SECURITY_PAM_APPL_H
#define HAVE_PAM_GETENVLIST
@@ -754,7 +754,7 @@
case PAM_PROMPT_ECHO_OFF:
*num = 1;
len = plen + mlen + 1;
- **prompts = xrealloc(**prompts, 1, len);
+ **prompts = xreallocarray(**prompts, 1, len);
strlcpy(**prompts + plen, msg, len - plen);
plen += mlen;
**echo_on = (type == PAM_PROMPT_ECHO_ON);
@@ -764,7 +764,7 @@
case PAM_TEXT_INFO:
/* accumulate messages */
len = plen + mlen + 2;
- **prompts = xrealloc(**prompts, 1, len);
+ **prompts = xreallocarray(**prompts, 1, len);
strlcpy(**prompts + plen, msg, len - plen);
plen += mlen;
strlcat(**prompts + plen, "\n", len - plen);
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/auth.c
--- a/crypto/external/bsd/openssh/dist/auth.c Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.c Fri Jul 03 00:59:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth.c,v 1.12 2015/04/03 23:58:19 christos Exp $ */
-/* $OpenBSD: auth.c,v 1.110 2015/02/25 17:29:38 djm Exp $ */
+/* $NetBSD: auth.c,v 1.13 2015/07/03 00:59:59 christos Exp $ */
+/* $OpenBSD: auth.c,v 1.111 2015/05/01 04:17:51 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.12 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.13 2015/07/03 00:59:59 christos Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -115,10 +115,8 @@
if (cap_hlist != NULL) {
hp = strtok(cap_hlist, ",");
while (hp != NULL) {
- match_name = match_hostname(hostname,
- hp, strlen(hp));
- match_ip = match_hostname(ipaddr,
- hp, strlen(hp));
+ match_name = match_hostname(hostname, hp);
+ match_ip = match_hostname(ipaddr, hp);
/*
* Only a positive match here causes a "deny".
*/
@@ -146,10 +144,8 @@
return 0;
}
while (hp != NULL) {
- match_name = match_hostname(hostname,
- hp, strlen(hp));
- match_ip = match_hostname(ipaddr,
- hp, strlen(hp));
+ match_name = match_hostname(hostname, hp);
+ match_ip = match_hostname(ipaddr, hp);
/*
* Negative match causes an immediate "deny".
* Positive match causes us to break out
@@ -442,8 +438,7 @@
char *
authorized_principals_file(struct passwd *pw)
{
- if (options.authorized_principals_file == NULL ||
- strcasecmp(options.authorized_principals_file, "none") == 0)
+ if (options.authorized_principals_file == NULL)
return NULL;
return expand_authorized_keys(options.authorized_principals_file, pw);
}
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/auth.h
--- a/crypto/external/bsd/openssh/dist/auth.h Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.h Fri Jul 03 00:59:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth.h,v 1.10 2015/04/03 23:58:19 christos Exp $ */
-/* $OpenBSD: auth.h,v 1.82 2015/02/16 22:13:32 djm Exp $ */
+/* $NetBSD: auth.h,v 1.11 2015/07/03 00:59:59 christos Exp $ */
+/* $OpenBSD: auth.h,v 1.84 2015/05/08 06:41:56 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -57,7 +57,7 @@
int valid; /* user exists and is allowed to login */
int attempt;
int failures;
- int server_caused_failure;
+ int server_caused_failure;
int force_pwchange;
char *user; /* username sent by the client */
char *service;
@@ -134,7 +134,7 @@
int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
-int user_key_allowed(struct passwd *, Key *);
+int user_key_allowed(struct passwd *, Key *, int);
void pubkey_auth_info(Authctxt *, const Key *, const char *, ...)
__attribute__((__format__ (printf, 3, 4)));
void auth2_record_userkey(Authctxt *, struct sshkey *);
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/auth1.c
--- a/crypto/external/bsd/openssh/dist/auth1.c Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth1.c Fri Jul 03 00:59:59 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auth1.c,v 1.11 2015/04/03 23:58:19 christos Exp $ */
+/* $NetBSD: auth1.c,v 1.12 2015/07/03 00:59:59 christos Exp $ */
/* $OpenBSD: auth1.c,v 1.82 2014/07/15 15:54:14 millert Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth1.c,v 1.11 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: auth1.c,v 1.12 2015/07/03 00:59:59 christos Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -427,16 +427,6 @@
if ((style = strchr(user, ':')) != NULL)
*style++ = '\0';
-#ifdef KRB5
- /* XXX - SSH.com Kerberos v5 braindeath. */
- if ((datafellows & SSH_BUG_K5USER) &&
- options.kerberos_authentication) {
- char *p;
- if ((p = strchr(user, '@')) != NULL)
- *p = '\0';
- }
-#endif
-
authctxt->user = user;
authctxt->style = style;
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/auth2-hostbased.c
--- a/crypto/external/bsd/openssh/dist/auth2-hostbased.c Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-hostbased.c Fri Jul 03 00:59:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth2-hostbased.c,v 1.7 2015/04/03 23:58:19 christos Exp $ */
-/* $OpenBSD: auth2-hostbased.c,v 1.24 2015/01/28 22:36:00 djm Exp $ */
+/* $NetBSD: auth2-hostbased.c,v 1.8 2015/07/03 00:59:59 christos Exp $ */
+/* $OpenBSD: auth2-hostbased.c,v 1.25 2015/05/04 06:10:48 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: auth2-hostbased.c,v 1.7 2015/04/03 23:58:19 christos Exp $");
+__RCSID("$NetBSD: auth2-hostbased.c,v 1.8 2015/07/03 00:59:59 christos Exp $");
#include <sys/types.h>
#include <pwd.h>
@@ -110,8 +110,7 @@
goto done;
}
if (match_pattern_list(sshkey_ssh_name(key),
- options.hostbased_key_types,
- strlen(options.hostbased_key_types), 0) != 1) {
+ options.hostbased_key_types, 0) != 1) {
logit("%s: key type %s not in HostbasedAcceptedKeyTypes",
__func__, sshkey_type(key));
goto done;
diff -r cd05627394bb -r cad1ec05c568 crypto/external/bsd/openssh/dist/auth2-pubkey.c
--- a/crypto/external/bsd/openssh/dist/auth2-pubkey.c Fri Jul 03 00:54:44 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-pubkey.c Fri Jul 03 00:59:59 2015 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: auth2-pubkey.c,v 1.11 2015/04/03 23:58:19 christos Exp $ */
-/* $OpenBSD: auth2-pubkey.c,v 1.47 2015/02/17 00:14:05 djm Exp $ */
+/* $NetBSD: auth2-pubkey.c,v 1.12 2015/07/03 00:59:59 christos Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.53 2015/06/15 18:44:22 jsing Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -25,7 +25,7 @@
*/
#include "includes.h"
Home |
Main Index |
Thread Index |
Old Index