christos
abbe9cc1c0
merge changes
2009-02-16 20:53:54 +00:00
christos
80a665de90
Add the HPN patch for ssh:
...
http://www.psc.edu/networking/projects/hpn-ssh/
2008-06-22 15:42:50 +00:00
christos
cbdb6c7a40
resolve conflicts.
2008-04-06 23:38:19 +00:00
dogcow
d642d06d3d
fixes for alpha: %ld -> %zd, signals are long.
2007-12-18 09:00:30 +00:00
christos
512c2e7e60
merge conflicts
2007-12-18 02:35:25 +00:00
christos
06993fb381
resolve conflicts.
2007-03-10 22:52:04 +00:00
christos
c5a8b87f73
Resolve conflicts
2006-09-28 21:22:14 +00:00
christos
fab0e5bf66
resolve conflicts
2006-02-04 22:32:13 +00:00
christos
5391e24af6
Make -D behave like -L (obey GatewayPorts). Before it defaulted to listen
...
to wildcard which is not secure.
2005-09-18 18:27:28 +00:00
christos
5db1262f0e
PR/31261: Mark Davies: ssh invokes xauth with bogus argument
2005-09-09 12:24:37 +00:00
christos
8471a3b7da
resolve conflicts.
2005-04-23 16:53:28 +00:00
he
e4afa5eb28
A sig_atomic_t isn't necessarily compatible with a %d printf format;
...
on evbsh5 sig_atomic_t is an __int64_t. Since this only stores a
signal number, cast to int before printing.
2005-02-15 16:22:12 +00:00
christos
8b8ab8547b
Resolve conflicts.
2005-02-13 05:57:25 +00:00
itojun
88ec7d3792
bring back krb4 support, just to suppress unwanted noise from other developers.
...
note that official openssh distribution have already dropped kerberosIV support,
therefore maintenance cost needs to be paid by us. and have no intent to help.
2003-07-24 15:31:52 +00:00
itojun
8556dff80c
remove KRB4 and AFS support. sync w/ openssh main tree
2003-07-23 03:52:16 +00:00
lukem
b1395375fd
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
...
binary when we only have the vendor's RCSID.
2003-07-10 01:09:41 +00:00
itojun
e7e7c84a6a
sync w/ 3.6.1
2003-04-03 06:21:31 +00:00
thorpej
b33be07056
Avoid conflict with reserved identifier "log".
2002-12-06 03:39:06 +00:00
itojun
ef7d24574a
upgrade to openssh 3.5. major changes include:
...
- krb4/5 support for privsep (krb5 diff was already applied)
includes fake implementaation of getpeereid() from openssh-portable, which
does nothing useful - need improvement.
2002-10-01 14:07:26 +00:00
itojun
968294e218
>make ssh-keysign read /etc/ssh/ssh_config
...
>and exit if HostbasedAuthentication is disabled globally. based on discussions
>with deraadt, itojun and sommerfeld; ok itojun@
sync w/openbsd
2002-07-03 14:23:13 +00:00
itojun
8d3378688a
pednatic check on command line args. correct signed/unsigned mixup.
...
sync w/ openbsd
2002-07-01 06:17:11 +00:00
itojun
3ea946f134
sync with openssh 3.3.
...
local mods included to make it compile with openssl 0.9.6d.
2002-06-24 05:48:24 +00:00
itojun
ca89359407
sync with 3.2.1 as of 5/13.
...
NOTE: privilege separation is turned off by default
as it seems there still are issues with setsid().
2002-05-13 02:58:17 +00:00
itojun
34b40b030e
sync with openssh 3.2 as of 2002/4/22.
...
- privilege separation
- afs/kerberos auth security issue fixed
2002-04-22 07:59:35 +00:00
itojun
af34a358ff
sync w/ 3.1 as of 2002/3/8. configuration file directory is still /etc
...
(openbsd usr.bin/ssh is using /etc/ssh)
2002-03-08 02:00:50 +00:00
itojun
718900f830
sync with 3.0.2
2001-12-06 03:54:04 +00:00
itojun
29574d25c5
sync with 3.0 as of 2001/11/7.
2001-11-07 06:26:47 +00:00
itojun
880aff49c4
buffix from openbsd tree: users config should overwrite system config.
2001-10-02 00:39:14 +00:00
itojun
ba613513e8
sync with openssh 2.9.9 around 9/27.
2001-09-27 03:24:01 +00:00
itojun
69d60502fe
upgrade to openssh 2.9, around 2001/6/24 (from openbsd usr.bin/ssh).
...
- authorized_keys2 and known_hosts2 are obsoleted, and integrated
into those without "2".
- file name change, /etc/primes -> /etc/moduli
- cleanups
2001-06-23 19:37:38 +00:00
itojun
f4532f2487
upgrade to openssh (openbsd usr.bin/ssh) 2.9, around 5/15/2001.
2001-05-15 15:26:07 +00:00
itojun
d9f67f8672
reduce amount of diff with openbsd usr.bin/ssh (for -Wall -Werror clean)
...
so that we can get rid of local changes.
openssh side do not like static functions so put prototypes into each files
rather than making function static.
2001-05-15 14:50:49 +00:00
itojun
235b9f0c2f
upgrade to openssh 2.5.4 (2001/4/10).
...
major behavior changes: (made in openssh master tree - openbsd usr.bin/ssh)
- ssh(1) now defaults to ssh protocol version 2.
if you want version 1 to take precedence, use /etc/ssh.conf to override.
- config change: ~/.ssh/id_rsa[12] is now ~/.ssh/id_rsa (changed 4/3)
- forced client rekey for protocol version 2 (~R)
- swap gid when uid swaps.
- ListenAddress syntax can take [foo]:port for IPv6 numerics.
- "ssh -D 1080" allows us to use ssh tunnel as SOCKS4 proxy.
2001-04-10 08:07:54 +00:00
lukem
315c0a92f9
if debugging (i.e, -v), use options.level instead of SYSLOG_LEVEL_INFO
...
to the first call to log_init(), otherwise debug messages from config
file parsing won't appear. (this seems to have been broken in recent
versions of openssh)
2001-04-02 03:53:36 +00:00
itojun
37da3c3c3c
sync with openssh 2.5.2 (from openbsd usr.bin/ssh, not from portable).
2001-03-19 20:03:24 +00:00
assar
e625c71295
add krb5 support to ssh/sshd. based on code initially from Daniel Kouril <kouril@informatics.muni.cz> and Björn Grönvall <bg@sics.se>
2001-03-04 00:41:27 +00:00
itojun
1317273fae
sync up with 2.5.1.
...
this fixes backward compatibility breakage against 1.2.18 - 1.2.22.
2001-02-19 12:13:04 +00:00
itojun
531a3ed838
sync with 2/14.
...
openssh changes:
- SIGWINCH propagated correctly
- mitigate SSH1 traffic analysis
- sprintf -> snprintf and lots of other cleanups
netbsd local changes:
- include OpenBSD RCSID into binary again, which helps us diagnose later.
2001-02-14 01:06:48 +00:00
itojun
1f5cfca3e6
sync crypto/dist/ssh with re-importorted tree. try to minimize diffs
...
with openssh tree to ease future upgrade. re-do local changes, including:
- prototype pedants
- IgnoreRootRhosts
- login.conf user validation
some of the local changes that weren't used are omitted for now. we may
need to revisit those afterwards.
it adds "sftp".
2001-02-07 17:05:31 +00:00
itojun
a0f7a7d829
crypto/dist/ssh: resolve conflicts with 2.3.0/20010105.
...
usr.bin/ssh: add ssh-keyscan and sftp-server into SUBDIR.
2001-01-14 05:22:31 +00:00
christos
392621627b
always attempt to canonicalize hostnames, not only when the hostname
...
does not contain a dot.
2000-11-05 20:09:08 +00:00
itojun
37a8d23037
improve error message on rnd(4) failure. the old text made reference
...
to ssl(4), which is openssl specific (talks about plugin RSA library).
2000-10-04 03:43:57 +00:00
thorpej
49a55a1d58
Import NetBSD Secure Shell. This is based on OpenSSH, but modified
...
somewhat.
2000-09-28 22:09:28 +00:00