freebsd-dev/crypto/openssh
Eygene Ryabinkin 8c0260d62b OpenSSH: allow VersionAddendum to be used again
Prior to this, setting VersionAddendum will be a no-op: one will
always have BASE_VERSION + " " + VERSION_HPN for VersionAddendum
set in the config and a bare BASE_VERSION + VERSION_HPN when there
is no VersionAddendum is set.

HPN patch requires both parties to have the "hpn" inside their
advertized versions, so we add VERSION_HPN to the VERSION_BASE
if HPN is enabled and omitting it if HPN is disabled.

VersionAddendum now uses the following logics:
 * unset (default value): append " " and VERSION_ADDENDUM;
 * VersionAddendum is set and isn't empty: append " "
   and VersionAddendum;
 * VersionAddendum is set and empty: don't append anything.

Approved by: des
Reviewed by: bz
MFC after: 3 days
2012-05-27 06:53:35 +00:00
..
openbsd-compat Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
aclocal.m4 Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
acss.c
acss.h
addrmatch.c
atomicio.c
atomicio.h
audit-bsm.c
audit-linux.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
audit.c
audit.h
auth1.c
auth2-chall.c
auth2-gss.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
auth2-hostbased.c
auth2-jpake.c
auth2-kbdint.c
auth2-none.c
auth2-passwd.c
auth2-pubkey.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
auth2.c Polish diff against upstream. 2012-02-13 11:59:59 +00:00
auth-bsdauth.c
auth-chall.c
auth-krb5.c
auth-options.c
auth-options.h
auth-pam.c
auth-pam.h
auth-passwd.c
auth-rh-rsa.c
auth-rhosts.c
auth-rsa.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
auth-shadow.c
auth-sia.c
auth-sia.h
auth-skey.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
auth.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
auth.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
authfd.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
authfd.h
authfile.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
authfile.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
bufaux.c
bufbn.c
bufec.c
buffer.c
buffer.h
canohost.c
canohost.h
ChangeLog Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
channels.c Polish diff against upstream. 2012-02-13 11:59:59 +00:00
channels.h Polish diff against upstream. 2012-02-13 11:59:59 +00:00
cipher-3des1.c
cipher-acss.c
cipher-aes.c
cipher-bf1.c
cipher-ctr.c
cipher.c
cipher.h
cleanup.c
clientloop.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
clientloop.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
compat.c
compat.h
compress.c
compress.h
config.guess Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
config.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
config.h.in Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
crc32.c
crc32.h
CREDITS
deattack.c
deattack.h
defines.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
dh.c
dh.h
dispatch.c
dispatch.h
dns.c
dns.h
entropy.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
entropy.h
fatal.c
fixpaths
fixprogs
FREEBSD-tricks
FREEBSD-upgrade
FREEBSD-vendor
groupaccess.c
groupaccess.h
gss-genr.c
gss-serv-krb5.c
gss-serv.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
hostfile.c
hostfile.h
includes.h
INSTALL Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
jpake.c
jpake.h
kex.c Polish diff against upstream. 2012-02-13 11:59:59 +00:00
kex.h
kexdh.c
kexdhc.c
kexdhs.c
kexecdh.c
kexecdhc.c
kexecdhs.c
kexgex.c
kexgexc.c
kexgexs.c
key.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
key.h
LICENCE
log.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
log.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
loginrec.c Polish diff against upstream. 2012-02-13 11:59:59 +00:00
loginrec.h
logintest.c
mac.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
mac.h
match.c
match.h
md5crypt.c
md5crypt.h
md-sha256.c
misc.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
misc.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
mkinstalldirs
moduli
moduli.5 Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
moduli.c
monitor_fdpass.c
monitor_fdpass.h
monitor_mm.c
monitor_mm.h
monitor_wrap.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
monitor_wrap.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
monitor.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
monitor.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
msg.c
msg.h
mux.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
myproposal.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
nchan.c
OVERVIEW
packet.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
packet.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
pathnames.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
pkcs11.h
platform.c
platform.h
progressmeter.c
progressmeter.h
PROTOCOL
PROTOCOL.agent
PROTOCOL.certkeys
PROTOCOL.mux Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
readconf.c Polish diff against upstream. 2012-02-13 11:59:59 +00:00
readconf.h Polish diff against upstream. 2012-02-13 11:59:59 +00:00
README Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
README.dns
README.hpn
README.platform
README.privsep
README.tun
readpass.c
rijndael.c
rijndael.h
roaming_client.c
roaming_common.c
roaming_dummy.c
roaming_serv.c
roaming.h
rsa.c
rsa.h
sandbox-darwin.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
sandbox-null.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
sandbox-rlimit.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
sandbox-systrace.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
schnorr.c
schnorr.h
scp.1
scp.c
servconf.c Polish diff against upstream. 2012-02-13 11:59:59 +00:00
servconf.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
serverloop.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
serverloop.h
session.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
session.h
sftp-client.c
sftp-client.h
sftp-common.c
sftp-common.h
sftp-glob.c
sftp-server-main.c
sftp-server.8
sftp-server.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
sftp.1 Polish diff against upstream. 2012-02-13 11:59:59 +00:00
sftp.c
sftp.h
ssh1.h
ssh2.h
ssh_config Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh_config.5 Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh_namespace.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-add.1
ssh-add.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-agent.1 Add a -x option that causes ssh-agent(1) to exit when all clients have 2011-10-07 13:10:16 +00:00
ssh-agent.c Add a -x option that causes ssh-agent(1) to exit when all clients have 2011-10-07 13:10:16 +00:00
ssh-dss.c
ssh-ecdsa.c
ssh-gss.h
ssh-keygen.1 Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-keygen.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-keyscan.1
ssh-keyscan.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-keysign.8
ssh-keysign.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-pkcs11-client.c
ssh-pkcs11-helper.8
ssh-pkcs11-helper.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-pkcs11.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh-pkcs11.h
ssh-rsa.c
ssh-sandbox.h Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh.1 Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
ssh.c OpenSSH: allow VersionAddendum to be used again 2012-05-27 06:53:35 +00:00
ssh.h
sshconnect1.c
sshconnect2.c Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
sshconnect.c OpenSSH: allow VersionAddendum to be used again 2012-05-27 06:53:35 +00:00
sshconnect.h
sshd_config Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
sshd_config.5 Polish diff against upstream. 2012-02-13 11:59:59 +00:00
sshd.8 Upgrade to OpenSSH 5.9p1. 2011-10-05 22:08:17 +00:00
sshd.c OpenSSH: allow VersionAddendum to be used again 2012-05-27 06:53:35 +00:00
sshlogin.c
sshlogin.h
sshpty.c
sshpty.h
sshtty.c
TODO
ttymodes.c
ttymodes.h
uidswap.c
uidswap.h
umac.c
umac.h
uuencode.c
uuencode.h
version.c OpenSSH: allow VersionAddendum to be used again 2012-05-27 06:53:35 +00:00
version.h OpenSSH: allow VersionAddendum to be used again 2012-05-27 06:53:35 +00:00
xmalloc.c
xmalloc.h

