merge conflicts
This commit is contained in:
christos
parent
93fded9a74
commit
b1c8f1c6ff
8
crypto/external/bsd/openssh/dist/auth.c
vendored
8
crypto/external/bsd/openssh/dist/auth.c
vendored
@ -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 @@ auth_root_allowed(const char *method)
|
||||
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:
|
||||
|
||||
19
crypto/external/bsd/openssh/dist/compat.c
vendored
19
crypto/external/bsd/openssh/dist/compat.c
vendored
@ -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 @@ compat_datafellows(const char *version)
|
||||
"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 @@ compat_datafellows(const char *version)
|
||||
"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 }
|
||||
};
|
||||
|
||||
|
||||
8
crypto/external/bsd/openssh/dist/dns.c
vendored
8
crypto/external/bsd/openssh/dist/dns.c
vendored
@ -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 @@ dns_read_rdata(u_int8_t *algorithm, u_int8_t *digest_type,
|
||||
*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("");
|
||||
|
||||
10
crypto/external/bsd/openssh/dist/mux.c
vendored
10
crypto/external/bsd/openssh/dist/mux.c
vendored
@ -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>
|
||||
*
|
||||
@ -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 @@ process_mux_open_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r)
|
||||
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 @@ process_mux_close_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r)
|
||||
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 ||
|
||||
|
||||
6
crypto/external/bsd/openssh/dist/packet.c
vendored
6
crypto/external/bsd/openssh/dist/packet.c
vendored
@ -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>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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>
|
||||
|
||||
10
crypto/external/bsd/openssh/dist/sftp-server.c
vendored
10
crypto/external/bsd/openssh/dist/sftp-server.c
vendored
@ -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 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
|
||||
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) {
|
||||
|
||||
10
crypto/external/bsd/openssh/dist/sftp.c
vendored
10
crypto/external/bsd/openssh/dist/sftp.c
vendored
@ -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>
|
||||
*
|
||||
@ -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 @@ complete(EditLine *el, int ch)
|
||||
|
||||
/* 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 @@ complete(EditLine *el, int ch)
|
||||
|
||||
/* 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);
|
||||
|
||||
10
crypto/external/bsd/openssh/dist/ssh-keygen.1
vendored
10
crypto/external/bsd/openssh/dist/ssh-keygen.1
vendored
@ -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 @@ and identifying the CA key by providing its public half as an argument
|
||||
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 @@ By default, generated certificates are valid for all users or hosts.
|
||||
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.
|
||||
|
||||
@ -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>
|
||||
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, 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 @@ do_known_hosts(struct passwd *pw, const char *name)
|
||||
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)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* $NetBSD: ssh-pkcs11-helper.c,v 1.8 2015/04/03 23:58:19 christos Exp $ */
|
||||
/* $OpenBSD: ssh-pkcs11-helper.c,v 1.10 2015/01/20 23:14:00 deraadt Exp $ */
|
||||
/* $NetBSD: ssh-pkcs11-helper.c,v 1.9 2015/08/21 08:20:59 christos Exp $ */
|
||||
/* $OpenBSD: ssh-pkcs11-helper.c,v 1.11 2015/08/20 22:32:42 deraadt Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2010 Markus Friedl. All rights reserved.
|
||||
*
|
||||
@ -16,7 +16,7 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
#include "includes.h"
|
||||
__RCSID("$NetBSD: ssh-pkcs11-helper.c,v 1.8 2015/04/03 23:58:19 christos Exp $");
|
||||
__RCSID("$NetBSD: ssh-pkcs11-helper.c,v 1.9 2015/08/21 08:20:59 christos Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/queue.h>
|
||||
@ -294,8 +294,8 @@ main(int argc, char **argv)
|
||||
buffer_init(&oqueue);
|
||||
|
||||
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);
|
||||
|
||||
for (;;) {
|
||||
memset(rset, 0, set_size);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: ssh_config.5,v 1.15 2015/08/13 10:33:21 christos Exp $
|
||||
.\" $NetBSD: ssh_config.5,v 1.16 2015/08/21 08:20:59 christos Exp $
|
||||
.\" -*- nroff -*-
|
||||
.\"
|
||||
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
@ -35,8 +35,8 @@
|
||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $OpenBSD: ssh_config.5,v 1.214 2015/07/30 00:01:34 djm Exp $
|
||||
.Dd July 30 2015
|
||||
.\" $OpenBSD: ssh_config.5,v 1.215 2015/08/14 15:32:41 jmc Exp $
|
||||
.Dd August 14 2015
|
||||
.Dt SSH_CONFIG 5
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -417,9 +417,9 @@ chacha20-poly1305@openssh.com
|
||||
.Pp
|
||||
The default is:
|
||||
.Bd -literal -offset indent
|
||||
chacha20-poly1305@openssh.com,
|
||||
aes128-ctr,aes192-ctr,aes256-ctr,
|
||||
aes128-gcm@openssh.com,aes256-gcm@openssh.com,
|
||||
chacha20-poly1305@openssh.com,
|
||||
arcfour256,arcfour128,
|
||||
aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,
|
||||
aes192-cbc,aes256-cbc,arcfour
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* $NetBSD: sshconnect.c,v 1.12 2015/07/03 01:00:00 christos Exp $ */
|
||||
/* $OpenBSD: sshconnect.c,v 1.262 2015/05/28 05:41:29 dtucker Exp $ */
|
||||
/* $NetBSD: sshconnect.c,v 1.13 2015/08/21 08:20:59 christos Exp $ */
|
||||
/* $OpenBSD: sshconnect.c,v 1.263 2015/08/20 22:32:42 deraadt Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$NetBSD: sshconnect.c,v 1.12 2015/07/03 01:00:00 christos Exp $");
|
||||
__RCSID("$NetBSD: sshconnect.c,v 1.13 2015/08/21 08:20:59 christos Exp $");
|
||||
#include <sys/param.h> /* roundup */
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
@ -378,7 +378,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
|
||||
goto done;
|
||||
}
|
||||
|
||||
fdset = (fd_set *)xcalloc(howmany(sockfd + 1, NFDBITS),
|
||||
fdset = xcalloc(howmany(sockfd + 1, NFDBITS),
|
||||
sizeof(fd_mask));
|
||||
FD_SET(sockfd, fdset);
|
||||
ms_to_timeval(&tv, *timeoutp);
|
||||
|
||||
8
crypto/external/bsd/openssh/dist/sshd.c
vendored
8
crypto/external/bsd/openssh/dist/sshd.c
vendored
@ -1,5 +1,5 @@
|
||||
/* $NetBSD: sshd.c,v 1.21 2015/08/13 10:33:21 christos Exp $ */
|
||||
/* $OpenBSD: sshd.c,v 1.457 2015/07/30 00:01:34 djm Exp $ */
|
||||
/* $NetBSD: sshd.c,v 1.22 2015/08/21 08:20:59 christos Exp $ */
|
||||
/* $OpenBSD: sshd.c,v 1.458 2015/08/20 22:32:42 deraadt Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
@ -44,7 +44,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
__RCSID("$NetBSD: sshd.c,v 1.21 2015/08/13 10:33:21 christos Exp $");
|
||||
__RCSID("$NetBSD: sshd.c,v 1.22 2015/08/21 08:20:59 christos Exp $");
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/ioctl.h>
|
||||
@ -1238,7 +1238,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
|
||||
sighup_restart();
|
||||
if (fdset != NULL)
|
||||
free(fdset);
|
||||
fdset = (fd_set *)xcalloc(howmany(maxfd + 1, NFDBITS),
|
||||
fdset = xcalloc(howmany(maxfd + 1, NFDBITS),
|
||||
sizeof(fd_mask));
|
||||
|
||||
for (i = 0; i < num_listen_socks; i++)
|
||||
|
||||
12
crypto/external/bsd/openssh/dist/sshd_config.5
vendored
12
crypto/external/bsd/openssh/dist/sshd_config.5
vendored
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: sshd_config.5,v 1.19 2015/08/13 10:33:21 christos Exp $
|
||||
.\" $NetBSD: sshd_config.5,v 1.20 2015/08/21 08:20:59 christos Exp $
|
||||
.\" -*- nroff -*-
|
||||
.\"
|
||||
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
@ -35,8 +35,8 @@
|
||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $OpenBSD: sshd_config.5,v 1.210 2015/08/06 14:53:21 deraadt Exp $
|
||||
.Dd August 6 2015
|
||||
.\" $OpenBSD: sshd_config.5,v 1.211 2015/08/14 15:32:41 jmc Exp $
|
||||
.Dd August 14 2015
|
||||
.Dt SSHD_CONFIG 5
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -479,9 +479,9 @@ chacha20-poly1305@openssh.com
|
||||
.Pp
|
||||
The default is:
|
||||
.Bd -literal -offset indent
|
||||
chacha20-poly1305@openssh.com,
|
||||
aes128-ctr,aes192-ctr,aes256-ctr,
|
||||
aes128-gcm@openssh.com,aes256-gcm@openssh.com,
|
||||
chacha20-poly1305@openssh.com
|
||||
aes128-gcm@openssh.com,aes256-gcm@openssh.com
|
||||
.Ed
|
||||
.Pp
|
||||
The list of available ciphers may also be obtained using the
|
||||
@ -1533,7 +1533,7 @@ If this option is set to
|
||||
.Pa ~/.ssh/known_hosts
|
||||
.Cm from
|
||||
and
|
||||
.Xr sshd_config 5
|
||||
.Nm
|
||||
.Cm Match
|
||||
.Cm Host
|
||||
directives.
|
||||
|
||||
7
crypto/external/bsd/openssh/dist/sshkey.c
vendored
7
crypto/external/bsd/openssh/dist/sshkey.c
vendored
@ -1,5 +1,5 @@
|
||||
/* $NetBSD: sshkey.c,v 1.5 2015/08/13 10:33:21 christos Exp $ */
|
||||
/* $OpenBSD: sshkey.c,v 1.20 2015/07/03 03:43:18 djm Exp $ */
|
||||
/* $NetBSD: sshkey.c,v 1.6 2015/08/21 08:20:59 christos Exp $ */
|
||||
/* $OpenBSD: sshkey.c,v 1.21 2015/08/19 23:19:01 djm Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
||||
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
|
||||
@ -26,7 +26,7 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include "includes.h"
|
||||
__RCSID("$NetBSD: sshkey.c,v 1.5 2015/08/13 10:33:21 christos Exp $");
|
||||
__RCSID("$NetBSD: sshkey.c,v 1.6 2015/08/21 08:20:59 christos Exp $");
|
||||
|
||||
#include <sys/param.h> /* MIN MAX */
|
||||
#include <sys/types.h>
|
||||
@ -1531,7 +1531,6 @@ dsa_generate_private_key(u_int bits, DSA **dsap)
|
||||
*dsap = NULL;
|
||||
if (!DSA_generate_parameters_ex(private, bits, NULL, 0, NULL,
|
||||
NULL, NULL) || !DSA_generate_key(private)) {
|
||||
DSA_free(private);
|
||||
ret = SSH_ERR_LIBCRYPTO_ERROR;
|
||||
goto out;
|
||||
}
|
||||
|
||||
8
crypto/external/bsd/openssh/dist/version.h
vendored
8
crypto/external/bsd/openssh/dist/version.h
vendored
@ -1,8 +1,8 @@
|
||||
/* $NetBSD: version.h,v 1.16 2015/08/13 10:33:21 christos Exp $ */
|
||||
/* $OpenBSD: version.h,v 1.74 2015/08/02 09:56:42 djm Exp $ */
|
||||
/* $NetBSD: version.h,v 1.17 2015/08/21 08:20:59 christos Exp $ */
|
||||
/* $OpenBSD: version.h,v 1.75 2015/08/21 03:45:26 djm Exp $ */
|
||||
|
||||
#define __OPENSSH_VERSION "OpenSSH_7.0"
|
||||
#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20150812"
|
||||
#define __OPENSSH_VERSION "OpenSSH_7.1"
|
||||
#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20150821"
|
||||
#define SSH_HPN "-hpn13v14"
|
||||
#define SSH_LPK "-lpk"
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user