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