See http://www.openssh.com/txt/release-5.9 for the release notes.

- A Japanese translation of this document and of the OpenSSH FAQ is
- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
- Thanks to HARUYAMA Seigo <haruyama@unixuser.org>

This is the port of OpenBSD's excellent OpenSSH[0] to Linux and other
Unices.

OpenSSH is based on the last free version of Tatu Ylonen's sample
implementation with all patent-encumbered algorithms removed (to
external libraries), all known security bugs fixed, new features
reintroduced and many other clean-ups.  OpenSSH has been created by
Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo de Raadt,
and Dug Song. It has a homepage at http://www.openssh.com/

This port consists of the re-introduction of autoconf support, PAM
support, EGD[1]/PRNGD[2] support and replacements for OpenBSD library
functions that are (regrettably) absent from other unices. This port
has been best tested on AIX, Cygwin, HP-UX, Linux, MacOS/X,
NetBSD, OpenBSD, OpenServer, Solaris, Unicos, and UnixWare.

This version actively tracks changes in the OpenBSD CVS repository.

The PAM support is now more functional than the popular packages of
commercial ssh-1.2.x. It checks "account" and "session" modules for
all logins, not just when using password authentication.

OpenSSH depends on Zlib[3], OpenSSL[4] and optionally PAM[5].

There is now several mailing lists for this port of OpenSSH. Please
refer to http://www.openssh.com/list.html for details on how to join.

Please send bug reports and patches to the mailing list
openssh-unix-dev@mindrot.org. The list is open to posting by
unsubscribed users.Code contribution are welcomed, but please follow the 
OpenBSD style guidelines[6].

Please refer to the INSTALL document for information on how to install
OpenSSH on your system. There are a number of differences between this
port of OpenSSH and F-Secure SSH 1.x, please refer to the OpenSSH FAQ[7]
for details and general tips.

Damien Miller <djm@mindrot.org>

Miscellania -

This version of OpenSSH is based upon code retrieved from the OpenBSD
CVS repository which in turn was based on the last free sample
implementation released by Tatu Ylonen.

References -

[0] http://www.openssh.com/faq.html
[1] http://www.lothar.com/tech/crypto/
[2] http://www.aet.tu-cottbus.de/personen/jaenicke/postfix_tls/prngd.html
[3] http://www.gzip.org/zlib/
[4] http://www.openssl.org/
[5] http://www.openpam.org
    http://www.kernel.org/pub/linux/libs/pam/ 
    (PAM also is standard on Solaris and HP-UX 11)
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
[7] http://www.openssh.com/faq.html

$Id: README,v 1.77.2.2 2011/09/06 23:11:20 djm Exp $