summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm8
-rw-r--r--debian/NEWS86
-rw-r--r--debian/README.Debian237
-rwxr-xr-xdebian/adjust-openssl-dependencies32
-rw-r--r--debian/changelog4185
-rw-r--r--debian/clean2
-rw-r--r--debian/compat1
-rw-r--r--debian/control192
-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.install37
-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.examples1
-rw-r--r--debian/openssh-server.if-up43
-rwxr-xr-xdebian/openssh-server.install16
-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.postinst327
-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/backport-fix-first-kex-follows.patch36
-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.patch3030
-rw-r--r--debian/patches/helpful-wait-terminate.patch26
-rw-r--r--debian/patches/keepalive-extensions.patch135
-rw-r--r--debian/patches/lintian-symlink-pickiness.patch32
-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/series29
-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.patch266
-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.upstart23
-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.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
118 files changed, 14597 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 000000000..b6e38a18d
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
1# see git-dpm(1) from git-dpm package
231cc76b587fe2305eab8f7788c5dc6c876aff60e
331cc76b587fe2305eab8f7788c5dc6c876aff60e
4651211fd4a199b299540c00c54a46e27fadb04be
5651211fd4a199b299540c00c54a46e27fadb04be
6openssh_7.1p1.orig.tar.gz
7ed22af19f962262c493fcc6ed8c8826b2761d9b6
81493170
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000000000..4dc9ffd92
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,86 @@
1openssh (1:7.1p1-2) unstable; urgency=medium
2
3 OpenSSH 7.0 disables several pieces of weak, legacy, and/or unsafe
4 cryptography.
5
6 * Support for the legacy SSH version 1 protocol is disabled by default at
7 compile time. Note that this also means that the Cipher keyword in
8 ssh_config(5) is effectively no longer usable; use Ciphers instead for
9 protocol 2. The openssh-client-ssh1 package includes "ssh1", "scp1",
10 and "ssh-keygen1" binaries which you can use if you have no alternative
11 way to connect to an outdated SSH1-only server; please contact the
12 server administrator or system vendor in such cases and ask them to
13 upgrade.
14 * Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
15 disabled by default at run-time. It may be re-enabled using the
16 instructions at http://www.openssh.com/legacy.html
17 * Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
18 default at run-time. These may be re-enabled using the instructions at
19 http://www.openssh.com/legacy.html
20 * Support for the legacy v00 cert format has been removed.
21
22 Future releases will retire more legacy cryptography, including:
23
24 * Refusing all RSA keys smaller than 1024 bits (the current minimum is
25 768 bits).
26 * Several ciphers will be disabled by default: blowfish-cbc, cast128-cbc,
27 all arcfour variants, and the rijndael-cbc aliases for AES.
28 * MD5-based HMAC algorithms will be disabled by default.
29
30 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
31
32openssh (1:6.7p1-5) unstable; urgency=medium
33
34 openssh-server 1:6.7p1-4 changed the default setting of AcceptEnv to list
35 a number of specific LC_FOO variables rather than the wildcard LC_*. I
36 have since been persuaded that this was a bad idea and have reverted it,
37 but it is difficult to automatically undo the change to
38 /etc/ssh/sshd_config without compounding the problem (that of modifying
39 configuration that some users did not want to be modified) further. Most
40 users who upgraded via version 1:6.7p1-4 should restore the previous value
41 of "AcceptEnv LANG LC_*" in /etc/ssh/sshd_config.
42
43 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:09:32 +0000
44
45openssh (1:5.4p1-2) unstable; urgency=low
46
47 Smartcard support is now available using PKCS#11 tokens. If you were
48 previously using an unofficial build of Debian's OpenSSH package with
49 OpenSC-based smartcard support added, then note that commands like
50 'ssh-add -s 0' will no longer work; you need to use 'ssh-add -s
51 /usr/lib/opensc-pkcs11.so' instead.
52
53 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
54
55openssh (1:3.8.1p1-9) experimental; urgency=low
56
57 The ssh package has been split into openssh-client and openssh-server. If
58 you had previously requested that the sshd server should not be run, then
59 that request will still be honoured. However, the recommended approach is
60 now to remove the openssh-server package if you do not want to run sshd.
61 You can remove the old /etc/ssh/sshd_not_to_be_run marker file after doing
62 that.
63
64 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
65
66openssh (1:3.5p1-1) unstable; urgency=low
67
68 This version of OpenSSH disables the environment option for public keys by
69 default, in order to avoid certain attacks (for example, LD_PRELOAD). If
70 you are using this option in an authorized_keys file, beware that the keys
71 in question will no longer work until the option is removed.
72
73 To re-enable this option, set "PermitUserEnvironment yes" in
74 /etc/ssh/sshd_config after the upgrade is complete, taking note of the
75 warning in the sshd_config(5) manual page.
76
77 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
78
79openssh (1:3.0.1p1-1) unstable; urgency=high
80
81 As of version 3, OpenSSH no longer uses separate files for ssh1 and ssh2
82 keys. This means the authorized_keys2 and known_hosts2 files are no longer
83 needed. They will still be read in order to maintain backward
84 compatibility.
85
86 -- 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..d26e5a39d
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,237 @@
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
235--
236Matthew Vernon <matthew@debian.org>
237Colin 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/changelog b/debian/changelog
new file mode 100644
index 000000000..e93229b6a
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,4185 @@
1openssh (1:7.1p1-6) UNRELEASED; urgency=medium
2
3 [ Colin Watson ]
4 * Remove explicit "XS-Testsuite: autopkgtest" from debian/control;
5 dpkg-source now figures that out automatically based on the existence of
6 debian/tests/control.
7 * Allow authenticating as root using gssapi-keyex even with
8 "PermitRootLogin prohibit-password" (closes: #809695).
9 * Shuffle PROPOSAL_KEX_ALGS mangling for GSSAPI key exchange a little
10 later in ssh_kex2 so that it's actually effective (closes: #809696).
11
12 [ Michael Biebl ]
13 * Don't call sd_notify when sshd is re-execed (closes: #809035).
14
15 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2016 13:27:44 +0000
16
17openssh (1:7.1p1-5) unstable; urgency=medium
18
19 [ Michael Biebl ]
20 * Add systemd readiness notification support (closes: #778913).
21
22 -- Colin Watson <cjwatson@debian.org> Mon, 21 Dec 2015 22:10:07 +0000
23
24openssh (1:7.1p1-4) unstable; urgency=medium
25
26 * Backport upstream patch to unbreak connections with peers that set
27 first_kex_follows (LP: #1526357).
28
29 -- Colin Watson <cjwatson@debian.org> Tue, 15 Dec 2015 15:40:18 +0000
30
31openssh (1:7.1p1-3) unstable; urgency=medium
32
33 * Drop priority of openssh-client-ssh1 to extra (closes: #807518).
34 * Redirect regression test input from /dev/zero, since otherwise conch
35 will immediately send EOF.
36
37 -- Colin Watson <cjwatson@debian.org> Thu, 10 Dec 2015 15:12:10 +0000
38
39openssh (1:7.1p1-2) unstable; urgency=medium
40
41 * Really enable conch interoperability tests under autopkgtest.
42 * Drop SSH1 keepalive patch. Now that SSH1 is disabled at compile-time,
43 it's been rejected upstream and there isn't much point carrying it any
44 more.
45 * Add NEWS.Debian documenting cryptographic changes in OpenSSH 7.0
46 (closes: #806962).
47 * Add an openssh-client-ssh1 binary package for people who need to connect
48 to outdated SSH1-only servers (closes: #807107).
49 * Update "Subsystem sftp" path in example sshd_config (closes: #691004,
50 LP: #1437005).
51
52 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
53
54openssh (1:7.1p1-1) unstable; urgency=medium
55
56 * New upstream release (http://www.openssh.com/txt/release-7.0, closes:
57 #785190):
58 - Support for the legacy SSH version 1 protocol is disabled by default
59 at compile time.
60 - Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
61 disabled by default at run-time. It may be re-enabled using the
62 instructions at http://www.openssh.com/legacy.html
63 - Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
64 default at run-time. These may be re-enabled using the instructions
65 at http://www.openssh.com/legacy.html
66 - Support for the legacy v00 cert format has been removed.
67 - The default for the sshd_config(5) PermitRootLogin option has changed
68 from "yes" to "prohibit-password".
69 - PermitRootLogin=without-password/prohibit-password now bans all
70 interactive authentication methods, allowing only public-key,
71 hostbased and GSSAPI authentication (previously it permitted
72 keyboard-interactive and password-less authentication if those were
73 enabled).
74 - ssh_config(5): Add PubkeyAcceptedKeyTypes option to control which
75 public key types are available for user authentication.
76 - sshd_config(5): Add HostKeyAlgorithms option to control which public
77 key types are offered for host authentications.
78 - ssh(1), sshd(8): Extend Ciphers, MACs, KexAlgorithms,
79 HostKeyAlgorithms, PubkeyAcceptedKeyTypes and HostbasedKeyTypes
80 options to allow appending to the default set of algorithms instead of
81 replacing it. Options may now be prefixed with a '+' to append to the
82 default, e.g. "HostKeyAlgorithms=+ssh-dss".
83 - sshd_config(5): PermitRootLogin now accepts an argument of
84 'prohibit-password' as a less-ambiguous synonym of 'without-
85 password'.
86 - ssh(1), sshd(8): Add compatability workarounds for Cisco and more
87 PuTTY versions.
88 - Fix some omissions and errors in the PROTOCOL and PROTOCOL.mux
89 documentation relating to Unix domain socket forwarding.
90 - ssh(1): Improve the ssh(1) manual page to include a better description
91 of Unix domain socket forwarding (closes: #779068).
92 - ssh(1), ssh-agent(1): Skip uninitialised PKCS#11 slots, fixing
93 failures to load keys when they are present.
94 - ssh(1), ssh-agent(1): Do not ignore PKCS#11 hosted keys that wth empty
95 CKA_ID.
96 - sshd(8): Clarify documentation for UseDNS option.
97 - Check realpath(3) behaviour matches what sftp-server requires and use
98 a replacement if necessary.
99 * New upstream release (http://www.openssh.com/txt/release-7.1):
100 - sshd(8): OpenSSH 7.0 contained a logic error in PermitRootLogin=
101 prohibit-password/without-password that could, depending on
102 compile-time configuration, permit password authentication to root
103 while preventing other forms of authentication. This problem was
104 reported by Mantas Mikulenas.
105 - ssh(1), sshd(8): Add compatibility workarounds for FuTTY.
106 - ssh(1), sshd(8): Refine compatibility workarounds for WinSCP.
107 - Fix a number of memory faults (double-free, free of uninitialised
108 memory, etc) in ssh(1) and ssh-keygen(1). Reported by Mateusz
109 Kocielski.
110 * Change "PermitRootLogin without-password" to the new preferred spelling
111 of "PermitRootLogin prohibit-password" in sshd_config, and update
112 documentation to reflect the new upstream default.
113 * Enable conch interoperability tests under autopkgtest.
114
115 -- Colin Watson <cjwatson@debian.org> Wed, 02 Dec 2015 20:18:35 +0000
116
117openssh (1:6.9p1-3) unstable; urgency=medium
118
119 * ssh_config(5): Fix markup errors in description of GSSAPITrustDns
120 (closes: #799271).
121 * Fix dh_install and dh_fixperms overrides to work properly with an
122 architecture-independent-only build (closes: #806090).
123 * Do much less work in architecture-independent-only builds.
124 * Drop ConsoleKit session registration patch; it was only ever enabled for
125 Ubuntu, which no longer needs it (LP: #1334916, #1502045).
126
127 -- Colin Watson <cjwatson@debian.org> Tue, 24 Nov 2015 22:48:53 +0000
128
129openssh (1:6.9p1-2) unstable; urgency=medium
130
131 [ Colin Watson ]
132 * mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen
133 invocation onto a separate line to make it easier to copy and paste
134 (LP: #1491532).
135
136 [ Tyler Hicks ]
137 * Build with audit support on Linux (closes: #797727, LP: #1478087).
138
139 -- Colin Watson <cjwatson@debian.org> Thu, 10 Sep 2015 12:26:11 +0100
140
141openssh (1:6.9p1-1) unstable; urgency=medium
142
143 * New upstream release (http://www.openssh.com/txt/release-6.8):
144 - sshd(8): UseDNS now defaults to 'no'. Configurations that match
145 against the client host name (via sshd_config or authorized_keys) may
146 need to re-enable it or convert to matching against addresses.
147 - Add FingerprintHash option to ssh(1) and sshd(8), and equivalent
148 command-line flags to the other tools to control algorithm used for
149 key fingerprints. The default changes from MD5 to SHA256 and format
150 from hex to base64.
151 Fingerprints now have the hash algorithm prepended. An example of the
152 new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE
153 Please note that visual host keys will also be different.
154 - ssh(1), sshd(8): Experimental host key rotation support. Add a
155 protocol extension for a server to inform a client of all its
156 available host keys after authentication has completed. The client
157 may record the keys in known_hosts, allowing it to upgrade to better
158 host key algorithms and a server to gracefully rotate its keys.
159 The client side of this is controlled by a UpdateHostkeys config
160 option (default off).
161 - ssh(1): Add a ssh_config HostbasedKeyType option to control which host
162 public key types are tried during host-based authentication.
163 - ssh(1), sshd(8): Fix connection-killing host key mismatch errors when
164 sshd offers multiple ECDSA keys of different lengths.
165 - ssh(1): When host name canonicalisation is enabled, try to parse host
166 names as addresses before looking them up for canonicalisation. Fixes
167 bz#2074 and avoids needless DNS lookups in some cases.
168 - ssh(1), ssh-keysign(8): Make ed25519 keys work for host based
169 authentication.
170 - sshd(8): SSH protocol v.1 workaround for the Meyer, et al,
171 Bleichenbacher Side Channel Attack. Fake up a bignum key before RSA
172 decryption.
173 - sshd(8): Remember which public keys have been used for authentication
174 and refuse to accept previously-used keys. This allows
175 AuthenticationMethods=publickey,publickey to require that users
176 authenticate using two _different_ public keys.
177 - sshd(8): add sshd_config HostbasedAcceptedKeyTypes and
178 PubkeyAcceptedKeyTypes options to allow sshd to control what public
179 key types will be accepted (closes: #481133). Currently defaults to
180 all.
181 - sshd(8): Don't count partial authentication success as a failure
182 against MaxAuthTries.
183 - ssh(1): Add RevokedHostKeys option for the client to allow text-file
184 or KRL-based revocation of host keys.
185 - ssh-keygen(1), sshd(8): Permit KRLs that revoke certificates by serial
186 number or key ID without scoping to a particular CA.
187 - ssh(1): Add a "Match canonical" criteria that allows ssh_config Match
188 blocks to trigger only in the second config pass.
189 - ssh(1): Add a -G option to ssh that causes it to parse its
190 configuration and dump the result to stdout, similar to "sshd -T".
191 - ssh(1): Allow Match criteria to be negated. E.g. "Match !host".
192 - ssh-keyscan(1): ssh-keyscan has been made much more robust against
193 servers that hang or violate the SSH protocol (closes: #241119).
194 - ssh(1), ssh-keygen(1): Fix regression bz#2306: Key path names were
195 being lost as comment fields (closes: #787776).
196 - ssh(1): Allow ssh_config Port options set in the second config parse
197 phase to be applied (they were being ignored; closes: #774369).
198 - ssh(1): Tweak config re-parsing with host canonicalisation - make the
199 second pass through the config files always run when host name
200 canonicalisation is enabled (and not whenever the host name changes)
201 - ssh(1): Fix passing of wildcard forward bind addresses when connection
202 multiplexing is in use.
203 - ssh-keygen(1): Fix broken private key conversion from non-OpenSSH
204 formats.
205 - ssh-keygen(1): Fix KRL generation bug when multiple CAs are in use.
206 * New upstream release (http://www.openssh.com/txt/release-6.9):
207 - CVE-2015-5352: ssh(1): When forwarding X11 connections with
208 ForwardX11Trusted=no, connections made after ForwardX11Timeout expired
209 could be permitted and no longer subject to XSECURITY restrictions
210 because of an ineffective timeout check in ssh(1) coupled with "fail
211 open" behaviour in the X11 server when clients attempted connections
212 with expired credentials (closes: #790798). This problem was reported
213 by Jann Horn.
214 - SECURITY: ssh-agent(1): Fix weakness of agent locking (ssh-add -x) to
215 password guessing by implementing an increasing failure delay, storing
216 a salted hash of the password rather than the password itself and
217 using a timing-safe comparison function for verifying unlock attempts.
218 This problem was reported by Ryan Castellucci.
219 - sshd(8): Support admin-specified arguments to AuthorizedKeysCommand
220 (closes: #740494).
221 - sshd(8): Add AuthorizedPrincipalsCommand that allows retrieving
222 authorized principals information from a subprocess rather than a
223 file.
224 - ssh(1), ssh-add(1): Support PKCS#11 devices with external PIN entry
225 devices.
226 - ssh-keygen(1): Support "ssh-keygen -lF hostname" to search known_hosts
227 and print key hashes rather than full keys.
228 - ssh-agent(1): Add -D flag to leave ssh-agent in foreground without
229 enabling debug mode.
230 - ssh(1), sshd(8): Deprecate legacy SSH2_MSG_KEX_DH_GEX_REQUEST_OLD
231 message and do not try to use it against some 3rd-party SSH
232 implementations that use it (older PuTTY, WinSCP).
233 - ssh(1), sshd(8): Cap DH-GEX group size at 4Kbits for Cisco
234 implementations as some would fail when attempting to use group sizes
235 >4K (closes: #740307, LP: #1287222).
236 - ssh(1): Fix out-of-bound read in EscapeChar configuration option
237 parsing.
238 - sshd(8): Fix application of PermitTunnel, LoginGraceTime,
239 AuthenticationMethods and StreamLocalBindMask options in Match blocks.
240 - ssh(1), sshd(8): Improve disconnection message on TCP reset.
241 - ssh(1): Remove failed remote forwards established by multiplexing from
242 the list of active forwards.
243 - sshd(8): Make parsing of authorized_keys "environment=" options
244 independent of PermitUserEnv being enabled.
245 - sshd(8): Fix post-auth crash with permitopen=none (closes: #778807).
246 - ssh(1), ssh-add(1), ssh-keygen(1): Allow new-format private keys to be
247 encrypted with AEAD ciphers.
248 - ssh(1): Allow ListenAddress, Port and AddressFamily configuration
249 options to appear in any order.
250 - sshd(8): Check for and reject missing arguments for VersionAddendum
251 and ForceCommand.
252 - ssh(1), sshd(8): Don't treat unknown certificate extensions as fatal.
253 - ssh-keygen(1): Make stdout and stderr output consistent.
254 - ssh(1): Mention missing DISPLAY environment in debug log when X11
255 forwarding requested.
256 - sshd(8): Correctly record login when UseLogin is set.
257 - sshd(8): Add some missing options to sshd -T output and fix output of
258 VersionAddendum and HostCertificate.
259 - Document and improve consistency of options that accept a "none"
260 argument: TrustedUserCAKeys, RevokedKeys, AuthorizedPrincipalsFile.
261 - ssh(1): Include remote username in debug output.
262 - sshd(8): Avoid compatibility problem with some versions of Tera Term,
263 which would crash when they received the hostkeys notification message
264 (hostkeys-00@openssh.com).
265 - sshd(8): Mention ssh-keygen -E as useful when comparing legacy MD5
266 host key fingerprints.
267 - ssh(1): Clarify pseudo-terminal request behaviour and make manual
268 language consistent.
269 - ssh(1): Document that the TERM environment variable is not subject to
270 SendEnv and AcceptEnv; bz#2386
271 - sshd(8): Format UsePAM setting when using sshd -T (closes: #767648).
272 - moduli(5): Update DH-GEX moduli (closes: #787037).
273 * There are some things I want to fix before upgrading to 7.0p1, though I
274 intend to do that soon. In the meantime, backport some patches, mainly
275 to fix security issues:
276 - SECURITY: sshd(8): OpenSSH 6.8 and 6.9 incorrectly set TTYs to be
277 world-writable. Local attackers may be able to write arbitrary
278 messages to logged-in users, including terminal escape sequences.
279 Reported by Nikolay Edigaryev.
280 - SECURITY: sshd(8): Fixed a privilege separation weakness related to
281 PAM support. Attackers who could successfully compromise the
282 pre-authentication process for remote code execution and who had valid
283 credentials on the host could impersonate other users. Reported by
284 Moritz Jodeit.
285 - SECURITY: sshd(8): Fixed a use-after-free bug related to PAM support
286 that was reachable by attackers who could compromise the
287 pre-authentication process for remote code execution (closes:
288 #795711). Also reported by Moritz Jodeit.
289 - CVE-2015-5600: sshd(8): Fix circumvention of MaxAuthTries using
290 keyboard-interactive authentication (closes: #793616). By specifying
291 a long, repeating keyboard-interactive "devices" string, an attacker
292 could request the same authentication method be tried thousands of
293 times in a single pass. The LoginGraceTime timeout in sshd(8) and any
294 authentication failure delays implemented by the authentication
295 mechanism itself were still applied. Found by Kingcope.
296 - Let principals-command.sh work for noexec /var/run.
297 * Thanks to Jakub Jelen of Red Hat for Fedora's rebased version of the
298 GSSAPI key exchange patch.
299 * Document the Debian-specific change to the default value of
300 ForwardX11Trusted in ssh(1) (closes: #781469).
301
302 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
303
304openssh (1:6.7p1-6) unstable; urgency=medium
305
306 [ Martin Pitt ]
307 * openssh-server.postinst: Quiesce "Unable to connect to Upstart" error
308 message from initctl if upstart is installed, but not the current init
309 system. (LP: #1440070)
310 * openssh-server.postinst: Fix version comparisons of upgrade adjustments
311 to not apply to fresh installs.
312
313 -- Colin Watson <cjwatson@debian.org> Sun, 19 Apr 2015 14:32:43 +0100
314
315openssh (1:6.7p1-5) unstable; urgency=medium
316
317 * Revert change from previous upload, which causes far more trouble than
318 it is worth (closes: #780797):
319 - Send/accept only specific known LC_* variables, rather than using a
320 wildcard.
321 * Add a NEWS.Debian entry documenting this reversion, as it is too
322 difficult to undo the sshd_config change automatically without
323 compounding the problem of (arguably) overwriting user configuration.
324
325 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:20:56 +0000
326
327openssh (1:6.7p1-4) unstable; urgency=medium
328
329 * Send/accept only specific known LC_* variables, rather than using a
330 wildcard (closes: #765633).
331 * Document interactions between ListenAddress/Port and ssh.socket in
332 README.Debian (closes: #764842).
333 * Debconf translations:
334 - Brazilian Portuguese (thanks, José de Figueiredo; closes: #771859).
335
336 -- Colin Watson <cjwatson@debian.org> Wed, 18 Mar 2015 15:34:13 +0000
337
338openssh (1:6.7p1-3) unstable; urgency=medium
339
340 * Debconf translations:
341 - Dutch (thanks, Frans Spiesschaert; closes: #765851).
342 * Assume that dpkg-statoverride exists and drop the test for an obsolete
343 compatibility path.
344
345 -- Colin Watson <cjwatson@debian.org> Mon, 03 Nov 2014 20:29:52 +0000
346
347openssh (1:6.7p1-2) unstable; urgency=medium
348
349 * debian/tests/control: Drop isolation-container, since the tests run on a
350 high port. They're still not guaranteed to run correctly in an schroot,
351 but may manage to work, so this lets the tests at least try to run on
352 ci.debian.net.
353
354 -- Colin Watson <cjwatson@debian.org> Fri, 10 Oct 2014 10:47:19 +0100
355
356openssh (1:6.7p1-1) unstable; urgency=medium
357
358 * New upstream release (http://www.openssh.com/txt/release-6.7):
359 - sshd(8): The default set of ciphers and MACs has been altered to
360 remove unsafe algorithms. In particular, CBC ciphers and arcfour* are
361 disabled by default. The full set of algorithms remains available if
362 configured explicitly via the Ciphers and MACs sshd_config options.
363 - ssh(1), sshd(8): Add support for Unix domain socket forwarding. A
364 remote TCP port may be forwarded to a local Unix domain socket and
365 vice versa or both ends may be a Unix domain socket (closes: #236718).
366 - ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519
367 key types.
368 - sftp(1): Allow resumption of interrupted uploads.
369 - ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is
370 the same as the one sent during initial key exchange.
371 - sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses
372 when GatewayPorts=no; allows client to choose address family.
373 - sshd(8): Add a sshd_config PermitUserRC option to control whether
374 ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys
375 option.
376 - ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that
377 expands to a unique identifier based on a hash of the tuple of (local
378 host, remote user, hostname, port). Helps avoid exceeding miserly
379 pathname limits for Unix domain sockets in multiplexing control paths.
380 - sshd(8): Make the "Too many authentication failures" message include
381 the user, source address, port and protocol in a format similar to the
382 authentication success / failure messages.
383 - Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is
384 available. It considers time spent suspended, thereby ensuring
385 timeouts (e.g. for expiring agent keys) fire correctly (closes:
386 #734553).
387 - Use prctl() to prevent sftp-server from accessing
388 /proc/self/{mem,maps}.
389 * Restore TCP wrappers support, removed upstream in 6.7. It is true that
390 dropping this reduces preauth attack surface in sshd. On the other
391 hand, this support seems to be quite widely used, and abruptly dropping
392 it (from the perspective of users who don't read openssh-unix-dev) could
393 easily cause more serious problems in practice. It's not entirely clear
394 what the right long-term answer for Debian is, but it at least probably
395 doesn't involve dropping this feature shortly before a freeze.
396 * Replace patch to disable OpenSSL version check with an updated version
397 of Kurt Roeckx's patch from #732940 to just avoid checking the status
398 field.
399 * Build-depend on a new enough dpkg-dev for dpkg-buildflags, rather than
400 simply a new enough dpkg.
401 * Simplify debian/rules using /usr/share/dpkg/buildflags.mk.
402 * Use Package-Type rather than XC-Package-Type, now that it is an official
403 field.
404 * Run a subset of the upstream regression test suite at package build
405 time, and the rest of it under autopkgtest.
406
407 -- Colin Watson <cjwatson@debian.org> Thu, 09 Oct 2014 14:05:56 +0100
408
409openssh (1:6.6p1-8) unstable; urgency=medium
410
411 * Make the if-up hook use "reload" rather than "restart" if the system was
412 booted using systemd (closes: #756547).
413 * Show fingerprints of new keys after creating them in the postinst
414 (closes: #762128).
415 * Policy version 3.9.6: no changes required.
416 * Don't link /usr/share/doc/ssh to openssh-client, as this is not safe
417 between Architecture: all and Architecture: any binary packages (closes:
418 #763375).
419
420 -- Colin Watson <cjwatson@debian.org> Fri, 03 Oct 2014 12:23:57 +0100
421
422openssh (1:6.6p1-7) unstable; urgency=medium
423
424 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
425 directly.
426 * Use dh-exec to simplify override_dh_install target.
427 * Remove several unnecessary entries in debian/*.dirs.
428 * Pass noupdate to the second call to pam_motd, not the first (thanks, Ken
429 T Takusagawa; closes: #757059).
430 * Debconf translations:
431 - Turkish (thanks, Mert Dirik; closes: #756757).
432
433 -- Colin Watson <cjwatson@debian.org> Tue, 05 Aug 2014 09:10:04 +0100
434
435openssh (1:6.6p1-6) unstable; urgency=medium
436
437 * Upgrade to debhelper v9.
438 * Only use pam_keyinit on Linux architectures (closes: #747245).
439 * Make get_config_option more robust against trailing whitespace (thanks,
440 LaMont Jones).
441 * Debconf translations:
442 - Czech (thanks, Michal Šimůnek; closes: #751419).
443
444 -- Colin Watson <cjwatson@debian.org> Sat, 28 Jun 2014 14:50:04 +0100
445
446openssh (1:6.6p1-5) unstable; urgency=medium
447
448 * Force ssh-agent Upstart job to use sh syntax regardless of the user's
449 shell (thanks, Steffen Stempel; LP: #1312928).
450
451 -- Colin Watson <cjwatson@debian.org> Thu, 01 May 2014 16:27:53 +0100
452
453openssh (1:6.6p1-4) unstable; urgency=medium
454
455 * Debconf translations:
456 - Spanish (thanks, Matías Bellone; closes: #744867).
457 * Apply upstream-recommended patch to fix bignum encoding for
458 curve25519-sha256@libssh.org, fixing occasional key exchange failures.
459
460 -- Colin Watson <cjwatson@debian.org> Mon, 21 Apr 2014 21:29:53 +0100
461
462openssh (1:6.6p1-3) unstable; urgency=medium
463
464 * Debconf translations:
465 - French (thanks, Étienne Gilli; closes: #743242).
466 * Never signal the service supervisor with SIGSTOP more than once, to
467 prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).
468
469 -- Colin Watson <cjwatson@debian.org> Mon, 14 Apr 2014 12:11:50 +0100
470
471openssh (1:6.6p1-2) unstable; urgency=medium
472
473 * If no root password is set, then switch to "PermitRootLogin
474 without-password" without asking (LP: #1300127).
475
476 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2014 12:20:46 +0100
477
478openssh (1:6.6p1-1) unstable; urgency=medium
479
480 [ Colin Watson ]
481 * Apply various warning-suppression and regression-test fixes to
482 gssapi.patch from Damien Miller.
483 * New upstream release (http://www.openssh.com/txt/release-6.6,
484 LP: #1298280):
485 - CVE-2014-2532: sshd(8): when using environment passing with an
486 sshd_config(5) AcceptEnv pattern with a wildcard, OpenSSH prior to 6.6
487 could be tricked into accepting any environment variable that contains
488 the characters before the wildcard character.
489 * Re-enable btmp logging, as its permissions were fixed a long time ago in
490 response to #370050 (closes: #341883).
491 * Change to "PermitRootLogin without-password" for new installations, and
492 ask a debconf question when upgrading systems with "PermitRootLogin yes"
493 from previous versions (closes: #298138).
494 * Debconf translations:
495 - Danish (thanks, Joe Hansen).
496 - Portuguese (thanks, Américo Monteiro).
497 - Russian (thanks, Yuri Kozlov; closes: #742308).
498 - Swedish (thanks, Andreas Rönnquist).
499 - Japanese (thanks, victory).
500 - German (thanks, Stephan Beck; closes: #742541).
501 - Italian (thanks, Beatrice Torracca).
502 * Don't start ssh-agent from the Upstart user session job if something
503 like Xsession has already done so (based on work by Bruno Vasselle;
504 LP: #1244736).
505
506 [ Matthew Vernon ]
507 * CVE-2014-2653: Fix failure to check SSHFP records if server presents a
508 certificate (bug reported by me, patch by upstream's Damien Miller;
509 thanks also to Mark Wooding for his help in fixing this) (Closes:
510 #742513)
511
512 -- Colin Watson <cjwatson@debian.org> Fri, 28 Mar 2014 18:04:41 +0000
513
514openssh (1:6.5p1-6) unstable; urgency=medium
515
516 * Fix Breaks/Replaces versions of openssh-sftp-server on openssh-server
517 (thanks, Axel Beckert).
518
519 -- Colin Watson <cjwatson@debian.org> Thu, 06 Mar 2014 16:18:44 +0000
520
521openssh (1:6.5p1-5) unstable; urgency=medium
522
523 [ Colin Watson ]
524 * Add Alias=sshd.service to systemd ssh.service file, to match "Provides:
525 sshd" in the sysvinit script (thanks, Michael Biebl).
526 * Add Before=ssh.service to systemd ssh.socket file, since otherwise
527 nothing guarantees that ssh.service has stopped before ssh.socket starts
528 (thanks, Uoti Urpala).
529
530 [ Axel Beckert ]
531 * Split sftp-server into its own package to allow it to also be used by
532 other SSH server implementations like dropbear (closes: #504290).
533
534 -- Colin Watson <cjwatson@debian.org> Wed, 05 Mar 2014 13:53:08 +0000
535
536openssh (1:6.5p1-4) unstable; urgency=medium
537
538 * Configure --without-hardening on hppa, to work around
539 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798).
540 * Amend "Running sshd from inittab" instructions in README.Debian to
541 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
542 symlinks that won't work with dependency-based sysv-rc.
543 * Remove code related to non-dependency-based sysv-rc ordering, since that
544 is no longer supported.
545 * Apply patch from https://bugzilla.mindrot.org/show_bug.cgi?id=2200 to
546 fix getsockname errors when using "ssh -W" (closes: #738693).
547
548 -- Colin Watson <cjwatson@debian.org> Sat, 15 Feb 2014 02:19:36 +0000
549
550openssh (1:6.5p1-3) unstable; urgency=medium
551
552 * Clarify socket activation mode in README.Debian, as suggested by Uoti
553 Urpala.
554 * Stop claiming that "Protocol 2" is a Debian-specific default; this has
555 been upstream's default since 5.4p1.
556 * Avoid stdout noise from which(1) on purge of openssh-client.
557 * Fix sysvinit->systemd transition code to cope with still-running
558 sysvinit jobs being considered active by systemd (thanks, Uoti Urpala
559 and Michael Biebl).
560 * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may
561 have got it wrong before, and it's fairly harmless to repeat it.
562 * Remove tests for whether /dev/null is a character device from the
563 Upstart job and the systemd service files; it's there to avoid a
564 confusing failure mode in daemon(), but with modern init systems we use
565 the -D option to suppress daemonisation anyway.
566 * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the
567 Debian patch) rather than plain GPL.
568 * Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9),
569 rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2),
570 and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch
571 versions, for which we no longer have maintainer script code, and per
572 policy they would have to become Breaks nowadays anyway.
573 * Policy version 3.9.5.
574 * Drop unnecessary -1 in zlib1g Build-Depends version.
575 * Tweak dh_systemd_enable invocations to avoid lots of error noise.
576
577 -- Colin Watson <cjwatson@debian.org> Wed, 12 Feb 2014 13:10:08 +0000
578
579openssh (1:6.5p1-2) unstable; urgency=medium
580
581 * Only enable ssh.service for systemd, not both ssh.service and
582 ssh.socket. Thanks to Michael Biebl for spotting this.
583 * Backport upstream patch to unbreak case-sensitive matching of ssh_config
584 (closes: #738619).
585
586 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 11:28:35 +0000
587
588openssh (1:6.5p1-1) unstable; urgency=medium
589
590 * New upstream release (http://www.openssh.com/txt/release-6.5,
591 LP: #1275068):
592 - ssh(1): Add support for client-side hostname canonicalisation using a
593 set of DNS suffixes and rules in ssh_config(5). This allows
594 unqualified names to be canonicalised to fully-qualified domain names
595 to eliminate ambiguity when looking up keys in known_hosts or checking
596 host certificate names (closes: #115286).
597 * Switch to git; adjust Vcs-* fields.
598 * Convert to git-dpm, and drop source package documentation associated
599 with the old bzr/quilt patch handling workflow.
600 * Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration code,
601 leaving only basic configuration file compatibility, since it has been
602 nearly six years since the original vulnerability and this code is not
603 likely to be of much value any more (closes: #481853, #570651). See
604 https://lists.debian.org/debian-devel/2013/09/msg00240.html for my full
605 reasoning.
606 * Add OpenPGP signature checking configuration to watch file (thanks,
607 Daniel Kahn Gillmor; closes: #732441).
608 * Add the pam_keyinit session module, to create a new session keyring on
609 login (closes: #734816).
610 * Incorporate default path changes from shadow 1:4.0.18.1-8, removing
611 /usr/bin/X11 (closes: #644521).
612 * Generate ED25519 host keys on fresh installations. Upgraders who wish
613 to add such host keys should manually add 'HostKey
614 /etc/ssh/ssh_host_ed25519_key' to /etc/ssh/sshd_config and run
615 'ssh-keygen -q -f /etc/ssh/ssh_host_ed25519_key -N "" -t ed25519'.
616 * Drop long-obsolete "SSH now uses protocol 2 by default" section from
617 README.Debian.
618 * Add systemd support (thanks, Sven Joachim; closes: #676830).
619
620 -- Colin Watson <cjwatson@debian.org> Mon, 10 Feb 2014 14:58:26 +0000
621
622openssh (1:6.4p1-2) unstable; urgency=high
623
624 * Increase ServerKeyBits value in package-generated sshd_config to 1024
625 (closes: #727622, LP: #1244272).
626 * Restore patch to disable OpenSSL version check (closes: #732940).
627
628 -- Colin Watson <cjwatson@debian.org> Mon, 23 Dec 2013 10:44:04 +0000
629
630openssh (1:6.4p1-1) unstable; urgency=high
631
632 * New upstream release. Important changes:
633 - 6.3/6.3p1 (http://www.openssh.com/txt/release-6.3):
634 + sftp(1): add support for resuming partial downloads using the
635 "reget" command and on the sftp commandline or on the "get"
636 commandline using the "-a" (append) option (closes: #158590).
637 + ssh(1): add an "IgnoreUnknown" configuration option to selectively
638 suppress errors arising from unknown configuration directives
639 (closes: #436052).
640 + sftp(1): update progressmeter when data is acknowledged, not when
641 it's sent (partially addresses #708372).
642 + ssh(1): do not fatally exit when attempting to cleanup multiplexing-
643 created channels that are incompletely opened (closes: #651357).
644 - 6.4/6.4p1 (http://www.openssh.com/txt/release-6.4):
645 + CVE-2013-4548: sshd(8): fix a memory corruption problem triggered
646 during rekeying when an AES-GCM cipher is selected (closes:
647 #729029). Full details of the vulnerability are available at:
648 http://www.openssh.com/txt/gcmrekey.adv
649 * When running under Upstart, only consider the daemon started once it is
650 ready to accept connections (by raising SIGSTOP at that point and using
651 "expect stop").
652
653 -- Colin Watson <cjwatson@debian.org> Sat, 09 Nov 2013 18:24:16 +0000
654
655openssh (1:6.2p2-6) unstable; urgency=low
656
657 * Update config.guess and config.sub automatically at build time.
658 dh_autoreconf does not take care of that by default because openssh does
659 not use automake.
660
661 -- Colin Watson <cjwatson@debian.org> Tue, 02 Jul 2013 22:54:49 +0100
662
663openssh (1:6.2p2-5) unstable; urgency=low
664
665 [ Colin Watson ]
666 * Document consequences of ssh-agent being setgid in ssh-agent(1); see
667 #711623.
668 * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
669 ssh-argv0.
670
671 [ Yolanda Robla ]
672 * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
673 hardcoding Debian (LP: #1195342).
674
675 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jun 2013 15:24:14 +0100
676
677openssh (1:6.2p2-4) unstable; urgency=low
678
679 * Fix non-portable shell in ssh-copy-id (closes: #711162).
680 * Rebuild against debhelper 9.20130604 with fixed dependencies for
681 invoke-rc.d and Upstart jobs (closes: #711159, #711364).
682 * Set SELinux context on private host keys as well as public host keys
683 (closes: #687436).
684
685 -- Colin Watson <cjwatson@debian.org> Thu, 06 Jun 2013 17:06:31 +0100
686
687openssh (1:6.2p2-3) unstable; urgency=low
688
689 * If the running init daemon is Upstart, then, on the first upgrade to
690 this version, check whether sysvinit is still managing sshd; if so,
691 manually stop it so that it can be restarted under upstart. We do this
692 near the end of the postinst, so it shouldn't result in any appreciable
693 extra window where sshd is not running during upgrade.
694
695 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 17:42:10 +0100
696
697openssh (1:6.2p2-2) unstable; urgency=low
698
699 * Change start condition of Upstart job to be just the standard "runlevel
700 [2345]", rather than "filesystem or runlevel [2345]"; the latter makes
701 it unreasonably difficult to ensure that urandom starts before ssh, and
702 is not really necessary since one of static-network-up and failsafe-boot
703 is guaranteed to happen and will trigger entry to the default runlevel,
704 and we don't care about ssh starting before the network (LP: #1098299).
705 * Drop conffile handling for direct upgrades from pre-split ssh package;
706 this was originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a
707 truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is
708 now four Debian releases ago, we can afford to drop this and simplify
709 the packaging.
710 * Remove ssh/use_old_init_script, which was a workaround for a very old
711 bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then
712 they aren't going to be convinced now (closes: #214182).
713 * Remove support for upgrading directly from ssh-nonfree.
714 * Remove lots of maintainer script support for direct upgrades from
715 pre-etch (three releases before current stable).
716 * Add #DEBHELPER# tokens to openssh-client.postinst and
717 openssh-server.postinst.
718 * Replace old manual conffile handling code with dpkg-maintscript-helper,
719 via dh_installdeb.
720 * Switch to new unified layout for Upstart jobs as documented in
721 https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script
722 checks for a running Upstart, and we now let dh_installinit handle most
723 of the heavy lifting in maintainer scripts. Ubuntu users should be
724 essentially unaffected except that sshd may no longer start
725 automatically in chroots if the running Upstart predates 0.9.0; but the
726 main goal is simply not to break when openssh-server is installed in a
727 chroot.
728 * Remove the check for vulnerable host keys; this was first added five
729 years ago, and everyone should have upgraded through a version that
730 applied these checks by now. The ssh-vulnkey tool and the blacklisting
731 support in sshd are still here, at least for the moment.
732 * This removes the last of our uses of debconf (closes: #221531).
733 * Use the pam_loginuid session module (thanks, Laurent Bigonville; closes:
734 #677440, LP: #1067779).
735 * Bracket our session stack with calls to pam_selinux close/open (thanks,
736 Laurent Bigonville; closes: #679458).
737 * Fix dh_builddeb invocation so that we really use xz compression for
738 binary packages, as intended since 1:6.1p1-2.
739
740 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 09:07:42 +0100
741
742openssh (1:6.2p2-1) unstable; urgency=low
743
744 * New upstream release (http://www.openssh.com/txt/release-6.2p2):
745 - Only warn for missing identity files that were explicitly specified
746 (closes: #708275).
747 - Fix bug in contributed contrib/ssh-copy-id script that could result in
748 "rm *" being called on mktemp failure (closes: #708419).
749
750 -- Colin Watson <cjwatson@debian.org> Thu, 16 May 2013 14:05:06 +0100
751
752openssh (1:6.2p1-3) unstable; urgency=low
753
754 * Renumber Debian-specific additions to enum monitor_reqtype so that they
755 fit within a single byte (thanks, Jason Conti; LP: #1179202).
756
757 -- Colin Watson <cjwatson@debian.org> Mon, 13 May 2013 10:56:04 +0100
758
759openssh (1:6.2p1-2) unstable; urgency=low
760
761 * Fix build failure on Ubuntu:
762 - Include openbsd-compat/sys-queue.h from consolekit.c.
763 - Fix consolekit mismerges in monitor.c and monitor_wrap.c.
764
765 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 09:45:57 +0100
766
767openssh (1:6.2p1-1) unstable; urgency=low
768
769 * New upstream release (http://www.openssh.com/txt/release-6.2).
770 - Add support for multiple required authentication in SSH protocol 2 via
771 an AuthenticationMethods option (closes: #195716).
772 - Fix Sophie Germain formula in moduli(5) (closes: #698612).
773 - Update ssh-copy-id to Phil Hands' greatly revised version (closes:
774 #99785, #322228, #620428; LP: #518883, #835901, #1074798).
775 * Use dh-autoreconf.
776
777 -- Colin Watson <cjwatson@debian.org> Tue, 07 May 2013 11:48:16 +0100
778
779openssh (1:6.1p1-4) experimental; urgency=low
780
781 [ Gunnar Hjalmarsson ]
782 * debian/openssh-server.sshd.pam: Explicitly state that ~/.pam_environment
783 should be read, and move the pam_env calls from "auth" to "session" so
784 that it's also read when $HOME is encrypted (LP: #952185).
785
786 [ Stéphane Graber ]
787 * Add ssh-agent upstart user job. This implements something similar to
788 the 90x11-common_ssh-agent Xsession script. That is, start ssh-agent
789 and set the appropriate environment variables (closes: #703906).
790
791 -- Colin Watson <cjwatson@debian.org> Mon, 25 Mar 2013 16:58:04 +0000
792
793openssh (1:6.1p1-3) experimental; urgency=low
794
795 * Give ssh and ssh-krb5 versioned dependencies on openssh-client and
796 openssh-server, to try to reduce confusion when people run 'apt-get
797 install ssh' or similar and expect that to upgrade everything relevant.
798 * CVE-2010-5107: Improve DoS resistance by changing default of MaxStartups
799 to 10:30:100 (closes: #700102).
800
801 -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2013 21:07:31 +0000
802
803openssh (1:6.1p1-2) experimental; urgency=low
804
805 * Use xz compression for binary packages.
806 * Merge from Ubuntu:
807 - Add support for registering ConsoleKit sessions on login. (This is
808 currently enabled only when building for Ubuntu.)
809 - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's
810 been long enough since the relevant vulnerability that we shouldn't
811 need these installed by default nowadays.
812 - Add an Upstart job (not currently used by default in Debian).
813 - Add mention of ssh-keygen in ssh connect warning (Scott Moser).
814 - Install apport hooks.
815 * Only build with -j if DEB_BUILD_OPTIONS=parallel=* is used (closes:
816 #694282).
817
818 -- Colin Watson <cjwatson@debian.org> Mon, 26 Nov 2012 16:39:07 +0000
819
820openssh (1:6.1p1-1) experimental; urgency=low
821
822 * New upstream release (http://www.openssh.com/txt/release-6.1).
823 - Enable pre-auth sandboxing by default for new installs.
824 - Allow "PermitOpen none" to refuse all port-forwarding requests
825 (closes: #543683).
826
827 -- Colin Watson <cjwatson@debian.org> Fri, 07 Sep 2012 00:22:44 +0100
828
829openssh (1:6.0p1-3) unstable; urgency=low
830
831 * debconf template translations:
832 - Add Indonesian (thanks, Andika Triwidada; closes: #681670).
833 * Call restorecon on copied ~/.ssh/authorized_keys if possible, since some
834 SELinux policies require this (closes: #658675).
835 * Add ncurses-term to openssh-server's Recommends, since it's often needed
836 to support unusual terminal emulators on clients (closes: #675362).
837
838 -- Colin Watson <cjwatson@debian.org> Fri, 24 Aug 2012 06:55:36 +0100
839
840openssh (1:6.0p1-2) unstable; urgency=low
841
842 * Tighten libssl1.0.0 and libcrypto1.0.0-udeb dependencies to the current
843 "fix" version at build time (closes: #678661).
844
845 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jun 2012 12:16:06 +0100
846
847openssh (1:6.0p1-1) unstable; urgency=low
848
849 [ Roger Leigh ]
850 * Display dynamic part of MOTD from /run/motd.dynamic, if it exists
851 (closes: #669699).
852
853 [ Colin Watson ]
854 * Update OpenSSH FAQ to revision 1.113, fixing missing line break (closes:
855 #669667).
856 * New upstream release (closes: #671010,
857 http://www.openssh.org/txt/release-6.0).
858 - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
859 (closes: #643312, #650512, #671075).
860 - Add a new privilege separation sandbox implementation for Linux's new
861 seccomp sandbox, automatically enabled on platforms that support it.
862 (Note: privilege separation sandboxing is still experimental.)
863 * Fix a bashism in configure's seccomp_filter check.
864 * Add a sandbox fallback mechanism, so that behaviour on Linux depends on
865 whether the running system's kernel has seccomp_filter support, not the
866 build system's kernel (forwarded upstream as
867 https://bugzilla.mindrot.org/show_bug.cgi?id=2011).
868
869 -- Colin Watson <cjwatson@debian.org> Sat, 26 May 2012 13:48:14 +0100
870
871openssh (1:5.9p1-5) unstable; urgency=low
872
873 * Use dpkg-buildflags, including for hardening support; drop use of
874 hardening-includes.
875 * Fix cross-building:
876 - Allow using a cross-architecture pkg-config.
877 - Pass default LDFLAGS to contrib/Makefile.
878 - Allow dh_strip to strip gnome-ssh-askpass, rather than calling
879 'install -s'.
880
881 -- Colin Watson <cjwatson@debian.org> Mon, 02 Apr 2012 11:20:33 +0100
882
883openssh (1:5.9p1-4) unstable; urgency=low
884
885 * Disable OpenSSL version check again, as its SONAME is sufficient
886 nowadays (closes: #664383).
887
888 -- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 11:06:30 +0000
889
890openssh (1:5.9p1-3) unstable; urgency=low
891
892 * debconf template translations:
893 - Update Polish (thanks, Michał Kułach; closes: #659829).
894 * Ignore errors writing to console in init script (closes: #546743).
895 * Move ssh-krb5 to Section: oldlibs.
896
897 -- Colin Watson <cjwatson@debian.org> Fri, 24 Feb 2012 08:56:18 +0000
898
899openssh (1:5.9p1-2) unstable; urgency=low
900
901 * Mark openssh-client and openssh-server as Multi-Arch: foreign.
902
903 -- Colin Watson <cjwatson@debian.org> Wed, 09 Nov 2011 02:06:48 +0000
904
905openssh (1:5.9p1-1) unstable; urgency=low
906
907 * New upstream release (http://www.openssh.org/txt/release-5.9).
908 - Introduce sandboxing of the pre-auth privsep child using an optional
909 sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
910 mandatory restrictions on the syscalls the privsep child can perform.
911 - Add new SHA256-based HMAC transport integrity modes from
912 http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
913 - The pre-authentication sshd(8) privilege separation slave process now
914 logs via a socket shared with the master process, avoiding the need to
915 maintain /dev/log inside the chroot (closes: #75043, #429243,
916 #599240).
917 - ssh(1) now warns when a server refuses X11 forwarding (closes:
918 #504757).
919 - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
920 separated by whitespace (closes: #76312). The authorized_keys2
921 fallback is deprecated but documented (closes: #560156).
922 - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
923 ToS/DSCP (closes: #498297).
924 - ssh-add(1) now accepts keys piped from standard input. E.g. "ssh-add
925 - < /path/to/key" (closes: #229124).
926 - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
927 - Say "required" rather than "recommended" in unprotected-private-key
928 warning (LP: #663455).
929 * Update OpenSSH FAQ to revision 1.112.
930
931 -- Colin Watson <cjwatson@debian.org> Wed, 07 Sep 2011 23:46:00 +0100
932
933openssh (1:5.8p1-7) unstable; urgency=low
934
935 * Only recommend ssh-import-id when built on Ubuntu (closes: #635887).
936 * Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather
937 than 'lsb_release -is' so that Ubuntu derivatives behave the same way as
938 Ubuntu itself.
939
940 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 14:27:52 +0100
941
942openssh (1:5.8p1-6) unstable; urgency=low
943
944 * openssh-client and openssh-server Suggests: monkeysphere.
945 * Quieten logs when multiple from= restrictions are used in different
946 authorized_keys lines for the same key; it's still not ideal, but at
947 least you'll only get one log entry per key (closes: #630606).
948 * Merge from Ubuntu (Dustin Kirkland):
949 - openssh-server Recommends: ssh-import-id (no-op in Debian since that
950 package doesn't exist there, but this reduces the Ubuntu delta).
951
952 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2011 17:10:18 +0100
953
954openssh (1:5.8p1-5) unstable; urgency=low
955
956 * Drop openssh-server's dependency on openssh-blacklist to a
957 recommendation (closes: #622604).
958 * Update Vcs-* fields and README.source for Alioth changes.
959 * Backport from upstream:
960 - Make hostbased auth with ECDSA keys work correctly (closes: #633368).
961
962 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jul 2011 11:06:47 +0100
963
964openssh (1:5.8p1-4) unstable; urgency=low
965
966 * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb,
967 since the required minimum versions are rather old now anyway and
968 openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828).
969 * Remove unreachable code from openssh-server.postinst.
970
971 -- Colin Watson <cjwatson@debian.org> Mon, 04 Apr 2011 15:56:18 +0100
972
973openssh (1:5.8p1-3) unstable; urgency=low
974
975 * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks,
976 Joel Stanley).
977 * Allow ssh-add to read from FIFOs (thanks, Daniel Kahn Gillmor; closes:
978 #614897).
979
980 -- Colin Watson <cjwatson@debian.org> Fri, 18 Mar 2011 16:42:42 +0000
981
982openssh (1:5.8p1-2) unstable; urgency=low
983
984 * Upload to unstable.
985
986 -- Colin Watson <cjwatson@debian.org> Tue, 08 Feb 2011 10:59:17 +0000
987
988openssh (1:5.8p1-1) experimental; urgency=low
989
990 * New upstream release (http://www.openssh.org/txt/release-5.8):
991 - Fix stack information leak in legacy certificate signing
992 (http://www.openssh.com/txt/legacy-cert.adv).
993
994 -- Colin Watson <cjwatson@debian.org> Sat, 05 Feb 2011 11:13:11 +0000
995
996openssh (1:5.7p1-2) experimental; urgency=low
997
998 * Fix crash in ssh_selinux_setfscreatecon when SELinux is disabled
999 (LP: #708571).
1000
1001 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jan 2011 12:14:17 +0000
1002
1003openssh (1:5.7p1-1) experimental; urgency=low
1004
1005 * New upstream release (http://www.openssh.org/txt/release-5.7):
1006 - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
1007 and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA
1008 offer better performance than plain DH and DSA at the same equivalent
1009 symmetric key length, as well as much shorter keys.
1010 - sftp(1)/sftp-server(8): add a protocol extension to support a hard
1011 link operation. It is available through the "ln" command in the
1012 client. The old "ln" behaviour of creating a symlink is available
1013 using its "-s" option or through the preexisting "symlink" command.
1014 - scp(1): Add a new -3 option to scp: Copies between two remote hosts
1015 are transferred through the local host (closes: #508613).
1016 - ssh(1): "atomically" create the listening mux socket by binding it on
1017 a temporary name and then linking it into position after listen() has
1018 succeeded. This allows the mux clients to determine that the server
1019 socket is either ready or stale without races (closes: #454784).
1020 Stale server sockets are now automatically removed (closes: #523250).
1021 - ssh(1): install a SIGCHLD handler to reap expired child process
1022 (closes: #594687).
1023 - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
1024 temporary directories (closes: #357469, although only if you arrange
1025 for ssh-agent to actually see $TMPDIR since the setgid bit will cause
1026 it to be stripped off).
1027 * Update to current GSSAPI patch from
1028 http://www.sxw.org.uk/computing/patches/openssh-5.7p1-gsskex-all-20110125.patch:
1029 - Add GSSAPIServerIdentity option.
1030 * Generate ECDSA host keys on fresh installations. Upgraders who wish to
1031 add such host keys should manually add 'HostKey
1032 /etc/ssh/ssh_host_ecdsa_key' to /etc/ssh/sshd_config and run 'ssh-keygen
1033 -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa'.
1034 * Build-depend on libssl-dev (>= 0.9.8g) to ensure sufficient ECC support.
1035 * Backport SELinux build fix from CVS.
1036 * Rearrange selinux-role.patch so that it links properly given this
1037 SELinux build fix.
1038
1039 -- Colin Watson <cjwatson@debian.org> Wed, 26 Jan 2011 23:48:02 +0000
1040
1041openssh (1:5.6p1-3) experimental; urgency=low
1042
1043 * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
1044 longer issues.
1045 * Merge 1:5.5p1-6.
1046
1047 -- Colin Watson <cjwatson@debian.org> Thu, 30 Dec 2010 11:48:00 +0000
1048
1049openssh (1:5.6p1-2) experimental; urgency=low
1050
1051 * Backport upstream patch to install a SIGCHLD handler to reap expired ssh
1052 child processes, preventing lots of zombies when using ControlPersist
1053 (closes: #594687).
1054
1055 -- Colin Watson <cjwatson@debian.org> Tue, 26 Oct 2010 14:46:40 +0100
1056
1057openssh (1:5.6p1-1) experimental; urgency=low
1058
1059 * New upstream release (http://www.openssh.com/txt/release-5.6):
1060 - Added a ControlPersist option to ssh_config(5) that automatically
1061 starts a background ssh(1) multiplex master when connecting. This
1062 connection can stay alive indefinitely, or can be set to automatically
1063 close after a user-specified duration of inactivity (closes: #335697,
1064 #350898, #454787, #500573, #550262).
1065 - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
1066 HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
1067 Match blocks (closes: #549858).
1068 - sftp(1): fix ls in working directories that contain globbing
1069 characters in their pathnames (LP: #530714).
1070
1071 -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100
1072
1073openssh (1:5.5p1-6) unstable; urgency=low
1074
1075 * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
1076 which is intentionally no longer shipped in the openssh-server package
1077 due to /var/run often being a temporary directory, is not removed on
1078 upgrade (closes: #575582).
1079
1080 -- Colin Watson <cjwatson@debian.org> Sun, 26 Dec 2010 18:09:29 +0000
1081
1082openssh (1:5.5p1-5) unstable; urgency=low
1083
1084 * Use an architecture wildcard for libselinux1-dev (closes: #591740).
1085 * debconf template translations:
1086 - Update Danish (thanks, Joe Hansen; closes: #592800).
1087
1088 -- Colin Watson <cjwatson@debian.org> Mon, 23 Aug 2010 22:59:03 +0100
1089
1090openssh (1:5.5p1-4) unstable; urgency=low
1091
1092 [ Sebastian Andrzej Siewior ]
1093 * Add powerpcspe to architecture list for libselinux1-dev build-dependency
1094 (closes: #579843).
1095
1096 [ Colin Watson ]
1097 * Allow ~/.ssh/authorized_keys and other secure files to be
1098 group-writable, provided that the group in question contains only the
1099 file's owner; this extends a patch previously applied to ~/.ssh/config
1100 (closes: #581919).
1101 * Check primary group memberships as well as supplementary group
1102 memberships, and only allow group-writability by groups with exactly one
1103 member, as zero-member groups are typically used by setgid binaries
1104 rather than being user-private groups (closes: #581697).
1105
1106 -- Colin Watson <cjwatson@debian.org> Sat, 22 May 2010 23:37:20 +0100
1107
1108openssh (1:5.5p1-3) unstable; urgency=low
1109
1110 * Discard error messages while checking whether rsh, rlogin, and rcp
1111 alternatives exist (closes: #579285).
1112 * Drop IDEA key check; I don't think it works properly any more due to
1113 textual changes in error output, it's only relevant for direct upgrades
1114 from truly ancient versions, and it breaks upgrades if
1115 /etc/ssh/ssh_host_key can't be loaded (closes: #579570).
1116
1117 -- Colin Watson <cjwatson@debian.org> Wed, 28 Apr 2010 22:12:47 +0100
1118
1119openssh (1:5.5p1-2) unstable; urgency=low
1120
1121 * Use dh_installinit -n, since our maintainer scripts already handle this
1122 more carefully (thanks, Julien Cristau).
1123
1124 -- Colin Watson <cjwatson@debian.org> Sat, 17 Apr 2010 12:55:56 +0100
1125
1126openssh (1:5.5p1-1) unstable; urgency=low
1127
1128 * New upstream release:
1129 - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
1130 paths.
1131 - Include a language tag when sending a protocol 2 disconnection
1132 message.
1133 - Make logging of certificates used for user authentication more clear
1134 and consistent between CAs specified using TrustedUserCAKeys and
1135 authorized_keys.
1136
1137 -- Colin Watson <cjwatson@debian.org> Fri, 16 Apr 2010 10:27:30 +0100
1138
1139openssh (1:5.4p1-2) unstable; urgency=low
1140
1141 * Borrow patch from Fedora to add DNSSEC support: if glibc 2.11 is
1142 installed, the host key is published in an SSHFP RR secured with DNSSEC,
1143 and VerifyHostKeyDNS=yes, then ssh will no longer prompt for host key
1144 verification (closes: #572049).
1145 * Convert to dh(1), and use dh_installdocs --link-doc.
1146 * Drop lpia support, since Ubuntu no longer supports this architecture.
1147 * Use dh_install more effectively.
1148 * Add a NEWS.Debian entry about changes in smartcard support relative to
1149 previous unofficial builds (closes: #231472).
1150
1151 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
1152
1153openssh (1:5.4p1-1) unstable; urgency=low
1154
1155 * New upstream release (LP: #535029).
1156 - After a transition period of about 10 years, this release disables SSH
1157 protocol 1 by default. Clients and servers that need to use the
1158 legacy protocol must explicitly enable it in ssh_config / sshd_config
1159 or on the command-line.
1160 - Remove the libsectok/OpenSC-based smartcard code and add support for
1161 PKCS#11 tokens. This support is enabled by default in the Debian
1162 packaging, since it now doesn't involve additional library
1163 dependencies (closes: #231472, LP: #16918).
1164 - Add support for certificate authentication of users and hosts using a
1165 new, minimal OpenSSH certificate format (closes: #482806).
1166 - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
1167 - Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
1168 package, this overlaps with the key blacklisting facility added in
1169 openssh 1:4.7p1-9, but with different file formats and slightly
1170 different scopes; for the moment, I've roughly merged the two.)
1171 - Various multiplexing improvements, including support for requesting
1172 port-forwardings via the multiplex protocol (closes: #360151).
1173 - Allow setting an explicit umask on the sftp-server(8) commandline to
1174 override whatever default the user has (closes: #496843).
1175 - Many sftp client improvements, including tab-completion, more options,
1176 and recursive transfer support for get/put (LP: #33378). The old
1177 mget/mput commands never worked properly and have been removed
1178 (closes: #270399, #428082).
1179 - Do not prompt for a passphrase if we fail to open a keyfile, and log
1180 the reason why the open failed to debug (closes: #431538).
1181 - Prevent sftp from crashing when given a "-" without a command. Also,
1182 allow whitespace to follow a "-" (closes: #531561).
1183
1184 * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some
1185 patches apply with offsets.
1186 * Include debian/ssh-askpass-gnome.png in the Debian tarball now that
1187 we're using a source format that permits this, rather than messing
1188 around with uudecode.
1189 * Drop compatibility with the old gssapi mechanism used in ssh-krb5 <<
1190 3.8.1p1-1. Simon Wilkinson refused this patch since the old gssapi
1191 mechanism was removed due to a serious security hole, and since these
1192 versions of ssh-krb5 are no longer security-supported by Debian I don't
1193 think there's any point keeping client compatibility for them.
1194 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
1195 * Hardcode the location of xauth to /usr/bin/xauth rather than
1196 /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440).
1197 xauth no longer depends on x11-common, so we're no longer guaranteed to
1198 have the /usr/bin/X11 symlink available. I was taking advantage of the
1199 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
1200 enough in the past now that it's probably safe to just use /usr/bin.
1201 * Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes
1202 itself non-OOM-killable, and doesn't require configuration to avoid log
1203 spam in virtualisation containers (closes: #555625).
1204 * Drop Debian-specific removal of OpenSSL version check. Upstream ignores
1205 the two patchlevel nybbles now, which is sufficient to address the
1206 original reason this change was introduced, and it appears that any
1207 change in the major/minor/fix nybbles would involve a new libssl package
1208 name. (We'd still lose if the status nybble were ever changed, but that
1209 would mean somebody had packaged a development/beta version rather than
1210 a proper release, which doesn't appear to be normal practice.)
1211 * Drop most of our "LogLevel SILENT" (-qq) patch. This was originally
1212 introduced to match the behaviour of non-free SSH, in which -q does not
1213 suppress fatal errors, but matching the behaviour of OpenSSH upstream is
1214 much more important nowadays. We no longer document that -q does not
1215 suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to
1216 "LogLevel QUIET" in sshd_config on upgrade.
1217 * Policy version 3.8.4:
1218 - Add a Homepage field.
1219
1220 -- Colin Watson <cjwatson@debian.org> Tue, 06 Apr 2010 22:38:31 +0100
1221
1222openssh (1:5.3p1-3) unstable; urgency=low
1223
1224 * Convert to source format 3.0 (quilt).
1225 * Update README.source to match, and add a 'quilt-setup' target to
1226 debian/rules for the benefit of those checking out the package from
1227 revision control.
1228 * All patches are now maintained separately and tagged according to DEP-3.
1229 * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump.
1230 * Remove documentation of building for Debian 3.0 in README.Debian.
1231 Support for this was removed in 1:4.7p1-2.
1232 * Remove obsolete header from README.Debian dating from when people
1233 expected non-free SSH.
1234 * Update copyright years for GSSAPI patch.
1235
1236 -- Colin Watson <cjwatson@debian.org> Sun, 28 Feb 2010 01:35:53 +0000
1237
1238openssh (1:5.3p1-2) unstable; urgency=low
1239
1240 * Link with -Wl,--as-needed (closes: #560155).
1241 * Install upstream sshd_config as an example (closes: #415008).
1242 * Use dh_lintian.
1243 * Honour DEB_BUILD_OPTIONS=nocheck.
1244
1245 -- Colin Watson <cjwatson@debian.org> Mon, 22 Feb 2010 12:43:24 +0000
1246
1247openssh (1:5.3p1-1) unstable; urgency=low
1248
1249 * New upstream release.
1250 * Update to GSSAPI patch from
1251 http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
1252 * Backport from upstream:
1253 - Do not fall back to adding keys without constraints (ssh-add -c / -t
1254 ...) when the agent refuses the constrained add request. This was a
1255 useful migration measure back in 2002 when constraints were new, but
1256 just adds risk now (LP: #209447).
1257 * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
1258 calls. This only applied to Linux 2.2, which it's no longer feasible to
1259 run anyway (see 1:5.2p1-2 changelog).
1260
1261 -- Colin Watson <cjwatson@debian.org> Tue, 26 Jan 2010 11:55:29 +0000
1262
1263openssh (1:5.2p1-2) unstable; urgency=low
1264
1265 [ Colin Watson ]
1266 * Backport from upstream:
1267 - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd
1268 re-execs itself. Prevents two HUPs in quick succession from resulting
1269 in sshd dying (LP: #497781).
1270 - Output a debug if we can't open an existing keyfile (LP: #505301).
1271 * Use host compiler for ssh-askpass-gnome when cross-compiling.
1272 * Don't run tests when cross-compiling.
1273 * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file
1274 descriptor passing when running on Linux 2.0. The previous stable
1275 release of Debian dropped support for Linux 2.4, let alone 2.0, so this
1276 very likely has no remaining users depending on it.
1277
1278 [ Kees Cook ]
1279 * Implement DebianBanner server configuration flag that can be set to "no"
1280 to allow sshd to run without the Debian-specific extra version in the
1281 initial protocol handshake (closes: #562048).
1282
1283 -- Colin Watson <cjwatson@debian.org> Sat, 16 Jan 2010 01:28:58 +0000
1284
1285openssh (1:5.2p1-1) unstable; urgency=low
1286
1287 * New upstream release (closes: #536182). Yes, I know 5.3p1 has been out
1288 for a while, but there's no GSSAPI patch available for it yet.
1289 - Change the default cipher order to prefer the AES CTR modes and the
1290 revised "arcfour256" mode to CBC mode ciphers that are susceptible to
1291 CPNI-957037 "Plaintext Recovery Attack Against SSH".
1292 - Add countermeasures to mitigate CPNI-957037-style attacks against the
1293 SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
1294 packet length or Message Authentication Code, ssh/sshd will continue
1295 reading up to the maximum supported packet length rather than
1296 immediately terminating the connection. This eliminates most of the
1297 known differences in behaviour that leaked information about the
1298 plaintext of injected data which formed the basis of this attack
1299 (closes: #506115, LP: #379329).
1300 - ForceCommand directive now accepts commandline arguments for the
1301 internal-sftp server (closes: #524423, LP: #362511).
1302 - Add AllowAgentForwarding to available Match keywords list (closes:
1303 #540623).
1304 - Make ssh(1) send the correct channel number for
1305 SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
1306 avoid triggering 'Non-public channel' error messages on sshd(8) in
1307 openssh-5.1.
1308 - Avoid printing 'Non-public channel' warnings in sshd(8), since the
1309 ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
1310 behaviour introduced in openssh-5.1; closes: #496017).
1311 - Disable nonfunctional ssh(1) ~C escape handler in multiplex slave
1312 connections (closes: #507541).
1313 - Fix "whitepsace" typo in ssh_config(5) (closes: #514313, LP: #303835).
1314 * Update to GSSAPI patch from
1315 http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
1316 including cascading credentials support (LP: #416958).
1317 * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951).
1318 * Moved to bzr.debian.org; add Vcs-Bzr and Vcs-Browser control fields.
1319 * Add debian/README.source with instructions on bzr handling.
1320 * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes:
1321 #556644).
1322 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
1323 closes: #498684).
1324 * Don't duplicate backslashes when displaying server banner (thanks,
1325 Michał Górny; closes: #505378, LP: #425346).
1326 * Use hardening-includes for hardening logic (thanks, Kees Cook; closes:
1327 #561887).
1328 * Update OpenSSH FAQ to revision 1.110.
1329 * Remove ssh/new_config, only needed for direct upgrades from potato which
1330 are no longer particularly feasible anyway (closes: #420682).
1331 * Cope with insserv reordering of init script links.
1332 * Remove init script stop link in rc1, as killprocs handles it already.
1333 * Adjust short descriptions to avoid relying on previous experience with
1334 rsh, based on suggestions from Reuben Thomas (closes: #512198).
1335 * Remove manual page references to login.conf, which aren't applicable on
1336 non-BSD systems (closes: #154434).
1337 * Remove/adjust manual page references to BSD-specific /etc/rc (closes:
1338 #513417).
1339 * Refer to sshd_config(5) rather than sshd(8) in postinst-written
1340 /etc/ssh/sshd_config, and add UsePAM commentary from upstream-shipped
1341 configuration file (closes: #415008, although unfortunately this will
1342 only be conveniently visible on new installations).
1343 * Include URL to OpenBSD's ssl(8) in ssh(1), since I don't see a better
1344 source for the same information among Debian's manual pages (closes:
1345 #530692, LP: #456660).
1346
1347 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2010 13:23:35 +0000
1348
1349openssh (1:5.1p1-8) unstable; urgency=low
1350
1351 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;
1352 closes: #538313).
1353 * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu;
1354 closes: #547103).
1355 * Fix grammar in if-up script (closes: #549128).
1356 * Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt";
1357 closes: #548662).
1358
1359 -- Colin Watson <cjwatson@debian.org> Mon, 05 Oct 2009 13:30:49 +0100
1360
1361openssh (1:5.1p1-7) unstable; urgency=low
1362
1363 * Update config.guess and config.sub from autotools-dev 20090611.1
1364 (closes: #538301).
1365 * Set umask to 022 in the init script as well as postinsts (closes:
1366 #539030).
1367 * Add ${misc:Depends} to keep Lintian happy.
1368 * Use 'which' rather than 'type' in maintainer scripts.
1369 * Upgrade to debhelper v7.
1370
1371 -- Colin Watson <cjwatson@debian.org> Fri, 31 Jul 2009 16:28:10 +0100
1372
1373openssh (1:5.1p1-6) unstable; urgency=low
1374
1375 * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather
1376 than O_RDWR.
1377 * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
1378 #511771).
1379 * Add ufw integration (thanks, Didier Roche; see
1380 https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages;
1381 LP: #261884).
1382 * Add a comment above PermitRootLogin in sshd_config pointing to
1383 README.Debian.
1384 * Check if delgroup is present in openssh-client.postrm (closes: #530501).
1385 * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942).
1386 * Remove /var/run/sshd from openssh-server package; it will be created at
1387 run-time before starting the server.
1388 * Use invoke-rc.d in openssh-server's if-up script.
1389
1390 -- Colin Watson <cjwatson@debian.org> Fri, 05 Jun 2009 11:56:03 +0100
1391
1392openssh (1:5.1p1-5) unstable; urgency=low
1393
1394 * Backport from upstream CVS (Markus Friedl):
1395 - packet_disconnect() on padding error, too. Should reduce the success
1396 probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18.
1397 * Check that /var/run/sshd.pid exists and that the process ID listed there
1398 corresponds to sshd before running '/etc/init.d/ssh reload' from if-up
1399 script; SIGHUP is racy if called at boot before sshd has a chance to
1400 install its signal handler, but fortunately the pid file is written
1401 after that which lets us avoid the race (closes: #502444).
1402 * While the above is a valuable sanity-check, it turns out that it doesn't
1403 really fix the bug (thanks to Kevin Price for testing), so for the
1404 meantime we'll just use '/etc/init.d/ssh restart', even though it is
1405 unfortunately heavyweight.
1406
1407 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 00:34:08 +0000
1408
1409openssh (1:5.1p1-4) unstable; urgency=low
1410
1411 * ssh-copy-id: Strip trailing colons from hostname (closes: #226172,
1412 LP: #249706; thanks to Karl Goetz for nudging this along; forwarded
1413 upstream as https://bugzilla.mindrot.org/show_bug.cgi?id=1530).
1414 * Backport from upstream CVS (Markus Friedl):
1415 - Only send eow and no-more-sessions requests to openssh 5 and newer;
1416 fixes interop problems with broken ssh v2 implementations (closes:
1417 #495917).
1418 * Fix double-free when failing to parse a forwarding specification given
1419 using ~C (closes: #505330; forwarded upstream as
1420 https://bugzilla.mindrot.org/show_bug.cgi?id=1539).
1421
1422 -- Colin Watson <cjwatson@debian.org> Sun, 23 Nov 2008 14:46:10 +0000
1423
1424openssh (1:5.1p1-3) unstable; urgency=low
1425
1426 * Remove unnecessary ssh-vulnkey output in non-verbose mode when no
1427 compromised or unknown keys were found (closes: #496495).
1428 * Configure with --disable-strip; dh_strip will deal with stripping
1429 binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
1430 closes: #498681).
1431 * Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
1432 #497026).
1433
1434 -- Colin Watson <cjwatson@debian.org> Tue, 30 Sep 2008 23:09:58 +0100
1435
1436openssh (1:5.1p1-2) unstable; urgency=low
1437
1438 * Look for $SHELL on the path when executing ProxyCommands or
1439 LocalCommands (closes: #492728).
1440
1441 -- Colin Watson <cjwatson@debian.org> Tue, 29 Jul 2008 15:31:25 +0100
1442
1443openssh (1:5.1p1-1) unstable; urgency=low
1444
1445 * New upstream release (closes: #474301). Important changes not previously
1446 backported to 4.7p1:
1447 - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9):
1448 + Added chroot(2) support for sshd(8), controlled by a new option
1449 "ChrootDirectory" (closes: #139047, LP: #24777).
1450 + Linked sftp-server(8) into sshd(8). The internal sftp server is used
1451 when the command "internal-sftp" is specified in a Subsystem or
1452 ForceCommand declaration. When used with ChrootDirectory, the
1453 internal sftp server requires no special configuration of files
1454 inside the chroot environment.
1455 + Added a protocol extension method "posix-rename@openssh.com" for
1456 sftp-server(8) to perform POSIX atomic rename() operations; sftp(1)
1457 prefers this if available (closes: #308561).
1458 + Removed the fixed limit of 100 file handles in sftp-server(8).
1459 + ssh(8) will now skip generation of SSH protocol 1 ephemeral server
1460 keys when in inetd mode and protocol 2 connections are negotiated.
1461 This speeds up protocol 2 connections to inetd-mode servers that
1462 also allow Protocol 1.
1463 + Accept the PermitRootLogin directive in a sshd_config(5) Match
1464 block. Allows for, e.g. permitting root only from the local network.
1465 + Reworked sftp(1) argument splitting and escaping to be more
1466 internally consistent (i.e. between sftp commands) and more
1467 consistent with sh(1). Please note that this will change the
1468 interpretation of some quoted strings, especially those with
1469 embedded backslash escape sequences.
1470 + Support "Banner=none" in sshd_config(5) to disable sending of a
1471 pre-login banner (e.g. in a Match block).
1472 + ssh(1) ProxyCommands are now executed with $SHELL rather than
1473 /bin/sh.
1474 + ssh(1)'s ConnectTimeout option is now applied to both the TCP
1475 connection and the SSH banner exchange (previously it just covered
1476 the TCP connection). This allows callers of ssh(1) to better detect
1477 and deal with stuck servers that accept a TCP connection but don't
1478 progress the protocol, and also makes ConnectTimeout useful for
1479 connections via a ProxyCommand.
1480 + scp(1) incorrectly reported "stalled" on slow copies (closes:
1481 #140828).
1482 + scp(1) date underflow for timestamps before epoch.
1483 + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS,
1484 instead of the current standard RRSIG.
1485 + Correctly drain ACKs when a sftp(1) upload write fails midway,
1486 avoids a fatal() exit from what should be a recoverable condition.
1487 + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF
1488 hostname") to not include any IP address in the data to be hashed.
1489 + Make ssh(1) skip listening on the IPv6 wildcard address when a
1490 binding address of 0.0.0.0 is used against an old SSH server that
1491 does not support the RFC4254 syntax for wildcard bind addresses.
1492 + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is
1493 already done for X11/TCP forwarding sockets (closes: #439661).
1494 + Fix FD leak that could hang a ssh(1) connection multiplexing master.
1495 + Make ssh(1) -q option documentation consistent with reality.
1496 + Fixed sshd(8) PAM support not calling pam_session_close(), or
1497 failing to call it with root privileges (closes: #372680).
1498 + Fix activation of OpenSSL engine support when requested in configure
1499 (LP: #119295).
1500 + Cache SELinux status earlier so we know if it's enabled after a
1501 chroot (LP: #237557).
1502 - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1):
1503 + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1)
1504 and ssh-keygen(1). Visual fingerprint display is controlled by a new
1505 ssh_config(5) option "VisualHostKey". The intent is to render SSH
1506 host keys in a visual form that is amenable to easy recall and
1507 rejection of changed host keys.
1508 + sshd_config(5) now supports CIDR address/masklen matching in "Match
1509 address" blocks, with a fallback to classic wildcard matching.
1510 + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys
1511 from="..." restrictions, also with a fallback to classic wildcard
1512 matching.
1513 + Added an extended test mode (-T) to sshd(8) to request that it write
1514 its effective configuration to stdout and exit. Extended test mode
1515 also supports the specification of connection parameters (username,
1516 source address and hostname) to test the application of
1517 sshd_config(5) Match rules.
1518 + ssh(1) now prints the number of bytes transferred and the overall
1519 connection throughput for SSH protocol 2 sessions when in verbose
1520 mode (previously these statistics were displayed for protocol 1
1521 connections only).
1522 + sftp-server(8) now supports extension methods statvfs@openssh.com
1523 and fstatvfs@openssh.com that implement statvfs(2)-like operations.
1524 + sftp(1) now has a "df" command to the sftp client that uses the
1525 statvfs@openssh.com to produce a df(1)-like display of filesystem
1526 space and inode utilisation (requires statvfs@openssh.com support on
1527 the server).
1528 + Added a MaxSessions option to sshd_config(5) to allow control of the
1529 number of multiplexed sessions supported over a single TCP
1530 connection. This allows increasing the number of allowed sessions
1531 above the previous default of 10, disabling connection multiplexing
1532 (MaxSessions=1) or disallowing login/shell/subsystem sessions
1533 entirely (MaxSessions=0).
1534 + Added a no-more-sessions@openssh.com global request extension that
1535 is sent from ssh(1) to sshd(8) when the client knows that it will
1536 never request another session (i.e. when session multiplexing is
1537 disabled). This allows a server to disallow further session requests
1538 and terminate the session in cases where the client has been
1539 hijacked.
1540 + ssh-keygen(1) now supports the use of the -l option in combination
1541 with -F to search for a host in ~/.ssh/known_hosts and display its
1542 fingerprint.
1543 + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of
1544 "rsa1" (LP: #129794).
1545 + Added an AllowAgentForwarding option to sshd_config(8) to control
1546 whether authentication agent forwarding is permitted. Note that this
1547 is a loose control, as a client may install their own unofficial
1548 forwarder.
1549 + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when
1550 receiving network data, resulting in a ~10% speedup.
1551 + ssh(1) and sshd(8) will now try additional addresses when connecting
1552 to a port forward destination whose DNS name resolves to more than
1553 one address. The previous behaviour was to try the only first
1554 address and give up if that failed.
1555 + ssh(1) and sshd(8) now support signalling that channels are
1556 half-closed for writing, through a channel protocol extension
1557 notification "eow@openssh.com". This allows propagation of closed
1558 file descriptors, so that commands such as "ssh -2 localhost od
1559 /bin/ls | true" do not send unnecessary data over the wire.
1560 + sshd(8): increased the default size of ssh protocol 1 ephemeral keys
1561 from 768 to 1024 bits.
1562 + When ssh(1) has been requested to fork after authentication ("ssh
1563 -f") with ExitOnForwardFailure enabled, delay the fork until after
1564 replies for any -R forwards have been seen. Allows for robust
1565 detection of -R forward failure when using -f.
1566 + "Match group" blocks in sshd_config(5) now support negation of
1567 groups. E.g. "Match group staff,!guests".
1568 + sftp(1) and sftp-server(8) now allow chmod-like operations to set
1569 set[ug]id/sticky bits.
1570 + The MaxAuthTries option is now permitted in sshd_config(5) match
1571 blocks.
1572 + Multiplexed ssh(1) sessions now support a subset of the ~ escapes
1573 that are available to a primary connection.
1574 + ssh(1) connection multiplexing will now fall back to creating a new
1575 connection in most error cases (closes: #352830).
1576 + Make ssh(1) deal more gracefully with channel requests that fail.
1577 Previously it would optimistically assume that requests would always
1578 succeed, which could cause hangs if they did not (e.g. when the
1579 server runs out of file descriptors).
1580 + ssh(1) now reports multiplexing errors via the multiplex slave's
1581 stderr where possible (subject to LogLevel in the mux master).
1582 + Fixed an UMAC alignment problem that manifested on Itanium
1583 platforms.
1584 * Remove our local version of moduli(5) now that there's one upstream.
1585 * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description.
1586 * Add lintian overrides for empty /usr/share/doc/openssh-client
1587 directories in openssh-server and ssh (necessary due to being symlink
1588 targets).
1589 * Merge from Ubuntu:
1590 - Add 'status' action to openssh-server init script, requiring lsb-base
1591 (>= 3.2-13) (thanks, Dustin Kirkland).
1592 * debconf template translations:
1593 - Update Korean (thanks, Sunjae Park; closes: #484821).
1594
1595 -- Colin Watson <cjwatson@debian.org> Fri, 25 Jul 2008 10:45:08 +0100
1596
1597openssh (1:4.7p1-13) unstable; urgency=low
1598
1599 * Add some helpful advice to the end of ssh-vulnkey's output if there are
1600 unknown or compromised keys (thanks, Dan Jacobson; closes: #483756).
1601 * Check compromised key blacklist in ssh or ssh-add, as well as in the
1602 server (LP: #232391). To override the blacklist check in ssh
1603 temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override
1604 for the blacklist check in ssh-add.
1605 * Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1),
1606 ssh-keygen(1), and sshd(8) (closes: #484451).
1607 * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999
1608 (thanks, Frans Pop).
1609 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
1610 takes care of that (thanks, Frans Pop; closes: #484404).
1611 * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
1612 * Add documentation on removing openssh-blacklist locally (see #484269).
1613 * Clarify documentation of SSHD_OOM_ADJUST, and make setting it to the
1614 empty string actually skip adjustment as intended (closes: #487325).
1615 * Remove empty /usr/share/applications directory in ssh-askpass-gnome.
1616 * debconf template translations:
1617 - Update Romanian (thanks, Cătălin Feștilă; closes: #485415).
1618
1619 -- Colin Watson <cjwatson@debian.org> Mon, 21 Jul 2008 12:18:28 +0100
1620
1621openssh (1:4.7p1-12) unstable; urgency=low
1622
1623 * Fill in CVE identifier for ssh-vulnkey bug fixed in 1:4.7p1-10.
1624 * Refactor rejection of blacklisted user keys into a single
1625 reject_blacklisted_key function in auth.c (thanks, Dmitry V. Levin).
1626 * Fix memory leak of blacklisted host keys (thanks, Dmitry V. Levin).
1627 * debconf template translations:
1628 - Update Dutch (thanks, Bart Cornelis; closes: #483004).
1629 - Update Brazilian Portuguese (thanks, Eder L. Marques; closes:
1630 #483142).
1631 - Update Slovak (thanks, Ivan Masár; closes: #483517).
1632
1633 -- Colin Watson <cjwatson@debian.org> Thu, 29 May 2008 21:41:29 +0100
1634
1635openssh (1:4.7p1-11) unstable; urgency=low
1636
1637 * Make init script depend on $syslog, and fix some other dependency
1638 glitches (thanks, Petter Reinholdtsen; closes: #481018).
1639 * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
1640 closes: #481151).
1641 * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
1642 closes: #480020).
1643 * Allow building with heimdal-dev (LP: #125805).
1644
1645 * Check RSA1 keys without the need for a separate blacklist. Thanks to
1646 Simon Tatham for the idea.
1647 * Generate two keys with the PID forced to the same value and test that
1648 they differ, to defend against recurrences of the recent Debian OpenSSL
1649 vulnerability.
1650 * Recommend openssh-blacklist from openssh-client (closes: #481187).
1651 * Recommend openssh-blacklist-extra from openssh-client and
1652 openssh-server.
1653 * Make ssh-vulnkey report the file name and line number for each key
1654 (thanks, Heiko Schlittermann and Christopher Perry; closes: #481398).
1655 * Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see
1656 #481283).
1657 * Log IP addresses of hosts attempting to use blacklisted keys (closes:
1658 #481721).
1659 * Incorporate various ssh-vulnkey suggestions from Hugh Daniel:
1660 - Add -v (verbose) option, and don't print output for keys that have a
1661 blacklist file but that are not listed unless in verbose mode.
1662 - Move exit status documentation to a separate section.
1663 - Document key status descriptions.
1664 - Add key type to output.
1665 - Fix error output if ssh-vulnkey fails to read key files, with the
1666 exception of host keys unless -a was given.
1667 - In verbose mode, output the name of each file examined.
1668 * Handle leading IP addresses in ssh-vulnkey input (LP: #230497).
1669 * Fix various ssh-vulnkey problems pointed out by Solar Designer:
1670 - Fix some buffer handling inconsistencies.
1671 - Use xasprintf to build user key file names, avoiding truncation
1672 problems.
1673 - Drop to the user's UID when reading user keys with -a.
1674 - Use EUID rather than UID when run with no file names and without -a.
1675 - Reword "Unknown (no blacklist information)" to "Unknown (blacklist
1676 file not installed)".
1677
1678 * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi).
1679 * debconf template translations:
1680 - Update Finnish (thanks, Esko Arajärvi; closes: #481530).
1681 - Update French (thanks, Christian Perrier; closes: #481576).
1682 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591).
1683 - Update Galician (thanks, Jacobo Tarrio; closes: #481596).
1684 - Update Japanese (thanks, Kenshi Muto; closes: #481621).
1685 - Update Czech (thanks, Miroslav Kure; closes: #481624).
1686 - Update German (thanks, Helge Kreutzmann; closes: #481676).
1687 - Update Portuguese (thanks, Ricardo Silva; closes: #481781).
1688 - Update Basque (thanks, Piarres Beobide; closes: #481836).
1689 - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870).
1690 - Update Vietnamese (thanks, Clytie Siddall; closes: #481876).
1691 - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes:
1692 #482341).
1693 - Update Turkish (thanks, Mert Dirik; closes: #482548).
1694 - Update Russian (thanks, Yuri Kozlov; closes: #482887).
1695 - Update Swedish (thanks, Martin Bagge; closes: #482464).
1696 - Update Italian (thanks, Luca Monducci; closes: #482808).
1697
1698 -- Colin Watson <cjwatson@debian.org> Mon, 26 May 2008 12:21:39 +0100
1699
1700openssh (1:4.7p1-10) unstable; urgency=low
1701
1702 * Add a FILES section to ssh-vulnkey(1) (thanks, Hugh Daniel).
1703 * CVE-2008-2285: ssh-vulnkey handles options in authorized_keys
1704 (LP: #230029), and treats # as introducing a comment even if it is
1705 preceded by whitespace.
1706
1707 -- Colin Watson <cjwatson@debian.org> Wed, 14 May 2008 12:35:05 +0100
1708
1709openssh (1:4.7p1-9) unstable; urgency=critical
1710
1711 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-8.
1712 * Mitigate OpenSSL security vulnerability (CVE-2008-0166):
1713 - Add key blacklisting support. Keys listed in
1714 /etc/ssh/blacklist.TYPE-LENGTH will be rejected for authentication by
1715 sshd, unless "PermitBlacklistedKeys yes" is set in
1716 /etc/ssh/sshd_config.
1717 - Add a new program, ssh-vulnkey, which can be used to check keys
1718 against these blacklists.
1719 - Depend on openssh-blacklist.
1720 - Force dependencies on libssl0.9.8 / libcrypto0.9.8-udeb to at least
1721 0.9.8g-9.
1722 - Automatically regenerate known-compromised host keys, with a
1723 critical-priority debconf note. (I regret that there was no time to
1724 gather translations.)
1725
1726 -- Colin Watson <cjwatson@debian.org> Tue, 13 May 2008 12:33:38 +0100
1727
1728openssh (1:4.7p1-8) unstable; urgency=high
1729
1730 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
1731 * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
1732 configurations (LP: #211400).
1733 * Tweak scp's reporting of filenames in verbose mode to be a bit less
1734 confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
1735 * Backport from 4.9p1:
1736 - CVE-2008-1657: Ignore ~/.ssh/rc if a sshd_config ForceCommand is
1737 specified.
1738 - Add no-user-rc authorized_keys option to disable execution of
1739 ~/.ssh/rc.
1740 * Backport from Simon Wilkinson's GSSAPI key exchange patch for 5.0p1:
1741 - Add code to actually implement GSSAPIStrictAcceptorCheck, which had
1742 somehow been omitted from a previous version of this patch (closes:
1743 #474246).
1744
1745 -- Colin Watson <cjwatson@debian.org> Sun, 06 Apr 2008 12:34:19 +0100
1746
1747openssh (1:4.7p1-7) unstable; urgency=low
1748
1749 * Ignore errors writing to oom_adj (closes: #473573).
1750
1751 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2008 16:24:44 +0100
1752
1753openssh (1:4.7p1-6) unstable; urgency=low
1754
1755 * Disable the Linux kernel's OOM-killer for the sshd parent; tweak
1756 SSHD_OOM_ADJUST in /etc/default/ssh to change this (closes: #341767).
1757
1758 -- Colin Watson <cjwatson@debian.org> Sun, 30 Mar 2008 21:14:12 +0100
1759
1760openssh (1:4.7p1-5) unstable; urgency=low
1761
1762 * Recommends: xauth rather than Suggests: xbase-clients.
1763 * Document in ssh(1) that '-S none' disables connection sharing
1764 (closes: #471437).
1765 * Patch from Red Hat / Fedora:
1766 - CVE-2008-1483: Don't use X11 forwarding port which can't be bound on
1767 all address families, preventing hijacking of X11 forwarding by
1768 unprivileged users when both IPv4 and IPv6 are configured (closes:
1769 #463011).
1770 * Use printf rather than echo -en (a bashism) in openssh-server.config and
1771 openssh-server.preinst.
1772 * debconf template translations:
1773 - Update Finnish (thanks, Esko Arajärvi; closes: #468563).
1774
1775 -- Colin Watson <cjwatson@debian.org> Sat, 22 Mar 2008 12:37:00 +0000
1776
1777openssh (1:4.7p1-4) unstable; urgency=low
1778
1779 [ Caleb Case ]
1780 * Fix configure detection of getseuserbyname and
1781 get_default_context_with_level (closes: #465614, LP: #188136).
1782
1783 [ Colin Watson ]
1784 * Include the autogenerated debian/copyright in the source package.
1785 * Move /etc/pam.d/ssh to /etc/pam.d/sshd, allowing us to stop defining
1786 SSHD_PAM_SERVICE (closes: #255870).
1787
1788 -- Colin Watson <cjwatson@debian.org> Wed, 13 Feb 2008 18:18:52 +0000
1789
1790openssh (1:4.7p1-3) unstable; urgency=low
1791
1792 * Improve grammar of ssh-askpass-gnome description.
1793 * Backport from upstream:
1794 - Use the correct packet maximum sizes for remote port and agent
1795 forwarding. Prevents the server from killing the connection if too
1796 much data is queued and an excessively large packet gets sent
1797 (https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
1798 * Allow passing temporary daemon parameters on the init script's command
1799 line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks,
1800 Marc Haber; closes: #458547).
1801
1802 -- Colin Watson <cjwatson@debian.org> Fri, 01 Feb 2008 21:59:59 +0000
1803
1804openssh (1:4.7p1-2) unstable; urgency=low
1805
1806 * Adjust many relative links in faq.html to point to
1807 http://www.openssh.org/ (thanks, Dan Jacobson; mentioned in #459807).
1808 * Pass --with-mantype=doc to configure rather than build-depending on
1809 groff (closes: #460121).
1810 * Add armel to architecture list for libselinux1-dev build-dependency
1811 (closes: #460136).
1812 * Drop source-compatibility with Debian 3.0:
1813 - Remove support for building with GNOME 1. This allows simplification
1814 of our GNOME build-dependencies (see #460136).
1815 - Remove hacks to support the old PAM configuration scheme.
1816 - Remove compatibility for building without po-debconf.
1817 * Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I
1818 can see, the GTK2 version of ssh-askpass-gnome has never required
1819 libgnomeui-dev.
1820
1821 -- Colin Watson <cjwatson@debian.org> Fri, 11 Jan 2008 00:14:10 +0000
1822
1823openssh (1:4.7p1-1) unstable; urgency=low
1824
1825 * New upstream release (closes: #453367).
1826 - CVE-2007-4752: Prevent ssh(1) from using a trusted X11 cookie if
1827 creation of an untrusted cookie fails; found and fixed by Jan Pechanec
1828 (closes: #444738).
1829 - sshd(8) in new installations defaults to SSH Protocol 2 only. Existing
1830 installations are unchanged.
1831 - The SSH channel window size has been increased, and both ssh(1)
1832 sshd(8) now send window updates more aggressively. These improves
1833 performance on high-BDP (Bandwidth Delay Product) networks.
1834 - ssh(1) and sshd(8) now preserve MAC contexts between packets, which
1835 saves 2 hash calls per packet and results in 12-16% speedup for
1836 arcfour256/hmac-md5.
1837 - A new MAC algorithm has been added, UMAC-64 (RFC4418) as
1838 "umac-64@openssh.com". UMAC-64 has been measured to be approximately
1839 20% faster than HMAC-MD5.
1840 - Failure to establish a ssh(1) TunnelForward is now treated as a fatal
1841 error when the ExitOnForwardFailure option is set.
1842 - ssh(1) returns a sensible exit status if the control master goes away
1843 without passing the full exit status.
1844 - When using a ProxyCommand in ssh(1), set the outgoing hostname with
1845 gethostname(2), allowing hostbased authentication to work.
1846 - Make scp(1) skip FIFOs rather than hanging (closes: #246774).
1847 - Encode non-printing characters in scp(1) filenames. These could cause
1848 copies to be aborted with a "protocol error".
1849 - Handle SIGINT in sshd(8) privilege separation child process to ensure
1850 that wtmp and lastlog records are correctly updated.
1851 - Report GSSAPI mechanism in errors, for libraries that support multiple
1852 mechanisms.
1853 - Improve documentation for ssh-add(1)'s -d option.
1854 - Rearrange and tidy GSSAPI code, removing server-only code being linked
1855 into the client.
1856 - Delay execution of ssh(1)'s LocalCommand until after all forwardings
1857 have been established.
1858 - In scp(1), do not truncate non-regular files.
1859 - Improve exit message from ControlMaster clients.
1860 - Prevent sftp-server(8) from reading until it runs out of buffer space,
1861 whereupon it would exit with a fatal error (closes: #365541).
1862 - pam_end() was not being called if authentication failed
1863 (closes: #405041).
1864 - Manual page datestamps updated (closes: #433181).
1865 * Install the OpenSSH FAQ in /usr/share/doc/openssh-client.
1866 - Includes documentation on copying files with colons using scp
1867 (closes: #303453).
1868 * Create /var/run/sshd on start even if /etc/ssh/sshd_not_to_be_run exists
1869 (closes: #453285).
1870 * Fix "overriden" typo in ssh(1) (thanks, A. Costa; closes: #390699).
1871 * Refactor debian/rules configure and make invocations to make development
1872 easier.
1873 * Remove the hideously old /etc/ssh/primes on upgrade (closes: #123013).
1874 * Update moduli(5) to revision 1.11 from OpenBSD CVS.
1875 * Document the non-default options we set as standard in ssh_config(5) and
1876 sshd_config(5) (closes: #327886, #345628).
1877 * Recode LICENCE to UTF-8 when concatenating it to debian/copyright.
1878 * Override desktop-file-but-no-dh_desktop-call lintian warning; the
1879 .desktop file is intentionally not installed (see 1:3.8.1p1-10).
1880 * Update copyright dates for Kerberos patch in debian/copyright.head.
1881 * Policy version 3.7.3: no changes required.
1882
1883 -- Colin Watson <cjwatson@debian.org> Mon, 24 Dec 2007 16:43:02 +0000
1884
1885openssh (1:4.6p1-7) unstable; urgency=low
1886
1887 * Don't build PIE executables on m68k (closes: #451192).
1888 * Use autotools-dev's recommended configure --build and --host options.
1889 * Adjust README.Debian to suggest mailing debian-ssh@lists.debian.org
1890 rather than Matthew.
1891 * Check whether deluser exists in postrm (closes: #454085).
1892
1893 -- Colin Watson <cjwatson@debian.org> Mon, 03 Dec 2007 11:11:02 +0000
1894
1895openssh (1:4.6p1-6) unstable; urgency=low
1896
1897 * Remove blank line between head comment and first template in
1898 debian/openssh-server.templates.master; apparently it confuses some
1899 versions of debconf.
1900 * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas
1901 Pospisek; closes: #441817).
1902 * Discard error output from dpkg-query in preinsts, in case the ssh
1903 metapackage is not installed.
1904 * Fix sshd/inittab advice in README.Debian to account for rc.d movement
1905 (closes: #450632).
1906 * Suppress error from debian/rules if lsb-release is not installed.
1907 * Don't ignore errors from 'make -C contrib clean'.
1908 * Adjust categories in ssh-askpass-gnome.desktop to comply with the
1909 Desktop Menu Specification.
1910 * debconf template translations:
1911 - Add Slovak (thanks, Ivan Masár; closes: #441690).
1912 - Update Brazilian Portuguese (thanks, Eder L. Marques;
1913 closes: #447145).
1914
1915 -- Colin Watson <cjwatson@debian.org> Mon, 12 Nov 2007 11:47:28 +0000
1916
1917openssh (1:4.6p1-5) unstable; urgency=low
1918
1919 * Identify ssh as a metapackage rather than a transitional package. It's
1920 still useful as a quick way to install both the client and the server.
1921 * ssh-copy-id now checks the exit status of ssh-add -L (thanks, Adeodato
1922 Simó; closes: #221675).
1923 * ssh-copy-id no longer prints the output of expr (thanks, Peter
1924 Eisentraut; closes: #291534).
1925 * ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than
1926 ~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris;
1927 closes: #234627).
1928 * Build-depend on libselinux1-dev on lpia.
1929 * openssh-client Suggests: keychain.
1930 * debconf template translations:
1931 - Update Catalan (thanks, Jordà Polo; closes: #431970).
1932
1933 -- Colin Watson <cjwatson@debian.org> Mon, 30 Jul 2007 09:34:38 +0100
1934
1935openssh (1:4.6p1-4) unstable; urgency=low
1936
1937 * Don't build PIE executables on hppa, as they crash.
1938
1939 -- Colin Watson <cjwatson@debian.org> Thu, 05 Jul 2007 11:06:54 +0100
1940
1941openssh (1:4.6p1-3) unstable; urgency=low
1942
1943 * Only build PIE executables on Linux and NetBSD (closes: #430455).
1944 * Fix broken switch fallthrough when SELinux is running in permissive mode
1945 (closes: #430838).
1946 * Document that HashKnownHosts may break tab-completion (closes: #430154).
1947
1948 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jun 2007 07:15:38 +0100
1949
1950openssh (1:4.6p1-2) unstable; urgency=low
1951
1952 * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
1953 * Clarify that 'ssh -q -q' still prints errors caused by bad arguments
1954 (i.e. before the logging system is initialised).
1955 * Suppress "Connection to <host> closed" and "Connection to master closed"
1956 messages at loglevel SILENT (thanks, Jaap Eldering; closes: #409788).
1957 * Suppress "Pseudo-terminal will not be allocated because stdin is not a
1958 terminal" message at loglevels QUIET and SILENT (closes: #366814).
1959 * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and
1960 sshd_config(5).
1961 * Add try-restart action to init script.
1962 * Add /etc/network/if-up.d/openssh-server to restart sshd when new
1963 interfaces appear (LP: #103436).
1964 * Backport from upstream:
1965 - Move C/R -> kbdint special case to after the defaults have been
1966 loaded, which makes ChallengeResponse default to yes again. This was
1967 broken by the Match changes and not fixed properly subsequently
1968 (closes: #428968).
1969 - Silence spurious error messages from hang-on-exit fix
1970 (http://bugzilla.mindrot.org/show_bug.cgi?id=1306, closes: #429531).
1971
1972 -- Colin Watson <cjwatson@debian.org> Wed, 20 Jun 2007 11:52:44 +0100
1973
1974openssh (1:4.6p1-1) unstable; urgency=low
1975
1976 * New upstream release (closes: #395507, #397961, #420035). Important
1977 changes not previously backported to 4.3p2:
1978 - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
1979 + On portable OpenSSH, fix a GSSAPI authentication abort that could be
1980 used to determine the validity of usernames on some platforms.
1981 + Implemented conditional configuration in sshd_config(5) using the
1982 "Match" directive. This allows some configuration options to be
1983 selectively overridden if specific criteria (based on user, group,
1984 hostname and/or address) are met. So far a useful subset of
1985 post-authentication options are supported and more are expected to
1986 be added in future releases.
1987 + Add support for Diffie-Hellman group exchange key agreement with a
1988 final hash of SHA256.
1989 + Added a "ForceCommand" directive to sshd_config(5). Similar to the
1990 command="..." option accepted in ~/.ssh/authorized_keys, this forces
1991 the execution of the specified command regardless of what the user
1992 requested. This is very useful in conjunction with the new "Match"
1993 option.
1994 + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
1995 permitopen="..." authorized_keys option, allowing fine-grained
1996 control over the port-forwardings that a user is allowed to
1997 establish.
1998 + Add optional logging of transactions to sftp-server(8).
1999 + ssh(1) will now record port numbers for hosts stored in
2000 ~/.ssh/known_hosts when a non-standard port has been requested
2001 (closes: #50612).
2002 + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
2003 non-zero exit code) when requested port forwardings could not be
2004 established.
2005 + Extend sshd_config(5) "SubSystem" declarations to allow the
2006 specification of command-line arguments.
2007 + Replacement of all integer overflow susceptible invocations of
2008 malloc(3) and realloc(3) with overflow-checking equivalents.
2009 + Many manpage fixes and improvements.
2010 + Add optional support for OpenSSL hardware accelerators (engines),
2011 enabled using the --with-ssl-engine configure option.
2012 + Tokens in configuration files may be double-quoted in order to
2013 contain spaces (closes: #319639).
2014 + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
2015 session exits very quickly (closes: #307890).
2016 + Fix some incorrect buffer allocation calculations (closes: #410599).
2017 + ssh-add doesn't ask for a passphrase if key file permissions are too
2018 liberal (closes: #103677).
2019 + Likewise, ssh doesn't ask either (closes: #99675).
2020 - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
2021 + sshd now allows the enabling and disabling of authentication methods
2022 on a per user, group, host and network basis via the Match directive
2023 in sshd_config.
2024 + Fixed an inconsistent check for a terminal when displaying scp
2025 progress meter (closes: #257524).
2026 + Fix "hang on exit" when background processes are running at the time
2027 of exit on a ttyful/login session (closes: #88337).
2028 * Update to current GSSAPI patch from
2029 http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
2030 install ChangeLog.gssapi.
2031 * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
2032 * Use LSB functions in init scripts, and add an LSB-style header (partly
2033 from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
2034 * Move init script start links to S16, move rc1 stop link to K84, and
2035 remove rc0 and rc6 stop links altogether (the last part from Ubuntu;
2036 closes: #122188).
2037 * Emit a slightly more informative message from the init script if
2038 /dev/null has somehow become not a character device (closes: #369964).
2039 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
2040 * Merge from Ubuntu:
2041 - Build position-independent executables (only for debs, not for udebs)
2042 to take advantage of address space layout randomisation.
2043 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
2044 the default path.
2045 * Use ${binary:Version} rather than ${Source-Version} in openssh-server ->
2046 openssh-client dependency.
2047
2048 -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:28:26 +0100
2049
2050openssh (1:4.3p2-11) unstable; urgency=low
2051
2052 * It's been four and a half years now since I took over as "temporary"
2053 maintainer, so the Maintainer field is getting a bit inaccurate. Set
2054 Maintainer to debian-ssh@lists.debian.org and leave Matthew and myself
2055 as Uploaders.
2056 * Use dpkg-query to fetch conffile md5sums rather than parsing
2057 /var/lib/dpkg/status directly.
2058 * openssh-client Suggests: libpam-ssh (closes: #427840).
2059 * Use 'start-stop-daemon --oknodo' so that openssh-server's init script
2060 exits successfully if sshd is already running (closes: #426858).
2061
2062 * Apply results of debconf templates and package descriptions review by
2063 debian-l10n-english (closes: #420107, #420742).
2064 * debconf template translations:
2065 - Update Dutch (thanks, Machteld de Kok; closes: #419260).
2066 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #420630).
2067 - Update Galician (thanks, Jacobo Tarrio; closes: #420635).
2068 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2069 closes: #420651).
2070 - Update Swedish (thanks, Daniel Nylander; closes: #420663).
2071 - Add Bulgarian (thanks, Damyan Ivanov; closes: #420703).
2072 - Add Tamil (thanks, Tirumurti Vasudevan; closes: #420739).
2073 - Update German (thanks, Helge Kreutzmann; closes: #420743).
2074 - Update Japanese (thanks, Kenshi Muto; closes: #420946).
2075 - Add Basque (thanks, Piarres Beobide; closes: #421238).
2076 - Update Italian (thanks, Luca Monducci; closes: #421348).
2077 - Update Czech (thanks, Miroslav Kure; closes: #421484).
2078 - Update Romanian (thanks, Igor Stirbu; closes: #421760).
2079 - Update Russian (thanks, Yuriy Talakan' and Sergey Alyoshin;
2080 closes: #420862).
2081 - Update Dutch (thanks, Bart Cornelis; closes: #422767).
2082 - Update Portuguese (thanks, Ricardo Silva; closes: #423112).
2083 - Update French (thanks, Christian Perrier).
2084 - Add Korean (thanks, Sunjae Park; closes: #424008).
2085 - Update Vietnamese (thanks, Clytie Siddall; closes: #426991).
2086
2087 -- Colin Watson <cjwatson@debian.org> Sun, 10 Jun 2007 08:59:42 +0100
2088
2089openssh (1:4.3p2-10) unstable; urgency=low
2090
2091 * Multiply openssh-client-udeb's Installer-Menu-Item by 100.
2092 * Increase MAX_SESSIONS to 64.
2093
2094 -- Colin Watson <cjwatson@debian.org> Tue, 10 Apr 2007 19:17:20 +0100
2095
2096openssh (1:4.3p2-9) unstable; urgency=high
2097
2098 [ Russ Allbery ]
2099 * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5
2100 (closes: #404863).
2101 * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
2102
2103 [ Colin Watson ]
2104 * debconf template translations:
2105 - Add Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #412330).
2106
2107 -- Colin Watson <cjwatson@debian.org> Mon, 5 Mar 2007 16:13:50 +0000
2108
2109openssh (1:4.3p2-8) unstable; urgency=medium
2110
2111 [ Vincent Untz ]
2112 * Give the ssh-askpass-gnome window a default icon; remove unnecessary
2113 icon extension from .desktop file (closes:
2114 https://launchpad.net/bugs/27152).
2115
2116 [ Colin Watson ]
2117 * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
2118 sufficient to replace conffiles (closes: #402804).
2119 * Make GSSAPICleanupCreds a compatibility alias for
2120 GSSAPICleanupCredentials. Mark GSSUseSessionCCache and
2121 GSSAPIUseSessionCredCache as known-but-unsupported options, and migrate
2122 away from them on upgrade.
2123 * It turns out that the people who told me that removing a conffile in the
2124 preinst was sufficient to have dpkg replace it without prompting when
2125 moving a conffile between packages were very much mistaken. As far as I
2126 can tell, the only way to do this reliably is to write out the desired
2127 new text of the conffile in the preinst. This is gross, and requires
2128 shipping the text of all conffiles in the preinst too, but there's
2129 nothing for it. Fortunately this nonsense is only required for smooth
2130 upgrades from sarge.
2131 * debconf template translations:
2132 - Add Romanian (thanks, Stan Ioan-Eugen; closes: #403528).
2133
2134 -- Colin Watson <cjwatson@debian.org> Sat, 23 Dec 2006 18:38:33 +0000
2135
2136openssh (1:4.3p2-7) unstable; urgency=medium
2137
2138 [ Colin Watson ]
2139 * Ignore errors from usermod when changing sshd's shell, since it will
2140 fail if the sshd user is not local (closes: #398436).
2141 * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
2142 to avoid unnecessary conffile resolution steps for administrators
2143 (thanks, Jari Aalto; closes: #335259).
2144 * Fix quoting error in configure.ac and regenerate configure (thanks, Ben
2145 Pfaff; closes: #391248).
2146 * When installing openssh-client or openssh-server from scratch, remove
2147 any unchanged conffiles from the pre-split ssh package to work around a
2148 bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).
2149
2150 [ Russ Allbery ]
2151 * Create transitional ssh-krb5 package which enables GSSAPI configuration
2152 in sshd_config (closes: #390986).
2153 * Default client to attempting GSSAPI authentication.
2154 * Remove obsolete GSSAPINoMICAuthentication from sshd_config if it's
2155 found.
2156 * Add ssh -K option, the converse of -k, to enable GSSAPI credential
2157 delegation (closes: #401483).
2158
2159 -- Colin Watson <cjwatson@debian.org> Wed, 6 Dec 2006 23:00:49 +0000
2160
2161openssh (1:4.3p2-6) unstable; urgency=low
2162
2163 * Acknowledge NMU (thanks, Manoj; closes: #394795).
2164 * Backport from 4.5p1:
2165 - Fix a bug in the sshd privilege separation monitor that weakened its
2166 verification of successful authentication. This bug is not known to be
2167 exploitable in the absence of additional vulnerabilities.
2168 * openssh-server Suggests: molly-guard (closes: #395473).
2169 * debconf template translations:
2170 - Update German (thanks, Helge Kreutzmann; closes: #395947).
2171
2172 -- Colin Watson <cjwatson@debian.org> Wed, 15 Nov 2006 00:07:32 +0000
2173
2174openssh (1:4.3p2-5.1) unstable; urgency=low
2175
2176 * NMU to update SELinux patch, bringing it in line with current selinux
2177 releases. The patch for this NMU is simply the Bug#394795 patch,
2178 and no other changes. (closes: #394795)
2179
2180 -- Manoj Srivastava <srivasta@debian.org> Mon, 23 Oct 2006 14:11:24 -0500
2181
2182openssh (1:4.3p2-5) unstable; urgency=low
2183
2184 * Remove ssh/insecure_telnetd check altogether (closes: #391081).
2185 * debconf template translations:
2186 - Update Danish (thanks, Claus Hindsgaul; closes: #390612).
2187
2188 -- Colin Watson <cjwatson@debian.org> Thu, 5 Oct 2006 09:04:19 +0100
2189
2190openssh (1:4.3p2-4) unstable; urgency=high
2191
2192 * Backport from 4.4p1 (since I don't have an updated version of the GSSAPI
2193 patch yet):
2194 - CVE-2006-4924: Fix a pre-authentication denial of service found by
2195 Tavis Ormandy, that would cause sshd(8) to spin until the login grace
2196 time expired (closes: #389995).
2197 - CVE-2006-5051: Fix an unsafe signal hander reported by Mark Dowd. The
2198 signal handler was vulnerable to a race condition that could be
2199 exploited to perform a pre-authentication denial of service. On
2200 portable OpenSSH, this vulnerability could theoretically lead to
2201 pre-authentication remote code execution if GSSAPI authentication is
2202 enabled, but the likelihood of successful exploitation appears remote.
2203
2204 * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël
2205 Hertzog; closes: #369395).
2206 * Remove no-longer-used ssh/insecure_rshd debconf template.
2207 * Make ssh/insecure_telnetd Type: error (closes: #388946).
2208
2209 * debconf template translations:
2210 - Update Portuguese (thanks, Rui Branco; closes: #381942).
2211 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2212 closes: #382966).
2213
2214 -- Colin Watson <cjwatson@debian.org> Fri, 29 Sep 2006 16:28:24 +0100
2215
2216openssh (1:4.3p2-3) unstable; urgency=low
2217
2218 * Document KeepAlive->TCPKeepAlive renaming in sshd_config(5) (closes:
2219 https://launchpad.net/bugs/50702).
2220 * Change sshd user's shell to /usr/sbin/nologin (closes: #366541).
2221 Introduces dependency on passwd for usermod.
2222 * debconf template translations:
2223 - Update French (thanks, Denis Barbier; closes: #368503).
2224 - Update Dutch (thanks, Bart Cornelis; closes: #375100).
2225 - Update Japanese (thanks, Kenshi Muto; closes: #379950).
2226
2227 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jul 2006 00:12:36 +0100
2228
2229openssh (1:4.3p2-2) unstable; urgency=low
2230
2231 * Include commented-out pam_access example in /etc/pam.d/ssh.
2232 * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the
2233 server configuration, as otherwise 'sshd -t' will complain about the
2234 lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).
2235 * debconf template translations:
2236 - Update Russian (thanks, Yuriy Talakan'; closes: #367143).
2237 - Update Czech (thanks, Miroslav Kure; closes: #367161).
2238 - Update Italian (thanks, Luca Monducci; closes: #367186).
2239 - Update Galician (thanks, Jacobo Tarrio; closes: #367318).
2240 - Update Swedish (thanks, Daniel Nylander; closes: #367971).
2241
2242 -- Colin Watson <cjwatson@debian.org> Fri, 19 May 2006 09:14:27 +0100
2243
2244openssh (1:4.3p2-1) unstable; urgency=low
2245
2246 * New upstream release (closes: #361032).
2247 - CVE-2006-0225: scp (as does rcp, on which it is based) invoked a
2248 subshell to perform local to local, and remote to remote copy
2249 operations. This subshell exposed filenames to shell expansion twice;
2250 allowing a local attacker to create filenames containing shell
2251 metacharacters that, if matched by a wildcard, could lead to execution
2252 of attacker-specified commands with the privilege of the user running
2253 scp (closes: #349645).
2254 - Add support for tunneling arbitrary network packets over a connection
2255 between an OpenSSH client and server via tun(4) virtual network
2256 interfaces. This allows the use of OpenSSH (4.3+) to create a true VPN
2257 between the client and server providing real network connectivity at
2258 layer 2 or 3. This feature is experimental.
2259 - Reduce default key length for new DSA keys generated by ssh-keygen
2260 back to 1024 bits. DSA is not specified for longer lengths and does
2261 not fully benefit from simply making keys longer. As per FIPS 186-2
2262 Change Notice 1, ssh-keygen will refuse to generate a new DSA key
2263 smaller or larger than 1024 bits.
2264 - Fixed X forwarding failing to start when the X11 client is executed in
2265 background at the time of session exit.
2266 - Change ssh-keygen to generate a protocol 2 RSA key when invoked
2267 without arguments (closes: #114894).
2268 - Fix timing variance for valid vs. invalid accounts when attempting
2269 Kerberos authentication.
2270 - Ensure that ssh always returns code 255 on internal error
2271 (closes: #259865).
2272 - Cleanup wtmp files on SIGTERM when not using privsep.
2273 - Set SO_REUSEADDR on X11 listeners to avoid problems caused by
2274 lingering sockets from previous session (X11 applications can
2275 sometimes not connect to 127.0.0.1:60xx) (closes:
2276 https://launchpad.net/bugs/25528).
2277 - Ensure that fds 0, 1 and 2 are always attached in all programs, by
2278 duping /dev/null to them if necessary.
2279 - Xauth list invocation had bogus "." argument.
2280 - Remove internal assumptions on key exchange hash algorithm and output
2281 length, preparing OpenSSH for KEX methods with alternate hashes.
2282 - Ignore junk sent by a server before it sends the "SSH-" banner.
2283 - Many manual page improvements.
2284 - Lots of cleanups, including fixes to memory leaks on error paths and
2285 possible crashes.
2286 * Update to current GSSAPI patch from
2287 http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
2288 (closes: #352042).
2289 * debian/rules: Resynchronise CFLAGS with that generated by configure.
2290 * Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself
2291 when PAM is enabled, but relies on PAM to do it.
2292 * Rename KeepAlive to TCPKeepAlive in default sshd_config
2293 (closes: #349896).
2294 * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf
2295 templates to make boolean short descriptions end with a question mark
2296 and to avoid use of the first person.
2297 * Ship README.tun.
2298 * Policy version 3.7.2: no changes required.
2299 * debconf template translations:
2300 - Update Italian (thanks, Luca Monducci; closes: #360348).
2301 - Add Galician (thanks, Jacobo Tarrio; closes: #361220).
2302
2303 -- Colin Watson <cjwatson@debian.org> Fri, 12 May 2006 12:48:24 +0100
2304
2305openssh (1:4.2p1-8) unstable; urgency=low
2306
2307 [ Frans Pop ]
2308 * Use udeb support introduced in debhelper 4.2.0 (available in sarge)
2309 rather than constructing udebs by steam.
2310 * Require debhelper 5.0.22, which generates correct shared library
2311 dependencies for udebs (closes: #360068). This build-dependency can be
2312 ignored if building on sarge.
2313
2314 [ Colin Watson ]
2315 * Switch to debhelper compatibility level 4, since we now require
2316 debhelper 4 even on sarge anyway for udeb support.
2317
2318 -- Colin Watson <cjwatson@debian.org> Fri, 31 Mar 2006 09:44:55 +0100
2319
2320openssh (1:4.2p1-7) unstable; urgency=low
2321
2322 * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb
2323 rather than the deb. Fixed.
2324
2325 -- Colin Watson <cjwatson@debian.org> Wed, 1 Mar 2006 16:19:00 +0000
2326
2327openssh (1:4.2p1-6) unstable; urgency=low
2328
2329 * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11
2330 to the normal and superuser paths and /usr/games to the normal path.
2331 * When the client receives a signal, don't fatal() with "Killed by signal
2332 %d." (which produces unhelpful noise on stderr and causes confusion for
2333 users of some applications that wrap ssh); instead, generate a debug
2334 message and exit with the traditional status (closes: #313371).
2335 * debconf template translations:
2336 - Add Swedish (thanks, Daniel Nylander; closes: #333133).
2337 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2338 closes: #341371).
2339 - Correct erroneously-changed Last-Translator headers in Greek and
2340 Spanish translations.
2341
2342 -- Colin Watson <cjwatson@debian.org> Mon, 20 Feb 2006 16:50:55 +0000
2343
2344openssh (1:4.2p1-5) unstable; urgency=low
2345
2346 * Add a CVE name to the 1:4.0p1-1 changelog entry.
2347 * Build-depend on libselinux1-dev on armeb.
2348 * Only send GSSAPI proposal if GSSAPIAuthentication is enabled.
2349 * Build-depend on libssl-dev (>= 0.9.8-1) to cope with surprise OpenSSL
2350 transition, since otherwise who knows what the buildds will do. If
2351 you're building openssh yourself, you can safely ignore this and use an
2352 older libssl-dev.
2353
2354 -- Colin Watson <cjwatson@debian.org> Fri, 7 Oct 2005 12:23:42 +0100
2355
2356openssh (1:4.2p1-4) unstable; urgency=low
2357
2358 * Initialise token to GSS_C_EMPTY_BUFFER in ssh_gssapi_check_mechanism
2359 (closes: #328606).
2360
2361 -- Colin Watson <cjwatson@debian.org> Fri, 16 Sep 2005 12:50:16 +0100
2362
2363openssh (1:4.2p1-3) unstable; urgency=low
2364
2365 * Add prototype for ssh_gssapi_server_mechanisms (closes: #328372).
2366 * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly
2367 different version of the gssapi authentication method (thanks, Aaron M.
2368 Ucko; closes: #328388).
2369 * Explicitly tell po2debconf to use the 'popular' output encoding, so that
2370 the woody-compatibility hack works even with po-debconf 0.9.0.
2371
2372 -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:28:21 +0100
2373
2374openssh (1:4.2p1-2) unstable; urgency=low
2375
2376 * Annotate 1:4.2p1-1 changelog with CVE references.
2377 * Add remaining pieces of Kerberos support (closes: #152657, #275472):
2378 - Add GSSAPI key exchange support from
2379 http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen
2380 Frost).
2381 - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr.
2382 - openssh-client and openssh-server replace ssh-krb5.
2383 - Update commented-out Kerberos/GSSAPI options in default sshd_config.
2384 - Fix HAVE_GSSAPI_KRB5_H/HAVE_GSSAPI_GSSAPI_KRB5_H typos in
2385 gss-serv-krb5.c.
2386
2387 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 18:28:49 +0100
2388
2389openssh (1:4.2p1-1) unstable; urgency=low
2390
2391 * New upstream release.
2392 - SECURITY (CAN-2005-2797): Fix a bug introduced in OpenSSH 4.0 that
2393 caused GatewayPorts to be incorrectly activated for dynamic ("-D")
2394 port forwardings when no listen address was explicitly specified
2395 (closes: #326065).
2396 - SECURITY (CAN-2005-2798): Fix improper delegation of GSSAPI
2397 credentials. This code is only built in openssh-krb5, not openssh, but
2398 I mention the CVE reference here anyway for completeness.
2399 - Add a new compression method ("Compression delayed") that delays zlib
2400 compression until after authentication, eliminating the risk of zlib
2401 vulnerabilities being exploited by unauthenticated users. Note that
2402 users of OpenSSH versions earlier than 3.5 will need to disable
2403 compression on the client or set "Compression yes" (losing this
2404 security benefit) on the server.
2405 - Increase the default size of new RSA/DSA keys generated by ssh-keygen
2406 from 1024 to 2048 bits (closes: #181162).
2407 - Many bugfixes and improvements to connection multiplexing.
2408 - Don't pretend to accept $HOME (closes: #208648).
2409 * debian/rules: Resynchronise CFLAGS with that generated by configure.
2410 * openssh-client and openssh-server conflict with pre-split ssh to avoid
2411 problems when ssh is left un-upgraded (closes: #324695).
2412 * Set X11Forwarding to yes in the default sshd_config (new installs only).
2413 At least when X11UseLocalhost is turned on, which is the default, the
2414 security risks of using X11 forwarding are risks to the client, not to
2415 the server (closes: #320104).
2416
2417 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:16:14 +0100
2418
2419openssh (1:4.1p1-7) unstable; urgency=low
2420
2421 * Do the IDEA host key check on a temporary file to avoid altering
2422 /etc/ssh/ssh_host_key itself (closes: #312312).
2423 * Work around the ssh-askpass alternative somehow ending up in manual mode
2424 pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
2425 * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113).
2426 * Fix XSIish uses of 'test' in openssh-server.preinst.
2427 * Policy version 3.6.2: no changes required.
2428
2429 -- Colin Watson <cjwatson@debian.org> Fri, 2 Sep 2005 16:18:11 +0100
2430
2431openssh (1:4.1p1-6) unstable; urgency=low
2432
2433 * Fix one-character typo that meant the binaries in openssh-client and
2434 openssh-server got recompiled with the wrong options during
2435 'debian/rules install' (closes: #317088, #317238, #317241).
2436
2437 -- Colin Watson <cjwatson@debian.org> Thu, 7 Jul 2005 10:56:16 +0100
2438
2439openssh (1:4.1p1-5) unstable; urgency=low
2440
2441 * Build-depend on libselinux1-dev on ppc64 too (closes: #314625).
2442 * Drop priority of ssh to extra to match the override file.
2443 * Make /usr/share/doc/openssh-server and /usr/share/doc/ssh symlinks to
2444 /usr/share/doc/openssh-client (closes: #314745).
2445 * Ship README.dns (closes: #284874).
2446 * Disable btmp logging, since Debian's /var/log/btmp has inappropriate
2447 permissions (closes: #314956).
2448 * Allow ~/.ssh/config to be group-writable, provided that the group in
2449 question contains only the file's owner (closes: #314347).
2450 * debconf template translations:
2451 - Update Brazilian Portuguese (thanks, André Luís Lopes;
2452 closes: #315477).
2453 - Add Vietnamese (thanks, Clytie Siddall; closes: #316636).
2454
2455 -- Colin Watson <cjwatson@debian.org> Sun, 3 Jul 2005 17:08:08 +0100
2456
2457openssh (1:4.1p1-4) unstable; urgency=low
2458
2459 * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5
2460 only conflicts with ssh (closes: #312475).
2461 * SELinux support (thanks, Manoj Srivastava; closes: #308555):
2462 - Added SELinux capability, and turned it on be default. Added
2463 restorecon calls in preinst and postinst (should not matter if the
2464 machine is not SELinux aware). By and large, the changes made should
2465 have no effect unless the rules file calls --with-selinux; and even
2466 then there should be no performance hit for machines not actively
2467 running SELinux.
2468 - Modified the preinst and postinst to call restorecon to set the
2469 security context for the generated public key files.
2470 - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system
2471 may want to also include pam_selinux.so.
2472 * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
2473 are available.
2474 * Restore /usr/lib/sftp-server temporarily, as a symlink to
2475 /usr/lib/openssh/sftp-server (closes: #312891).
2476 * Switch to debhelper compatibility level 3, since 2 is deprecated.
2477 * debconf template translations:
2478 - Update German (thanks, Jens Seidel; closes: #313949).
2479
2480 -- Colin Watson <cjwatson@debian.org> Fri, 17 Jun 2005 14:20:20 +0100
2481
2482openssh (1:4.1p1-3) unstable; urgency=low
2483
2484 * Upload to unstable.
2485
2486 -- Colin Watson <cjwatson@debian.org> Mon, 6 Jun 2005 22:28:33 +0100
2487
2488openssh (1:4.1p1-2) experimental; urgency=low
2489
2490 * Drop debconf support for allowing SSH protocol 1, which is discouraged
2491 and has not been the default since openssh 1:3.0.1p1-1. Users who need
2492 this should edit sshd_config instead (closes: #147212).
2493 * Since ssh-keysign isn't used by default (you need to set
2494 EnableSSHKeysign to "yes" in /etc/ssh/ssh_config), having a debconf
2495 question to ask whether it should be setuid is overkill, and the
2496 question text had got out of date anyway. Remove this question, ship
2497 ssh-keysign setuid in openssh-client.deb, and set a statoverride if the
2498 debconf question was previously set to false.
2499 * Add lintian overrides for the above (setuid-binary,
2500 no-debconf-templates).
2501 * Fix picky lintian errors about slogin symlinks.
2502 * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling.
2503 * Apply Linux 2.2 workaround (see #239999) only on Linux.
2504
2505 -- Colin Watson <cjwatson@debian.org> Thu, 2 Jun 2005 00:55:58 +0100
2506
2507openssh (1:4.1p1-1) experimental; urgency=low
2508
2509 * New upstream release.
2510 - Normalise socket addresses returned by get_remote_hostname(), fixing
2511 4-in-6 mapping issues with AllowUsers et al (closes: #192234).
2512 * Take upstream's hint and disable the unsupported USE_POSIX_THREADS
2513 (closes: #295757, #308868, and possibly others; may open other bugs).
2514 Use PAM password authentication to avoid #278394. In future I may
2515 provide two sets of binaries built with and without this option, since
2516 it seems I can't win.
2517 * Disable ChallengeResponseAuthentication in new installations, returning
2518 to PasswordAuthentication by default, since it now supports PAM and
2519 apparently works better with a non-threaded sshd (closes: #247521).
2520 * openssh-server Suggests: rssh (closes: #233012).
2521 * Change libexecdir to /usr/lib/openssh, and fix up various alternatives
2522 and configuration files to match (closes: #87900, #151321).
2523 * Fix up very old sshd_config files that refer to /usr/libexec/sftp-server
2524 (closes: #141979).
2525
2526 -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 01:33:33 +0100
2527
2528openssh (1:4.0p1-1) experimental; urgency=low
2529
2530 * New upstream release.
2531 - Port-forwarding specifications now take optional bind addresses, and
2532 the server allows client-specified bind addresses for remote port
2533 forwardings when configured with "GatewayPorts clientspecified"
2534 (closes: #87253, #192206).
2535 - ssh and ssh-keyscan now support hashing of known_hosts files for
2536 improved privacy (CAN-2005-2666). ssh-keygen has new options for
2537 managing known_hosts files, which understand hashing.
2538 - sftp supports command history and editing support using libedit
2539 (closes: #287013).
2540 - Have scp and sftp wait for the spawned ssh to exit before they exit
2541 themselves, allowing ssh to restore terminal modes (closes: #257130).
2542 - Improved the handling of bad data in authorized_keys files,
2543 eliminating fatal errors on corrupt or very large keys; e.g. linefeeds
2544 in keys only produce errors in auth.log now (closes: #220726).
2545 - Add "command mode" to ssh connection multiplexing (closes: #303452).
2546 - Mention $HOME/.hushlogin in sshd(8) FILES section (closes: #163933).
2547 * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
2548 closes: #296487).
2549 * Remove obsolete and unnecessary ssh/forward_warning debconf note.
2550 * Hurd build fixes (although sshd still doesn't work):
2551 - Restore X forwarding fix from #102991, lost somewhere along the way.
2552 - Link with -lcrypt.
2553 - Link with -lpthread rather than -pthread.
2554 - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to
2555 satisfy build-dependencies.
2556 * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
2557 * Enable HashKnownHosts by default. This only affects new entries; use
2558 'ssh-keygen -H' to convert an entire known_hosts file to hashed format.
2559 * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific
2560 (closes: #307069).
2561 * debconf template translations:
2562 - Update Czech (thanks, Miroslav Kure; closes: #298744).
2563 - Update Finnish (thanks, Matti Pöllä; closes: #303787).
2564 - Synchronise Spanish with sarge branch (thanks, Javier
2565 Fernández-Sanguino Peña; closes: #298536).
2566 - Add Ukrainian (thanks, Eugeniy Meshcheryakov; closes: #301852).
2567
2568 -- Colin Watson <cjwatson@debian.org> Thu, 26 May 2005 11:23:18 +0100
2569
2570openssh (1:3.9p1-3) experimental; urgency=low
2571
2572 * Explain how to run sshd from inittab in README.Debian (closes: #147360).
2573 * Add debian/watch file.
2574
2575 -- Colin Watson <cjwatson@debian.org> Fri, 18 Feb 2005 00:20:16 +0000
2576
2577openssh (1:3.9p1-2) experimental; urgency=low
2578
2579 * Remove pam_nologin from /etc/pam.d/ssh, as sshd's built-in support
2580 appears to be sufficient and more useful (closes: #162996).
2581 * Depend on debconf | debconf-2.0.
2582 * Drop LoginGraceTime back to the upstream default of two minutes on new
2583 installs (closes: #289573).
2584 * debconf template translations from Ubuntu bug #1232:
2585 - Update Greek (thanks, Logiotatidis George).
2586 - Update Spanish (thanks, Santiago Erquicia).
2587
2588 -- Colin Watson <cjwatson@debian.org> Sat, 15 Jan 2005 12:37:54 +0000
2589
2590openssh (1:3.9p1-1) experimental; urgency=low
2591
2592 * New upstream release.
2593 - PAM password authentication implemented again (closes: #238699,
2594 #242119).
2595 - Implemented the ability to pass selected environment variables between
2596 the client and the server.
2597 - Fix ssh-keyscan breakage when remote server doesn't speak SSH protocol
2598 (closes: #228828).
2599 - Fix res_query detection (closes: #242462).
2600 - 'ssh -c' documentation improved (closes: #265627).
2601 * Pass LANG and LC_* environment variables from the client by default, and
2602 accept them to the server by default in new installs, although not on
2603 upgrade (closes: #264024).
2604 * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones).
2605 * Expand on openssh-client package description (closes: #273831).
2606
2607 -- Colin Watson <cjwatson@debian.org> Tue, 4 Jan 2005 14:18:31 +0000
2608
2609openssh (1:3.8.1p1-14) experimental; urgency=low
2610
2611 * We use DH_COMPAT=2, so build-depend on debhelper (>= 2).
2612 * Fix timing information leak allowing discovery of invalid usernames in
2613 PAM keyboard-interactive authentication (backported from a patch by
2614 Darren Tucker; closes: #281595).
2615 * Make sure that there's a delay in PAM keyboard-interactive
2616 authentication when PermitRootLogin is not set to yes and the correct
2617 root password is entered (closes: #248747).
2618
2619 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 18:09:37 +0000
2620
2621openssh (1:3.8.1p1-13) experimental; urgency=low
2622
2623 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
2624 * debconf template translations:
2625 - Update Dutch (thanks, cobaco; closes: #278715).
2626 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
2627
2628 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 12:03:13 +0000
2629
2630openssh (1:3.8.1p1-12) experimental; urgency=low
2631
2632 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
2633 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
2634 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
2635 implementations apparently have problems with the long version string.
2636 This is of course a bug in those implementations, but since the extent
2637 of the problem is unknown it's best to play safe (closes: #275731).
2638 * debconf template translations:
2639 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
2640 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
2641 - Update French (thanks, Denis Barbier; closes: #276703).
2642 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
2643
2644 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 19:21:17 +0100
2645
2646openssh (1:3.8.1p1-11) experimental; urgency=high
2647
2648 * Move sshd_config(5) to openssh-server, where it belongs.
2649 * If PasswordAuthentication is disabled, then offer to disable
2650 ChallengeResponseAuthentication too. The current PAM code will attempt
2651 password-style authentication if ChallengeResponseAuthentication is
2652 enabled (closes: #250369).
2653 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
2654 later and then upgraded. Sorry about that ... for this reason, the
2655 default answer is to leave ChallengeResponseAuthentication enabled.
2656
2657 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:28:20 +0100
2658
2659openssh (1:3.8.1p1-10) experimental; urgency=low
2660
2661 * Don't install the ssh-askpass-gnome .desktop file by default; I've had
2662 too many GNOME people tell me it's the wrong thing to be doing. I've
2663 left it in /usr/share/doc/ssh-askpass-gnome/examples/ for now.
2664
2665 -- Colin Watson <cjwatson@debian.org> Wed, 25 Aug 2004 18:18:14 +0100
2666
2667openssh (1:3.8.1p1-9) experimental; urgency=low
2668
2669 * Split the ssh binary package into openssh-client and openssh-server
2670 (closes: #39741). openssh-server depends on openssh-client for some
2671 common functionality; it didn't seem worth creating yet another package
2672 for this. openssh-client is priority standard, openssh-server optional.
2673 * New transitional ssh package, priority optional, depending on
2674 openssh-client and openssh-server. May be removed once nothing depends
2675 on it.
2676 * When upgrading from ssh to openssh-{client,server}, it's very difficult
2677 for the maintainer scripts to find out what version we're upgrading from
2678 without dodgy dpkg hackery. I've therefore taken the opportunity to move
2679 a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
2680 and ssh/user_environment_tell.
2681 * Add a heuristic to try to make sure the sshd_config upgrade to >= 3.7
2682 happens even though we don't know what version we're upgrading from.
2683 * Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now
2684 (until sarge+2) it's still honoured to avoid breaking existing
2685 configurations, but the right approach is now to remove the
2686 openssh-server package if you don't want to run the server. Add a NEWS
2687 item to that effect.
2688
2689 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
2690
2691openssh (1:3.8.1p1-8.sarge.4) unstable; urgency=high
2692
2693 * Fix timing information leak allowing discovery of invalid usernames in
2694 PAM keyboard-interactive authentication (backported from a patch by
2695 Darren Tucker; closes: #281595).
2696 * Make sure that there's a delay in PAM keyboard-interactive
2697 authentication when PermitRootLogin is not set to yes and the correct
2698 root password is entered (closes: #248747).
2699
2700 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 12:37:16 +0000
2701
2702openssh (1:3.8.1p1-8.sarge.3) unstable; urgency=low
2703
2704 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
2705 * debconf template translations:
2706 - Update Dutch (thanks, cobaco; closes: #278715).
2707 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
2708
2709 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 10:31:12 +0000
2710
2711openssh (1:3.8.1p1-8.sarge.2) unstable; urgency=low
2712
2713 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
2714 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
2715 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
2716 implementations apparently have problems with the long version string.
2717 This is of course a bug in those implementations, but since the extent
2718 of the problem is unknown it's best to play safe (closes: #275731).
2719 * debconf template translations:
2720 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
2721 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
2722 - Update French (thanks, Denis Barbier; closes: #276703).
2723 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
2724
2725 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 17:57:14 +0100
2726
2727openssh (1:3.8.1p1-8.sarge.1) unstable; urgency=high
2728
2729 * If PasswordAuthentication is disabled, then offer to disable
2730 ChallengeResponseAuthentication too. The current PAM code will attempt
2731 password-style authentication if ChallengeResponseAuthentication is
2732 enabled (closes: #250369).
2733 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
2734 later and then upgraded. Sorry about that ... for this reason, the
2735 default answer is to leave ChallengeResponseAuthentication enabled.
2736
2737 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:21:55 +0100
2738
2739openssh (1:3.8.1p1-8) unstable; urgency=high
2740
2741 * Matthew Vernon:
2742 - Add a GPL exception to the licensing terms of the Debian patch
2743 (closes: #211644).
2744
2745 -- Colin Watson <cjwatson@debian.org> Thu, 29 Jul 2004 13:28:47 +0100
2746
2747openssh (1:3.8.1p1-7) unstable; urgency=low
2748
2749 * Re-enable shadow password support in openssh-server-udeb, at Bastian
2750 Blank's request (closes: #260800).
2751
2752 -- Colin Watson <cjwatson@debian.org> Thu, 22 Jul 2004 10:56:06 +0100
2753
2754openssh (1:3.8.1p1-6) unstable; urgency=low
2755
2756 * Implement hack in
2757 http://lists.debian.org/debian-boot/2004/07/msg01207.html to get
2758 openssh-client-udeb to show up as a retrievable debian-installer
2759 component.
2760 * Generate host keys in postinst only if the relevant HostKey directives
2761 are found in sshd_config (closes: #87946).
2762
2763 -- Colin Watson <cjwatson@debian.org> Wed, 21 Jul 2004 15:14:46 +0100
2764
2765openssh (1:3.8.1p1-5) unstable; urgency=medium
2766
2767 * Update German debconf template translation (thanks, Helge Kreutzmann;
2768 closes: #252226).
2769 * Remove Suggests: dnsutils, as it was only needed for
2770 make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan.
2771 * Disable shadow password support in openssh-server-udeb.
2772 * Fix non-portable shell constructs in maintainer scripts, Makefile, and
2773 ssh-copy-id (thanks, David Weinehall; closes: #258517).
2774 * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD
2775 handler kill the PAM thread if its waitpid() call returns 0, as well as
2776 the previous check for -1 (closes: #252676).
2777 * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any
2778 more; oh well.
2779
2780 -- Colin Watson <cjwatson@debian.org> Sat, 10 Jul 2004 13:57:27 +0100
2781
2782openssh (1:3.8.1p1-4) unstable; urgency=medium
2783
2784 * Kill off PAM thread if privsep slave dies (closes: #248125).
2785
2786 -- Colin Watson <cjwatson@debian.org> Fri, 28 May 2004 17:58:45 -0300
2787
2788openssh (1:3.8.1p1-3) unstable; urgency=low
2789
2790 * Add ssh-keygen to openssh-server-udeb.
2791
2792 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 16:31:52 +0100
2793
2794openssh (1:3.8.1p1-2) unstable; urgency=low
2795
2796 * Add Catalan debconf template translation (thanks, Aleix Badia i Bosch;
2797 closes: #248748).
2798 * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb
2799 (not yet uploaded).
2800 * Restore ssh-askpass-gnome binary, lost by mistake.
2801 * Don't link against libnsl in udeb builds.
2802
2803 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 11:15:58 +0100
2804
2805openssh (1:3.8.1p1-1) unstable; urgency=low
2806
2807 * New upstream release.
2808 - Use a longer buffer for tty names in utmp (closes: #247538).
2809 * Make sure there's a newline at the end of sshd_config before adding
2810 'UsePAM yes' (closes: #244829).
2811 * Generate a new .orig.tar.gz without RFC.nroff, and remove
2812 /usr/share/doc/ssh/RFC.gz (closes: #211640). It isn't DFSG-free and only
2813 documents the obsolete SSH1 protocol, not to mention that it was never a
2814 real RFC but only an Internet-Draft. It's available from
2815 http://www.free.lp.se/bamse/draft-ylonen-ssh-protocol-00.txt if you want
2816 it for some reason.
2817 * Add openssh-client-udeb and openssh-server-udeb binary packages for use
2818 in debian-installer. They still need libnss_files to be supplied in udeb
2819 form by glibc.
2820 * Work around lack of res_query weak alias in libresolv on amd64 (see
2821 #242462, awaiting real fix upstream).
2822 * Fix grammar in sshd(8) (closes: #238753).
2823 * Add .desktop file and icon for ssh-askpass-gnome (closes: #232333).
2824 * Update Polish debconf template translation (thanks, Emil Nowak;
2825 closes: #242808).
2826 * Add Turkish debconf template translation (thanks, Recai Oktaş;
2827 closes: #246068).
2828
2829 -- Colin Watson <cjwatson@debian.org> Tue, 11 May 2004 23:38:10 +0100
2830
2831openssh (1:3.8p1-3) unstable; urgency=low
2832
2833 * Remove deprecated ReverseMappingCheck option from newly generated
2834 sshd_config files (closes: #239987).
2835 * Build everything apart from contrib in a subdirectory, to allow for
2836 multiple builds.
2837 * Some older kernels are missing setresuid() and setresgid(), so don't try
2838 to use them. setreuid() and setregid() will do well enough for our
2839 purposes (closes: #239999).
2840
2841 -- Colin Watson <cjwatson@debian.org> Mon, 5 Apr 2004 21:23:43 +0100
2842
2843openssh (1:3.8p1-2) unstable; urgency=medium
2844
2845 * Disable PasswordAuthentication for new installations (closes: #236810).
2846 * Turn off the new ForwardX11Trusted by default, returning to the
2847 semantics of 3.7 and earlier, since it seems immature and causes far too
2848 many problems with existing setups. See README.Debian for details
2849 (closes: #237021).
2850
2851 -- Colin Watson <cjwatson@debian.org> Wed, 10 Mar 2004 10:33:07 +0000
2852
2853openssh (1:3.8p1-1) unstable; urgency=low
2854
2855 * New upstream release (closes: #232281):
2856 - New PAM implementation based on that in FreeBSD. This runs PAM session
2857 modules before dropping privileges (closes: #132681, #150968).
2858 - Since PAM session modules are run as root, we can turn pam_limits back
2859 on by default, and it no longer spits out "Operation not permitted" to
2860 syslog (closes: #171673).
2861 - Password expiry works again (closes: #153235).
2862 - 'ssh -q' suppresses login banner (closes: #134589).
2863 - sshd doesn't lie to PAM about invalid usernames (closes: #157078).
2864 - ssh-add prints key comment on each prompt (closes: #181869).
2865 - Punctuation formatting fixed in man pages (closes: #191131).
2866 - EnableSSHKeysign documented in ssh_config(5) (closes: #224457).
2867 * Add 'UsePAM yes' to /etc/ssh/sshd_config on upgrade from versions older
2868 than this, to maintain the standard Debian sshd configuration.
2869 * Comment out PAMAuthenticationViaKbdInt and RhostsAuthentication in
2870 sshd_config on upgrade. Neither option is supported any more.
2871 * Privilege separation and PAM are now properly supported together, so
2872 remove both debconf questions related to them and simply set it
2873 unconditionally in newly generated sshd_config files (closes: #228838).
2874 * ServerAliveInterval implemented upstream, so ProtocolKeepAlives is now a
2875 compatibility alias. The semantics differ slightly, though; see
2876 ssh_config(5) for details.
2877 * Implement SSH1 support for ServerAliveInterval using SSH_MSG_IGNORE. As
2878 documented in ssh_config(5), it's not as good as the SSH2 version.
2879 * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and
2880 -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary.
2881 * Update config.guess and config.sub from autotools-dev 20040105.1.
2882 * Darren Tucker:
2883 - Reset signal status when starting pam auth thread, prevent hanging
2884 during PAM keyboard-interactive authentications.
2885 - Fix a non-security-critical segfault in PAM authentication.
2886 * Add debconf template translations:
2887 - Greek (thanks, Konstantinos Margaritis; closes: #232843).
2888 - Italian (thanks, Renato Gini; closes: #234777).
2889
2890 -- Colin Watson <cjwatson@debian.org> Sat, 6 Mar 2004 18:43:44 +0000
2891
2892openssh (1:3.6.1p2-12) unstable; urgency=low
2893
2894 * Update Spanish debconf template translation (thanks, Javier
2895 Fernández-Sanguino Peña; closes: #228242).
2896 * Add debconf template translations:
2897 - Czech (thanks, Miroslav Kure; closes: #230110).
2898 - Simplified Chinese (thanks, Hiei Xu; closes: #230726).
2899
2900 -- Colin Watson <cjwatson@debian.org> Wed, 11 Feb 2004 09:37:57 +0000
2901
2902openssh (1:3.6.1p2-11) unstable; urgency=low
2903
2904 * Comment out pam_limits in default configuration, for now at least
2905 (closes: #198254).
2906 * Use invoke-rc.d (if it exists) to run the init script.
2907 * Backport format string bug fix in sshconnect.c (closes: #225238).
2908 * ssh-copy-id exits if ssh fails (closes: #215252).
2909
2910 -- Colin Watson <cjwatson@debian.org> Sun, 4 Jan 2004 18:59:21 +0000
2911
2912openssh (1:3.6.1p2-10) unstable; urgency=low
2913
2914 * Use --retry in init script when restarting rather than sleeping, to make
2915 sure the old process is dead (thanks, Herbert Xu; closes: #212117).
2916 Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option.
2917 * Update debconf template translations:
2918 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844).
2919 - Danish (thanks, Morten Brix Pedersen; closes: #217964).
2920 - Japanese (thanks, Kenshi Muto; closes: #212497).
2921 - Russian (thanks, Ilgiz Kalmetev).
2922 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #211832).
2923 * Add Dutch debconf template translation (thanks, cobaco;
2924 closes: #215372).
2925 * Update config.guess and config.sub from autotools-dev 20031007.1
2926 (closes: #217696).
2927 * Implement New World Order for PAM configuration, including
2928 /etc/pam.d/common-* from /etc/pam.d/ssh (closes: #212959).
2929 - To backport this release to woody, you need to set DEB_BUILD_SSH_WOODY
2930 in your environment. See README.Debian.
2931 * Add more commentary to /etc/pam.d/ssh.
2932
2933 -- Colin Watson <cjwatson@debian.org> Sun, 16 Nov 2003 01:14:16 +0000
2934
2935openssh (1:3.6.1p2-9) unstable; urgency=high
2936
2937 * Merge even more buffer allocation fixes from upstream (CAN-2003-0682;
2938 closes: #211434).
2939
2940 -- Colin Watson <cjwatson@debian.org> Fri, 19 Sep 2003 10:25:25 +0100
2941
2942openssh (1:3.6.1p2-8) unstable; urgency=high
2943
2944 * Merge more buffer allocation fixes from new upstream version 3.7.1p1
2945 (closes: #211324).
2946
2947 -- Colin Watson <cjwatson@debian.org> Wed, 17 Sep 2003 03:07:19 +0100
2948
2949openssh (1:3.6.1p2-7) unstable; urgency=high
2950
2951 * Update debconf template translations:
2952 - French (thanks, Christian Perrier; closes: #208801).
2953 - Japanese (thanks, Kenshi Muto; closes: #210380).
2954 * Some small improvements to the English templates courtesy of Christian
2955 Perrier. I've manually unfuzzied a few translations where it was
2956 obvious, on Christian's advice, but the others will have to be updated.
2957 * Document how to generate an RSA1 host key (closes: #141703).
2958 * Incorporate NMU fix for early buffer expansion vulnerability,
2959 CAN-2003-0693 (closes: #211205). Thanks to Michael Stone.
2960
2961 -- Colin Watson <cjwatson@debian.org> Tue, 16 Sep 2003 14:32:28 +0100
2962
2963openssh (1:3.6.1p2-6.0) unstable; urgency=high
2964
2965 * SECURITY: fix for CAN-2003-0693, buffer allocation error
2966
2967 -- Michael Stone <mstone@debian.org> Tue, 16 Sep 2003 08:27:07 -0400
2968
2969openssh (1:3.6.1p2-6) unstable; urgency=medium
2970
2971 * Use a more CVS-friendly means of setting SSH_VERSION.
2972 * Update Brazilian Portuguese debconf template translation (thanks, Andre
2973 Luis Lopes; closes: #208036).
2974 * Don't run 'sshd -t' in init script if the server isn't to be run
2975 (closes: #197576).
2976 * Fix login delay, spurious auth.log entry, and PermitRootLogin
2977 information leakage due to PAM issues with upstream's recent security
2978 update (thanks, Darren Tucker; closes: #99168, #192207, #193546).
2979 * Policy version 3.6.1: recode this changelog to UTF-8.
2980
2981 -- Colin Watson <cjwatson@debian.org> Wed, 3 Sep 2003 19:14:02 +0100
2982
2983openssh (1:3.6.1p2-5) unstable; urgency=low
2984
2985 * Disable cmsg_type check for file descriptor passing when running on
2986 Linux 2.0 (closes: #150976). Remove comments about non-functional
2987 privilege separation on 2.0 from ssh/privsep_ask and ssh/privsep_tell
2988 debconf questions and from README.Debian, since it should all now work.
2989 * Fix "defails" typo in generated sshd_config (closes: #206484).
2990 * Backport upstream patch to strip trailing whitespace (including
2991 newlines) from configuration directives (closes: #192079).
2992
2993 -- Colin Watson <cjwatson@debian.org> Wed, 27 Aug 2003 02:19:57 +0100
2994
2995openssh (1:3.6.1p2-4) unstable; urgency=low
2996
2997 * getent can get just one key; no need to use grep (thanks, James Troup).
2998 * Move /usr/local/bin to the front of the default path, following
2999 /etc/login.defs (closes: #201150).
3000 * Remove specifics of problematic countries from package description
3001 (closes: #197040).
3002 * Update Spanish debconf template translation (thanks, Carlos Valdivia
3003 Yagüe; closes: #198456).
3004 * Backport upstream patch to pass monitor signals through to child
3005 (closes: #164797).
3006
3007 -- Colin Watson <cjwatson@debian.org> Sun, 27 Jul 2003 17:31:15 +0100
3008
3009openssh (1:3.6.1p2-3) unstable; urgency=low
3010
3011 * Update French debconf template translation (thanks, Christian Perrier;
3012 closes: #194323).
3013 * Version the adduser dependency for --no-create-home (closes: #195756).
3014 * Add a version of moduli(5), namely revision 1.7 of
3015 http://www.openbsd.org/cgi-bin/cvsweb/src/share/man/man5/moduli.5 with
3016 '/etc/moduli' changed to '/etc/ssh/moduli' throughout (closes: #196061).
3017
3018 -- Colin Watson <cjwatson@debian.org> Mon, 9 Jun 2003 02:51:35 +0100
3019
3020openssh (1:3.6.1p2-2) unstable; urgency=low
3021
3022 * Force /etc/default/ssh to be non-executable, since dpkg apparently
3023 doesn't deal with permissions changes on conffiles (closes: #192966).
3024 * Use debconf 0.5's seen flag rather than the deprecated isdefault.
3025 * Add GPL location to copyright file.
3026 * Remove debian/postinst.old.
3027 * Switch to po-debconf, with some careful manual use of po2debconf to
3028 ensure that the source package continues to build smoothly on woody
3029 (closes: #183986).
3030 * Update debconf template translations:
3031 - Brazilian Portugese (thanks, Andre Luis Lopes; see #183986).
3032 - Japanese (thanks, Tomohiro KUBOTA; closes: #192429).
3033 * Compile with -fno-builtin-log for now, otherwise gcc-3.3 complains
3034 "log.h:59: warning: conflicting types for built-in function `log'". The
3035 OpenSSH log() function has been renamed in upstream CVS.
3036
3037 -- Colin Watson <cjwatson@debian.org> Mon, 19 May 2003 01:52:38 +0100
3038
3039openssh (1:3.6.1p2-1) unstable; urgency=medium
3040
3041 * New upstream release, including fix for PAM user-discovery security hole
3042 (closes: #191681).
3043 * Fix ChallengeResponseAuthentication default in generated sshd_config
3044 (closes: #106037).
3045 * Put newlines after full stops in man page documentation for
3046 ProtocolKeepAlives and SetupTimeOut.
3047 * Policy version 3.5.9: support DEB_BUILD_OPTIONS=noopt, build
3048 gnome-ssh-askpass with -g and -Wall flags.
3049 * Really ask ssh/new_config debconf question before trying to fetch its
3050 value (closes: #188721).
3051 * On purge, remove only the files we know about in /etc/ssh rather than
3052 the whole thing, and remove the directory if that leaves it empty
3053 (closes: #176679).
3054 * ssh has depended on debconf for some time now with no complaints, so:
3055 - Simplify the postinst by relying on debconf being present. (The absent
3056 case was buggy anyway.)
3057 - Get rid of "if you have not installed debconf" text in README.Debian,
3058 and generally update the "/usr/bin/ssh not SUID" entry.
3059 * More README.Debian work:
3060 - Reorganize into "UPGRADE ISSUES" and "OTHER ISSUES", in an effort to
3061 make it easier for people to find the former. The upgrade issues
3062 should probably be sorted by version somehow.
3063 - Document X11UseLocalhost under "X11 Forwarding" (closes: #150913).
3064 * Fix setting of IP flags for interactive sessions (upstream bug #541).
3065
3066 -- Colin Watson <cjwatson@debian.org> Mon, 5 May 2003 17:47:40 +0100
3067
3068openssh (1:3.6.1p1-1) unstable; urgency=low
3069
3070 * New upstream release (thanks, Laurence J. Lane).
3071 * debian/control: ssh-askpass-gnome is now Section: gnome, following the
3072 override file.
3073
3074 -- Colin Watson <cjwatson@debian.org> Wed, 2 Apr 2003 00:51:02 +0100
3075
3076openssh (1:3.6p1-1) unstable; urgency=low
3077
3078 * New upstream release.
3079 - Workaround applied upstream for a bug in the interaction of glibc's
3080 getaddrinfo() with the Linux 2.2 kernel (closes: #155814).
3081 - As such, it should now be safe to remove --with-ipv4-default, so
3082 starting sshd with -6 is no longer necessary (closes: #79861 and lots
3083 of other merged bugs).
3084 - ssh-copy-id prints usage when run without arguments (closes: #71376).
3085 - scp exits 1 if ssh fails (closes: #138400).
3086 - sshd writes to utmp's ut_addr_v6 field in IPv6 mode (closes: #167867).
3087 - 'ssh-add -c' causes ssh-agent to ask the user each time a key is used
3088 (closes: #109795).
3089 * Install /etc/default/ssh non-executable (closes: #185537).
3090
3091 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2003 23:00:59 +0100
3092
3093openssh (1:3.5p1-5) unstable; urgency=low
3094
3095 * Add /etc/default/ssh (closes: #161049).
3096 * Run the init script under 'set -e' (closes: #175010).
3097 * Change the default superuser path to include /sbin, /usr/sbin, and
3098 /usr/local/sbin (closes: #128235, #151267). Using login.defs would be
3099 nice, but that belongs to another package. Without a defined API to
3100 retrieve its settings, parsing it is off-limits.
3101 * Build ssh-askpass-gnome with GNOME 2. The source package should still
3102 support building on stable with GNOME 1, using the alternate
3103 libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582).
3104
3105 -- Colin Watson <cjwatson@debian.org> Sun, 9 Mar 2003 20:12:10 +0000
3106
3107openssh (1:3.5p1-4) unstable; urgency=low
3108
3109 * Point rlogin and rcp alternatives at slogin and scp respectively rather
3110 than ssh (closes: #121103, #151666). Fix alternative removal to match;
3111 previously it was completely wrong anyway.
3112 * Find out whether /etc/ssh/sshd_not_to_be_run exists and set the debconf
3113 question's default using that information, rather than using debconf as
3114 a registry. Other solutions may be better in the long run, but this is
3115 at least correct (thanks, Matthew Woodcraft; closes: #84725).
3116 * Stop using pam_lastlog, as it doesn't currently work well as a session
3117 module when privilege separation is enabled; it can usually read
3118 /var/log/lastlog but can't write to it. Instead, just use sshd's
3119 built-in support, already enabled by default (closes: #151297, #169938).
3120 * Use 'ssh-keygen -q' rather than redirecting output to /dev/null.
3121 * Add a "this may take some time" warning when creating host keys on
3122 installation (part of #110094).
3123 * When restarting via the init script, check for sshd_not_to_be_run after
3124 stopping sshd (idea from Tomas Pospisek; closes: #149850).
3125 * Append /usr/sbin:/sbin to the init script's $PATH, just in case of
3126 strangeness (closes: #115138).
3127 * Fix a dpkg-statoverride call to redirect stdout to /dev/null, not
3128 stderr.
3129 * Correct copyright file typo: "orignal" -> "original" (closes: #176490).
3130 * Rebuild with libssl0.9.7 (closes: #176983).
3131 * We're up to policy version 3.5.6. DEB_BUILD_OPTIONS stuff still needs to
3132 be looked at.
3133
3134 -- Colin Watson <cjwatson@debian.org> Sat, 18 Jan 2003 01:37:23 +0000
3135
3136openssh (1:3.5p1-3) unstable; urgency=low
3137
3138 * Happy new year!
3139 * Use getent rather than id to find out whether the sshd user exists
3140 (closes: #150974).
3141 * Remove some duplication from the postinst's ssh-keysign setuid code.
3142 * Replace db_text with db_input throughout debian/config. (db_text has
3143 been a compatibility wrapper since debconf 0.1.5.)
3144 * Warn about PermitUserEnvironment on upgrade (closes: #167895).
3145 * Use 'make install-nokeys', and disable unused debhelper commands,
3146 thereby forward-porting the last pieces of Zack Weinberg's patch
3147 (closes: #68341).
3148 * Move the man page for gnome-ssh-askpass from the ssh package to
3149 ssh-askpass-gnome (closes: #174449).
3150 * Build with -DLOGIN_NO_ENDOPT, since Debian's /bin/login doesn't accept
3151 '--' to terminate the list of options (closes: #171554).
3152 * Add Jonathan Amery's ssh-argv0 script (closes: #111341).
3153 * Update Danish debconf template (thanks, Morten Brix Pedersen;
3154 closes: #174757).
3155 * Document setgid ssh-agent's effect on certain environment variables in
3156 README.Debian (closes: #167974).
3157 * Document interoperability problems between scp and ssh.com's server in
3158 README.Debian, and suggest some workarounds (closes: #174662).
3159
3160 -- Colin Watson <cjwatson@debian.org> Wed, 1 Jan 2003 14:18:30 +0000
3161
3162openssh (1:3.5p1-2) unstable; urgency=low
3163
3164 * Mention in the ssh package description that it provides both ssh and
3165 sshd (closes: #99680).
3166 * Create a system group for ssh-agent, not a user group (closes: #167669).
3167
3168 -- Colin Watson <cjwatson@debian.org> Mon, 4 Nov 2002 13:43:53 +0000
3169
3170openssh (1:3.5p1-1) unstable; urgency=low
3171
3172 * New upstream release.
3173 - Fixes typo in ssh-add usage (closes: #152239).
3174 - Fixes 'PermitRootLogin forced-commands-only' (closes: #166184).
3175 - ~/.ssh/environment and environment= options in ~/.ssh/authorized_keys
3176 are deprecated for security reasons and will eventually go away. For
3177 now they can be re-enabled by setting 'PermitUserEnvironment yes' in
3178 sshd_config.
3179 - ssh-agent is installed setgid to prevent ptrace() attacks. The group
3180 actually doesn't matter, as it drops privileges immediately, but to
3181 avoid confusion the postinst creates a new 'ssh' group for it.
3182 * Obsolete patches:
3183 - Solar Designer's privsep+compression patch for Linux 2.2 (see
3184 1:3.3p1-0.0woody1).
3185 - Hostbased auth ssh-keysign backport (see 1:3.4p1-4).
3186
3187 * Remove duplicated phrase in ssh_config(5) (closes: #152404).
3188 * Source the debconf confmodule at the top of the postrm rather than at
3189 the bottom, to avoid making future non-idempotency problems worse (see
3190 #151035).
3191 * Debconf templates:
3192 - Add Polish (thanks, Grzegorz Kusnierz).
3193 - Update French (thanks, Denis Barbier; closes: #132509).
3194 - Update Spanish (thanks, Carlos Valdivia Yagüe; closes: #164716).
3195 * Write a man page for gnome-ssh-askpass, and link it to ssh-askpass.1 if
3196 this is the selected ssh-askpass alternative (closes: #67775).
3197
3198 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
3199
3200openssh (1:3.4p1-4) unstable; urgency=low
3201
3202 * Allow ssh-krb5 in ssh-askpass-gnome's dependencies (closes: #129532).
3203 * Restore Russia to list of countries where encryption is problematic (see
3204 #148951 and http://www.average.org/freecrypto/).
3205 * Drop ssh-askpass-gnome's priority to optional, per the override file.
3206 * Drop the PAM special case for hurd-i386 (closes: #99157).
3207 * s/dile/idle/ in ssh_config(5) (closes: #118331).
3208 * Note in README.Debian that you need xauth from xbase-clients on the
3209 server for X11 forwarding (closes: #140269).
3210 * Use correct path to upstream README in copyright file (closes: #146037).
3211 * Document the units for ProtocolKeepAlives (closes: #159479).
3212 * Backport upstream patch to fix hostbased auth (closes: #117114).
3213 * Add -g to CFLAGS.
3214
3215 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 18:58:53 +0100
3216
3217openssh (1:3.4p1-3) unstable; urgency=low
3218
3219 * Add myself to Uploaders: and begin acting as temporary maintainer, at
3220 Matthew's request. (Normal service will resume in some months' time.)
3221 * Add sharutils to Build-Depends (closes: #138465).
3222 * Stop creating the /usr/doc/ssh symlink.
3223
3224 * Fix some debconf template typos (closes: #160358).
3225 * Split debconf templates into one file per language.
3226 * Add debconf template translations:
3227 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #106173).
3228 - Danish (thanks, Claus Hindsgaul; closes: #126607).
3229 - Japanese (thanks, Tomohiro KUBOTA; closes: #137427).
3230 - Russian (thanks, Ilgiz Kalmetev; closes: #136610).
3231 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #129041).
3232 * Update debconf template translations:
3233 - French (thanks, Igor Genibel; closes: #151361).
3234 - German (thanks, Axel Noetzold; closes: #147069).
3235 * Some of these translations are fuzzy. Please send updates.
3236
3237 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 14:09:57 +0100
3238
3239openssh (1:3.4p1-2) unstable; urgency=high
3240
3241 * Get a security-fixed version into unstable
3242 * Also tidy README.Debian up a little
3243
3244 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 17:20:59 +0100
3245
3246openssh (1:3.4p1-1) testing; urgency=high
3247
3248 * Extend my tendrils back into this package (Closes: #150915, #151098)
3249 * thanks to the security team for their work
3250 * no thanks to ISS/Theo de Raadt for their handling of these bugs
3251 * save old sshd_configs to sshd_config.dpkg-old when auto-generating a
3252 new one
3253 * tell/ask the user about PriviledgeSeparation
3254 * /etc/init.d/ssh run will now create the chroot empty dir if necessary
3255 * Remove our previous statoverride on /usr/bin/ssh (only for people
3256 upgrading from a version where we'd put one in ourselves!)
3257 * Stop slandering Russia, since someone asked so nicely (Closes: #148951)
3258 * Reduce the sleep time in /etc/init.d/ssh during a restart
3259
3260 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 15:52:10 +0100
3261
3262openssh (1:3.4p1-0.0woody1) testing-security; urgency=high
3263
3264 * NMU by the security team.
3265 * New upstream version
3266
3267 -- Michael Stone <mstone@debian.org> Wed, 26 Jun 2002 15:40:38 -0400
3268
3269openssh (1:3.3p1-0.0woody4) testing-security; urgency=high
3270
3271 * NMU by the security team.
3272 * fix error when /etc/ssh/sshd_config exists on new install
3273 * check that user doesn't exist before running adduser
3274 * use openssl internal random unconditionally
3275
3276 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 19:44:39 -0400
3277
3278openssh (1:3.3p1-0.0woody3) testing-security; urgency=high
3279
3280 * NMU by the security team.
3281 * use correct home directory when sshd user is created
3282
3283 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
3284
3285openssh (1:3.3p1-0.0woody2) testing-security; urgency=high
3286
3287 * NMU by the security team.
3288 * Fix rsa1 key creation (Closes: #150949)
3289 * don't fail if sshd user removal fails
3290 * depends: on adduser (Closes: #150907)
3291
3292 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
3293
3294openssh (1:3.3p1-0.0woody1) testing-security; urgency=high
3295
3296 * NMU by the security team.
3297 * New upstream version.
3298 - Enable privilege separation by default.
3299 * Include patch from Solar Designer for privilege separation and
3300 compression on 2.2.x kernels.
3301 * Remove --disable-suid-ssh from configure.
3302 * Support setuid ssh-keysign binary instead of setuid ssh client.
3303 * Check sshd configuration before restarting.
3304
3305 -- Daniel Jacobowitz <dan@debian.org> Mon, 24 Jun 2002 13:43:44 -0400
3306
3307openssh (1:3.0.2p1-9) unstable; urgency=high
3308
3309 * Thanks to those who NMUd
3310 * The only change in this version is to debian/control - I've removed
3311 the bit that says you can't export it from the US - it would look
3312 pretty daft to say this about a package in main! Also, it's now OK
3313 to use crypto in France, so I've edited that comment slightly
3314 * Correct a path in README.Debian too (Closes: #138634)
3315
3316 -- Matthew Vernon <matthew@debian.org> Sun, 4 Apr 2002 09:52:59 +0100
3317
3318openssh (1:3.0.2p1-8.3) unstable; urgency=medium
3319
3320 * NMU
3321 * Really set urgency to medium this time (oops)
3322 * Fix priority to standard per override while I'm at it
3323
3324 -- Aaron M. Ucko <ucko@debian.org> Sun, 24 Mar 2002 09:00:08 -0500
3325
3326openssh (1:3.0.2p1-8.2) unstable; urgency=low
3327
3328 * NMU with maintainer's permission
3329 * Prepare for upcoming ssh-nonfree transitional packages per
3330 <http://lists.debian.org/debian-ssh/2002/debian-ssh-200203/msg00008.html>
3331 * Urgency medium because it would really be good to get this into woody
3332 before it releases
3333 * Fix sections to match override file
3334 * Reissued due to clash with non-US -> main move
3335
3336 -- Aaron M. Ucko <ucko@debian.org> Sat, 23 Mar 2002 21:21:52 -0500
3337
3338openssh (1:3.0.2p1-8.1) unstable; urgency=low
3339
3340 * NMU
3341 * Move from non-US to mani
3342
3343 -- LaMont Jones <lamont@debian.org> Thu, 21 Mar 2002 09:33:50 -0700
3344
3345openssh (1:3.0.2p1-8) unstable; urgency=critical
3346
3347 * Security fix - patch from upstream (Closes: #137209, #137210)
3348 * Undo the changes in the unreleased -7, since they appear to break
3349 things here. Accordingly, the code change is minimal, and I'm
3350 happy to get it into testing ASAP
3351
3352 -- Matthew Vernon <matthew@debian.org> Thu, 7 Mar 2002 14:25:23 +0000
3353
3354openssh (1:3.0.2p1-7) unstable; urgency=high
3355
3356 * Build to support IPv6 and IPv4 by default again
3357
3358 -- Matthew Vernon <matthew@debian.org> Sat, 2 Mar 2002 00:25:05 +0000
3359
3360openssh (1:3.0.2p1-6) unstable; urgency=high
3361
3362 * Correct error in the clean target (Closes: #130868)
3363
3364 -- Matthew Vernon <matthew@debian.org> Sat, 26 Jan 2002 00:32:00 +0000
3365
3366openssh (1:3.0.2p1-5) unstable; urgency=medium
3367
3368 * Include the Debian version in our identification, to make it easier to
3369 audit networks for patched versions in future
3370
3371 -- Matthew Vernon <matthew@debian.org> Mon, 21 Jan 2002 17:16:10 +0000
3372
3373openssh (1:3.0.2p1-4) unstable; urgency=medium
3374
3375 * If we're asked to not run sshd, stop any running sshd's first
3376 (Closes: #129327)
3377
3378 -- Matthew Vernon <matthew@debian.org> Wed, 16 Jan 2002 21:24:16 +0000
3379
3380openssh (1:3.0.2p1-3) unstable; urgency=high
3381
3382 * Fix /etc/pam.d/ssh to not set $MAIL (Closes: #128913)
3383 * Remove extra debconf suggestion (Closes: #128094)
3384 * Mmm. speedy bug-fixing :-)
3385
3386 -- Matthew Vernon <matthew@debian.org> Sat, 12 Jan 2002 17:23:58 +0000
3387
3388openssh (1:3.0.2p1-2) unstable; urgency=high
3389
3390 * Fix postinst to not automatically overwrite sshd_config (!)
3391 (Closes: #127842, #127867)
3392 * Add section in README.Debian about the PermitRootLogin setting
3393
3394 -- Matthew Vernon <matthew@debian.org> Sat, 5 Jan 2003 05:26:30 +0000
3395
3396openssh (1:3.0.2p1-1) unstable; urgency=high
3397
3398 * Incorporate fix from Colin's NMU
3399 * New upstream version (fixes the bug Wichert fixed) (Closes: #124035)
3400 * Capitalise IETF (Closes: #125379)
3401 * Refer to the correct sftp-server location (Closes: #126854, #126224)
3402 * Do what we're asked re SetUID ssh (Closes: #124065, #124154, #123247)
3403 * Ask people upgrading from potato if they want a new conffile
3404 (Closes: #125642)
3405 * Fix a typo in postinst (Closes: #122192, #122410, #123440)
3406 * Frob the default config a little (Closes: #122284, #125827, #125696,
3407 #123854)
3408 * Make /etc/init.d/ssh be more clear about ssh not running (Closes:
3409 #123552)
3410 * Fix typo in templates file (Closes: #123411)
3411
3412 -- Matthew Vernon <matthew@debian.org> Fri, 4 Jan 2002 16:01:52 +0000
3413
3414openssh (1:3.0.1p1-1.2) unstable; urgency=high
3415
3416 * Non-maintainer upload
3417 * Prevent local users from passing environment variables to the login
3418 process when UseLogin is enabled
3419
3420 -- Wichert Akkerman <wakkerma@debian.org> Mon, 3 Dec 2001 19:34:45 +0100
3421
3422openssh (1:3.0.1p1-1.1) unstable; urgency=low
3423
3424 * Non-maintainer upload, at Matthew's request.
3425 * Remove sa_restorer assignment to fix compilation on alpha, hppa, and
3426 ia64 (closes: #122086).
3427
3428 -- Colin Watson <cjwatson@debian.org> Sun, 2 Dec 2001 18:54:16 +0000
3429
3430openssh (1:3.0.1p1-1) unstable; urgency=high
3431
3432 * New upstream version (Closes: #113646, #113513, #114707, #118564)
3433 * Building with a libc that works (!) (Closes: #115228)
3434 * Patches forward-ported are -1/-2 options for scp, the improvement to
3435 'waiting for forwarded connections to terminate...'
3436 * Fix /etc/init.d/ssh to stop sshd properly (Closes: #115228)
3437 * /etc/ssh/sshd_config is no longer a conffile but generated in the postinst
3438 * Remove suidregister leftover from postrm
3439 * Mention key we are making in the postinst
3440 * Default to not enable SSH protocol 1 support, since protocol 2 is
3441 much safer anyway.
3442 * New version of the vpn-fixes patch, from Ian Jackson
3443 * New handling of -q, and added new -qq option; thanks to Jon Amery
3444 * Experimental smartcard support not enabled, since I have no way of
3445 testing it.
3446
3447 -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000
3448
3449openssh (1:2.9p2-6) unstable; urgency=low
3450
3451 * check for correct file in /etc/init.d/ssh (Closes: #110876)
3452 * correct location of version 2 keys in ssh.1 (Closes: #110439)
3453 * call update-alternatives --quiet (Closes: #103314)
3454 * hack ssh-copy-id to chmod go-w (Closes: #95551)
3455 * TEMPORARY fix to provide largefile support using a -D in the cflags
3456 line. long-term, upstream will patch the autoconf stuff
3457 (Closes: #106809, #111849)
3458 * remove /etc/rc references in ssh-keygen.1 (Closes: #68350)
3459 * scp.1 patch from Adam McKenna to document -r properly (Closes: #76054)
3460 * Check for files containing a newline character (Closes: #111692)
3461
3462 -- Matthew Vernon <matthew@debian.org> Thu, 13 Sep 2001 16:47:36 +0100
3463
3464openssh (1:2.9p2-5) unstable; urgency=high
3465
3466 * Thanks to all the bug-fixers who helped!
3467 * remove sa_restorer assignment (Closes: #102837)
3468 * patch from Peter Benie to DTRT wrt X forwarding if the server refuses
3469 us access (Closes: #48297)
3470 * patch from upstream CVS to fix port forwarding (Closes: #107132)
3471 * patch from Jonathan Amery to document ssh-keygen behaviour
3472 (Closes:#106643, #107512)
3473 * patch to postinst from Jonathan Amery (Closes: #106411)
3474 * patch to manpage from Jonathan Amery (Closes: #107364)
3475 * patch from Matthew Vernon to make -q emit fatal errors as that is the
3476 documented behaviour (Closes: #64347)
3477 * patch from Ian Jackson to cause us to destroy a file when we scp it
3478 onto itself, rather than dumping bits of our memory into it, which was
3479 a security hole (see #51955)
3480 * patch from Jonathan Amery to document lack of Kerberos support
3481 (Closes: #103726)
3482 * patch from Matthew Vernon to make the 'waiting for connections to
3483 terminate' message more helpful (Closes: #50308)
3484
3485 -- Matthew Vernon <matthew@debian.org> Thu, 23 Aug 2001 02:14:09 +0100
3486
3487openssh (1:2.9p2-4) unstable; urgency=high
3488
3489 * Today's build of ssh is strawberry flavoured
3490 * Patch from mhp to reduce length of time sshd is stopped for (Closes: #106176)
3491 * Tidy up debconf template (Closes: #106152)
3492 * If called non-setuid, then setgid()'s failure should not be fatal (see
3493 #105854)
3494
3495 -- Matthew Vernon <matthew@debian.org> Sun, 22 Jul 2001 14:19:43 +0100
3496
3497openssh (1:2.9p2-3) unstable; urgency=low
3498
3499 * Patch from yours truly to add -1 and -2 options to scp (Closes: #106061)
3500 * Improve the IdentityFile section in the man page (Closes: #106038)
3501
3502 -- Matthew Vernon <matthew@debian.org> Sat, 21 Jul 2001 14:47:27 +0100
3503
3504openssh (1:2.9p2-2) unstable; urgency=low
3505
3506 * Document the protocol version 2 and IPV6 changes (Closes: #105845, #105868)
3507 * Make PrintLastLog 'no' by default (Closes: #105893)
3508
3509 -- Matthew Vernon <matthew@debian.org> Thu, 19 Jul 2001 18:36:41 +0100
3510
3511openssh (1:2.9p2-1) unstable; urgency=low
3512
3513 * new (several..) upstream version (Closes: #96726, #81856, #96335)
3514 * Hopefully, this will close some other bugs too
3515
3516 -- Matthew Vernon <matthew@debian.org> Tue, 17 Jul 2001 19:41:58 +0100
3517
3518openssh (1:2.5.2p2-3) unstable; urgency=low
3519
3520 * Taking Over this package
3521 * Patches from Robert Bihlmeyer for the Hurd (Closes: #102991)
3522 * Put PermitRootLogin back to yes (Closes: #67334, #67371, #78274)
3523 * Don't fiddle with conf-files any more (Closes: #69501)
3524
3525 -- Matthew Vernon <matthew@debian.org> Tue, 03 Jul 2001 02:58:13 +0100
3526
3527openssh (1:2.5.2p2-2.2) unstable; urgency=low
3528
3529 * NMU
3530 * Include Hurd compatibility patches from Robert Bihlmeyer (Closes: #76033)
3531 * Patch from Richard Kettlewell for protocolkeepalives (Closes: #99273)
3532 * Patch from Matthew Vernon for BannerTimeOut, batchmode, and
3533 documentation for protocolkeepalives. Makes ssh more generally useful
3534 for scripting uses (Closes: #82877, #99275)
3535 * Set a umask, so ourpidfile isn't world-writable (closes: #100012,
3536 #98286, #97391)
3537
3538 -- Matthew Vernon <matthew@debian.org> Thu, 28 Jun 2001 23:15:42 +0100
3539
3540openssh (1:2.5.2p2-2.1) unstable; urgency=low
3541
3542 * NMU
3543 * Remove duplicate Build-Depends for libssl096-dev and change it to
3544 depend on libssl-dev instaed. Also adding in virtual | real package
3545 style build-deps. (Closes: #93793, #75228)
3546 * Removing add-log entry (Closes: #79266)
3547 * This was a pam bug from a while back (Closes: #86908, #88457, #86843)
3548 * pam build-dep already exists (Closes: #93683)
3549 * libgnome-dev build-dep already exists (Closes: #93694)
3550 * No longer in non-free (Closes: #85401)
3551 * Adding in fr debconf translations (Closes: #83783)
3552 * Already suggests xbase-clients (Closes: #79741)
3553 * No need to suggest libpam-pwdb anymore (Closes: #81658)
3554 * Providing rsh-client (Closes: #79437)
3555 * hurd patch was already applied (Closes: #76033)
3556 * default set to no (Closes: #73682)
3557 * Adding in a suggests for dnsutils (Closes: #93265)
3558 * postinst bugs fixed (Closes: #88057, #88066, #88196, #88405, #88612)
3559 (Closes: #88774, #88196, #89556, #90123, #90228, #90833, #87814, #85465)
3560 * Adding in debconf dependency
3561
3562 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Apr 2001 14:11:04 +0100
3563
3564openssh (1:2.5.2p2-2) unstable; urgency=high
3565
3566 * disable the OpenSSL version check in entropy.c
3567 (closes: #93581, #93588, #93590, #93614, #93619, #93635, #93648)
3568
3569 -- Philip Hands <phil@uk.alcove.com> Wed, 11 Apr 2001 20:30:04 +0100
3570
3571openssh (1:2.5.2p2-1) unstable; urgency=low
3572
3573 * New upstream release
3574 * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes: #86069, #87748)
3575 * fix double space indent in german templates (closes: #89493)
3576 * make postinst check for ssh_host_rsa_key
3577 * get rid of the last of the misguided debian/rules NMU debris :-/
3578
3579 -- Philip Hands <phil@hands.com> Sat, 24 Mar 2001 20:59:33 +0000
3580
3581openssh (1:2.5.1p2-2) unstable; urgency=low
3582
3583 * rebuild with new debhelper (closes: #89558, #89536, #90225)
3584 * fix broken dpkg-statoverride test in postinst
3585 (closes: #89612, #90474, #90460, #89605)
3586 * NMU bug fixed but not closed in last upload (closes: #88206)
3587
3588 -- Philip Hands <phil@hands.com> Fri, 23 Mar 2001 16:11:33 +0000
3589
3590openssh (1:2.5.1p2-1) unstable; urgency=high
3591
3592 * New upstream release
3593 * fix typo in postinst (closes: #88110)
3594 * revert to setting PAM service name in debian/rules, backing out last
3595 NMU, which also (closes: #88101)
3596 * restore the pam lastlog/motd lines, lost during the NMUs, and sshd_config
3597 * restore printlastlog option patch
3598 * revert to using debhelper, which had been partially disabled in NMUs
3599
3600 -- Philip Hands <phil@hands.com> Tue, 13 Mar 2001 01:41:34 +0000
3601
3602openssh (1:2.5.1p1-1.8) unstable; urgency=high
3603
3604 * And now the old pam-bug s/sshd/ssh in ssh.c is also fixed
3605
3606 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 19:48:01 +0100
3607
3608openssh (1:2.5.1p1-1.7) unstable; urgency=high
3609
3610 * And now we mark the correct binary as setuid, when a user requested
3611 to install it setuid.
3612
3613 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 07:19:56 +0100
3614
3615openssh (1:2.5.1p1-1.6) unstable; urgency=high
3616
3617 * Fixes postinst to handle overrides that are already there. Damn, I
3618 should have noticed the bug earlier.
3619
3620 -- Christian Kurz <shorty@debian.org> Wed, 28 Feb 2001 22:35:00 +0100
3621
3622openssh (1:2.5.1p1-1.5) unstable; urgency=high
3623
3624 * Rebuild ssh with pam-support.
3625
3626 -- Christian Kurz <shorty@debian.org> Mon, 26 Feb 2001 21:55:51 +0100
3627
3628openssh (1:2.5.1p1-1.4) unstable; urgency=low
3629
3630 * Added Build-Depends on libssl096-dev.
3631 * Fixed sshd_config file to disallow root logins again.
3632
3633 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 20:03:55 +0100
3634
3635openssh (1:2.5.1p1-1.3) unstable; urgency=low
3636
3637 * Fixed missing manpages for sftp.1 and ssh-keyscan.1
3638 * Made package policy 3.5.2 compliant.
3639
3640 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 15:46:26 +0100
3641
3642openssh (1:2.5.1p1-1.2) unstable; urgency=low
3643
3644 * Added Conflict with sftp, since we now provide our own sftp-client.
3645 * Added a fix for our broken dpkg-statoverride call in the
3646 2.3.0p1-13.
3647 * Fixed some config pathes in the comments of sshd_config.
3648 * Removed ssh-key-exchange-vulnerability-patch since it's not needed
3649 anymore because upstream included the fix.
3650
3651 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 13:46:58 +0100
3652
3653openssh (1:2.5.1p1-1.1) unstable; urgency=high
3654
3655 * Another NMU to get the new upstream version 2.5.1p1 into
3656 unstable. (Closes: #87123)
3657 * Corrected postinst to mark ssh as setuid. (Closes: #86391, #85766)
3658 * Key Exchange patch is already included by upstream. (Closes: #86015)
3659 * Upgrading should be possible now. (Closes: #85525, #85523)
3660 * Added --disable-suid-ssh as compile option, so ssh won't get installed
3661 suid per default.
3662 * Fixed postinst to run dpkg-statoverride only, when dpkg-statoverride
3663 is available and the mode of the binary should be 4755. And also added
3664 suggestion for a newer dpkg.
3665 (Closes: #85734, #85741, #86876)
3666 * sftp and ssh-keyscan will also be included from now on. (Closes: #79994)
3667 * scp now understands spaces in filenames (Closes: #53783, #58958,
3668 #66723)
3669 * ssh-keygen now supports showing DSA fingerprints. (Closes: #68623)
3670 * ssh doesn' t show motd anymore when switch -t is used. (Closes #69035)
3671 * ssh supports the usage of other dsa keys via the ssh command line
3672 options. (Closes: #81250)
3673 * Documentation in sshd_config fixed. (Closes: #81088)
3674 * primes file included by upstream and included now. (Closes: #82101)
3675 * scp now allows dots in the username. (Closes: #82477)
3676 * Spelling error in ssh-copy-id.1 corrected by upstream. (Closes: #78124)
3677
3678 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 10:06:08 +0100
3679
3680openssh (1:2.3.0p1-1.13) unstable; urgency=low
3681
3682 * Config should now also be fixed with this hopefully last NMU.
3683
3684 -- Christian Kurz <shorty@debian.org> Sat, 10 Feb 2001 22:56:36 +0100
3685
3686openssh (1:2.3.0p1-1.12) unstable; urgency=high
3687
3688 * Added suggest for xbase-clients to control-file. (Closes #85227)
3689 * Applied patch from Markus Friedl to fix a vulnerability in
3690 the rsa keyexchange.
3691 * Fixed position of horizontal line. (Closes: #83613)
3692 * Fixed hopefully the grep problem in the config-file. (Closes: #78802)
3693 * Converted package from suidregister to dpkg-statoverride.
3694
3695 -- Christian Kurz <shorty@debian.org> Fri, 9 Feb 2001 19:43:55 +0100
3696
3697openssh (1:2.3.0p1-1.11) unstable; urgency=medium
3698
3699 * Fixed some typos in the german translation of the debconf
3700 template.
3701
3702 -- Christian Kurz <shorty@debian.org> Wed, 24 Jan 2001 18:22:38 +0100
3703
3704openssh (1:2.3.0p1-1.10) unstable; urgency=medium
3705
3706 * Fixed double printing of motd. (Closes: #82618)
3707
3708 -- Christian Kurz <shorty@debian.org> Tue, 23 Jan 2001 21:03:43 +0100
3709
3710openssh (1:2.3.0p1-1.9) unstable; urgency=high
3711
3712 * And the next NMU which includes the patch from Andrew Bartlett
3713 and Markus Friedl to fix the root privileges handling of openssh.
3714 (Closes: #82657)
3715
3716 -- Christian Kurz <shorty@debian.org> Wed, 17 Jan 2001 22:20:54 +0100
3717
3718openssh (1:2.3.0p1-1.8) unstable; urgency=high
3719
3720 * Applied fix from Ryan Murray to allow building on other architectures
3721 since the hurd patch was wrong. (Closes: #82471)
3722
3723 -- Christian Kurz <shorty@debian.org> Tue, 16 Jan 2001 22:45:51 +0100
3724
3725openssh (1:2.3.0p1-1.7) unstable; urgency=medium
3726
3727 * Fixed another typo on sshd_config
3728
3729 -- Christian Kurz <shorty@debian.org> Sun, 14 Jan 2001 19:01:31 +0100
3730
3731openssh (1:2.3.0p1-1.6) unstable; urgency=high
3732
3733 * Added Build-Dependency on groff (Closes: #81886)
3734 * Added Build-Depencency on debhelper (Closes: #82072)
3735 * Fixed entry for known_hosts in sshd_config (Closes: #82096)
3736
3737 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 23:08:16 +0100
3738
3739openssh (1:2.3.0p1-1.5) unstable; urgency=high
3740
3741 * Fixed now also the problem with sshd used as default ipv4 and
3742 didn't use IPv6. This should be now fixed.
3743
3744 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 21:25:55 +0100
3745
3746openssh (1:2.3.0p1-1.4) unstable; urgency=high
3747
3748 * Fixed buggy entry in postinst.
3749
3750 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 23:12:16 +0100
3751
3752openssh (1:2.3.0p1-1.3) unstable; urgency=high
3753
3754 * After finishing the rewrite of the rules-file I had to notice that
3755 the manpage installation was broken. This should now work again.
3756
3757 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 22:11:59 +0100
3758
3759openssh (1:2.3.0p1-1.2) unstable; urgency=high
3760
3761 * Fixed the screwed up build-dependency.
3762 * Removed --with-ipv4-default to support ipv6.
3763 * Changed makefile to use /etc/pam.d/ssh instead of /etc/pam.d/sshd.
3764 * Fixed location to sftp-server in config.
3765 * Since debian still relies on /etc/pam.d/ssh instead of moving to
3766 /etc/pam.d/sshd, I had to hack ssh.h to get ssh to use this name.
3767 * Fixed path to host key in sshd_config.
3768
3769 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 08:23:47 +0100
3770
3771openssh (1:2.3.0p1-1.1) unstable; urgency=medium
3772
3773 * NMU with permission of Phil Hands.
3774 * New upstream release
3775 * Update Build-Depends to point to new libssl096.
3776 * This upstream release doesn't leak any information depending
3777 on the setting of PermitRootLogin (Closes: #59933)
3778 * New upstream release contains fix against forcing a client to
3779 do X/agent forwarding (Closes: #76788)
3780 * Changed template to contain correct path to the documentation
3781 (Closes: #67245)
3782 * Added --with-4in6 switch as compile option into debian/rules.
3783 * Added --with-ipv4-default as compile option into debian/rules.
3784 (Closes: #75037)
3785 * Changed default path to also contain /usr/local/bin and
3786 /usr/X11R6/bin (Closes: #62472,#54567,#62810)
3787 * Changed path to sftp-server in sshd_config to match the
3788 our package (Closes: #68347)
3789 * Replaced OpenBSDh with OpenBSD in the init-script.
3790 * Changed location to original source in copyright.head
3791 * Changed behaviour of init-script when invoked with the option
3792 restart (Closes: #68706,#72560)
3793 * Added a note about -L option of scp to README.Debian
3794 * ssh won't print now the motd if invoked with -t option
3795 (Closes: #59933)
3796 * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867)
3797 * Added a note about tcp-wrapper support to README.Debian
3798 (Closes: #72807,#22190)
3799 * Removed two unneeded options from building process.
3800 * Added sshd.pam into debian dir and install it.
3801 * Commented out unnecessary call to dh_installinfo.
3802 * Added a line to sshd.pam so that limits will be paid attention
3803 to (Closes: #66904)
3804 * Restart Option has a Timeout of 10 seconds (Closes: 51264)
3805 * scp won't override files anymore (Closes: 51955)
3806 * Removed pam_lastlog module, so that the lastlog is now printed
3807 only once (Closes: #71742, #68335, #69592, #71495, #77781)
3808 * If password is expired, openssh now forces the user to change it.
3809 (Closes: #51747)
3810 * scp should now have no more problems with shell-init-files that
3811 produces ouput (Closes: #56280,#59873)
3812 * ssh now prints the motd correctly (Closes: #66926)
3813 * ssh upgrade should disable ssh daemon only if users has choosen
3814 to do so (Closes: #67478)
3815 * ssh can now be installed suid (Closes: #70879)
3816 * Modified debian/rules to support hurd.
3817
3818 -- Christian Kurz <shorty@debian.org> Wed, 27 Dec 2000 20:06:57 +0100
3819
3820openssh (1:2.2.0p1-1.1) unstable; urgency=medium
3821
3822 * Non-Maintainer Upload
3823 * Check for new returns in the new libc
3824 (closes: #72803, #74393, #72797, #71307, #71702)
3825 * Link against libssl095a (closes: #66304)
3826 * Correct check for PermitRootLogin (closes: #69448)
3827
3828 -- Ryan Murray <rmurray@debian.org> Wed, 18 Oct 2000 00:48:18 -0700
3829
3830openssh (1:2.2.0p1-1) unstable; urgency=low
3831
3832 * New upstream release
3833
3834 -- Philip Hands <phil@hands.com> Mon, 11 Sep 2000 14:49:43 +0100
3835
3836openssh (1:2.1.1p4-3) unstable; urgency=low
3837
3838 * add rsh alternatives
3839 * add -S option to scp (using Tommi Virtanen's patch) (closes: #63097)
3840 * do the IPV4_DEFAULT thing properly this time
3841
3842 -- Philip Hands <phil@hands.com> Fri, 11 Aug 2000 18:14:37 +0100
3843
3844openssh (1:2.1.1p4-2) unstable; urgency=low
3845
3846 * reinstate manpage .out patch from 1:1.2.3
3847 * fix typo in postinst
3848 * only compile ssh with IPV4_DEFAULT
3849 * apply James Troup's patch to add a -o option to scp and updated manpage
3850
3851 -- Philip Hands <phil@hands.com> Sun, 30 Jul 2000 00:12:49 +0100
3852
3853openssh (1:2.1.1p4-1) unstable; urgency=low
3854
3855 * New upstream release
3856
3857 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 14:46:16 +0100
3858
3859openssh (1:1.2.3-10) unstable; urgency=low
3860
3861 * add version to libpam-modules dependency, because old versions of
3862 pam_motd make it impossible to log in.
3863
3864 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 13:28:22 +0100
3865
3866openssh (1:1.2.3-9) frozen unstable; urgency=low
3867
3868 * force location of /usr/bin/X11/xauth
3869 (closes: #64424, #66437, #66859) *RC*
3870 * typos in config (closes: #66779, #66780)
3871 * sshd_not_to_be_run could be assumed to be true, in error, if the config
3872 script died in an unusual way --- I've reversed this (closes: #66335)
3873 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to ssh-askpass-ptk
3874 (closes: #65981)
3875 * change default for PermitRootLogin to "no" (closes: #66406)
3876
3877 -- Philip Hands <phil@hands.com> Tue, 11 Jul 2000 20:51:18 +0100
3878
3879openssh (1:1.2.3-8) frozen unstable; urgency=low
3880
3881 * get rid of Provides: rsh-server (this will mean that rstartd
3882 will need to change it's depends to deal with #63948, which I'm
3883 reopening) (closes: #66257)
3884 Given that this is also a trivial change, and is a reversal of a
3885 change that was mistakenly made after the freeze, I think this should
3886 also go into frozen.
3887
3888 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:26:30 +0100
3889
3890openssh (1:1.2.3-7) frozen unstable; urgency=low
3891
3892 * check if debconf is installed before calling db_stop in postinst.
3893 This is required to allow ssh to be installed when debconf is not
3894 wanted, which probably makes it an RC upload (hopefully the last of
3895 too many).
3896
3897 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:19:47 +0100
3898
3899openssh (1:1.2.3-6) frozen unstable; urgency=low
3900
3901 * fixed depressing little bug involving a line wrap looking like
3902 a blank line in the templates file *RC*
3903 (closes: #66090, #66078, #66083, #66182)
3904
3905 -- Philip Hands <phil@hands.com> Mon, 26 Jun 2000 00:45:05 +0100
3906
3907openssh (1:1.2.3-5) frozen unstable; urgency=low
3908
3909 * add code to prevent UseLogin exploit, although I think our PAM
3910 conditional code breaks UseLogin in a way that protects us from this
3911 exploit anyway. ;-) (closes: #65495) *RC*
3912 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to fix keyboard
3913 grab vulnerability in ssh-askpass-gnome (closes: #64795) *RC*
3914 * stop redirection of sshd's file descriptors (introduced in 1:1.2.3-3)
3915 and use db_stop in the postinst to solve that problem instead
3916 (closes: #65104)
3917 * add Provides: rsh-server to ssh (closes: #63948)
3918 * provide config option not to run sshd
3919
3920 -- Philip Hands <phil@hands.com> Mon, 12 Jun 2000 23:05:11 +0100
3921
3922openssh (1:1.2.3-4) frozen unstable; urgency=low
3923
3924 * fixes #63436 which is *RC*
3925 * add 10 second pause in init.d restart (closes: #63844)
3926 * get rid of noenv in PAM mail line (closes: #63856)
3927 * fix host key path in make-ssh-known-hosts (closes: #63713)
3928 * change wording of SUID template (closes: #62788, #63436)
3929
3930 -- Philip Hands <phil@hands.com> Sat, 27 May 2000 11:18:06 +0100
3931
3932openssh (1:1.2.3-3) frozen unstable; urgency=low
3933
3934 * redirect sshd's file descriptors to /dev/null in init to
3935 prevent debconf from locking up during installation
3936 ** grave bug just submited by me **
3937
3938 -- Philip Hands <phil@hands.com> Thu, 20 Apr 2000 17:10:59 +0100
3939
3940openssh (1:1.2.3-2) frozen unstable; urgency=low
3941
3942 * allow user to select SUID status of /usr/bin/ssh (closes: 62462) ** RC **
3943 * suggest debconf
3944 * conflict with debconf{,-tiny} (<<0.2.17) so I can clean up the preinst
3945
3946 -- Philip Hands <phil@hands.com> Wed, 19 Apr 2000 17:49:15 +0100
3947
3948openssh (1:1.2.3-1) frozen unstable; urgency=low
3949
3950 * New upstream release
3951 * patch sshd to create extra xauth key required for localhost
3952 (closes: #49944) *** RC ***
3953 * FallbacktoRsh now defaults to ``no'' to match impression
3954 given in sshd_config
3955 * stop setting suid bit on ssh (closes: #58711, #58558)
3956 This breaks Rhosts authentication (which nobody uses) and allows
3957 the LD_PRELOAD trick to get socks working, so seems like a net benefit.
3958
3959 -- Philip Hands <phil@hands.com> Thu, 13 Apr 2000 20:01:54 +0100
3960
3961openssh (1:1.2.2-1.4) frozen unstable; urgency=low
3962
3963 * Recompile for frozen, contains fix for RC bug.
3964
3965 -- Tommi Virtanen <tv@debian.org> Tue, 29 Feb 2000 22:14:58 +0200
3966
3967openssh (1:1.2.2-1.3) unstable; urgency=low
3968
3969 * Integrated man page addition for PrintLastLog.
3970 This bug was filed on "openssh", and I ended up
3971 creating my own patch for this (closes: #59054)
3972 * Improved error message when ssh_exchange_identification
3973 gets EOF (closes: #58904)
3974 * Fixed typo (your -> you're) in debian/preinst.
3975 * Added else-clauses to config to make this upgradepath possible:
3976 oldssh -> openssh preinst fails due to upgrade_to_openssh=false
3977 -> ssh-nonfree -> openssh. Without these, debconf remembered
3978 the old answer, config didn't force asking it, and preinst always
3979 aborted (closes: #56596, #57782)
3980 * Moved setting upgrade_to_openssh isdefault flag to the place
3981 where preinst would abort. This means no double question to most
3982 users, people who currently suffer from "can't upgrade" may need
3983 to run apt-get install ssh twice. Did not do the same for
3984 use_old_init_script, as the situation is a bit different, and
3985 less common (closes: #54010, #56224)
3986 * Check for existance of ssh-keygen before attempting to use it in
3987 preinst, added warning for non-existant ssh-keygen in config. This
3988 happens when the old ssh is removed (say, due to ssh-nonfree getting
3989 installed).
3990
3991 -- Tommi Virtanen <tv@debian.org> Sun, 27 Feb 2000 21:36:43 +0200
3992
3993openssh (1:1.2.2-1.2) frozen unstable; urgency=low
3994
3995 * Non-maintainer upload.
3996 * Added configuration option PrintLastLog, default off due to PAM
3997 (closes: #54007, #55042)
3998 * ssh-askpass-{gnome,ptk} now provide ssh-askpass, making ssh's
3999 Suggests: line more accurate. Also closing related bugs fixed
4000 earlier, when default ssh-askpass moved to /usr/bin.
4001 (closes: #52403, #54741, #50607, #52298, #50967, #51661)
4002 * Patched to call vhangup, with autoconf detection and all
4003 (closes: #55379)
4004 * Added --with-ipv4-default workaround to a glibc bug causing
4005 slow DNS lookups, as per UPGRADING. Use -6 to really use
4006 IPv6 addresses. (closes: #57891, #58744, #58713, #57970)
4007 * Added noenv to PAM pam_mail line. Thanks to Ben Collins.
4008 (closes: #58429)
4009 * Added the UPGRADING file to the package.
4010 * Added frozen to the changelog line and recompiled before
4011 package was installed into the archive.
4012
4013 -- Tommi Virtanen <tv@debian.org> Fri, 25 Feb 2000 22:08:57 +0200
4014
4015openssh (1:1.2.2-1.1) frozen unstable; urgency=low
4016
4017 * Non-maintainer upload.
4018 * Integrated scp pipe buffer patch from Ben Collins
4019 <benc@debian.org>, should now work even if reading
4020 a pipe gives less than fstat st_blksize bytes.
4021 Should now work on Alpha and Sparc Linux (closes: #53697, #52071)
4022 * Made ssh depend on libssl09 (>= 0.9.4-3) (closes: #51393)
4023 * Integrated patch from Ben Collins <benc@debian.org>
4024 to do full shadow account locking and expiration
4025 checking (closes: #58165, #51747)
4026
4027 -- Tommi Virtanen <tv@debian.org> Tue, 22 Feb 2000 20:46:12 +0200
4028
4029openssh (1:1.2.2-1) frozen unstable; urgency=medium
4030
4031 * New upstream release (closes: #56870, #56346)
4032 * built against new libesd (closes: #56805)
4033 * add Colin Watson <cjw44@cam.ac.uk> =NULL patch
4034 (closes: #49902, #54894)
4035 * use socketpairs as suggested by Andrew Tridgell to eliminate rsync
4036 (and other) lockups
4037 * patch SSHD_PAM_SERVICE back into auth-pam.c, again :-/
4038 (closes: #49902, #55872, #56959)
4039 * uncoment the * line in ssh_config (closes: #56444)
4040
4041 * #54894 & #49902 are release critical, so this should go in frozen
4042
4043 -- Philip Hands <phil@hands.com> Wed, 9 Feb 2000 04:52:04 +0000
4044
4045openssh (1:1.2.1pre24-1) unstable; urgency=low
4046
4047 * New upstream release
4048
4049 -- Philip Hands <phil@hands.com> Fri, 31 Dec 1999 02:47:24 +0000
4050
4051openssh (1:1.2.1pre23-1) unstable; urgency=low
4052
4053 * New upstream release
4054 * excape ? in /etc/init.d/ssh (closes: #53269)
4055
4056 -- Philip Hands <phil@hands.com> Wed, 29 Dec 1999 16:50:46 +0000
4057
4058openssh (1:1.2pre17-1) unstable; urgency=low
4059
4060 * New upstream release
4061
4062 -- Philip Hands <phil@hands.com> Thu, 9 Dec 1999 16:50:40 +0000
4063
4064openssh (1:1.2pre16-1) unstable; urgency=low
4065
4066 * New upstream release
4067 * upstream release (1.2pre14) (closes: #50299)
4068 * make ssh depend on libwrap0 (>= 7.6-1.1) (closes: #50973, #50776)
4069 * dispose of grep -q broken pipe message in config script (closes: #50855)
4070 * add make-ssh-known-hosts (closes: #50660)
4071 * add -i option to ssh-copy-id (closes: #50657)
4072 * add check for *LK* in password, indicating a locked account
4073
4074 -- Philip Hands <phil@hands.com> Wed, 8 Dec 1999 22:59:38 +0000
4075
4076openssh (1:1.2pre13-1) unstable; urgency=low
4077
4078 * New upstream release
4079 * make sshd.c use SSHD_PAM_SERVICE and define it as "ssh" in debian/rules
4080 * remove duplicate line in /etc/pam.d/ssh (closes: #50310)
4081 * mention ssh -A option in ssh.1 & ssh_config
4082 * enable forwarding to localhost in default ssh_config (closes: #50373)
4083 * tweak preinst to deal with debconf being `unpacked'
4084 * use --with-tcp-wrappers (closes: #49545)
4085
4086 -- Philip Hands <phil@hands.com> Sat, 20 Nov 1999 14:20:04 +0000
4087
4088openssh (1:1.2pre11-2) unstable; urgency=low
4089
4090 * oops, just realised that I forgot to strip out the unpleasant
4091 fiddling mentioned below (which turned not to be a fix anyway)
4092
4093 -- Philip Hands <phil@hands.com> Mon, 15 Nov 1999 01:35:23 +0000
4094
4095openssh (1:1.2pre11-1) unstable; urgency=low
4096
4097 * New upstream release (closes: #49722)
4098 * add 2>/dev/null to dispose of spurious message casused by grep -q
4099 (closes: #49876, #49604)
4100 * fix typo in debian/control (closes: #49841)
4101 * Do some unpleasant fiddling with upgraded keys in the preinst, which
4102 should make the keylength problem go away. (closes: #49676)
4103 * make pam_start in sshd use ``ssh'' as the service name (closes: #49956)
4104 * If /etc/ssh/NOSERVER exist, stop sshd from starting (closes: #47107)
4105 * apply Ben Collins <bcollins@debian.org>'s shadow patch
4106 * disable lastlogin and motd printing if using pam (closes: #49957)
4107 * add ssh-copy-id script and manpage
4108
4109 -- Philip Hands <phil@hands.com> Fri, 12 Nov 1999 01:03:38 +0000
4110
4111openssh (1:1.2pre9-1) unstable; urgency=low
4112
4113 * New upstream release
4114 * apply Chip Salzenberg <chip@valinux.com>'s SO_REUSEADDR patch
4115 to channels.c, to make forwarded ports instantly reusable
4116 * replace Pre-Depend: debconf with some check code in preinst
4117 * make the ssh-add ssh-askpass failure message more helpful
4118 * fix the ssh-agent getopts bug (closes: #49426)
4119 * fixed typo on Suggests: line (closes: #49704, #49571)
4120 * tidy up ssh package description (closes: #49642)
4121 * make ssh suid (closes: #49635)
4122 * in preinst upgrade code, ensure ssh_host_keys is mode 600 (closes: #49606)
4123 * disable agent forwarding by default, for the similar reasons as
4124 X forwarding (closes: #49586)
4125
4126 -- Philip Hands <phil@hands.com> Tue, 9 Nov 1999 09:57:47 +0000
4127
4128openssh (1:1.2pre7-4) unstable; urgency=low
4129
4130 * predepend on debconf (>= 0.2.17) should now allow preinst questions
4131
4132 -- Philip Hands <phil@hands.com> Sat, 6 Nov 1999 10:31:06 +0000
4133
4134openssh (1:1.2pre7-3) unstable; urgency=low
4135
4136 * add ssh-askpass package using Tommi Virtanen's perl-tk script
4137 * add ssh-preconfig package cludge
4138 * add usage hints to ssh-agent.1
4139
4140 -- Philip Hands <phil@hands.com> Fri, 5 Nov 1999 00:38:33 +0000
4141
4142openssh (1:1.2pre7-2) unstable; urgency=low
4143
4144 * use pam patch from Ben Collins <bcollins@debian.org>
4145 * add slogin symlink to Makefile.in
4146 * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login
4147 * sort out debconf usage
4148 * patch from Tommi Virtanen <tv@debian.org>'s makes ssh-add use ssh-askpass
4149
4150 -- Philip Hands <phil@hands.com> Thu, 4 Nov 1999 11:08:54 +0000
4151
4152openssh (1:1.2pre7-1) unstable; urgency=low
4153
4154 * New upstream release
4155
4156 -- Philip Hands <phil@hands.com> Tue, 2 Nov 1999 21:02:37 +0000
4157
4158openssh (1:1.2.0.pre6db1-2) unstable; urgency=low
4159
4160 * change the binary package name to ssh (the non-free branch of ssh has
4161 been renamed to ssh-nonfree)
4162 * make pam file comply with Debian standards
4163 * use an epoch to make sure openssh supercedes ssh-nonfree
4164
4165 -- Philip Hands <phil@hands.com> Sat, 30 Oct 1999 16:26:05 +0100
4166
4167openssh (1.2pre6db1-1) unstable; urgency=low
4168
4169 * New upstream source
4170 * sshd accepts logins now!
4171
4172 -- Dan Brosemer <odin@linuxfreak.com> Fri, 29 Oct 1999 11:13:38 -0500
4173
4174openssh (1.2.0.19991028-1) unstable; urgency=low
4175
4176 * New upstream source
4177 * Added test for -lnsl to configure script
4178
4179 -- Dan Brosemer <odin@linuxfreak.com> Thu, 28 Oct 1999 18:52:09 -0500
4180
4181openssh (1.2.0.19991027-3) unstable; urgency=low
4182
4183 * Initial release
4184
4185 -- 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..c04d5b9eb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,192 @@
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.6
7Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
8Homepage: http://www.openssh.org/
9Vcs-Git: git://anonscm.debian.org/pkg-ssh/openssh.git
10Vcs-Browser: http://anonscm.debian.org/gitweb/?p=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, ${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
130Package: ssh
131Priority: extra
132Architecture: all
133Pre-Depends: dpkg (>= 1.17.5)
134Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
135Description: secure shell client and server (metapackage)
136 This metapackage is a convenient way to install both the OpenSSH client
137 and the OpenSSH server. It provides nothing in and of itself, so you
138 may remove it if nothing depends on it.
139
140Package: ssh-krb5
141Section: oldlibs
142Priority: extra
143Architecture: all
144Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
145Description: secure shell client and server (transitional package)
146 This is a transitional package depending on the regular Debian OpenSSH
147 client and server, which now support GSSAPI natively. It will add the
148 necessary GSSAPI options to the server configuration file. You can
149 remove it once the upgrade is complete and nothing depends on it.
150
151Package: ssh-askpass-gnome
152Section: gnome
153Priority: optional
154Architecture: any
155Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5
156Replaces: ssh (<< 1:3.5p1-3)
157Provides: ssh-askpass
158Description: interactive X program to prompt users for a passphrase for ssh-add
159 This has been split out of the main openssh-client package so that
160 openssh-client does not need to depend on GTK+.
161 .
162 You probably want the ssh-askpass package instead, but this is
163 provided to add to your choice and/or confusion.
164
165Package: openssh-client-udeb
166Package-Type: udeb
167Section: debian-installer
168Priority: optional
169Architecture: any
170Depends: ${shlibs:Depends}, libnss-files-udeb
171XB-Installer-Menu-Item: 99999
172Description: secure shell client for the Debian installer
173 This is the portable version of OpenSSH, a free implementation of
174 the Secure Shell protocol as specified by the IETF secsh working
175 group.
176 .
177 This package provides the ssh client for use in debian-installer.
178
179Package: openssh-server-udeb
180Package-Type: udeb
181Section: debian-installer
182Priority: optional
183Architecture: any
184Depends: ${shlibs:Depends}, libnss-files-udeb
185Description: secure shell server for the Debian installer
186 This is the portable version of OpenSSH, a free implementation of
187 the Secure Shell protocol as specified by the IETF secsh working
188 group.
189 .
190 This package provides the sshd server for use in debian-installer.
191 Since it is expected to be used in specialized situations (e.g. S/390
192 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..d6eb7fda5
--- /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.org/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.org/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.org/portable.html">Portable</a> distribution from a
143<a href="http://www.openssh.org/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.org/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.org/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.org/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.org/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.org/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.org/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.org/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.org/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..18e529f64
--- /dev/null
+++ b/debian/openssh-client.install
@@ -0,0 +1,37 @@
1#! /usr/bin/dh-exec
2
3etc/ssh/moduli
4etc/ssh/ssh_config
5usr/bin/scp
6usr/bin/sftp
7usr/bin/slogin
8usr/bin/ssh
9usr/bin/ssh-add
10usr/bin/ssh-agent
11usr/bin/ssh-keygen
12usr/bin/ssh-keyscan
13usr/lib/openssh/ssh-keysign
14usr/lib/openssh/ssh-pkcs11-helper
15usr/share/man/man1/scp.1
16usr/share/man/man1/sftp.1
17usr/share/man/man1/slogin.1
18usr/share/man/man1/ssh-add.1
19usr/share/man/man1/ssh-agent.1
20usr/share/man/man1/ssh-keygen.1
21usr/share/man/man1/ssh-keyscan.1
22usr/share/man/man1/ssh.1
23usr/share/man/man5/moduli.5
24usr/share/man/man5/ssh_config.5
25usr/share/man/man8/ssh-keysign.8
26usr/share/man/man8/ssh-pkcs11-helper.8
27
28contrib/ssh-copy-id usr/bin
29debian/ssh-argv0 usr/bin
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
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..0d0e55a7a
--- /dev/null
+++ b/debian/openssh-server.examples
@@ -0,0 +1 @@
sshd_config
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
new file mode 100644
index 000000000..dd05ea51c
--- /dev/null
+++ b/debian/openssh-server.if-up
@@ -0,0 +1,43 @@
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 action=reload
38else
39 action=restart
40fi
41invoke-rc.d ssh $action >/dev/null 2>&1 || true
42
43exit 0
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
new file mode 100755
index 000000000..06e0c71b7
--- /dev/null
+++ b/debian/openssh-server.install
@@ -0,0 +1,16 @@
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
13
14# dh_apport would be neater, but at the time of writing it isn't in unstable
15# yet.
16debian/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..2c6c53d88
--- /dev/null
+++ b/debian/openssh-server.postinst
@@ -0,0 +1,327 @@
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 depending on the setting of Protocol.
83 protocol="$(get_config_option Protocol)"
84 [ "$protocol" ] || protocol=1,2
85 if echo "$protocol" | grep 1 >/dev/null; then
86 echo /etc/ssh/ssh_host_key
87 fi
88 if echo "$protocol" | grep 2 >/dev/null; then
89 echo /etc/ssh/ssh_host_rsa_key
90 echo /etc/ssh/ssh_host_dsa_key
91 echo /etc/ssh/ssh_host_ecdsa_key
92 echo /etc/ssh/ssh_host_ed25519_key
93 fi
94 fi
95}
96
97
98create_key() {
99 msg="$1"
100 shift
101 hostkeys="$1"
102 shift
103 file="$1"
104 shift
105
106 if echo "$hostkeys" | grep -x "$file" >/dev/null && \
107 [ ! -f "$file" ] ; then
108 echo -n $msg
109 ssh-keygen -q -f "$file" -N '' "$@"
110 echo
111 if which restorecon >/dev/null 2>&1; then
112 restorecon "$file" "$file.pub"
113 fi
114 ssh-keygen -l -f "$file.pub"
115 fi
116}
117
118
119create_keys() {
120 hostkeys="$(host_keys_required)"
121
122 create_key "Creating SSH1 key; this may take some time ..." \
123 "$hostkeys" /etc/ssh/ssh_host_key -t rsa1
124
125 create_key "Creating SSH2 RSA key; this may take some time ..." \
126 "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa
127 create_key "Creating SSH2 DSA key; this may take some time ..." \
128 "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa
129 create_key "Creating SSH2 ECDSA key; this may take some time ..." \
130 "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa
131 create_key "Creating SSH2 ED25519 key; this may take some time ..." \
132 "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519
133}
134
135
136fix_loglevel_silent() {
137 if [ "$(get_config_option LogLevel)" = SILENT ]; then
138 set_config_option LogLevel QUIET
139 fi
140}
141
142
143update_server_key_bits() {
144 if [ "$(get_config_option ServerKeyBits)" = 768 ]; then
145 set_config_option ServerKeyBits 1024
146 fi
147}
148
149
150create_sshdconfig() {
151 if [ -e /etc/ssh/sshd_config ] ; then
152 # Upgrade an existing sshd configuration.
153
154 # This option was renamed in 3.8p1, but we never took care
155 # of adjusting the configuration file until now.
156 if dpkg --compare-versions "$oldversion" lt 1:4.7p1-8; then
157 rename_config_option KeepAlive TCPKeepAlive
158 fi
159
160 # 'LogLevel SILENT' is now equivalent to QUIET.
161 if dpkg --compare-versions "$oldversion" lt 1:5.4p1-1; then
162 fix_loglevel_silent
163 fi
164
165 # Changed upstream in 5.1p1, but we forgot to update the
166 # package-generated configuration file until now.
167 if dpkg --compare-versions "$oldversion" lt 1:6.4p1-2; then
168 update_server_key_bits
169 fi
170
171 return 0
172 fi
173
174 cat <<EOF > /etc/ssh/sshd_config
175# Package generated configuration file
176# See the sshd_config(5) manpage for details
177
178# What ports, IPs and protocols we listen for
179Port 22
180# Use these options to restrict which interfaces/protocols sshd will bind to
181#ListenAddress ::
182#ListenAddress 0.0.0.0
183Protocol 2
184# HostKeys for protocol version 2
185HostKey /etc/ssh/ssh_host_rsa_key
186HostKey /etc/ssh/ssh_host_dsa_key
187HostKey /etc/ssh/ssh_host_ecdsa_key
188HostKey /etc/ssh/ssh_host_ed25519_key
189#Privilege Separation is turned on for security
190UsePrivilegeSeparation yes
191
192# Lifetime and size of ephemeral version 1 server key
193KeyRegenerationInterval 3600
194ServerKeyBits 1024
195
196# Logging
197SyslogFacility AUTH
198LogLevel INFO
199
200# Authentication:
201LoginGraceTime 120
202PermitRootLogin prohibit-password
203StrictModes yes
204
205RSAAuthentication yes
206PubkeyAuthentication yes
207#AuthorizedKeysFile %h/.ssh/authorized_keys
208
209# Don't read the user's ~/.rhosts and ~/.shosts files
210IgnoreRhosts yes
211# For this to work you will also need host keys in /etc/ssh_known_hosts
212RhostsRSAAuthentication no
213# similar for protocol version 2
214HostbasedAuthentication no
215# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
216#IgnoreUserKnownHosts yes
217
218# To enable empty passwords, change to yes (NOT RECOMMENDED)
219PermitEmptyPasswords no
220
221# Change to yes to enable challenge-response passwords (beware issues with
222# some PAM modules and threads)
223ChallengeResponseAuthentication no
224
225# Change to no to disable tunnelled clear text passwords
226#PasswordAuthentication yes
227
228# Kerberos options
229#KerberosAuthentication no
230#KerberosGetAFSToken no
231#KerberosOrLocalPasswd yes
232#KerberosTicketCleanup yes
233
234# GSSAPI options
235#GSSAPIAuthentication no
236#GSSAPICleanupCredentials yes
237
238X11Forwarding yes
239X11DisplayOffset 10
240PrintMotd no
241PrintLastLog yes
242TCPKeepAlive yes
243#UseLogin no
244
245#MaxStartups 10:30:60
246#Banner /etc/issue.net
247
248# Allow client to pass locale environment variables
249AcceptEnv LANG LC_*
250
251Subsystem sftp /usr/lib/openssh/sftp-server
252
253# Set this to 'yes' to enable PAM authentication, account processing,
254# and session processing. If this is enabled, PAM authentication will
255# be allowed through the ChallengeResponseAuthentication and
256# PasswordAuthentication. Depending on your PAM configuration,
257# PAM authentication via ChallengeResponseAuthentication may bypass
258# the setting of "PermitRootLogin without-password".
259# If you just want the PAM account and session checks to run without
260# PAM authentication, then enable this but set PasswordAuthentication
261# and ChallengeResponseAuthentication to 'no'.
262UsePAM yes
263EOF
264}
265
266fix_statoverride() {
267# Remove an erronous override for sshd (we should have overridden ssh)
268 if dpkg-statoverride --list /usr/sbin/sshd >/dev/null; then
269 dpkg-statoverride --remove /usr/sbin/sshd
270 fi
271}
272
273setup_sshd_user() {
274 if ! getent passwd sshd >/dev/null; then
275 adduser --quiet --system --no-create-home --home /var/run/sshd --shell /usr/sbin/nologin sshd
276 fi
277}
278
279if [ "$action" = configure ]; then
280 create_sshdconfig
281 create_keys
282 fix_statoverride
283 setup_sshd_user
284 # Renamed to /etc/ssh/moduli in 2.9.9 (!)
285 if dpkg --compare-versions "$2" lt-nl 1:4.7p1-1; then
286 rm -f /etc/ssh/primes
287 fi
288 if dpkg --compare-versions "$2" lt-nl 1:5.5p1-6; then
289 rm -f /var/run/sshd/.placeholder
290 fi
291 if dpkg --compare-versions "$2" lt-nl 1:6.2p2-3 && \
292 which initctl >/dev/null && initctl version 2>/dev/null | grep -q upstart && \
293 ! status ssh 2>/dev/null | grep -q ' start/'; then
294 # We must stop the sysvinit-controlled sshd before we can
295 # restart it under Upstart.
296 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true
297 fi
298 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-2 && \
299 deb-systemd-helper debian-installed ssh.socket && \
300 deb-systemd-helper --quiet was-enabled ssh.service && \
301 deb-systemd-helper --quiet was-enabled ssh.socket; then
302 # 1:6.5p1-1 mistakenly left both ssh.service and ssh.socket
303 # enabled.
304 deb-systemd-helper disable ssh.socket >/dev/null || true
305 fi
306 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-3 && \
307 [ -d /run/systemd/system ]; then
308 # We must stop the sysvinit-controlled sshd before we can
309 # restart it under systemd.
310 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd || true
311 fi
312 if dpkg --compare-versions "$2" lt-nl 1:6.6p1-1 && \
313 [ "$(get_config_option PermitRootLogin)" = yes ] &&
314 db_get openssh-server/permit-root-login && [ "$RET" = true ]; then
315 set_config_option PermitRootLogin prohibit-password
316 fi
317 if dpkg --compare-versions "$2" lt-nl 1:7.1p1-1 && \
318 [ "$(get_config_option PermitRootLogin)" = without-password ]; then
319 set_config_option PermitRootLogin prohibit-password
320 fi
321fi
322
323#DEBHELPER#
324
325db_stop
326
327exit 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..dc82a6085
--- /dev/null
+++ b/debian/patches/auth-log-verbosity.patch
@@ -0,0 +1,133 @@
1From bede2f8c8a352b57ae5188fe6d3e45c5a57892eb 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 e387697..f1e3ddf 100644
20--- a/auth-options.c
21+++ b/auth-options.c
22@@ -58,9 +58,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@@ -293,10 +304,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@@ -519,11 +533,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 5aa319c..1eee161 100644
108--- a/auth2-pubkey.c
109+++ b/auth2-pubkey.c
110@@ -561,6 +561,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@@ -726,6 +727,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@@ -872,6 +874,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..694b8e584
--- /dev/null
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -0,0 +1,26 @@
1From efc61f37910b46ad2ac920aca7eefce909ef2555 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 3d2a328..915c740 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -324,6 +324,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/backport-fix-first-kex-follows.patch b/debian/patches/backport-fix-first-kex-follows.patch
new file mode 100644
index 000000000..0039a55a6
--- /dev/null
+++ b/debian/patches/backport-fix-first-kex-follows.patch
@@ -0,0 +1,36 @@
1From 31cc76b587fe2305eab8f7788c5dc6c876aff60e Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Tue, 15 Dec 2015 15:25:04 +0000
4Subject: upstream commit
5
6unbreak connections with peers that set first_kex_follows;
7fix from Matt Johnston va bz#2515
8
9Origin: backport, http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/kex.c.diff?r1=1.114&r2=1.115
10Forwarded: not-needed
11Bug-Ubuntu: https://bugs.launchpad.net/bugs/1526357
12
13Patch-Name: backport-fix-first-kex-follows.patch
14---
15 kex.c | 6 +++---
16 1 file changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/kex.c b/kex.c
19index 39a6f98..12f3e41 100644
20--- a/kex.c
21+++ b/kex.c
22@@ -286,11 +286,11 @@ kex_buf2prop(struct sshbuf *raw, int *first_kex_follows, char ***propp)
23 debug2("kex_parse_kexinit: %s", proposal[i]);
24 }
25 /* first kex follows / reserved */
26- if ((r = sshbuf_get_u8(b, &v)) != 0 ||
27- (r = sshbuf_get_u32(b, &i)) != 0)
28+ if ((r = sshbuf_get_u8(b, &v)) != 0 || /* first_kex_follows */
29+ (r = sshbuf_get_u32(b, &i)) != 0) /* reserved */
30 goto out;
31 if (first_kex_follows != NULL)
32- *first_kex_follows = i;
33+ *first_kex_follows = v;
34 debug2("kex_parse_kexinit: first_kex_follows %d ", v);
35 debug2("kex_parse_kexinit: reserved %u ", i);
36 r = 0;
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
new file mode 100644
index 000000000..0ca73053b
--- /dev/null
+++ b/debian/patches/debian-banner.patch
@@ -0,0 +1,111 @@
1From e35768a64e1ca5a6ad2a5df3ebbe6806ffb8afa2 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 ed3a88d..a778f44 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@@ -347,6 +348,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 if (kex_assemble_names(KEX_SERVER_ENCRYPT, &options->ciphers) != 0 ||
41 kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 ||
42@@ -430,6 +433,7 @@ typedef enum {
43 sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
44 sStreamLocalBindMask, sStreamLocalBindUnlink,
45 sAllowStreamLocalForwarding, sFingerprintHash,
46+ sDebianBanner,
47 sDeprecated, sUnsupported
48 } ServerOpCodes;
49
50@@ -577,6 +581,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@@ -1867,6 +1872,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 0d4fb7f..6024e0e 100644
84--- a/sshd.c
85+++ b/sshd.c
86@@ -443,7 +443,8 @@ sshd_exchange_identification(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 c8ee35d..b149bd3 100644
98--- a/sshd_config.5
99+++ b/sshd_config.5
100@@ -533,6 +533,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..0a2b1c58d
--- /dev/null
+++ b/debian/patches/debian-config.patch
@@ -0,0 +1,195 @@
1From 966fde291d530349c427da5c98e4f1869cb4e0bb 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 c0ba5a7..e4e1cba 100644
36--- a/readconf.c
37+++ b/readconf.c
38@@ -1749,7 +1749,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 if (options->exit_on_forward_failure == -1)
47diff --git a/ssh.1 b/ssh.1
48index 05b7f10..649d6c3 100644
49--- a/ssh.1
50+++ b/ssh.1
51@@ -755,6 +755,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@@ -763,6 +773,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 228e5ab..c9386aa 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@@ -48,3 +49,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 d4928b8..81b9b74 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@@ -721,7 +737,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 64786c9..d8338db 100644
149--- a/sshd_config
150+++ b/sshd_config
151@@ -125,7 +125,7 @@ UsePrivilegeSeparation sandbox # Default for new installations.
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 0828592..0be7250 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..16c4d61b9
--- /dev/null
+++ b/debian/patches/dnssec-sshfp.patch
@@ -0,0 +1,94 @@
1From c35c5d9e775ad138661f3c4ef797060be53a4bd8 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..ec2878845
--- /dev/null
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -0,0 +1,28 @@
1From a6edf4df120a78aefe39b44d07c89e13340c9ac8 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 1e9c058..d4928b8 100644
17--- a/ssh_config.5
18+++ b/ssh_config.5
19@@ -809,6 +809,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..1f3d7bf08
--- /dev/null
+++ b/debian/patches/doc-upstart.patch
@@ -0,0 +1,29 @@
1From 5e6ecf32f56fa0c7d102239b74ae09bd4186c5a3 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 42ba596..17b917c 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..4fce0733d
--- /dev/null
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -0,0 +1,26 @@
1From a9bfb2fba2b1ec9ebeca20550cbccf2499d42461 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..8c96afbb0
--- /dev/null
+++ b/debian/patches/gssapi.patch
@@ -0,0 +1,3030 @@
1From 48424483cbf2232ba849038e02675b2db1ea3a88 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-01-04
21
22Patch-Name: gssapi.patch
23---
24 ChangeLog.gssapi | 113 +++++++++++++++++++
25 Makefile.in | 5 +-
26 auth-krb5.c | 17 ++-
27 auth.c | 3 +-
28 auth2-gss.c | 48 +++++++-
29 auth2.c | 2 +
30 clientloop.c | 13 +++
31 config.h.in | 6 +
32 configure.ac | 24 ++++
33 gss-genr.c | 275 ++++++++++++++++++++++++++++++++++++++++++++-
34 gss-serv-krb5.c | 85 ++++++++++++--
35 gss-serv.c | 185 +++++++++++++++++++++++++++---
36 kex.c | 16 +++
37 kex.h | 14 +++
38 kexgssc.c | 336 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
39 kexgsss.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++
40 monitor.c | 108 +++++++++++++++++-
41 monitor.h | 3 +
42 monitor_wrap.c | 47 +++++++-
43 monitor_wrap.h | 4 +-
44 readconf.c | 42 +++++++
45 readconf.h | 5 +
46 servconf.c | 28 ++++-
47 servconf.h | 2 +
48 ssh-gss.h | 41 ++++++-
49 ssh_config | 2 +
50 ssh_config.5 | 36 +++++-
51 sshconnect2.c | 120 +++++++++++++++++++-
52 sshd.c | 110 ++++++++++++++++++
53 sshd_config | 2 +
54 sshd_config.5 | 11 ++
55 sshkey.c | 3 +-
56 sshkey.h | 1 +
57 33 files changed, 1955 insertions(+), 47 deletions(-)
58 create mode 100644 ChangeLog.gssapi
59 create mode 100644 kexgssc.c
60 create mode 100644 kexgsss.c
61
62diff --git a/ChangeLog.gssapi b/ChangeLog.gssapi
63new file mode 100644
64index 0000000..f117a33
65--- /dev/null
66+++ b/ChangeLog.gssapi
67@@ -0,0 +1,113 @@
68+20110101
69+ - Finally update for OpenSSH 5.6p1
70+ - Add GSSAPIServerIdentity option from Jim Basney
71+
72+20100308
73+ - [ Makefile.in, key.c, key.h ]
74+ Updates for OpenSSH 5.4p1
75+ - [ servconf.c ]
76+ Include GSSAPI options in the sshd -T configuration dump, and flag
77+ some older configuration options as being unsupported. Thanks to Colin
78+ Watson.
79+ -
80+
81+20100124
82+ - [ sshconnect2.c ]
83+ Adapt to deal with additional element in Authmethod structure. Thanks to
84+ Colin Watson
85+
86+20090615
87+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
88+ sshd.c ]
89+ Fix issues identified by Greg Hudson following a code review
90+ Check return value of gss_indicate_mechs
91+ Protect GSSAPI calls in monitor, so they can only be used if enabled
92+ Check return values of bignum functions in key exchange
93+ Use BN_clear_free to clear other side's DH value
94+ Make ssh_gssapi_id_kex more robust
95+ Only configure kex table pointers if GSSAPI is enabled
96+ Don't leak mechanism list, or gss mechanism list
97+ Cast data.length before printing
98+ If serverkey isn't provided, use an empty string, rather than NULL
99+
100+20090201
101+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h
102+ ssh_config.5 sshconnet2.c ]
103+ Add support for the GSSAPIClientIdentity option, which allows the user
104+ to specify which GSSAPI identity to use to contact a given server
105+
106+20080404
107+ - [ gss-serv.c ]
108+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow
109+ been omitted from a previous version of this patch. Reported by Borislav
110+ Stoichkov
111+
112+20070317
113+ - [ gss-serv-krb5.c ]
114+ Remove C99ism, where new_ccname was being declared in the middle of a
115+ function
116+
117+20061220
118+ - [ servconf.c ]
119+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and
120+ documented, behaviour. Reported by Dan Watson.
121+
122+20060910
123+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c
124+ ssh-gss.h ]
125+ add support for gss-group14-sha1 key exchange mechanisms
126+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ]
127+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of
128+ acceptor principal checking on multi-homed machines.
129+ <Bugzilla #928>
130+ - [ sshd_config ssh_config ]
131+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample
132+ configuration files
133+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ]
134+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf()
135+ Limit length of error messages displayed by client
136+
137+20060909
138+ - [ gss-genr.c gss-serv.c ]
139+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server
140+ only, where they belong
141+ <Bugzilla #1225>
142+
143+20060829
144+ - [ gss-serv-krb5.c ]
145+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment
146+ variable
147+
148+20060828
149+ - [ gss-genr.c ]
150+ Avoid Heimdal context freeing problem
151+ <Fixed upstream 20060829>
152+
153+20060818
154+ - [ gss-genr.c ssh-gss.h sshconnect2.c ]
155+ Make sure that SPENGO is disabled
156+ <Bugzilla #1218 - Fixed upstream 20060818>
157+
158+20060421
159+ - [ gssgenr.c, sshconnect2.c ]
160+ a few type changes (signed versus unsigned, int versus size_t) to
161+ fix compiler errors/warnings
162+ (from jbasney AT ncsa.uiuc.edu)
163+ - [ kexgssc.c, sshconnect2.c ]
164+ fix uninitialized variable warnings
165+ (from jbasney AT ncsa.uiuc.edu)
166+ - [ gssgenr.c ]
167+ pass oid to gss_display_status (helpful when using GSSAPI mechglue)
168+ (from jbasney AT ncsa.uiuc.edu)
169+ <Bugzilla #1220 >
170+ - [ gss-serv-krb5.c ]
171+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
172+ (from jbasney AT ncsa.uiuc.edu)
173+ <Fixed upstream 20060304>
174+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c
175+ add client-side GssapiKeyExchange option
176+ (from jbasney AT ncsa.uiuc.edu)
177+ - [ sshconnect2.c ]
178+ add support for GssapiTrustDns option for gssapi-with-mic
179+ (from jbasney AT ncsa.uiuc.edu)
180+ <gssapi-with-mic support is Bugzilla #1008>
181diff --git a/Makefile.in b/Makefile.in
182index 40cc7aa..3d2a328 100644
183--- a/Makefile.in
184+++ b/Makefile.in
185@@ -91,7 +91,8 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
186 sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \
187 kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
188 kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
189- kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o
190+ kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
191+ kexgssc.o
192
193 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
194 sshconnect.o sshconnect1.o sshconnect2.o mux.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 roaming_common.o roaming_serv.o \
204diff --git a/auth-krb5.c b/auth-krb5.c
205index 0089b18..ec47869 100644
206--- a/auth-krb5.c
207+++ b/auth-krb5.c
208@@ -183,8 +183,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@@ -241,15 +246,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@@ -266,6 +278,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 214c2c7..bd6a026 100644
257--- a/auth.c
258+++ b/auth.c
259@@ -354,7 +354,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:
269diff --git a/auth2-gss.c b/auth2-gss.c
270index 1ca8357..3b5036d 100644
271--- a/auth2-gss.c
272+++ b/auth2-gss.c
273@@ -1,7 +1,7 @@
274 /* $OpenBSD: auth2-gss.c,v 1.22 2015/01/19 20:07:45 markus Exp $ */
275
276 /*
277- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
278+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
279 *
280 * Redistribution and use in source and binary forms, with or without
281 * modification, are permitted provided that the following conditions
282@@ -53,6 +53,40 @@ static int input_gssapi_mic(int type, u_int32_t plen, void *ctxt);
283 static int input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
284 static int input_gssapi_errtok(int, u_int32_t, void *);
285
286+/*
287+ * The 'gssapi_keyex' userauth mechanism.
288+ */
289+static int
290+userauth_gsskeyex(Authctxt *authctxt)
291+{
292+ int authenticated = 0;
293+ Buffer b;
294+ gss_buffer_desc mic, gssbuf;
295+ u_int len;
296+
297+ mic.value = packet_get_string(&len);
298+ mic.length = len;
299+
300+ packet_check_eom();
301+
302+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
303+ "gssapi-keyex");
304+
305+ gssbuf.value = buffer_ptr(&b);
306+ gssbuf.length = buffer_len(&b);
307+
308+ /* gss_kex_context is NULL with privsep, so we can't check it here */
309+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context,
310+ &gssbuf, &mic))))
311+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
312+ authctxt->pw));
313+
314+ buffer_free(&b);
315+ free(mic.value);
316+
317+ return (authenticated);
318+}
319+
320 /*
321 * We only support those mechanisms that we know about (ie ones that we know
322 * how to check local user kuserok and the like)
323@@ -238,7 +272,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
324
325 packet_check_eom();
326
327- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
328+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
329+ authctxt->pw));
330
331 authctxt->postponed = 0;
332 dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
333@@ -274,7 +309,8 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
334 gssbuf.length = buffer_len(&b);
335
336 if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
337- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
338+ authenticated =
339+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw));
340 else
341 logit("GSSAPI MIC check failed");
342
343@@ -290,6 +326,12 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
344 return 0;
345 }
346
347+Authmethod method_gsskeyex = {
348+ "gssapi-keyex",
349+ userauth_gsskeyex,
350+ &options.gss_authentication
351+};
352+
353 Authmethod method_gssapi = {
354 "gssapi-with-mic",
355 userauth_gssapi,
356diff --git a/auth2.c b/auth2.c
357index 7177962..3f49bdc 100644
358--- a/auth2.c
359+++ b/auth2.c
360@@ -70,6 +70,7 @@ extern Authmethod method_passwd;
361 extern Authmethod method_kbdint;
362 extern Authmethod method_hostbased;
363 #ifdef GSSAPI
364+extern Authmethod method_gsskeyex;
365 extern Authmethod method_gssapi;
366 #endif
367
368@@ -77,6 +78,7 @@ Authmethod *authmethods[] = {
369 &method_none,
370 &method_pubkey,
371 #ifdef GSSAPI
372+ &method_gsskeyex,
373 &method_gssapi,
374 #endif
375 &method_passwd,
376diff --git a/clientloop.c b/clientloop.c
377index 87ceb3d..fba1b54 100644
378--- a/clientloop.c
379+++ b/clientloop.c
380@@ -115,6 +115,10 @@
381 #include "ssherr.h"
382 #include "hostfile.h"
383
384+#ifdef GSSAPI
385+#include "ssh-gss.h"
386+#endif
387+
388 /* import options */
389 extern Options options;
390
391@@ -1610,6 +1614,15 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
392 /* Do channel operations unless rekeying in progress. */
393 if (!rekeying) {
394 channel_after_select(readset, writeset);
395+
396+#ifdef GSSAPI
397+ if (options.gss_renewal_rekey &&
398+ ssh_gssapi_credentials_updated(NULL)) {
399+ debug("credentials updated - forcing rekey");
400+ need_rekeying = 1;
401+ }
402+#endif
403+
404 if (need_rekeying || packet_need_rekeying()) {
405 debug("need rekeying");
406 active_state->kex->done = 0;
407diff --git a/config.h.in b/config.h.in
408index 7500df5..97accd8 100644
409--- a/config.h.in
410+++ b/config.h.in
411@@ -1623,6 +1623,9 @@
412 /* Use btmp to log bad logins */
413 #undef USE_BTMP
414
415+/* platform uses an in-memory credentials cache */
416+#undef USE_CCAPI
417+
418 /* Use libedit for sftp */
419 #undef USE_LIBEDIT
420
421@@ -1638,6 +1641,9 @@
422 /* Use PIPES instead of a socketpair() */
423 #undef USE_PIPES
424
425+/* platform has the Security Authorization Session API */
426+#undef USE_SECURITY_SESSION_API
427+
428 /* Define if you have Solaris process contracts */
429 #undef USE_SOLARIS_PROCESS_CONTRACTS
430
431diff --git a/configure.ac b/configure.ac
432index 9b05c30..7a25603 100644
433--- a/configure.ac
434+++ b/configure.ac
435@@ -625,6 +625,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
436 [Use tunnel device compatibility to OpenBSD])
437 AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
438 [Prepend the address family to IP tunnel traffic])
439+ AC_MSG_CHECKING([if we have the Security Authorization Session API])
440+ AC_TRY_COMPILE([#include <Security/AuthSession.h>],
441+ [SessionCreate(0, 0);],
442+ [ac_cv_use_security_session_api="yes"
443+ AC_DEFINE([USE_SECURITY_SESSION_API], [1],
444+ [platform has the Security Authorization Session API])
445+ LIBS="$LIBS -framework Security"
446+ AC_MSG_RESULT([yes])],
447+ [ac_cv_use_security_session_api="no"
448+ AC_MSG_RESULT([no])])
449+ AC_MSG_CHECKING([if we have an in-memory credentials cache])
450+ AC_TRY_COMPILE(
451+ [#include <Kerberos/Kerberos.h>],
452+ [cc_context_t c;
453+ (void) cc_initialize (&c, 0, NULL, NULL);],
454+ [AC_DEFINE([USE_CCAPI], [1],
455+ [platform uses an in-memory credentials cache])
456+ LIBS="$LIBS -framework Security"
457+ AC_MSG_RESULT([yes])
458+ if test "x$ac_cv_use_security_session_api" = "xno"; then
459+ AC_MSG_ERROR([*** Need a security framework to use the credentials cache API ***])
460+ fi],
461+ [AC_MSG_RESULT([no])]
462+ )
463 m4_pattern_allow([AU_IPv])
464 AC_CHECK_DECL([AU_IPv4], [],
465 AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
466diff --git a/gss-genr.c b/gss-genr.c
467index d617d60..b4eca3f 100644
468--- a/gss-genr.c
469+++ b/gss-genr.c
470@@ -1,7 +1,7 @@
471 /* $OpenBSD: gss-genr.c,v 1.23 2015/01/20 23:14:00 deraadt Exp $ */
472
473 /*
474- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
475+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
476 *
477 * Redistribution and use in source and binary forms, with or without
478 * modification, are permitted provided that the following conditions
479@@ -41,12 +41,167 @@
480 #include "buffer.h"
481 #include "log.h"
482 #include "ssh2.h"
483+#include "cipher.h"
484+#include "key.h"
485+#include "kex.h"
486+#include <openssl/evp.h>
487
488 #include "ssh-gss.h"
489
490 extern u_char *session_id2;
491 extern u_int session_id2_len;
492
493+typedef struct {
494+ char *encoded;
495+ gss_OID oid;
496+} ssh_gss_kex_mapping;
497+
498+/*
499+ * XXX - It would be nice to find a more elegant way of handling the
500+ * XXX passing of the key exchange context to the userauth routines
501+ */
502+
503+Gssctxt *gss_kex_context = NULL;
504+
505+static ssh_gss_kex_mapping *gss_enc2oid = NULL;
506+
507+int
508+ssh_gssapi_oid_table_ok(void) {
509+ return (gss_enc2oid != NULL);
510+}
511+
512+/*
513+ * Return a list of the gss-group1-sha1 mechanisms supported by this program
514+ *
515+ * We test mechanisms to ensure that we can use them, to avoid starting
516+ * a key exchange with a bad mechanism
517+ */
518+
519+char *
520+ssh_gssapi_client_mechanisms(const char *host, const char *client) {
521+ gss_OID_set gss_supported;
522+ OM_uint32 min_status;
523+
524+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported)))
525+ return NULL;
526+
527+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
528+ host, client));
529+}
530+
531+char *
532+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
533+ const char *host, const char *client) {
534+ Buffer buf;
535+ size_t i;
536+ int oidpos, enclen;
537+ char *mechs, *encoded;
538+ u_char digest[EVP_MAX_MD_SIZE];
539+ char deroid[2];
540+ const EVP_MD *evp_md = EVP_md5();
541+ EVP_MD_CTX md;
542+
543+ if (gss_enc2oid != NULL) {
544+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
545+ free(gss_enc2oid[i].encoded);
546+ free(gss_enc2oid);
547+ }
548+
549+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
550+ (gss_supported->count + 1));
551+
552+ buffer_init(&buf);
553+
554+ oidpos = 0;
555+ for (i = 0; i < gss_supported->count; i++) {
556+ if (gss_supported->elements[i].length < 128 &&
557+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) {
558+
559+ deroid[0] = SSH_GSS_OIDTYPE;
560+ deroid[1] = gss_supported->elements[i].length;
561+
562+ EVP_DigestInit(&md, evp_md);
563+ EVP_DigestUpdate(&md, deroid, 2);
564+ EVP_DigestUpdate(&md,
565+ gss_supported->elements[i].elements,
566+ gss_supported->elements[i].length);
567+ EVP_DigestFinal(&md, digest, NULL);
568+
569+ encoded = xmalloc(EVP_MD_size(evp_md) * 2);
570+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md),
571+ encoded, EVP_MD_size(evp_md) * 2);
572+
573+ if (oidpos != 0)
574+ buffer_put_char(&buf, ',');
575+
576+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID,
577+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1);
578+ buffer_append(&buf, encoded, enclen);
579+ buffer_put_char(&buf, ',');
580+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID,
581+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1);
582+ buffer_append(&buf, encoded, enclen);
583+ buffer_put_char(&buf, ',');
584+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID,
585+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1);
586+ buffer_append(&buf, encoded, enclen);
587+
588+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]);
589+ gss_enc2oid[oidpos].encoded = encoded;
590+ oidpos++;
591+ }
592+ }
593+ gss_enc2oid[oidpos].oid = NULL;
594+ gss_enc2oid[oidpos].encoded = NULL;
595+
596+ buffer_put_char(&buf, '\0');
597+
598+ mechs = xmalloc(buffer_len(&buf));
599+ buffer_get(&buf, mechs, buffer_len(&buf));
600+ buffer_free(&buf);
601+
602+ if (strlen(mechs) == 0) {
603+ free(mechs);
604+ mechs = NULL;
605+ }
606+
607+ return (mechs);
608+}
609+
610+gss_OID
611+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) {
612+ int i = 0;
613+
614+ switch (kex_type) {
615+ case KEX_GSS_GRP1_SHA1:
616+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID))
617+ return GSS_C_NO_OID;
618+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
619+ break;
620+ case KEX_GSS_GRP14_SHA1:
621+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID))
622+ return GSS_C_NO_OID;
623+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
624+ break;
625+ case KEX_GSS_GEX_SHA1:
626+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID))
627+ return GSS_C_NO_OID;
628+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1;
629+ break;
630+ default:
631+ return GSS_C_NO_OID;
632+ }
633+
634+ while (gss_enc2oid[i].encoded != NULL &&
635+ strcmp(name, gss_enc2oid[i].encoded) != 0)
636+ i++;
637+
638+ if (gss_enc2oid[i].oid != NULL && ctx != NULL)
639+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid);
640+
641+ return gss_enc2oid[i].oid;
642+}
643+
644 /* Check that the OID in a data stream matches that in the context */
645 int
646 ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
647@@ -199,7 +354,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
648 }
649
650 ctx->major = gss_init_sec_context(&ctx->minor,
651- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid,
652+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid,
653 GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
654 0, NULL, recv_tok, NULL, send_tok, flags, NULL);
655
656@@ -229,8 +384,42 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
657 }
658
659 OM_uint32
660+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name)
661+{
662+ gss_buffer_desc gssbuf;
663+ gss_name_t gssname;
664+ OM_uint32 status;
665+ gss_OID_set oidset;
666+
667+ gssbuf.value = (void *) name;
668+ gssbuf.length = strlen(gssbuf.value);
669+
670+ gss_create_empty_oid_set(&status, &oidset);
671+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
672+
673+ ctx->major = gss_import_name(&ctx->minor, &gssbuf,
674+ GSS_C_NT_USER_NAME, &gssname);
675+
676+ if (!ctx->major)
677+ ctx->major = gss_acquire_cred(&ctx->minor,
678+ gssname, 0, oidset, GSS_C_INITIATE,
679+ &ctx->client_creds, NULL, NULL);
680+
681+ gss_release_name(&status, &gssname);
682+ gss_release_oid_set(&status, &oidset);
683+
684+ if (ctx->major)
685+ ssh_gssapi_error(ctx);
686+
687+ return(ctx->major);
688+}
689+
690+OM_uint32
691 ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
692 {
693+ if (ctx == NULL)
694+ return -1;
695+
696 if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
697 GSS_C_QOP_DEFAULT, buffer, hash)))
698 ssh_gssapi_error(ctx);
699@@ -238,6 +427,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
700 return (ctx->major);
701 }
702
703+/* Priviledged when used by server */
704+OM_uint32
705+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
706+{
707+ if (ctx == NULL)
708+ return -1;
709+
710+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
711+ gssbuf, gssmic, NULL);
712+
713+ return (ctx->major);
714+}
715+
716 void
717 ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
718 const char *context)
719@@ -251,11 +453,16 @@ ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
720 }
721
722 int
723-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
724+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host,
725+ const char *client)
726 {
727 gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
728 OM_uint32 major, minor;
729 gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
730+ Gssctxt *intctx = NULL;
731+
732+ if (ctx == NULL)
733+ ctx = &intctx;
734
735 /* RFC 4462 says we MUST NOT do SPNEGO */
736 if (oid->length == spnego_oid.length &&
737@@ -265,6 +472,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
738 ssh_gssapi_build_ctx(ctx);
739 ssh_gssapi_set_oid(*ctx, oid);
740 major = ssh_gssapi_import_name(*ctx, host);
741+
742+ if (!GSS_ERROR(major) && client)
743+ major = ssh_gssapi_client_identity(*ctx, client);
744+
745 if (!GSS_ERROR(major)) {
746 major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token,
747 NULL);
748@@ -274,10 +485,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
749 GSS_C_NO_BUFFER);
750 }
751
752- if (GSS_ERROR(major))
753+ if (GSS_ERROR(major) || intctx != NULL)
754 ssh_gssapi_delete_ctx(ctx);
755
756 return (!GSS_ERROR(major));
757 }
758
759+int
760+ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
761+ static gss_name_t saved_name = GSS_C_NO_NAME;
762+ static OM_uint32 saved_lifetime = 0;
763+ static gss_OID saved_mech = GSS_C_NO_OID;
764+ static gss_name_t name;
765+ static OM_uint32 last_call = 0;
766+ OM_uint32 lifetime, now, major, minor;
767+ int equal;
768+
769+ now = time(NULL);
770+
771+ if (ctxt) {
772+ debug("Rekey has happened - updating saved versions");
773+
774+ if (saved_name != GSS_C_NO_NAME)
775+ gss_release_name(&minor, &saved_name);
776+
777+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
778+ &saved_name, &saved_lifetime, NULL, NULL);
779+
780+ if (!GSS_ERROR(major)) {
781+ saved_mech = ctxt->oid;
782+ saved_lifetime+= now;
783+ } else {
784+ /* Handle the error */
785+ }
786+ return 0;
787+ }
788+
789+ if (now - last_call < 10)
790+ return 0;
791+
792+ last_call = now;
793+
794+ if (saved_mech == GSS_C_NO_OID)
795+ return 0;
796+
797+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
798+ &name, &lifetime, NULL, NULL);
799+ if (major == GSS_S_CREDENTIALS_EXPIRED)
800+ return 0;
801+ else if (GSS_ERROR(major))
802+ return 0;
803+
804+ major = gss_compare_name(&minor, saved_name, name, &equal);
805+ gss_release_name(&minor, &name);
806+ if (GSS_ERROR(major))
807+ return 0;
808+
809+ if (equal && (saved_lifetime < lifetime + now - 10))
810+ return 1;
811+
812+ return 0;
813+}
814+
815 #endif /* GSSAPI */
816diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
817index 795992d..fd8b371 100644
818--- a/gss-serv-krb5.c
819+++ b/gss-serv-krb5.c
820@@ -1,7 +1,7 @@
821 /* $OpenBSD: gss-serv-krb5.c,v 1.8 2013/07/20 01:55:13 djm Exp $ */
822
823 /*
824- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
825+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
826 *
827 * Redistribution and use in source and binary forms, with or without
828 * modification, are permitted provided that the following conditions
829@@ -121,8 +121,8 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
830 krb5_error_code problem;
831 krb5_principal princ;
832 OM_uint32 maj_status, min_status;
833- int len;
834 const char *errmsg;
835+ const char *new_ccname;
836
837 if (client->creds == NULL) {
838 debug("No credentials stored");
839@@ -181,11 +181,16 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
840 return;
841 }
842
843- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
844+ new_ccname = krb5_cc_get_name(krb_context, ccache);
845+
846 client->store.envvar = "KRB5CCNAME";
847- len = strlen(client->store.filename) + 6;
848- client->store.envval = xmalloc(len);
849- snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
850+#ifdef USE_CCAPI
851+ xasprintf(&client->store.envval, "API:%s", new_ccname);
852+ client->store.filename = NULL;
853+#else
854+ xasprintf(&client->store.envval, "FILE:%s", new_ccname);
855+ client->store.filename = xstrdup(new_ccname);
856+#endif
857
858 #ifdef USE_PAM
859 if (options.use_pam)
860@@ -197,6 +202,71 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
861 return;
862 }
863
864+int
865+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store,
866+ ssh_gssapi_client *client)
867+{
868+ krb5_ccache ccache = NULL;
869+ krb5_principal principal = NULL;
870+ char *name = NULL;
871+ krb5_error_code problem;
872+ OM_uint32 maj_status, min_status;
873+
874+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) {
875+ logit("krb5_cc_resolve(): %.100s",
876+ krb5_get_err_text(krb_context, problem));
877+ return 0;
878+ }
879+
880+ /* Find out who the principal in this cache is */
881+ if ((problem = krb5_cc_get_principal(krb_context, ccache,
882+ &principal))) {
883+ logit("krb5_cc_get_principal(): %.100s",
884+ krb5_get_err_text(krb_context, problem));
885+ krb5_cc_close(krb_context, ccache);
886+ return 0;
887+ }
888+
889+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) {
890+ logit("krb5_unparse_name(): %.100s",
891+ krb5_get_err_text(krb_context, problem));
892+ krb5_free_principal(krb_context, principal);
893+ krb5_cc_close(krb_context, ccache);
894+ return 0;
895+ }
896+
897+
898+ if (strcmp(name,client->exportedname.value)!=0) {
899+ debug("Name in local credentials cache differs. Not storing");
900+ krb5_free_principal(krb_context, principal);
901+ krb5_cc_close(krb_context, ccache);
902+ krb5_free_unparsed_name(krb_context, name);
903+ return 0;
904+ }
905+ krb5_free_unparsed_name(krb_context, name);
906+
907+ /* Name matches, so lets get on with it! */
908+
909+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) {
910+ logit("krb5_cc_initialize(): %.100s",
911+ krb5_get_err_text(krb_context, problem));
912+ krb5_free_principal(krb_context, principal);
913+ krb5_cc_close(krb_context, ccache);
914+ return 0;
915+ }
916+
917+ krb5_free_principal(krb_context, principal);
918+
919+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds,
920+ ccache))) {
921+ logit("gss_krb5_copy_ccache() failed. Sorry!");
922+ krb5_cc_close(krb_context, ccache);
923+ return 0;
924+ }
925+
926+ return 1;
927+}
928+
929 ssh_gssapi_mech gssapi_kerberos_mech = {
930 "toWM5Slw5Ew8Mqkay+al2g==",
931 "Kerberos",
932@@ -204,7 +274,8 @@ ssh_gssapi_mech gssapi_kerberos_mech = {
933 NULL,
934 &ssh_gssapi_krb5_userok,
935 NULL,
936- &ssh_gssapi_krb5_storecreds
937+ &ssh_gssapi_krb5_storecreds,
938+ &ssh_gssapi_krb5_updatecreds
939 };
940
941 #endif /* KRB5 */
942diff --git a/gss-serv.c b/gss-serv.c
943index 53993d6..2f6baf7 100644
944--- a/gss-serv.c
945+++ b/gss-serv.c
946@@ -1,7 +1,7 @@
947 /* $OpenBSD: gss-serv.c,v 1.29 2015/05/22 03:50:02 djm Exp $ */
948
949 /*
950- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
951+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
952 *
953 * Redistribution and use in source and binary forms, with or without
954 * modification, are permitted provided that the following conditions
955@@ -45,17 +45,22 @@
956 #include "session.h"
957 #include "misc.h"
958 #include "servconf.h"
959+#include "uidswap.h"
960
961 #include "ssh-gss.h"
962+#include "monitor_wrap.h"
963+
964+extern ServerOptions options;
965
966 extern ServerOptions options;
967
968 static ssh_gssapi_client gssapi_client =
969 { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
970- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL, NULL}};
971+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL,
972+ {NULL, NULL, NULL, NULL, NULL}, 0, 0};
973
974 ssh_gssapi_mech gssapi_null_mech =
975- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
976+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL};
977
978 #ifdef KRB5
979 extern ssh_gssapi_mech gssapi_kerberos_mech;
980@@ -142,6 +147,29 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
981 }
982
983 /* Unprivileged */
984+char *
985+ssh_gssapi_server_mechanisms(void) {
986+ gss_OID_set supported;
987+
988+ ssh_gssapi_supported_oids(&supported);
989+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech,
990+ NULL, NULL));
991+}
992+
993+/* Unprivileged */
994+int
995+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data,
996+ const char *dummy) {
997+ Gssctxt *ctx = NULL;
998+ int res;
999+
1000+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
1001+ ssh_gssapi_delete_ctx(&ctx);
1002+
1003+ return (res);
1004+}
1005+
1006+/* Unprivileged */
1007 void
1008 ssh_gssapi_supported_oids(gss_OID_set *oidset)
1009 {
1010@@ -151,7 +179,9 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
1011 gss_OID_set supported;
1012
1013 gss_create_empty_oid_set(&min_status, oidset);
1014- gss_indicate_mechs(&min_status, &supported);
1015+
1016+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported)))
1017+ return;
1018
1019 while (supported_mechs[i]->name != NULL) {
1020 if (GSS_ERROR(gss_test_oid_set_member(&min_status,
1021@@ -277,8 +307,48 @@ OM_uint32
1022 ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1023 {
1024 int i = 0;
1025+ int equal = 0;
1026+ gss_name_t new_name = GSS_C_NO_NAME;
1027+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER;
1028+
1029+ if (options.gss_store_rekey && client->used && ctx->client_creds) {
1030+ if (client->mech->oid.length != ctx->oid->length ||
1031+ (memcmp(client->mech->oid.elements,
1032+ ctx->oid->elements, ctx->oid->length) !=0)) {
1033+ debug("Rekeyed credentials have different mechanism");
1034+ return GSS_S_COMPLETE;
1035+ }
1036+
1037+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1038+ ctx->client_creds, ctx->oid, &new_name,
1039+ NULL, NULL, NULL))) {
1040+ ssh_gssapi_error(ctx);
1041+ return (ctx->major);
1042+ }
1043+
1044+ ctx->major = gss_compare_name(&ctx->minor, client->name,
1045+ new_name, &equal);
1046+
1047+ if (GSS_ERROR(ctx->major)) {
1048+ ssh_gssapi_error(ctx);
1049+ return (ctx->major);
1050+ }
1051+
1052+ if (!equal) {
1053+ debug("Rekeyed credentials have different name");
1054+ return GSS_S_COMPLETE;
1055+ }
1056
1057- gss_buffer_desc ename;
1058+ debug("Marking rekeyed credentials for export");
1059+
1060+ gss_release_name(&ctx->minor, &client->name);
1061+ gss_release_cred(&ctx->minor, &client->creds);
1062+ client->name = new_name;
1063+ client->creds = ctx->client_creds;
1064+ ctx->client_creds = GSS_C_NO_CREDENTIAL;
1065+ client->updated = 1;
1066+ return GSS_S_COMPLETE;
1067+ }
1068
1069 client->mech = NULL;
1070
1071@@ -293,6 +363,13 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1072 if (client->mech == NULL)
1073 return GSS_S_FAILURE;
1074
1075+ if (ctx->client_creds &&
1076+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1077+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) {
1078+ ssh_gssapi_error(ctx);
1079+ return (ctx->major);
1080+ }
1081+
1082 if ((ctx->major = gss_display_name(&ctx->minor, ctx->client,
1083 &client->displayname, NULL))) {
1084 ssh_gssapi_error(ctx);
1085@@ -310,6 +387,8 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1086 return (ctx->major);
1087 }
1088
1089+ gss_release_buffer(&ctx->minor, &ename);
1090+
1091 /* We can't copy this structure, so we just move the pointer to it */
1092 client->creds = ctx->client_creds;
1093 ctx->client_creds = GSS_C_NO_CREDENTIAL;
1094@@ -357,7 +436,7 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
1095
1096 /* Privileged */
1097 int
1098-ssh_gssapi_userok(char *user)
1099+ssh_gssapi_userok(char *user, struct passwd *pw)
1100 {
1101 OM_uint32 lmin;
1102
1103@@ -367,9 +446,11 @@ ssh_gssapi_userok(char *user)
1104 return 0;
1105 }
1106 if (gssapi_client.mech && gssapi_client.mech->userok)
1107- if ((*gssapi_client.mech->userok)(&gssapi_client, user))
1108+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) {
1109+ gssapi_client.used = 1;
1110+ gssapi_client.store.owner = pw;
1111 return 1;
1112- else {
1113+ } else {
1114 /* Destroy delegated credentials if userok fails */
1115 gss_release_buffer(&lmin, &gssapi_client.displayname);
1116 gss_release_buffer(&lmin, &gssapi_client.exportedname);
1117@@ -383,14 +464,90 @@ ssh_gssapi_userok(char *user)
1118 return (0);
1119 }
1120
1121-/* Privileged */
1122-OM_uint32
1123-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
1124+/* These bits are only used for rekeying. The unpriviledged child is running
1125+ * as the user, the monitor is root.
1126+ *
1127+ * In the child, we want to :
1128+ * *) Ask the monitor to store our credentials into the store we specify
1129+ * *) If it succeeds, maybe do a PAM update
1130+ */
1131+
1132+/* Stuff for PAM */
1133+
1134+#ifdef USE_PAM
1135+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg,
1136+ struct pam_response **resp, void *data)
1137 {
1138- ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
1139- gssbuf, gssmic, NULL);
1140+ return (PAM_CONV_ERR);
1141+}
1142+#endif
1143
1144- return (ctx->major);
1145+void
1146+ssh_gssapi_rekey_creds(void) {
1147+ int ok;
1148+ int ret;
1149+#ifdef USE_PAM
1150+ pam_handle_t *pamh = NULL;
1151+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
1152+ char *envstr;
1153+#endif
1154+
1155+ if (gssapi_client.store.filename == NULL &&
1156+ gssapi_client.store.envval == NULL &&
1157+ gssapi_client.store.envvar == NULL)
1158+ return;
1159+
1160+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store));
1161+
1162+ if (!ok)
1163+ return;
1164+
1165+ debug("Rekeyed credentials stored successfully");
1166+
1167+ /* Actually managing to play with the ssh pam stack from here will
1168+ * be next to impossible. In any case, we may want different options
1169+ * for rekeying. So, use our own :)
1170+ */
1171+#ifdef USE_PAM
1172+ if (!use_privsep) {
1173+ debug("Not even going to try and do PAM with privsep disabled");
1174+ return;
1175+ }
1176+
1177+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name,
1178+ &pamconv, &pamh);
1179+ if (ret)
1180+ return;
1181+
1182+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar,
1183+ gssapi_client.store.envval);
1184+
1185+ ret = pam_putenv(pamh, envstr);
1186+ if (!ret)
1187+ pam_setcred(pamh, PAM_REINITIALIZE_CRED);
1188+ pam_end(pamh, PAM_SUCCESS);
1189+#endif
1190+}
1191+
1192+int
1193+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
1194+ int ok = 0;
1195+
1196+ /* Check we've got credentials to store */
1197+ if (!gssapi_client.updated)
1198+ return 0;
1199+
1200+ gssapi_client.updated = 0;
1201+
1202+ temporarily_use_uid(gssapi_client.store.owner);
1203+ if (gssapi_client.mech && gssapi_client.mech->updatecreds)
1204+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client);
1205+ else
1206+ debug("No update function for this mechanism");
1207+
1208+ restore_uid();
1209+
1210+ return ok;
1211 }
1212
1213 #endif
1214diff --git a/kex.c b/kex.c
1215index 5100c66..39a6f98 100644
1216--- a/kex.c
1217+++ b/kex.c
1218@@ -55,6 +55,10 @@
1219 #include "sshbuf.h"
1220 #include "digest.h"
1221
1222+#ifdef GSSAPI
1223+#include "ssh-gss.h"
1224+#endif
1225+
1226 #if OPENSSL_VERSION_NUMBER >= 0x00907000L
1227 # if defined(HAVE_EVP_SHA256)
1228 # define evp_ssh_sha256 EVP_sha256
1229@@ -97,6 +101,14 @@ static const struct kexalg kexalgs[] = {
1230 #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
1231 { NULL, -1, -1, -1},
1232 };
1233+static const struct kexalg kexalg_prefixes[] = {
1234+#ifdef GSSAPI
1235+ { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, SSH_DIGEST_SHA1 },
1236+ { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
1237+ { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
1238+#endif
1239+ { NULL, -1, -1, -1 },
1240+};
1241
1242 char *
1243 kex_alg_list(char sep)
1244@@ -129,6 +141,10 @@ kex_alg_by_name(const char *name)
1245 if (strcmp(k->name, name) == 0)
1246 return k;
1247 }
1248+ for (k = kexalg_prefixes; k->name != NULL; k++) {
1249+ if (strncmp(k->name, name, strlen(k->name)) == 0)
1250+ return k;
1251+ }
1252 return NULL;
1253 }
1254
1255diff --git a/kex.h b/kex.h
1256index d71b532..ee46815 100644
1257--- a/kex.h
1258+++ b/kex.h
1259@@ -93,6 +93,9 @@ enum kex_exchange {
1260 KEX_DH_GEX_SHA256,
1261 KEX_ECDH_SHA2,
1262 KEX_C25519_SHA256,
1263+ KEX_GSS_GRP1_SHA1,
1264+ KEX_GSS_GRP14_SHA1,
1265+ KEX_GSS_GEX_SHA1,
1266 KEX_MAX
1267 };
1268
1269@@ -139,6 +142,12 @@ struct kex {
1270 u_int flags;
1271 int hash_alg;
1272 int ec_nid;
1273+#ifdef GSSAPI
1274+ int gss_deleg_creds;
1275+ int gss_trust_dns;
1276+ char *gss_host;
1277+ char *gss_client;
1278+#endif
1279 char *client_version_string;
1280 char *server_version_string;
1281 char *failed_choice;
1282@@ -187,6 +196,11 @@ int kexecdh_server(struct ssh *);
1283 int kexc25519_client(struct ssh *);
1284 int kexc25519_server(struct ssh *);
1285
1286+#ifdef GSSAPI
1287+int kexgss_client(struct ssh *);
1288+int kexgss_server(struct ssh *);
1289+#endif
1290+
1291 int kex_dh_hash(const char *, const char *,
1292 const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
1293 const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
1294diff --git a/kexgssc.c b/kexgssc.c
1295new file mode 100644
1296index 0000000..a49bac2
1297--- /dev/null
1298+++ b/kexgssc.c
1299@@ -0,0 +1,336 @@
1300+/*
1301+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1302+ *
1303+ * Redistribution and use in source and binary forms, with or without
1304+ * modification, are permitted provided that the following conditions
1305+ * are met:
1306+ * 1. Redistributions of source code must retain the above copyright
1307+ * notice, this list of conditions and the following disclaimer.
1308+ * 2. Redistributions in binary form must reproduce the above copyright
1309+ * notice, this list of conditions and the following disclaimer in the
1310+ * documentation and/or other materials provided with the distribution.
1311+ *
1312+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1313+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1314+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1315+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1316+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1317+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1318+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1319+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1320+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1321+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1322+ */
1323+
1324+#include "includes.h"
1325+
1326+#ifdef GSSAPI
1327+
1328+#include "includes.h"
1329+
1330+#include <openssl/crypto.h>
1331+#include <openssl/bn.h>
1332+
1333+#include <string.h>
1334+
1335+#include "xmalloc.h"
1336+#include "buffer.h"
1337+#include "ssh2.h"
1338+#include "key.h"
1339+#include "cipher.h"
1340+#include "kex.h"
1341+#include "log.h"
1342+#include "packet.h"
1343+#include "dh.h"
1344+#include "digest.h"
1345+
1346+#include "ssh-gss.h"
1347+
1348+int
1349+kexgss_client(struct ssh *ssh) {
1350+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1351+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr;
1352+ Gssctxt *ctxt;
1353+ OM_uint32 maj_status, min_status, ret_flags;
1354+ u_int klen, kout, slen = 0, strlen;
1355+ DH *dh;
1356+ BIGNUM *dh_server_pub = NULL;
1357+ BIGNUM *shared_secret = NULL;
1358+ BIGNUM *p = NULL;
1359+ BIGNUM *g = NULL;
1360+ u_char *kbuf;
1361+ u_char *serverhostkey = NULL;
1362+ u_char *empty = "";
1363+ char *msg;
1364+ int type = 0;
1365+ int first = 1;
1366+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
1367+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1368+ size_t hashlen;
1369+
1370+ /* Initialise our GSSAPI world */
1371+ ssh_gssapi_build_ctx(&ctxt);
1372+ if (ssh_gssapi_id_kex(ctxt, ssh->kex->name, ssh->kex->kex_type)
1373+ == GSS_C_NO_OID)
1374+ fatal("Couldn't identify host exchange");
1375+
1376+ if (ssh_gssapi_import_name(ctxt, ssh->kex->gss_host))
1377+ fatal("Couldn't import hostname");
1378+
1379+ if (ssh->kex->gss_client &&
1380+ ssh_gssapi_client_identity(ctxt, ssh->kex->gss_client))
1381+ fatal("Couldn't acquire client credentials");
1382+
1383+ switch (ssh->kex->kex_type) {
1384+ case KEX_GSS_GRP1_SHA1:
1385+ dh = dh_new_group1();
1386+ break;
1387+ case KEX_GSS_GRP14_SHA1:
1388+ dh = dh_new_group14();
1389+ break;
1390+ case KEX_GSS_GEX_SHA1:
1391+ debug("Doing group exchange\n");
1392+ nbits = dh_estimate(ssh->kex->we_need * 8);
1393+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ);
1394+ packet_put_int(min);
1395+ packet_put_int(nbits);
1396+ packet_put_int(max);
1397+
1398+ packet_send();
1399+
1400+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP);
1401+
1402+ if ((p = BN_new()) == NULL)
1403+ fatal("BN_new() failed");
1404+ packet_get_bignum2(p);
1405+ if ((g = BN_new()) == NULL)
1406+ fatal("BN_new() failed");
1407+ packet_get_bignum2(g);
1408+ packet_check_eom();
1409+
1410+ if (BN_num_bits(p) < min || BN_num_bits(p) > max)
1411+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d",
1412+ min, BN_num_bits(p), max);
1413+
1414+ dh = dh_new_group(g, p);
1415+ break;
1416+ default:
1417+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1418+ }
1419+
1420+ /* Step 1 - e is dh->pub_key */
1421+ dh_gen_key(dh, ssh->kex->we_need * 8);
1422+
1423+ /* This is f, we initialise it now to make life easier */
1424+ dh_server_pub = BN_new();
1425+ if (dh_server_pub == NULL)
1426+ fatal("dh_server_pub == NULL");
1427+
1428+ token_ptr = GSS_C_NO_BUFFER;
1429+
1430+ do {
1431+ debug("Calling gss_init_sec_context");
1432+
1433+ maj_status = ssh_gssapi_init_ctx(ctxt,
1434+ ssh->kex->gss_deleg_creds, token_ptr, &send_tok,
1435+ &ret_flags);
1436+
1437+ if (GSS_ERROR(maj_status)) {
1438+ if (send_tok.length != 0) {
1439+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1440+ packet_put_string(send_tok.value,
1441+ send_tok.length);
1442+ }
1443+ fatal("gss_init_context failed");
1444+ }
1445+
1446+ /* If we've got an old receive buffer get rid of it */
1447+ if (token_ptr != GSS_C_NO_BUFFER)
1448+ free(recv_tok.value);
1449+
1450+ if (maj_status == GSS_S_COMPLETE) {
1451+ /* If mutual state flag is not true, kex fails */
1452+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
1453+ fatal("Mutual authentication failed");
1454+
1455+ /* If integ avail flag is not true kex fails */
1456+ if (!(ret_flags & GSS_C_INTEG_FLAG))
1457+ fatal("Integrity check failed");
1458+ }
1459+
1460+ /*
1461+ * If we have data to send, then the last message that we
1462+ * received cannot have been a 'complete'.
1463+ */
1464+ if (send_tok.length != 0) {
1465+ if (first) {
1466+ packet_start(SSH2_MSG_KEXGSS_INIT);
1467+ packet_put_string(send_tok.value,
1468+ send_tok.length);
1469+ packet_put_bignum2(dh->pub_key);
1470+ first = 0;
1471+ } else {
1472+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1473+ packet_put_string(send_tok.value,
1474+ send_tok.length);
1475+ }
1476+ packet_send();
1477+ gss_release_buffer(&min_status, &send_tok);
1478+
1479+ /* If we've sent them data, they should reply */
1480+ do {
1481+ type = packet_read();
1482+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
1483+ debug("Received KEXGSS_HOSTKEY");
1484+ if (serverhostkey)
1485+ fatal("Server host key received more than once");
1486+ serverhostkey =
1487+ packet_get_string(&slen);
1488+ }
1489+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY);
1490+
1491+ switch (type) {
1492+ case SSH2_MSG_KEXGSS_CONTINUE:
1493+ debug("Received GSSAPI_CONTINUE");
1494+ if (maj_status == GSS_S_COMPLETE)
1495+ fatal("GSSAPI Continue received from server when complete");
1496+ recv_tok.value = packet_get_string(&strlen);
1497+ recv_tok.length = strlen;
1498+ break;
1499+ case SSH2_MSG_KEXGSS_COMPLETE:
1500+ debug("Received GSSAPI_COMPLETE");
1501+ packet_get_bignum2(dh_server_pub);
1502+ msg_tok.value = packet_get_string(&strlen);
1503+ msg_tok.length = strlen;
1504+
1505+ /* Is there a token included? */
1506+ if (packet_get_char()) {
1507+ recv_tok.value=
1508+ packet_get_string(&strlen);
1509+ recv_tok.length = strlen;
1510+ /* If we're already complete - protocol error */
1511+ if (maj_status == GSS_S_COMPLETE)
1512+ packet_disconnect("Protocol error: received token when complete");
1513+ } else {
1514+ /* No token included */
1515+ if (maj_status != GSS_S_COMPLETE)
1516+ packet_disconnect("Protocol error: did not receive final token");
1517+ }
1518+ break;
1519+ case SSH2_MSG_KEXGSS_ERROR:
1520+ debug("Received Error");
1521+ maj_status = packet_get_int();
1522+ min_status = packet_get_int();
1523+ msg = packet_get_string(NULL);
1524+ (void) packet_get_string_ptr(NULL);
1525+ fatal("GSSAPI Error: \n%.400s",msg);
1526+ default:
1527+ packet_disconnect("Protocol error: didn't expect packet type %d",
1528+ type);
1529+ }
1530+ token_ptr = &recv_tok;
1531+ } else {
1532+ /* No data, and not complete */
1533+ if (maj_status != GSS_S_COMPLETE)
1534+ fatal("Not complete, and no token output");
1535+ }
1536+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
1537+
1538+ /*
1539+ * We _must_ have received a COMPLETE message in reply from the
1540+ * server, which will have set dh_server_pub and msg_tok
1541+ */
1542+
1543+ if (type != SSH2_MSG_KEXGSS_COMPLETE)
1544+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
1545+
1546+ /* Check f in range [1, p-1] */
1547+ if (!dh_pub_is_valid(dh, dh_server_pub))
1548+ packet_disconnect("bad server public DH value");
1549+
1550+ /* compute K=f^x mod p */
1551+ klen = DH_size(dh);
1552+ kbuf = xmalloc(klen);
1553+ kout = DH_compute_key(kbuf, dh_server_pub, dh);
1554+ if (kout < 0)
1555+ fatal("DH_compute_key: failed");
1556+
1557+ shared_secret = BN_new();
1558+ if (shared_secret == NULL)
1559+ fatal("kexgss_client: BN_new failed");
1560+
1561+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
1562+ fatal("kexdh_client: BN_bin2bn failed");
1563+
1564+ memset(kbuf, 0, klen);
1565+ free(kbuf);
1566+
1567+ hashlen = sizeof(hash);
1568+ switch (ssh->kex->kex_type) {
1569+ case KEX_GSS_GRP1_SHA1:
1570+ case KEX_GSS_GRP14_SHA1:
1571+ kex_dh_hash( ssh->kex->client_version_string,
1572+ ssh->kex->server_version_string,
1573+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1574+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1575+ (serverhostkey ? serverhostkey : empty), slen,
1576+ dh->pub_key, /* e */
1577+ dh_server_pub, /* f */
1578+ shared_secret, /* K */
1579+ hash, &hashlen
1580+ );
1581+ break;
1582+ case KEX_GSS_GEX_SHA1:
1583+ kexgex_hash(
1584+ ssh->kex->hash_alg,
1585+ ssh->kex->client_version_string,
1586+ ssh->kex->server_version_string,
1587+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1588+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1589+ (serverhostkey ? serverhostkey : empty), slen,
1590+ min, nbits, max,
1591+ dh->p, dh->g,
1592+ dh->pub_key,
1593+ dh_server_pub,
1594+ shared_secret,
1595+ hash, &hashlen
1596+ );
1597+ break;
1598+ default:
1599+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1600+ }
1601+
1602+ gssbuf.value = hash;
1603+ gssbuf.length = hashlen;
1604+
1605+ /* Verify that the hash matches the MIC we just got. */
1606+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
1607+ packet_disconnect("Hash's MIC didn't verify");
1608+
1609+ free(msg_tok.value);
1610+
1611+ DH_free(dh);
1612+ free(serverhostkey);
1613+ BN_clear_free(dh_server_pub);
1614+
1615+ /* save session id */
1616+ if (ssh->kex->session_id == NULL) {
1617+ ssh->kex->session_id_len = hashlen;
1618+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
1619+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
1620+ }
1621+
1622+ if (ssh->kex->gss_deleg_creds)
1623+ ssh_gssapi_credentials_updated(ctxt);
1624+
1625+ if (gss_kex_context == NULL)
1626+ gss_kex_context = ctxt;
1627+ else
1628+ ssh_gssapi_delete_ctx(&ctxt);
1629+
1630+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
1631+ BN_clear_free(shared_secret);
1632+ return kex_send_newkeys(ssh);
1633+}
1634+
1635+#endif /* GSSAPI */
1636diff --git a/kexgsss.c b/kexgsss.c
1637new file mode 100644
1638index 0000000..0847469
1639--- /dev/null
1640+++ b/kexgsss.c
1641@@ -0,0 +1,295 @@
1642+/*
1643+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1644+ *
1645+ * Redistribution and use in source and binary forms, with or without
1646+ * modification, are permitted provided that the following conditions
1647+ * are met:
1648+ * 1. Redistributions of source code must retain the above copyright
1649+ * notice, this list of conditions and the following disclaimer.
1650+ * 2. Redistributions in binary form must reproduce the above copyright
1651+ * notice, this list of conditions and the following disclaimer in the
1652+ * documentation and/or other materials provided with the distribution.
1653+ *
1654+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1655+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1656+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1657+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1658+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1659+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1660+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1661+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1662+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1663+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1664+ */
1665+
1666+#include "includes.h"
1667+
1668+#ifdef GSSAPI
1669+
1670+#include <string.h>
1671+
1672+#include <openssl/crypto.h>
1673+#include <openssl/bn.h>
1674+
1675+#include "xmalloc.h"
1676+#include "buffer.h"
1677+#include "ssh2.h"
1678+#include "key.h"
1679+#include "cipher.h"
1680+#include "kex.h"
1681+#include "log.h"
1682+#include "packet.h"
1683+#include "dh.h"
1684+#include "ssh-gss.h"
1685+#include "monitor_wrap.h"
1686+#include "misc.h"
1687+#include "servconf.h"
1688+#include "digest.h"
1689+
1690+extern ServerOptions options;
1691+
1692+int
1693+kexgss_server(struct ssh *ssh)
1694+{
1695+ OM_uint32 maj_status, min_status;
1696+
1697+ /*
1698+ * Some GSSAPI implementations use the input value of ret_flags (an
1699+ * output variable) as a means of triggering mechanism specific
1700+ * features. Initializing it to zero avoids inadvertently
1701+ * activating this non-standard behaviour.
1702+ */
1703+
1704+ OM_uint32 ret_flags = 0;
1705+ gss_buffer_desc gssbuf, recv_tok, msg_tok;
1706+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1707+ Gssctxt *ctxt = NULL;
1708+ u_int slen, klen, kout;
1709+ u_char *kbuf;
1710+ DH *dh;
1711+ int min = -1, max = -1, nbits = -1;
1712+ BIGNUM *shared_secret = NULL;
1713+ BIGNUM *dh_client_pub = NULL;
1714+ int type = 0;
1715+ gss_OID oid;
1716+ char *mechs;
1717+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1718+ size_t hashlen;
1719+
1720+ /* Initialise GSSAPI */
1721+
1722+ /* If we're rekeying, privsep means that some of the private structures
1723+ * in the GSSAPI code are no longer available. This kludges them back
1724+ * into life
1725+ */
1726+ if (!ssh_gssapi_oid_table_ok()) {
1727+ mechs = ssh_gssapi_server_mechanisms();
1728+ free(mechs);
1729+ }
1730+
1731+ debug2("%s: Identifying %s", __func__, ssh->kex->name);
1732+ oid = ssh_gssapi_id_kex(NULL, ssh->kex->name, ssh->kex->kex_type);
1733+ if (oid == GSS_C_NO_OID)
1734+ fatal("Unknown gssapi mechanism");
1735+
1736+ debug2("%s: Acquiring credentials", __func__);
1737+
1738+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
1739+ fatal("Unable to acquire credentials for the server");
1740+
1741+ switch (ssh->kex->kex_type) {
1742+ case KEX_GSS_GRP1_SHA1:
1743+ dh = dh_new_group1();
1744+ break;
1745+ case KEX_GSS_GRP14_SHA1:
1746+ dh = dh_new_group14();
1747+ break;
1748+ case KEX_GSS_GEX_SHA1:
1749+ debug("Doing group exchange");
1750+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ);
1751+ min = packet_get_int();
1752+ nbits = packet_get_int();
1753+ max = packet_get_int();
1754+ min = MAX(DH_GRP_MIN, min);
1755+ max = MIN(DH_GRP_MAX, max);
1756+ packet_check_eom();
1757+ if (max < min || nbits < min || max < nbits)
1758+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
1759+ min, nbits, max);
1760+ dh = PRIVSEP(choose_dh(min, nbits, max));
1761+ if (dh == NULL)
1762+ packet_disconnect("Protocol error: no matching group found");
1763+
1764+ packet_start(SSH2_MSG_KEXGSS_GROUP);
1765+ packet_put_bignum2(dh->p);
1766+ packet_put_bignum2(dh->g);
1767+ packet_send();
1768+
1769+ packet_write_wait();
1770+ break;
1771+ default:
1772+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1773+ }
1774+
1775+ dh_gen_key(dh, ssh->kex->we_need * 8);
1776+
1777+ do {
1778+ debug("Wait SSH2_MSG_GSSAPI_INIT");
1779+ type = packet_read();
1780+ switch(type) {
1781+ case SSH2_MSG_KEXGSS_INIT:
1782+ if (dh_client_pub != NULL)
1783+ fatal("Received KEXGSS_INIT after initialising");
1784+ recv_tok.value = packet_get_string(&slen);
1785+ recv_tok.length = slen;
1786+
1787+ if ((dh_client_pub = BN_new()) == NULL)
1788+ fatal("dh_client_pub == NULL");
1789+
1790+ packet_get_bignum2(dh_client_pub);
1791+
1792+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
1793+ break;
1794+ case SSH2_MSG_KEXGSS_CONTINUE:
1795+ recv_tok.value = packet_get_string(&slen);
1796+ recv_tok.length = slen;
1797+ break;
1798+ default:
1799+ packet_disconnect(
1800+ "Protocol error: didn't expect packet type %d",
1801+ type);
1802+ }
1803+
1804+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
1805+ &send_tok, &ret_flags));
1806+
1807+ free(recv_tok.value);
1808+
1809+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
1810+ fatal("Zero length token output when incomplete");
1811+
1812+ if (dh_client_pub == NULL)
1813+ fatal("No client public key");
1814+
1815+ if (maj_status & GSS_S_CONTINUE_NEEDED) {
1816+ debug("Sending GSSAPI_CONTINUE");
1817+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1818+ packet_put_string(send_tok.value, send_tok.length);
1819+ packet_send();
1820+ gss_release_buffer(&min_status, &send_tok);
1821+ }
1822+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
1823+
1824+ if (GSS_ERROR(maj_status)) {
1825+ if (send_tok.length > 0) {
1826+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1827+ packet_put_string(send_tok.value, send_tok.length);
1828+ packet_send();
1829+ }
1830+ fatal("accept_ctx died");
1831+ }
1832+
1833+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
1834+ fatal("Mutual Authentication flag wasn't set");
1835+
1836+ if (!(ret_flags & GSS_C_INTEG_FLAG))
1837+ fatal("Integrity flag wasn't set");
1838+
1839+ if (!dh_pub_is_valid(dh, dh_client_pub))
1840+ packet_disconnect("bad client public DH value");
1841+
1842+ klen = DH_size(dh);
1843+ kbuf = xmalloc(klen);
1844+ kout = DH_compute_key(kbuf, dh_client_pub, dh);
1845+ if (kout < 0)
1846+ fatal("DH_compute_key: failed");
1847+
1848+ shared_secret = BN_new();
1849+ if (shared_secret == NULL)
1850+ fatal("kexgss_server: BN_new failed");
1851+
1852+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
1853+ fatal("kexgss_server: BN_bin2bn failed");
1854+
1855+ memset(kbuf, 0, klen);
1856+ free(kbuf);
1857+
1858+ hashlen = sizeof(hash);
1859+ switch (ssh->kex->kex_type) {
1860+ case KEX_GSS_GRP1_SHA1:
1861+ case KEX_GSS_GRP14_SHA1:
1862+ kex_dh_hash(
1863+ ssh->kex->client_version_string, ssh->kex->server_version_string,
1864+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1865+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1866+ NULL, 0, /* Change this if we start sending host keys */
1867+ dh_client_pub, dh->pub_key, shared_secret,
1868+ hash, &hashlen
1869+ );
1870+ break;
1871+ case KEX_GSS_GEX_SHA1:
1872+ kexgex_hash(
1873+ ssh->kex->hash_alg,
1874+ ssh->kex->client_version_string, ssh->kex->server_version_string,
1875+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1876+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1877+ NULL, 0,
1878+ min, nbits, max,
1879+ dh->p, dh->g,
1880+ dh_client_pub,
1881+ dh->pub_key,
1882+ shared_secret,
1883+ hash, &hashlen
1884+ );
1885+ break;
1886+ default:
1887+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1888+ }
1889+
1890+ BN_clear_free(dh_client_pub);
1891+
1892+ if (ssh->kex->session_id == NULL) {
1893+ ssh->kex->session_id_len = hashlen;
1894+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
1895+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
1896+ }
1897+
1898+ gssbuf.value = hash;
1899+ gssbuf.length = hashlen;
1900+
1901+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok))))
1902+ fatal("Couldn't get MIC");
1903+
1904+ packet_start(SSH2_MSG_KEXGSS_COMPLETE);
1905+ packet_put_bignum2(dh->pub_key);
1906+ packet_put_string(msg_tok.value,msg_tok.length);
1907+
1908+ if (send_tok.length != 0) {
1909+ packet_put_char(1); /* true */
1910+ packet_put_string(send_tok.value, send_tok.length);
1911+ } else {
1912+ packet_put_char(0); /* false */
1913+ }
1914+ packet_send();
1915+
1916+ gss_release_buffer(&min_status, &send_tok);
1917+ gss_release_buffer(&min_status, &msg_tok);
1918+
1919+ if (gss_kex_context == NULL)
1920+ gss_kex_context = ctxt;
1921+ else
1922+ ssh_gssapi_delete_ctx(&ctxt);
1923+
1924+ DH_free(dh);
1925+
1926+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
1927+ BN_clear_free(shared_secret);
1928+ kex_send_newkeys(ssh);
1929+
1930+ /* If this was a rekey, then save out any delegated credentials we
1931+ * just exchanged. */
1932+ if (options.gss_store_rekey)
1933+ ssh_gssapi_rekey_creds();
1934+ return 0;
1935+}
1936+#endif /* GSSAPI */
1937diff --git a/monitor.c b/monitor.c
1938index a914209..2658aaa 100644
1939--- a/monitor.c
1940+++ b/monitor.c
1941@@ -157,6 +157,8 @@ int mm_answer_gss_setup_ctx(int, Buffer *);
1942 int mm_answer_gss_accept_ctx(int, Buffer *);
1943 int mm_answer_gss_userok(int, Buffer *);
1944 int mm_answer_gss_checkmic(int, Buffer *);
1945+int mm_answer_gss_sign(int, Buffer *);
1946+int mm_answer_gss_updatecreds(int, Buffer *);
1947 #endif
1948
1949 #ifdef SSH_AUDIT_EVENTS
1950@@ -234,11 +236,18 @@ struct mon_table mon_dispatch_proto20[] = {
1951 {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx},
1952 {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok},
1953 {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic},
1954+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign},
1955 #endif
1956 {0, 0, NULL}
1957 };
1958
1959 struct mon_table mon_dispatch_postauth20[] = {
1960+#ifdef GSSAPI
1961+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx},
1962+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
1963+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign},
1964+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds},
1965+#endif
1966 #ifdef WITH_OPENSSL
1967 {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
1968 #endif
1969@@ -353,6 +362,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
1970 /* Permit requests for moduli and signatures */
1971 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
1972 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
1973+#ifdef GSSAPI
1974+ /* and for the GSSAPI key exchange */
1975+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
1976+#endif
1977 } else {
1978 mon_dispatch = mon_dispatch_proto15;
1979
1980@@ -461,6 +474,10 @@ monitor_child_postauth(struct monitor *pmonitor)
1981 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
1982 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
1983 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
1984+#ifdef GSSAPI
1985+ /* and for the GSSAPI key exchange */
1986+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
1987+#endif
1988 } else {
1989 mon_dispatch = mon_dispatch_postauth15;
1990 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
1991@@ -1864,6 +1881,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
1992 # endif
1993 #endif /* WITH_OPENSSL */
1994 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
1995+#ifdef GSSAPI
1996+ if (options.gss_keyex) {
1997+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
1998+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
1999+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
2000+ }
2001+#endif
2002 kex->load_host_public_key=&get_hostkey_public_by_type;
2003 kex->load_host_private_key=&get_hostkey_private_by_type;
2004 kex->host_key_index=&get_hostkey_index;
2005@@ -1963,6 +1987,9 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
2006 OM_uint32 major;
2007 u_int len;
2008
2009+ if (!options.gss_authentication && !options.gss_keyex)
2010+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2011+
2012 goid.elements = buffer_get_string(m, &len);
2013 goid.length = len;
2014
2015@@ -1990,6 +2017,9 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
2016 OM_uint32 flags = 0; /* GSI needs this */
2017 u_int len;
2018
2019+ if (!options.gss_authentication && !options.gss_keyex)
2020+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2021+
2022 in.value = buffer_get_string(m, &len);
2023 in.length = len;
2024 major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);
2025@@ -2007,6 +2037,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
2026 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
2027 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
2028 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
2029+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1);
2030 }
2031 return (0);
2032 }
2033@@ -2018,6 +2049,9 @@ mm_answer_gss_checkmic(int sock, Buffer *m)
2034 OM_uint32 ret;
2035 u_int len;
2036
2037+ if (!options.gss_authentication && !options.gss_keyex)
2038+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2039+
2040 gssbuf.value = buffer_get_string(m, &len);
2041 gssbuf.length = len;
2042 mic.value = buffer_get_string(m, &len);
2043@@ -2044,7 +2078,11 @@ mm_answer_gss_userok(int sock, Buffer *m)
2044 {
2045 int authenticated;
2046
2047- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user);
2048+ if (!options.gss_authentication && !options.gss_keyex)
2049+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2050+
2051+ authenticated = authctxt->valid &&
2052+ ssh_gssapi_userok(authctxt->user, authctxt->pw);
2053
2054 buffer_clear(m);
2055 buffer_put_int(m, authenticated);
2056@@ -2057,5 +2095,73 @@ mm_answer_gss_userok(int sock, Buffer *m)
2057 /* Monitor loop will terminate if authenticated */
2058 return (authenticated);
2059 }
2060+
2061+int
2062+mm_answer_gss_sign(int socket, Buffer *m)
2063+{
2064+ gss_buffer_desc data;
2065+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER;
2066+ OM_uint32 major, minor;
2067+ u_int len;
2068+
2069+ if (!options.gss_authentication && !options.gss_keyex)
2070+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2071+
2072+ data.value = buffer_get_string(m, &len);
2073+ data.length = len;
2074+ if (data.length != 20)
2075+ fatal("%s: data length incorrect: %d", __func__,
2076+ (int) data.length);
2077+
2078+ /* Save the session ID on the first time around */
2079+ if (session_id2_len == 0) {
2080+ session_id2_len = data.length;
2081+ session_id2 = xmalloc(session_id2_len);
2082+ memcpy(session_id2, data.value, session_id2_len);
2083+ }
2084+ major = ssh_gssapi_sign(gsscontext, &data, &hash);
2085+
2086+ free(data.value);
2087+
2088+ buffer_clear(m);
2089+ buffer_put_int(m, major);
2090+ buffer_put_string(m, hash.value, hash.length);
2091+
2092+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
2093+
2094+ gss_release_buffer(&minor, &hash);
2095+
2096+ /* Turn on getpwnam permissions */
2097+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
2098+
2099+ /* And credential updating, for when rekeying */
2100+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1);
2101+
2102+ return (0);
2103+}
2104+
2105+int
2106+mm_answer_gss_updatecreds(int socket, Buffer *m) {
2107+ ssh_gssapi_ccache store;
2108+ int ok;
2109+
2110+ store.filename = buffer_get_string(m, NULL);
2111+ store.envvar = buffer_get_string(m, NULL);
2112+ store.envval = buffer_get_string(m, NULL);
2113+
2114+ ok = ssh_gssapi_update_creds(&store);
2115+
2116+ free(store.filename);
2117+ free(store.envvar);
2118+ free(store.envval);
2119+
2120+ buffer_clear(m);
2121+ buffer_put_int(m, ok);
2122+
2123+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m);
2124+
2125+ return(0);
2126+}
2127+
2128 #endif /* GSSAPI */
2129
2130diff --git a/monitor.h b/monitor.h
2131index 93b8b66..bc50ade 100644
2132--- a/monitor.h
2133+++ b/monitor.h
2134@@ -65,6 +65,9 @@ enum monitor_reqtype {
2135 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
2136 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
2137
2138+ MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
2139+ MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
2140+
2141 };
2142
2143 struct mm_master;
2144diff --git a/monitor_wrap.c b/monitor_wrap.c
2145index eac421b..81ceddb 100644
2146--- a/monitor_wrap.c
2147+++ b/monitor_wrap.c
2148@@ -1068,7 +1068,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
2149 }
2150
2151 int
2152-mm_ssh_gssapi_userok(char *user)
2153+mm_ssh_gssapi_userok(char *user, struct passwd *pw)
2154 {
2155 Buffer m;
2156 int authenticated = 0;
2157@@ -1085,5 +1085,50 @@ mm_ssh_gssapi_userok(char *user)
2158 debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
2159 return (authenticated);
2160 }
2161+
2162+OM_uint32
2163+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
2164+{
2165+ Buffer m;
2166+ OM_uint32 major;
2167+ u_int len;
2168+
2169+ buffer_init(&m);
2170+ buffer_put_string(&m, data->value, data->length);
2171+
2172+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m);
2173+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m);
2174+
2175+ major = buffer_get_int(&m);
2176+ hash->value = buffer_get_string(&m, &len);
2177+ hash->length = len;
2178+
2179+ buffer_free(&m);
2180+
2181+ return(major);
2182+}
2183+
2184+int
2185+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
2186+{
2187+ Buffer m;
2188+ int ok;
2189+
2190+ buffer_init(&m);
2191+
2192+ buffer_put_cstring(&m, store->filename ? store->filename : "");
2193+ buffer_put_cstring(&m, store->envvar ? store->envvar : "");
2194+ buffer_put_cstring(&m, store->envval ? store->envval : "");
2195+
2196+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m);
2197+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m);
2198+
2199+ ok = buffer_get_int(&m);
2200+
2201+ buffer_free(&m);
2202+
2203+ return (ok);
2204+}
2205+
2206 #endif /* GSSAPI */
2207
2208diff --git a/monitor_wrap.h b/monitor_wrap.h
2209index de4a08f..9758290 100644
2210--- a/monitor_wrap.h
2211+++ b/monitor_wrap.h
2212@@ -58,8 +58,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *);
2213 OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2214 OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
2215 gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
2216-int mm_ssh_gssapi_userok(char *user);
2217+int mm_ssh_gssapi_userok(char *user, struct passwd *);
2218 OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2219+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2220+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *);
2221 #endif
2222
2223 #ifdef USE_PAM
2224diff --git a/readconf.c b/readconf.c
2225index 1d03bdf..43b7570 100644
2226--- a/readconf.c
2227+++ b/readconf.c
2228@@ -147,6 +147,8 @@ typedef enum {
2229 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
2230 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
2231 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
2232+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
2233+ oGssServerIdentity,
2234 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
2235 oSendEnv, oControlPath, oControlMaster, oControlPersist,
2236 oHashKnownHosts,
2237@@ -192,10 +194,19 @@ static struct {
2238 { "afstokenpassing", oUnsupported },
2239 #if defined(GSSAPI)
2240 { "gssapiauthentication", oGssAuthentication },
2241+ { "gssapikeyexchange", oGssKeyEx },
2242 { "gssapidelegatecredentials", oGssDelegateCreds },
2243+ { "gssapitrustdns", oGssTrustDns },
2244+ { "gssapiclientidentity", oGssClientIdentity },
2245+ { "gssapiserveridentity", oGssServerIdentity },
2246+ { "gssapirenewalforcesrekey", oGssRenewalRekey },
2247 #else
2248 { "gssapiauthentication", oUnsupported },
2249+ { "gssapikeyexchange", oUnsupported },
2250 { "gssapidelegatecredentials", oUnsupported },
2251+ { "gssapitrustdns", oUnsupported },
2252+ { "gssapiclientidentity", oUnsupported },
2253+ { "gssapirenewalforcesrekey", oUnsupported },
2254 #endif
2255 { "fallbacktorsh", oDeprecated },
2256 { "usersh", oDeprecated },
2257@@ -894,10 +905,30 @@ parse_time:
2258 intptr = &options->gss_authentication;
2259 goto parse_flag;
2260
2261+ case oGssKeyEx:
2262+ intptr = &options->gss_keyex;
2263+ goto parse_flag;
2264+
2265 case oGssDelegateCreds:
2266 intptr = &options->gss_deleg_creds;
2267 goto parse_flag;
2268
2269+ case oGssTrustDns:
2270+ intptr = &options->gss_trust_dns;
2271+ goto parse_flag;
2272+
2273+ case oGssClientIdentity:
2274+ charptr = &options->gss_client_identity;
2275+ goto parse_string;
2276+
2277+ case oGssServerIdentity:
2278+ charptr = &options->gss_server_identity;
2279+ goto parse_string;
2280+
2281+ case oGssRenewalRekey:
2282+ intptr = &options->gss_renewal_rekey;
2283+ goto parse_flag;
2284+
2285 case oBatchMode:
2286 intptr = &options->batch_mode;
2287 goto parse_flag;
2288@@ -1601,7 +1632,12 @@ initialize_options(Options * options)
2289 options->pubkey_authentication = -1;
2290 options->challenge_response_authentication = -1;
2291 options->gss_authentication = -1;
2292+ options->gss_keyex = -1;
2293 options->gss_deleg_creds = -1;
2294+ options->gss_trust_dns = -1;
2295+ options->gss_renewal_rekey = -1;
2296+ options->gss_client_identity = NULL;
2297+ options->gss_server_identity = NULL;
2298 options->password_authentication = -1;
2299 options->kbd_interactive_authentication = -1;
2300 options->kbd_interactive_devices = NULL;
2301@@ -1729,8 +1765,14 @@ fill_default_options(Options * options)
2302 options->challenge_response_authentication = 1;
2303 if (options->gss_authentication == -1)
2304 options->gss_authentication = 0;
2305+ if (options->gss_keyex == -1)
2306+ options->gss_keyex = 0;
2307 if (options->gss_deleg_creds == -1)
2308 options->gss_deleg_creds = 0;
2309+ if (options->gss_trust_dns == -1)
2310+ options->gss_trust_dns = 0;
2311+ if (options->gss_renewal_rekey == -1)
2312+ options->gss_renewal_rekey = 0;
2313 if (options->password_authentication == -1)
2314 options->password_authentication = 1;
2315 if (options->kbd_interactive_authentication == -1)
2316diff --git a/readconf.h b/readconf.h
2317index bb2d552..e7e80c3 100644
2318--- a/readconf.h
2319+++ b/readconf.h
2320@@ -45,7 +45,12 @@ typedef struct {
2321 int challenge_response_authentication;
2322 /* Try S/Key or TIS, authentication. */
2323 int gss_authentication; /* Try GSS authentication */
2324+ int gss_keyex; /* Try GSS key exchange */
2325 int gss_deleg_creds; /* Delegate GSS credentials */
2326+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
2327+ int gss_renewal_rekey; /* Credential renewal forces rekey */
2328+ char *gss_client_identity; /* Principal to initiate GSSAPI with */
2329+ char *gss_server_identity; /* GSSAPI target principal */
2330 int password_authentication; /* Try password
2331 * authentication. */
2332 int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
2333diff --git a/servconf.c b/servconf.c
2334index 6c7a91e..cfe7029 100644
2335--- a/servconf.c
2336+++ b/servconf.c
2337@@ -117,8 +117,10 @@ initialize_server_options(ServerOptions *options)
2338 options->kerberos_ticket_cleanup = -1;
2339 options->kerberos_get_afs_token = -1;
2340 options->gss_authentication=-1;
2341+ options->gss_keyex = -1;
2342 options->gss_cleanup_creds = -1;
2343 options->gss_strict_acceptor = -1;
2344+ options->gss_store_rekey = -1;
2345 options->password_authentication = -1;
2346 options->kbd_interactive_authentication = -1;
2347 options->challenge_response_authentication = -1;
2348@@ -275,10 +277,14 @@ fill_default_server_options(ServerOptions *options)
2349 options->kerberos_get_afs_token = 0;
2350 if (options->gss_authentication == -1)
2351 options->gss_authentication = 0;
2352+ if (options->gss_keyex == -1)
2353+ options->gss_keyex = 0;
2354 if (options->gss_cleanup_creds == -1)
2355 options->gss_cleanup_creds = 1;
2356 if (options->gss_strict_acceptor == -1)
2357- options->gss_strict_acceptor = 0;
2358+ options->gss_strict_acceptor = 1;
2359+ if (options->gss_store_rekey == -1)
2360+ options->gss_store_rekey = 0;
2361 if (options->password_authentication == -1)
2362 options->password_authentication = 1;
2363 if (options->kbd_interactive_authentication == -1)
2364@@ -412,6 +418,7 @@ typedef enum {
2365 sHostKeyAlgorithms,
2366 sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
2367 sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
2368+ sGssKeyEx, sGssStoreRekey,
2369 sAcceptEnv, sPermitTunnel,
2370 sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
2371 sUsePrivilegeSeparation, sAllowAgentForwarding,
2372@@ -485,12 +492,20 @@ static struct {
2373 #ifdef GSSAPI
2374 { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
2375 { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
2376+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
2377 { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
2378+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
2379+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
2380 #else
2381 { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
2382 { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
2383+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
2384 { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
2385+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
2386+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
2387 #endif
2388+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
2389+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
2390 { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
2391 { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
2392 { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
2393@@ -1231,6 +1246,10 @@ process_server_config_line(ServerOptions *options, char *line,
2394 intptr = &options->gss_authentication;
2395 goto parse_flag;
2396
2397+ case sGssKeyEx:
2398+ intptr = &options->gss_keyex;
2399+ goto parse_flag;
2400+
2401 case sGssCleanupCreds:
2402 intptr = &options->gss_cleanup_creds;
2403 goto parse_flag;
2404@@ -1239,6 +1258,10 @@ process_server_config_line(ServerOptions *options, char *line,
2405 intptr = &options->gss_strict_acceptor;
2406 goto parse_flag;
2407
2408+ case sGssStoreRekey:
2409+ intptr = &options->gss_store_rekey;
2410+ goto parse_flag;
2411+
2412 case sPasswordAuthentication:
2413 intptr = &options->password_authentication;
2414 goto parse_flag;
2415@@ -2246,7 +2269,10 @@ dump_config(ServerOptions *o)
2416 #endif
2417 #ifdef GSSAPI
2418 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
2419+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
2420 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
2421+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
2422+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
2423 #endif
2424 dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
2425 dump_cfg_fmtint(sKbdInteractiveAuthentication,
2426diff --git a/servconf.h b/servconf.h
2427index f4137af..778ba17 100644
2428--- a/servconf.h
2429+++ b/servconf.h
2430@@ -118,8 +118,10 @@ typedef struct {
2431 int kerberos_get_afs_token; /* If true, try to get AFS token if
2432 * authenticated with Kerberos. */
2433 int gss_authentication; /* If true, permit GSSAPI authentication */
2434+ int gss_keyex; /* If true, permit GSSAPI key exchange */
2435 int gss_cleanup_creds; /* If true, destroy cred cache on logout */
2436 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
2437+ int gss_store_rekey;
2438 int password_authentication; /* If true, permit password
2439 * authentication. */
2440 int kbd_interactive_authentication; /* If true, permit */
2441diff --git a/ssh-gss.h b/ssh-gss.h
2442index a99d7f0..914701b 100644
2443--- a/ssh-gss.h
2444+++ b/ssh-gss.h
2445@@ -1,6 +1,6 @@
2446 /* $OpenBSD: ssh-gss.h,v 1.11 2014/02/26 20:28:44 djm Exp $ */
2447 /*
2448- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
2449+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
2450 *
2451 * Redistribution and use in source and binary forms, with or without
2452 * modification, are permitted provided that the following conditions
2453@@ -61,10 +61,22 @@
2454
2455 #define SSH_GSS_OIDTYPE 0x06
2456
2457+#define SSH2_MSG_KEXGSS_INIT 30
2458+#define SSH2_MSG_KEXGSS_CONTINUE 31
2459+#define SSH2_MSG_KEXGSS_COMPLETE 32
2460+#define SSH2_MSG_KEXGSS_HOSTKEY 33
2461+#define SSH2_MSG_KEXGSS_ERROR 34
2462+#define SSH2_MSG_KEXGSS_GROUPREQ 40
2463+#define SSH2_MSG_KEXGSS_GROUP 41
2464+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-"
2465+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-"
2466+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-"
2467+
2468 typedef struct {
2469 char *filename;
2470 char *envvar;
2471 char *envval;
2472+ struct passwd *owner;
2473 void *data;
2474 } ssh_gssapi_ccache;
2475
2476@@ -72,8 +84,11 @@ typedef struct {
2477 gss_buffer_desc displayname;
2478 gss_buffer_desc exportedname;
2479 gss_cred_id_t creds;
2480+ gss_name_t name;
2481 struct ssh_gssapi_mech_struct *mech;
2482 ssh_gssapi_ccache store;
2483+ int used;
2484+ int updated;
2485 } ssh_gssapi_client;
2486
2487 typedef struct ssh_gssapi_mech_struct {
2488@@ -84,6 +99,7 @@ typedef struct ssh_gssapi_mech_struct {
2489 int (*userok) (ssh_gssapi_client *, char *);
2490 int (*localname) (ssh_gssapi_client *, char **);
2491 void (*storecreds) (ssh_gssapi_client *);
2492+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *);
2493 } ssh_gssapi_mech;
2494
2495 typedef struct {
2496@@ -94,10 +110,11 @@ typedef struct {
2497 gss_OID oid; /* client */
2498 gss_cred_id_t creds; /* server */
2499 gss_name_t client; /* server */
2500- gss_cred_id_t client_creds; /* server */
2501+ gss_cred_id_t client_creds; /* both */
2502 } Gssctxt;
2503
2504 extern ssh_gssapi_mech *supported_mechs[];
2505+extern Gssctxt *gss_kex_context;
2506
2507 int ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
2508 void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
2509@@ -119,16 +136,32 @@ void ssh_gssapi_build_ctx(Gssctxt **);
2510 void ssh_gssapi_delete_ctx(Gssctxt **);
2511 OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2512 void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
2513-int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
2514+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *);
2515+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
2516+int ssh_gssapi_credentials_updated(Gssctxt *);
2517
2518 /* In the server */
2519+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *,
2520+ const char *);
2521+char *ssh_gssapi_client_mechanisms(const char *, const char *);
2522+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *,
2523+ const char *);
2524+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
2525+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *,
2526+ const char *);
2527 OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2528-int ssh_gssapi_userok(char *name);
2529+int ssh_gssapi_userok(char *name, struct passwd *);
2530 OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2531 void ssh_gssapi_do_child(char ***, u_int *);
2532 void ssh_gssapi_cleanup_creds(void);
2533 void ssh_gssapi_storecreds(void);
2534
2535+char *ssh_gssapi_server_mechanisms(void);
2536+int ssh_gssapi_oid_table_ok(void);
2537+
2538+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store);
2539+void ssh_gssapi_rekey_creds(void);
2540+
2541 #endif /* GSSAPI */
2542
2543 #endif /* _SSH_GSS_H */
2544diff --git a/ssh_config b/ssh_config
2545index 03a228f..228e5ab 100644
2546--- a/ssh_config
2547+++ b/ssh_config
2548@@ -26,6 +26,8 @@
2549 # HostbasedAuthentication no
2550 # GSSAPIAuthentication no
2551 # GSSAPIDelegateCredentials no
2552+# GSSAPIKeyExchange no
2553+# GSSAPITrustDNS no
2554 # BatchMode no
2555 # CheckHostIP yes
2556 # AddressFamily any
2557diff --git a/ssh_config.5 b/ssh_config.5
2558index a47f3ca..cac8cda 100644
2559--- a/ssh_config.5
2560+++ b/ssh_config.5
2561@@ -749,11 +749,45 @@ Specifies whether user authentication based on GSSAPI is allowed.
2562 The default is
2563 .Dq no .
2564 Note that this option applies to protocol version 2 only.
2565+.It Cm GSSAPIKeyExchange
2566+Specifies whether key exchange based on GSSAPI may be used. When using
2567+GSSAPI key exchange the server need not have a host key.
2568+The default is
2569+.Dq no .
2570+Note that this option applies to protocol version 2 only.
2571+.It Cm GSSAPIClientIdentity
2572+If set, specifies the GSSAPI client identity that ssh should use when
2573+connecting to the server. The default is unset, which means that the default
2574+identity will be used.
2575+.It Cm GSSAPIServerIdentity
2576+If set, specifies the GSSAPI server identity that ssh should expect when
2577+connecting to the server. The default is unset, which means that the
2578+expected GSSAPI server identity will be determined from the target
2579+hostname.
2580 .It Cm GSSAPIDelegateCredentials
2581 Forward (delegate) credentials to the server.
2582 The default is
2583 .Dq no .
2584-Note that this option applies to protocol version 2 only.
2585+Note that this option applies to protocol version 2 connections using GSSAPI.
2586+.It Cm GSSAPIRenewalForcesRekey
2587+If set to
2588+.Dq yes
2589+then renewal of the client's GSSAPI credentials will force the rekeying of the
2590+ssh connection. With a compatible server, this can delegate the renewed
2591+credentials to a session on the server.
2592+The default is
2593+.Dq no .
2594+.It Cm GSSAPITrustDns
2595+Set to
2596+.Dq yes
2597+to indicate that the DNS is trusted to securely canonicalize
2598+the name of the host being connected to. If
2599+.Dq no ,
2600+the hostname entered on the
2601+command line will be passed untouched to the GSSAPI library.
2602+The default is
2603+.Dq no .
2604+This option only applies to protocol version 2 connections using GSSAPI.
2605 .It Cm HashKnownHosts
2606 Indicates that
2607 .Xr ssh 1
2608diff --git a/sshconnect2.c b/sshconnect2.c
2609index 7751031..32e9b0d 100644
2610--- a/sshconnect2.c
2611+++ b/sshconnect2.c
2612@@ -160,6 +160,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2613 struct kex *kex;
2614 int r;
2615
2616+#ifdef GSSAPI
2617+ char *orig = NULL, *gss = NULL;
2618+ char *gss_host = NULL;
2619+#endif
2620+
2621 xxx_host = host;
2622 xxx_hostaddr = hostaddr;
2623
2624@@ -193,6 +198,33 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2625 order_hostkeyalgs(host, hostaddr, port));
2626 }
2627
2628+#ifdef GSSAPI
2629+ if (options.gss_keyex) {
2630+ /* Add the GSSAPI mechanisms currently supported on this
2631+ * client to the key exchange algorithm proposal */
2632+ orig = myproposal[PROPOSAL_KEX_ALGS];
2633+
2634+ if (options.gss_trust_dns)
2635+ gss_host = (char *)get_canonical_hostname(1);
2636+ else
2637+ gss_host = host;
2638+
2639+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity);
2640+ if (gss) {
2641+ debug("Offering GSSAPI proposal: %s", gss);
2642+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
2643+ "%s,%s", gss, orig);
2644+
2645+ /* If we've got GSSAPI algorithms, then we also
2646+ * support the 'null' hostkey, as a last resort */
2647+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
2648+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],
2649+ "%s,null", orig);
2650+ free(gss);
2651+ }
2652+ }
2653+#endif
2654+
2655 if (options.rekey_limit || options.rekey_interval)
2656 packet_set_rekey_limits((u_int32_t)options.rekey_limit,
2657 (time_t)options.rekey_interval);
2658@@ -211,10 +243,30 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2659 # endif
2660 #endif
2661 kex->kex[KEX_C25519_SHA256] = kexc25519_client;
2662+#ifdef GSSAPI
2663+ if (options.gss_keyex) {
2664+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
2665+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client;
2666+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client;
2667+ }
2668+#endif
2669 kex->client_version_string=client_version_string;
2670 kex->server_version_string=server_version_string;
2671 kex->verify_host_key=&verify_host_key_callback;
2672
2673+#ifdef GSSAPI
2674+ if (options.gss_keyex) {
2675+ kex->gss_deleg_creds = options.gss_deleg_creds;
2676+ kex->gss_trust_dns = options.gss_trust_dns;
2677+ kex->gss_client = options.gss_client_identity;
2678+ if (options.gss_server_identity) {
2679+ kex->gss_host = options.gss_server_identity;
2680+ } else {
2681+ kex->gss_host = gss_host;
2682+ }
2683+ }
2684+#endif
2685+
2686 dispatch_run(DISPATCH_BLOCK, &kex->done, active_state);
2687
2688 if (options.use_roaming && !kex->roaming) {
2689@@ -306,6 +358,7 @@ int input_gssapi_token(int type, u_int32_t, void *);
2690 int input_gssapi_hash(int type, u_int32_t, void *);
2691 int input_gssapi_error(int, u_int32_t, void *);
2692 int input_gssapi_errtok(int, u_int32_t, void *);
2693+int userauth_gsskeyex(Authctxt *authctxt);
2694 #endif
2695
2696 void userauth(Authctxt *, char *);
2697@@ -321,6 +374,11 @@ static char *authmethods_get(void);
2698
2699 Authmethod authmethods[] = {
2700 #ifdef GSSAPI
2701+ {"gssapi-keyex",
2702+ userauth_gsskeyex,
2703+ NULL,
2704+ &options.gss_authentication,
2705+ NULL},
2706 {"gssapi-with-mic",
2707 userauth_gssapi,
2708 NULL,
2709@@ -627,19 +685,31 @@ userauth_gssapi(Authctxt *authctxt)
2710 static u_int mech = 0;
2711 OM_uint32 min;
2712 int ok = 0;
2713+ const char *gss_host;
2714+
2715+ if (options.gss_server_identity)
2716+ gss_host = options.gss_server_identity;
2717+ else if (options.gss_trust_dns)
2718+ gss_host = get_canonical_hostname(1);
2719+ else
2720+ gss_host = authctxt->host;
2721
2722 /* Try one GSSAPI method at a time, rather than sending them all at
2723 * once. */
2724
2725 if (gss_supported == NULL)
2726- gss_indicate_mechs(&min, &gss_supported);
2727+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) {
2728+ gss_supported = NULL;
2729+ return 0;
2730+ }
2731
2732 /* Check to see if the mechanism is usable before we offer it */
2733 while (mech < gss_supported->count && !ok) {
2734 /* My DER encoding requires length<128 */
2735 if (gss_supported->elements[mech].length < 128 &&
2736 ssh_gssapi_check_mechanism(&gssctxt,
2737- &gss_supported->elements[mech], authctxt->host)) {
2738+ &gss_supported->elements[mech], gss_host,
2739+ options.gss_client_identity)) {
2740 ok = 1; /* Mechanism works */
2741 } else {
2742 mech++;
2743@@ -736,8 +806,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt)
2744 {
2745 Authctxt *authctxt = ctxt;
2746 Gssctxt *gssctxt;
2747- int oidlen;
2748- char *oidv;
2749+ u_int oidlen;
2750+ u_char *oidv;
2751
2752 if (authctxt == NULL)
2753 fatal("input_gssapi_response: no authentication context");
2754@@ -850,6 +920,48 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt)
2755 free(lang);
2756 return 0;
2757 }
2758+
2759+int
2760+userauth_gsskeyex(Authctxt *authctxt)
2761+{
2762+ Buffer b;
2763+ gss_buffer_desc gssbuf;
2764+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
2765+ OM_uint32 ms;
2766+
2767+ static int attempt = 0;
2768+ if (attempt++ >= 1)
2769+ return (0);
2770+
2771+ if (gss_kex_context == NULL) {
2772+ debug("No valid Key exchange context");
2773+ return (0);
2774+ }
2775+
2776+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service,
2777+ "gssapi-keyex");
2778+
2779+ gssbuf.value = buffer_ptr(&b);
2780+ gssbuf.length = buffer_len(&b);
2781+
2782+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) {
2783+ buffer_free(&b);
2784+ return (0);
2785+ }
2786+
2787+ packet_start(SSH2_MSG_USERAUTH_REQUEST);
2788+ packet_put_cstring(authctxt->server_user);
2789+ packet_put_cstring(authctxt->service);
2790+ packet_put_cstring(authctxt->method->name);
2791+ packet_put_string(mic.value, mic.length);
2792+ packet_send();
2793+
2794+ buffer_free(&b);
2795+ gss_release_buffer(&ms, &mic);
2796+
2797+ return (1);
2798+}
2799+
2800 #endif /* GSSAPI */
2801
2802 int
2803diff --git a/sshd.c b/sshd.c
2804index 65ef7e8..839c2e0 100644
2805--- a/sshd.c
2806+++ b/sshd.c
2807@@ -126,6 +126,10 @@
2808 #include "version.h"
2809 #include "ssherr.h"
2810
2811+#ifdef USE_SECURITY_SESSION_API
2812+#include <Security/AuthSession.h>
2813+#endif
2814+
2815 #ifndef O_NOCTTY
2816 #define O_NOCTTY 0
2817 #endif
2818@@ -1827,10 +1831,13 @@ main(int ac, char **av)
2819 logit("Disabling protocol version 1. Could not load host key");
2820 options.protocol &= ~SSH_PROTO_1;
2821 }
2822+#ifndef GSSAPI
2823+ /* The GSSAPI key exchange can run without a host key */
2824 if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) {
2825 logit("Disabling protocol version 2. Could not load host key");
2826 options.protocol &= ~SSH_PROTO_2;
2827 }
2828+#endif
2829 if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
2830 logit("sshd: no hostkeys available -- exiting.");
2831 exit(1);
2832@@ -2145,6 +2152,60 @@ main(int ac, char **av)
2833 remote_ip, remote_port, laddr, get_local_port());
2834 free(laddr);
2835
2836+#ifdef USE_SECURITY_SESSION_API
2837+ /*
2838+ * Create a new security session for use by the new user login if
2839+ * the current session is the root session or we are not launched
2840+ * by inetd (eg: debugging mode or server mode). We do not
2841+ * necessarily need to create a session if we are launched from
2842+ * inetd because Panther xinetd will create a session for us.
2843+ *
2844+ * The only case where this logic will fail is if there is an
2845+ * inetd running in a non-root session which is not creating
2846+ * new sessions for us. Then all the users will end up in the
2847+ * same session (bad).
2848+ *
2849+ * When the client exits, the session will be destroyed for us
2850+ * automatically.
2851+ *
2852+ * We must create the session before any credentials are stored
2853+ * (including AFS pags, which happens a few lines below).
2854+ */
2855+ {
2856+ OSStatus err = 0;
2857+ SecuritySessionId sid = 0;
2858+ SessionAttributeBits sattrs = 0;
2859+
2860+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs);
2861+ if (err)
2862+ error("SessionGetInfo() failed with error %.8X",
2863+ (unsigned) err);
2864+ else
2865+ debug("Current Session ID is %.8X / Session Attributes are %.8X",
2866+ (unsigned) sid, (unsigned) sattrs);
2867+
2868+ if (inetd_flag && !(sattrs & sessionIsRoot))
2869+ debug("Running in inetd mode in a non-root session... "
2870+ "assuming inetd created the session for us.");
2871+ else {
2872+ debug("Creating new security session...");
2873+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote);
2874+ if (err)
2875+ error("SessionCreate() failed with error %.8X",
2876+ (unsigned) err);
2877+
2878+ err = SessionGetInfo(callerSecuritySession, &sid,
2879+ &sattrs);
2880+ if (err)
2881+ error("SessionGetInfo() failed with error %.8X",
2882+ (unsigned) err);
2883+ else
2884+ debug("New Session ID is %.8X / Session Attributes are %.8X",
2885+ (unsigned) sid, (unsigned) sattrs);
2886+ }
2887+ }
2888+#endif
2889+
2890 /*
2891 * We don't want to listen forever unless the other side
2892 * successfully authenticates itself. So we set up an alarm which is
2893@@ -2563,6 +2624,48 @@ do_ssh2_kex(void)
2894 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
2895 list_hostkey_types());
2896
2897+#ifdef GSSAPI
2898+ {
2899+ char *orig;
2900+ char *gss = NULL;
2901+ char *newstr = NULL;
2902+ orig = myproposal[PROPOSAL_KEX_ALGS];
2903+
2904+ /*
2905+ * If we don't have a host key, then there's no point advertising
2906+ * the other key exchange algorithms
2907+ */
2908+
2909+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
2910+ orig = NULL;
2911+
2912+ if (options.gss_keyex)
2913+ gss = ssh_gssapi_server_mechanisms();
2914+ else
2915+ gss = NULL;
2916+
2917+ if (gss && orig)
2918+ xasprintf(&newstr, "%s,%s", gss, orig);
2919+ else if (gss)
2920+ newstr = gss;
2921+ else if (orig)
2922+ newstr = orig;
2923+
2924+ /*
2925+ * If we've got GSSAPI mechanisms, then we've got the 'null' host
2926+ * key alg, but we can't tell people about it unless its the only
2927+ * host key algorithm we support
2928+ */
2929+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
2930+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
2931+
2932+ if (newstr)
2933+ myproposal[PROPOSAL_KEX_ALGS] = newstr;
2934+ else
2935+ fatal("No supported key exchange algorithms");
2936+ }
2937+#endif
2938+
2939 /* start key exchange */
2940 if ((r = kex_setup(active_state, myproposal)) != 0)
2941 fatal("kex_setup: %s", ssh_err(r));
2942@@ -2577,6 +2680,13 @@ do_ssh2_kex(void)
2943 # endif
2944 #endif
2945 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
2946+#ifdef GSSAPI
2947+ if (options.gss_keyex) {
2948+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
2949+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
2950+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
2951+ }
2952+#endif
2953 kex->server = 1;
2954 kex->client_version_string=client_version_string;
2955 kex->server_version_string=server_version_string;
2956diff --git a/sshd_config b/sshd_config
2957index 4d77f05..64786c9 100644
2958--- a/sshd_config
2959+++ b/sshd_config
2960@@ -84,6 +84,8 @@ AuthorizedKeysFile .ssh/authorized_keys
2961 # GSSAPI options
2962 #GSSAPIAuthentication no
2963 #GSSAPICleanupCredentials yes
2964+#GSSAPIStrictAcceptorCheck yes
2965+#GSSAPIKeyExchange no
2966
2967 # Set this to 'yes' to enable PAM authentication, account processing,
2968 # and session processing. If this is enabled, PAM authentication will
2969diff --git a/sshd_config.5 b/sshd_config.5
2970index b18d340..5491c89 100644
2971--- a/sshd_config.5
2972+++ b/sshd_config.5
2973@@ -621,6 +621,12 @@ Specifies whether user authentication based on GSSAPI is allowed.
2974 The default is
2975 .Dq no .
2976 Note that this option applies to protocol version 2 only.
2977+.It Cm GSSAPIKeyExchange
2978+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange
2979+doesn't rely on ssh keys to verify host identity.
2980+The default is
2981+.Dq no .
2982+Note that this option applies to protocol version 2 only.
2983 .It Cm GSSAPICleanupCredentials
2984 Specifies whether to automatically destroy the user's credentials cache
2985 on logout.
2986@@ -642,6 +648,11 @@ machine's default store.
2987 This facility is provided to assist with operation on multi homed machines.
2988 The default is
2989 .Dq yes .
2990+.It Cm GSSAPIStoreCredentialsOnRekey
2991+Controls whether the user's GSSAPI credentials should be updated following a
2992+successful connection rekeying. This option can be used to accepted renewed
2993+or updated credentials from a compatible client. The default is
2994+.Dq no .
2995 .It Cm HostbasedAcceptedKeyTypes
2996 Specifies the key types that will be accepted for hostbased authentication
2997 as a comma-separated pattern list.
2998diff --git a/sshkey.c b/sshkey.c
2999index 32dd8f2..5368e7c 100644
3000--- a/sshkey.c
3001+++ b/sshkey.c
3002@@ -112,6 +112,7 @@ static const struct keytype keytypes[] = {
3003 # endif /* OPENSSL_HAS_NISTP521 */
3004 # endif /* OPENSSL_HAS_ECC */
3005 #endif /* WITH_OPENSSL */
3006+ { "null", "null", KEY_NULL, 0, 0 },
3007 { NULL, NULL, -1, -1, 0 }
3008 };
3009
3010@@ -200,7 +201,7 @@ key_alg_list(int certs_only, int plain_only)
3011 const struct keytype *kt;
3012
3013 for (kt = keytypes; kt->type != -1; kt++) {
3014- if (kt->name == NULL)
3015+ if (kt->name == NULL || kt->type == KEY_NULL)
3016 continue;
3017 if ((certs_only && !kt->cert) || (plain_only && kt->cert))
3018 continue;
3019diff --git a/sshkey.h b/sshkey.h
3020index c8d3cdd..5cf4e5d 100644
3021--- a/sshkey.h
3022+++ b/sshkey.h
3023@@ -62,6 +62,7 @@ enum sshkey_types {
3024 KEY_DSA_CERT,
3025 KEY_ECDSA_CERT,
3026 KEY_ED25519_CERT,
3027+ KEY_NULL,
3028 KEY_UNSPEC
3029 };
3030
diff --git a/debian/patches/helpful-wait-terminate.patch b/debian/patches/helpful-wait-terminate.patch
new file mode 100644
index 000000000..0dc5bafbf
--- /dev/null
+++ b/debian/patches/helpful-wait-terminate.patch
@@ -0,0 +1,26 @@
1From 86d7bcd53809aacc75344386bd8b88bf5fcb2fce 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 306ac36..68f0251 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..bbb3ef86f
--- /dev/null
+++ b/debian/patches/keepalive-extensions.patch
@@ -0,0 +1,135 @@
1From 8f53616f872acf853b52e94f5b0668c78bf0cb76 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 522ad37..46c343f 100644
30--- a/readconf.c
31+++ b/readconf.c
32@@ -160,6 +160,7 @@ typedef enum {
33 oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
34 oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
35 oPubkeyAcceptedKeyTypes,
36+ oProtocolKeepAlives, oSetupTimeOut,
37 oIgnoredUnknownOption, oDeprecated, oUnsupported
38 } OpCodes;
39
40@@ -290,6 +291,8 @@ static struct {
41 { "hostbasedkeytypes", oHostbasedKeyTypes },
42 { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
43 { "ignoreunknown", oIgnoreUnknown },
44+ { "protocolkeepalives", oProtocolKeepAlives },
45+ { "setuptimeout", oSetupTimeOut },
46
47 { NULL, oBadOption }
48 };
49@@ -1304,6 +1307,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@@ -1856,8 +1861,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 cac8cda..78e918a 100644
76--- a/ssh_config.5
77+++ b/ssh_config.5
78@@ -233,8 +233,12 @@ Valid arguments are
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@@ -1476,8 +1480,15 @@ 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 This option applies to protocol version 2 only.
102+.Cm ProtocolKeepAlives
103+and
104+.Cm SetupTimeOut
105+are Debian-specific compatibility aliases for this option.
106 .It Cm StreamLocalBindMask
107 Sets the octal file creation mode mask
108 .Pq umask
109@@ -1543,6 +1554,12 @@ Specifies whether the system should send TCP keepalive messages to the
110 other side.
111 If they are sent, death of the connection or crash of one
112 of the machines will be properly noticed.
113+This option only uses TCP keepalives (as opposed to using ssh level
114+keepalives), so takes a long time to notice when the connection dies.
115+As such, you probably want
116+the
117+.Cm ServerAliveInterval
118+option as well.
119 However, this means that
120 connections will die if the route is down temporarily, and some people
121 find it annoying.
122diff --git a/sshd_config.5 b/sshd_config.5
123index 5491c89..c8ee35d 100644
124--- a/sshd_config.5
125+++ b/sshd_config.5
126@@ -1510,6 +1510,9 @@ This avoids infinitely hanging sessions.
127 .Pp
128 To disable TCP keepalive messages, the value should be set to
129 .Dq no .
130+.Pp
131+This option was formerly called
132+.Cm KeepAlive .
133 .It Cm TrustedUserCAKeys
134 Specifies a file containing public keys of certificate authorities that are
135 trusted to sign user certificates for authentication, or
diff --git a/debian/patches/lintian-symlink-pickiness.patch b/debian/patches/lintian-symlink-pickiness.patch
new file mode 100644
index 000000000..252cd99b8
--- /dev/null
+++ b/debian/patches/lintian-symlink-pickiness.patch
@@ -0,0 +1,32 @@
1From ca06409500b9f4f3a43fa61526a4c0654761e009 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:08 +0000
4Subject: Fix picky lintian errors about slogin symlinks
5
6Apparently this breaks some SVR4 packaging systems, so upstream can't win
7either way and opted to keep the status quo. We need this patch anyway.
8
9Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1728
10Last-Update: 2013-09-14
11
12Patch-Name: lintian-symlink-pickiness.patch
13---
14 Makefile.in | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/Makefile.in b/Makefile.in
18index 915c740..e161d0e 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -330,9 +330,9 @@ install-files:
22 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
23 $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
24 -rm -f $(DESTDIR)$(bindir)/slogin
25- ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
26+ ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
27 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
28- ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
29+ ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
30
31 install-sysconf:
32 if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
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..79c984179
--- /dev/null
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -0,0 +1,42 @@
1From 9f59e8a3ddd28351126a5b26d2dd3d9f24442c09 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 cd467fd..bbde8af 100644
17--- a/sshconnect.c
18+++ b/sshconnect.c
19@@ -1078,9 +1078,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@@ -1088,6 +1092,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..14ec01dbf
--- /dev/null
+++ b/debian/patches/no-openssl-version-status.patch
@@ -0,0 +1,62 @@
1From e5908e70f9a105f725d9884fba1a68bfb3ba664f 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..4ce6c79e0
--- /dev/null
+++ b/debian/patches/openbsd-docs.patch
@@ -0,0 +1,148 @@
1From 70ef4add88e4f6adc7f9f0e9521567dcd80a12e6 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 ed17a08..c560179 100644
48--- a/ssh-keygen.1
49+++ b/ssh-keygen.1
50@@ -174,9 +174,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@@ -223,9 +221,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@@ -638,7 +634,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@@ -837,7 +833,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 ff80022..4fba77f 100644
92--- a/ssh.1
93+++ b/ssh.1
94@@ -853,6 +853,10 @@ Protocol 1 is restricted to using only RSA keys,
95 but protocol 2 may use any.
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 2105979..42ba596 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@@ -861,7 +861,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 The file format is described in
126 .Xr moduli 5 .
127@@ -960,7 +960,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 b149bd3..0828592 100644
137--- a/sshd_config.5
138+++ b/sshd_config.5
139@@ -374,8 +374,7 @@ This option is only available for protocol version 2.
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..51e14b07a
--- /dev/null
+++ b/debian/patches/package-versioning.patch
@@ -0,0 +1,65 @@
1From 3b79d6bcaf9405b878496c9107855ebe8906a60a 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 bbde8af..0ec1e54 100644
23--- a/sshconnect.c
24+++ b/sshconnect.c
25@@ -524,10 +524,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 (roaming_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 0537bc9..0d4fb7f 100644
40--- a/sshd.c
41+++ b/sshd.c
42@@ -443,7 +443,7 @@ sshd_exchange_identification(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 d917ca1..5c22d90 100644
53--- a/version.h
54+++ b/version.h
55@@ -3,4 +3,9 @@
56 #define SSH_VERSION "OpenSSH_7.1"
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..4d9267c19
--- /dev/null
+++ b/debian/patches/quieter-signals.patch
@@ -0,0 +1,40 @@
1From de340b1ef1920a34e8c640a571a88a3f58121c6a 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 fba1b54..5653cc4 100644
26--- a/clientloop.c
27+++ b/clientloop.c
28@@ -1716,8 +1716,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..0bda03255
--- /dev/null
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -0,0 +1,172 @@
1From c538473bc1958b99bb26283752f287df5934045a 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 7a25603..128889a 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -1448,6 +1448,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@@ -4953,6 +5009,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 213b5fc..2105979 100644
107--- a/sshd.8
108+++ b/sshd.8
109@@ -850,6 +850,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@@ -953,6 +959,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 839c2e0..0e30e6e 100644
132--- a/sshd.c
133+++ b/sshd.c
134@@ -130,6 +130,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@@ -2145,6 +2152,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..c6568cf1e
--- /dev/null
+++ b/debian/patches/scp-quoting.patch
@@ -0,0 +1,41 @@
1From bad235ddc7e9cb8fa83ccefac7640fe456bcf993 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 593fe89..e39294e 100644
21--- a/scp.c
22+++ b/scp.c
23@@ -190,8 +190,16 @@ do_local_cmd(arglist *a)
24
25 if (verbose_mode) {
26 fprintf(stderr, "Executing:");
27- for (i = 0; i < a->num; i++)
28- fprintf(stderr, " %s", a->list[i]);
29+ for (i = 0; i < a->num; i++) {
30+ if (i == 0)
31+ fprintf(stderr, " %s", a->list[i]);
32+ else
33+ /*
34+ * TODO: misbehaves if a->list[i] contains a
35+ * single quote
36+ */
37+ fprintf(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..f479c4635
--- /dev/null
+++ b/debian/patches/selinux-role.patch
@@ -0,0 +1,504 @@
1From 5f583693723b0f56608a9a91e58b248219a668c9 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 8b27575..3c2222f 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 3f49bdc..6eb3cc7 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 2658aaa..c063ad1 100644
117--- a/monitor.c
118+++ b/monitor.c
119@@ -127,6 +127,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@@ -208,6 +209,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@@ -879,6 +881,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@@ -909,14 +912,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@@ -1544,7 +1570,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 81ceddb..6799911 100644
207--- a/monitor_wrap.c
208+++ b/monitor_wrap.c
209@@ -327,10 +327,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@@ -339,12 +339,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 9758290..57e740f 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);
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 ee313da..f35ec39 100644
365--- a/platform.c
366+++ b/platform.c
367@@ -143,7 +143,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@@ -184,7 +184,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 1c7a45d..436ae7c 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 5a64715..afac4a5 100644
400--- a/session.c
401+++ b/session.c
402@@ -1487,7 +1487,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 #ifdef USE_LIBIAF
411@@ -1518,7 +1518,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 (options.chroot_directory != NULL &&
419 strcasecmp(options.chroot_directory, "none") != 0) {
420@@ -1677,7 +1677,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@@ -1704,7 +1704,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@@ -2115,7 +2115,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 6a2f35e..ef6593c 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 0e30e6e..0537bc9 100644
462--- a/sshd.c
463+++ b/sshd.c
464@@ -782,7 +782,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..f7eb1cc8b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,29 @@
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
18lintian-symlink-pickiness.patch
19openbsd-docs.patch
20ssh-argv0.patch
21doc-hash-tab-completion.patch
22doc-upstart.patch
23ssh-agent-setgid.patch
24no-openssl-version-status.patch
25gnome-ssh-askpass2-icon.patch
26sigstop.patch
27systemd-readiness.patch
28debian-config.patch
29backport-fix-first-kex-follows.patch
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
new file mode 100644
index 000000000..3a98343cc
--- /dev/null
+++ b/debian/patches/shell-path.patch
@@ -0,0 +1,39 @@
1From bf28735236933b0a1f011d73d7cbb948e197c4cc 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 17fbe39..cd467fd 100644
20--- a/sshconnect.c
21+++ b/sshconnect.c
22@@ -231,7 +231,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@@ -1471,7 +1471,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..7db2557a0
--- /dev/null
+++ b/debian/patches/sigstop.patch
@@ -0,0 +1,35 @@
1From bf533d857451efe2f9abc6fb96e1c9c93ff1a7ee 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 6024e0e..7e72b9b 100644
17--- a/sshd.c
18+++ b/sshd.c
19@@ -2042,6 +2042,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..11ecc5c42
--- /dev/null
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -0,0 +1,40 @@
1From 0f29b62fb2529bd6341dae7bea1271f5b967ece0 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 d0aa712..2a940d9 100644
17--- a/ssh-agent.1
18+++ b/ssh-agent.1
19@@ -186,6 +186,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..3c22db5cf
--- /dev/null
+++ b/debian/patches/ssh-argv0.patch
@@ -0,0 +1,31 @@
1From 11e3509a4baa45a988598b937ea16e6ed3949d44 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 4fba77f..05b7f10 100644
22--- a/ssh.1
23+++ b/ssh.1
24@@ -1574,6 +1574,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..59b0983f9
--- /dev/null
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -0,0 +1,42 @@
1From 6b1e8291597ff151b913c470f4af4b04ddec5c7d 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 43b7570..522ad37 100644
21--- a/readconf.c
22+++ b/readconf.c
23@@ -181,6 +181,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 cfe7029..ed3a88d 100644
33--- a/servconf.c
34+++ b/servconf.c
35@@ -522,6 +522,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..d591c1a70
--- /dev/null
+++ b/debian/patches/syslog-level-silent.patch
@@ -0,0 +1,47 @@
1From 2b9216f2931cfe880a7ea85750730579f8da4465 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 ad12930..e68b84a 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 59c1f93..712ea0e 100644
37--- a/ssh.c
38+++ b/ssh.c
39@@ -1106,7 +1106,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..4914cd6f5
--- /dev/null
+++ b/debian/patches/systemd-readiness.patch
@@ -0,0 +1,84 @@
1From 0aff7ca980bc54be68f7479a016d7779f99cf06e 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 128889a..eec2b72 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -4213,6 +4213,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@@ -5014,6 +5037,7 @@ echo " MD5 password support: $MD5_MSG"
51 echo " libedit support: $LIBEDIT_MSG"
52 echo " Solaris process contract support: $SPC_MSG"
53 echo " Solaris project support: $SP_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 7e72b9b..19ee92b 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@@ -2052,6 +2056,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..70d5275aa
--- /dev/null
+++ b/debian/patches/user-group-modes.patch
@@ -0,0 +1,266 @@
1From c60b1066b877429b723b351f44efb9e84bc64252 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 | 5 +++--
26 ssh.1 | 2 ++
27 ssh_config.5 | 2 ++
28 8 files changed, 82 insertions(+), 29 deletions(-)
29
30diff --git a/auth-rhosts.c b/auth-rhosts.c
31index ee9e827..2ff2cff 100644
32--- a/auth-rhosts.c
33+++ b/auth-rhosts.c
34@@ -271,8 +271,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@@ -298,8 +297,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 bd6a026..782b7f8 100644
56--- a/auth.c
57+++ b/auth.c
58@@ -425,8 +425,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@@ -488,8 +487,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@@ -504,8 +502,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 ddd2b2d..1c063ea 100644
90--- a/misc.c
91+++ b/misc.c
92@@ -50,8 +50,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@@ -60,6 +61,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@@ -644,6 +646,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 374c33c..89e1f75 100644
185--- a/misc.h
186+++ b/misc.h
187@@ -135,4 +135,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 f35ec39..9a23e6e 100644
196--- a/platform.c
197+++ b/platform.c
198@@ -197,19 +197,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 46c343f..c0ba5a7 100644
220--- a/readconf.c
221+++ b/readconf.c
222@@ -39,6 +39,8 @@
223 #include <stdio.h>
224 #include <string.h>
225 #include <unistd.h>
226+#include <pwd.h>
227+#include <grp.h>
228 #ifdef HAVE_UTIL_H
229 #include <util.h>
230 #endif
231@@ -1579,8 +1581,7 @@ read_config_file(const char *filename, struct passwd *pw, const char *host,
232
233 if (fstat(fileno(f), &sb) == -1)
234 fatal("fstat %s: %s", filename, strerror(errno));
235- if (((sb.st_uid != 0 && sb.st_uid != getuid()) ||
236- (sb.st_mode & 022) != 0))
237+ if (!secure_permissions(&sb, getuid()))
238 fatal("Bad owner or permissions on %s", filename);
239 }
240
241diff --git a/ssh.1 b/ssh.1
242index 2ea0a20..ff80022 100644
243--- a/ssh.1
244+++ b/ssh.1
245@@ -1458,6 +1458,8 @@ The file format and configuration options are described in
246 .Xr ssh_config 5 .
247 Because of the potential for abuse, this file must have strict permissions:
248 read/write for the user, and not writable by others.
249+It may be group-writable provided that the group in question contains only
250+the user.
251 .Pp
252 .It Pa ~/.ssh/environment
253 Contains additional definitions for environment variables; see
254diff --git a/ssh_config.5 b/ssh_config.5
255index 78e918a..1e9c058 100644
256--- a/ssh_config.5
257+++ b/ssh_config.5
258@@ -1757,6 +1757,8 @@ The format of this file is described above.
259 This file is used by the SSH client.
260 Because of the potential for abuse, this file must have strict permissions:
261 read/write for the user, and not accessible by others.
262+It may be group-writable provided that the group in question contains only
263+the user.
264 .It Pa /etc/ssh/ssh_config
265 Systemwide configuration file.
266 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..01937b39e
--- /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) 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.org/faq.html | \
249 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\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..385a9ecc6
--- /dev/null
+++ b/debian/ssh-agent.user-session.upstart
@@ -0,0 +1,23 @@
1description "SSH Agent"
2author "Stéphane Graber <stgraber@ubuntu.com>"
3
4start on starting xsession-init
5
6pre-start script
7 [ -e /etc/X11/Xsession.options ] || { stop; exit 0; }
8 grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; }
9 [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; }
10
11 eval "$(ssh-agent -s)" >/dev/null
12 initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK
13 initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID
14 initctl set-env --global SSH_AGENT_LAUNCHER=upstart
15end script
16
17post-stop script
18 [ "$SSH_AGENT_LAUNCHER" = upstart ] || exit 0
19 kill $SSH_AGENT_PID 2>/dev/null || true
20 initctl unset-env --global SSH_AUTH_SOCK
21 initctl unset-env --global SSH_AGENT_PID
22 initctl unset-env --global SSH_AGENT_LAUNCHER
23end script
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.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..426797246
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
1version=3
2opts=pgpsigurlmangle=s/$/.asc/ \
3ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-(.*)\.tar\.gz