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