summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore48
-rw-r--r--debian/.git-dpm8
-rw-r--r--debian/NEWS107
-rw-r--r--debian/README.Debian256
-rwxr-xr-xdebian/adjust-openssl-dependencies32
-rwxr-xr-xdebian/agent-launch29
-rw-r--r--debian/changelog4419
-rw-r--r--debian/clean2
-rw-r--r--debian/compat1
-rw-r--r--debian/control200
-rw-r--r--debian/copyright392
-rw-r--r--debian/copyright.head52
-rw-r--r--debian/faq.html1187
-rw-r--r--debian/gnome-ssh-askpass.151
-rw-r--r--debian/keygen-test/Makefile12
-rw-r--r--debian/keygen-test/getpid.c39
-rwxr-xr-xdebian/keygen-test/keygen-test12
-rwxr-xr-xdebian/openssh-client-ssh1.install5
-rw-r--r--debian/openssh-client-udeb.install3
-rw-r--r--debian/openssh-client.apport32
-rw-r--r--debian/openssh-client.docs6
-rwxr-xr-xdebian/openssh-client.install41
-rw-r--r--debian/openssh-client.links4
-rw-r--r--debian/openssh-client.lintian-overrides1
-rw-r--r--debian/openssh-client.manpages2
-rw-r--r--debian/openssh-client.postinst45
-rw-r--r--debian/openssh-client.postrm22
-rw-r--r--debian/openssh-client.prerm39
-rw-r--r--debian/openssh-server-udeb.dirs1
-rw-r--r--debian/openssh-server-udeb.install2
-rw-r--r--debian/openssh-server.apport28
-rw-r--r--debian/openssh-server.config29
-rw-r--r--debian/openssh-server.examples2
-rw-r--r--debian/openssh-server.if-up42
-rwxr-xr-xdebian/openssh-server.install17
-rw-r--r--debian/openssh-server.links0
-rw-r--r--debian/openssh-server.lintian-overrides1
-rw-r--r--debian/openssh-server.maintscript1
-rw-r--r--debian/openssh-server.postinst315
-rw-r--r--debian/openssh-server.postrm27
-rw-r--r--debian/openssh-server.preinst18
-rw-r--r--debian/openssh-server.ssh.default5
-rw-r--r--debian/openssh-server.ssh.init174
l---------debian/openssh-server.ssh.service1
-rw-r--r--debian/openssh-server.ssh.upstart29
-rw-r--r--debian/openssh-server.sshd.pam.in55
-rw-r--r--debian/openssh-server.templates15
-rw-r--r--debian/openssh-server.ufw.profile4
-rw-r--r--debian/openssh-sftp-server.install2
-rw-r--r--debian/openssh-sftp-server.links1
-rw-r--r--debian/patches/auth-log-verbosity.patch133
-rw-r--r--debian/patches/authorized-keys-man-symlink.patch26
-rw-r--r--debian/patches/debian-banner.patch111
-rw-r--r--debian/patches/debian-config.patch195
-rw-r--r--debian/patches/dnssec-sshfp.patch94
-rw-r--r--debian/patches/doc-hash-tab-completion.patch28
-rw-r--r--debian/patches/doc-upstart.patch29
-rw-r--r--debian/patches/gnome-ssh-askpass2-icon.patch26
-rw-r--r--debian/patches/gssapi.patch3267
-rw-r--r--debian/patches/helpful-wait-terminate.patch26
-rw-r--r--debian/patches/keepalive-extensions.patch134
-rw-r--r--debian/patches/mention-ssh-keygen-on-keychange.patch42
-rw-r--r--debian/patches/no-openssl-version-status.patch62
-rw-r--r--debian/patches/openbsd-docs.patch148
-rw-r--r--debian/patches/package-versioning.patch65
-rw-r--r--debian/patches/quieter-signals.patch40
-rw-r--r--debian/patches/restore-tcp-wrappers.patch172
-rw-r--r--debian/patches/scp-quoting.patch41
-rw-r--r--debian/patches/selinux-role.patch504
-rw-r--r--debian/patches/series27
-rw-r--r--debian/patches/shell-path.patch39
-rw-r--r--debian/patches/sigstop.patch35
-rw-r--r--debian/patches/ssh-agent-setgid.patch40
-rw-r--r--debian/patches/ssh-argv0.patch31
-rw-r--r--debian/patches/ssh-vulnkey-compat.patch42
-rw-r--r--debian/patches/syslog-level-silent.patch47
-rw-r--r--debian/patches/systemd-readiness.patch84
-rw-r--r--debian/patches/user-group-modes.patch257
-rw-r--r--debian/po/POTFILES.in1
-rw-r--r--debian/po/cs.po55
-rw-r--r--debian/po/da.po55
-rw-r--r--debian/po/de.po61
-rw-r--r--debian/po/es.po80
-rw-r--r--debian/po/fr.po59
-rw-r--r--debian/po/it.po58
-rw-r--r--debian/po/ja.po55
-rw-r--r--debian/po/nl.po60
-rw-r--r--debian/po/pt.po59
-rw-r--r--debian/po/pt_BR.po57
-rw-r--r--debian/po/ru.po57
-rw-r--r--debian/po/sv.po58
-rw-r--r--debian/po/templates.pot46
-rw-r--r--debian/po/tr.po58
-rwxr-xr-xdebian/rules250
-rw-r--r--debian/source/format1
-rw-r--r--debian/source/include-binaries1
-rw-r--r--debian/ssh-agent.user-session.upstart7
-rw-r--r--debian/ssh-argv031
-rw-r--r--debian/ssh-argv0.164
-rw-r--r--debian/ssh-askpass-gnome.copyright44
-rw-r--r--debian/ssh-askpass-gnome.desktop12
-rw-r--r--debian/ssh-askpass-gnome.examples1
-rwxr-xr-xdebian/ssh-askpass-gnome.install3
-rw-r--r--debian/ssh-askpass-gnome.manpages1
-rw-r--r--debian/ssh-askpass-gnome.pngbin0 -> 6949 bytes
-rw-r--r--debian/ssh-askpass-gnome.postinst48
-rw-r--r--debian/ssh-askpass-gnome.prerm39
-rw-r--r--debian/ssh-krb5.NEWS18
-rw-r--r--debian/ssh-krb5.postinst61
-rw-r--r--debian/ssh.lintian-overrides1
-rw-r--r--debian/ssh.maintscript1
-rw-r--r--debian/systemd/ssh-agent.override1
-rw-r--r--debian/systemd/ssh-agent.service8
-rwxr-xr-xdebian/systemd/ssh-session-cleanup11
-rw-r--r--debian/systemd/ssh-session-cleanup.service13
-rw-r--r--debian/systemd/ssh.service17
-rw-r--r--debian/systemd/ssh.socket12
-rw-r--r--debian/systemd/ssh@.service8
-rw-r--r--debian/systemd/sshd.conf1
-rw-r--r--debian/tests/control3
-rw-r--r--debian/tests/regress43
-rw-r--r--debian/upstream/signing-key.asc44
-rw-r--r--debian/watch3
123 files changed, 15127 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..3d984650a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
1/*.out
2/Makefile
3/autom4te.cache
4/build-deb
5/build-deb-stamp
6/build-udeb
7/build-udeb-stamp
8/buildit.sh
9/buildpkg.sh
10/config.cache
11/config.h
12/config.log
13/config.status
14/openssh.xml
15/opensshd.init
16/scp
17/sftp
18/sftp-server
19/ssh
20/ssh-add
21/ssh-agent
22/ssh-keygen
23/ssh-keyscan
24/ssh-keysign
25/ssh-rand-helper
26/ssh_prng_cmds
27/sshd
28/stamp-h.in
29/survey
30/survey.sh
31contrib/gnome-ssh-askpass1
32contrib/gnome-ssh-askpass2
33openbsd-compat/Makefile
34debian/*.debhelper*
35debian/*substvars
36debian/files
37debian/keygen-test/key1
38debian/keygen-test/key1.pub
39debian/keygen-test/key2
40debian/keygen-test/key2.pub
41debian/openssh-client
42debian/openssh-client-udeb
43debian/openssh-server
44debian/openssh-server-udeb
45debian/ssh
46debian/ssh-askpass-gnome
47debian/ssh-krb5
48debian/tmp
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 000000000..1532e846b
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
1# see git-dpm(1) from git-dpm package
24c914ccd85bbf391c4dc61b85e3c178fef465e3f
34c914ccd85bbf391c4dc61b85e3c178fef465e3f
4a8ed8d256b2e2c05b0c15565a7938028c5192277
5a8ed8d256b2e2c05b0c15565a7938028c5192277
6openssh_7.3p1.orig.tar.gz
7bfade84283fcba885e2084343ab19a08c7d123a5
81522617
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000000000..6f4564ba7
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,107 @@
1openssh (1:7.2p1-1) unstable; urgency=medium
2
3 OpenSSH 7.2 disables a number of legacy cryptographic algorithms by
4 default in ssh:
5
6 * Several ciphers blowfish-cbc, cast128-cbc, all arcfour variants and the
7 rijndael-cbc aliases for AES.
8 * MD5-based and truncated HMAC algorithms.
9
10 These algorithms are already disabled by default in sshd.
11
12 -- Colin Watson <cjwatson@debian.org> Tue, 08 Mar 2016 11:47:20 +0000
13
14openssh (1:7.1p1-2) unstable; urgency=medium
15
16 OpenSSH 7.0 disables several pieces of weak, legacy, and/or unsafe
17 cryptography.
18
19 * Support for the legacy SSH version 1 protocol is disabled by default at
20 compile time. Note that this also means that the Cipher keyword in
21 ssh_config(5) is effectively no longer usable; use Ciphers instead for
22 protocol 2. The openssh-client-ssh1 package includes "ssh1", "scp1",
23 and "ssh-keygen1" binaries which you can use if you have no alternative
24 way to connect to an outdated SSH1-only server; please contact the
25 server administrator or system vendor in such cases and ask them to
26 upgrade.
27 * Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
28 disabled by default at run-time. It may be re-enabled using the
29 instructions at http://www.openssh.com/legacy.html
30 * Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
31 default at run-time. These may be re-enabled using the instructions at
32 http://www.openssh.com/legacy.html
33 * Support for the legacy v00 cert format has been removed.
34
35 Future releases will retire more legacy cryptography, including:
36
37 * Refusing all RSA keys smaller than 1024 bits (the current minimum is
38 768 bits).
39 * Several ciphers will be disabled by default: blowfish-cbc, cast128-cbc,
40 all arcfour variants, and the rijndael-cbc aliases for AES.
41 * MD5-based HMAC algorithms will be disabled by default.
42
43 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
44
45openssh (1:6.9p1-1) unstable; urgency=medium
46
47 UseDNS now defaults to 'no'. Configurations that match against the client
48 host name (via sshd_config or authorized_keys) may need to re-enable it or
49 convert to matching against addresses.
50
51 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
52
53openssh (1:6.7p1-5) unstable; urgency=medium
54
55 openssh-server 1:6.7p1-4 changed the default setting of AcceptEnv to list
56 a number of specific LC_FOO variables rather than the wildcard LC_*. I
57 have since been persuaded that this was a bad idea and have reverted it,
58 but it is difficult to automatically undo the change to
59 /etc/ssh/sshd_config without compounding the problem (that of modifying
60 configuration that some users did not want to be modified) further. Most
61 users who upgraded via version 1:6.7p1-4 should restore the previous value
62 of "AcceptEnv LANG LC_*" in /etc/ssh/sshd_config.
63
64 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:09:32 +0000
65
66openssh (1:5.4p1-2) unstable; urgency=low
67
68 Smartcard support is now available using PKCS#11 tokens. If you were
69 previously using an unofficial build of Debian's OpenSSH package with
70 OpenSC-based smartcard support added, then note that commands like
71 'ssh-add -s 0' will no longer work; you need to use 'ssh-add -s
72 /usr/lib/opensc-pkcs11.so' instead.
73
74 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
75
76openssh (1:3.8.1p1-9) experimental; urgency=low
77
78 The ssh package has been split into openssh-client and openssh-server. If
79 you had previously requested that the sshd server should not be run, then
80 that request will still be honoured. However, the recommended approach is
81 now to remove the openssh-server package if you do not want to run sshd.
82 You can remove the old /etc/ssh/sshd_not_to_be_run marker file after doing
83 that.
84
85 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
86
87openssh (1:3.5p1-1) unstable; urgency=low
88
89 This version of OpenSSH disables the environment option for public keys by
90 default, in order to avoid certain attacks (for example, LD_PRELOAD). If
91 you are using this option in an authorized_keys file, beware that the keys
92 in question will no longer work until the option is removed.
93
94 To re-enable this option, set "PermitUserEnvironment yes" in
95 /etc/ssh/sshd_config after the upgrade is complete, taking note of the
96 warning in the sshd_config(5) manual page.
97
98 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
99
100openssh (1:3.0.1p1-1) unstable; urgency=high
101
102 As of version 3, OpenSSH no longer uses separate files for ssh1 and ssh2
103 keys. This means the authorized_keys2 and known_hosts2 files are no longer
104 needed. They will still be read in order to maintain backward
105 compatibility.
106
107 -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000000000..f0e5bea24
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,256 @@
1OpenSSH for Debian
2------------------
3
4UPGRADE ISSUES
5==============
6
7Privilege Separation
8--------------------
9
10As of 3.3, openssh has employed privilege separation to reduce the
11quantity of code that runs as root, thereby reducing the impact of
12some security holes in sshd. This now also works properly with PAM.
13
14Privilege separation is turned on by default, so, if you decide you
15want it turned off, you need to add "UsePrivilegeSeparation no" to
16/etc/ssh/sshd_config.
17
18PermitRootLogin
19---------------
20
21As of 1:6.6p1-1, new installations will be set to "PermitRootLogin
22without-password" (or the synonymous "PermitRootLogin prohibit-password" as
23of 1:7.1p1-1). This disables password authentication for root, foiling
24password dictionary attacks on the root user. Some sites may wish to use
25the stronger "PermitRootLogin forced-commands-only" or "PermitRootLogin no",
26but note that "PermitRootLogin no" will break setups that SSH to root with a
27forced command to take full-system backups. You can use PermitRootLogin in
28a Match block if you want finer-grained control here.
29
30For many years Debian's OpenSSH packaging used "PermitRootLogin yes", in
31line with upstream. To avoid breaking local setups, this is still true for
32installations upgraded from before 1:6.6p1-1. If you wish to change this,
33you should edit /etc/ssh/sshd_config, change it manually, and run "service
34ssh restart" as root.
35
36Disabling PermitRootLogin means that an attacker possessing credentials for
37the root account (any credentials in the case of "yes", or private key
38material in the case of "prohibit-password") must compromise a normal user
39account rather than being able to SSH directly to root. Be careful to avoid
40a false illusion of security if you change this setting; any account you
41escalate to root from should be considered equivalent to root for the
42purposes of security against external attack. You might for example disable
43it if you know you will only ever log in as root from the physical console.
44
45Since the root account does not generally have non-password credentials
46unless you explicitly install an SSH public key in its
47~/.ssh/authorized_keys, which you presumably only do if you want to SSH to
48it, "prohibit-password" should be a reasonable default for most sites.
49
50As of OpenSSH 7.0, this is the upstream default.
51
52For further discussion, see:
53
54 https://bugs.debian.org/298138
55 https://bugzilla.mindrot.org/show_bug.cgi?id=2164
56
57X11 Forwarding
58--------------
59
60ssh's default for ForwardX11 has been changed to ``no'' because it has
61been pointed out that logging into remote systems administered by
62untrusted people is likely to open you up to X11 attacks, so you
63should have to actively decide that you trust the remote machine's
64root, before enabling X11. I strongly recommend that you do this on a
65machine-by-machine basis, rather than just enabling it in the default
66host settings.
67
68In order for X11 forwarding to work, you need to install xauth on the
69server. In Debian this is in the xbase-clients package.
70
71As of OpenSSH 3.1, the remote $DISPLAY uses localhost by default to reduce
72the security risks of X11 forwarding. Look up X11UseLocalhost in
73sshd_config(8) if this is a problem.
74
75OpenSSH 3.8 invented ForwardX11Trusted, which when set to no causes the
76ssh client to create an untrusted X cookie so that attacks on the
77forwarded X11 connection can't become attacks on X clients on the remote
78machine. However, this has some problems in implementation - notably a
79very short timeout of the untrusted cookie - breaks large numbers of
80existing setups, and generally seems immature. The Debian package
81therefore sets the default for this option to "yes" (in ssh itself,
82rather than in ssh_config).
83
84Fallback to RSH
85---------------
86
87The default for this setting has been changed from Yes to No, for
88security reasons, and to stop the delay attempting to rsh to machines
89that don't offer the service. Simply switch it back on in either
90/etc/ssh/ssh_config or ~/.ssh/config for those machines that you need
91it for.
92
93Setgid ssh-agent and environment variables
94------------------------------------------
95
96As of version 1:3.5p1-1, ssh-agent is installed setgid to prevent ptrace()
97attacks retrieving private key material. This has the side-effect of causing
98glibc to remove certain environment variables which might have security
99implications for set-id programs, including LD_PRELOAD, LD_LIBRARY_PATH, and
100TMPDIR.
101
102If you need to set any of these environment variables, you will need to do
103so in the program exec()ed by ssh-agent. This may involve creating a small
104wrapper script.
105
106Symlink Hostname invocation
107---------------------------
108
109This version of ssh no longer includes support for invoking ssh with the
110hostname as the name of the file run. People wanting this support should
111use the ssh-argv0 script.
112
113=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
114
115OTHER ISSUES
116============
117
118/usr/bin/ssh not SUID
119---------------------
120
121Due to Debian bug #164325, RhostsRSAAuthentication can only be used if ssh
122is SUID. Until this is fixed, if that is a problem, use:
123
124 dpkg-statoverride
125
126or if that's also missing, use this:
127
128 chown root.root /usr/bin/ssh
129 chmod 04755 /usr/bin/ssh
130
131Authorization Forwarding
132------------------------
133
134Similarly, root on a remote server could make use of your ssh-agent
135(while you're logged into their machine) to obtain access to machines
136which trust your keys. This feature is therefore disabled by default.
137You should only re-enable it for those hosts (in your ~/.ssh/config or
138/etc/ssh/ssh_config) where you are confident that the remote machine
139is not a threat.
140
141Problems logging in with RSA authentication
142-------------------------------------------
143
144If you have trouble logging in with RSA authentication then the
145problem is probably caused by the fact that you have your home
146directory writable by group, as well as user (this is the default on
147Debian systems).
148
149Depending upon other settings on your system (i.e. other users being
150in your group) this could open a security hole, so you will need to
151make your home directory writable only by yourself. Run this command,
152as yourself:
153
154 chmod g-w ~/
155
156to remove group write permissions. If you use ssh-copy-id to install your
157keys, it does this for you.
158
159-L option of ssh nonfree
160------------------------
161
162non-free ssh supported the usage of the option -L to use a non privileged
163port for scp. This option will not be supported by scp from openssh.
164
165Please use instead scp -o "UsePrivilegedPort=no" as documented in the
166manpage to scp itself.
167
168Problem logging in because of TCP-Wrappers
169------------------------------------------
170
171ssh is compiled with support for tcp-wrappers. So if you can no longer
172log into your system, please check that /etc/hosts.allow and /etc/hosts.deny
173are configured so that ssh is not blocked.
174
175Kerberos support
176----------------
177
178ssh is now compiled with Kerberos support. Unfortunately, privilege
179separation is incompatible with Kerberos support for SSH protocol 1 and
180parts of the support for protocol 2; you may need to run kinit after logging
181in.
182
183Interoperability between scp and the ssh.com SSH server
184-------------------------------------------------------
185
186In version 2 and greater of the commercial SSH server produced by SSH
187Communications Security, scp was changed to use SFTP (SSH2's file transfer
188protocol) instead of the traditional rcp-over-ssh, thereby breaking
189compatibility. The OpenSSH developers regard this as a bug in the ssh.com
190server, and do not currently intend to change OpenSSH's scp to match.
191
192Workarounds for this problem are to install scp1 on the server (scp2 will
193fall back to it), to use sftp, or to use some other transfer mechanism such
194as rsync-over-ssh or tar-over-ssh.
195
196Running sshd from inittab
197-------------------------
198
199Some people find it useful to run the sshd server from inittab, to make sure
200that it always stays running. To do this, stop sshd ('/etc/init.d/ssh
201stop'), add the following line to /etc/inittab, and run 'telinit q':
202
203 ss:2345:respawn:/usr/sbin/sshd -D
204
205If you do this, note that you will need to stop sshd being started in the
206normal way ('update-rc.d ssh disable') and that you will need to restart
207this sshd manually on upgrades.
208
209Per-connection sshd instances with systemd
210------------------------------------------
211
212If you want to reconfigure systemd to listen on port 22 itself and launch an
213instance of sshd for each connection (inetd-style socket activation), then
214you can run:
215
216 systemctl stop ssh.service
217 systemctl start ssh.socket
218
219To make this permanent:
220
221 systemctl disable ssh.service
222 systemctl enable ssh.socket
223
224This may be appropriate in environments where minimal footprint is critical
225(e.g. cloud guests). Be aware that this bypasses MaxStartups, and systemd's
226MaxConnections cannot quite replace this as it cannot distinguish between
227authenticated and unauthenticated connections; see
228https://bugzilla.redhat.com/show_bug.cgi?id=963268 for more discussion.
229
230The provided ssh.socket unit file sets ListenStream=22. If you need to have
231it listen on a different address or port, then you will need to do this by
232copying /lib/systemd/system/ssh.socket to /etc/systemd/system/ssh.socket and
233modifying the ListenStream option. See systemd.socket(5) for details.
234
235Terminating SSH sessions cleanly on shutdown/reboot with systemd
236----------------------------------------------------------------
237
238If you have libpam-systemd >= 230 installed (following openssh-server's
239Recommends) and "UsePAM yes" in sshd_config (the default configuration
240shipped by this package), then SSH sessions will be terminated cleanly when
241the server is shut down or rebooted.
242
243If either of these conditions does not hold, then you may find that SSH
244sessions hang silently when the server is shut down or rebooted. If you do
245not want to use PAM or configure it properly for whatever reason, then you
246can instead copy
247/usr/share/doc/openssh-server/examples/ssh-session-cleanup.service to
248/etc/systemd/system/ and run "systemctl enable ssh-session-cleanup.service".
249
250Non-systemd users may find /usr/lib/openssh/ssh-session-cleanup helpful if
251they have a similar problem, although at present there is no system
252integration for this for anything other than systemd.
253
254--
255Matthew Vernon <matthew@debian.org>
256Colin Watson <cjwatson@debian.org>
diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies
new file mode 100755
index 000000000..9daa9b415
--- /dev/null
+++ b/debian/adjust-openssl-dependencies
@@ -0,0 +1,32 @@
1#! /bin/sh
2# Attempt to tighten libssl dependencies to match the check in entropy.c.
3# Must be run after dpkg-shlibdeps.
4
5client=debian/openssh-client.substvars
6server=debian/openssh-server.substvars
7
8libssl_version="$(dpkg-query -W libssl-dev 2>/dev/null | cut -f2)"
9if [ -z "$libssl_version" ]; then
10 echo "Can't find libssl-dev version; leaving dependencies alone."
11 exit 0
12fi
13libssl_version="$(echo "$libssl_version" | sed 's/[a-z-].*//')"
14
15libssl_package="$(sed -n 's/.*[= ]\(libssl[0-9][a-z0-9+.-]*\).*/\1/p' "$client")"
16if [ "$libssl_package" ]; then
17 new_dep="$libssl_package (>= $libssl_version)"
18 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client"
19 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server"
20fi
21
22client_udeb=debian/openssh-client-udeb.substvars
23server_udeb=debian/openssh-server-udeb.substvars
24
25libcrypto_package="$(sed -n 's/.*[= ]\(libcrypto[0-9][a-z0-9+.-]*\).*/\1/p' "$client_udeb")"
26if [ "$libcrypto_package" ]; then
27 new_dep="$libcrypto_package (>= $libssl_version)"
28 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_udeb"
29 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server_udeb"
30fi
31
32exit 0
diff --git a/debian/agent-launch b/debian/agent-launch
new file mode 100755
index 000000000..40479b868
--- /dev/null
+++ b/debian/agent-launch
@@ -0,0 +1,29 @@
1#!/bin/sh
2# helper script for launching ssh-agent, used by systemd unit and upstart job
3set -e
4
5if [ ! -d "$XDG_RUNTIME_DIR" ]; then
6 echo 'This needs $XDG_RUNTIME_DIR to be set' >&2
7 exit 1
8fi
9
10if [ "$1" = start ]; then
11 if [ -z "$SSH_AUTH_SOCK" ] && grep -s -q '^use-ssh-agent$' /etc/X11/Xsession.options; then
12 S="$XDG_RUNTIME_DIR/openssh_agent"
13 dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK=$S SSH_AGENT_LAUNCHER=openssh
14 if type initctl >/dev/null 2>&1; then
15 initctl set-env --global SSH_AUTH_SOCK=$S
16 fi
17 exec ssh-agent -D -a $S
18 fi
19elif [ "$1" = stop ]; then
20 if [ "$SSH_AGENT_LAUNCHER" = openssh ]; then
21 dbus-update-activation-environment --systemd SSH_AUTH_SOCK=
22 if type initctl >/dev/null 2>&1; then
23 initctl unset-env --global SSH_AUTH_SOCK
24 fi
25 fi
26else
27 echo "Unknown command $1" >&2
28 exit 1
29fi
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..76607d617
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,4419 @@
1openssh (1:7.3p1-1) UNRELEASED; urgency=medium
2
3 * New upstream release (http://www.openssh.com/txt/release-7.3):
4 - SECURITY: sshd(8): Mitigate a potential denial-of-service attack
5 against the system's crypt(3) function via sshd(8). An attacker could
6 send very long passwords that would cause excessive CPU use in
7 crypt(3). sshd(8) now refuses to accept password authentication
8 requests of length greater than 1024 characters.
9 - SECURITY: ssh(1), sshd(8): Fix observable timing weakness in the CBC
10 padding oracle countermeasures. Note that CBC ciphers are disabled by
11 default and only included for legacy compatibility.
12 - SECURITY: ssh(1), sshd(8): Improve operation ordering of MAC
13 verification for Encrypt-then-MAC (EtM) mode transport MAC algorithms
14 to verify the MAC before decrypting any ciphertext. This removes the
15 possibility of timing differences leaking facts about the plaintext,
16 though no such leakage has been observed.
17 - ssh(1): Add a ProxyJump option and corresponding -J command-line flag
18 to allow simplified indirection through a one or more SSH bastions or
19 "jump hosts".
20 - ssh(1): Add an IdentityAgent option to allow specifying specific agent
21 sockets instead of accepting one from the environment.
22 - ssh(1): Allow ExitOnForwardFailure and ClearAllForwardings to be
23 optionally overridden when using ssh -W.
24 - ssh(1), sshd(8): Implement support for the IUTF8 terminal mode as per
25 draft-sgtatham-secsh-iutf8-00 (closes: #337041, LP: #394570).
26 - ssh(1), sshd(8): Add support for additional fixed Diffie-Hellman 2K,
27 4K and 8K groups from draft-ietf-curdle-ssh-kex-sha2-03.
28 - ssh-keygen(1), ssh(1), sshd(8): Support SHA256 and SHA512 RSA
29 signatures in certificates.
30 - ssh(1): Add an Include directive for ssh_config(5) files (closes:
31 #536031).
32 - ssh(1): Permit UTF-8 characters in pre-authentication banners sent
33 from the server.
34 - ssh(1), sshd(8): Reduce the syslog level of some relatively common
35 protocol events from LOG_CRIT.
36 - sshd(8): Refuse AuthenticationMethods="" in configurations and accept
37 AuthenticationMethods=any for the default behaviour of not requiring
38 multiple authentication.
39 - sshd(8): Remove obsolete and misleading "POSSIBLE BREAK-IN ATTEMPT!"
40 message when forward and reverse DNS don't match.
41 - ssh(1): Deduplicate LocalForward and RemoteForward entries to fix
42 failures when both ExitOnForwardFailure and hostname canonicalisation
43 are enabled.
44 - sshd(8): Remove fallback from moduli to obsolete "primes" file that
45 was deprecated in 2001 (LP: #1528251).
46 - sshd_config(5): Correct description of UseDNS: it affects ssh hostname
47 processing for authorized_keys, not known_hosts.
48 - sshd(8): Send ClientAliveInterval pings when a time-based RekeyLimit
49 is set; previously keepalive packets were not being sent.
50 - sshd(8): Whitelist more architectures to enable the seccomp-bpf
51 sandbox.
52 - scp(1): Respect the local user's LC_CTYPE locale (closes: #396295).
53 - Take character display widths into account for the progressmeter
54 (closes: #407088).
55
56 -- Colin Watson <cjwatson@debian.org> Sat, 06 Aug 2016 11:00:55 +0100
57
58openssh (1:7.2p2-8) unstable; urgency=medium
59
60 [ Colin Watson ]
61 * Stop enabling ssh-session-cleanup.service by default; instead, ship it
62 as an example and add a section to README.Debian. libpam-systemd >= 230
63 and "UsePAM yes" should take care of the original problem for most
64 systemd users (thanks, Michael Biebl; closes: #832155).
65
66 [ Martin Pitt ]
67 * Add debian/agent-launch: Helper script for conditionally starting the SSH
68 agent in the user session. Use it in ssh-agent.user-session.upstart.
69 * Add systemd user unit for graphical sessions that use systemd. Override
70 the corresponding upstart job in that case (closes: #832445).
71 * debian/openssh-server.if-up: Don't block on a finished reload of
72 openssh.service, to avoid deadlocking with restarting networking.
73 (closes: #832557, LP: #1584393)
74
75 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2016 02:51:32 +0100
76
77openssh (1:7.2p2-7) unstable; urgency=medium
78
79 * Don't stop the ssh-session-cleanup service on upgrade (closes: #832155).
80 This may cause SSH sessions to be killed on upgrade to *this* version if
81 you had previously installed 1:7.2p2-6. Sorry! If your session is
82 killed, you can recover using "dpkg --unpack" on this openssh-server
83 .deb, followed by "dpkg --configure -a".
84 * Recommend libpam-systemd from openssh-server. It's a much better
85 solution than the above for systemd users, but I'm wary of depending on
86 it in case I cause an assortment of exciting dependency problems on
87 upgrade for non-systemd users.
88
89 -- Colin Watson <cjwatson@debian.org> Sat, 23 Jul 2016 11:46:33 +0100
90
91openssh (1:7.2p2-6) unstable; urgency=medium
92
93 * debian/watch: Switch to HTTP (thanks, Nicholas Luedtke; closes:
94 #822997).
95 * Copy summary of supported SFTP protocol versions from upstream's
96 PROTOCOL file into the openssh-sftp-server package description (closes:
97 #766887).
98 * Set SSH_PROGRAM=/usr/bin/ssh1 when building openssh-client-ssh1 so that
99 scp1 works (reported by Olivier MATZ).
100 * Retroactively add a NEWS.Debian entry for the UseDNS change in 6.9 (see
101 LP #1588457).
102 * CVE-2016-6210: Mitigate user enumeration via covert timing channel
103 (closes: #831902).
104 * Backport upstream patch to close ControlPersist background process
105 stderr when not in debug mode or when logging to a file or syslog
106 (closes: #714526).
107 * Add a session cleanup script and a systemd unit file to trigger it,
108 which serves to terminate SSH sessions cleanly if systemd doesn't do
109 that itself, often because libpam-systemd is not installed (thanks,
110 Vivek Das Mohapatra, Tom Hutter, and others; closes: #751636).
111 * Stop generating DSA host keys by default (thanks, Santiago Vila; closes:
112 #823827).
113
114 -- Colin Watson <cjwatson@debian.org> Fri, 22 Jul 2016 17:06:19 +0100
115
116openssh (1:7.2p2-5) unstable; urgency=medium
117
118 * Backport upstream patch to unbreak authentication using lone certificate
119 keys in ssh-agent: when attempting pubkey auth with a certificate, if no
120 separate private key is found among the keys then try with the
121 certificate key itself (thanks, Paul Querna; LP: #1575961).
122
123 -- Colin Watson <cjwatson@debian.org> Thu, 28 Apr 2016 01:52:01 +0100
124
125openssh (1:7.2p2-4) unstable; urgency=medium
126
127 * Drop dependency on libnss-files-udeb (closes: #819686).
128 * Policy version 3.9.7: no changes required.
129
130 -- Colin Watson <cjwatson@debian.org> Fri, 15 Apr 2016 16:40:07 +0100
131
132openssh (1:7.2p2-3) unstable; urgency=high
133
134 * Change all openssh.org references to openssh.com (closes: #819213).
135 * CVE-2015-8325: Ignore PAM environment vars when UseLogin=yes.
136
137 -- Colin Watson <cjwatson@debian.org> Wed, 13 Apr 2016 16:42:28 +0100
138
139openssh (1:7.2p2-2) unstable; urgency=medium
140
141 * Fix kexgss_server to cope with DH_GRP_MIN/DH_GRP_MAX being stricter on
142 the server end than the client (thanks, Damien Miller; closes: #817870,
143 LP: #1558576).
144
145 -- Colin Watson <cjwatson@debian.org> Mon, 21 Mar 2016 12:08:55 +0000
146
147openssh (1:7.2p2-1) unstable; urgency=high
148
149 * New upstream release (http://www.openssh.com/txt/release-7.2p2):
150 - CVE-2016-3115: sshd(8): Sanitise X11 authentication credentials to
151 avoid xauth command injection when X11Forwarding is enabled
152 (http://www.openssh.com/txt/x11fwd.adv).
153
154 -- Colin Watson <cjwatson@debian.org> Thu, 10 Mar 2016 13:04:29 +0000
155
156openssh (1:7.2p1-1) unstable; urgency=medium
157
158 * New upstream release (http://www.openssh.com/txt/release-7.2):
159 - This release disables a number of legacy cryptographic algorithms by
160 default in ssh:
161 + Several ciphers blowfish-cbc, cast128-cbc, all arcfour variants and
162 the rijndael-cbc aliases for AES.
163 + MD5-based and truncated HMAC algorithms.
164 These algorithms are already disabled by default in sshd.
165 - ssh(1), sshd(8): Remove unfinished and unused roaming code (was
166 already forcibly disabled in OpenSSH 7.1p2).
167 - ssh(1): Eliminate fallback from untrusted X11 forwarding to trusted
168 forwarding when the X server disables the SECURITY extension.
169 - ssh(1), sshd(8): Increase the minimum modulus size supported for
170 diffie-hellman-group-exchange to 2048 bits.
171 - sshd(8): Pre-auth sandboxing is now enabled by default (previous
172 releases enabled it for new installations via sshd_config).
173 - all: Add support for RSA signatures using SHA-256/512 hash algorithms
174 based on draft-rsa-dsa-sha2-256-03.txt and draft-ssh-ext-info-04.txt.
175 - ssh(1): Add an AddKeysToAgent client option which can be set to 'yes',
176 'no', 'ask', or 'confirm', and defaults to 'no'. When enabled, a
177 private key that is used during authentication will be added to
178 ssh-agent if it is running (with confirmation enabled if set to
179 'confirm').
180 - sshd(8): Add a new authorized_keys option "restrict" that includes all
181 current and future key restrictions (no-*-forwarding, etc.). Also add
182 permissive versions of the existing restrictions, e.g. "no-pty" ->
183 "pty". This simplifies the task of setting up restricted keys and
184 ensures they are maximally-restricted, regardless of any permissions
185 we might implement in the future.
186 - ssh(1): Add ssh_config CertificateFile option to explicitly list
187 certificates.
188 - ssh-keygen(1): Allow ssh-keygen to change the key comment for all
189 supported formats (closes: #811125).
190 - ssh-keygen(1): Allow fingerprinting from standard input, e.g.
191 "ssh-keygen -lf -" (closes: #509058).
192 - ssh-keygen(1): Allow fingerprinting multiple public keys in a file,
193 e.g. "ssh-keygen -lf ~/.ssh/authorized_keys".
194 - sshd(8): Support "none" as an argument for sshd_config Foreground and
195 ChrootDirectory. Useful inside Match blocks to override a global
196 default.
197 - ssh-keygen(1): Support multiple certificates (one per line) and
198 reading from standard input (using "-f -") for "ssh-keygen -L"
199 - ssh-keyscan(1): Add "ssh-keyscan -c ..." flag to allow fetching
200 certificates instead of plain keys.
201 - ssh(1): Better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in
202 hostname canonicalisation - treat them as already canonical and remove
203 the trailing '.' before matching ssh_config.
204 - sftp(1): Existing destination directories should not terminate
205 recursive uploads (regression in OpenSSH 6.8; LP: #1553378).
206 * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
207 * Restore slogin symlinks for compatibility, although they were removed
208 upstream.
209
210 -- Colin Watson <cjwatson@debian.org> Tue, 08 Mar 2016 11:47:20 +0000
211
212openssh (1:7.1p2-2) unstable; urgency=medium
213
214 * Remove protocol 1 host key generation from openssh-server.postinst
215 (closes: #811265).
216
217 -- Colin Watson <cjwatson@debian.org> Sun, 17 Jan 2016 14:10:19 +0000
218
219openssh (1:7.1p2-1) unstable; urgency=high
220
221 * New upstream release (http://www.openssh.com/txt/release-7.1p2):
222 - CVE-2016-0777, CVE-2016-0778: Disable experimental client-side support
223 for roaming, which could be tricked by a malicious server into leaking
224 client memory to the server, including private client user keys; this
225 information leak is restricted to connections to malicious or
226 compromised servers (closes: #810984).
227 - SECURITY: Fix an out of-bound read access in the packet handling code.
228 Reported by Ben Hawkes.
229 - Further use of explicit_bzero has been added in various buffer
230 handling code paths to guard against compilers aggressively doing
231 dead-store removal.
232
233 -- Colin Watson <cjwatson@debian.org> Thu, 14 Jan 2016 15:28:03 +0000
234
235openssh (1:7.1p1-6) unstable; urgency=medium
236
237 [ Colin Watson ]
238 * Remove explicit "XS-Testsuite: autopkgtest" from debian/control;
239 dpkg-source now figures that out automatically based on the existence of
240 debian/tests/control.
241 * Allow authenticating as root using gssapi-keyex even with
242 "PermitRootLogin prohibit-password" (closes: #809695).
243 * Shuffle PROPOSAL_KEX_ALGS mangling for GSSAPI key exchange a little
244 later in ssh_kex2 so that it's actually effective (closes: #809696).
245
246 [ Michael Biebl ]
247 * Don't call sd_notify when sshd is re-execed (closes: #809035).
248
249 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2016 15:09:10 +0000
250
251openssh (1:7.1p1-5) unstable; urgency=medium
252
253 [ Michael Biebl ]
254 * Add systemd readiness notification support (closes: #778913).
255
256 -- Colin Watson <cjwatson@debian.org> Mon, 21 Dec 2015 22:10:07 +0000
257
258openssh (1:7.1p1-4) unstable; urgency=medium
259
260 * Backport upstream patch to unbreak connections with peers that set
261 first_kex_follows (LP: #1526357).
262
263 -- Colin Watson <cjwatson@debian.org> Tue, 15 Dec 2015 15:40:18 +0000
264
265openssh (1:7.1p1-3) unstable; urgency=medium
266
267 * Drop priority of openssh-client-ssh1 to extra (closes: #807518).
268 * Redirect regression test input from /dev/zero, since otherwise conch
269 will immediately send EOF.
270
271 -- Colin Watson <cjwatson@debian.org> Thu, 10 Dec 2015 15:12:10 +0000
272
273openssh (1:7.1p1-2) unstable; urgency=medium
274
275 * Really enable conch interoperability tests under autopkgtest.
276 * Drop SSH1 keepalive patch. Now that SSH1 is disabled at compile-time,
277 it's been rejected upstream and there isn't much point carrying it any
278 more.
279 * Add NEWS.Debian documenting cryptographic changes in OpenSSH 7.0
280 (closes: #806962).
281 * Add an openssh-client-ssh1 binary package for people who need to connect
282 to outdated SSH1-only servers (closes: #807107).
283 * Update "Subsystem sftp" path in example sshd_config (closes: #691004,
284 LP: #1437005).
285
286 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
287
288openssh (1:7.1p1-1) unstable; urgency=medium
289
290 * New upstream release (http://www.openssh.com/txt/release-7.0, closes:
291 #785190):
292 - Support for the legacy SSH version 1 protocol is disabled by default
293 at compile time.
294 - Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
295 disabled by default at run-time. It may be re-enabled using the
296 instructions at http://www.openssh.com/legacy.html
297 - Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
298 default at run-time. These may be re-enabled using the instructions
299 at http://www.openssh.com/legacy.html
300 - Support for the legacy v00 cert format has been removed.
301 - The default for the sshd_config(5) PermitRootLogin option has changed
302 from "yes" to "prohibit-password".
303 - PermitRootLogin=without-password/prohibit-password now bans all
304 interactive authentication methods, allowing only public-key,
305 hostbased and GSSAPI authentication (previously it permitted
306 keyboard-interactive and password-less authentication if those were
307 enabled).
308 - ssh_config(5): Add PubkeyAcceptedKeyTypes option to control which
309 public key types are available for user authentication.
310 - sshd_config(5): Add HostKeyAlgorithms option to control which public
311 key types are offered for host authentications.
312 - ssh(1), sshd(8): Extend Ciphers, MACs, KexAlgorithms,
313 HostKeyAlgorithms, PubkeyAcceptedKeyTypes and HostbasedKeyTypes
314 options to allow appending to the default set of algorithms instead of
315 replacing it. Options may now be prefixed with a '+' to append to the
316 default, e.g. "HostKeyAlgorithms=+ssh-dss".
317 - sshd_config(5): PermitRootLogin now accepts an argument of
318 'prohibit-password' as a less-ambiguous synonym of 'without-
319 password'.
320 - ssh(1), sshd(8): Add compatability workarounds for Cisco and more
321 PuTTY versions.
322 - Fix some omissions and errors in the PROTOCOL and PROTOCOL.mux
323 documentation relating to Unix domain socket forwarding.
324 - ssh(1): Improve the ssh(1) manual page to include a better description
325 of Unix domain socket forwarding (closes: #779068).
326 - ssh(1), ssh-agent(1): Skip uninitialised PKCS#11 slots, fixing
327 failures to load keys when they are present.
328 - ssh(1), ssh-agent(1): Do not ignore PKCS#11 hosted keys that wth empty
329 CKA_ID.
330 - sshd(8): Clarify documentation for UseDNS option.
331 - Check realpath(3) behaviour matches what sftp-server requires and use
332 a replacement if necessary.
333 * New upstream release (http://www.openssh.com/txt/release-7.1):
334 - sshd(8): OpenSSH 7.0 contained a logic error in PermitRootLogin=
335 prohibit-password/without-password that could, depending on
336 compile-time configuration, permit password authentication to root
337 while preventing other forms of authentication. This problem was
338 reported by Mantas Mikulenas.
339 - ssh(1), sshd(8): Add compatibility workarounds for FuTTY.
340 - ssh(1), sshd(8): Refine compatibility workarounds for WinSCP.
341 - Fix a number of memory faults (double-free, free of uninitialised
342 memory, etc) in ssh(1) and ssh-keygen(1). Reported by Mateusz
343 Kocielski.
344 * Change "PermitRootLogin without-password" to the new preferred spelling
345 of "PermitRootLogin prohibit-password" in sshd_config, and update
346 documentation to reflect the new upstream default.
347 * Enable conch interoperability tests under autopkgtest.
348
349 -- Colin Watson <cjwatson@debian.org> Wed, 02 Dec 2015 20:18:35 +0000
350
351openssh (1:6.9p1-3) unstable; urgency=medium
352
353 * ssh_config(5): Fix markup errors in description of GSSAPITrustDns
354 (closes: #799271).
355 * Fix dh_install and dh_fixperms overrides to work properly with an
356 architecture-independent-only build (closes: #806090).
357 * Do much less work in architecture-independent-only builds.
358 * Drop ConsoleKit session registration patch; it was only ever enabled for
359 Ubuntu, which no longer needs it (LP: #1334916, #1502045).
360
361 -- Colin Watson <cjwatson@debian.org> Tue, 24 Nov 2015 22:48:53 +0000
362
363openssh (1:6.9p1-2) unstable; urgency=medium
364
365 [ Colin Watson ]
366 * mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen
367 invocation onto a separate line to make it easier to copy and paste
368 (LP: #1491532).
369
370 [ Tyler Hicks ]
371 * Build with audit support on Linux (closes: #797727, LP: #1478087).
372
373 -- Colin Watson <cjwatson@debian.org> Thu, 10 Sep 2015 12:26:11 +0100
374
375openssh (1:6.9p1-1) unstable; urgency=medium
376
377 * New upstream release (http://www.openssh.com/txt/release-6.8):
378 - sshd(8): UseDNS now defaults to 'no'. Configurations that match
379 against the client host name (via sshd_config or authorized_keys) may
380 need to re-enable it or convert to matching against addresses.
381 - Add FingerprintHash option to ssh(1) and sshd(8), and equivalent
382 command-line flags to the other tools to control algorithm used for
383 key fingerprints. The default changes from MD5 to SHA256 and format
384 from hex to base64.
385 Fingerprints now have the hash algorithm prepended. An example of the
386 new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE
387 Please note that visual host keys will also be different.
388 - ssh(1), sshd(8): Experimental host key rotation support. Add a
389 protocol extension for a server to inform a client of all its
390 available host keys after authentication has completed. The client
391 may record the keys in known_hosts, allowing it to upgrade to better
392 host key algorithms and a server to gracefully rotate its keys.
393 The client side of this is controlled by a UpdateHostkeys config
394 option (default off).
395 - ssh(1): Add a ssh_config HostbasedKeyType option to control which host
396 public key types are tried during host-based authentication.
397 - ssh(1), sshd(8): Fix connection-killing host key mismatch errors when
398 sshd offers multiple ECDSA keys of different lengths.
399 - ssh(1): When host name canonicalisation is enabled, try to parse host
400 names as addresses before looking them up for canonicalisation. Fixes
401 bz#2074 and avoids needless DNS lookups in some cases.
402 - ssh(1), ssh-keysign(8): Make ed25519 keys work for host based
403 authentication.
404 - sshd(8): SSH protocol v.1 workaround for the Meyer, et al,
405 Bleichenbacher Side Channel Attack. Fake up a bignum key before RSA
406 decryption.
407 - sshd(8): Remember which public keys have been used for authentication
408 and refuse to accept previously-used keys. This allows
409 AuthenticationMethods=publickey,publickey to require that users
410 authenticate using two _different_ public keys.
411 - sshd(8): add sshd_config HostbasedAcceptedKeyTypes and
412 PubkeyAcceptedKeyTypes options to allow sshd to control what public
413 key types will be accepted (closes: #481133). Currently defaults to
414 all.
415 - sshd(8): Don't count partial authentication success as a failure
416 against MaxAuthTries.
417 - ssh(1): Add RevokedHostKeys option for the client to allow text-file
418 or KRL-based revocation of host keys.
419 - ssh-keygen(1), sshd(8): Permit KRLs that revoke certificates by serial
420 number or key ID without scoping to a particular CA.
421 - ssh(1): Add a "Match canonical" criteria that allows ssh_config Match
422 blocks to trigger only in the second config pass.
423 - ssh(1): Add a -G option to ssh that causes it to parse its
424 configuration and dump the result to stdout, similar to "sshd -T".
425 - ssh(1): Allow Match criteria to be negated. E.g. "Match !host".
426 - ssh-keyscan(1): ssh-keyscan has been made much more robust against
427 servers that hang or violate the SSH protocol (closes: #241119).
428 - ssh(1), ssh-keygen(1): Fix regression bz#2306: Key path names were
429 being lost as comment fields (closes: #787776).
430 - ssh(1): Allow ssh_config Port options set in the second config parse
431 phase to be applied (they were being ignored; closes: #774369).
432 - ssh(1): Tweak config re-parsing with host canonicalisation - make the
433 second pass through the config files always run when host name
434 canonicalisation is enabled (and not whenever the host name changes)
435 - ssh(1): Fix passing of wildcard forward bind addresses when connection
436 multiplexing is in use.
437 - ssh-keygen(1): Fix broken private key conversion from non-OpenSSH
438 formats.
439 - ssh-keygen(1): Fix KRL generation bug when multiple CAs are in use.
440 * New upstream release (http://www.openssh.com/txt/release-6.9):
441 - CVE-2015-5352: ssh(1): When forwarding X11 connections with
442 ForwardX11Trusted=no, connections made after ForwardX11Timeout expired
443 could be permitted and no longer subject to XSECURITY restrictions
444 because of an ineffective timeout check in ssh(1) coupled with "fail
445 open" behaviour in the X11 server when clients attempted connections
446 with expired credentials (closes: #790798). This problem was reported
447 by Jann Horn.
448 - SECURITY: ssh-agent(1): Fix weakness of agent locking (ssh-add -x) to
449 password guessing by implementing an increasing failure delay, storing
450 a salted hash of the password rather than the password itself and
451 using a timing-safe comparison function for verifying unlock attempts.
452 This problem was reported by Ryan Castellucci.
453 - sshd(8): Support admin-specified arguments to AuthorizedKeysCommand
454 (closes: #740494).
455 - sshd(8): Add AuthorizedPrincipalsCommand that allows retrieving
456 authorized principals information from a subprocess rather than a
457 file.
458 - ssh(1), ssh-add(1): Support PKCS#11 devices with external PIN entry
459 devices.
460 - ssh-keygen(1): Support "ssh-keygen -lF hostname" to search known_hosts
461 and print key hashes rather than full keys.
462 - ssh-agent(1): Add -D flag to leave ssh-agent in foreground without
463 enabling debug mode.
464 - ssh(1), sshd(8): Deprecate legacy SSH2_MSG_KEX_DH_GEX_REQUEST_OLD
465 message and do not try to use it against some 3rd-party SSH
466 implementations that use it (older PuTTY, WinSCP).
467 - ssh(1), sshd(8): Cap DH-GEX group size at 4Kbits for Cisco
468 implementations as some would fail when attempting to use group sizes
469 >4K (closes: #740307, LP: #1287222).
470 - ssh(1): Fix out-of-bound read in EscapeChar configuration option
471 parsing.
472 - sshd(8): Fix application of PermitTunnel, LoginGraceTime,
473 AuthenticationMethods and StreamLocalBindMask options in Match blocks.
474 - ssh(1), sshd(8): Improve disconnection message on TCP reset.
475 - ssh(1): Remove failed remote forwards established by multiplexing from
476 the list of active forwards.
477 - sshd(8): Make parsing of authorized_keys "environment=" options
478 independent of PermitUserEnv being enabled.
479 - sshd(8): Fix post-auth crash with permitopen=none (closes: #778807).
480 - ssh(1), ssh-add(1), ssh-keygen(1): Allow new-format private keys to be
481 encrypted with AEAD ciphers.
482 - ssh(1): Allow ListenAddress, Port and AddressFamily configuration
483 options to appear in any order.
484 - sshd(8): Check for and reject missing arguments for VersionAddendum
485 and ForceCommand.
486 - ssh(1), sshd(8): Don't treat unknown certificate extensions as fatal.
487 - ssh-keygen(1): Make stdout and stderr output consistent.
488 - ssh(1): Mention missing DISPLAY environment in debug log when X11
489 forwarding requested.
490 - sshd(8): Correctly record login when UseLogin is set.
491 - sshd(8): Add some missing options to sshd -T output and fix output of
492 VersionAddendum and HostCertificate.
493 - Document and improve consistency of options that accept a "none"
494 argument: TrustedUserCAKeys, RevokedKeys, AuthorizedPrincipalsFile.
495 - ssh(1): Include remote username in debug output.
496 - sshd(8): Avoid compatibility problem with some versions of Tera Term,
497 which would crash when they received the hostkeys notification message
498 (hostkeys-00@openssh.com).
499 - sshd(8): Mention ssh-keygen -E as useful when comparing legacy MD5
500 host key fingerprints.
501 - ssh(1): Clarify pseudo-terminal request behaviour and make manual
502 language consistent.
503 - ssh(1): Document that the TERM environment variable is not subject to
504 SendEnv and AcceptEnv; bz#2386
505 - sshd(8): Format UsePAM setting when using sshd -T (closes: #767648).
506 - moduli(5): Update DH-GEX moduli (closes: #787037).
507 * There are some things I want to fix before upgrading to 7.0p1, though I
508 intend to do that soon. In the meantime, backport some patches, mainly
509 to fix security issues:
510 - SECURITY: sshd(8): OpenSSH 6.8 and 6.9 incorrectly set TTYs to be
511 world-writable. Local attackers may be able to write arbitrary
512 messages to logged-in users, including terminal escape sequences.
513 Reported by Nikolay Edigaryev.
514 - SECURITY: sshd(8): Fixed a privilege separation weakness related to
515 PAM support. Attackers who could successfully compromise the
516 pre-authentication process for remote code execution and who had valid
517 credentials on the host could impersonate other users. Reported by
518 Moritz Jodeit.
519 - SECURITY: sshd(8): Fixed a use-after-free bug related to PAM support
520 that was reachable by attackers who could compromise the
521 pre-authentication process for remote code execution (closes:
522 #795711). Also reported by Moritz Jodeit.
523 - CVE-2015-5600: sshd(8): Fix circumvention of MaxAuthTries using
524 keyboard-interactive authentication (closes: #793616). By specifying
525 a long, repeating keyboard-interactive "devices" string, an attacker
526 could request the same authentication method be tried thousands of
527 times in a single pass. The LoginGraceTime timeout in sshd(8) and any
528 authentication failure delays implemented by the authentication
529 mechanism itself were still applied. Found by Kingcope.
530 - Let principals-command.sh work for noexec /var/run.
531 * Thanks to Jakub Jelen of Red Hat for Fedora's rebased version of the
532 GSSAPI key exchange patch.
533 * Document the Debian-specific change to the default value of
534 ForwardX11Trusted in ssh(1) (closes: #781469).
535
536 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
537
538openssh (1:6.7p1-6) unstable; urgency=medium
539
540 [ Martin Pitt ]
541 * openssh-server.postinst: Quiesce "Unable to connect to Upstart" error
542 message from initctl if upstart is installed, but not the current init
543 system. (LP: #1440070)
544 * openssh-server.postinst: Fix version comparisons of upgrade adjustments
545 to not apply to fresh installs.
546
547 -- Colin Watson <cjwatson@debian.org> Sun, 19 Apr 2015 14:32:43 +0100
548
549openssh (1:6.7p1-5) unstable; urgency=medium
550
551 * Revert change from previous upload, which causes far more trouble than
552 it is worth (closes: #780797):
553 - Send/accept only specific known LC_* variables, rather than using a
554 wildcard.
555 * Add a NEWS.Debian entry documenting this reversion, as it is too
556 difficult to undo the sshd_config change automatically without
557 compounding the problem of (arguably) overwriting user configuration.
558
559 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:20:56 +0000
560
561openssh (1:6.7p1-4) unstable; urgency=medium
562
563 * Send/accept only specific known LC_* variables, rather than using a
564 wildcard (closes: #765633).
565 * Document interactions between ListenAddress/Port and ssh.socket in
566 README.Debian (closes: #764842).
567 * Debconf translations:
568 - Brazilian Portuguese (thanks, José de Figueiredo; closes: #771859).
569
570 -- Colin Watson <cjwatson@debian.org> Wed, 18 Mar 2015 15:34:13 +0000
571
572openssh (1:6.7p1-3) unstable; urgency=medium
573
574 * Debconf translations:
575 - Dutch (thanks, Frans Spiesschaert; closes: #765851).
576 * Assume that dpkg-statoverride exists and drop the test for an obsolete
577 compatibility path.
578
579 -- Colin Watson <cjwatson@debian.org> Mon, 03 Nov 2014 20:29:52 +0000
580
581openssh (1:6.7p1-2) unstable; urgency=medium
582
583 * debian/tests/control: Drop isolation-container, since the tests run on a
584 high port. They're still not guaranteed to run correctly in an schroot,
585 but may manage to work, so this lets the tests at least try to run on
586 ci.debian.net.
587
588 -- Colin Watson <cjwatson@debian.org> Fri, 10 Oct 2014 10:47:19 +0100
589
590openssh (1:6.7p1-1) unstable; urgency=medium
591
592 * New upstream release (http://www.openssh.com/txt/release-6.7):
593 - sshd(8): The default set of ciphers and MACs has been altered to
594 remove unsafe algorithms. In particular, CBC ciphers and arcfour* are
595 disabled by default. The full set of algorithms remains available if
596 configured explicitly via the Ciphers and MACs sshd_config options.
597 - ssh(1), sshd(8): Add support for Unix domain socket forwarding. A
598 remote TCP port may be forwarded to a local Unix domain socket and
599 vice versa or both ends may be a Unix domain socket (closes: #236718).
600 - ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519
601 key types.
602 - sftp(1): Allow resumption of interrupted uploads.
603 - ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is
604 the same as the one sent during initial key exchange.
605 - sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses
606 when GatewayPorts=no; allows client to choose address family.
607 - sshd(8): Add a sshd_config PermitUserRC option to control whether
608 ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys
609 option.
610 - ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that
611 expands to a unique identifier based on a hash of the tuple of (local
612 host, remote user, hostname, port). Helps avoid exceeding miserly
613 pathname limits for Unix domain sockets in multiplexing control paths.
614 - sshd(8): Make the "Too many authentication failures" message include
615 the user, source address, port and protocol in a format similar to the
616 authentication success / failure messages.
617 - Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is
618 available. It considers time spent suspended, thereby ensuring
619 timeouts (e.g. for expiring agent keys) fire correctly (closes:
620 #734553).
621 - Use prctl() to prevent sftp-server from accessing
622 /proc/self/{mem,maps}.
623 * Restore TCP wrappers support, removed upstream in 6.7. It is true that
624 dropping this reduces preauth attack surface in sshd. On the other
625 hand, this support seems to be quite widely used, and abruptly dropping
626 it (from the perspective of users who don't read openssh-unix-dev) could
627 easily cause more serious problems in practice. It's not entirely clear
628 what the right long-term answer for Debian is, but it at least probably
629 doesn't involve dropping this feature shortly before a freeze.
630 * Replace patch to disable OpenSSL version check with an updated version
631 of Kurt Roeckx's patch from #732940 to just avoid checking the status
632 field.
633 * Build-depend on a new enough dpkg-dev for dpkg-buildflags, rather than
634 simply a new enough dpkg.
635 * Simplify debian/rules using /usr/share/dpkg/buildflags.mk.
636 * Use Package-Type rather than XC-Package-Type, now that it is an official
637 field.
638 * Run a subset of the upstream regression test suite at package build
639 time, and the rest of it under autopkgtest.
640
641 -- Colin Watson <cjwatson@debian.org> Thu, 09 Oct 2014 14:05:56 +0100
642
643openssh (1:6.6p1-8) unstable; urgency=medium
644
645 * Make the if-up hook use "reload" rather than "restart" if the system was
646 booted using systemd (closes: #756547).
647 * Show fingerprints of new keys after creating them in the postinst
648 (closes: #762128).
649 * Policy version 3.9.6: no changes required.
650 * Don't link /usr/share/doc/ssh to openssh-client, as this is not safe
651 between Architecture: all and Architecture: any binary packages (closes:
652 #763375).
653
654 -- Colin Watson <cjwatson@debian.org> Fri, 03 Oct 2014 12:23:57 +0100
655
656openssh (1:6.6p1-7) unstable; urgency=medium
657
658 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
659 directly.
660 * Use dh-exec to simplify override_dh_install target.
661 * Remove several unnecessary entries in debian/*.dirs.
662 * Pass noupdate to the second call to pam_motd, not the first (thanks, Ken
663 T Takusagawa; closes: #757059).
664 * Debconf translations:
665 - Turkish (thanks, Mert Dirik; closes: #756757).
666
667 -- Colin Watson <cjwatson@debian.org> Tue, 05 Aug 2014 09:10:04 +0100
668
669openssh (1:6.6p1-6) unstable; urgency=medium
670
671 * Upgrade to debhelper v9.
672 * Only use pam_keyinit on Linux architectures (closes: #747245).
673 * Make get_config_option more robust against trailing whitespace (thanks,
674 LaMont Jones).
675 * Debconf translations:
676 - Czech (thanks, Michal Šimůnek; closes: #751419).
677
678 -- Colin Watson <cjwatson@debian.org> Sat, 28 Jun 2014 14:50:04 +0100
679
680openssh (1:6.6p1-5) unstable; urgency=medium
681
682 * Force ssh-agent Upstart job to use sh syntax regardless of the user's
683 shell (thanks, Steffen Stempel; LP: #1312928).
684
685 -- Colin Watson <cjwatson@debian.org> Thu, 01 May 2014 16:27:53 +0100
686
687openssh (1:6.6p1-4) unstable; urgency=medium
688
689 * Debconf translations:
690 - Spanish (thanks, Matías Bellone; closes: #744867).
691 * Apply upstream-recommended patch to fix bignum encoding for
692 curve25519-sha256@libssh.org, fixing occasional key exchange failures.
693
694 -- Colin Watson <cjwatson@debian.org> Mon, 21 Apr 2014 21:29:53 +0100
695
696openssh (1:6.6p1-3) unstable; urgency=medium
697
698 * Debconf translations:
699 - French (thanks, Étienne Gilli; closes: #743242).
700 * Never signal the service supervisor with SIGSTOP more than once, to
701 prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).
702
703 -- Colin Watson <cjwatson@debian.org> Mon, 14 Apr 2014 12:11:50 +0100
704
705openssh (1:6.6p1-2) unstable; urgency=medium
706
707 * If no root password is set, then switch to "PermitRootLogin
708 without-password" without asking (LP: #1300127).
709
710 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2014 12:20:46 +0100
711
712openssh (1:6.6p1-1) unstable; urgency=medium
713
714 [ Colin Watson ]
715 * Apply various warning-suppression and regression-test fixes to
716 gssapi.patch from Damien Miller.
717 * New upstream release (http://www.openssh.com/txt/release-6.6,
718 LP: #1298280):
719 - CVE-2014-2532: sshd(8): when using environment passing with an
720 sshd_config(5) AcceptEnv pattern with a wildcard, OpenSSH prior to 6.6
721 could be tricked into accepting any environment variable that contains
722 the characters before the wildcard character.
723 * Re-enable btmp logging, as its permissions were fixed a long time ago in
724 response to #370050 (closes: #341883).
725 * Change to "PermitRootLogin without-password" for new installations, and
726 ask a debconf question when upgrading systems with "PermitRootLogin yes"
727 from previous versions (closes: #298138).
728 * Debconf translations:
729 - Danish (thanks, Joe Hansen).
730 - Portuguese (thanks, Américo Monteiro).
731 - Russian (thanks, Yuri Kozlov; closes: #742308).
732 - Swedish (thanks, Andreas Rönnquist).
733 - Japanese (thanks, victory).
734 - German (thanks, Stephan Beck; closes: #742541).
735 - Italian (thanks, Beatrice Torracca).
736 * Don't start ssh-agent from the Upstart user session job if something
737 like Xsession has already done so (based on work by Bruno Vasselle;
738 LP: #1244736).
739
740 [ Matthew Vernon ]
741 * CVE-2014-2653: Fix failure to check SSHFP records if server presents a
742 certificate (bug reported by me, patch by upstream's Damien Miller;
743 thanks also to Mark Wooding for his help in fixing this) (Closes:
744 #742513)
745
746 -- Colin Watson <cjwatson@debian.org> Fri, 28 Mar 2014 18:04:41 +0000
747
748openssh (1:6.5p1-6) unstable; urgency=medium
749
750 * Fix Breaks/Replaces versions of openssh-sftp-server on openssh-server
751 (thanks, Axel Beckert).
752
753 -- Colin Watson <cjwatson@debian.org> Thu, 06 Mar 2014 16:18:44 +0000
754
755openssh (1:6.5p1-5) unstable; urgency=medium
756
757 [ Colin Watson ]
758 * Add Alias=sshd.service to systemd ssh.service file, to match "Provides:
759 sshd" in the sysvinit script (thanks, Michael Biebl).
760 * Add Before=ssh.service to systemd ssh.socket file, since otherwise
761 nothing guarantees that ssh.service has stopped before ssh.socket starts
762 (thanks, Uoti Urpala).
763
764 [ Axel Beckert ]
765 * Split sftp-server into its own package to allow it to also be used by
766 other SSH server implementations like dropbear (closes: #504290).
767
768 -- Colin Watson <cjwatson@debian.org> Wed, 05 Mar 2014 13:53:08 +0000
769
770openssh (1:6.5p1-4) unstable; urgency=medium
771
772 * Configure --without-hardening on hppa, to work around
773 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798).
774 * Amend "Running sshd from inittab" instructions in README.Debian to
775 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
776 symlinks that won't work with dependency-based sysv-rc.
777 * Remove code related to non-dependency-based sysv-rc ordering, since that
778 is no longer supported.
779 * Apply patch from https://bugzilla.mindrot.org/show_bug.cgi?id=2200 to
780 fix getsockname errors when using "ssh -W" (closes: #738693).
781
782 -- Colin Watson <cjwatson@debian.org> Sat, 15 Feb 2014 02:19:36 +0000
783
784openssh (1:6.5p1-3) unstable; urgency=medium
785
786 * Clarify socket activation mode in README.Debian, as suggested by Uoti
787 Urpala.
788 * Stop claiming that "Protocol 2" is a Debian-specific default; this has
789 been upstream's default since 5.4p1.
790 * Avoid stdout noise from which(1) on purge of openssh-client.
791 * Fix sysvinit->systemd transition code to cope with still-running
792 sysvinit jobs being considered active by systemd (thanks, Uoti Urpala
793 and Michael Biebl).
794 * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may
795 have got it wrong before, and it's fairly harmless to repeat it.
796 * Remove tests for whether /dev/null is a character device from the
797 Upstart job and the systemd service files; it's there to avoid a
798 confusing failure mode in daemon(), but with modern init systems we use
799 the -D option to suppress daemonisation anyway.
800 * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the
801 Debian patch) rather than plain GPL.
802 * Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9),
803 rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2),
804 and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch
805 versions, for which we no longer have maintainer script code, and per
806 policy they would have to become Breaks nowadays anyway.
807 * Policy version 3.9.5.
808 * Drop unnecessary -1 in zlib1g Build-Depends version.
809 * Tweak dh_systemd_enable invocations to avoid lots of error noise.
810
811 -- Colin Watson <cjwatson@debian.org> Wed, 12 Feb 2014 13:10:08 +0000
812
813openssh (1:6.5p1-2) unstable; urgency=medium
814
815 * Only enable ssh.service for systemd, not both ssh.service and
816 ssh.socket. Thanks to Michael Biebl for spotting this.
817 * Backport upstream patch to unbreak case-sensitive matching of ssh_config
818 (closes: #738619).
819
820 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 11:28:35 +0000
821
822openssh (1:6.5p1-1) unstable; urgency=medium
823
824 * New upstream release (http://www.openssh.com/txt/release-6.5,
825 LP: #1275068):
826 - ssh(1): Add support for client-side hostname canonicalisation using a
827 set of DNS suffixes and rules in ssh_config(5). This allows
828 unqualified names to be canonicalised to fully-qualified domain names
829 to eliminate ambiguity when looking up keys in known_hosts or checking
830 host certificate names (closes: #115286).
831 * Switch to git; adjust Vcs-* fields.
832 * Convert to git-dpm, and drop source package documentation associated
833 with the old bzr/quilt patch handling workflow.
834 * Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration code,
835 leaving only basic configuration file compatibility, since it has been
836 nearly six years since the original vulnerability and this code is not
837 likely to be of much value any more (closes: #481853, #570651). See
838 https://lists.debian.org/debian-devel/2013/09/msg00240.html for my full
839 reasoning.
840 * Add OpenPGP signature checking configuration to watch file (thanks,
841 Daniel Kahn Gillmor; closes: #732441).
842 * Add the pam_keyinit session module, to create a new session keyring on
843 login (closes: #734816).
844 * Incorporate default path changes from shadow 1:4.0.18.1-8, removing
845 /usr/bin/X11 (closes: #644521).
846 * Generate ED25519 host keys on fresh installations. Upgraders who wish
847 to add such host keys should manually add 'HostKey
848 /etc/ssh/ssh_host_ed25519_key' to /etc/ssh/sshd_config and run
849 'ssh-keygen -q -f /etc/ssh/ssh_host_ed25519_key -N "" -t ed25519'.
850 * Drop long-obsolete "SSH now uses protocol 2 by default" section from
851 README.Debian.
852 * Add systemd support (thanks, Sven Joachim; closes: #676830).
853
854 -- Colin Watson <cjwatson@debian.org> Mon, 10 Feb 2014 14:58:26 +0000
855
856openssh (1:6.4p1-2) unstable; urgency=high
857
858 * Increase ServerKeyBits value in package-generated sshd_config to 1024
859 (closes: #727622, LP: #1244272).
860 * Restore patch to disable OpenSSL version check (closes: #732940).
861
862 -- Colin Watson <cjwatson@debian.org> Mon, 23 Dec 2013 10:44:04 +0000
863
864openssh (1:6.4p1-1) unstable; urgency=high
865
866 * New upstream release. Important changes:
867 - 6.3/6.3p1 (http://www.openssh.com/txt/release-6.3):
868 + sftp(1): add support for resuming partial downloads using the
869 "reget" command and on the sftp commandline or on the "get"
870 commandline using the "-a" (append) option (closes: #158590).
871 + ssh(1): add an "IgnoreUnknown" configuration option to selectively
872 suppress errors arising from unknown configuration directives
873 (closes: #436052).
874 + sftp(1): update progressmeter when data is acknowledged, not when
875 it's sent (partially addresses #708372).
876 + ssh(1): do not fatally exit when attempting to cleanup multiplexing-
877 created channels that are incompletely opened (closes: #651357).
878 - 6.4/6.4p1 (http://www.openssh.com/txt/release-6.4):
879 + CVE-2013-4548: sshd(8): fix a memory corruption problem triggered
880 during rekeying when an AES-GCM cipher is selected (closes:
881 #729029). Full details of the vulnerability are available at:
882 http://www.openssh.com/txt/gcmrekey.adv
883 * When running under Upstart, only consider the daemon started once it is
884 ready to accept connections (by raising SIGSTOP at that point and using
885 "expect stop").
886
887 -- Colin Watson <cjwatson@debian.org> Sat, 09 Nov 2013 18:24:16 +0000
888
889openssh (1:6.2p2-6) unstable; urgency=low
890
891 * Update config.guess and config.sub automatically at build time.
892 dh_autoreconf does not take care of that by default because openssh does
893 not use automake.
894
895 -- Colin Watson <cjwatson@debian.org> Tue, 02 Jul 2013 22:54:49 +0100
896
897openssh (1:6.2p2-5) unstable; urgency=low
898
899 [ Colin Watson ]
900 * Document consequences of ssh-agent being setgid in ssh-agent(1); see
901 #711623.
902 * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
903 ssh-argv0.
904
905 [ Yolanda Robla ]
906 * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
907 hardcoding Debian (LP: #1195342).
908
909 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jun 2013 15:24:14 +0100
910
911openssh (1:6.2p2-4) unstable; urgency=low
912
913 * Fix non-portable shell in ssh-copy-id (closes: #711162).
914 * Rebuild against debhelper 9.20130604 with fixed dependencies for
915 invoke-rc.d and Upstart jobs (closes: #711159, #711364).
916 * Set SELinux context on private host keys as well as public host keys
917 (closes: #687436).
918
919 -- Colin Watson <cjwatson@debian.org> Thu, 06 Jun 2013 17:06:31 +0100
920
921openssh (1:6.2p2-3) unstable; urgency=low
922
923 * If the running init daemon is Upstart, then, on the first upgrade to
924 this version, check whether sysvinit is still managing sshd; if so,
925 manually stop it so that it can be restarted under upstart. We do this
926 near the end of the postinst, so it shouldn't result in any appreciable
927 extra window where sshd is not running during upgrade.
928
929 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 17:42:10 +0100
930
931openssh (1:6.2p2-2) unstable; urgency=low
932
933 * Change start condition of Upstart job to be just the standard "runlevel
934 [2345]", rather than "filesystem or runlevel [2345]"; the latter makes
935 it unreasonably difficult to ensure that urandom starts before ssh, and
936 is not really necessary since one of static-network-up and failsafe-boot
937 is guaranteed to happen and will trigger entry to the default runlevel,
938 and we don't care about ssh starting before the network (LP: #1098299).
939 * Drop conffile handling for direct upgrades from pre-split ssh package;
940 this was originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a
941 truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is
942 now four Debian releases ago, we can afford to drop this and simplify
943 the packaging.
944 * Remove ssh/use_old_init_script, which was a workaround for a very old
945 bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then
946 they aren't going to be convinced now (closes: #214182).
947 * Remove support for upgrading directly from ssh-nonfree.
948 * Remove lots of maintainer script support for direct upgrades from
949 pre-etch (three releases before current stable).
950 * Add #DEBHELPER# tokens to openssh-client.postinst and
951 openssh-server.postinst.
952 * Replace old manual conffile handling code with dpkg-maintscript-helper,
953 via dh_installdeb.
954 * Switch to new unified layout for Upstart jobs as documented in
955 https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script
956 checks for a running Upstart, and we now let dh_installinit handle most
957 of the heavy lifting in maintainer scripts. Ubuntu users should be
958 essentially unaffected except that sshd may no longer start
959 automatically in chroots if the running Upstart predates 0.9.0; but the
960 main goal is simply not to break when openssh-server is installed in a
961 chroot.
962 * Remove the check for vulnerable host keys; this was first added five
963 years ago, and everyone should have upgraded through a version that
964 applied these checks by now. The ssh-vulnkey tool and the blacklisting
965 support in sshd are still here, at least for the moment.
966 * This removes the last of our uses of debconf (closes: #221531).
967 * Use the pam_loginuid session module (thanks, Laurent Bigonville; closes:
968 #677440, LP: #1067779).
969 * Bracket our session stack with calls to pam_selinux close/open (thanks,
970 Laurent Bigonville; closes: #679458).
971 * Fix dh_builddeb invocation so that we really use xz compression for
972 binary packages, as intended since 1:6.1p1-2.
973
974 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 09:07:42 +0100
975
976openssh (1:6.2p2-1) unstable; urgency=low
977
978 * New upstream release (http://www.openssh.com/txt/release-6.2p2):
979 - Only warn for missing identity files that were explicitly specified
980 (closes: #708275).
981 - Fix bug in contributed contrib/ssh-copy-id script that could result in
982 "rm *" being called on mktemp failure (closes: #708419).
983
984 -- Colin Watson <cjwatson@debian.org> Thu, 16 May 2013 14:05:06 +0100
985
986openssh (1:6.2p1-3) unstable; urgency=low
987
988 * Renumber Debian-specific additions to enum monitor_reqtype so that they
989 fit within a single byte (thanks, Jason Conti; LP: #1179202).
990
991 -- Colin Watson <cjwatson@debian.org> Mon, 13 May 2013 10:56:04 +0100
992
993openssh (1:6.2p1-2) unstable; urgency=low
994
995 * Fix build failure on Ubuntu:
996 - Include openbsd-compat/sys-queue.h from consolekit.c.
997 - Fix consolekit mismerges in monitor.c and monitor_wrap.c.
998
999 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 09:45:57 +0100
1000
1001openssh (1:6.2p1-1) unstable; urgency=low
1002
1003 * New upstream release (http://www.openssh.com/txt/release-6.2).
1004 - Add support for multiple required authentication in SSH protocol 2 via
1005 an AuthenticationMethods option (closes: #195716).
1006 - Fix Sophie Germain formula in moduli(5) (closes: #698612).
1007 - Update ssh-copy-id to Phil Hands' greatly revised version (closes:
1008 #99785, #322228, #620428; LP: #518883, #835901, #1074798).
1009 * Use dh-autoreconf.
1010
1011 -- Colin Watson <cjwatson@debian.org> Tue, 07 May 2013 11:48:16 +0100
1012
1013openssh (1:6.1p1-4) experimental; urgency=low
1014
1015 [ Gunnar Hjalmarsson ]
1016 * debian/openssh-server.sshd.pam: Explicitly state that ~/.pam_environment
1017 should be read, and move the pam_env calls from "auth" to "session" so
1018 that it's also read when $HOME is encrypted (LP: #952185).
1019
1020 [ Stéphane Graber ]
1021 * Add ssh-agent upstart user job. This implements something similar to
1022 the 90x11-common_ssh-agent Xsession script. That is, start ssh-agent
1023 and set the appropriate environment variables (closes: #703906).
1024
1025 -- Colin Watson <cjwatson@debian.org> Mon, 25 Mar 2013 16:58:04 +0000
1026
1027openssh (1:6.1p1-3) experimental; urgency=low
1028
1029 * Give ssh and ssh-krb5 versioned dependencies on openssh-client and
1030 openssh-server, to try to reduce confusion when people run 'apt-get
1031 install ssh' or similar and expect that to upgrade everything relevant.
1032 * CVE-2010-5107: Improve DoS resistance by changing default of MaxStartups
1033 to 10:30:100 (closes: #700102).
1034
1035 -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2013 21:07:31 +0000
1036
1037openssh (1:6.1p1-2) experimental; urgency=low
1038
1039 * Use xz compression for binary packages.
1040 * Merge from Ubuntu:
1041 - Add support for registering ConsoleKit sessions on login. (This is
1042 currently enabled only when building for Ubuntu.)
1043 - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's
1044 been long enough since the relevant vulnerability that we shouldn't
1045 need these installed by default nowadays.
1046 - Add an Upstart job (not currently used by default in Debian).
1047 - Add mention of ssh-keygen in ssh connect warning (Scott Moser).
1048 - Install apport hooks.
1049 * Only build with -j if DEB_BUILD_OPTIONS=parallel=* is used (closes:
1050 #694282).
1051
1052 -- Colin Watson <cjwatson@debian.org> Mon, 26 Nov 2012 16:39:07 +0000
1053
1054openssh (1:6.1p1-1) experimental; urgency=low
1055
1056 * New upstream release (http://www.openssh.com/txt/release-6.1).
1057 - Enable pre-auth sandboxing by default for new installs.
1058 - Allow "PermitOpen none" to refuse all port-forwarding requests
1059 (closes: #543683).
1060
1061 -- Colin Watson <cjwatson@debian.org> Fri, 07 Sep 2012 00:22:44 +0100
1062
1063openssh (1:6.0p1-3) unstable; urgency=low
1064
1065 * debconf template translations:
1066 - Add Indonesian (thanks, Andika Triwidada; closes: #681670).
1067 * Call restorecon on copied ~/.ssh/authorized_keys if possible, since some
1068 SELinux policies require this (closes: #658675).
1069 * Add ncurses-term to openssh-server's Recommends, since it's often needed
1070 to support unusual terminal emulators on clients (closes: #675362).
1071
1072 -- Colin Watson <cjwatson@debian.org> Fri, 24 Aug 2012 06:55:36 +0100
1073
1074openssh (1:6.0p1-2) unstable; urgency=low
1075
1076 * Tighten libssl1.0.0 and libcrypto1.0.0-udeb dependencies to the current
1077 "fix" version at build time (closes: #678661).
1078
1079 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jun 2012 12:16:06 +0100
1080
1081openssh (1:6.0p1-1) unstable; urgency=low
1082
1083 [ Roger Leigh ]
1084 * Display dynamic part of MOTD from /run/motd.dynamic, if it exists
1085 (closes: #669699).
1086
1087 [ Colin Watson ]
1088 * Update OpenSSH FAQ to revision 1.113, fixing missing line break (closes:
1089 #669667).
1090 * New upstream release (closes: #671010,
1091 http://www.openssh.com/txt/release-6.0).
1092 - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
1093 (closes: #643312, #650512, #671075).
1094 - Add a new privilege separation sandbox implementation for Linux's new
1095 seccomp sandbox, automatically enabled on platforms that support it.
1096 (Note: privilege separation sandboxing is still experimental.)
1097 * Fix a bashism in configure's seccomp_filter check.
1098 * Add a sandbox fallback mechanism, so that behaviour on Linux depends on
1099 whether the running system's kernel has seccomp_filter support, not the
1100 build system's kernel (forwarded upstream as
1101 https://bugzilla.mindrot.org/show_bug.cgi?id=2011).
1102
1103 -- Colin Watson <cjwatson@debian.org> Sat, 26 May 2012 13:48:14 +0100
1104
1105openssh (1:5.9p1-5) unstable; urgency=low
1106
1107 * Use dpkg-buildflags, including for hardening support; drop use of
1108 hardening-includes.
1109 * Fix cross-building:
1110 - Allow using a cross-architecture pkg-config.
1111 - Pass default LDFLAGS to contrib/Makefile.
1112 - Allow dh_strip to strip gnome-ssh-askpass, rather than calling
1113 'install -s'.
1114
1115 -- Colin Watson <cjwatson@debian.org> Mon, 02 Apr 2012 11:20:33 +0100
1116
1117openssh (1:5.9p1-4) unstable; urgency=low
1118
1119 * Disable OpenSSL version check again, as its SONAME is sufficient
1120 nowadays (closes: #664383).
1121
1122 -- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 11:06:30 +0000
1123
1124openssh (1:5.9p1-3) unstable; urgency=low
1125
1126 * debconf template translations:
1127 - Update Polish (thanks, Michał Kułach; closes: #659829).
1128 * Ignore errors writing to console in init script (closes: #546743).
1129 * Move ssh-krb5 to Section: oldlibs.
1130
1131 -- Colin Watson <cjwatson@debian.org> Fri, 24 Feb 2012 08:56:18 +0000
1132
1133openssh (1:5.9p1-2) unstable; urgency=low
1134
1135 * Mark openssh-client and openssh-server as Multi-Arch: foreign.
1136
1137 -- Colin Watson <cjwatson@debian.org> Wed, 09 Nov 2011 02:06:48 +0000
1138
1139openssh (1:5.9p1-1) unstable; urgency=low
1140
1141 * New upstream release (http://www.openssh.com/txt/release-5.9).
1142 - Introduce sandboxing of the pre-auth privsep child using an optional
1143 sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
1144 mandatory restrictions on the syscalls the privsep child can perform.
1145 - Add new SHA256-based HMAC transport integrity modes from
1146 http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
1147 - The pre-authentication sshd(8) privilege separation slave process now
1148 logs via a socket shared with the master process, avoiding the need to
1149 maintain /dev/log inside the chroot (closes: #75043, #429243,
1150 #599240).
1151 - ssh(1) now warns when a server refuses X11 forwarding (closes:
1152 #504757).
1153 - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
1154 separated by whitespace (closes: #76312). The authorized_keys2
1155 fallback is deprecated but documented (closes: #560156).
1156 - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
1157 ToS/DSCP (closes: #498297).
1158 - ssh-add(1) now accepts keys piped from standard input. E.g. "ssh-add
1159 - < /path/to/key" (closes: #229124).
1160 - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
1161 - Say "required" rather than "recommended" in unprotected-private-key
1162 warning (LP: #663455).
1163 * Update OpenSSH FAQ to revision 1.112.
1164
1165 -- Colin Watson <cjwatson@debian.org> Wed, 07 Sep 2011 23:46:00 +0100
1166
1167openssh (1:5.8p1-7) unstable; urgency=low
1168
1169 * Only recommend ssh-import-id when built on Ubuntu (closes: #635887).
1170 * Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather
1171 than 'lsb_release -is' so that Ubuntu derivatives behave the same way as
1172 Ubuntu itself.
1173
1174 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 14:27:52 +0100
1175
1176openssh (1:5.8p1-6) unstable; urgency=low
1177
1178 * openssh-client and openssh-server Suggests: monkeysphere.
1179 * Quieten logs when multiple from= restrictions are used in different
1180 authorized_keys lines for the same key; it's still not ideal, but at
1181 least you'll only get one log entry per key (closes: #630606).
1182 * Merge from Ubuntu (Dustin Kirkland):
1183 - openssh-server Recommends: ssh-import-id (no-op in Debian since that
1184 package doesn't exist there, but this reduces the Ubuntu delta).
1185
1186 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2011 17:10:18 +0100
1187
1188openssh (1:5.8p1-5) unstable; urgency=low
1189
1190 * Drop openssh-server's dependency on openssh-blacklist to a
1191 recommendation (closes: #622604).
1192 * Update Vcs-* fields and README.source for Alioth changes.
1193 * Backport from upstream:
1194 - Make hostbased auth with ECDSA keys work correctly (closes: #633368).
1195
1196 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jul 2011 11:06:47 +0100
1197
1198openssh (1:5.8p1-4) unstable; urgency=low
1199
1200 * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb,
1201 since the required minimum versions are rather old now anyway and
1202 openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828).
1203 * Remove unreachable code from openssh-server.postinst.
1204
1205 -- Colin Watson <cjwatson@debian.org> Mon, 04 Apr 2011 15:56:18 +0100
1206
1207openssh (1:5.8p1-3) unstable; urgency=low
1208
1209 * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks,
1210 Joel Stanley).
1211 * Allow ssh-add to read from FIFOs (thanks, Daniel Kahn Gillmor; closes:
1212 #614897).
1213
1214 -- Colin Watson <cjwatson@debian.org> Fri, 18 Mar 2011 16:42:42 +0000
1215
1216openssh (1:5.8p1-2) unstable; urgency=low
1217
1218 * Upload to unstable.
1219
1220 -- Colin Watson <cjwatson@debian.org> Tue, 08 Feb 2011 10:59:17 +0000
1221
1222openssh (1:5.8p1-1) experimental; urgency=low
1223
1224 * New upstream release (http://www.openssh.com/txt/release-5.8):
1225 - Fix stack information leak in legacy certificate signing
1226 (http://www.openssh.com/txt/legacy-cert.adv).
1227
1228 -- Colin Watson <cjwatson@debian.org> Sat, 05 Feb 2011 11:13:11 +0000
1229
1230openssh (1:5.7p1-2) experimental; urgency=low
1231
1232 * Fix crash in ssh_selinux_setfscreatecon when SELinux is disabled
1233 (LP: #708571).
1234
1235 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jan 2011 12:14:17 +0000
1236
1237openssh (1:5.7p1-1) experimental; urgency=low
1238
1239 * New upstream release (http://www.openssh.com/txt/release-5.7):
1240 - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
1241 and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA
1242 offer better performance than plain DH and DSA at the same equivalent
1243 symmetric key length, as well as much shorter keys.
1244 - sftp(1)/sftp-server(8): add a protocol extension to support a hard
1245 link operation. It is available through the "ln" command in the
1246 client. The old "ln" behaviour of creating a symlink is available
1247 using its "-s" option or through the preexisting "symlink" command.
1248 - scp(1): Add a new -3 option to scp: Copies between two remote hosts
1249 are transferred through the local host (closes: #508613).
1250 - ssh(1): "atomically" create the listening mux socket by binding it on
1251 a temporary name and then linking it into position after listen() has
1252 succeeded. This allows the mux clients to determine that the server
1253 socket is either ready or stale without races (closes: #454784).
1254 Stale server sockets are now automatically removed (closes: #523250).
1255 - ssh(1): install a SIGCHLD handler to reap expired child process
1256 (closes: #594687).
1257 - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
1258 temporary directories (closes: #357469, although only if you arrange
1259 for ssh-agent to actually see $TMPDIR since the setgid bit will cause
1260 it to be stripped off).
1261 * Update to current GSSAPI patch from
1262 http://www.sxw.org.uk/computing/patches/openssh-5.7p1-gsskex-all-20110125.patch:
1263 - Add GSSAPIServerIdentity option.
1264 * Generate ECDSA host keys on fresh installations. Upgraders who wish to
1265 add such host keys should manually add 'HostKey
1266 /etc/ssh/ssh_host_ecdsa_key' to /etc/ssh/sshd_config and run 'ssh-keygen
1267 -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa'.
1268 * Build-depend on libssl-dev (>= 0.9.8g) to ensure sufficient ECC support.
1269 * Backport SELinux build fix from CVS.
1270 * Rearrange selinux-role.patch so that it links properly given this
1271 SELinux build fix.
1272
1273 -- Colin Watson <cjwatson@debian.org> Wed, 26 Jan 2011 23:48:02 +0000
1274
1275openssh (1:5.6p1-3) experimental; urgency=low
1276
1277 * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
1278 longer issues.
1279 * Merge 1:5.5p1-6.
1280
1281 -- Colin Watson <cjwatson@debian.org> Thu, 30 Dec 2010 11:48:00 +0000
1282
1283openssh (1:5.6p1-2) experimental; urgency=low
1284
1285 * Backport upstream patch to install a SIGCHLD handler to reap expired ssh
1286 child processes, preventing lots of zombies when using ControlPersist
1287 (closes: #594687).
1288
1289 -- Colin Watson <cjwatson@debian.org> Tue, 26 Oct 2010 14:46:40 +0100
1290
1291openssh (1:5.6p1-1) experimental; urgency=low
1292
1293 * New upstream release (http://www.openssh.com/txt/release-5.6):
1294 - Added a ControlPersist option to ssh_config(5) that automatically
1295 starts a background ssh(1) multiplex master when connecting. This
1296 connection can stay alive indefinitely, or can be set to automatically
1297 close after a user-specified duration of inactivity (closes: #335697,
1298 #350898, #454787, #500573, #550262).
1299 - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
1300 HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
1301 Match blocks (closes: #549858).
1302 - sftp(1): fix ls in working directories that contain globbing
1303 characters in their pathnames (LP: #530714).
1304
1305 -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100
1306
1307openssh (1:5.5p1-6) unstable; urgency=low
1308
1309 * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
1310 which is intentionally no longer shipped in the openssh-server package
1311 due to /var/run often being a temporary directory, is not removed on
1312 upgrade (closes: #575582).
1313
1314 -- Colin Watson <cjwatson@debian.org> Sun, 26 Dec 2010 18:09:29 +0000
1315
1316openssh (1:5.5p1-5) unstable; urgency=low
1317
1318 * Use an architecture wildcard for libselinux1-dev (closes: #591740).
1319 * debconf template translations:
1320 - Update Danish (thanks, Joe Hansen; closes: #592800).
1321
1322 -- Colin Watson <cjwatson@debian.org> Mon, 23 Aug 2010 22:59:03 +0100
1323
1324openssh (1:5.5p1-4) unstable; urgency=low
1325
1326 [ Sebastian Andrzej Siewior ]
1327 * Add powerpcspe to architecture list for libselinux1-dev build-dependency
1328 (closes: #579843).
1329
1330 [ Colin Watson ]
1331 * Allow ~/.ssh/authorized_keys and other secure files to be
1332 group-writable, provided that the group in question contains only the
1333 file's owner; this extends a patch previously applied to ~/.ssh/config
1334 (closes: #581919).
1335 * Check primary group memberships as well as supplementary group
1336 memberships, and only allow group-writability by groups with exactly one
1337 member, as zero-member groups are typically used by setgid binaries
1338 rather than being user-private groups (closes: #581697).
1339
1340 -- Colin Watson <cjwatson@debian.org> Sat, 22 May 2010 23:37:20 +0100
1341
1342openssh (1:5.5p1-3) unstable; urgency=low
1343
1344 * Discard error messages while checking whether rsh, rlogin, and rcp
1345 alternatives exist (closes: #579285).
1346 * Drop IDEA key check; I don't think it works properly any more due to
1347 textual changes in error output, it's only relevant for direct upgrades
1348 from truly ancient versions, and it breaks upgrades if
1349 /etc/ssh/ssh_host_key can't be loaded (closes: #579570).
1350
1351 -- Colin Watson <cjwatson@debian.org> Wed, 28 Apr 2010 22:12:47 +0100
1352
1353openssh (1:5.5p1-2) unstable; urgency=low
1354
1355 * Use dh_installinit -n, since our maintainer scripts already handle this
1356 more carefully (thanks, Julien Cristau).
1357
1358 -- Colin Watson <cjwatson@debian.org> Sat, 17 Apr 2010 12:55:56 +0100
1359
1360openssh (1:5.5p1-1) unstable; urgency=low
1361
1362 * New upstream release:
1363 - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
1364 paths.
1365 - Include a language tag when sending a protocol 2 disconnection
1366 message.
1367 - Make logging of certificates used for user authentication more clear
1368 and consistent between CAs specified using TrustedUserCAKeys and
1369 authorized_keys.
1370
1371 -- Colin Watson <cjwatson@debian.org> Fri, 16 Apr 2010 10:27:30 +0100
1372
1373openssh (1:5.4p1-2) unstable; urgency=low
1374
1375 * Borrow patch from Fedora to add DNSSEC support: if glibc 2.11 is
1376 installed, the host key is published in an SSHFP RR secured with DNSSEC,
1377 and VerifyHostKeyDNS=yes, then ssh will no longer prompt for host key
1378 verification (closes: #572049).
1379 * Convert to dh(1), and use dh_installdocs --link-doc.
1380 * Drop lpia support, since Ubuntu no longer supports this architecture.
1381 * Use dh_install more effectively.
1382 * Add a NEWS.Debian entry about changes in smartcard support relative to
1383 previous unofficial builds (closes: #231472).
1384
1385 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
1386
1387openssh (1:5.4p1-1) unstable; urgency=low
1388
1389 * New upstream release (LP: #535029).
1390 - After a transition period of about 10 years, this release disables SSH
1391 protocol 1 by default. Clients and servers that need to use the
1392 legacy protocol must explicitly enable it in ssh_config / sshd_config
1393 or on the command-line.
1394 - Remove the libsectok/OpenSC-based smartcard code and add support for
1395 PKCS#11 tokens. This support is enabled by default in the Debian
1396 packaging, since it now doesn't involve additional library
1397 dependencies (closes: #231472, LP: #16918).
1398 - Add support for certificate authentication of users and hosts using a
1399 new, minimal OpenSSH certificate format (closes: #482806).
1400 - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
1401 - Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
1402 package, this overlaps with the key blacklisting facility added in
1403 openssh 1:4.7p1-9, but with different file formats and slightly
1404 different scopes; for the moment, I've roughly merged the two.)
1405 - Various multiplexing improvements, including support for requesting
1406 port-forwardings via the multiplex protocol (closes: #360151).
1407 - Allow setting an explicit umask on the sftp-server(8) commandline to
1408 override whatever default the user has (closes: #496843).
1409 - Many sftp client improvements, including tab-completion, more options,
1410 and recursive transfer support for get/put (LP: #33378). The old
1411 mget/mput commands never worked properly and have been removed
1412 (closes: #270399, #428082).
1413 - Do not prompt for a passphrase if we fail to open a keyfile, and log
1414 the reason why the open failed to debug (closes: #431538).
1415 - Prevent sftp from crashing when given a "-" without a command. Also,
1416 allow whitespace to follow a "-" (closes: #531561).
1417
1418 * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some
1419 patches apply with offsets.
1420 * Include debian/ssh-askpass-gnome.png in the Debian tarball now that
1421 we're using a source format that permits this, rather than messing
1422 around with uudecode.
1423 * Drop compatibility with the old gssapi mechanism used in ssh-krb5 <<
1424 3.8.1p1-1. Simon Wilkinson refused this patch since the old gssapi
1425 mechanism was removed due to a serious security hole, and since these
1426 versions of ssh-krb5 are no longer security-supported by Debian I don't
1427 think there's any point keeping client compatibility for them.
1428 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
1429 * Hardcode the location of xauth to /usr/bin/xauth rather than
1430 /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440).
1431 xauth no longer depends on x11-common, so we're no longer guaranteed to
1432 have the /usr/bin/X11 symlink available. I was taking advantage of the
1433 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
1434 enough in the past now that it's probably safe to just use /usr/bin.
1435 * Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes
1436 itself non-OOM-killable, and doesn't require configuration to avoid log
1437 spam in virtualisation containers (closes: #555625).
1438 * Drop Debian-specific removal of OpenSSL version check. Upstream ignores
1439 the two patchlevel nybbles now, which is sufficient to address the
1440 original reason this change was introduced, and it appears that any
1441 change in the major/minor/fix nybbles would involve a new libssl package
1442 name. (We'd still lose if the status nybble were ever changed, but that
1443 would mean somebody had packaged a development/beta version rather than
1444 a proper release, which doesn't appear to be normal practice.)
1445 * Drop most of our "LogLevel SILENT" (-qq) patch. This was originally
1446 introduced to match the behaviour of non-free SSH, in which -q does not
1447 suppress fatal errors, but matching the behaviour of OpenSSH upstream is
1448 much more important nowadays. We no longer document that -q does not
1449 suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to
1450 "LogLevel QUIET" in sshd_config on upgrade.
1451 * Policy version 3.8.4:
1452 - Add a Homepage field.
1453
1454 -- Colin Watson <cjwatson@debian.org> Tue, 06 Apr 2010 22:38:31 +0100
1455
1456openssh (1:5.3p1-3) unstable; urgency=low
1457
1458 * Convert to source format 3.0 (quilt).
1459 * Update README.source to match, and add a 'quilt-setup' target to
1460 debian/rules for the benefit of those checking out the package from
1461 revision control.
1462 * All patches are now maintained separately and tagged according to DEP-3.
1463 * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump.
1464 * Remove documentation of building for Debian 3.0 in README.Debian.
1465 Support for this was removed in 1:4.7p1-2.
1466 * Remove obsolete header from README.Debian dating from when people
1467 expected non-free SSH.
1468 * Update copyright years for GSSAPI patch.
1469
1470 -- Colin Watson <cjwatson@debian.org> Sun, 28 Feb 2010 01:35:53 +0000
1471
1472openssh (1:5.3p1-2) unstable; urgency=low
1473
1474 * Link with -Wl,--as-needed (closes: #560155).
1475 * Install upstream sshd_config as an example (closes: #415008).
1476 * Use dh_lintian.
1477 * Honour DEB_BUILD_OPTIONS=nocheck.
1478
1479 -- Colin Watson <cjwatson@debian.org> Mon, 22 Feb 2010 12:43:24 +0000
1480
1481openssh (1:5.3p1-1) unstable; urgency=low
1482
1483 * New upstream release.
1484 * Update to GSSAPI patch from
1485 http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
1486 * Backport from upstream:
1487 - Do not fall back to adding keys without constraints (ssh-add -c / -t
1488 ...) when the agent refuses the constrained add request. This was a
1489 useful migration measure back in 2002 when constraints were new, but
1490 just adds risk now (LP: #209447).
1491 * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
1492 calls. This only applied to Linux 2.2, which it's no longer feasible to
1493 run anyway (see 1:5.2p1-2 changelog).
1494
1495 -- Colin Watson <cjwatson@debian.org> Tue, 26 Jan 2010 11:55:29 +0000
1496
1497openssh (1:5.2p1-2) unstable; urgency=low
1498
1499 [ Colin Watson ]
1500 * Backport from upstream:
1501 - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd
1502 re-execs itself. Prevents two HUPs in quick succession from resulting
1503 in sshd dying (LP: #497781).
1504 - Output a debug if we can't open an existing keyfile (LP: #505301).
1505 * Use host compiler for ssh-askpass-gnome when cross-compiling.
1506 * Don't run tests when cross-compiling.
1507 * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file
1508 descriptor passing when running on Linux 2.0. The previous stable
1509 release of Debian dropped support for Linux 2.4, let alone 2.0, so this
1510 very likely has no remaining users depending on it.
1511
1512 [ Kees Cook ]
1513 * Implement DebianBanner server configuration flag that can be set to "no"
1514 to allow sshd to run without the Debian-specific extra version in the
1515 initial protocol handshake (closes: #562048).
1516
1517 -- Colin Watson <cjwatson@debian.org> Sat, 16 Jan 2010 01:28:58 +0000
1518
1519openssh (1:5.2p1-1) unstable; urgency=low
1520
1521 * New upstream release (closes: #536182). Yes, I know 5.3p1 has been out
1522 for a while, but there's no GSSAPI patch available for it yet.
1523 - Change the default cipher order to prefer the AES CTR modes and the
1524 revised "arcfour256" mode to CBC mode ciphers that are susceptible to
1525 CPNI-957037 "Plaintext Recovery Attack Against SSH".
1526 - Add countermeasures to mitigate CPNI-957037-style attacks against the
1527 SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
1528 packet length or Message Authentication Code, ssh/sshd will continue
1529 reading up to the maximum supported packet length rather than
1530 immediately terminating the connection. This eliminates most of the
1531 known differences in behaviour that leaked information about the
1532 plaintext of injected data which formed the basis of this attack
1533 (closes: #506115, LP: #379329).
1534 - ForceCommand directive now accepts commandline arguments for the
1535 internal-sftp server (closes: #524423, LP: #362511).
1536 - Add AllowAgentForwarding to available Match keywords list (closes:
1537 #540623).
1538 - Make ssh(1) send the correct channel number for
1539 SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
1540 avoid triggering 'Non-public channel' error messages on sshd(8) in
1541 openssh-5.1.
1542 - Avoid printing 'Non-public channel' warnings in sshd(8), since the
1543 ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
1544 behaviour introduced in openssh-5.1; closes: #496017).
1545 - Disable nonfunctional ssh(1) ~C escape handler in multiplex slave
1546 connections (closes: #507541).
1547 - Fix "whitepsace" typo in ssh_config(5) (closes: #514313, LP: #303835).
1548 * Update to GSSAPI patch from
1549 http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
1550 including cascading credentials support (LP: #416958).
1551 * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951).
1552 * Moved to bzr.debian.org; add Vcs-Bzr and Vcs-Browser control fields.
1553 * Add debian/README.source with instructions on bzr handling.
1554 * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes:
1555 #556644).
1556 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
1557 closes: #498684).
1558 * Don't duplicate backslashes when displaying server banner (thanks,
1559 Michał Górny; closes: #505378, LP: #425346).
1560 * Use hardening-includes for hardening logic (thanks, Kees Cook; closes:
1561 #561887).
1562 * Update OpenSSH FAQ to revision 1.110.
1563 * Remove ssh/new_config, only needed for direct upgrades from potato which
1564 are no longer particularly feasible anyway (closes: #420682).
1565 * Cope with insserv reordering of init script links.
1566 * Remove init script stop link in rc1, as killprocs handles it already.
1567 * Adjust short descriptions to avoid relying on previous experience with
1568 rsh, based on suggestions from Reuben Thomas (closes: #512198).
1569 * Remove manual page references to login.conf, which aren't applicable on
1570 non-BSD systems (closes: #154434).
1571 * Remove/adjust manual page references to BSD-specific /etc/rc (closes:
1572 #513417).
1573 * Refer to sshd_config(5) rather than sshd(8) in postinst-written
1574 /etc/ssh/sshd_config, and add UsePAM commentary from upstream-shipped
1575 configuration file (closes: #415008, although unfortunately this will
1576 only be conveniently visible on new installations).
1577 * Include URL to OpenBSD's ssl(8) in ssh(1), since I don't see a better
1578 source for the same information among Debian's manual pages (closes:
1579 #530692, LP: #456660).
1580
1581 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2010 13:23:35 +0000
1582
1583openssh (1:5.1p1-8) unstable; urgency=low
1584
1585 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;
1586 closes: #538313).
1587 * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu;
1588 closes: #547103).
1589 * Fix grammar in if-up script (closes: #549128).
1590 * Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt";
1591 closes: #548662).
1592
1593 -- Colin Watson <cjwatson@debian.org> Mon, 05 Oct 2009 13:30:49 +0100
1594
1595openssh (1:5.1p1-7) unstable; urgency=low
1596
1597 * Update config.guess and config.sub from autotools-dev 20090611.1
1598 (closes: #538301).
1599 * Set umask to 022 in the init script as well as postinsts (closes:
1600 #539030).
1601 * Add ${misc:Depends} to keep Lintian happy.
1602 * Use 'which' rather than 'type' in maintainer scripts.
1603 * Upgrade to debhelper v7.
1604
1605 -- Colin Watson <cjwatson@debian.org> Fri, 31 Jul 2009 16:28:10 +0100
1606
1607openssh (1:5.1p1-6) unstable; urgency=low
1608
1609 * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather
1610 than O_RDWR.
1611 * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
1612 #511771).
1613 * Add ufw integration (thanks, Didier Roche; see
1614 https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages;
1615 LP: #261884).
1616 * Add a comment above PermitRootLogin in sshd_config pointing to
1617 README.Debian.
1618 * Check if delgroup is present in openssh-client.postrm (closes: #530501).
1619 * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942).
1620 * Remove /var/run/sshd from openssh-server package; it will be created at
1621 run-time before starting the server.
1622 * Use invoke-rc.d in openssh-server's if-up script.
1623
1624 -- Colin Watson <cjwatson@debian.org> Fri, 05 Jun 2009 11:56:03 +0100
1625
1626openssh (1:5.1p1-5) unstable; urgency=low
1627
1628 * Backport from upstream CVS (Markus Friedl):
1629 - packet_disconnect() on padding error, too. Should reduce the success
1630 probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18.
1631 * Check that /var/run/sshd.pid exists and that the process ID listed there
1632 corresponds to sshd before running '/etc/init.d/ssh reload' from if-up
1633 script; SIGHUP is racy if called at boot before sshd has a chance to
1634 install its signal handler, but fortunately the pid file is written
1635 after that which lets us avoid the race (closes: #502444).
1636 * While the above is a valuable sanity-check, it turns out that it doesn't
1637 really fix the bug (thanks to Kevin Price for testing), so for the
1638 meantime we'll just use '/etc/init.d/ssh restart', even though it is
1639 unfortunately heavyweight.
1640
1641 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 00:34:08 +0000
1642
1643openssh (1:5.1p1-4) unstable; urgency=low
1644
1645 * ssh-copy-id: Strip trailing colons from hostname (closes: #226172,
1646 LP: #249706; thanks to Karl Goetz for nudging this along; forwarded
1647 upstream as https://bugzilla.mindrot.org/show_bug.cgi?id=1530).
1648 * Backport from upstream CVS (Markus Friedl):
1649 - Only send eow and no-more-sessions requests to openssh 5 and newer;
1650 fixes interop problems with broken ssh v2 implementations (closes:
1651 #495917).
1652 * Fix double-free when failing to parse a forwarding specification given
1653 using ~C (closes: #505330; forwarded upstream as
1654 https://bugzilla.mindrot.org/show_bug.cgi?id=1539).
1655
1656 -- Colin Watson <cjwatson@debian.org> Sun, 23 Nov 2008 14:46:10 +0000
1657
1658openssh (1:5.1p1-3) unstable; urgency=low
1659
1660 * Remove unnecessary ssh-vulnkey output in non-verbose mode when no
1661 compromised or unknown keys were found (closes: #496495).
1662 * Configure with --disable-strip; dh_strip will deal with stripping
1663 binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
1664 closes: #498681).
1665 * Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
1666 #497026).
1667
1668 -- Colin Watson <cjwatson@debian.org> Tue, 30 Sep 2008 23:09:58 +0100
1669
1670openssh (1:5.1p1-2) unstable; urgency=low
1671
1672 * Look for $SHELL on the path when executing ProxyCommands or
1673 LocalCommands (closes: #492728).
1674
1675 -- Colin Watson <cjwatson@debian.org> Tue, 29 Jul 2008 15:31:25 +0100
1676
1677openssh (1:5.1p1-1) unstable; urgency=low
1678
1679 * New upstream release (closes: #474301). Important changes not previously
1680 backported to 4.7p1:
1681 - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9):
1682 + Added chroot(2) support for sshd(8), controlled by a new option
1683 "ChrootDirectory" (closes: #139047, LP: #24777).
1684 + Linked sftp-server(8) into sshd(8). The internal sftp server is used
1685 when the command "internal-sftp" is specified in a Subsystem or
1686 ForceCommand declaration. When used with ChrootDirectory, the
1687 internal sftp server requires no special configuration of files
1688 inside the chroot environment.
1689 + Added a protocol extension method "posix-rename@openssh.com" for
1690 sftp-server(8) to perform POSIX atomic rename() operations; sftp(1)
1691 prefers this if available (closes: #308561).
1692 + Removed the fixed limit of 100 file handles in sftp-server(8).
1693 + ssh(8) will now skip generation of SSH protocol 1 ephemeral server
1694 keys when in inetd mode and protocol 2 connections are negotiated.
1695 This speeds up protocol 2 connections to inetd-mode servers that
1696 also allow Protocol 1.
1697 + Accept the PermitRootLogin directive in a sshd_config(5) Match
1698 block. Allows for, e.g. permitting root only from the local network.
1699 + Reworked sftp(1) argument splitting and escaping to be more
1700 internally consistent (i.e. between sftp commands) and more
1701 consistent with sh(1). Please note that this will change the
1702 interpretation of some quoted strings, especially those with
1703 embedded backslash escape sequences.
1704 + Support "Banner=none" in sshd_config(5) to disable sending of a
1705 pre-login banner (e.g. in a Match block).
1706 + ssh(1) ProxyCommands are now executed with $SHELL rather than
1707 /bin/sh.
1708 + ssh(1)'s ConnectTimeout option is now applied to both the TCP
1709 connection and the SSH banner exchange (previously it just covered
1710 the TCP connection). This allows callers of ssh(1) to better detect
1711 and deal with stuck servers that accept a TCP connection but don't
1712 progress the protocol, and also makes ConnectTimeout useful for
1713 connections via a ProxyCommand.
1714 + scp(1) incorrectly reported "stalled" on slow copies (closes:
1715 #140828).
1716 + scp(1) date underflow for timestamps before epoch.
1717 + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS,
1718 instead of the current standard RRSIG.
1719 + Correctly drain ACKs when a sftp(1) upload write fails midway,
1720 avoids a fatal() exit from what should be a recoverable condition.
1721 + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF
1722 hostname") to not include any IP address in the data to be hashed.
1723 + Make ssh(1) skip listening on the IPv6 wildcard address when a
1724 binding address of 0.0.0.0 is used against an old SSH server that
1725 does not support the RFC4254 syntax for wildcard bind addresses.
1726 + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is
1727 already done for X11/TCP forwarding sockets (closes: #439661).
1728 + Fix FD leak that could hang a ssh(1) connection multiplexing master.
1729 + Make ssh(1) -q option documentation consistent with reality.
1730 + Fixed sshd(8) PAM support not calling pam_session_close(), or
1731 failing to call it with root privileges (closes: #372680).
1732 + Fix activation of OpenSSL engine support when requested in configure
1733 (LP: #119295).
1734 + Cache SELinux status earlier so we know if it's enabled after a
1735 chroot (LP: #237557).
1736 - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1):
1737 + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1)
1738 and ssh-keygen(1). Visual fingerprint display is controlled by a new
1739 ssh_config(5) option "VisualHostKey". The intent is to render SSH
1740 host keys in a visual form that is amenable to easy recall and
1741 rejection of changed host keys.
1742 + sshd_config(5) now supports CIDR address/masklen matching in "Match
1743 address" blocks, with a fallback to classic wildcard matching.
1744 + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys
1745 from="..." restrictions, also with a fallback to classic wildcard
1746 matching.
1747 + Added an extended test mode (-T) to sshd(8) to request that it write
1748 its effective configuration to stdout and exit. Extended test mode
1749 also supports the specification of connection parameters (username,
1750 source address and hostname) to test the application of
1751 sshd_config(5) Match rules.
1752 + ssh(1) now prints the number of bytes transferred and the overall
1753 connection throughput for SSH protocol 2 sessions when in verbose
1754 mode (previously these statistics were displayed for protocol 1
1755 connections only).
1756 + sftp-server(8) now supports extension methods statvfs@openssh.com
1757 and fstatvfs@openssh.com that implement statvfs(2)-like operations.
1758 + sftp(1) now has a "df" command to the sftp client that uses the
1759 statvfs@openssh.com to produce a df(1)-like display of filesystem
1760 space and inode utilisation (requires statvfs@openssh.com support on
1761 the server).
1762 + Added a MaxSessions option to sshd_config(5) to allow control of the
1763 number of multiplexed sessions supported over a single TCP
1764 connection. This allows increasing the number of allowed sessions
1765 above the previous default of 10, disabling connection multiplexing
1766 (MaxSessions=1) or disallowing login/shell/subsystem sessions
1767 entirely (MaxSessions=0).
1768 + Added a no-more-sessions@openssh.com global request extension that
1769 is sent from ssh(1) to sshd(8) when the client knows that it will
1770 never request another session (i.e. when session multiplexing is
1771 disabled). This allows a server to disallow further session requests
1772 and terminate the session in cases where the client has been
1773 hijacked.
1774 + ssh-keygen(1) now supports the use of the -l option in combination
1775 with -F to search for a host in ~/.ssh/known_hosts and display its
1776 fingerprint.
1777 + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of
1778 "rsa1" (LP: #129794).
1779 + Added an AllowAgentForwarding option to sshd_config(8) to control
1780 whether authentication agent forwarding is permitted. Note that this
1781 is a loose control, as a client may install their own unofficial
1782 forwarder.
1783 + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when
1784 receiving network data, resulting in a ~10% speedup.
1785 + ssh(1) and sshd(8) will now try additional addresses when connecting
1786 to a port forward destination whose DNS name resolves to more than
1787 one address. The previous behaviour was to try the only first
1788 address and give up if that failed.
1789 + ssh(1) and sshd(8) now support signalling that channels are
1790 half-closed for writing, through a channel protocol extension
1791 notification "eow@openssh.com". This allows propagation of closed
1792 file descriptors, so that commands such as "ssh -2 localhost od
1793 /bin/ls | true" do not send unnecessary data over the wire.
1794 + sshd(8): increased the default size of ssh protocol 1 ephemeral keys
1795 from 768 to 1024 bits.
1796 + When ssh(1) has been requested to fork after authentication ("ssh
1797 -f") with ExitOnForwardFailure enabled, delay the fork until after
1798 replies for any -R forwards have been seen. Allows for robust
1799 detection of -R forward failure when using -f.
1800 + "Match group" blocks in sshd_config(5) now support negation of
1801 groups. E.g. "Match group staff,!guests".
1802 + sftp(1) and sftp-server(8) now allow chmod-like operations to set
1803 set[ug]id/sticky bits.
1804 + The MaxAuthTries option is now permitted in sshd_config(5) match
1805 blocks.
1806 + Multiplexed ssh(1) sessions now support a subset of the ~ escapes
1807 that are available to a primary connection.
1808 + ssh(1) connection multiplexing will now fall back to creating a new
1809 connection in most error cases (closes: #352830).
1810 + Make ssh(1) deal more gracefully with channel requests that fail.
1811 Previously it would optimistically assume that requests would always
1812 succeed, which could cause hangs if they did not (e.g. when the
1813 server runs out of file descriptors).
1814 + ssh(1) now reports multiplexing errors via the multiplex slave's
1815 stderr where possible (subject to LogLevel in the mux master).
1816 + Fixed an UMAC alignment problem that manifested on Itanium
1817 platforms.
1818 * Remove our local version of moduli(5) now that there's one upstream.
1819 * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description.
1820 * Add lintian overrides for empty /usr/share/doc/openssh-client
1821 directories in openssh-server and ssh (necessary due to being symlink
1822 targets).
1823 * Merge from Ubuntu:
1824 - Add 'status' action to openssh-server init script, requiring lsb-base
1825 (>= 3.2-13) (thanks, Dustin Kirkland).
1826 * debconf template translations:
1827 - Update Korean (thanks, Sunjae Park; closes: #484821).
1828
1829 -- Colin Watson <cjwatson@debian.org> Fri, 25 Jul 2008 10:45:08 +0100
1830
1831openssh (1:4.7p1-13) unstable; urgency=low
1832
1833 * Add some helpful advice to the end of ssh-vulnkey's output if there are
1834 unknown or compromised keys (thanks, Dan Jacobson; closes: #483756).
1835 * Check compromised key blacklist in ssh or ssh-add, as well as in the
1836 server (LP: #232391). To override the blacklist check in ssh
1837 temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override
1838 for the blacklist check in ssh-add.
1839 * Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1),
1840 ssh-keygen(1), and sshd(8) (closes: #484451).
1841 * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999
1842 (thanks, Frans Pop).
1843 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
1844 takes care of that (thanks, Frans Pop; closes: #484404).
1845 * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
1846 * Add documentation on removing openssh-blacklist locally (see #484269).
1847 * Clarify documentation of SSHD_OOM_ADJUST, and make setting it to the
1848 empty string actually skip adjustment as intended (closes: #487325).
1849 * Remove empty /usr/share/applications directory in ssh-askpass-gnome.
1850 * debconf template translations:
1851 - Update Romanian (thanks, Cătălin Feștilă; closes: #485415).
1852
1853 -- Colin Watson <cjwatson@debian.org> Mon, 21 Jul 2008 12:18:28 +0100
1854
1855openssh (1:4.7p1-12) unstable; urgency=low
1856
1857 * Fill in CVE identifier for ssh-vulnkey bug fixed in 1:4.7p1-10.
1858 * Refactor rejection of blacklisted user keys into a single
1859 reject_blacklisted_key function in auth.c (thanks, Dmitry V. Levin).
1860 * Fix memory leak of blacklisted host keys (thanks, Dmitry V. Levin).
1861 * debconf template translations:
1862 - Update Dutch (thanks, Bart Cornelis; closes: #483004).
1863 - Update Brazilian Portuguese (thanks, Eder L. Marques; closes:
1864 #483142).
1865 - Update Slovak (thanks, Ivan Masár; closes: #483517).
1866
1867 -- Colin Watson <cjwatson@debian.org> Thu, 29 May 2008 21:41:29 +0100
1868
1869openssh (1:4.7p1-11) unstable; urgency=low
1870
1871 * Make init script depend on $syslog, and fix some other dependency
1872 glitches (thanks, Petter Reinholdtsen; closes: #481018).
1873 * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
1874 closes: #481151).
1875 * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
1876 closes: #480020).
1877 * Allow building with heimdal-dev (LP: #125805).
1878
1879 * Check RSA1 keys without the need for a separate blacklist. Thanks to
1880 Simon Tatham for the idea.
1881 * Generate two keys with the PID forced to the same value and test that
1882 they differ, to defend against recurrences of the recent Debian OpenSSL
1883 vulnerability.
1884 * Recommend openssh-blacklist from openssh-client (closes: #481187).
1885 * Recommend openssh-blacklist-extra from openssh-client and
1886 openssh-server.
1887 * Make ssh-vulnkey report the file name and line number for each key
1888 (thanks, Heiko Schlittermann and Christopher Perry; closes: #481398).
1889 * Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see
1890 #481283).
1891 * Log IP addresses of hosts attempting to use blacklisted keys (closes:
1892 #481721).
1893 * Incorporate various ssh-vulnkey suggestions from Hugh Daniel:
1894 - Add -v (verbose) option, and don't print output for keys that have a
1895 blacklist file but that are not listed unless in verbose mode.
1896 - Move exit status documentation to a separate section.
1897 - Document key status descriptions.
1898 - Add key type to output.
1899 - Fix error output if ssh-vulnkey fails to read key files, with the
1900 exception of host keys unless -a was given.
1901 - In verbose mode, output the name of each file examined.
1902 * Handle leading IP addresses in ssh-vulnkey input (LP: #230497).
1903 * Fix various ssh-vulnkey problems pointed out by Solar Designer:
1904 - Fix some buffer handling inconsistencies.
1905 - Use xasprintf to build user key file names, avoiding truncation
1906 problems.
1907 - Drop to the user's UID when reading user keys with -a.
1908 - Use EUID rather than UID when run with no file names and without -a.
1909 - Reword "Unknown (no blacklist information)" to "Unknown (blacklist
1910 file not installed)".
1911
1912 * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi).
1913 * debconf template translations:
1914 - Update Finnish (thanks, Esko Arajärvi; closes: #481530).
1915 - Update French (thanks, Christian Perrier; closes: #481576).
1916 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591).
1917 - Update Galician (thanks, Jacobo Tarrio; closes: #481596).
1918 - Update Japanese (thanks, Kenshi Muto; closes: #481621).
1919 - Update Czech (thanks, Miroslav Kure; closes: #481624).
1920 - Update German (thanks, Helge Kreutzmann; closes: #481676).
1921 - Update Portuguese (thanks, Ricardo Silva; closes: #481781).
1922 - Update Basque (thanks, Piarres Beobide; closes: #481836).
1923 - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870).
1924 - Update Vietnamese (thanks, Clytie Siddall; closes: #481876).
1925 - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes:
1926 #482341).
1927 - Update Turkish (thanks, Mert Dirik; closes: #482548).
1928 - Update Russian (thanks, Yuri Kozlov; closes: #482887).
1929 - Update Swedish (thanks, Martin Bagge; closes: #482464).
1930 - Update Italian (thanks, Luca Monducci; closes: #482808).
1931
1932 -- Colin Watson <cjwatson@debian.org> Mon, 26 May 2008 12:21:39 +0100
1933
1934openssh (1:4.7p1-10) unstable; urgency=low
1935
1936 * Add a FILES section to ssh-vulnkey(1) (thanks, Hugh Daniel).
1937 * CVE-2008-2285: ssh-vulnkey handles options in authorized_keys
1938 (LP: #230029), and treats # as introducing a comment even if it is
1939 preceded by whitespace.
1940
1941 -- Colin Watson <cjwatson@debian.org> Wed, 14 May 2008 12:35:05 +0100
1942
1943openssh (1:4.7p1-9) unstable; urgency=critical
1944
1945 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-8.
1946 * Mitigate OpenSSL security vulnerability (CVE-2008-0166):
1947 - Add key blacklisting support. Keys listed in
1948 /etc/ssh/blacklist.TYPE-LENGTH will be rejected for authentication by
1949 sshd, unless "PermitBlacklistedKeys yes" is set in
1950 /etc/ssh/sshd_config.
1951 - Add a new program, ssh-vulnkey, which can be used to check keys
1952 against these blacklists.
1953 - Depend on openssh-blacklist.
1954 - Force dependencies on libssl0.9.8 / libcrypto0.9.8-udeb to at least
1955 0.9.8g-9.
1956 - Automatically regenerate known-compromised host keys, with a
1957 critical-priority debconf note. (I regret that there was no time to
1958 gather translations.)
1959
1960 -- Colin Watson <cjwatson@debian.org> Tue, 13 May 2008 12:33:38 +0100
1961
1962openssh (1:4.7p1-8) unstable; urgency=high
1963
1964 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
1965 * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
1966 configurations (LP: #211400).
1967 * Tweak scp's reporting of filenames in verbose mode to be a bit less
1968 confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
1969 * Backport from 4.9p1:
1970 - CVE-2008-1657: Ignore ~/.ssh/rc if a sshd_config ForceCommand is
1971 specified.
1972 - Add no-user-rc authorized_keys option to disable execution of
1973 ~/.ssh/rc.
1974 * Backport from Simon Wilkinson's GSSAPI key exchange patch for 5.0p1:
1975 - Add code to actually implement GSSAPIStrictAcceptorCheck, which had
1976 somehow been omitted from a previous version of this patch (closes:
1977 #474246).
1978
1979 -- Colin Watson <cjwatson@debian.org> Sun, 06 Apr 2008 12:34:19 +0100
1980
1981openssh (1:4.7p1-7) unstable; urgency=low
1982
1983 * Ignore errors writing to oom_adj (closes: #473573).
1984
1985 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2008 16:24:44 +0100
1986
1987openssh (1:4.7p1-6) unstable; urgency=low
1988
1989 * Disable the Linux kernel's OOM-killer for the sshd parent; tweak
1990 SSHD_OOM_ADJUST in /etc/default/ssh to change this (closes: #341767).
1991
1992 -- Colin Watson <cjwatson@debian.org> Sun, 30 Mar 2008 21:14:12 +0100
1993
1994openssh (1:4.7p1-5) unstable; urgency=low
1995
1996 * Recommends: xauth rather than Suggests: xbase-clients.
1997 * Document in ssh(1) that '-S none' disables connection sharing
1998 (closes: #471437).
1999 * Patch from Red Hat / Fedora:
2000 - CVE-2008-1483: Don't use X11 forwarding port which can't be bound on
2001 all address families, preventing hijacking of X11 forwarding by
2002 unprivileged users when both IPv4 and IPv6 are configured (closes:
2003 #463011).
2004 * Use printf rather than echo -en (a bashism) in openssh-server.config and
2005 openssh-server.preinst.
2006 * debconf template translations:
2007 - Update Finnish (thanks, Esko Arajärvi; closes: #468563).
2008
2009 -- Colin Watson <cjwatson@debian.org> Sat, 22 Mar 2008 12:37:00 +0000
2010
2011openssh (1:4.7p1-4) unstable; urgency=low
2012
2013 [ Caleb Case ]
2014 * Fix configure detection of getseuserbyname and
2015 get_default_context_with_level (closes: #465614, LP: #188136).
2016
2017 [ Colin Watson ]
2018 * Include the autogenerated debian/copyright in the source package.
2019 * Move /etc/pam.d/ssh to /etc/pam.d/sshd, allowing us to stop defining
2020 SSHD_PAM_SERVICE (closes: #255870).
2021
2022 -- Colin Watson <cjwatson@debian.org> Wed, 13 Feb 2008 18:18:52 +0000
2023
2024openssh (1:4.7p1-3) unstable; urgency=low
2025
2026 * Improve grammar of ssh-askpass-gnome description.
2027 * Backport from upstream:
2028 - Use the correct packet maximum sizes for remote port and agent
2029 forwarding. Prevents the server from killing the connection if too
2030 much data is queued and an excessively large packet gets sent
2031 (https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
2032 * Allow passing temporary daemon parameters on the init script's command
2033 line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks,
2034 Marc Haber; closes: #458547).
2035
2036 -- Colin Watson <cjwatson@debian.org> Fri, 01 Feb 2008 21:59:59 +0000
2037
2038openssh (1:4.7p1-2) unstable; urgency=low
2039
2040 * Adjust many relative links in faq.html to point to
2041 http://www.openssh.com/ (thanks, Dan Jacobson; mentioned in #459807).
2042 * Pass --with-mantype=doc to configure rather than build-depending on
2043 groff (closes: #460121).
2044 * Add armel to architecture list for libselinux1-dev build-dependency
2045 (closes: #460136).
2046 * Drop source-compatibility with Debian 3.0:
2047 - Remove support for building with GNOME 1. This allows simplification
2048 of our GNOME build-dependencies (see #460136).
2049 - Remove hacks to support the old PAM configuration scheme.
2050 - Remove compatibility for building without po-debconf.
2051 * Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I
2052 can see, the GTK2 version of ssh-askpass-gnome has never required
2053 libgnomeui-dev.
2054
2055 -- Colin Watson <cjwatson@debian.org> Fri, 11 Jan 2008 00:14:10 +0000
2056
2057openssh (1:4.7p1-1) unstable; urgency=low
2058
2059 * New upstream release (closes: #453367).
2060 - CVE-2007-4752: Prevent ssh(1) from using a trusted X11 cookie if
2061 creation of an untrusted cookie fails; found and fixed by Jan Pechanec
2062 (closes: #444738).
2063 - sshd(8) in new installations defaults to SSH Protocol 2 only. Existing
2064 installations are unchanged.
2065 - The SSH channel window size has been increased, and both ssh(1)
2066 sshd(8) now send window updates more aggressively. These improves
2067 performance on high-BDP (Bandwidth Delay Product) networks.
2068 - ssh(1) and sshd(8) now preserve MAC contexts between packets, which
2069 saves 2 hash calls per packet and results in 12-16% speedup for
2070 arcfour256/hmac-md5.
2071 - A new MAC algorithm has been added, UMAC-64 (RFC4418) as
2072 "umac-64@openssh.com". UMAC-64 has been measured to be approximately
2073 20% faster than HMAC-MD5.
2074 - Failure to establish a ssh(1) TunnelForward is now treated as a fatal
2075 error when the ExitOnForwardFailure option is set.
2076 - ssh(1) returns a sensible exit status if the control master goes away
2077 without passing the full exit status.
2078 - When using a ProxyCommand in ssh(1), set the outgoing hostname with
2079 gethostname(2), allowing hostbased authentication to work.
2080 - Make scp(1) skip FIFOs rather than hanging (closes: #246774).
2081 - Encode non-printing characters in scp(1) filenames. These could cause
2082 copies to be aborted with a "protocol error".
2083 - Handle SIGINT in sshd(8) privilege separation child process to ensure
2084 that wtmp and lastlog records are correctly updated.
2085 - Report GSSAPI mechanism in errors, for libraries that support multiple
2086 mechanisms.
2087 - Improve documentation for ssh-add(1)'s -d option.
2088 - Rearrange and tidy GSSAPI code, removing server-only code being linked
2089 into the client.
2090 - Delay execution of ssh(1)'s LocalCommand until after all forwardings
2091 have been established.
2092 - In scp(1), do not truncate non-regular files.
2093 - Improve exit message from ControlMaster clients.
2094 - Prevent sftp-server(8) from reading until it runs out of buffer space,
2095 whereupon it would exit with a fatal error (closes: #365541).
2096 - pam_end() was not being called if authentication failed
2097 (closes: #405041).
2098 - Manual page datestamps updated (closes: #433181).
2099 * Install the OpenSSH FAQ in /usr/share/doc/openssh-client.
2100 - Includes documentation on copying files with colons using scp
2101 (closes: #303453).
2102 * Create /var/run/sshd on start even if /etc/ssh/sshd_not_to_be_run exists
2103 (closes: #453285).
2104 * Fix "overriden" typo in ssh(1) (thanks, A. Costa; closes: #390699).
2105 * Refactor debian/rules configure and make invocations to make development
2106 easier.
2107 * Remove the hideously old /etc/ssh/primes on upgrade (closes: #123013).
2108 * Update moduli(5) to revision 1.11 from OpenBSD CVS.
2109 * Document the non-default options we set as standard in ssh_config(5) and
2110 sshd_config(5) (closes: #327886, #345628).
2111 * Recode LICENCE to UTF-8 when concatenating it to debian/copyright.
2112 * Override desktop-file-but-no-dh_desktop-call lintian warning; the
2113 .desktop file is intentionally not installed (see 1:3.8.1p1-10).
2114 * Update copyright dates for Kerberos patch in debian/copyright.head.
2115 * Policy version 3.7.3: no changes required.
2116
2117 -- Colin Watson <cjwatson@debian.org> Mon, 24 Dec 2007 16:43:02 +0000
2118
2119openssh (1:4.6p1-7) unstable; urgency=low
2120
2121 * Don't build PIE executables on m68k (closes: #451192).
2122 * Use autotools-dev's recommended configure --build and --host options.
2123 * Adjust README.Debian to suggest mailing debian-ssh@lists.debian.org
2124 rather than Matthew.
2125 * Check whether deluser exists in postrm (closes: #454085).
2126
2127 -- Colin Watson <cjwatson@debian.org> Mon, 03 Dec 2007 11:11:02 +0000
2128
2129openssh (1:4.6p1-6) unstable; urgency=low
2130
2131 * Remove blank line between head comment and first template in
2132 debian/openssh-server.templates.master; apparently it confuses some
2133 versions of debconf.
2134 * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas
2135 Pospisek; closes: #441817).
2136 * Discard error output from dpkg-query in preinsts, in case the ssh
2137 metapackage is not installed.
2138 * Fix sshd/inittab advice in README.Debian to account for rc.d movement
2139 (closes: #450632).
2140 * Suppress error from debian/rules if lsb-release is not installed.
2141 * Don't ignore errors from 'make -C contrib clean'.
2142 * Adjust categories in ssh-askpass-gnome.desktop to comply with the
2143 Desktop Menu Specification.
2144 * debconf template translations:
2145 - Add Slovak (thanks, Ivan Masár; closes: #441690).
2146 - Update Brazilian Portuguese (thanks, Eder L. Marques;
2147 closes: #447145).
2148
2149 -- Colin Watson <cjwatson@debian.org> Mon, 12 Nov 2007 11:47:28 +0000
2150
2151openssh (1:4.6p1-5) unstable; urgency=low
2152
2153 * Identify ssh as a metapackage rather than a transitional package. It's
2154 still useful as a quick way to install both the client and the server.
2155 * ssh-copy-id now checks the exit status of ssh-add -L (thanks, Adeodato
2156 Simó; closes: #221675).
2157 * ssh-copy-id no longer prints the output of expr (thanks, Peter
2158 Eisentraut; closes: #291534).
2159 * ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than
2160 ~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris;
2161 closes: #234627).
2162 * Build-depend on libselinux1-dev on lpia.
2163 * openssh-client Suggests: keychain.
2164 * debconf template translations:
2165 - Update Catalan (thanks, Jordà Polo; closes: #431970).
2166
2167 -- Colin Watson <cjwatson@debian.org> Mon, 30 Jul 2007 09:34:38 +0100
2168
2169openssh (1:4.6p1-4) unstable; urgency=low
2170
2171 * Don't build PIE executables on hppa, as they crash.
2172
2173 -- Colin Watson <cjwatson@debian.org> Thu, 05 Jul 2007 11:06:54 +0100
2174
2175openssh (1:4.6p1-3) unstable; urgency=low
2176
2177 * Only build PIE executables on Linux and NetBSD (closes: #430455).
2178 * Fix broken switch fallthrough when SELinux is running in permissive mode
2179 (closes: #430838).
2180 * Document that HashKnownHosts may break tab-completion (closes: #430154).
2181
2182 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jun 2007 07:15:38 +0100
2183
2184openssh (1:4.6p1-2) unstable; urgency=low
2185
2186 * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
2187 * Clarify that 'ssh -q -q' still prints errors caused by bad arguments
2188 (i.e. before the logging system is initialised).
2189 * Suppress "Connection to <host> closed" and "Connection to master closed"
2190 messages at loglevel SILENT (thanks, Jaap Eldering; closes: #409788).
2191 * Suppress "Pseudo-terminal will not be allocated because stdin is not a
2192 terminal" message at loglevels QUIET and SILENT (closes: #366814).
2193 * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and
2194 sshd_config(5).
2195 * Add try-restart action to init script.
2196 * Add /etc/network/if-up.d/openssh-server to restart sshd when new
2197 interfaces appear (LP: #103436).
2198 * Backport from upstream:
2199 - Move C/R -> kbdint special case to after the defaults have been
2200 loaded, which makes ChallengeResponse default to yes again. This was
2201 broken by the Match changes and not fixed properly subsequently
2202 (closes: #428968).
2203 - Silence spurious error messages from hang-on-exit fix
2204 (http://bugzilla.mindrot.org/show_bug.cgi?id=1306, closes: #429531).
2205
2206 -- Colin Watson <cjwatson@debian.org> Wed, 20 Jun 2007 11:52:44 +0100
2207
2208openssh (1:4.6p1-1) unstable; urgency=low
2209
2210 * New upstream release (closes: #395507, #397961, #420035). Important
2211 changes not previously backported to 4.3p2:
2212 - 4.4/4.4p1 (http://www.openssh.com/txt/release-4.4):
2213 + On portable OpenSSH, fix a GSSAPI authentication abort that could be
2214 used to determine the validity of usernames on some platforms.
2215 + Implemented conditional configuration in sshd_config(5) using the
2216 "Match" directive. This allows some configuration options to be
2217 selectively overridden if specific criteria (based on user, group,
2218 hostname and/or address) are met. So far a useful subset of
2219 post-authentication options are supported and more are expected to
2220 be added in future releases.
2221 + Add support for Diffie-Hellman group exchange key agreement with a
2222 final hash of SHA256.
2223 + Added a "ForceCommand" directive to sshd_config(5). Similar to the
2224 command="..." option accepted in ~/.ssh/authorized_keys, this forces
2225 the execution of the specified command regardless of what the user
2226 requested. This is very useful in conjunction with the new "Match"
2227 option.
2228 + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
2229 permitopen="..." authorized_keys option, allowing fine-grained
2230 control over the port-forwardings that a user is allowed to
2231 establish.
2232 + Add optional logging of transactions to sftp-server(8).
2233 + ssh(1) will now record port numbers for hosts stored in
2234 ~/.ssh/known_hosts when a non-standard port has been requested
2235 (closes: #50612).
2236 + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
2237 non-zero exit code) when requested port forwardings could not be
2238 established.
2239 + Extend sshd_config(5) "SubSystem" declarations to allow the
2240 specification of command-line arguments.
2241 + Replacement of all integer overflow susceptible invocations of
2242 malloc(3) and realloc(3) with overflow-checking equivalents.
2243 + Many manpage fixes and improvements.
2244 + Add optional support for OpenSSL hardware accelerators (engines),
2245 enabled using the --with-ssl-engine configure option.
2246 + Tokens in configuration files may be double-quoted in order to
2247 contain spaces (closes: #319639).
2248 + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
2249 session exits very quickly (closes: #307890).
2250 + Fix some incorrect buffer allocation calculations (closes: #410599).
2251 + ssh-add doesn't ask for a passphrase if key file permissions are too
2252 liberal (closes: #103677).
2253 + Likewise, ssh doesn't ask either (closes: #99675).
2254 - 4.6/4.6p1 (http://www.openssh.com/txt/release-4.6):
2255 + sshd now allows the enabling and disabling of authentication methods
2256 on a per user, group, host and network basis via the Match directive
2257 in sshd_config.
2258 + Fixed an inconsistent check for a terminal when displaying scp
2259 progress meter (closes: #257524).
2260 + Fix "hang on exit" when background processes are running at the time
2261 of exit on a ttyful/login session (closes: #88337).
2262 * Update to current GSSAPI patch from
2263 http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
2264 install ChangeLog.gssapi.
2265 * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
2266 * Use LSB functions in init scripts, and add an LSB-style header (partly
2267 from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
2268 * Move init script start links to S16, move rc1 stop link to K84, and
2269 remove rc0 and rc6 stop links altogether (the last part from Ubuntu;
2270 closes: #122188).
2271 * Emit a slightly more informative message from the init script if
2272 /dev/null has somehow become not a character device (closes: #369964).
2273 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
2274 * Merge from Ubuntu:
2275 - Build position-independent executables (only for debs, not for udebs)
2276 to take advantage of address space layout randomisation.
2277 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
2278 the default path.
2279 * Use ${binary:Version} rather than ${Source-Version} in openssh-server ->
2280 openssh-client dependency.
2281
2282 -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:28:26 +0100
2283
2284openssh (1:4.3p2-11) unstable; urgency=low
2285
2286 * It's been four and a half years now since I took over as "temporary"
2287 maintainer, so the Maintainer field is getting a bit inaccurate. Set
2288 Maintainer to debian-ssh@lists.debian.org and leave Matthew and myself
2289 as Uploaders.
2290 * Use dpkg-query to fetch conffile md5sums rather than parsing
2291 /var/lib/dpkg/status directly.
2292 * openssh-client Suggests: libpam-ssh (closes: #427840).
2293 * Use 'start-stop-daemon --oknodo' so that openssh-server's init script
2294 exits successfully if sshd is already running (closes: #426858).
2295
2296 * Apply results of debconf templates and package descriptions review by
2297 debian-l10n-english (closes: #420107, #420742).
2298 * debconf template translations:
2299 - Update Dutch (thanks, Machteld de Kok; closes: #419260).
2300 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #420630).
2301 - Update Galician (thanks, Jacobo Tarrio; closes: #420635).
2302 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2303 closes: #420651).
2304 - Update Swedish (thanks, Daniel Nylander; closes: #420663).
2305 - Add Bulgarian (thanks, Damyan Ivanov; closes: #420703).
2306 - Add Tamil (thanks, Tirumurti Vasudevan; closes: #420739).
2307 - Update German (thanks, Helge Kreutzmann; closes: #420743).
2308 - Update Japanese (thanks, Kenshi Muto; closes: #420946).
2309 - Add Basque (thanks, Piarres Beobide; closes: #421238).
2310 - Update Italian (thanks, Luca Monducci; closes: #421348).
2311 - Update Czech (thanks, Miroslav Kure; closes: #421484).
2312 - Update Romanian (thanks, Igor Stirbu; closes: #421760).
2313 - Update Russian (thanks, Yuriy Talakan' and Sergey Alyoshin;
2314 closes: #420862).
2315 - Update Dutch (thanks, Bart Cornelis; closes: #422767).
2316 - Update Portuguese (thanks, Ricardo Silva; closes: #423112).
2317 - Update French (thanks, Christian Perrier).
2318 - Add Korean (thanks, Sunjae Park; closes: #424008).
2319 - Update Vietnamese (thanks, Clytie Siddall; closes: #426991).
2320
2321 -- Colin Watson <cjwatson@debian.org> Sun, 10 Jun 2007 08:59:42 +0100
2322
2323openssh (1:4.3p2-10) unstable; urgency=low
2324
2325 * Multiply openssh-client-udeb's Installer-Menu-Item by 100.
2326 * Increase MAX_SESSIONS to 64.
2327
2328 -- Colin Watson <cjwatson@debian.org> Tue, 10 Apr 2007 19:17:20 +0100
2329
2330openssh (1:4.3p2-9) unstable; urgency=high
2331
2332 [ Russ Allbery ]
2333 * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5
2334 (closes: #404863).
2335 * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
2336
2337 [ Colin Watson ]
2338 * debconf template translations:
2339 - Add Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #412330).
2340
2341 -- Colin Watson <cjwatson@debian.org> Mon, 5 Mar 2007 16:13:50 +0000
2342
2343openssh (1:4.3p2-8) unstable; urgency=medium
2344
2345 [ Vincent Untz ]
2346 * Give the ssh-askpass-gnome window a default icon; remove unnecessary
2347 icon extension from .desktop file (closes:
2348 https://launchpad.net/bugs/27152).
2349
2350 [ Colin Watson ]
2351 * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
2352 sufficient to replace conffiles (closes: #402804).
2353 * Make GSSAPICleanupCreds a compatibility alias for
2354 GSSAPICleanupCredentials. Mark GSSUseSessionCCache and
2355 GSSAPIUseSessionCredCache as known-but-unsupported options, and migrate
2356 away from them on upgrade.
2357 * It turns out that the people who told me that removing a conffile in the
2358 preinst was sufficient to have dpkg replace it without prompting when
2359 moving a conffile between packages were very much mistaken. As far as I
2360 can tell, the only way to do this reliably is to write out the desired
2361 new text of the conffile in the preinst. This is gross, and requires
2362 shipping the text of all conffiles in the preinst too, but there's
2363 nothing for it. Fortunately this nonsense is only required for smooth
2364 upgrades from sarge.
2365 * debconf template translations:
2366 - Add Romanian (thanks, Stan Ioan-Eugen; closes: #403528).
2367
2368 -- Colin Watson <cjwatson@debian.org> Sat, 23 Dec 2006 18:38:33 +0000
2369
2370openssh (1:4.3p2-7) unstable; urgency=medium
2371
2372 [ Colin Watson ]
2373 * Ignore errors from usermod when changing sshd's shell, since it will
2374 fail if the sshd user is not local (closes: #398436).
2375 * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
2376 to avoid unnecessary conffile resolution steps for administrators
2377 (thanks, Jari Aalto; closes: #335259).
2378 * Fix quoting error in configure.ac and regenerate configure (thanks, Ben
2379 Pfaff; closes: #391248).
2380 * When installing openssh-client or openssh-server from scratch, remove
2381 any unchanged conffiles from the pre-split ssh package to work around a
2382 bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).
2383
2384 [ Russ Allbery ]
2385 * Create transitional ssh-krb5 package which enables GSSAPI configuration
2386 in sshd_config (closes: #390986).
2387 * Default client to attempting GSSAPI authentication.
2388 * Remove obsolete GSSAPINoMICAuthentication from sshd_config if it's
2389 found.
2390 * Add ssh -K option, the converse of -k, to enable GSSAPI credential
2391 delegation (closes: #401483).
2392
2393 -- Colin Watson <cjwatson@debian.org> Wed, 6 Dec 2006 23:00:49 +0000
2394
2395openssh (1:4.3p2-6) unstable; urgency=low
2396
2397 * Acknowledge NMU (thanks, Manoj; closes: #394795).
2398 * Backport from 4.5p1:
2399 - Fix a bug in the sshd privilege separation monitor that weakened its
2400 verification of successful authentication. This bug is not known to be
2401 exploitable in the absence of additional vulnerabilities.
2402 * openssh-server Suggests: molly-guard (closes: #395473).
2403 * debconf template translations:
2404 - Update German (thanks, Helge Kreutzmann; closes: #395947).
2405
2406 -- Colin Watson <cjwatson@debian.org> Wed, 15 Nov 2006 00:07:32 +0000
2407
2408openssh (1:4.3p2-5.1) unstable; urgency=low
2409
2410 * NMU to update SELinux patch, bringing it in line with current selinux
2411 releases. The patch for this NMU is simply the Bug#394795 patch,
2412 and no other changes. (closes: #394795)
2413
2414 -- Manoj Srivastava <srivasta@debian.org> Mon, 23 Oct 2006 14:11:24 -0500
2415
2416openssh (1:4.3p2-5) unstable; urgency=low
2417
2418 * Remove ssh/insecure_telnetd check altogether (closes: #391081).
2419 * debconf template translations:
2420 - Update Danish (thanks, Claus Hindsgaul; closes: #390612).
2421
2422 -- Colin Watson <cjwatson@debian.org> Thu, 5 Oct 2006 09:04:19 +0100
2423
2424openssh (1:4.3p2-4) unstable; urgency=high
2425
2426 * Backport from 4.4p1 (since I don't have an updated version of the GSSAPI
2427 patch yet):
2428 - CVE-2006-4924: Fix a pre-authentication denial of service found by
2429 Tavis Ormandy, that would cause sshd(8) to spin until the login grace
2430 time expired (closes: #389995).
2431 - CVE-2006-5051: Fix an unsafe signal hander reported by Mark Dowd. The
2432 signal handler was vulnerable to a race condition that could be
2433 exploited to perform a pre-authentication denial of service. On
2434 portable OpenSSH, this vulnerability could theoretically lead to
2435 pre-authentication remote code execution if GSSAPI authentication is
2436 enabled, but the likelihood of successful exploitation appears remote.
2437
2438 * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël
2439 Hertzog; closes: #369395).
2440 * Remove no-longer-used ssh/insecure_rshd debconf template.
2441 * Make ssh/insecure_telnetd Type: error (closes: #388946).
2442
2443 * debconf template translations:
2444 - Update Portuguese (thanks, Rui Branco; closes: #381942).
2445 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2446 closes: #382966).
2447
2448 -- Colin Watson <cjwatson@debian.org> Fri, 29 Sep 2006 16:28:24 +0100
2449
2450openssh (1:4.3p2-3) unstable; urgency=low
2451
2452 * Document KeepAlive->TCPKeepAlive renaming in sshd_config(5) (closes:
2453 https://launchpad.net/bugs/50702).
2454 * Change sshd user's shell to /usr/sbin/nologin (closes: #366541).
2455 Introduces dependency on passwd for usermod.
2456 * debconf template translations:
2457 - Update French (thanks, Denis Barbier; closes: #368503).
2458 - Update Dutch (thanks, Bart Cornelis; closes: #375100).
2459 - Update Japanese (thanks, Kenshi Muto; closes: #379950).
2460
2461 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jul 2006 00:12:36 +0100
2462
2463openssh (1:4.3p2-2) unstable; urgency=low
2464
2465 * Include commented-out pam_access example in /etc/pam.d/ssh.
2466 * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the
2467 server configuration, as otherwise 'sshd -t' will complain about the
2468 lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).
2469 * debconf template translations:
2470 - Update Russian (thanks, Yuriy Talakan'; closes: #367143).
2471 - Update Czech (thanks, Miroslav Kure; closes: #367161).
2472 - Update Italian (thanks, Luca Monducci; closes: #367186).
2473 - Update Galician (thanks, Jacobo Tarrio; closes: #367318).
2474 - Update Swedish (thanks, Daniel Nylander; closes: #367971).
2475
2476 -- Colin Watson <cjwatson@debian.org> Fri, 19 May 2006 09:14:27 +0100
2477
2478openssh (1:4.3p2-1) unstable; urgency=low
2479
2480 * New upstream release (closes: #361032).
2481 - CVE-2006-0225: scp (as does rcp, on which it is based) invoked a
2482 subshell to perform local to local, and remote to remote copy
2483 operations. This subshell exposed filenames to shell expansion twice;
2484 allowing a local attacker to create filenames containing shell
2485 metacharacters that, if matched by a wildcard, could lead to execution
2486 of attacker-specified commands with the privilege of the user running
2487 scp (closes: #349645).
2488 - Add support for tunneling arbitrary network packets over a connection
2489 between an OpenSSH client and server via tun(4) virtual network
2490 interfaces. This allows the use of OpenSSH (4.3+) to create a true VPN
2491 between the client and server providing real network connectivity at
2492 layer 2 or 3. This feature is experimental.
2493 - Reduce default key length for new DSA keys generated by ssh-keygen
2494 back to 1024 bits. DSA is not specified for longer lengths and does
2495 not fully benefit from simply making keys longer. As per FIPS 186-2
2496 Change Notice 1, ssh-keygen will refuse to generate a new DSA key
2497 smaller or larger than 1024 bits.
2498 - Fixed X forwarding failing to start when the X11 client is executed in
2499 background at the time of session exit.
2500 - Change ssh-keygen to generate a protocol 2 RSA key when invoked
2501 without arguments (closes: #114894).
2502 - Fix timing variance for valid vs. invalid accounts when attempting
2503 Kerberos authentication.
2504 - Ensure that ssh always returns code 255 on internal error
2505 (closes: #259865).
2506 - Cleanup wtmp files on SIGTERM when not using privsep.
2507 - Set SO_REUSEADDR on X11 listeners to avoid problems caused by
2508 lingering sockets from previous session (X11 applications can
2509 sometimes not connect to 127.0.0.1:60xx) (closes:
2510 https://launchpad.net/bugs/25528).
2511 - Ensure that fds 0, 1 and 2 are always attached in all programs, by
2512 duping /dev/null to them if necessary.
2513 - Xauth list invocation had bogus "." argument.
2514 - Remove internal assumptions on key exchange hash algorithm and output
2515 length, preparing OpenSSH for KEX methods with alternate hashes.
2516 - Ignore junk sent by a server before it sends the "SSH-" banner.
2517 - Many manual page improvements.
2518 - Lots of cleanups, including fixes to memory leaks on error paths and
2519 possible crashes.
2520 * Update to current GSSAPI patch from
2521 http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
2522 (closes: #352042).
2523 * debian/rules: Resynchronise CFLAGS with that generated by configure.
2524 * Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself
2525 when PAM is enabled, but relies on PAM to do it.
2526 * Rename KeepAlive to TCPKeepAlive in default sshd_config
2527 (closes: #349896).
2528 * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf
2529 templates to make boolean short descriptions end with a question mark
2530 and to avoid use of the first person.
2531 * Ship README.tun.
2532 * Policy version 3.7.2: no changes required.
2533 * debconf template translations:
2534 - Update Italian (thanks, Luca Monducci; closes: #360348).
2535 - Add Galician (thanks, Jacobo Tarrio; closes: #361220).
2536
2537 -- Colin Watson <cjwatson@debian.org> Fri, 12 May 2006 12:48:24 +0100
2538
2539openssh (1:4.2p1-8) unstable; urgency=low
2540
2541 [ Frans Pop ]
2542 * Use udeb support introduced in debhelper 4.2.0 (available in sarge)
2543 rather than constructing udebs by steam.
2544 * Require debhelper 5.0.22, which generates correct shared library
2545 dependencies for udebs (closes: #360068). This build-dependency can be
2546 ignored if building on sarge.
2547
2548 [ Colin Watson ]
2549 * Switch to debhelper compatibility level 4, since we now require
2550 debhelper 4 even on sarge anyway for udeb support.
2551
2552 -- Colin Watson <cjwatson@debian.org> Fri, 31 Mar 2006 09:44:55 +0100
2553
2554openssh (1:4.2p1-7) unstable; urgency=low
2555
2556 * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb
2557 rather than the deb. Fixed.
2558
2559 -- Colin Watson <cjwatson@debian.org> Wed, 1 Mar 2006 16:19:00 +0000
2560
2561openssh (1:4.2p1-6) unstable; urgency=low
2562
2563 * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11
2564 to the normal and superuser paths and /usr/games to the normal path.
2565 * When the client receives a signal, don't fatal() with "Killed by signal
2566 %d." (which produces unhelpful noise on stderr and causes confusion for
2567 users of some applications that wrap ssh); instead, generate a debug
2568 message and exit with the traditional status (closes: #313371).
2569 * debconf template translations:
2570 - Add Swedish (thanks, Daniel Nylander; closes: #333133).
2571 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2572 closes: #341371).
2573 - Correct erroneously-changed Last-Translator headers in Greek and
2574 Spanish translations.
2575
2576 -- Colin Watson <cjwatson@debian.org> Mon, 20 Feb 2006 16:50:55 +0000
2577
2578openssh (1:4.2p1-5) unstable; urgency=low
2579
2580 * Add a CVE name to the 1:4.0p1-1 changelog entry.
2581 * Build-depend on libselinux1-dev on armeb.
2582 * Only send GSSAPI proposal if GSSAPIAuthentication is enabled.
2583 * Build-depend on libssl-dev (>= 0.9.8-1) to cope with surprise OpenSSL
2584 transition, since otherwise who knows what the buildds will do. If
2585 you're building openssh yourself, you can safely ignore this and use an
2586 older libssl-dev.
2587
2588 -- Colin Watson <cjwatson@debian.org> Fri, 7 Oct 2005 12:23:42 +0100
2589
2590openssh (1:4.2p1-4) unstable; urgency=low
2591
2592 * Initialise token to GSS_C_EMPTY_BUFFER in ssh_gssapi_check_mechanism
2593 (closes: #328606).
2594
2595 -- Colin Watson <cjwatson@debian.org> Fri, 16 Sep 2005 12:50:16 +0100
2596
2597openssh (1:4.2p1-3) unstable; urgency=low
2598
2599 * Add prototype for ssh_gssapi_server_mechanisms (closes: #328372).
2600 * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly
2601 different version of the gssapi authentication method (thanks, Aaron M.
2602 Ucko; closes: #328388).
2603 * Explicitly tell po2debconf to use the 'popular' output encoding, so that
2604 the woody-compatibility hack works even with po-debconf 0.9.0.
2605
2606 -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:28:21 +0100
2607
2608openssh (1:4.2p1-2) unstable; urgency=low
2609
2610 * Annotate 1:4.2p1-1 changelog with CVE references.
2611 * Add remaining pieces of Kerberos support (closes: #152657, #275472):
2612 - Add GSSAPI key exchange support from
2613 http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen
2614 Frost).
2615 - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr.
2616 - openssh-client and openssh-server replace ssh-krb5.
2617 - Update commented-out Kerberos/GSSAPI options in default sshd_config.
2618 - Fix HAVE_GSSAPI_KRB5_H/HAVE_GSSAPI_GSSAPI_KRB5_H typos in
2619 gss-serv-krb5.c.
2620
2621 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 18:28:49 +0100
2622
2623openssh (1:4.2p1-1) unstable; urgency=low
2624
2625 * New upstream release.
2626 - SECURITY (CAN-2005-2797): Fix a bug introduced in OpenSSH 4.0 that
2627 caused GatewayPorts to be incorrectly activated for dynamic ("-D")
2628 port forwardings when no listen address was explicitly specified
2629 (closes: #326065).
2630 - SECURITY (CAN-2005-2798): Fix improper delegation of GSSAPI
2631 credentials. This code is only built in openssh-krb5, not openssh, but
2632 I mention the CVE reference here anyway for completeness.
2633 - Add a new compression method ("Compression delayed") that delays zlib
2634 compression until after authentication, eliminating the risk of zlib
2635 vulnerabilities being exploited by unauthenticated users. Note that
2636 users of OpenSSH versions earlier than 3.5 will need to disable
2637 compression on the client or set "Compression yes" (losing this
2638 security benefit) on the server.
2639 - Increase the default size of new RSA/DSA keys generated by ssh-keygen
2640 from 1024 to 2048 bits (closes: #181162).
2641 - Many bugfixes and improvements to connection multiplexing.
2642 - Don't pretend to accept $HOME (closes: #208648).
2643 * debian/rules: Resynchronise CFLAGS with that generated by configure.
2644 * openssh-client and openssh-server conflict with pre-split ssh to avoid
2645 problems when ssh is left un-upgraded (closes: #324695).
2646 * Set X11Forwarding to yes in the default sshd_config (new installs only).
2647 At least when X11UseLocalhost is turned on, which is the default, the
2648 security risks of using X11 forwarding are risks to the client, not to
2649 the server (closes: #320104).
2650
2651 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:16:14 +0100
2652
2653openssh (1:4.1p1-7) unstable; urgency=low
2654
2655 * Do the IDEA host key check on a temporary file to avoid altering
2656 /etc/ssh/ssh_host_key itself (closes: #312312).
2657 * Work around the ssh-askpass alternative somehow ending up in manual mode
2658 pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
2659 * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113).
2660 * Fix XSIish uses of 'test' in openssh-server.preinst.
2661 * Policy version 3.6.2: no changes required.
2662
2663 -- Colin Watson <cjwatson@debian.org> Fri, 2 Sep 2005 16:18:11 +0100
2664
2665openssh (1:4.1p1-6) unstable; urgency=low
2666
2667 * Fix one-character typo that meant the binaries in openssh-client and
2668 openssh-server got recompiled with the wrong options during
2669 'debian/rules install' (closes: #317088, #317238, #317241).
2670
2671 -- Colin Watson <cjwatson@debian.org> Thu, 7 Jul 2005 10:56:16 +0100
2672
2673openssh (1:4.1p1-5) unstable; urgency=low
2674
2675 * Build-depend on libselinux1-dev on ppc64 too (closes: #314625).
2676 * Drop priority of ssh to extra to match the override file.
2677 * Make /usr/share/doc/openssh-server and /usr/share/doc/ssh symlinks to
2678 /usr/share/doc/openssh-client (closes: #314745).
2679 * Ship README.dns (closes: #284874).
2680 * Disable btmp logging, since Debian's /var/log/btmp has inappropriate
2681 permissions (closes: #314956).
2682 * Allow ~/.ssh/config to be group-writable, provided that the group in
2683 question contains only the file's owner (closes: #314347).
2684 * debconf template translations:
2685 - Update Brazilian Portuguese (thanks, André Luís Lopes;
2686 closes: #315477).
2687 - Add Vietnamese (thanks, Clytie Siddall; closes: #316636).
2688
2689 -- Colin Watson <cjwatson@debian.org> Sun, 3 Jul 2005 17:08:08 +0100
2690
2691openssh (1:4.1p1-4) unstable; urgency=low
2692
2693 * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5
2694 only conflicts with ssh (closes: #312475).
2695 * SELinux support (thanks, Manoj Srivastava; closes: #308555):
2696 - Added SELinux capability, and turned it on be default. Added
2697 restorecon calls in preinst and postinst (should not matter if the
2698 machine is not SELinux aware). By and large, the changes made should
2699 have no effect unless the rules file calls --with-selinux; and even
2700 then there should be no performance hit for machines not actively
2701 running SELinux.
2702 - Modified the preinst and postinst to call restorecon to set the
2703 security context for the generated public key files.
2704 - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system
2705 may want to also include pam_selinux.so.
2706 * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
2707 are available.
2708 * Restore /usr/lib/sftp-server temporarily, as a symlink to
2709 /usr/lib/openssh/sftp-server (closes: #312891).
2710 * Switch to debhelper compatibility level 3, since 2 is deprecated.
2711 * debconf template translations:
2712 - Update German (thanks, Jens Seidel; closes: #313949).
2713
2714 -- Colin Watson <cjwatson@debian.org> Fri, 17 Jun 2005 14:20:20 +0100
2715
2716openssh (1:4.1p1-3) unstable; urgency=low
2717
2718 * Upload to unstable.
2719
2720 -- Colin Watson <cjwatson@debian.org> Mon, 6 Jun 2005 22:28:33 +0100
2721
2722openssh (1:4.1p1-2) experimental; urgency=low
2723
2724 * Drop debconf support for allowing SSH protocol 1, which is discouraged
2725 and has not been the default since openssh 1:3.0.1p1-1. Users who need
2726 this should edit sshd_config instead (closes: #147212).
2727 * Since ssh-keysign isn't used by default (you need to set
2728 EnableSSHKeysign to "yes" in /etc/ssh/ssh_config), having a debconf
2729 question to ask whether it should be setuid is overkill, and the
2730 question text had got out of date anyway. Remove this question, ship
2731 ssh-keysign setuid in openssh-client.deb, and set a statoverride if the
2732 debconf question was previously set to false.
2733 * Add lintian overrides for the above (setuid-binary,
2734 no-debconf-templates).
2735 * Fix picky lintian errors about slogin symlinks.
2736 * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling.
2737 * Apply Linux 2.2 workaround (see #239999) only on Linux.
2738
2739 -- Colin Watson <cjwatson@debian.org> Thu, 2 Jun 2005 00:55:58 +0100
2740
2741openssh (1:4.1p1-1) experimental; urgency=low
2742
2743 * New upstream release.
2744 - Normalise socket addresses returned by get_remote_hostname(), fixing
2745 4-in-6 mapping issues with AllowUsers et al (closes: #192234).
2746 * Take upstream's hint and disable the unsupported USE_POSIX_THREADS
2747 (closes: #295757, #308868, and possibly others; may open other bugs).
2748 Use PAM password authentication to avoid #278394. In future I may
2749 provide two sets of binaries built with and without this option, since
2750 it seems I can't win.
2751 * Disable ChallengeResponseAuthentication in new installations, returning
2752 to PasswordAuthentication by default, since it now supports PAM and
2753 apparently works better with a non-threaded sshd (closes: #247521).
2754 * openssh-server Suggests: rssh (closes: #233012).
2755 * Change libexecdir to /usr/lib/openssh, and fix up various alternatives
2756 and configuration files to match (closes: #87900, #151321).
2757 * Fix up very old sshd_config files that refer to /usr/libexec/sftp-server
2758 (closes: #141979).
2759
2760 -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 01:33:33 +0100
2761
2762openssh (1:4.0p1-1) experimental; urgency=low
2763
2764 * New upstream release.
2765 - Port-forwarding specifications now take optional bind addresses, and
2766 the server allows client-specified bind addresses for remote port
2767 forwardings when configured with "GatewayPorts clientspecified"
2768 (closes: #87253, #192206).
2769 - ssh and ssh-keyscan now support hashing of known_hosts files for
2770 improved privacy (CAN-2005-2666). ssh-keygen has new options for
2771 managing known_hosts files, which understand hashing.
2772 - sftp supports command history and editing support using libedit
2773 (closes: #287013).
2774 - Have scp and sftp wait for the spawned ssh to exit before they exit
2775 themselves, allowing ssh to restore terminal modes (closes: #257130).
2776 - Improved the handling of bad data in authorized_keys files,
2777 eliminating fatal errors on corrupt or very large keys; e.g. linefeeds
2778 in keys only produce errors in auth.log now (closes: #220726).
2779 - Add "command mode" to ssh connection multiplexing (closes: #303452).
2780 - Mention $HOME/.hushlogin in sshd(8) FILES section (closes: #163933).
2781 * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
2782 closes: #296487).
2783 * Remove obsolete and unnecessary ssh/forward_warning debconf note.
2784 * Hurd build fixes (although sshd still doesn't work):
2785 - Restore X forwarding fix from #102991, lost somewhere along the way.
2786 - Link with -lcrypt.
2787 - Link with -lpthread rather than -pthread.
2788 - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to
2789 satisfy build-dependencies.
2790 * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
2791 * Enable HashKnownHosts by default. This only affects new entries; use
2792 'ssh-keygen -H' to convert an entire known_hosts file to hashed format.
2793 * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific
2794 (closes: #307069).
2795 * debconf template translations:
2796 - Update Czech (thanks, Miroslav Kure; closes: #298744).
2797 - Update Finnish (thanks, Matti Pöllä; closes: #303787).
2798 - Synchronise Spanish with sarge branch (thanks, Javier
2799 Fernández-Sanguino Peña; closes: #298536).
2800 - Add Ukrainian (thanks, Eugeniy Meshcheryakov; closes: #301852).
2801
2802 -- Colin Watson <cjwatson@debian.org> Thu, 26 May 2005 11:23:18 +0100
2803
2804openssh (1:3.9p1-3) experimental; urgency=low
2805
2806 * Explain how to run sshd from inittab in README.Debian (closes: #147360).
2807 * Add debian/watch file.
2808
2809 -- Colin Watson <cjwatson@debian.org> Fri, 18 Feb 2005 00:20:16 +0000
2810
2811openssh (1:3.9p1-2) experimental; urgency=low
2812
2813 * Remove pam_nologin from /etc/pam.d/ssh, as sshd's built-in support
2814 appears to be sufficient and more useful (closes: #162996).
2815 * Depend on debconf | debconf-2.0.
2816 * Drop LoginGraceTime back to the upstream default of two minutes on new
2817 installs (closes: #289573).
2818 * debconf template translations from Ubuntu bug #1232:
2819 - Update Greek (thanks, Logiotatidis George).
2820 - Update Spanish (thanks, Santiago Erquicia).
2821
2822 -- Colin Watson <cjwatson@debian.org> Sat, 15 Jan 2005 12:37:54 +0000
2823
2824openssh (1:3.9p1-1) experimental; urgency=low
2825
2826 * New upstream release.
2827 - PAM password authentication implemented again (closes: #238699,
2828 #242119).
2829 - Implemented the ability to pass selected environment variables between
2830 the client and the server.
2831 - Fix ssh-keyscan breakage when remote server doesn't speak SSH protocol
2832 (closes: #228828).
2833 - Fix res_query detection (closes: #242462).
2834 - 'ssh -c' documentation improved (closes: #265627).
2835 * Pass LANG and LC_* environment variables from the client by default, and
2836 accept them to the server by default in new installs, although not on
2837 upgrade (closes: #264024).
2838 * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones).
2839 * Expand on openssh-client package description (closes: #273831).
2840
2841 -- Colin Watson <cjwatson@debian.org> Tue, 4 Jan 2005 14:18:31 +0000
2842
2843openssh (1:3.8.1p1-14) experimental; urgency=low
2844
2845 * We use DH_COMPAT=2, so build-depend on debhelper (>= 2).
2846 * Fix timing information leak allowing discovery of invalid usernames in
2847 PAM keyboard-interactive authentication (backported from a patch by
2848 Darren Tucker; closes: #281595).
2849 * Make sure that there's a delay in PAM keyboard-interactive
2850 authentication when PermitRootLogin is not set to yes and the correct
2851 root password is entered (closes: #248747).
2852
2853 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 18:09:37 +0000
2854
2855openssh (1:3.8.1p1-13) experimental; urgency=low
2856
2857 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
2858 * debconf template translations:
2859 - Update Dutch (thanks, cobaco; closes: #278715).
2860 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
2861
2862 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 12:03:13 +0000
2863
2864openssh (1:3.8.1p1-12) experimental; urgency=low
2865
2866 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
2867 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
2868 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
2869 implementations apparently have problems with the long version string.
2870 This is of course a bug in those implementations, but since the extent
2871 of the problem is unknown it's best to play safe (closes: #275731).
2872 * debconf template translations:
2873 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
2874 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
2875 - Update French (thanks, Denis Barbier; closes: #276703).
2876 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
2877
2878 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 19:21:17 +0100
2879
2880openssh (1:3.8.1p1-11) experimental; urgency=high
2881
2882 * Move sshd_config(5) to openssh-server, where it belongs.
2883 * If PasswordAuthentication is disabled, then offer to disable
2884 ChallengeResponseAuthentication too. The current PAM code will attempt
2885 password-style authentication if ChallengeResponseAuthentication is
2886 enabled (closes: #250369).
2887 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
2888 later and then upgraded. Sorry about that ... for this reason, the
2889 default answer is to leave ChallengeResponseAuthentication enabled.
2890
2891 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:28:20 +0100
2892
2893openssh (1:3.8.1p1-10) experimental; urgency=low
2894
2895 * Don't install the ssh-askpass-gnome .desktop file by default; I've had
2896 too many GNOME people tell me it's the wrong thing to be doing. I've
2897 left it in /usr/share/doc/ssh-askpass-gnome/examples/ for now.
2898
2899 -- Colin Watson <cjwatson@debian.org> Wed, 25 Aug 2004 18:18:14 +0100
2900
2901openssh (1:3.8.1p1-9) experimental; urgency=low
2902
2903 * Split the ssh binary package into openssh-client and openssh-server
2904 (closes: #39741). openssh-server depends on openssh-client for some
2905 common functionality; it didn't seem worth creating yet another package
2906 for this. openssh-client is priority standard, openssh-server optional.
2907 * New transitional ssh package, priority optional, depending on
2908 openssh-client and openssh-server. May be removed once nothing depends
2909 on it.
2910 * When upgrading from ssh to openssh-{client,server}, it's very difficult
2911 for the maintainer scripts to find out what version we're upgrading from
2912 without dodgy dpkg hackery. I've therefore taken the opportunity to move
2913 a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
2914 and ssh/user_environment_tell.
2915 * Add a heuristic to try to make sure the sshd_config upgrade to >= 3.7
2916 happens even though we don't know what version we're upgrading from.
2917 * Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now
2918 (until sarge+2) it's still honoured to avoid breaking existing
2919 configurations, but the right approach is now to remove the
2920 openssh-server package if you don't want to run the server. Add a NEWS
2921 item to that effect.
2922
2923 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
2924
2925openssh (1:3.8.1p1-8.sarge.4) unstable; urgency=high
2926
2927 * Fix timing information leak allowing discovery of invalid usernames in
2928 PAM keyboard-interactive authentication (backported from a patch by
2929 Darren Tucker; closes: #281595).
2930 * Make sure that there's a delay in PAM keyboard-interactive
2931 authentication when PermitRootLogin is not set to yes and the correct
2932 root password is entered (closes: #248747).
2933
2934 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 12:37:16 +0000
2935
2936openssh (1:3.8.1p1-8.sarge.3) unstable; urgency=low
2937
2938 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
2939 * debconf template translations:
2940 - Update Dutch (thanks, cobaco; closes: #278715).
2941 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
2942
2943 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 10:31:12 +0000
2944
2945openssh (1:3.8.1p1-8.sarge.2) unstable; urgency=low
2946
2947 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
2948 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
2949 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
2950 implementations apparently have problems with the long version string.
2951 This is of course a bug in those implementations, but since the extent
2952 of the problem is unknown it's best to play safe (closes: #275731).
2953 * debconf template translations:
2954 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
2955 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
2956 - Update French (thanks, Denis Barbier; closes: #276703).
2957 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
2958
2959 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 17:57:14 +0100
2960
2961openssh (1:3.8.1p1-8.sarge.1) unstable; urgency=high
2962
2963 * If PasswordAuthentication is disabled, then offer to disable
2964 ChallengeResponseAuthentication too. The current PAM code will attempt
2965 password-style authentication if ChallengeResponseAuthentication is
2966 enabled (closes: #250369).
2967 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
2968 later and then upgraded. Sorry about that ... for this reason, the
2969 default answer is to leave ChallengeResponseAuthentication enabled.
2970
2971 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:21:55 +0100
2972
2973openssh (1:3.8.1p1-8) unstable; urgency=high
2974
2975 * Matthew Vernon:
2976 - Add a GPL exception to the licensing terms of the Debian patch
2977 (closes: #211644).
2978
2979 -- Colin Watson <cjwatson@debian.org> Thu, 29 Jul 2004 13:28:47 +0100
2980
2981openssh (1:3.8.1p1-7) unstable; urgency=low
2982
2983 * Re-enable shadow password support in openssh-server-udeb, at Bastian
2984 Blank's request (closes: #260800).
2985
2986 -- Colin Watson <cjwatson@debian.org> Thu, 22 Jul 2004 10:56:06 +0100
2987
2988openssh (1:3.8.1p1-6) unstable; urgency=low
2989
2990 * Implement hack in
2991 http://lists.debian.org/debian-boot/2004/07/msg01207.html to get
2992 openssh-client-udeb to show up as a retrievable debian-installer
2993 component.
2994 * Generate host keys in postinst only if the relevant HostKey directives
2995 are found in sshd_config (closes: #87946).
2996
2997 -- Colin Watson <cjwatson@debian.org> Wed, 21 Jul 2004 15:14:46 +0100
2998
2999openssh (1:3.8.1p1-5) unstable; urgency=medium
3000
3001 * Update German debconf template translation (thanks, Helge Kreutzmann;
3002 closes: #252226).
3003 * Remove Suggests: dnsutils, as it was only needed for
3004 make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan.
3005 * Disable shadow password support in openssh-server-udeb.
3006 * Fix non-portable shell constructs in maintainer scripts, Makefile, and
3007 ssh-copy-id (thanks, David Weinehall; closes: #258517).
3008 * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD
3009 handler kill the PAM thread if its waitpid() call returns 0, as well as
3010 the previous check for -1 (closes: #252676).
3011 * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any
3012 more; oh well.
3013
3014 -- Colin Watson <cjwatson@debian.org> Sat, 10 Jul 2004 13:57:27 +0100
3015
3016openssh (1:3.8.1p1-4) unstable; urgency=medium
3017
3018 * Kill off PAM thread if privsep slave dies (closes: #248125).
3019
3020 -- Colin Watson <cjwatson@debian.org> Fri, 28 May 2004 17:58:45 -0300
3021
3022openssh (1:3.8.1p1-3) unstable; urgency=low
3023
3024 * Add ssh-keygen to openssh-server-udeb.
3025
3026 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 16:31:52 +0100
3027
3028openssh (1:3.8.1p1-2) unstable; urgency=low
3029
3030 * Add Catalan debconf template translation (thanks, Aleix Badia i Bosch;
3031 closes: #248748).
3032 * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb
3033 (not yet uploaded).
3034 * Restore ssh-askpass-gnome binary, lost by mistake.
3035 * Don't link against libnsl in udeb builds.
3036
3037 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 11:15:58 +0100
3038
3039openssh (1:3.8.1p1-1) unstable; urgency=low
3040
3041 * New upstream release.
3042 - Use a longer buffer for tty names in utmp (closes: #247538).
3043 * Make sure there's a newline at the end of sshd_config before adding
3044 'UsePAM yes' (closes: #244829).
3045 * Generate a new .orig.tar.gz without RFC.nroff, and remove
3046 /usr/share/doc/ssh/RFC.gz (closes: #211640). It isn't DFSG-free and only
3047 documents the obsolete SSH1 protocol, not to mention that it was never a
3048 real RFC but only an Internet-Draft. It's available from
3049 http://www.free.lp.se/bamse/draft-ylonen-ssh-protocol-00.txt if you want
3050 it for some reason.
3051 * Add openssh-client-udeb and openssh-server-udeb binary packages for use
3052 in debian-installer. They still need libnss_files to be supplied in udeb
3053 form by glibc.
3054 * Work around lack of res_query weak alias in libresolv on amd64 (see
3055 #242462, awaiting real fix upstream).
3056 * Fix grammar in sshd(8) (closes: #238753).
3057 * Add .desktop file and icon for ssh-askpass-gnome (closes: #232333).
3058 * Update Polish debconf template translation (thanks, Emil Nowak;
3059 closes: #242808).
3060 * Add Turkish debconf template translation (thanks, Recai Oktaş;
3061 closes: #246068).
3062
3063 -- Colin Watson <cjwatson@debian.org> Tue, 11 May 2004 23:38:10 +0100
3064
3065openssh (1:3.8p1-3) unstable; urgency=low
3066
3067 * Remove deprecated ReverseMappingCheck option from newly generated
3068 sshd_config files (closes: #239987).
3069 * Build everything apart from contrib in a subdirectory, to allow for
3070 multiple builds.
3071 * Some older kernels are missing setresuid() and setresgid(), so don't try
3072 to use them. setreuid() and setregid() will do well enough for our
3073 purposes (closes: #239999).
3074
3075 -- Colin Watson <cjwatson@debian.org> Mon, 5 Apr 2004 21:23:43 +0100
3076
3077openssh (1:3.8p1-2) unstable; urgency=medium
3078
3079 * Disable PasswordAuthentication for new installations (closes: #236810).
3080 * Turn off the new ForwardX11Trusted by default, returning to the
3081 semantics of 3.7 and earlier, since it seems immature and causes far too
3082 many problems with existing setups. See README.Debian for details
3083 (closes: #237021).
3084
3085 -- Colin Watson <cjwatson@debian.org> Wed, 10 Mar 2004 10:33:07 +0000
3086
3087openssh (1:3.8p1-1) unstable; urgency=low
3088
3089 * New upstream release (closes: #232281):
3090 - New PAM implementation based on that in FreeBSD. This runs PAM session
3091 modules before dropping privileges (closes: #132681, #150968).
3092 - Since PAM session modules are run as root, we can turn pam_limits back
3093 on by default, and it no longer spits out "Operation not permitted" to
3094 syslog (closes: #171673).
3095 - Password expiry works again (closes: #153235).
3096 - 'ssh -q' suppresses login banner (closes: #134589).
3097 - sshd doesn't lie to PAM about invalid usernames (closes: #157078).
3098 - ssh-add prints key comment on each prompt (closes: #181869).
3099 - Punctuation formatting fixed in man pages (closes: #191131).
3100 - EnableSSHKeysign documented in ssh_config(5) (closes: #224457).
3101 * Add 'UsePAM yes' to /etc/ssh/sshd_config on upgrade from versions older
3102 than this, to maintain the standard Debian sshd configuration.
3103 * Comment out PAMAuthenticationViaKbdInt and RhostsAuthentication in
3104 sshd_config on upgrade. Neither option is supported any more.
3105 * Privilege separation and PAM are now properly supported together, so
3106 remove both debconf questions related to them and simply set it
3107 unconditionally in newly generated sshd_config files (closes: #228838).
3108 * ServerAliveInterval implemented upstream, so ProtocolKeepAlives is now a
3109 compatibility alias. The semantics differ slightly, though; see
3110 ssh_config(5) for details.
3111 * Implement SSH1 support for ServerAliveInterval using SSH_MSG_IGNORE. As
3112 documented in ssh_config(5), it's not as good as the SSH2 version.
3113 * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and
3114 -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary.
3115 * Update config.guess and config.sub from autotools-dev 20040105.1.
3116 * Darren Tucker:
3117 - Reset signal status when starting pam auth thread, prevent hanging
3118 during PAM keyboard-interactive authentications.
3119 - Fix a non-security-critical segfault in PAM authentication.
3120 * Add debconf template translations:
3121 - Greek (thanks, Konstantinos Margaritis; closes: #232843).
3122 - Italian (thanks, Renato Gini; closes: #234777).
3123
3124 -- Colin Watson <cjwatson@debian.org> Sat, 6 Mar 2004 18:43:44 +0000
3125
3126openssh (1:3.6.1p2-12) unstable; urgency=low
3127
3128 * Update Spanish debconf template translation (thanks, Javier
3129 Fernández-Sanguino Peña; closes: #228242).
3130 * Add debconf template translations:
3131 - Czech (thanks, Miroslav Kure; closes: #230110).
3132 - Simplified Chinese (thanks, Hiei Xu; closes: #230726).
3133
3134 -- Colin Watson <cjwatson@debian.org> Wed, 11 Feb 2004 09:37:57 +0000
3135
3136openssh (1:3.6.1p2-11) unstable; urgency=low
3137
3138 * Comment out pam_limits in default configuration, for now at least
3139 (closes: #198254).
3140 * Use invoke-rc.d (if it exists) to run the init script.
3141 * Backport format string bug fix in sshconnect.c (closes: #225238).
3142 * ssh-copy-id exits if ssh fails (closes: #215252).
3143
3144 -- Colin Watson <cjwatson@debian.org> Sun, 4 Jan 2004 18:59:21 +0000
3145
3146openssh (1:3.6.1p2-10) unstable; urgency=low
3147
3148 * Use --retry in init script when restarting rather than sleeping, to make
3149 sure the old process is dead (thanks, Herbert Xu; closes: #212117).
3150 Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option.
3151 * Update debconf template translations:
3152 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844).
3153 - Danish (thanks, Morten Brix Pedersen; closes: #217964).
3154 - Japanese (thanks, Kenshi Muto; closes: #212497).
3155 - Russian (thanks, Ilgiz Kalmetev).
3156 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #211832).
3157 * Add Dutch debconf template translation (thanks, cobaco;
3158 closes: #215372).
3159 * Update config.guess and config.sub from autotools-dev 20031007.1
3160 (closes: #217696).
3161 * Implement New World Order for PAM configuration, including
3162 /etc/pam.d/common-* from /etc/pam.d/ssh (closes: #212959).
3163 - To backport this release to woody, you need to set DEB_BUILD_SSH_WOODY
3164 in your environment. See README.Debian.
3165 * Add more commentary to /etc/pam.d/ssh.
3166
3167 -- Colin Watson <cjwatson@debian.org> Sun, 16 Nov 2003 01:14:16 +0000
3168
3169openssh (1:3.6.1p2-9) unstable; urgency=high
3170
3171 * Merge even more buffer allocation fixes from upstream (CAN-2003-0682;
3172 closes: #211434).
3173
3174 -- Colin Watson <cjwatson@debian.org> Fri, 19 Sep 2003 10:25:25 +0100
3175
3176openssh (1:3.6.1p2-8) unstable; urgency=high
3177
3178 * Merge more buffer allocation fixes from new upstream version 3.7.1p1
3179 (closes: #211324).
3180
3181 -- Colin Watson <cjwatson@debian.org> Wed, 17 Sep 2003 03:07:19 +0100
3182
3183openssh (1:3.6.1p2-7) unstable; urgency=high
3184
3185 * Update debconf template translations:
3186 - French (thanks, Christian Perrier; closes: #208801).
3187 - Japanese (thanks, Kenshi Muto; closes: #210380).
3188 * Some small improvements to the English templates courtesy of Christian
3189 Perrier. I've manually unfuzzied a few translations where it was
3190 obvious, on Christian's advice, but the others will have to be updated.
3191 * Document how to generate an RSA1 host key (closes: #141703).
3192 * Incorporate NMU fix for early buffer expansion vulnerability,
3193 CAN-2003-0693 (closes: #211205). Thanks to Michael Stone.
3194
3195 -- Colin Watson <cjwatson@debian.org> Tue, 16 Sep 2003 14:32:28 +0100
3196
3197openssh (1:3.6.1p2-6.0) unstable; urgency=high
3198
3199 * SECURITY: fix for CAN-2003-0693, buffer allocation error
3200
3201 -- Michael Stone <mstone@debian.org> Tue, 16 Sep 2003 08:27:07 -0400
3202
3203openssh (1:3.6.1p2-6) unstable; urgency=medium
3204
3205 * Use a more CVS-friendly means of setting SSH_VERSION.
3206 * Update Brazilian Portuguese debconf template translation (thanks, Andre
3207 Luis Lopes; closes: #208036).
3208 * Don't run 'sshd -t' in init script if the server isn't to be run
3209 (closes: #197576).
3210 * Fix login delay, spurious auth.log entry, and PermitRootLogin
3211 information leakage due to PAM issues with upstream's recent security
3212 update (thanks, Darren Tucker; closes: #99168, #192207, #193546).
3213 * Policy version 3.6.1: recode this changelog to UTF-8.
3214
3215 -- Colin Watson <cjwatson@debian.org> Wed, 3 Sep 2003 19:14:02 +0100
3216
3217openssh (1:3.6.1p2-5) unstable; urgency=low
3218
3219 * Disable cmsg_type check for file descriptor passing when running on
3220 Linux 2.0 (closes: #150976). Remove comments about non-functional
3221 privilege separation on 2.0 from ssh/privsep_ask and ssh/privsep_tell
3222 debconf questions and from README.Debian, since it should all now work.
3223 * Fix "defails" typo in generated sshd_config (closes: #206484).
3224 * Backport upstream patch to strip trailing whitespace (including
3225 newlines) from configuration directives (closes: #192079).
3226
3227 -- Colin Watson <cjwatson@debian.org> Wed, 27 Aug 2003 02:19:57 +0100
3228
3229openssh (1:3.6.1p2-4) unstable; urgency=low
3230
3231 * getent can get just one key; no need to use grep (thanks, James Troup).
3232 * Move /usr/local/bin to the front of the default path, following
3233 /etc/login.defs (closes: #201150).
3234 * Remove specifics of problematic countries from package description
3235 (closes: #197040).
3236 * Update Spanish debconf template translation (thanks, Carlos Valdivia
3237 Yagüe; closes: #198456).
3238 * Backport upstream patch to pass monitor signals through to child
3239 (closes: #164797).
3240
3241 -- Colin Watson <cjwatson@debian.org> Sun, 27 Jul 2003 17:31:15 +0100
3242
3243openssh (1:3.6.1p2-3) unstable; urgency=low
3244
3245 * Update French debconf template translation (thanks, Christian Perrier;
3246 closes: #194323).
3247 * Version the adduser dependency for --no-create-home (closes: #195756).
3248 * Add a version of moduli(5), namely revision 1.7 of
3249 http://www.openbsd.org/cgi-bin/cvsweb/src/share/man/man5/moduli.5 with
3250 '/etc/moduli' changed to '/etc/ssh/moduli' throughout (closes: #196061).
3251
3252 -- Colin Watson <cjwatson@debian.org> Mon, 9 Jun 2003 02:51:35 +0100
3253
3254openssh (1:3.6.1p2-2) unstable; urgency=low
3255
3256 * Force /etc/default/ssh to be non-executable, since dpkg apparently
3257 doesn't deal with permissions changes on conffiles (closes: #192966).
3258 * Use debconf 0.5's seen flag rather than the deprecated isdefault.
3259 * Add GPL location to copyright file.
3260 * Remove debian/postinst.old.
3261 * Switch to po-debconf, with some careful manual use of po2debconf to
3262 ensure that the source package continues to build smoothly on woody
3263 (closes: #183986).
3264 * Update debconf template translations:
3265 - Brazilian Portugese (thanks, Andre Luis Lopes; see #183986).
3266 - Japanese (thanks, Tomohiro KUBOTA; closes: #192429).
3267 * Compile with -fno-builtin-log for now, otherwise gcc-3.3 complains
3268 "log.h:59: warning: conflicting types for built-in function `log'". The
3269 OpenSSH log() function has been renamed in upstream CVS.
3270
3271 -- Colin Watson <cjwatson@debian.org> Mon, 19 May 2003 01:52:38 +0100
3272
3273openssh (1:3.6.1p2-1) unstable; urgency=medium
3274
3275 * New upstream release, including fix for PAM user-discovery security hole
3276 (closes: #191681).
3277 * Fix ChallengeResponseAuthentication default in generated sshd_config
3278 (closes: #106037).
3279 * Put newlines after full stops in man page documentation for
3280 ProtocolKeepAlives and SetupTimeOut.
3281 * Policy version 3.5.9: support DEB_BUILD_OPTIONS=noopt, build
3282 gnome-ssh-askpass with -g and -Wall flags.
3283 * Really ask ssh/new_config debconf question before trying to fetch its
3284 value (closes: #188721).
3285 * On purge, remove only the files we know about in /etc/ssh rather than
3286 the whole thing, and remove the directory if that leaves it empty
3287 (closes: #176679).
3288 * ssh has depended on debconf for some time now with no complaints, so:
3289 - Simplify the postinst by relying on debconf being present. (The absent
3290 case was buggy anyway.)
3291 - Get rid of "if you have not installed debconf" text in README.Debian,
3292 and generally update the "/usr/bin/ssh not SUID" entry.
3293 * More README.Debian work:
3294 - Reorganize into "UPGRADE ISSUES" and "OTHER ISSUES", in an effort to
3295 make it easier for people to find the former. The upgrade issues
3296 should probably be sorted by version somehow.
3297 - Document X11UseLocalhost under "X11 Forwarding" (closes: #150913).
3298 * Fix setting of IP flags for interactive sessions (upstream bug #541).
3299
3300 -- Colin Watson <cjwatson@debian.org> Mon, 5 May 2003 17:47:40 +0100
3301
3302openssh (1:3.6.1p1-1) unstable; urgency=low
3303
3304 * New upstream release (thanks, Laurence J. Lane).
3305 * debian/control: ssh-askpass-gnome is now Section: gnome, following the
3306 override file.
3307
3308 -- Colin Watson <cjwatson@debian.org> Wed, 2 Apr 2003 00:51:02 +0100
3309
3310openssh (1:3.6p1-1) unstable; urgency=low
3311
3312 * New upstream release.
3313 - Workaround applied upstream for a bug in the interaction of glibc's
3314 getaddrinfo() with the Linux 2.2 kernel (closes: #155814).
3315 - As such, it should now be safe to remove --with-ipv4-default, so
3316 starting sshd with -6 is no longer necessary (closes: #79861 and lots
3317 of other merged bugs).
3318 - ssh-copy-id prints usage when run without arguments (closes: #71376).
3319 - scp exits 1 if ssh fails (closes: #138400).
3320 - sshd writes to utmp's ut_addr_v6 field in IPv6 mode (closes: #167867).
3321 - 'ssh-add -c' causes ssh-agent to ask the user each time a key is used
3322 (closes: #109795).
3323 * Install /etc/default/ssh non-executable (closes: #185537).
3324
3325 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2003 23:00:59 +0100
3326
3327openssh (1:3.5p1-5) unstable; urgency=low
3328
3329 * Add /etc/default/ssh (closes: #161049).
3330 * Run the init script under 'set -e' (closes: #175010).
3331 * Change the default superuser path to include /sbin, /usr/sbin, and
3332 /usr/local/sbin (closes: #128235, #151267). Using login.defs would be
3333 nice, but that belongs to another package. Without a defined API to
3334 retrieve its settings, parsing it is off-limits.
3335 * Build ssh-askpass-gnome with GNOME 2. The source package should still
3336 support building on stable with GNOME 1, using the alternate
3337 libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582).
3338
3339 -- Colin Watson <cjwatson@debian.org> Sun, 9 Mar 2003 20:12:10 +0000
3340
3341openssh (1:3.5p1-4) unstable; urgency=low
3342
3343 * Point rlogin and rcp alternatives at slogin and scp respectively rather
3344 than ssh (closes: #121103, #151666). Fix alternative removal to match;
3345 previously it was completely wrong anyway.
3346 * Find out whether /etc/ssh/sshd_not_to_be_run exists and set the debconf
3347 question's default using that information, rather than using debconf as
3348 a registry. Other solutions may be better in the long run, but this is
3349 at least correct (thanks, Matthew Woodcraft; closes: #84725).
3350 * Stop using pam_lastlog, as it doesn't currently work well as a session
3351 module when privilege separation is enabled; it can usually read
3352 /var/log/lastlog but can't write to it. Instead, just use sshd's
3353 built-in support, already enabled by default (closes: #151297, #169938).
3354 * Use 'ssh-keygen -q' rather than redirecting output to /dev/null.
3355 * Add a "this may take some time" warning when creating host keys on
3356 installation (part of #110094).
3357 * When restarting via the init script, check for sshd_not_to_be_run after
3358 stopping sshd (idea from Tomas Pospisek; closes: #149850).
3359 * Append /usr/sbin:/sbin to the init script's $PATH, just in case of
3360 strangeness (closes: #115138).
3361 * Fix a dpkg-statoverride call to redirect stdout to /dev/null, not
3362 stderr.
3363 * Correct copyright file typo: "orignal" -> "original" (closes: #176490).
3364 * Rebuild with libssl0.9.7 (closes: #176983).
3365 * We're up to policy version 3.5.6. DEB_BUILD_OPTIONS stuff still needs to
3366 be looked at.
3367
3368 -- Colin Watson <cjwatson@debian.org> Sat, 18 Jan 2003 01:37:23 +0000
3369
3370openssh (1:3.5p1-3) unstable; urgency=low
3371
3372 * Happy new year!
3373 * Use getent rather than id to find out whether the sshd user exists
3374 (closes: #150974).
3375 * Remove some duplication from the postinst's ssh-keysign setuid code.
3376 * Replace db_text with db_input throughout debian/config. (db_text has
3377 been a compatibility wrapper since debconf 0.1.5.)
3378 * Warn about PermitUserEnvironment on upgrade (closes: #167895).
3379 * Use 'make install-nokeys', and disable unused debhelper commands,
3380 thereby forward-porting the last pieces of Zack Weinberg's patch
3381 (closes: #68341).
3382 * Move the man page for gnome-ssh-askpass from the ssh package to
3383 ssh-askpass-gnome (closes: #174449).
3384 * Build with -DLOGIN_NO_ENDOPT, since Debian's /bin/login doesn't accept
3385 '--' to terminate the list of options (closes: #171554).
3386 * Add Jonathan Amery's ssh-argv0 script (closes: #111341).
3387 * Update Danish debconf template (thanks, Morten Brix Pedersen;
3388 closes: #174757).
3389 * Document setgid ssh-agent's effect on certain environment variables in
3390 README.Debian (closes: #167974).
3391 * Document interoperability problems between scp and ssh.com's server in
3392 README.Debian, and suggest some workarounds (closes: #174662).
3393
3394 -- Colin Watson <cjwatson@debian.org> Wed, 1 Jan 2003 14:18:30 +0000
3395
3396openssh (1:3.5p1-2) unstable; urgency=low
3397
3398 * Mention in the ssh package description that it provides both ssh and
3399 sshd (closes: #99680).
3400 * Create a system group for ssh-agent, not a user group (closes: #167669).
3401
3402 -- Colin Watson <cjwatson@debian.org> Mon, 4 Nov 2002 13:43:53 +0000
3403
3404openssh (1:3.5p1-1) unstable; urgency=low
3405
3406 * New upstream release.
3407 - Fixes typo in ssh-add usage (closes: #152239).
3408 - Fixes 'PermitRootLogin forced-commands-only' (closes: #166184).
3409 - ~/.ssh/environment and environment= options in ~/.ssh/authorized_keys
3410 are deprecated for security reasons and will eventually go away. For
3411 now they can be re-enabled by setting 'PermitUserEnvironment yes' in
3412 sshd_config.
3413 - ssh-agent is installed setgid to prevent ptrace() attacks. The group
3414 actually doesn't matter, as it drops privileges immediately, but to
3415 avoid confusion the postinst creates a new 'ssh' group for it.
3416 * Obsolete patches:
3417 - Solar Designer's privsep+compression patch for Linux 2.2 (see
3418 1:3.3p1-0.0woody1).
3419 - Hostbased auth ssh-keysign backport (see 1:3.4p1-4).
3420
3421 * Remove duplicated phrase in ssh_config(5) (closes: #152404).
3422 * Source the debconf confmodule at the top of the postrm rather than at
3423 the bottom, to avoid making future non-idempotency problems worse (see
3424 #151035).
3425 * Debconf templates:
3426 - Add Polish (thanks, Grzegorz Kusnierz).
3427 - Update French (thanks, Denis Barbier; closes: #132509).
3428 - Update Spanish (thanks, Carlos Valdivia Yagüe; closes: #164716).
3429 * Write a man page for gnome-ssh-askpass, and link it to ssh-askpass.1 if
3430 this is the selected ssh-askpass alternative (closes: #67775).
3431
3432 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
3433
3434openssh (1:3.4p1-4) unstable; urgency=low
3435
3436 * Allow ssh-krb5 in ssh-askpass-gnome's dependencies (closes: #129532).
3437 * Restore Russia to list of countries where encryption is problematic (see
3438 #148951 and http://www.average.org/freecrypto/).
3439 * Drop ssh-askpass-gnome's priority to optional, per the override file.
3440 * Drop the PAM special case for hurd-i386 (closes: #99157).
3441 * s/dile/idle/ in ssh_config(5) (closes: #118331).
3442 * Note in README.Debian that you need xauth from xbase-clients on the
3443 server for X11 forwarding (closes: #140269).
3444 * Use correct path to upstream README in copyright file (closes: #146037).
3445 * Document the units for ProtocolKeepAlives (closes: #159479).
3446 * Backport upstream patch to fix hostbased auth (closes: #117114).
3447 * Add -g to CFLAGS.
3448
3449 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 18:58:53 +0100
3450
3451openssh (1:3.4p1-3) unstable; urgency=low
3452
3453 * Add myself to Uploaders: and begin acting as temporary maintainer, at
3454 Matthew's request. (Normal service will resume in some months' time.)
3455 * Add sharutils to Build-Depends (closes: #138465).
3456 * Stop creating the /usr/doc/ssh symlink.
3457
3458 * Fix some debconf template typos (closes: #160358).
3459 * Split debconf templates into one file per language.
3460 * Add debconf template translations:
3461 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #106173).
3462 - Danish (thanks, Claus Hindsgaul; closes: #126607).
3463 - Japanese (thanks, Tomohiro KUBOTA; closes: #137427).
3464 - Russian (thanks, Ilgiz Kalmetev; closes: #136610).
3465 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #129041).
3466 * Update debconf template translations:
3467 - French (thanks, Igor Genibel; closes: #151361).
3468 - German (thanks, Axel Noetzold; closes: #147069).
3469 * Some of these translations are fuzzy. Please send updates.
3470
3471 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 14:09:57 +0100
3472
3473openssh (1:3.4p1-2) unstable; urgency=high
3474
3475 * Get a security-fixed version into unstable
3476 * Also tidy README.Debian up a little
3477
3478 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 17:20:59 +0100
3479
3480openssh (1:3.4p1-1) testing; urgency=high
3481
3482 * Extend my tendrils back into this package (Closes: #150915, #151098)
3483 * thanks to the security team for their work
3484 * no thanks to ISS/Theo de Raadt for their handling of these bugs
3485 * save old sshd_configs to sshd_config.dpkg-old when auto-generating a
3486 new one
3487 * tell/ask the user about PriviledgeSeparation
3488 * /etc/init.d/ssh run will now create the chroot empty dir if necessary
3489 * Remove our previous statoverride on /usr/bin/ssh (only for people
3490 upgrading from a version where we'd put one in ourselves!)
3491 * Stop slandering Russia, since someone asked so nicely (Closes: #148951)
3492 * Reduce the sleep time in /etc/init.d/ssh during a restart
3493
3494 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 15:52:10 +0100
3495
3496openssh (1:3.4p1-0.0woody1) testing-security; urgency=high
3497
3498 * NMU by the security team.
3499 * New upstream version
3500
3501 -- Michael Stone <mstone@debian.org> Wed, 26 Jun 2002 15:40:38 -0400
3502
3503openssh (1:3.3p1-0.0woody4) testing-security; urgency=high
3504
3505 * NMU by the security team.
3506 * fix error when /etc/ssh/sshd_config exists on new install
3507 * check that user doesn't exist before running adduser
3508 * use openssl internal random unconditionally
3509
3510 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 19:44:39 -0400
3511
3512openssh (1:3.3p1-0.0woody3) testing-security; urgency=high
3513
3514 * NMU by the security team.
3515 * use correct home directory when sshd user is created
3516
3517 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
3518
3519openssh (1:3.3p1-0.0woody2) testing-security; urgency=high
3520
3521 * NMU by the security team.
3522 * Fix rsa1 key creation (Closes: #150949)
3523 * don't fail if sshd user removal fails
3524 * depends: on adduser (Closes: #150907)
3525
3526 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
3527
3528openssh (1:3.3p1-0.0woody1) testing-security; urgency=high
3529
3530 * NMU by the security team.
3531 * New upstream version.
3532 - Enable privilege separation by default.
3533 * Include patch from Solar Designer for privilege separation and
3534 compression on 2.2.x kernels.
3535 * Remove --disable-suid-ssh from configure.
3536 * Support setuid ssh-keysign binary instead of setuid ssh client.
3537 * Check sshd configuration before restarting.
3538
3539 -- Daniel Jacobowitz <dan@debian.org> Mon, 24 Jun 2002 13:43:44 -0400
3540
3541openssh (1:3.0.2p1-9) unstable; urgency=high
3542
3543 * Thanks to those who NMUd
3544 * The only change in this version is to debian/control - I've removed
3545 the bit that says you can't export it from the US - it would look
3546 pretty daft to say this about a package in main! Also, it's now OK
3547 to use crypto in France, so I've edited that comment slightly
3548 * Correct a path in README.Debian too (Closes: #138634)
3549
3550 -- Matthew Vernon <matthew@debian.org> Sun, 4 Apr 2002 09:52:59 +0100
3551
3552openssh (1:3.0.2p1-8.3) unstable; urgency=medium
3553
3554 * NMU
3555 * Really set urgency to medium this time (oops)
3556 * Fix priority to standard per override while I'm at it
3557
3558 -- Aaron M. Ucko <ucko@debian.org> Sun, 24 Mar 2002 09:00:08 -0500
3559
3560openssh (1:3.0.2p1-8.2) unstable; urgency=low
3561
3562 * NMU with maintainer's permission
3563 * Prepare for upcoming ssh-nonfree transitional packages per
3564 <http://lists.debian.org/debian-ssh/2002/debian-ssh-200203/msg00008.html>
3565 * Urgency medium because it would really be good to get this into woody
3566 before it releases
3567 * Fix sections to match override file
3568 * Reissued due to clash with non-US -> main move
3569
3570 -- Aaron M. Ucko <ucko@debian.org> Sat, 23 Mar 2002 21:21:52 -0500
3571
3572openssh (1:3.0.2p1-8.1) unstable; urgency=low
3573
3574 * NMU
3575 * Move from non-US to mani
3576
3577 -- LaMont Jones <lamont@debian.org> Thu, 21 Mar 2002 09:33:50 -0700
3578
3579openssh (1:3.0.2p1-8) unstable; urgency=critical
3580
3581 * Security fix - patch from upstream (Closes: #137209, #137210)
3582 * Undo the changes in the unreleased -7, since they appear to break
3583 things here. Accordingly, the code change is minimal, and I'm
3584 happy to get it into testing ASAP
3585
3586 -- Matthew Vernon <matthew@debian.org> Thu, 7 Mar 2002 14:25:23 +0000
3587
3588openssh (1:3.0.2p1-7) unstable; urgency=high
3589
3590 * Build to support IPv6 and IPv4 by default again
3591
3592 -- Matthew Vernon <matthew@debian.org> Sat, 2 Mar 2002 00:25:05 +0000
3593
3594openssh (1:3.0.2p1-6) unstable; urgency=high
3595
3596 * Correct error in the clean target (Closes: #130868)
3597
3598 -- Matthew Vernon <matthew@debian.org> Sat, 26 Jan 2002 00:32:00 +0000
3599
3600openssh (1:3.0.2p1-5) unstable; urgency=medium
3601
3602 * Include the Debian version in our identification, to make it easier to
3603 audit networks for patched versions in future
3604
3605 -- Matthew Vernon <matthew@debian.org> Mon, 21 Jan 2002 17:16:10 +0000
3606
3607openssh (1:3.0.2p1-4) unstable; urgency=medium
3608
3609 * If we're asked to not run sshd, stop any running sshd's first
3610 (Closes: #129327)
3611
3612 -- Matthew Vernon <matthew@debian.org> Wed, 16 Jan 2002 21:24:16 +0000
3613
3614openssh (1:3.0.2p1-3) unstable; urgency=high
3615
3616 * Fix /etc/pam.d/ssh to not set $MAIL (Closes: #128913)
3617 * Remove extra debconf suggestion (Closes: #128094)
3618 * Mmm. speedy bug-fixing :-)
3619
3620 -- Matthew Vernon <matthew@debian.org> Sat, 12 Jan 2002 17:23:58 +0000
3621
3622openssh (1:3.0.2p1-2) unstable; urgency=high
3623
3624 * Fix postinst to not automatically overwrite sshd_config (!)
3625 (Closes: #127842, #127867)
3626 * Add section in README.Debian about the PermitRootLogin setting
3627
3628 -- Matthew Vernon <matthew@debian.org> Sat, 5 Jan 2003 05:26:30 +0000
3629
3630openssh (1:3.0.2p1-1) unstable; urgency=high
3631
3632 * Incorporate fix from Colin's NMU
3633 * New upstream version (fixes the bug Wichert fixed) (Closes: #124035)
3634 * Capitalise IETF (Closes: #125379)
3635 * Refer to the correct sftp-server location (Closes: #126854, #126224)
3636 * Do what we're asked re SetUID ssh (Closes: #124065, #124154, #123247)
3637 * Ask people upgrading from potato if they want a new conffile
3638 (Closes: #125642)
3639 * Fix a typo in postinst (Closes: #122192, #122410, #123440)
3640 * Frob the default config a little (Closes: #122284, #125827, #125696,
3641 #123854)
3642 * Make /etc/init.d/ssh be more clear about ssh not running (Closes:
3643 #123552)
3644 * Fix typo in templates file (Closes: #123411)
3645
3646 -- Matthew Vernon <matthew@debian.org> Fri, 4 Jan 2002 16:01:52 +0000
3647
3648openssh (1:3.0.1p1-1.2) unstable; urgency=high
3649
3650 * Non-maintainer upload
3651 * Prevent local users from passing environment variables to the login
3652 process when UseLogin is enabled
3653
3654 -- Wichert Akkerman <wakkerma@debian.org> Mon, 3 Dec 2001 19:34:45 +0100
3655
3656openssh (1:3.0.1p1-1.1) unstable; urgency=low
3657
3658 * Non-maintainer upload, at Matthew's request.
3659 * Remove sa_restorer assignment to fix compilation on alpha, hppa, and
3660 ia64 (closes: #122086).
3661
3662 -- Colin Watson <cjwatson@debian.org> Sun, 2 Dec 2001 18:54:16 +0000
3663
3664openssh (1:3.0.1p1-1) unstable; urgency=high
3665
3666 * New upstream version (Closes: #113646, #113513, #114707, #118564)
3667 * Building with a libc that works (!) (Closes: #115228)
3668 * Patches forward-ported are -1/-2 options for scp, the improvement to
3669 'waiting for forwarded connections to terminate...'
3670 * Fix /etc/init.d/ssh to stop sshd properly (Closes: #115228)
3671 * /etc/ssh/sshd_config is no longer a conffile but generated in the postinst
3672 * Remove suidregister leftover from postrm
3673 * Mention key we are making in the postinst
3674 * Default to not enable SSH protocol 1 support, since protocol 2 is
3675 much safer anyway.
3676 * New version of the vpn-fixes patch, from Ian Jackson
3677 * New handling of -q, and added new -qq option; thanks to Jon Amery
3678 * Experimental smartcard support not enabled, since I have no way of
3679 testing it.
3680
3681 -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000
3682
3683openssh (1:2.9p2-6) unstable; urgency=low
3684
3685 * check for correct file in /etc/init.d/ssh (Closes: #110876)
3686 * correct location of version 2 keys in ssh.1 (Closes: #110439)
3687 * call update-alternatives --quiet (Closes: #103314)
3688 * hack ssh-copy-id to chmod go-w (Closes: #95551)
3689 * TEMPORARY fix to provide largefile support using a -D in the cflags
3690 line. long-term, upstream will patch the autoconf stuff
3691 (Closes: #106809, #111849)
3692 * remove /etc/rc references in ssh-keygen.1 (Closes: #68350)
3693 * scp.1 patch from Adam McKenna to document -r properly (Closes: #76054)
3694 * Check for files containing a newline character (Closes: #111692)
3695
3696 -- Matthew Vernon <matthew@debian.org> Thu, 13 Sep 2001 16:47:36 +0100
3697
3698openssh (1:2.9p2-5) unstable; urgency=high
3699
3700 * Thanks to all the bug-fixers who helped!
3701 * remove sa_restorer assignment (Closes: #102837)
3702 * patch from Peter Benie to DTRT wrt X forwarding if the server refuses
3703 us access (Closes: #48297)
3704 * patch from upstream CVS to fix port forwarding (Closes: #107132)
3705 * patch from Jonathan Amery to document ssh-keygen behaviour
3706 (Closes:#106643, #107512)
3707 * patch to postinst from Jonathan Amery (Closes: #106411)
3708 * patch to manpage from Jonathan Amery (Closes: #107364)
3709 * patch from Matthew Vernon to make -q emit fatal errors as that is the
3710 documented behaviour (Closes: #64347)
3711 * patch from Ian Jackson to cause us to destroy a file when we scp it
3712 onto itself, rather than dumping bits of our memory into it, which was
3713 a security hole (see #51955)
3714 * patch from Jonathan Amery to document lack of Kerberos support
3715 (Closes: #103726)
3716 * patch from Matthew Vernon to make the 'waiting for connections to
3717 terminate' message more helpful (Closes: #50308)
3718
3719 -- Matthew Vernon <matthew@debian.org> Thu, 23 Aug 2001 02:14:09 +0100
3720
3721openssh (1:2.9p2-4) unstable; urgency=high
3722
3723 * Today's build of ssh is strawberry flavoured
3724 * Patch from mhp to reduce length of time sshd is stopped for (Closes: #106176)
3725 * Tidy up debconf template (Closes: #106152)
3726 * If called non-setuid, then setgid()'s failure should not be fatal (see
3727 #105854)
3728
3729 -- Matthew Vernon <matthew@debian.org> Sun, 22 Jul 2001 14:19:43 +0100
3730
3731openssh (1:2.9p2-3) unstable; urgency=low
3732
3733 * Patch from yours truly to add -1 and -2 options to scp (Closes: #106061)
3734 * Improve the IdentityFile section in the man page (Closes: #106038)
3735
3736 -- Matthew Vernon <matthew@debian.org> Sat, 21 Jul 2001 14:47:27 +0100
3737
3738openssh (1:2.9p2-2) unstable; urgency=low
3739
3740 * Document the protocol version 2 and IPV6 changes (Closes: #105845, #105868)
3741 * Make PrintLastLog 'no' by default (Closes: #105893)
3742
3743 -- Matthew Vernon <matthew@debian.org> Thu, 19 Jul 2001 18:36:41 +0100
3744
3745openssh (1:2.9p2-1) unstable; urgency=low
3746
3747 * new (several..) upstream version (Closes: #96726, #81856, #96335)
3748 * Hopefully, this will close some other bugs too
3749
3750 -- Matthew Vernon <matthew@debian.org> Tue, 17 Jul 2001 19:41:58 +0100
3751
3752openssh (1:2.5.2p2-3) unstable; urgency=low
3753
3754 * Taking Over this package
3755 * Patches from Robert Bihlmeyer for the Hurd (Closes: #102991)
3756 * Put PermitRootLogin back to yes (Closes: #67334, #67371, #78274)
3757 * Don't fiddle with conf-files any more (Closes: #69501)
3758
3759 -- Matthew Vernon <matthew@debian.org> Tue, 03 Jul 2001 02:58:13 +0100
3760
3761openssh (1:2.5.2p2-2.2) unstable; urgency=low
3762
3763 * NMU
3764 * Include Hurd compatibility patches from Robert Bihlmeyer (Closes: #76033)
3765 * Patch from Richard Kettlewell for protocolkeepalives (Closes: #99273)
3766 * Patch from Matthew Vernon for BannerTimeOut, batchmode, and
3767 documentation for protocolkeepalives. Makes ssh more generally useful
3768 for scripting uses (Closes: #82877, #99275)
3769 * Set a umask, so ourpidfile isn't world-writable (closes: #100012,
3770 #98286, #97391)
3771
3772 -- Matthew Vernon <matthew@debian.org> Thu, 28 Jun 2001 23:15:42 +0100
3773
3774openssh (1:2.5.2p2-2.1) unstable; urgency=low
3775
3776 * NMU
3777 * Remove duplicate Build-Depends for libssl096-dev and change it to
3778 depend on libssl-dev instaed. Also adding in virtual | real package
3779 style build-deps. (Closes: #93793, #75228)
3780 * Removing add-log entry (Closes: #79266)
3781 * This was a pam bug from a while back (Closes: #86908, #88457, #86843)
3782 * pam build-dep already exists (Closes: #93683)
3783 * libgnome-dev build-dep already exists (Closes: #93694)
3784 * No longer in non-free (Closes: #85401)
3785 * Adding in fr debconf translations (Closes: #83783)
3786 * Already suggests xbase-clients (Closes: #79741)
3787 * No need to suggest libpam-pwdb anymore (Closes: #81658)
3788 * Providing rsh-client (Closes: #79437)
3789 * hurd patch was already applied (Closes: #76033)
3790 * default set to no (Closes: #73682)
3791 * Adding in a suggests for dnsutils (Closes: #93265)
3792 * postinst bugs fixed (Closes: #88057, #88066, #88196, #88405, #88612)
3793 (Closes: #88774, #88196, #89556, #90123, #90228, #90833, #87814, #85465)
3794 * Adding in debconf dependency
3795
3796 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Apr 2001 14:11:04 +0100
3797
3798openssh (1:2.5.2p2-2) unstable; urgency=high
3799
3800 * disable the OpenSSL version check in entropy.c
3801 (closes: #93581, #93588, #93590, #93614, #93619, #93635, #93648)
3802
3803 -- Philip Hands <phil@uk.alcove.com> Wed, 11 Apr 2001 20:30:04 +0100
3804
3805openssh (1:2.5.2p2-1) unstable; urgency=low
3806
3807 * New upstream release
3808 * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes: #86069, #87748)
3809 * fix double space indent in german templates (closes: #89493)
3810 * make postinst check for ssh_host_rsa_key
3811 * get rid of the last of the misguided debian/rules NMU debris :-/
3812
3813 -- Philip Hands <phil@hands.com> Sat, 24 Mar 2001 20:59:33 +0000
3814
3815openssh (1:2.5.1p2-2) unstable; urgency=low
3816
3817 * rebuild with new debhelper (closes: #89558, #89536, #90225)
3818 * fix broken dpkg-statoverride test in postinst
3819 (closes: #89612, #90474, #90460, #89605)
3820 * NMU bug fixed but not closed in last upload (closes: #88206)
3821
3822 -- Philip Hands <phil@hands.com> Fri, 23 Mar 2001 16:11:33 +0000
3823
3824openssh (1:2.5.1p2-1) unstable; urgency=high
3825
3826 * New upstream release
3827 * fix typo in postinst (closes: #88110)
3828 * revert to setting PAM service name in debian/rules, backing out last
3829 NMU, which also (closes: #88101)
3830 * restore the pam lastlog/motd lines, lost during the NMUs, and sshd_config
3831 * restore printlastlog option patch
3832 * revert to using debhelper, which had been partially disabled in NMUs
3833
3834 -- Philip Hands <phil@hands.com> Tue, 13 Mar 2001 01:41:34 +0000
3835
3836openssh (1:2.5.1p1-1.8) unstable; urgency=high
3837
3838 * And now the old pam-bug s/sshd/ssh in ssh.c is also fixed
3839
3840 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 19:48:01 +0100
3841
3842openssh (1:2.5.1p1-1.7) unstable; urgency=high
3843
3844 * And now we mark the correct binary as setuid, when a user requested
3845 to install it setuid.
3846
3847 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 07:19:56 +0100
3848
3849openssh (1:2.5.1p1-1.6) unstable; urgency=high
3850
3851 * Fixes postinst to handle overrides that are already there. Damn, I
3852 should have noticed the bug earlier.
3853
3854 -- Christian Kurz <shorty@debian.org> Wed, 28 Feb 2001 22:35:00 +0100
3855
3856openssh (1:2.5.1p1-1.5) unstable; urgency=high
3857
3858 * Rebuild ssh with pam-support.
3859
3860 -- Christian Kurz <shorty@debian.org> Mon, 26 Feb 2001 21:55:51 +0100
3861
3862openssh (1:2.5.1p1-1.4) unstable; urgency=low
3863
3864 * Added Build-Depends on libssl096-dev.
3865 * Fixed sshd_config file to disallow root logins again.
3866
3867 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 20:03:55 +0100
3868
3869openssh (1:2.5.1p1-1.3) unstable; urgency=low
3870
3871 * Fixed missing manpages for sftp.1 and ssh-keyscan.1
3872 * Made package policy 3.5.2 compliant.
3873
3874 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 15:46:26 +0100
3875
3876openssh (1:2.5.1p1-1.2) unstable; urgency=low
3877
3878 * Added Conflict with sftp, since we now provide our own sftp-client.
3879 * Added a fix for our broken dpkg-statoverride call in the
3880 2.3.0p1-13.
3881 * Fixed some config pathes in the comments of sshd_config.
3882 * Removed ssh-key-exchange-vulnerability-patch since it's not needed
3883 anymore because upstream included the fix.
3884
3885 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 13:46:58 +0100
3886
3887openssh (1:2.5.1p1-1.1) unstable; urgency=high
3888
3889 * Another NMU to get the new upstream version 2.5.1p1 into
3890 unstable. (Closes: #87123)
3891 * Corrected postinst to mark ssh as setuid. (Closes: #86391, #85766)
3892 * Key Exchange patch is already included by upstream. (Closes: #86015)
3893 * Upgrading should be possible now. (Closes: #85525, #85523)
3894 * Added --disable-suid-ssh as compile option, so ssh won't get installed
3895 suid per default.
3896 * Fixed postinst to run dpkg-statoverride only, when dpkg-statoverride
3897 is available and the mode of the binary should be 4755. And also added
3898 suggestion for a newer dpkg.
3899 (Closes: #85734, #85741, #86876)
3900 * sftp and ssh-keyscan will also be included from now on. (Closes: #79994)
3901 * scp now understands spaces in filenames (Closes: #53783, #58958,
3902 #66723)
3903 * ssh-keygen now supports showing DSA fingerprints. (Closes: #68623)
3904 * ssh doesn' t show motd anymore when switch -t is used. (Closes #69035)
3905 * ssh supports the usage of other dsa keys via the ssh command line
3906 options. (Closes: #81250)
3907 * Documentation in sshd_config fixed. (Closes: #81088)
3908 * primes file included by upstream and included now. (Closes: #82101)
3909 * scp now allows dots in the username. (Closes: #82477)
3910 * Spelling error in ssh-copy-id.1 corrected by upstream. (Closes: #78124)
3911
3912 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 10:06:08 +0100
3913
3914openssh (1:2.3.0p1-1.13) unstable; urgency=low
3915
3916 * Config should now also be fixed with this hopefully last NMU.
3917
3918 -- Christian Kurz <shorty@debian.org> Sat, 10 Feb 2001 22:56:36 +0100
3919
3920openssh (1:2.3.0p1-1.12) unstable; urgency=high
3921
3922 * Added suggest for xbase-clients to control-file. (Closes #85227)
3923 * Applied patch from Markus Friedl to fix a vulnerability in
3924 the rsa keyexchange.
3925 * Fixed position of horizontal line. (Closes: #83613)
3926 * Fixed hopefully the grep problem in the config-file. (Closes: #78802)
3927 * Converted package from suidregister to dpkg-statoverride.
3928
3929 -- Christian Kurz <shorty@debian.org> Fri, 9 Feb 2001 19:43:55 +0100
3930
3931openssh (1:2.3.0p1-1.11) unstable; urgency=medium
3932
3933 * Fixed some typos in the german translation of the debconf
3934 template.
3935
3936 -- Christian Kurz <shorty@debian.org> Wed, 24 Jan 2001 18:22:38 +0100
3937
3938openssh (1:2.3.0p1-1.10) unstable; urgency=medium
3939
3940 * Fixed double printing of motd. (Closes: #82618)
3941
3942 -- Christian Kurz <shorty@debian.org> Tue, 23 Jan 2001 21:03:43 +0100
3943
3944openssh (1:2.3.0p1-1.9) unstable; urgency=high
3945
3946 * And the next NMU which includes the patch from Andrew Bartlett
3947 and Markus Friedl to fix the root privileges handling of openssh.
3948 (Closes: #82657)
3949
3950 -- Christian Kurz <shorty@debian.org> Wed, 17 Jan 2001 22:20:54 +0100
3951
3952openssh (1:2.3.0p1-1.8) unstable; urgency=high
3953
3954 * Applied fix from Ryan Murray to allow building on other architectures
3955 since the hurd patch was wrong. (Closes: #82471)
3956
3957 -- Christian Kurz <shorty@debian.org> Tue, 16 Jan 2001 22:45:51 +0100
3958
3959openssh (1:2.3.0p1-1.7) unstable; urgency=medium
3960
3961 * Fixed another typo on sshd_config
3962
3963 -- Christian Kurz <shorty@debian.org> Sun, 14 Jan 2001 19:01:31 +0100
3964
3965openssh (1:2.3.0p1-1.6) unstable; urgency=high
3966
3967 * Added Build-Dependency on groff (Closes: #81886)
3968 * Added Build-Depencency on debhelper (Closes: #82072)
3969 * Fixed entry for known_hosts in sshd_config (Closes: #82096)
3970
3971 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 23:08:16 +0100
3972
3973openssh (1:2.3.0p1-1.5) unstable; urgency=high
3974
3975 * Fixed now also the problem with sshd used as default ipv4 and
3976 didn't use IPv6. This should be now fixed.
3977
3978 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 21:25:55 +0100
3979
3980openssh (1:2.3.0p1-1.4) unstable; urgency=high
3981
3982 * Fixed buggy entry in postinst.
3983
3984 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 23:12:16 +0100
3985
3986openssh (1:2.3.0p1-1.3) unstable; urgency=high
3987
3988 * After finishing the rewrite of the rules-file I had to notice that
3989 the manpage installation was broken. This should now work again.
3990
3991 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 22:11:59 +0100
3992
3993openssh (1:2.3.0p1-1.2) unstable; urgency=high
3994
3995 * Fixed the screwed up build-dependency.
3996 * Removed --with-ipv4-default to support ipv6.
3997 * Changed makefile to use /etc/pam.d/ssh instead of /etc/pam.d/sshd.
3998 * Fixed location to sftp-server in config.
3999 * Since debian still relies on /etc/pam.d/ssh instead of moving to
4000 /etc/pam.d/sshd, I had to hack ssh.h to get ssh to use this name.
4001 * Fixed path to host key in sshd_config.
4002
4003 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 08:23:47 +0100
4004
4005openssh (1:2.3.0p1-1.1) unstable; urgency=medium
4006
4007 * NMU with permission of Phil Hands.
4008 * New upstream release
4009 * Update Build-Depends to point to new libssl096.
4010 * This upstream release doesn't leak any information depending
4011 on the setting of PermitRootLogin (Closes: #59933)
4012 * New upstream release contains fix against forcing a client to
4013 do X/agent forwarding (Closes: #76788)
4014 * Changed template to contain correct path to the documentation
4015 (Closes: #67245)
4016 * Added --with-4in6 switch as compile option into debian/rules.
4017 * Added --with-ipv4-default as compile option into debian/rules.
4018 (Closes: #75037)
4019 * Changed default path to also contain /usr/local/bin and
4020 /usr/X11R6/bin (Closes: #62472,#54567,#62810)
4021 * Changed path to sftp-server in sshd_config to match the
4022 our package (Closes: #68347)
4023 * Replaced OpenBSDh with OpenBSD in the init-script.
4024 * Changed location to original source in copyright.head
4025 * Changed behaviour of init-script when invoked with the option
4026 restart (Closes: #68706,#72560)
4027 * Added a note about -L option of scp to README.Debian
4028 * ssh won't print now the motd if invoked with -t option
4029 (Closes: #59933)
4030 * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867)
4031 * Added a note about tcp-wrapper support to README.Debian
4032 (Closes: #72807,#22190)
4033 * Removed two unneeded options from building process.
4034 * Added sshd.pam into debian dir and install it.
4035 * Commented out unnecessary call to dh_installinfo.
4036 * Added a line to sshd.pam so that limits will be paid attention
4037 to (Closes: #66904)
4038 * Restart Option has a Timeout of 10 seconds (Closes: 51264)
4039 * scp won't override files anymore (Closes: 51955)
4040 * Removed pam_lastlog module, so that the lastlog is now printed
4041 only once (Closes: #71742, #68335, #69592, #71495, #77781)
4042 * If password is expired, openssh now forces the user to change it.
4043 (Closes: #51747)
4044 * scp should now have no more problems with shell-init-files that
4045 produces ouput (Closes: #56280,#59873)
4046 * ssh now prints the motd correctly (Closes: #66926)
4047 * ssh upgrade should disable ssh daemon only if users has choosen
4048 to do so (Closes: #67478)
4049 * ssh can now be installed suid (Closes: #70879)
4050 * Modified debian/rules to support hurd.
4051
4052 -- Christian Kurz <shorty@debian.org> Wed, 27 Dec 2000 20:06:57 +0100
4053
4054openssh (1:2.2.0p1-1.1) unstable; urgency=medium
4055
4056 * Non-Maintainer Upload
4057 * Check for new returns in the new libc
4058 (closes: #72803, #74393, #72797, #71307, #71702)
4059 * Link against libssl095a (closes: #66304)
4060 * Correct check for PermitRootLogin (closes: #69448)
4061
4062 -- Ryan Murray <rmurray@debian.org> Wed, 18 Oct 2000 00:48:18 -0700
4063
4064openssh (1:2.2.0p1-1) unstable; urgency=low
4065
4066 * New upstream release
4067
4068 -- Philip Hands <phil@hands.com> Mon, 11 Sep 2000 14:49:43 +0100
4069
4070openssh (1:2.1.1p4-3) unstable; urgency=low
4071
4072 * add rsh alternatives
4073 * add -S option to scp (using Tommi Virtanen's patch) (closes: #63097)
4074 * do the IPV4_DEFAULT thing properly this time
4075
4076 -- Philip Hands <phil@hands.com> Fri, 11 Aug 2000 18:14:37 +0100
4077
4078openssh (1:2.1.1p4-2) unstable; urgency=low
4079
4080 * reinstate manpage .out patch from 1:1.2.3
4081 * fix typo in postinst
4082 * only compile ssh with IPV4_DEFAULT
4083 * apply James Troup's patch to add a -o option to scp and updated manpage
4084
4085 -- Philip Hands <phil@hands.com> Sun, 30 Jul 2000 00:12:49 +0100
4086
4087openssh (1:2.1.1p4-1) unstable; urgency=low
4088
4089 * New upstream release
4090
4091 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 14:46:16 +0100
4092
4093openssh (1:1.2.3-10) unstable; urgency=low
4094
4095 * add version to libpam-modules dependency, because old versions of
4096 pam_motd make it impossible to log in.
4097
4098 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 13:28:22 +0100
4099
4100openssh (1:1.2.3-9) frozen unstable; urgency=low
4101
4102 * force location of /usr/bin/X11/xauth
4103 (closes: #64424, #66437, #66859) *RC*
4104 * typos in config (closes: #66779, #66780)
4105 * sshd_not_to_be_run could be assumed to be true, in error, if the config
4106 script died in an unusual way --- I've reversed this (closes: #66335)
4107 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to ssh-askpass-ptk
4108 (closes: #65981)
4109 * change default for PermitRootLogin to "no" (closes: #66406)
4110
4111 -- Philip Hands <phil@hands.com> Tue, 11 Jul 2000 20:51:18 +0100
4112
4113openssh (1:1.2.3-8) frozen unstable; urgency=low
4114
4115 * get rid of Provides: rsh-server (this will mean that rstartd
4116 will need to change it's depends to deal with #63948, which I'm
4117 reopening) (closes: #66257)
4118 Given that this is also a trivial change, and is a reversal of a
4119 change that was mistakenly made after the freeze, I think this should
4120 also go into frozen.
4121
4122 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:26:30 +0100
4123
4124openssh (1:1.2.3-7) frozen unstable; urgency=low
4125
4126 * check if debconf is installed before calling db_stop in postinst.
4127 This is required to allow ssh to be installed when debconf is not
4128 wanted, which probably makes it an RC upload (hopefully the last of
4129 too many).
4130
4131 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:19:47 +0100
4132
4133openssh (1:1.2.3-6) frozen unstable; urgency=low
4134
4135 * fixed depressing little bug involving a line wrap looking like
4136 a blank line in the templates file *RC*
4137 (closes: #66090, #66078, #66083, #66182)
4138
4139 -- Philip Hands <phil@hands.com> Mon, 26 Jun 2000 00:45:05 +0100
4140
4141openssh (1:1.2.3-5) frozen unstable; urgency=low
4142
4143 * add code to prevent UseLogin exploit, although I think our PAM
4144 conditional code breaks UseLogin in a way that protects us from this
4145 exploit anyway. ;-) (closes: #65495) *RC*
4146 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to fix keyboard
4147 grab vulnerability in ssh-askpass-gnome (closes: #64795) *RC*
4148 * stop redirection of sshd's file descriptors (introduced in 1:1.2.3-3)
4149 and use db_stop in the postinst to solve that problem instead
4150 (closes: #65104)
4151 * add Provides: rsh-server to ssh (closes: #63948)
4152 * provide config option not to run sshd
4153
4154 -- Philip Hands <phil@hands.com> Mon, 12 Jun 2000 23:05:11 +0100
4155
4156openssh (1:1.2.3-4) frozen unstable; urgency=low
4157
4158 * fixes #63436 which is *RC*
4159 * add 10 second pause in init.d restart (closes: #63844)
4160 * get rid of noenv in PAM mail line (closes: #63856)
4161 * fix host key path in make-ssh-known-hosts (closes: #63713)
4162 * change wording of SUID template (closes: #62788, #63436)
4163
4164 -- Philip Hands <phil@hands.com> Sat, 27 May 2000 11:18:06 +0100
4165
4166openssh (1:1.2.3-3) frozen unstable; urgency=low
4167
4168 * redirect sshd's file descriptors to /dev/null in init to
4169 prevent debconf from locking up during installation
4170 ** grave bug just submited by me **
4171
4172 -- Philip Hands <phil@hands.com> Thu, 20 Apr 2000 17:10:59 +0100
4173
4174openssh (1:1.2.3-2) frozen unstable; urgency=low
4175
4176 * allow user to select SUID status of /usr/bin/ssh (closes: 62462) ** RC **
4177 * suggest debconf
4178 * conflict with debconf{,-tiny} (<<0.2.17) so I can clean up the preinst
4179
4180 -- Philip Hands <phil@hands.com> Wed, 19 Apr 2000 17:49:15 +0100
4181
4182openssh (1:1.2.3-1) frozen unstable; urgency=low
4183
4184 * New upstream release
4185 * patch sshd to create extra xauth key required for localhost
4186 (closes: #49944) *** RC ***
4187 * FallbacktoRsh now defaults to ``no'' to match impression
4188 given in sshd_config
4189 * stop setting suid bit on ssh (closes: #58711, #58558)
4190 This breaks Rhosts authentication (which nobody uses) and allows
4191 the LD_PRELOAD trick to get socks working, so seems like a net benefit.
4192
4193 -- Philip Hands <phil@hands.com> Thu, 13 Apr 2000 20:01:54 +0100
4194
4195openssh (1:1.2.2-1.4) frozen unstable; urgency=low
4196
4197 * Recompile for frozen, contains fix for RC bug.
4198
4199 -- Tommi Virtanen <tv@debian.org> Tue, 29 Feb 2000 22:14:58 +0200
4200
4201openssh (1:1.2.2-1.3) unstable; urgency=low
4202
4203 * Integrated man page addition for PrintLastLog.
4204 This bug was filed on "openssh", and I ended up
4205 creating my own patch for this (closes: #59054)
4206 * Improved error message when ssh_exchange_identification
4207 gets EOF (closes: #58904)
4208 * Fixed typo (your -> you're) in debian/preinst.
4209 * Added else-clauses to config to make this upgradepath possible:
4210 oldssh -> openssh preinst fails due to upgrade_to_openssh=false
4211 -> ssh-nonfree -> openssh. Without these, debconf remembered
4212 the old answer, config didn't force asking it, and preinst always
4213 aborted (closes: #56596, #57782)
4214 * Moved setting upgrade_to_openssh isdefault flag to the place
4215 where preinst would abort. This means no double question to most
4216 users, people who currently suffer from "can't upgrade" may need
4217 to run apt-get install ssh twice. Did not do the same for
4218 use_old_init_script, as the situation is a bit different, and
4219 less common (closes: #54010, #56224)
4220 * Check for existance of ssh-keygen before attempting to use it in
4221 preinst, added warning for non-existant ssh-keygen in config. This
4222 happens when the old ssh is removed (say, due to ssh-nonfree getting
4223 installed).
4224
4225 -- Tommi Virtanen <tv@debian.org> Sun, 27 Feb 2000 21:36:43 +0200
4226
4227openssh (1:1.2.2-1.2) frozen unstable; urgency=low
4228
4229 * Non-maintainer upload.
4230 * Added configuration option PrintLastLog, default off due to PAM
4231 (closes: #54007, #55042)
4232 * ssh-askpass-{gnome,ptk} now provide ssh-askpass, making ssh's
4233 Suggests: line more accurate. Also closing related bugs fixed
4234 earlier, when default ssh-askpass moved to /usr/bin.
4235 (closes: #52403, #54741, #50607, #52298, #50967, #51661)
4236 * Patched to call vhangup, with autoconf detection and all
4237 (closes: #55379)
4238 * Added --with-ipv4-default workaround to a glibc bug causing
4239 slow DNS lookups, as per UPGRADING. Use -6 to really use
4240 IPv6 addresses. (closes: #57891, #58744, #58713, #57970)
4241 * Added noenv to PAM pam_mail line. Thanks to Ben Collins.
4242 (closes: #58429)
4243 * Added the UPGRADING file to the package.
4244 * Added frozen to the changelog line and recompiled before
4245 package was installed into the archive.
4246
4247 -- Tommi Virtanen <tv@debian.org> Fri, 25 Feb 2000 22:08:57 +0200
4248
4249openssh (1:1.2.2-1.1) frozen unstable; urgency=low
4250
4251 * Non-maintainer upload.
4252 * Integrated scp pipe buffer patch from Ben Collins
4253 <benc@debian.org>, should now work even if reading
4254 a pipe gives less than fstat st_blksize bytes.
4255 Should now work on Alpha and Sparc Linux (closes: #53697, #52071)
4256 * Made ssh depend on libssl09 (>= 0.9.4-3) (closes: #51393)
4257 * Integrated patch from Ben Collins <benc@debian.org>
4258 to do full shadow account locking and expiration
4259 checking (closes: #58165, #51747)
4260
4261 -- Tommi Virtanen <tv@debian.org> Tue, 22 Feb 2000 20:46:12 +0200
4262
4263openssh (1:1.2.2-1) frozen unstable; urgency=medium
4264
4265 * New upstream release (closes: #56870, #56346)
4266 * built against new libesd (closes: #56805)
4267 * add Colin Watson <cjw44@cam.ac.uk> =NULL patch
4268 (closes: #49902, #54894)
4269 * use socketpairs as suggested by Andrew Tridgell to eliminate rsync
4270 (and other) lockups
4271 * patch SSHD_PAM_SERVICE back into auth-pam.c, again :-/
4272 (closes: #49902, #55872, #56959)
4273 * uncoment the * line in ssh_config (closes: #56444)
4274
4275 * #54894 & #49902 are release critical, so this should go in frozen
4276
4277 -- Philip Hands <phil@hands.com> Wed, 9 Feb 2000 04:52:04 +0000
4278
4279openssh (1:1.2.1pre24-1) unstable; urgency=low
4280
4281 * New upstream release
4282
4283 -- Philip Hands <phil@hands.com> Fri, 31 Dec 1999 02:47:24 +0000
4284
4285openssh (1:1.2.1pre23-1) unstable; urgency=low
4286
4287 * New upstream release
4288 * excape ? in /etc/init.d/ssh (closes: #53269)
4289
4290 -- Philip Hands <phil@hands.com> Wed, 29 Dec 1999 16:50:46 +0000
4291
4292openssh (1:1.2pre17-1) unstable; urgency=low
4293
4294 * New upstream release
4295
4296 -- Philip Hands <phil@hands.com> Thu, 9 Dec 1999 16:50:40 +0000
4297
4298openssh (1:1.2pre16-1) unstable; urgency=low
4299
4300 * New upstream release
4301 * upstream release (1.2pre14) (closes: #50299)
4302 * make ssh depend on libwrap0 (>= 7.6-1.1) (closes: #50973, #50776)
4303 * dispose of grep -q broken pipe message in config script (closes: #50855)
4304 * add make-ssh-known-hosts (closes: #50660)
4305 * add -i option to ssh-copy-id (closes: #50657)
4306 * add check for *LK* in password, indicating a locked account
4307
4308 -- Philip Hands <phil@hands.com> Wed, 8 Dec 1999 22:59:38 +0000
4309
4310openssh (1:1.2pre13-1) unstable; urgency=low
4311
4312 * New upstream release
4313 * make sshd.c use SSHD_PAM_SERVICE and define it as "ssh" in debian/rules
4314 * remove duplicate line in /etc/pam.d/ssh (closes: #50310)
4315 * mention ssh -A option in ssh.1 & ssh_config
4316 * enable forwarding to localhost in default ssh_config (closes: #50373)
4317 * tweak preinst to deal with debconf being `unpacked'
4318 * use --with-tcp-wrappers (closes: #49545)
4319
4320 -- Philip Hands <phil@hands.com> Sat, 20 Nov 1999 14:20:04 +0000
4321
4322openssh (1:1.2pre11-2) unstable; urgency=low
4323
4324 * oops, just realised that I forgot to strip out the unpleasant
4325 fiddling mentioned below (which turned not to be a fix anyway)
4326
4327 -- Philip Hands <phil@hands.com> Mon, 15 Nov 1999 01:35:23 +0000
4328
4329openssh (1:1.2pre11-1) unstable; urgency=low
4330
4331 * New upstream release (closes: #49722)
4332 * add 2>/dev/null to dispose of spurious message casused by grep -q
4333 (closes: #49876, #49604)
4334 * fix typo in debian/control (closes: #49841)
4335 * Do some unpleasant fiddling with upgraded keys in the preinst, which
4336 should make the keylength problem go away. (closes: #49676)
4337 * make pam_start in sshd use ``ssh'' as the service name (closes: #49956)
4338 * If /etc/ssh/NOSERVER exist, stop sshd from starting (closes: #47107)
4339 * apply Ben Collins <bcollins@debian.org>'s shadow patch
4340 * disable lastlogin and motd printing if using pam (closes: #49957)
4341 * add ssh-copy-id script and manpage
4342
4343 -- Philip Hands <phil@hands.com> Fri, 12 Nov 1999 01:03:38 +0000
4344
4345openssh (1:1.2pre9-1) unstable; urgency=low
4346
4347 * New upstream release
4348 * apply Chip Salzenberg <chip@valinux.com>'s SO_REUSEADDR patch
4349 to channels.c, to make forwarded ports instantly reusable
4350 * replace Pre-Depend: debconf with some check code in preinst
4351 * make the ssh-add ssh-askpass failure message more helpful
4352 * fix the ssh-agent getopts bug (closes: #49426)
4353 * fixed typo on Suggests: line (closes: #49704, #49571)
4354 * tidy up ssh package description (closes: #49642)
4355 * make ssh suid (closes: #49635)
4356 * in preinst upgrade code, ensure ssh_host_keys is mode 600 (closes: #49606)
4357 * disable agent forwarding by default, for the similar reasons as
4358 X forwarding (closes: #49586)
4359
4360 -- Philip Hands <phil@hands.com> Tue, 9 Nov 1999 09:57:47 +0000
4361
4362openssh (1:1.2pre7-4) unstable; urgency=low
4363
4364 * predepend on debconf (>= 0.2.17) should now allow preinst questions
4365
4366 -- Philip Hands <phil@hands.com> Sat, 6 Nov 1999 10:31:06 +0000
4367
4368openssh (1:1.2pre7-3) unstable; urgency=low
4369
4370 * add ssh-askpass package using Tommi Virtanen's perl-tk script
4371 * add ssh-preconfig package cludge
4372 * add usage hints to ssh-agent.1
4373
4374 -- Philip Hands <phil@hands.com> Fri, 5 Nov 1999 00:38:33 +0000
4375
4376openssh (1:1.2pre7-2) unstable; urgency=low
4377
4378 * use pam patch from Ben Collins <bcollins@debian.org>
4379 * add slogin symlink to Makefile.in
4380 * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login
4381 * sort out debconf usage
4382 * patch from Tommi Virtanen <tv@debian.org>'s makes ssh-add use ssh-askpass
4383
4384 -- Philip Hands <phil@hands.com> Thu, 4 Nov 1999 11:08:54 +0000
4385
4386openssh (1:1.2pre7-1) unstable; urgency=low
4387
4388 * New upstream release
4389
4390 -- Philip Hands <phil@hands.com> Tue, 2 Nov 1999 21:02:37 +0000
4391
4392openssh (1:1.2.0.pre6db1-2) unstable; urgency=low
4393
4394 * change the binary package name to ssh (the non-free branch of ssh has
4395 been renamed to ssh-nonfree)
4396 * make pam file comply with Debian standards
4397 * use an epoch to make sure openssh supercedes ssh-nonfree
4398
4399 -- Philip Hands <phil@hands.com> Sat, 30 Oct 1999 16:26:05 +0100
4400
4401openssh (1.2pre6db1-1) unstable; urgency=low
4402
4403 * New upstream source
4404 * sshd accepts logins now!
4405
4406 -- Dan Brosemer <odin@linuxfreak.com> Fri, 29 Oct 1999 11:13:38 -0500
4407
4408openssh (1.2.0.19991028-1) unstable; urgency=low
4409
4410 * New upstream source
4411 * Added test for -lnsl to configure script
4412
4413 -- Dan Brosemer <odin@linuxfreak.com> Thu, 28 Oct 1999 18:52:09 -0500
4414
4415openssh (1.2.0.19991027-3) unstable; urgency=low
4416
4417 * Initial release
4418
4419 -- Dan Brosemer <odin@linuxfreak.com> Wed, 27 Oct 1999 19:39:46 -0500
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000000000..fcd68b77e
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
1config.log
2debian/openssh-server.sshd.pam
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000000000..541cb851d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,200 @@
1Source: openssh
2Section: net
3Priority: standard
4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg-dev (>= 1.16.1~), dh-autoreconf, autotools-dev, dh-systemd (>= 1.4), libaudit-dev [linux-any], libsystemd-dev [linux-any]
6Standards-Version: 3.9.7
7Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
8Homepage: http://www.openssh.com/
9Vcs-Git: https://anonscm.debian.org/git/pkg-ssh/openssh.git
10Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ssh/openssh.git
11
12Package: openssh-client
13Architecture: any
14Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
15Recommends: xauth
16Conflicts: sftp
17Replaces: ssh, ssh-krb5
18Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere
19Provides: rsh-client, ssh-client
20Multi-Arch: foreign
21Description: secure shell (SSH) client, for secure access to remote machines
22 This is the portable version of OpenSSH, a free implementation of
23 the Secure Shell protocol as specified by the IETF secsh working
24 group.
25 .
26 Ssh (Secure Shell) is a program for logging into a remote machine
27 and for executing commands on a remote machine.
28 It provides secure encrypted communications between two untrusted
29 hosts over an insecure network. X11 connections and arbitrary TCP/IP
30 ports can also be forwarded over the secure channel.
31 It can be used to provide applications with a secure communication
32 channel.
33 .
34 This package provides the ssh, scp and sftp clients, the ssh-agent
35 and ssh-add programs to make public key authentication more convenient,
36 and the ssh-keygen, ssh-keyscan, ssh-copy-id and ssh-argv0 utilities.
37 .
38 In some countries it may be illegal to use any encryption at all
39 without a special permit.
40 .
41 ssh replaces the insecure rsh, rcp and rlogin programs, which are
42 obsolete for most purposes.
43
44Package: openssh-client-ssh1
45Priority: extra
46Architecture: any
47Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client (= ${binary:Version})
48Multi-Arch: foreign
49Description: secure shell (SSH) client for legacy SSH1 protocol
50 This is the portable version of OpenSSH, a free implementation of
51 the Secure Shell protocol as specified by the IETF secsh working
52 group.
53 .
54 Ssh (Secure Shell) is a program for logging into a remote machine
55 and for executing commands on a remote machine.
56 It provides secure encrypted communications between two untrusted
57 hosts over an insecure network. X11 connections and arbitrary TCP/IP
58 ports can also be forwarded over the secure channel.
59 It can be used to provide applications with a secure communication
60 channel.
61 .
62 This package provides the ssh1 and scp1 clients and the ssh-keygen1
63 utility, all built with support for the legacy SSH1 protocol. This
64 protocol is obsolete and should not normally be used, but in some cases
65 there may be no alternative way to connect to outdated servers.
66 .
67 In some countries it may be illegal to use any encryption at all
68 without a special permit.
69 .
70 ssh replaces the insecure rsh, rcp and rlogin programs, which are
71 obsolete for most purposes.
72
73Package: openssh-server
74Priority: optional
75Architecture: any
76Pre-Depends: ${misc:Pre-Depends}
77Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps, openssh-sftp-server
78Recommends: xauth, ncurses-term, libpam-systemd, ${openssh-server:Recommends}
79Conflicts: ssh-socks, ssh2, sftp
80Replaces: ssh, ssh-krb5
81Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere
82Provides: ssh-server
83Multi-Arch: foreign
84Description: secure shell (SSH) server, for secure access from remote machines
85 This is the portable version of OpenSSH, a free implementation of
86 the Secure Shell protocol as specified by the IETF secsh working
87 group.
88 .
89 Ssh (Secure Shell) is a program for logging into a remote machine
90 and for executing commands on a remote machine.
91 It provides secure encrypted communications between two untrusted
92 hosts over an insecure network. X11 connections and arbitrary TCP/IP
93 ports can also be forwarded over the secure channel.
94 It can be used to provide applications with a secure communication
95 channel.
96 .
97 This package provides the sshd server.
98 .
99 In some countries it may be illegal to use any encryption at all
100 without a special permit.
101 .
102 sshd replaces the insecure rshd program, which is obsolete for most
103 purposes.
104
105Package: openssh-sftp-server
106Priority: optional
107Architecture: any
108Depends: ${shlibs:Depends}, ${misc:Depends}
109Recommends: openssh-server | ssh-server
110Breaks: openssh-server (<< 1:6.5p1-5)
111Replaces: openssh-server (<< 1:6.5p1-5)
112Enhances: openssh-server, ssh-server
113Description: secure shell (SSH) sftp server module, for SFTP access from remote machines
114 This is the portable version of OpenSSH, a free implementation of
115 the Secure Shell protocol as specified by the IETF secsh working
116 group.
117 .
118 Ssh (Secure Shell) is a program for logging into a remote machine
119 and for executing commands on a remote machine.
120 It provides secure encrypted communications between two untrusted
121 hosts over an insecure network. X11 connections and arbitrary TCP/IP
122 ports can also be forwarded over the secure channel.
123 It can be used to provide applications with a secure communication
124 channel.
125 .
126 This package provides the SFTP server module for the SSH server. It
127 is needed if you want to access your SSH server with SFTP. The SFTP
128 server module also works with other SSH daemons like dropbear.
129 .
130 OpenSSH's sftp and sftp-server implement revision 3 of the SSH filexfer
131 protocol described in:
132 .
133 http://www.openssh.com/txt/draft-ietf-secsh-filexfer-02.txt
134 .
135 Newer versions of the draft will not be supported, though some features
136 are individually implemented as extensions.
137
138Package: ssh
139Priority: extra
140Architecture: all
141Pre-Depends: dpkg (>= 1.17.5)
142Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
143Description: secure shell client and server (metapackage)
144 This metapackage is a convenient way to install both the OpenSSH client
145 and the OpenSSH server. It provides nothing in and of itself, so you
146 may remove it if nothing depends on it.
147
148Package: ssh-krb5
149Section: oldlibs
150Priority: extra
151Architecture: all
152Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
153Description: secure shell client and server (transitional package)
154 This is a transitional package depending on the regular Debian OpenSSH
155 client and server, which now support GSSAPI natively. It will add the
156 necessary GSSAPI options to the server configuration file. You can
157 remove it once the upgrade is complete and nothing depends on it.
158
159Package: ssh-askpass-gnome
160Section: gnome
161Priority: optional
162Architecture: any
163Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5
164Replaces: ssh (<< 1:3.5p1-3)
165Provides: ssh-askpass
166Description: interactive X program to prompt users for a passphrase for ssh-add
167 This has been split out of the main openssh-client package so that
168 openssh-client does not need to depend on GTK+.
169 .
170 You probably want the ssh-askpass package instead, but this is
171 provided to add to your choice and/or confusion.
172
173Package: openssh-client-udeb
174Package-Type: udeb
175Section: debian-installer
176Priority: optional
177Architecture: any
178Depends: ${shlibs:Depends}
179XB-Installer-Menu-Item: 99999
180Description: secure shell client for the Debian installer
181 This is the portable version of OpenSSH, a free implementation of
182 the Secure Shell protocol as specified by the IETF secsh working
183 group.
184 .
185 This package provides the ssh client for use in debian-installer.
186
187Package: openssh-server-udeb
188Package-Type: udeb
189Section: debian-installer
190Priority: optional
191Architecture: any
192Depends: ${shlibs:Depends}
193Description: secure shell server for the Debian installer
194 This is the portable version of OpenSSH, a free implementation of
195 the Secure Shell protocol as specified by the IETF secsh working
196 group.
197 .
198 This package provides the sshd server for use in debian-installer.
199 Since it is expected to be used in specialized situations (e.g. S/390
200 installs with no console), it does not provide any configuration.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..5b360cac4
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,392 @@
1This package was debianized by Philip Hands <phil@hands.com> on 31 Oct 1999
2(with help from Dan Brosemer <odin@linuxfreak.com>)
3
4It was downloaded from here:
5 ftp://ftp.fu-berlin.de/unix/security/openssh/openssh-2.3.0p1.tar.gz
6
7worldwide mirrors are listed here:
8 http://www.openssh.com/ftp.html
9
10The Debian-specific parts of the package were initially derived from the
11original ssh package, which has since been renamed as ssh-nonfree.
12
13The Debian patch is distributed under the terms of the GPL, which you
14can find in /usr/share/common-licenses/GPL-2.
15
16In addition, as a special exception, Matthew Vernon gives permission
17to link the code of the Debian patch with any version of the OpenSSH
18code which is distributed under a license identical to that listed in
19the included Copyright file, and distribute linked combinations
20including the two. You must obey the GNU General Public License in
21all respects for all of the code used other than OpenSSH. If you
22modify this file, you may extend this exception to your version of the
23file, but you are not obligated to do so. If you do not wish to do
24so, delete this exception statement from your version.
25
26The upstream source for this package is a combination of the ssh
27branch that is being maintained by the OpenBSD team (starting from
28the last version of SSH that was distributed under a free license),
29and porting work by Damien Miller <damien@ibs.com.au> to get it
30working on Linux. Other people also contributed to this, and are
31credited in /usr/share/doc/ssh/README.
32
33This package contains Kerberos version 5 patches from
34http://www.sxw.org.uk/computing/patches/openssh.html; this is Copyright
35(c) 2001-2009 Simon Wilkinson and provided under the standard 2-term BSD
36licence used elsewhere in OpenSSH.
37
38Copyright:
39
40Code in helper.[ch] is Copyright Internet Business Solutions and is
41released under a X11-style license (see source file for details).
42
43(A)RC4 code in rc4.[ch] is Copyright Damien Miller. It too is under a
44X11-style license (see source file for details).
45
46make-ssh-known-hosts is Copyright Tero Kivinen <Tero.Kivinen@hut.fi>,
47and is distributed under the GPL (see source file for details).
48
49The copyright for the original SSH version follows. It has been
50modified with [comments] to reflect the changes that the OpenBSD folks
51have made:
52
53This file is part of the OpenSSH software.
54
55The licences which components of this software fall under are as
56follows. First, we will summarize and say that all components
57are under a BSD licence, or a licence more free than that.
58
59OpenSSH contains no GPL code.
60
611)
62 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
63 * All rights reserved
64 *
65 * As far as I am concerned, the code I have written for this software
66 * can be used freely for any purpose. Any derived versions of this
67 * software must be clearly marked as such, and if the derived work is
68 * incompatible with the protocol description in the RFC file, it must be
69 * called by a name other than "ssh" or "Secure Shell".
70
71 [Tatu continues]
72 * However, I am not implying to give any licenses to any patents or
73 * copyrights held by third parties, and the software includes parts that
74 * are not under my direct control. As far as I know, all included
75 * source code is used in accordance with the relevant license agreements
76 * and can be used freely for any purpose (the GNU license being the most
77 * restrictive); see below for details.
78
79 [However, none of that term is relevant at this point in time. All of
80 these restrictively licenced software components which he talks about
81 have been removed from OpenSSH, i.e.,
82
83 - RSA is no longer included, found in the OpenSSL library
84 - IDEA is no longer included, its use is deprecated
85 - DES is now external, in the OpenSSL library
86 - GMP is no longer used, and instead we call BN code from OpenSSL
87 - Zlib is now external, in a library
88 - The make-ssh-known-hosts script is no longer included
89 - TSS has been removed
90 - MD5 is now external, in the OpenSSL library
91 - RC4 support has been replaced with ARC4 support from OpenSSL
92 - Blowfish is now external, in the OpenSSL library
93
94 [The licence continues]
95
96 Note that any information and cryptographic algorithms used in this
97 software are publicly available on the Internet and at any major
98 bookstore, scientific library, and patent office worldwide. More
99 information can be found e.g. at "http://www.cs.hut.fi/crypto".
100
101 The legal status of this program is some combination of all these
102 permissions and restrictions. Use only at your own responsibility.
103 You will be responsible for any legal consequences yourself; I am not
104 making any claims whether possessing or using this is legal or not in
105 your country, and I am not taking any responsibility on your behalf.
106
107
108 NO WARRANTY
109
110 BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
111 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
112 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
113 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
114 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
115 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
116 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
117 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
118 REPAIR OR CORRECTION.
119
120 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
121 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
122 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
123 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
124 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
125 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
126 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
127 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
128 POSSIBILITY OF SUCH DAMAGES.
129
1302)
131 The 32-bit CRC compensation attack detector in deattack.c was
132 contributed by CORE SDI S.A. under a BSD-style license.
133
134 * Cryptographic attack detector for ssh - source code
135 *
136 * Copyright (c) 1998 CORE SDI S.A., Buenos Aires, Argentina.
137 *
138 * All rights reserved. Redistribution and use in source and binary
139 * forms, with or without modification, are permitted provided that
140 * this copyright notice is retained.
141 *
142 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
143 * WARRANTIES ARE DISCLAIMED. IN NO EVENT SHALL CORE SDI S.A. BE
144 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR
145 * CONSEQUENTIAL DAMAGES RESULTING FROM THE USE OR MISUSE OF THIS
146 * SOFTWARE.
147 *
148 * Ariel Futoransky <futo@core-sdi.com>
149 * <http://www.core-sdi.com>
150
1513)
152 ssh-keyscan was contributed by David Mazieres under a BSD-style
153 license.
154
155 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
156 *
157 * Modification and redistribution in source and binary forms is
158 * permitted provided that due credit is given to the author and the
159 * OpenBSD project by leaving this copyright notice intact.
160
1614)
162 The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers
163 and Paulo Barreto is in the public domain and distributed
164 with the following license:
165
166 * @version 3.0 (December 2000)
167 *
168 * Optimised ANSI C code for the Rijndael cipher (now AES)
169 *
170 * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
171 * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
172 * @author Paulo Barreto <paulo.barreto@terra.com.br>
173 *
174 * This code is hereby placed in the public domain.
175 *
176 * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
177 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
178 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
179 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
180 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
181 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
182 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
183 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
184 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
185 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
186 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
187
1885)
189 One component of the ssh source code is under a 3-clause BSD license,
190 held by the University of California, since we pulled these parts from
191 original Berkeley code.
192
193 * Copyright (c) 1983, 1990, 1992, 1993, 1995
194 * The Regents of the University of California. All rights reserved.
195 *
196 * Redistribution and use in source and binary forms, with or without
197 * modification, are permitted provided that the following conditions
198 * are met:
199 * 1. Redistributions of source code must retain the above copyright
200 * notice, this list of conditions and the following disclaimer.
201 * 2. Redistributions in binary form must reproduce the above copyright
202 * notice, this list of conditions and the following disclaimer in the
203 * documentation and/or other materials provided with the distribution.
204 * 3. Neither the name of the University nor the names of its contributors
205 * may be used to endorse or promote products derived from this software
206 * without specific prior written permission.
207 *
208 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
209 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
210 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
211 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
212 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
213 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
214 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
215 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
216 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
217 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
218 * SUCH DAMAGE.
219
2206)
221 Remaining components of the software are provided under a standard
222 2-term BSD licence with the following names as copyright holders:
223
224 Markus Friedl
225 Theo de Raadt
226 Niels Provos
227 Dug Song
228 Aaron Campbell
229 Damien Miller
230 Kevin Steves
231 Daniel Kouril
232 Wesley Griffin
233 Per Allansson
234 Nils Nordman
235 Simon Wilkinson
236
237 Portable OpenSSH additionally includes code from the following copyright
238 holders, also under the 2-term BSD license:
239
240 Ben Lindstrom
241 Tim Rice
242 Andre Lucas
243 Chris Adams
244 Corinna Vinschen
245 Cray Inc.
246 Denis Parker
247 Gert Doering
248 Jakob Schlyter
249 Jason Downs
250 Juha Yrjölä
251 Michael Stone
252 Networks Associates Technology, Inc.
253 Solar Designer
254 Todd C. Miller
255 Wayne Schroeder
256 William Jones
257 Darren Tucker
258 Sun Microsystems
259 The SCO Group
260 Daniel Walsh
261 Red Hat, Inc
262 Simon Vallet / Genoscope
263
264 * Redistribution and use in source and binary forms, with or without
265 * modification, are permitted provided that the following conditions
266 * are met:
267 * 1. Redistributions of source code must retain the above copyright
268 * notice, this list of conditions and the following disclaimer.
269 * 2. Redistributions in binary form must reproduce the above copyright
270 * notice, this list of conditions and the following disclaimer in the
271 * documentation and/or other materials provided with the distribution.
272 *
273 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
274 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
275 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
276 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
277 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
278 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
279 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
280 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
281 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
282 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
283
2848) Portable OpenSSH contains the following additional licenses:
285
286 a) md5crypt.c, md5crypt.h
287
288 * "THE BEER-WARE LICENSE" (Revision 42):
289 * <phk@login.dknet.dk> wrote this file. As long as you retain this
290 * notice you can do whatever you want with this stuff. If we meet
291 * some day, and you think this stuff is worth it, you can buy me a
292 * beer in return. Poul-Henning Kamp
293
294 b) snprintf replacement
295
296 * Copyright Patrick Powell 1995
297 * This code is based on code written by Patrick Powell
298 * (papowell@astart.com) It may be used for any purpose as long as this
299 * notice remains intact on all source code distributions
300
301 c) Compatibility code (openbsd-compat)
302
303 Apart from the previously mentioned licenses, various pieces of code
304 in the openbsd-compat/ subdirectory are licensed as follows:
305
306 Some code is licensed under a 3-term BSD license, to the following
307 copyright holders:
308
309 Todd C. Miller
310 Theo de Raadt
311 Damien Miller
312 Eric P. Allman
313 The Regents of the University of California
314 Constantin S. Svintsoff
315
316 * Redistribution and use in source and binary forms, with or without
317 * modification, are permitted provided that the following conditions
318 * are met:
319 * 1. Redistributions of source code must retain the above copyright
320 * notice, this list of conditions and the following disclaimer.
321 * 2. Redistributions in binary form must reproduce the above copyright
322 * notice, this list of conditions and the following disclaimer in the
323 * documentation and/or other materials provided with the distribution.
324 * 3. Neither the name of the University nor the names of its contributors
325 * may be used to endorse or promote products derived from this software
326 * without specific prior written permission.
327 *
328 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
329 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
330 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
331 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
332 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
333 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
334 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
335 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
336 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
337 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
338 * SUCH DAMAGE.
339
340 Some code is licensed under an ISC-style license, to the following
341 copyright holders:
342
343 Internet Software Consortium.
344 Todd C. Miller
345 Reyk Floeter
346 Chad Mynhier
347
348 * Permission to use, copy, modify, and distribute this software for any
349 * purpose with or without fee is hereby granted, provided that the above
350 * copyright notice and this permission notice appear in all copies.
351 *
352 * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
353 * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
354 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
355 * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
356 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
357 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
358 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
359
360 Some code is licensed under a MIT-style license to the following
361 copyright holders:
362
363 Free Software Foundation, Inc.
364
365 * Permission is hereby granted, free of charge, to any person obtaining a *
366 * copy of this software and associated documentation files (the *
367 * "Software"), to deal in the Software without restriction, including *
368 * without limitation the rights to use, copy, modify, merge, publish, *
369 * distribute, distribute with modifications, sublicense, and/or sell *
370 * copies of the Software, and to permit persons to whom the Software is *
371 * furnished to do so, subject to the following conditions: *
372 * *
373 * The above copyright notice and this permission notice shall be included *
374 * in all copies or substantial portions of the Software. *
375 * *
376 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
377 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
378 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
379 * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
380 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
381 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
382 * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
383 * *
384 * Except as contained in this notice, the name(s) of the above copyright *
385 * holders shall not be used in advertising or otherwise to promote the *
386 * sale, use or other dealings in this Software without prior written *
387 * authorization. *
388 ****************************************************************************/
389
390
391------
392$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
diff --git a/debian/copyright.head b/debian/copyright.head
new file mode 100644
index 000000000..bf1ab0ea2
--- /dev/null
+++ b/debian/copyright.head
@@ -0,0 +1,52 @@
1This package was debianized by Philip Hands <phil@hands.com> on 31 Oct 1999
2(with help from Dan Brosemer <odin@linuxfreak.com>)
3
4It was downloaded from here:
5 ftp://ftp.fu-berlin.de/unix/security/openssh/openssh-2.3.0p1.tar.gz
6
7worldwide mirrors are listed here:
8 http://www.openssh.com/ftp.html
9
10The Debian-specific parts of the package were initially derived from the
11original ssh package, which has since been renamed as ssh-nonfree.
12
13The Debian patch is distributed under the terms of the GPL, which you
14can find in /usr/share/common-licenses/GPL-2.
15
16In addition, as a special exception, Matthew Vernon gives permission
17to link the code of the Debian patch with any version of the OpenSSH
18code which is distributed under a license identical to that listed in
19the included Copyright file, and distribute linked combinations
20including the two. You must obey the GNU General Public License in
21all respects for all of the code used other than OpenSSH. If you
22modify this file, you may extend this exception to your version of the
23file, but you are not obligated to do so. If you do not wish to do
24so, delete this exception statement from your version.
25
26The upstream source for this package is a combination of the ssh
27branch that is being maintained by the OpenBSD team (starting from
28the last version of SSH that was distributed under a free license),
29and porting work by Damien Miller <damien@ibs.com.au> to get it
30working on Linux. Other people also contributed to this, and are
31credited in /usr/share/doc/ssh/README.
32
33This package contains Kerberos version 5 patches from
34http://www.sxw.org.uk/computing/patches/openssh.html; this is Copyright
35(c) 2001-2009 Simon Wilkinson and provided under the standard 2-term BSD
36licence used elsewhere in OpenSSH.
37
38Copyright:
39
40Code in helper.[ch] is Copyright Internet Business Solutions and is
41released under a X11-style license (see source file for details).
42
43(A)RC4 code in rc4.[ch] is Copyright Damien Miller. It too is under a
44X11-style license (see source file for details).
45
46make-ssh-known-hosts is Copyright Tero Kivinen <Tero.Kivinen@hut.fi>,
47and is distributed under the GPL (see source file for details).
48
49The copyright for the original SSH version follows. It has been
50modified with [comments] to reflect the changes that the OpenBSD folks
51have made:
52
diff --git a/debian/faq.html b/debian/faq.html
new file mode 100644
index 000000000..7f0252891
--- /dev/null
+++ b/debian/faq.html
@@ -0,0 +1,1187 @@
1<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2<html>
3<head>
4<title>OpenSSH FAQ</title>
5<link rev= "made" href= "mailto:www@openbsd.org">
6<meta name= "resource-type" content= "document">
7<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
8<meta name= "description" content= "the OpenSSH FAQ page">
9<meta name= "keywords" content= "OpenSSH,SSH,Secure Shell,faq">
10<meta name= "distribution" content= "global">
11<meta name= "copyright" content= "This document copyright 1999-2010 OpenBSD.">
12</head>
13
14<body bgcolor= "#ffffff" text= "#000000" link= "#23238E">
15<a href="http://www.openssh.com/index.html"><img alt="[OpenSSH]" height="30" width="141" src="images/smalltitle.gif" border="0"></a>
16<p>
17
18<h1>OpenSSH FAQ (Frequently asked questions)</h1>
19
20<hr>
21
22<blockquote>
23<h3><a href= "#1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></h3>
24<ul>
25<li><a href= "#1.1">1.1 - What is OpenSSH and where can I download it?</a>
26<li><a href= "#1.2">1.2 - Why should it be used?</a>
27<li><a href= "#1.3">1.3 - What Operating Systems are supported?</a>
28<li><a href= "#1.4">1.4 - What about copyright, usage and patents?</a>
29<li><a href= "#1.5">1.5 - Where should I ask for help?</a>
30<li><a href= "#1.6">1.6 - I have found a bug. Where do I report it?</a>
31</ul>
32
33<h3><a href= "#2.0">2.0 - General Questions</a></h3>
34<ul>
35<li><a href= "#2.1">2.1 - Why does ssh/scp make connections from low-numbered ports. My firewall blocks these.</a>
36<li><a href= "#2.2">2.2 - Why is the ssh client setuid root?</a>
37<li><a href= "#2.3">2.3 - Why does SSH 2.3 have problems interoperating with OpenSSH 2.1.1?</a>
38<li><a href= "#2.4">2.4 - Why does OpenSSH print: Dispatch protocol error: type 20</a>
39<li><a href= "#2.5">2.5 - Old versions of commercial SSH encrypt host keys with IDEA.</a>
40<li><a href= "#2.6">2.6 - What are these warning messages about key lengths?</a>
41<li><a href= "#2.7">2.7 - X11 and/or agent forwarding does not work.</a>
42<li><a href= "#2.8">2.8 - After upgrading OpenSSH I lost SSH2 support.</a>
43<li><a href= "#2.9">2.9 - sftp/scp fails at connection, but ssh is OK.</a>
44<li><a href= "#2.10">2.10 - Will you add [foo] to scp?</a>
45<li><a href= "#2.11">2.11 - How do I use port forwarding?</a>
46<li><a href= "#2.12">2.12 - My ssh connection freezes or drops out after N minutes of inactivity.</a>
47<li><a href= "#2.13">2.13 - How do I use scp to copy a file with a colon in it?</a>
48<li><a href= "#2.14">2.14 - Why does OpenSSH report its version to clients?</a>
49</ul>
50
51<h3><a href= "#3.0">3.0 - Portable OpenSSH Questions</a></h3>
52<ul>
53<li><a href= "#3.1">3.1 - Spurious PAM authentication messages in logfiles.</a>
54<li><a href= "#3.2">3.2 - Empty passwords not allowed with PAM authentication.</a>
55<li><a href= "#3.3">3.3 - ssh(1) takes a long time to connect or log in</a>
56<li><a href= "#3.4">3.4 - "Can't locate module net-pf-10" messages in log under Linux.</a>
57<li><a href= "#3.5">3.5 - Password authentication doesn't work (eg on Slackware 7.0 or Red Hat Linux 6.x)</a>
58<li><a href= "#3.6">3.6 - Configure or sshd(8) complain about lack of RSA support</a>
59<li><a href= "#3.7">3.7 - "scp: command not found" errors</a>
60<li><a href= "#3.8">3.8 - Unable to read passphrase</a>
61<li><a href= "#3.9">3.9 - 'configure' missing or make fails</a>
62<li><a href= "#3.10">3.10 - Hangs when exiting ssh</a>
63<li><a href= "#3.11">3.11 - Why does ssh hang on exit?</a>
64<li><a href= "#3.12">3.12 - I upgraded to OpenSSH 3.1 and X11 forwarding stopped working.</a>
65<li><a href= "#3.13">3.13 - I upgraded to OpenSSH 3.8 and some X11 programs stopped working.</a>
66<li><a href= "#3.14">3.14 - I copied my public key to authorized_keys but public-key authentication still doesn't work.</a>
67<li><a href= "#3.15">3.15 - OpenSSH versions and PAM behaviour.</a>
68<li><a href= "#3.16">3.16 - Why doesn't "w" or "who" on AIX 5.x show users logged in via ssh?</a>
69</ul>
70
71</blockquote>
72
73<hr>
74
75<h2><u><a name= "1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></u></h2>
76
77<h2><a name= "1.1">1.1 - What is OpenSSH and where can I download it?</a></h2>
78
79OpenSSH provides end-to-end encrypted replacement of applications such as
80telnet, rlogin, and ftp.
81Unlike these legacy applications, OpenSSH never passes anything
82(including username and password) over the wire in unencrypted form, and
83provides host authentication, to verify that you really are talking to
84the system that you think you are and that no one else can take over
85that session.
86
87<p>
88The OpenSSH suite includes the
89<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
90program which replaces rlogin and telnet, and
91<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a>
92which replaces
93<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rcp&amp;sektion=1">rcp(1)</a> and
94<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&amp;sektion=1">ftp(1)</a>.
95OpenSSH has also added
96<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a> and
97<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a>
98which implement an easier solution for file-transfer. This is based upon the
99<a href="http://www.openssh.com/txt/draft-ietf-secsh-filexfer-02.txt">secsh-filexfer</a> IETF draft.
100
101
102<p><strong>OpenSSH consists of a number of programs.</strong>
103
104<ul>
105<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a> - Server program run on the server machine. This listens for connections from client machines, and whenever it receives a connection, it performs authentication and starts serving the client.
106Its behaviour is controlled by the config file <i><a
107href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">
108sshd_config(5)</a></i>.
109<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a> - This is the client program used to log into another machine or to execute commands on the other machine. <i>slogin</i> is another name for this program.
110Its behaviour is controlled by the global config file <i><a
111href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&amp;sektion=5">
112ssh_config(5)</a></i> and individual users' <i>$HOME/.ssh/config</i> files.
113<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a> - Securely copies files from one machine to another.
114<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a> - Used to create Pubkey Authentication (RSA or DSA) keys (host keys and user authentication keys).
115<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-agent&amp;sektion=1">ssh-agent(1)</a> - Authentication agent. This can be used to hold RSA keys for authentication.
116<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-add&amp;sektion=1">ssh-add(1)</a> - Used to register new keys with the agent.
117<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a> - SFTP server subsystem.
118<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a> - Secure file transfer program.
119<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keyscan&amp;sektion=1">ssh-keyscan(1)</a> - gather ssh public keys.
120<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keysign&amp;sektion=8">ssh-keysign(8)</a> - ssh helper program for hostbased authentication.
121</ul>
122
123<h3>Downloading</h3>
124
125<p>
126The most recent version of OpenSSH is included with the current
127distribution of <a href="http://www.openbsd.org/">OpenBSD</a>, and
128installed as part of a basic install.
129
130<p>
131Today, most other operating systems include some version of OpenSSH
132(often re-badged or privately labeled), so most users can immediately
133use it.
134However, sometimes the included versions are quite old, and missing
135features of the current release of OpenSSH, and you may wish to install
136the current version, or install it on one of the few OSs that lacked it,
137and where the OS publisher does not make a modern version available.
138You may also wish to use OpenSSH on your embedded application.
139
140<p>
141Non-OpenBSD users will want to download, compile and install the
142multi-platform <a href="http://www.openssh.com/portable.html">Portable</a> distribution from a
143<a href="http://www.openssh.com/portable.html#mirrors">mirror</a> near you.
144
145
146<h2><a name= "1.2">1.2 - Why should it be used?</a></h2>
147
148<p>
149OpenSSH is a suite of tools to help secure your network
150connections. Here is a list of features:
151
152
153<ul>
154 <li>Strong authentication. Closes several security holes (e.g., IP, routing, and DNS spoofing).
155 <li>Improved privacy. All communications are automatically and transparently encrypted.
156 <li>Secure X11 sessions. The program automatically sets DISPLAY on the server machine, and forwards any X11 connections over the secure channel.
157 <li>Arbitrary TCP/IP ports can be redirected through the encrypted channel in both directions (e.g., for e-cash transactions).
158 <li>No retraining needed for normal users.
159 <li>Never trusts the network. Minimal trust on the remote side of the connection. Minimal trust on domain name servers. Pure RSA authentication never trusts anything but the private key.
160 <li>Client RSA-authenticates the server machine in the beginning of every connection to prevent trojan horses (by routing or DNS spoofing) and man-in-the-middle attacks, and the server RSA-authenticates the client machine before accepting <i>.rhosts</i> or <i>/etc/hosts.equiv</i> authentication (to prevent DNS, routing, or IP-spoofing).
161 <li>Host authentication key distribution can be centrally by the administration, automatically when the first connection is made to a machine.
162 <li>Any user can create any number of user authentication RSA keys for his/her own use.
163 <li>The server program has its own server RSA key which is automatically regenerated every hour.
164 <li>An authentication agent, running in the user's laptop or local workstation, can be used to hold the user's RSA authentication keys.
165 <li>The software can be installed and used (with restricted functionality) even without root privileges.
166 <li>The client is customizable in system-wide and per-user configuration files.
167 <li>Optional compression of all data with gzip (including forwarded X11 and TCP/IP port data), which may result in significant speedups on slow connections.
168 <li>Complete replacement for rlogin, rsh, and rcp.
169</ul>
170
171<p>
172Currently, almost all communications in computer networks are done
173without encryption. As a consequence, anyone who has access to any
174machine connected to the network can listen in on any communication.
175This is being done by hackers, curious administrators, employers,
176criminals, industrial spies, and governments. Some networks leak off
177enough electromagnetic radiation that data may be captured even from a
178distance.
179
180
181<p>
182When you log in, your password goes in the network in plain
183text. Thus, any listener can then use your account to do any evil he
184likes. Many incidents have been encountered worldwide where crackers
185have started programs on workstations without the owner's knowledge
186just to listen to the network and collect passwords. Programs for
187doing this are available on the Internet, or can be built by a
188competent programmer in a few hours.
189
190
191<p>
192Businesses have trade secrets, patent applications in preparation,
193pricing information, subcontractor information, client data, personnel
194data, financial information, etc. Currently, anyone with access to
195the network (any machine on the network) can listen to anything that
196goes in the network, without any regard to normal access restrictions.
197
198
199<p>
200Many companies are not aware that information can so easily be
201recovered from the network. They trust that their data is safe
202since nobody is supposed to know that there is sensitive information
203in the network, or because so much other data is transferred in the
204network. This is not a safe policy.
205
206
207<h2><a name= "1.3">1.3 - What operating systems are supported?</a></h2>
208
209<p>
210Even though OpenSSH is developed on
211<a href="http://www.openbsd.org/">OpenBSD</a> a wide variety of
212ports to other operating systems exist. The portable version of OpenSSH
213is headed by <a href="mailto:djm@openbsd.org">Damien Miller</a>.
214For a quick overview of the portable version of OpenSSH see
215<a href="http://www.openssh.com/portable.html">OpenSSH Portable Release</a>.
216Currently, the supported operating systems are:
217
218
219<ul>
220 <li>OpenBSD
221 <li>NetBSD
222 <li>FreeBSD
223 <li>AIX
224 <li>HP-UX
225 <li>IRIX
226 <li>Linux
227 <li>NeXT
228 <li>SCO
229 <li>SNI/Reliant Unix
230 <li>Solaris
231 <li>Digital Unix/Tru64/OSF
232 <li>Mac OS X
233 <li>Cygwin
234</ul>
235
236<p>
237A list of vendors that include OpenSSH in their distributions
238is located in the <a href="http://www.openssh.com/users.html">OpenSSH Users page</a>.
239
240<h2><a name= "1.4">1.4 - What about copyrights, usage and patents?</a></h2>
241<p>
242The OpenSSH developers have tried very hard to keep OpenSSH free of any
243patent or copyright problems. To do this, some options had to be
244stripped from OpenSSH. Namely support for patented algorithms.
245
246<p>
247OpenSSH does not support any patented transport algorithms. In SSH1 mode,
248only 3DES and Blowfish are available options. In SSH2 mode, only 3DES,
249Blowfish, CAST128, Arcfour and AES can be selected.
250The patented IDEA algorithm is not supported.
251
252<p>
253OpenSSH provides support for both SSH1 and SSH2 protocols.
254
255<p>
256Since the RSA patent has expired, there are no restrictions on the use
257of RSA algorithm using software, including OpenBSD.
258
259<h2><a name= "1.5">1.5 - Where should I ask for help?</a></h2>
260<p>
261There are many places to turn to for help. In addition to the main
262<a href="http://www.openssh.com/index.html">OpenSSH website</a>,
263there are many mailing lists to try. Before trying any mailing lists,
264please search through all mailing list archives to see if your question
265has already been answered. The OpenSSH Mailing List has been archived and
266put in searchable form and can be found at
267<a href="http://marc.info/?l=openssh-unix-dev&amp;r=1&amp;w=2">marc.info</a>.
268
269<p>
270For more information on subscribing to OpenSSH related mailing lists,
271please see <a href="http://www.openssh.com/list.html">OpenSSH Mailing lists</a>.
272
273<h2><a name= "1.6">1.6 - I have found a bug. Where do I report it?</a></h2>
274<p>
275Information about submitting bug reports can be found at the OpenSSH
276<a href="http://www.openssh.com/report.html">Reporting bugs</a> page.
277<p>
278If you wish to report a security bug, please contact the private developers
279list &lt;<a href="mailto:openssh@openssh.com">openssh@openssh.com</a>&gt;.
280
281<h2><u><a name= "2.0">2.0 - General Questions</a></u></h2>
282
283<h2><a name= "2.1">2.1 - Why does ssh/scp make connections from low-numbered ports.</a></h2>
284<p>
285The OpenSSH client uses low numbered ports for rhosts and rhosts-rsa
286authentication because the server needs to trust the username provided by
287the client. To get around this, you can add the below example to your
288<i>ssh_config</i> or <i>~/.ssh/config</i> file.
289
290
291<blockquote>
292<table border=0 width="800">
293 <tr>
294 <td nowrap bgcolor="#EEEEEE">
295<b>UsePrivilegedPort no</b>
296 </td>
297 </tr>
298</table>
299</blockquote>
300
301<p>
302Or you can specify this option on the command line, using the <b>-o</b>
303option to
304<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a> command.
305
306<blockquote>
307<table border=0 width="800">
308 <tr>
309 <td nowrap bgcolor="#EEEEEE">
310$ <b>ssh -o "UsePrivilegedPort no" host.com</b>
311 </td>
312 </tr>
313</table>
314</blockquote>
315
316<h2><a name= "2.2">2.2 - Why is the ssh client setuid root?</a></h2>
317
318<p>
319In conjunction with the previous question, (<a href="#2.1">2.1</a>)
320OpenSSH needs root authority to be able to bind to low-numbered ports to
321facilitate <i>rhosts authentication</i>.
322A privileged port is also required for rhosts-rsa authentication to older
323SSH releases.
324
325<p>
326Additionally, for both <i>rhosts-rsa authentication</i> (in protocol
327version 1) and <i>hostbased authentication</i> (in protocol version 2)
328the ssh client needs to access the <i>private host key</i> in order to
329authenticate the client machine to the server.
330OpenSSH versions prior to 3.3 required the <code>ssh</code> binary to be
331setuid root to enable this, and you may safely remove it if you don't
332want to use these authentication methods.
333
334<p>
335Starting in OpenSSH 3.3, <code>ssh</code> is not setuid by default. <a
336href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keysign">ssh-keysign</a>,
337is used for access to the private hosts keys, and ssh does not use privileged
338source ports by default. If you wish to use a privileged source port, you must
339manually set the setuid bit on <code>ssh</code>.
340
341<h2><a name= "2.3">2.3 - Why does SSH 2.3 have problems interoperating with OpenSSH 2.1.1?</a></h2>
342
343<p>
344SSH 2.3 and earlier versions contain a flaw in their HMAC implementation.
345Their code was not supplying the full data block output from the digest,
346and instead always provided 128 bits. For longer digests, this caused
347SSH 2.3 to not interoperate with OpenSSH.
348
349<p>
350OpenSSH 2.2.0 detects that SSH 2.3 has this flaw. Recent versions of SSH
351will have this bug fixed. Or you can add the following to
352SSH 2.3 <i>sshd2_config</i>.
353
354
355<blockquote>
356<table border=0 width="800">
357 <tr>
358 <td nowrap bgcolor="#EEEEEE">
359<b>Mac hmac-md5</b>
360 </td>
361 </tr>
362</table>
363</blockquote>
364
365<h2><a name= "2.4">2.4 - Why does OpenSSH print: Dispatch protocol error: type 20</a></h2>
366
367<p>
368Problems in interoperation have been seen because older versions of
369OpenSSH did not support session rekeying. However the commercial SSH 2.3
370tries to negotiate this feature, and you might experience connection
371freezes or see the error message &quot;<b>Dispatch protocol error:
372type 20 </b>&quot;.
373To solve this problem, either upgrade to a recent OpenSSH release or
374disable rekeying by adding the following to your commercial SSH 2.3's
375<i>ssh2_config</i> or <i>sshd2_config</i>.
376
377
378<blockquote>
379<table border=0 width="800">
380 <tr>
381 <td nowrap bgcolor="#EEEEEE">
382<b>RekeyIntervalSeconds 0</b>
383 </td>
384 </tr>
385</table>
386</blockquote>
387
388<h2><a name= "2.5">2.5 - Old versions of commercial SSH encrypt host keys with IDEA.</a></h2>
389
390<p>
391The old versions of SSH used a patented algorithm to encrypt their
392<i>/etc/ssh/ssh_host_key</i>. This problem will manifest as
393<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
394not being able to read its host key. To solve this, use the command below
395to convert your ssh_host_key to use 3DES.
396<b>NOTE:</b> Use the
397<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
398program from the Commercial SSH product, *NOT* OpenSSH for the example
399below.
400
401
402<blockquote>
403<table border=0 width="800">
404 <tr>
405 <td nowrap bgcolor="#EEEEEE">
406# <b>ssh-keygen -u -f /etc/ssh/ssh_host_key</b>
407 </td>
408 </tr>
409</table>
410</blockquote>
411
412<h2><a name= "2.6">2.6 - What are these warning messages about key lengths</a></h2>
413
414<p>
415Commercial SSH's
416<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
417program contained a bug which caused it to occasionally generate Pubkey
418Authentication (RSA or DSA) keys which had their Most Significant Bit
419(MSB) unset. Such keys were advertised as being full-length, but are
420actually, half the time, smaller than advertised.
421
422<p>
423OpenSSH will print warning messages when it encounters such keys. To rid
424yourself of these message, edit your <i>known_hosts</i> files and replace the
425incorrect key length (usually "1024") with the correct key length
426(usually "1023").
427
428<h2><a name= "2.7">2.7 - X11 and/or agent forwarding does not work.</a></h2>
429
430<p>
431Check your <i>ssh_config</i> and <i>sshd_config</i>. The default
432configuration files disable authentication agent and X11 forwarding. To
433enable it, put the line below in <i>sshd_config</i>:
434
435<blockquote>
436<table border=0 width="800">
437 <tr>
438 <td nowrap bgcolor="#EEEEEE">
439<b>X11Forwarding yes</b>
440 </td>
441 </tr>
442</table>
443</blockquote>
444
445<p>
446and put the following lines in <i>ssh_config</i>:
447
448<blockquote>
449<table border=0 width="800">
450 <tr>
451 <td nowrap bgcolor="#EEEEEE">
452<b>ForwardAgent yes</b><br>
453<b>ForwardX11 yes</b>
454 </td>
455 </tr>
456</table>
457</blockquote>
458
459<p>
460X11 forwarding requires a working <a
461href="http://www.openbsd.org/cgi-bin/man.cgi?query=xauth&amp;sektion=1"
462>xauth(1)</a> binary. On OpenBSD this is in the <i>xbase</i> file
463set but will probably be different on other platforms. For OpenSSH
464Portable, xauth must be either found at configure time or specified
465via <b>XAuthLocation</b> in sshd_config(5) and ssh_config(5).
466
467<p>
468Note on agent interoperability: There are two different and
469incompatible agent forwarding mechanisms within the SSH2 protocol.
470OpenSSH has always used an extension of the original SSH1 agent
471requests, however some commercial products use a different, non-free
472agent forwarding protocol. This means that agent forwarding cannot
473be used between OpenSSH and those products.
474
475<p>
476<b>NOTE:</b> For users of Linux Mandrake 7.2, Mandrake modifies the
477<i>XAUTHORITY</i> environment variable in <i>/etc/skel/.bashrc</i>,
478and thus any bash user's home directory. This variable is set by OpenSSH
479and for either of the above options to work, you need to comment out
480the line:
481
482
483<blockquote>
484<table border=0 width="800">
485 <tr>
486 <td nowrap bgcolor="#EEEEEE">
487<b># export XAUTHORITY=$HOME/.Xauthority</b>
488 </td>
489 </tr>
490</table>
491</blockquote>
492
493<h2><a name= "2.8">2.8 - After upgrading OpenSSH I lost SSH2 support.</a></h2>
494
495<p>
496Between versions changes can be made to <i>sshd_config</i> or
497<i>ssh_config</i>. You should always check on these changes when upgrading
498versions of OpenSSH. After OpenSSH Version 2.3.0 you need to add the
499following to your <i>sshd_config</i>:
500
501
502<blockquote>
503<table border=0 width="800">
504 <tr>
505 <td nowrap bgcolor="#EEEEEE">
506<b>HostKey /etc/ssh_host_dsa_key</b><br>
507<b>HostKey /etc/ssh_host_rsa_key</b>
508 </td>
509 </tr>
510</table>
511</blockquote>
512
513<h2><a name= "2.9">2.9 - sftp/scp fails at connection, but ssh is OK.</a></h2>
514
515<p>
516sftp and/or scp may fail at connection time if you have shell
517initialization (.profile, .bashrc, .cshrc, etc) which produces output
518for non-interactive sessions. This output confuses the sftp/scp client.
519You can verify if your shell is doing this by executing:
520
521<blockquote>
522<table border=0 width="800">
523 <tr>
524 <td nowrap bgcolor="#EEEEEE">
525<b>ssh yourhost /usr/bin/true</b>
526 </td>
527 </tr>
528</table>
529</blockquote>
530
531<p>
532If the above command produces any output, then you need to modify your
533shell initialization.
534
535<h2><a name= "2.10">2.10 - Will you add [foo] to scp?</a></h2>
536
537<p>
538Short Answer: no.
539
540<p>
541Long Answer: scp is not standardized. The closest thing it has to a
542specification is "what rcp does". Since the same command is used on both ends
543of the connection, adding features or options risks breaking interoperability with other
544implementations.
545
546<p>
547New features are more likely in sftp, since the protocol is standardized
548(well, a <a href="http://www.ietf.org/html.charters/OLD/secsh-charter.html">
549draft standard</a>), extensible, and the client and server are decoupled.
550
551<h2><a name= "2.11">2.11 - How do I use port forwarding?</a></h2>
552
553<p>
554If the remote server is running sshd(8), it may be possible to
555``tunnel'' certain services via ssh. This may be desirable, for
556example, to encrypt POP or SMTP connections, even though the software
557does not directly support encrypted communications. Tunnelling uses
558port forwarding to create a connection between the client and server.
559The client software must be able to specify a non-standard port to
560connect to for this to work.
561
562<p>
563The idea is that the user connects to the remote host using ssh,
564and specifies which port on the client's machine should be used to
565forward connections to the remote server. After that it is possible
566to start the service which is to be encrypted (e.g. fetchmail, irc)
567on the client machine, specifying the same local port passed to
568ssh, and the connection will be tunnelled through ssh. By default,
569the system running the forward will only accept connections from
570itself.
571
572<p>
573The options most relevant to tunnelling are the -L and -R options,
574which allow the user to forward connections, the -D option, which
575permits dynamic port forwarding, the -g option, which permits other
576hosts to use port forwards, and the -f option, which instructs ssh
577to put itself in the background after authentication. See the <a
578href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1"
579>ssh(1)</a> man page for further details.
580
581<p>
582This is an example of tunnelling an IRC session from client machine
583``127.0.0.1'' (localhost) to remote server ``server.example.com'':
584
585<blockquote>
586<table border=0 width="800">
587 <tr>
588 <td nowrap bgcolor="#EEEEEE">
589<b>ssh -f -L 1234:server.example.com:6667 server.example.com sleep 10<br>
590irc -c '#users' -p 1234 pinky 127.0.0.1</b>
591 </td>
592 </tr>
593</table>
594</blockquote>
595
596<p>
597This tunnels a connection to IRC server server.example.com, joining
598channel ``#users'', using the nickname ``pinky''. The local port used
599in this example is 1234. It does not matter which port is used, as
600long as it's greater than 1023 (remember, only root can open sockets on
601privileged ports) and doesn't conflict with any ports already in use.
602The connection is forwarded to port 6667 on the remote server, since
603that's the standard port for IRC services.
604
605<p>
606The remote command ``sleep 10'' was specified to allow an amount
607of time (10 seconds, in the example) to start the service which is to
608be tunnelled. If no connections are made within the time specified,
609ssh will exit. If more time is required, the sleep(1) value can be
610increased appropriately or, alternatively, the example above could
611be added as a function to the user's shell. See ksh(1) and csh(1)
612for more details about user-defined functions.
613
614<p>
615ssh also has an -N option, convenient for use with port forwarding:
616if -N is specified, it is not necessary to specify a remote command
617(``sleep 10'' in the example above). However, use of this option
618causes ssh to wait around for ever (as opposed to exiting after a
619remote command has completed), and the user must take care to manually
620kill(1) the process afterwards.
621
622<h2><a name= "2.12">2.12 - My ssh connection freezes or drops out after N minutes of inactivity.</a></h2>
623
624<p>
625This is usually the result of a packet filter or NAT device
626timing out your TCP connection due to inactivity. You can enable
627<b>ClientAliveInterval</b> in the server's <i><a
628href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">
629sshd_config</a></i>, or enable <b>ServerAliveInterval</b> in the
630client's <i><a
631href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&amp;sektion=5">
632ssh_config</a></i> (the latter is available in OpenSSH 3.8 and newer).
633
634<p>
635Enabling either option and setting the interval for less than the time
636it takes to time out your session will ensure that the connection is
637kept "fresh" in the device's connection table.
638
639<h2><a name= "2.13">2.13 - How do I use scp to copy a file with a colon in it?</a></h2>
640
641<b><a
642href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">
643scp</a></b> will interpret the component before the colon to be a remote
644server name and attempt to connect to it. To prevent this, refer to
645the file by a relative or absolute path, eg:
646
647<blockquote>
648<table border=0 width="800">
649 <tr>
650 <td nowrap bgcolor="#EEEEEE">
651$ scp ./source:file sshserver:
652 </td>
653 </tr>
654</table>
655</blockquote>
656
657<h2><a name= "2.14">2.14 - Why does OpenSSH report its version to clients?</a></h2>
658
659<p>
660OpenSSH, like most SSH implementations, reports its name and version to clients
661when they connect, e.g.
662</p>
663
664<blockquote>
665SSH-2.0-OpenSSH_3.9
666</blockquote>
667
668<p>
669This information is used by clients and servers to enable protocol
670compatibility tweaks to work around changed, buggy or missing features in
671the implementation they are talking to. This protocol feature checking is
672still required at present because versions with incompatibilities are still
673in wide use.
674</p>
675
676<h2><u><a name= "3.0">3.0 - Portable OpenSSH Questions</a></u></h2>
677
678<h2><a name= "3.1">3.1 - Spurious PAM authentication messages in logfiles.</a></h2>
679
680<p>
681The portable version of OpenSSH will generate spurious authentication
682failures at every login, similar to:
683
684
685<blockquote>
686<table border=0 width="800">
687 <tr>
688 <td nowrap bgcolor="#EEEEEE">
689&quot;<b>authentication failure; (uid=0) -&gt; root for sshd service</b>&quot;
690 </td>
691 </tr>
692</table>
693</blockquote>
694
695<p>
696These are generated because OpenSSH first tries to determine whether a
697user needs authentication to login (e.g. empty password). Unfortunately
698PAM likes to log all authentication events, this one included.
699
700<p>
701If it annoys you too much, set &quot;<b>PermitEmptyPasswords no</b>&quot;
702in <i>sshd_config</i>. This will quiet the error message at the expense
703of disabling logins to accounts with no password set.
704This is the default if you use the supplied <i>sshd_config</i> file.
705
706<h2><a name= "3.2">3.2 - Empty passwords not allowed with PAM authentication.</a></h2>
707
708<p>
709To enable empty passwords with a version of OpenSSH built with PAM you
710must add the flag nullok to the end of the password checking module
711in the <i>/etc/pam.d/sshd</i> file. For example:
712
713<blockquote>
714<table border=0 width="800">
715 <tr>
716 <td nowrap bgcolor="#EEEEEE">
717auth required/lib/security/pam_unix.so shadow nodelay nullok
718 </td>
719 </tr>
720</table>
721</blockquote>
722
723<p>
724This must be done in addition to setting &quot;<b>PermitEmptyPasswords
725yes</b>&quot; in the <i>sshd_config</i> file.
726
727<p>
728There is one caveat when using empty passwords with PAM authentication:
729PAM will allow any password when authenticating an account with an empty
730password. This breaks the check that
731<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
732uses to determine whether an account has no password set and grant
733users access to the account regardless of the policy specified by
734<b>PermitEmptyPasswords</b>. For this reason, it is recommended that you
735do not add the <b>nullok</b> directive to your PAM configuration file
736unless you specifically wish to allow empty passwords.
737
738
739<h2><a name= "3.3">3.3 - ssh(1) takes a long time to connect or log
740in</a></h2>
741
742<p>
743Large delays (more than 10 seconds) are typically caused by a problem with
744name resolution:
745<ul>
746<li>Some versions of glibc (notably glibc 2.1 shipped with Red Hat 6.1)
747can take a long time to resolve "IPv6 or IPv4" addresses from domain
748names. This can be worked around with by specifying <b>AddressFamily
749inet</b> option in <i>ssh_config</i>.</li>
750
751<li>There may be a DNS lookup problem, either at the client or server.
752You can use the <code>nslookup</code> command to check this on both client
753and server by looking up the other end's name and IP address. In
754addition, on the server look up the name returned by the client's
755IP-name lookup. You can disable most of the server-side lookups by
756setting <b>UseDNS no</b> in <i>sshd_config</i>.</li>
757</ul>
758
759<p>
760Delays less than 10 seconds can have other causes.
761
762<ul>
763
764<li>OpenSSH releases prior to 3.8 had an <i>moduli</i> file with
765moduli that were just smaller than what sshd would look for, and
766as a result, sshd would end up using moduli significantly larger
767than requested, which resulted in a speed penalty. Replacing the
768<i>moduli</i> file will resolve this (note that in most cases this
769file will not be replaced during an upgrade and must be replaced
770manually).</li>
771
772<li>OpenSSH releases prior to 3.8 had a flaw in <code>ssh</code> that
773would cause it to request moduli larger than intended (which when
774combined with the above resulted in significant slowdowns).
775Upgrading the client to 3.8 or higher will resolve this issue.</li>
776
777<li>If either the client or server lack a kernel-based random number
778device (eg Solaris &lt; 9, AIX &lt; 5.2, HP-UX &lt; 11.11) and no
779substitute is available (eg <a href=
780"ftp://ftp.ayamura.org/pub/prngd/">prngd</a>) it's possible that
781one of the programs called by <code>ssh-rand-helper</code> to
782generate entropy is hanging. This can be investigated by running
783it in debug mode:
784
785<blockquote>
786<table border=0 width="800">
787 <tr>
788 <td nowrap bgcolor="#EEEEEE">
789/usr/local/libexec/ssh-rand-helper -vvv
790 </td>
791 </tr>
792</table>
793</blockquote>
794
795Any significant delays should be investigated and rectified, or the
796corresponding commands should be removed from <i>ssh_prng_cmds</i>.
797</li>
798
799</ul>
800
801<h3>How slow is "slow"?</h3>
802Under normal conditions, the speed of SSH logins is dependant on
803CPU speed of client and server. For comparison the following are
804typical connect times for <code>time ssh localhost true</code>
805with a 1024-bit RSA key on otherwise unloaded hosts. OpenSSH and
806OpenSSL were compiled with gcc 3.3.x.
807
808<p>
809<table>
810<tr><th>CPU</th><th>Time (SSHv1)<a href="#3.3fn1">[1]</a></th>
811 <th>Time (SSHv2)</th></tr>
812<tr><td>170MHz SPARC/sun4m</td><td>0.74 sec</td><td>1.25 sec</td></tr>
813<tr><td>236MHz HPPA/8200<a href="#3.3fn2">[2]</a></td><td>0.44 sec</td>
814 <td>0.79 sec</td></tr>
815<tr><td>375MHz PowerPC/604e</td><td>0.38 sec</td><td>0.51 sec</td></tr>
816<tr><td>933MHz VIA Ezra</td><td>0.34 sec</td><td>0.44 sec</td></tr>
817<tr><td>2.1GHz Athlon XP 2600+</td><td>0.14 sec</td><td>0.22 sec</td></tr>
818</table>
819
820<br>
821
822<a name="3.3fn1">[1]</a> The SSHv1 protocol is faster but is
823cryptographically weaker than SSHv2.<br>
824
825<a name="3.3fn2">[2]</a> At the time of writing, gcc generates
826relatively slow code on HPPA for RSA and Diffie-Hellman operations
827(see <a href= "http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7625">gcc
828bug #7625</a> and <a
829href="http://marc.info/?l=openssh-unix-dev&amp;m=102646106016694">
830discussion on openssh-unix-dev</a>).
831
832<h2><a name= "3.4">3.4 - "Can't locate module net-pf-10" messages in log under Linux.</a></h2>
833
834<p>
835The Linux kernel is looking (via modprobe) for protocol family 10 (IPv6).
836Either load the appropriate kernel module, enter the correct alias in
837<i>/etc/modules.conf</i> or disable IPv6 in <i>/etc/modules.conf</i>.
838
839
840<p>
841For some silly reason <i>/etc/modules.conf</i> may also be named
842<i>/etc/conf.modules</i>.
843
844
845<h2><a name= "3.5">3.5 - Password authentication doesn't work (eg on Slackware 7.0 or Red Hat 6.x)</a></h2>
846
847<p>
848If the password is correct password the login is still denied, the
849usual cause is that the system is configured to use MD5-type passwords
850but the
851<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=crypt&amp;sektion=3"
852>crypt(3)</a> function used by sshd doesn't understand them.
853
854<p>
855Affected accounts will have password strings in <i>/etc/passwd</i>
856or <i>/etc/shadow</i> that start with <b>$1$</b>.
857If password authentication fails for new accounts or accounts with
858recently changed passwords, but works for old accounts, this is the
859likely culprit.
860
861<p>
862The underlying cause is that some versions of OpenSSL have a crypt(3)
863function that does not understand MD5 passwords, and the link order of
864sshd means that OpenSSL's crypt(3) is used instead of the system's.
865OpensSSH's configure attempts to correct for this but is not always
866successful.
867
868<p>
869There are several possible solutions:
870
871<ul>
872<li>
873<p>
874Enable sshd's built-in support for MD5 passwords at build time.
875
876<blockquote>
877<table border=0 width="800">
878 <tr>
879 <td nowrap bgcolor="#EEEEEE">
880./configure --with-md5-passwords [options]
881 </td>
882 </tr>
883</table>
884</blockquote>
885
886This is safe even if you have both types of encryption as sshd will
887select the correct algorithm for each account automatically.
888
889<li>
890<p>
891If your system has a separate libcrypt library (eg Slackware 7) then you
892can manually add -lcrypt to the LIBS list so it's used instead of
893OpenSSL's:
894
895<blockquote>
896<table border=0 width="800">
897 <tr>
898 <td nowrap bgcolor="#EEEEEE">
899LIBS=-lcrypt ./configure [options]
900 </td>
901 </tr>
902</table>
903</blockquote>
904
905<li>
906<p>
907If your platforms supports PAM, you may configure sshd to use it
908(see <a href= "#3.15" >section 3.15</a>). This will mean that sshd will
909not verify passwords itself but will defer to the configured PAM modules.
910</ul>
911
912<h2><a name= "3.6">3.6 - Configure or sshd(8) complain about lack of RSA or DSA support</a></h2>
913
914<p>
915Ensure that your OpenSSL libraries have been built to include RSA or DSA
916support either internally or through RSAref.
917
918
919<h2><a name= "3.7">3.7 - "scp: command not found" errors</a></h2>
920
921<p>
922<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a>
923must be in the default PATH on both the client and the server. You may
924need to use the <b>--with-default-path</b> option to specify a custom
925path to search on the server. This option replaces the default path,
926so you need to specify all the current directories on your path as well
927as where you have installed scp. For example:
928
929<blockquote>
930<table border=0 width="800">
931 <tr>
932 <td nowrap bgcolor="#EEEEEE">
933$ <b>./configure --with-default-path=/bin:/usr/bin:/usr/local/bin:/path/to/scp</b>
934 </td>
935 </tr>
936</table>
937</blockquote>
938
939<p>
940Note that configuration by the server's admin will take precedence over the
941setting of <b>--with-default-path</b>. This includes resetting PATH in
942<i>/etc/profile</i>, PATH in <i>/etc/environment</i> on AIX, or (for 3.7p1 and
943above) setting PATH or SUPATH in <i>/etc/default/login</i> on Solaris or
944Reliant Unix.
945
946<h2><a name= "3.8">3.8 - Unable to read passphrase</a></h2>
947
948<p>
949Some operating systems set <i>/dev/tty</i> with incorrect modes, causing
950the reading of passwords to fail with the following error:
951
952<blockquote>
953<table border=0 width="800">
954 <tr>
955 <td nowrap bgcolor="#EEEEEE">
956You have no controlling tty. Cannot read passphrase.
957 </td>
958 </tr>
959</table>
960</blockquote>
961
962<p>
963The solution to this is to reset the permissions on <i>/dev/tty</i>
964to mode 0666 and report the error as a bug to your OS vendor.
965
966
967<h2><a name= "3.9">3.9 - 'configure' missing or make fails</a></h2>
968
969<p>
970If there is no 'configure' file in the tar.gz file that you downloaded
971or make fails with "missing separator" errors, you have probably
972downloaded the OpenBSD distribution of OpenSSH and are attempting to
973compile it on another platform. Please refer to the information on the
974<a href="http://www.openssh.com/portable.html">portable version</a>.
975
976
977<h2><a name= "3.10">3.10 - Hangs when exiting ssh</a></h2>
978
979<p>
980OpenSSH may hang when exiting. This can occur when there is an active
981background process. This is known to occur on Linux and HP-UX.
982The problem can be verified by doing the following:
983
984<blockquote>
985<table border=0 width="800">
986 <tr>
987 <td nowrap bgcolor="#EEEEEE">
988$ <b>sleep 20 &amp; exit</b>
989 </td>
990 </tr>
991</table>
992</blockquote>
993
994Try to use this instead:
995<blockquote>
996<table border=0 width="800">
997 <tr>
998 <td nowrap bgcolor="#EEEEEE">
999$ <b>sleep 20 &lt; /dev/null &gt; /dev/null 2&gt;&amp;1 &amp;</b>
1000 </td>
1001 </tr>
1002</table>
1003</blockquote>
1004
1005<p>
1006A work around for bash users is to place <b>"shopt -s huponexit"</b>
1007in either /etc/bashrc or ~/.bashrc. Otherwise, consult your shell's
1008man page for an option to enable it to send a HUP signal to active
1009jobs when exiting. See <a
1010href="http://bugzilla.mindrot.org/show_bug.cgi?id=52">bug #52</a>
1011for other workarounds.
1012
1013<h2><a name= "3.11">3.11 - Why does ssh hang on exit?</a></h2>
1014
1015<p>
1016When executing
1017<blockquote>
1018<table border=0 width="800">
1019 <tr>
1020 <td nowrap bgcolor="#EEEEEE">
1021$ <b>ssh host command</b>
1022 </td>
1023 </tr>
1024</table>
1025</blockquote>
1026ssh <b>needs</b> to hang, because it needs to wait:
1027<ul>
1028<li>
1029until it can be sure that <code>command</code> does not need
1030more input.
1031<li>
1032until it can be sure that <code>command</code> does not produce
1033more output.
1034<li>
1035until <code>command</code> exits because sshd needs to tell
1036the exit status from <code>command</code> to ssh.
1037</ul>
1038<p>
1039
1040<h2><a name= "3.12">3.12 - I upgraded to OpenSSH 3.1 and X11
1041forwarding stopped working.</a></h2>
1042
1043Starting with OpenSSH 3.1, the sshd x11 forwarding server listens on
1044localhost by default; see the sshd <b>X11UseLocalhost</b> option to
1045revert to prior behaviour if your older X11 clients do not function
1046with this configuration.<p>
1047
1048In general, X11 clients using X11 R6 should work with the default
1049setting. Some vendors, including HP, ship X11 clients with R6
1050and R5 libs, so some clients will work, and others will not work.
1051This is true for HP-UX 11.X.<p>
1052
1053<h2><a name= "3.13">3.13 - I upgraded to OpenSSH 3.8 and some
1054X11 programs stopped working.</a></h2>
1055
1056<p>
1057As documented in the <a href="http://www.openssh.com/txt/release-3.8">3.8 release notes</a>,
1058<code>ssh</code> will now use untrusted X11 cookies by
1059default. The previous behaviour can be restored by setting
1060<b>ForwardX11Trusted yes</b> in <i>ssh_config</i>.
1061
1062<p>
1063Possible symptoms include:<br>
1064<code>BadWindow (invalid Window parameter)<br>
1065BadAccess (attempt to access private resource denied)<br>
1066X Error of failed request: BadAtom (invalid Atom parameter)<br>
1067Major opcode of failed request: 20 (X_GetProperty)<br></code>
1068
1069<h2><a name= "3.14">3.14 - I copied my public key to authorized_keys
1070but public-key authentication still doesn't work.</a></h2>
1071
1072<p>
1073Typically this is caused by the file permissions on $HOME, $HOME/.ssh or
1074$HOME/.ssh/authorized_keys being more permissive than sshd allows by default.
1075
1076<p>
1077In this case, it can be solved by executing the following on the server.
1078<blockquote>
1079<table border=0 width="800">
1080<tr>
1081 <td nowrap bgcolor="#EEEEEE">
1082$ <b>chmod go-w $HOME $HOME/.ssh</b><br>
1083$ <b>chmod 600 $HOME/.ssh/authorized_keys</b><br>
1084$ <b>chown `whoami` $HOME/.ssh/authorized_keys</b><br>
1085 </td>
1086</tr>
1087</table>
1088</blockquote>
1089
1090<p>
1091If this is not possible for some reason, an alternative is to set
1092<b>StrictModes no</b> in <i>sshd_config</i>, however this is not
1093recommended.
1094
1095<h2><a name= "3.15">3.15 - OpenSSH versions and PAM behaviour.</a></h2>
1096
1097Portable OpenSSH has a configure-time option to enable sshd's use of the
1098<a href="http://www.opengroup.org/onlinepubs/008329799/">PAM</a>
1099(Pluggable Authentication Modules) interface.
1100
1101<blockquote>
1102<table border=0 width="800">
1103 <tr>
1104 <td nowrap bgcolor="#EEEEEE">
1105./configure --with-pam [options]
1106 </td>
1107 </tr>
1108</table>
1109</blockquote>
1110
1111To use PAM at all, this option must be provided at build time.
1112The run-time behaviour when PAM is built in varies with the version of
1113Portable OpenSSH, and on later versions it must also be enabled by setting
1114<b>UsePAM</b> to <b>yes</b> in <i>sshd_config</i>.
1115
1116<p>
1117The behaviour of the relevant authentications options when PAM support is built
1118in is summarised by the following table.
1119
1120<p>
1121<table border="1">
1122 <tr> <th>Version</th> <th>UsePAM</th> <th>PasswordAuthentication</th> <th>ChallengeResponseAuthentication</th> </tr>
1123 <tr>
1124 <td>&lt;=3.6.1p2</td>
1125 <td>Not applicable</td>
1126 <td>Uses PAM</td>
1127 <td>Uses PAM if <b>PAMAuthenticationViaKbdInt</b> is enabled</td>
1128 </tr>
1129 <tr>
1130 <td>3.7p1 - 3.7.1p1</td>
1131 <td>Defaults to <b>yes</b></td>
1132 <td>Does not use PAM</td>
1133 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1134 </tr>
1135 <tr>
1136 <td>3.7.1p2 - 3.8.1p1</td>
1137 <td>Defaults to <b>no</b></td>
1138 <td>Does not use PAM <a href="#3.15fn1">[1]</a></td>
1139 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1140 </tr>
1141 <tr>
1142 <td>3.9p1</td>
1143 <td>Defaults to <b>no</b></td>
1144 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1145 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1146 </tr>
1147</table>
1148<p>
1149
1150<a name= "3.15fn1">[1]</a> Some vendors, notably Redhat/Fedora, have
1151backported the PasswordAuthentication from 3.9p1 to their 3.8x based
1152packages. If you're using a vendor-supplied package then consult their
1153documentation.
1154
1155<p>
1156OpenSSH Portable's PAM interface still has problems with a few modules,
1157however we hope that this number will reduce in the future. As at the
11583.9p1 release, the known problems are:
1159
1160<ul>
1161 <li>Modules relying on module-private data (eg pam_dhkeys, pam_krb5, AFS)
1162 may fail to correctly establish credentials (bug <a
1163 href="http://bugzilla.mindrot.org/show_bug.cgi?id=688">#688</a>) when
1164 authenticating via <b>ChallengeResponseAuthentication</b>.
1165 <b>PasswordAuthentication</b> with 3.9p1 and above should work.
1166</ul>
1167
1168You can also check <a
1169href="http://bugzilla.mindrot.org/buglist.cgi?product=Portable+OpenSSH&amp;bug_status=RESOLVED&amp;bug_status=NEW&amp;bug_status=ACCEPTED&amp;component=PAM+support"
1170>bugzilla for current PAM issues</a>.
1171
1172<h2><a name= "3.16">3.16 - Why doesn't "w" or "who" on AIX 5.x show users
1173logged in via ssh?</a></h2>
1174
1175Between AIX 4.3.3 and AIX 5.x, the format of the wtmp struct changed. This
1176means that sshd binaries built on AIX 4.x will not correctly write wtmp
1177entries when run on AIX 5.x. This can be fixed by simply recompiling
1178sshd on an AIX 5.x system and using that.
1179
1180<hr>
1181<a href="http://www.openssh.com/index.html"><img height=24 width=24 src="back.gif" border=0 alt=OpenSSH></a>
1182<a href="mailto:www@openbsd.org">www@openbsd.org</a>
1183<br>
1184<small>$OpenBSD: faq.html,v 1.113 2012/04/21 12:12:22 dtucker Exp $</small>
1185
1186</body>
1187</html>
diff --git a/debian/gnome-ssh-askpass.1 b/debian/gnome-ssh-askpass.1
new file mode 100644
index 000000000..b74c410a8
--- /dev/null
+++ b/debian/gnome-ssh-askpass.1
@@ -0,0 +1,51 @@
1.TH GNOME-SSH-ASKPASS 1
2.SH NAME
3gnome\-ssh\-askpass \- prompts a user for a passphrase using GNOME
4.SH SYNOPSIS
5.B gnome\-ssh\-askpass
6.SH DESCRIPTION
7.B gnome\-ssh\-askpass
8is a GNOME-based passphrase dialog for use with OpenSSH.
9It is intended to be called by the
10.BR ssh\-add (1)
11program and not invoked directly.
12It allows
13.BR ssh\-add (1)
14to obtain a passphrase from a user, even if not connected to a terminal
15(assuming that an X display is available).
16This happens automatically in the case where
17.B ssh\-add
18is invoked from one's
19.B ~/.xsession
20or as one of the GNOME startup programs, for example.
21.PP
22In order to be called automatically by
23.BR ssh\-add ,
24.B gnome\-ssh\-askpass
25should be installed as
26.IR /usr/bin/ssh\-askpass .
27.SH "ENVIRONMENT VARIABLES"
28The following environment variables are recognized:
29.TP
30.I GNOME_SSH_ASKPASS_GRAB_SERVER
31Causes
32.B gnome\-ssh\-askpass
33to grab the X server before asking for a passphrase.
34.TP
35.I GNOME_SSH_ASKPASS_GRAB_POINTER
36Causes
37.B gnome\-ssh\-askpass
38to grab the mouse pointer using
39.IR gdk_pointer_grab ()
40before asking for a passphrase.
41.PP
42Regardless of whether either of these environment variables is set,
43.B gnome\-ssh\-askpass
44will grab the keyboard using
45.IR gdk_keyboard_grab ().
46.SH AUTHOR
47This manual page was written by Colin Watson <cjwatson@debian.org>
48for the Debian system (but may be used by others).
49It was based on that for
50.B x11\-ssh\-askpass
51by Philip Hands.
diff --git a/debian/keygen-test/Makefile b/debian/keygen-test/Makefile
new file mode 100644
index 000000000..666ed8227
--- /dev/null
+++ b/debian/keygen-test/Makefile
@@ -0,0 +1,12 @@
1test: getpid.so
2 chmod +x keygen-test
3 ./keygen-test
4
5getpid.o: getpid.c
6 gcc -fPIC -c $< -o $@
7
8getpid.so: getpid.o
9 gcc -shared -o $@ $<
10
11clean:
12 rm -f getpid.o getpid.so key1 key1.pub key2 key2.pub
diff --git a/debian/keygen-test/getpid.c b/debian/keygen-test/getpid.c
new file mode 100644
index 000000000..c9e35b87e
--- /dev/null
+++ b/debian/keygen-test/getpid.c
@@ -0,0 +1,39 @@
1/*
2 * Compile:
3
4gcc -fPIC -c getpid.c -o getpid.o
5gcc -shared -o getpid.so getpid.o
6
7 * Use:
8
9FORCE_PID=1234 LD_PRELOAD=./getpid.so bash
10
11#
12# Copyright (C) 2001-2008 Kees Cook
13# kees@outflux.net, http://outflux.net/
14#
15# This program is free software; you can redistribute it and/or
16# modify it under the terms of the GNU General Public License
17# as published by the Free Software Foundation; either version 2
18# of the License, or (at your option) any later version.
19#
20# This program is distributed in the hope that it will be useful,
21# but WITHOUT ANY WARRANTY; without even the implied warranty of
22# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23# GNU General Public License for more details.
24#
25# You should have received a copy of the GNU General Public License
26# along with this program; if not, write to the Free Software
27# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
28# http://www.gnu.org/copyleft/gpl.html
29
30*/
31
32#include <sys/types.h>
33#include <unistd.h>
34#include <stdlib.h>
35
36pid_t getpid(void)
37{
38 return atoi(getenv("FORCE_PID"));
39}
diff --git a/debian/keygen-test/keygen-test b/debian/keygen-test/keygen-test
new file mode 100755
index 000000000..02b7c761a
--- /dev/null
+++ b/debian/keygen-test/keygen-test
@@ -0,0 +1,12 @@
1#! /bin/sh
2
3rm -f key1 key1.pub key2 key2.pub
4LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
5 ../../build-deb/ssh-keygen -N '' -f key1 >/dev/null
6LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
7 ../../build-deb/ssh-keygen -N '' -f key2 >/dev/null
8if cmp -s key1 key2; then
9 echo "Generated two identical keys!" >&2
10 exit 1
11fi
12exit 0
diff --git a/debian/openssh-client-ssh1.install b/debian/openssh-client-ssh1.install
new file mode 100755
index 000000000..04e7e0c45
--- /dev/null
+++ b/debian/openssh-client-ssh1.install
@@ -0,0 +1,5 @@
1#! /usr/bin/dh-exec
2
3build-deb-ssh1/scp => usr/bin/scp1
4build-deb-ssh1/ssh => usr/bin/ssh1
5build-deb-ssh1/ssh-keygen => usr/bin/ssh-keygen1
diff --git a/debian/openssh-client-udeb.install b/debian/openssh-client-udeb.install
new file mode 100644
index 000000000..b3891f02d
--- /dev/null
+++ b/debian/openssh-client-udeb.install
@@ -0,0 +1,3 @@
1scp usr/bin
2sftp usr/bin
3ssh usr/bin
diff --git a/debian/openssh-client.apport b/debian/openssh-client.apport
new file mode 100644
index 000000000..3dbc8e5e6
--- /dev/null
+++ b/debian/openssh-client.apport
@@ -0,0 +1,32 @@
1#!/usr/bin/python
2
3'''apport hook for openssh-client
4
5(c) 2010 Canonical Ltd.
6Author: Chuck Short <chuck.short@canonical.com>
7
8This program is free software; you can redistribute it and/or modify it
9under the terms of the GNU General Public License as published by the
10Free Software Foundation; either version 2 of the License, or (at your
11option) any later version. See http://www.gnu.org/copyleft/gpl.html for
12the full text of the license.
13'''
14
15from apport.hookutils import *
16
17def add_info(report, ui):
18 response = ui.yesno("The contents of your /etc/ssh/ssh_config file "
19 "may help developers diagnose your bug more "
20 "quickly. However, it may contain sensitive "
21 "information. Do you want to include it in your "
22 "bug report?")
23
24 if response == None: # user cancelled
25 raise StopIteration
26
27 elif response == True:
28 attach_conffiles(report, 'openssh-client')
29
30 attach_related_packages(report,
31 ['ssh-askpass', 'libpam-ssh', 'keychain', 'ssh-askpass-gnome'])
32 report['SSHClientVersion'] = command_output(['/usr/bin/ssh', '-V'])
diff --git a/debian/openssh-client.docs b/debian/openssh-client.docs
new file mode 100644
index 000000000..d80ec1262
--- /dev/null
+++ b/debian/openssh-client.docs
@@ -0,0 +1,6 @@
1ChangeLog.gssapi
2OVERVIEW
3README
4README.dns
5README.tun
6debian/faq.html
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
new file mode 100755
index 000000000..b8b798d91
--- /dev/null
+++ b/debian/openssh-client.install
@@ -0,0 +1,41 @@
1#! /usr/bin/dh-exec
2
3etc/ssh/moduli
4etc/ssh/ssh_config
5usr/bin/scp
6usr/bin/sftp
7usr/bin/ssh
8usr/bin/ssh-add
9usr/bin/ssh-agent
10usr/bin/ssh-keygen
11usr/bin/ssh-keyscan
12usr/lib/openssh/ssh-keysign
13usr/lib/openssh/ssh-pkcs11-helper
14usr/share/man/man1/scp.1
15usr/share/man/man1/sftp.1
16usr/share/man/man1/ssh-add.1
17usr/share/man/man1/ssh-agent.1
18usr/share/man/man1/ssh-keygen.1
19usr/share/man/man1/ssh-keyscan.1
20usr/share/man/man1/ssh.1
21usr/share/man/man5/moduli.5
22usr/share/man/man5/ssh_config.5
23usr/share/man/man8/ssh-keysign.8
24usr/share/man/man8/ssh-pkcs11-helper.8
25
26contrib/ssh-copy-id usr/bin
27debian/ssh-argv0 usr/bin
28
29debian/agent-launch usr/lib/openssh
30
31# dh_apport would be neater, but at the time of writing it isn't in unstable
32# yet.
33debian/openssh-client.apport => usr/share/apport/package-hooks/openssh-client.py
34
35# Upstart user job (only used under user sessions).
36debian/ssh-agent.user-session.upstart => usr/share/upstart/sessions/ssh-agent.conf
37
38# systemd user unit (only used under sessions)
39debian/systemd/ssh-agent.service usr/lib/systemd/user
40# disable above upstart job when running the systemd user unit
41debian/systemd/ssh-agent.override usr/share/upstart/systemd-session/upstart
diff --git a/debian/openssh-client.links b/debian/openssh-client.links
new file mode 100644
index 000000000..1d94c74e8
--- /dev/null
+++ b/debian/openssh-client.links
@@ -0,0 +1,4 @@
1usr/bin/ssh usr/bin/slogin
2usr/share/man/man1/ssh.1 usr/share/man/man1/slogin.1
3# enable systemd user unit for graphical sessions that use systemd
4usr/lib/systemd/user/ssh-agent.service usr/lib/systemd/user/graphical-session-pre.target.wants/ssh-agent.service
diff --git a/debian/openssh-client.lintian-overrides b/debian/openssh-client.lintian-overrides
new file mode 100644
index 000000000..486567744
--- /dev/null
+++ b/debian/openssh-client.lintian-overrides
@@ -0,0 +1 @@
openssh-client: setuid-binary usr/lib/openssh/ssh-keysign 4755 root/root
diff --git a/debian/openssh-client.manpages b/debian/openssh-client.manpages
new file mode 100644
index 000000000..690bd8a22
--- /dev/null
+++ b/debian/openssh-client.manpages
@@ -0,0 +1,2 @@
1contrib/ssh-copy-id.1
2debian/ssh-argv0.1
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
new file mode 100644
index 000000000..ec0ad2b2b
--- /dev/null
+++ b/debian/openssh-client.postinst
@@ -0,0 +1,45 @@
1#!/bin/sh
2set -e
3
4action="$1"
5oldversion="$2"
6
7umask 022
8
9
10create_alternatives() {
11# Create alternatives for the various r* tools.
12# Make sure we don't change existing alternatives that a user might have
13# changed, but clean up after some old alternatives that mistakenly pointed
14# rlogin and rcp to ssh.
15 update-alternatives --quiet --remove rlogin /usr/bin/ssh
16 update-alternatives --quiet --remove rcp /usr/bin/ssh
17 for cmd in rsh rlogin rcp; do
18 scmd="s${cmd#r}"
19 if ! update-alternatives --display "$cmd" 2>/dev/null | \
20 grep -q "$scmd"; then
21 update-alternatives --quiet --install "/usr/bin/$cmd" "$cmd" "/usr/bin/$scmd" 20 \
22 --slave "/usr/share/man/man1/$cmd.1.gz" "$cmd.1.gz" "/usr/share/man/man1/$scmd.1.gz"
23 fi
24 done
25}
26
27set_ssh_agent_permissions() {
28 if ! getent group ssh >/dev/null; then
29 addgroup --system --quiet ssh
30 fi
31 if ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null; then
32 chgrp ssh /usr/bin/ssh-agent
33 chmod 2755 /usr/bin/ssh-agent
34 fi
35}
36
37
38if [ "$action" = configure ]; then
39 create_alternatives
40 set_ssh_agent_permissions
41fi
42
43#DEBHELPER#
44
45exit 0
diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm
new file mode 100644
index 000000000..68c354481
--- /dev/null
+++ b/debian/openssh-client.postrm
@@ -0,0 +1,22 @@
1#!/bin/sh
2set -e
3
4#DEBHELPER#
5
6case $1 in
7 purge)
8 # Remove all non-conffiles that ssh might create, so that we
9 # can smoothly remove /etc/ssh if and only if the user
10 # hasn't dropped some other files in there. Conffiles have
11 # already been removed at this point.
12 rm -f /etc/ssh/moduli /etc/ssh/primes
13 rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2
14 rmdir --ignore-fail-on-non-empty /etc/ssh
15
16 if which delgroup >/dev/null 2>&1; then
17 delgroup --quiet ssh > /dev/null || true
18 fi
19 ;;
20esac
21
22exit 0
diff --git a/debian/openssh-client.prerm b/debian/openssh-client.prerm
new file mode 100644
index 000000000..2d631cb9c
--- /dev/null
+++ b/debian/openssh-client.prerm
@@ -0,0 +1,39 @@
1#! /bin/sh
2# prerm script for ssh
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see /usr/share/doc/packaging-manual/
17
18case "$1" in
19 remove|deconfigure)
20 update-alternatives --quiet --remove rsh /usr/bin/ssh
21 update-alternatives --quiet --remove rlogin /usr/bin/slogin
22 update-alternatives --quiet --remove rcp /usr/bin/scp
23 ;;
24 upgrade)
25 ;;
26 failed-upgrade)
27 ;;
28 *)
29 echo "prerm called with unknown argument \`$1'" >&2
30 exit 0
31 ;;
32esac
33
34# dh_installdeb will replace this with shell code automatically
35# generated by other debhelper scripts.
36
37#DEBHELPER#
38
39exit 0
diff --git a/debian/openssh-server-udeb.dirs b/debian/openssh-server-udeb.dirs
new file mode 100644
index 000000000..2ce0d81d6
--- /dev/null
+++ b/debian/openssh-server-udeb.dirs
@@ -0,0 +1 @@
var/run/sshd
diff --git a/debian/openssh-server-udeb.install b/debian/openssh-server-udeb.install
new file mode 100644
index 000000000..05ccbf7af
--- /dev/null
+++ b/debian/openssh-server-udeb.install
@@ -0,0 +1,2 @@
1sshd usr/sbin
2ssh-keygen usr/bin
diff --git a/debian/openssh-server.apport b/debian/openssh-server.apport
new file mode 100644
index 000000000..3644bd855
--- /dev/null
+++ b/debian/openssh-server.apport
@@ -0,0 +1,28 @@
1#!/usr/bin/python
2
3'''apport hook for openssh-server
4
5(c) 2010 Canonical Ltd.
6Author: Chuck Short <chuck.short@canonical.com>
7
8This program is free software; you can redistribute it and/or modify it
9under the terms of the GNU General Public License as published by the
10Free Software Foundation; either version 2 of the License, or (at your
11option) any later version. See http://www.gnu.org/copyleft/gpl.html for
12the full text of the license.
13'''
14
15from apport.hookutils import *
16
17def add_info(report, ui):
18 response = ui.yesno("The contents of your /etc/ssh/sshd_config file "
19 "may help developers diagnose your bug more "
20 "quickly. However, it may contain sensitive "
21 "information. Do you want to include it in your "
22 "bug report?")
23
24 if response == None: # user cancelled
25 raise StopIteration
26
27 elif response == True:
28 report['SSHDConfig'] = root_command_output(['/usr/sbin/sshd', '-T'])
diff --git a/debian/openssh-server.config b/debian/openssh-server.config
new file mode 100644
index 000000000..dbde2cbb0
--- /dev/null
+++ b/debian/openssh-server.config
@@ -0,0 +1,29 @@
1#! /bin/sh
2set -e
3
4. /usr/share/debconf/confmodule
5db_version 2.0
6
7get_config_option() {
8 option="$1"
9
10 [ -f /etc/ssh/sshd_config ] || return
11
12 # TODO: actually only one '=' allowed after option
13 perl -lne '
14 s/[[:space:]]+/ /g; s/[[:space:]]+$//;
15 print if s/^[[:space:]]*'"$option"'[[:space:]=]+//i' \
16 /etc/ssh/sshd_config 2>/dev/null
17}
18
19if dpkg --compare-versions "$2" lt-nl 1:6.6p1-1 && \
20 [ "$(get_config_option PermitRootLogin)" = yes ]; then
21 if [ "$(getent shadow root | cut -d: -f2)" = "!" ]; then
22 db_set openssh-server/permit-root-login true
23 else
24 db_input high openssh-server/permit-root-login || true
25 db_go
26 fi
27fi
28
29exit 0
diff --git a/debian/openssh-server.examples b/debian/openssh-server.examples
new file mode 100644
index 000000000..ef6eb5468
--- /dev/null
+++ b/debian/openssh-server.examples
@@ -0,0 +1,2 @@
1sshd_config
2debian/systemd/ssh-session-cleanup.service
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
new file mode 100644
index 000000000..915284cc6
--- /dev/null
+++ b/debian/openssh-server.if-up
@@ -0,0 +1,42 @@
1#! /bin/sh
2# Reload the OpenSSH server when an interface comes up, to allow it to start
3# listening on new addresses.
4
5set -e
6
7# Don't bother to restart sshd when lo is configured.
8if [ "$IFACE" = lo ]; then
9 exit 0
10fi
11
12# Only run from ifup.
13if [ "$MODE" != start ]; then
14 exit 0
15fi
16
17# OpenSSH only cares about inet and inet6. Get ye gone, strange people
18# still using ipx.
19if [ "$ADDRFAM" != inet ] && [ "$ADDRFAM" != inet6 ]; then
20 exit 0
21fi
22
23# Is /usr mounted?
24if [ ! -e /usr/sbin/sshd ]; then
25 exit 0
26fi
27
28if [ ! -f /var/run/sshd.pid ] || \
29 [ "$(ps -p "$(cat /var/run/sshd.pid)" -o comm=)" != sshd ]; then
30 exit 0
31fi
32
33# We'd like to use 'reload' here, but it has some problems; see #502444. On
34# the other hand, repeated restarts of ssh make systemd unhappy
35# (#756547/#757822), so use reload in that case.
36if [ -d /run/systemd/system ]; then
37 systemctl reload --no-block ssh.service >/dev/null 2>&1 || true
38else
39 invoke-rc.d ssh restart >/dev/null 2>&1 || true
40fi
41
42exit 0
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
new file mode 100755
index 000000000..f696de231
--- /dev/null
+++ b/debian/openssh-server.install
@@ -0,0 +1,17 @@
1#! /usr/bin/dh-exec
2
3usr/sbin/sshd
4usr/share/man/man5/authorized_keys.5
5usr/share/man/man5/sshd_config.5
6usr/share/man/man8/sshd.8
7
8debian/openssh-server.if-up => etc/network/if-up.d/openssh-server
9debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server
10debian/systemd/ssh.socket lib/systemd/system
11debian/systemd/ssh@.service lib/systemd/system
12debian/systemd/sshd.conf usr/lib/tmpfiles.d
13debian/systemd/ssh-session-cleanup usr/lib/openssh
14
15# dh_apport would be neater, but at the time of writing it isn't in unstable
16# yet.
17debian/openssh-server.apport => usr/share/apport/package-hooks/openssh-server.py
diff --git a/debian/openssh-server.links b/debian/openssh-server.links
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/openssh-server.links
diff --git a/debian/openssh-server.lintian-overrides b/debian/openssh-server.lintian-overrides
new file mode 100644
index 000000000..17d912cb0
--- /dev/null
+++ b/debian/openssh-server.lintian-overrides
@@ -0,0 +1 @@
openssh-server: package-contains-empty-directory usr/share/doc/openssh-client/
diff --git a/debian/openssh-server.maintscript b/debian/openssh-server.maintscript
new file mode 100644
index 000000000..f9e3c4d53
--- /dev/null
+++ b/debian/openssh-server.maintscript
@@ -0,0 +1 @@
mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd 1:4.7p1-4~
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
new file mode 100644
index 000000000..ff61c4f1b
--- /dev/null
+++ b/debian/openssh-server.postinst
@@ -0,0 +1,315 @@
1#!/bin/sh
2set -e
3
4. /usr/share/debconf/confmodule
5db_version 2.0
6
7action="$1"
8oldversion="$2"
9
10umask 022
11
12
13get_config_option() {
14 option="$1"
15
16 [ -f /etc/ssh/sshd_config ] || return
17
18 # TODO: actually only one '=' allowed after option
19 perl -lne '
20 s/[[:space:]]+/ /g; s/[[:space:]]+$//;
21 print if s/^[[:space:]]*'"$option"'[[:space:]=]+//i' \
22 /etc/ssh/sshd_config
23}
24
25
26set_config_option() {
27 option="$1"
28 value="$2"
29
30 perl -le '
31 $option = $ARGV[0]; $value = $ARGV[1]; $done = 0;
32 while (<STDIN>) {
33 chomp;
34 (my $match = $_) =~ s/\s+/ /g;
35 if ($match =~ s/^\s*\Q$option\E\s+.*/$option $value/) {
36 $_ = $match;
37 $done = 1;
38 }
39 print;
40 }
41 print "$option $value" unless $done;' \
42 "$option" "$value" \
43 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
44 chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
45 chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
46 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
47}
48
49
50rename_config_option() {
51 oldoption="$1"
52 newoption="$2"
53
54 value="$(get_config_option "$oldoption")"
55 [ "$value" ] || return 0
56
57 perl -le '
58 $oldoption = $ARGV[0]; $newoption = $ARGV[1];
59 while (<STDIN>) {
60 chomp;
61 (my $match = $_) =~ s/\s+/ /g;
62 # TODO: actually only one "=" allowed after option
63 if ($match =~ s/^(\s*)\Q$oldoption\E([[:space:]=]+)/$1$newoption$2/i) {
64 $_ = $match;
65 }
66 print;
67 }' \
68 "$oldoption" "$newoption" \
69 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
70 chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
71 chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
72 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
73}
74
75
76host_keys_required() {
77 hostkeys="$(get_config_option HostKey)"
78 if [ "$hostkeys" ]; then
79 echo "$hostkeys"
80 else
81 # No HostKey directives at all, so the server picks some
82 # defaults.
83 echo /etc/ssh/ssh_host_rsa_key
84 echo /etc/ssh/ssh_host_ecdsa_key
85 echo /etc/ssh/ssh_host_ed25519_key
86 fi
87}
88
89
90create_key() {
91 msg="$1"
92 shift
93 hostkeys="$1"
94 shift
95 file="$1"
96 shift
97
98 if echo "$hostkeys" | grep -x "$file" >/dev/null && \
99 [ ! -f "$file" ] ; then
100 echo -n $msg
101 ssh-keygen -q -f "$file" -N '' "$@"
102 echo
103 if which restorecon >/dev/null 2>&1; then
104 restorecon "$file" "$file.pub"
105 fi
106 ssh-keygen -l -f "$file.pub"
107 fi
108}
109
110
111create_keys() {
112 hostkeys="$(host_keys_required)"
113
114 create_key "Creating SSH2 RSA key; this may take some time ..." \
115 "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa
116 create_key "Creating SSH2 DSA key; this may take some time ..." \
117 "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa
118 create_key "Creating SSH2 ECDSA key; this may take some time ..." \
119 "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa
120 create_key "Creating SSH2 ED25519 key; this may take some time ..." \
121 "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519
122}
123
124
125fix_loglevel_silent() {
126 if [ "$(get_config_option LogLevel)" = SILENT ]; then
127 set_config_option LogLevel QUIET
128 fi
129}
130
131
132update_server_key_bits() {
133 if [ "$(get_config_option ServerKeyBits)" = 768 ]; then
134 set_config_option ServerKeyBits 1024
135 fi
136}
137
138
139create_sshdconfig() {
140 if [ -e /etc/ssh/sshd_config ] ; then
141 # Upgrade an existing sshd configuration.
142
143 # This option was renamed in 3.8p1, but we never took care
144 # of adjusting the configuration file until now.
145 if dpkg --compare-versions "$oldversion" lt 1:4.7p1-8; then
146 rename_config_option KeepAlive TCPKeepAlive
147 fi
148
149 # 'LogLevel SILENT' is now equivalent to QUIET.
150 if dpkg --compare-versions "$oldversion" lt 1:5.4p1-1; then
151 fix_loglevel_silent
152 fi
153
154 # Changed upstream in 5.1p1, but we forgot to update the
155 # package-generated configuration file until now.
156 if dpkg --compare-versions "$oldversion" lt 1:6.4p1-2; then
157 update_server_key_bits
158 fi
159
160 return 0
161 fi
162
163 cat <<EOF > /etc/ssh/sshd_config
164# Package generated configuration file
165# See the sshd_config(5) manpage for details
166
167# What ports, IPs and protocols we listen for
168Port 22
169# Use these options to restrict which interfaces/protocols sshd will bind to
170#ListenAddress ::
171#ListenAddress 0.0.0.0
172Protocol 2
173# HostKeys for protocol version 2
174HostKey /etc/ssh/ssh_host_rsa_key
175HostKey /etc/ssh/ssh_host_ecdsa_key
176HostKey /etc/ssh/ssh_host_ed25519_key
177#Privilege Separation is turned on for security
178UsePrivilegeSeparation yes
179
180# Lifetime and size of ephemeral version 1 server key
181KeyRegenerationInterval 3600
182ServerKeyBits 1024
183
184# Logging
185SyslogFacility AUTH
186LogLevel INFO
187
188# Authentication:
189LoginGraceTime 120
190PermitRootLogin prohibit-password
191StrictModes yes
192
193RSAAuthentication yes
194PubkeyAuthentication yes
195#AuthorizedKeysFile %h/.ssh/authorized_keys
196
197# Don't read the user's ~/.rhosts and ~/.shosts files
198IgnoreRhosts yes
199# For this to work you will also need host keys in /etc/ssh_known_hosts
200RhostsRSAAuthentication no
201# similar for protocol version 2
202HostbasedAuthentication no
203# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
204#IgnoreUserKnownHosts yes
205
206# To enable empty passwords, change to yes (NOT RECOMMENDED)
207PermitEmptyPasswords no
208
209# Change to yes to enable challenge-response passwords (beware issues with
210# some PAM modules and threads)
211ChallengeResponseAuthentication no
212
213# Change to no to disable tunnelled clear text passwords
214#PasswordAuthentication yes
215
216# Kerberos options
217#KerberosAuthentication no
218#KerberosGetAFSToken no
219#KerberosOrLocalPasswd yes
220#KerberosTicketCleanup yes
221
222# GSSAPI options
223#GSSAPIAuthentication no
224#GSSAPICleanupCredentials yes
225
226X11Forwarding yes
227X11DisplayOffset 10
228PrintMotd no
229PrintLastLog yes
230TCPKeepAlive yes
231#UseLogin no
232
233#MaxStartups 10:30:60
234#Banner /etc/issue.net
235
236# Allow client to pass locale environment variables
237AcceptEnv LANG LC_*
238
239Subsystem sftp /usr/lib/openssh/sftp-server
240
241# Set this to 'yes' to enable PAM authentication, account processing,
242# and session processing. If this is enabled, PAM authentication will
243# be allowed through the ChallengeResponseAuthentication and
244# PasswordAuthentication. Depending on your PAM configuration,
245# PAM authentication via ChallengeResponseAuthentication may bypass
246# the setting of "PermitRootLogin without-password".
247# If you just want the PAM account and session checks to run without
248# PAM authentication, then enable this but set PasswordAuthentication
249# and ChallengeResponseAuthentication to 'no'.
250UsePAM yes
251EOF
252}
253
254fix_statoverride() {
255# Remove an erronous override for sshd (we should have overridden ssh)
256 if dpkg-statoverride --list /usr/sbin/sshd >/dev/null; then
257 dpkg-statoverride --remove /usr/sbin/sshd
258 fi
259}
260
261setup_sshd_user() {
262 if ! getent passwd sshd >/dev/null; then
263 adduser --quiet --system --no-create-home --home /var/run/sshd --shell /usr/sbin/nologin sshd
264 fi
265}
266
267if [ "$action" = configure ]; then
268 create_sshdconfig
269 create_keys
270 fix_statoverride
271 setup_sshd_user
272 # Renamed to /etc/ssh/moduli in 2.9.9 (!)
273 if dpkg --compare-versions "$2" lt-nl 1:4.7p1-1; then
274 rm -f /etc/ssh/primes
275 fi
276 if dpkg --compare-versions "$2" lt-nl 1:5.5p1-6; then
277 rm -f /var/run/sshd/.placeholder
278 fi
279 if dpkg --compare-versions "$2" lt-nl 1:6.2p2-3 && \
280 which initctl >/dev/null && initctl version 2>/dev/null | grep -q upstart && \
281 ! status ssh 2>/dev/null | grep -q ' start/'; then
282 # We must stop the sysvinit-controlled sshd before we can
283 # restart it under Upstart.
284 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true
285 fi
286 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-2 && \
287 deb-systemd-helper debian-installed ssh.socket && \
288 deb-systemd-helper --quiet was-enabled ssh.service && \
289 deb-systemd-helper --quiet was-enabled ssh.socket; then
290 # 1:6.5p1-1 mistakenly left both ssh.service and ssh.socket
291 # enabled.
292 deb-systemd-helper disable ssh.socket >/dev/null || true
293 fi
294 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-3 && \
295 [ -d /run/systemd/system ]; then
296 # We must stop the sysvinit-controlled sshd before we can
297 # restart it under systemd.
298 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd || true
299 fi
300 if dpkg --compare-versions "$2" lt-nl 1:6.6p1-1 && \
301 [ "$(get_config_option PermitRootLogin)" = yes ] &&
302 db_get openssh-server/permit-root-login && [ "$RET" = true ]; then
303 set_config_option PermitRootLogin prohibit-password
304 fi
305 if dpkg --compare-versions "$2" lt-nl 1:7.1p1-1 && \
306 [ "$(get_config_option PermitRootLogin)" = without-password ]; then
307 set_config_option PermitRootLogin prohibit-password
308 fi
309fi
310
311#DEBHELPER#
312
313db_stop
314
315exit 0
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
new file mode 100644
index 000000000..88e28a91e
--- /dev/null
+++ b/debian/openssh-server.postrm
@@ -0,0 +1,27 @@
1#!/bin/sh
2set -e
3
4#DEBHELPER#
5
6case $1 in
7 purge)
8 # Remove all non-conffiles that ssh might create, so that we
9 # can smoothly remove /etc/ssh if and only if the user
10 # hasn't dropped some other files in there. Conffiles have
11 # already been removed at this point.
12 rm -f /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub
13 rm -f /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
14 rm -f /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub
15 rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key.pub
16 rm -f /etc/ssh/ssh_host_ed25519_key /etc/ssh/ssh_host_ed25519_key.pub
17 rm -f /etc/ssh/sshd_config
18 rm -f /etc/ssh/sshd_not_to_be_run
19 rmdir --ignore-fail-on-non-empty /etc/ssh
20
21 if which deluser >/dev/null 2>&1; then
22 deluser --quiet sshd > /dev/null || true
23 fi
24 ;;
25esac
26
27exit 0
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
new file mode 100644
index 000000000..9fb5d350e
--- /dev/null
+++ b/debian/openssh-server.preinst
@@ -0,0 +1,18 @@
1#!/bin/sh
2set -e
3
4action=$1
5version=$2
6
7if [ "$action" = upgrade ] || [ "$action" = install ]
8then
9 if dpkg --compare-versions "$version" lt 1:5.5p1-6 && \
10 [ -d /var/run/sshd ]; then
11 # make sure /var/run/sshd is not removed on upgrades
12 touch /var/run/sshd/.placeholder
13 fi
14fi
15
16#DEBHELPER#
17
18exit 0
diff --git a/debian/openssh-server.ssh.default b/debian/openssh-server.ssh.default
new file mode 100644
index 000000000..304042224
--- /dev/null
+++ b/debian/openssh-server.ssh.default
@@ -0,0 +1,5 @@
1# Default settings for openssh-server. This file is sourced by /bin/sh from
2# /etc/init.d/ssh.
3
4# Options to pass to sshd
5SSHD_OPTS=
diff --git a/debian/openssh-server.ssh.init b/debian/openssh-server.ssh.init
new file mode 100644
index 000000000..bda7a92b8
--- /dev/null
+++ b/debian/openssh-server.ssh.init
@@ -0,0 +1,174 @@
1#! /bin/sh
2
3### BEGIN INIT INFO
4# Provides: sshd
5# Required-Start: $remote_fs $syslog
6# Required-Stop: $remote_fs $syslog
7# Default-Start: 2 3 4 5
8# Default-Stop:
9# Short-Description: OpenBSD Secure Shell server
10### END INIT INFO
11
12set -e
13
14# /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon
15
16test -x /usr/sbin/sshd || exit 0
17( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
18
19umask 022
20
21if test -f /etc/default/ssh; then
22 . /etc/default/ssh
23fi
24
25. /lib/lsb/init-functions
26
27if [ -n "$2" ]; then
28 SSHD_OPTS="$SSHD_OPTS $2"
29fi
30
31# Are we running from init?
32run_by_init() {
33 ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]
34}
35
36check_for_upstart() {
37 if init_is_upstart; then
38 exit $1
39 fi
40}
41
42check_for_no_start() {
43 # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
44 if [ -e /etc/ssh/sshd_not_to_be_run ]; then
45 if [ "$1" = log_end_msg ]; then
46 log_end_msg 0 || true
47 fi
48 if ! run_by_init; then
49 log_action_msg "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)" || true
50 fi
51 exit 0
52 fi
53}
54
55check_dev_null() {
56 if [ ! -c /dev/null ]; then
57 if [ "$1" = log_end_msg ]; then
58 log_end_msg 1 || true
59 fi
60 if ! run_by_init; then
61 log_action_msg "/dev/null is not a character device!" || true
62 fi
63 exit 1
64 fi
65}
66
67check_privsep_dir() {
68 # Create the PrivSep empty dir if necessary
69 if [ ! -d /var/run/sshd ]; then
70 mkdir /var/run/sshd
71 chmod 0755 /var/run/sshd
72 fi
73}
74
75check_config() {
76 if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then
77 /usr/sbin/sshd $SSHD_OPTS -t || exit 1
78 fi
79}
80
81export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
82
83case "$1" in
84 start)
85 check_for_upstart 1
86 check_privsep_dir
87 check_for_no_start
88 check_dev_null
89 log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd" || true
90 if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
91 log_end_msg 0 || true
92 else
93 log_end_msg 1 || true
94 fi
95 ;;
96 stop)
97 check_for_upstart 0
98 log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true
99 if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid; then
100 log_end_msg 0 || true
101 else
102 log_end_msg 1 || true
103 fi
104 ;;
105
106 reload|force-reload)
107 check_for_upstart 1
108 check_for_no_start
109 check_config
110 log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true
111 if start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd; then
112 log_end_msg 0 || true
113 else
114 log_end_msg 1 || true
115 fi
116 ;;
117
118 restart)
119 check_for_upstart 1
120 check_privsep_dir
121 check_config
122 log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
123 start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid
124 check_for_no_start log_end_msg
125 check_dev_null log_end_msg
126 if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
127 log_end_msg 0 || true
128 else
129 log_end_msg 1 || true
130 fi
131 ;;
132
133 try-restart)
134 check_for_upstart 1
135 check_privsep_dir
136 check_config
137 log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
138 RET=0
139 start-stop-daemon --stop --quiet --retry 30 --pidfile /var/run/sshd.pid || RET="$?"
140 case $RET in
141 0)
142 # old daemon stopped
143 check_for_no_start log_end_msg
144 check_dev_null log_end_msg
145 if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
146 log_end_msg 0 || true
147 else
148 log_end_msg 1 || true
149 fi
150 ;;
151 1)
152 # daemon not running
153 log_progress_msg "(not running)" || true
154 log_end_msg 0 || true
155 ;;
156 *)
157 # failed to stop
158 log_progress_msg "(failed to stop)" || true
159 log_end_msg 1 || true
160 ;;
161 esac
162 ;;
163
164 status)
165 check_for_upstart 1
166 status_of_proc -p /var/run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
167 ;;
168
169 *)
170 log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}" || true
171 exit 1
172esac
173
174exit 0
diff --git a/debian/openssh-server.ssh.service b/debian/openssh-server.ssh.service
new file mode 120000
index 000000000..609457230
--- /dev/null
+++ b/debian/openssh-server.ssh.service
@@ -0,0 +1 @@
systemd/ssh.service \ No newline at end of file
diff --git a/debian/openssh-server.ssh.upstart b/debian/openssh-server.ssh.upstart
new file mode 100644
index 000000000..b34cbff5d
--- /dev/null
+++ b/debian/openssh-server.ssh.upstart
@@ -0,0 +1,29 @@
1# ssh - OpenBSD Secure Shell server
2#
3# The OpenSSH server provides secure shell access to the system.
4
5description "OpenSSH server"
6
7start on runlevel [2345]
8stop on runlevel [!2345]
9
10respawn
11respawn limit 10 5
12umask 022
13
14env SSH_SIGSTOP=1
15expect stop
16
17# 'sshd -D' leaks stderr and confuses things in conjunction with 'console log'
18console none
19
20pre-start script
21 test -x /usr/sbin/sshd || { stop; exit 0; }
22 test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
23
24 mkdir -p -m0755 /var/run/sshd
25end script
26
27# if you used to set SSHD_OPTS in /etc/default/ssh, you can change the
28# 'exec' line here instead
29exec /usr/sbin/sshd -D
diff --git a/debian/openssh-server.sshd.pam.in b/debian/openssh-server.sshd.pam.in
new file mode 100644
index 000000000..2cad67da6
--- /dev/null
+++ b/debian/openssh-server.sshd.pam.in
@@ -0,0 +1,55 @@
1# PAM configuration for the Secure Shell service
2
3# Standard Un*x authentication.
4@include common-auth
5
6# Disallow non-root logins when /etc/nologin exists.
7account required pam_nologin.so
8
9# Uncomment and edit /etc/security/access.conf if you need to set complex
10# access limits that are hard to express in sshd_config.
11# account required pam_access.so
12
13# Standard Un*x authorization.
14@include common-account
15
16# SELinux needs to be the first session rule. This ensures that any
17# lingering context has been cleared. Without this it is possible that a
18# module could execute code in the wrong domain.
19session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
20
21# Set the loginuid process attribute.
22session required pam_loginuid.so
23
24@IF_KEYINIT@# Create a new session keyring.
25@IF_KEYINIT@session optional pam_keyinit.so force revoke
26
27# Standard Un*x session setup and teardown.
28@include common-session
29
30# Print the message of the day upon successful login.
31# This includes a dynamically generated part from /run/motd.dynamic
32# and a static (admin-editable) part from /etc/motd.
33session optional pam_motd.so motd=/run/motd.dynamic
34session optional pam_motd.so noupdate
35
36# Print the status of the user's mailbox upon successful login.
37session optional pam_mail.so standard noenv # [1]
38
39# Set up user limits from /etc/security/limits.conf.
40session required pam_limits.so
41
42# Read environment variables from /etc/environment and
43# /etc/security/pam_env.conf.
44session required pam_env.so # [1]
45# In Debian 4.0 (etch), locale-related environment variables were moved to
46# /etc/default/locale, so read that as well.
47session required pam_env.so user_readenv=1 envfile=/etc/default/locale
48
49# SELinux needs to intervene at login time to ensure that the process starts
50# in the proper default security context. Only sessions which are intended
51# to run in the user's context should be run after this.
52session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
53
54# Standard Un*x password updating.
55@include common-password
diff --git a/debian/openssh-server.templates b/debian/openssh-server.templates
new file mode 100644
index 000000000..1bc8a3308
--- /dev/null
+++ b/debian/openssh-server.templates
@@ -0,0 +1,15 @@
1Template: openssh-server/permit-root-login
2Type: boolean
3Default: false
4_Description: Disable SSH password authentication for root?
5 Previous versions of openssh-server permitted logging in as root over SSH
6 using password authentication. The default for new installations is now
7 "PermitRootLogin prohibit-password", which disables password authentication
8 for root without breaking systems that have explicitly configured SSH
9 public key authentication for root.
10 .
11 This change makes systems more secure against brute-force password
12 dictionary attacks on the root user (a very common target for such
13 attacks). However, it may break systems that are set up with the
14 expectation of being able to SSH as root using password authentication. You
15 should only make this change if you do not need to do that.
diff --git a/debian/openssh-server.ufw.profile b/debian/openssh-server.ufw.profile
new file mode 100644
index 000000000..9bbe906bc
--- /dev/null
+++ b/debian/openssh-server.ufw.profile
@@ -0,0 +1,4 @@
1[OpenSSH]
2title=Secure shell server, an rshd replacement
3description=OpenSSH is a free implementation of the Secure Shell protocol.
4ports=22/tcp
diff --git a/debian/openssh-sftp-server.install b/debian/openssh-sftp-server.install
new file mode 100644
index 000000000..25b12dc09
--- /dev/null
+++ b/debian/openssh-sftp-server.install
@@ -0,0 +1,2 @@
1usr/lib/openssh/sftp-server
2usr/share/man/man8/sftp-server.8
diff --git a/debian/openssh-sftp-server.links b/debian/openssh-sftp-server.links
new file mode 100644
index 000000000..2d98b1dcb
--- /dev/null
+++ b/debian/openssh-sftp-server.links
@@ -0,0 +1 @@
usr/lib/openssh/sftp-server usr/lib/sftp-server
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch
new file mode 100644
index 000000000..7abed3704
--- /dev/null
+++ b/debian/patches/auth-log-verbosity.patch
@@ -0,0 +1,133 @@
1From b4b79ae5a16f73426b54c6394a29b2b49da4dc16 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:02 +0000
4Subject: Quieten logs when multiple from= restrictions are used
5
6Bug-Debian: http://bugs.debian.org/630606
7Forwarded: no
8Last-Update: 2013-09-14
9
10Patch-Name: auth-log-verbosity.patch
11---
12 auth-options.c | 35 ++++++++++++++++++++++++++---------
13 auth-options.h | 1 +
14 auth-rsa.c | 2 ++
15 auth2-pubkey.c | 3 +++
16 4 files changed, 32 insertions(+), 9 deletions(-)
17
18diff --git a/auth-options.c b/auth-options.c
19index b399b91..a9d9a81 100644
20--- a/auth-options.c
21+++ b/auth-options.c
22@@ -59,9 +59,20 @@ int forced_tun_device = -1;
23 /* "principals=" option. */
24 char *authorized_principals = NULL;
25
26+/* Throttle log messages. */
27+int logged_from_hostip = 0;
28+int logged_cert_hostip = 0;
29+
30 extern ServerOptions options;
31
32 void
33+auth_start_parse_options(void)
34+{
35+ logged_from_hostip = 0;
36+ logged_cert_hostip = 0;
37+}
38+
39+void
40 auth_clear_options(void)
41 {
42 no_agent_forwarding_flag = 0;
43@@ -316,10 +327,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
44 /* FALLTHROUGH */
45 case 0:
46 free(patterns);
47- logit("Authentication tried for %.100s with "
48- "correct key but not from a permitted "
49- "host (host=%.200s, ip=%.200s).",
50- pw->pw_name, remote_host, remote_ip);
51+ if (!logged_from_hostip) {
52+ logit("Authentication tried for %.100s with "
53+ "correct key but not from a permitted "
54+ "host (host=%.200s, ip=%.200s).",
55+ pw->pw_name, remote_host, remote_ip);
56+ logged_from_hostip = 1;
57+ }
58 auth_debug_add("Your host '%.200s' is not "
59 "permitted to use this key for login.",
60 remote_host);
61@@ -543,11 +557,14 @@ parse_option_list(struct sshbuf *oblob, struct passwd *pw,
62 break;
63 case 0:
64 /* no match */
65- logit("Authentication tried for %.100s "
66- "with valid certificate but not "
67- "from a permitted host "
68- "(ip=%.200s).", pw->pw_name,
69- remote_ip);
70+ if (!logged_cert_hostip) {
71+ logit("Authentication tried for %.100s "
72+ "with valid certificate but not "
73+ "from a permitted host "
74+ "(ip=%.200s).", pw->pw_name,
75+ remote_ip);
76+ logged_cert_hostip = 1;
77+ }
78 auth_debug_add("Your address '%.200s' "
79 "is not permitted to use this "
80 "certificate for login.",
81diff --git a/auth-options.h b/auth-options.h
82index 34852e5..1653855 100644
83--- a/auth-options.h
84+++ b/auth-options.h
85@@ -33,6 +33,7 @@ extern int forced_tun_device;
86 extern int key_is_cert_authority;
87 extern char *authorized_principals;
88
89+void auth_start_parse_options(void);
90 int auth_parse_options(struct passwd *, char *, char *, u_long);
91 void auth_clear_options(void);
92 int auth_cert_options(struct sshkey *, struct passwd *);
93diff --git a/auth-rsa.c b/auth-rsa.c
94index cbd971b..4cf2163 100644
95--- a/auth-rsa.c
96+++ b/auth-rsa.c
97@@ -181,6 +181,8 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file,
98 if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL)
99 return 0;
100
101+ auth_start_parse_options();
102+
103 /*
104 * Go though the accepted keys, looking for the current key. If
105 * found, perform a challenge-response dialog to verify that the
106diff --git a/auth2-pubkey.c b/auth2-pubkey.c
107index 41b34ae..aace7ca 100644
108--- a/auth2-pubkey.c
109+++ b/auth2-pubkey.c
110@@ -566,6 +566,7 @@ process_principals(FILE *f, char *file, struct passwd *pw,
111 u_long linenum = 0;
112 u_int i;
113
114+ auth_start_parse_options();
115 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
116 /* Skip leading whitespace. */
117 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
118@@ -731,6 +732,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
119 found_key = 0;
120
121 found = NULL;
122+ auth_start_parse_options();
123 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
124 char *cp, *key_options = NULL;
125 if (found != NULL)
126@@ -878,6 +880,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key)
127 if (key_cert_check_authority(key, 0, 1,
128 use_authorized_principals ? NULL : pw->pw_name, &reason) != 0)
129 goto fail_reason;
130+ auth_start_parse_options();
131 if (auth_cert_options(key, pw) != 0)
132 goto out;
133
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
new file mode 100644
index 000000000..d75494fa6
--- /dev/null
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -0,0 +1,26 @@
1From 724283a55e8928a5564722ebe9c133033b51809d Mon Sep 17 00:00:00 2001
2From: Tomas Pospisek <tpo_deb@sourcepole.ch>
3Date: Sun, 9 Feb 2014 16:10:07 +0000
4Subject: Install authorized_keys(5) as a symlink to sshd(8)
5
6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1720
7Bug-Debian: http://bugs.debian.org/441817
8Last-Update: 2013-09-14
9
10Patch-Name: authorized-keys-man-symlink.patch
11---
12 Makefile.in | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/Makefile.in b/Makefile.in
16index 51817df..21948dd 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -327,6 +327,7 @@ install-files:
20 $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
21 $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
22 $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
23+ ln -s ../$(mansubdir)8/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)5/authorized_keys.5
24 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
25 $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
26 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
new file mode 100644
index 000000000..cf4bfad50
--- /dev/null
+++ b/debian/patches/debian-banner.patch
@@ -0,0 +1,111 @@
1From 277ad2acedde81dce324e711da116d100b47f445 Mon Sep 17 00:00:00 2001
2From: Kees Cook <kees@debian.org>
3Date: Sun, 9 Feb 2014 16:10:06 +0000
4Subject: Add DebianBanner server configuration option
5
6Setting this to "no" causes sshd to omit the Debian revision from its
7initial protocol handshake, for those scared by package-versioning.patch.
8
9Bug-Debian: http://bugs.debian.org/562048
10Forwarded: not-needed
11Last-Update: 2015-11-29
12
13Patch-Name: debian-banner.patch
14---
15 servconf.c | 9 +++++++++
16 servconf.h | 2 ++
17 sshd.c | 3 ++-
18 sshd_config.5 | 5 +++++
19 4 files changed, 18 insertions(+), 1 deletion(-)
20
21diff --git a/servconf.c b/servconf.c
22index bf9f8f7..a98b309 100644
23--- a/servconf.c
24+++ b/servconf.c
25@@ -171,6 +171,7 @@ initialize_server_options(ServerOptions *options)
26 options->ip_qos_bulk = -1;
27 options->version_addendum = NULL;
28 options->fingerprint_hash = -1;
29+ options->debian_banner = -1;
30 }
31
32 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
33@@ -359,6 +360,8 @@ fill_default_server_options(ServerOptions *options)
34 options->fwd_opts.streamlocal_bind_unlink = 0;
35 if (options->fingerprint_hash == -1)
36 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
37+ if (options->debian_banner == -1)
38+ options->debian_banner = 1;
39
40 assemble_algorithms(options);
41
42@@ -445,6 +448,7 @@ typedef enum {
43 sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
44 sStreamLocalBindMask, sStreamLocalBindUnlink,
45 sAllowStreamLocalForwarding, sFingerprintHash,
46+ sDebianBanner,
47 sDeprecated, sUnsupported
48 } ServerOpCodes;
49
50@@ -596,6 +600,7 @@ static struct {
51 { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },
52 { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
53 { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
54+ { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
55 { NULL, sBadOption, 0 }
56 };
57
58@@ -1903,6 +1908,10 @@ process_server_config_line(ServerOptions *options, char *line,
59 options->fingerprint_hash = value;
60 break;
61
62+ case sDebianBanner:
63+ intptr = &options->debian_banner;
64+ goto parse_int;
65+
66 case sDeprecated:
67 logit("%s line %d: Deprecated option %s",
68 filename, linenum, arg);
69diff --git a/servconf.h b/servconf.h
70index 778ba17..161fa37 100644
71--- a/servconf.h
72+++ b/servconf.h
73@@ -197,6 +197,8 @@ typedef struct {
74 char *auth_methods[MAX_AUTH_METHODS];
75
76 int fingerprint_hash;
77+
78+ int debian_banner;
79 } ServerOptions;
80
81 /* Information about the incoming connection as used by Match */
82diff --git a/sshd.c b/sshd.c
83index e873557..71fad9e 100644
84--- a/sshd.c
85+++ b/sshd.c
86@@ -443,7 +443,8 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
87 }
88
89 xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
90- major, minor, SSH_RELEASE,
91+ major, minor,
92+ options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
93 *options.version_addendum == '\0' ? "" : " ",
94 options.version_addendum, newline);
95
96diff --git a/sshd_config.5 b/sshd_config.5
97index e05cdbe..ac9b1f0 100644
98--- a/sshd_config.5
99+++ b/sshd_config.5
100@@ -541,6 +541,11 @@ or
101 .Dq no .
102 The default is
103 .Dq delayed .
104+.It Cm DebianBanner
105+Specifies whether the distribution-specified extra version suffix is
106+included during initial protocol handshake.
107+The default is
108+.Dq yes .
109 .It Cm DenyGroups
110 This keyword can be followed by a list of group name patterns, separated
111 by spaces.
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
new file mode 100644
index 000000000..1d9efcbbf
--- /dev/null
+++ b/debian/patches/debian-config.patch
@@ -0,0 +1,195 @@
1From 4c914ccd85bbf391c4dc61b85e3c178fef465e3f Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:18 +0000
4Subject: Various Debian-specific configuration changes
5
6ssh: Enable ForwardX11Trusted, returning to earlier semantics which cause
7fewer problems with existing setups (http://bugs.debian.org/237021).
8
9ssh: Set 'SendEnv LANG LC_*' by default (http://bugs.debian.org/264024).
10
11ssh: Enable HashKnownHosts by default to try to limit the spread of ssh
12worms.
13
14ssh: Enable GSSAPIAuthentication and disable GSSAPIDelegateCredentials by
15default.
16
17Document all of this, along with several sshd defaults set in
18debian/openssh-server.postinst.
19
20Author: Russ Allbery <rra@debian.org>
21Forwarded: not-needed
22Last-Update: 2015-12-07
23
24Patch-Name: debian-config.patch
25---
26 readconf.c | 2 +-
27 ssh.1 | 21 +++++++++++++++++++++
28 ssh_config | 7 ++++++-
29 ssh_config.5 | 19 ++++++++++++++++++-
30 sshd_config | 2 +-
31 sshd_config.5 | 25 +++++++++++++++++++++++++
32 6 files changed, 72 insertions(+), 4 deletions(-)
33
34diff --git a/readconf.c b/readconf.c
35index f6b4c8f..5cd51f3 100644
36--- a/readconf.c
37+++ b/readconf.c
38@@ -1928,7 +1928,7 @@ fill_default_options(Options * options)
39 if (options->forward_x11 == -1)
40 options->forward_x11 = 0;
41 if (options->forward_x11_trusted == -1)
42- options->forward_x11_trusted = 0;
43+ options->forward_x11_trusted = 1;
44 if (options->forward_x11_timeout == -1)
45 options->forward_x11_timeout = 1200;
46 /*
47diff --git a/ssh.1 b/ssh.1
48index 22e56a7..6aa57c4 100644
49--- a/ssh.1
50+++ b/ssh.1
51@@ -785,6 +785,16 @@ directive in
52 .Xr ssh_config 5
53 for more information.
54 .Pp
55+(Debian-specific: X11 forwarding is not subjected to X11 SECURITY extension
56+restrictions by default, because too many programs currently crash in this
57+mode.
58+Set the
59+.Cm ForwardX11Trusted
60+option to
61+.Dq no
62+to restore the upstream behaviour.
63+This may change in future depending on client-side improvements.)
64+.Pp
65 .It Fl x
66 Disables X11 forwarding.
67 .Pp
68@@ -793,6 +803,17 @@ Enables trusted X11 forwarding.
69 Trusted X11 forwardings are not subjected to the X11 SECURITY extension
70 controls.
71 .Pp
72+(Debian-specific: This option does nothing in the default configuration: it
73+is equivalent to
74+.Dq Cm ForwardX11Trusted No yes ,
75+which is the default as described above.
76+Set the
77+.Cm ForwardX11Trusted
78+option to
79+.Dq no
80+to restore the upstream behaviour.
81+This may change in future depending on client-side improvements.)
82+.Pp
83 .It Fl y
84 Send log information using the
85 .Xr syslog 3
86diff --git a/ssh_config b/ssh_config
87index 4e879cd..5190b06 100644
88--- a/ssh_config
89+++ b/ssh_config
90@@ -17,9 +17,10 @@
91 # list of available options, their meanings and defaults, please see the
92 # ssh_config(5) man page.
93
94-# Host *
95+Host *
96 # ForwardAgent no
97 # ForwardX11 no
98+# ForwardX11Trusted yes
99 # RhostsRSAAuthentication no
100 # RSAAuthentication yes
101 # PasswordAuthentication yes
102@@ -50,3 +51,7 @@
103 # VisualHostKey no
104 # ProxyCommand ssh -q -W %h:%p gateway.example.com
105 # RekeyLimit 1G 1h
106+ SendEnv LANG LC_*
107+ HashKnownHosts yes
108+ GSSAPIAuthentication yes
109+ GSSAPIDelegateCredentials no
110diff --git a/ssh_config.5 b/ssh_config.5
111index 30c97a9..c967258 100644
112--- a/ssh_config.5
113+++ b/ssh_config.5
114@@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more
115 host-specific declarations should be given near the beginning of the
116 file, and general defaults at the end.
117 .Pp
118+Note that the Debian
119+.Ic openssh-client
120+package sets several options as standard in
121+.Pa /etc/ssh/ssh_config
122+which are not the default in
123+.Xr ssh 1 :
124+.Pp
125+.Bl -bullet -offset indent -compact
126+.It
127+.Cm SendEnv No LANG LC_*
128+.It
129+.Cm HashKnownHosts No yes
130+.It
131+.Cm GSSAPIAuthentication No yes
132+.El
133+.Pp
134 The configuration file has the following format:
135 .Pp
136 Empty lines and lines starting with
137@@ -799,7 +815,8 @@ token used for the session will be set to expire after 20 minutes.
138 Remote clients will be refused access after this time.
139 .Pp
140 The default is
141-.Dq no .
142+.Dq yes
143+(Debian-specific).
144 .Pp
145 See the X11 SECURITY extension specification for full details on
146 the restrictions imposed on untrusted clients.
147diff --git a/sshd_config b/sshd_config
148index 3fe3e01..ec8ff8f 100644
149--- a/sshd_config
150+++ b/sshd_config
151@@ -124,7 +124,7 @@ AuthorizedKeysFile .ssh/authorized_keys
152 #Banner none
153
154 # override default of no subsystems
155-Subsystem sftp /usr/libexec/sftp-server
156+Subsystem sftp /usr/lib/openssh/sftp-server
157
158 # Example of overriding settings on a per-user basis
159 #Match User anoncvs
160diff --git a/sshd_config.5 b/sshd_config.5
161index b2b349e..79f2d61 100644
162--- a/sshd_config.5
163+++ b/sshd_config.5
164@@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes
165 .Pq \&"
166 in order to represent arguments containing spaces.
167 .Pp
168+Note that the Debian
169+.Ic openssh-server
170+package sets several options as standard in
171+.Pa /etc/ssh/sshd_config
172+which are not the default in
173+.Xr sshd 8 .
174+The exact list depends on whether the package was installed fresh or
175+upgraded from various possible previous versions, but includes at least the
176+following:
177+.Pp
178+.Bl -bullet -offset indent -compact
179+.It
180+.Cm ChallengeResponseAuthentication No no
181+.It
182+.Cm X11Forwarding No yes
183+.It
184+.Cm PrintMotd No no
185+.It
186+.Cm AcceptEnv No LANG LC_*
187+.It
188+.Cm Subsystem No sftp /usr/lib/openssh/sftp-server
189+.It
190+.Cm UsePAM No yes
191+.El
192+.Pp
193 The possible
194 keywords and their meanings are as follows (note that
195 keywords are case-insensitive and arguments are case-sensitive):
diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch
new file mode 100644
index 000000000..e4498fb48
--- /dev/null
+++ b/debian/patches/dnssec-sshfp.patch
@@ -0,0 +1,94 @@
1From 9d9a37bb0c2d7546253ff2b0b67e314d8475bfc7 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:01 +0000
4Subject: Force use of DNSSEC even if "options edns0" isn't in resolv.conf
5
6This allows SSHFP DNS records to be verified if glibc 2.11 is installed.
7
8Origin: vendor, https://cvs.fedoraproject.org/viewvc/F-12/openssh/openssh-5.2p1-edns.patch?revision=1.1&view=markup
9Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049
10Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049
11Last-Update: 2010-04-06
12
13Patch-Name: dnssec-sshfp.patch
14---
15 dns.c | 14 +++++++++++++-
16 openbsd-compat/getrrsetbyname.c | 10 +++++-----
17 openbsd-compat/getrrsetbyname.h | 3 +++
18 3 files changed, 21 insertions(+), 6 deletions(-)
19
20diff --git a/dns.c b/dns.c
21index e813afe..fce2e30 100644
22--- a/dns.c
23+++ b/dns.c
24@@ -206,6 +206,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
25 {
26 u_int counter;
27 int result;
28+ unsigned int rrset_flags = 0;
29 struct rrsetinfo *fingerprints = NULL;
30
31 u_int8_t hostkey_algorithm;
32@@ -229,8 +230,19 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
33 return -1;
34 }
35
36+ /*
37+ * Original getrrsetbyname function, found on OpenBSD for example,
38+ * doesn't accept any flag and prerequisite for obtaining AD bit in
39+ * DNS response is set by "options edns0" in resolv.conf.
40+ *
41+ * Our version is more clever and use RRSET_FORCE_EDNS0 flag.
42+ */
43+#ifndef HAVE_GETRRSETBYNAME
44+ rrset_flags |= RRSET_FORCE_EDNS0;
45+#endif
46 result = getrrsetbyname(hostname, DNS_RDATACLASS_IN,
47- DNS_RDATATYPE_SSHFP, 0, &fingerprints);
48+ DNS_RDATATYPE_SSHFP, rrset_flags, &fingerprints);
49+
50 if (result) {
51 verbose("DNS lookup error: %s", dns_result_totext(result));
52 return -1;
53diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
54index dc6fe05..e061a29 100644
55--- a/openbsd-compat/getrrsetbyname.c
56+++ b/openbsd-compat/getrrsetbyname.c
57@@ -209,8 +209,8 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
58 goto fail;
59 }
60
61- /* don't allow flags yet, unimplemented */
62- if (flags) {
63+ /* Allow RRSET_FORCE_EDNS0 flag only. */
64+ if ((flags & !RRSET_FORCE_EDNS0) != 0) {
65 result = ERRSET_INVAL;
66 goto fail;
67 }
68@@ -226,9 +226,9 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
69 #endif /* DEBUG */
70
71 #ifdef RES_USE_DNSSEC
72- /* turn on DNSSEC if EDNS0 is configured */
73- if (_resp->options & RES_USE_EDNS0)
74- _resp->options |= RES_USE_DNSSEC;
75+ /* turn on DNSSEC if required */
76+ if (flags & RRSET_FORCE_EDNS0)
77+ _resp->options |= (RES_USE_EDNS0|RES_USE_DNSSEC);
78 #endif /* RES_USE_DNSEC */
79
80 /* make query */
81diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
82index 1283f55..dbbc85a 100644
83--- a/openbsd-compat/getrrsetbyname.h
84+++ b/openbsd-compat/getrrsetbyname.h
85@@ -72,6 +72,9 @@
86 #ifndef RRSET_VALIDATED
87 # define RRSET_VALIDATED 1
88 #endif
89+#ifndef RRSET_FORCE_EDNS0
90+# define RRSET_FORCE_EDNS0 0x0001
91+#endif
92
93 /*
94 * Return codes for getrrsetbyname()
diff --git a/debian/patches/doc-hash-tab-completion.patch b/debian/patches/doc-hash-tab-completion.patch
new file mode 100644
index 000000000..5f91cadfe
--- /dev/null
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -0,0 +1,28 @@
1From bfea780bba64294541d98efcc26b01392ff64c60 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:11 +0000
4Subject: Document that HashKnownHosts may break tab-completion
5
6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1727
7Bug-Debian: http://bugs.debian.org/430154
8Last-Update: 2013-09-14
9
10Patch-Name: doc-hash-tab-completion.patch
11---
12 ssh_config.5 | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/ssh_config.5 b/ssh_config.5
16index 5dd26bc..30c97a9 100644
17--- a/ssh_config.5
18+++ b/ssh_config.5
19@@ -883,6 +883,9 @@ Note that existing names and addresses in known hosts files
20 will not be converted automatically,
21 but may be manually hashed using
22 .Xr ssh-keygen 1 .
23+Use of this option may break facilities such as tab-completion that rely
24+on being able to read unhashed host names from
25+.Pa ~/.ssh/known_hosts .
26 .It Cm HostbasedAuthentication
27 Specifies whether to try rhosts based authentication with public key
28 authentication.
diff --git a/debian/patches/doc-upstart.patch b/debian/patches/doc-upstart.patch
new file mode 100644
index 000000000..8f093d80c
--- /dev/null
+++ b/debian/patches/doc-upstart.patch
@@ -0,0 +1,29 @@
1From e4ba4e1616d372522de9e18f0973ed49a5521b95 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:12 +0000
4Subject: Refer to ssh's Upstart job as well as its init script
5
6Forwarded: not-needed
7Last-Update: 2013-09-14
8
9Patch-Name: doc-upstart.patch
10---
11 sshd.8 | 5 ++++-
12 1 file changed, 4 insertions(+), 1 deletion(-)
13
14diff --git a/sshd.8 b/sshd.8
15index 58eefe9..4e75567 100644
16--- a/sshd.8
17+++ b/sshd.8
18@@ -67,7 +67,10 @@ over an insecure network.
19 .Nm
20 listens for connections from clients.
21 It is normally started at boot from
22-.Pa /etc/init.d/ssh .
23+.Pa /etc/init.d/ssh
24+(or
25+.Pa /etc/init/ssh.conf
26+on systems using the Upstart init daemon).
27 It forks a new
28 daemon for each incoming connection.
29 The forked daemons handle
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
new file mode 100644
index 000000000..c34441df3
--- /dev/null
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -0,0 +1,26 @@
1From db85bf41862b80b0447777d942a091cd3ac5f1c1 Mon Sep 17 00:00:00 2001
2From: Vincent Untz <vuntz@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:16 +0000
4Subject: Give the ssh-askpass-gnome window a default icon
5
6Bug-Ubuntu: https://bugs.launchpad.net/bugs/27152
7Last-Update: 2010-02-28
8
9Patch-Name: gnome-ssh-askpass2-icon.patch
10---
11 contrib/gnome-ssh-askpass2.c | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
15index 9d97c30..04b3a11 100644
16--- a/contrib/gnome-ssh-askpass2.c
17+++ b/contrib/gnome-ssh-askpass2.c
18@@ -209,6 +209,8 @@ main(int argc, char **argv)
19
20 gtk_init(&argc, &argv);
21
22+ gtk_window_set_default_icon_from_file ("/usr/share/pixmaps/ssh-askpass-gnome.png", NULL);
23+
24 if (argc > 1) {
25 message = g_strjoinv(" ", argv + 1);
26 } else {
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch
new file mode 100644
index 000000000..8e946aa88
--- /dev/null
+++ b/debian/patches/gssapi.patch
@@ -0,0 +1,3267 @@
1From eecddf8b72fcad83ccca43b1badb03782704f6b7 Mon Sep 17 00:00:00 2001
2From: Simon Wilkinson <simon@sxw.org.uk>
3Date: Sun, 9 Feb 2014 16:09:48 +0000
4Subject: GSSAPI key exchange support
5
6This patch has been rejected upstream: "None of the OpenSSH developers are
7in favour of adding this, and this situation has not changed for several
8years. This is not a slight on Simon's patch, which is of fine quality, but
9just that a) we don't trust GSSAPI implementations that much and b) we don't
10like adding new KEX since they are pre-auth attack surface. This one is
11particularly scary, since it requires hooks out to typically root-owned
12system resources."
13
14However, quite a lot of people rely on this in Debian, and it's better to
15have it merged into the main openssh package rather than having separate
16-krb5 packages (as we used to have). It seems to have a generally good
17security history.
18
19Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242
20Last-Updated: 2016-08-07
21
22Patch-Name: gssapi.patch
23---
24 ChangeLog.gssapi | 113 +++++++++++++++++++
25 Makefile.in | 3 +-
26 auth-krb5.c | 17 ++-
27 auth.c | 96 +---------------
28 auth2-gss.c | 48 +++++++-
29 auth2.c | 2 +
30 canohost.c | 93 +++++++++++++++
31 canohost.h | 3 +
32 clientloop.c | 15 ++-
33 config.h.in | 6 +
34 configure.ac | 24 ++++
35 gss-genr.c | 275 +++++++++++++++++++++++++++++++++++++++++++-
36 gss-serv-krb5.c | 85 ++++++++++++--
37 gss-serv.c | 185 +++++++++++++++++++++++++++---
38 kex.c | 19 ++++
39 kex.h | 14 +++
40 kexgssc.c | 338 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
41 kexgsss.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++
42 monitor.c | 108 +++++++++++++++++-
43 monitor.h | 3 +
44 monitor_wrap.c | 47 +++++++-
45 monitor_wrap.h | 4 +-
46 readconf.c | 42 +++++++
47 readconf.h | 5 +
48 servconf.c | 28 ++++-
49 servconf.h | 2 +
50 ssh-gss.h | 41 ++++++-
51 ssh_config | 2 +
52 ssh_config.5 | 32 ++++++
53 sshconnect2.c | 122 +++++++++++++++++++-
54 sshd.c | 110 ++++++++++++++++++
55 sshd_config | 2 +
56 sshd_config.5 | 10 ++
57 sshkey.c | 3 +-
58 sshkey.h | 1 +
59 35 files changed, 2054 insertions(+), 139 deletions(-)
60 create mode 100644 ChangeLog.gssapi
61 create mode 100644 kexgssc.c
62 create mode 100644 kexgsss.c
63
64diff --git a/ChangeLog.gssapi b/ChangeLog.gssapi
65new file mode 100644
66index 0000000..f117a33
67--- /dev/null
68+++ b/ChangeLog.gssapi
69@@ -0,0 +1,113 @@
70+20110101
71+ - Finally update for OpenSSH 5.6p1
72+ - Add GSSAPIServerIdentity option from Jim Basney
73+
74+20100308
75+ - [ Makefile.in, key.c, key.h ]
76+ Updates for OpenSSH 5.4p1
77+ - [ servconf.c ]
78+ Include GSSAPI options in the sshd -T configuration dump, and flag
79+ some older configuration options as being unsupported. Thanks to Colin
80+ Watson.
81+ -
82+
83+20100124
84+ - [ sshconnect2.c ]
85+ Adapt to deal with additional element in Authmethod structure. Thanks to
86+ Colin Watson
87+
88+20090615
89+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
90+ sshd.c ]
91+ Fix issues identified by Greg Hudson following a code review
92+ Check return value of gss_indicate_mechs
93+ Protect GSSAPI calls in monitor, so they can only be used if enabled
94+ Check return values of bignum functions in key exchange
95+ Use BN_clear_free to clear other side's DH value
96+ Make ssh_gssapi_id_kex more robust
97+ Only configure kex table pointers if GSSAPI is enabled
98+ Don't leak mechanism list, or gss mechanism list
99+ Cast data.length before printing
100+ If serverkey isn't provided, use an empty string, rather than NULL
101+
102+20090201
103+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h
104+ ssh_config.5 sshconnet2.c ]
105+ Add support for the GSSAPIClientIdentity option, which allows the user
106+ to specify which GSSAPI identity to use to contact a given server
107+
108+20080404
109+ - [ gss-serv.c ]
110+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow
111+ been omitted from a previous version of this patch. Reported by Borislav
112+ Stoichkov
113+
114+20070317
115+ - [ gss-serv-krb5.c ]
116+ Remove C99ism, where new_ccname was being declared in the middle of a
117+ function
118+
119+20061220
120+ - [ servconf.c ]
121+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and
122+ documented, behaviour. Reported by Dan Watson.
123+
124+20060910
125+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c
126+ ssh-gss.h ]
127+ add support for gss-group14-sha1 key exchange mechanisms
128+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ]
129+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of
130+ acceptor principal checking on multi-homed machines.
131+ <Bugzilla #928>
132+ - [ sshd_config ssh_config ]
133+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample
134+ configuration files
135+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ]
136+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf()
137+ Limit length of error messages displayed by client
138+
139+20060909
140+ - [ gss-genr.c gss-serv.c ]
141+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server
142+ only, where they belong
143+ <Bugzilla #1225>
144+
145+20060829
146+ - [ gss-serv-krb5.c ]
147+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment
148+ variable
149+
150+20060828
151+ - [ gss-genr.c ]
152+ Avoid Heimdal context freeing problem
153+ <Fixed upstream 20060829>
154+
155+20060818
156+ - [ gss-genr.c ssh-gss.h sshconnect2.c ]
157+ Make sure that SPENGO is disabled
158+ <Bugzilla #1218 - Fixed upstream 20060818>
159+
160+20060421
161+ - [ gssgenr.c, sshconnect2.c ]
162+ a few type changes (signed versus unsigned, int versus size_t) to
163+ fix compiler errors/warnings
164+ (from jbasney AT ncsa.uiuc.edu)
165+ - [ kexgssc.c, sshconnect2.c ]
166+ fix uninitialized variable warnings
167+ (from jbasney AT ncsa.uiuc.edu)
168+ - [ gssgenr.c ]
169+ pass oid to gss_display_status (helpful when using GSSAPI mechglue)
170+ (from jbasney AT ncsa.uiuc.edu)
171+ <Bugzilla #1220 >
172+ - [ gss-serv-krb5.c ]
173+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
174+ (from jbasney AT ncsa.uiuc.edu)
175+ <Fixed upstream 20060304>
176+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c
177+ add client-side GssapiKeyExchange option
178+ (from jbasney AT ncsa.uiuc.edu)
179+ - [ sshconnect2.c ]
180+ add support for GssapiTrustDns option for gssapi-with-mic
181+ (from jbasney AT ncsa.uiuc.edu)
182+ <gssapi-with-mic support is Bugzilla #1008>
183diff --git a/Makefile.in b/Makefile.in
184index 12991cd..51817df 100644
185--- a/Makefile.in
186+++ b/Makefile.in
187@@ -92,6 +92,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
188 kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
189 kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
190 kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
191+ kexgssc.o \
192 platform-pledge.o platform-tracing.o
193
194 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
195@@ -105,7 +106,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
196 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
197 auth2-none.o auth2-passwd.o auth2-pubkey.o \
198 monitor_mm.o monitor.o monitor_wrap.o auth-krb5.o \
199- auth2-gss.o gss-serv.o gss-serv-krb5.o \
200+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o \
201 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
202 sftp-server.o sftp-common.o \
203 sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
204diff --git a/auth-krb5.c b/auth-krb5.c
205index a5a81ed..38e7fee 100644
206--- a/auth-krb5.c
207+++ b/auth-krb5.c
208@@ -182,8 +182,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
209
210 len = strlen(authctxt->krb5_ticket_file) + 6;
211 authctxt->krb5_ccname = xmalloc(len);
212+#ifdef USE_CCAPI
213+ snprintf(authctxt->krb5_ccname, len, "API:%s",
214+ authctxt->krb5_ticket_file);
215+#else
216 snprintf(authctxt->krb5_ccname, len, "FILE:%s",
217 authctxt->krb5_ticket_file);
218+#endif
219
220 #ifdef USE_PAM
221 if (options.use_pam)
222@@ -240,15 +245,22 @@ krb5_cleanup_proc(Authctxt *authctxt)
223 #ifndef HEIMDAL
224 krb5_error_code
225 ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
226- int tmpfd, ret, oerrno;
227+ int ret, oerrno;
228 char ccname[40];
229 mode_t old_umask;
230+#ifdef USE_CCAPI
231+ char cctemplate[] = "API:krb5cc_%d";
232+#else
233+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
234+ int tmpfd;
235+#endif
236
237 ret = snprintf(ccname, sizeof(ccname),
238- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid());
239+ cctemplate, geteuid());
240 if (ret < 0 || (size_t)ret >= sizeof(ccname))
241 return ENOMEM;
242
243+#ifndef USE_CCAPI
244 old_umask = umask(0177);
245 tmpfd = mkstemp(ccname + strlen("FILE:"));
246 oerrno = errno;
247@@ -265,6 +277,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
248 return oerrno;
249 }
250 close(tmpfd);
251+#endif
252
253 return (krb5_cc_resolve(ctx, ccname, ccache));
254 }
255diff --git a/auth.c b/auth.c
256index 24527dd..f56dcc6 100644
257--- a/auth.c
258+++ b/auth.c
259@@ -363,7 +363,8 @@ auth_root_allowed(const char *method)
260 case PERMIT_NO_PASSWD:
261 if (strcmp(method, "publickey") == 0 ||
262 strcmp(method, "hostbased") == 0 ||
263- strcmp(method, "gssapi-with-mic") == 0)
264+ strcmp(method, "gssapi-with-mic") == 0 ||
265+ strcmp(method, "gssapi-keyex") == 0)
266 return 1;
267 break;
268 case PERMIT_FORCED_ONLY:
269@@ -786,99 +787,6 @@ fakepw(void)
270 }
271
272 /*
273- * Returns the remote DNS hostname as a string. The returned string must not
274- * be freed. NB. this will usually trigger a DNS query the first time it is
275- * called.
276- * This function does additional checks on the hostname to mitigate some
277- * attacks on legacy rhosts-style authentication.
278- * XXX is RhostsRSAAuthentication vulnerable to these?
279- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
280- */
281-
282-static char *
283-remote_hostname(struct ssh *ssh)
284-{
285- struct sockaddr_storage from;
286- socklen_t fromlen;
287- struct addrinfo hints, *ai, *aitop;
288- char name[NI_MAXHOST], ntop2[NI_MAXHOST];
289- const char *ntop = ssh_remote_ipaddr(ssh);
290-
291- /* Get IP address of client. */
292- fromlen = sizeof(from);
293- memset(&from, 0, sizeof(from));
294- if (getpeername(ssh_packet_get_connection_in(ssh),
295- (struct sockaddr *)&from, &fromlen) < 0) {
296- debug("getpeername failed: %.100s", strerror(errno));
297- return strdup(ntop);
298- }
299-
300- ipv64_normalise_mapped(&from, &fromlen);
301- if (from.ss_family == AF_INET6)
302- fromlen = sizeof(struct sockaddr_in6);
303-
304- debug3("Trying to reverse map address %.100s.", ntop);
305- /* Map the IP address to a host name. */
306- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
307- NULL, 0, NI_NAMEREQD) != 0) {
308- /* Host name not found. Use ip address. */
309- return strdup(ntop);
310- }
311-
312- /*
313- * if reverse lookup result looks like a numeric hostname,
314- * someone is trying to trick us by PTR record like following:
315- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
316- */
317- memset(&hints, 0, sizeof(hints));
318- hints.ai_socktype = SOCK_DGRAM; /*dummy*/
319- hints.ai_flags = AI_NUMERICHOST;
320- if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
321- logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
322- name, ntop);
323- freeaddrinfo(ai);
324- return strdup(ntop);
325- }
326-
327- /* Names are stored in lowercase. */
328- lowercase(name);
329-
330- /*
331- * Map it back to an IP address and check that the given
332- * address actually is an address of this host. This is
333- * necessary because anyone with access to a name server can
334- * define arbitrary names for an IP address. Mapping from
335- * name to IP address can be trusted better (but can still be
336- * fooled if the intruder has access to the name server of
337- * the domain).
338- */
339- memset(&hints, 0, sizeof(hints));
340- hints.ai_family = from.ss_family;
341- hints.ai_socktype = SOCK_STREAM;
342- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
343- logit("reverse mapping checking getaddrinfo for %.700s "
344- "[%s] failed.", name, ntop);
345- return strdup(ntop);
346- }
347- /* Look for the address from the list of addresses. */
348- for (ai = aitop; ai; ai = ai->ai_next) {
349- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
350- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
351- (strcmp(ntop, ntop2) == 0))
352- break;
353- }
354- freeaddrinfo(aitop);
355- /* If we reached the end of the list, the address was not there. */
356- if (ai == NULL) {
357- /* Address not found for the host name. */
358- logit("Address %.100s maps to %.600s, but this does not "
359- "map back to the address.", ntop, name);
360- return strdup(ntop);
361- }
362- return strdup(name);
363-}
364-
365-/*
366 * Return the canonical name of the host in the other side of the current
367 * connection. The host name is cached, so it is efficient to call this
368 * several times.
369diff --git a/auth2-gss.c b/auth2-gss.c
370index 1ca8357..3b5036d 100644
371--- a/auth2-gss.c
372+++ b/auth2-gss.c
373@@ -1,7 +1,7 @@
374 /* $OpenBSD: auth2-gss.c,v 1.22 2015/01/19 20:07:45 markus Exp $ */
375
376 /*
377- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
378+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
379 *
380 * Redistribution and use in source and binary forms, with or without
381 * modification, are permitted provided that the following conditions
382@@ -53,6 +53,40 @@ static int input_gssapi_mic(int type, u_int32_t plen, void *ctxt);
383 static int input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
384 static int input_gssapi_errtok(int, u_int32_t, void *);
385
386+/*
387+ * The 'gssapi_keyex' userauth mechanism.
388+ */
389+static int
390+userauth_gsskeyex(Authctxt *authctxt)
391+{
392+ int authenticated = 0;
393+ Buffer b;
394+ gss_buffer_desc mic, gssbuf;
395+ u_int len;
396+
397+ mic.value = packet_get_string(&len);
398+ mic.length = len;
399+
400+ packet_check_eom();
401+
402+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
403+ "gssapi-keyex");
404+
405+ gssbuf.value = buffer_ptr(&b);
406+ gssbuf.length = buffer_len(&b);
407+
408+ /* gss_kex_context is NULL with privsep, so we can't check it here */
409+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context,
410+ &gssbuf, &mic))))
411+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
412+ authctxt->pw));
413+
414+ buffer_free(&b);
415+ free(mic.value);
416+
417+ return (authenticated);
418+}
419+
420 /*
421 * We only support those mechanisms that we know about (ie ones that we know
422 * how to check local user kuserok and the like)
423@@ -238,7 +272,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
424
425 packet_check_eom();
426
427- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
428+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
429+ authctxt->pw));
430
431 authctxt->postponed = 0;
432 dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
433@@ -274,7 +309,8 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
434 gssbuf.length = buffer_len(&b);
435
436 if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
437- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
438+ authenticated =
439+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw));
440 else
441 logit("GSSAPI MIC check failed");
442
443@@ -290,6 +326,12 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
444 return 0;
445 }
446
447+Authmethod method_gsskeyex = {
448+ "gssapi-keyex",
449+ userauth_gsskeyex,
450+ &options.gss_authentication
451+};
452+
453 Authmethod method_gssapi = {
454 "gssapi-with-mic",
455 userauth_gssapi,
456diff --git a/auth2.c b/auth2.c
457index 9108b86..ce0d376 100644
458--- a/auth2.c
459+++ b/auth2.c
460@@ -70,6 +70,7 @@ extern Authmethod method_passwd;
461 extern Authmethod method_kbdint;
462 extern Authmethod method_hostbased;
463 #ifdef GSSAPI
464+extern Authmethod method_gsskeyex;
465 extern Authmethod method_gssapi;
466 #endif
467
468@@ -77,6 +78,7 @@ Authmethod *authmethods[] = {
469 &method_none,
470 &method_pubkey,
471 #ifdef GSSAPI
472+ &method_gsskeyex,
473 &method_gssapi,
474 #endif
475 &method_passwd,
476diff --git a/canohost.c b/canohost.c
477index f71a085..404731d 100644
478--- a/canohost.c
479+++ b/canohost.c
480@@ -35,6 +35,99 @@
481 #include "canohost.h"
482 #include "misc.h"
483
484+/*
485+ * Returns the remote DNS hostname as a string. The returned string must not
486+ * be freed. NB. this will usually trigger a DNS query the first time it is
487+ * called.
488+ * This function does additional checks on the hostname to mitigate some
489+ * attacks on legacy rhosts-style authentication.
490+ * XXX is RhostsRSAAuthentication vulnerable to these?
491+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
492+ */
493+
494+char *
495+remote_hostname(struct ssh *ssh)
496+{
497+ struct sockaddr_storage from;
498+ socklen_t fromlen;
499+ struct addrinfo hints, *ai, *aitop;
500+ char name[NI_MAXHOST], ntop2[NI_MAXHOST];
501+ const char *ntop = ssh_remote_ipaddr(ssh);
502+
503+ /* Get IP address of client. */
504+ fromlen = sizeof(from);
505+ memset(&from, 0, sizeof(from));
506+ if (getpeername(ssh_packet_get_connection_in(ssh),
507+ (struct sockaddr *)&from, &fromlen) < 0) {
508+ debug("getpeername failed: %.100s", strerror(errno));
509+ return strdup(ntop);
510+ }
511+
512+ ipv64_normalise_mapped(&from, &fromlen);
513+ if (from.ss_family == AF_INET6)
514+ fromlen = sizeof(struct sockaddr_in6);
515+
516+ debug3("Trying to reverse map address %.100s.", ntop);
517+ /* Map the IP address to a host name. */
518+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
519+ NULL, 0, NI_NAMEREQD) != 0) {
520+ /* Host name not found. Use ip address. */
521+ return strdup(ntop);
522+ }
523+
524+ /*
525+ * if reverse lookup result looks like a numeric hostname,
526+ * someone is trying to trick us by PTR record like following:
527+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
528+ */
529+ memset(&hints, 0, sizeof(hints));
530+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/
531+ hints.ai_flags = AI_NUMERICHOST;
532+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
533+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
534+ name, ntop);
535+ freeaddrinfo(ai);
536+ return strdup(ntop);
537+ }
538+
539+ /* Names are stored in lowercase. */
540+ lowercase(name);
541+
542+ /*
543+ * Map it back to an IP address and check that the given
544+ * address actually is an address of this host. This is
545+ * necessary because anyone with access to a name server can
546+ * define arbitrary names for an IP address. Mapping from
547+ * name to IP address can be trusted better (but can still be
548+ * fooled if the intruder has access to the name server of
549+ * the domain).
550+ */
551+ memset(&hints, 0, sizeof(hints));
552+ hints.ai_family = from.ss_family;
553+ hints.ai_socktype = SOCK_STREAM;
554+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
555+ logit("reverse mapping checking getaddrinfo for %.700s "
556+ "[%s] failed.", name, ntop);
557+ return strdup(ntop);
558+ }
559+ /* Look for the address from the list of addresses. */
560+ for (ai = aitop; ai; ai = ai->ai_next) {
561+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
562+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
563+ (strcmp(ntop, ntop2) == 0))
564+ break;
565+ }
566+ freeaddrinfo(aitop);
567+ /* If we reached the end of the list, the address was not there. */
568+ if (ai == NULL) {
569+ /* Address not found for the host name. */
570+ logit("Address %.100s maps to %.600s, but this does not "
571+ "map back to the address.", ntop, name);
572+ return strdup(ntop);
573+ }
574+ return strdup(name);
575+}
576+
577 void
578 ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
579 {
580diff --git a/canohost.h b/canohost.h
581index 26d6285..0cadc9f 100644
582--- a/canohost.h
583+++ b/canohost.h
584@@ -15,6 +15,9 @@
585 #ifndef _CANOHOST_H
586 #define _CANOHOST_H
587
588+struct ssh;
589+
590+char *remote_hostname(struct ssh *);
591 char *get_peer_ipaddr(int);
592 int get_peer_port(int);
593 char *get_local_ipaddr(int);
594diff --git a/clientloop.c b/clientloop.c
595index 2c44f5d..421241f 100644
596--- a/clientloop.c
597+++ b/clientloop.c
598@@ -114,6 +114,10 @@
599 #include "ssherr.h"
600 #include "hostfile.h"
601
602+#ifdef GSSAPI
603+#include "ssh-gss.h"
604+#endif
605+
606 /* import options */
607 extern Options options;
608
609@@ -1666,9 +1670,18 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
610 break;
611
612 /* Do channel operations unless rekeying in progress. */
613- if (!ssh_packet_is_rekeying(active_state))
614+ if (!ssh_packet_is_rekeying(active_state)) {
615 channel_after_select(readset, writeset);
616
617+#ifdef GSSAPI
618+ if (options.gss_renewal_rekey &&
619+ ssh_gssapi_credentials_updated(NULL)) {
620+ debug("credentials updated - forcing rekey");
621+ need_rekeying = 1;
622+ }
623+#endif
624+ }
625+
626 /* Buffer input from the connection. */
627 client_process_net_input(readset);
628
629diff --git a/config.h.in b/config.h.in
630index 39d018f..d7caf9a 100644
631--- a/config.h.in
632+++ b/config.h.in
633@@ -1668,6 +1668,9 @@
634 /* Use btmp to log bad logins */
635 #undef USE_BTMP
636
637+/* platform uses an in-memory credentials cache */
638+#undef USE_CCAPI
639+
640 /* Use libedit for sftp */
641 #undef USE_LIBEDIT
642
643@@ -1683,6 +1686,9 @@
644 /* Use PIPES instead of a socketpair() */
645 #undef USE_PIPES
646
647+/* platform has the Security Authorization Session API */
648+#undef USE_SECURITY_SESSION_API
649+
650 /* Define if you have Solaris privileges */
651 #undef USE_SOLARIS_PRIVS
652
653diff --git a/configure.ac b/configure.ac
654index 373d21b..894ec3b 100644
655--- a/configure.ac
656+++ b/configure.ac
657@@ -632,6 +632,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
658 [Use tunnel device compatibility to OpenBSD])
659 AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
660 [Prepend the address family to IP tunnel traffic])
661+ AC_MSG_CHECKING([if we have the Security Authorization Session API])
662+ AC_TRY_COMPILE([#include <Security/AuthSession.h>],
663+ [SessionCreate(0, 0);],
664+ [ac_cv_use_security_session_api="yes"
665+ AC_DEFINE([USE_SECURITY_SESSION_API], [1],
666+ [platform has the Security Authorization Session API])
667+ LIBS="$LIBS -framework Security"
668+ AC_MSG_RESULT([yes])],
669+ [ac_cv_use_security_session_api="no"
670+ AC_MSG_RESULT([no])])
671+ AC_MSG_CHECKING([if we have an in-memory credentials cache])
672+ AC_TRY_COMPILE(
673+ [#include <Kerberos/Kerberos.h>],
674+ [cc_context_t c;
675+ (void) cc_initialize (&c, 0, NULL, NULL);],
676+ [AC_DEFINE([USE_CCAPI], [1],
677+ [platform uses an in-memory credentials cache])
678+ LIBS="$LIBS -framework Security"
679+ AC_MSG_RESULT([yes])
680+ if test "x$ac_cv_use_security_session_api" = "xno"; then
681+ AC_MSG_ERROR([*** Need a security framework to use the credentials cache API ***])
682+ fi],
683+ [AC_MSG_RESULT([no])]
684+ )
685 m4_pattern_allow([AU_IPv])
686 AC_CHECK_DECL([AU_IPv4], [],
687 AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
688diff --git a/gss-genr.c b/gss-genr.c
689index d617d60..b4eca3f 100644
690--- a/gss-genr.c
691+++ b/gss-genr.c
692@@ -1,7 +1,7 @@
693 /* $OpenBSD: gss-genr.c,v 1.23 2015/01/20 23:14:00 deraadt Exp $ */
694
695 /*
696- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
697+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
698 *
699 * Redistribution and use in source and binary forms, with or without
700 * modification, are permitted provided that the following conditions
701@@ -41,12 +41,167 @@
702 #include "buffer.h"
703 #include "log.h"
704 #include "ssh2.h"
705+#include "cipher.h"
706+#include "key.h"
707+#include "kex.h"
708+#include <openssl/evp.h>
709
710 #include "ssh-gss.h"
711
712 extern u_char *session_id2;
713 extern u_int session_id2_len;
714
715+typedef struct {
716+ char *encoded;
717+ gss_OID oid;
718+} ssh_gss_kex_mapping;
719+
720+/*
721+ * XXX - It would be nice to find a more elegant way of handling the
722+ * XXX passing of the key exchange context to the userauth routines
723+ */
724+
725+Gssctxt *gss_kex_context = NULL;
726+
727+static ssh_gss_kex_mapping *gss_enc2oid = NULL;
728+
729+int
730+ssh_gssapi_oid_table_ok(void) {
731+ return (gss_enc2oid != NULL);
732+}
733+
734+/*
735+ * Return a list of the gss-group1-sha1 mechanisms supported by this program
736+ *
737+ * We test mechanisms to ensure that we can use them, to avoid starting
738+ * a key exchange with a bad mechanism
739+ */
740+
741+char *
742+ssh_gssapi_client_mechanisms(const char *host, const char *client) {
743+ gss_OID_set gss_supported;
744+ OM_uint32 min_status;
745+
746+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported)))
747+ return NULL;
748+
749+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
750+ host, client));
751+}
752+
753+char *
754+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
755+ const char *host, const char *client) {
756+ Buffer buf;
757+ size_t i;
758+ int oidpos, enclen;
759+ char *mechs, *encoded;
760+ u_char digest[EVP_MAX_MD_SIZE];
761+ char deroid[2];
762+ const EVP_MD *evp_md = EVP_md5();
763+ EVP_MD_CTX md;
764+
765+ if (gss_enc2oid != NULL) {
766+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
767+ free(gss_enc2oid[i].encoded);
768+ free(gss_enc2oid);
769+ }
770+
771+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
772+ (gss_supported->count + 1));
773+
774+ buffer_init(&buf);
775+
776+ oidpos = 0;
777+ for (i = 0; i < gss_supported->count; i++) {
778+ if (gss_supported->elements[i].length < 128 &&
779+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) {
780+
781+ deroid[0] = SSH_GSS_OIDTYPE;
782+ deroid[1] = gss_supported->elements[i].length;
783+
784+ EVP_DigestInit(&md, evp_md);
785+ EVP_DigestUpdate(&md, deroid, 2);
786+ EVP_DigestUpdate(&md,
787+ gss_supported->elements[i].elements,
788+ gss_supported->elements[i].length);
789+ EVP_DigestFinal(&md, digest, NULL);
790+
791+ encoded = xmalloc(EVP_MD_size(evp_md) * 2);
792+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md),
793+ encoded, EVP_MD_size(evp_md) * 2);
794+
795+ if (oidpos != 0)
796+ buffer_put_char(&buf, ',');
797+
798+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID,
799+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1);
800+ buffer_append(&buf, encoded, enclen);
801+ buffer_put_char(&buf, ',');
802+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID,
803+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1);
804+ buffer_append(&buf, encoded, enclen);
805+ buffer_put_char(&buf, ',');
806+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID,
807+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1);
808+ buffer_append(&buf, encoded, enclen);
809+
810+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]);
811+ gss_enc2oid[oidpos].encoded = encoded;
812+ oidpos++;
813+ }
814+ }
815+ gss_enc2oid[oidpos].oid = NULL;
816+ gss_enc2oid[oidpos].encoded = NULL;
817+
818+ buffer_put_char(&buf, '\0');
819+
820+ mechs = xmalloc(buffer_len(&buf));
821+ buffer_get(&buf, mechs, buffer_len(&buf));
822+ buffer_free(&buf);
823+
824+ if (strlen(mechs) == 0) {
825+ free(mechs);
826+ mechs = NULL;
827+ }
828+
829+ return (mechs);
830+}
831+
832+gss_OID
833+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) {
834+ int i = 0;
835+
836+ switch (kex_type) {
837+ case KEX_GSS_GRP1_SHA1:
838+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID))
839+ return GSS_C_NO_OID;
840+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
841+ break;
842+ case KEX_GSS_GRP14_SHA1:
843+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID))
844+ return GSS_C_NO_OID;
845+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
846+ break;
847+ case KEX_GSS_GEX_SHA1:
848+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID))
849+ return GSS_C_NO_OID;
850+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1;
851+ break;
852+ default:
853+ return GSS_C_NO_OID;
854+ }
855+
856+ while (gss_enc2oid[i].encoded != NULL &&
857+ strcmp(name, gss_enc2oid[i].encoded) != 0)
858+ i++;
859+
860+ if (gss_enc2oid[i].oid != NULL && ctx != NULL)
861+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid);
862+
863+ return gss_enc2oid[i].oid;
864+}
865+
866 /* Check that the OID in a data stream matches that in the context */
867 int
868 ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
869@@ -199,7 +354,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
870 }
871
872 ctx->major = gss_init_sec_context(&ctx->minor,
873- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid,
874+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid,
875 GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
876 0, NULL, recv_tok, NULL, send_tok, flags, NULL);
877
878@@ -229,8 +384,42 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
879 }
880
881 OM_uint32
882+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name)
883+{
884+ gss_buffer_desc gssbuf;
885+ gss_name_t gssname;
886+ OM_uint32 status;
887+ gss_OID_set oidset;
888+
889+ gssbuf.value = (void *) name;
890+ gssbuf.length = strlen(gssbuf.value);
891+
892+ gss_create_empty_oid_set(&status, &oidset);
893+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
894+
895+ ctx->major = gss_import_name(&ctx->minor, &gssbuf,
896+ GSS_C_NT_USER_NAME, &gssname);
897+
898+ if (!ctx->major)
899+ ctx->major = gss_acquire_cred(&ctx->minor,
900+ gssname, 0, oidset, GSS_C_INITIATE,
901+ &ctx->client_creds, NULL, NULL);
902+
903+ gss_release_name(&status, &gssname);
904+ gss_release_oid_set(&status, &oidset);
905+
906+ if (ctx->major)
907+ ssh_gssapi_error(ctx);
908+
909+ return(ctx->major);
910+}
911+
912+OM_uint32
913 ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
914 {
915+ if (ctx == NULL)
916+ return -1;
917+
918 if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
919 GSS_C_QOP_DEFAULT, buffer, hash)))
920 ssh_gssapi_error(ctx);
921@@ -238,6 +427,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
922 return (ctx->major);
923 }
924
925+/* Priviledged when used by server */
926+OM_uint32
927+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
928+{
929+ if (ctx == NULL)
930+ return -1;
931+
932+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
933+ gssbuf, gssmic, NULL);
934+
935+ return (ctx->major);
936+}
937+
938 void
939 ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
940 const char *context)
941@@ -251,11 +453,16 @@ ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
942 }
943
944 int
945-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
946+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host,
947+ const char *client)
948 {
949 gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
950 OM_uint32 major, minor;
951 gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
952+ Gssctxt *intctx = NULL;
953+
954+ if (ctx == NULL)
955+ ctx = &intctx;
956
957 /* RFC 4462 says we MUST NOT do SPNEGO */
958 if (oid->length == spnego_oid.length &&
959@@ -265,6 +472,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
960 ssh_gssapi_build_ctx(ctx);
961 ssh_gssapi_set_oid(*ctx, oid);
962 major = ssh_gssapi_import_name(*ctx, host);
963+
964+ if (!GSS_ERROR(major) && client)
965+ major = ssh_gssapi_client_identity(*ctx, client);
966+
967 if (!GSS_ERROR(major)) {
968 major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token,
969 NULL);
970@@ -274,10 +485,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
971 GSS_C_NO_BUFFER);
972 }
973
974- if (GSS_ERROR(major))
975+ if (GSS_ERROR(major) || intctx != NULL)
976 ssh_gssapi_delete_ctx(ctx);
977
978 return (!GSS_ERROR(major));
979 }
980
981+int
982+ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
983+ static gss_name_t saved_name = GSS_C_NO_NAME;
984+ static OM_uint32 saved_lifetime = 0;
985+ static gss_OID saved_mech = GSS_C_NO_OID;
986+ static gss_name_t name;
987+ static OM_uint32 last_call = 0;
988+ OM_uint32 lifetime, now, major, minor;
989+ int equal;
990+
991+ now = time(NULL);
992+
993+ if (ctxt) {
994+ debug("Rekey has happened - updating saved versions");
995+
996+ if (saved_name != GSS_C_NO_NAME)
997+ gss_release_name(&minor, &saved_name);
998+
999+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
1000+ &saved_name, &saved_lifetime, NULL, NULL);
1001+
1002+ if (!GSS_ERROR(major)) {
1003+ saved_mech = ctxt->oid;
1004+ saved_lifetime+= now;
1005+ } else {
1006+ /* Handle the error */
1007+ }
1008+ return 0;
1009+ }
1010+
1011+ if (now - last_call < 10)
1012+ return 0;
1013+
1014+ last_call = now;
1015+
1016+ if (saved_mech == GSS_C_NO_OID)
1017+ return 0;
1018+
1019+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
1020+ &name, &lifetime, NULL, NULL);
1021+ if (major == GSS_S_CREDENTIALS_EXPIRED)
1022+ return 0;
1023+ else if (GSS_ERROR(major))
1024+ return 0;
1025+
1026+ major = gss_compare_name(&minor, saved_name, name, &equal);
1027+ gss_release_name(&minor, &name);
1028+ if (GSS_ERROR(major))
1029+ return 0;
1030+
1031+ if (equal && (saved_lifetime < lifetime + now - 10))
1032+ return 1;
1033+
1034+ return 0;
1035+}
1036+
1037 #endif /* GSSAPI */
1038diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
1039index 795992d..fd8b371 100644
1040--- a/gss-serv-krb5.c
1041+++ b/gss-serv-krb5.c
1042@@ -1,7 +1,7 @@
1043 /* $OpenBSD: gss-serv-krb5.c,v 1.8 2013/07/20 01:55:13 djm Exp $ */
1044
1045 /*
1046- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
1047+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
1048 *
1049 * Redistribution and use in source and binary forms, with or without
1050 * modification, are permitted provided that the following conditions
1051@@ -121,8 +121,8 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
1052 krb5_error_code problem;
1053 krb5_principal princ;
1054 OM_uint32 maj_status, min_status;
1055- int len;
1056 const char *errmsg;
1057+ const char *new_ccname;
1058
1059 if (client->creds == NULL) {
1060 debug("No credentials stored");
1061@@ -181,11 +181,16 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
1062 return;
1063 }
1064
1065- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
1066+ new_ccname = krb5_cc_get_name(krb_context, ccache);
1067+
1068 client->store.envvar = "KRB5CCNAME";
1069- len = strlen(client->store.filename) + 6;
1070- client->store.envval = xmalloc(len);
1071- snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
1072+#ifdef USE_CCAPI
1073+ xasprintf(&client->store.envval, "API:%s", new_ccname);
1074+ client->store.filename = NULL;
1075+#else
1076+ xasprintf(&client->store.envval, "FILE:%s", new_ccname);
1077+ client->store.filename = xstrdup(new_ccname);
1078+#endif
1079
1080 #ifdef USE_PAM
1081 if (options.use_pam)
1082@@ -197,6 +202,71 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
1083 return;
1084 }
1085
1086+int
1087+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store,
1088+ ssh_gssapi_client *client)
1089+{
1090+ krb5_ccache ccache = NULL;
1091+ krb5_principal principal = NULL;
1092+ char *name = NULL;
1093+ krb5_error_code problem;
1094+ OM_uint32 maj_status, min_status;
1095+
1096+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) {
1097+ logit("krb5_cc_resolve(): %.100s",
1098+ krb5_get_err_text(krb_context, problem));
1099+ return 0;
1100+ }
1101+
1102+ /* Find out who the principal in this cache is */
1103+ if ((problem = krb5_cc_get_principal(krb_context, ccache,
1104+ &principal))) {
1105+ logit("krb5_cc_get_principal(): %.100s",
1106+ krb5_get_err_text(krb_context, problem));
1107+ krb5_cc_close(krb_context, ccache);
1108+ return 0;
1109+ }
1110+
1111+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) {
1112+ logit("krb5_unparse_name(): %.100s",
1113+ krb5_get_err_text(krb_context, problem));
1114+ krb5_free_principal(krb_context, principal);
1115+ krb5_cc_close(krb_context, ccache);
1116+ return 0;
1117+ }
1118+
1119+
1120+ if (strcmp(name,client->exportedname.value)!=0) {
1121+ debug("Name in local credentials cache differs. Not storing");
1122+ krb5_free_principal(krb_context, principal);
1123+ krb5_cc_close(krb_context, ccache);
1124+ krb5_free_unparsed_name(krb_context, name);
1125+ return 0;
1126+ }
1127+ krb5_free_unparsed_name(krb_context, name);
1128+
1129+ /* Name matches, so lets get on with it! */
1130+
1131+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) {
1132+ logit("krb5_cc_initialize(): %.100s",
1133+ krb5_get_err_text(krb_context, problem));
1134+ krb5_free_principal(krb_context, principal);
1135+ krb5_cc_close(krb_context, ccache);
1136+ return 0;
1137+ }
1138+
1139+ krb5_free_principal(krb_context, principal);
1140+
1141+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds,
1142+ ccache))) {
1143+ logit("gss_krb5_copy_ccache() failed. Sorry!");
1144+ krb5_cc_close(krb_context, ccache);
1145+ return 0;
1146+ }
1147+
1148+ return 1;
1149+}
1150+
1151 ssh_gssapi_mech gssapi_kerberos_mech = {
1152 "toWM5Slw5Ew8Mqkay+al2g==",
1153 "Kerberos",
1154@@ -204,7 +274,8 @@ ssh_gssapi_mech gssapi_kerberos_mech = {
1155 NULL,
1156 &ssh_gssapi_krb5_userok,
1157 NULL,
1158- &ssh_gssapi_krb5_storecreds
1159+ &ssh_gssapi_krb5_storecreds,
1160+ &ssh_gssapi_krb5_updatecreds
1161 };
1162
1163 #endif /* KRB5 */
1164diff --git a/gss-serv.c b/gss-serv.c
1165index 53993d6..2f6baf7 100644
1166--- a/gss-serv.c
1167+++ b/gss-serv.c
1168@@ -1,7 +1,7 @@
1169 /* $OpenBSD: gss-serv.c,v 1.29 2015/05/22 03:50:02 djm Exp $ */
1170
1171 /*
1172- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
1173+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1174 *
1175 * Redistribution and use in source and binary forms, with or without
1176 * modification, are permitted provided that the following conditions
1177@@ -45,17 +45,22 @@
1178 #include "session.h"
1179 #include "misc.h"
1180 #include "servconf.h"
1181+#include "uidswap.h"
1182
1183 #include "ssh-gss.h"
1184+#include "monitor_wrap.h"
1185+
1186+extern ServerOptions options;
1187
1188 extern ServerOptions options;
1189
1190 static ssh_gssapi_client gssapi_client =
1191 { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
1192- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL, NULL}};
1193+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL,
1194+ {NULL, NULL, NULL, NULL, NULL}, 0, 0};
1195
1196 ssh_gssapi_mech gssapi_null_mech =
1197- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
1198+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL};
1199
1200 #ifdef KRB5
1201 extern ssh_gssapi_mech gssapi_kerberos_mech;
1202@@ -142,6 +147,29 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
1203 }
1204
1205 /* Unprivileged */
1206+char *
1207+ssh_gssapi_server_mechanisms(void) {
1208+ gss_OID_set supported;
1209+
1210+ ssh_gssapi_supported_oids(&supported);
1211+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech,
1212+ NULL, NULL));
1213+}
1214+
1215+/* Unprivileged */
1216+int
1217+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data,
1218+ const char *dummy) {
1219+ Gssctxt *ctx = NULL;
1220+ int res;
1221+
1222+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
1223+ ssh_gssapi_delete_ctx(&ctx);
1224+
1225+ return (res);
1226+}
1227+
1228+/* Unprivileged */
1229 void
1230 ssh_gssapi_supported_oids(gss_OID_set *oidset)
1231 {
1232@@ -151,7 +179,9 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
1233 gss_OID_set supported;
1234
1235 gss_create_empty_oid_set(&min_status, oidset);
1236- gss_indicate_mechs(&min_status, &supported);
1237+
1238+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported)))
1239+ return;
1240
1241 while (supported_mechs[i]->name != NULL) {
1242 if (GSS_ERROR(gss_test_oid_set_member(&min_status,
1243@@ -277,8 +307,48 @@ OM_uint32
1244 ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1245 {
1246 int i = 0;
1247+ int equal = 0;
1248+ gss_name_t new_name = GSS_C_NO_NAME;
1249+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER;
1250+
1251+ if (options.gss_store_rekey && client->used && ctx->client_creds) {
1252+ if (client->mech->oid.length != ctx->oid->length ||
1253+ (memcmp(client->mech->oid.elements,
1254+ ctx->oid->elements, ctx->oid->length) !=0)) {
1255+ debug("Rekeyed credentials have different mechanism");
1256+ return GSS_S_COMPLETE;
1257+ }
1258+
1259+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1260+ ctx->client_creds, ctx->oid, &new_name,
1261+ NULL, NULL, NULL))) {
1262+ ssh_gssapi_error(ctx);
1263+ return (ctx->major);
1264+ }
1265+
1266+ ctx->major = gss_compare_name(&ctx->minor, client->name,
1267+ new_name, &equal);
1268+
1269+ if (GSS_ERROR(ctx->major)) {
1270+ ssh_gssapi_error(ctx);
1271+ return (ctx->major);
1272+ }
1273+
1274+ if (!equal) {
1275+ debug("Rekeyed credentials have different name");
1276+ return GSS_S_COMPLETE;
1277+ }
1278
1279- gss_buffer_desc ename;
1280+ debug("Marking rekeyed credentials for export");
1281+
1282+ gss_release_name(&ctx->minor, &client->name);
1283+ gss_release_cred(&ctx->minor, &client->creds);
1284+ client->name = new_name;
1285+ client->creds = ctx->client_creds;
1286+ ctx->client_creds = GSS_C_NO_CREDENTIAL;
1287+ client->updated = 1;
1288+ return GSS_S_COMPLETE;
1289+ }
1290
1291 client->mech = NULL;
1292
1293@@ -293,6 +363,13 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1294 if (client->mech == NULL)
1295 return GSS_S_FAILURE;
1296
1297+ if (ctx->client_creds &&
1298+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1299+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) {
1300+ ssh_gssapi_error(ctx);
1301+ return (ctx->major);
1302+ }
1303+
1304 if ((ctx->major = gss_display_name(&ctx->minor, ctx->client,
1305 &client->displayname, NULL))) {
1306 ssh_gssapi_error(ctx);
1307@@ -310,6 +387,8 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1308 return (ctx->major);
1309 }
1310
1311+ gss_release_buffer(&ctx->minor, &ename);
1312+
1313 /* We can't copy this structure, so we just move the pointer to it */
1314 client->creds = ctx->client_creds;
1315 ctx->client_creds = GSS_C_NO_CREDENTIAL;
1316@@ -357,7 +436,7 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
1317
1318 /* Privileged */
1319 int
1320-ssh_gssapi_userok(char *user)
1321+ssh_gssapi_userok(char *user, struct passwd *pw)
1322 {
1323 OM_uint32 lmin;
1324
1325@@ -367,9 +446,11 @@ ssh_gssapi_userok(char *user)
1326 return 0;
1327 }
1328 if (gssapi_client.mech && gssapi_client.mech->userok)
1329- if ((*gssapi_client.mech->userok)(&gssapi_client, user))
1330+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) {
1331+ gssapi_client.used = 1;
1332+ gssapi_client.store.owner = pw;
1333 return 1;
1334- else {
1335+ } else {
1336 /* Destroy delegated credentials if userok fails */
1337 gss_release_buffer(&lmin, &gssapi_client.displayname);
1338 gss_release_buffer(&lmin, &gssapi_client.exportedname);
1339@@ -383,14 +464,90 @@ ssh_gssapi_userok(char *user)
1340 return (0);
1341 }
1342
1343-/* Privileged */
1344-OM_uint32
1345-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
1346+/* These bits are only used for rekeying. The unpriviledged child is running
1347+ * as the user, the monitor is root.
1348+ *
1349+ * In the child, we want to :
1350+ * *) Ask the monitor to store our credentials into the store we specify
1351+ * *) If it succeeds, maybe do a PAM update
1352+ */
1353+
1354+/* Stuff for PAM */
1355+
1356+#ifdef USE_PAM
1357+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg,
1358+ struct pam_response **resp, void *data)
1359 {
1360- ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
1361- gssbuf, gssmic, NULL);
1362+ return (PAM_CONV_ERR);
1363+}
1364+#endif
1365
1366- return (ctx->major);
1367+void
1368+ssh_gssapi_rekey_creds(void) {
1369+ int ok;
1370+ int ret;
1371+#ifdef USE_PAM
1372+ pam_handle_t *pamh = NULL;
1373+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
1374+ char *envstr;
1375+#endif
1376+
1377+ if (gssapi_client.store.filename == NULL &&
1378+ gssapi_client.store.envval == NULL &&
1379+ gssapi_client.store.envvar == NULL)
1380+ return;
1381+
1382+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store));
1383+
1384+ if (!ok)
1385+ return;
1386+
1387+ debug("Rekeyed credentials stored successfully");
1388+
1389+ /* Actually managing to play with the ssh pam stack from here will
1390+ * be next to impossible. In any case, we may want different options
1391+ * for rekeying. So, use our own :)
1392+ */
1393+#ifdef USE_PAM
1394+ if (!use_privsep) {
1395+ debug("Not even going to try and do PAM with privsep disabled");
1396+ return;
1397+ }
1398+
1399+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name,
1400+ &pamconv, &pamh);
1401+ if (ret)
1402+ return;
1403+
1404+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar,
1405+ gssapi_client.store.envval);
1406+
1407+ ret = pam_putenv(pamh, envstr);
1408+ if (!ret)
1409+ pam_setcred(pamh, PAM_REINITIALIZE_CRED);
1410+ pam_end(pamh, PAM_SUCCESS);
1411+#endif
1412+}
1413+
1414+int
1415+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
1416+ int ok = 0;
1417+
1418+ /* Check we've got credentials to store */
1419+ if (!gssapi_client.updated)
1420+ return 0;
1421+
1422+ gssapi_client.updated = 0;
1423+
1424+ temporarily_use_uid(gssapi_client.store.owner);
1425+ if (gssapi_client.mech && gssapi_client.mech->updatecreds)
1426+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client);
1427+ else
1428+ debug("No update function for this mechanism");
1429+
1430+ restore_uid();
1431+
1432+ return ok;
1433 }
1434
1435 #endif
1436diff --git a/kex.c b/kex.c
1437index 50c7a0f..c17d652 100644
1438--- a/kex.c
1439+++ b/kex.c
1440@@ -55,6 +55,10 @@
1441 #include "sshbuf.h"
1442 #include "digest.h"
1443
1444+#ifdef GSSAPI
1445+#include "ssh-gss.h"
1446+#endif
1447+
1448 #if OPENSSL_VERSION_NUMBER >= 0x00907000L
1449 # if defined(HAVE_EVP_SHA256)
1450 # define evp_ssh_sha256 EVP_sha256
1451@@ -113,6 +117,14 @@ static const struct kexalg kexalgs[] = {
1452 #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
1453 { NULL, -1, -1, -1},
1454 };
1455+static const struct kexalg kexalg_prefixes[] = {
1456+#ifdef GSSAPI
1457+ { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, SSH_DIGEST_SHA1 },
1458+ { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
1459+ { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
1460+#endif
1461+ { NULL, -1, -1, -1 },
1462+};
1463
1464 char *
1465 kex_alg_list(char sep)
1466@@ -145,6 +157,10 @@ kex_alg_by_name(const char *name)
1467 if (strcmp(k->name, name) == 0)
1468 return k;
1469 }
1470+ for (k = kexalg_prefixes; k->name != NULL; k++) {
1471+ if (strncmp(k->name, name, strlen(k->name)) == 0)
1472+ return k;
1473+ }
1474 return NULL;
1475 }
1476
1477@@ -587,6 +603,9 @@ kex_free(struct kex *kex)
1478 sshbuf_free(kex->peer);
1479 sshbuf_free(kex->my);
1480 free(kex->session_id);
1481+#ifdef GSSAPI
1482+ free(kex->gss_host);
1483+#endif /* GSSAPI */
1484 free(kex->client_version_string);
1485 free(kex->server_version_string);
1486 free(kex->failed_choice);
1487diff --git a/kex.h b/kex.h
1488index c351955..8ed459a 100644
1489--- a/kex.h
1490+++ b/kex.h
1491@@ -98,6 +98,9 @@ enum kex_exchange {
1492 KEX_DH_GEX_SHA256,
1493 KEX_ECDH_SHA2,
1494 KEX_C25519_SHA256,
1495+ KEX_GSS_GRP1_SHA1,
1496+ KEX_GSS_GRP14_SHA1,
1497+ KEX_GSS_GEX_SHA1,
1498 KEX_MAX
1499 };
1500
1501@@ -146,6 +149,12 @@ struct kex {
1502 u_int flags;
1503 int hash_alg;
1504 int ec_nid;
1505+#ifdef GSSAPI
1506+ int gss_deleg_creds;
1507+ int gss_trust_dns;
1508+ char *gss_host;
1509+ char *gss_client;
1510+#endif
1511 char *client_version_string;
1512 char *server_version_string;
1513 char *failed_choice;
1514@@ -196,6 +205,11 @@ int kexecdh_server(struct ssh *);
1515 int kexc25519_client(struct ssh *);
1516 int kexc25519_server(struct ssh *);
1517
1518+#ifdef GSSAPI
1519+int kexgss_client(struct ssh *);
1520+int kexgss_server(struct ssh *);
1521+#endif
1522+
1523 int kex_dh_hash(int, const char *, const char *,
1524 const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
1525 const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
1526diff --git a/kexgssc.c b/kexgssc.c
1527new file mode 100644
1528index 0000000..10447f2
1529--- /dev/null
1530+++ b/kexgssc.c
1531@@ -0,0 +1,338 @@
1532+/*
1533+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1534+ *
1535+ * Redistribution and use in source and binary forms, with or without
1536+ * modification, are permitted provided that the following conditions
1537+ * are met:
1538+ * 1. Redistributions of source code must retain the above copyright
1539+ * notice, this list of conditions and the following disclaimer.
1540+ * 2. Redistributions in binary form must reproduce the above copyright
1541+ * notice, this list of conditions and the following disclaimer in the
1542+ * documentation and/or other materials provided with the distribution.
1543+ *
1544+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1545+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1546+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1547+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1548+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1549+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1550+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1551+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1552+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1553+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1554+ */
1555+
1556+#include "includes.h"
1557+
1558+#ifdef GSSAPI
1559+
1560+#include "includes.h"
1561+
1562+#include <openssl/crypto.h>
1563+#include <openssl/bn.h>
1564+
1565+#include <string.h>
1566+
1567+#include "xmalloc.h"
1568+#include "buffer.h"
1569+#include "ssh2.h"
1570+#include "key.h"
1571+#include "cipher.h"
1572+#include "kex.h"
1573+#include "log.h"
1574+#include "packet.h"
1575+#include "dh.h"
1576+#include "digest.h"
1577+
1578+#include "ssh-gss.h"
1579+
1580+int
1581+kexgss_client(struct ssh *ssh) {
1582+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1583+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr;
1584+ Gssctxt *ctxt;
1585+ OM_uint32 maj_status, min_status, ret_flags;
1586+ u_int klen, kout, slen = 0, strlen;
1587+ DH *dh;
1588+ BIGNUM *dh_server_pub = NULL;
1589+ BIGNUM *shared_secret = NULL;
1590+ BIGNUM *p = NULL;
1591+ BIGNUM *g = NULL;
1592+ u_char *kbuf;
1593+ u_char *serverhostkey = NULL;
1594+ u_char *empty = "";
1595+ char *msg;
1596+ int type = 0;
1597+ int first = 1;
1598+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
1599+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1600+ size_t hashlen;
1601+
1602+ /* Initialise our GSSAPI world */
1603+ ssh_gssapi_build_ctx(&ctxt);
1604+ if (ssh_gssapi_id_kex(ctxt, ssh->kex->name, ssh->kex->kex_type)
1605+ == GSS_C_NO_OID)
1606+ fatal("Couldn't identify host exchange");
1607+
1608+ if (ssh_gssapi_import_name(ctxt, ssh->kex->gss_host))
1609+ fatal("Couldn't import hostname");
1610+
1611+ if (ssh->kex->gss_client &&
1612+ ssh_gssapi_client_identity(ctxt, ssh->kex->gss_client))
1613+ fatal("Couldn't acquire client credentials");
1614+
1615+ switch (ssh->kex->kex_type) {
1616+ case KEX_GSS_GRP1_SHA1:
1617+ dh = dh_new_group1();
1618+ break;
1619+ case KEX_GSS_GRP14_SHA1:
1620+ dh = dh_new_group14();
1621+ break;
1622+ case KEX_GSS_GEX_SHA1:
1623+ debug("Doing group exchange\n");
1624+ nbits = dh_estimate(ssh->kex->we_need * 8);
1625+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ);
1626+ packet_put_int(min);
1627+ packet_put_int(nbits);
1628+ packet_put_int(max);
1629+
1630+ packet_send();
1631+
1632+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP);
1633+
1634+ if ((p = BN_new()) == NULL)
1635+ fatal("BN_new() failed");
1636+ packet_get_bignum2(p);
1637+ if ((g = BN_new()) == NULL)
1638+ fatal("BN_new() failed");
1639+ packet_get_bignum2(g);
1640+ packet_check_eom();
1641+
1642+ if (BN_num_bits(p) < min || BN_num_bits(p) > max)
1643+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d",
1644+ min, BN_num_bits(p), max);
1645+
1646+ dh = dh_new_group(g, p);
1647+ break;
1648+ default:
1649+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1650+ }
1651+
1652+ /* Step 1 - e is dh->pub_key */
1653+ dh_gen_key(dh, ssh->kex->we_need * 8);
1654+
1655+ /* This is f, we initialise it now to make life easier */
1656+ dh_server_pub = BN_new();
1657+ if (dh_server_pub == NULL)
1658+ fatal("dh_server_pub == NULL");
1659+
1660+ token_ptr = GSS_C_NO_BUFFER;
1661+
1662+ do {
1663+ debug("Calling gss_init_sec_context");
1664+
1665+ maj_status = ssh_gssapi_init_ctx(ctxt,
1666+ ssh->kex->gss_deleg_creds, token_ptr, &send_tok,
1667+ &ret_flags);
1668+
1669+ if (GSS_ERROR(maj_status)) {
1670+ if (send_tok.length != 0) {
1671+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1672+ packet_put_string(send_tok.value,
1673+ send_tok.length);
1674+ }
1675+ fatal("gss_init_context failed");
1676+ }
1677+
1678+ /* If we've got an old receive buffer get rid of it */
1679+ if (token_ptr != GSS_C_NO_BUFFER)
1680+ free(recv_tok.value);
1681+
1682+ if (maj_status == GSS_S_COMPLETE) {
1683+ /* If mutual state flag is not true, kex fails */
1684+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
1685+ fatal("Mutual authentication failed");
1686+
1687+ /* If integ avail flag is not true kex fails */
1688+ if (!(ret_flags & GSS_C_INTEG_FLAG))
1689+ fatal("Integrity check failed");
1690+ }
1691+
1692+ /*
1693+ * If we have data to send, then the last message that we
1694+ * received cannot have been a 'complete'.
1695+ */
1696+ if (send_tok.length != 0) {
1697+ if (first) {
1698+ packet_start(SSH2_MSG_KEXGSS_INIT);
1699+ packet_put_string(send_tok.value,
1700+ send_tok.length);
1701+ packet_put_bignum2(dh->pub_key);
1702+ first = 0;
1703+ } else {
1704+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1705+ packet_put_string(send_tok.value,
1706+ send_tok.length);
1707+ }
1708+ packet_send();
1709+ gss_release_buffer(&min_status, &send_tok);
1710+
1711+ /* If we've sent them data, they should reply */
1712+ do {
1713+ type = packet_read();
1714+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
1715+ debug("Received KEXGSS_HOSTKEY");
1716+ if (serverhostkey)
1717+ fatal("Server host key received more than once");
1718+ serverhostkey =
1719+ packet_get_string(&slen);
1720+ }
1721+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY);
1722+
1723+ switch (type) {
1724+ case SSH2_MSG_KEXGSS_CONTINUE:
1725+ debug("Received GSSAPI_CONTINUE");
1726+ if (maj_status == GSS_S_COMPLETE)
1727+ fatal("GSSAPI Continue received from server when complete");
1728+ recv_tok.value = packet_get_string(&strlen);
1729+ recv_tok.length = strlen;
1730+ break;
1731+ case SSH2_MSG_KEXGSS_COMPLETE:
1732+ debug("Received GSSAPI_COMPLETE");
1733+ packet_get_bignum2(dh_server_pub);
1734+ msg_tok.value = packet_get_string(&strlen);
1735+ msg_tok.length = strlen;
1736+
1737+ /* Is there a token included? */
1738+ if (packet_get_char()) {
1739+ recv_tok.value=
1740+ packet_get_string(&strlen);
1741+ recv_tok.length = strlen;
1742+ /* If we're already complete - protocol error */
1743+ if (maj_status == GSS_S_COMPLETE)
1744+ packet_disconnect("Protocol error: received token when complete");
1745+ } else {
1746+ /* No token included */
1747+ if (maj_status != GSS_S_COMPLETE)
1748+ packet_disconnect("Protocol error: did not receive final token");
1749+ }
1750+ break;
1751+ case SSH2_MSG_KEXGSS_ERROR:
1752+ debug("Received Error");
1753+ maj_status = packet_get_int();
1754+ min_status = packet_get_int();
1755+ msg = packet_get_string(NULL);
1756+ (void) packet_get_string_ptr(NULL);
1757+ fatal("GSSAPI Error: \n%.400s",msg);
1758+ default:
1759+ packet_disconnect("Protocol error: didn't expect packet type %d",
1760+ type);
1761+ }
1762+ token_ptr = &recv_tok;
1763+ } else {
1764+ /* No data, and not complete */
1765+ if (maj_status != GSS_S_COMPLETE)
1766+ fatal("Not complete, and no token output");
1767+ }
1768+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
1769+
1770+ /*
1771+ * We _must_ have received a COMPLETE message in reply from the
1772+ * server, which will have set dh_server_pub and msg_tok
1773+ */
1774+
1775+ if (type != SSH2_MSG_KEXGSS_COMPLETE)
1776+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
1777+
1778+ /* Check f in range [1, p-1] */
1779+ if (!dh_pub_is_valid(dh, dh_server_pub))
1780+ packet_disconnect("bad server public DH value");
1781+
1782+ /* compute K=f^x mod p */
1783+ klen = DH_size(dh);
1784+ kbuf = xmalloc(klen);
1785+ kout = DH_compute_key(kbuf, dh_server_pub, dh);
1786+ if (kout < 0)
1787+ fatal("DH_compute_key: failed");
1788+
1789+ shared_secret = BN_new();
1790+ if (shared_secret == NULL)
1791+ fatal("kexgss_client: BN_new failed");
1792+
1793+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
1794+ fatal("kexdh_client: BN_bin2bn failed");
1795+
1796+ memset(kbuf, 0, klen);
1797+ free(kbuf);
1798+
1799+ hashlen = sizeof(hash);
1800+ switch (ssh->kex->kex_type) {
1801+ case KEX_GSS_GRP1_SHA1:
1802+ case KEX_GSS_GRP14_SHA1:
1803+ kex_dh_hash(
1804+ ssh->kex->hash_alg,
1805+ ssh->kex->client_version_string,
1806+ ssh->kex->server_version_string,
1807+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1808+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1809+ (serverhostkey ? serverhostkey : empty), slen,
1810+ dh->pub_key, /* e */
1811+ dh_server_pub, /* f */
1812+ shared_secret, /* K */
1813+ hash, &hashlen
1814+ );
1815+ break;
1816+ case KEX_GSS_GEX_SHA1:
1817+ kexgex_hash(
1818+ ssh->kex->hash_alg,
1819+ ssh->kex->client_version_string,
1820+ ssh->kex->server_version_string,
1821+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1822+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1823+ (serverhostkey ? serverhostkey : empty), slen,
1824+ min, nbits, max,
1825+ dh->p, dh->g,
1826+ dh->pub_key,
1827+ dh_server_pub,
1828+ shared_secret,
1829+ hash, &hashlen
1830+ );
1831+ break;
1832+ default:
1833+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1834+ }
1835+
1836+ gssbuf.value = hash;
1837+ gssbuf.length = hashlen;
1838+
1839+ /* Verify that the hash matches the MIC we just got. */
1840+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
1841+ packet_disconnect("Hash's MIC didn't verify");
1842+
1843+ free(msg_tok.value);
1844+
1845+ DH_free(dh);
1846+ free(serverhostkey);
1847+ BN_clear_free(dh_server_pub);
1848+
1849+ /* save session id */
1850+ if (ssh->kex->session_id == NULL) {
1851+ ssh->kex->session_id_len = hashlen;
1852+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
1853+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
1854+ }
1855+
1856+ if (ssh->kex->gss_deleg_creds)
1857+ ssh_gssapi_credentials_updated(ctxt);
1858+
1859+ if (gss_kex_context == NULL)
1860+ gss_kex_context = ctxt;
1861+ else
1862+ ssh_gssapi_delete_ctx(&ctxt);
1863+
1864+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
1865+ BN_clear_free(shared_secret);
1866+ return kex_send_newkeys(ssh);
1867+}
1868+
1869+#endif /* GSSAPI */
1870diff --git a/kexgsss.c b/kexgsss.c
1871new file mode 100644
1872index 0000000..38ca082
1873--- /dev/null
1874+++ b/kexgsss.c
1875@@ -0,0 +1,295 @@
1876+/*
1877+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1878+ *
1879+ * Redistribution and use in source and binary forms, with or without
1880+ * modification, are permitted provided that the following conditions
1881+ * are met:
1882+ * 1. Redistributions of source code must retain the above copyright
1883+ * notice, this list of conditions and the following disclaimer.
1884+ * 2. Redistributions in binary form must reproduce the above copyright
1885+ * notice, this list of conditions and the following disclaimer in the
1886+ * documentation and/or other materials provided with the distribution.
1887+ *
1888+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1889+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1890+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1891+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1892+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1893+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1894+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1895+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1896+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1897+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1898+ */
1899+
1900+#include "includes.h"
1901+
1902+#ifdef GSSAPI
1903+
1904+#include <string.h>
1905+
1906+#include <openssl/crypto.h>
1907+#include <openssl/bn.h>
1908+
1909+#include "xmalloc.h"
1910+#include "buffer.h"
1911+#include "ssh2.h"
1912+#include "key.h"
1913+#include "cipher.h"
1914+#include "kex.h"
1915+#include "log.h"
1916+#include "packet.h"
1917+#include "dh.h"
1918+#include "ssh-gss.h"
1919+#include "monitor_wrap.h"
1920+#include "misc.h"
1921+#include "servconf.h"
1922+#include "digest.h"
1923+
1924+extern ServerOptions options;
1925+
1926+int
1927+kexgss_server(struct ssh *ssh)
1928+{
1929+ OM_uint32 maj_status, min_status;
1930+
1931+ /*
1932+ * Some GSSAPI implementations use the input value of ret_flags (an
1933+ * output variable) as a means of triggering mechanism specific
1934+ * features. Initializing it to zero avoids inadvertently
1935+ * activating this non-standard behaviour.
1936+ */
1937+
1938+ OM_uint32 ret_flags = 0;
1939+ gss_buffer_desc gssbuf, recv_tok, msg_tok;
1940+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1941+ Gssctxt *ctxt = NULL;
1942+ u_int slen, klen, kout;
1943+ u_char *kbuf;
1944+ DH *dh;
1945+ int min = -1, max = -1, nbits = -1;
1946+ BIGNUM *shared_secret = NULL;
1947+ BIGNUM *dh_client_pub = NULL;
1948+ int type = 0;
1949+ gss_OID oid;
1950+ char *mechs;
1951+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1952+ size_t hashlen;
1953+
1954+ /* Initialise GSSAPI */
1955+
1956+ /* If we're rekeying, privsep means that some of the private structures
1957+ * in the GSSAPI code are no longer available. This kludges them back
1958+ * into life
1959+ */
1960+ if (!ssh_gssapi_oid_table_ok()) {
1961+ mechs = ssh_gssapi_server_mechanisms();
1962+ free(mechs);
1963+ }
1964+
1965+ debug2("%s: Identifying %s", __func__, ssh->kex->name);
1966+ oid = ssh_gssapi_id_kex(NULL, ssh->kex->name, ssh->kex->kex_type);
1967+ if (oid == GSS_C_NO_OID)
1968+ fatal("Unknown gssapi mechanism");
1969+
1970+ debug2("%s: Acquiring credentials", __func__);
1971+
1972+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
1973+ fatal("Unable to acquire credentials for the server");
1974+
1975+ switch (ssh->kex->kex_type) {
1976+ case KEX_GSS_GRP1_SHA1:
1977+ dh = dh_new_group1();
1978+ break;
1979+ case KEX_GSS_GRP14_SHA1:
1980+ dh = dh_new_group14();
1981+ break;
1982+ case KEX_GSS_GEX_SHA1:
1983+ debug("Doing group exchange");
1984+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ);
1985+ min = packet_get_int();
1986+ nbits = packet_get_int();
1987+ max = packet_get_int();
1988+ packet_check_eom();
1989+ if (max < min || nbits < min || max < nbits)
1990+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
1991+ min, nbits, max);
1992+ dh = PRIVSEP(choose_dh(MAX(DH_GRP_MIN, min),
1993+ nbits, MIN(DH_GRP_MAX, max)));
1994+ if (dh == NULL)
1995+ packet_disconnect("Protocol error: no matching group found");
1996+
1997+ packet_start(SSH2_MSG_KEXGSS_GROUP);
1998+ packet_put_bignum2(dh->p);
1999+ packet_put_bignum2(dh->g);
2000+ packet_send();
2001+
2002+ packet_write_wait();
2003+ break;
2004+ default:
2005+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
2006+ }
2007+
2008+ dh_gen_key(dh, ssh->kex->we_need * 8);
2009+
2010+ do {
2011+ debug("Wait SSH2_MSG_GSSAPI_INIT");
2012+ type = packet_read();
2013+ switch(type) {
2014+ case SSH2_MSG_KEXGSS_INIT:
2015+ if (dh_client_pub != NULL)
2016+ fatal("Received KEXGSS_INIT after initialising");
2017+ recv_tok.value = packet_get_string(&slen);
2018+ recv_tok.length = slen;
2019+
2020+ if ((dh_client_pub = BN_new()) == NULL)
2021+ fatal("dh_client_pub == NULL");
2022+
2023+ packet_get_bignum2(dh_client_pub);
2024+
2025+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
2026+ break;
2027+ case SSH2_MSG_KEXGSS_CONTINUE:
2028+ recv_tok.value = packet_get_string(&slen);
2029+ recv_tok.length = slen;
2030+ break;
2031+ default:
2032+ packet_disconnect(
2033+ "Protocol error: didn't expect packet type %d",
2034+ type);
2035+ }
2036+
2037+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
2038+ &send_tok, &ret_flags));
2039+
2040+ free(recv_tok.value);
2041+
2042+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
2043+ fatal("Zero length token output when incomplete");
2044+
2045+ if (dh_client_pub == NULL)
2046+ fatal("No client public key");
2047+
2048+ if (maj_status & GSS_S_CONTINUE_NEEDED) {
2049+ debug("Sending GSSAPI_CONTINUE");
2050+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
2051+ packet_put_string(send_tok.value, send_tok.length);
2052+ packet_send();
2053+ gss_release_buffer(&min_status, &send_tok);
2054+ }
2055+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
2056+
2057+ if (GSS_ERROR(maj_status)) {
2058+ if (send_tok.length > 0) {
2059+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
2060+ packet_put_string(send_tok.value, send_tok.length);
2061+ packet_send();
2062+ }
2063+ fatal("accept_ctx died");
2064+ }
2065+
2066+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
2067+ fatal("Mutual Authentication flag wasn't set");
2068+
2069+ if (!(ret_flags & GSS_C_INTEG_FLAG))
2070+ fatal("Integrity flag wasn't set");
2071+
2072+ if (!dh_pub_is_valid(dh, dh_client_pub))
2073+ packet_disconnect("bad client public DH value");
2074+
2075+ klen = DH_size(dh);
2076+ kbuf = xmalloc(klen);
2077+ kout = DH_compute_key(kbuf, dh_client_pub, dh);
2078+ if (kout < 0)
2079+ fatal("DH_compute_key: failed");
2080+
2081+ shared_secret = BN_new();
2082+ if (shared_secret == NULL)
2083+ fatal("kexgss_server: BN_new failed");
2084+
2085+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
2086+ fatal("kexgss_server: BN_bin2bn failed");
2087+
2088+ memset(kbuf, 0, klen);
2089+ free(kbuf);
2090+
2091+ hashlen = sizeof(hash);
2092+ switch (ssh->kex->kex_type) {
2093+ case KEX_GSS_GRP1_SHA1:
2094+ case KEX_GSS_GRP14_SHA1:
2095+ kex_dh_hash(
2096+ ssh->kex->hash_alg,
2097+ ssh->kex->client_version_string, ssh->kex->server_version_string,
2098+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
2099+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
2100+ NULL, 0, /* Change this if we start sending host keys */
2101+ dh_client_pub, dh->pub_key, shared_secret,
2102+ hash, &hashlen
2103+ );
2104+ break;
2105+ case KEX_GSS_GEX_SHA1:
2106+ kexgex_hash(
2107+ ssh->kex->hash_alg,
2108+ ssh->kex->client_version_string, ssh->kex->server_version_string,
2109+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
2110+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
2111+ NULL, 0,
2112+ min, nbits, max,
2113+ dh->p, dh->g,
2114+ dh_client_pub,
2115+ dh->pub_key,
2116+ shared_secret,
2117+ hash, &hashlen
2118+ );
2119+ break;
2120+ default:
2121+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
2122+ }
2123+
2124+ BN_clear_free(dh_client_pub);
2125+
2126+ if (ssh->kex->session_id == NULL) {
2127+ ssh->kex->session_id_len = hashlen;
2128+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
2129+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
2130+ }
2131+
2132+ gssbuf.value = hash;
2133+ gssbuf.length = hashlen;
2134+
2135+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok))))
2136+ fatal("Couldn't get MIC");
2137+
2138+ packet_start(SSH2_MSG_KEXGSS_COMPLETE);
2139+ packet_put_bignum2(dh->pub_key);
2140+ packet_put_string(msg_tok.value,msg_tok.length);
2141+
2142+ if (send_tok.length != 0) {
2143+ packet_put_char(1); /* true */
2144+ packet_put_string(send_tok.value, send_tok.length);
2145+ } else {
2146+ packet_put_char(0); /* false */
2147+ }
2148+ packet_send();
2149+
2150+ gss_release_buffer(&min_status, &send_tok);
2151+ gss_release_buffer(&min_status, &msg_tok);
2152+
2153+ if (gss_kex_context == NULL)
2154+ gss_kex_context = ctxt;
2155+ else
2156+ ssh_gssapi_delete_ctx(&ctxt);
2157+
2158+ DH_free(dh);
2159+
2160+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
2161+ BN_clear_free(shared_secret);
2162+ kex_send_newkeys(ssh);
2163+
2164+ /* If this was a rekey, then save out any delegated credentials we
2165+ * just exchanged. */
2166+ if (options.gss_store_rekey)
2167+ ssh_gssapi_rekey_creds();
2168+ return 0;
2169+}
2170+#endif /* GSSAPI */
2171diff --git a/monitor.c b/monitor.c
2172index cb57bd0..05bb48a 100644
2173--- a/monitor.c
2174+++ b/monitor.c
2175@@ -158,6 +158,8 @@ int mm_answer_gss_setup_ctx(int, Buffer *);
2176 int mm_answer_gss_accept_ctx(int, Buffer *);
2177 int mm_answer_gss_userok(int, Buffer *);
2178 int mm_answer_gss_checkmic(int, Buffer *);
2179+int mm_answer_gss_sign(int, Buffer *);
2180+int mm_answer_gss_updatecreds(int, Buffer *);
2181 #endif
2182
2183 #ifdef SSH_AUDIT_EVENTS
2184@@ -235,11 +237,18 @@ struct mon_table mon_dispatch_proto20[] = {
2185 {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx},
2186 {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok},
2187 {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic},
2188+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign},
2189 #endif
2190 {0, 0, NULL}
2191 };
2192
2193 struct mon_table mon_dispatch_postauth20[] = {
2194+#ifdef GSSAPI
2195+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx},
2196+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
2197+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign},
2198+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds},
2199+#endif
2200 #ifdef WITH_OPENSSL
2201 {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
2202 #endif
2203@@ -354,6 +363,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
2204 /* Permit requests for moduli and signatures */
2205 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
2206 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
2207+#ifdef GSSAPI
2208+ /* and for the GSSAPI key exchange */
2209+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
2210+#endif
2211 } else {
2212 mon_dispatch = mon_dispatch_proto15;
2213
2214@@ -462,6 +475,10 @@ monitor_child_postauth(struct monitor *pmonitor)
2215 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
2216 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
2217 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
2218+#ifdef GSSAPI
2219+ /* and for the GSSAPI key exchange */
2220+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
2221+#endif
2222 } else {
2223 mon_dispatch = mon_dispatch_postauth15;
2224 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
2225@@ -1876,6 +1893,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
2226 # endif
2227 #endif /* WITH_OPENSSL */
2228 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
2229+#ifdef GSSAPI
2230+ if (options.gss_keyex) {
2231+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
2232+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
2233+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
2234+ }
2235+#endif
2236 kex->load_host_public_key=&get_hostkey_public_by_type;
2237 kex->load_host_private_key=&get_hostkey_private_by_type;
2238 kex->host_key_index=&get_hostkey_index;
2239@@ -1975,6 +1999,9 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
2240 OM_uint32 major;
2241 u_int len;
2242
2243+ if (!options.gss_authentication && !options.gss_keyex)
2244+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2245+
2246 goid.elements = buffer_get_string(m, &len);
2247 goid.length = len;
2248
2249@@ -2002,6 +2029,9 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
2250 OM_uint32 flags = 0; /* GSI needs this */
2251 u_int len;
2252
2253+ if (!options.gss_authentication && !options.gss_keyex)
2254+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2255+
2256 in.value = buffer_get_string(m, &len);
2257 in.length = len;
2258 major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);
2259@@ -2019,6 +2049,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
2260 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
2261 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
2262 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
2263+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1);
2264 }
2265 return (0);
2266 }
2267@@ -2030,6 +2061,9 @@ mm_answer_gss_checkmic(int sock, Buffer *m)
2268 OM_uint32 ret;
2269 u_int len;
2270
2271+ if (!options.gss_authentication && !options.gss_keyex)
2272+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2273+
2274 gssbuf.value = buffer_get_string(m, &len);
2275 gssbuf.length = len;
2276 mic.value = buffer_get_string(m, &len);
2277@@ -2056,7 +2090,11 @@ mm_answer_gss_userok(int sock, Buffer *m)
2278 {
2279 int authenticated;
2280
2281- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user);
2282+ if (!options.gss_authentication && !options.gss_keyex)
2283+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2284+
2285+ authenticated = authctxt->valid &&
2286+ ssh_gssapi_userok(authctxt->user, authctxt->pw);
2287
2288 buffer_clear(m);
2289 buffer_put_int(m, authenticated);
2290@@ -2069,5 +2107,73 @@ mm_answer_gss_userok(int sock, Buffer *m)
2291 /* Monitor loop will terminate if authenticated */
2292 return (authenticated);
2293 }
2294+
2295+int
2296+mm_answer_gss_sign(int socket, Buffer *m)
2297+{
2298+ gss_buffer_desc data;
2299+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER;
2300+ OM_uint32 major, minor;
2301+ u_int len;
2302+
2303+ if (!options.gss_authentication && !options.gss_keyex)
2304+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2305+
2306+ data.value = buffer_get_string(m, &len);
2307+ data.length = len;
2308+ if (data.length != 20)
2309+ fatal("%s: data length incorrect: %d", __func__,
2310+ (int) data.length);
2311+
2312+ /* Save the session ID on the first time around */
2313+ if (session_id2_len == 0) {
2314+ session_id2_len = data.length;
2315+ session_id2 = xmalloc(session_id2_len);
2316+ memcpy(session_id2, data.value, session_id2_len);
2317+ }
2318+ major = ssh_gssapi_sign(gsscontext, &data, &hash);
2319+
2320+ free(data.value);
2321+
2322+ buffer_clear(m);
2323+ buffer_put_int(m, major);
2324+ buffer_put_string(m, hash.value, hash.length);
2325+
2326+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
2327+
2328+ gss_release_buffer(&minor, &hash);
2329+
2330+ /* Turn on getpwnam permissions */
2331+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
2332+
2333+ /* And credential updating, for when rekeying */
2334+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1);
2335+
2336+ return (0);
2337+}
2338+
2339+int
2340+mm_answer_gss_updatecreds(int socket, Buffer *m) {
2341+ ssh_gssapi_ccache store;
2342+ int ok;
2343+
2344+ store.filename = buffer_get_string(m, NULL);
2345+ store.envvar = buffer_get_string(m, NULL);
2346+ store.envval = buffer_get_string(m, NULL);
2347+
2348+ ok = ssh_gssapi_update_creds(&store);
2349+
2350+ free(store.filename);
2351+ free(store.envvar);
2352+ free(store.envval);
2353+
2354+ buffer_clear(m);
2355+ buffer_put_int(m, ok);
2356+
2357+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m);
2358+
2359+ return(0);
2360+}
2361+
2362 #endif /* GSSAPI */
2363
2364diff --git a/monitor.h b/monitor.h
2365index 93b8b66..bc50ade 100644
2366--- a/monitor.h
2367+++ b/monitor.h
2368@@ -65,6 +65,9 @@ enum monitor_reqtype {
2369 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
2370 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
2371
2372+ MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
2373+ MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
2374+
2375 };
2376
2377 struct mm_master;
2378diff --git a/monitor_wrap.c b/monitor_wrap.c
2379index 99dc13b..5a9f1b5 100644
2380--- a/monitor_wrap.c
2381+++ b/monitor_wrap.c
2382@@ -1073,7 +1073,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
2383 }
2384
2385 int
2386-mm_ssh_gssapi_userok(char *user)
2387+mm_ssh_gssapi_userok(char *user, struct passwd *pw)
2388 {
2389 Buffer m;
2390 int authenticated = 0;
2391@@ -1090,5 +1090,50 @@ mm_ssh_gssapi_userok(char *user)
2392 debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
2393 return (authenticated);
2394 }
2395+
2396+OM_uint32
2397+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
2398+{
2399+ Buffer m;
2400+ OM_uint32 major;
2401+ u_int len;
2402+
2403+ buffer_init(&m);
2404+ buffer_put_string(&m, data->value, data->length);
2405+
2406+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m);
2407+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m);
2408+
2409+ major = buffer_get_int(&m);
2410+ hash->value = buffer_get_string(&m, &len);
2411+ hash->length = len;
2412+
2413+ buffer_free(&m);
2414+
2415+ return(major);
2416+}
2417+
2418+int
2419+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
2420+{
2421+ Buffer m;
2422+ int ok;
2423+
2424+ buffer_init(&m);
2425+
2426+ buffer_put_cstring(&m, store->filename ? store->filename : "");
2427+ buffer_put_cstring(&m, store->envvar ? store->envvar : "");
2428+ buffer_put_cstring(&m, store->envval ? store->envval : "");
2429+
2430+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m);
2431+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m);
2432+
2433+ ok = buffer_get_int(&m);
2434+
2435+ buffer_free(&m);
2436+
2437+ return (ok);
2438+}
2439+
2440 #endif /* GSSAPI */
2441
2442diff --git a/monitor_wrap.h b/monitor_wrap.h
2443index 9fd02b3..b5414c2 100644
2444--- a/monitor_wrap.h
2445+++ b/monitor_wrap.h
2446@@ -60,8 +60,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *);
2447 OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2448 OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
2449 gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
2450-int mm_ssh_gssapi_userok(char *user);
2451+int mm_ssh_gssapi_userok(char *user, struct passwd *);
2452 OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2453+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2454+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *);
2455 #endif
2456
2457 #ifdef USE_PAM
2458diff --git a/readconf.c b/readconf.c
2459index c177202..e019195 100644
2460--- a/readconf.c
2461+++ b/readconf.c
2462@@ -160,6 +160,8 @@ typedef enum {
2463 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
2464 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
2465 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
2466+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
2467+ oGssServerIdentity,
2468 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
2469 oSendEnv, oControlPath, oControlMaster, oControlPersist,
2470 oHashKnownHosts,
2471@@ -205,10 +207,19 @@ static struct {
2472 { "afstokenpassing", oUnsupported },
2473 #if defined(GSSAPI)
2474 { "gssapiauthentication", oGssAuthentication },
2475+ { "gssapikeyexchange", oGssKeyEx },
2476 { "gssapidelegatecredentials", oGssDelegateCreds },
2477+ { "gssapitrustdns", oGssTrustDns },
2478+ { "gssapiclientidentity", oGssClientIdentity },
2479+ { "gssapiserveridentity", oGssServerIdentity },
2480+ { "gssapirenewalforcesrekey", oGssRenewalRekey },
2481 #else
2482 { "gssapiauthentication", oUnsupported },
2483+ { "gssapikeyexchange", oUnsupported },
2484 { "gssapidelegatecredentials", oUnsupported },
2485+ { "gssapitrustdns", oUnsupported },
2486+ { "gssapiclientidentity", oUnsupported },
2487+ { "gssapirenewalforcesrekey", oUnsupported },
2488 #endif
2489 { "fallbacktorsh", oDeprecated },
2490 { "usersh", oDeprecated },
2491@@ -962,10 +973,30 @@ parse_time:
2492 intptr = &options->gss_authentication;
2493 goto parse_flag;
2494
2495+ case oGssKeyEx:
2496+ intptr = &options->gss_keyex;
2497+ goto parse_flag;
2498+
2499 case oGssDelegateCreds:
2500 intptr = &options->gss_deleg_creds;
2501 goto parse_flag;
2502
2503+ case oGssTrustDns:
2504+ intptr = &options->gss_trust_dns;
2505+ goto parse_flag;
2506+
2507+ case oGssClientIdentity:
2508+ charptr = &options->gss_client_identity;
2509+ goto parse_string;
2510+
2511+ case oGssServerIdentity:
2512+ charptr = &options->gss_server_identity;
2513+ goto parse_string;
2514+
2515+ case oGssRenewalRekey:
2516+ intptr = &options->gss_renewal_rekey;
2517+ goto parse_flag;
2518+
2519 case oBatchMode:
2520 intptr = &options->batch_mode;
2521 goto parse_flag;
2522@@ -1777,7 +1808,12 @@ initialize_options(Options * options)
2523 options->pubkey_authentication = -1;
2524 options->challenge_response_authentication = -1;
2525 options->gss_authentication = -1;
2526+ options->gss_keyex = -1;
2527 options->gss_deleg_creds = -1;
2528+ options->gss_trust_dns = -1;
2529+ options->gss_renewal_rekey = -1;
2530+ options->gss_client_identity = NULL;
2531+ options->gss_server_identity = NULL;
2532 options->password_authentication = -1;
2533 options->kbd_interactive_authentication = -1;
2534 options->kbd_interactive_devices = NULL;
2535@@ -1921,8 +1957,14 @@ fill_default_options(Options * options)
2536 options->challenge_response_authentication = 1;
2537 if (options->gss_authentication == -1)
2538 options->gss_authentication = 0;
2539+ if (options->gss_keyex == -1)
2540+ options->gss_keyex = 0;
2541 if (options->gss_deleg_creds == -1)
2542 options->gss_deleg_creds = 0;
2543+ if (options->gss_trust_dns == -1)
2544+ options->gss_trust_dns = 0;
2545+ if (options->gss_renewal_rekey == -1)
2546+ options->gss_renewal_rekey = 0;
2547 if (options->password_authentication == -1)
2548 options->password_authentication = 1;
2549 if (options->kbd_interactive_authentication == -1)
2550diff --git a/readconf.h b/readconf.h
2551index cef55f7..fd3d7c7 100644
2552--- a/readconf.h
2553+++ b/readconf.h
2554@@ -45,7 +45,12 @@ typedef struct {
2555 int challenge_response_authentication;
2556 /* Try S/Key or TIS, authentication. */
2557 int gss_authentication; /* Try GSS authentication */
2558+ int gss_keyex; /* Try GSS key exchange */
2559 int gss_deleg_creds; /* Delegate GSS credentials */
2560+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
2561+ int gss_renewal_rekey; /* Credential renewal forces rekey */
2562+ char *gss_client_identity; /* Principal to initiate GSSAPI with */
2563+ char *gss_server_identity; /* GSSAPI target principal */
2564 int password_authentication; /* Try password
2565 * authentication. */
2566 int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
2567diff --git a/servconf.c b/servconf.c
2568index 873b0d0..9b06281 100644
2569--- a/servconf.c
2570+++ b/servconf.c
2571@@ -117,8 +117,10 @@ initialize_server_options(ServerOptions *options)
2572 options->kerberos_ticket_cleanup = -1;
2573 options->kerberos_get_afs_token = -1;
2574 options->gss_authentication=-1;
2575+ options->gss_keyex = -1;
2576 options->gss_cleanup_creds = -1;
2577 options->gss_strict_acceptor = -1;
2578+ options->gss_store_rekey = -1;
2579 options->password_authentication = -1;
2580 options->kbd_interactive_authentication = -1;
2581 options->challenge_response_authentication = -1;
2582@@ -287,10 +289,14 @@ fill_default_server_options(ServerOptions *options)
2583 options->kerberos_get_afs_token = 0;
2584 if (options->gss_authentication == -1)
2585 options->gss_authentication = 0;
2586+ if (options->gss_keyex == -1)
2587+ options->gss_keyex = 0;
2588 if (options->gss_cleanup_creds == -1)
2589 options->gss_cleanup_creds = 1;
2590 if (options->gss_strict_acceptor == -1)
2591- options->gss_strict_acceptor = 0;
2592+ options->gss_strict_acceptor = 1;
2593+ if (options->gss_store_rekey == -1)
2594+ options->gss_store_rekey = 0;
2595 if (options->password_authentication == -1)
2596 options->password_authentication = 1;
2597 if (options->kbd_interactive_authentication == -1)
2598@@ -427,6 +433,7 @@ typedef enum {
2599 sHostKeyAlgorithms,
2600 sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
2601 sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
2602+ sGssKeyEx, sGssStoreRekey,
2603 sAcceptEnv, sPermitTunnel,
2604 sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
2605 sUsePrivilegeSeparation, sAllowAgentForwarding,
2606@@ -500,12 +507,20 @@ static struct {
2607 #ifdef GSSAPI
2608 { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
2609 { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
2610+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
2611 { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
2612+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
2613+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
2614 #else
2615 { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
2616 { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
2617+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
2618 { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
2619+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
2620+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
2621 #endif
2622+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
2623+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
2624 { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
2625 { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
2626 { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
2627@@ -1251,6 +1266,10 @@ process_server_config_line(ServerOptions *options, char *line,
2628 intptr = &options->gss_authentication;
2629 goto parse_flag;
2630
2631+ case sGssKeyEx:
2632+ intptr = &options->gss_keyex;
2633+ goto parse_flag;
2634+
2635 case sGssCleanupCreds:
2636 intptr = &options->gss_cleanup_creds;
2637 goto parse_flag;
2638@@ -1259,6 +1278,10 @@ process_server_config_line(ServerOptions *options, char *line,
2639 intptr = &options->gss_strict_acceptor;
2640 goto parse_flag;
2641
2642+ case sGssStoreRekey:
2643+ intptr = &options->gss_store_rekey;
2644+ goto parse_flag;
2645+
2646 case sPasswordAuthentication:
2647 intptr = &options->password_authentication;
2648 goto parse_flag;
2649@@ -2308,7 +2331,10 @@ dump_config(ServerOptions *o)
2650 #endif
2651 #ifdef GSSAPI
2652 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
2653+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
2654 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
2655+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
2656+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
2657 #endif
2658 dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
2659 dump_cfg_fmtint(sKbdInteractiveAuthentication,
2660diff --git a/servconf.h b/servconf.h
2661index f4137af..778ba17 100644
2662--- a/servconf.h
2663+++ b/servconf.h
2664@@ -118,8 +118,10 @@ typedef struct {
2665 int kerberos_get_afs_token; /* If true, try to get AFS token if
2666 * authenticated with Kerberos. */
2667 int gss_authentication; /* If true, permit GSSAPI authentication */
2668+ int gss_keyex; /* If true, permit GSSAPI key exchange */
2669 int gss_cleanup_creds; /* If true, destroy cred cache on logout */
2670 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
2671+ int gss_store_rekey;
2672 int password_authentication; /* If true, permit password
2673 * authentication. */
2674 int kbd_interactive_authentication; /* If true, permit */
2675diff --git a/ssh-gss.h b/ssh-gss.h
2676index a99d7f0..914701b 100644
2677--- a/ssh-gss.h
2678+++ b/ssh-gss.h
2679@@ -1,6 +1,6 @@
2680 /* $OpenBSD: ssh-gss.h,v 1.11 2014/02/26 20:28:44 djm Exp $ */
2681 /*
2682- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
2683+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
2684 *
2685 * Redistribution and use in source and binary forms, with or without
2686 * modification, are permitted provided that the following conditions
2687@@ -61,10 +61,22 @@
2688
2689 #define SSH_GSS_OIDTYPE 0x06
2690
2691+#define SSH2_MSG_KEXGSS_INIT 30
2692+#define SSH2_MSG_KEXGSS_CONTINUE 31
2693+#define SSH2_MSG_KEXGSS_COMPLETE 32
2694+#define SSH2_MSG_KEXGSS_HOSTKEY 33
2695+#define SSH2_MSG_KEXGSS_ERROR 34
2696+#define SSH2_MSG_KEXGSS_GROUPREQ 40
2697+#define SSH2_MSG_KEXGSS_GROUP 41
2698+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-"
2699+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-"
2700+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-"
2701+
2702 typedef struct {
2703 char *filename;
2704 char *envvar;
2705 char *envval;
2706+ struct passwd *owner;
2707 void *data;
2708 } ssh_gssapi_ccache;
2709
2710@@ -72,8 +84,11 @@ typedef struct {
2711 gss_buffer_desc displayname;
2712 gss_buffer_desc exportedname;
2713 gss_cred_id_t creds;
2714+ gss_name_t name;
2715 struct ssh_gssapi_mech_struct *mech;
2716 ssh_gssapi_ccache store;
2717+ int used;
2718+ int updated;
2719 } ssh_gssapi_client;
2720
2721 typedef struct ssh_gssapi_mech_struct {
2722@@ -84,6 +99,7 @@ typedef struct ssh_gssapi_mech_struct {
2723 int (*userok) (ssh_gssapi_client *, char *);
2724 int (*localname) (ssh_gssapi_client *, char **);
2725 void (*storecreds) (ssh_gssapi_client *);
2726+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *);
2727 } ssh_gssapi_mech;
2728
2729 typedef struct {
2730@@ -94,10 +110,11 @@ typedef struct {
2731 gss_OID oid; /* client */
2732 gss_cred_id_t creds; /* server */
2733 gss_name_t client; /* server */
2734- gss_cred_id_t client_creds; /* server */
2735+ gss_cred_id_t client_creds; /* both */
2736 } Gssctxt;
2737
2738 extern ssh_gssapi_mech *supported_mechs[];
2739+extern Gssctxt *gss_kex_context;
2740
2741 int ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
2742 void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
2743@@ -119,16 +136,32 @@ void ssh_gssapi_build_ctx(Gssctxt **);
2744 void ssh_gssapi_delete_ctx(Gssctxt **);
2745 OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2746 void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
2747-int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
2748+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *);
2749+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
2750+int ssh_gssapi_credentials_updated(Gssctxt *);
2751
2752 /* In the server */
2753+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *,
2754+ const char *);
2755+char *ssh_gssapi_client_mechanisms(const char *, const char *);
2756+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *,
2757+ const char *);
2758+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
2759+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *,
2760+ const char *);
2761 OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2762-int ssh_gssapi_userok(char *name);
2763+int ssh_gssapi_userok(char *name, struct passwd *);
2764 OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2765 void ssh_gssapi_do_child(char ***, u_int *);
2766 void ssh_gssapi_cleanup_creds(void);
2767 void ssh_gssapi_storecreds(void);
2768
2769+char *ssh_gssapi_server_mechanisms(void);
2770+int ssh_gssapi_oid_table_ok(void);
2771+
2772+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store);
2773+void ssh_gssapi_rekey_creds(void);
2774+
2775 #endif /* GSSAPI */
2776
2777 #endif /* _SSH_GSS_H */
2778diff --git a/ssh_config b/ssh_config
2779index 90fb63f..4e879cd 100644
2780--- a/ssh_config
2781+++ b/ssh_config
2782@@ -26,6 +26,8 @@
2783 # HostbasedAuthentication no
2784 # GSSAPIAuthentication no
2785 # GSSAPIDelegateCredentials no
2786+# GSSAPIKeyExchange no
2787+# GSSAPITrustDNS no
2788 # BatchMode no
2789 # CheckHostIP yes
2790 # AddressFamily any
2791diff --git a/ssh_config.5 b/ssh_config.5
2792index 7630e7b..707d0e1 100644
2793--- a/ssh_config.5
2794+++ b/ssh_config.5
2795@@ -826,10 +826,42 @@ The default is
2796 Specifies whether user authentication based on GSSAPI is allowed.
2797 The default is
2798 .Dq no .
2799+.It Cm GSSAPIKeyExchange
2800+Specifies whether key exchange based on GSSAPI may be used. When using
2801+GSSAPI key exchange the server need not have a host key.
2802+The default is
2803+.Dq no .
2804+.It Cm GSSAPIClientIdentity
2805+If set, specifies the GSSAPI client identity that ssh should use when
2806+connecting to the server. The default is unset, which means that the default
2807+identity will be used.
2808+.It Cm GSSAPIServerIdentity
2809+If set, specifies the GSSAPI server identity that ssh should expect when
2810+connecting to the server. The default is unset, which means that the
2811+expected GSSAPI server identity will be determined from the target
2812+hostname.
2813 .It Cm GSSAPIDelegateCredentials
2814 Forward (delegate) credentials to the server.
2815 The default is
2816 .Dq no .
2817+.It Cm GSSAPIRenewalForcesRekey
2818+If set to
2819+.Dq yes
2820+then renewal of the client's GSSAPI credentials will force the rekeying of the
2821+ssh connection. With a compatible server, this can delegate the renewed
2822+credentials to a session on the server.
2823+The default is
2824+.Dq no .
2825+.It Cm GSSAPITrustDns
2826+Set to
2827+.Dq yes
2828+to indicate that the DNS is trusted to securely canonicalize
2829+the name of the host being connected to. If
2830+.Dq no ,
2831+the hostname entered on the
2832+command line will be passed untouched to the GSSAPI library.
2833+The default is
2834+.Dq no .
2835 .It Cm HashKnownHosts
2836 Indicates that
2837 .Xr ssh 1
2838diff --git a/sshconnect2.c b/sshconnect2.c
2839index fae8b0f..34b9d30 100644
2840--- a/sshconnect2.c
2841+++ b/sshconnect2.c
2842@@ -162,6 +162,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2843 struct kex *kex;
2844 int r;
2845
2846+#ifdef GSSAPI
2847+ char *orig = NULL, *gss = NULL;
2848+ char *gss_host = NULL;
2849+#endif
2850+
2851 xxx_host = host;
2852 xxx_hostaddr = hostaddr;
2853
2854@@ -192,6 +197,36 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2855 order_hostkeyalgs(host, hostaddr, port));
2856 }
2857
2858+#ifdef GSSAPI
2859+ if (options.gss_keyex) {
2860+ /* Add the GSSAPI mechanisms currently supported on this
2861+ * client to the key exchange algorithm proposal */
2862+ orig = myproposal[PROPOSAL_KEX_ALGS];
2863+
2864+ if (options.gss_server_identity)
2865+ gss_host = xstrdup(options.gss_server_identity);
2866+ else if (options.gss_trust_dns)
2867+ gss_host = remote_hostname(active_state);
2868+ else
2869+ gss_host = xstrdup(host);
2870+
2871+ gss = ssh_gssapi_client_mechanisms(gss_host,
2872+ options.gss_client_identity);
2873+ if (gss) {
2874+ debug("Offering GSSAPI proposal: %s", gss);
2875+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
2876+ "%s,%s", gss, orig);
2877+
2878+ /* If we've got GSSAPI algorithms, then we also
2879+ * support the 'null' hostkey, as a last resort */
2880+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
2881+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],
2882+ "%s,null", orig);
2883+ free(gss);
2884+ }
2885+ }
2886+#endif
2887+
2888 if (options.rekey_limit || options.rekey_interval)
2889 packet_set_rekey_limits((u_int32_t)options.rekey_limit,
2890 (time_t)options.rekey_interval);
2891@@ -213,10 +248,26 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2892 # endif
2893 #endif
2894 kex->kex[KEX_C25519_SHA256] = kexc25519_client;
2895+#ifdef GSSAPI
2896+ if (options.gss_keyex) {
2897+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
2898+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client;
2899+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client;
2900+ }
2901+#endif
2902 kex->client_version_string=client_version_string;
2903 kex->server_version_string=server_version_string;
2904 kex->verify_host_key=&verify_host_key_callback;
2905
2906+#ifdef GSSAPI
2907+ if (options.gss_keyex) {
2908+ kex->gss_deleg_creds = options.gss_deleg_creds;
2909+ kex->gss_trust_dns = options.gss_trust_dns;
2910+ kex->gss_client = options.gss_client_identity;
2911+ kex->gss_host = gss_host;
2912+ }
2913+#endif
2914+
2915 dispatch_run(DISPATCH_BLOCK, &kex->done, active_state);
2916
2917 /* remove ext-info from the KEX proposals for rekeying */
2918@@ -311,6 +362,7 @@ int input_gssapi_token(int type, u_int32_t, void *);
2919 int input_gssapi_hash(int type, u_int32_t, void *);
2920 int input_gssapi_error(int, u_int32_t, void *);
2921 int input_gssapi_errtok(int, u_int32_t, void *);
2922+int userauth_gsskeyex(Authctxt *authctxt);
2923 #endif
2924
2925 void userauth(Authctxt *, char *);
2926@@ -326,6 +378,11 @@ static char *authmethods_get(void);
2927
2928 Authmethod authmethods[] = {
2929 #ifdef GSSAPI
2930+ {"gssapi-keyex",
2931+ userauth_gsskeyex,
2932+ NULL,
2933+ &options.gss_authentication,
2934+ NULL},
2935 {"gssapi-with-mic",
2936 userauth_gssapi,
2937 NULL,
2938@@ -650,25 +707,40 @@ userauth_gssapi(Authctxt *authctxt)
2939 static u_int mech = 0;
2940 OM_uint32 min;
2941 int ok = 0;
2942+ char *gss_host;
2943+
2944+ if (options.gss_server_identity)
2945+ gss_host = xstrdup(options.gss_server_identity);
2946+ else if (options.gss_trust_dns)
2947+ gss_host = remote_hostname(active_state);
2948+ else
2949+ gss_host = xstrdup(authctxt->host);
2950
2951 /* Try one GSSAPI method at a time, rather than sending them all at
2952 * once. */
2953
2954 if (gss_supported == NULL)
2955- gss_indicate_mechs(&min, &gss_supported);
2956+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) {
2957+ gss_supported = NULL;
2958+ free(gss_host);
2959+ return 0;
2960+ }
2961
2962 /* Check to see if the mechanism is usable before we offer it */
2963 while (mech < gss_supported->count && !ok) {
2964 /* My DER encoding requires length<128 */
2965 if (gss_supported->elements[mech].length < 128 &&
2966 ssh_gssapi_check_mechanism(&gssctxt,
2967- &gss_supported->elements[mech], authctxt->host)) {
2968+ &gss_supported->elements[mech], gss_host,
2969+ options.gss_client_identity)) {
2970 ok = 1; /* Mechanism works */
2971 } else {
2972 mech++;
2973 }
2974 }
2975
2976+ free(gss_host);
2977+
2978 if (!ok)
2979 return 0;
2980
2981@@ -759,8 +831,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt)
2982 {
2983 Authctxt *authctxt = ctxt;
2984 Gssctxt *gssctxt;
2985- int oidlen;
2986- char *oidv;
2987+ u_int oidlen;
2988+ u_char *oidv;
2989
2990 if (authctxt == NULL)
2991 fatal("input_gssapi_response: no authentication context");
2992@@ -873,6 +945,48 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt)
2993 free(lang);
2994 return 0;
2995 }
2996+
2997+int
2998+userauth_gsskeyex(Authctxt *authctxt)
2999+{
3000+ Buffer b;
3001+ gss_buffer_desc gssbuf;
3002+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
3003+ OM_uint32 ms;
3004+
3005+ static int attempt = 0;
3006+ if (attempt++ >= 1)
3007+ return (0);
3008+
3009+ if (gss_kex_context == NULL) {
3010+ debug("No valid Key exchange context");
3011+ return (0);
3012+ }
3013+
3014+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service,
3015+ "gssapi-keyex");
3016+
3017+ gssbuf.value = buffer_ptr(&b);
3018+ gssbuf.length = buffer_len(&b);
3019+
3020+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) {
3021+ buffer_free(&b);
3022+ return (0);
3023+ }
3024+
3025+ packet_start(SSH2_MSG_USERAUTH_REQUEST);
3026+ packet_put_cstring(authctxt->server_user);
3027+ packet_put_cstring(authctxt->service);
3028+ packet_put_cstring(authctxt->method->name);
3029+ packet_put_string(mic.value, mic.length);
3030+ packet_send();
3031+
3032+ buffer_free(&b);
3033+ gss_release_buffer(&ms, &mic);
3034+
3035+ return (1);
3036+}
3037+
3038 #endif /* GSSAPI */
3039
3040 int
3041diff --git a/sshd.c b/sshd.c
3042index 799c771..ebb88c7 100644
3043--- a/sshd.c
3044+++ b/sshd.c
3045@@ -125,6 +125,10 @@
3046 #include "version.h"
3047 #include "ssherr.h"
3048
3049+#ifdef USE_SECURITY_SESSION_API
3050+#include <Security/AuthSession.h>
3051+#endif
3052+
3053 #ifndef O_NOCTTY
3054 #define O_NOCTTY 0
3055 #endif
3056@@ -1892,10 +1896,13 @@ main(int ac, char **av)
3057 logit("Disabling protocol version 1. Could not load host key");
3058 options.protocol &= ~SSH_PROTO_1;
3059 }
3060+#ifndef GSSAPI
3061+ /* The GSSAPI key exchange can run without a host key */
3062 if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) {
3063 logit("Disabling protocol version 2. Could not load host key");
3064 options.protocol &= ~SSH_PROTO_2;
3065 }
3066+#endif
3067 if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
3068 logit("sshd: no hostkeys available -- exiting.");
3069 exit(1);
3070@@ -2207,6 +2214,60 @@ main(int ac, char **av)
3071 remote_ip, remote_port, laddr, ssh_local_port(ssh));
3072 free(laddr);
3073
3074+#ifdef USE_SECURITY_SESSION_API
3075+ /*
3076+ * Create a new security session for use by the new user login if
3077+ * the current session is the root session or we are not launched
3078+ * by inetd (eg: debugging mode or server mode). We do not
3079+ * necessarily need to create a session if we are launched from
3080+ * inetd because Panther xinetd will create a session for us.
3081+ *
3082+ * The only case where this logic will fail is if there is an
3083+ * inetd running in a non-root session which is not creating
3084+ * new sessions for us. Then all the users will end up in the
3085+ * same session (bad).
3086+ *
3087+ * When the client exits, the session will be destroyed for us
3088+ * automatically.
3089+ *
3090+ * We must create the session before any credentials are stored
3091+ * (including AFS pags, which happens a few lines below).
3092+ */
3093+ {
3094+ OSStatus err = 0;
3095+ SecuritySessionId sid = 0;
3096+ SessionAttributeBits sattrs = 0;
3097+
3098+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs);
3099+ if (err)
3100+ error("SessionGetInfo() failed with error %.8X",
3101+ (unsigned) err);
3102+ else
3103+ debug("Current Session ID is %.8X / Session Attributes are %.8X",
3104+ (unsigned) sid, (unsigned) sattrs);
3105+
3106+ if (inetd_flag && !(sattrs & sessionIsRoot))
3107+ debug("Running in inetd mode in a non-root session... "
3108+ "assuming inetd created the session for us.");
3109+ else {
3110+ debug("Creating new security session...");
3111+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote);
3112+ if (err)
3113+ error("SessionCreate() failed with error %.8X",
3114+ (unsigned) err);
3115+
3116+ err = SessionGetInfo(callerSecuritySession, &sid,
3117+ &sattrs);
3118+ if (err)
3119+ error("SessionGetInfo() failed with error %.8X",
3120+ (unsigned) err);
3121+ else
3122+ debug("New Session ID is %.8X / Session Attributes are %.8X",
3123+ (unsigned) sid, (unsigned) sattrs);
3124+ }
3125+ }
3126+#endif
3127+
3128 /*
3129 * We don't want to listen forever unless the other side
3130 * successfully authenticates itself. So we set up an alarm which is
3131@@ -2631,6 +2692,48 @@ do_ssh2_kex(void)
3132 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
3133 list_hostkey_types());
3134
3135+#ifdef GSSAPI
3136+ {
3137+ char *orig;
3138+ char *gss = NULL;
3139+ char *newstr = NULL;
3140+ orig = myproposal[PROPOSAL_KEX_ALGS];
3141+
3142+ /*
3143+ * If we don't have a host key, then there's no point advertising
3144+ * the other key exchange algorithms
3145+ */
3146+
3147+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
3148+ orig = NULL;
3149+
3150+ if (options.gss_keyex)
3151+ gss = ssh_gssapi_server_mechanisms();
3152+ else
3153+ gss = NULL;
3154+
3155+ if (gss && orig)
3156+ xasprintf(&newstr, "%s,%s", gss, orig);
3157+ else if (gss)
3158+ newstr = gss;
3159+ else if (orig)
3160+ newstr = orig;
3161+
3162+ /*
3163+ * If we've got GSSAPI mechanisms, then we've got the 'null' host
3164+ * key alg, but we can't tell people about it unless its the only
3165+ * host key algorithm we support
3166+ */
3167+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
3168+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
3169+
3170+ if (newstr)
3171+ myproposal[PROPOSAL_KEX_ALGS] = newstr;
3172+ else
3173+ fatal("No supported key exchange algorithms");
3174+ }
3175+#endif
3176+
3177 /* start key exchange */
3178 if ((r = kex_setup(active_state, myproposal)) != 0)
3179 fatal("kex_setup: %s", ssh_err(r));
3180@@ -2648,6 +2751,13 @@ do_ssh2_kex(void)
3181 # endif
3182 #endif
3183 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
3184+#ifdef GSSAPI
3185+ if (options.gss_keyex) {
3186+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
3187+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
3188+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
3189+ }
3190+#endif
3191 kex->server = 1;
3192 kex->client_version_string=client_version_string;
3193 kex->server_version_string=server_version_string;
3194diff --git a/sshd_config b/sshd_config
3195index 75ae8e7..3fe3e01 100644
3196--- a/sshd_config
3197+++ b/sshd_config
3198@@ -83,6 +83,8 @@ AuthorizedKeysFile .ssh/authorized_keys
3199 # GSSAPI options
3200 #GSSAPIAuthentication no
3201 #GSSAPICleanupCredentials yes
3202+#GSSAPIStrictAcceptorCheck yes
3203+#GSSAPIKeyExchange no
3204
3205 # Set this to 'yes' to enable PAM authentication, account processing,
3206 # and session processing. If this is enabled, PAM authentication will
3207diff --git a/sshd_config.5 b/sshd_config.5
3208index 1bc26ec..3b4cba9 100644
3209--- a/sshd_config.5
3210+++ b/sshd_config.5
3211@@ -632,6 +632,11 @@ The default is
3212 Specifies whether user authentication based on GSSAPI is allowed.
3213 The default is
3214 .Dq no .
3215+.It Cm GSSAPIKeyExchange
3216+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange
3217+doesn't rely on ssh keys to verify host identity.
3218+The default is
3219+.Dq no .
3220 .It Cm GSSAPICleanupCredentials
3221 Specifies whether to automatically destroy the user's credentials cache
3222 on logout.
3223@@ -652,6 +657,11 @@ machine's default store.
3224 This facility is provided to assist with operation on multi homed machines.
3225 The default is
3226 .Dq yes .
3227+.It Cm GSSAPIStoreCredentialsOnRekey
3228+Controls whether the user's GSSAPI credentials should be updated following a
3229+successful connection rekeying. This option can be used to accepted renewed
3230+or updated credentials from a compatible client. The default is
3231+.Dq no .
3232 .It Cm HostbasedAcceptedKeyTypes
3233 Specifies the key types that will be accepted for hostbased authentication
3234 as a comma-separated pattern list.
3235diff --git a/sshkey.c b/sshkey.c
3236index c9f04cd..558bbbe 100644
3237--- a/sshkey.c
3238+++ b/sshkey.c
3239@@ -115,6 +115,7 @@ static const struct keytype keytypes[] = {
3240 # endif /* OPENSSL_HAS_NISTP521 */
3241 # endif /* OPENSSL_HAS_ECC */
3242 #endif /* WITH_OPENSSL */
3243+ { "null", "null", KEY_NULL, 0, 0, 0 },
3244 { NULL, NULL, -1, -1, 0, 0 }
3245 };
3246
3247@@ -203,7 +204,7 @@ key_alg_list(int certs_only, int plain_only)
3248 const struct keytype *kt;
3249
3250 for (kt = keytypes; kt->type != -1; kt++) {
3251- if (kt->name == NULL || kt->sigonly)
3252+ if (kt->name == NULL || kt->sigonly || kt->type == KEY_NULL)
3253 continue;
3254 if ((certs_only && !kt->cert) || (plain_only && kt->cert))
3255 continue;
3256diff --git a/sshkey.h b/sshkey.h
3257index 8c3d866..e0caa37 100644
3258--- a/sshkey.h
3259+++ b/sshkey.h
3260@@ -62,6 +62,7 @@ enum sshkey_types {
3261 KEY_DSA_CERT,
3262 KEY_ECDSA_CERT,
3263 KEY_ED25519_CERT,
3264+ KEY_NULL,
3265 KEY_UNSPEC
3266 };
3267
diff --git a/debian/patches/helpful-wait-terminate.patch b/debian/patches/helpful-wait-terminate.patch
new file mode 100644
index 000000000..a990ca1ea
--- /dev/null
+++ b/debian/patches/helpful-wait-terminate.patch
@@ -0,0 +1,26 @@
1From 173d65e72989cba82502604da3f1336766c0cf0f Mon Sep 17 00:00:00 2001
2From: Matthew Vernon <matthew@debian.org>
3Date: Sun, 9 Feb 2014 16:09:56 +0000
4Subject: Mention ~& when waiting for forwarded connections to terminate
5
6Bug-Debian: http://bugs.debian.org/50308
7Last-Update: 2010-02-27
8
9Patch-Name: helpful-wait-terminate.patch
10---
11 serverloop.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/serverloop.c b/serverloop.c
15index 3563e5d..c4e1d1d 100644
16--- a/serverloop.c
17+++ b/serverloop.c
18@@ -687,7 +687,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
19 if (!channel_still_open())
20 break;
21 if (!waiting_termination) {
22- const char *s = "Waiting for forwarded connections to terminate...\r\n";
23+ const char *s = "Waiting for forwarded connections to terminate... (press ~& to background)\r\n";
24 char *cp;
25 waiting_termination = 1;
26 buffer_append(&stderr_buffer, s, strlen(s));
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
new file mode 100644
index 000000000..14ab7d34f
--- /dev/null
+++ b/debian/patches/keepalive-extensions.patch
@@ -0,0 +1,134 @@
1From 67c34f23edbcd0f39ebc2aadae9d33950bd1f98a Mon Sep 17 00:00:00 2001
2From: Richard Kettlewell <rjk@greenend.org.uk>
3Date: Sun, 9 Feb 2014 16:09:52 +0000
4Subject: Various keepalive extensions
5
6Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut, supported
7in previous versions of Debian's OpenSSH package but since superseded by
8ServerAliveInterval. (We're probably stuck with this bit for
9compatibility.)
10
11In batch mode, default ServerAliveInterval to five minutes.
12
13Adjust documentation to match and to give some more advice on use of
14keepalives.
15
16Author: Ian Jackson <ian@chiark.greenend.org.uk>
17Author: Matthew Vernon <matthew@debian.org>
18Author: Colin Watson <cjwatson@debian.org>
19Last-Update: 2015-11-29
20
21Patch-Name: keepalive-extensions.patch
22---
23 readconf.c | 14 ++++++++++++--
24 ssh_config.5 | 21 +++++++++++++++++++--
25 sshd_config.5 | 3 +++
26 3 files changed, 34 insertions(+), 4 deletions(-)
27
28diff --git a/readconf.c b/readconf.c
29index c0b7822..3a6c67b 100644
30--- a/readconf.c
31+++ b/readconf.c
32@@ -173,6 +173,7 @@ typedef enum {
33 oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
34 oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
35 oPubkeyAcceptedKeyTypes, oProxyJump,
36+ oProtocolKeepAlives, oSetupTimeOut,
37 oIgnoredUnknownOption, oDeprecated, oUnsupported
38 } OpCodes;
39
40@@ -308,6 +309,8 @@ static struct {
41 { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
42 { "ignoreunknown", oIgnoreUnknown },
43 { "proxyjump", oProxyJump },
44+ { "protocolkeepalives", oProtocolKeepAlives },
45+ { "setuptimeout", oSetupTimeOut },
46
47 { NULL, oBadOption }
48 };
49@@ -1403,6 +1406,8 @@ parse_keytypes:
50 goto parse_flag;
51
52 case oServerAliveInterval:
53+ case oProtocolKeepAlives: /* Debian-specific compatibility alias */
54+ case oSetupTimeOut: /* Debian-specific compatibility alias */
55 intptr = &options->server_alive_interval;
56 goto parse_time;
57
58@@ -2048,8 +2053,13 @@ fill_default_options(Options * options)
59 options->rekey_interval = 0;
60 if (options->verify_host_key_dns == -1)
61 options->verify_host_key_dns = 0;
62- if (options->server_alive_interval == -1)
63- options->server_alive_interval = 0;
64+ if (options->server_alive_interval == -1) {
65+ /* in batch mode, default is 5mins */
66+ if (options->batch_mode == 1)
67+ options->server_alive_interval = 300;
68+ else
69+ options->server_alive_interval = 0;
70+ }
71 if (options->server_alive_count_max == -1)
72 options->server_alive_count_max = 3;
73 if (options->control_master == -1)
74diff --git a/ssh_config.5 b/ssh_config.5
75index 707d0e1..efc265a 100644
76--- a/ssh_config.5
77+++ b/ssh_config.5
78@@ -268,8 +268,12 @@ The default is
79 If set to
80 .Dq yes ,
81 passphrase/password querying will be disabled.
82+In addition, the
83+.Cm ServerAliveInterval
84+option will be set to 300 seconds by default.
85 This option is useful in scripts and other batch jobs where no user
86-is present to supply the password.
87+is present to supply the password,
88+and where it is desirable to detect a broken network swiftly.
89 The argument must be
90 .Dq yes
91 or
92@@ -1624,7 +1628,14 @@ from the server,
93 will send a message through the encrypted
94 channel to request a response from the server.
95 The default
96-is 0, indicating that these messages will not be sent to the server.
97+is 0, indicating that these messages will not be sent to the server,
98+or 300 if the
99+.Cm BatchMode
100+option is set.
101+.Cm ProtocolKeepAlives
102+and
103+.Cm SetupTimeOut
104+are Debian-specific compatibility aliases for this option.
105 .It Cm StreamLocalBindMask
106 Sets the octal file creation mode mask
107 .Pq umask
108@@ -1690,6 +1701,12 @@ Specifies whether the system should send TCP keepalive messages to the
109 other side.
110 If they are sent, death of the connection or crash of one
111 of the machines will be properly noticed.
112+This option only uses TCP keepalives (as opposed to using ssh level
113+keepalives), so takes a long time to notice when the connection dies.
114+As such, you probably want
115+the
116+.Cm ServerAliveInterval
117+option as well.
118 However, this means that
119 connections will die if the route is down temporarily, and some people
120 find it annoying.
121diff --git a/sshd_config.5 b/sshd_config.5
122index 3b4cba9..e05cdbe 100644
123--- a/sshd_config.5
124+++ b/sshd_config.5
125@@ -1530,6 +1530,9 @@ This avoids infinitely hanging sessions.
126 .Pp
127 To disable TCP keepalive messages, the value should be set to
128 .Dq no .
129+.Pp
130+This option was formerly called
131+.Cm KeepAlive .
132 .It Cm TrustedUserCAKeys
133 Specifies a file containing public keys of certificate authorities that are
134 trusted to sign user certificates for authentication, or
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
new file mode 100644
index 000000000..12dbaf853
--- /dev/null
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -0,0 +1,42 @@
1From 6a1979d97fbde734a745b5123130fed669bfb145 Mon Sep 17 00:00:00 2001
2From: Scott Moser <smoser@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:03 +0000
4Subject: Mention ssh-keygen in ssh fingerprint changed warning
5
6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
7Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
8Last-Update: 2015-09-08
9
10Patch-Name: mention-ssh-keygen-on-keychange.patch
11---
12 sshconnect.c | 8 +++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-)
14
15diff --git a/sshconnect.c b/sshconnect.c
16index 8b8e760..fd67727 100644
17--- a/sshconnect.c
18+++ b/sshconnect.c
19@@ -1081,9 +1081,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
20 error("%s. This could either mean that", key_msg);
21 error("DNS SPOOFING is happening or the IP address for the host");
22 error("and its host key have changed at the same time.");
23- if (ip_status != HOST_NEW)
24+ if (ip_status != HOST_NEW) {
25 error("Offending key for IP in %s:%lu",
26 ip_found->file, ip_found->line);
27+ error(" remove with:");
28+ error(" ssh-keygen -f \"%s\" -R %s",
29+ ip_found->file, ip);
30+ }
31 }
32 /* The host key has changed. */
33 warn_changed_key(host_key);
34@@ -1091,6 +1095,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
35 user_hostfiles[0]);
36 error("Offending %s key in %s:%lu", key_type(host_found->key),
37 host_found->file, host_found->line);
38+ error(" remove with:");
39+ error(" ssh-keygen -f \"%s\" -R %s", host_found->file, host);
40
41 /*
42 * If strict host key checking is in use, the user will have
diff --git a/debian/patches/no-openssl-version-status.patch b/debian/patches/no-openssl-version-status.patch
new file mode 100644
index 000000000..8503c5854
--- /dev/null
+++ b/debian/patches/no-openssl-version-status.patch
@@ -0,0 +1,62 @@
1From e7d4050d9077603c20a93bdfd6b99cd419d69f1c Mon Sep 17 00:00:00 2001
2From: Kurt Roeckx <kurt@roeckx.be>
3Date: Sun, 9 Feb 2014 16:10:14 +0000
4Subject: Don't check the status field of the OpenSSL version
5
6There is no reason to check the version of OpenSSL (in Debian). If it's
7not compatible the soname will change. OpenSSH seems to want to do a
8check for the soname based on the version number, but wants to keep the
9status of the release the same. Remove that check on the status since
10it doesn't tell you anything about how compatible that version is.
11
12Author: Colin Watson <cjwatson@debian.org>
13Bug-Debian: https://bugs.debian.org/93581
14Bug-Debian: https://bugs.debian.org/664383
15Bug-Debian: https://bugs.debian.org/732940
16Forwarded: not-needed
17Last-Update: 2014-10-07
18
19Patch-Name: no-openssl-version-status.patch
20---
21 openbsd-compat/openssl-compat.c | 6 +++---
22 openbsd-compat/regress/opensslvertest.c | 1 +
23 2 files changed, 4 insertions(+), 3 deletions(-)
24
25diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
26index 63a660c..3f62403 100644
27--- a/openbsd-compat/openssl-compat.c
28+++ b/openbsd-compat/openssl-compat.c
29@@ -36,7 +36,7 @@
30 /*
31 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
32 * We match major, minor, fix and status (not patch) for <1.0.0.
33- * After that, we acceptable compatible fix versions (so we
34+ * After that, we accept compatible fix and status versions (so we
35 * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
36 * within a patch series.
37 */
38@@ -57,10 +57,10 @@ ssh_compatible_openssl(long headerver, long libver)
39 }
40
41 /*
42- * For versions >= 1.0.0, major,minor,status must match and library
43+ * For versions >= 1.0.0, major,minor must match and library
44 * fix version must be equal to or newer than the header.
45 */
46- mask = 0xfff0000fL; /* major,minor,status */
47+ mask = 0xfff00000L; /* major,minor */
48 hfix = (headerver & 0x000ff000) >> 12;
49 lfix = (libver & 0x000ff000) >> 12;
50 if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
51diff --git a/openbsd-compat/regress/opensslvertest.c b/openbsd-compat/regress/opensslvertest.c
52index 5d019b5..5847487 100644
53--- a/openbsd-compat/regress/opensslvertest.c
54+++ b/openbsd-compat/regress/opensslvertest.c
55@@ -35,6 +35,7 @@ struct version_test {
56
57 /* built with 1.0.1b release headers */
58 { 0x1000101fL, 0x1000101fL, 1},/* exact match */
59+ { 0x1000101fL, 0x10001010L, 1}, /* different status: ok */
60 { 0x1000101fL, 0x1000102fL, 1}, /* newer library patch version: ok */
61 { 0x1000101fL, 0x1000100fL, 1}, /* older library patch version: ok */
62 { 0x1000101fL, 0x1000201fL, 1}, /* newer library fix version: ok */
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
new file mode 100644
index 000000000..771e77216
--- /dev/null
+++ b/debian/patches/openbsd-docs.patch
@@ -0,0 +1,148 @@
1From ab7ae820a882c8a51b06ec0b3522813b4e90eeff Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:09 +0000
4Subject: Adjust various OpenBSD-specific references in manual pages
5
6No single bug reference for this patch, but history includes:
7 http://bugs.debian.org/154434 (login.conf(5))
8 http://bugs.debian.org/513417 (/etc/rc)
9 http://bugs.debian.org/530692 (ssl(8))
10 https://bugs.launchpad.net/bugs/456660 (ssl(8))
11
12Forwarded: not-needed
13Last-Update: 2014-10-07
14
15Patch-Name: openbsd-docs.patch
16---
17 moduli.5 | 4 ++--
18 ssh-keygen.1 | 12 ++++--------
19 ssh.1 | 4 ++++
20 sshd.8 | 5 ++---
21 sshd_config.5 | 3 +--
22 5 files changed, 13 insertions(+), 15 deletions(-)
23
24diff --git a/moduli.5 b/moduli.5
25index ef0de08..149846c 100644
26--- a/moduli.5
27+++ b/moduli.5
28@@ -21,7 +21,7 @@
29 .Nd Diffie-Hellman moduli
30 .Sh DESCRIPTION
31 The
32-.Pa /etc/moduli
33+.Pa /etc/ssh/moduli
34 file contains prime numbers and generators for use by
35 .Xr sshd 8
36 in the Diffie-Hellman Group Exchange key exchange method.
37@@ -110,7 +110,7 @@ first estimates the size of the modulus required to produce enough
38 Diffie-Hellman output to sufficiently key the selected symmetric cipher.
39 .Xr sshd 8
40 then randomly selects a modulus from
41-.Fa /etc/moduli
42+.Fa /etc/ssh/moduli
43 that best meets the size requirement.
44 .Sh SEE ALSO
45 .Xr ssh-keygen 1 ,
46diff --git a/ssh-keygen.1 b/ssh-keygen.1
47index ce2213c..01711df 100644
48--- a/ssh-keygen.1
49+++ b/ssh-keygen.1
50@@ -178,9 +178,7 @@ key in
51 .Pa ~/.ssh/id_ed25519
52 or
53 .Pa ~/.ssh/id_rsa .
54-Additionally, the system administrator may use this to generate host keys,
55-as seen in
56-.Pa /etc/rc .
57+Additionally, the system administrator may use this to generate host keys.
58 .Pp
59 Normally this program generates the key and asks for a file in which
60 to store the private key.
61@@ -227,9 +225,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
62 for which host keys
63 do not exist, generate the host keys with the default key file path,
64 an empty passphrase, default bits for the key type, and default comment.
65-This is used by
66-.Pa /etc/rc
67-to generate new host keys.
68+This is used by system administration scripts to generate new host keys.
69 .It Fl a Ar rounds
70 When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
71 2 key when the
72@@ -644,7 +640,7 @@ option.
73 Valid generator values are 2, 3, and 5.
74 .Pp
75 Screened DH groups may be installed in
76-.Pa /etc/moduli .
77+.Pa /etc/ssh/moduli .
78 It is important that this file contains moduli of a range of bit lengths and
79 that both ends of a connection share common moduli.
80 .Sh CERTIFICATES
81@@ -843,7 +839,7 @@ on all machines
82 where the user wishes to log in using public key authentication.
83 There is no need to keep the contents of this file secret.
84 .Pp
85-.It Pa /etc/moduli
86+.It Pa /etc/ssh/moduli
87 Contains Diffie-Hellman groups used for DH-GEX.
88 The file format is described in
89 .Xr moduli 5 .
90diff --git a/ssh.1 b/ssh.1
91index feef81a..b1f128c 100644
92--- a/ssh.1
93+++ b/ssh.1
94@@ -877,6 +877,10 @@ implements public key authentication protocol automatically,
95 using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
96 The HISTORY section of
97 .Xr ssl 8
98+(on non-OpenBSD systems, see
99+.nh
100+http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY)
101+.hy
102 contains a brief discussion of the DSA and RSA algorithms.
103 .Pp
104 The file
105diff --git a/sshd.8 b/sshd.8
106index 589841f..58eefe9 100644
107--- a/sshd.8
108+++ b/sshd.8
109@@ -67,7 +67,7 @@ over an insecure network.
110 .Nm
111 listens for connections from clients.
112 It is normally started at boot from
113-.Pa /etc/rc .
114+.Pa /etc/init.d/ssh .
115 It forks a new
116 daemon for each incoming connection.
117 The forked daemons handle
118@@ -891,7 +891,7 @@ This file is for host-based authentication (see
119 .Xr ssh 1 ) .
120 It should only be writable by root.
121 .Pp
122-.It Pa /etc/moduli
123+.It Pa /etc/ssh/moduli
124 Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
125 key exchange method.
126 The file format is described in
127@@ -993,7 +993,6 @@ The content of this file is not sensitive; it can be world-readable.
128 .Xr ssh-keyscan 1 ,
129 .Xr chroot 2 ,
130 .Xr hosts_access 5 ,
131-.Xr login.conf 5 ,
132 .Xr moduli 5 ,
133 .Xr sshd_config 5 ,
134 .Xr inetd 8 ,
135diff --git a/sshd_config.5 b/sshd_config.5
136index ac9b1f0..b2b349e 100644
137--- a/sshd_config.5
138+++ b/sshd_config.5
139@@ -382,8 +382,7 @@ then no banner is displayed.
140 By default, no banner is displayed.
141 .It Cm ChallengeResponseAuthentication
142 Specifies whether challenge-response authentication is allowed (e.g. via
143-PAM or through authentication styles supported in
144-.Xr login.conf 5 )
145+PAM).
146 The default is
147 .Dq yes .
148 .It Cm ChrootDirectory
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
new file mode 100644
index 000000000..efc629b71
--- /dev/null
+++ b/debian/patches/package-versioning.patch
@@ -0,0 +1,65 @@
1From c8105413361d3c97b6a2f72c9f1c85da830bed2c Mon Sep 17 00:00:00 2001
2From: Matthew Vernon <matthew@debian.org>
3Date: Sun, 9 Feb 2014 16:10:05 +0000
4Subject: Include the Debian version in our identification
5
6This makes it easier to audit networks for versions patched against security
7vulnerabilities. It has little detrimental effect, as attackers will
8generally just try attacks rather than bothering to scan for
9vulnerable-looking version strings. (However, see debian-banner.patch.)
10
11Forwarded: not-needed
12Last-Update: 2013-09-14
13
14Patch-Name: package-versioning.patch
15---
16 sshconnect.c | 4 ++--
17 sshd.c | 2 +-
18 version.h | 7 ++++++-
19 3 files changed, 9 insertions(+), 4 deletions(-)
20
21diff --git a/sshconnect.c b/sshconnect.c
22index fd67727..07dfc9d 100644
23--- a/sshconnect.c
24+++ b/sshconnect.c
25@@ -527,10 +527,10 @@ send_client_banner(int connection_out, int minor1)
26 /* Send our own protocol version identification. */
27 if (compat20) {
28 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
29- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
30+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
31 } else {
32 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
33- PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
34+ PROTOCOL_MAJOR_1, minor1, SSH_RELEASE);
35 }
36 if (atomicio(vwrite, connection_out, client_version_string,
37 strlen(client_version_string)) != strlen(client_version_string))
38diff --git a/sshd.c b/sshd.c
39index 76306da..e873557 100644
40--- a/sshd.c
41+++ b/sshd.c
42@@ -443,7 +443,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
43 }
44
45 xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
46- major, minor, SSH_VERSION,
47+ major, minor, SSH_RELEASE,
48 *options.version_addendum == '\0' ? "" : " ",
49 options.version_addendum, newline);
50
51diff --git a/version.h b/version.h
52index 617ab62..fb81655 100644
53--- a/version.h
54+++ b/version.h
55@@ -3,4 +3,9 @@
56 #define SSH_VERSION "OpenSSH_7.3"
57
58 #define SSH_PORTABLE "p1"
59-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
60+#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE
61+#ifdef SSH_EXTRAVERSION
62+#define SSH_RELEASE SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION
63+#else
64+#define SSH_RELEASE SSH_RELEASE_MINIMUM
65+#endif
diff --git a/debian/patches/quieter-signals.patch b/debian/patches/quieter-signals.patch
new file mode 100644
index 000000000..36c366d95
--- /dev/null
+++ b/debian/patches/quieter-signals.patch
@@ -0,0 +1,40 @@
1From 8eeec10866f78acd021824225e9d62e4a18fc2c3 Mon Sep 17 00:00:00 2001
2From: Peter Samuelson <peter@p12n.org>
3Date: Sun, 9 Feb 2014 16:09:55 +0000
4Subject: Reduce severity of "Killed by signal %d"
5
6This produces irritating messages when using ProxyCommand or other programs
7that use ssh under the covers (e.g. Subversion). These messages are more
8normally printed by the calling program, such as the shell.
9
10According to the upstream bug, the right way to avoid this is to use the -q
11option, so we may drop this patch after further investigation into whether
12any software in Debian is still relying on it.
13
14Author: Colin Watson <cjwatson@debian.org>
15Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1118
16Bug-Debian: http://bugs.debian.org/313371
17Last-Update: 2013-09-14
18
19Patch-Name: quieter-signals.patch
20---
21 clientloop.c | 6 ++++--
22 1 file changed, 4 insertions(+), 2 deletions(-)
23
24diff --git a/clientloop.c b/clientloop.c
25index 421241f..e5cc3f8 100644
26--- a/clientloop.c
27+++ b/clientloop.c
28@@ -1757,8 +1757,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
29 exit_status = 0;
30 }
31
32- if (received_signal)
33- fatal("Killed by signal %d.", (int) received_signal);
34+ if (received_signal) {
35+ debug("Killed by signal %d.", (int) received_signal);
36+ cleanup_exit((int) received_signal + 128);
37+ }
38
39 /*
40 * In interactive mode (with pseudo tty) display a message indicating
diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch
new file mode 100644
index 000000000..bf3a575ad
--- /dev/null
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -0,0 +1,172 @@
1From c027de5eb3e6cb1718990841c2a9cbc89fd53151 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Tue, 7 Oct 2014 13:22:41 +0100
4Subject: Restore TCP wrappers support
5
6Support for TCP wrappers was dropped in OpenSSH 6.7. See this message
7and thread:
8
9 https://lists.mindrot.org/pipermail/openssh-unix-dev/2014-April/032497.html
10
11It is true that this reduces preauth attack surface in sshd. On the
12other hand, this support seems to be quite widely used, and abruptly
13dropping it (from the perspective of users who don't read
14openssh-unix-dev) could easily cause more serious problems in practice.
15
16It's not entirely clear what the right long-term answer for Debian is,
17but it at least probably doesn't involve dropping this feature shortly
18before a freeze.
19
20Forwarded: not-needed
21Last-Update: 2014-10-07
22
23Patch-Name: restore-tcp-wrappers.patch
24---
25 configure.ac | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
26 sshd.8 | 7 +++++++
27 sshd.c | 25 +++++++++++++++++++++++++
28 3 files changed, 89 insertions(+)
29
30diff --git a/configure.ac b/configure.ac
31index 894ec3b..f822fb3 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -1510,6 +1510,62 @@ AC_ARG_WITH([skey],
35 ]
36 )
37
38+# Check whether user wants TCP wrappers support
39+TCPW_MSG="no"
40+AC_ARG_WITH([tcp-wrappers],
41+ [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)],
42+ [
43+ if test "x$withval" != "xno" ; then
44+ saved_LIBS="$LIBS"
45+ saved_LDFLAGS="$LDFLAGS"
46+ saved_CPPFLAGS="$CPPFLAGS"
47+ if test -n "${withval}" && \
48+ test "x${withval}" != "xyes"; then
49+ if test -d "${withval}/lib"; then
50+ if test -n "${need_dash_r}"; then
51+ LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
52+ else
53+ LDFLAGS="-L${withval}/lib ${LDFLAGS}"
54+ fi
55+ else
56+ if test -n "${need_dash_r}"; then
57+ LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
58+ else
59+ LDFLAGS="-L${withval} ${LDFLAGS}"
60+ fi
61+ fi
62+ if test -d "${withval}/include"; then
63+ CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
64+ else
65+ CPPFLAGS="-I${withval} ${CPPFLAGS}"
66+ fi
67+ fi
68+ LIBS="-lwrap $LIBS"
69+ AC_MSG_CHECKING([for libwrap])
70+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
71+#include <sys/types.h>
72+#include <sys/socket.h>
73+#include <netinet/in.h>
74+#include <tcpd.h>
75+int deny_severity = 0, allow_severity = 0;
76+ ]], [[
77+ hosts_access(0);
78+ ]])], [
79+ AC_MSG_RESULT([yes])
80+ AC_DEFINE([LIBWRAP], [1],
81+ [Define if you want
82+ TCP Wrappers support])
83+ SSHDLIBS="$SSHDLIBS -lwrap"
84+ TCPW_MSG="yes"
85+ ], [
86+ AC_MSG_ERROR([*** libwrap missing])
87+
88+ ])
89+ LIBS="$saved_LIBS"
90+ fi
91+ ]
92+)
93+
94 # Check whether user wants to use ldns
95 LDNS_MSG="no"
96 AC_ARG_WITH(ldns,
97@@ -5059,6 +5115,7 @@ echo " KerberosV support: $KRB5_MSG"
98 echo " SELinux support: $SELINUX_MSG"
99 echo " Smartcard support: $SCARD_MSG"
100 echo " S/KEY support: $SKEY_MSG"
101+echo " TCP Wrappers support: $TCPW_MSG"
102 echo " MD5 password support: $MD5_MSG"
103 echo " libedit support: $LIBEDIT_MSG"
104 echo " Solaris process contract support: $SPC_MSG"
105diff --git a/sshd.8 b/sshd.8
106index 6c521f2..589841f 100644
107--- a/sshd.8
108+++ b/sshd.8
109@@ -880,6 +880,12 @@ the user's home directory becomes accessible.
110 This file should be writable only by the user, and need not be
111 readable by anyone else.
112 .Pp
113+.It Pa /etc/hosts.allow
114+.It Pa /etc/hosts.deny
115+Access controls that should be enforced by tcp-wrappers are defined here.
116+Further details are described in
117+.Xr hosts_access 5 .
118+.Pp
119 .It Pa /etc/hosts.equiv
120 This file is for host-based authentication (see
121 .Xr ssh 1 ) .
122@@ -986,6 +992,7 @@ The content of this file is not sensitive; it can be world-readable.
123 .Xr ssh-keygen 1 ,
124 .Xr ssh-keyscan 1 ,
125 .Xr chroot 2 ,
126+.Xr hosts_access 5 ,
127 .Xr login.conf 5 ,
128 .Xr moduli 5 ,
129 .Xr sshd_config 5 ,
130diff --git a/sshd.c b/sshd.c
131index ebb88c7..982e545 100644
132--- a/sshd.c
133+++ b/sshd.c
134@@ -129,6 +129,13 @@
135 #include <Security/AuthSession.h>
136 #endif
137
138+#ifdef LIBWRAP
139+#include <tcpd.h>
140+#include <syslog.h>
141+int allow_severity;
142+int deny_severity;
143+#endif /* LIBWRAP */
144+
145 #ifndef O_NOCTTY
146 #define O_NOCTTY 0
147 #endif
148@@ -2207,6 +2214,24 @@ main(int ac, char **av)
149 #ifdef SSH_AUDIT_EVENTS
150 audit_connection_from(remote_ip, remote_port);
151 #endif
152+#ifdef LIBWRAP
153+ allow_severity = options.log_facility|LOG_INFO;
154+ deny_severity = options.log_facility|LOG_WARNING;
155+ /* Check whether logins are denied from this host. */
156+ if (packet_connection_is_on_socket()) {
157+ struct request_info req;
158+
159+ request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0);
160+ fromhost(&req);
161+
162+ if (!hosts_access(&req)) {
163+ debug("Connection refused by tcp wrapper");
164+ refuse(&req);
165+ /* NOTREACHED */
166+ fatal("libwrap refuse returns");
167+ }
168+ }
169+#endif /* LIBWRAP */
170
171 /* Log the connection. */
172 laddr = get_local_ipaddr(sock_in);
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
new file mode 100644
index 000000000..2efc40e07
--- /dev/null
+++ b/debian/patches/scp-quoting.patch
@@ -0,0 +1,41 @@
1From 119936d7b64829f81cbc84c2e81bf23373c6ed37 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Nicolas=20Valc=C3=A1rcel?= <nvalcarcel@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:09:59 +0000
4Subject: Adjust scp quoting in verbose mode
5
6Tweak scp's reporting of filenames in verbose mode to be a bit less
7confusing with spaces.
8
9This should be revised to mimic real shell quoting.
10
11Bug-Ubuntu: https://bugs.launchpad.net/bugs/89945
12Last-Update: 2010-02-27
13
14Patch-Name: scp-quoting.patch
15---
16 scp.c | 12 ++++++++++--
17 1 file changed, 10 insertions(+), 2 deletions(-)
18
19diff --git a/scp.c b/scp.c
20index 43ca3fa..4a7f73a 100644
21--- a/scp.c
22+++ b/scp.c
23@@ -192,8 +192,16 @@ do_local_cmd(arglist *a)
24
25 if (verbose_mode) {
26 fprintf(stderr, "Executing:");
27- for (i = 0; i < a->num; i++)
28- fmprintf(stderr, " %s", a->list[i]);
29+ for (i = 0; i < a->num; i++) {
30+ if (i == 0)
31+ fmprintf(stderr, " %s", a->list[i]);
32+ else
33+ /*
34+ * TODO: misbehaves if a->list[i] contains a
35+ * single quote
36+ */
37+ fmprintf(stderr, " '%s'", a->list[i]);
38+ }
39 fprintf(stderr, "\n");
40 }
41 if ((pid = fork()) == -1)
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
new file mode 100644
index 000000000..bcb61480d
--- /dev/null
+++ b/debian/patches/selinux-role.patch
@@ -0,0 +1,504 @@
1From 7a7851c903e5dbb58a85014deb2c88cb718068c9 Mon Sep 17 00:00:00 2001
2From: Manoj Srivastava <srivasta@debian.org>
3Date: Sun, 9 Feb 2014 16:09:49 +0000
4Subject: Handle SELinux authorisation roles
5
6Rejected upstream due to discomfort with magic usernames; a better approach
7will need an SSH protocol change. In the meantime, this came from Debian's
8SELinux maintainer, so we'll keep it until we have something better.
9
10Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1641
11Bug-Debian: http://bugs.debian.org/394795
12Last-Update: 2015-08-19
13
14Patch-Name: selinux-role.patch
15---
16 auth.h | 1 +
17 auth1.c | 8 +++++++-
18 auth2.c | 10 ++++++++--
19 monitor.c | 32 +++++++++++++++++++++++++++++---
20 monitor.h | 2 ++
21 monitor_wrap.c | 22 ++++++++++++++++++++--
22 monitor_wrap.h | 3 ++-
23 openbsd-compat/port-linux.c | 27 ++++++++++++++++++++-------
24 openbsd-compat/port-linux.h | 4 ++--
25 platform.c | 4 ++--
26 platform.h | 2 +-
27 session.c | 10 +++++-----
28 session.h | 2 +-
29 sshd.c | 2 +-
30 sshpty.c | 4 ++--
31 sshpty.h | 2 +-
32 16 files changed, 104 insertions(+), 31 deletions(-)
33
34diff --git a/auth.h b/auth.h
35index 55170af..50baeaa 100644
36--- a/auth.h
37+++ b/auth.h
38@@ -62,6 +62,7 @@ struct Authctxt {
39 char *service;
40 struct passwd *pw; /* set if 'valid' */
41 char *style;
42+ char *role;
43 void *kbdintctxt;
44 char *info; /* Extra info for next auth_log */
45 #ifdef BSD_AUTH
46diff --git a/auth1.c b/auth1.c
47index 5073c49..dd00648 100644
48--- a/auth1.c
49+++ b/auth1.c
50@@ -383,7 +383,7 @@ void
51 do_authentication(Authctxt *authctxt)
52 {
53 u_int ulen;
54- char *user, *style = NULL;
55+ char *user, *style = NULL, *role = NULL;
56
57 /* Get the name of the user that we wish to log in as. */
58 packet_read_expect(SSH_CMSG_USER);
59@@ -392,11 +392,17 @@ do_authentication(Authctxt *authctxt)
60 user = packet_get_cstring(&ulen);
61 packet_check_eom();
62
63+ if ((role = strchr(user, '/')) != NULL)
64+ *role++ = '\0';
65+
66 if ((style = strchr(user, ':')) != NULL)
67 *style++ = '\0';
68+ else if (role && (style = strchr(role, ':')) != NULL)
69+ *style++ = '\0';
70
71 authctxt->user = user;
72 authctxt->style = style;
73+ authctxt->role = role;
74
75 /* Verify that the user is a valid user. */
76 if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL)
77diff --git a/auth2.c b/auth2.c
78index ce0d376..461311b 100644
79--- a/auth2.c
80+++ b/auth2.c
81@@ -216,7 +216,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
82 {
83 Authctxt *authctxt = ctxt;
84 Authmethod *m = NULL;
85- char *user, *service, *method, *style = NULL;
86+ char *user, *service, *method, *style = NULL, *role = NULL;
87 int authenticated = 0;
88
89 if (authctxt == NULL)
90@@ -228,8 +228,13 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
91 debug("userauth-request for user %s service %s method %s", user, service, method);
92 debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
93
94+ if ((role = strchr(user, '/')) != NULL)
95+ *role++ = 0;
96+
97 if ((style = strchr(user, ':')) != NULL)
98 *style++ = 0;
99+ else if (role && (style = strchr(role, ':')) != NULL)
100+ *style++ = '\0';
101
102 if (authctxt->attempt++ == 0) {
103 /* setup auth context */
104@@ -253,8 +258,9 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
105 use_privsep ? " [net]" : "");
106 authctxt->service = xstrdup(service);
107 authctxt->style = style ? xstrdup(style) : NULL;
108+ authctxt->role = role ? xstrdup(role) : NULL;
109 if (use_privsep)
110- mm_inform_authserv(service, style);
111+ mm_inform_authserv(service, style, role);
112 userauth_banner();
113 if (auth2_setup_methods_lists(authctxt) != 0)
114 packet_disconnect("no authentication methods enabled");
115diff --git a/monitor.c b/monitor.c
116index 05bb48a..e91054e 100644
117--- a/monitor.c
118+++ b/monitor.c
119@@ -128,6 +128,7 @@ int mm_answer_sign(int, Buffer *);
120 int mm_answer_pwnamallow(int, Buffer *);
121 int mm_answer_auth2_read_banner(int, Buffer *);
122 int mm_answer_authserv(int, Buffer *);
123+int mm_answer_authrole(int, Buffer *);
124 int mm_answer_authpassword(int, Buffer *);
125 int mm_answer_bsdauthquery(int, Buffer *);
126 int mm_answer_bsdauthrespond(int, Buffer *);
127@@ -209,6 +210,7 @@ struct mon_table mon_dispatch_proto20[] = {
128 {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
129 {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
130 {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
131+ {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
132 {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
133 {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
134 #ifdef USE_PAM
135@@ -880,6 +882,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
136 else {
137 /* Allow service/style information on the auth context */
138 monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
139+ monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
140 monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
141 }
142 #ifdef USE_PAM
143@@ -910,14 +913,37 @@ mm_answer_authserv(int sock, Buffer *m)
144
145 authctxt->service = buffer_get_string(m, NULL);
146 authctxt->style = buffer_get_string(m, NULL);
147- debug3("%s: service=%s, style=%s",
148- __func__, authctxt->service, authctxt->style);
149+ authctxt->role = buffer_get_string(m, NULL);
150+ debug3("%s: service=%s, style=%s, role=%s",
151+ __func__, authctxt->service, authctxt->style, authctxt->role);
152
153 if (strlen(authctxt->style) == 0) {
154 free(authctxt->style);
155 authctxt->style = NULL;
156 }
157
158+ if (strlen(authctxt->role) == 0) {
159+ free(authctxt->role);
160+ authctxt->role = NULL;
161+ }
162+
163+ return (0);
164+}
165+
166+int
167+mm_answer_authrole(int sock, Buffer *m)
168+{
169+ monitor_permit_authentications(1);
170+
171+ authctxt->role = buffer_get_string(m, NULL);
172+ debug3("%s: role=%s",
173+ __func__, authctxt->role);
174+
175+ if (strlen(authctxt->role) == 0) {
176+ free(authctxt->role);
177+ authctxt->role = NULL;
178+ }
179+
180 return (0);
181 }
182
183@@ -1553,7 +1579,7 @@ mm_answer_pty(int sock, Buffer *m)
184 res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
185 if (res == 0)
186 goto error;
187- pty_setowner(authctxt->pw, s->tty);
188+ pty_setowner(authctxt->pw, s->tty, authctxt->role);
189
190 buffer_put_int(m, 1);
191 buffer_put_cstring(m, s->tty);
192diff --git a/monitor.h b/monitor.h
193index bc50ade..2d82b8b 100644
194--- a/monitor.h
195+++ b/monitor.h
196@@ -68,6 +68,8 @@ enum monitor_reqtype {
197 MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
198 MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
199
200+ MONITOR_REQ_AUTHROLE = 154,
201+
202 };
203
204 struct mm_master;
205diff --git a/monitor_wrap.c b/monitor_wrap.c
206index 5a9f1b5..11e3a69 100644
207--- a/monitor_wrap.c
208+++ b/monitor_wrap.c
209@@ -328,10 +328,10 @@ mm_auth2_read_banner(void)
210 return (banner);
211 }
212
213-/* Inform the privileged process about service and style */
214+/* Inform the privileged process about service, style, and role */
215
216 void
217-mm_inform_authserv(char *service, char *style)
218+mm_inform_authserv(char *service, char *style, char *role)
219 {
220 Buffer m;
221
222@@ -340,12 +340,30 @@ mm_inform_authserv(char *service, char *style)
223 buffer_init(&m);
224 buffer_put_cstring(&m, service);
225 buffer_put_cstring(&m, style ? style : "");
226+ buffer_put_cstring(&m, role ? role : "");
227
228 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHSERV, &m);
229
230 buffer_free(&m);
231 }
232
233+/* Inform the privileged process about role */
234+
235+void
236+mm_inform_authrole(char *role)
237+{
238+ Buffer m;
239+
240+ debug3("%s entering", __func__);
241+
242+ buffer_init(&m);
243+ buffer_put_cstring(&m, role ? role : "");
244+
245+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m);
246+
247+ buffer_free(&m);
248+}
249+
250 /* Do the password authentication */
251 int
252 mm_auth_password(Authctxt *authctxt, char *password)
253diff --git a/monitor_wrap.h b/monitor_wrap.h
254index b5414c2..d5b3334 100644
255--- a/monitor_wrap.h
256+++ b/monitor_wrap.h
257@@ -41,7 +41,8 @@ void mm_log_handler(LogLevel, const char *, void *);
258 int mm_is_monitor(void);
259 DH *mm_choose_dh(int, int, int);
260 int mm_key_sign(Key *, u_char **, u_int *, const u_char *, u_int, const char *);
261-void mm_inform_authserv(char *, char *);
262+void mm_inform_authserv(char *, char *, char *);
263+void mm_inform_authrole(char *);
264 struct passwd *mm_getpwnamallow(const char *);
265 char *mm_auth2_read_banner(void);
266 int mm_auth_password(struct Authctxt *, char *);
267diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
268index f36999d..f9cdc15 100644
269--- a/openbsd-compat/port-linux.c
270+++ b/openbsd-compat/port-linux.c
271@@ -29,6 +29,12 @@
272 #include <string.h>
273 #include <stdio.h>
274
275+#ifdef WITH_SELINUX
276+#include "key.h"
277+#include "hostfile.h"
278+#include "auth.h"
279+#endif
280+
281 #include "log.h"
282 #include "xmalloc.h"
283 #include "port-linux.h"
284@@ -58,7 +64,7 @@ ssh_selinux_enabled(void)
285
286 /* Return the default security context for the given username */
287 static security_context_t
288-ssh_selinux_getctxbyname(char *pwname)
289+ssh_selinux_getctxbyname(char *pwname, const char *role)
290 {
291 security_context_t sc = NULL;
292 char *sename = NULL, *lvl = NULL;
293@@ -73,9 +79,16 @@ ssh_selinux_getctxbyname(char *pwname)
294 #endif
295
296 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
297- r = get_default_context_with_level(sename, lvl, NULL, &sc);
298+ if (role != NULL && role[0])
299+ r = get_default_context_with_rolelevel(sename, role, lvl, NULL,
300+ &sc);
301+ else
302+ r = get_default_context_with_level(sename, lvl, NULL, &sc);
303 #else
304- r = get_default_context(sename, NULL, &sc);
305+ if (role != NULL && role[0])
306+ r = get_default_context_with_role(sename, role, NULL, &sc);
307+ else
308+ r = get_default_context(sename, NULL, &sc);
309 #endif
310
311 if (r != 0) {
312@@ -105,7 +118,7 @@ ssh_selinux_getctxbyname(char *pwname)
313
314 /* Set the execution context to the default for the specified user */
315 void
316-ssh_selinux_setup_exec_context(char *pwname)
317+ssh_selinux_setup_exec_context(char *pwname, const char *role)
318 {
319 security_context_t user_ctx = NULL;
320
321@@ -114,7 +127,7 @@ ssh_selinux_setup_exec_context(char *pwname)
322
323 debug3("%s: setting execution context", __func__);
324
325- user_ctx = ssh_selinux_getctxbyname(pwname);
326+ user_ctx = ssh_selinux_getctxbyname(pwname, role);
327 if (setexeccon(user_ctx) != 0) {
328 switch (security_getenforce()) {
329 case -1:
330@@ -136,7 +149,7 @@ ssh_selinux_setup_exec_context(char *pwname)
331
332 /* Set the TTY context for the specified user */
333 void
334-ssh_selinux_setup_pty(char *pwname, const char *tty)
335+ssh_selinux_setup_pty(char *pwname, const char *tty, const char *role)
336 {
337 security_context_t new_tty_ctx = NULL;
338 security_context_t user_ctx = NULL;
339@@ -147,7 +160,7 @@ ssh_selinux_setup_pty(char *pwname, const char *tty)
340
341 debug3("%s: setting TTY context on %s", __func__, tty);
342
343- user_ctx = ssh_selinux_getctxbyname(pwname);
344+ user_ctx = ssh_selinux_getctxbyname(pwname, role);
345
346 /* XXX: should these calls fatal() upon failure in enforcing mode? */
347
348diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
349index e3d1004..80ce13a 100644
350--- a/openbsd-compat/port-linux.h
351+++ b/openbsd-compat/port-linux.h
352@@ -21,8 +21,8 @@
353
354 #ifdef WITH_SELINUX
355 int ssh_selinux_enabled(void);
356-void ssh_selinux_setup_pty(char *, const char *);
357-void ssh_selinux_setup_exec_context(char *);
358+void ssh_selinux_setup_pty(char *, const char *, const char *);
359+void ssh_selinux_setup_exec_context(char *, const char *);
360 void ssh_selinux_change_context(const char *);
361 void ssh_selinux_setfscreatecon(const char *);
362 #endif
363diff --git a/platform.c b/platform.c
364index acf8554..4831706 100644
365--- a/platform.c
366+++ b/platform.c
367@@ -145,7 +145,7 @@ platform_setusercontext(struct passwd *pw)
368 * called if sshd is running as root.
369 */
370 void
371-platform_setusercontext_post_groups(struct passwd *pw)
372+platform_setusercontext_post_groups(struct passwd *pw, const char *role)
373 {
374 #if !defined(HAVE_LOGIN_CAP) && defined(USE_PAM)
375 /*
376@@ -186,7 +186,7 @@ platform_setusercontext_post_groups(struct passwd *pw)
377 }
378 #endif /* HAVE_SETPCRED */
379 #ifdef WITH_SELINUX
380- ssh_selinux_setup_exec_context(pw->pw_name);
381+ ssh_selinux_setup_exec_context(pw->pw_name, role);
382 #endif
383 }
384
385diff --git a/platform.h b/platform.h
386index e97ecd9..5b72304 100644
387--- a/platform.h
388+++ b/platform.h
389@@ -27,7 +27,7 @@ void platform_post_fork_parent(pid_t child_pid);
390 void platform_post_fork_child(void);
391 int platform_privileged_uidswap(void);
392 void platform_setusercontext(struct passwd *);
393-void platform_setusercontext_post_groups(struct passwd *);
394+void platform_setusercontext_post_groups(struct passwd *, const char *);
395 char *platform_get_krb5_client(const char *);
396 char *platform_krb5_get_principal_name(const char *);
397 int platform_sys_dir_uid(uid_t);
398diff --git a/session.c b/session.c
399index 2235f26..6dfcf84 100644
400--- a/session.c
401+++ b/session.c
402@@ -1517,7 +1517,7 @@ safely_chroot(const char *path, uid_t uid)
403
404 /* Set login name, uid, gid, and groups. */
405 void
406-do_setusercontext(struct passwd *pw)
407+do_setusercontext(struct passwd *pw, const char *role)
408 {
409 char *chroot_path, *tmp;
410
411@@ -1545,7 +1545,7 @@ do_setusercontext(struct passwd *pw)
412 endgrent();
413 #endif
414
415- platform_setusercontext_post_groups(pw);
416+ platform_setusercontext_post_groups(pw, role);
417
418 if (!in_chroot && options.chroot_directory != NULL &&
419 strcasecmp(options.chroot_directory, "none") != 0) {
420@@ -1703,7 +1703,7 @@ do_child(Session *s, const char *command)
421
422 /* Force a password change */
423 if (s->authctxt->force_pwchange) {
424- do_setusercontext(pw);
425+ do_setusercontext(pw, s->authctxt->role);
426 child_close_fds();
427 do_pwchange(s);
428 exit(1);
429@@ -1730,7 +1730,7 @@ do_child(Session *s, const char *command)
430 /* When PAM is enabled we rely on it to do the nologin check */
431 if (!options.use_pam)
432 do_nologin(pw);
433- do_setusercontext(pw);
434+ do_setusercontext(pw, s->authctxt->role);
435 /*
436 * PAM session modules in do_setusercontext may have
437 * generated messages, so if this in an interactive
438@@ -2141,7 +2141,7 @@ session_pty_req(Session *s)
439 tty_parse_modes(s->ttyfd, &n_bytes);
440
441 if (!use_privsep)
442- pty_setowner(s->pw, s->tty);
443+ pty_setowner(s->pw, s->tty, s->authctxt->role);
444
445 /* Set window size from the packet. */
446 pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
447diff --git a/session.h b/session.h
448index f18eaf3..2b7d939 100644
449--- a/session.h
450+++ b/session.h
451@@ -77,7 +77,7 @@ void session_pty_cleanup2(Session *);
452 Session *session_new(void);
453 Session *session_by_tty(char *);
454 void session_close(Session *);
455-void do_setusercontext(struct passwd *);
456+void do_setusercontext(struct passwd *, const char *);
457 void child_set_env(char ***envp, u_int *envsizep, const char *name,
458 const char *value);
459
460diff --git a/sshd.c b/sshd.c
461index 982e545..76306da 100644
462--- a/sshd.c
463+++ b/sshd.c
464@@ -787,7 +787,7 @@ privsep_postauth(Authctxt *authctxt)
465 explicit_bzero(rnd, sizeof(rnd));
466
467 /* Drop privileges */
468- do_setusercontext(authctxt->pw);
469+ do_setusercontext(authctxt->pw, authctxt->role);
470
471 skip:
472 /* It is safe now to apply the key state */
473diff --git a/sshpty.c b/sshpty.c
474index 15da8c6..e89efb7 100644
475--- a/sshpty.c
476+++ b/sshpty.c
477@@ -187,7 +187,7 @@ pty_change_window_size(int ptyfd, u_int row, u_int col,
478 }
479
480 void
481-pty_setowner(struct passwd *pw, const char *tty)
482+pty_setowner(struct passwd *pw, const char *tty, const char *role)
483 {
484 struct group *grp;
485 gid_t gid;
486@@ -209,7 +209,7 @@ pty_setowner(struct passwd *pw, const char *tty)
487 strerror(errno));
488
489 #ifdef WITH_SELINUX
490- ssh_selinux_setup_pty(pw->pw_name, tty);
491+ ssh_selinux_setup_pty(pw->pw_name, tty, role);
492 #endif
493
494 if (st.st_uid != pw->pw_uid || st.st_gid != gid) {
495diff --git a/sshpty.h b/sshpty.h
496index cfa3224..edf2436 100644
497--- a/sshpty.h
498+++ b/sshpty.h
499@@ -24,4 +24,4 @@ int pty_allocate(int *, int *, char *, size_t);
500 void pty_release(const char *);
501 void pty_make_controlling_tty(int *, const char *);
502 void pty_change_window_size(int, u_int, u_int, u_int, u_int);
503-void pty_setowner(struct passwd *, const char *);
504+void pty_setowner(struct passwd *, const char *, const char *);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..e5821f627
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,27 @@
1gssapi.patch
2restore-tcp-wrappers.patch
3selinux-role.patch
4ssh-vulnkey-compat.patch
5keepalive-extensions.patch
6syslog-level-silent.patch
7quieter-signals.patch
8helpful-wait-terminate.patch
9user-group-modes.patch
10scp-quoting.patch
11shell-path.patch
12dnssec-sshfp.patch
13auth-log-verbosity.patch
14mention-ssh-keygen-on-keychange.patch
15package-versioning.patch
16debian-banner.patch
17authorized-keys-man-symlink.patch
18openbsd-docs.patch
19ssh-argv0.patch
20doc-hash-tab-completion.patch
21doc-upstart.patch
22ssh-agent-setgid.patch
23no-openssl-version-status.patch
24gnome-ssh-askpass2-icon.patch
25sigstop.patch
26systemd-readiness.patch
27debian-config.patch
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
new file mode 100644
index 000000000..506ba3f7a
--- /dev/null
+++ b/debian/patches/shell-path.patch
@@ -0,0 +1,39 @@
1From ac283605e244f9dab676b039986f137f86284291 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:00 +0000
4Subject: Look for $SHELL on the path for ProxyCommand/LocalCommand
5
6There's some debate on the upstream bug about whether POSIX requires this.
7I (Colin Watson) agree with Vincent and think it does.
8
9Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494
10Bug-Debian: http://bugs.debian.org/492728
11Last-Update: 2013-09-14
12
13Patch-Name: shell-path.patch
14---
15 sshconnect.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/sshconnect.c b/sshconnect.c
19index 356ec79..8b8e760 100644
20--- a/sshconnect.c
21+++ b/sshconnect.c
22@@ -232,7 +232,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
23 /* Execute the proxy command. Note that we gave up any
24 extra privileges above. */
25 signal(SIGPIPE, SIG_DFL);
26- execv(argv[0], argv);
27+ execvp(argv[0], argv);
28 perror(argv[0]);
29 exit(1);
30 }
31@@ -1499,7 +1499,7 @@ ssh_local_cmd(const char *args)
32 if (pid == 0) {
33 signal(SIGPIPE, SIG_DFL);
34 debug3("Executing %s -c \"%s\"", shell, args);
35- execl(shell, shell, "-c", args, (char *)NULL);
36+ execlp(shell, shell, "-c", args, (char *)NULL);
37 error("Couldn't execute %s -c \"%s\": %s",
38 shell, args, strerror(errno));
39 _exit(1);
diff --git a/debian/patches/sigstop.patch b/debian/patches/sigstop.patch
new file mode 100644
index 000000000..7ae7f3558
--- /dev/null
+++ b/debian/patches/sigstop.patch
@@ -0,0 +1,35 @@
1From 8d765e441787d024e76369496316105fe736d3ba Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:17 +0000
4Subject: Support synchronisation with service supervisor using SIGSTOP
5
6Author: Robie Basak <robie.basak@ubuntu.com>
7Forwarded: no
8Last-Update: 2014-04-14
9
10Patch-Name: sigstop.patch
11---
12 sshd.c | 10 ++++++++++
13 1 file changed, 10 insertions(+)
14
15diff --git a/sshd.c b/sshd.c
16index 71fad9e..837409b 100644
17--- a/sshd.c
18+++ b/sshd.c
19@@ -2107,6 +2107,16 @@ main(int ac, char **av)
20 }
21 }
22
23+ if (getenv("SSH_SIGSTOP")) {
24+ /* Tell service supervisor that we are ready. */
25+ kill(getpid(), SIGSTOP);
26+ /* The service supervisor only ever expects a single
27+ * STOP signal, so do not ever signal it again, even
28+ * in the case of a re-exec or future children.
29+ */
30+ unsetenv("SSH_SIGSTOP");
31+ }
32+
33 /* Accept a connection and return in a forked child */
34 server_accept_loop(&sock_in, &sock_out,
35 &newsock, config_s);
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
new file mode 100644
index 000000000..2d1dabfd3
--- /dev/null
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -0,0 +1,40 @@
1From 172bb48ec4cb3b65d26d4f3bd8bc0e82ddaf6ca1 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:13 +0000
4Subject: Document consequences of ssh-agent being setgid in ssh-agent(1)
5
6Bug-Debian: http://bugs.debian.org/711623
7Forwarded: no
8Last-Update: 2013-06-08
9
10Patch-Name: ssh-agent-setgid.patch
11---
12 ssh-agent.1 | 15 +++++++++++++++
13 1 file changed, 15 insertions(+)
14
15diff --git a/ssh-agent.1 b/ssh-agent.1
16index c4b50bb..2fe2201 100644
17--- a/ssh-agent.1
18+++ b/ssh-agent.1
19@@ -193,6 +193,21 @@ environment variable holds the agent's process ID.
20 .Pp
21 The agent exits automatically when the command given on the command
22 line terminates.
23+.Pp
24+In Debian,
25+.Nm
26+is installed with the set-group-id bit set, to prevent
27+.Xr ptrace 2
28+attacks retrieving private key material.
29+This has the side-effect of causing the run-time linker to remove certain
30+environment variables which might have security implications for set-id
31+programs, including
32+.Ev LD_PRELOAD ,
33+.Ev LD_LIBRARY_PATH ,
34+and
35+.Ev TMPDIR .
36+If you need to set any of these environment variables, you will need to do
37+so in the program executed by ssh-agent.
38 .Sh FILES
39 .Bl -tag -width Ds
40 .It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt
diff --git a/debian/patches/ssh-argv0.patch b/debian/patches/ssh-argv0.patch
new file mode 100644
index 000000000..614ed8195
--- /dev/null
+++ b/debian/patches/ssh-argv0.patch
@@ -0,0 +1,31 @@
1From ccfb71ca70b73f6d5a2873b31d0140c7cb5f4430 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:10 +0000
4Subject: ssh(1): Refer to ssh-argv0(1)
5
6Old versions of OpenSSH (up to 2.5 or thereabouts) allowed creating symlinks
7to ssh with the name of the host you want to connect to. Debian ships an
8ssh-argv0 script restoring this feature; this patch refers to its manual
9page from ssh(1).
10
11Bug-Debian: http://bugs.debian.org/111341
12Forwarded: not-needed
13Last-Update: 2013-09-14
14
15Patch-Name: ssh-argv0.patch
16---
17 ssh.1 | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/ssh.1 b/ssh.1
21index b1f128c..22e56a7 100644
22--- a/ssh.1
23+++ b/ssh.1
24@@ -1586,6 +1586,7 @@ if an error occurred.
25 .Xr sftp 1 ,
26 .Xr ssh-add 1 ,
27 .Xr ssh-agent 1 ,
28+.Xr ssh-argv0 1 ,
29 .Xr ssh-keygen 1 ,
30 .Xr ssh-keyscan 1 ,
31 .Xr tun 4 ,
diff --git a/debian/patches/ssh-vulnkey-compat.patch b/debian/patches/ssh-vulnkey-compat.patch
new file mode 100644
index 000000000..0492c84fe
--- /dev/null
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -0,0 +1,42 @@
1From e35c0bb4c3997b8ef885c6afdcc600b403eb878b Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:09:50 +0000
4Subject: Accept obsolete ssh-vulnkey configuration options
5
6These options were used as part of Debian's response to CVE-2008-0166.
7Nearly six years later, we no longer need to continue carrying the bulk
8of that patch, but we do need to avoid failing when the associated
9configuration options are still present.
10
11Last-Update: 2014-02-09
12
13Patch-Name: ssh-vulnkey-compat.patch
14---
15 readconf.c | 1 +
16 servconf.c | 1 +
17 2 files changed, 2 insertions(+)
18
19diff --git a/readconf.c b/readconf.c
20index e019195..c0b7822 100644
21--- a/readconf.c
22+++ b/readconf.c
23@@ -194,6 +194,7 @@ static struct {
24 { "passwordauthentication", oPasswordAuthentication },
25 { "kbdinteractiveauthentication", oKbdInteractiveAuthentication },
26 { "kbdinteractivedevices", oKbdInteractiveDevices },
27+ { "useblacklistedkeys", oDeprecated },
28 { "rsaauthentication", oRSAAuthentication },
29 { "pubkeyauthentication", oPubkeyAuthentication },
30 { "dsaauthentication", oPubkeyAuthentication }, /* alias */
31diff --git a/servconf.c b/servconf.c
32index 9b06281..bf9f8f7 100644
33--- a/servconf.c
34+++ b/servconf.c
35@@ -541,6 +541,7 @@ static struct {
36 { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
37 { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
38 { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
39+ { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL },
40 { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
41 { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
42 { "uselogin", sUseLogin, SSHCFG_GLOBAL },
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
new file mode 100644
index 000000000..3e46d03c8
--- /dev/null
+++ b/debian/patches/syslog-level-silent.patch
@@ -0,0 +1,47 @@
1From 21fb55231ad0422fa0e5f0c2f67093cb5f29dd47 Mon Sep 17 00:00:00 2001
2From: Jonathan David Amery <jdamery@ysolde.ucam.org>
3Date: Sun, 9 Feb 2014 16:09:54 +0000
4Subject: "LogLevel SILENT" compatibility
5
6"LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to
7match the behaviour of non-free SSH, in which -q does not suppress fatal
8errors. However, this was unintentionally broken in 1:4.6p1-2 and nobody
9complained, so we've dropped most of it. The parts that remain are basic
10configuration file compatibility, and an adjustment to "Pseudo-terminal will
11not be allocated ..." which should be split out into a separate patch.
12
13Author: Matthew Vernon <matthew@debian.org>
14Author: Colin Watson <cjwatson@debian.org>
15Last-Update: 2013-09-14
16
17Patch-Name: syslog-level-silent.patch
18---
19 log.c | 1 +
20 ssh.c | 2 +-
21 2 files changed, 2 insertions(+), 1 deletion(-)
22
23diff --git a/log.c b/log.c
24index 2b59c42..ffc8ffb 100644
25--- a/log.c
26+++ b/log.c
27@@ -93,6 +93,7 @@ static struct {
28 LogLevel val;
29 } log_levels[] =
30 {
31+ { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */
32 { "QUIET", SYSLOG_LEVEL_QUIET },
33 { "FATAL", SYSLOG_LEVEL_FATAL },
34 { "ERROR", SYSLOG_LEVEL_ERROR },
35diff --git a/ssh.c b/ssh.c
36index 03a23fb..1febb04 100644
37--- a/ssh.c
38+++ b/ssh.c
39@@ -1167,7 +1167,7 @@ main(int ac, char **av)
40 /* Do not allocate a tty if stdin is not a tty. */
41 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
42 options.request_tty != REQUEST_TTY_FORCE) {
43- if (tty_flag)
44+ if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
45 logit("Pseudo-terminal will not be allocated because "
46 "stdin is not a terminal.");
47 tty_flag = 0;
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
new file mode 100644
index 000000000..deee48460
--- /dev/null
+++ b/debian/patches/systemd-readiness.patch
@@ -0,0 +1,84 @@
1From fe97848e044743f0bac019a491ddf0138f84e14a Mon Sep 17 00:00:00 2001
2From: Michael Biebl <biebl@debian.org>
3Date: Mon, 21 Dec 2015 16:08:47 +0000
4Subject: Add systemd readiness notification support
5
6Bug-Debian: https://bugs.debian.org/778913
7Forwarded: no
8Last-Update: 2016-01-04
9
10Patch-Name: systemd-readiness.patch
11---
12 configure.ac | 24 ++++++++++++++++++++++++
13 sshd.c | 9 +++++++++
14 2 files changed, 33 insertions(+)
15
16diff --git a/configure.ac b/configure.ac
17index f822fb3..6cafb15 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -4319,6 +4319,29 @@ AC_ARG_WITH([kerberos5],
21 AC_SUBST([GSSLIBS])
22 AC_SUBST([K5LIBS])
23
24+# Check whether user wants systemd support
25+SYSTEMD_MSG="no"
26+AC_ARG_WITH(systemd,
27+ [ --with-systemd Enable systemd support],
28+ [ if test "x$withval" != "xno" ; then
29+ AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
30+ if test "$PKGCONFIG" != "no"; then
31+ AC_MSG_CHECKING([for libsystemd])
32+ if $PKGCONFIG --exists libsystemd; then
33+ SYSTEMD_CFLAGS=`$PKGCONFIG --cflags libsystemd`
34+ SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
35+ CPPFLAGS="$CPPFLAGS $SYSTEMD_CFLAGS"
36+ SSHDLIBS="$SSHDLIBS $SYSTEMD_LIBS"
37+ AC_MSG_RESULT([yes])
38+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if you want systemd support.])
39+ SYSTEMD_MSG="yes"
40+ else
41+ AC_MSG_RESULT([no])
42+ fi
43+ fi
44+ fi ]
45+)
46+
47 # Looking for programs, paths and files
48
49 PRIVSEP_PATH=/var/empty
50@@ -5121,6 +5144,7 @@ echo " libedit support: $LIBEDIT_MSG"
51 echo " Solaris process contract support: $SPC_MSG"
52 echo " Solaris project support: $SP_MSG"
53 echo " Solaris privilege support: $SPP_MSG"
54+echo " systemd support: $SYSTEMD_MSG"
55 echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
56 echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
57 echo " BSD Auth support: $BSD_AUTH_MSG"
58diff --git a/sshd.c b/sshd.c
59index 837409b..868df9e 100644
60--- a/sshd.c
61+++ b/sshd.c
62@@ -85,6 +85,10 @@
63 #include <prot.h>
64 #endif
65
66+#ifdef HAVE_SYSTEMD
67+#include <systemd/sd-daemon.h>
68+#endif
69+
70 #include "xmalloc.h"
71 #include "ssh.h"
72 #include "ssh1.h"
73@@ -2117,6 +2121,11 @@ main(int ac, char **av)
74 unsetenv("SSH_SIGSTOP");
75 }
76
77+#ifdef HAVE_SYSTEMD
78+ /* Signal systemd that we are ready to accept connections */
79+ sd_notify(0, "READY=1");
80+#endif
81+
82 /* Accept a connection and return in a forked child */
83 server_accept_loop(&sock_in, &sock_out,
84 &newsock, config_s);
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
new file mode 100644
index 000000000..3bd2fd91f
--- /dev/null
+++ b/debian/patches/user-group-modes.patch
@@ -0,0 +1,257 @@
1From 563974a78e937c4844e1198b5f6d79b8b2b5c600 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:09:58 +0000
4Subject: Allow harmless group-writability
5
6Allow secure files (~/.ssh/config, ~/.ssh/authorized_keys, etc.) to be
7group-writable, provided that the group in question contains only the file's
8owner. Rejected upstream for IMO incorrect reasons (e.g. a misunderstanding
9about the contents of gr->gr_mem). Given that per-user groups and umask 002
10are the default setup in Debian (for good reasons - this makes operating in
11setgid directories with other groups much easier), we need to permit this by
12default.
13
14Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060
15Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347
16Last-Update: 2013-09-14
17
18Patch-Name: user-group-modes.patch
19---
20 auth-rhosts.c | 6 ++----
21 auth.c | 9 +++-----
22 misc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
23 misc.h | 2 ++
24 platform.c | 16 --------------
25 readconf.c | 3 +--
26 ssh.1 | 2 ++
27 ssh_config.5 | 2 ++
28 8 files changed, 80 insertions(+), 29 deletions(-)
29
30diff --git a/auth-rhosts.c b/auth-rhosts.c
31index 0ef3447..c17c13c 100644
32--- a/auth-rhosts.c
33+++ b/auth-rhosts.c
34@@ -273,8 +273,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
35 return 0;
36 }
37 if (options.strict_modes &&
38- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
39- (st.st_mode & 022) != 0)) {
40+ !secure_permissions(&st, pw->pw_uid)) {
41 logit("Rhosts authentication refused for %.100s: "
42 "bad ownership or modes for home directory.", pw->pw_name);
43 auth_debug_add("Rhosts authentication refused for %.100s: "
44@@ -300,8 +299,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
45 * allowing access to their account by anyone.
46 */
47 if (options.strict_modes &&
48- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
49- (st.st_mode & 022) != 0)) {
50+ !secure_permissions(&st, pw->pw_uid)) {
51 logit("Rhosts authentication refused for %.100s: bad modes for %.200s",
52 pw->pw_name, buf);
53 auth_debug_add("Bad file modes for %.200s", buf);
54diff --git a/auth.c b/auth.c
55index f56dcc6..3f8b348 100644
56--- a/auth.c
57+++ b/auth.c
58@@ -435,8 +435,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
59 user_hostfile = tilde_expand_filename(userfile, pw->pw_uid);
60 if (options.strict_modes &&
61 (stat(user_hostfile, &st) == 0) &&
62- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
63- (st.st_mode & 022) != 0)) {
64+ !secure_permissions(&st, pw->pw_uid)) {
65 logit("Authentication refused for %.100s: "
66 "bad owner or modes for %.200s",
67 pw->pw_name, user_hostfile);
68@@ -498,8 +497,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
69 snprintf(err, errlen, "%s is not a regular file", buf);
70 return -1;
71 }
72- if ((!platform_sys_dir_uid(stp->st_uid) && stp->st_uid != uid) ||
73- (stp->st_mode & 022) != 0) {
74+ if (!secure_permissions(stp, uid)) {
75 snprintf(err, errlen, "bad ownership or modes for file %s",
76 buf);
77 return -1;
78@@ -514,8 +512,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
79 strlcpy(buf, cp, sizeof(buf));
80
81 if (stat(buf, &st) < 0 ||
82- (!platform_sys_dir_uid(st.st_uid) && st.st_uid != uid) ||
83- (st.st_mode & 022) != 0) {
84+ !secure_permissions(&st, uid)) {
85 snprintf(err, errlen,
86 "bad ownership or modes for directory %s", buf);
87 return -1;
88diff --git a/misc.c b/misc.c
89index 9421b4d..68efb2b 100644
90--- a/misc.c
91+++ b/misc.c
92@@ -51,8 +51,9 @@
93 #include <netdb.h>
94 #ifdef HAVE_PATHS_H
95 # include <paths.h>
96-#include <pwd.h>
97 #endif
98+#include <pwd.h>
99+#include <grp.h>
100 #ifdef SSH_TUN_OPENBSD
101 #include <net/if.h>
102 #endif
103@@ -61,6 +62,7 @@
104 #include "misc.h"
105 #include "log.h"
106 #include "ssh.h"
107+#include "platform.h"
108
109 /* remove newline at end of string */
110 char *
111@@ -708,6 +710,71 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
112 return -1;
113 }
114
115+/*
116+ * return 1 if the specified uid is a uid that may own a system directory
117+ * otherwise 0.
118+ */
119+int
120+platform_sys_dir_uid(uid_t uid)
121+{
122+ if (uid == 0)
123+ return 1;
124+#ifdef PLATFORM_SYS_DIR_UID
125+ if (uid == PLATFORM_SYS_DIR_UID)
126+ return 1;
127+#endif
128+ return 0;
129+}
130+
131+int
132+secure_permissions(struct stat *st, uid_t uid)
133+{
134+ if (!platform_sys_dir_uid(st->st_uid) && st->st_uid != uid)
135+ return 0;
136+ if ((st->st_mode & 002) != 0)
137+ return 0;
138+ if ((st->st_mode & 020) != 0) {
139+ /* If the file is group-writable, the group in question must
140+ * have exactly one member, namely the file's owner.
141+ * (Zero-member groups are typically used by setgid
142+ * binaries, and are unlikely to be suitable.)
143+ */
144+ struct passwd *pw;
145+ struct group *gr;
146+ int members = 0;
147+
148+ gr = getgrgid(st->st_gid);
149+ if (!gr)
150+ return 0;
151+
152+ /* Check primary group memberships. */
153+ while ((pw = getpwent()) != NULL) {
154+ if (pw->pw_gid == gr->gr_gid) {
155+ ++members;
156+ if (pw->pw_uid != uid)
157+ return 0;
158+ }
159+ }
160+ endpwent();
161+
162+ pw = getpwuid(st->st_uid);
163+ if (!pw)
164+ return 0;
165+
166+ /* Check supplementary group memberships. */
167+ if (gr->gr_mem[0]) {
168+ ++members;
169+ if (strcmp(pw->pw_name, gr->gr_mem[0]) ||
170+ gr->gr_mem[1])
171+ return 0;
172+ }
173+
174+ if (!members)
175+ return 0;
176+ }
177+ return 1;
178+}
179+
180 int
181 tun_open(int tun, int mode)
182 {
183diff --git a/misc.h b/misc.h
184index 7c76a6a..42cd95e 100644
185--- a/misc.h
186+++ b/misc.h
187@@ -139,4 +139,6 @@ char *read_passphrase(const char *, int);
188 int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
189 int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
190
191+int secure_permissions(struct stat *st, uid_t uid);
192+
193 #endif /* _MISC_H */
194diff --git a/platform.c b/platform.c
195index 4831706..2ce4dbf 100644
196--- a/platform.c
197+++ b/platform.c
198@@ -199,19 +199,3 @@ platform_krb5_get_principal_name(const char *pw_name)
199 return NULL;
200 #endif
201 }
202-
203-/*
204- * return 1 if the specified uid is a uid that may own a system directory
205- * otherwise 0.
206- */
207-int
208-platform_sys_dir_uid(uid_t uid)
209-{
210- if (uid == 0)
211- return 1;
212-#ifdef PLATFORM_SYS_DIR_UID
213- if (uid == PLATFORM_SYS_DIR_UID)
214- return 1;
215-#endif
216- return 0;
217-}
218diff --git a/readconf.c b/readconf.c
219index 3a6c67b..f6b4c8f 100644
220--- a/readconf.c
221+++ b/readconf.c
222@@ -1753,8 +1753,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
223
224 if (fstat(fileno(f), &sb) == -1)
225 fatal("fstat %s: %s", filename, strerror(errno));
226- if (((sb.st_uid != 0 && sb.st_uid != getuid()) ||
227- (sb.st_mode & 022) != 0))
228+ if (!secure_permissions(&sb, getuid()))
229 fatal("Bad owner or permissions on %s", filename);
230 }
231
232diff --git a/ssh.1 b/ssh.1
233index 4011c65..feef81a 100644
234--- a/ssh.1
235+++ b/ssh.1
236@@ -1484,6 +1484,8 @@ The file format and configuration options are described in
237 .Xr ssh_config 5 .
238 Because of the potential for abuse, this file must have strict permissions:
239 read/write for the user, and not writable by others.
240+It may be group-writable provided that the group in question contains only
241+the user.
242 .Pp
243 .It Pa ~/.ssh/environment
244 Contains additional definitions for environment variables; see
245diff --git a/ssh_config.5 b/ssh_config.5
246index efc265a..5dd26bc 100644
247--- a/ssh_config.5
248+++ b/ssh_config.5
249@@ -1903,6 +1903,8 @@ The format of this file is described above.
250 This file is used by the SSH client.
251 Because of the potential for abuse, this file must have strict permissions:
252 read/write for the user, and not accessible by others.
253+It may be group-writable provided that the group in question contains only
254+the user.
255 .It Pa /etc/ssh/ssh_config
256 Systemwide configuration file.
257 This file provides defaults for those
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 000000000..c619f3451
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
[type: gettext/rfc822deb] openssh-server.templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 000000000..d01e0ffdc
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,55 @@
1# Czech PO debconf template translation of openssh.
2# Copyright (C) 2014 Michal Simunek <michal.simunek@gmail.com>
3# This file is distributed under the same license as the openssh package.
4# Michal Simunek <michal.simunek@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh 1:6.6p1-1\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-06-12 12:25+0200\n"
12"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
13"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
14"Language: cs\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=utf-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "Zakázat ověřování heslem pro uživatele root?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin prohibit-password\", which disables password "
32"authentication for root without breaking systems that have explicitly "
33"configured SSH public key authentication for root."
34msgstr ""
35"Předchozí verze openssh-server dovolovala přihlašovat se přes SSH jako root "
36"pomocí ověřování heslem. Výchozí volba pro nové instalace je nyní "
37"\"PermitRootLogin prohibit-password\", která zakazuje ověřování heslem pro "
38"uživatele root, aniž by to omezilo systémy, které mají explicitně nastaveno "
39"ověřování veřejným SSH klíčem pro uživatele root."
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"Tato změna činí systémy zabezpečenějšími proti útokům hrubou silou na heslo "
52"uživatele root pomocí slovníku (velmi častý cíl útoků). Nicméně, to může "
53"poškodit systémy, které jsou nastaveny s předpokladem, že bude možné se "
54"přihlašovat přes SSH jako root pomocí ověřování heslem. Změnu této volby "
55"byste měli provést pouze pokud ověřování heslem potřebujete."
diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644
index 000000000..70d576d7b
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,55 @@
1# Danish translation openssh.
2# Copyright (C) 2014 openssh og nedenstående oversættere.
3# This file is distributed under the same license as the openssh package.
4# Joe Hansen <joedalton2@yahoo.dk>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-21 23:51+0200\n"
12"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
13"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
14"Language: da\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "Deaktiver SSH-adgangskodegodkendelse for root?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin prohibit-password\", which disables password "
32"authentication for root without breaking systems that have explicitly "
33"configured SSH public key authentication for root."
34msgstr ""
35"Tidligere versioner af openssh-server tillod indlogning som root over SSH "
36"med brug af adgangskodegodkendelse. Standarden for nye installationer er nu "
37"»PermitRootLogin prohibit-password«, som deaktiverer adgangskodegodkendelse "
38"for root uden at ødelægge systemer, som eksplicit har konfigureret SSH-"
39"offentlig nøglegodkendelse for root."
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"Denne ændring gør systemer mere sikre mod brute-force angreb vis ordlister "
52"med adgangskoder på root-brugeren (et meget ofte mål for sådanne angreb). "
53"Det kan dog ødelægge systemer, som er opsat med forventning om at kunne SSH "
54"som root via brug af adgangskodegodkendelse. Du skal kun lave denne ændring, "
55"hvis du ikke har brug for dette."
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 000000000..ecba54b6c
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,61 @@
1# openssh.
2# Copyright (C) 2014 Colin Watson
3# Copyright (C) 2014 Stephan Beck
4# This file is distributed under the same license as the openssh package.
5# Stephan Beck <sbeck@mailbox.org>, 2014.
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh_1:6.6p1-1\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-03-24 22:21+0100\n"
13"Last-Translator: Stephan Beck <sbeck@mailbox.org>\n"
14"Language-Team: Debian German translation team <debian-l10n-german@lists."
15"debian.org>\n"
16"Language: de\n"
17"MIME-Version: 1.0\n"
18"Content-Type: text/plain; charset=UTF-8\n"
19"Content-Transfer-Encoding: 8bit\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "SSH Passwort-Authentifizierung für »root« deaktivieren?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Vorherige Versionen von openssh-server erlaubten das Anmelden als »root« "
38"über SSH unter Verwendung von Passwort-Authentifizierung. Die "
39"Standardeinstellung für Neuinstallationen lautet nun »PermitRootLogin "
40"prohibit-password«, wodurch die Passwort-Authentifizierung für »root« "
41"deaktiviert wird, und Systeme dennoch funktionsfähig bleiben, bei denen "
42"ausdrücklich die Authentifizierung als »root« mittels öffentlichem SSH-"
43"Schlüssel konfiguriert ist."
44
45#. Type: boolean
46#. Description
47#: ../openssh-server.templates:1001
48msgid ""
49"This change makes systems more secure against brute-force password "
50"dictionary attacks on the root user (a very common target for such attacks). "
51"However, it may break systems that are set up with the expectation of being "
52"able to SSH as root using password authentication. You should only make this "
53"change if you do not need to do that."
54msgstr ""
55"Diese Änderung sichert Systeme besser gegen jene Angriffe auf den Benutzer "
56"»root« (ein verbreitetes Ziel solcher Angriffe) ab, die das Passwort durch "
57"simples Ausprobieren aller Einträge von Wörterbüchern zu erraten versuchen. "
58"Sie kann allerdings dazu führen, dass Systeme nicht mehr funktionieren, die "
59"in der Absicht konfiguriert wurden, die Anmeldung als »root« über SSH unter "
60"Verwendung von Passwort-Authentifizierung zuzulassen. Sie sollten diese "
61"Änderung nur vornehmen, wenn Sie auf Letzteres verzichten können."
diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 000000000..de8a67ace
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,80 @@
1# openssh po-debconf translation to Spanish
2# Copyright (C) 2014 Software in the Public Interest
3# This file is distributed under the same license as the openssh package.
4#
5# Changes:
6# - Initial translation
7# Matías A. Bellone <matiasbellone+debian@gmail.com>, 2014
8#
9# Traductores, si no conocen el formato PO, merece la pena leer la
10# de gettext, especialmente las secciones dedicadas a este
11# formato, por ejemplo ejecutando:
12# info -n '(gettext)PO Files'
13# info -n '(gettext)Header Entry'
14#
15# Equipo de traducción al español, por favor, lean antes de traducir
16# los siguientes documentos:
17#
18# - El proyecto de traducción de Debian al español
19# http://www.debian.org/intl/spanish/
20# especialmente las notas de traducción en
21# http://www.debian.org/intl/spanish/notas
22#
23# - La guía de traducción de po's de debconf:
24# /usr/share/doc/po-debconf/README-trans
25# o http://www.debian.org/intl/l10n/po-debconf/README-trans
26#
27msgid ""
28msgstr ""
29"Project-Id-Version: openssh\n"
30"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
31"POT-Creation-Date: 2014-03-20 02:06+0000\n"
32"PO-Revision-Date: 2014-03-23 20:43-0300\n"
33"Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
34"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
35"Language: es\n"
36"MIME-Version: 1.0\n"
37"Content-Type: text/plain; charset=UTF-8\n"
38"Content-Transfer-Encoding: 8bit\n"
39
40#. Type: boolean
41#. Description
42#: ../openssh-server.templates:1001
43msgid "Disable SSH password authentication for root?"
44msgstr ""
45"¿Desea desactivar la autenticación SSH mediante contraseña para el usuario "
46"root?"
47
48#. Type: boolean
49#. Description
50#: ../openssh-server.templates:1001
51msgid ""
52"Previous versions of openssh-server permitted logging in as root over SSH "
53"using password authentication. The default for new installations is now "
54"\"PermitRootLogin prohibit-password\", which disables password "
55"authentication for root without breaking systems that have explicitly "
56"configured SSH public key authentication for root."
57msgstr ""
58"Las versiones anteriores de openssh-server permitían iniciar sesión como "
59"usuario root utilizando autenticación con contraseña. La configuración "
60"predeterminada para las nuevas instalaciones ahora incluye «PermitRootLogin "
61"prohibit-password», lo que desactiva la autenticación con contraseña para el "
62"usuario root sin romper los sistemas que tienen configurado explícitamente "
63"la autenticación SSH utilizando claves públicas para el usuario root."
64
65#. Type: boolean
66#. Description
67#: ../openssh-server.templates:1001
68msgid ""
69"This change makes systems more secure against brute-force password "
70"dictionary attacks on the root user (a very common target for such attacks). "
71"However, it may break systems that are set up with the expectation of being "
72"able to SSH as root using password authentication. You should only make this "
73"change if you do not need to do that."
74msgstr ""
75"Este cambio hace que los sistemas sean más resistentes contra ataques de "
76"fuerza bruta basados en diccionarios sobre el usuario root (un objetivo muy "
77"común para este tipo de ataques). Sin embargo, podría romper sistemas cuya "
78"configuración permite que el usuario root inicie sesión a través de SSH "
79"utilizando una contraseña. Sólo debería realizar este cambio si no necesita "
80"este comportamiento."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 000000000..f7125e9a3
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,59 @@
1# Translation of openssh debconf template to French
2# Copyright (C) 2014
3# This file is distributed under the same license as the openssh package.
4# Étienne Gilli <etienne.gilli@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh_1:6.5p1-6\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-22 08:26+0100\n"
12"Last-Translator: Étienne Gilli <etienne.gilli@gmail.com>\n"
13"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
14"Language: fr\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr ""
24"Désactiver l’authentification SSH par mot de passe pour le superutilisateur ?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36"Les versions précédentes du paquet openssh-server autorisaient la connexion "
37"par SSH du superutilisateur (root) en utilisant l’authentification par mot "
38"de passe. Par défaut, les nouvelles installations ont maintenant l’option "
39"« PermitRootLogin prohibit-password », qui désactive l’authentification par "
40"mot de passe pour le compte « root », sans casser les systèmes qui ont "
41"configuré explicitement l’authentification SSH par clé publique pour ce "
42"compte."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Cette modification rend les systèmes plus robustes face aux attaques par "
55"force brute et par dictionnaire contre le superutilisateur (très souvent "
56"pris pour cible par ce type d’attaque). Cependant, cela peut rendre "
57"inutilisables les systèmes reposant sur la possibilité de se connecter au "
58"compte « root » par SSH avec authentification par mot de passe. Vous ne "
59"devriez appliquer cette modification que si ce n’est pas votre cas."
diff --git a/debian/po/it.po b/debian/po/it.po
new file mode 100644
index 000000000..dd7106090
--- /dev/null
+++ b/debian/po/it.po
@@ -0,0 +1,58 @@
1# Italian translation of openssh debconf messages.
2# Copyright (C) 2014, openssh package copyright holder
3# This file is distributed under the same license as the openssh package.
4# Beatrice Torracca <beatricet@libero.it>, 2014.
5msgid ""
6msgstr ""
7"Project-Id-Version: openssh\n"
8"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
9"POT-Creation-Date: 2014-03-20 02:06+0000\n"
10"PO-Revision-Date: 2014-03-28 11:12+0200\n"
11"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
12"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
13"Language: it\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18"X-Generator: Virtaal 0.7.1\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr "Disabilitare l'autenticazione SSH con password per root?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36"Le versioni precedenti di openssh-server permettevano il login come root via "
37"SSH, usando l'autenticazione con password. Il comportamento predefinito "
38"delle nuove installazioni è «PermitRootLogin prohibit-password» che "
39"disabilita l'autenticazione con password per root, senza rendere non "
40"funzionanti sistemi che hanno esplicitamente configurato l'autenticazione "
41"SSH con chiave pubblica per root."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Questo cambiamento rende i sistemi più al sicuro da attacchi di forza bruta "
54"a dizionario sulle password per l'utente root (un obiettivo molto comune per "
55"tali attacchi). Tuttavia, può rendere non funzionanti sistemi che sono "
56"impostati facendo affidamento sulla possibilità di autenticazione SSH come "
57"root usando la password. Si dovrebbe fare questo cambiamento solo se non si "
58"ha bisogno di tale comportamento."
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 000000000..db382f19a
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,55 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# victory <victory.deb@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-20 11:06+0900\n"
12"Last-Translator: victory <victory.deb@gmail.com>\n"
13"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
14"Language: ja\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "root での SSH パスワード認証を無効にしますか?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin prohibit-password\", which disables password "
32"authentication for root without breaking systems that have explicitly "
33"configured SSH public key authentication for root."
34msgstr ""
35"openssh-server の以前のバージョンではパスワード認証を利用した SSH 経由の "
36"root のログインを許可していました。新しくインストールした場合のデフォルト値が"
37"現在は「PermitRootLogin prohibit-password」になり、root のパスワード認証を無"
38"効化しますが SSH の公開鍵認証を root 用に明示的に設定しているシステムでは特に"
39"問題はありません。"
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"この変更によりシステムは root ユーザ (こういった攻撃ではとても一般的な攻撃対"
52"象です) へのブルートフォースによるパスワード辞書攻撃に対してはより安全になり"
53"ます。しかしパスワード認証により root で SSH 接続できることを前提として構成し"
54"たシステムでは問題が発生する可能性があります。そういった必要のない場合にのみ"
55"この変更を行うようにしてください。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 000000000..3afd6171e
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,60 @@
1# Dutch translation of openssh debconf templates.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-10-03 23:54+0200\n"
12"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
13"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
14"Language: nl\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr ""
25"Wachtwoordauthenticatie over SSH voor de systeembeheerder uitschakelen?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Eerdere versies van de openssh-server lieten de systeembeheerder toe om zich "
38"over SSH te authenticeren met een wachtwoord. Voor nieuwe installaties is de "
39"standaard nu \"PermitRootLogin prohibit-password\". Deze standaardinstelling "
40"maakt het voor de systeembeheerder onmogelijk om zich via een wachtwoord te "
41"authenticeren. Deze instelling heeft geen impact op systemen waarbij de SSH-"
42"configuratie expliciet vereist dat de systeembeheerder zich authenticeert "
43"via een publieke sleutel."
44
45#. Type: boolean
46#. Description
47#: ../openssh-server.templates:1001
48msgid ""
49"This change makes systems more secure against brute-force password "
50"dictionary attacks on the root user (a very common target for such attacks). "
51"However, it may break systems that are set up with the expectation of being "
52"able to SSH as root using password authentication. You should only make this "
53"change if you do not need to do that."
54msgstr ""
55"Deze wijziging maakt systemen veiliger tegenover aanvallen met brute kracht "
56"(met een wachtwoordenwoordenboek) op de systeembeheerder, een zeer courant "
57"doelwit voor zulke aanvallen. Maar het kan systemen onbruikbaar maken die "
58"ingesteld werden vanuit de verwachting dat de systeembeheerder SSH kan "
59"gebruiken met authenticatie via wachtwoord. Enkel wanneer u dit laatste niet "
60"nodig heeft, zou u deze wijziging kunnen doorvoeren."
diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 000000000..2dab84ccf
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,59 @@
1# Translation of openssh's debconf messages to European Portuguese
2# Copyright (C) 2014 YEAR THE openssh'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4#
5# Américo Monteiro <a_monteiro@gmx.com>, 2014.
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh 1:6.6p1-1\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-21 21:13+0000\n"
12"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
13"Language-Team: Portuguese <traduz@debianpt.org>\n"
14"Language: pt\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19"X-Generator: Lokalize 1.4\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Desactivar a autenticação SSH por palavra passe para o root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"As versões anteriores do servidor openssh permitiam iniciar sessão como root "
38"sobre SSH usando autenticação por palavra-passe. A predefinição para novas "
39"instalações é agora \"PermitRootLogin prohibit-password\", a qual desactiva "
40"a autenticação por palavra-passe para o root sem danificar os sistemas que "
41"têm configurados explicitamente autenticação SSH por chave pública para o "
42"root."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Esta alteração torna os sistemas mais seguros contra ataques em que se "
55"forçam dicionários de palavras-passe no utilizador root (um alvo muito comum "
56"para tais ataques). No entanto, pode danificar sistemas que estão "
57"configurados com a expectativa de serem capazes de SSH como root usando "
58"autenticação por palavra-passe. Apenas deverá fazer esta alteração se não "
59"precisa de tal método de autenticação."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644
index 000000000..99b1182f1
--- /dev/null
+++ b/debian/po/pt_BR.po
@@ -0,0 +1,57 @@
1# Debconf translations for openssh.
2# Copyright (C) 2014 THE openssh'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# José de Figueiredo <deb.gnulinux@gmail.com>, 2014.
5#
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-11-23 23:49-0200\n"
13"Last-Translator: José de Figueiredo <deb.gnulinux@gmail.com>\n"
14"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
15"org>\n"
16"Language: pt_BR\n"
17"MIME-Version: 1.0\n"
18"Content-Type: text/plain; charset=UTF-8\n"
19"Content-Transfer-Encoding: 8bit\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Desabilitar autenticação por senha do SSH para root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Versões anteriores do openssh-server permitiam login como root sobre SSH "
38"usando autenticação por senha. O padrão para as novas instalações agora é "
39"\"PermitRootLogin prohibit-password\", que desabilita a autenticação por "
40"senha para root sem quebrar sistemas que tenham configurado explicitamente o "
41"SSH para autenticação por chave pública para root."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Esta alteração torna sistemas mais seguros contra ataques de força bruta por "
54"dicionário de senhas no usuário root (um alvo muito comum destes ataques). "
55"Entretanto, ela pode quebrar sistemas que foram configurados com a "
56"expectativa de acesso SSH com root usando autenticação por senha. Você deve "
57"fazer esta mudança somente se você não precisa fazer isso."
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 000000000..f2e1dafc4
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,57 @@
1# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
2# This file is distributed under the same license as the openssh package.
3#
4# Yuri Kozlov <yuray@komyakino.ru>, 2014.
5msgid ""
6msgstr ""
7"Project-Id-Version: openssh 1:6.6p1-1\n"
8"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
9"POT-Creation-Date: 2014-03-20 02:06+0000\n"
10"PO-Revision-Date: 2014-03-22 10:04+0400\n"
11"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
12"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
13"Language: ru\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
18"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19"X-Generator: Lokalize 1.4\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Выключить в SSH аутентификацию по паролю для root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"В предыдущих версиях openssh-server разрешён вход с правами пользователя "
38"root через SSH с помощью аутентификации по паролю. При новых установках по "
39"умолчанию теперь используется настройка «PermitRootLogin prohibit-password», "
40"которая отключает аутентификацию по паролю для root, что не вредит системам, "
41"у которых в SSH для root настроена аутентификация по открытому ключу."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Это изменение делает системы более стойкими к атакам методом перебора "
54"словарных паролей для пользователя root (самая распространённая цель таких "
55"атак). Однако, это вредит системам, в которых специально настроен вход для "
56"root по SSH с парольной аутентификацией. Если это не ваш случай, то ответьте "
57"утвердительно."
diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 000000000..278b0ccbf
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,58 @@
1# Swedish translations for openssh package
2# Svenska översättningar för paket openssh.
3# Copyright (C) 2014 THE openssh'S COPYRIGHT HOLDER
4# This file is distributed under the same license as the openssh package.
5# Andreas Rönnquist <gusnan@gusnan.se>, 2014.
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-03-21 21:36+0100\n"
13"Last-Translator: Andreas Rönnquist <gusnan@gusnan.se>\n"
14"Language-Team: Swedish\n"
15"Language: sv\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=2; plural=(n != 1);\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Inaktivera SSH-lösenordsautentisering för root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Tidigare versioner av openssh-server tillät inloggning som root över SSH med "
38"hjälp av lösenordsautentisering. Standardinställningen för nya "
39"installationer är nu \"PermitRootLogin prohibit-password\", vilket "
40"inaktiverar lösenordsautentisering för root utan att förstöra system som "
41"explicit har konfigurerat nyckelautentisering med hjälp av publika nycklar "
42"för root."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Denna förändring gör system säkrare mot brute-force-angrepp med hjälp av "
55"ordlistor med lösenord på root-användaren (ett väldigt vanligt mål för "
56"sådana angrepp). Dock så kan detta förstöra system som förväntas kunna "
57"använda SSH som root med hjälp av lösenordsautentisering. Du skall endast "
58"göra denna förändring om du inte har ett behov av att kunna göra detta."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 000000000..47c9e3686
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,46 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr ""
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36
37#. Type: boolean
38#. Description
39#: ../openssh-server.templates:1001
40msgid ""
41"This change makes systems more secure against brute-force password "
42"dictionary attacks on the root user (a very common target for such attacks). "
43"However, it may break systems that are set up with the expectation of being "
44"able to SSH as root using password authentication. You should only make this "
45"change if you do not need to do that."
46msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
new file mode 100644
index 000000000..1ada04101
--- /dev/null
+++ b/debian/po/tr.po
@@ -0,0 +1,58 @@
1# Turkish translation of openssh package
2# Copyright (C) 2014 Mert Dirik
3# This file is distributed under the same license as the openssh package.
4# Mert Dirik <mertdirik@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh-server\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-08-01 14:44+0200\n"
12"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
13"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Generator: Poedit 1.5.4\n"
18"Language: tr\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr "root kullanıcısının parola ile kimlik doğrulaması engellensin mi?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36"openssh-server'ın önceki sürümleri parola ile kimlik doğrulama kullanılarak "
37"root kullanıcısının SSH üzerinden oturum açmasına izin veriyordu. Artık yeni "
38"kurulumların öntanımlı ayarı \"PermitRootLogin prohibit-password\" "
39"şeklindedir. Bu ayar root kullanıcısının parola kullanarak oturum açmasını "
40"yasaklar. SSH genel anahtar doğrulama yöntemine ayrıca izin veren mevcut "
41"sistemler bu ayardan etkilenmez."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Bu ayar sistemleri kaba kuvvet sözlükten parola saldırılarına karşı güvenli "
54"hale getirir (root kullanıcısı bu tarz saldırıların en büyük "
55"hedeflerindendir). Fakat bu ayarın etkinleştirilmesi, root kullanıcısına "
56"parola doğrulama yöntemiyle oturum açılabileceği varsayımıyla hareket eden "
57"sistemlerde eskiden çalışan düzenin bozulmasına sebep olacaktır. Bu "
58"değişikliği yalnızca sorun çıkarmayacağından eminseniz yapın."
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000000000..3a8c86cdc
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,250 @@
1#!/usr/bin/make -f
2
3# Uncomment this to turn on verbose mode.
4# export DH_VERBOSE=1
5
6# This has to be exported to make some magic below work.
7export DH_OPTIONS
8
9ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
10 RUN_TESTS := yes
11else
12 RUN_TESTS :=
13endif
14
15ifeq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
16 PARALLEL :=
17else
18 PARALLEL := \
19 -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
20endif
21
22DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
23DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
24DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
25
26ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
27 CC := gcc
28 PKG_CONFIG = pkg-config
29else
30 CC := $(DEB_HOST_GNU_TYPE)-gcc
31 PKG_CONFIG = $(DEB_HOST_GNU_TYPE)-pkg-config
32 RUN_TESTS :=
33endif
34
35DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
36
37# Take account of old dpkg-architecture output.
38ifeq ($(DEB_HOST_ARCH_OS),)
39 DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
40 ifeq ($(DEB_HOST_ARCH_OS),gnu)
41 DEB_HOST_ARCH_OS := hurd
42 endif
43endif
44
45# Change the version string to reflect distribution
46DISTRIBUTION := $(shell dpkg-vendor --query vendor)
47SSH_EXTRAVERSION := $(DISTRIBUTION)-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
48
49DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi)
50ifeq ($(DISTRIBUTOR),Ubuntu)
51DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
52else
53DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/games
54endif
55SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
56
57ifeq ($(DISTRIBUTOR),Ubuntu)
58server_recommends := ssh-import-id
59else
60server_recommends :=
61endif
62
63# Common path configuration.
64confflags += --sysconfdir=/etc/ssh
65confflags += --libexecdir=\$${prefix}/lib/openssh
66
67# Common build options.
68confflags += --disable-strip
69confflags += --with-mantype=doc
70confflags += --with-4in6
71confflags += --with-privsep-path=/var/run/sshd
72
73# The Hurd needs libcrypt for res_query et al.
74ifeq ($(DEB_HOST_ARCH_OS),hurd)
75confflags += --with-libs=-lcrypt
76endif
77
78# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
79ifeq ($(DEB_HOST_ARCH),hppa)
80confflags += --without-hardening
81endif
82
83# Everything above here is common to the deb and udeb builds.
84confflags_udeb := $(confflags)
85
86# Options specific to the deb build.
87confflags += --with-tcp-wrappers
88confflags += --with-pam
89confflags += --with-libedit
90confflags += --with-kerberos5=/usr
91confflags += --with-ssl-engine
92ifeq ($(DEB_HOST_ARCH_OS),linux)
93confflags += --with-selinux
94confflags += --with-audit=linux
95confflags += --with-systemd
96endif
97
98# The deb build wants xauth; the udeb build doesn't.
99confflags += --with-xauth=/usr/bin/xauth
100confflags_udeb += --without-xauth
101
102# Default paths. The udeb build has /usr/games removed.
103confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH)
104confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
105
106# Compiler flags.
107export DEB_BUILD_MAINT_OPTIONS := hardening=+all
108include /usr/share/dpkg/buildflags.mk
109cflags := $(CPPFLAGS) $(CFLAGS)
110cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT
111cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
112cflags_udeb := -Os
113cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
114confflags += --with-cflags='$(cflags)'
115confflags_udeb += --with-cflags='$(cflags_udeb)'
116
117# Linker flags.
118confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))'
119confflags_udeb += --with-ldflags='-Wl,--as-needed'
120
121%:
122 dh $@ --with=autoreconf,systemd
123
124autoreconf:
125 autoreconf -f -i
126 cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
127
128override_dh_autoreconf-arch:
129 dh_autoreconf debian/rules -- autoreconf
130
131override_dh_autoreconf-indep:
132
133override_dh_auto_configure-arch:
134 dh_auto_configure -Bbuild-deb -- $(confflags)
135 dh_auto_configure -Bbuild-deb-ssh1 -- $(confflags) --with-ssh1
136 dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
137
138override_dh_auto_configure-indep:
139
140override_dh_auto_build-arch:
141 # Avoid libnsl linkage. Ugh.
142 perl -pi -e 's/ +-lnsl//' build-udeb/config.status
143 cd build-udeb && ./config.status
144
145 $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
146 $(MAKE) -C build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen
147 $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
148
149 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
150
151override_dh_auto_build-indep:
152
153override_dh_auto_test-arch:
154ifeq ($(RUN_TESTS),yes)
155 $(MAKE) -C build-deb regress-prep
156 $(MAKE) -C build-deb $(PARALLEL) \
157 regress/unittests/sshbuf/test_sshbuf \
158 regress/unittests/sshkey/test_sshkey \
159 regress/unittests/bitmap/test_bitmap \
160 regress/unittests/hostkeys/test_hostkeys \
161 regress/unittests/kex/test_kex
162 $(MAKE) -C build-deb/regress \
163 .OBJDIR="$(CURDIR)/build-deb/regress" \
164 .CURDIR="$(CURDIR)/regress" \
165 unit
166 $(MAKE) -C build-deb compat-tests
167 $(MAKE) -C debian/keygen-test
168endif
169
170override_dh_auto_test-indep:
171
172override_dh_auto_clean:
173 rm -rf build-deb build-deb-ssh1 build-udeb
174ifeq ($(RUN_TESTS),yes)
175 $(MAKE) -C debian/keygen-test clean
176endif
177 $(MAKE) -C contrib clean
178 (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
179 > debian/copyright
180
181override_dh_auto_install-arch:
182 $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
183
184override_dh_auto_install-indep:
185
186override_dh_install-arch:
187 rm -f debian/tmp/etc/ssh/sshd_config
188
189 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
190 dh_install -popenssh-client-udeb -popenssh-server-udeb \
191 --sourcedir=build-udeb
192
193 # Remove version control tags to avoid unnecessary conffile
194 # resolution steps for administrators.
195 sed -i '/\$$OpenBSD:/d' \
196 debian/openssh-client/etc/ssh/moduli \
197 debian/openssh-client/etc/ssh/ssh_config
198
199# We'd like to use dh_install --fail-missing here, but that doesn't work
200# well in combination with dh-exec: it complains that files generated by
201# dh-exec for architecture-dependent packages aren't installed.
202override_dh_install-indep:
203 rm -f debian/tmp/etc/ssh/sshd_config
204 dh_install
205
206override_dh_installdocs:
207 dh_installdocs \
208 -Nopenssh-client-ssh1 -Nopenssh-server -Nopenssh-sftp-server
209 dh_installdocs \
210 -popenssh-client-ssh1 -popenssh-server -popenssh-sftp-server \
211 --link-doc=openssh-client
212 # Avoid breaking dh_installexamples later.
213 mkdir -p debian/openssh-server/usr/share/doc/openssh-client
214
215override_dh_systemd_enable:
216 dh_systemd_enable -popenssh-server --name ssh ssh.service
217 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
218
219override_dh_installinit:
220 dh_installinit -R --name ssh
221
222debian/openssh-server.sshd.pam: debian/openssh-server.sshd.pam.in
223ifeq ($(DEB_HOST_ARCH_OS),linux)
224 sed 's/^@IF_KEYINIT@//' $< > $@
225else
226 sed '/^@IF_KEYINIT@/d' $< > $@
227endif
228
229override_dh_installpam: debian/openssh-server.sshd.pam
230 dh_installpam --name sshd
231
232override_dh_fixperms-arch:
233 dh_fixperms
234 chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign
235
236# Tighten libssl dependencies to match the check in entropy.c.
237override_dh_shlibdeps:
238 dh_shlibdeps
239 debian/adjust-openssl-dependencies
240
241override_dh_gencontrol:
242 dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'
243
244override_dh_builddeb:
245 dh_builddeb -- -Zxz
246
247debian/faq.html:
248 wget -O - http://www.openssh.com/faq.html | \
249 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.com/\2,g' \
250 > debian/faq.html
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 000000000..df5790e2e
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
debian/ssh-askpass-gnome.png
diff --git a/debian/ssh-agent.user-session.upstart b/debian/ssh-agent.user-session.upstart
new file mode 100644
index 000000000..672d2a0de
--- /dev/null
+++ b/debian/ssh-agent.user-session.upstart
@@ -0,0 +1,7 @@
1description "SSH Agent"
2author "Stéphane Graber <stgraber@ubuntu.com>"
3
4start on starting xsession-init
5
6exec /usr/lib/openssh/agent-launch start
7post-stop exec /usr/lib/openssh/agent-launch stop
diff --git a/debian/ssh-argv0 b/debian/ssh-argv0
new file mode 100644
index 000000000..37506a4d7
--- /dev/null
+++ b/debian/ssh-argv0
@@ -0,0 +1,31 @@
1#! /bin/sh
2set -e
3
4# Copyright (c) 2001 Jonathan Amery.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:
9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright
12# notice, this list of conditions and the following disclaimer in the
13# documentation and/or other materials provided with the distribution.
14#
15# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
16# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25
26if [ "${0##*/}" = "ssh-argv0" ]
27then
28 echo 'ssh-argv0: This script should not be run like this, see ssh-argv0(1) for details' 1>&2
29 exit 1
30fi
31exec ssh "${0##*/}" "$@"
diff --git a/debian/ssh-argv0.1 b/debian/ssh-argv0.1
new file mode 100644
index 000000000..a36a63d40
--- /dev/null
+++ b/debian/ssh-argv0.1
@@ -0,0 +1,64 @@
1.Dd September 7, 2001
2.Dt SSH-ARGV0 1
3.Os Debian Project
4.Sh NAME
5.Nm ssh-argv0
6.Nd replaces the old ssh command-name as hostname handling
7.Sh SYNOPSIS
8.Ar hostname | user@hostname
9.Op Fl l Ar login_name
10.Op Ar command
11.Pp
12.Ar hostname | user@hostname
13.Op Fl afgknqstvxACNTX1246
14.Op Fl b Ar bind_address
15.Op Fl c Ar cipher_spec
16.Op Fl e Ar escape_char
17.Op Fl i Ar identity_file
18.Op Fl l Ar login_name
19.Op Fl m Ar mac_spec
20.Op Fl o Ar option
21.Op Fl p Ar port
22.Op Fl F Ar configfile
23.Oo Fl L Xo
24.Sm off
25.Ar port :
26.Ar host :
27.Ar hostport
28.Sm on
29.Xc
30.Oc
31.Oo Fl R Xo
32.Sm off
33.Ar port :
34.Ar host :
35.Ar hostport
36.Sm on
37.Xc
38.Oc
39.Op Fl D Ar port
40.Op Ar command
41.Sh DESCRIPTION
42.Nm
43replaces the old ssh command-name as hostname handling.
44If you link to this script with a hostname then executing the link is
45equivalent to having executed ssh with that hostname as an argument.
46All other arguments are passed to ssh and will be processed normally.
47.Sh OPTIONS
48See
49.Xr ssh 1 .
50.Sh FILES
51See
52.Xr ssh 1 .
53.Sh AUTHORS
54OpenSSH is a derivative of the original and free
55ssh 1.2.12 release by Tatu Ylonen.
56Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
57Theo de Raadt and Dug Song
58removed many bugs, re-added newer features and
59created OpenSSH.
60Markus Friedl contributed the support for SSH
61protocol versions 1.5 and 2.0.
62Jonathan Amery wrote this ssh-argv0 script and the associated documentation.
63.Sh SEE ALSO
64.Xr ssh 1
diff --git a/debian/ssh-askpass-gnome.copyright b/debian/ssh-askpass-gnome.copyright
new file mode 100644
index 000000000..4a71dda00
--- /dev/null
+++ b/debian/ssh-askpass-gnome.copyright
@@ -0,0 +1,44 @@
1This package contains a Gnome based implementation of ssh-askpass
2written by Damien Miller.
3
4It is split out from the main package to isolate the dependency on the
5Gnome and X11 libraries.
6
7It was packaged for Debian by Philip Hands <phil@hands.com>.
8
9Copyright:
10
11/*
12**
13** GNOME ssh passphrase requestor
14**
15** Damien Miller <djm@ibs.com.au>
16**
17** Copyright 1999 Internet Business Solutions
18**
19** Permission is hereby granted, free of charge, to any person
20** obtaining a copy of this software and associated documentation
21** files (the "Software"), to deal in the Software without
22** restriction, including without limitation the rights to use, copy,
23** modify, merge, publish, distribute, sublicense, and/or sell copies
24** of the Software, and to permit persons to whom the Software is
25** furnished to do so, subject to the following conditions:
26**
27** The above copyright notice and this permission notice shall be
28** included in all copies or substantial portions of the Software.
29**
30** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
31** KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
32** WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
33** AND NONINFRINGEMENT. IN NO EVENT SHALL DAMIEN MILLER OR INTERNET
34** BUSINESS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
35** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
36** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
37** OR OTHER DEALINGS IN THE SOFTWARE.
38**
39** Except as contained in this notice, the name of Internet Business
40** Solutions shall not be used in advertising or otherwise to promote
41** the sale, use or other dealings in this Software without prior
42** written authorization from Internet Business Solutions.
43**
44*/
diff --git a/debian/ssh-askpass-gnome.desktop b/debian/ssh-askpass-gnome.desktop
new file mode 100644
index 000000000..eba7a67d1
--- /dev/null
+++ b/debian/ssh-askpass-gnome.desktop
@@ -0,0 +1,12 @@
1[Desktop Entry]
2Version=1.0
3Encoding=UTF-8
4Name=SSH AskPass
5GenericName=ssh-add
6Comment=Enter passphrase to authenticate to the ssh agent
7Exec=/usr/bin/ssh-add
8TryExec=ssh-add
9Terminal=false
10Type=Application
11Icon=ssh-askpass-gnome
12Categories=Network;Security;
diff --git a/debian/ssh-askpass-gnome.examples b/debian/ssh-askpass-gnome.examples
new file mode 100644
index 000000000..66fd8c0e4
--- /dev/null
+++ b/debian/ssh-askpass-gnome.examples
@@ -0,0 +1 @@
debian/ssh-askpass-gnome.desktop
diff --git a/debian/ssh-askpass-gnome.install b/debian/ssh-askpass-gnome.install
new file mode 100755
index 000000000..9b0a8fd8d
--- /dev/null
+++ b/debian/ssh-askpass-gnome.install
@@ -0,0 +1,3 @@
1#! /usr/bin/dh-exec
2contrib/gnome-ssh-askpass2 => usr/lib/openssh/gnome-ssh-askpass
3debian/ssh-askpass-gnome.png usr/share/pixmaps
diff --git a/debian/ssh-askpass-gnome.manpages b/debian/ssh-askpass-gnome.manpages
new file mode 100644
index 000000000..7749f13bb
--- /dev/null
+++ b/debian/ssh-askpass-gnome.manpages
@@ -0,0 +1 @@
debian/gnome-ssh-askpass.1
diff --git a/debian/ssh-askpass-gnome.png b/debian/ssh-askpass-gnome.png
new file mode 100644
index 000000000..06f75764e
--- /dev/null
+++ b/debian/ssh-askpass-gnome.png
Binary files differ
diff --git a/debian/ssh-askpass-gnome.postinst b/debian/ssh-askpass-gnome.postinst
new file mode 100644
index 000000000..8a454e520
--- /dev/null
+++ b/debian/ssh-askpass-gnome.postinst
@@ -0,0 +1,48 @@
1#! /bin/sh
2# postinst script for ssh-askpass-gnome
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <postinst> `configure' <most-recently-configured-version>
10# * <old-postinst> `abort-upgrade' <new version>
11# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
12# <new-version>
13# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
14# <failed-install-package> <version> `removing'
15# <conflicting-package> <version>
16# for details, see /usr/share/doc/packaging-manual/
17#
18# quoting from the policy:
19# Any necessary prompting should almost always be confined to the
20# post-installation script, and should be protected with a conditional
21# so that unnecessary prompting doesn't happen if a package's
22# installation fails and the `postinst' is called with `abort-upgrade',
23# `abort-remove' or `abort-deconfigure'.
24
25case "$1" in
26 configure)
27 update-alternatives --quiet \
28 --install /usr/bin/ssh-askpass ssh-askpass \
29 /usr/lib/openssh/gnome-ssh-askpass 30 \
30 --slave /usr/share/man/man1/ssh-askpass.1.gz \
31 ssh-askpass.1.gz /usr/share/man/man1/gnome-ssh-askpass.1.gz
32 ;;
33
34 abort-upgrade|abort-remove|abort-deconfigure)
35 ;;
36
37 *)
38 echo "postinst called with unknown argument \`$1'" >&2
39 exit 0
40 ;;
41esac
42
43# dh_installdeb will replace this with shell code automatically
44# generated by other debhelper scripts.
45
46#DEBHELPER#
47
48exit 0
diff --git a/debian/ssh-askpass-gnome.prerm b/debian/ssh-askpass-gnome.prerm
new file mode 100644
index 000000000..0adcfc76b
--- /dev/null
+++ b/debian/ssh-askpass-gnome.prerm
@@ -0,0 +1,39 @@
1#! /bin/sh
2# prerm script for ssh-askpass-gnome
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see /usr/share/doc/packaging-manual/
17
18case "$1" in
19 remove|deconfigure)
20 update-alternatives --quiet --remove ssh-askpass /usr/lib/openssh/gnome-ssh-askpass
21 ;;
22 upgrade)
23 ;;
24 failed-upgrade)
25 ;;
26 *)
27 echo "prerm called with unknown argument \`$1'" >&2
28 exit 0
29 ;;
30esac
31
32# dh_installdeb will replace this with shell code automatically
33# generated by other debhelper scripts.
34
35#DEBHELPER#
36
37exit 0
38
39
diff --git a/debian/ssh-krb5.NEWS b/debian/ssh-krb5.NEWS
new file mode 100644
index 000000000..5a6433ab2
--- /dev/null
+++ b/debian/ssh-krb5.NEWS
@@ -0,0 +1,18 @@
1ssh-krb5 (1:4.3p2-7) unstable; urgency=low
2
3 The normal openssh-server and openssh-client packages in Debian now
4 include full GSSAPI support, including key exchange. This package is
5 now only a transitional package that depends on openssh-server and
6 openssh-client and configures openssh-server for GSSAPI authentication
7 if it wasn't already.
8
9 You can now simply install openssh-server and openssh-client directly
10 and remove this package. Just make sure that /etc/ssh/sshd_config
11 contains:
12
13 GSSAPIAuthentication yes
14 GSSAPIKeyExchange yes
15
16 if you want to support GSSAPI authentication to your ssh server.
17
18 -- Russ Allbery <rra@debian.org> Tue, 03 Oct 2006 22:27:27 -0700
diff --git a/debian/ssh-krb5.postinst b/debian/ssh-krb5.postinst
new file mode 100644
index 000000000..f799accfe
--- /dev/null
+++ b/debian/ssh-krb5.postinst
@@ -0,0 +1,61 @@
1#!/bin/sh
2
3set -e
4
5action="$1"
6oldversion="$2"
7
8if [ "$action" = configure ] ; then
9 # Make sure that GSSAPI is enabled. If there is no uncommented GSSAPI
10 # configuration, uncomment any commented-out configuration if present
11 # (this will catch the case of a fresh install of openssh-server).
12 # Otherwise, add configuration turning on GSSAPIAuthentication and
13 # GSSAPIKeyExchange.
14 #
15 # If there is some configuration, we may be upgrading from ssh-krb5. It
16 # enabled GSSAPIKeyExchange without any configuration option. Therefore,
17 # if it isn't explicitly set, always enable it for compatible behavior
18 # with ssh-krb5.
19 if dpkg --compare-versions "$oldversion" ge 1:4.3p2-9; then
20 :
21 else
22 changed=
23 if grep -qi '^[ ]*GSSAPI' /etc/ssh/sshd_config ; then
24 if grep -qi '^[ ]*GSSAPIKeyExchange' /etc/ssh/sshd_config ; then
25 :
26 else
27 changed=true
28 cat >> /etc/ssh/sshd_config <<EOF
29
30# GSSAPI key exchange (added by ssh-krb5 transitional package)
31GSSAPIKeyExchange yes
32EOF
33 fi
34 else
35 changed=true
36 if grep -qi '^#GSSAPI' /etc/ssh/sshd_config ; then
37 perl -pe 's/^\#(GSSAPI(Authentication|KeyExchange))\b.*/$1 yes/i' \
38 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
39 chown --reference /etc/ssh/sshd_config \
40 /etc/ssh/sshd_config.dpkg-new
41 chmod --reference /etc/ssh/sshd_config \
42 /etc/ssh/sshd_config.dpkg-new
43 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
44 else
45 cat >> /etc/ssh/sshd_config <<EOF
46
47# GSSAPI authentication (added by ssh-krb5 transitional package)
48GSSAPIAuthentication yes
49GSSAPIKeyExchange yes
50EOF
51 fi
52 fi
53 if [ -n "$changed" ]; then
54 invoke-rc.d ssh restart
55 fi
56 fi
57fi
58
59#DEBHELPER#
60
61exit 0
diff --git a/debian/ssh.lintian-overrides b/debian/ssh.lintian-overrides
new file mode 100644
index 000000000..b9bf7ea08
--- /dev/null
+++ b/debian/ssh.lintian-overrides
@@ -0,0 +1 @@
ssh: package-contains-empty-directory usr/share/doc/openssh-client/
diff --git a/debian/ssh.maintscript b/debian/ssh.maintscript
new file mode 100644
index 000000000..efd370e25
--- /dev/null
+++ b/debian/ssh.maintscript
@@ -0,0 +1 @@
symlink_to_dir /usr/share/doc/ssh /usr/share/doc/openssh-client 1:6.6p1-8~
diff --git a/debian/systemd/ssh-agent.override b/debian/systemd/ssh-agent.override
new file mode 100644
index 000000000..2905494b6
--- /dev/null
+++ b/debian/systemd/ssh-agent.override
@@ -0,0 +1 @@
manual
diff --git a/debian/systemd/ssh-agent.service b/debian/systemd/ssh-agent.service
new file mode 100644
index 000000000..2297f8f75
--- /dev/null
+++ b/debian/systemd/ssh-agent.service
@@ -0,0 +1,8 @@
1[Unit]
2Description=OpenSSH Agent
3Before=graphical-session-pre.target
4ConditionPathExists=/etc/X11/Xsession.options
5
6[Service]
7ExecStart=/usr/lib/openssh/agent-launch start
8ExecStopPost=/usr/lib/openssh/agent-launch stop
diff --git a/debian/systemd/ssh-session-cleanup b/debian/systemd/ssh-session-cleanup
new file mode 100755
index 000000000..f283cc967
--- /dev/null
+++ b/debian/systemd/ssh-session-cleanup
@@ -0,0 +1,11 @@
1#! /bin/sh
2
3ssh_session_pattern='sshd: \S.*@pts/[0-9]+'
4
5IFS="$IFS@"
6pgrep -a -f "$ssh_session_pattern" | while read pid daemon user pty; do
7 echo "Found ${daemon%:} session $pid on $pty; sending SIGTERM"
8 kill "$pid" || true
9done
10
11exit 0
diff --git a/debian/systemd/ssh-session-cleanup.service b/debian/systemd/ssh-session-cleanup.service
new file mode 100644
index 000000000..b86727227
--- /dev/null
+++ b/debian/systemd/ssh-session-cleanup.service
@@ -0,0 +1,13 @@
1[Unit]
2Description=OpenBSD Secure Shell session cleanup
3Wants=network.target
4After=network.target
5
6[Service]
7ExecStart=/bin/true
8ExecStop=/usr/lib/openssh/ssh-session-cleanup
9RemainAfterExit=yes
10Type=oneshot
11
12[Install]
13WantedBy=multi-user.target
diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service
new file mode 100644
index 000000000..3df8c6426
--- /dev/null
+++ b/debian/systemd/ssh.service
@@ -0,0 +1,17 @@
1[Unit]
2Description=OpenBSD Secure Shell server
3After=network.target auditd.service
4ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
5
6[Service]
7EnvironmentFile=-/etc/default/ssh
8ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
9ExecReload=/bin/kill -HUP $MAINPID
10KillMode=process
11Restart=on-failure
12RestartPreventExitStatus=255
13Type=notify
14
15[Install]
16WantedBy=multi-user.target
17Alias=sshd.service
diff --git a/debian/systemd/ssh.socket b/debian/systemd/ssh.socket
new file mode 100644
index 000000000..5a766dcab
--- /dev/null
+++ b/debian/systemd/ssh.socket
@@ -0,0 +1,12 @@
1[Unit]
2Description=OpenBSD Secure Shell server socket
3Before=ssh.service
4Conflicts=ssh.service
5ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
6
7[Socket]
8ListenStream=22
9Accept=yes
10
11[Install]
12WantedBy=sockets.target
diff --git a/debian/systemd/ssh@.service b/debian/systemd/ssh@.service
new file mode 100644
index 000000000..4b0801dbc
--- /dev/null
+++ b/debian/systemd/ssh@.service
@@ -0,0 +1,8 @@
1[Unit]
2Description=OpenBSD Secure Shell server per-connection daemon
3After=auditd.service
4
5[Service]
6EnvironmentFile=-/etc/default/ssh
7ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS
8StandardInput=socket
diff --git a/debian/systemd/sshd.conf b/debian/systemd/sshd.conf
new file mode 100644
index 000000000..ab7302189
--- /dev/null
+++ b/debian/systemd/sshd.conf
@@ -0,0 +1 @@
d /var/run/sshd 0755 root root
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000000000..ab5122f46
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
1Tests: regress
2Restrictions: needs-root allow-stderr
3Depends: @builddeps@, openssh-client, openssh-server, openssh-sftp-server, sudo, python-twisted-conch (>= 1:15.5.0-1)
diff --git a/debian/tests/regress b/debian/tests/regress
new file mode 100644
index 000000000..a3ffd66ba
--- /dev/null
+++ b/debian/tests/regress
@@ -0,0 +1,43 @@
1#! /bin/sh
2set -e
3
4# Don't use "make tests"; we want to test the installed version.
5
6cp -a . "$ADTTMP/tree"
7cd "$ADTTMP/tree"
8
9# We aren't actually going to use most of this build, but we need a basic
10# build tree in place in order to be able to build the regression tests.
11autoreconf -f -i
12cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
13./configure
14make
15
16# The defaults for TEST_SSH_* in regress/test-exec.sh use the system
17# versions, but the top-level Makefile sets things up to test the just-built
18# versions, so we must bypass the latter in order to work correctly under
19# autopkgtest.
20make regress-prep
21make regress/modpipe \
22 regress/setuid-allowed \
23 regress/netcat \
24 regress/unittests/sshbuf/test_sshbuf \
25 regress/unittests/sshkey/test_sshkey \
26 regress/unittests/bitmap/test_bitmap \
27 regress/unittests/hostkeys/test_hostkeys \
28 regress/unittests/kex/test_kex
29
30SRCDIR="$(pwd)"
31BUILDDIR="$SRCDIR"
32make -C regress \
33 .OBJDIR="$BUILDDIR/regress" \
34 .CURDIR="$SRCDIR/regress" \
35 BUILDDIR="$BUILDDIR" \
36 OBJ="$BUILDDIR/regress" \
37 SUDO=sudo \
38 TEST_SHELL=sh \
39 TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
40 TEST_SSH_CONCH=conch \
41 TEST_SSH_IPV6=yes \
42 TEST_SSH_ECC=yes \
43 tests interop-tests </dev/zero
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000000000..ac41e6e22
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,44 @@
1-----BEGIN PGP PUBLIC KEY BLOCK-----
2Version: GnuPG v1
3
4mQGdBFKmggUBDICUNqm4cNh7tdEbwaNhbnwqLiHpILeXT6sddGI0Stz5ofB1uvIH
5m9kXYG5XUUwlc5ywjIZm2JeuKqrd/6wAz5laLagFA6k86EZzzuBE3b5FxSQ4EN4K
65XZEJo61xASEF7z1mQCiqoA6/F407ht7nNoiVE95kOmqJlv4cqbpCw3n8f2VW+mV
7UH6MYRZVrYAC9NnJWv24rem2fjgFhNT1/bx44G7H9bVJqL7hMEGa+xYQBI3YT/ul
8Eu9HYmLFVeiZm1gB1eKXW7jS4ctLl5uPrxayA5DX/qNB2yqgVVlIKFwUm8gGPGPO
9nsNKo0xBseE7E0F/KeGpaT5aS9yFgPm9A652Jx9felYgb0e9Ipt3lxriPQwgF/cx
10LGuP/WEbN5fpWFnuV0ViklusuVI2e8GHJGU5bQD5AlzvWu4Sv6oBOcDCabScydY7
11IxPBk/XBWCF9QDIa2qa32Mc9dYc8EnJszPeVCHX5hG23omDRmdLGLwH7F+CuBvCx
12AKCymZtJl5DhRmnhdzRg9d+0VG4hLF7O06ANABEBAAG0H0RhbWllbiBNaWxsZXIg
13PGRqbUBtaW5kcm90Lm9yZz6JAc0EEwECACcCGwMFCQ1H67ECHgECF4AFAlKmjJwE
14CwkIBwYVCgkICwIFFgIDAQAACgkQ0+X1a22SDTB2TAx9E1ozPJKUGWJPZefqsSr8
15KsO6Dp3QuPrw2Zwgo2QfeCT+uzNA5AKCDIAaYEpVbQsvu4sDy8dAW1+HENCxVrMX
16WG+SH41lcdAdI4io0PGHVQDl42R5jX3e9pfjYCQALVv5BDXddK6054nyxEmudQ3I
17CFCYXIcqQbA1nfj3Uk06jGhuM99B2/akbxCoFSiUX9uHDZKNYAGpU7/FCF9xCZF4
18Kd9Twvyy17jDIg7km3/Q4Jy++VP8FyvE5JjBdLRQSBzSG9GCjv9fyKWW7S0bMY4D
193SKKt/Jm1XchEMgpRr4eBpgCs3rxO1hXjzqm3te97uy6/q8CuJUtupJsPKc9Wh4+
20ogUZifC0ta7UrxZp8yZTRvPSUxYrlvDzM32VDLQ3FX6Y2i4VNo48PSJMA+BPUx7D
21TcZKIXt457zsLD4jF4sRdwOk/QF/GXCkH2GAyKHWCPXIOe+jIXgiuajcqZm9cAWj
22L3hidSohKfefvKkzsg75mDmjhvAtDncIbmImJNjXIe2PQU4iY9Vq5i0vlaVKgBgK
23SohGBBARAgAGBQJSpovfAAoJEM6OywOG/5xInf8An0A7MPrfJIz2e643VEV4AX3d
24O9+IAJ9MOsQiB4LnqtTcc9NBMHf9VLE46LkBnQRSpoIFAQyA1OdwfpwXKch+O00W
251FsQSMcEjahGmo84WTroM/qjTd7Ysld300PMv3wkQn2WdhyTca/EmkW0fVTGSYs7
26Z3v5SpPf0prYSjmfu8WlXoz64ApdXqGHjj9KAeq2OuUtWrwobgiQEzU4Hxlz94X/
2765BgG5k7OTyE3J6bgRcMwJCgCkwjK85wbbBkGH+Jo9o/Zw9TPczQcE7BmGYkkLNA
28Xbw7omKBOL4Z6w9sXToz9UnQ0EB9s4TvAbHGKX9y2PEQjZN+wkzR3DavWB7ql8vH
29ZIRmspAsDAJvDT1ofsNtu8MB8wJcxvZaoZ7j9wULYpnaNYx9xxEhgbB9o1mBcYsd
30Dj3xz5jrgtq/cpdgGC6bg+awDc/ylQ1mNglKfY8P9hFIhIANZilnmAlk5GSoWclP
31/69m+u34KKoHU4Yc3I1pPNcL6Nyi0bh8mHqe9WedKfod7Y4yM1S20fXaS4vrLIlK
32gxbsDpWiWrk0ltV03uyC7eqDe3nzzGW/2GLTHj5xsA2+HwGtPom5mmzjvV5PFNpS
337a90JQARAQABiQG1BBgBAgAPBQJSpoIFAhsMBQkNR+uxAAoJENPl9Wttkg0wEScM
34f2QjDWm3XawJxNA8pqqxrFeTEo+GESznVRTUeprrUFd1GHw33qaAvqLixZ+x8cr+
351Gj/fJd5eiIVJfRLYbXlC8su8JZXngfX0VhuMcUob/FTikfpcoYkRzriUsJEB3/O
36mjlLjGgnQm5Gz9TV1ityF3bzoHkR8svWEKKKzNoIEPHLU3y7bqSkOrjnY3bZfdVR
37h618XbjV28NMuoZsV8E4pOuQoy+3s5IjmIf/mkSiFE3VJwdaPem23UsXatFb/eoC
38/Ahi0iCd/8ioFwi+oHT2Pnt9HrzVF6E8gBVO3vKo6UJgDTr9Qt27Nc6eHL0O5j50
39ins9ob/3DoOC3P5A08zhl+w466yGEv5+Es/usUAs/4ng4ksI3DTLK9Ygj70l5oBu
40MFYd3b5KGVfAIlGc5mwIOIG41YLIzZTrGuOuTymjwCdC9cUZJ6R2Cv/Vx0htZ0hq
41DdyaDO0Io9OG/W2s2T7160tY9ic4MwBCFemzwFELIBIIHNY/n/wsmxQGkI3Oj86J
42pOVVgR5lXWR+BrGcBjkSEyg=
43=T9xO
44-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000000000..e05063598
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
1version=3
2opts=pgpsigurlmangle=s/$/.asc/ \
3http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-(.*)\.tar\.gz