summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm8
-rw-r--r--debian/NEWS55
-rw-r--r--debian/README.Debian234
-rwxr-xr-xdebian/adjust-openssl-dependencies32
-rw-r--r--debian/changelog4053
-rw-r--r--debian/clean2
-rw-r--r--debian/compat1
-rw-r--r--debian/control164
-rw-r--r--debian/copyright392
-rw-r--r--debian/copyright.head52
-rw-r--r--debian/faq.html1187
-rw-r--r--debian/gnome-ssh-askpass.151
-rw-r--r--debian/keygen-test/Makefile12
-rw-r--r--debian/keygen-test/getpid.c39
-rwxr-xr-xdebian/keygen-test/keygen-test12
-rw-r--r--debian/openssh-client-udeb.install3
-rw-r--r--debian/openssh-client.apport32
-rw-r--r--debian/openssh-client.docs6
-rwxr-xr-xdebian/openssh-client.install37
-rw-r--r--debian/openssh-client.lintian-overrides1
-rw-r--r--debian/openssh-client.manpages2
-rw-r--r--debian/openssh-client.postinst45
-rw-r--r--debian/openssh-client.postrm22
-rw-r--r--debian/openssh-client.prerm39
-rw-r--r--debian/openssh-server-udeb.dirs1
-rw-r--r--debian/openssh-server-udeb.install2
-rw-r--r--debian/openssh-server.apport28
-rw-r--r--debian/openssh-server.config29
-rw-r--r--debian/openssh-server.examples1
-rw-r--r--debian/openssh-server.if-up43
-rwxr-xr-xdebian/openssh-server.install16
-rw-r--r--debian/openssh-server.links0
-rw-r--r--debian/openssh-server.lintian-overrides1
-rw-r--r--debian/openssh-server.maintscript1
-rw-r--r--debian/openssh-server.postinst323
-rw-r--r--debian/openssh-server.postrm27
-rw-r--r--debian/openssh-server.preinst18
-rw-r--r--debian/openssh-server.ssh.default5
-rw-r--r--debian/openssh-server.ssh.init174
l---------debian/openssh-server.ssh.service1
-rw-r--r--debian/openssh-server.ssh.upstart29
-rw-r--r--debian/openssh-server.sshd.pam.in55
-rw-r--r--debian/openssh-server.templates15
-rw-r--r--debian/openssh-server.ufw.profile4
-rw-r--r--debian/openssh-sftp-server.install2
-rw-r--r--debian/openssh-sftp-server.links1
-rw-r--r--debian/patches/auth-log-verbosity.patch133
-rw-r--r--debian/patches/authorized-keys-man-symlink.patch26
-rw-r--r--debian/patches/backport-do-not-resend-username-to-pam.patch43
-rw-r--r--debian/patches/backport-fix-pty-permissions.patch33
-rw-r--r--debian/patches/backport-kbdint-duplicates.patch53
-rw-r--r--debian/patches/backport-pam-use-after-free.patch39
-rw-r--r--debian/patches/backport-regress-principals-command-noexec.patch257
-rw-r--r--debian/patches/consolekit.patch576
-rw-r--r--debian/patches/debian-banner.patch111
-rw-r--r--debian/patches/debian-config.patch198
-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.patch3020
-rw-r--r--debian/patches/helpful-wait-terminate.patch26
-rw-r--r--debian/patches/keepalive-extensions.patch135
-rw-r--r--debian/patches/lintian-symlink-pickiness.patch32
-rw-r--r--debian/patches/mention-ssh-keygen-on-keychange.patch42
-rw-r--r--debian/patches/no-openssl-version-status.patch62
-rw-r--r--debian/patches/openbsd-docs.patch148
-rw-r--r--debian/patches/package-versioning.patch65
-rw-r--r--debian/patches/quieter-signals.patch40
-rw-r--r--debian/patches/restore-tcp-wrappers.patch172
-rw-r--r--debian/patches/scp-quoting.patch41
-rw-r--r--debian/patches/selinux-role.patch504
-rw-r--r--debian/patches/series34
-rw-r--r--debian/patches/shell-path.patch39
-rw-r--r--debian/patches/sigstop.patch35
-rw-r--r--debian/patches/ssh-agent-setgid.patch40
-rw-r--r--debian/patches/ssh-argv0.patch31
-rw-r--r--debian/patches/ssh-vulnkey-compat.patch42
-rw-r--r--debian/patches/ssh1-keepalive.patch74
-rw-r--r--debian/patches/syslog-level-silent.patch47
-rw-r--r--debian/patches/user-group-modes.patch266
-rw-r--r--debian/po/POTFILES.in1
-rw-r--r--debian/po/cs.po55
-rw-r--r--debian/po/da.po55
-rw-r--r--debian/po/de.po61
-rw-r--r--debian/po/es.po80
-rw-r--r--debian/po/fr.po59
-rw-r--r--debian/po/it.po58
-rw-r--r--debian/po/ja.po55
-rw-r--r--debian/po/nl.po60
-rw-r--r--debian/po/pt.po58
-rw-r--r--debian/po/pt_BR.po57
-rw-r--r--debian/po/ru.po57
-rw-r--r--debian/po/sv.po58
-rw-r--r--debian/po/templates.pot46
-rw-r--r--debian/po/tr.po58
-rwxr-xr-xdebian/rules230
-rw-r--r--debian/source/format1
-rw-r--r--debian/source/include-binaries1
-rw-r--r--debian/ssh-agent.user-session.upstart23
-rw-r--r--debian/ssh-argv031
-rw-r--r--debian/ssh-argv0.164
-rw-r--r--debian/ssh-askpass-gnome.copyright44
-rw-r--r--debian/ssh-askpass-gnome.desktop12
-rw-r--r--debian/ssh-askpass-gnome.examples1
-rwxr-xr-xdebian/ssh-askpass-gnome.install3
-rw-r--r--debian/ssh-askpass-gnome.manpages1
-rw-r--r--debian/ssh-askpass-gnome.pngbin0 -> 6949 bytes
-rw-r--r--debian/ssh-askpass-gnome.postinst48
-rw-r--r--debian/ssh-askpass-gnome.prerm39
-rw-r--r--debian/ssh-krb5.NEWS18
-rw-r--r--debian/ssh-krb5.postinst61
-rw-r--r--debian/ssh.lintian-overrides1
-rw-r--r--debian/ssh.maintscript1
-rw-r--r--debian/systemd/ssh.service15
-rw-r--r--debian/systemd/ssh.socket12
-rw-r--r--debian/systemd/ssh@.service8
-rw-r--r--debian/systemd/sshd.conf1
-rw-r--r--debian/tests/control3
-rw-r--r--debian/tests/regress42
-rw-r--r--debian/upstream/signing-key.asc44
-rw-r--r--debian/watch3
122 files changed, 15323 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 000000000..6726eed9d
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
1# see git-dpm(1) from git-dpm package
2fb43a1fa9d049900efd76861b9496a9585ba4759
3fb43a1fa9d049900efd76861b9496a9585ba4759
4544df7a04ae5b5c1fc30be7c445ad685d7a02dc9
5544df7a04ae5b5c1fc30be7c445ad685d7a02dc9
6openssh_6.9p1.orig.tar.gz
786ab57f00d0fd9bf302760f2f6deac1b6e9df265
81487617
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000000000..40c7fc0a0
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,55 @@
1openssh (1:6.7p1-5) unstable; urgency=medium
2
3 openssh-server 1:6.7p1-4 changed the default setting of AcceptEnv to list
4 a number of specific LC_FOO variables rather than the wildcard LC_*. I
5 have since been persuaded that this was a bad idea and have reverted it,
6 but it is difficult to automatically undo the change to
7 /etc/ssh/sshd_config without compounding the problem (that of modifying
8 configuration that some users did not want to be modified) further. Most
9 users who upgraded via version 1:6.7p1-4 should restore the previous value
10 of "AcceptEnv LANG LC_*" in /etc/ssh/sshd_config.
11
12 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:09:32 +0000
13
14openssh (1:5.4p1-2) unstable; urgency=low
15
16 Smartcard support is now available using PKCS#11 tokens. If you were
17 previously using an unofficial build of Debian's OpenSSH package with
18 OpenSC-based smartcard support added, then note that commands like
19 'ssh-add -s 0' will no longer work; you need to use 'ssh-add -s
20 /usr/lib/opensc-pkcs11.so' instead.
21
22 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
23
24openssh (1:3.8.1p1-9) experimental; urgency=low
25
26 The ssh package has been split into openssh-client and openssh-server. If
27 you had previously requested that the sshd server should not be run, then
28 that request will still be honoured. However, the recommended approach is
29 now to remove the openssh-server package if you do not want to run sshd.
30 You can remove the old /etc/ssh/sshd_not_to_be_run marker file after doing
31 that.
32
33 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
34
35openssh (1:3.5p1-1) unstable; urgency=low
36
37 This version of OpenSSH disables the environment option for public keys by
38 default, in order to avoid certain attacks (for example, LD_PRELOAD). If
39 you are using this option in an authorized_keys file, beware that the keys
40 in question will no longer work until the option is removed.
41
42 To re-enable this option, set "PermitUserEnvironment yes" in
43 /etc/ssh/sshd_config after the upgrade is complete, taking note of the
44 warning in the sshd_config(5) manual page.
45
46 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
47
48openssh (1:3.0.1p1-1) unstable; urgency=high
49
50 As of version 3, OpenSSH no longer uses separate files for ssh1 and ssh2
51 keys. This means the authorized_keys2 and known_hosts2 files are no longer
52 needed. They will still be read in order to maintain backward
53 compatibility.
54
55 -- 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..dee9ddb21
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,234 @@
1OpenSSH for Debian
2------------------
3
4UPGRADE ISSUES
5==============
6
7Privilege Separation
8--------------------
9
10As of 3.3, openssh has employed privilege separation to reduce the
11quantity of code that runs as root, thereby reducing the impact of
12some security holes in sshd. This now also works properly with PAM.
13
14Privilege separation is turned on by default, so, if you decide you
15want it turned off, you need to add "UsePrivilegeSeparation no" to
16/etc/ssh/sshd_config.
17
18PermitRootLogin
19---------------
20
21As of 1:6.6p1-1, new installations will be set to "PermitRootLogin
22without-password". This disables password authentication for root, foiling
23password dictionary attacks on the root user. Some sites may wish to use
24the stronger "PermitRootLogin forced-commands-only" or "PermitRootLogin no",
25but note that "PermitRootLogin no" will break setups that SSH to root with a
26forced command to take full-system backups. You can use PermitRootLogin in
27a Match block if you want finer-grained control here.
28
29For many years Debian's OpenSSH packaging used "PermitRootLogin yes", in
30line with upstream. To avoid breaking local setups, this is still true for
31installations upgraded from before 1:6.6p1-1. If you wish to change this,
32you should edit /etc/ssh/sshd_config, change it manually, and run "service
33ssh restart" as root.
34
35Disabling PermitRootLogin means that an attacker possessing credentials for
36the root account (any credentials in the case of "yes", or private key
37material in the case of "without-password") must compromise a normal user
38account rather than being able to SSH directly to root. Be careful to avoid
39a false illusion of security if you change this setting; any account you
40escalate to root from should be considered equivalent to root for the
41purposes of security against external attack. You might for example disable
42it if you know you will only ever log in as root from the physical console.
43
44Since the root account does not generally have non-password credentials
45unless you explicitly install an SSH public key in its
46~/.ssh/authorized_keys, which you presumably only do if you want to SSH to
47it, "without-password" should be a reasonable default for most sites.
48
49For further discussion, see:
50
51 https://bugs.debian.org/298138
52 https://bugzilla.mindrot.org/show_bug.cgi?id=2164
53
54X11 Forwarding
55--------------
56
57ssh's default for ForwardX11 has been changed to ``no'' because it has
58been pointed out that logging into remote systems administered by
59untrusted people is likely to open you up to X11 attacks, so you
60should have to actively decide that you trust the remote machine's
61root, before enabling X11. I strongly recommend that you do this on a
62machine-by-machine basis, rather than just enabling it in the default
63host settings.
64
65In order for X11 forwarding to work, you need to install xauth on the
66server. In Debian this is in the xbase-clients package.
67
68As of OpenSSH 3.1, the remote $DISPLAY uses localhost by default to reduce
69the security risks of X11 forwarding. Look up X11UseLocalhost in
70sshd_config(8) if this is a problem.
71
72OpenSSH 3.8 invented ForwardX11Trusted, which when set to no causes the
73ssh client to create an untrusted X cookie so that attacks on the
74forwarded X11 connection can't become attacks on X clients on the remote
75machine. However, this has some problems in implementation - notably a
76very short timeout of the untrusted cookie - breaks large numbers of
77existing setups, and generally seems immature. The Debian package
78therefore sets the default for this option to "yes" (in ssh itself,
79rather than in ssh_config).
80
81Fallback to RSH
82---------------
83
84The default for this setting has been changed from Yes to No, for
85security reasons, and to stop the delay attempting to rsh to machines
86that don't offer the service. Simply switch it back on in either
87/etc/ssh/ssh_config or ~/.ssh/config for those machines that you need
88it for.
89
90Setgid ssh-agent and environment variables
91------------------------------------------
92
93As of version 1:3.5p1-1, ssh-agent is installed setgid to prevent ptrace()
94attacks retrieving private key material. This has the side-effect of causing
95glibc to remove certain environment variables which might have security
96implications for set-id programs, including LD_PRELOAD, LD_LIBRARY_PATH, and
97TMPDIR.
98
99If you need to set any of these environment variables, you will need to do
100so in the program exec()ed by ssh-agent. This may involve creating a small
101wrapper script.
102
103Symlink Hostname invocation
104---------------------------
105
106This version of ssh no longer includes support for invoking ssh with the
107hostname as the name of the file run. People wanting this support should
108use the ssh-argv0 script.
109
110=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
111
112OTHER ISSUES
113============
114
115/usr/bin/ssh not SUID
116---------------------
117
118Due to Debian bug #164325, RhostsRSAAuthentication can only be used if ssh
119is SUID. Until this is fixed, if that is a problem, use:
120
121 dpkg-statoverride
122
123or if that's also missing, use this:
124
125 chown root.root /usr/bin/ssh
126 chmod 04755 /usr/bin/ssh
127
128Authorization Forwarding
129------------------------
130
131Similarly, root on a remote server could make use of your ssh-agent
132(while you're logged into their machine) to obtain access to machines
133which trust your keys. This feature is therefore disabled by default.
134You should only re-enable it for those hosts (in your ~/.ssh/config or
135/etc/ssh/ssh_config) where you are confident that the remote machine
136is not a threat.
137
138Problems logging in with RSA authentication
139-------------------------------------------
140
141If you have trouble logging in with RSA authentication then the
142problem is probably caused by the fact that you have your home
143directory writable by group, as well as user (this is the default on
144Debian systems).
145
146Depending upon other settings on your system (i.e. other users being
147in your group) this could open a security hole, so you will need to
148make your home directory writable only by yourself. Run this command,
149as yourself:
150
151 chmod g-w ~/
152
153to remove group write permissions. If you use ssh-copy-id to install your
154keys, it does this for you.
155
156-L option of ssh nonfree
157------------------------
158
159non-free ssh supported the usage of the option -L to use a non privileged
160port for scp. This option will not be supported by scp from openssh.
161
162Please use instead scp -o "UsePrivilegedPort=no" as documented in the
163manpage to scp itself.
164
165Problem logging in because of TCP-Wrappers
166------------------------------------------
167
168ssh is compiled with support for tcp-wrappers. So if you can no longer
169log into your system, please check that /etc/hosts.allow and /etc/hosts.deny
170are configured so that ssh is not blocked.
171
172Kerberos support
173----------------
174
175ssh is now compiled with Kerberos support. Unfortunately, privilege
176separation is incompatible with Kerberos support for SSH protocol 1 and
177parts of the support for protocol 2; you may need to run kinit after logging
178in.
179
180Interoperability between scp and the ssh.com SSH server
181-------------------------------------------------------
182
183In version 2 and greater of the commercial SSH server produced by SSH
184Communications Security, scp was changed to use SFTP (SSH2's file transfer
185protocol) instead of the traditional rcp-over-ssh, thereby breaking
186compatibility. The OpenSSH developers regard this as a bug in the ssh.com
187server, and do not currently intend to change OpenSSH's scp to match.
188
189Workarounds for this problem are to install scp1 on the server (scp2 will
190fall back to it), to use sftp, or to use some other transfer mechanism such
191as rsync-over-ssh or tar-over-ssh.
192
193Running sshd from inittab
194-------------------------
195
196Some people find it useful to run the sshd server from inittab, to make sure
197that it always stays running. To do this, stop sshd ('/etc/init.d/ssh
198stop'), add the following line to /etc/inittab, and run 'telinit q':
199
200 ss:2345:respawn:/usr/sbin/sshd -D
201
202If you do this, note that you will need to stop sshd being started in the
203normal way ('update-rc.d ssh disable') and that you will need to restart
204this sshd manually on upgrades.
205
206Per-connection sshd instances with systemd
207------------------------------------------
208
209If you want to reconfigure systemd to listen on port 22 itself and launch an
210instance of sshd for each connection (inetd-style socket activation), then
211you can run:
212
213 systemctl stop ssh.service
214 systemctl start ssh.socket
215
216To make this permanent:
217
218 systemctl disable ssh.service
219 systemctl enable ssh.socket
220
221This may be appropriate in environments where minimal footprint is critical
222(e.g. cloud guests). Be aware that this bypasses MaxStartups, and systemd's
223MaxConnections cannot quite replace this as it cannot distinguish between
224authenticated and unauthenticated connections; see
225https://bugzilla.redhat.com/show_bug.cgi?id=963268 for more discussion.
226
227The provided ssh.socket unit file sets ListenStream=22. If you need to have
228it listen on a different address or port, then you will need to do this by
229copying /lib/systemd/system/ssh.socket to /etc/systemd/system/ssh.socket and
230modifying the ListenStream option. See systemd.socket(5) for details.
231
232--
233Matthew Vernon <matthew@debian.org>
234Colin 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..5eb1d4528
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,4053 @@
1openssh (1:6.9p1-2) UNRELEASED; urgency=medium
2
3 * mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen
4 invocation onto a separate line to make it easier to copy and paste
5 (LP: #1491532).
6
7 -- Colin Watson <cjwatson@debian.org> Tue, 08 Sep 2015 14:50:16 +0100
8
9openssh (1:6.9p1-1) unstable; urgency=medium
10
11 * New upstream release (http://www.openssh.com/txt/release-6.8):
12 - sshd(8): UseDNS now defaults to 'no'. Configurations that match
13 against the client host name (via sshd_config or authorized_keys) may
14 need to re-enable it or convert to matching against addresses.
15 - Add FingerprintHash option to ssh(1) and sshd(8), and equivalent
16 command-line flags to the other tools to control algorithm used for
17 key fingerprints. The default changes from MD5 to SHA256 and format
18 from hex to base64.
19 Fingerprints now have the hash algorithm prepended. An example of the
20 new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE
21 Please note that visual host keys will also be different.
22 - ssh(1), sshd(8): Experimental host key rotation support. Add a
23 protocol extension for a server to inform a client of all its
24 available host keys after authentication has completed. The client
25 may record the keys in known_hosts, allowing it to upgrade to better
26 host key algorithms and a server to gracefully rotate its keys.
27 The client side of this is controlled by a UpdateHostkeys config
28 option (default off).
29 - ssh(1): Add a ssh_config HostbasedKeyType option to control which host
30 public key types are tried during host-based authentication.
31 - ssh(1), sshd(8): Fix connection-killing host key mismatch errors when
32 sshd offers multiple ECDSA keys of different lengths.
33 - ssh(1): When host name canonicalisation is enabled, try to parse host
34 names as addresses before looking them up for canonicalisation. Fixes
35 bz#2074 and avoids needless DNS lookups in some cases.
36 - ssh(1), ssh-keysign(8): Make ed25519 keys work for host based
37 authentication.
38 - sshd(8): SSH protocol v.1 workaround for the Meyer, et al,
39 Bleichenbacher Side Channel Attack. Fake up a bignum key before RSA
40 decryption.
41 - sshd(8): Remember which public keys have been used for authentication
42 and refuse to accept previously-used keys. This allows
43 AuthenticationMethods=publickey,publickey to require that users
44 authenticate using two _different_ public keys.
45 - sshd(8): add sshd_config HostbasedAcceptedKeyTypes and
46 PubkeyAcceptedKeyTypes options to allow sshd to control what public
47 key types will be accepted (closes: #481133). Currently defaults to
48 all.
49 - sshd(8): Don't count partial authentication success as a failure
50 against MaxAuthTries.
51 - ssh(1): Add RevokedHostKeys option for the client to allow text-file
52 or KRL-based revocation of host keys.
53 - ssh-keygen(1), sshd(8): Permit KRLs that revoke certificates by serial
54 number or key ID without scoping to a particular CA.
55 - ssh(1): Add a "Match canonical" criteria that allows ssh_config Match
56 blocks to trigger only in the second config pass.
57 - ssh(1): Add a -G option to ssh that causes it to parse its
58 configuration and dump the result to stdout, similar to "sshd -T".
59 - ssh(1): Allow Match criteria to be negated. E.g. "Match !host".
60 - ssh-keyscan(1): ssh-keyscan has been made much more robust against
61 servers that hang or violate the SSH protocol (closes: #241119).
62 - ssh(1), ssh-keygen(1): Fix regression bz#2306: Key path names were
63 being lost as comment fields (closes: #787776).
64 - ssh(1): Allow ssh_config Port options set in the second config parse
65 phase to be applied (they were being ignored; closes: #774369).
66 - ssh(1): Tweak config re-parsing with host canonicalisation - make the
67 second pass through the config files always run when host name
68 canonicalisation is enabled (and not whenever the host name changes)
69 - ssh(1): Fix passing of wildcard forward bind addresses when connection
70 multiplexing is in use.
71 - ssh-keygen(1): Fix broken private key conversion from non-OpenSSH
72 formats.
73 - ssh-keygen(1): Fix KRL generation bug when multiple CAs are in use.
74 * New upstream release (http://www.openssh.com/txt/release-6.9):
75 - CVE-2015-5352: ssh(1): When forwarding X11 connections with
76 ForwardX11Trusted=no, connections made after ForwardX11Timeout expired
77 could be permitted and no longer subject to XSECURITY restrictions
78 because of an ineffective timeout check in ssh(1) coupled with "fail
79 open" behaviour in the X11 server when clients attempted connections
80 with expired credentials (closes: #790798). This problem was reported
81 by Jann Horn.
82 - SECURITY: ssh-agent(1): Fix weakness of agent locking (ssh-add -x) to
83 password guessing by implementing an increasing failure delay, storing
84 a salted hash of the password rather than the password itself and
85 using a timing-safe comparison function for verifying unlock attempts.
86 This problem was reported by Ryan Castellucci.
87 - sshd(8): Support admin-specified arguments to AuthorizedKeysCommand
88 (closes: #740494).
89 - sshd(8): Add AuthorizedPrincipalsCommand that allows retrieving
90 authorized principals information from a subprocess rather than a
91 file.
92 - ssh(1), ssh-add(1): Support PKCS#11 devices with external PIN entry
93 devices.
94 - ssh-keygen(1): Support "ssh-keygen -lF hostname" to search known_hosts
95 and print key hashes rather than full keys.
96 - ssh-agent(1): Add -D flag to leave ssh-agent in foreground without
97 enabling debug mode.
98 - ssh(1), sshd(8): Deprecate legacy SSH2_MSG_KEX_DH_GEX_REQUEST_OLD
99 message and do not try to use it against some 3rd-party SSH
100 implementations that use it (older PuTTY, WinSCP).
101 - ssh(1), sshd(8): Cap DH-GEX group size at 4Kbits for Cisco
102 implementations as some would fail when attempting to use group sizes
103 >4K (closes: #740307, LP: #1287222).
104 - ssh(1): Fix out-of-bound read in EscapeChar configuration option
105 parsing.
106 - sshd(8): Fix application of PermitTunnel, LoginGraceTime,
107 AuthenticationMethods and StreamLocalBindMask options in Match blocks.
108 - ssh(1), sshd(8): Improve disconnection message on TCP reset.
109 - ssh(1): Remove failed remote forwards established by multiplexing from
110 the list of active forwards.
111 - sshd(8): Make parsing of authorized_keys "environment=" options
112 independent of PermitUserEnv being enabled.
113 - sshd(8): Fix post-auth crash with permitopen=none (closes: #778807).
114 - ssh(1), ssh-add(1), ssh-keygen(1): Allow new-format private keys to be
115 encrypted with AEAD ciphers.
116 - ssh(1): Allow ListenAddress, Port and AddressFamily configuration
117 options to appear in any order.
118 - sshd(8): Check for and reject missing arguments for VersionAddendum
119 and ForceCommand.
120 - ssh(1), sshd(8): Don't treat unknown certificate extensions as fatal.
121 - ssh-keygen(1): Make stdout and stderr output consistent.
122 - ssh(1): Mention missing DISPLAY environment in debug log when X11
123 forwarding requested.
124 - sshd(8): Correctly record login when UseLogin is set.
125 - sshd(8): Add some missing options to sshd -T output and fix output of
126 VersionAddendum and HostCertificate.
127 - Document and improve consistency of options that accept a "none"
128 argument: TrustedUserCAKeys, RevokedKeys, AuthorizedPrincipalsFile.
129 - ssh(1): Include remote username in debug output.
130 - sshd(8): Avoid compatibility problem with some versions of Tera Term,
131 which would crash when they received the hostkeys notification message
132 (hostkeys-00@openssh.com).
133 - sshd(8): Mention ssh-keygen -E as useful when comparing legacy MD5
134 host key fingerprints.
135 - ssh(1): Clarify pseudo-terminal request behaviour and make manual
136 language consistent.
137 - ssh(1): Document that the TERM environment variable is not subject to
138 SendEnv and AcceptEnv; bz#2386
139 - sshd(8): Format UsePAM setting when using sshd -T (closes: #767648).
140 - moduli(5): Update DH-GEX moduli (closes: #787037).
141 * There are some things I want to fix before upgrading to 7.0p1, though I
142 intend to do that soon. In the meantime, backport some patches, mainly
143 to fix security issues:
144 - SECURITY: sshd(8): OpenSSH 6.8 and 6.9 incorrectly set TTYs to be
145 world-writable. Local attackers may be able to write arbitrary
146 messages to logged-in users, including terminal escape sequences.
147 Reported by Nikolay Edigaryev.
148 - SECURITY: sshd(8): Fixed a privilege separation weakness related to
149 PAM support. Attackers who could successfully compromise the
150 pre-authentication process for remote code execution and who had valid
151 credentials on the host could impersonate other users. Reported by
152 Moritz Jodeit.
153 - SECURITY: sshd(8): Fixed a use-after-free bug related to PAM support
154 that was reachable by attackers who could compromise the
155 pre-authentication process for remote code execution (closes:
156 #795711). Also reported by Moritz Jodeit.
157 - CVE-2015-5600: sshd(8): Fix circumvention of MaxAuthTries using
158 keyboard-interactive authentication (closes: #793616). By specifying
159 a long, repeating keyboard-interactive "devices" string, an attacker
160 could request the same authentication method be tried thousands of
161 times in a single pass. The LoginGraceTime timeout in sshd(8) and any
162 authentication failure delays implemented by the authentication
163 mechanism itself were still applied. Found by Kingcope.
164 - Let principals-command.sh work for noexec /var/run.
165 * Thanks to Jakub Jelen of Red Hat for Fedora's rebased version of the
166 GSSAPI key exchange patch.
167 * Document the Debian-specific change to the default value of
168 ForwardX11Trusted in ssh(1) (closes: #781469).
169
170 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
171
172openssh (1:6.7p1-6) unstable; urgency=medium
173
174 [ Martin Pitt ]
175 * openssh-server.postinst: Quiesce "Unable to connect to Upstart" error
176 message from initctl if upstart is installed, but not the current init
177 system. (LP: #1440070)
178 * openssh-server.postinst: Fix version comparisons of upgrade adjustments
179 to not apply to fresh installs.
180
181 -- Colin Watson <cjwatson@debian.org> Sun, 19 Apr 2015 14:32:43 +0100
182
183openssh (1:6.7p1-5) unstable; urgency=medium
184
185 * Revert change from previous upload, which causes far more trouble than
186 it is worth (closes: #780797):
187 - Send/accept only specific known LC_* variables, rather than using a
188 wildcard.
189 * Add a NEWS.Debian entry documenting this reversion, as it is too
190 difficult to undo the sshd_config change automatically without
191 compounding the problem of (arguably) overwriting user configuration.
192
193 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:20:56 +0000
194
195openssh (1:6.7p1-4) unstable; urgency=medium
196
197 * Send/accept only specific known LC_* variables, rather than using a
198 wildcard (closes: #765633).
199 * Document interactions between ListenAddress/Port and ssh.socket in
200 README.Debian (closes: #764842).
201 * Debconf translations:
202 - Brazilian Portuguese (thanks, José de Figueiredo; closes: #771859).
203
204 -- Colin Watson <cjwatson@debian.org> Wed, 18 Mar 2015 15:34:13 +0000
205
206openssh (1:6.7p1-3) unstable; urgency=medium
207
208 * Debconf translations:
209 - Dutch (thanks, Frans Spiesschaert; closes: #765851).
210 * Assume that dpkg-statoverride exists and drop the test for an obsolete
211 compatibility path.
212
213 -- Colin Watson <cjwatson@debian.org> Mon, 03 Nov 2014 20:29:52 +0000
214
215openssh (1:6.7p1-2) unstable; urgency=medium
216
217 * debian/tests/control: Drop isolation-container, since the tests run on a
218 high port. They're still not guaranteed to run correctly in an schroot,
219 but may manage to work, so this lets the tests at least try to run on
220 ci.debian.net.
221
222 -- Colin Watson <cjwatson@debian.org> Fri, 10 Oct 2014 10:47:19 +0100
223
224openssh (1:6.7p1-1) unstable; urgency=medium
225
226 * New upstream release (http://www.openssh.com/txt/release-6.7):
227 - sshd(8): The default set of ciphers and MACs has been altered to
228 remove unsafe algorithms. In particular, CBC ciphers and arcfour* are
229 disabled by default. The full set of algorithms remains available if
230 configured explicitly via the Ciphers and MACs sshd_config options.
231 - ssh(1), sshd(8): Add support for Unix domain socket forwarding. A
232 remote TCP port may be forwarded to a local Unix domain socket and
233 vice versa or both ends may be a Unix domain socket (closes: #236718).
234 - ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519
235 key types.
236 - sftp(1): Allow resumption of interrupted uploads.
237 - ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is
238 the same as the one sent during initial key exchange.
239 - sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses
240 when GatewayPorts=no; allows client to choose address family.
241 - sshd(8): Add a sshd_config PermitUserRC option to control whether
242 ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys
243 option.
244 - ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that
245 expands to a unique identifier based on a hash of the tuple of (local
246 host, remote user, hostname, port). Helps avoid exceeding miserly
247 pathname limits for Unix domain sockets in multiplexing control paths.
248 - sshd(8): Make the "Too many authentication failures" message include
249 the user, source address, port and protocol in a format similar to the
250 authentication success / failure messages.
251 - Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is
252 available. It considers time spent suspended, thereby ensuring
253 timeouts (e.g. for expiring agent keys) fire correctly (closes:
254 #734553).
255 - Use prctl() to prevent sftp-server from accessing
256 /proc/self/{mem,maps}.
257 * Restore TCP wrappers support, removed upstream in 6.7. It is true that
258 dropping this reduces preauth attack surface in sshd. On the other
259 hand, this support seems to be quite widely used, and abruptly dropping
260 it (from the perspective of users who don't read openssh-unix-dev) could
261 easily cause more serious problems in practice. It's not entirely clear
262 what the right long-term answer for Debian is, but it at least probably
263 doesn't involve dropping this feature shortly before a freeze.
264 * Replace patch to disable OpenSSL version check with an updated version
265 of Kurt Roeckx's patch from #732940 to just avoid checking the status
266 field.
267 * Build-depend on a new enough dpkg-dev for dpkg-buildflags, rather than
268 simply a new enough dpkg.
269 * Simplify debian/rules using /usr/share/dpkg/buildflags.mk.
270 * Use Package-Type rather than XC-Package-Type, now that it is an official
271 field.
272 * Run a subset of the upstream regression test suite at package build
273 time, and the rest of it under autopkgtest.
274
275 -- Colin Watson <cjwatson@debian.org> Thu, 09 Oct 2014 14:05:56 +0100
276
277openssh (1:6.6p1-8) unstable; urgency=medium
278
279 * Make the if-up hook use "reload" rather than "restart" if the system was
280 booted using systemd (closes: #756547).
281 * Show fingerprints of new keys after creating them in the postinst
282 (closes: #762128).
283 * Policy version 3.9.6: no changes required.
284 * Don't link /usr/share/doc/ssh to openssh-client, as this is not safe
285 between Architecture: all and Architecture: any binary packages (closes:
286 #763375).
287
288 -- Colin Watson <cjwatson@debian.org> Fri, 03 Oct 2014 12:23:57 +0100
289
290openssh (1:6.6p1-7) unstable; urgency=medium
291
292 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
293 directly.
294 * Use dh-exec to simplify override_dh_install target.
295 * Remove several unnecessary entries in debian/*.dirs.
296 * Pass noupdate to the second call to pam_motd, not the first (thanks, Ken
297 T Takusagawa; closes: #757059).
298 * Debconf translations:
299 - Turkish (thanks, Mert Dirik; closes: #756757).
300
301 -- Colin Watson <cjwatson@debian.org> Tue, 05 Aug 2014 09:10:04 +0100
302
303openssh (1:6.6p1-6) unstable; urgency=medium
304
305 * Upgrade to debhelper v9.
306 * Only use pam_keyinit on Linux architectures (closes: #747245).
307 * Make get_config_option more robust against trailing whitespace (thanks,
308 LaMont Jones).
309 * Debconf translations:
310 - Czech (thanks, Michal Šimůnek; closes: #751419).
311
312 -- Colin Watson <cjwatson@debian.org> Sat, 28 Jun 2014 14:50:04 +0100
313
314openssh (1:6.6p1-5) unstable; urgency=medium
315
316 * Force ssh-agent Upstart job to use sh syntax regardless of the user's
317 shell (thanks, Steffen Stempel; LP: #1312928).
318
319 -- Colin Watson <cjwatson@debian.org> Thu, 01 May 2014 16:27:53 +0100
320
321openssh (1:6.6p1-4) unstable; urgency=medium
322
323 * Debconf translations:
324 - Spanish (thanks, Matías Bellone; closes: #744867).
325 * Apply upstream-recommended patch to fix bignum encoding for
326 curve25519-sha256@libssh.org, fixing occasional key exchange failures.
327
328 -- Colin Watson <cjwatson@debian.org> Mon, 21 Apr 2014 21:29:53 +0100
329
330openssh (1:6.6p1-3) unstable; urgency=medium
331
332 * Debconf translations:
333 - French (thanks, Étienne Gilli; closes: #743242).
334 * Never signal the service supervisor with SIGSTOP more than once, to
335 prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).
336
337 -- Colin Watson <cjwatson@debian.org> Mon, 14 Apr 2014 12:11:50 +0100
338
339openssh (1:6.6p1-2) unstable; urgency=medium
340
341 * If no root password is set, then switch to "PermitRootLogin
342 without-password" without asking (LP: #1300127).
343
344 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2014 12:20:46 +0100
345
346openssh (1:6.6p1-1) unstable; urgency=medium
347
348 [ Colin Watson ]
349 * Apply various warning-suppression and regression-test fixes to
350 gssapi.patch from Damien Miller.
351 * New upstream release (http://www.openssh.com/txt/release-6.6,
352 LP: #1298280):
353 - CVE-2014-2532: sshd(8): when using environment passing with an
354 sshd_config(5) AcceptEnv pattern with a wildcard, OpenSSH prior to 6.6
355 could be tricked into accepting any environment variable that contains
356 the characters before the wildcard character.
357 * Re-enable btmp logging, as its permissions were fixed a long time ago in
358 response to #370050 (closes: #341883).
359 * Change to "PermitRootLogin without-password" for new installations, and
360 ask a debconf question when upgrading systems with "PermitRootLogin yes"
361 from previous versions (closes: #298138).
362 * Debconf translations:
363 - Danish (thanks, Joe Hansen).
364 - Portuguese (thanks, Américo Monteiro).
365 - Russian (thanks, Yuri Kozlov; closes: #742308).
366 - Swedish (thanks, Andreas Rönnquist).
367 - Japanese (thanks, victory).
368 - German (thanks, Stephan Beck; closes: #742541).
369 - Italian (thanks, Beatrice Torracca).
370 * Don't start ssh-agent from the Upstart user session job if something
371 like Xsession has already done so (based on work by Bruno Vasselle;
372 LP: #1244736).
373
374 [ Matthew Vernon ]
375 * CVE-2014-2653: Fix failure to check SSHFP records if server presents a
376 certificate (bug reported by me, patch by upstream's Damien Miller;
377 thanks also to Mark Wooding for his help in fixing this) (Closes:
378 #742513)
379
380 -- Colin Watson <cjwatson@debian.org> Fri, 28 Mar 2014 18:04:41 +0000
381
382openssh (1:6.5p1-6) unstable; urgency=medium
383
384 * Fix Breaks/Replaces versions of openssh-sftp-server on openssh-server
385 (thanks, Axel Beckert).
386
387 -- Colin Watson <cjwatson@debian.org> Thu, 06 Mar 2014 16:18:44 +0000
388
389openssh (1:6.5p1-5) unstable; urgency=medium
390
391 [ Colin Watson ]
392 * Add Alias=sshd.service to systemd ssh.service file, to match "Provides:
393 sshd" in the sysvinit script (thanks, Michael Biebl).
394 * Add Before=ssh.service to systemd ssh.socket file, since otherwise
395 nothing guarantees that ssh.service has stopped before ssh.socket starts
396 (thanks, Uoti Urpala).
397
398 [ Axel Beckert ]
399 * Split sftp-server into its own package to allow it to also be used by
400 other SSH server implementations like dropbear (closes: #504290).
401
402 -- Colin Watson <cjwatson@debian.org> Wed, 05 Mar 2014 13:53:08 +0000
403
404openssh (1:6.5p1-4) unstable; urgency=medium
405
406 * Configure --without-hardening on hppa, to work around
407 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798).
408 * Amend "Running sshd from inittab" instructions in README.Debian to
409 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
410 symlinks that won't work with dependency-based sysv-rc.
411 * Remove code related to non-dependency-based sysv-rc ordering, since that
412 is no longer supported.
413 * Apply patch from https://bugzilla.mindrot.org/show_bug.cgi?id=2200 to
414 fix getsockname errors when using "ssh -W" (closes: #738693).
415
416 -- Colin Watson <cjwatson@debian.org> Sat, 15 Feb 2014 02:19:36 +0000
417
418openssh (1:6.5p1-3) unstable; urgency=medium
419
420 * Clarify socket activation mode in README.Debian, as suggested by Uoti
421 Urpala.
422 * Stop claiming that "Protocol 2" is a Debian-specific default; this has
423 been upstream's default since 5.4p1.
424 * Avoid stdout noise from which(1) on purge of openssh-client.
425 * Fix sysvinit->systemd transition code to cope with still-running
426 sysvinit jobs being considered active by systemd (thanks, Uoti Urpala
427 and Michael Biebl).
428 * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may
429 have got it wrong before, and it's fairly harmless to repeat it.
430 * Remove tests for whether /dev/null is a character device from the
431 Upstart job and the systemd service files; it's there to avoid a
432 confusing failure mode in daemon(), but with modern init systems we use
433 the -D option to suppress daemonisation anyway.
434 * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the
435 Debian patch) rather than plain GPL.
436 * Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9),
437 rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2),
438 and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch
439 versions, for which we no longer have maintainer script code, and per
440 policy they would have to become Breaks nowadays anyway.
441 * Policy version 3.9.5.
442 * Drop unnecessary -1 in zlib1g Build-Depends version.
443 * Tweak dh_systemd_enable invocations to avoid lots of error noise.
444
445 -- Colin Watson <cjwatson@debian.org> Wed, 12 Feb 2014 13:10:08 +0000
446
447openssh (1:6.5p1-2) unstable; urgency=medium
448
449 * Only enable ssh.service for systemd, not both ssh.service and
450 ssh.socket. Thanks to Michael Biebl for spotting this.
451 * Backport upstream patch to unbreak case-sensitive matching of ssh_config
452 (closes: #738619).
453
454 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 11:28:35 +0000
455
456openssh (1:6.5p1-1) unstable; urgency=medium
457
458 * New upstream release (http://www.openssh.com/txt/release-6.5,
459 LP: #1275068):
460 - ssh(1): Add support for client-side hostname canonicalisation using a
461 set of DNS suffixes and rules in ssh_config(5). This allows
462 unqualified names to be canonicalised to fully-qualified domain names
463 to eliminate ambiguity when looking up keys in known_hosts or checking
464 host certificate names (closes: #115286).
465 * Switch to git; adjust Vcs-* fields.
466 * Convert to git-dpm, and drop source package documentation associated
467 with the old bzr/quilt patch handling workflow.
468 * Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration code,
469 leaving only basic configuration file compatibility, since it has been
470 nearly six years since the original vulnerability and this code is not
471 likely to be of much value any more (closes: #481853, #570651). See
472 https://lists.debian.org/debian-devel/2013/09/msg00240.html for my full
473 reasoning.
474 * Add OpenPGP signature checking configuration to watch file (thanks,
475 Daniel Kahn Gillmor; closes: #732441).
476 * Add the pam_keyinit session module, to create a new session keyring on
477 login (closes: #734816).
478 * Incorporate default path changes from shadow 1:4.0.18.1-8, removing
479 /usr/bin/X11 (closes: #644521).
480 * Generate ED25519 host keys on fresh installations. Upgraders who wish
481 to add such host keys should manually add 'HostKey
482 /etc/ssh/ssh_host_ed25519_key' to /etc/ssh/sshd_config and run
483 'ssh-keygen -q -f /etc/ssh/ssh_host_ed25519_key -N "" -t ed25519'.
484 * Drop long-obsolete "SSH now uses protocol 2 by default" section from
485 README.Debian.
486 * Add systemd support (thanks, Sven Joachim; closes: #676830).
487
488 -- Colin Watson <cjwatson@debian.org> Mon, 10 Feb 2014 14:58:26 +0000
489
490openssh (1:6.4p1-2) unstable; urgency=high
491
492 * Increase ServerKeyBits value in package-generated sshd_config to 1024
493 (closes: #727622, LP: #1244272).
494 * Restore patch to disable OpenSSL version check (closes: #732940).
495
496 -- Colin Watson <cjwatson@debian.org> Mon, 23 Dec 2013 10:44:04 +0000
497
498openssh (1:6.4p1-1) unstable; urgency=high
499
500 * New upstream release. Important changes:
501 - 6.3/6.3p1 (http://www.openssh.com/txt/release-6.3):
502 + sftp(1): add support for resuming partial downloads using the
503 "reget" command and on the sftp commandline or on the "get"
504 commandline using the "-a" (append) option (closes: #158590).
505 + ssh(1): add an "IgnoreUnknown" configuration option to selectively
506 suppress errors arising from unknown configuration directives
507 (closes: #436052).
508 + sftp(1): update progressmeter when data is acknowledged, not when
509 it's sent (partially addresses #708372).
510 + ssh(1): do not fatally exit when attempting to cleanup multiplexing-
511 created channels that are incompletely opened (closes: #651357).
512 - 6.4/6.4p1 (http://www.openssh.com/txt/release-6.4):
513 + CVE-2013-4548: sshd(8): fix a memory corruption problem triggered
514 during rekeying when an AES-GCM cipher is selected (closes:
515 #729029). Full details of the vulnerability are available at:
516 http://www.openssh.com/txt/gcmrekey.adv
517 * When running under Upstart, only consider the daemon started once it is
518 ready to accept connections (by raising SIGSTOP at that point and using
519 "expect stop").
520
521 -- Colin Watson <cjwatson@debian.org> Sat, 09 Nov 2013 18:24:16 +0000
522
523openssh (1:6.2p2-6) unstable; urgency=low
524
525 * Update config.guess and config.sub automatically at build time.
526 dh_autoreconf does not take care of that by default because openssh does
527 not use automake.
528
529 -- Colin Watson <cjwatson@debian.org> Tue, 02 Jul 2013 22:54:49 +0100
530
531openssh (1:6.2p2-5) unstable; urgency=low
532
533 [ Colin Watson ]
534 * Document consequences of ssh-agent being setgid in ssh-agent(1); see
535 #711623.
536 * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
537 ssh-argv0.
538
539 [ Yolanda Robla ]
540 * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
541 hardcoding Debian (LP: #1195342).
542
543 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jun 2013 15:24:14 +0100
544
545openssh (1:6.2p2-4) unstable; urgency=low
546
547 * Fix non-portable shell in ssh-copy-id (closes: #711162).
548 * Rebuild against debhelper 9.20130604 with fixed dependencies for
549 invoke-rc.d and Upstart jobs (closes: #711159, #711364).
550 * Set SELinux context on private host keys as well as public host keys
551 (closes: #687436).
552
553 -- Colin Watson <cjwatson@debian.org> Thu, 06 Jun 2013 17:06:31 +0100
554
555openssh (1:6.2p2-3) unstable; urgency=low
556
557 * If the running init daemon is Upstart, then, on the first upgrade to
558 this version, check whether sysvinit is still managing sshd; if so,
559 manually stop it so that it can be restarted under upstart. We do this
560 near the end of the postinst, so it shouldn't result in any appreciable
561 extra window where sshd is not running during upgrade.
562
563 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 17:42:10 +0100
564
565openssh (1:6.2p2-2) unstable; urgency=low
566
567 * Change start condition of Upstart job to be just the standard "runlevel
568 [2345]", rather than "filesystem or runlevel [2345]"; the latter makes
569 it unreasonably difficult to ensure that urandom starts before ssh, and
570 is not really necessary since one of static-network-up and failsafe-boot
571 is guaranteed to happen and will trigger entry to the default runlevel,
572 and we don't care about ssh starting before the network (LP: #1098299).
573 * Drop conffile handling for direct upgrades from pre-split ssh package;
574 this was originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a
575 truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is
576 now four Debian releases ago, we can afford to drop this and simplify
577 the packaging.
578 * Remove ssh/use_old_init_script, which was a workaround for a very old
579 bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then
580 they aren't going to be convinced now (closes: #214182).
581 * Remove support for upgrading directly from ssh-nonfree.
582 * Remove lots of maintainer script support for direct upgrades from
583 pre-etch (three releases before current stable).
584 * Add #DEBHELPER# tokens to openssh-client.postinst and
585 openssh-server.postinst.
586 * Replace old manual conffile handling code with dpkg-maintscript-helper,
587 via dh_installdeb.
588 * Switch to new unified layout for Upstart jobs as documented in
589 https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script
590 checks for a running Upstart, and we now let dh_installinit handle most
591 of the heavy lifting in maintainer scripts. Ubuntu users should be
592 essentially unaffected except that sshd may no longer start
593 automatically in chroots if the running Upstart predates 0.9.0; but the
594 main goal is simply not to break when openssh-server is installed in a
595 chroot.
596 * Remove the check for vulnerable host keys; this was first added five
597 years ago, and everyone should have upgraded through a version that
598 applied these checks by now. The ssh-vulnkey tool and the blacklisting
599 support in sshd are still here, at least for the moment.
600 * This removes the last of our uses of debconf (closes: #221531).
601 * Use the pam_loginuid session module (thanks, Laurent Bigonville; closes:
602 #677440, LP: #1067779).
603 * Bracket our session stack with calls to pam_selinux close/open (thanks,
604 Laurent Bigonville; closes: #679458).
605 * Fix dh_builddeb invocation so that we really use xz compression for
606 binary packages, as intended since 1:6.1p1-2.
607
608 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 09:07:42 +0100
609
610openssh (1:6.2p2-1) unstable; urgency=low
611
612 * New upstream release (http://www.openssh.com/txt/release-6.2p2):
613 - Only warn for missing identity files that were explicitly specified
614 (closes: #708275).
615 - Fix bug in contributed contrib/ssh-copy-id script that could result in
616 "rm *" being called on mktemp failure (closes: #708419).
617
618 -- Colin Watson <cjwatson@debian.org> Thu, 16 May 2013 14:05:06 +0100
619
620openssh (1:6.2p1-3) unstable; urgency=low
621
622 * Renumber Debian-specific additions to enum monitor_reqtype so that they
623 fit within a single byte (thanks, Jason Conti; LP: #1179202).
624
625 -- Colin Watson <cjwatson@debian.org> Mon, 13 May 2013 10:56:04 +0100
626
627openssh (1:6.2p1-2) unstable; urgency=low
628
629 * Fix build failure on Ubuntu:
630 - Include openbsd-compat/sys-queue.h from consolekit.c.
631 - Fix consolekit mismerges in monitor.c and monitor_wrap.c.
632
633 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 09:45:57 +0100
634
635openssh (1:6.2p1-1) unstable; urgency=low
636
637 * New upstream release (http://www.openssh.com/txt/release-6.2).
638 - Add support for multiple required authentication in SSH protocol 2 via
639 an AuthenticationMethods option (closes: #195716).
640 - Fix Sophie Germain formula in moduli(5) (closes: #698612).
641 - Update ssh-copy-id to Phil Hands' greatly revised version (closes:
642 #99785, #322228, #620428; LP: #518883, #835901, #1074798).
643 * Use dh-autoreconf.
644
645 -- Colin Watson <cjwatson@debian.org> Tue, 07 May 2013 11:48:16 +0100
646
647openssh (1:6.1p1-4) experimental; urgency=low
648
649 [ Gunnar Hjalmarsson ]
650 * debian/openssh-server.sshd.pam: Explicitly state that ~/.pam_environment
651 should be read, and move the pam_env calls from "auth" to "session" so
652 that it's also read when $HOME is encrypted (LP: #952185).
653
654 [ Stéphane Graber ]
655 * Add ssh-agent upstart user job. This implements something similar to
656 the 90x11-common_ssh-agent Xsession script. That is, start ssh-agent
657 and set the appropriate environment variables (closes: #703906).
658
659 -- Colin Watson <cjwatson@debian.org> Mon, 25 Mar 2013 16:58:04 +0000
660
661openssh (1:6.1p1-3) experimental; urgency=low
662
663 * Give ssh and ssh-krb5 versioned dependencies on openssh-client and
664 openssh-server, to try to reduce confusion when people run 'apt-get
665 install ssh' or similar and expect that to upgrade everything relevant.
666 * CVE-2010-5107: Improve DoS resistance by changing default of MaxStartups
667 to 10:30:100 (closes: #700102).
668
669 -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2013 21:07:31 +0000
670
671openssh (1:6.1p1-2) experimental; urgency=low
672
673 * Use xz compression for binary packages.
674 * Merge from Ubuntu:
675 - Add support for registering ConsoleKit sessions on login. (This is
676 currently enabled only when building for Ubuntu.)
677 - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's
678 been long enough since the relevant vulnerability that we shouldn't
679 need these installed by default nowadays.
680 - Add an Upstart job (not currently used by default in Debian).
681 - Add mention of ssh-keygen in ssh connect warning (Scott Moser).
682 - Install apport hooks.
683 * Only build with -j if DEB_BUILD_OPTIONS=parallel=* is used (closes:
684 #694282).
685
686 -- Colin Watson <cjwatson@debian.org> Mon, 26 Nov 2012 16:39:07 +0000
687
688openssh (1:6.1p1-1) experimental; urgency=low
689
690 * New upstream release (http://www.openssh.com/txt/release-6.1).
691 - Enable pre-auth sandboxing by default for new installs.
692 - Allow "PermitOpen none" to refuse all port-forwarding requests
693 (closes: #543683).
694
695 -- Colin Watson <cjwatson@debian.org> Fri, 07 Sep 2012 00:22:44 +0100
696
697openssh (1:6.0p1-3) unstable; urgency=low
698
699 * debconf template translations:
700 - Add Indonesian (thanks, Andika Triwidada; closes: #681670).
701 * Call restorecon on copied ~/.ssh/authorized_keys if possible, since some
702 SELinux policies require this (closes: #658675).
703 * Add ncurses-term to openssh-server's Recommends, since it's often needed
704 to support unusual terminal emulators on clients (closes: #675362).
705
706 -- Colin Watson <cjwatson@debian.org> Fri, 24 Aug 2012 06:55:36 +0100
707
708openssh (1:6.0p1-2) unstable; urgency=low
709
710 * Tighten libssl1.0.0 and libcrypto1.0.0-udeb dependencies to the current
711 "fix" version at build time (closes: #678661).
712
713 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jun 2012 12:16:06 +0100
714
715openssh (1:6.0p1-1) unstable; urgency=low
716
717 [ Roger Leigh ]
718 * Display dynamic part of MOTD from /run/motd.dynamic, if it exists
719 (closes: #669699).
720
721 [ Colin Watson ]
722 * Update OpenSSH FAQ to revision 1.113, fixing missing line break (closes:
723 #669667).
724 * New upstream release (closes: #671010,
725 http://www.openssh.org/txt/release-6.0).
726 - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
727 (closes: #643312, #650512, #671075).
728 - Add a new privilege separation sandbox implementation for Linux's new
729 seccomp sandbox, automatically enabled on platforms that support it.
730 (Note: privilege separation sandboxing is still experimental.)
731 * Fix a bashism in configure's seccomp_filter check.
732 * Add a sandbox fallback mechanism, so that behaviour on Linux depends on
733 whether the running system's kernel has seccomp_filter support, not the
734 build system's kernel (forwarded upstream as
735 https://bugzilla.mindrot.org/show_bug.cgi?id=2011).
736
737 -- Colin Watson <cjwatson@debian.org> Sat, 26 May 2012 13:48:14 +0100
738
739openssh (1:5.9p1-5) unstable; urgency=low
740
741 * Use dpkg-buildflags, including for hardening support; drop use of
742 hardening-includes.
743 * Fix cross-building:
744 - Allow using a cross-architecture pkg-config.
745 - Pass default LDFLAGS to contrib/Makefile.
746 - Allow dh_strip to strip gnome-ssh-askpass, rather than calling
747 'install -s'.
748
749 -- Colin Watson <cjwatson@debian.org> Mon, 02 Apr 2012 11:20:33 +0100
750
751openssh (1:5.9p1-4) unstable; urgency=low
752
753 * Disable OpenSSL version check again, as its SONAME is sufficient
754 nowadays (closes: #664383).
755
756 -- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 11:06:30 +0000
757
758openssh (1:5.9p1-3) unstable; urgency=low
759
760 * debconf template translations:
761 - Update Polish (thanks, Michał Kułach; closes: #659829).
762 * Ignore errors writing to console in init script (closes: #546743).
763 * Move ssh-krb5 to Section: oldlibs.
764
765 -- Colin Watson <cjwatson@debian.org> Fri, 24 Feb 2012 08:56:18 +0000
766
767openssh (1:5.9p1-2) unstable; urgency=low
768
769 * Mark openssh-client and openssh-server as Multi-Arch: foreign.
770
771 -- Colin Watson <cjwatson@debian.org> Wed, 09 Nov 2011 02:06:48 +0000
772
773openssh (1:5.9p1-1) unstable; urgency=low
774
775 * New upstream release (http://www.openssh.org/txt/release-5.9).
776 - Introduce sandboxing of the pre-auth privsep child using an optional
777 sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
778 mandatory restrictions on the syscalls the privsep child can perform.
779 - Add new SHA256-based HMAC transport integrity modes from
780 http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
781 - The pre-authentication sshd(8) privilege separation slave process now
782 logs via a socket shared with the master process, avoiding the need to
783 maintain /dev/log inside the chroot (closes: #75043, #429243,
784 #599240).
785 - ssh(1) now warns when a server refuses X11 forwarding (closes:
786 #504757).
787 - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
788 separated by whitespace (closes: #76312). The authorized_keys2
789 fallback is deprecated but documented (closes: #560156).
790 - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
791 ToS/DSCP (closes: #498297).
792 - ssh-add(1) now accepts keys piped from standard input. E.g. "ssh-add
793 - < /path/to/key" (closes: #229124).
794 - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
795 - Say "required" rather than "recommended" in unprotected-private-key
796 warning (LP: #663455).
797 * Update OpenSSH FAQ to revision 1.112.
798
799 -- Colin Watson <cjwatson@debian.org> Wed, 07 Sep 2011 23:46:00 +0100
800
801openssh (1:5.8p1-7) unstable; urgency=low
802
803 * Only recommend ssh-import-id when built on Ubuntu (closes: #635887).
804 * Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather
805 than 'lsb_release -is' so that Ubuntu derivatives behave the same way as
806 Ubuntu itself.
807
808 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 14:27:52 +0100
809
810openssh (1:5.8p1-6) unstable; urgency=low
811
812 * openssh-client and openssh-server Suggests: monkeysphere.
813 * Quieten logs when multiple from= restrictions are used in different
814 authorized_keys lines for the same key; it's still not ideal, but at
815 least you'll only get one log entry per key (closes: #630606).
816 * Merge from Ubuntu (Dustin Kirkland):
817 - openssh-server Recommends: ssh-import-id (no-op in Debian since that
818 package doesn't exist there, but this reduces the Ubuntu delta).
819
820 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2011 17:10:18 +0100
821
822openssh (1:5.8p1-5) unstable; urgency=low
823
824 * Drop openssh-server's dependency on openssh-blacklist to a
825 recommendation (closes: #622604).
826 * Update Vcs-* fields and README.source for Alioth changes.
827 * Backport from upstream:
828 - Make hostbased auth with ECDSA keys work correctly (closes: #633368).
829
830 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jul 2011 11:06:47 +0100
831
832openssh (1:5.8p1-4) unstable; urgency=low
833
834 * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb,
835 since the required minimum versions are rather old now anyway and
836 openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828).
837 * Remove unreachable code from openssh-server.postinst.
838
839 -- Colin Watson <cjwatson@debian.org> Mon, 04 Apr 2011 15:56:18 +0100
840
841openssh (1:5.8p1-3) unstable; urgency=low
842
843 * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks,
844 Joel Stanley).
845 * Allow ssh-add to read from FIFOs (thanks, Daniel Kahn Gillmor; closes:
846 #614897).
847
848 -- Colin Watson <cjwatson@debian.org> Fri, 18 Mar 2011 16:42:42 +0000
849
850openssh (1:5.8p1-2) unstable; urgency=low
851
852 * Upload to unstable.
853
854 -- Colin Watson <cjwatson@debian.org> Tue, 08 Feb 2011 10:59:17 +0000
855
856openssh (1:5.8p1-1) experimental; urgency=low
857
858 * New upstream release (http://www.openssh.org/txt/release-5.8):
859 - Fix stack information leak in legacy certificate signing
860 (http://www.openssh.com/txt/legacy-cert.adv).
861
862 -- Colin Watson <cjwatson@debian.org> Sat, 05 Feb 2011 11:13:11 +0000
863
864openssh (1:5.7p1-2) experimental; urgency=low
865
866 * Fix crash in ssh_selinux_setfscreatecon when SELinux is disabled
867 (LP: #708571).
868
869 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jan 2011 12:14:17 +0000
870
871openssh (1:5.7p1-1) experimental; urgency=low
872
873 * New upstream release (http://www.openssh.org/txt/release-5.7):
874 - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
875 and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA
876 offer better performance than plain DH and DSA at the same equivalent
877 symmetric key length, as well as much shorter keys.
878 - sftp(1)/sftp-server(8): add a protocol extension to support a hard
879 link operation. It is available through the "ln" command in the
880 client. The old "ln" behaviour of creating a symlink is available
881 using its "-s" option or through the preexisting "symlink" command.
882 - scp(1): Add a new -3 option to scp: Copies between two remote hosts
883 are transferred through the local host (closes: #508613).
884 - ssh(1): "atomically" create the listening mux socket by binding it on
885 a temporary name and then linking it into position after listen() has
886 succeeded. This allows the mux clients to determine that the server
887 socket is either ready or stale without races (closes: #454784).
888 Stale server sockets are now automatically removed (closes: #523250).
889 - ssh(1): install a SIGCHLD handler to reap expired child process
890 (closes: #594687).
891 - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
892 temporary directories (closes: #357469, although only if you arrange
893 for ssh-agent to actually see $TMPDIR since the setgid bit will cause
894 it to be stripped off).
895 * Update to current GSSAPI patch from
896 http://www.sxw.org.uk/computing/patches/openssh-5.7p1-gsskex-all-20110125.patch:
897 - Add GSSAPIServerIdentity option.
898 * Generate ECDSA host keys on fresh installations. Upgraders who wish to
899 add such host keys should manually add 'HostKey
900 /etc/ssh/ssh_host_ecdsa_key' to /etc/ssh/sshd_config and run 'ssh-keygen
901 -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa'.
902 * Build-depend on libssl-dev (>= 0.9.8g) to ensure sufficient ECC support.
903 * Backport SELinux build fix from CVS.
904 * Rearrange selinux-role.patch so that it links properly given this
905 SELinux build fix.
906
907 -- Colin Watson <cjwatson@debian.org> Wed, 26 Jan 2011 23:48:02 +0000
908
909openssh (1:5.6p1-3) experimental; urgency=low
910
911 * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
912 longer issues.
913 * Merge 1:5.5p1-6.
914
915 -- Colin Watson <cjwatson@debian.org> Thu, 30 Dec 2010 11:48:00 +0000
916
917openssh (1:5.6p1-2) experimental; urgency=low
918
919 * Backport upstream patch to install a SIGCHLD handler to reap expired ssh
920 child processes, preventing lots of zombies when using ControlPersist
921 (closes: #594687).
922
923 -- Colin Watson <cjwatson@debian.org> Tue, 26 Oct 2010 14:46:40 +0100
924
925openssh (1:5.6p1-1) experimental; urgency=low
926
927 * New upstream release (http://www.openssh.com/txt/release-5.6):
928 - Added a ControlPersist option to ssh_config(5) that automatically
929 starts a background ssh(1) multiplex master when connecting. This
930 connection can stay alive indefinitely, or can be set to automatically
931 close after a user-specified duration of inactivity (closes: #335697,
932 #350898, #454787, #500573, #550262).
933 - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
934 HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
935 Match blocks (closes: #549858).
936 - sftp(1): fix ls in working directories that contain globbing
937 characters in their pathnames (LP: #530714).
938
939 -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100
940
941openssh (1:5.5p1-6) unstable; urgency=low
942
943 * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
944 which is intentionally no longer shipped in the openssh-server package
945 due to /var/run often being a temporary directory, is not removed on
946 upgrade (closes: #575582).
947
948 -- Colin Watson <cjwatson@debian.org> Sun, 26 Dec 2010 18:09:29 +0000
949
950openssh (1:5.5p1-5) unstable; urgency=low
951
952 * Use an architecture wildcard for libselinux1-dev (closes: #591740).
953 * debconf template translations:
954 - Update Danish (thanks, Joe Hansen; closes: #592800).
955
956 -- Colin Watson <cjwatson@debian.org> Mon, 23 Aug 2010 22:59:03 +0100
957
958openssh (1:5.5p1-4) unstable; urgency=low
959
960 [ Sebastian Andrzej Siewior ]
961 * Add powerpcspe to architecture list for libselinux1-dev build-dependency
962 (closes: #579843).
963
964 [ Colin Watson ]
965 * Allow ~/.ssh/authorized_keys and other secure files to be
966 group-writable, provided that the group in question contains only the
967 file's owner; this extends a patch previously applied to ~/.ssh/config
968 (closes: #581919).
969 * Check primary group memberships as well as supplementary group
970 memberships, and only allow group-writability by groups with exactly one
971 member, as zero-member groups are typically used by setgid binaries
972 rather than being user-private groups (closes: #581697).
973
974 -- Colin Watson <cjwatson@debian.org> Sat, 22 May 2010 23:37:20 +0100
975
976openssh (1:5.5p1-3) unstable; urgency=low
977
978 * Discard error messages while checking whether rsh, rlogin, and rcp
979 alternatives exist (closes: #579285).
980 * Drop IDEA key check; I don't think it works properly any more due to
981 textual changes in error output, it's only relevant for direct upgrades
982 from truly ancient versions, and it breaks upgrades if
983 /etc/ssh/ssh_host_key can't be loaded (closes: #579570).
984
985 -- Colin Watson <cjwatson@debian.org> Wed, 28 Apr 2010 22:12:47 +0100
986
987openssh (1:5.5p1-2) unstable; urgency=low
988
989 * Use dh_installinit -n, since our maintainer scripts already handle this
990 more carefully (thanks, Julien Cristau).
991
992 -- Colin Watson <cjwatson@debian.org> Sat, 17 Apr 2010 12:55:56 +0100
993
994openssh (1:5.5p1-1) unstable; urgency=low
995
996 * New upstream release:
997 - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
998 paths.
999 - Include a language tag when sending a protocol 2 disconnection
1000 message.
1001 - Make logging of certificates used for user authentication more clear
1002 and consistent between CAs specified using TrustedUserCAKeys and
1003 authorized_keys.
1004
1005 -- Colin Watson <cjwatson@debian.org> Fri, 16 Apr 2010 10:27:30 +0100
1006
1007openssh (1:5.4p1-2) unstable; urgency=low
1008
1009 * Borrow patch from Fedora to add DNSSEC support: if glibc 2.11 is
1010 installed, the host key is published in an SSHFP RR secured with DNSSEC,
1011 and VerifyHostKeyDNS=yes, then ssh will no longer prompt for host key
1012 verification (closes: #572049).
1013 * Convert to dh(1), and use dh_installdocs --link-doc.
1014 * Drop lpia support, since Ubuntu no longer supports this architecture.
1015 * Use dh_install more effectively.
1016 * Add a NEWS.Debian entry about changes in smartcard support relative to
1017 previous unofficial builds (closes: #231472).
1018
1019 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
1020
1021openssh (1:5.4p1-1) unstable; urgency=low
1022
1023 * New upstream release (LP: #535029).
1024 - After a transition period of about 10 years, this release disables SSH
1025 protocol 1 by default. Clients and servers that need to use the
1026 legacy protocol must explicitly enable it in ssh_config / sshd_config
1027 or on the command-line.
1028 - Remove the libsectok/OpenSC-based smartcard code and add support for
1029 PKCS#11 tokens. This support is enabled by default in the Debian
1030 packaging, since it now doesn't involve additional library
1031 dependencies (closes: #231472, LP: #16918).
1032 - Add support for certificate authentication of users and hosts using a
1033 new, minimal OpenSSH certificate format (closes: #482806).
1034 - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
1035 - Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
1036 package, this overlaps with the key blacklisting facility added in
1037 openssh 1:4.7p1-9, but with different file formats and slightly
1038 different scopes; for the moment, I've roughly merged the two.)
1039 - Various multiplexing improvements, including support for requesting
1040 port-forwardings via the multiplex protocol (closes: #360151).
1041 - Allow setting an explicit umask on the sftp-server(8) commandline to
1042 override whatever default the user has (closes: #496843).
1043 - Many sftp client improvements, including tab-completion, more options,
1044 and recursive transfer support for get/put (LP: #33378). The old
1045 mget/mput commands never worked properly and have been removed
1046 (closes: #270399, #428082).
1047 - Do not prompt for a passphrase if we fail to open a keyfile, and log
1048 the reason why the open failed to debug (closes: #431538).
1049 - Prevent sftp from crashing when given a "-" without a command. Also,
1050 allow whitespace to follow a "-" (closes: #531561).
1051
1052 * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some
1053 patches apply with offsets.
1054 * Include debian/ssh-askpass-gnome.png in the Debian tarball now that
1055 we're using a source format that permits this, rather than messing
1056 around with uudecode.
1057 * Drop compatibility with the old gssapi mechanism used in ssh-krb5 <<
1058 3.8.1p1-1. Simon Wilkinson refused this patch since the old gssapi
1059 mechanism was removed due to a serious security hole, and since these
1060 versions of ssh-krb5 are no longer security-supported by Debian I don't
1061 think there's any point keeping client compatibility for them.
1062 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
1063 * Hardcode the location of xauth to /usr/bin/xauth rather than
1064 /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440).
1065 xauth no longer depends on x11-common, so we're no longer guaranteed to
1066 have the /usr/bin/X11 symlink available. I was taking advantage of the
1067 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
1068 enough in the past now that it's probably safe to just use /usr/bin.
1069 * Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes
1070 itself non-OOM-killable, and doesn't require configuration to avoid log
1071 spam in virtualisation containers (closes: #555625).
1072 * Drop Debian-specific removal of OpenSSL version check. Upstream ignores
1073 the two patchlevel nybbles now, which is sufficient to address the
1074 original reason this change was introduced, and it appears that any
1075 change in the major/minor/fix nybbles would involve a new libssl package
1076 name. (We'd still lose if the status nybble were ever changed, but that
1077 would mean somebody had packaged a development/beta version rather than
1078 a proper release, which doesn't appear to be normal practice.)
1079 * Drop most of our "LogLevel SILENT" (-qq) patch. This was originally
1080 introduced to match the behaviour of non-free SSH, in which -q does not
1081 suppress fatal errors, but matching the behaviour of OpenSSH upstream is
1082 much more important nowadays. We no longer document that -q does not
1083 suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to
1084 "LogLevel QUIET" in sshd_config on upgrade.
1085 * Policy version 3.8.4:
1086 - Add a Homepage field.
1087
1088 -- Colin Watson <cjwatson@debian.org> Tue, 06 Apr 2010 22:38:31 +0100
1089
1090openssh (1:5.3p1-3) unstable; urgency=low
1091
1092 * Convert to source format 3.0 (quilt).
1093 * Update README.source to match, and add a 'quilt-setup' target to
1094 debian/rules for the benefit of those checking out the package from
1095 revision control.
1096 * All patches are now maintained separately and tagged according to DEP-3.
1097 * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump.
1098 * Remove documentation of building for Debian 3.0 in README.Debian.
1099 Support for this was removed in 1:4.7p1-2.
1100 * Remove obsolete header from README.Debian dating from when people
1101 expected non-free SSH.
1102 * Update copyright years for GSSAPI patch.
1103
1104 -- Colin Watson <cjwatson@debian.org> Sun, 28 Feb 2010 01:35:53 +0000
1105
1106openssh (1:5.3p1-2) unstable; urgency=low
1107
1108 * Link with -Wl,--as-needed (closes: #560155).
1109 * Install upstream sshd_config as an example (closes: #415008).
1110 * Use dh_lintian.
1111 * Honour DEB_BUILD_OPTIONS=nocheck.
1112
1113 -- Colin Watson <cjwatson@debian.org> Mon, 22 Feb 2010 12:43:24 +0000
1114
1115openssh (1:5.3p1-1) unstable; urgency=low
1116
1117 * New upstream release.
1118 * Update to GSSAPI patch from
1119 http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
1120 * Backport from upstream:
1121 - Do not fall back to adding keys without constraints (ssh-add -c / -t
1122 ...) when the agent refuses the constrained add request. This was a
1123 useful migration measure back in 2002 when constraints were new, but
1124 just adds risk now (LP: #209447).
1125 * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
1126 calls. This only applied to Linux 2.2, which it's no longer feasible to
1127 run anyway (see 1:5.2p1-2 changelog).
1128
1129 -- Colin Watson <cjwatson@debian.org> Tue, 26 Jan 2010 11:55:29 +0000
1130
1131openssh (1:5.2p1-2) unstable; urgency=low
1132
1133 [ Colin Watson ]
1134 * Backport from upstream:
1135 - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd
1136 re-execs itself. Prevents two HUPs in quick succession from resulting
1137 in sshd dying (LP: #497781).
1138 - Output a debug if we can't open an existing keyfile (LP: #505301).
1139 * Use host compiler for ssh-askpass-gnome when cross-compiling.
1140 * Don't run tests when cross-compiling.
1141 * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file
1142 descriptor passing when running on Linux 2.0. The previous stable
1143 release of Debian dropped support for Linux 2.4, let alone 2.0, so this
1144 very likely has no remaining users depending on it.
1145
1146 [ Kees Cook ]
1147 * Implement DebianBanner server configuration flag that can be set to "no"
1148 to allow sshd to run without the Debian-specific extra version in the
1149 initial protocol handshake (closes: #562048).
1150
1151 -- Colin Watson <cjwatson@debian.org> Sat, 16 Jan 2010 01:28:58 +0000
1152
1153openssh (1:5.2p1-1) unstable; urgency=low
1154
1155 * New upstream release (closes: #536182). Yes, I know 5.3p1 has been out
1156 for a while, but there's no GSSAPI patch available for it yet.
1157 - Change the default cipher order to prefer the AES CTR modes and the
1158 revised "arcfour256" mode to CBC mode ciphers that are susceptible to
1159 CPNI-957037 "Plaintext Recovery Attack Against SSH".
1160 - Add countermeasures to mitigate CPNI-957037-style attacks against the
1161 SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
1162 packet length or Message Authentication Code, ssh/sshd will continue
1163 reading up to the maximum supported packet length rather than
1164 immediately terminating the connection. This eliminates most of the
1165 known differences in behaviour that leaked information about the
1166 plaintext of injected data which formed the basis of this attack
1167 (closes: #506115, LP: #379329).
1168 - ForceCommand directive now accepts commandline arguments for the
1169 internal-sftp server (closes: #524423, LP: #362511).
1170 - Add AllowAgentForwarding to available Match keywords list (closes:
1171 #540623).
1172 - Make ssh(1) send the correct channel number for
1173 SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
1174 avoid triggering 'Non-public channel' error messages on sshd(8) in
1175 openssh-5.1.
1176 - Avoid printing 'Non-public channel' warnings in sshd(8), since the
1177 ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
1178 behaviour introduced in openssh-5.1; closes: #496017).
1179 - Disable nonfunctional ssh(1) ~C escape handler in multiplex slave
1180 connections (closes: #507541).
1181 - Fix "whitepsace" typo in ssh_config(5) (closes: #514313, LP: #303835).
1182 * Update to GSSAPI patch from
1183 http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
1184 including cascading credentials support (LP: #416958).
1185 * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951).
1186 * Moved to bzr.debian.org; add Vcs-Bzr and Vcs-Browser control fields.
1187 * Add debian/README.source with instructions on bzr handling.
1188 * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes:
1189 #556644).
1190 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
1191 closes: #498684).
1192 * Don't duplicate backslashes when displaying server banner (thanks,
1193 Michał Górny; closes: #505378, LP: #425346).
1194 * Use hardening-includes for hardening logic (thanks, Kees Cook; closes:
1195 #561887).
1196 * Update OpenSSH FAQ to revision 1.110.
1197 * Remove ssh/new_config, only needed for direct upgrades from potato which
1198 are no longer particularly feasible anyway (closes: #420682).
1199 * Cope with insserv reordering of init script links.
1200 * Remove init script stop link in rc1, as killprocs handles it already.
1201 * Adjust short descriptions to avoid relying on previous experience with
1202 rsh, based on suggestions from Reuben Thomas (closes: #512198).
1203 * Remove manual page references to login.conf, which aren't applicable on
1204 non-BSD systems (closes: #154434).
1205 * Remove/adjust manual page references to BSD-specific /etc/rc (closes:
1206 #513417).
1207 * Refer to sshd_config(5) rather than sshd(8) in postinst-written
1208 /etc/ssh/sshd_config, and add UsePAM commentary from upstream-shipped
1209 configuration file (closes: #415008, although unfortunately this will
1210 only be conveniently visible on new installations).
1211 * Include URL to OpenBSD's ssl(8) in ssh(1), since I don't see a better
1212 source for the same information among Debian's manual pages (closes:
1213 #530692, LP: #456660).
1214
1215 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2010 13:23:35 +0000
1216
1217openssh (1:5.1p1-8) unstable; urgency=low
1218
1219 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;
1220 closes: #538313).
1221 * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu;
1222 closes: #547103).
1223 * Fix grammar in if-up script (closes: #549128).
1224 * Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt";
1225 closes: #548662).
1226
1227 -- Colin Watson <cjwatson@debian.org> Mon, 05 Oct 2009 13:30:49 +0100
1228
1229openssh (1:5.1p1-7) unstable; urgency=low
1230
1231 * Update config.guess and config.sub from autotools-dev 20090611.1
1232 (closes: #538301).
1233 * Set umask to 022 in the init script as well as postinsts (closes:
1234 #539030).
1235 * Add ${misc:Depends} to keep Lintian happy.
1236 * Use 'which' rather than 'type' in maintainer scripts.
1237 * Upgrade to debhelper v7.
1238
1239 -- Colin Watson <cjwatson@debian.org> Fri, 31 Jul 2009 16:28:10 +0100
1240
1241openssh (1:5.1p1-6) unstable; urgency=low
1242
1243 * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather
1244 than O_RDWR.
1245 * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
1246 #511771).
1247 * Add ufw integration (thanks, Didier Roche; see
1248 https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages;
1249 LP: #261884).
1250 * Add a comment above PermitRootLogin in sshd_config pointing to
1251 README.Debian.
1252 * Check if delgroup is present in openssh-client.postrm (closes: #530501).
1253 * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942).
1254 * Remove /var/run/sshd from openssh-server package; it will be created at
1255 run-time before starting the server.
1256 * Use invoke-rc.d in openssh-server's if-up script.
1257
1258 -- Colin Watson <cjwatson@debian.org> Fri, 05 Jun 2009 11:56:03 +0100
1259
1260openssh (1:5.1p1-5) unstable; urgency=low
1261
1262 * Backport from upstream CVS (Markus Friedl):
1263 - packet_disconnect() on padding error, too. Should reduce the success
1264 probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18.
1265 * Check that /var/run/sshd.pid exists and that the process ID listed there
1266 corresponds to sshd before running '/etc/init.d/ssh reload' from if-up
1267 script; SIGHUP is racy if called at boot before sshd has a chance to
1268 install its signal handler, but fortunately the pid file is written
1269 after that which lets us avoid the race (closes: #502444).
1270 * While the above is a valuable sanity-check, it turns out that it doesn't
1271 really fix the bug (thanks to Kevin Price for testing), so for the
1272 meantime we'll just use '/etc/init.d/ssh restart', even though it is
1273 unfortunately heavyweight.
1274
1275 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 00:34:08 +0000
1276
1277openssh (1:5.1p1-4) unstable; urgency=low
1278
1279 * ssh-copy-id: Strip trailing colons from hostname (closes: #226172,
1280 LP: #249706; thanks to Karl Goetz for nudging this along; forwarded
1281 upstream as https://bugzilla.mindrot.org/show_bug.cgi?id=1530).
1282 * Backport from upstream CVS (Markus Friedl):
1283 - Only send eow and no-more-sessions requests to openssh 5 and newer;
1284 fixes interop problems with broken ssh v2 implementations (closes:
1285 #495917).
1286 * Fix double-free when failing to parse a forwarding specification given
1287 using ~C (closes: #505330; forwarded upstream as
1288 https://bugzilla.mindrot.org/show_bug.cgi?id=1539).
1289
1290 -- Colin Watson <cjwatson@debian.org> Sun, 23 Nov 2008 14:46:10 +0000
1291
1292openssh (1:5.1p1-3) unstable; urgency=low
1293
1294 * Remove unnecessary ssh-vulnkey output in non-verbose mode when no
1295 compromised or unknown keys were found (closes: #496495).
1296 * Configure with --disable-strip; dh_strip will deal with stripping
1297 binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
1298 closes: #498681).
1299 * Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
1300 #497026).
1301
1302 -- Colin Watson <cjwatson@debian.org> Tue, 30 Sep 2008 23:09:58 +0100
1303
1304openssh (1:5.1p1-2) unstable; urgency=low
1305
1306 * Look for $SHELL on the path when executing ProxyCommands or
1307 LocalCommands (closes: #492728).
1308
1309 -- Colin Watson <cjwatson@debian.org> Tue, 29 Jul 2008 15:31:25 +0100
1310
1311openssh (1:5.1p1-1) unstable; urgency=low
1312
1313 * New upstream release (closes: #474301). Important changes not previously
1314 backported to 4.7p1:
1315 - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9):
1316 + Added chroot(2) support for sshd(8), controlled by a new option
1317 "ChrootDirectory" (closes: #139047, LP: #24777).
1318 + Linked sftp-server(8) into sshd(8). The internal sftp server is used
1319 when the command "internal-sftp" is specified in a Subsystem or
1320 ForceCommand declaration. When used with ChrootDirectory, the
1321 internal sftp server requires no special configuration of files
1322 inside the chroot environment.
1323 + Added a protocol extension method "posix-rename@openssh.com" for
1324 sftp-server(8) to perform POSIX atomic rename() operations; sftp(1)
1325 prefers this if available (closes: #308561).
1326 + Removed the fixed limit of 100 file handles in sftp-server(8).
1327 + ssh(8) will now skip generation of SSH protocol 1 ephemeral server
1328 keys when in inetd mode and protocol 2 connections are negotiated.
1329 This speeds up protocol 2 connections to inetd-mode servers that
1330 also allow Protocol 1.
1331 + Accept the PermitRootLogin directive in a sshd_config(5) Match
1332 block. Allows for, e.g. permitting root only from the local network.
1333 + Reworked sftp(1) argument splitting and escaping to be more
1334 internally consistent (i.e. between sftp commands) and more
1335 consistent with sh(1). Please note that this will change the
1336 interpretation of some quoted strings, especially those with
1337 embedded backslash escape sequences.
1338 + Support "Banner=none" in sshd_config(5) to disable sending of a
1339 pre-login banner (e.g. in a Match block).
1340 + ssh(1) ProxyCommands are now executed with $SHELL rather than
1341 /bin/sh.
1342 + ssh(1)'s ConnectTimeout option is now applied to both the TCP
1343 connection and the SSH banner exchange (previously it just covered
1344 the TCP connection). This allows callers of ssh(1) to better detect
1345 and deal with stuck servers that accept a TCP connection but don't
1346 progress the protocol, and also makes ConnectTimeout useful for
1347 connections via a ProxyCommand.
1348 + scp(1) incorrectly reported "stalled" on slow copies (closes:
1349 #140828).
1350 + scp(1) date underflow for timestamps before epoch.
1351 + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS,
1352 instead of the current standard RRSIG.
1353 + Correctly drain ACKs when a sftp(1) upload write fails midway,
1354 avoids a fatal() exit from what should be a recoverable condition.
1355 + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF
1356 hostname") to not include any IP address in the data to be hashed.
1357 + Make ssh(1) skip listening on the IPv6 wildcard address when a
1358 binding address of 0.0.0.0 is used against an old SSH server that
1359 does not support the RFC4254 syntax for wildcard bind addresses.
1360 + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is
1361 already done for X11/TCP forwarding sockets (closes: #439661).
1362 + Fix FD leak that could hang a ssh(1) connection multiplexing master.
1363 + Make ssh(1) -q option documentation consistent with reality.
1364 + Fixed sshd(8) PAM support not calling pam_session_close(), or
1365 failing to call it with root privileges (closes: #372680).
1366 + Fix activation of OpenSSL engine support when requested in configure
1367 (LP: #119295).
1368 + Cache SELinux status earlier so we know if it's enabled after a
1369 chroot (LP: #237557).
1370 - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1):
1371 + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1)
1372 and ssh-keygen(1). Visual fingerprint display is controlled by a new
1373 ssh_config(5) option "VisualHostKey". The intent is to render SSH
1374 host keys in a visual form that is amenable to easy recall and
1375 rejection of changed host keys.
1376 + sshd_config(5) now supports CIDR address/masklen matching in "Match
1377 address" blocks, with a fallback to classic wildcard matching.
1378 + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys
1379 from="..." restrictions, also with a fallback to classic wildcard
1380 matching.
1381 + Added an extended test mode (-T) to sshd(8) to request that it write
1382 its effective configuration to stdout and exit. Extended test mode
1383 also supports the specification of connection parameters (username,
1384 source address and hostname) to test the application of
1385 sshd_config(5) Match rules.
1386 + ssh(1) now prints the number of bytes transferred and the overall
1387 connection throughput for SSH protocol 2 sessions when in verbose
1388 mode (previously these statistics were displayed for protocol 1
1389 connections only).
1390 + sftp-server(8) now supports extension methods statvfs@openssh.com
1391 and fstatvfs@openssh.com that implement statvfs(2)-like operations.
1392 + sftp(1) now has a "df" command to the sftp client that uses the
1393 statvfs@openssh.com to produce a df(1)-like display of filesystem
1394 space and inode utilisation (requires statvfs@openssh.com support on
1395 the server).
1396 + Added a MaxSessions option to sshd_config(5) to allow control of the
1397 number of multiplexed sessions supported over a single TCP
1398 connection. This allows increasing the number of allowed sessions
1399 above the previous default of 10, disabling connection multiplexing
1400 (MaxSessions=1) or disallowing login/shell/subsystem sessions
1401 entirely (MaxSessions=0).
1402 + Added a no-more-sessions@openssh.com global request extension that
1403 is sent from ssh(1) to sshd(8) when the client knows that it will
1404 never request another session (i.e. when session multiplexing is
1405 disabled). This allows a server to disallow further session requests
1406 and terminate the session in cases where the client has been
1407 hijacked.
1408 + ssh-keygen(1) now supports the use of the -l option in combination
1409 with -F to search for a host in ~/.ssh/known_hosts and display its
1410 fingerprint.
1411 + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of
1412 "rsa1" (LP: #129794).
1413 + Added an AllowAgentForwarding option to sshd_config(8) to control
1414 whether authentication agent forwarding is permitted. Note that this
1415 is a loose control, as a client may install their own unofficial
1416 forwarder.
1417 + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when
1418 receiving network data, resulting in a ~10% speedup.
1419 + ssh(1) and sshd(8) will now try additional addresses when connecting
1420 to a port forward destination whose DNS name resolves to more than
1421 one address. The previous behaviour was to try the only first
1422 address and give up if that failed.
1423 + ssh(1) and sshd(8) now support signalling that channels are
1424 half-closed for writing, through a channel protocol extension
1425 notification "eow@openssh.com". This allows propagation of closed
1426 file descriptors, so that commands such as "ssh -2 localhost od
1427 /bin/ls | true" do not send unnecessary data over the wire.
1428 + sshd(8): increased the default size of ssh protocol 1 ephemeral keys
1429 from 768 to 1024 bits.
1430 + When ssh(1) has been requested to fork after authentication ("ssh
1431 -f") with ExitOnForwardFailure enabled, delay the fork until after
1432 replies for any -R forwards have been seen. Allows for robust
1433 detection of -R forward failure when using -f.
1434 + "Match group" blocks in sshd_config(5) now support negation of
1435 groups. E.g. "Match group staff,!guests".
1436 + sftp(1) and sftp-server(8) now allow chmod-like operations to set
1437 set[ug]id/sticky bits.
1438 + The MaxAuthTries option is now permitted in sshd_config(5) match
1439 blocks.
1440 + Multiplexed ssh(1) sessions now support a subset of the ~ escapes
1441 that are available to a primary connection.
1442 + ssh(1) connection multiplexing will now fall back to creating a new
1443 connection in most error cases (closes: #352830).
1444 + Make ssh(1) deal more gracefully with channel requests that fail.
1445 Previously it would optimistically assume that requests would always
1446 succeed, which could cause hangs if they did not (e.g. when the
1447 server runs out of file descriptors).
1448 + ssh(1) now reports multiplexing errors via the multiplex slave's
1449 stderr where possible (subject to LogLevel in the mux master).
1450 + Fixed an UMAC alignment problem that manifested on Itanium
1451 platforms.
1452 * Remove our local version of moduli(5) now that there's one upstream.
1453 * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description.
1454 * Add lintian overrides for empty /usr/share/doc/openssh-client
1455 directories in openssh-server and ssh (necessary due to being symlink
1456 targets).
1457 * Merge from Ubuntu:
1458 - Add 'status' action to openssh-server init script, requiring lsb-base
1459 (>= 3.2-13) (thanks, Dustin Kirkland).
1460 * debconf template translations:
1461 - Update Korean (thanks, Sunjae Park; closes: #484821).
1462
1463 -- Colin Watson <cjwatson@debian.org> Fri, 25 Jul 2008 10:45:08 +0100
1464
1465openssh (1:4.7p1-13) unstable; urgency=low
1466
1467 * Add some helpful advice to the end of ssh-vulnkey's output if there are
1468 unknown or compromised keys (thanks, Dan Jacobson; closes: #483756).
1469 * Check compromised key blacklist in ssh or ssh-add, as well as in the
1470 server (LP: #232391). To override the blacklist check in ssh
1471 temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override
1472 for the blacklist check in ssh-add.
1473 * Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1),
1474 ssh-keygen(1), and sshd(8) (closes: #484451).
1475 * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999
1476 (thanks, Frans Pop).
1477 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
1478 takes care of that (thanks, Frans Pop; closes: #484404).
1479 * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
1480 * Add documentation on removing openssh-blacklist locally (see #484269).
1481 * Clarify documentation of SSHD_OOM_ADJUST, and make setting it to the
1482 empty string actually skip adjustment as intended (closes: #487325).
1483 * Remove empty /usr/share/applications directory in ssh-askpass-gnome.
1484 * debconf template translations:
1485 - Update Romanian (thanks, Cătălin Feștilă; closes: #485415).
1486
1487 -- Colin Watson <cjwatson@debian.org> Mon, 21 Jul 2008 12:18:28 +0100
1488
1489openssh (1:4.7p1-12) unstable; urgency=low
1490
1491 * Fill in CVE identifier for ssh-vulnkey bug fixed in 1:4.7p1-10.
1492 * Refactor rejection of blacklisted user keys into a single
1493 reject_blacklisted_key function in auth.c (thanks, Dmitry V. Levin).
1494 * Fix memory leak of blacklisted host keys (thanks, Dmitry V. Levin).
1495 * debconf template translations:
1496 - Update Dutch (thanks, Bart Cornelis; closes: #483004).
1497 - Update Brazilian Portuguese (thanks, Eder L. Marques; closes:
1498 #483142).
1499 - Update Slovak (thanks, Ivan Masár; closes: #483517).
1500
1501 -- Colin Watson <cjwatson@debian.org> Thu, 29 May 2008 21:41:29 +0100
1502
1503openssh (1:4.7p1-11) unstable; urgency=low
1504
1505 * Make init script depend on $syslog, and fix some other dependency
1506 glitches (thanks, Petter Reinholdtsen; closes: #481018).
1507 * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
1508 closes: #481151).
1509 * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
1510 closes: #480020).
1511 * Allow building with heimdal-dev (LP: #125805).
1512
1513 * Check RSA1 keys without the need for a separate blacklist. Thanks to
1514 Simon Tatham for the idea.
1515 * Generate two keys with the PID forced to the same value and test that
1516 they differ, to defend against recurrences of the recent Debian OpenSSL
1517 vulnerability.
1518 * Recommend openssh-blacklist from openssh-client (closes: #481187).
1519 * Recommend openssh-blacklist-extra from openssh-client and
1520 openssh-server.
1521 * Make ssh-vulnkey report the file name and line number for each key
1522 (thanks, Heiko Schlittermann and Christopher Perry; closes: #481398).
1523 * Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see
1524 #481283).
1525 * Log IP addresses of hosts attempting to use blacklisted keys (closes:
1526 #481721).
1527 * Incorporate various ssh-vulnkey suggestions from Hugh Daniel:
1528 - Add -v (verbose) option, and don't print output for keys that have a
1529 blacklist file but that are not listed unless in verbose mode.
1530 - Move exit status documentation to a separate section.
1531 - Document key status descriptions.
1532 - Add key type to output.
1533 - Fix error output if ssh-vulnkey fails to read key files, with the
1534 exception of host keys unless -a was given.
1535 - In verbose mode, output the name of each file examined.
1536 * Handle leading IP addresses in ssh-vulnkey input (LP: #230497).
1537 * Fix various ssh-vulnkey problems pointed out by Solar Designer:
1538 - Fix some buffer handling inconsistencies.
1539 - Use xasprintf to build user key file names, avoiding truncation
1540 problems.
1541 - Drop to the user's UID when reading user keys with -a.
1542 - Use EUID rather than UID when run with no file names and without -a.
1543 - Reword "Unknown (no blacklist information)" to "Unknown (blacklist
1544 file not installed)".
1545
1546 * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi).
1547 * debconf template translations:
1548 - Update Finnish (thanks, Esko Arajärvi; closes: #481530).
1549 - Update French (thanks, Christian Perrier; closes: #481576).
1550 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591).
1551 - Update Galician (thanks, Jacobo Tarrio; closes: #481596).
1552 - Update Japanese (thanks, Kenshi Muto; closes: #481621).
1553 - Update Czech (thanks, Miroslav Kure; closes: #481624).
1554 - Update German (thanks, Helge Kreutzmann; closes: #481676).
1555 - Update Portuguese (thanks, Ricardo Silva; closes: #481781).
1556 - Update Basque (thanks, Piarres Beobide; closes: #481836).
1557 - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870).
1558 - Update Vietnamese (thanks, Clytie Siddall; closes: #481876).
1559 - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes:
1560 #482341).
1561 - Update Turkish (thanks, Mert Dirik; closes: #482548).
1562 - Update Russian (thanks, Yuri Kozlov; closes: #482887).
1563 - Update Swedish (thanks, Martin Bagge; closes: #482464).
1564 - Update Italian (thanks, Luca Monducci; closes: #482808).
1565
1566 -- Colin Watson <cjwatson@debian.org> Mon, 26 May 2008 12:21:39 +0100
1567
1568openssh (1:4.7p1-10) unstable; urgency=low
1569
1570 * Add a FILES section to ssh-vulnkey(1) (thanks, Hugh Daniel).
1571 * CVE-2008-2285: ssh-vulnkey handles options in authorized_keys
1572 (LP: #230029), and treats # as introducing a comment even if it is
1573 preceded by whitespace.
1574
1575 -- Colin Watson <cjwatson@debian.org> Wed, 14 May 2008 12:35:05 +0100
1576
1577openssh (1:4.7p1-9) unstable; urgency=critical
1578
1579 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-8.
1580 * Mitigate OpenSSL security vulnerability (CVE-2008-0166):
1581 - Add key blacklisting support. Keys listed in
1582 /etc/ssh/blacklist.TYPE-LENGTH will be rejected for authentication by
1583 sshd, unless "PermitBlacklistedKeys yes" is set in
1584 /etc/ssh/sshd_config.
1585 - Add a new program, ssh-vulnkey, which can be used to check keys
1586 against these blacklists.
1587 - Depend on openssh-blacklist.
1588 - Force dependencies on libssl0.9.8 / libcrypto0.9.8-udeb to at least
1589 0.9.8g-9.
1590 - Automatically regenerate known-compromised host keys, with a
1591 critical-priority debconf note. (I regret that there was no time to
1592 gather translations.)
1593
1594 -- Colin Watson <cjwatson@debian.org> Tue, 13 May 2008 12:33:38 +0100
1595
1596openssh (1:4.7p1-8) unstable; urgency=high
1597
1598 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
1599 * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
1600 configurations (LP: #211400).
1601 * Tweak scp's reporting of filenames in verbose mode to be a bit less
1602 confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
1603 * Backport from 4.9p1:
1604 - CVE-2008-1657: Ignore ~/.ssh/rc if a sshd_config ForceCommand is
1605 specified.
1606 - Add no-user-rc authorized_keys option to disable execution of
1607 ~/.ssh/rc.
1608 * Backport from Simon Wilkinson's GSSAPI key exchange patch for 5.0p1:
1609 - Add code to actually implement GSSAPIStrictAcceptorCheck, which had
1610 somehow been omitted from a previous version of this patch (closes:
1611 #474246).
1612
1613 -- Colin Watson <cjwatson@debian.org> Sun, 06 Apr 2008 12:34:19 +0100
1614
1615openssh (1:4.7p1-7) unstable; urgency=low
1616
1617 * Ignore errors writing to oom_adj (closes: #473573).
1618
1619 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2008 16:24:44 +0100
1620
1621openssh (1:4.7p1-6) unstable; urgency=low
1622
1623 * Disable the Linux kernel's OOM-killer for the sshd parent; tweak
1624 SSHD_OOM_ADJUST in /etc/default/ssh to change this (closes: #341767).
1625
1626 -- Colin Watson <cjwatson@debian.org> Sun, 30 Mar 2008 21:14:12 +0100
1627
1628openssh (1:4.7p1-5) unstable; urgency=low
1629
1630 * Recommends: xauth rather than Suggests: xbase-clients.
1631 * Document in ssh(1) that '-S none' disables connection sharing
1632 (closes: #471437).
1633 * Patch from Red Hat / Fedora:
1634 - CVE-2008-1483: Don't use X11 forwarding port which can't be bound on
1635 all address families, preventing hijacking of X11 forwarding by
1636 unprivileged users when both IPv4 and IPv6 are configured (closes:
1637 #463011).
1638 * Use printf rather than echo -en (a bashism) in openssh-server.config and
1639 openssh-server.preinst.
1640 * debconf template translations:
1641 - Update Finnish (thanks, Esko Arajärvi; closes: #468563).
1642
1643 -- Colin Watson <cjwatson@debian.org> Sat, 22 Mar 2008 12:37:00 +0000
1644
1645openssh (1:4.7p1-4) unstable; urgency=low
1646
1647 [ Caleb Case ]
1648 * Fix configure detection of getseuserbyname and
1649 get_default_context_with_level (closes: #465614, LP: #188136).
1650
1651 [ Colin Watson ]
1652 * Include the autogenerated debian/copyright in the source package.
1653 * Move /etc/pam.d/ssh to /etc/pam.d/sshd, allowing us to stop defining
1654 SSHD_PAM_SERVICE (closes: #255870).
1655
1656 -- Colin Watson <cjwatson@debian.org> Wed, 13 Feb 2008 18:18:52 +0000
1657
1658openssh (1:4.7p1-3) unstable; urgency=low
1659
1660 * Improve grammar of ssh-askpass-gnome description.
1661 * Backport from upstream:
1662 - Use the correct packet maximum sizes for remote port and agent
1663 forwarding. Prevents the server from killing the connection if too
1664 much data is queued and an excessively large packet gets sent
1665 (https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
1666 * Allow passing temporary daemon parameters on the init script's command
1667 line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks,
1668 Marc Haber; closes: #458547).
1669
1670 -- Colin Watson <cjwatson@debian.org> Fri, 01 Feb 2008 21:59:59 +0000
1671
1672openssh (1:4.7p1-2) unstable; urgency=low
1673
1674 * Adjust many relative links in faq.html to point to
1675 http://www.openssh.org/ (thanks, Dan Jacobson; mentioned in #459807).
1676 * Pass --with-mantype=doc to configure rather than build-depending on
1677 groff (closes: #460121).
1678 * Add armel to architecture list for libselinux1-dev build-dependency
1679 (closes: #460136).
1680 * Drop source-compatibility with Debian 3.0:
1681 - Remove support for building with GNOME 1. This allows simplification
1682 of our GNOME build-dependencies (see #460136).
1683 - Remove hacks to support the old PAM configuration scheme.
1684 - Remove compatibility for building without po-debconf.
1685 * Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I
1686 can see, the GTK2 version of ssh-askpass-gnome has never required
1687 libgnomeui-dev.
1688
1689 -- Colin Watson <cjwatson@debian.org> Fri, 11 Jan 2008 00:14:10 +0000
1690
1691openssh (1:4.7p1-1) unstable; urgency=low
1692
1693 * New upstream release (closes: #453367).
1694 - CVE-2007-4752: Prevent ssh(1) from using a trusted X11 cookie if
1695 creation of an untrusted cookie fails; found and fixed by Jan Pechanec
1696 (closes: #444738).
1697 - sshd(8) in new installations defaults to SSH Protocol 2 only. Existing
1698 installations are unchanged.
1699 - The SSH channel window size has been increased, and both ssh(1)
1700 sshd(8) now send window updates more aggressively. These improves
1701 performance on high-BDP (Bandwidth Delay Product) networks.
1702 - ssh(1) and sshd(8) now preserve MAC contexts between packets, which
1703 saves 2 hash calls per packet and results in 12-16% speedup for
1704 arcfour256/hmac-md5.
1705 - A new MAC algorithm has been added, UMAC-64 (RFC4418) as
1706 "umac-64@openssh.com". UMAC-64 has been measured to be approximately
1707 20% faster than HMAC-MD5.
1708 - Failure to establish a ssh(1) TunnelForward is now treated as a fatal
1709 error when the ExitOnForwardFailure option is set.
1710 - ssh(1) returns a sensible exit status if the control master goes away
1711 without passing the full exit status.
1712 - When using a ProxyCommand in ssh(1), set the outgoing hostname with
1713 gethostname(2), allowing hostbased authentication to work.
1714 - Make scp(1) skip FIFOs rather than hanging (closes: #246774).
1715 - Encode non-printing characters in scp(1) filenames. These could cause
1716 copies to be aborted with a "protocol error".
1717 - Handle SIGINT in sshd(8) privilege separation child process to ensure
1718 that wtmp and lastlog records are correctly updated.
1719 - Report GSSAPI mechanism in errors, for libraries that support multiple
1720 mechanisms.
1721 - Improve documentation for ssh-add(1)'s -d option.
1722 - Rearrange and tidy GSSAPI code, removing server-only code being linked
1723 into the client.
1724 - Delay execution of ssh(1)'s LocalCommand until after all forwardings
1725 have been established.
1726 - In scp(1), do not truncate non-regular files.
1727 - Improve exit message from ControlMaster clients.
1728 - Prevent sftp-server(8) from reading until it runs out of buffer space,
1729 whereupon it would exit with a fatal error (closes: #365541).
1730 - pam_end() was not being called if authentication failed
1731 (closes: #405041).
1732 - Manual page datestamps updated (closes: #433181).
1733 * Install the OpenSSH FAQ in /usr/share/doc/openssh-client.
1734 - Includes documentation on copying files with colons using scp
1735 (closes: #303453).
1736 * Create /var/run/sshd on start even if /etc/ssh/sshd_not_to_be_run exists
1737 (closes: #453285).
1738 * Fix "overriden" typo in ssh(1) (thanks, A. Costa; closes: #390699).
1739 * Refactor debian/rules configure and make invocations to make development
1740 easier.
1741 * Remove the hideously old /etc/ssh/primes on upgrade (closes: #123013).
1742 * Update moduli(5) to revision 1.11 from OpenBSD CVS.
1743 * Document the non-default options we set as standard in ssh_config(5) and
1744 sshd_config(5) (closes: #327886, #345628).
1745 * Recode LICENCE to UTF-8 when concatenating it to debian/copyright.
1746 * Override desktop-file-but-no-dh_desktop-call lintian warning; the
1747 .desktop file is intentionally not installed (see 1:3.8.1p1-10).
1748 * Update copyright dates for Kerberos patch in debian/copyright.head.
1749 * Policy version 3.7.3: no changes required.
1750
1751 -- Colin Watson <cjwatson@debian.org> Mon, 24 Dec 2007 16:43:02 +0000
1752
1753openssh (1:4.6p1-7) unstable; urgency=low
1754
1755 * Don't build PIE executables on m68k (closes: #451192).
1756 * Use autotools-dev's recommended configure --build and --host options.
1757 * Adjust README.Debian to suggest mailing debian-ssh@lists.debian.org
1758 rather than Matthew.
1759 * Check whether deluser exists in postrm (closes: #454085).
1760
1761 -- Colin Watson <cjwatson@debian.org> Mon, 03 Dec 2007 11:11:02 +0000
1762
1763openssh (1:4.6p1-6) unstable; urgency=low
1764
1765 * Remove blank line between head comment and first template in
1766 debian/openssh-server.templates.master; apparently it confuses some
1767 versions of debconf.
1768 * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas
1769 Pospisek; closes: #441817).
1770 * Discard error output from dpkg-query in preinsts, in case the ssh
1771 metapackage is not installed.
1772 * Fix sshd/inittab advice in README.Debian to account for rc.d movement
1773 (closes: #450632).
1774 * Suppress error from debian/rules if lsb-release is not installed.
1775 * Don't ignore errors from 'make -C contrib clean'.
1776 * Adjust categories in ssh-askpass-gnome.desktop to comply with the
1777 Desktop Menu Specification.
1778 * debconf template translations:
1779 - Add Slovak (thanks, Ivan Masár; closes: #441690).
1780 - Update Brazilian Portuguese (thanks, Eder L. Marques;
1781 closes: #447145).
1782
1783 -- Colin Watson <cjwatson@debian.org> Mon, 12 Nov 2007 11:47:28 +0000
1784
1785openssh (1:4.6p1-5) unstable; urgency=low
1786
1787 * Identify ssh as a metapackage rather than a transitional package. It's
1788 still useful as a quick way to install both the client and the server.
1789 * ssh-copy-id now checks the exit status of ssh-add -L (thanks, Adeodato
1790 Simó; closes: #221675).
1791 * ssh-copy-id no longer prints the output of expr (thanks, Peter
1792 Eisentraut; closes: #291534).
1793 * ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than
1794 ~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris;
1795 closes: #234627).
1796 * Build-depend on libselinux1-dev on lpia.
1797 * openssh-client Suggests: keychain.
1798 * debconf template translations:
1799 - Update Catalan (thanks, Jordà Polo; closes: #431970).
1800
1801 -- Colin Watson <cjwatson@debian.org> Mon, 30 Jul 2007 09:34:38 +0100
1802
1803openssh (1:4.6p1-4) unstable; urgency=low
1804
1805 * Don't build PIE executables on hppa, as they crash.
1806
1807 -- Colin Watson <cjwatson@debian.org> Thu, 05 Jul 2007 11:06:54 +0100
1808
1809openssh (1:4.6p1-3) unstable; urgency=low
1810
1811 * Only build PIE executables on Linux and NetBSD (closes: #430455).
1812 * Fix broken switch fallthrough when SELinux is running in permissive mode
1813 (closes: #430838).
1814 * Document that HashKnownHosts may break tab-completion (closes: #430154).
1815
1816 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jun 2007 07:15:38 +0100
1817
1818openssh (1:4.6p1-2) unstable; urgency=low
1819
1820 * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
1821 * Clarify that 'ssh -q -q' still prints errors caused by bad arguments
1822 (i.e. before the logging system is initialised).
1823 * Suppress "Connection to <host> closed" and "Connection to master closed"
1824 messages at loglevel SILENT (thanks, Jaap Eldering; closes: #409788).
1825 * Suppress "Pseudo-terminal will not be allocated because stdin is not a
1826 terminal" message at loglevels QUIET and SILENT (closes: #366814).
1827 * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and
1828 sshd_config(5).
1829 * Add try-restart action to init script.
1830 * Add /etc/network/if-up.d/openssh-server to restart sshd when new
1831 interfaces appear (LP: #103436).
1832 * Backport from upstream:
1833 - Move C/R -> kbdint special case to after the defaults have been
1834 loaded, which makes ChallengeResponse default to yes again. This was
1835 broken by the Match changes and not fixed properly subsequently
1836 (closes: #428968).
1837 - Silence spurious error messages from hang-on-exit fix
1838 (http://bugzilla.mindrot.org/show_bug.cgi?id=1306, closes: #429531).
1839
1840 -- Colin Watson <cjwatson@debian.org> Wed, 20 Jun 2007 11:52:44 +0100
1841
1842openssh (1:4.6p1-1) unstable; urgency=low
1843
1844 * New upstream release (closes: #395507, #397961, #420035). Important
1845 changes not previously backported to 4.3p2:
1846 - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
1847 + On portable OpenSSH, fix a GSSAPI authentication abort that could be
1848 used to determine the validity of usernames on some platforms.
1849 + Implemented conditional configuration in sshd_config(5) using the
1850 "Match" directive. This allows some configuration options to be
1851 selectively overridden if specific criteria (based on user, group,
1852 hostname and/or address) are met. So far a useful subset of
1853 post-authentication options are supported and more are expected to
1854 be added in future releases.
1855 + Add support for Diffie-Hellman group exchange key agreement with a
1856 final hash of SHA256.
1857 + Added a "ForceCommand" directive to sshd_config(5). Similar to the
1858 command="..." option accepted in ~/.ssh/authorized_keys, this forces
1859 the execution of the specified command regardless of what the user
1860 requested. This is very useful in conjunction with the new "Match"
1861 option.
1862 + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
1863 permitopen="..." authorized_keys option, allowing fine-grained
1864 control over the port-forwardings that a user is allowed to
1865 establish.
1866 + Add optional logging of transactions to sftp-server(8).
1867 + ssh(1) will now record port numbers for hosts stored in
1868 ~/.ssh/known_hosts when a non-standard port has been requested
1869 (closes: #50612).
1870 + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
1871 non-zero exit code) when requested port forwardings could not be
1872 established.
1873 + Extend sshd_config(5) "SubSystem" declarations to allow the
1874 specification of command-line arguments.
1875 + Replacement of all integer overflow susceptible invocations of
1876 malloc(3) and realloc(3) with overflow-checking equivalents.
1877 + Many manpage fixes and improvements.
1878 + Add optional support for OpenSSL hardware accelerators (engines),
1879 enabled using the --with-ssl-engine configure option.
1880 + Tokens in configuration files may be double-quoted in order to
1881 contain spaces (closes: #319639).
1882 + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
1883 session exits very quickly (closes: #307890).
1884 + Fix some incorrect buffer allocation calculations (closes: #410599).
1885 + ssh-add doesn't ask for a passphrase if key file permissions are too
1886 liberal (closes: #103677).
1887 + Likewise, ssh doesn't ask either (closes: #99675).
1888 - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
1889 + sshd now allows the enabling and disabling of authentication methods
1890 on a per user, group, host and network basis via the Match directive
1891 in sshd_config.
1892 + Fixed an inconsistent check for a terminal when displaying scp
1893 progress meter (closes: #257524).
1894 + Fix "hang on exit" when background processes are running at the time
1895 of exit on a ttyful/login session (closes: #88337).
1896 * Update to current GSSAPI patch from
1897 http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
1898 install ChangeLog.gssapi.
1899 * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
1900 * Use LSB functions in init scripts, and add an LSB-style header (partly
1901 from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
1902 * Move init script start links to S16, move rc1 stop link to K84, and
1903 remove rc0 and rc6 stop links altogether (the last part from Ubuntu;
1904 closes: #122188).
1905 * Emit a slightly more informative message from the init script if
1906 /dev/null has somehow become not a character device (closes: #369964).
1907 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
1908 * Merge from Ubuntu:
1909 - Build position-independent executables (only for debs, not for udebs)
1910 to take advantage of address space layout randomisation.
1911 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
1912 the default path.
1913 * Use ${binary:Version} rather than ${Source-Version} in openssh-server ->
1914 openssh-client dependency.
1915
1916 -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:28:26 +0100
1917
1918openssh (1:4.3p2-11) unstable; urgency=low
1919
1920 * It's been four and a half years now since I took over as "temporary"
1921 maintainer, so the Maintainer field is getting a bit inaccurate. Set
1922 Maintainer to debian-ssh@lists.debian.org and leave Matthew and myself
1923 as Uploaders.
1924 * Use dpkg-query to fetch conffile md5sums rather than parsing
1925 /var/lib/dpkg/status directly.
1926 * openssh-client Suggests: libpam-ssh (closes: #427840).
1927 * Use 'start-stop-daemon --oknodo' so that openssh-server's init script
1928 exits successfully if sshd is already running (closes: #426858).
1929
1930 * Apply results of debconf templates and package descriptions review by
1931 debian-l10n-english (closes: #420107, #420742).
1932 * debconf template translations:
1933 - Update Dutch (thanks, Machteld de Kok; closes: #419260).
1934 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #420630).
1935 - Update Galician (thanks, Jacobo Tarrio; closes: #420635).
1936 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
1937 closes: #420651).
1938 - Update Swedish (thanks, Daniel Nylander; closes: #420663).
1939 - Add Bulgarian (thanks, Damyan Ivanov; closes: #420703).
1940 - Add Tamil (thanks, Tirumurti Vasudevan; closes: #420739).
1941 - Update German (thanks, Helge Kreutzmann; closes: #420743).
1942 - Update Japanese (thanks, Kenshi Muto; closes: #420946).
1943 - Add Basque (thanks, Piarres Beobide; closes: #421238).
1944 - Update Italian (thanks, Luca Monducci; closes: #421348).
1945 - Update Czech (thanks, Miroslav Kure; closes: #421484).
1946 - Update Romanian (thanks, Igor Stirbu; closes: #421760).
1947 - Update Russian (thanks, Yuriy Talakan' and Sergey Alyoshin;
1948 closes: #420862).
1949 - Update Dutch (thanks, Bart Cornelis; closes: #422767).
1950 - Update Portuguese (thanks, Ricardo Silva; closes: #423112).
1951 - Update French (thanks, Christian Perrier).
1952 - Add Korean (thanks, Sunjae Park; closes: #424008).
1953 - Update Vietnamese (thanks, Clytie Siddall; closes: #426991).
1954
1955 -- Colin Watson <cjwatson@debian.org> Sun, 10 Jun 2007 08:59:42 +0100
1956
1957openssh (1:4.3p2-10) unstable; urgency=low
1958
1959 * Multiply openssh-client-udeb's Installer-Menu-Item by 100.
1960 * Increase MAX_SESSIONS to 64.
1961
1962 -- Colin Watson <cjwatson@debian.org> Tue, 10 Apr 2007 19:17:20 +0100
1963
1964openssh (1:4.3p2-9) unstable; urgency=high
1965
1966 [ Russ Allbery ]
1967 * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5
1968 (closes: #404863).
1969 * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
1970
1971 [ Colin Watson ]
1972 * debconf template translations:
1973 - Add Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #412330).
1974
1975 -- Colin Watson <cjwatson@debian.org> Mon, 5 Mar 2007 16:13:50 +0000
1976
1977openssh (1:4.3p2-8) unstable; urgency=medium
1978
1979 [ Vincent Untz ]
1980 * Give the ssh-askpass-gnome window a default icon; remove unnecessary
1981 icon extension from .desktop file (closes:
1982 https://launchpad.net/bugs/27152).
1983
1984 [ Colin Watson ]
1985 * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
1986 sufficient to replace conffiles (closes: #402804).
1987 * Make GSSAPICleanupCreds a compatibility alias for
1988 GSSAPICleanupCredentials. Mark GSSUseSessionCCache and
1989 GSSAPIUseSessionCredCache as known-but-unsupported options, and migrate
1990 away from them on upgrade.
1991 * It turns out that the people who told me that removing a conffile in the
1992 preinst was sufficient to have dpkg replace it without prompting when
1993 moving a conffile between packages were very much mistaken. As far as I
1994 can tell, the only way to do this reliably is to write out the desired
1995 new text of the conffile in the preinst. This is gross, and requires
1996 shipping the text of all conffiles in the preinst too, but there's
1997 nothing for it. Fortunately this nonsense is only required for smooth
1998 upgrades from sarge.
1999 * debconf template translations:
2000 - Add Romanian (thanks, Stan Ioan-Eugen; closes: #403528).
2001
2002 -- Colin Watson <cjwatson@debian.org> Sat, 23 Dec 2006 18:38:33 +0000
2003
2004openssh (1:4.3p2-7) unstable; urgency=medium
2005
2006 [ Colin Watson ]
2007 * Ignore errors from usermod when changing sshd's shell, since it will
2008 fail if the sshd user is not local (closes: #398436).
2009 * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
2010 to avoid unnecessary conffile resolution steps for administrators
2011 (thanks, Jari Aalto; closes: #335259).
2012 * Fix quoting error in configure.ac and regenerate configure (thanks, Ben
2013 Pfaff; closes: #391248).
2014 * When installing openssh-client or openssh-server from scratch, remove
2015 any unchanged conffiles from the pre-split ssh package to work around a
2016 bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).
2017
2018 [ Russ Allbery ]
2019 * Create transitional ssh-krb5 package which enables GSSAPI configuration
2020 in sshd_config (closes: #390986).
2021 * Default client to attempting GSSAPI authentication.
2022 * Remove obsolete GSSAPINoMICAuthentication from sshd_config if it's
2023 found.
2024 * Add ssh -K option, the converse of -k, to enable GSSAPI credential
2025 delegation (closes: #401483).
2026
2027 -- Colin Watson <cjwatson@debian.org> Wed, 6 Dec 2006 23:00:49 +0000
2028
2029openssh (1:4.3p2-6) unstable; urgency=low
2030
2031 * Acknowledge NMU (thanks, Manoj; closes: #394795).
2032 * Backport from 4.5p1:
2033 - Fix a bug in the sshd privilege separation monitor that weakened its
2034 verification of successful authentication. This bug is not known to be
2035 exploitable in the absence of additional vulnerabilities.
2036 * openssh-server Suggests: molly-guard (closes: #395473).
2037 * debconf template translations:
2038 - Update German (thanks, Helge Kreutzmann; closes: #395947).
2039
2040 -- Colin Watson <cjwatson@debian.org> Wed, 15 Nov 2006 00:07:32 +0000
2041
2042openssh (1:4.3p2-5.1) unstable; urgency=low
2043
2044 * NMU to update SELinux patch, bringing it in line with current selinux
2045 releases. The patch for this NMU is simply the Bug#394795 patch,
2046 and no other changes. (closes: #394795)
2047
2048 -- Manoj Srivastava <srivasta@debian.org> Mon, 23 Oct 2006 14:11:24 -0500
2049
2050openssh (1:4.3p2-5) unstable; urgency=low
2051
2052 * Remove ssh/insecure_telnetd check altogether (closes: #391081).
2053 * debconf template translations:
2054 - Update Danish (thanks, Claus Hindsgaul; closes: #390612).
2055
2056 -- Colin Watson <cjwatson@debian.org> Thu, 5 Oct 2006 09:04:19 +0100
2057
2058openssh (1:4.3p2-4) unstable; urgency=high
2059
2060 * Backport from 4.4p1 (since I don't have an updated version of the GSSAPI
2061 patch yet):
2062 - CVE-2006-4924: Fix a pre-authentication denial of service found by
2063 Tavis Ormandy, that would cause sshd(8) to spin until the login grace
2064 time expired (closes: #389995).
2065 - CVE-2006-5051: Fix an unsafe signal hander reported by Mark Dowd. The
2066 signal handler was vulnerable to a race condition that could be
2067 exploited to perform a pre-authentication denial of service. On
2068 portable OpenSSH, this vulnerability could theoretically lead to
2069 pre-authentication remote code execution if GSSAPI authentication is
2070 enabled, but the likelihood of successful exploitation appears remote.
2071
2072 * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël
2073 Hertzog; closes: #369395).
2074 * Remove no-longer-used ssh/insecure_rshd debconf template.
2075 * Make ssh/insecure_telnetd Type: error (closes: #388946).
2076
2077 * debconf template translations:
2078 - Update Portuguese (thanks, Rui Branco; closes: #381942).
2079 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2080 closes: #382966).
2081
2082 -- Colin Watson <cjwatson@debian.org> Fri, 29 Sep 2006 16:28:24 +0100
2083
2084openssh (1:4.3p2-3) unstable; urgency=low
2085
2086 * Document KeepAlive->TCPKeepAlive renaming in sshd_config(5) (closes:
2087 https://launchpad.net/bugs/50702).
2088 * Change sshd user's shell to /usr/sbin/nologin (closes: #366541).
2089 Introduces dependency on passwd for usermod.
2090 * debconf template translations:
2091 - Update French (thanks, Denis Barbier; closes: #368503).
2092 - Update Dutch (thanks, Bart Cornelis; closes: #375100).
2093 - Update Japanese (thanks, Kenshi Muto; closes: #379950).
2094
2095 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jul 2006 00:12:36 +0100
2096
2097openssh (1:4.3p2-2) unstable; urgency=low
2098
2099 * Include commented-out pam_access example in /etc/pam.d/ssh.
2100 * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the
2101 server configuration, as otherwise 'sshd -t' will complain about the
2102 lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).
2103 * debconf template translations:
2104 - Update Russian (thanks, Yuriy Talakan'; closes: #367143).
2105 - Update Czech (thanks, Miroslav Kure; closes: #367161).
2106 - Update Italian (thanks, Luca Monducci; closes: #367186).
2107 - Update Galician (thanks, Jacobo Tarrio; closes: #367318).
2108 - Update Swedish (thanks, Daniel Nylander; closes: #367971).
2109
2110 -- Colin Watson <cjwatson@debian.org> Fri, 19 May 2006 09:14:27 +0100
2111
2112openssh (1:4.3p2-1) unstable; urgency=low
2113
2114 * New upstream release (closes: #361032).
2115 - CVE-2006-0225: scp (as does rcp, on which it is based) invoked a
2116 subshell to perform local to local, and remote to remote copy
2117 operations. This subshell exposed filenames to shell expansion twice;
2118 allowing a local attacker to create filenames containing shell
2119 metacharacters that, if matched by a wildcard, could lead to execution
2120 of attacker-specified commands with the privilege of the user running
2121 scp (closes: #349645).
2122 - Add support for tunneling arbitrary network packets over a connection
2123 between an OpenSSH client and server via tun(4) virtual network
2124 interfaces. This allows the use of OpenSSH (4.3+) to create a true VPN
2125 between the client and server providing real network connectivity at
2126 layer 2 or 3. This feature is experimental.
2127 - Reduce default key length for new DSA keys generated by ssh-keygen
2128 back to 1024 bits. DSA is not specified for longer lengths and does
2129 not fully benefit from simply making keys longer. As per FIPS 186-2
2130 Change Notice 1, ssh-keygen will refuse to generate a new DSA key
2131 smaller or larger than 1024 bits.
2132 - Fixed X forwarding failing to start when the X11 client is executed in
2133 background at the time of session exit.
2134 - Change ssh-keygen to generate a protocol 2 RSA key when invoked
2135 without arguments (closes: #114894).
2136 - Fix timing variance for valid vs. invalid accounts when attempting
2137 Kerberos authentication.
2138 - Ensure that ssh always returns code 255 on internal error
2139 (closes: #259865).
2140 - Cleanup wtmp files on SIGTERM when not using privsep.
2141 - Set SO_REUSEADDR on X11 listeners to avoid problems caused by
2142 lingering sockets from previous session (X11 applications can
2143 sometimes not connect to 127.0.0.1:60xx) (closes:
2144 https://launchpad.net/bugs/25528).
2145 - Ensure that fds 0, 1 and 2 are always attached in all programs, by
2146 duping /dev/null to them if necessary.
2147 - Xauth list invocation had bogus "." argument.
2148 - Remove internal assumptions on key exchange hash algorithm and output
2149 length, preparing OpenSSH for KEX methods with alternate hashes.
2150 - Ignore junk sent by a server before it sends the "SSH-" banner.
2151 - Many manual page improvements.
2152 - Lots of cleanups, including fixes to memory leaks on error paths and
2153 possible crashes.
2154 * Update to current GSSAPI patch from
2155 http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
2156 (closes: #352042).
2157 * debian/rules: Resynchronise CFLAGS with that generated by configure.
2158 * Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself
2159 when PAM is enabled, but relies on PAM to do it.
2160 * Rename KeepAlive to TCPKeepAlive in default sshd_config
2161 (closes: #349896).
2162 * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf
2163 templates to make boolean short descriptions end with a question mark
2164 and to avoid use of the first person.
2165 * Ship README.tun.
2166 * Policy version 3.7.2: no changes required.
2167 * debconf template translations:
2168 - Update Italian (thanks, Luca Monducci; closes: #360348).
2169 - Add Galician (thanks, Jacobo Tarrio; closes: #361220).
2170
2171 -- Colin Watson <cjwatson@debian.org> Fri, 12 May 2006 12:48:24 +0100
2172
2173openssh (1:4.2p1-8) unstable; urgency=low
2174
2175 [ Frans Pop ]
2176 * Use udeb support introduced in debhelper 4.2.0 (available in sarge)
2177 rather than constructing udebs by steam.
2178 * Require debhelper 5.0.22, which generates correct shared library
2179 dependencies for udebs (closes: #360068). This build-dependency can be
2180 ignored if building on sarge.
2181
2182 [ Colin Watson ]
2183 * Switch to debhelper compatibility level 4, since we now require
2184 debhelper 4 even on sarge anyway for udeb support.
2185
2186 -- Colin Watson <cjwatson@debian.org> Fri, 31 Mar 2006 09:44:55 +0100
2187
2188openssh (1:4.2p1-7) unstable; urgency=low
2189
2190 * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb
2191 rather than the deb. Fixed.
2192
2193 -- Colin Watson <cjwatson@debian.org> Wed, 1 Mar 2006 16:19:00 +0000
2194
2195openssh (1:4.2p1-6) unstable; urgency=low
2196
2197 * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11
2198 to the normal and superuser paths and /usr/games to the normal path.
2199 * When the client receives a signal, don't fatal() with "Killed by signal
2200 %d." (which produces unhelpful noise on stderr and causes confusion for
2201 users of some applications that wrap ssh); instead, generate a debug
2202 message and exit with the traditional status (closes: #313371).
2203 * debconf template translations:
2204 - Add Swedish (thanks, Daniel Nylander; closes: #333133).
2205 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
2206 closes: #341371).
2207 - Correct erroneously-changed Last-Translator headers in Greek and
2208 Spanish translations.
2209
2210 -- Colin Watson <cjwatson@debian.org> Mon, 20 Feb 2006 16:50:55 +0000
2211
2212openssh (1:4.2p1-5) unstable; urgency=low
2213
2214 * Add a CVE name to the 1:4.0p1-1 changelog entry.
2215 * Build-depend on libselinux1-dev on armeb.
2216 * Only send GSSAPI proposal if GSSAPIAuthentication is enabled.
2217 * Build-depend on libssl-dev (>= 0.9.8-1) to cope with surprise OpenSSL
2218 transition, since otherwise who knows what the buildds will do. If
2219 you're building openssh yourself, you can safely ignore this and use an
2220 older libssl-dev.
2221
2222 -- Colin Watson <cjwatson@debian.org> Fri, 7 Oct 2005 12:23:42 +0100
2223
2224openssh (1:4.2p1-4) unstable; urgency=low
2225
2226 * Initialise token to GSS_C_EMPTY_BUFFER in ssh_gssapi_check_mechanism
2227 (closes: #328606).
2228
2229 -- Colin Watson <cjwatson@debian.org> Fri, 16 Sep 2005 12:50:16 +0100
2230
2231openssh (1:4.2p1-3) unstable; urgency=low
2232
2233 * Add prototype for ssh_gssapi_server_mechanisms (closes: #328372).
2234 * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly
2235 different version of the gssapi authentication method (thanks, Aaron M.
2236 Ucko; closes: #328388).
2237 * Explicitly tell po2debconf to use the 'popular' output encoding, so that
2238 the woody-compatibility hack works even with po-debconf 0.9.0.
2239
2240 -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:28:21 +0100
2241
2242openssh (1:4.2p1-2) unstable; urgency=low
2243
2244 * Annotate 1:4.2p1-1 changelog with CVE references.
2245 * Add remaining pieces of Kerberos support (closes: #152657, #275472):
2246 - Add GSSAPI key exchange support from
2247 http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen
2248 Frost).
2249 - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr.
2250 - openssh-client and openssh-server replace ssh-krb5.
2251 - Update commented-out Kerberos/GSSAPI options in default sshd_config.
2252 - Fix HAVE_GSSAPI_KRB5_H/HAVE_GSSAPI_GSSAPI_KRB5_H typos in
2253 gss-serv-krb5.c.
2254
2255 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 18:28:49 +0100
2256
2257openssh (1:4.2p1-1) unstable; urgency=low
2258
2259 * New upstream release.
2260 - SECURITY (CAN-2005-2797): Fix a bug introduced in OpenSSH 4.0 that
2261 caused GatewayPorts to be incorrectly activated for dynamic ("-D")
2262 port forwardings when no listen address was explicitly specified
2263 (closes: #326065).
2264 - SECURITY (CAN-2005-2798): Fix improper delegation of GSSAPI
2265 credentials. This code is only built in openssh-krb5, not openssh, but
2266 I mention the CVE reference here anyway for completeness.
2267 - Add a new compression method ("Compression delayed") that delays zlib
2268 compression until after authentication, eliminating the risk of zlib
2269 vulnerabilities being exploited by unauthenticated users. Note that
2270 users of OpenSSH versions earlier than 3.5 will need to disable
2271 compression on the client or set "Compression yes" (losing this
2272 security benefit) on the server.
2273 - Increase the default size of new RSA/DSA keys generated by ssh-keygen
2274 from 1024 to 2048 bits (closes: #181162).
2275 - Many bugfixes and improvements to connection multiplexing.
2276 - Don't pretend to accept $HOME (closes: #208648).
2277 * debian/rules: Resynchronise CFLAGS with that generated by configure.
2278 * openssh-client and openssh-server conflict with pre-split ssh to avoid
2279 problems when ssh is left un-upgraded (closes: #324695).
2280 * Set X11Forwarding to yes in the default sshd_config (new installs only).
2281 At least when X11UseLocalhost is turned on, which is the default, the
2282 security risks of using X11 forwarding are risks to the client, not to
2283 the server (closes: #320104).
2284
2285 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:16:14 +0100
2286
2287openssh (1:4.1p1-7) unstable; urgency=low
2288
2289 * Do the IDEA host key check on a temporary file to avoid altering
2290 /etc/ssh/ssh_host_key itself (closes: #312312).
2291 * Work around the ssh-askpass alternative somehow ending up in manual mode
2292 pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
2293 * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113).
2294 * Fix XSIish uses of 'test' in openssh-server.preinst.
2295 * Policy version 3.6.2: no changes required.
2296
2297 -- Colin Watson <cjwatson@debian.org> Fri, 2 Sep 2005 16:18:11 +0100
2298
2299openssh (1:4.1p1-6) unstable; urgency=low
2300
2301 * Fix one-character typo that meant the binaries in openssh-client and
2302 openssh-server got recompiled with the wrong options during
2303 'debian/rules install' (closes: #317088, #317238, #317241).
2304
2305 -- Colin Watson <cjwatson@debian.org> Thu, 7 Jul 2005 10:56:16 +0100
2306
2307openssh (1:4.1p1-5) unstable; urgency=low
2308
2309 * Build-depend on libselinux1-dev on ppc64 too (closes: #314625).
2310 * Drop priority of ssh to extra to match the override file.
2311 * Make /usr/share/doc/openssh-server and /usr/share/doc/ssh symlinks to
2312 /usr/share/doc/openssh-client (closes: #314745).
2313 * Ship README.dns (closes: #284874).
2314 * Disable btmp logging, since Debian's /var/log/btmp has inappropriate
2315 permissions (closes: #314956).
2316 * Allow ~/.ssh/config to be group-writable, provided that the group in
2317 question contains only the file's owner (closes: #314347).
2318 * debconf template translations:
2319 - Update Brazilian Portuguese (thanks, André Luís Lopes;
2320 closes: #315477).
2321 - Add Vietnamese (thanks, Clytie Siddall; closes: #316636).
2322
2323 -- Colin Watson <cjwatson@debian.org> Sun, 3 Jul 2005 17:08:08 +0100
2324
2325openssh (1:4.1p1-4) unstable; urgency=low
2326
2327 * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5
2328 only conflicts with ssh (closes: #312475).
2329 * SELinux support (thanks, Manoj Srivastava; closes: #308555):
2330 - Added SELinux capability, and turned it on be default. Added
2331 restorecon calls in preinst and postinst (should not matter if the
2332 machine is not SELinux aware). By and large, the changes made should
2333 have no effect unless the rules file calls --with-selinux; and even
2334 then there should be no performance hit for machines not actively
2335 running SELinux.
2336 - Modified the preinst and postinst to call restorecon to set the
2337 security context for the generated public key files.
2338 - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system
2339 may want to also include pam_selinux.so.
2340 * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
2341 are available.
2342 * Restore /usr/lib/sftp-server temporarily, as a symlink to
2343 /usr/lib/openssh/sftp-server (closes: #312891).
2344 * Switch to debhelper compatibility level 3, since 2 is deprecated.
2345 * debconf template translations:
2346 - Update German (thanks, Jens Seidel; closes: #313949).
2347
2348 -- Colin Watson <cjwatson@debian.org> Fri, 17 Jun 2005 14:20:20 +0100
2349
2350openssh (1:4.1p1-3) unstable; urgency=low
2351
2352 * Upload to unstable.
2353
2354 -- Colin Watson <cjwatson@debian.org> Mon, 6 Jun 2005 22:28:33 +0100
2355
2356openssh (1:4.1p1-2) experimental; urgency=low
2357
2358 * Drop debconf support for allowing SSH protocol 1, which is discouraged
2359 and has not been the default since openssh 1:3.0.1p1-1. Users who need
2360 this should edit sshd_config instead (closes: #147212).
2361 * Since ssh-keysign isn't used by default (you need to set
2362 EnableSSHKeysign to "yes" in /etc/ssh/ssh_config), having a debconf
2363 question to ask whether it should be setuid is overkill, and the
2364 question text had got out of date anyway. Remove this question, ship
2365 ssh-keysign setuid in openssh-client.deb, and set a statoverride if the
2366 debconf question was previously set to false.
2367 * Add lintian overrides for the above (setuid-binary,
2368 no-debconf-templates).
2369 * Fix picky lintian errors about slogin symlinks.
2370 * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling.
2371 * Apply Linux 2.2 workaround (see #239999) only on Linux.
2372
2373 -- Colin Watson <cjwatson@debian.org> Thu, 2 Jun 2005 00:55:58 +0100
2374
2375openssh (1:4.1p1-1) experimental; urgency=low
2376
2377 * New upstream release.
2378 - Normalise socket addresses returned by get_remote_hostname(), fixing
2379 4-in-6 mapping issues with AllowUsers et al (closes: #192234).
2380 * Take upstream's hint and disable the unsupported USE_POSIX_THREADS
2381 (closes: #295757, #308868, and possibly others; may open other bugs).
2382 Use PAM password authentication to avoid #278394. In future I may
2383 provide two sets of binaries built with and without this option, since
2384 it seems I can't win.
2385 * Disable ChallengeResponseAuthentication in new installations, returning
2386 to PasswordAuthentication by default, since it now supports PAM and
2387 apparently works better with a non-threaded sshd (closes: #247521).
2388 * openssh-server Suggests: rssh (closes: #233012).
2389 * Change libexecdir to /usr/lib/openssh, and fix up various alternatives
2390 and configuration files to match (closes: #87900, #151321).
2391 * Fix up very old sshd_config files that refer to /usr/libexec/sftp-server
2392 (closes: #141979).
2393
2394 -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 01:33:33 +0100
2395
2396openssh (1:4.0p1-1) experimental; urgency=low
2397
2398 * New upstream release.
2399 - Port-forwarding specifications now take optional bind addresses, and
2400 the server allows client-specified bind addresses for remote port
2401 forwardings when configured with "GatewayPorts clientspecified"
2402 (closes: #87253, #192206).
2403 - ssh and ssh-keyscan now support hashing of known_hosts files for
2404 improved privacy (CAN-2005-2666). ssh-keygen has new options for
2405 managing known_hosts files, which understand hashing.
2406 - sftp supports command history and editing support using libedit
2407 (closes: #287013).
2408 - Have scp and sftp wait for the spawned ssh to exit before they exit
2409 themselves, allowing ssh to restore terminal modes (closes: #257130).
2410 - Improved the handling of bad data in authorized_keys files,
2411 eliminating fatal errors on corrupt or very large keys; e.g. linefeeds
2412 in keys only produce errors in auth.log now (closes: #220726).
2413 - Add "command mode" to ssh connection multiplexing (closes: #303452).
2414 - Mention $HOME/.hushlogin in sshd(8) FILES section (closes: #163933).
2415 * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
2416 closes: #296487).
2417 * Remove obsolete and unnecessary ssh/forward_warning debconf note.
2418 * Hurd build fixes (although sshd still doesn't work):
2419 - Restore X forwarding fix from #102991, lost somewhere along the way.
2420 - Link with -lcrypt.
2421 - Link with -lpthread rather than -pthread.
2422 - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to
2423 satisfy build-dependencies.
2424 * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
2425 * Enable HashKnownHosts by default. This only affects new entries; use
2426 'ssh-keygen -H' to convert an entire known_hosts file to hashed format.
2427 * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific
2428 (closes: #307069).
2429 * debconf template translations:
2430 - Update Czech (thanks, Miroslav Kure; closes: #298744).
2431 - Update Finnish (thanks, Matti Pöllä; closes: #303787).
2432 - Synchronise Spanish with sarge branch (thanks, Javier
2433 Fernández-Sanguino Peña; closes: #298536).
2434 - Add Ukrainian (thanks, Eugeniy Meshcheryakov; closes: #301852).
2435
2436 -- Colin Watson <cjwatson@debian.org> Thu, 26 May 2005 11:23:18 +0100
2437
2438openssh (1:3.9p1-3) experimental; urgency=low
2439
2440 * Explain how to run sshd from inittab in README.Debian (closes: #147360).
2441 * Add debian/watch file.
2442
2443 -- Colin Watson <cjwatson@debian.org> Fri, 18 Feb 2005 00:20:16 +0000
2444
2445openssh (1:3.9p1-2) experimental; urgency=low
2446
2447 * Remove pam_nologin from /etc/pam.d/ssh, as sshd's built-in support
2448 appears to be sufficient and more useful (closes: #162996).
2449 * Depend on debconf | debconf-2.0.
2450 * Drop LoginGraceTime back to the upstream default of two minutes on new
2451 installs (closes: #289573).
2452 * debconf template translations from Ubuntu bug #1232:
2453 - Update Greek (thanks, Logiotatidis George).
2454 - Update Spanish (thanks, Santiago Erquicia).
2455
2456 -- Colin Watson <cjwatson@debian.org> Sat, 15 Jan 2005 12:37:54 +0000
2457
2458openssh (1:3.9p1-1) experimental; urgency=low
2459
2460 * New upstream release.
2461 - PAM password authentication implemented again (closes: #238699,
2462 #242119).
2463 - Implemented the ability to pass selected environment variables between
2464 the client and the server.
2465 - Fix ssh-keyscan breakage when remote server doesn't speak SSH protocol
2466 (closes: #228828).
2467 - Fix res_query detection (closes: #242462).
2468 - 'ssh -c' documentation improved (closes: #265627).
2469 * Pass LANG and LC_* environment variables from the client by default, and
2470 accept them to the server by default in new installs, although not on
2471 upgrade (closes: #264024).
2472 * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones).
2473 * Expand on openssh-client package description (closes: #273831).
2474
2475 -- Colin Watson <cjwatson@debian.org> Tue, 4 Jan 2005 14:18:31 +0000
2476
2477openssh (1:3.8.1p1-14) experimental; urgency=low
2478
2479 * We use DH_COMPAT=2, so build-depend on debhelper (>= 2).
2480 * Fix timing information leak allowing discovery of invalid usernames in
2481 PAM keyboard-interactive authentication (backported from a patch by
2482 Darren Tucker; closes: #281595).
2483 * Make sure that there's a delay in PAM keyboard-interactive
2484 authentication when PermitRootLogin is not set to yes and the correct
2485 root password is entered (closes: #248747).
2486
2487 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 18:09:37 +0000
2488
2489openssh (1:3.8.1p1-13) experimental; urgency=low
2490
2491 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
2492 * debconf template translations:
2493 - Update Dutch (thanks, cobaco; closes: #278715).
2494 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
2495
2496 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 12:03:13 +0000
2497
2498openssh (1:3.8.1p1-12) experimental; urgency=low
2499
2500 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
2501 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
2502 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
2503 implementations apparently have problems with the long version string.
2504 This is of course a bug in those implementations, but since the extent
2505 of the problem is unknown it's best to play safe (closes: #275731).
2506 * debconf template translations:
2507 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
2508 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
2509 - Update French (thanks, Denis Barbier; closes: #276703).
2510 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
2511
2512 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 19:21:17 +0100
2513
2514openssh (1:3.8.1p1-11) experimental; urgency=high
2515
2516 * Move sshd_config(5) to openssh-server, where it belongs.
2517 * If PasswordAuthentication is disabled, then offer to disable
2518 ChallengeResponseAuthentication too. The current PAM code will attempt
2519 password-style authentication if ChallengeResponseAuthentication is
2520 enabled (closes: #250369).
2521 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
2522 later and then upgraded. Sorry about that ... for this reason, the
2523 default answer is to leave ChallengeResponseAuthentication enabled.
2524
2525 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:28:20 +0100
2526
2527openssh (1:3.8.1p1-10) experimental; urgency=low
2528
2529 * Don't install the ssh-askpass-gnome .desktop file by default; I've had
2530 too many GNOME people tell me it's the wrong thing to be doing. I've
2531 left it in /usr/share/doc/ssh-askpass-gnome/examples/ for now.
2532
2533 -- Colin Watson <cjwatson@debian.org> Wed, 25 Aug 2004 18:18:14 +0100
2534
2535openssh (1:3.8.1p1-9) experimental; urgency=low
2536
2537 * Split the ssh binary package into openssh-client and openssh-server
2538 (closes: #39741). openssh-server depends on openssh-client for some
2539 common functionality; it didn't seem worth creating yet another package
2540 for this. openssh-client is priority standard, openssh-server optional.
2541 * New transitional ssh package, priority optional, depending on
2542 openssh-client and openssh-server. May be removed once nothing depends
2543 on it.
2544 * When upgrading from ssh to openssh-{client,server}, it's very difficult
2545 for the maintainer scripts to find out what version we're upgrading from
2546 without dodgy dpkg hackery. I've therefore taken the opportunity to move
2547 a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
2548 and ssh/user_environment_tell.
2549 * Add a heuristic to try to make sure the sshd_config upgrade to >= 3.7
2550 happens even though we don't know what version we're upgrading from.
2551 * Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now
2552 (until sarge+2) it's still honoured to avoid breaking existing
2553 configurations, but the right approach is now to remove the
2554 openssh-server package if you don't want to run the server. Add a NEWS
2555 item to that effect.
2556
2557 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
2558
2559openssh (1:3.8.1p1-8.sarge.4) unstable; urgency=high
2560
2561 * Fix timing information leak allowing discovery of invalid usernames in
2562 PAM keyboard-interactive authentication (backported from a patch by
2563 Darren Tucker; closes: #281595).
2564 * Make sure that there's a delay in PAM keyboard-interactive
2565 authentication when PermitRootLogin is not set to yes and the correct
2566 root password is entered (closes: #248747).
2567
2568 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 12:37:16 +0000
2569
2570openssh (1:3.8.1p1-8.sarge.3) unstable; urgency=low
2571
2572 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
2573 * debconf template translations:
2574 - Update Dutch (thanks, cobaco; closes: #278715).
2575 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
2576
2577 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 10:31:12 +0000
2578
2579openssh (1:3.8.1p1-8.sarge.2) unstable; urgency=low
2580
2581 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
2582 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
2583 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
2584 implementations apparently have problems with the long version string.
2585 This is of course a bug in those implementations, but since the extent
2586 of the problem is unknown it's best to play safe (closes: #275731).
2587 * debconf template translations:
2588 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
2589 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
2590 - Update French (thanks, Denis Barbier; closes: #276703).
2591 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
2592
2593 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 17:57:14 +0100
2594
2595openssh (1:3.8.1p1-8.sarge.1) unstable; urgency=high
2596
2597 * If PasswordAuthentication is disabled, then offer to disable
2598 ChallengeResponseAuthentication too. The current PAM code will attempt
2599 password-style authentication if ChallengeResponseAuthentication is
2600 enabled (closes: #250369).
2601 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
2602 later and then upgraded. Sorry about that ... for this reason, the
2603 default answer is to leave ChallengeResponseAuthentication enabled.
2604
2605 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:21:55 +0100
2606
2607openssh (1:3.8.1p1-8) unstable; urgency=high
2608
2609 * Matthew Vernon:
2610 - Add a GPL exception to the licensing terms of the Debian patch
2611 (closes: #211644).
2612
2613 -- Colin Watson <cjwatson@debian.org> Thu, 29 Jul 2004 13:28:47 +0100
2614
2615openssh (1:3.8.1p1-7) unstable; urgency=low
2616
2617 * Re-enable shadow password support in openssh-server-udeb, at Bastian
2618 Blank's request (closes: #260800).
2619
2620 -- Colin Watson <cjwatson@debian.org> Thu, 22 Jul 2004 10:56:06 +0100
2621
2622openssh (1:3.8.1p1-6) unstable; urgency=low
2623
2624 * Implement hack in
2625 http://lists.debian.org/debian-boot/2004/07/msg01207.html to get
2626 openssh-client-udeb to show up as a retrievable debian-installer
2627 component.
2628 * Generate host keys in postinst only if the relevant HostKey directives
2629 are found in sshd_config (closes: #87946).
2630
2631 -- Colin Watson <cjwatson@debian.org> Wed, 21 Jul 2004 15:14:46 +0100
2632
2633openssh (1:3.8.1p1-5) unstable; urgency=medium
2634
2635 * Update German debconf template translation (thanks, Helge Kreutzmann;
2636 closes: #252226).
2637 * Remove Suggests: dnsutils, as it was only needed for
2638 make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan.
2639 * Disable shadow password support in openssh-server-udeb.
2640 * Fix non-portable shell constructs in maintainer scripts, Makefile, and
2641 ssh-copy-id (thanks, David Weinehall; closes: #258517).
2642 * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD
2643 handler kill the PAM thread if its waitpid() call returns 0, as well as
2644 the previous check for -1 (closes: #252676).
2645 * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any
2646 more; oh well.
2647
2648 -- Colin Watson <cjwatson@debian.org> Sat, 10 Jul 2004 13:57:27 +0100
2649
2650openssh (1:3.8.1p1-4) unstable; urgency=medium
2651
2652 * Kill off PAM thread if privsep slave dies (closes: #248125).
2653
2654 -- Colin Watson <cjwatson@debian.org> Fri, 28 May 2004 17:58:45 -0300
2655
2656openssh (1:3.8.1p1-3) unstable; urgency=low
2657
2658 * Add ssh-keygen to openssh-server-udeb.
2659
2660 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 16:31:52 +0100
2661
2662openssh (1:3.8.1p1-2) unstable; urgency=low
2663
2664 * Add Catalan debconf template translation (thanks, Aleix Badia i Bosch;
2665 closes: #248748).
2666 * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb
2667 (not yet uploaded).
2668 * Restore ssh-askpass-gnome binary, lost by mistake.
2669 * Don't link against libnsl in udeb builds.
2670
2671 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 11:15:58 +0100
2672
2673openssh (1:3.8.1p1-1) unstable; urgency=low
2674
2675 * New upstream release.
2676 - Use a longer buffer for tty names in utmp (closes: #247538).
2677 * Make sure there's a newline at the end of sshd_config before adding
2678 'UsePAM yes' (closes: #244829).
2679 * Generate a new .orig.tar.gz without RFC.nroff, and remove
2680 /usr/share/doc/ssh/RFC.gz (closes: #211640). It isn't DFSG-free and only
2681 documents the obsolete SSH1 protocol, not to mention that it was never a
2682 real RFC but only an Internet-Draft. It's available from
2683 http://www.free.lp.se/bamse/draft-ylonen-ssh-protocol-00.txt if you want
2684 it for some reason.
2685 * Add openssh-client-udeb and openssh-server-udeb binary packages for use
2686 in debian-installer. They still need libnss_files to be supplied in udeb
2687 form by glibc.
2688 * Work around lack of res_query weak alias in libresolv on amd64 (see
2689 #242462, awaiting real fix upstream).
2690 * Fix grammar in sshd(8) (closes: #238753).
2691 * Add .desktop file and icon for ssh-askpass-gnome (closes: #232333).
2692 * Update Polish debconf template translation (thanks, Emil Nowak;
2693 closes: #242808).
2694 * Add Turkish debconf template translation (thanks, Recai Oktaş;
2695 closes: #246068).
2696
2697 -- Colin Watson <cjwatson@debian.org> Tue, 11 May 2004 23:38:10 +0100
2698
2699openssh (1:3.8p1-3) unstable; urgency=low
2700
2701 * Remove deprecated ReverseMappingCheck option from newly generated
2702 sshd_config files (closes: #239987).
2703 * Build everything apart from contrib in a subdirectory, to allow for
2704 multiple builds.
2705 * Some older kernels are missing setresuid() and setresgid(), so don't try
2706 to use them. setreuid() and setregid() will do well enough for our
2707 purposes (closes: #239999).
2708
2709 -- Colin Watson <cjwatson@debian.org> Mon, 5 Apr 2004 21:23:43 +0100
2710
2711openssh (1:3.8p1-2) unstable; urgency=medium
2712
2713 * Disable PasswordAuthentication for new installations (closes: #236810).
2714 * Turn off the new ForwardX11Trusted by default, returning to the
2715 semantics of 3.7 and earlier, since it seems immature and causes far too
2716 many problems with existing setups. See README.Debian for details
2717 (closes: #237021).
2718
2719 -- Colin Watson <cjwatson@debian.org> Wed, 10 Mar 2004 10:33:07 +0000
2720
2721openssh (1:3.8p1-1) unstable; urgency=low
2722
2723 * New upstream release (closes: #232281):
2724 - New PAM implementation based on that in FreeBSD. This runs PAM session
2725 modules before dropping privileges (closes: #132681, #150968).
2726 - Since PAM session modules are run as root, we can turn pam_limits back
2727 on by default, and it no longer spits out "Operation not permitted" to
2728 syslog (closes: #171673).
2729 - Password expiry works again (closes: #153235).
2730 - 'ssh -q' suppresses login banner (closes: #134589).
2731 - sshd doesn't lie to PAM about invalid usernames (closes: #157078).
2732 - ssh-add prints key comment on each prompt (closes: #181869).
2733 - Punctuation formatting fixed in man pages (closes: #191131).
2734 - EnableSSHKeysign documented in ssh_config(5) (closes: #224457).
2735 * Add 'UsePAM yes' to /etc/ssh/sshd_config on upgrade from versions older
2736 than this, to maintain the standard Debian sshd configuration.
2737 * Comment out PAMAuthenticationViaKbdInt and RhostsAuthentication in
2738 sshd_config on upgrade. Neither option is supported any more.
2739 * Privilege separation and PAM are now properly supported together, so
2740 remove both debconf questions related to them and simply set it
2741 unconditionally in newly generated sshd_config files (closes: #228838).
2742 * ServerAliveInterval implemented upstream, so ProtocolKeepAlives is now a
2743 compatibility alias. The semantics differ slightly, though; see
2744 ssh_config(5) for details.
2745 * Implement SSH1 support for ServerAliveInterval using SSH_MSG_IGNORE. As
2746 documented in ssh_config(5), it's not as good as the SSH2 version.
2747 * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and
2748 -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary.
2749 * Update config.guess and config.sub from autotools-dev 20040105.1.
2750 * Darren Tucker:
2751 - Reset signal status when starting pam auth thread, prevent hanging
2752 during PAM keyboard-interactive authentications.
2753 - Fix a non-security-critical segfault in PAM authentication.
2754 * Add debconf template translations:
2755 - Greek (thanks, Konstantinos Margaritis; closes: #232843).
2756 - Italian (thanks, Renato Gini; closes: #234777).
2757
2758 -- Colin Watson <cjwatson@debian.org> Sat, 6 Mar 2004 18:43:44 +0000
2759
2760openssh (1:3.6.1p2-12) unstable; urgency=low
2761
2762 * Update Spanish debconf template translation (thanks, Javier
2763 Fernández-Sanguino Peña; closes: #228242).
2764 * Add debconf template translations:
2765 - Czech (thanks, Miroslav Kure; closes: #230110).
2766 - Simplified Chinese (thanks, Hiei Xu; closes: #230726).
2767
2768 -- Colin Watson <cjwatson@debian.org> Wed, 11 Feb 2004 09:37:57 +0000
2769
2770openssh (1:3.6.1p2-11) unstable; urgency=low
2771
2772 * Comment out pam_limits in default configuration, for now at least
2773 (closes: #198254).
2774 * Use invoke-rc.d (if it exists) to run the init script.
2775 * Backport format string bug fix in sshconnect.c (closes: #225238).
2776 * ssh-copy-id exits if ssh fails (closes: #215252).
2777
2778 -- Colin Watson <cjwatson@debian.org> Sun, 4 Jan 2004 18:59:21 +0000
2779
2780openssh (1:3.6.1p2-10) unstable; urgency=low
2781
2782 * Use --retry in init script when restarting rather than sleeping, to make
2783 sure the old process is dead (thanks, Herbert Xu; closes: #212117).
2784 Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option.
2785 * Update debconf template translations:
2786 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844).
2787 - Danish (thanks, Morten Brix Pedersen; closes: #217964).
2788 - Japanese (thanks, Kenshi Muto; closes: #212497).
2789 - Russian (thanks, Ilgiz Kalmetev).
2790 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #211832).
2791 * Add Dutch debconf template translation (thanks, cobaco;
2792 closes: #215372).
2793 * Update config.guess and config.sub from autotools-dev 20031007.1
2794 (closes: #217696).
2795 * Implement New World Order for PAM configuration, including
2796 /etc/pam.d/common-* from /etc/pam.d/ssh (closes: #212959).
2797 - To backport this release to woody, you need to set DEB_BUILD_SSH_WOODY
2798 in your environment. See README.Debian.
2799 * Add more commentary to /etc/pam.d/ssh.
2800
2801 -- Colin Watson <cjwatson@debian.org> Sun, 16 Nov 2003 01:14:16 +0000
2802
2803openssh (1:3.6.1p2-9) unstable; urgency=high
2804
2805 * Merge even more buffer allocation fixes from upstream (CAN-2003-0682;
2806 closes: #211434).
2807
2808 -- Colin Watson <cjwatson@debian.org> Fri, 19 Sep 2003 10:25:25 +0100
2809
2810openssh (1:3.6.1p2-8) unstable; urgency=high
2811
2812 * Merge more buffer allocation fixes from new upstream version 3.7.1p1
2813 (closes: #211324).
2814
2815 -- Colin Watson <cjwatson@debian.org> Wed, 17 Sep 2003 03:07:19 +0100
2816
2817openssh (1:3.6.1p2-7) unstable; urgency=high
2818
2819 * Update debconf template translations:
2820 - French (thanks, Christian Perrier; closes: #208801).
2821 - Japanese (thanks, Kenshi Muto; closes: #210380).
2822 * Some small improvements to the English templates courtesy of Christian
2823 Perrier. I've manually unfuzzied a few translations where it was
2824 obvious, on Christian's advice, but the others will have to be updated.
2825 * Document how to generate an RSA1 host key (closes: #141703).
2826 * Incorporate NMU fix for early buffer expansion vulnerability,
2827 CAN-2003-0693 (closes: #211205). Thanks to Michael Stone.
2828
2829 -- Colin Watson <cjwatson@debian.org> Tue, 16 Sep 2003 14:32:28 +0100
2830
2831openssh (1:3.6.1p2-6.0) unstable; urgency=high
2832
2833 * SECURITY: fix for CAN-2003-0693, buffer allocation error
2834
2835 -- Michael Stone <mstone@debian.org> Tue, 16 Sep 2003 08:27:07 -0400
2836
2837openssh (1:3.6.1p2-6) unstable; urgency=medium
2838
2839 * Use a more CVS-friendly means of setting SSH_VERSION.
2840 * Update Brazilian Portuguese debconf template translation (thanks, Andre
2841 Luis Lopes; closes: #208036).
2842 * Don't run 'sshd -t' in init script if the server isn't to be run
2843 (closes: #197576).
2844 * Fix login delay, spurious auth.log entry, and PermitRootLogin
2845 information leakage due to PAM issues with upstream's recent security
2846 update (thanks, Darren Tucker; closes: #99168, #192207, #193546).
2847 * Policy version 3.6.1: recode this changelog to UTF-8.
2848
2849 -- Colin Watson <cjwatson@debian.org> Wed, 3 Sep 2003 19:14:02 +0100
2850
2851openssh (1:3.6.1p2-5) unstable; urgency=low
2852
2853 * Disable cmsg_type check for file descriptor passing when running on
2854 Linux 2.0 (closes: #150976). Remove comments about non-functional
2855 privilege separation on 2.0 from ssh/privsep_ask and ssh/privsep_tell
2856 debconf questions and from README.Debian, since it should all now work.
2857 * Fix "defails" typo in generated sshd_config (closes: #206484).
2858 * Backport upstream patch to strip trailing whitespace (including
2859 newlines) from configuration directives (closes: #192079).
2860
2861 -- Colin Watson <cjwatson@debian.org> Wed, 27 Aug 2003 02:19:57 +0100
2862
2863openssh (1:3.6.1p2-4) unstable; urgency=low
2864
2865 * getent can get just one key; no need to use grep (thanks, James Troup).
2866 * Move /usr/local/bin to the front of the default path, following
2867 /etc/login.defs (closes: #201150).
2868 * Remove specifics of problematic countries from package description
2869 (closes: #197040).
2870 * Update Spanish debconf template translation (thanks, Carlos Valdivia
2871 Yagüe; closes: #198456).
2872 * Backport upstream patch to pass monitor signals through to child
2873 (closes: #164797).
2874
2875 -- Colin Watson <cjwatson@debian.org> Sun, 27 Jul 2003 17:31:15 +0100
2876
2877openssh (1:3.6.1p2-3) unstable; urgency=low
2878
2879 * Update French debconf template translation (thanks, Christian Perrier;
2880 closes: #194323).
2881 * Version the adduser dependency for --no-create-home (closes: #195756).
2882 * Add a version of moduli(5), namely revision 1.7 of
2883 http://www.openbsd.org/cgi-bin/cvsweb/src/share/man/man5/moduli.5 with
2884 '/etc/moduli' changed to '/etc/ssh/moduli' throughout (closes: #196061).
2885
2886 -- Colin Watson <cjwatson@debian.org> Mon, 9 Jun 2003 02:51:35 +0100
2887
2888openssh (1:3.6.1p2-2) unstable; urgency=low
2889
2890 * Force /etc/default/ssh to be non-executable, since dpkg apparently
2891 doesn't deal with permissions changes on conffiles (closes: #192966).
2892 * Use debconf 0.5's seen flag rather than the deprecated isdefault.
2893 * Add GPL location to copyright file.
2894 * Remove debian/postinst.old.
2895 * Switch to po-debconf, with some careful manual use of po2debconf to
2896 ensure that the source package continues to build smoothly on woody
2897 (closes: #183986).
2898 * Update debconf template translations:
2899 - Brazilian Portugese (thanks, Andre Luis Lopes; see #183986).
2900 - Japanese (thanks, Tomohiro KUBOTA; closes: #192429).
2901 * Compile with -fno-builtin-log for now, otherwise gcc-3.3 complains
2902 "log.h:59: warning: conflicting types for built-in function `log'". The
2903 OpenSSH log() function has been renamed in upstream CVS.
2904
2905 -- Colin Watson <cjwatson@debian.org> Mon, 19 May 2003 01:52:38 +0100
2906
2907openssh (1:3.6.1p2-1) unstable; urgency=medium
2908
2909 * New upstream release, including fix for PAM user-discovery security hole
2910 (closes: #191681).
2911 * Fix ChallengeResponseAuthentication default in generated sshd_config
2912 (closes: #106037).
2913 * Put newlines after full stops in man page documentation for
2914 ProtocolKeepAlives and SetupTimeOut.
2915 * Policy version 3.5.9: support DEB_BUILD_OPTIONS=noopt, build
2916 gnome-ssh-askpass with -g and -Wall flags.
2917 * Really ask ssh/new_config debconf question before trying to fetch its
2918 value (closes: #188721).
2919 * On purge, remove only the files we know about in /etc/ssh rather than
2920 the whole thing, and remove the directory if that leaves it empty
2921 (closes: #176679).
2922 * ssh has depended on debconf for some time now with no complaints, so:
2923 - Simplify the postinst by relying on debconf being present. (The absent
2924 case was buggy anyway.)
2925 - Get rid of "if you have not installed debconf" text in README.Debian,
2926 and generally update the "/usr/bin/ssh not SUID" entry.
2927 * More README.Debian work:
2928 - Reorganize into "UPGRADE ISSUES" and "OTHER ISSUES", in an effort to
2929 make it easier for people to find the former. The upgrade issues
2930 should probably be sorted by version somehow.
2931 - Document X11UseLocalhost under "X11 Forwarding" (closes: #150913).
2932 * Fix setting of IP flags for interactive sessions (upstream bug #541).
2933
2934 -- Colin Watson <cjwatson@debian.org> Mon, 5 May 2003 17:47:40 +0100
2935
2936openssh (1:3.6.1p1-1) unstable; urgency=low
2937
2938 * New upstream release (thanks, Laurence J. Lane).
2939 * debian/control: ssh-askpass-gnome is now Section: gnome, following the
2940 override file.
2941
2942 -- Colin Watson <cjwatson@debian.org> Wed, 2 Apr 2003 00:51:02 +0100
2943
2944openssh (1:3.6p1-1) unstable; urgency=low
2945
2946 * New upstream release.
2947 - Workaround applied upstream for a bug in the interaction of glibc's
2948 getaddrinfo() with the Linux 2.2 kernel (closes: #155814).
2949 - As such, it should now be safe to remove --with-ipv4-default, so
2950 starting sshd with -6 is no longer necessary (closes: #79861 and lots
2951 of other merged bugs).
2952 - ssh-copy-id prints usage when run without arguments (closes: #71376).
2953 - scp exits 1 if ssh fails (closes: #138400).
2954 - sshd writes to utmp's ut_addr_v6 field in IPv6 mode (closes: #167867).
2955 - 'ssh-add -c' causes ssh-agent to ask the user each time a key is used
2956 (closes: #109795).
2957 * Install /etc/default/ssh non-executable (closes: #185537).
2958
2959 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2003 23:00:59 +0100
2960
2961openssh (1:3.5p1-5) unstable; urgency=low
2962
2963 * Add /etc/default/ssh (closes: #161049).
2964 * Run the init script under 'set -e' (closes: #175010).
2965 * Change the default superuser path to include /sbin, /usr/sbin, and
2966 /usr/local/sbin (closes: #128235, #151267). Using login.defs would be
2967 nice, but that belongs to another package. Without a defined API to
2968 retrieve its settings, parsing it is off-limits.
2969 * Build ssh-askpass-gnome with GNOME 2. The source package should still
2970 support building on stable with GNOME 1, using the alternate
2971 libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582).
2972
2973 -- Colin Watson <cjwatson@debian.org> Sun, 9 Mar 2003 20:12:10 +0000
2974
2975openssh (1:3.5p1-4) unstable; urgency=low
2976
2977 * Point rlogin and rcp alternatives at slogin and scp respectively rather
2978 than ssh (closes: #121103, #151666). Fix alternative removal to match;
2979 previously it was completely wrong anyway.
2980 * Find out whether /etc/ssh/sshd_not_to_be_run exists and set the debconf
2981 question's default using that information, rather than using debconf as
2982 a registry. Other solutions may be better in the long run, but this is
2983 at least correct (thanks, Matthew Woodcraft; closes: #84725).
2984 * Stop using pam_lastlog, as it doesn't currently work well as a session
2985 module when privilege separation is enabled; it can usually read
2986 /var/log/lastlog but can't write to it. Instead, just use sshd's
2987 built-in support, already enabled by default (closes: #151297, #169938).
2988 * Use 'ssh-keygen -q' rather than redirecting output to /dev/null.
2989 * Add a "this may take some time" warning when creating host keys on
2990 installation (part of #110094).
2991 * When restarting via the init script, check for sshd_not_to_be_run after
2992 stopping sshd (idea from Tomas Pospisek; closes: #149850).
2993 * Append /usr/sbin:/sbin to the init script's $PATH, just in case of
2994 strangeness (closes: #115138).
2995 * Fix a dpkg-statoverride call to redirect stdout to /dev/null, not
2996 stderr.
2997 * Correct copyright file typo: "orignal" -> "original" (closes: #176490).
2998 * Rebuild with libssl0.9.7 (closes: #176983).
2999 * We're up to policy version 3.5.6. DEB_BUILD_OPTIONS stuff still needs to
3000 be looked at.
3001
3002 -- Colin Watson <cjwatson@debian.org> Sat, 18 Jan 2003 01:37:23 +0000
3003
3004openssh (1:3.5p1-3) unstable; urgency=low
3005
3006 * Happy new year!
3007 * Use getent rather than id to find out whether the sshd user exists
3008 (closes: #150974).
3009 * Remove some duplication from the postinst's ssh-keysign setuid code.
3010 * Replace db_text with db_input throughout debian/config. (db_text has
3011 been a compatibility wrapper since debconf 0.1.5.)
3012 * Warn about PermitUserEnvironment on upgrade (closes: #167895).
3013 * Use 'make install-nokeys', and disable unused debhelper commands,
3014 thereby forward-porting the last pieces of Zack Weinberg's patch
3015 (closes: #68341).
3016 * Move the man page for gnome-ssh-askpass from the ssh package to
3017 ssh-askpass-gnome (closes: #174449).
3018 * Build with -DLOGIN_NO_ENDOPT, since Debian's /bin/login doesn't accept
3019 '--' to terminate the list of options (closes: #171554).
3020 * Add Jonathan Amery's ssh-argv0 script (closes: #111341).
3021 * Update Danish debconf template (thanks, Morten Brix Pedersen;
3022 closes: #174757).
3023 * Document setgid ssh-agent's effect on certain environment variables in
3024 README.Debian (closes: #167974).
3025 * Document interoperability problems between scp and ssh.com's server in
3026 README.Debian, and suggest some workarounds (closes: #174662).
3027
3028 -- Colin Watson <cjwatson@debian.org> Wed, 1 Jan 2003 14:18:30 +0000
3029
3030openssh (1:3.5p1-2) unstable; urgency=low
3031
3032 * Mention in the ssh package description that it provides both ssh and
3033 sshd (closes: #99680).
3034 * Create a system group for ssh-agent, not a user group (closes: #167669).
3035
3036 -- Colin Watson <cjwatson@debian.org> Mon, 4 Nov 2002 13:43:53 +0000
3037
3038openssh (1:3.5p1-1) unstable; urgency=low
3039
3040 * New upstream release.
3041 - Fixes typo in ssh-add usage (closes: #152239).
3042 - Fixes 'PermitRootLogin forced-commands-only' (closes: #166184).
3043 - ~/.ssh/environment and environment= options in ~/.ssh/authorized_keys
3044 are deprecated for security reasons and will eventually go away. For
3045 now they can be re-enabled by setting 'PermitUserEnvironment yes' in
3046 sshd_config.
3047 - ssh-agent is installed setgid to prevent ptrace() attacks. The group
3048 actually doesn't matter, as it drops privileges immediately, but to
3049 avoid confusion the postinst creates a new 'ssh' group for it.
3050 * Obsolete patches:
3051 - Solar Designer's privsep+compression patch for Linux 2.2 (see
3052 1:3.3p1-0.0woody1).
3053 - Hostbased auth ssh-keysign backport (see 1:3.4p1-4).
3054
3055 * Remove duplicated phrase in ssh_config(5) (closes: #152404).
3056 * Source the debconf confmodule at the top of the postrm rather than at
3057 the bottom, to avoid making future non-idempotency problems worse (see
3058 #151035).
3059 * Debconf templates:
3060 - Add Polish (thanks, Grzegorz Kusnierz).
3061 - Update French (thanks, Denis Barbier; closes: #132509).
3062 - Update Spanish (thanks, Carlos Valdivia Yagüe; closes: #164716).
3063 * Write a man page for gnome-ssh-askpass, and link it to ssh-askpass.1 if
3064 this is the selected ssh-askpass alternative (closes: #67775).
3065
3066 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
3067
3068openssh (1:3.4p1-4) unstable; urgency=low
3069
3070 * Allow ssh-krb5 in ssh-askpass-gnome's dependencies (closes: #129532).
3071 * Restore Russia to list of countries where encryption is problematic (see
3072 #148951 and http://www.average.org/freecrypto/).
3073 * Drop ssh-askpass-gnome's priority to optional, per the override file.
3074 * Drop the PAM special case for hurd-i386 (closes: #99157).
3075 * s/dile/idle/ in ssh_config(5) (closes: #118331).
3076 * Note in README.Debian that you need xauth from xbase-clients on the
3077 server for X11 forwarding (closes: #140269).
3078 * Use correct path to upstream README in copyright file (closes: #146037).
3079 * Document the units for ProtocolKeepAlives (closes: #159479).
3080 * Backport upstream patch to fix hostbased auth (closes: #117114).
3081 * Add -g to CFLAGS.
3082
3083 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 18:58:53 +0100
3084
3085openssh (1:3.4p1-3) unstable; urgency=low
3086
3087 * Add myself to Uploaders: and begin acting as temporary maintainer, at
3088 Matthew's request. (Normal service will resume in some months' time.)
3089 * Add sharutils to Build-Depends (closes: #138465).
3090 * Stop creating the /usr/doc/ssh symlink.
3091
3092 * Fix some debconf template typos (closes: #160358).
3093 * Split debconf templates into one file per language.
3094 * Add debconf template translations:
3095 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #106173).
3096 - Danish (thanks, Claus Hindsgaul; closes: #126607).
3097 - Japanese (thanks, Tomohiro KUBOTA; closes: #137427).
3098 - Russian (thanks, Ilgiz Kalmetev; closes: #136610).
3099 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #129041).
3100 * Update debconf template translations:
3101 - French (thanks, Igor Genibel; closes: #151361).
3102 - German (thanks, Axel Noetzold; closes: #147069).
3103 * Some of these translations are fuzzy. Please send updates.
3104
3105 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 14:09:57 +0100
3106
3107openssh (1:3.4p1-2) unstable; urgency=high
3108
3109 * Get a security-fixed version into unstable
3110 * Also tidy README.Debian up a little
3111
3112 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 17:20:59 +0100
3113
3114openssh (1:3.4p1-1) testing; urgency=high
3115
3116 * Extend my tendrils back into this package (Closes: #150915, #151098)
3117 * thanks to the security team for their work
3118 * no thanks to ISS/Theo de Raadt for their handling of these bugs
3119 * save old sshd_configs to sshd_config.dpkg-old when auto-generating a
3120 new one
3121 * tell/ask the user about PriviledgeSeparation
3122 * /etc/init.d/ssh run will now create the chroot empty dir if necessary
3123 * Remove our previous statoverride on /usr/bin/ssh (only for people
3124 upgrading from a version where we'd put one in ourselves!)
3125 * Stop slandering Russia, since someone asked so nicely (Closes: #148951)
3126 * Reduce the sleep time in /etc/init.d/ssh during a restart
3127
3128 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 15:52:10 +0100
3129
3130openssh (1:3.4p1-0.0woody1) testing-security; urgency=high
3131
3132 * NMU by the security team.
3133 * New upstream version
3134
3135 -- Michael Stone <mstone@debian.org> Wed, 26 Jun 2002 15:40:38 -0400
3136
3137openssh (1:3.3p1-0.0woody4) testing-security; urgency=high
3138
3139 * NMU by the security team.
3140 * fix error when /etc/ssh/sshd_config exists on new install
3141 * check that user doesn't exist before running adduser
3142 * use openssl internal random unconditionally
3143
3144 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 19:44:39 -0400
3145
3146openssh (1:3.3p1-0.0woody3) testing-security; urgency=high
3147
3148 * NMU by the security team.
3149 * use correct home directory when sshd user is created
3150
3151 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
3152
3153openssh (1:3.3p1-0.0woody2) testing-security; urgency=high
3154
3155 * NMU by the security team.
3156 * Fix rsa1 key creation (Closes: #150949)
3157 * don't fail if sshd user removal fails
3158 * depends: on adduser (Closes: #150907)
3159
3160 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
3161
3162openssh (1:3.3p1-0.0woody1) testing-security; urgency=high
3163
3164 * NMU by the security team.
3165 * New upstream version.
3166 - Enable privilege separation by default.
3167 * Include patch from Solar Designer for privilege separation and
3168 compression on 2.2.x kernels.
3169 * Remove --disable-suid-ssh from configure.
3170 * Support setuid ssh-keysign binary instead of setuid ssh client.
3171 * Check sshd configuration before restarting.
3172
3173 -- Daniel Jacobowitz <dan@debian.org> Mon, 24 Jun 2002 13:43:44 -0400
3174
3175openssh (1:3.0.2p1-9) unstable; urgency=high
3176
3177 * Thanks to those who NMUd
3178 * The only change in this version is to debian/control - I've removed
3179 the bit that says you can't export it from the US - it would look
3180 pretty daft to say this about a package in main! Also, it's now OK
3181 to use crypto in France, so I've edited that comment slightly
3182 * Correct a path in README.Debian too (Closes: #138634)
3183
3184 -- Matthew Vernon <matthew@debian.org> Sun, 4 Apr 2002 09:52:59 +0100
3185
3186openssh (1:3.0.2p1-8.3) unstable; urgency=medium
3187
3188 * NMU
3189 * Really set urgency to medium this time (oops)
3190 * Fix priority to standard per override while I'm at it
3191
3192 -- Aaron M. Ucko <ucko@debian.org> Sun, 24 Mar 2002 09:00:08 -0500
3193
3194openssh (1:3.0.2p1-8.2) unstable; urgency=low
3195
3196 * NMU with maintainer's permission
3197 * Prepare for upcoming ssh-nonfree transitional packages per
3198 <http://lists.debian.org/debian-ssh/2002/debian-ssh-200203/msg00008.html>
3199 * Urgency medium because it would really be good to get this into woody
3200 before it releases
3201 * Fix sections to match override file
3202 * Reissued due to clash with non-US -> main move
3203
3204 -- Aaron M. Ucko <ucko@debian.org> Sat, 23 Mar 2002 21:21:52 -0500
3205
3206openssh (1:3.0.2p1-8.1) unstable; urgency=low
3207
3208 * NMU
3209 * Move from non-US to mani
3210
3211 -- LaMont Jones <lamont@debian.org> Thu, 21 Mar 2002 09:33:50 -0700
3212
3213openssh (1:3.0.2p1-8) unstable; urgency=critical
3214
3215 * Security fix - patch from upstream (Closes: #137209, #137210)
3216 * Undo the changes in the unreleased -7, since they appear to break
3217 things here. Accordingly, the code change is minimal, and I'm
3218 happy to get it into testing ASAP
3219
3220 -- Matthew Vernon <matthew@debian.org> Thu, 7 Mar 2002 14:25:23 +0000
3221
3222openssh (1:3.0.2p1-7) unstable; urgency=high
3223
3224 * Build to support IPv6 and IPv4 by default again
3225
3226 -- Matthew Vernon <matthew@debian.org> Sat, 2 Mar 2002 00:25:05 +0000
3227
3228openssh (1:3.0.2p1-6) unstable; urgency=high
3229
3230 * Correct error in the clean target (Closes: #130868)
3231
3232 -- Matthew Vernon <matthew@debian.org> Sat, 26 Jan 2002 00:32:00 +0000
3233
3234openssh (1:3.0.2p1-5) unstable; urgency=medium
3235
3236 * Include the Debian version in our identification, to make it easier to
3237 audit networks for patched versions in future
3238
3239 -- Matthew Vernon <matthew@debian.org> Mon, 21 Jan 2002 17:16:10 +0000
3240
3241openssh (1:3.0.2p1-4) unstable; urgency=medium
3242
3243 * If we're asked to not run sshd, stop any running sshd's first
3244 (Closes: #129327)
3245
3246 -- Matthew Vernon <matthew@debian.org> Wed, 16 Jan 2002 21:24:16 +0000
3247
3248openssh (1:3.0.2p1-3) unstable; urgency=high
3249
3250 * Fix /etc/pam.d/ssh to not set $MAIL (Closes: #128913)
3251 * Remove extra debconf suggestion (Closes: #128094)
3252 * Mmm. speedy bug-fixing :-)
3253
3254 -- Matthew Vernon <matthew@debian.org> Sat, 12 Jan 2002 17:23:58 +0000
3255
3256openssh (1:3.0.2p1-2) unstable; urgency=high
3257
3258 * Fix postinst to not automatically overwrite sshd_config (!)
3259 (Closes: #127842, #127867)
3260 * Add section in README.Debian about the PermitRootLogin setting
3261
3262 -- Matthew Vernon <matthew@debian.org> Sat, 5 Jan 2003 05:26:30 +0000
3263
3264openssh (1:3.0.2p1-1) unstable; urgency=high
3265
3266 * Incorporate fix from Colin's NMU
3267 * New upstream version (fixes the bug Wichert fixed) (Closes: #124035)
3268 * Capitalise IETF (Closes: #125379)
3269 * Refer to the correct sftp-server location (Closes: #126854, #126224)
3270 * Do what we're asked re SetUID ssh (Closes: #124065, #124154, #123247)
3271 * Ask people upgrading from potato if they want a new conffile
3272 (Closes: #125642)
3273 * Fix a typo in postinst (Closes: #122192, #122410, #123440)
3274 * Frob the default config a little (Closes: #122284, #125827, #125696,
3275 #123854)
3276 * Make /etc/init.d/ssh be more clear about ssh not running (Closes:
3277 #123552)
3278 * Fix typo in templates file (Closes: #123411)
3279
3280 -- Matthew Vernon <matthew@debian.org> Fri, 4 Jan 2002 16:01:52 +0000
3281
3282openssh (1:3.0.1p1-1.2) unstable; urgency=high
3283
3284 * Non-maintainer upload
3285 * Prevent local users from passing environment variables to the login
3286 process when UseLogin is enabled
3287
3288 -- Wichert Akkerman <wakkerma@debian.org> Mon, 3 Dec 2001 19:34:45 +0100
3289
3290openssh (1:3.0.1p1-1.1) unstable; urgency=low
3291
3292 * Non-maintainer upload, at Matthew's request.
3293 * Remove sa_restorer assignment to fix compilation on alpha, hppa, and
3294 ia64 (closes: #122086).
3295
3296 -- Colin Watson <cjwatson@debian.org> Sun, 2 Dec 2001 18:54:16 +0000
3297
3298openssh (1:3.0.1p1-1) unstable; urgency=high
3299
3300 * New upstream version (Closes: #113646, #113513, #114707, #118564)
3301 * Building with a libc that works (!) (Closes: #115228)
3302 * Patches forward-ported are -1/-2 options for scp, the improvement to
3303 'waiting for forwarded connections to terminate...'
3304 * Fix /etc/init.d/ssh to stop sshd properly (Closes: #115228)
3305 * /etc/ssh/sshd_config is no longer a conffile but generated in the postinst
3306 * Remove suidregister leftover from postrm
3307 * Mention key we are making in the postinst
3308 * Default to not enable SSH protocol 1 support, since protocol 2 is
3309 much safer anyway.
3310 * New version of the vpn-fixes patch, from Ian Jackson
3311 * New handling of -q, and added new -qq option; thanks to Jon Amery
3312 * Experimental smartcard support not enabled, since I have no way of
3313 testing it.
3314
3315 -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000
3316
3317openssh (1:2.9p2-6) unstable; urgency=low
3318
3319 * check for correct file in /etc/init.d/ssh (Closes: #110876)
3320 * correct location of version 2 keys in ssh.1 (Closes: #110439)
3321 * call update-alternatives --quiet (Closes: #103314)
3322 * hack ssh-copy-id to chmod go-w (Closes: #95551)
3323 * TEMPORARY fix to provide largefile support using a -D in the cflags
3324 line. long-term, upstream will patch the autoconf stuff
3325 (Closes: #106809, #111849)
3326 * remove /etc/rc references in ssh-keygen.1 (Closes: #68350)
3327 * scp.1 patch from Adam McKenna to document -r properly (Closes: #76054)
3328 * Check for files containing a newline character (Closes: #111692)
3329
3330 -- Matthew Vernon <matthew@debian.org> Thu, 13 Sep 2001 16:47:36 +0100
3331
3332openssh (1:2.9p2-5) unstable; urgency=high
3333
3334 * Thanks to all the bug-fixers who helped!
3335 * remove sa_restorer assignment (Closes: #102837)
3336 * patch from Peter Benie to DTRT wrt X forwarding if the server refuses
3337 us access (Closes: #48297)
3338 * patch from upstream CVS to fix port forwarding (Closes: #107132)
3339 * patch from Jonathan Amery to document ssh-keygen behaviour
3340 (Closes:#106643, #107512)
3341 * patch to postinst from Jonathan Amery (Closes: #106411)
3342 * patch to manpage from Jonathan Amery (Closes: #107364)
3343 * patch from Matthew Vernon to make -q emit fatal errors as that is the
3344 documented behaviour (Closes: #64347)
3345 * patch from Ian Jackson to cause us to destroy a file when we scp it
3346 onto itself, rather than dumping bits of our memory into it, which was
3347 a security hole (see #51955)
3348 * patch from Jonathan Amery to document lack of Kerberos support
3349 (Closes: #103726)
3350 * patch from Matthew Vernon to make the 'waiting for connections to
3351 terminate' message more helpful (Closes: #50308)
3352
3353 -- Matthew Vernon <matthew@debian.org> Thu, 23 Aug 2001 02:14:09 +0100
3354
3355openssh (1:2.9p2-4) unstable; urgency=high
3356
3357 * Today's build of ssh is strawberry flavoured
3358 * Patch from mhp to reduce length of time sshd is stopped for (Closes: #106176)
3359 * Tidy up debconf template (Closes: #106152)
3360 * If called non-setuid, then setgid()'s failure should not be fatal (see
3361 #105854)
3362
3363 -- Matthew Vernon <matthew@debian.org> Sun, 22 Jul 2001 14:19:43 +0100
3364
3365openssh (1:2.9p2-3) unstable; urgency=low
3366
3367 * Patch from yours truly to add -1 and -2 options to scp (Closes: #106061)
3368 * Improve the IdentityFile section in the man page (Closes: #106038)
3369
3370 -- Matthew Vernon <matthew@debian.org> Sat, 21 Jul 2001 14:47:27 +0100
3371
3372openssh (1:2.9p2-2) unstable; urgency=low
3373
3374 * Document the protocol version 2 and IPV6 changes (Closes: #105845, #105868)
3375 * Make PrintLastLog 'no' by default (Closes: #105893)
3376
3377 -- Matthew Vernon <matthew@debian.org> Thu, 19 Jul 2001 18:36:41 +0100
3378
3379openssh (1:2.9p2-1) unstable; urgency=low
3380
3381 * new (several..) upstream version (Closes: #96726, #81856, #96335)
3382 * Hopefully, this will close some other bugs too
3383
3384 -- Matthew Vernon <matthew@debian.org> Tue, 17 Jul 2001 19:41:58 +0100
3385
3386openssh (1:2.5.2p2-3) unstable; urgency=low
3387
3388 * Taking Over this package
3389 * Patches from Robert Bihlmeyer for the Hurd (Closes: #102991)
3390 * Put PermitRootLogin back to yes (Closes: #67334, #67371, #78274)
3391 * Don't fiddle with conf-files any more (Closes: #69501)
3392
3393 -- Matthew Vernon <matthew@debian.org> Tue, 03 Jul 2001 02:58:13 +0100
3394
3395openssh (1:2.5.2p2-2.2) unstable; urgency=low
3396
3397 * NMU
3398 * Include Hurd compatibility patches from Robert Bihlmeyer (Closes: #76033)
3399 * Patch from Richard Kettlewell for protocolkeepalives (Closes: #99273)
3400 * Patch from Matthew Vernon for BannerTimeOut, batchmode, and
3401 documentation for protocolkeepalives. Makes ssh more generally useful
3402 for scripting uses (Closes: #82877, #99275)
3403 * Set a umask, so ourpidfile isn't world-writable (closes: #100012,
3404 #98286, #97391)
3405
3406 -- Matthew Vernon <matthew@debian.org> Thu, 28 Jun 2001 23:15:42 +0100
3407
3408openssh (1:2.5.2p2-2.1) unstable; urgency=low
3409
3410 * NMU
3411 * Remove duplicate Build-Depends for libssl096-dev and change it to
3412 depend on libssl-dev instaed. Also adding in virtual | real package
3413 style build-deps. (Closes: #93793, #75228)
3414 * Removing add-log entry (Closes: #79266)
3415 * This was a pam bug from a while back (Closes: #86908, #88457, #86843)
3416 * pam build-dep already exists (Closes: #93683)
3417 * libgnome-dev build-dep already exists (Closes: #93694)
3418 * No longer in non-free (Closes: #85401)
3419 * Adding in fr debconf translations (Closes: #83783)
3420 * Already suggests xbase-clients (Closes: #79741)
3421 * No need to suggest libpam-pwdb anymore (Closes: #81658)
3422 * Providing rsh-client (Closes: #79437)
3423 * hurd patch was already applied (Closes: #76033)
3424 * default set to no (Closes: #73682)
3425 * Adding in a suggests for dnsutils (Closes: #93265)
3426 * postinst bugs fixed (Closes: #88057, #88066, #88196, #88405, #88612)
3427 (Closes: #88774, #88196, #89556, #90123, #90228, #90833, #87814, #85465)
3428 * Adding in debconf dependency
3429
3430 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Apr 2001 14:11:04 +0100
3431
3432openssh (1:2.5.2p2-2) unstable; urgency=high
3433
3434 * disable the OpenSSL version check in entropy.c
3435 (closes: #93581, #93588, #93590, #93614, #93619, #93635, #93648)
3436
3437 -- Philip Hands <phil@uk.alcove.com> Wed, 11 Apr 2001 20:30:04 +0100
3438
3439openssh (1:2.5.2p2-1) unstable; urgency=low
3440
3441 * New upstream release
3442 * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes: #86069, #87748)
3443 * fix double space indent in german templates (closes: #89493)
3444 * make postinst check for ssh_host_rsa_key
3445 * get rid of the last of the misguided debian/rules NMU debris :-/
3446
3447 -- Philip Hands <phil@hands.com> Sat, 24 Mar 2001 20:59:33 +0000
3448
3449openssh (1:2.5.1p2-2) unstable; urgency=low
3450
3451 * rebuild with new debhelper (closes: #89558, #89536, #90225)
3452 * fix broken dpkg-statoverride test in postinst
3453 (closes: #89612, #90474, #90460, #89605)
3454 * NMU bug fixed but not closed in last upload (closes: #88206)
3455
3456 -- Philip Hands <phil@hands.com> Fri, 23 Mar 2001 16:11:33 +0000
3457
3458openssh (1:2.5.1p2-1) unstable; urgency=high
3459
3460 * New upstream release
3461 * fix typo in postinst (closes: #88110)
3462 * revert to setting PAM service name in debian/rules, backing out last
3463 NMU, which also (closes: #88101)
3464 * restore the pam lastlog/motd lines, lost during the NMUs, and sshd_config
3465 * restore printlastlog option patch
3466 * revert to using debhelper, which had been partially disabled in NMUs
3467
3468 -- Philip Hands <phil@hands.com> Tue, 13 Mar 2001 01:41:34 +0000
3469
3470openssh (1:2.5.1p1-1.8) unstable; urgency=high
3471
3472 * And now the old pam-bug s/sshd/ssh in ssh.c is also fixed
3473
3474 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 19:48:01 +0100
3475
3476openssh (1:2.5.1p1-1.7) unstable; urgency=high
3477
3478 * And now we mark the correct binary as setuid, when a user requested
3479 to install it setuid.
3480
3481 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 07:19:56 +0100
3482
3483openssh (1:2.5.1p1-1.6) unstable; urgency=high
3484
3485 * Fixes postinst to handle overrides that are already there. Damn, I
3486 should have noticed the bug earlier.
3487
3488 -- Christian Kurz <shorty@debian.org> Wed, 28 Feb 2001 22:35:00 +0100
3489
3490openssh (1:2.5.1p1-1.5) unstable; urgency=high
3491
3492 * Rebuild ssh with pam-support.
3493
3494 -- Christian Kurz <shorty@debian.org> Mon, 26 Feb 2001 21:55:51 +0100
3495
3496openssh (1:2.5.1p1-1.4) unstable; urgency=low
3497
3498 * Added Build-Depends on libssl096-dev.
3499 * Fixed sshd_config file to disallow root logins again.
3500
3501 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 20:03:55 +0100
3502
3503openssh (1:2.5.1p1-1.3) unstable; urgency=low
3504
3505 * Fixed missing manpages for sftp.1 and ssh-keyscan.1
3506 * Made package policy 3.5.2 compliant.
3507
3508 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 15:46:26 +0100
3509
3510openssh (1:2.5.1p1-1.2) unstable; urgency=low
3511
3512 * Added Conflict with sftp, since we now provide our own sftp-client.
3513 * Added a fix for our broken dpkg-statoverride call in the
3514 2.3.0p1-13.
3515 * Fixed some config pathes in the comments of sshd_config.
3516 * Removed ssh-key-exchange-vulnerability-patch since it's not needed
3517 anymore because upstream included the fix.
3518
3519 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 13:46:58 +0100
3520
3521openssh (1:2.5.1p1-1.1) unstable; urgency=high
3522
3523 * Another NMU to get the new upstream version 2.5.1p1 into
3524 unstable. (Closes: #87123)
3525 * Corrected postinst to mark ssh as setuid. (Closes: #86391, #85766)
3526 * Key Exchange patch is already included by upstream. (Closes: #86015)
3527 * Upgrading should be possible now. (Closes: #85525, #85523)
3528 * Added --disable-suid-ssh as compile option, so ssh won't get installed
3529 suid per default.
3530 * Fixed postinst to run dpkg-statoverride only, when dpkg-statoverride
3531 is available and the mode of the binary should be 4755. And also added
3532 suggestion for a newer dpkg.
3533 (Closes: #85734, #85741, #86876)
3534 * sftp and ssh-keyscan will also be included from now on. (Closes: #79994)
3535 * scp now understands spaces in filenames (Closes: #53783, #58958,
3536 #66723)
3537 * ssh-keygen now supports showing DSA fingerprints. (Closes: #68623)
3538 * ssh doesn' t show motd anymore when switch -t is used. (Closes #69035)
3539 * ssh supports the usage of other dsa keys via the ssh command line
3540 options. (Closes: #81250)
3541 * Documentation in sshd_config fixed. (Closes: #81088)
3542 * primes file included by upstream and included now. (Closes: #82101)
3543 * scp now allows dots in the username. (Closes: #82477)
3544 * Spelling error in ssh-copy-id.1 corrected by upstream. (Closes: #78124)
3545
3546 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 10:06:08 +0100
3547
3548openssh (1:2.3.0p1-1.13) unstable; urgency=low
3549
3550 * Config should now also be fixed with this hopefully last NMU.
3551
3552 -- Christian Kurz <shorty@debian.org> Sat, 10 Feb 2001 22:56:36 +0100
3553
3554openssh (1:2.3.0p1-1.12) unstable; urgency=high
3555
3556 * Added suggest for xbase-clients to control-file. (Closes #85227)
3557 * Applied patch from Markus Friedl to fix a vulnerability in
3558 the rsa keyexchange.
3559 * Fixed position of horizontal line. (Closes: #83613)
3560 * Fixed hopefully the grep problem in the config-file. (Closes: #78802)
3561 * Converted package from suidregister to dpkg-statoverride.
3562
3563 -- Christian Kurz <shorty@debian.org> Fri, 9 Feb 2001 19:43:55 +0100
3564
3565openssh (1:2.3.0p1-1.11) unstable; urgency=medium
3566
3567 * Fixed some typos in the german translation of the debconf
3568 template.
3569
3570 -- Christian Kurz <shorty@debian.org> Wed, 24 Jan 2001 18:22:38 +0100
3571
3572openssh (1:2.3.0p1-1.10) unstable; urgency=medium
3573
3574 * Fixed double printing of motd. (Closes: #82618)
3575
3576 -- Christian Kurz <shorty@debian.org> Tue, 23 Jan 2001 21:03:43 +0100
3577
3578openssh (1:2.3.0p1-1.9) unstable; urgency=high
3579
3580 * And the next NMU which includes the patch from Andrew Bartlett
3581 and Markus Friedl to fix the root privileges handling of openssh.
3582 (Closes: #82657)
3583
3584 -- Christian Kurz <shorty@debian.org> Wed, 17 Jan 2001 22:20:54 +0100
3585
3586openssh (1:2.3.0p1-1.8) unstable; urgency=high
3587
3588 * Applied fix from Ryan Murray to allow building on other architectures
3589 since the hurd patch was wrong. (Closes: #82471)
3590
3591 -- Christian Kurz <shorty@debian.org> Tue, 16 Jan 2001 22:45:51 +0100
3592
3593openssh (1:2.3.0p1-1.7) unstable; urgency=medium
3594
3595 * Fixed another typo on sshd_config
3596
3597 -- Christian Kurz <shorty@debian.org> Sun, 14 Jan 2001 19:01:31 +0100
3598
3599openssh (1:2.3.0p1-1.6) unstable; urgency=high
3600
3601 * Added Build-Dependency on groff (Closes: #81886)
3602 * Added Build-Depencency on debhelper (Closes: #82072)
3603 * Fixed entry for known_hosts in sshd_config (Closes: #82096)
3604
3605 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 23:08:16 +0100
3606
3607openssh (1:2.3.0p1-1.5) unstable; urgency=high
3608
3609 * Fixed now also the problem with sshd used as default ipv4 and
3610 didn't use IPv6. This should be now fixed.
3611
3612 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 21:25:55 +0100
3613
3614openssh (1:2.3.0p1-1.4) unstable; urgency=high
3615
3616 * Fixed buggy entry in postinst.
3617
3618 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 23:12:16 +0100
3619
3620openssh (1:2.3.0p1-1.3) unstable; urgency=high
3621
3622 * After finishing the rewrite of the rules-file I had to notice that
3623 the manpage installation was broken. This should now work again.
3624
3625 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 22:11:59 +0100
3626
3627openssh (1:2.3.0p1-1.2) unstable; urgency=high
3628
3629 * Fixed the screwed up build-dependency.
3630 * Removed --with-ipv4-default to support ipv6.
3631 * Changed makefile to use /etc/pam.d/ssh instead of /etc/pam.d/sshd.
3632 * Fixed location to sftp-server in config.
3633 * Since debian still relies on /etc/pam.d/ssh instead of moving to
3634 /etc/pam.d/sshd, I had to hack ssh.h to get ssh to use this name.
3635 * Fixed path to host key in sshd_config.
3636
3637 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 08:23:47 +0100
3638
3639openssh (1:2.3.0p1-1.1) unstable; urgency=medium
3640
3641 * NMU with permission of Phil Hands.
3642 * New upstream release
3643 * Update Build-Depends to point to new libssl096.
3644 * This upstream release doesn't leak any information depending
3645 on the setting of PermitRootLogin (Closes: #59933)
3646 * New upstream release contains fix against forcing a client to
3647 do X/agent forwarding (Closes: #76788)
3648 * Changed template to contain correct path to the documentation
3649 (Closes: #67245)
3650 * Added --with-4in6 switch as compile option into debian/rules.
3651 * Added --with-ipv4-default as compile option into debian/rules.
3652 (Closes: #75037)
3653 * Changed default path to also contain /usr/local/bin and
3654 /usr/X11R6/bin (Closes: #62472,#54567,#62810)
3655 * Changed path to sftp-server in sshd_config to match the
3656 our package (Closes: #68347)
3657 * Replaced OpenBSDh with OpenBSD in the init-script.
3658 * Changed location to original source in copyright.head
3659 * Changed behaviour of init-script when invoked with the option
3660 restart (Closes: #68706,#72560)
3661 * Added a note about -L option of scp to README.Debian
3662 * ssh won't print now the motd if invoked with -t option
3663 (Closes: #59933)
3664 * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867)
3665 * Added a note about tcp-wrapper support to README.Debian
3666 (Closes: #72807,#22190)
3667 * Removed two unneeded options from building process.
3668 * Added sshd.pam into debian dir and install it.
3669 * Commented out unnecessary call to dh_installinfo.
3670 * Added a line to sshd.pam so that limits will be paid attention
3671 to (Closes: #66904)
3672 * Restart Option has a Timeout of 10 seconds (Closes: 51264)
3673 * scp won't override files anymore (Closes: 51955)
3674 * Removed pam_lastlog module, so that the lastlog is now printed
3675 only once (Closes: #71742, #68335, #69592, #71495, #77781)
3676 * If password is expired, openssh now forces the user to change it.
3677 (Closes: #51747)
3678 * scp should now have no more problems with shell-init-files that
3679 produces ouput (Closes: #56280,#59873)
3680 * ssh now prints the motd correctly (Closes: #66926)
3681 * ssh upgrade should disable ssh daemon only if users has choosen
3682 to do so (Closes: #67478)
3683 * ssh can now be installed suid (Closes: #70879)
3684 * Modified debian/rules to support hurd.
3685
3686 -- Christian Kurz <shorty@debian.org> Wed, 27 Dec 2000 20:06:57 +0100
3687
3688openssh (1:2.2.0p1-1.1) unstable; urgency=medium
3689
3690 * Non-Maintainer Upload
3691 * Check for new returns in the new libc
3692 (closes: #72803, #74393, #72797, #71307, #71702)
3693 * Link against libssl095a (closes: #66304)
3694 * Correct check for PermitRootLogin (closes: #69448)
3695
3696 -- Ryan Murray <rmurray@debian.org> Wed, 18 Oct 2000 00:48:18 -0700
3697
3698openssh (1:2.2.0p1-1) unstable; urgency=low
3699
3700 * New upstream release
3701
3702 -- Philip Hands <phil@hands.com> Mon, 11 Sep 2000 14:49:43 +0100
3703
3704openssh (1:2.1.1p4-3) unstable; urgency=low
3705
3706 * add rsh alternatives
3707 * add -S option to scp (using Tommi Virtanen's patch) (closes: #63097)
3708 * do the IPV4_DEFAULT thing properly this time
3709
3710 -- Philip Hands <phil@hands.com> Fri, 11 Aug 2000 18:14:37 +0100
3711
3712openssh (1:2.1.1p4-2) unstable; urgency=low
3713
3714 * reinstate manpage .out patch from 1:1.2.3
3715 * fix typo in postinst
3716 * only compile ssh with IPV4_DEFAULT
3717 * apply James Troup's patch to add a -o option to scp and updated manpage
3718
3719 -- Philip Hands <phil@hands.com> Sun, 30 Jul 2000 00:12:49 +0100
3720
3721openssh (1:2.1.1p4-1) unstable; urgency=low
3722
3723 * New upstream release
3724
3725 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 14:46:16 +0100
3726
3727openssh (1:1.2.3-10) unstable; urgency=low
3728
3729 * add version to libpam-modules dependency, because old versions of
3730 pam_motd make it impossible to log in.
3731
3732 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 13:28:22 +0100
3733
3734openssh (1:1.2.3-9) frozen unstable; urgency=low
3735
3736 * force location of /usr/bin/X11/xauth
3737 (closes: #64424, #66437, #66859) *RC*
3738 * typos in config (closes: #66779, #66780)
3739 * sshd_not_to_be_run could be assumed to be true, in error, if the config
3740 script died in an unusual way --- I've reversed this (closes: #66335)
3741 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to ssh-askpass-ptk
3742 (closes: #65981)
3743 * change default for PermitRootLogin to "no" (closes: #66406)
3744
3745 -- Philip Hands <phil@hands.com> Tue, 11 Jul 2000 20:51:18 +0100
3746
3747openssh (1:1.2.3-8) frozen unstable; urgency=low
3748
3749 * get rid of Provides: rsh-server (this will mean that rstartd
3750 will need to change it's depends to deal with #63948, which I'm
3751 reopening) (closes: #66257)
3752 Given that this is also a trivial change, and is a reversal of a
3753 change that was mistakenly made after the freeze, I think this should
3754 also go into frozen.
3755
3756 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:26:30 +0100
3757
3758openssh (1:1.2.3-7) frozen unstable; urgency=low
3759
3760 * check if debconf is installed before calling db_stop in postinst.
3761 This is required to allow ssh to be installed when debconf is not
3762 wanted, which probably makes it an RC upload (hopefully the last of
3763 too many).
3764
3765 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:19:47 +0100
3766
3767openssh (1:1.2.3-6) frozen unstable; urgency=low
3768
3769 * fixed depressing little bug involving a line wrap looking like
3770 a blank line in the templates file *RC*
3771 (closes: #66090, #66078, #66083, #66182)
3772
3773 -- Philip Hands <phil@hands.com> Mon, 26 Jun 2000 00:45:05 +0100
3774
3775openssh (1:1.2.3-5) frozen unstable; urgency=low
3776
3777 * add code to prevent UseLogin exploit, although I think our PAM
3778 conditional code breaks UseLogin in a way that protects us from this
3779 exploit anyway. ;-) (closes: #65495) *RC*
3780 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to fix keyboard
3781 grab vulnerability in ssh-askpass-gnome (closes: #64795) *RC*
3782 * stop redirection of sshd's file descriptors (introduced in 1:1.2.3-3)
3783 and use db_stop in the postinst to solve that problem instead
3784 (closes: #65104)
3785 * add Provides: rsh-server to ssh (closes: #63948)
3786 * provide config option not to run sshd
3787
3788 -- Philip Hands <phil@hands.com> Mon, 12 Jun 2000 23:05:11 +0100
3789
3790openssh (1:1.2.3-4) frozen unstable; urgency=low
3791
3792 * fixes #63436 which is *RC*
3793 * add 10 second pause in init.d restart (closes: #63844)
3794 * get rid of noenv in PAM mail line (closes: #63856)
3795 * fix host key path in make-ssh-known-hosts (closes: #63713)
3796 * change wording of SUID template (closes: #62788, #63436)
3797
3798 -- Philip Hands <phil@hands.com> Sat, 27 May 2000 11:18:06 +0100
3799
3800openssh (1:1.2.3-3) frozen unstable; urgency=low
3801
3802 * redirect sshd's file descriptors to /dev/null in init to
3803 prevent debconf from locking up during installation
3804 ** grave bug just submited by me **
3805
3806 -- Philip Hands <phil@hands.com> Thu, 20 Apr 2000 17:10:59 +0100
3807
3808openssh (1:1.2.3-2) frozen unstable; urgency=low
3809
3810 * allow user to select SUID status of /usr/bin/ssh (closes: 62462) ** RC **
3811 * suggest debconf
3812 * conflict with debconf{,-tiny} (<<0.2.17) so I can clean up the preinst
3813
3814 -- Philip Hands <phil@hands.com> Wed, 19 Apr 2000 17:49:15 +0100
3815
3816openssh (1:1.2.3-1) frozen unstable; urgency=low
3817
3818 * New upstream release
3819 * patch sshd to create extra xauth key required for localhost
3820 (closes: #49944) *** RC ***
3821 * FallbacktoRsh now defaults to ``no'' to match impression
3822 given in sshd_config
3823 * stop setting suid bit on ssh (closes: #58711, #58558)
3824 This breaks Rhosts authentication (which nobody uses) and allows
3825 the LD_PRELOAD trick to get socks working, so seems like a net benefit.
3826
3827 -- Philip Hands <phil@hands.com> Thu, 13 Apr 2000 20:01:54 +0100
3828
3829openssh (1:1.2.2-1.4) frozen unstable; urgency=low
3830
3831 * Recompile for frozen, contains fix for RC bug.
3832
3833 -- Tommi Virtanen <tv@debian.org> Tue, 29 Feb 2000 22:14:58 +0200
3834
3835openssh (1:1.2.2-1.3) unstable; urgency=low
3836
3837 * Integrated man page addition for PrintLastLog.
3838 This bug was filed on "openssh", and I ended up
3839 creating my own patch for this (closes: #59054)
3840 * Improved error message when ssh_exchange_identification
3841 gets EOF (closes: #58904)
3842 * Fixed typo (your -> you're) in debian/preinst.
3843 * Added else-clauses to config to make this upgradepath possible:
3844 oldssh -> openssh preinst fails due to upgrade_to_openssh=false
3845 -> ssh-nonfree -> openssh. Without these, debconf remembered
3846 the old answer, config didn't force asking it, and preinst always
3847 aborted (closes: #56596, #57782)
3848 * Moved setting upgrade_to_openssh isdefault flag to the place
3849 where preinst would abort. This means no double question to most
3850 users, people who currently suffer from "can't upgrade" may need
3851 to run apt-get install ssh twice. Did not do the same for
3852 use_old_init_script, as the situation is a bit different, and
3853 less common (closes: #54010, #56224)
3854 * Check for existance of ssh-keygen before attempting to use it in
3855 preinst, added warning for non-existant ssh-keygen in config. This
3856 happens when the old ssh is removed (say, due to ssh-nonfree getting
3857 installed).
3858
3859 -- Tommi Virtanen <tv@debian.org> Sun, 27 Feb 2000 21:36:43 +0200
3860
3861openssh (1:1.2.2-1.2) frozen unstable; urgency=low
3862
3863 * Non-maintainer upload.
3864 * Added configuration option PrintLastLog, default off due to PAM
3865 (closes: #54007, #55042)
3866 * ssh-askpass-{gnome,ptk} now provide ssh-askpass, making ssh's
3867 Suggests: line more accurate. Also closing related bugs fixed
3868 earlier, when default ssh-askpass moved to /usr/bin.
3869 (closes: #52403, #54741, #50607, #52298, #50967, #51661)
3870 * Patched to call vhangup, with autoconf detection and all
3871 (closes: #55379)
3872 * Added --with-ipv4-default workaround to a glibc bug causing
3873 slow DNS lookups, as per UPGRADING. Use -6 to really use
3874 IPv6 addresses. (closes: #57891, #58744, #58713, #57970)
3875 * Added noenv to PAM pam_mail line. Thanks to Ben Collins.
3876 (closes: #58429)
3877 * Added the UPGRADING file to the package.
3878 * Added frozen to the changelog line and recompiled before
3879 package was installed into the archive.
3880
3881 -- Tommi Virtanen <tv@debian.org> Fri, 25 Feb 2000 22:08:57 +0200
3882
3883openssh (1:1.2.2-1.1) frozen unstable; urgency=low
3884
3885 * Non-maintainer upload.
3886 * Integrated scp pipe buffer patch from Ben Collins
3887 <benc@debian.org>, should now work even if reading
3888 a pipe gives less than fstat st_blksize bytes.
3889 Should now work on Alpha and Sparc Linux (closes: #53697, #52071)
3890 * Made ssh depend on libssl09 (>= 0.9.4-3) (closes: #51393)
3891 * Integrated patch from Ben Collins <benc@debian.org>
3892 to do full shadow account locking and expiration
3893 checking (closes: #58165, #51747)
3894
3895 -- Tommi Virtanen <tv@debian.org> Tue, 22 Feb 2000 20:46:12 +0200
3896
3897openssh (1:1.2.2-1) frozen unstable; urgency=medium
3898
3899 * New upstream release (closes: #56870, #56346)
3900 * built against new libesd (closes: #56805)
3901 * add Colin Watson <cjw44@cam.ac.uk> =NULL patch
3902 (closes: #49902, #54894)
3903 * use socketpairs as suggested by Andrew Tridgell to eliminate rsync
3904 (and other) lockups
3905 * patch SSHD_PAM_SERVICE back into auth-pam.c, again :-/
3906 (closes: #49902, #55872, #56959)
3907 * uncoment the * line in ssh_config (closes: #56444)
3908
3909 * #54894 & #49902 are release critical, so this should go in frozen
3910
3911 -- Philip Hands <phil@hands.com> Wed, 9 Feb 2000 04:52:04 +0000
3912
3913openssh (1:1.2.1pre24-1) unstable; urgency=low
3914
3915 * New upstream release
3916
3917 -- Philip Hands <phil@hands.com> Fri, 31 Dec 1999 02:47:24 +0000
3918
3919openssh (1:1.2.1pre23-1) unstable; urgency=low
3920
3921 * New upstream release
3922 * excape ? in /etc/init.d/ssh (closes: #53269)
3923
3924 -- Philip Hands <phil@hands.com> Wed, 29 Dec 1999 16:50:46 +0000
3925
3926openssh (1:1.2pre17-1) unstable; urgency=low
3927
3928 * New upstream release
3929
3930 -- Philip Hands <phil@hands.com> Thu, 9 Dec 1999 16:50:40 +0000
3931
3932openssh (1:1.2pre16-1) unstable; urgency=low
3933
3934 * New upstream release
3935 * upstream release (1.2pre14) (closes: #50299)
3936 * make ssh depend on libwrap0 (>= 7.6-1.1) (closes: #50973, #50776)
3937 * dispose of grep -q broken pipe message in config script (closes: #50855)
3938 * add make-ssh-known-hosts (closes: #50660)
3939 * add -i option to ssh-copy-id (closes: #50657)
3940 * add check for *LK* in password, indicating a locked account
3941
3942 -- Philip Hands <phil@hands.com> Wed, 8 Dec 1999 22:59:38 +0000
3943
3944openssh (1:1.2pre13-1) unstable; urgency=low
3945
3946 * New upstream release
3947 * make sshd.c use SSHD_PAM_SERVICE and define it as "ssh" in debian/rules
3948 * remove duplicate line in /etc/pam.d/ssh (closes: #50310)
3949 * mention ssh -A option in ssh.1 & ssh_config
3950 * enable forwarding to localhost in default ssh_config (closes: #50373)
3951 * tweak preinst to deal with debconf being `unpacked'
3952 * use --with-tcp-wrappers (closes: #49545)
3953
3954 -- Philip Hands <phil@hands.com> Sat, 20 Nov 1999 14:20:04 +0000
3955
3956openssh (1:1.2pre11-2) unstable; urgency=low
3957
3958 * oops, just realised that I forgot to strip out the unpleasant
3959 fiddling mentioned below (which turned not to be a fix anyway)
3960
3961 -- Philip Hands <phil@hands.com> Mon, 15 Nov 1999 01:35:23 +0000
3962
3963openssh (1:1.2pre11-1) unstable; urgency=low
3964
3965 * New upstream release (closes: #49722)
3966 * add 2>/dev/null to dispose of spurious message casused by grep -q
3967 (closes: #49876, #49604)
3968 * fix typo in debian/control (closes: #49841)
3969 * Do some unpleasant fiddling with upgraded keys in the preinst, which
3970 should make the keylength problem go away. (closes: #49676)
3971 * make pam_start in sshd use ``ssh'' as the service name (closes: #49956)
3972 * If /etc/ssh/NOSERVER exist, stop sshd from starting (closes: #47107)
3973 * apply Ben Collins <bcollins@debian.org>'s shadow patch
3974 * disable lastlogin and motd printing if using pam (closes: #49957)
3975 * add ssh-copy-id script and manpage
3976
3977 -- Philip Hands <phil@hands.com> Fri, 12 Nov 1999 01:03:38 +0000
3978
3979openssh (1:1.2pre9-1) unstable; urgency=low
3980
3981 * New upstream release
3982 * apply Chip Salzenberg <chip@valinux.com>'s SO_REUSEADDR patch
3983 to channels.c, to make forwarded ports instantly reusable
3984 * replace Pre-Depend: debconf with some check code in preinst
3985 * make the ssh-add ssh-askpass failure message more helpful
3986 * fix the ssh-agent getopts bug (closes: #49426)
3987 * fixed typo on Suggests: line (closes: #49704, #49571)
3988 * tidy up ssh package description (closes: #49642)
3989 * make ssh suid (closes: #49635)
3990 * in preinst upgrade code, ensure ssh_host_keys is mode 600 (closes: #49606)
3991 * disable agent forwarding by default, for the similar reasons as
3992 X forwarding (closes: #49586)
3993
3994 -- Philip Hands <phil@hands.com> Tue, 9 Nov 1999 09:57:47 +0000
3995
3996openssh (1:1.2pre7-4) unstable; urgency=low
3997
3998 * predepend on debconf (>= 0.2.17) should now allow preinst questions
3999
4000 -- Philip Hands <phil@hands.com> Sat, 6 Nov 1999 10:31:06 +0000
4001
4002openssh (1:1.2pre7-3) unstable; urgency=low
4003
4004 * add ssh-askpass package using Tommi Virtanen's perl-tk script
4005 * add ssh-preconfig package cludge
4006 * add usage hints to ssh-agent.1
4007
4008 -- Philip Hands <phil@hands.com> Fri, 5 Nov 1999 00:38:33 +0000
4009
4010openssh (1:1.2pre7-2) unstable; urgency=low
4011
4012 * use pam patch from Ben Collins <bcollins@debian.org>
4013 * add slogin symlink to Makefile.in
4014 * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login
4015 * sort out debconf usage
4016 * patch from Tommi Virtanen <tv@debian.org>'s makes ssh-add use ssh-askpass
4017
4018 -- Philip Hands <phil@hands.com> Thu, 4 Nov 1999 11:08:54 +0000
4019
4020openssh (1:1.2pre7-1) unstable; urgency=low
4021
4022 * New upstream release
4023
4024 -- Philip Hands <phil@hands.com> Tue, 2 Nov 1999 21:02:37 +0000
4025
4026openssh (1:1.2.0.pre6db1-2) unstable; urgency=low
4027
4028 * change the binary package name to ssh (the non-free branch of ssh has
4029 been renamed to ssh-nonfree)
4030 * make pam file comply with Debian standards
4031 * use an epoch to make sure openssh supercedes ssh-nonfree
4032
4033 -- Philip Hands <phil@hands.com> Sat, 30 Oct 1999 16:26:05 +0100
4034
4035openssh (1.2pre6db1-1) unstable; urgency=low
4036
4037 * New upstream source
4038 * sshd accepts logins now!
4039
4040 -- Dan Brosemer <odin@linuxfreak.com> Fri, 29 Oct 1999 11:13:38 -0500
4041
4042openssh (1.2.0.19991028-1) unstable; urgency=low
4043
4044 * New upstream source
4045 * Added test for -lnsl to configure script
4046
4047 -- Dan Brosemer <odin@linuxfreak.com> Thu, 28 Oct 1999 18:52:09 -0500
4048
4049openssh (1.2.0.19991027-3) unstable; urgency=low
4050
4051 * Initial release
4052
4053 -- Dan Brosemer <odin@linuxfreak.com> Wed, 27 Oct 1999 19:39:46 -0500
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000000000..fcd68b77e
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
1config.log
2debian/openssh-server.sshd.pam
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000000000..c513f4ee4
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,164 @@
1Source: openssh
2Section: net
3Priority: standard
4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), dh-exec, libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg-dev (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4)
6XS-Testsuite: autopkgtest
7Standards-Version: 3.9.6
8Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
9Homepage: http://www.openssh.org/
10Vcs-Git: git://anonscm.debian.org/pkg-ssh/openssh.git
11Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ssh/openssh.git
12
13Package: openssh-client
14Architecture: any
15Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd
16Recommends: xauth
17Conflicts: sftp
18Replaces: ssh, ssh-krb5
19Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere
20Provides: rsh-client, ssh-client
21Multi-Arch: foreign
22Description: secure shell (SSH) client, for secure access to remote machines
23 This is the portable version of OpenSSH, a free implementation of
24 the Secure Shell protocol as specified by the IETF secsh working
25 group.
26 .
27 Ssh (Secure Shell) is a program for logging into a remote machine
28 and for executing commands on a remote machine.
29 It provides secure encrypted communications between two untrusted
30 hosts over an insecure network. X11 connections and arbitrary TCP/IP
31 ports can also be forwarded over the secure channel.
32 It can be used to provide applications with a secure communication
33 channel.
34 .
35 This package provides the ssh, scp and sftp clients, the ssh-agent
36 and ssh-add programs to make public key authentication more convenient,
37 and the ssh-keygen, ssh-keyscan, ssh-copy-id and ssh-argv0 utilities.
38 .
39 In some countries it may be illegal to use any encryption at all
40 without a special permit.
41 .
42 ssh replaces the insecure rsh, rcp and rlogin programs, which are
43 obsolete for most purposes.
44
45Package: openssh-server
46Priority: optional
47Architecture: any
48Pre-Depends: ${misc:Pre-Depends}
49Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps, openssh-sftp-server
50Recommends: xauth, ncurses-term, ${openssh-server:Recommends}
51Conflicts: ssh-socks, ssh2, sftp
52Replaces: ssh, ssh-krb5
53Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere
54Provides: ssh-server
55Multi-Arch: foreign
56Description: secure shell (SSH) server, for secure access from remote machines
57 This is the portable version of OpenSSH, a free implementation of
58 the Secure Shell protocol as specified by the IETF secsh working
59 group.
60 .
61 Ssh (Secure Shell) is a program for logging into a remote machine
62 and for executing commands on a remote machine.
63 It provides secure encrypted communications between two untrusted
64 hosts over an insecure network. X11 connections and arbitrary TCP/IP
65 ports can also be forwarded over the secure channel.
66 It can be used to provide applications with a secure communication
67 channel.
68 .
69 This package provides the sshd server.
70 .
71 In some countries it may be illegal to use any encryption at all
72 without a special permit.
73 .
74 sshd replaces the insecure rshd program, which is obsolete for most
75 purposes.
76
77Package: openssh-sftp-server
78Priority: optional
79Architecture: any
80Depends: ${shlibs:Depends}, ${misc:Depends}
81Recommends: openssh-server | ssh-server
82Breaks: openssh-server (<< 1:6.5p1-5)
83Replaces: openssh-server (<< 1:6.5p1-5)
84Enhances: openssh-server, ssh-server
85Description: secure shell (SSH) sftp server module, for SFTP access from remote machines
86 This is the portable version of OpenSSH, a free implementation of
87 the Secure Shell protocol as specified by the IETF secsh working
88 group.
89 .
90 Ssh (Secure Shell) is a program for logging into a remote machine
91 and for executing commands on a remote machine.
92 It provides secure encrypted communications between two untrusted
93 hosts over an insecure network. X11 connections and arbitrary TCP/IP
94 ports can also be forwarded over the secure channel.
95 It can be used to provide applications with a secure communication
96 channel.
97 .
98 This package provides the SFTP server module for the SSH server. It
99 is needed if you want to access your SSH server with SFTP. The SFTP
100 server module also works with other SSH daemons like dropbear.
101
102Package: ssh
103Priority: extra
104Architecture: all
105Pre-Depends: dpkg (>= 1.17.5)
106Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
107Description: secure shell client and server (metapackage)
108 This metapackage is a convenient way to install both the OpenSSH client
109 and the OpenSSH server. It provides nothing in and of itself, so you
110 may remove it if nothing depends on it.
111
112Package: ssh-krb5
113Section: oldlibs
114Priority: extra
115Architecture: all
116Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version})
117Description: secure shell client and server (transitional package)
118 This is a transitional package depending on the regular Debian OpenSSH
119 client and server, which now support GSSAPI natively. It will add the
120 necessary GSSAPI options to the server configuration file. You can
121 remove it once the upgrade is complete and nothing depends on it.
122
123Package: ssh-askpass-gnome
124Section: gnome
125Priority: optional
126Architecture: any
127Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5
128Replaces: ssh (<< 1:3.5p1-3)
129Provides: ssh-askpass
130Description: interactive X program to prompt users for a passphrase for ssh-add
131 This has been split out of the main openssh-client package so that
132 openssh-client does not need to depend on GTK+.
133 .
134 You probably want the ssh-askpass package instead, but this is
135 provided to add to your choice and/or confusion.
136
137Package: openssh-client-udeb
138Package-Type: udeb
139Section: debian-installer
140Priority: optional
141Architecture: any
142Depends: ${shlibs:Depends}, libnss-files-udeb
143XB-Installer-Menu-Item: 99999
144Description: secure shell client for the Debian installer
145 This is the portable version of OpenSSH, a free implementation of
146 the Secure Shell protocol as specified by the IETF secsh working
147 group.
148 .
149 This package provides the ssh client for use in debian-installer.
150
151Package: openssh-server-udeb
152Package-Type: udeb
153Section: debian-installer
154Priority: optional
155Architecture: any
156Depends: ${shlibs:Depends}, libnss-files-udeb
157Description: secure shell server for the Debian installer
158 This is the portable version of OpenSSH, a free implementation of
159 the Secure Shell protocol as specified by the IETF secsh working
160 group.
161 .
162 This package provides the sshd server for use in debian-installer.
163 Since it is expected to be used in specialized situations (e.g. S/390
164 installs with no console), it does not provide any configuration.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..5b360cac4
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,392 @@
1This package was debianized by Philip Hands <phil@hands.com> on 31 Oct 1999
2(with help from Dan Brosemer <odin@linuxfreak.com>)
3
4It was downloaded from here:
5 ftp://ftp.fu-berlin.de/unix/security/openssh/openssh-2.3.0p1.tar.gz
6
7worldwide mirrors are listed here:
8 http://www.openssh.com/ftp.html
9
10The Debian-specific parts of the package were initially derived from the
11original ssh package, which has since been renamed as ssh-nonfree.
12
13The Debian patch is distributed under the terms of the GPL, which you
14can find in /usr/share/common-licenses/GPL-2.
15
16In addition, as a special exception, Matthew Vernon gives permission
17to link the code of the Debian patch with any version of the OpenSSH
18code which is distributed under a license identical to that listed in
19the included Copyright file, and distribute linked combinations
20including the two. You must obey the GNU General Public License in
21all respects for all of the code used other than OpenSSH. If you
22modify this file, you may extend this exception to your version of the
23file, but you are not obligated to do so. If you do not wish to do
24so, delete this exception statement from your version.
25
26The upstream source for this package is a combination of the ssh
27branch that is being maintained by the OpenBSD team (starting from
28the last version of SSH that was distributed under a free license),
29and porting work by Damien Miller <damien@ibs.com.au> to get it
30working on Linux. Other people also contributed to this, and are
31credited in /usr/share/doc/ssh/README.
32
33This package contains Kerberos version 5 patches from
34http://www.sxw.org.uk/computing/patches/openssh.html; this is Copyright
35(c) 2001-2009 Simon Wilkinson and provided under the standard 2-term BSD
36licence used elsewhere in OpenSSH.
37
38Copyright:
39
40Code in helper.[ch] is Copyright Internet Business Solutions and is
41released under a X11-style license (see source file for details).
42
43(A)RC4 code in rc4.[ch] is Copyright Damien Miller. It too is under a
44X11-style license (see source file for details).
45
46make-ssh-known-hosts is Copyright Tero Kivinen <Tero.Kivinen@hut.fi>,
47and is distributed under the GPL (see source file for details).
48
49The copyright for the original SSH version follows. It has been
50modified with [comments] to reflect the changes that the OpenBSD folks
51have made:
52
53This file is part of the OpenSSH software.
54
55The licences which components of this software fall under are as
56follows. First, we will summarize and say that all components
57are under a BSD licence, or a licence more free than that.
58
59OpenSSH contains no GPL code.
60
611)
62 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
63 * All rights reserved
64 *
65 * As far as I am concerned, the code I have written for this software
66 * can be used freely for any purpose. Any derived versions of this
67 * software must be clearly marked as such, and if the derived work is
68 * incompatible with the protocol description in the RFC file, it must be
69 * called by a name other than "ssh" or "Secure Shell".
70
71 [Tatu continues]
72 * However, I am not implying to give any licenses to any patents or
73 * copyrights held by third parties, and the software includes parts that
74 * are not under my direct control. As far as I know, all included
75 * source code is used in accordance with the relevant license agreements
76 * and can be used freely for any purpose (the GNU license being the most
77 * restrictive); see below for details.
78
79 [However, none of that term is relevant at this point in time. All of
80 these restrictively licenced software components which he talks about
81 have been removed from OpenSSH, i.e.,
82
83 - RSA is no longer included, found in the OpenSSL library
84 - IDEA is no longer included, its use is deprecated
85 - DES is now external, in the OpenSSL library
86 - GMP is no longer used, and instead we call BN code from OpenSSL
87 - Zlib is now external, in a library
88 - The make-ssh-known-hosts script is no longer included
89 - TSS has been removed
90 - MD5 is now external, in the OpenSSL library
91 - RC4 support has been replaced with ARC4 support from OpenSSL
92 - Blowfish is now external, in the OpenSSL library
93
94 [The licence continues]
95
96 Note that any information and cryptographic algorithms used in this
97 software are publicly available on the Internet and at any major
98 bookstore, scientific library, and patent office worldwide. More
99 information can be found e.g. at "http://www.cs.hut.fi/crypto".
100
101 The legal status of this program is some combination of all these
102 permissions and restrictions. Use only at your own responsibility.
103 You will be responsible for any legal consequences yourself; I am not
104 making any claims whether possessing or using this is legal or not in
105 your country, and I am not taking any responsibility on your behalf.
106
107
108 NO WARRANTY
109
110 BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
111 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
112 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
113 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
114 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
115 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
116 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
117 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
118 REPAIR OR CORRECTION.
119
120 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
121 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
122 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
123 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
124 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
125 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
126 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
127 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
128 POSSIBILITY OF SUCH DAMAGES.
129
1302)
131 The 32-bit CRC compensation attack detector in deattack.c was
132 contributed by CORE SDI S.A. under a BSD-style license.
133
134 * Cryptographic attack detector for ssh - source code
135 *
136 * Copyright (c) 1998 CORE SDI S.A., Buenos Aires, Argentina.
137 *
138 * All rights reserved. Redistribution and use in source and binary
139 * forms, with or without modification, are permitted provided that
140 * this copyright notice is retained.
141 *
142 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
143 * WARRANTIES ARE DISCLAIMED. IN NO EVENT SHALL CORE SDI S.A. BE
144 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY OR
145 * CONSEQUENTIAL DAMAGES RESULTING FROM THE USE OR MISUSE OF THIS
146 * SOFTWARE.
147 *
148 * Ariel Futoransky <futo@core-sdi.com>
149 * <http://www.core-sdi.com>
150
1513)
152 ssh-keyscan was contributed by David Mazieres under a BSD-style
153 license.
154
155 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
156 *
157 * Modification and redistribution in source and binary forms is
158 * permitted provided that due credit is given to the author and the
159 * OpenBSD project by leaving this copyright notice intact.
160
1614)
162 The Rijndael implementation by Vincent Rijmen, Antoon Bosselaers
163 and Paulo Barreto is in the public domain and distributed
164 with the following license:
165
166 * @version 3.0 (December 2000)
167 *
168 * Optimised ANSI C code for the Rijndael cipher (now AES)
169 *
170 * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
171 * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
172 * @author Paulo Barreto <paulo.barreto@terra.com.br>
173 *
174 * This code is hereby placed in the public domain.
175 *
176 * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
177 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
178 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
179 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
180 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
181 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
182 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
183 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
184 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
185 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
186 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
187
1885)
189 One component of the ssh source code is under a 3-clause BSD license,
190 held by the University of California, since we pulled these parts from
191 original Berkeley code.
192
193 * Copyright (c) 1983, 1990, 1992, 1993, 1995
194 * The Regents of the University of California. All rights reserved.
195 *
196 * Redistribution and use in source and binary forms, with or without
197 * modification, are permitted provided that the following conditions
198 * are met:
199 * 1. Redistributions of source code must retain the above copyright
200 * notice, this list of conditions and the following disclaimer.
201 * 2. Redistributions in binary form must reproduce the above copyright
202 * notice, this list of conditions and the following disclaimer in the
203 * documentation and/or other materials provided with the distribution.
204 * 3. Neither the name of the University nor the names of its contributors
205 * may be used to endorse or promote products derived from this software
206 * without specific prior written permission.
207 *
208 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
209 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
210 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
211 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
212 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
213 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
214 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
215 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
216 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
217 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
218 * SUCH DAMAGE.
219
2206)
221 Remaining components of the software are provided under a standard
222 2-term BSD licence with the following names as copyright holders:
223
224 Markus Friedl
225 Theo de Raadt
226 Niels Provos
227 Dug Song
228 Aaron Campbell
229 Damien Miller
230 Kevin Steves
231 Daniel Kouril
232 Wesley Griffin
233 Per Allansson
234 Nils Nordman
235 Simon Wilkinson
236
237 Portable OpenSSH additionally includes code from the following copyright
238 holders, also under the 2-term BSD license:
239
240 Ben Lindstrom
241 Tim Rice
242 Andre Lucas
243 Chris Adams
244 Corinna Vinschen
245 Cray Inc.
246 Denis Parker
247 Gert Doering
248 Jakob Schlyter
249 Jason Downs
250 Juha Yrjölä
251 Michael Stone
252 Networks Associates Technology, Inc.
253 Solar Designer
254 Todd C. Miller
255 Wayne Schroeder
256 William Jones
257 Darren Tucker
258 Sun Microsystems
259 The SCO Group
260 Daniel Walsh
261 Red Hat, Inc
262 Simon Vallet / Genoscope
263
264 * Redistribution and use in source and binary forms, with or without
265 * modification, are permitted provided that the following conditions
266 * are met:
267 * 1. Redistributions of source code must retain the above copyright
268 * notice, this list of conditions and the following disclaimer.
269 * 2. Redistributions in binary form must reproduce the above copyright
270 * notice, this list of conditions and the following disclaimer in the
271 * documentation and/or other materials provided with the distribution.
272 *
273 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
274 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
275 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
276 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
277 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
278 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
279 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
280 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
281 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
282 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
283
2848) Portable OpenSSH contains the following additional licenses:
285
286 a) md5crypt.c, md5crypt.h
287
288 * "THE BEER-WARE LICENSE" (Revision 42):
289 * <phk@login.dknet.dk> wrote this file. As long as you retain this
290 * notice you can do whatever you want with this stuff. If we meet
291 * some day, and you think this stuff is worth it, you can buy me a
292 * beer in return. Poul-Henning Kamp
293
294 b) snprintf replacement
295
296 * Copyright Patrick Powell 1995
297 * This code is based on code written by Patrick Powell
298 * (papowell@astart.com) It may be used for any purpose as long as this
299 * notice remains intact on all source code distributions
300
301 c) Compatibility code (openbsd-compat)
302
303 Apart from the previously mentioned licenses, various pieces of code
304 in the openbsd-compat/ subdirectory are licensed as follows:
305
306 Some code is licensed under a 3-term BSD license, to the following
307 copyright holders:
308
309 Todd C. Miller
310 Theo de Raadt
311 Damien Miller
312 Eric P. Allman
313 The Regents of the University of California
314 Constantin S. Svintsoff
315
316 * Redistribution and use in source and binary forms, with or without
317 * modification, are permitted provided that the following conditions
318 * are met:
319 * 1. Redistributions of source code must retain the above copyright
320 * notice, this list of conditions and the following disclaimer.
321 * 2. Redistributions in binary form must reproduce the above copyright
322 * notice, this list of conditions and the following disclaimer in the
323 * documentation and/or other materials provided with the distribution.
324 * 3. Neither the name of the University nor the names of its contributors
325 * may be used to endorse or promote products derived from this software
326 * without specific prior written permission.
327 *
328 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
329 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
330 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
331 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
332 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
333 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
334 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
335 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
336 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
337 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
338 * SUCH DAMAGE.
339
340 Some code is licensed under an ISC-style license, to the following
341 copyright holders:
342
343 Internet Software Consortium.
344 Todd C. Miller
345 Reyk Floeter
346 Chad Mynhier
347
348 * Permission to use, copy, modify, and distribute this software for any
349 * purpose with or without fee is hereby granted, provided that the above
350 * copyright notice and this permission notice appear in all copies.
351 *
352 * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
353 * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
354 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
355 * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
356 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
357 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
358 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
359
360 Some code is licensed under a MIT-style license to the following
361 copyright holders:
362
363 Free Software Foundation, Inc.
364
365 * Permission is hereby granted, free of charge, to any person obtaining a *
366 * copy of this software and associated documentation files (the *
367 * "Software"), to deal in the Software without restriction, including *
368 * without limitation the rights to use, copy, modify, merge, publish, *
369 * distribute, distribute with modifications, sublicense, and/or sell *
370 * copies of the Software, and to permit persons to whom the Software is *
371 * furnished to do so, subject to the following conditions: *
372 * *
373 * The above copyright notice and this permission notice shall be included *
374 * in all copies or substantial portions of the Software. *
375 * *
376 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
377 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
378 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
379 * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
380 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
381 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
382 * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
383 * *
384 * Except as contained in this notice, the name(s) of the above copyright *
385 * holders shall not be used in advertising or otherwise to promote the *
386 * sale, use or other dealings in this Software without prior written *
387 * authorization. *
388 ****************************************************************************/
389
390
391------
392$OpenBSD: LICENCE,v 1.19 2004/08/30 09:18:08 markus Exp $
diff --git a/debian/copyright.head b/debian/copyright.head
new file mode 100644
index 000000000..bf1ab0ea2
--- /dev/null
+++ b/debian/copyright.head
@@ -0,0 +1,52 @@
1This package was debianized by Philip Hands <phil@hands.com> on 31 Oct 1999
2(with help from Dan Brosemer <odin@linuxfreak.com>)
3
4It was downloaded from here:
5 ftp://ftp.fu-berlin.de/unix/security/openssh/openssh-2.3.0p1.tar.gz
6
7worldwide mirrors are listed here:
8 http://www.openssh.com/ftp.html
9
10The Debian-specific parts of the package were initially derived from the
11original ssh package, which has since been renamed as ssh-nonfree.
12
13The Debian patch is distributed under the terms of the GPL, which you
14can find in /usr/share/common-licenses/GPL-2.
15
16In addition, as a special exception, Matthew Vernon gives permission
17to link the code of the Debian patch with any version of the OpenSSH
18code which is distributed under a license identical to that listed in
19the included Copyright file, and distribute linked combinations
20including the two. You must obey the GNU General Public License in
21all respects for all of the code used other than OpenSSH. If you
22modify this file, you may extend this exception to your version of the
23file, but you are not obligated to do so. If you do not wish to do
24so, delete this exception statement from your version.
25
26The upstream source for this package is a combination of the ssh
27branch that is being maintained by the OpenBSD team (starting from
28the last version of SSH that was distributed under a free license),
29and porting work by Damien Miller <damien@ibs.com.au> to get it
30working on Linux. Other people also contributed to this, and are
31credited in /usr/share/doc/ssh/README.
32
33This package contains Kerberos version 5 patches from
34http://www.sxw.org.uk/computing/patches/openssh.html; this is Copyright
35(c) 2001-2009 Simon Wilkinson and provided under the standard 2-term BSD
36licence used elsewhere in OpenSSH.
37
38Copyright:
39
40Code in helper.[ch] is Copyright Internet Business Solutions and is
41released under a X11-style license (see source file for details).
42
43(A)RC4 code in rc4.[ch] is Copyright Damien Miller. It too is under a
44X11-style license (see source file for details).
45
46make-ssh-known-hosts is Copyright Tero Kivinen <Tero.Kivinen@hut.fi>,
47and is distributed under the GPL (see source file for details).
48
49The copyright for the original SSH version follows. It has been
50modified with [comments] to reflect the changes that the OpenBSD folks
51have made:
52
diff --git a/debian/faq.html b/debian/faq.html
new file mode 100644
index 000000000..d6eb7fda5
--- /dev/null
+++ b/debian/faq.html
@@ -0,0 +1,1187 @@
1<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2<html>
3<head>
4<title>OpenSSH FAQ</title>
5<link rev= "made" href= "mailto:www@openbsd.org">
6<meta name= "resource-type" content= "document">
7<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
8<meta name= "description" content= "the OpenSSH FAQ page">
9<meta name= "keywords" content= "OpenSSH,SSH,Secure Shell,faq">
10<meta name= "distribution" content= "global">
11<meta name= "copyright" content= "This document copyright 1999-2010 OpenBSD.">
12</head>
13
14<body bgcolor= "#ffffff" text= "#000000" link= "#23238E">
15<a href="http://www.openssh.org/index.html"><img alt="[OpenSSH]" height="30" width="141" src="images/smalltitle.gif" border="0"></a>
16<p>
17
18<h1>OpenSSH FAQ (Frequently asked questions)</h1>
19
20<hr>
21
22<blockquote>
23<h3><a href= "#1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></h3>
24<ul>
25<li><a href= "#1.1">1.1 - What is OpenSSH and where can I download it?</a>
26<li><a href= "#1.2">1.2 - Why should it be used?</a>
27<li><a href= "#1.3">1.3 - What Operating Systems are supported?</a>
28<li><a href= "#1.4">1.4 - What about copyright, usage and patents?</a>
29<li><a href= "#1.5">1.5 - Where should I ask for help?</a>
30<li><a href= "#1.6">1.6 - I have found a bug. Where do I report it?</a>
31</ul>
32
33<h3><a href= "#2.0">2.0 - General Questions</a></h3>
34<ul>
35<li><a href= "#2.1">2.1 - Why does ssh/scp make connections from low-numbered ports. My firewall blocks these.</a>
36<li><a href= "#2.2">2.2 - Why is the ssh client setuid root?</a>
37<li><a href= "#2.3">2.3 - Why does SSH 2.3 have problems interoperating with OpenSSH 2.1.1?</a>
38<li><a href= "#2.4">2.4 - Why does OpenSSH print: Dispatch protocol error: type 20</a>
39<li><a href= "#2.5">2.5 - Old versions of commercial SSH encrypt host keys with IDEA.</a>
40<li><a href= "#2.6">2.6 - What are these warning messages about key lengths?</a>
41<li><a href= "#2.7">2.7 - X11 and/or agent forwarding does not work.</a>
42<li><a href= "#2.8">2.8 - After upgrading OpenSSH I lost SSH2 support.</a>
43<li><a href= "#2.9">2.9 - sftp/scp fails at connection, but ssh is OK.</a>
44<li><a href= "#2.10">2.10 - Will you add [foo] to scp?</a>
45<li><a href= "#2.11">2.11 - How do I use port forwarding?</a>
46<li><a href= "#2.12">2.12 - My ssh connection freezes or drops out after N minutes of inactivity.</a>
47<li><a href= "#2.13">2.13 - How do I use scp to copy a file with a colon in it?</a>
48<li><a href= "#2.14">2.14 - Why does OpenSSH report its version to clients?</a>
49</ul>
50
51<h3><a href= "#3.0">3.0 - Portable OpenSSH Questions</a></h3>
52<ul>
53<li><a href= "#3.1">3.1 - Spurious PAM authentication messages in logfiles.</a>
54<li><a href= "#3.2">3.2 - Empty passwords not allowed with PAM authentication.</a>
55<li><a href= "#3.3">3.3 - ssh(1) takes a long time to connect or log in</a>
56<li><a href= "#3.4">3.4 - "Can't locate module net-pf-10" messages in log under Linux.</a>
57<li><a href= "#3.5">3.5 - Password authentication doesn't work (eg on Slackware 7.0 or Red Hat Linux 6.x)</a>
58<li><a href= "#3.6">3.6 - Configure or sshd(8) complain about lack of RSA support</a>
59<li><a href= "#3.7">3.7 - "scp: command not found" errors</a>
60<li><a href= "#3.8">3.8 - Unable to read passphrase</a>
61<li><a href= "#3.9">3.9 - 'configure' missing or make fails</a>
62<li><a href= "#3.10">3.10 - Hangs when exiting ssh</a>
63<li><a href= "#3.11">3.11 - Why does ssh hang on exit?</a>
64<li><a href= "#3.12">3.12 - I upgraded to OpenSSH 3.1 and X11 forwarding stopped working.</a>
65<li><a href= "#3.13">3.13 - I upgraded to OpenSSH 3.8 and some X11 programs stopped working.</a>
66<li><a href= "#3.14">3.14 - I copied my public key to authorized_keys but public-key authentication still doesn't work.</a>
67<li><a href= "#3.15">3.15 - OpenSSH versions and PAM behaviour.</a>
68<li><a href= "#3.16">3.16 - Why doesn't "w" or "who" on AIX 5.x show users logged in via ssh?</a>
69</ul>
70
71</blockquote>
72
73<hr>
74
75<h2><u><a name= "1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></u></h2>
76
77<h2><a name= "1.1">1.1 - What is OpenSSH and where can I download it?</a></h2>
78
79OpenSSH provides end-to-end encrypted replacement of applications such as
80telnet, rlogin, and ftp.
81Unlike these legacy applications, OpenSSH never passes anything
82(including username and password) over the wire in unencrypted form, and
83provides host authentication, to verify that you really are talking to
84the system that you think you are and that no one else can take over
85that session.
86
87<p>
88The OpenSSH suite includes the
89<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
90program which replaces rlogin and telnet, and
91<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a>
92which replaces
93<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rcp&amp;sektion=1">rcp(1)</a> and
94<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&amp;sektion=1">ftp(1)</a>.
95OpenSSH has also added
96<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a> and
97<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a>
98which implement an easier solution for file-transfer. This is based upon the
99<a href="http://www.openssh.org/txt/draft-ietf-secsh-filexfer-02.txt">secsh-filexfer</a> IETF draft.
100
101
102<p><strong>OpenSSH consists of a number of programs.</strong>
103
104<ul>
105<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a> - Server program run on the server machine. This listens for connections from client machines, and whenever it receives a connection, it performs authentication and starts serving the client.
106Its behaviour is controlled by the config file <i><a
107href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">
108sshd_config(5)</a></i>.
109<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a> - This is the client program used to log into another machine or to execute commands on the other machine. <i>slogin</i> is another name for this program.
110Its behaviour is controlled by the global config file <i><a
111href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&amp;sektion=5">
112ssh_config(5)</a></i> and individual users' <i>$HOME/.ssh/config</i> files.
113<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a> - Securely copies files from one machine to another.
114<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a> - Used to create Pubkey Authentication (RSA or DSA) keys (host keys and user authentication keys).
115<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-agent&amp;sektion=1">ssh-agent(1)</a> - Authentication agent. This can be used to hold RSA keys for authentication.
116<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-add&amp;sektion=1">ssh-add(1)</a> - Used to register new keys with the agent.
117<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a> - SFTP server subsystem.
118<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a> - Secure file transfer program.
119<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keyscan&amp;sektion=1">ssh-keyscan(1)</a> - gather ssh public keys.
120<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keysign&amp;sektion=8">ssh-keysign(8)</a> - ssh helper program for hostbased authentication.
121</ul>
122
123<h3>Downloading</h3>
124
125<p>
126The most recent version of OpenSSH is included with the current
127distribution of <a href="http://www.openbsd.org/">OpenBSD</a>, and
128installed as part of a basic install.
129
130<p>
131Today, most other operating systems include some version of OpenSSH
132(often re-badged or privately labeled), so most users can immediately
133use it.
134However, sometimes the included versions are quite old, and missing
135features of the current release of OpenSSH, and you may wish to install
136the current version, or install it on one of the few OSs that lacked it,
137and where the OS publisher does not make a modern version available.
138You may also wish to use OpenSSH on your embedded application.
139
140<p>
141Non-OpenBSD users will want to download, compile and install the
142multi-platform <a href="http://www.openssh.org/portable.html">Portable</a> distribution from a
143<a href="http://www.openssh.org/portable.html#mirrors">mirror</a> near you.
144
145
146<h2><a name= "1.2">1.2 - Why should it be used?</a></h2>
147
148<p>
149OpenSSH is a suite of tools to help secure your network
150connections. Here is a list of features:
151
152
153<ul>
154 <li>Strong authentication. Closes several security holes (e.g., IP, routing, and DNS spoofing).
155 <li>Improved privacy. All communications are automatically and transparently encrypted.
156 <li>Secure X11 sessions. The program automatically sets DISPLAY on the server machine, and forwards any X11 connections over the secure channel.
157 <li>Arbitrary TCP/IP ports can be redirected through the encrypted channel in both directions (e.g., for e-cash transactions).
158 <li>No retraining needed for normal users.
159 <li>Never trusts the network. Minimal trust on the remote side of the connection. Minimal trust on domain name servers. Pure RSA authentication never trusts anything but the private key.
160 <li>Client RSA-authenticates the server machine in the beginning of every connection to prevent trojan horses (by routing or DNS spoofing) and man-in-the-middle attacks, and the server RSA-authenticates the client machine before accepting <i>.rhosts</i> or <i>/etc/hosts.equiv</i> authentication (to prevent DNS, routing, or IP-spoofing).
161 <li>Host authentication key distribution can be centrally by the administration, automatically when the first connection is made to a machine.
162 <li>Any user can create any number of user authentication RSA keys for his/her own use.
163 <li>The server program has its own server RSA key which is automatically regenerated every hour.
164 <li>An authentication agent, running in the user's laptop or local workstation, can be used to hold the user's RSA authentication keys.
165 <li>The software can be installed and used (with restricted functionality) even without root privileges.
166 <li>The client is customizable in system-wide and per-user configuration files.
167 <li>Optional compression of all data with gzip (including forwarded X11 and TCP/IP port data), which may result in significant speedups on slow connections.
168 <li>Complete replacement for rlogin, rsh, and rcp.
169</ul>
170
171<p>
172Currently, almost all communications in computer networks are done
173without encryption. As a consequence, anyone who has access to any
174machine connected to the network can listen in on any communication.
175This is being done by hackers, curious administrators, employers,
176criminals, industrial spies, and governments. Some networks leak off
177enough electromagnetic radiation that data may be captured even from a
178distance.
179
180
181<p>
182When you log in, your password goes in the network in plain
183text. Thus, any listener can then use your account to do any evil he
184likes. Many incidents have been encountered worldwide where crackers
185have started programs on workstations without the owner's knowledge
186just to listen to the network and collect passwords. Programs for
187doing this are available on the Internet, or can be built by a
188competent programmer in a few hours.
189
190
191<p>
192Businesses have trade secrets, patent applications in preparation,
193pricing information, subcontractor information, client data, personnel
194data, financial information, etc. Currently, anyone with access to
195the network (any machine on the network) can listen to anything that
196goes in the network, without any regard to normal access restrictions.
197
198
199<p>
200Many companies are not aware that information can so easily be
201recovered from the network. They trust that their data is safe
202since nobody is supposed to know that there is sensitive information
203in the network, or because so much other data is transferred in the
204network. This is not a safe policy.
205
206
207<h2><a name= "1.3">1.3 - What operating systems are supported?</a></h2>
208
209<p>
210Even though OpenSSH is developed on
211<a href="http://www.openbsd.org/">OpenBSD</a> a wide variety of
212ports to other operating systems exist. The portable version of OpenSSH
213is headed by <a href="mailto:djm@openbsd.org">Damien Miller</a>.
214For a quick overview of the portable version of OpenSSH see
215<a href="http://www.openssh.org/portable.html">OpenSSH Portable Release</a>.
216Currently, the supported operating systems are:
217
218
219<ul>
220 <li>OpenBSD
221 <li>NetBSD
222 <li>FreeBSD
223 <li>AIX
224 <li>HP-UX
225 <li>IRIX
226 <li>Linux
227 <li>NeXT
228 <li>SCO
229 <li>SNI/Reliant Unix
230 <li>Solaris
231 <li>Digital Unix/Tru64/OSF
232 <li>Mac OS X
233 <li>Cygwin
234</ul>
235
236<p>
237A list of vendors that include OpenSSH in their distributions
238is located in the <a href="http://www.openssh.org/users.html">OpenSSH Users page</a>.
239
240<h2><a name= "1.4">1.4 - What about copyrights, usage and patents?</a></h2>
241<p>
242The OpenSSH developers have tried very hard to keep OpenSSH free of any
243patent or copyright problems. To do this, some options had to be
244stripped from OpenSSH. Namely support for patented algorithms.
245
246<p>
247OpenSSH does not support any patented transport algorithms. In SSH1 mode,
248only 3DES and Blowfish are available options. In SSH2 mode, only 3DES,
249Blowfish, CAST128, Arcfour and AES can be selected.
250The patented IDEA algorithm is not supported.
251
252<p>
253OpenSSH provides support for both SSH1 and SSH2 protocols.
254
255<p>
256Since the RSA patent has expired, there are no restrictions on the use
257of RSA algorithm using software, including OpenBSD.
258
259<h2><a name= "1.5">1.5 - Where should I ask for help?</a></h2>
260<p>
261There are many places to turn to for help. In addition to the main
262<a href="http://www.openssh.org/index.html">OpenSSH website</a>,
263there are many mailing lists to try. Before trying any mailing lists,
264please search through all mailing list archives to see if your question
265has already been answered. The OpenSSH Mailing List has been archived and
266put in searchable form and can be found at
267<a href="http://marc.info/?l=openssh-unix-dev&amp;r=1&amp;w=2">marc.info</a>.
268
269<p>
270For more information on subscribing to OpenSSH related mailing lists,
271please see <a href="http://www.openssh.org/list.html">OpenSSH Mailing lists</a>.
272
273<h2><a name= "1.6">1.6 - I have found a bug. Where do I report it?</a></h2>
274<p>
275Information about submitting bug reports can be found at the OpenSSH
276<a href="http://www.openssh.org/report.html">Reporting bugs</a> page.
277<p>
278If you wish to report a security bug, please contact the private developers
279list &lt;<a href="mailto:openssh@openssh.com">openssh@openssh.com</a>&gt;.
280
281<h2><u><a name= "2.0">2.0 - General Questions</a></u></h2>
282
283<h2><a name= "2.1">2.1 - Why does ssh/scp make connections from low-numbered ports.</a></h2>
284<p>
285The OpenSSH client uses low numbered ports for rhosts and rhosts-rsa
286authentication because the server needs to trust the username provided by
287the client. To get around this, you can add the below example to your
288<i>ssh_config</i> or <i>~/.ssh/config</i> file.
289
290
291<blockquote>
292<table border=0 width="800">
293 <tr>
294 <td nowrap bgcolor="#EEEEEE">
295<b>UsePrivilegedPort no</b>
296 </td>
297 </tr>
298</table>
299</blockquote>
300
301<p>
302Or you can specify this option on the command line, using the <b>-o</b>
303option to
304<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a> command.
305
306<blockquote>
307<table border=0 width="800">
308 <tr>
309 <td nowrap bgcolor="#EEEEEE">
310$ <b>ssh -o "UsePrivilegedPort no" host.com</b>
311 </td>
312 </tr>
313</table>
314</blockquote>
315
316<h2><a name= "2.2">2.2 - Why is the ssh client setuid root?</a></h2>
317
318<p>
319In conjunction with the previous question, (<a href="#2.1">2.1</a>)
320OpenSSH needs root authority to be able to bind to low-numbered ports to
321facilitate <i>rhosts authentication</i>.
322A privileged port is also required for rhosts-rsa authentication to older
323SSH releases.
324
325<p>
326Additionally, for both <i>rhosts-rsa authentication</i> (in protocol
327version 1) and <i>hostbased authentication</i> (in protocol version 2)
328the ssh client needs to access the <i>private host key</i> in order to
329authenticate the client machine to the server.
330OpenSSH versions prior to 3.3 required the <code>ssh</code> binary to be
331setuid root to enable this, and you may safely remove it if you don't
332want to use these authentication methods.
333
334<p>
335Starting in OpenSSH 3.3, <code>ssh</code> is not setuid by default. <a
336href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keysign">ssh-keysign</a>,
337is used for access to the private hosts keys, and ssh does not use privileged
338source ports by default. If you wish to use a privileged source port, you must
339manually set the setuid bit on <code>ssh</code>.
340
341<h2><a name= "2.3">2.3 - Why does SSH 2.3 have problems interoperating with OpenSSH 2.1.1?</a></h2>
342
343<p>
344SSH 2.3 and earlier versions contain a flaw in their HMAC implementation.
345Their code was not supplying the full data block output from the digest,
346and instead always provided 128 bits. For longer digests, this caused
347SSH 2.3 to not interoperate with OpenSSH.
348
349<p>
350OpenSSH 2.2.0 detects that SSH 2.3 has this flaw. Recent versions of SSH
351will have this bug fixed. Or you can add the following to
352SSH 2.3 <i>sshd2_config</i>.
353
354
355<blockquote>
356<table border=0 width="800">
357 <tr>
358 <td nowrap bgcolor="#EEEEEE">
359<b>Mac hmac-md5</b>
360 </td>
361 </tr>
362</table>
363</blockquote>
364
365<h2><a name= "2.4">2.4 - Why does OpenSSH print: Dispatch protocol error: type 20</a></h2>
366
367<p>
368Problems in interoperation have been seen because older versions of
369OpenSSH did not support session rekeying. However the commercial SSH 2.3
370tries to negotiate this feature, and you might experience connection
371freezes or see the error message &quot;<b>Dispatch protocol error:
372type 20 </b>&quot;.
373To solve this problem, either upgrade to a recent OpenSSH release or
374disable rekeying by adding the following to your commercial SSH 2.3's
375<i>ssh2_config</i> or <i>sshd2_config</i>.
376
377
378<blockquote>
379<table border=0 width="800">
380 <tr>
381 <td nowrap bgcolor="#EEEEEE">
382<b>RekeyIntervalSeconds 0</b>
383 </td>
384 </tr>
385</table>
386</blockquote>
387
388<h2><a name= "2.5">2.5 - Old versions of commercial SSH encrypt host keys with IDEA.</a></h2>
389
390<p>
391The old versions of SSH used a patented algorithm to encrypt their
392<i>/etc/ssh/ssh_host_key</i>. This problem will manifest as
393<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
394not being able to read its host key. To solve this, use the command below
395to convert your ssh_host_key to use 3DES.
396<b>NOTE:</b> Use the
397<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
398program from the Commercial SSH product, *NOT* OpenSSH for the example
399below.
400
401
402<blockquote>
403<table border=0 width="800">
404 <tr>
405 <td nowrap bgcolor="#EEEEEE">
406# <b>ssh-keygen -u -f /etc/ssh/ssh_host_key</b>
407 </td>
408 </tr>
409</table>
410</blockquote>
411
412<h2><a name= "2.6">2.6 - What are these warning messages about key lengths</a></h2>
413
414<p>
415Commercial SSH's
416<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
417program contained a bug which caused it to occasionally generate Pubkey
418Authentication (RSA or DSA) keys which had their Most Significant Bit
419(MSB) unset. Such keys were advertised as being full-length, but are
420actually, half the time, smaller than advertised.
421
422<p>
423OpenSSH will print warning messages when it encounters such keys. To rid
424yourself of these message, edit your <i>known_hosts</i> files and replace the
425incorrect key length (usually "1024") with the correct key length
426(usually "1023").
427
428<h2><a name= "2.7">2.7 - X11 and/or agent forwarding does not work.</a></h2>
429
430<p>
431Check your <i>ssh_config</i> and <i>sshd_config</i>. The default
432configuration files disable authentication agent and X11 forwarding. To
433enable it, put the line below in <i>sshd_config</i>:
434
435<blockquote>
436<table border=0 width="800">
437 <tr>
438 <td nowrap bgcolor="#EEEEEE">
439<b>X11Forwarding yes</b>
440 </td>
441 </tr>
442</table>
443</blockquote>
444
445<p>
446and put the following lines in <i>ssh_config</i>:
447
448<blockquote>
449<table border=0 width="800">
450 <tr>
451 <td nowrap bgcolor="#EEEEEE">
452<b>ForwardAgent yes</b><br>
453<b>ForwardX11 yes</b>
454 </td>
455 </tr>
456</table>
457</blockquote>
458
459<p>
460X11 forwarding requires a working <a
461href="http://www.openbsd.org/cgi-bin/man.cgi?query=xauth&amp;sektion=1"
462>xauth(1)</a> binary. On OpenBSD this is in the <i>xbase</i> file
463set but will probably be different on other platforms. For OpenSSH
464Portable, xauth must be either found at configure time or specified
465via <b>XAuthLocation</b> in sshd_config(5) and ssh_config(5).
466
467<p>
468Note on agent interoperability: There are two different and
469incompatible agent forwarding mechanisms within the SSH2 protocol.
470OpenSSH has always used an extension of the original SSH1 agent
471requests, however some commercial products use a different, non-free
472agent forwarding protocol. This means that agent forwarding cannot
473be used between OpenSSH and those products.
474
475<p>
476<b>NOTE:</b> For users of Linux Mandrake 7.2, Mandrake modifies the
477<i>XAUTHORITY</i> environment variable in <i>/etc/skel/.bashrc</i>,
478and thus any bash user's home directory. This variable is set by OpenSSH
479and for either of the above options to work, you need to comment out
480the line:
481
482
483<blockquote>
484<table border=0 width="800">
485 <tr>
486 <td nowrap bgcolor="#EEEEEE">
487<b># export XAUTHORITY=$HOME/.Xauthority</b>
488 </td>
489 </tr>
490</table>
491</blockquote>
492
493<h2><a name= "2.8">2.8 - After upgrading OpenSSH I lost SSH2 support.</a></h2>
494
495<p>
496Between versions changes can be made to <i>sshd_config</i> or
497<i>ssh_config</i>. You should always check on these changes when upgrading
498versions of OpenSSH. After OpenSSH Version 2.3.0 you need to add the
499following to your <i>sshd_config</i>:
500
501
502<blockquote>
503<table border=0 width="800">
504 <tr>
505 <td nowrap bgcolor="#EEEEEE">
506<b>HostKey /etc/ssh_host_dsa_key</b><br>
507<b>HostKey /etc/ssh_host_rsa_key</b>
508 </td>
509 </tr>
510</table>
511</blockquote>
512
513<h2><a name= "2.9">2.9 - sftp/scp fails at connection, but ssh is OK.</a></h2>
514
515<p>
516sftp and/or scp may fail at connection time if you have shell
517initialization (.profile, .bashrc, .cshrc, etc) which produces output
518for non-interactive sessions. This output confuses the sftp/scp client.
519You can verify if your shell is doing this by executing:
520
521<blockquote>
522<table border=0 width="800">
523 <tr>
524 <td nowrap bgcolor="#EEEEEE">
525<b>ssh yourhost /usr/bin/true</b>
526 </td>
527 </tr>
528</table>
529</blockquote>
530
531<p>
532If the above command produces any output, then you need to modify your
533shell initialization.
534
535<h2><a name= "2.10">2.10 - Will you add [foo] to scp?</a></h2>
536
537<p>
538Short Answer: no.
539
540<p>
541Long Answer: scp is not standardized. The closest thing it has to a
542specification is "what rcp does". Since the same command is used on both ends
543of the connection, adding features or options risks breaking interoperability with other
544implementations.
545
546<p>
547New features are more likely in sftp, since the protocol is standardized
548(well, a <a href="http://www.ietf.org/html.charters/OLD/secsh-charter.html">
549draft standard</a>), extensible, and the client and server are decoupled.
550
551<h2><a name= "2.11">2.11 - How do I use port forwarding?</a></h2>
552
553<p>
554If the remote server is running sshd(8), it may be possible to
555``tunnel'' certain services via ssh. This may be desirable, for
556example, to encrypt POP or SMTP connections, even though the software
557does not directly support encrypted communications. Tunnelling uses
558port forwarding to create a connection between the client and server.
559The client software must be able to specify a non-standard port to
560connect to for this to work.
561
562<p>
563The idea is that the user connects to the remote host using ssh,
564and specifies which port on the client's machine should be used to
565forward connections to the remote server. After that it is possible
566to start the service which is to be encrypted (e.g. fetchmail, irc)
567on the client machine, specifying the same local port passed to
568ssh, and the connection will be tunnelled through ssh. By default,
569the system running the forward will only accept connections from
570itself.
571
572<p>
573The options most relevant to tunnelling are the -L and -R options,
574which allow the user to forward connections, the -D option, which
575permits dynamic port forwarding, the -g option, which permits other
576hosts to use port forwards, and the -f option, which instructs ssh
577to put itself in the background after authentication. See the <a
578href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1"
579>ssh(1)</a> man page for further details.
580
581<p>
582This is an example of tunnelling an IRC session from client machine
583``127.0.0.1'' (localhost) to remote server ``server.example.com'':
584
585<blockquote>
586<table border=0 width="800">
587 <tr>
588 <td nowrap bgcolor="#EEEEEE">
589<b>ssh -f -L 1234:server.example.com:6667 server.example.com sleep 10<br>
590irc -c '#users' -p 1234 pinky 127.0.0.1</b>
591 </td>
592 </tr>
593</table>
594</blockquote>
595
596<p>
597This tunnels a connection to IRC server server.example.com, joining
598channel ``#users'', using the nickname ``pinky''. The local port used
599in this example is 1234. It does not matter which port is used, as
600long as it's greater than 1023 (remember, only root can open sockets on
601privileged ports) and doesn't conflict with any ports already in use.
602The connection is forwarded to port 6667 on the remote server, since
603that's the standard port for IRC services.
604
605<p>
606The remote command ``sleep 10'' was specified to allow an amount
607of time (10 seconds, in the example) to start the service which is to
608be tunnelled. If no connections are made within the time specified,
609ssh will exit. If more time is required, the sleep(1) value can be
610increased appropriately or, alternatively, the example above could
611be added as a function to the user's shell. See ksh(1) and csh(1)
612for more details about user-defined functions.
613
614<p>
615ssh also has an -N option, convenient for use with port forwarding:
616if -N is specified, it is not necessary to specify a remote command
617(``sleep 10'' in the example above). However, use of this option
618causes ssh to wait around for ever (as opposed to exiting after a
619remote command has completed), and the user must take care to manually
620kill(1) the process afterwards.
621
622<h2><a name= "2.12">2.12 - My ssh connection freezes or drops out after N minutes of inactivity.</a></h2>
623
624<p>
625This is usually the result of a packet filter or NAT device
626timing out your TCP connection due to inactivity. You can enable
627<b>ClientAliveInterval</b> in the server's <i><a
628href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">
629sshd_config</a></i>, or enable <b>ServerAliveInterval</b> in the
630client's <i><a
631href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&amp;sektion=5">
632ssh_config</a></i> (the latter is available in OpenSSH 3.8 and newer).
633
634<p>
635Enabling either option and setting the interval for less than the time
636it takes to time out your session will ensure that the connection is
637kept "fresh" in the device's connection table.
638
639<h2><a name= "2.13">2.13 - How do I use scp to copy a file with a colon in it?</a></h2>
640
641<b><a
642href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">
643scp</a></b> will interpret the component before the colon to be a remote
644server name and attempt to connect to it. To prevent this, refer to
645the file by a relative or absolute path, eg:
646
647<blockquote>
648<table border=0 width="800">
649 <tr>
650 <td nowrap bgcolor="#EEEEEE">
651$ scp ./source:file sshserver:
652 </td>
653 </tr>
654</table>
655</blockquote>
656
657<h2><a name= "2.14">2.14 - Why does OpenSSH report its version to clients?</a></h2>
658
659<p>
660OpenSSH, like most SSH implementations, reports its name and version to clients
661when they connect, e.g.
662</p>
663
664<blockquote>
665SSH-2.0-OpenSSH_3.9
666</blockquote>
667
668<p>
669This information is used by clients and servers to enable protocol
670compatibility tweaks to work around changed, buggy or missing features in
671the implementation they are talking to. This protocol feature checking is
672still required at present because versions with incompatibilities are still
673in wide use.
674</p>
675
676<h2><u><a name= "3.0">3.0 - Portable OpenSSH Questions</a></u></h2>
677
678<h2><a name= "3.1">3.1 - Spurious PAM authentication messages in logfiles.</a></h2>
679
680<p>
681The portable version of OpenSSH will generate spurious authentication
682failures at every login, similar to:
683
684
685<blockquote>
686<table border=0 width="800">
687 <tr>
688 <td nowrap bgcolor="#EEEEEE">
689&quot;<b>authentication failure; (uid=0) -&gt; root for sshd service</b>&quot;
690 </td>
691 </tr>
692</table>
693</blockquote>
694
695<p>
696These are generated because OpenSSH first tries to determine whether a
697user needs authentication to login (e.g. empty password). Unfortunately
698PAM likes to log all authentication events, this one included.
699
700<p>
701If it annoys you too much, set &quot;<b>PermitEmptyPasswords no</b>&quot;
702in <i>sshd_config</i>. This will quiet the error message at the expense
703of disabling logins to accounts with no password set.
704This is the default if you use the supplied <i>sshd_config</i> file.
705
706<h2><a name= "3.2">3.2 - Empty passwords not allowed with PAM authentication.</a></h2>
707
708<p>
709To enable empty passwords with a version of OpenSSH built with PAM you
710must add the flag nullok to the end of the password checking module
711in the <i>/etc/pam.d/sshd</i> file. For example:
712
713<blockquote>
714<table border=0 width="800">
715 <tr>
716 <td nowrap bgcolor="#EEEEEE">
717auth required/lib/security/pam_unix.so shadow nodelay nullok
718 </td>
719 </tr>
720</table>
721</blockquote>
722
723<p>
724This must be done in addition to setting &quot;<b>PermitEmptyPasswords
725yes</b>&quot; in the <i>sshd_config</i> file.
726
727<p>
728There is one caveat when using empty passwords with PAM authentication:
729PAM will allow any password when authenticating an account with an empty
730password. This breaks the check that
731<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
732uses to determine whether an account has no password set and grant
733users access to the account regardless of the policy specified by
734<b>PermitEmptyPasswords</b>. For this reason, it is recommended that you
735do not add the <b>nullok</b> directive to your PAM configuration file
736unless you specifically wish to allow empty passwords.
737
738
739<h2><a name= "3.3">3.3 - ssh(1) takes a long time to connect or log
740in</a></h2>
741
742<p>
743Large delays (more than 10 seconds) are typically caused by a problem with
744name resolution:
745<ul>
746<li>Some versions of glibc (notably glibc 2.1 shipped with Red Hat 6.1)
747can take a long time to resolve "IPv6 or IPv4" addresses from domain
748names. This can be worked around with by specifying <b>AddressFamily
749inet</b> option in <i>ssh_config</i>.</li>
750
751<li>There may be a DNS lookup problem, either at the client or server.
752You can use the <code>nslookup</code> command to check this on both client
753and server by looking up the other end's name and IP address. In
754addition, on the server look up the name returned by the client's
755IP-name lookup. You can disable most of the server-side lookups by
756setting <b>UseDNS no</b> in <i>sshd_config</i>.</li>
757</ul>
758
759<p>
760Delays less than 10 seconds can have other causes.
761
762<ul>
763
764<li>OpenSSH releases prior to 3.8 had an <i>moduli</i> file with
765moduli that were just smaller than what sshd would look for, and
766as a result, sshd would end up using moduli significantly larger
767than requested, which resulted in a speed penalty. Replacing the
768<i>moduli</i> file will resolve this (note that in most cases this
769file will not be replaced during an upgrade and must be replaced
770manually).</li>
771
772<li>OpenSSH releases prior to 3.8 had a flaw in <code>ssh</code> that
773would cause it to request moduli larger than intended (which when
774combined with the above resulted in significant slowdowns).
775Upgrading the client to 3.8 or higher will resolve this issue.</li>
776
777<li>If either the client or server lack a kernel-based random number
778device (eg Solaris &lt; 9, AIX &lt; 5.2, HP-UX &lt; 11.11) and no
779substitute is available (eg <a href=
780"ftp://ftp.ayamura.org/pub/prngd/">prngd</a>) it's possible that
781one of the programs called by <code>ssh-rand-helper</code> to
782generate entropy is hanging. This can be investigated by running
783it in debug mode:
784
785<blockquote>
786<table border=0 width="800">
787 <tr>
788 <td nowrap bgcolor="#EEEEEE">
789/usr/local/libexec/ssh-rand-helper -vvv
790 </td>
791 </tr>
792</table>
793</blockquote>
794
795Any significant delays should be investigated and rectified, or the
796corresponding commands should be removed from <i>ssh_prng_cmds</i>.
797</li>
798
799</ul>
800
801<h3>How slow is "slow"?</h3>
802Under normal conditions, the speed of SSH logins is dependant on
803CPU speed of client and server. For comparison the following are
804typical connect times for <code>time ssh localhost true</code>
805with a 1024-bit RSA key on otherwise unloaded hosts. OpenSSH and
806OpenSSL were compiled with gcc 3.3.x.
807
808<p>
809<table>
810<tr><th>CPU</th><th>Time (SSHv1)<a href="#3.3fn1">[1]</a></th>
811 <th>Time (SSHv2)</th></tr>
812<tr><td>170MHz SPARC/sun4m</td><td>0.74 sec</td><td>1.25 sec</td></tr>
813<tr><td>236MHz HPPA/8200<a href="#3.3fn2">[2]</a></td><td>0.44 sec</td>
814 <td>0.79 sec</td></tr>
815<tr><td>375MHz PowerPC/604e</td><td>0.38 sec</td><td>0.51 sec</td></tr>
816<tr><td>933MHz VIA Ezra</td><td>0.34 sec</td><td>0.44 sec</td></tr>
817<tr><td>2.1GHz Athlon XP 2600+</td><td>0.14 sec</td><td>0.22 sec</td></tr>
818</table>
819
820<br>
821
822<a name="3.3fn1">[1]</a> The SSHv1 protocol is faster but is
823cryptographically weaker than SSHv2.<br>
824
825<a name="3.3fn2">[2]</a> At the time of writing, gcc generates
826relatively slow code on HPPA for RSA and Diffie-Hellman operations
827(see <a href= "http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7625">gcc
828bug #7625</a> and <a
829href="http://marc.info/?l=openssh-unix-dev&amp;m=102646106016694">
830discussion on openssh-unix-dev</a>).
831
832<h2><a name= "3.4">3.4 - "Can't locate module net-pf-10" messages in log under Linux.</a></h2>
833
834<p>
835The Linux kernel is looking (via modprobe) for protocol family 10 (IPv6).
836Either load the appropriate kernel module, enter the correct alias in
837<i>/etc/modules.conf</i> or disable IPv6 in <i>/etc/modules.conf</i>.
838
839
840<p>
841For some silly reason <i>/etc/modules.conf</i> may also be named
842<i>/etc/conf.modules</i>.
843
844
845<h2><a name= "3.5">3.5 - Password authentication doesn't work (eg on Slackware 7.0 or Red Hat 6.x)</a></h2>
846
847<p>
848If the password is correct password the login is still denied, the
849usual cause is that the system is configured to use MD5-type passwords
850but the
851<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=crypt&amp;sektion=3"
852>crypt(3)</a> function used by sshd doesn't understand them.
853
854<p>
855Affected accounts will have password strings in <i>/etc/passwd</i>
856or <i>/etc/shadow</i> that start with <b>$1$</b>.
857If password authentication fails for new accounts or accounts with
858recently changed passwords, but works for old accounts, this is the
859likely culprit.
860
861<p>
862The underlying cause is that some versions of OpenSSL have a crypt(3)
863function that does not understand MD5 passwords, and the link order of
864sshd means that OpenSSL's crypt(3) is used instead of the system's.
865OpensSSH's configure attempts to correct for this but is not always
866successful.
867
868<p>
869There are several possible solutions:
870
871<ul>
872<li>
873<p>
874Enable sshd's built-in support for MD5 passwords at build time.
875
876<blockquote>
877<table border=0 width="800">
878 <tr>
879 <td nowrap bgcolor="#EEEEEE">
880./configure --with-md5-passwords [options]
881 </td>
882 </tr>
883</table>
884</blockquote>
885
886This is safe even if you have both types of encryption as sshd will
887select the correct algorithm for each account automatically.
888
889<li>
890<p>
891If your system has a separate libcrypt library (eg Slackware 7) then you
892can manually add -lcrypt to the LIBS list so it's used instead of
893OpenSSL's:
894
895<blockquote>
896<table border=0 width="800">
897 <tr>
898 <td nowrap bgcolor="#EEEEEE">
899LIBS=-lcrypt ./configure [options]
900 </td>
901 </tr>
902</table>
903</blockquote>
904
905<li>
906<p>
907If your platforms supports PAM, you may configure sshd to use it
908(see <a href= "#3.15" >section 3.15</a>). This will mean that sshd will
909not verify passwords itself but will defer to the configured PAM modules.
910</ul>
911
912<h2><a name= "3.6">3.6 - Configure or sshd(8) complain about lack of RSA or DSA support</a></h2>
913
914<p>
915Ensure that your OpenSSL libraries have been built to include RSA or DSA
916support either internally or through RSAref.
917
918
919<h2><a name= "3.7">3.7 - "scp: command not found" errors</a></h2>
920
921<p>
922<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a>
923must be in the default PATH on both the client and the server. You may
924need to use the <b>--with-default-path</b> option to specify a custom
925path to search on the server. This option replaces the default path,
926so you need to specify all the current directories on your path as well
927as where you have installed scp. For example:
928
929<blockquote>
930<table border=0 width="800">
931 <tr>
932 <td nowrap bgcolor="#EEEEEE">
933$ <b>./configure --with-default-path=/bin:/usr/bin:/usr/local/bin:/path/to/scp</b>
934 </td>
935 </tr>
936</table>
937</blockquote>
938
939<p>
940Note that configuration by the server's admin will take precedence over the
941setting of <b>--with-default-path</b>. This includes resetting PATH in
942<i>/etc/profile</i>, PATH in <i>/etc/environment</i> on AIX, or (for 3.7p1 and
943above) setting PATH or SUPATH in <i>/etc/default/login</i> on Solaris or
944Reliant Unix.
945
946<h2><a name= "3.8">3.8 - Unable to read passphrase</a></h2>
947
948<p>
949Some operating systems set <i>/dev/tty</i> with incorrect modes, causing
950the reading of passwords to fail with the following error:
951
952<blockquote>
953<table border=0 width="800">
954 <tr>
955 <td nowrap bgcolor="#EEEEEE">
956You have no controlling tty. Cannot read passphrase.
957 </td>
958 </tr>
959</table>
960</blockquote>
961
962<p>
963The solution to this is to reset the permissions on <i>/dev/tty</i>
964to mode 0666 and report the error as a bug to your OS vendor.
965
966
967<h2><a name= "3.9">3.9 - 'configure' missing or make fails</a></h2>
968
969<p>
970If there is no 'configure' file in the tar.gz file that you downloaded
971or make fails with "missing separator" errors, you have probably
972downloaded the OpenBSD distribution of OpenSSH and are attempting to
973compile it on another platform. Please refer to the information on the
974<a href="http://www.openssh.org/portable.html">portable version</a>.
975
976
977<h2><a name= "3.10">3.10 - Hangs when exiting ssh</a></h2>
978
979<p>
980OpenSSH may hang when exiting. This can occur when there is an active
981background process. This is known to occur on Linux and HP-UX.
982The problem can be verified by doing the following:
983
984<blockquote>
985<table border=0 width="800">
986 <tr>
987 <td nowrap bgcolor="#EEEEEE">
988$ <b>sleep 20 &amp; exit</b>
989 </td>
990 </tr>
991</table>
992</blockquote>
993
994Try to use this instead:
995<blockquote>
996<table border=0 width="800">
997 <tr>
998 <td nowrap bgcolor="#EEEEEE">
999$ <b>sleep 20 &lt; /dev/null &gt; /dev/null 2&gt;&amp;1 &amp;</b>
1000 </td>
1001 </tr>
1002</table>
1003</blockquote>
1004
1005<p>
1006A work around for bash users is to place <b>"shopt -s huponexit"</b>
1007in either /etc/bashrc or ~/.bashrc. Otherwise, consult your shell's
1008man page for an option to enable it to send a HUP signal to active
1009jobs when exiting. See <a
1010href="http://bugzilla.mindrot.org/show_bug.cgi?id=52">bug #52</a>
1011for other workarounds.
1012
1013<h2><a name= "3.11">3.11 - Why does ssh hang on exit?</a></h2>
1014
1015<p>
1016When executing
1017<blockquote>
1018<table border=0 width="800">
1019 <tr>
1020 <td nowrap bgcolor="#EEEEEE">
1021$ <b>ssh host command</b>
1022 </td>
1023 </tr>
1024</table>
1025</blockquote>
1026ssh <b>needs</b> to hang, because it needs to wait:
1027<ul>
1028<li>
1029until it can be sure that <code>command</code> does not need
1030more input.
1031<li>
1032until it can be sure that <code>command</code> does not produce
1033more output.
1034<li>
1035until <code>command</code> exits because sshd needs to tell
1036the exit status from <code>command</code> to ssh.
1037</ul>
1038<p>
1039
1040<h2><a name= "3.12">3.12 - I upgraded to OpenSSH 3.1 and X11
1041forwarding stopped working.</a></h2>
1042
1043Starting with OpenSSH 3.1, the sshd x11 forwarding server listens on
1044localhost by default; see the sshd <b>X11UseLocalhost</b> option to
1045revert to prior behaviour if your older X11 clients do not function
1046with this configuration.<p>
1047
1048In general, X11 clients using X11 R6 should work with the default
1049setting. Some vendors, including HP, ship X11 clients with R6
1050and R5 libs, so some clients will work, and others will not work.
1051This is true for HP-UX 11.X.<p>
1052
1053<h2><a name= "3.13">3.13 - I upgraded to OpenSSH 3.8 and some
1054X11 programs stopped working.</a></h2>
1055
1056<p>
1057As documented in the <a href="http://www.openssh.org/txt/release-3.8">3.8 release notes</a>,
1058<code>ssh</code> will now use untrusted X11 cookies by
1059default. The previous behaviour can be restored by setting
1060<b>ForwardX11Trusted yes</b> in <i>ssh_config</i>.
1061
1062<p>
1063Possible symptoms include:<br>
1064<code>BadWindow (invalid Window parameter)<br>
1065BadAccess (attempt to access private resource denied)<br>
1066X Error of failed request: BadAtom (invalid Atom parameter)<br>
1067Major opcode of failed request: 20 (X_GetProperty)<br></code>
1068
1069<h2><a name= "3.14">3.14 - I copied my public key to authorized_keys
1070but public-key authentication still doesn't work.</a></h2>
1071
1072<p>
1073Typically this is caused by the file permissions on $HOME, $HOME/.ssh or
1074$HOME/.ssh/authorized_keys being more permissive than sshd allows by default.
1075
1076<p>
1077In this case, it can be solved by executing the following on the server.
1078<blockquote>
1079<table border=0 width="800">
1080<tr>
1081 <td nowrap bgcolor="#EEEEEE">
1082$ <b>chmod go-w $HOME $HOME/.ssh</b><br>
1083$ <b>chmod 600 $HOME/.ssh/authorized_keys</b><br>
1084$ <b>chown `whoami` $HOME/.ssh/authorized_keys</b><br>
1085 </td>
1086</tr>
1087</table>
1088</blockquote>
1089
1090<p>
1091If this is not possible for some reason, an alternative is to set
1092<b>StrictModes no</b> in <i>sshd_config</i>, however this is not
1093recommended.
1094
1095<h2><a name= "3.15">3.15 - OpenSSH versions and PAM behaviour.</a></h2>
1096
1097Portable OpenSSH has a configure-time option to enable sshd's use of the
1098<a href="http://www.opengroup.org/onlinepubs/008329799/">PAM</a>
1099(Pluggable Authentication Modules) interface.
1100
1101<blockquote>
1102<table border=0 width="800">
1103 <tr>
1104 <td nowrap bgcolor="#EEEEEE">
1105./configure --with-pam [options]
1106 </td>
1107 </tr>
1108</table>
1109</blockquote>
1110
1111To use PAM at all, this option must be provided at build time.
1112The run-time behaviour when PAM is built in varies with the version of
1113Portable OpenSSH, and on later versions it must also be enabled by setting
1114<b>UsePAM</b> to <b>yes</b> in <i>sshd_config</i>.
1115
1116<p>
1117The behaviour of the relevant authentications options when PAM support is built
1118in is summarised by the following table.
1119
1120<p>
1121<table border="1">
1122 <tr> <th>Version</th> <th>UsePAM</th> <th>PasswordAuthentication</th> <th>ChallengeResponseAuthentication</th> </tr>
1123 <tr>
1124 <td>&lt;=3.6.1p2</td>
1125 <td>Not applicable</td>
1126 <td>Uses PAM</td>
1127 <td>Uses PAM if <b>PAMAuthenticationViaKbdInt</b> is enabled</td>
1128 </tr>
1129 <tr>
1130 <td>3.7p1 - 3.7.1p1</td>
1131 <td>Defaults to <b>yes</b></td>
1132 <td>Does not use PAM</td>
1133 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1134 </tr>
1135 <tr>
1136 <td>3.7.1p2 - 3.8.1p1</td>
1137 <td>Defaults to <b>no</b></td>
1138 <td>Does not use PAM <a href="#3.15fn1">[1]</a></td>
1139 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1140 </tr>
1141 <tr>
1142 <td>3.9p1</td>
1143 <td>Defaults to <b>no</b></td>
1144 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1145 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1146 </tr>
1147</table>
1148<p>
1149
1150<a name= "3.15fn1">[1]</a> Some vendors, notably Redhat/Fedora, have
1151backported the PasswordAuthentication from 3.9p1 to their 3.8x based
1152packages. If you're using a vendor-supplied package then consult their
1153documentation.
1154
1155<p>
1156OpenSSH Portable's PAM interface still has problems with a few modules,
1157however we hope that this number will reduce in the future. As at the
11583.9p1 release, the known problems are:
1159
1160<ul>
1161 <li>Modules relying on module-private data (eg pam_dhkeys, pam_krb5, AFS)
1162 may fail to correctly establish credentials (bug <a
1163 href="http://bugzilla.mindrot.org/show_bug.cgi?id=688">#688</a>) when
1164 authenticating via <b>ChallengeResponseAuthentication</b>.
1165 <b>PasswordAuthentication</b> with 3.9p1 and above should work.
1166</ul>
1167
1168You can also check <a
1169href="http://bugzilla.mindrot.org/buglist.cgi?product=Portable+OpenSSH&amp;bug_status=RESOLVED&amp;bug_status=NEW&amp;bug_status=ACCEPTED&amp;component=PAM+support"
1170>bugzilla for current PAM issues</a>.
1171
1172<h2><a name= "3.16">3.16 - Why doesn't "w" or "who" on AIX 5.x show users
1173logged in via ssh?</a></h2>
1174
1175Between AIX 4.3.3 and AIX 5.x, the format of the wtmp struct changed. This
1176means that sshd binaries built on AIX 4.x will not correctly write wtmp
1177entries when run on AIX 5.x. This can be fixed by simply recompiling
1178sshd on an AIX 5.x system and using that.
1179
1180<hr>
1181<a href="http://www.openssh.org/index.html"><img height=24 width=24 src="back.gif" border=0 alt=OpenSSH></a>
1182<a href="mailto:www@openbsd.org">www@openbsd.org</a>
1183<br>
1184<small>$OpenBSD: faq.html,v 1.113 2012/04/21 12:12:22 dtucker Exp $</small>
1185
1186</body>
1187</html>
diff --git a/debian/gnome-ssh-askpass.1 b/debian/gnome-ssh-askpass.1
new file mode 100644
index 000000000..b74c410a8
--- /dev/null
+++ b/debian/gnome-ssh-askpass.1
@@ -0,0 +1,51 @@
1.TH GNOME-SSH-ASKPASS 1
2.SH NAME
3gnome\-ssh\-askpass \- prompts a user for a passphrase using GNOME
4.SH SYNOPSIS
5.B gnome\-ssh\-askpass
6.SH DESCRIPTION
7.B gnome\-ssh\-askpass
8is a GNOME-based passphrase dialog for use with OpenSSH.
9It is intended to be called by the
10.BR ssh\-add (1)
11program and not invoked directly.
12It allows
13.BR ssh\-add (1)
14to obtain a passphrase from a user, even if not connected to a terminal
15(assuming that an X display is available).
16This happens automatically in the case where
17.B ssh\-add
18is invoked from one's
19.B ~/.xsession
20or as one of the GNOME startup programs, for example.
21.PP
22In order to be called automatically by
23.BR ssh\-add ,
24.B gnome\-ssh\-askpass
25should be installed as
26.IR /usr/bin/ssh\-askpass .
27.SH "ENVIRONMENT VARIABLES"
28The following environment variables are recognized:
29.TP
30.I GNOME_SSH_ASKPASS_GRAB_SERVER
31Causes
32.B gnome\-ssh\-askpass
33to grab the X server before asking for a passphrase.
34.TP
35.I GNOME_SSH_ASKPASS_GRAB_POINTER
36Causes
37.B gnome\-ssh\-askpass
38to grab the mouse pointer using
39.IR gdk_pointer_grab ()
40before asking for a passphrase.
41.PP
42Regardless of whether either of these environment variables is set,
43.B gnome\-ssh\-askpass
44will grab the keyboard using
45.IR gdk_keyboard_grab ().
46.SH AUTHOR
47This manual page was written by Colin Watson <cjwatson@debian.org>
48for the Debian system (but may be used by others).
49It was based on that for
50.B x11\-ssh\-askpass
51by Philip Hands.
diff --git a/debian/keygen-test/Makefile b/debian/keygen-test/Makefile
new file mode 100644
index 000000000..666ed8227
--- /dev/null
+++ b/debian/keygen-test/Makefile
@@ -0,0 +1,12 @@
1test: getpid.so
2 chmod +x keygen-test
3 ./keygen-test
4
5getpid.o: getpid.c
6 gcc -fPIC -c $< -o $@
7
8getpid.so: getpid.o
9 gcc -shared -o $@ $<
10
11clean:
12 rm -f getpid.o getpid.so key1 key1.pub key2 key2.pub
diff --git a/debian/keygen-test/getpid.c b/debian/keygen-test/getpid.c
new file mode 100644
index 000000000..c9e35b87e
--- /dev/null
+++ b/debian/keygen-test/getpid.c
@@ -0,0 +1,39 @@
1/*
2 * Compile:
3
4gcc -fPIC -c getpid.c -o getpid.o
5gcc -shared -o getpid.so getpid.o
6
7 * Use:
8
9FORCE_PID=1234 LD_PRELOAD=./getpid.so bash
10
11#
12# Copyright (C) 2001-2008 Kees Cook
13# kees@outflux.net, http://outflux.net/
14#
15# This program is free software; you can redistribute it and/or
16# modify it under the terms of the GNU General Public License
17# as published by the Free Software Foundation; either version 2
18# of the License, or (at your option) any later version.
19#
20# This program is distributed in the hope that it will be useful,
21# but WITHOUT ANY WARRANTY; without even the implied warranty of
22# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23# GNU General Public License for more details.
24#
25# You should have received a copy of the GNU General Public License
26# along with this program; if not, write to the Free Software
27# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
28# http://www.gnu.org/copyleft/gpl.html
29
30*/
31
32#include <sys/types.h>
33#include <unistd.h>
34#include <stdlib.h>
35
36pid_t getpid(void)
37{
38 return atoi(getenv("FORCE_PID"));
39}
diff --git a/debian/keygen-test/keygen-test b/debian/keygen-test/keygen-test
new file mode 100755
index 000000000..02b7c761a
--- /dev/null
+++ b/debian/keygen-test/keygen-test
@@ -0,0 +1,12 @@
1#! /bin/sh
2
3rm -f key1 key1.pub key2 key2.pub
4LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
5 ../../build-deb/ssh-keygen -N '' -f key1 >/dev/null
6LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
7 ../../build-deb/ssh-keygen -N '' -f key2 >/dev/null
8if cmp -s key1 key2; then
9 echo "Generated two identical keys!" >&2
10 exit 1
11fi
12exit 0
diff --git a/debian/openssh-client-udeb.install b/debian/openssh-client-udeb.install
new file mode 100644
index 000000000..b3891f02d
--- /dev/null
+++ b/debian/openssh-client-udeb.install
@@ -0,0 +1,3 @@
1scp usr/bin
2sftp usr/bin
3ssh usr/bin
diff --git a/debian/openssh-client.apport b/debian/openssh-client.apport
new file mode 100644
index 000000000..3dbc8e5e6
--- /dev/null
+++ b/debian/openssh-client.apport
@@ -0,0 +1,32 @@
1#!/usr/bin/python
2
3'''apport hook for openssh-client
4
5(c) 2010 Canonical Ltd.
6Author: Chuck Short <chuck.short@canonical.com>
7
8This program is free software; you can redistribute it and/or modify it
9under the terms of the GNU General Public License as published by the
10Free Software Foundation; either version 2 of the License, or (at your
11option) any later version. See http://www.gnu.org/copyleft/gpl.html for
12the full text of the license.
13'''
14
15from apport.hookutils import *
16
17def add_info(report, ui):
18 response = ui.yesno("The contents of your /etc/ssh/ssh_config file "
19 "may help developers diagnose your bug more "
20 "quickly. However, it may contain sensitive "
21 "information. Do you want to include it in your "
22 "bug report?")
23
24 if response == None: # user cancelled
25 raise StopIteration
26
27 elif response == True:
28 attach_conffiles(report, 'openssh-client')
29
30 attach_related_packages(report,
31 ['ssh-askpass', 'libpam-ssh', 'keychain', 'ssh-askpass-gnome'])
32 report['SSHClientVersion'] = command_output(['/usr/bin/ssh', '-V'])
diff --git a/debian/openssh-client.docs b/debian/openssh-client.docs
new file mode 100644
index 000000000..d80ec1262
--- /dev/null
+++ b/debian/openssh-client.docs
@@ -0,0 +1,6 @@
1ChangeLog.gssapi
2OVERVIEW
3README
4README.dns
5README.tun
6debian/faq.html
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
new file mode 100755
index 000000000..18e529f64
--- /dev/null
+++ b/debian/openssh-client.install
@@ -0,0 +1,37 @@
1#! /usr/bin/dh-exec
2
3etc/ssh/moduli
4etc/ssh/ssh_config
5usr/bin/scp
6usr/bin/sftp
7usr/bin/slogin
8usr/bin/ssh
9usr/bin/ssh-add
10usr/bin/ssh-agent
11usr/bin/ssh-keygen
12usr/bin/ssh-keyscan
13usr/lib/openssh/ssh-keysign
14usr/lib/openssh/ssh-pkcs11-helper
15usr/share/man/man1/scp.1
16usr/share/man/man1/sftp.1
17usr/share/man/man1/slogin.1
18usr/share/man/man1/ssh-add.1
19usr/share/man/man1/ssh-agent.1
20usr/share/man/man1/ssh-keygen.1
21usr/share/man/man1/ssh-keyscan.1
22usr/share/man/man1/ssh.1
23usr/share/man/man5/moduli.5
24usr/share/man/man5/ssh_config.5
25usr/share/man/man8/ssh-keysign.8
26usr/share/man/man8/ssh-pkcs11-helper.8
27
28contrib/ssh-copy-id usr/bin
29debian/ssh-argv0 usr/bin
30
31# dh_apport would be neater, but at the time of writing it isn't in unstable
32# yet.
33debian/openssh-client.apport => usr/share/apport/package-hooks/openssh-client.py
34
35# Upstart user job (only used under user sessions).
36debian/ssh-agent.user-session.upstart => usr/share/upstart/sessions/ssh-agent.conf
37
diff --git a/debian/openssh-client.lintian-overrides b/debian/openssh-client.lintian-overrides
new file mode 100644
index 000000000..486567744
--- /dev/null
+++ b/debian/openssh-client.lintian-overrides
@@ -0,0 +1 @@
openssh-client: setuid-binary usr/lib/openssh/ssh-keysign 4755 root/root
diff --git a/debian/openssh-client.manpages b/debian/openssh-client.manpages
new file mode 100644
index 000000000..690bd8a22
--- /dev/null
+++ b/debian/openssh-client.manpages
@@ -0,0 +1,2 @@
1contrib/ssh-copy-id.1
2debian/ssh-argv0.1
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
new file mode 100644
index 000000000..ec0ad2b2b
--- /dev/null
+++ b/debian/openssh-client.postinst
@@ -0,0 +1,45 @@
1#!/bin/sh
2set -e
3
4action="$1"
5oldversion="$2"
6
7umask 022
8
9
10create_alternatives() {
11# Create alternatives for the various r* tools.
12# Make sure we don't change existing alternatives that a user might have
13# changed, but clean up after some old alternatives that mistakenly pointed
14# rlogin and rcp to ssh.
15 update-alternatives --quiet --remove rlogin /usr/bin/ssh
16 update-alternatives --quiet --remove rcp /usr/bin/ssh
17 for cmd in rsh rlogin rcp; do
18 scmd="s${cmd#r}"
19 if ! update-alternatives --display "$cmd" 2>/dev/null | \
20 grep -q "$scmd"; then
21 update-alternatives --quiet --install "/usr/bin/$cmd" "$cmd" "/usr/bin/$scmd" 20 \
22 --slave "/usr/share/man/man1/$cmd.1.gz" "$cmd.1.gz" "/usr/share/man/man1/$scmd.1.gz"
23 fi
24 done
25}
26
27set_ssh_agent_permissions() {
28 if ! getent group ssh >/dev/null; then
29 addgroup --system --quiet ssh
30 fi
31 if ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null; then
32 chgrp ssh /usr/bin/ssh-agent
33 chmod 2755 /usr/bin/ssh-agent
34 fi
35}
36
37
38if [ "$action" = configure ]; then
39 create_alternatives
40 set_ssh_agent_permissions
41fi
42
43#DEBHELPER#
44
45exit 0
diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm
new file mode 100644
index 000000000..68c354481
--- /dev/null
+++ b/debian/openssh-client.postrm
@@ -0,0 +1,22 @@
1#!/bin/sh
2set -e
3
4#DEBHELPER#
5
6case $1 in
7 purge)
8 # Remove all non-conffiles that ssh might create, so that we
9 # can smoothly remove /etc/ssh if and only if the user
10 # hasn't dropped some other files in there. Conffiles have
11 # already been removed at this point.
12 rm -f /etc/ssh/moduli /etc/ssh/primes
13 rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2
14 rmdir --ignore-fail-on-non-empty /etc/ssh
15
16 if which delgroup >/dev/null 2>&1; then
17 delgroup --quiet ssh > /dev/null || true
18 fi
19 ;;
20esac
21
22exit 0
diff --git a/debian/openssh-client.prerm b/debian/openssh-client.prerm
new file mode 100644
index 000000000..2d631cb9c
--- /dev/null
+++ b/debian/openssh-client.prerm
@@ -0,0 +1,39 @@
1#! /bin/sh
2# prerm script for ssh
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see /usr/share/doc/packaging-manual/
17
18case "$1" in
19 remove|deconfigure)
20 update-alternatives --quiet --remove rsh /usr/bin/ssh
21 update-alternatives --quiet --remove rlogin /usr/bin/slogin
22 update-alternatives --quiet --remove rcp /usr/bin/scp
23 ;;
24 upgrade)
25 ;;
26 failed-upgrade)
27 ;;
28 *)
29 echo "prerm called with unknown argument \`$1'" >&2
30 exit 0
31 ;;
32esac
33
34# dh_installdeb will replace this with shell code automatically
35# generated by other debhelper scripts.
36
37#DEBHELPER#
38
39exit 0
diff --git a/debian/openssh-server-udeb.dirs b/debian/openssh-server-udeb.dirs
new file mode 100644
index 000000000..2ce0d81d6
--- /dev/null
+++ b/debian/openssh-server-udeb.dirs
@@ -0,0 +1 @@
var/run/sshd
diff --git a/debian/openssh-server-udeb.install b/debian/openssh-server-udeb.install
new file mode 100644
index 000000000..05ccbf7af
--- /dev/null
+++ b/debian/openssh-server-udeb.install
@@ -0,0 +1,2 @@
1sshd usr/sbin
2ssh-keygen usr/bin
diff --git a/debian/openssh-server.apport b/debian/openssh-server.apport
new file mode 100644
index 000000000..3644bd855
--- /dev/null
+++ b/debian/openssh-server.apport
@@ -0,0 +1,28 @@
1#!/usr/bin/python
2
3'''apport hook for openssh-server
4
5(c) 2010 Canonical Ltd.
6Author: Chuck Short <chuck.short@canonical.com>
7
8This program is free software; you can redistribute it and/or modify it
9under the terms of the GNU General Public License as published by the
10Free Software Foundation; either version 2 of the License, or (at your
11option) any later version. See http://www.gnu.org/copyleft/gpl.html for
12the full text of the license.
13'''
14
15from apport.hookutils import *
16
17def add_info(report, ui):
18 response = ui.yesno("The contents of your /etc/ssh/sshd_config file "
19 "may help developers diagnose your bug more "
20 "quickly. However, it may contain sensitive "
21 "information. Do you want to include it in your "
22 "bug report?")
23
24 if response == None: # user cancelled
25 raise StopIteration
26
27 elif response == True:
28 report['SSHDConfig'] = root_command_output(['/usr/sbin/sshd', '-T'])
diff --git a/debian/openssh-server.config b/debian/openssh-server.config
new file mode 100644
index 000000000..dbde2cbb0
--- /dev/null
+++ b/debian/openssh-server.config
@@ -0,0 +1,29 @@
1#! /bin/sh
2set -e
3
4. /usr/share/debconf/confmodule
5db_version 2.0
6
7get_config_option() {
8 option="$1"
9
10 [ -f /etc/ssh/sshd_config ] || return
11
12 # TODO: actually only one '=' allowed after option
13 perl -lne '
14 s/[[:space:]]+/ /g; s/[[:space:]]+$//;
15 print if s/^[[:space:]]*'"$option"'[[:space:]=]+//i' \
16 /etc/ssh/sshd_config 2>/dev/null
17}
18
19if dpkg --compare-versions "$2" lt-nl 1:6.6p1-1 && \
20 [ "$(get_config_option PermitRootLogin)" = yes ]; then
21 if [ "$(getent shadow root | cut -d: -f2)" = "!" ]; then
22 db_set openssh-server/permit-root-login true
23 else
24 db_input high openssh-server/permit-root-login || true
25 db_go
26 fi
27fi
28
29exit 0
diff --git a/debian/openssh-server.examples b/debian/openssh-server.examples
new file mode 100644
index 000000000..0d0e55a7a
--- /dev/null
+++ b/debian/openssh-server.examples
@@ -0,0 +1 @@
sshd_config
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
new file mode 100644
index 000000000..dd05ea51c
--- /dev/null
+++ b/debian/openssh-server.if-up
@@ -0,0 +1,43 @@
1#! /bin/sh
2# Reload the OpenSSH server when an interface comes up, to allow it to start
3# listening on new addresses.
4
5set -e
6
7# Don't bother to restart sshd when lo is configured.
8if [ "$IFACE" = lo ]; then
9 exit 0
10fi
11
12# Only run from ifup.
13if [ "$MODE" != start ]; then
14 exit 0
15fi
16
17# OpenSSH only cares about inet and inet6. Get ye gone, strange people
18# still using ipx.
19if [ "$ADDRFAM" != inet ] && [ "$ADDRFAM" != inet6 ]; then
20 exit 0
21fi
22
23# Is /usr mounted?
24if [ ! -e /usr/sbin/sshd ]; then
25 exit 0
26fi
27
28if [ ! -f /var/run/sshd.pid ] || \
29 [ "$(ps -p "$(cat /var/run/sshd.pid)" -o comm=)" != sshd ]; then
30 exit 0
31fi
32
33# We'd like to use 'reload' here, but it has some problems; see #502444. On
34# the other hand, repeated restarts of ssh make systemd unhappy
35# (#756547/#757822), so use reload in that case.
36if [ -d /run/systemd/system ]; then
37 action=reload
38else
39 action=restart
40fi
41invoke-rc.d ssh $action >/dev/null 2>&1 || true
42
43exit 0
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
new file mode 100755
index 000000000..06e0c71b7
--- /dev/null
+++ b/debian/openssh-server.install
@@ -0,0 +1,16 @@
1#! /usr/bin/dh-exec
2
3usr/sbin/sshd
4usr/share/man/man5/authorized_keys.5
5usr/share/man/man5/sshd_config.5
6usr/share/man/man8/sshd.8
7
8debian/openssh-server.if-up => etc/network/if-up.d/openssh-server
9debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server
10debian/systemd/ssh.socket lib/systemd/system
11debian/systemd/ssh@.service lib/systemd/system
12debian/systemd/sshd.conf usr/lib/tmpfiles.d
13
14# dh_apport would be neater, but at the time of writing it isn't in unstable
15# yet.
16debian/openssh-server.apport => usr/share/apport/package-hooks/openssh-server.py
diff --git a/debian/openssh-server.links b/debian/openssh-server.links
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/openssh-server.links
diff --git a/debian/openssh-server.lintian-overrides b/debian/openssh-server.lintian-overrides
new file mode 100644
index 000000000..17d912cb0
--- /dev/null
+++ b/debian/openssh-server.lintian-overrides
@@ -0,0 +1 @@
openssh-server: package-contains-empty-directory usr/share/doc/openssh-client/
diff --git a/debian/openssh-server.maintscript b/debian/openssh-server.maintscript
new file mode 100644
index 000000000..f9e3c4d53
--- /dev/null
+++ b/debian/openssh-server.maintscript
@@ -0,0 +1 @@
mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd 1:4.7p1-4~
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
new file mode 100644
index 000000000..9e8516ca7
--- /dev/null
+++ b/debian/openssh-server.postinst
@@ -0,0 +1,323 @@
1#!/bin/sh
2set -e
3
4. /usr/share/debconf/confmodule
5db_version 2.0
6
7action="$1"
8oldversion="$2"
9
10umask 022
11
12
13get_config_option() {
14 option="$1"
15
16 [ -f /etc/ssh/sshd_config ] || return
17
18 # TODO: actually only one '=' allowed after option
19 perl -lne '
20 s/[[:space:]]+/ /g; s/[[:space:]]+$//;
21 print if s/^[[:space:]]*'"$option"'[[:space:]=]+//i' \
22 /etc/ssh/sshd_config
23}
24
25
26set_config_option() {
27 option="$1"
28 value="$2"
29
30 perl -le '
31 $option = $ARGV[0]; $value = $ARGV[1]; $done = 0;
32 while (<STDIN>) {
33 chomp;
34 (my $match = $_) =~ s/\s+/ /g;
35 if ($match =~ s/^\s*\Q$option\E\s+.*/$option $value/) {
36 $_ = $match;
37 $done = 1;
38 }
39 print;
40 }
41 print "$option $value" unless $done;' \
42 "$option" "$value" \
43 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
44 chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
45 chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
46 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
47}
48
49
50rename_config_option() {
51 oldoption="$1"
52 newoption="$2"
53
54 value="$(get_config_option "$oldoption")"
55 [ "$value" ] || return 0
56
57 perl -le '
58 $oldoption = $ARGV[0]; $newoption = $ARGV[1];
59 while (<STDIN>) {
60 chomp;
61 (my $match = $_) =~ s/\s+/ /g;
62 # TODO: actually only one "=" allowed after option
63 if ($match =~ s/^(\s*)\Q$oldoption\E([[:space:]=]+)/$1$newoption$2/i) {
64 $_ = $match;
65 }
66 print;
67 }' \
68 "$oldoption" "$newoption" \
69 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
70 chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
71 chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new
72 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
73}
74
75
76host_keys_required() {
77 hostkeys="$(get_config_option HostKey)"
78 if [ "$hostkeys" ]; then
79 echo "$hostkeys"
80 else
81 # No HostKey directives at all, so the server picks some
82 # defaults depending on the setting of Protocol.
83 protocol="$(get_config_option Protocol)"
84 [ "$protocol" ] || protocol=1,2
85 if echo "$protocol" | grep 1 >/dev/null; then
86 echo /etc/ssh/ssh_host_key
87 fi
88 if echo "$protocol" | grep 2 >/dev/null; then
89 echo /etc/ssh/ssh_host_rsa_key
90 echo /etc/ssh/ssh_host_dsa_key
91 echo /etc/ssh/ssh_host_ecdsa_key
92 echo /etc/ssh/ssh_host_ed25519_key
93 fi
94 fi
95}
96
97
98create_key() {
99 msg="$1"
100 shift
101 hostkeys="$1"
102 shift
103 file="$1"
104 shift
105
106 if echo "$hostkeys" | grep -x "$file" >/dev/null && \
107 [ ! -f "$file" ] ; then
108 echo -n $msg
109 ssh-keygen -q -f "$file" -N '' "$@"
110 echo
111 if which restorecon >/dev/null 2>&1; then
112 restorecon "$file" "$file.pub"
113 fi
114 ssh-keygen -l -f "$file.pub"
115 fi
116}
117
118
119create_keys() {
120 hostkeys="$(host_keys_required)"
121
122 create_key "Creating SSH1 key; this may take some time ..." \
123 "$hostkeys" /etc/ssh/ssh_host_key -t rsa1
124
125 create_key "Creating SSH2 RSA key; this may take some time ..." \
126 "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa
127 create_key "Creating SSH2 DSA key; this may take some time ..." \
128 "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa
129 create_key "Creating SSH2 ECDSA key; this may take some time ..." \
130 "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa
131 create_key "Creating SSH2 ED25519 key; this may take some time ..." \
132 "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519
133}
134
135
136fix_loglevel_silent() {
137 if [ "$(get_config_option LogLevel)" = SILENT ]; then
138 set_config_option LogLevel QUIET
139 fi
140}
141
142
143update_server_key_bits() {
144 if [ "$(get_config_option ServerKeyBits)" = 768 ]; then
145 set_config_option ServerKeyBits 1024
146 fi
147}
148
149
150create_sshdconfig() {
151 if [ -e /etc/ssh/sshd_config ] ; then
152 # Upgrade an existing sshd configuration.
153
154 # This option was renamed in 3.8p1, but we never took care
155 # of adjusting the configuration file until now.
156 if dpkg --compare-versions "$oldversion" lt 1:4.7p1-8; then
157 rename_config_option KeepAlive TCPKeepAlive
158 fi
159
160 # 'LogLevel SILENT' is now equivalent to QUIET.
161 if dpkg --compare-versions "$oldversion" lt 1:5.4p1-1; then
162 fix_loglevel_silent
163 fi
164
165 # Changed upstream in 5.1p1, but we forgot to update the
166 # package-generated configuration file until now.
167 if dpkg --compare-versions "$oldversion" lt 1:6.4p1-2; then
168 update_server_key_bits
169 fi
170
171 return 0
172 fi
173
174 cat <<EOF > /etc/ssh/sshd_config
175# Package generated configuration file
176# See the sshd_config(5) manpage for details
177
178# What ports, IPs and protocols we listen for
179Port 22
180# Use these options to restrict which interfaces/protocols sshd will bind to
181#ListenAddress ::
182#ListenAddress 0.0.0.0
183Protocol 2
184# HostKeys for protocol version 2
185HostKey /etc/ssh/ssh_host_rsa_key
186HostKey /etc/ssh/ssh_host_dsa_key
187HostKey /etc/ssh/ssh_host_ecdsa_key
188HostKey /etc/ssh/ssh_host_ed25519_key
189#Privilege Separation is turned on for security
190UsePrivilegeSeparation yes
191
192# Lifetime and size of ephemeral version 1 server key
193KeyRegenerationInterval 3600
194ServerKeyBits 1024
195
196# Logging
197SyslogFacility AUTH
198LogLevel INFO
199
200# Authentication:
201LoginGraceTime 120
202PermitRootLogin without-password
203StrictModes yes
204
205RSAAuthentication yes
206PubkeyAuthentication yes
207#AuthorizedKeysFile %h/.ssh/authorized_keys
208
209# Don't read the user's ~/.rhosts and ~/.shosts files
210IgnoreRhosts yes
211# For this to work you will also need host keys in /etc/ssh_known_hosts
212RhostsRSAAuthentication no
213# similar for protocol version 2
214HostbasedAuthentication no
215# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
216#IgnoreUserKnownHosts yes
217
218# To enable empty passwords, change to yes (NOT RECOMMENDED)
219PermitEmptyPasswords no
220
221# Change to yes to enable challenge-response passwords (beware issues with
222# some PAM modules and threads)
223ChallengeResponseAuthentication no
224
225# Change to no to disable tunnelled clear text passwords
226#PasswordAuthentication yes
227
228# Kerberos options
229#KerberosAuthentication no
230#KerberosGetAFSToken no
231#KerberosOrLocalPasswd yes
232#KerberosTicketCleanup yes
233
234# GSSAPI options
235#GSSAPIAuthentication no
236#GSSAPICleanupCredentials yes
237
238X11Forwarding yes
239X11DisplayOffset 10
240PrintMotd no
241PrintLastLog yes
242TCPKeepAlive yes
243#UseLogin no
244
245#MaxStartups 10:30:60
246#Banner /etc/issue.net
247
248# Allow client to pass locale environment variables
249AcceptEnv LANG LC_*
250
251Subsystem sftp /usr/lib/openssh/sftp-server
252
253# Set this to 'yes' to enable PAM authentication, account processing,
254# and session processing. If this is enabled, PAM authentication will
255# be allowed through the ChallengeResponseAuthentication and
256# PasswordAuthentication. Depending on your PAM configuration,
257# PAM authentication via ChallengeResponseAuthentication may bypass
258# the setting of "PermitRootLogin without-password".
259# If you just want the PAM account and session checks to run without
260# PAM authentication, then enable this but set PasswordAuthentication
261# and ChallengeResponseAuthentication to 'no'.
262UsePAM yes
263EOF
264}
265
266fix_statoverride() {
267# Remove an erronous override for sshd (we should have overridden ssh)
268 if dpkg-statoverride --list /usr/sbin/sshd >/dev/null; then
269 dpkg-statoverride --remove /usr/sbin/sshd
270 fi
271}
272
273setup_sshd_user() {
274 if ! getent passwd sshd >/dev/null; then
275 adduser --quiet --system --no-create-home --home /var/run/sshd --shell /usr/sbin/nologin sshd
276 fi
277}
278
279if [ "$action" = configure ]; then
280 create_sshdconfig
281 create_keys
282 fix_statoverride
283 setup_sshd_user
284 # Renamed to /etc/ssh/moduli in 2.9.9 (!)
285 if dpkg --compare-versions "$2" lt-nl 1:4.7p1-1; then
286 rm -f /etc/ssh/primes
287 fi
288 if dpkg --compare-versions "$2" lt-nl 1:5.5p1-6; then
289 rm -f /var/run/sshd/.placeholder
290 fi
291 if dpkg --compare-versions "$2" lt-nl 1:6.2p2-3 && \
292 which initctl >/dev/null && initctl version 2>/dev/null | grep -q upstart && \
293 ! status ssh 2>/dev/null | grep -q ' start/'; then
294 # We must stop the sysvinit-controlled sshd before we can
295 # restart it under Upstart.
296 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true
297 fi
298 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-2 && \
299 deb-systemd-helper debian-installed ssh.socket && \
300 deb-systemd-helper --quiet was-enabled ssh.service && \
301 deb-systemd-helper --quiet was-enabled ssh.socket; then
302 # 1:6.5p1-1 mistakenly left both ssh.service and ssh.socket
303 # enabled.
304 deb-systemd-helper disable ssh.socket >/dev/null || true
305 fi
306 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-3 && \
307 [ -d /run/systemd/system ]; then
308 # We must stop the sysvinit-controlled sshd before we can
309 # restart it under systemd.
310 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd || true
311 fi
312 if dpkg --compare-versions "$2" lt-nl 1:6.6p1-1 && \
313 [ "$(get_config_option PermitRootLogin)" = yes ] &&
314 db_get openssh-server/permit-root-login && [ "$RET" = true ]; then
315 set_config_option PermitRootLogin without-password
316 fi
317fi
318
319#DEBHELPER#
320
321db_stop
322
323exit 0
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
new file mode 100644
index 000000000..88e28a91e
--- /dev/null
+++ b/debian/openssh-server.postrm
@@ -0,0 +1,27 @@
1#!/bin/sh
2set -e
3
4#DEBHELPER#
5
6case $1 in
7 purge)
8 # Remove all non-conffiles that ssh might create, so that we
9 # can smoothly remove /etc/ssh if and only if the user
10 # hasn't dropped some other files in there. Conffiles have
11 # already been removed at this point.
12 rm -f /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub
13 rm -f /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
14 rm -f /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub
15 rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key.pub
16 rm -f /etc/ssh/ssh_host_ed25519_key /etc/ssh/ssh_host_ed25519_key.pub
17 rm -f /etc/ssh/sshd_config
18 rm -f /etc/ssh/sshd_not_to_be_run
19 rmdir --ignore-fail-on-non-empty /etc/ssh
20
21 if which deluser >/dev/null 2>&1; then
22 deluser --quiet sshd > /dev/null || true
23 fi
24 ;;
25esac
26
27exit 0
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
new file mode 100644
index 000000000..9fb5d350e
--- /dev/null
+++ b/debian/openssh-server.preinst
@@ -0,0 +1,18 @@
1#!/bin/sh
2set -e
3
4action=$1
5version=$2
6
7if [ "$action" = upgrade ] || [ "$action" = install ]
8then
9 if dpkg --compare-versions "$version" lt 1:5.5p1-6 && \
10 [ -d /var/run/sshd ]; then
11 # make sure /var/run/sshd is not removed on upgrades
12 touch /var/run/sshd/.placeholder
13 fi
14fi
15
16#DEBHELPER#
17
18exit 0
diff --git a/debian/openssh-server.ssh.default b/debian/openssh-server.ssh.default
new file mode 100644
index 000000000..304042224
--- /dev/null
+++ b/debian/openssh-server.ssh.default
@@ -0,0 +1,5 @@
1# Default settings for openssh-server. This file is sourced by /bin/sh from
2# /etc/init.d/ssh.
3
4# Options to pass to sshd
5SSHD_OPTS=
diff --git a/debian/openssh-server.ssh.init b/debian/openssh-server.ssh.init
new file mode 100644
index 000000000..bda7a92b8
--- /dev/null
+++ b/debian/openssh-server.ssh.init
@@ -0,0 +1,174 @@
1#! /bin/sh
2
3### BEGIN INIT INFO
4# Provides: sshd
5# Required-Start: $remote_fs $syslog
6# Required-Stop: $remote_fs $syslog
7# Default-Start: 2 3 4 5
8# Default-Stop:
9# Short-Description: OpenBSD Secure Shell server
10### END INIT INFO
11
12set -e
13
14# /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon
15
16test -x /usr/sbin/sshd || exit 0
17( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
18
19umask 022
20
21if test -f /etc/default/ssh; then
22 . /etc/default/ssh
23fi
24
25. /lib/lsb/init-functions
26
27if [ -n "$2" ]; then
28 SSHD_OPTS="$SSHD_OPTS $2"
29fi
30
31# Are we running from init?
32run_by_init() {
33 ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]
34}
35
36check_for_upstart() {
37 if init_is_upstart; then
38 exit $1
39 fi
40}
41
42check_for_no_start() {
43 # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
44 if [ -e /etc/ssh/sshd_not_to_be_run ]; then
45 if [ "$1" = log_end_msg ]; then
46 log_end_msg 0 || true
47 fi
48 if ! run_by_init; then
49 log_action_msg "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)" || true
50 fi
51 exit 0
52 fi
53}
54
55check_dev_null() {
56 if [ ! -c /dev/null ]; then
57 if [ "$1" = log_end_msg ]; then
58 log_end_msg 1 || true
59 fi
60 if ! run_by_init; then
61 log_action_msg "/dev/null is not a character device!" || true
62 fi
63 exit 1
64 fi
65}
66
67check_privsep_dir() {
68 # Create the PrivSep empty dir if necessary
69 if [ ! -d /var/run/sshd ]; then
70 mkdir /var/run/sshd
71 chmod 0755 /var/run/sshd
72 fi
73}
74
75check_config() {
76 if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then
77 /usr/sbin/sshd $SSHD_OPTS -t || exit 1
78 fi
79}
80
81export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
82
83case "$1" in
84 start)
85 check_for_upstart 1
86 check_privsep_dir
87 check_for_no_start
88 check_dev_null
89 log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd" || true
90 if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
91 log_end_msg 0 || true
92 else
93 log_end_msg 1 || true
94 fi
95 ;;
96 stop)
97 check_for_upstart 0
98 log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true
99 if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid; then
100 log_end_msg 0 || true
101 else
102 log_end_msg 1 || true
103 fi
104 ;;
105
106 reload|force-reload)
107 check_for_upstart 1
108 check_for_no_start
109 check_config
110 log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true
111 if start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd; then
112 log_end_msg 0 || true
113 else
114 log_end_msg 1 || true
115 fi
116 ;;
117
118 restart)
119 check_for_upstart 1
120 check_privsep_dir
121 check_config
122 log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
123 start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid
124 check_for_no_start log_end_msg
125 check_dev_null log_end_msg
126 if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
127 log_end_msg 0 || true
128 else
129 log_end_msg 1 || true
130 fi
131 ;;
132
133 try-restart)
134 check_for_upstart 1
135 check_privsep_dir
136 check_config
137 log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
138 RET=0
139 start-stop-daemon --stop --quiet --retry 30 --pidfile /var/run/sshd.pid || RET="$?"
140 case $RET in
141 0)
142 # old daemon stopped
143 check_for_no_start log_end_msg
144 check_dev_null log_end_msg
145 if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
146 log_end_msg 0 || true
147 else
148 log_end_msg 1 || true
149 fi
150 ;;
151 1)
152 # daemon not running
153 log_progress_msg "(not running)" || true
154 log_end_msg 0 || true
155 ;;
156 *)
157 # failed to stop
158 log_progress_msg "(failed to stop)" || true
159 log_end_msg 1 || true
160 ;;
161 esac
162 ;;
163
164 status)
165 check_for_upstart 1
166 status_of_proc -p /var/run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
167 ;;
168
169 *)
170 log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}" || true
171 exit 1
172esac
173
174exit 0
diff --git a/debian/openssh-server.ssh.service b/debian/openssh-server.ssh.service
new file mode 120000
index 000000000..609457230
--- /dev/null
+++ b/debian/openssh-server.ssh.service
@@ -0,0 +1 @@
systemd/ssh.service \ No newline at end of file
diff --git a/debian/openssh-server.ssh.upstart b/debian/openssh-server.ssh.upstart
new file mode 100644
index 000000000..b34cbff5d
--- /dev/null
+++ b/debian/openssh-server.ssh.upstart
@@ -0,0 +1,29 @@
1# ssh - OpenBSD Secure Shell server
2#
3# The OpenSSH server provides secure shell access to the system.
4
5description "OpenSSH server"
6
7start on runlevel [2345]
8stop on runlevel [!2345]
9
10respawn
11respawn limit 10 5
12umask 022
13
14env SSH_SIGSTOP=1
15expect stop
16
17# 'sshd -D' leaks stderr and confuses things in conjunction with 'console log'
18console none
19
20pre-start script
21 test -x /usr/sbin/sshd || { stop; exit 0; }
22 test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
23
24 mkdir -p -m0755 /var/run/sshd
25end script
26
27# if you used to set SSHD_OPTS in /etc/default/ssh, you can change the
28# 'exec' line here instead
29exec /usr/sbin/sshd -D
diff --git a/debian/openssh-server.sshd.pam.in b/debian/openssh-server.sshd.pam.in
new file mode 100644
index 000000000..2cad67da6
--- /dev/null
+++ b/debian/openssh-server.sshd.pam.in
@@ -0,0 +1,55 @@
1# PAM configuration for the Secure Shell service
2
3# Standard Un*x authentication.
4@include common-auth
5
6# Disallow non-root logins when /etc/nologin exists.
7account required pam_nologin.so
8
9# Uncomment and edit /etc/security/access.conf if you need to set complex
10# access limits that are hard to express in sshd_config.
11# account required pam_access.so
12
13# Standard Un*x authorization.
14@include common-account
15
16# SELinux needs to be the first session rule. This ensures that any
17# lingering context has been cleared. Without this it is possible that a
18# module could execute code in the wrong domain.
19session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
20
21# Set the loginuid process attribute.
22session required pam_loginuid.so
23
24@IF_KEYINIT@# Create a new session keyring.
25@IF_KEYINIT@session optional pam_keyinit.so force revoke
26
27# Standard Un*x session setup and teardown.
28@include common-session
29
30# Print the message of the day upon successful login.
31# This includes a dynamically generated part from /run/motd.dynamic
32# and a static (admin-editable) part from /etc/motd.
33session optional pam_motd.so motd=/run/motd.dynamic
34session optional pam_motd.so noupdate
35
36# Print the status of the user's mailbox upon successful login.
37session optional pam_mail.so standard noenv # [1]
38
39# Set up user limits from /etc/security/limits.conf.
40session required pam_limits.so
41
42# Read environment variables from /etc/environment and
43# /etc/security/pam_env.conf.
44session required pam_env.so # [1]
45# In Debian 4.0 (etch), locale-related environment variables were moved to
46# /etc/default/locale, so read that as well.
47session required pam_env.so user_readenv=1 envfile=/etc/default/locale
48
49# SELinux needs to intervene at login time to ensure that the process starts
50# in the proper default security context. Only sessions which are intended
51# to run in the user's context should be run after this.
52session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
53
54# Standard Un*x password updating.
55@include common-password
diff --git a/debian/openssh-server.templates b/debian/openssh-server.templates
new file mode 100644
index 000000000..a7ee70701
--- /dev/null
+++ b/debian/openssh-server.templates
@@ -0,0 +1,15 @@
1Template: openssh-server/permit-root-login
2Type: boolean
3Default: false
4_Description: Disable SSH password authentication for root?
5 Previous versions of openssh-server permitted logging in as root over SSH
6 using password authentication. The default for new installations is now
7 "PermitRootLogin without-password", which disables password authentication
8 for root without breaking systems that have explicitly configured SSH
9 public key authentication for root.
10 .
11 This change makes systems more secure against brute-force password
12 dictionary attacks on the root user (a very common target for such
13 attacks). However, it may break systems that are set up with the
14 expectation of being able to SSH as root using password authentication. You
15 should only make this change if you do not need to do that.
diff --git a/debian/openssh-server.ufw.profile b/debian/openssh-server.ufw.profile
new file mode 100644
index 000000000..9bbe906bc
--- /dev/null
+++ b/debian/openssh-server.ufw.profile
@@ -0,0 +1,4 @@
1[OpenSSH]
2title=Secure shell server, an rshd replacement
3description=OpenSSH is a free implementation of the Secure Shell protocol.
4ports=22/tcp
diff --git a/debian/openssh-sftp-server.install b/debian/openssh-sftp-server.install
new file mode 100644
index 000000000..25b12dc09
--- /dev/null
+++ b/debian/openssh-sftp-server.install
@@ -0,0 +1,2 @@
1usr/lib/openssh/sftp-server
2usr/share/man/man8/sftp-server.8
diff --git a/debian/openssh-sftp-server.links b/debian/openssh-sftp-server.links
new file mode 100644
index 000000000..2d98b1dcb
--- /dev/null
+++ b/debian/openssh-sftp-server.links
@@ -0,0 +1 @@
usr/lib/openssh/sftp-server usr/lib/sftp-server
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch
new file mode 100644
index 000000000..1b52fd4cc
--- /dev/null
+++ b/debian/patches/auth-log-verbosity.patch
@@ -0,0 +1,133 @@
1From ee78b163ac7fe57b819e8ddf84b32e67b6a950a3 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 facfc02..9ab1880 100644
20--- a/auth-options.c
21+++ b/auth-options.c
22@@ -58,9 +58,20 @@ int forced_tun_device = -1;
23 /* "principals=" option. */
24 char *authorized_principals = NULL;
25
26+/* Throttle log messages. */
27+int logged_from_hostip = 0;
28+int logged_cert_hostip = 0;
29+
30 extern ServerOptions options;
31
32 void
33+auth_start_parse_options(void)
34+{
35+ logged_from_hostip = 0;
36+ logged_cert_hostip = 0;
37+}
38+
39+void
40 auth_clear_options(void)
41 {
42 no_agent_forwarding_flag = 0;
43@@ -293,10 +304,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
44 /* FALLTHROUGH */
45 case 0:
46 free(patterns);
47- logit("Authentication tried for %.100s with "
48- "correct key but not from a permitted "
49- "host (host=%.200s, ip=%.200s).",
50- pw->pw_name, remote_host, remote_ip);
51+ if (!logged_from_hostip) {
52+ logit("Authentication tried for %.100s with "
53+ "correct key but not from a permitted "
54+ "host (host=%.200s, ip=%.200s).",
55+ pw->pw_name, remote_host, remote_ip);
56+ logged_from_hostip = 1;
57+ }
58 auth_debug_add("Your host '%.200s' is not "
59 "permitted to use this key for login.",
60 remote_host);
61@@ -519,11 +533,14 @@ parse_option_list(struct sshbuf *oblob, struct passwd *pw,
62 break;
63 case 0:
64 /* no match */
65- logit("Authentication tried for %.100s "
66- "with valid certificate but not "
67- "from a permitted host "
68- "(ip=%.200s).", pw->pw_name,
69- remote_ip);
70+ if (!logged_cert_hostip) {
71+ logit("Authentication tried for %.100s "
72+ "with valid certificate but not "
73+ "from a permitted host "
74+ "(ip=%.200s).", pw->pw_name,
75+ remote_ip);
76+ logged_cert_hostip = 1;
77+ }
78 auth_debug_add("Your address '%.200s' "
79 "is not permitted to use this "
80 "certificate for login.",
81diff --git a/auth-options.h b/auth-options.h
82index 34852e5..1653855 100644
83--- a/auth-options.h
84+++ b/auth-options.h
85@@ -33,6 +33,7 @@ extern int forced_tun_device;
86 extern int key_is_cert_authority;
87 extern char *authorized_principals;
88
89+void auth_start_parse_options(void);
90 int auth_parse_options(struct passwd *, char *, char *, u_long);
91 void auth_clear_options(void);
92 int auth_cert_options(struct sshkey *, struct passwd *);
93diff --git a/auth-rsa.c b/auth-rsa.c
94index cbd971b..4cf2163 100644
95--- a/auth-rsa.c
96+++ b/auth-rsa.c
97@@ -181,6 +181,8 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file,
98 if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL)
99 return 0;
100
101+ auth_start_parse_options();
102+
103 /*
104 * Go though the accepted keys, looking for the current key. If
105 * found, perform a challenge-response dialog to verify that the
106diff --git a/auth2-pubkey.c b/auth2-pubkey.c
107index 5aa319c..1eee161 100644
108--- a/auth2-pubkey.c
109+++ b/auth2-pubkey.c
110@@ -561,6 +561,7 @@ process_principals(FILE *f, char *file, struct passwd *pw,
111 u_long linenum = 0;
112 u_int i;
113
114+ auth_start_parse_options();
115 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
116 /* Skip leading whitespace. */
117 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
118@@ -726,6 +727,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
119 found_key = 0;
120
121 found = NULL;
122+ auth_start_parse_options();
123 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
124 char *cp, *key_options = NULL;
125 if (found != NULL)
126@@ -872,6 +874,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key)
127 if (key_cert_check_authority(key, 0, 1,
128 use_authorized_principals ? NULL : pw->pw_name, &reason) != 0)
129 goto fail_reason;
130+ auth_start_parse_options();
131 if (auth_cert_options(key, pw) != 0)
132 goto out;
133
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
new file mode 100644
index 000000000..b984e3051
--- /dev/null
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -0,0 +1,26 @@
1From 3b192a5f7a31dc247e546067fcca5fd3eb1d4b01 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 c406aec..37cb023 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -325,6 +325,7 @@ install-files:
20 $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
21 $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
22 $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
23+ ln -s ../$(mansubdir)8/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)5/authorized_keys.5
24 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
25 $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
26 $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
diff --git a/debian/patches/backport-do-not-resend-username-to-pam.patch b/debian/patches/backport-do-not-resend-username-to-pam.patch
new file mode 100644
index 000000000..a0dc7a550
--- /dev/null
+++ b/debian/patches/backport-do-not-resend-username-to-pam.patch
@@ -0,0 +1,43 @@
1From 7de26a97986c8032bf1869347a2ceaee1d64f857 Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Tue, 11 Aug 2015 13:33:24 +1000
4Subject: Don't resend username to PAM; it already has it.
5
6Pointed out by Moritz Jodeit; ok dtucker@
7
8Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=d4697fe9a28dab7255c60433e4dd23cf7fce8a8b
9Forwarded: not-needed
10Last-Update: 2015-08-19
11
12Patch-Name: backport-do-not-resend-username-to-pam.patch
13---
14 monitor.c | 2 --
15 monitor_wrap.c | 1 -
16 2 files changed, 3 deletions(-)
17
18diff --git a/monitor.c b/monitor.c
19index 12ed6fd..870a6b9 100644
20--- a/monitor.c
21+++ b/monitor.c
22@@ -1143,9 +1143,7 @@ extern KbdintDevice sshpam_device;
23 int
24 mm_answer_pam_init_ctx(int sock, Buffer *m)
25 {
26-
27 debug3("%s", __func__);
28- authctxt->user = buffer_get_string(m, NULL);
29 sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
30 sshpam_authok = NULL;
31 buffer_clear(m);
32diff --git a/monitor_wrap.c b/monitor_wrap.c
33index 2a0fe9b..e2fcf75 100644
34--- a/monitor_wrap.c
35+++ b/monitor_wrap.c
36@@ -632,7 +632,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
37
38 debug3("%s", __func__);
39 buffer_init(&m);
40- buffer_put_cstring(&m, authctxt->user);
41 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
42 debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
43 mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);
diff --git a/debian/patches/backport-fix-pty-permissions.patch b/debian/patches/backport-fix-pty-permissions.patch
new file mode 100644
index 000000000..6d7aaa71a
--- /dev/null
+++ b/debian/patches/backport-fix-pty-permissions.patch
@@ -0,0 +1,33 @@
1From 7c2583f26ff8eb848c53255a88574f923edaf94d Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Thu, 30 Jul 2015 23:09:15 +0000
4Subject: Fix pty permissions
5
6Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=6f941396b6835ad18018845f515b0c4fe20be21a
7Forwarded: not-needed
8Last-Update: 2015-08-19
9
10Patch-Name: backport-fix-pty-permissions.patch
11---
12 sshpty.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/sshpty.c b/sshpty.c
16index 0e32b39..e89efb7 100644
17--- a/sshpty.c
18+++ b/sshpty.c
19@@ -1,4 +1,4 @@
20-/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */
21+/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */
22 /*
23 * Author: Tatu Ylonen <ylo@cs.hut.fi>
24 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
25@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty, const char *role)
26 /* Determine the group to make the owner of the tty. */
27 grp = getgrnam("tty");
28 gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid;
29- mode = (grp != NULL) ? 0622 : 0600;
30+ mode = (grp != NULL) ? 0620 : 0600;
31
32 /*
33 * Change owner and mode of the tty as required.
diff --git a/debian/patches/backport-kbdint-duplicates.patch b/debian/patches/backport-kbdint-duplicates.patch
new file mode 100644
index 000000000..20b071fb5
--- /dev/null
+++ b/debian/patches/backport-kbdint-duplicates.patch
@@ -0,0 +1,53 @@
1From e1c118c1cd5b0c691e6d080c87c440c262fc6b12 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Sat, 18 Jul 2015 07:57:14 +0000
4Subject: only query each keyboard-interactive device once per authentication
5 request regardless of how many times it is listed
6
7ok markus@
8
9Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=5b64f85bb811246c59ebab70aed331f26ba37b18
10Forwarded: not-needed
11Last-Update: 2015-08-19
12
13Patch-Name: backport-kbdint-duplicates.patch
14---
15 auth2-chall.c | 11 ++++++++---
16 1 file changed, 8 insertions(+), 3 deletions(-)
17
18diff --git a/auth2-chall.c b/auth2-chall.c
19index ddabe1a..4aff09d 100644
20--- a/auth2-chall.c
21+++ b/auth2-chall.c
22@@ -1,4 +1,4 @@
23-/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */
24+/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */
25 /*
26 * Copyright (c) 2001 Markus Friedl. All rights reserved.
27 * Copyright (c) 2001 Per Allansson. All rights reserved.
28@@ -83,6 +83,7 @@ struct KbdintAuthctxt
29 void *ctxt;
30 KbdintDevice *device;
31 u_int nreq;
32+ u_int devices_done;
33 };
34
35 #ifdef USE_PAM
36@@ -169,11 +170,15 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt)
37 if (len == 0)
38 break;
39 for (i = 0; devices[i]; i++) {
40- if (!auth2_method_allowed(authctxt,
41+ if ((kbdintctxt->devices_done & (1 << i)) != 0 ||
42+ !auth2_method_allowed(authctxt,
43 "keyboard-interactive", devices[i]->name))
44 continue;
45- if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0)
46+ if (strncmp(kbdintctxt->devices, devices[i]->name,
47+ len) == 0) {
48 kbdintctxt->device = devices[i];
49+ kbdintctxt->devices_done |= 1 << i;
50+ }
51 }
52 t = kbdintctxt->devices;
53 kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL;
diff --git a/debian/patches/backport-pam-use-after-free.patch b/debian/patches/backport-pam-use-after-free.patch
new file mode 100644
index 000000000..cce52f554
--- /dev/null
+++ b/debian/patches/backport-pam-use-after-free.patch
@@ -0,0 +1,39 @@
1From 5811884269955979919121440a57a7475a4f9eac Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Tue, 11 Aug 2015 13:34:12 +1000
4Subject: set sshpam_ctxt to NULL after free
5
6Avoids use-after-free in monitor when privsep child is compromised.
7Reported by Moritz Jodeit; ok dtucker@
8
9Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=5e75f5198769056089fb06c4d738ab0e5abc66f7
10Forwarded: not-needed
11Last-Update: 2015-08-19
12
13Patch-Name: backport-pam-use-after-free.patch
14---
15 monitor.c | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/monitor.c b/monitor.c
19index 870a6b9..e8541b4 100644
20--- a/monitor.c
21+++ b/monitor.c
22@@ -1225,14 +1225,16 @@ mm_answer_pam_respond(int sock, Buffer *m)
23 int
24 mm_answer_pam_free_ctx(int sock, Buffer *m)
25 {
26+ int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt;
27
28 debug3("%s", __func__);
29 (sshpam_device.free_ctx)(sshpam_ctxt);
30+ sshpam_ctxt = sshpam_authok = NULL;
31 buffer_clear(m);
32 mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
33 auth_method = "keyboard-interactive";
34 auth_submethod = "pam";
35- return (sshpam_authok == sshpam_ctxt);
36+ return r;
37 }
38 #endif
39
diff --git a/debian/patches/backport-regress-principals-command-noexec.patch b/debian/patches/backport-regress-principals-command-noexec.patch
new file mode 100644
index 000000000..1e7c638cd
--- /dev/null
+++ b/debian/patches/backport-regress-principals-command-noexec.patch
@@ -0,0 +1,257 @@
1From fb43a1fa9d049900efd76861b9496a9585ba4759 Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Mon, 10 Aug 2015 11:13:44 +1000
4Subject: let principals-command.sh work for noexec /var/run
5
6Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=55b263fb7cfeacb81aaf1c2036e0394c881637da
7Forwarded: not-needed
8Last-Update: 2015-08-20
9
10Patch-Name: backport-regress-principals-command-noexec.patch
11---
12 regress/principals-command.sh | 222 +++++++++++++++++++++---------------------
13 1 file changed, 113 insertions(+), 109 deletions(-)
14
15diff --git a/regress/principals-command.sh b/regress/principals-command.sh
16index 9006437..b90a8cf 100644
17--- a/regress/principals-command.sh
18+++ b/regress/principals-command.sh
19@@ -14,15 +14,15 @@ fi
20
21 # Establish a AuthorizedPrincipalsCommand in /var/run where it will have
22 # acceptable directory permissions.
23-PRINCIPALS_COMMAND="/var/run/principals_command_${LOGNAME}"
24-cat << _EOF | $SUDO sh -c "cat > '$PRINCIPALS_COMMAND'"
25+PRINCIPALS_CMD="/var/run/principals_command_${LOGNAME}"
26+cat << _EOF | $SUDO sh -c "cat > '$PRINCIPALS_CMD'"
27 #!/bin/sh
28 test "x\$1" != "x${LOGNAME}" && exit 1
29 test -f "$OBJ/authorized_principals_${LOGNAME}" &&
30 exec cat "$OBJ/authorized_principals_${LOGNAME}"
31 _EOF
32 test $? -eq 0 || fatal "couldn't prepare principals command"
33-$SUDO chmod 0755 "$PRINCIPALS_COMMAND"
34+$SUDO chmod 0755 "$PRINCIPALS_CMD"
35
36 # Create a CA key and a user certificate.
37 ${SSHKEYGEN} -q -N '' -t ed25519 -f $OBJ/user_ca_key || \
38@@ -33,109 +33,113 @@ ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I "regress user key for $USER" \
39 -z $$ -n ${USER},mekmitasdigoat $OBJ/cert_user_key || \
40 fatal "couldn't sign cert_user_key"
41
42-# Test explicitly-specified principals
43-for privsep in yes no ; do
44- _prefix="privsep $privsep"
45-
46- # Setup for AuthorizedPrincipalsCommand
47- rm -f $OBJ/authorized_keys_$USER
48- (
49- cat $OBJ/sshd_proxy_bak
50- echo "UsePrivilegeSeparation $privsep"
51- echo "AuthorizedKeysFile none"
52- echo "AuthorizedPrincipalsCommand $PRINCIPALS_COMMAND %u"
53- echo "AuthorizedPrincipalsCommandUser ${LOGNAME}"
54- echo "TrustedUserCAKeys $OBJ/user_ca_key.pub"
55- ) > $OBJ/sshd_proxy
56-
57- # XXX test missing command
58- # XXX test failing command
59-
60- # Empty authorized_principals
61- verbose "$tid: ${_prefix} empty authorized_principals"
62- echo > $OBJ/authorized_principals_$USER
63- ${SSH} -2i $OBJ/cert_user_key \
64- -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
65- if [ $? -eq 0 ]; then
66- fail "ssh cert connect succeeded unexpectedly"
67- fi
68-
69- # Wrong authorized_principals
70- verbose "$tid: ${_prefix} wrong authorized_principals"
71- echo gregorsamsa > $OBJ/authorized_principals_$USER
72- ${SSH} -2i $OBJ/cert_user_key \
73- -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
74- if [ $? -eq 0 ]; then
75- fail "ssh cert connect succeeded unexpectedly"
76- fi
77-
78- # Correct authorized_principals
79- verbose "$tid: ${_prefix} correct authorized_principals"
80- echo mekmitasdigoat > $OBJ/authorized_principals_$USER
81- ${SSH} -2i $OBJ/cert_user_key \
82- -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
83- if [ $? -ne 0 ]; then
84- fail "ssh cert connect failed"
85- fi
86-
87- # authorized_principals with bad key option
88- verbose "$tid: ${_prefix} authorized_principals bad key opt"
89- echo 'blah mekmitasdigoat' > $OBJ/authorized_principals_$USER
90- ${SSH} -2i $OBJ/cert_user_key \
91- -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
92- if [ $? -eq 0 ]; then
93- fail "ssh cert connect succeeded unexpectedly"
94- fi
95-
96- # authorized_principals with command=false
97- verbose "$tid: ${_prefix} authorized_principals command=false"
98- echo 'command="false" mekmitasdigoat' > \
99- $OBJ/authorized_principals_$USER
100- ${SSH} -2i $OBJ/cert_user_key \
101- -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
102- if [ $? -eq 0 ]; then
103- fail "ssh cert connect succeeded unexpectedly"
104- fi
105-
106-
107- # authorized_principals with command=true
108- verbose "$tid: ${_prefix} authorized_principals command=true"
109- echo 'command="true" mekmitasdigoat' > \
110- $OBJ/authorized_principals_$USER
111- ${SSH} -2i $OBJ/cert_user_key \
112- -F $OBJ/ssh_proxy somehost false >/dev/null 2>&1
113- if [ $? -ne 0 ]; then
114- fail "ssh cert connect failed"
115- fi
116-
117- # Setup for principals= key option
118- rm -f $OBJ/authorized_principals_$USER
119- (
120- cat $OBJ/sshd_proxy_bak
121- echo "UsePrivilegeSeparation $privsep"
122- ) > $OBJ/sshd_proxy
123-
124- # Wrong principals list
125- verbose "$tid: ${_prefix} wrong principals key option"
126- (
127- printf 'cert-authority,principals="gregorsamsa" '
128- cat $OBJ/user_ca_key.pub
129- ) > $OBJ/authorized_keys_$USER
130- ${SSH} -2i $OBJ/cert_user_key \
131- -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
132- if [ $? -eq 0 ]; then
133- fail "ssh cert connect succeeded unexpectedly"
134- fi
135-
136- # Correct principals list
137- verbose "$tid: ${_prefix} correct principals key option"
138- (
139- printf 'cert-authority,principals="mekmitasdigoat" '
140- cat $OBJ/user_ca_key.pub
141- ) > $OBJ/authorized_keys_$USER
142- ${SSH} -2i $OBJ/cert_user_key \
143- -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
144- if [ $? -ne 0 ]; then
145- fail "ssh cert connect failed"
146- fi
147-done
148+if [ -x $PRINCIPALS_CMD ]; then
149+ # Test explicitly-specified principals
150+ for privsep in yes no ; do
151+ _prefix="privsep $privsep"
152+
153+ # Setup for AuthorizedPrincipalsCommand
154+ rm -f $OBJ/authorized_keys_$USER
155+ (
156+ cat $OBJ/sshd_proxy_bak
157+ echo "UsePrivilegeSeparation $privsep"
158+ echo "AuthorizedKeysFile none"
159+ echo "AuthorizedPrincipalsCommand $PRINCIPALS_CMD %u"
160+ echo "AuthorizedPrincipalsCommandUser ${LOGNAME}"
161+ echo "TrustedUserCAKeys $OBJ/user_ca_key.pub"
162+ ) > $OBJ/sshd_proxy
163+
164+ # XXX test missing command
165+ # XXX test failing command
166+
167+ # Empty authorized_principals
168+ verbose "$tid: ${_prefix} empty authorized_principals"
169+ echo > $OBJ/authorized_principals_$USER
170+ ${SSH} -2i $OBJ/cert_user_key \
171+ -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
172+ if [ $? -eq 0 ]; then
173+ fail "ssh cert connect succeeded unexpectedly"
174+ fi
175+
176+ # Wrong authorized_principals
177+ verbose "$tid: ${_prefix} wrong authorized_principals"
178+ echo gregorsamsa > $OBJ/authorized_principals_$USER
179+ ${SSH} -2i $OBJ/cert_user_key \
180+ -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
181+ if [ $? -eq 0 ]; then
182+ fail "ssh cert connect succeeded unexpectedly"
183+ fi
184+
185+ # Correct authorized_principals
186+ verbose "$tid: ${_prefix} correct authorized_principals"
187+ echo mekmitasdigoat > $OBJ/authorized_principals_$USER
188+ ${SSH} -2i $OBJ/cert_user_key \
189+ -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
190+ if [ $? -ne 0 ]; then
191+ fail "ssh cert connect failed"
192+ fi
193+
194+ # authorized_principals with bad key option
195+ verbose "$tid: ${_prefix} authorized_principals bad key opt"
196+ echo 'blah mekmitasdigoat' > $OBJ/authorized_principals_$USER
197+ ${SSH} -2i $OBJ/cert_user_key \
198+ -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
199+ if [ $? -eq 0 ]; then
200+ fail "ssh cert connect succeeded unexpectedly"
201+ fi
202+
203+ # authorized_principals with command=false
204+ verbose "$tid: ${_prefix} authorized_principals command=false"
205+ echo 'command="false" mekmitasdigoat' > \
206+ $OBJ/authorized_principals_$USER
207+ ${SSH} -2i $OBJ/cert_user_key \
208+ -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
209+ if [ $? -eq 0 ]; then
210+ fail "ssh cert connect succeeded unexpectedly"
211+ fi
212+
213+ # authorized_principals with command=true
214+ verbose "$tid: ${_prefix} authorized_principals command=true"
215+ echo 'command="true" mekmitasdigoat' > \
216+ $OBJ/authorized_principals_$USER
217+ ${SSH} -2i $OBJ/cert_user_key \
218+ -F $OBJ/ssh_proxy somehost false >/dev/null 2>&1
219+ if [ $? -ne 0 ]; then
220+ fail "ssh cert connect failed"
221+ fi
222+
223+ # Setup for principals= key option
224+ rm -f $OBJ/authorized_principals_$USER
225+ (
226+ cat $OBJ/sshd_proxy_bak
227+ echo "UsePrivilegeSeparation $privsep"
228+ ) > $OBJ/sshd_proxy
229+
230+ # Wrong principals list
231+ verbose "$tid: ${_prefix} wrong principals key option"
232+ (
233+ printf 'cert-authority,principals="gregorsamsa" '
234+ cat $OBJ/user_ca_key.pub
235+ ) > $OBJ/authorized_keys_$USER
236+ ${SSH} -2i $OBJ/cert_user_key \
237+ -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
238+ if [ $? -eq 0 ]; then
239+ fail "ssh cert connect succeeded unexpectedly"
240+ fi
241+
242+ # Correct principals list
243+ verbose "$tid: ${_prefix} correct principals key option"
244+ (
245+ printf 'cert-authority,principals="mekmitasdigoat" '
246+ cat $OBJ/user_ca_key.pub
247+ ) > $OBJ/authorized_keys_$USER
248+ ${SSH} -2i $OBJ/cert_user_key \
249+ -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
250+ if [ $? -ne 0 ]; then
251+ fail "ssh cert connect failed"
252+ fi
253+ done
254+else
255+ echo "SKIPPED: $PRINCIPALS_COMMAND not executable " \
256+ "(/var/run mounted noexec?)"
257+fi
diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
new file mode 100644
index 000000000..5ab47c0ca
--- /dev/null
+++ b/debian/patches/consolekit.patch
@@ -0,0 +1,576 @@
1From 1197fd975ab8fd11b1ac83557ef750129b16c0d8 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: 2015-08-19
8
9Patch-Name: consolekit.patch
10---
11 Makefile.in | 3 +-
12 configure.ac | 25 ++++++
13 consolekit.c | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
14 consolekit.h | 24 ++++++
15 monitor.c | 42 ++++++++++
16 monitor.h | 2 +
17 monitor_wrap.c | 30 +++++++
18 monitor_wrap.h | 4 +
19 session.c | 13 ++++
20 session.h | 6 ++
21 10 files changed, 389 insertions(+), 1 deletion(-)
22 create mode 100644 consolekit.c
23 create mode 100644 consolekit.h
24
25diff --git a/Makefile.in b/Makefile.in
26index 3d2a328..c406aec 100644
27--- a/Makefile.in
28+++ b/Makefile.in
29@@ -111,7 +111,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
30 sftp-server.o sftp-common.o \
31 roaming_common.o roaming_serv.o \
32 sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
33- sandbox-seccomp-filter.o sandbox-capsicum.o
34+ sandbox-seccomp-filter.o sandbox-capsicum.o \
35+ consolekit.o
36
37 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
38 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
39diff --git a/configure.ac b/configure.ac
40index 4d55c46..cd6acaf 100644
41--- a/configure.ac
42+++ b/configure.ac
43@@ -4188,6 +4188,30 @@ AC_ARG_WITH([kerberos5],
44 AC_SUBST([GSSLIBS])
45 AC_SUBST([K5LIBS])
46
47+# Check whether user wants ConsoleKit support
48+CONSOLEKIT_MSG="no"
49+LIBCK_CONNECTOR=""
50+AC_ARG_WITH(consolekit,
51+ [ --with-consolekit Enable ConsoleKit support],
52+ [ if test "x$withval" != "xno" ; then
53+ AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
54+ if test "$PKGCONFIG" != "no"; then
55+ AC_MSG_CHECKING([for ck-connector])
56+ if $PKGCONFIG --exists ck-connector; then
57+ CKCON_CFLAGS=`$PKGCONFIG --cflags ck-connector`
58+ CKCON_LIBS=`$PKGCONFIG --libs ck-connector`
59+ CPPFLAGS="$CPPFLAGS $CKCON_CFLAGS"
60+ SSHDLIBS="$SSHDLIBS $CKCON_LIBS"
61+ AC_MSG_RESULT([yes])
62+ AC_DEFINE(USE_CONSOLEKIT, 1, [Define if you want ConsoleKit support.])
63+ CONSOLEKIT_MSG="yes"
64+ else
65+ AC_MSG_RESULT([no])
66+ fi
67+ fi
68+ fi ]
69+)
70+
71 # Looking for programs, paths and files
72
73 PRIVSEP_PATH=/var/empty
74@@ -4989,6 +5013,7 @@ echo " MD5 password support: $MD5_MSG"
75 echo " libedit support: $LIBEDIT_MSG"
76 echo " Solaris process contract support: $SPC_MSG"
77 echo " Solaris project support: $SP_MSG"
78+echo " ConsoleKit support: $CONSOLEKIT_MSG"
79 echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
80 echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
81 echo " BSD Auth support: $BSD_AUTH_MSG"
82diff --git a/consolekit.c b/consolekit.c
83new file mode 100644
84index 0000000..0266f06
85--- /dev/null
86+++ b/consolekit.c
87@@ -0,0 +1,241 @@
88+/*
89+ * Copyright (c) 2008 Colin Watson. All rights reserved.
90+ *
91+ * Permission to use, copy, modify, and distribute this software for any
92+ * purpose with or without fee is hereby granted, provided that the above
93+ * copyright notice and this permission notice appear in all copies.
94+ *
95+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
96+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
97+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
98+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
99+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
100+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
101+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
102+ */
103+/*
104+ * Loosely based on pam-ck-connector, which is:
105+ *
106+ * Copyright (c) 2007 David Zeuthen <davidz@redhat.com>
107+ *
108+ * Permission is hereby granted, free of charge, to any person
109+ * obtaining a copy of this software and associated documentation
110+ * files (the "Software"), to deal in the Software without
111+ * restriction, including without limitation the rights to use,
112+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
113+ * copies of the Software, and to permit persons to whom the
114+ * Software is furnished to do so, subject to the following
115+ * conditions:
116+ *
117+ * The above copyright notice and this permission notice shall be
118+ * included in all copies or substantial portions of the Software.
119+ *
120+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
121+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
122+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
123+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
124+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
125+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
126+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
127+ * OTHER DEALINGS IN THE SOFTWARE.
128+ */
129+
130+#include "includes.h"
131+
132+#ifdef USE_CONSOLEKIT
133+
134+#include <ck-connector.h>
135+
136+#include "openbsd-compat/sys-queue.h"
137+#include "xmalloc.h"
138+#include "channels.h"
139+#include "key.h"
140+#include "hostfile.h"
141+#include "auth.h"
142+#include "log.h"
143+#include "misc.h"
144+#include "servconf.h"
145+#include "canohost.h"
146+#include "session.h"
147+#include "consolekit.h"
148+
149+extern ServerOptions options;
150+extern u_int utmp_len;
151+
152+void
153+set_active(const char *cookie)
154+{
155+ DBusError err;
156+ DBusConnection *connection;
157+ DBusMessage *message = NULL, *reply = NULL;
158+ char *sid;
159+ DBusMessageIter iter, subiter;
160+ const char *interface, *property;
161+ dbus_bool_t active;
162+
163+ dbus_error_init(&err);
164+ connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
165+ if (!connection) {
166+ if (dbus_error_is_set(&err)) {
167+ error("unable to open DBus connection: %s",
168+ err.message);
169+ dbus_error_free(&err);
170+ }
171+ goto out;
172+ }
173+ dbus_connection_set_exit_on_disconnect(connection, FALSE);
174+
175+ message = dbus_message_new_method_call("org.freedesktop.ConsoleKit",
176+ "/org/freedesktop/ConsoleKit/Manager",
177+ "org.freedesktop.ConsoleKit.Manager",
178+ "GetSessionForCookie");
179+ if (!message)
180+ goto out;
181+ if (!dbus_message_append_args(message, DBUS_TYPE_STRING, &cookie,
182+ DBUS_TYPE_INVALID)) {
183+ if (dbus_error_is_set(&err)) {
184+ error("unable to get current session: %s",
185+ err.message);
186+ dbus_error_free(&err);
187+ }
188+ goto out;
189+ }
190+
191+ dbus_error_init(&err);
192+ reply = dbus_connection_send_with_reply_and_block(connection, message,
193+ -1, &err);
194+ if (!reply) {
195+ if (dbus_error_is_set(&err)) {
196+ error("unable to get current session: %s",
197+ err.message);
198+ dbus_error_free(&err);
199+ }
200+ goto out;
201+ }
202+
203+ dbus_error_init(&err);
204+ if (!dbus_message_get_args(reply, &err,
205+ DBUS_TYPE_OBJECT_PATH, &sid,
206+ DBUS_TYPE_INVALID)) {
207+ if (dbus_error_is_set(&err)) {
208+ error("unable to get current session: %s",
209+ err.message);
210+ dbus_error_free(&err);
211+ }
212+ goto out;
213+ }
214+ dbus_message_unref(reply);
215+ dbus_message_unref(message);
216+ message = reply = NULL;
217+
218+ message = dbus_message_new_method_call("org.freedesktop.ConsoleKit",
219+ sid, "org.freedesktop.DBus.Properties", "Set");
220+ if (!message)
221+ goto out;
222+ interface = "org.freedesktop.ConsoleKit.Session";
223+ property = "active";
224+ if (!dbus_message_append_args(message,
225+ DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &property,
226+ DBUS_TYPE_INVALID))
227+ goto out;
228+ dbus_message_iter_init_append(message, &iter);
229+ if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT,
230+ DBUS_TYPE_BOOLEAN_AS_STRING, &subiter))
231+ goto out;
232+ active = TRUE;
233+ if (!dbus_message_iter_append_basic(&subiter, DBUS_TYPE_BOOLEAN,
234+ &active))
235+ goto out;
236+ if (!dbus_message_iter_close_container(&iter, &subiter))
237+ goto out;
238+
239+ dbus_error_init(&err);
240+ reply = dbus_connection_send_with_reply_and_block(connection, message,
241+ -1, &err);
242+ if (!reply) {
243+ if (dbus_error_is_set(&err)) {
244+ error("unable to make current session active: %s",
245+ err.message);
246+ dbus_error_free(&err);
247+ }
248+ goto out;
249+ }
250+
251+out:
252+ if (reply)
253+ dbus_message_unref(reply);
254+ if (message)
255+ dbus_message_unref(message);
256+}
257+
258+/*
259+ * We pass display separately rather than using s->display because the
260+ * latter is not available in the monitor when using privsep.
261+ */
262+
263+char *
264+consolekit_register(Session *s, const char *display)
265+{
266+ DBusError err;
267+ const char *tty = s->tty;
268+ const char *remote_host_name;
269+ dbus_bool_t is_local = FALSE;
270+ const char *cookie = NULL;
271+
272+ if (s->ckc) {
273+ debug("already registered with ConsoleKit");
274+ return xstrdup(ck_connector_get_cookie(s->ckc));
275+ }
276+
277+ s->ckc = ck_connector_new();
278+ if (!s->ckc) {
279+ error("ck_connector_new failed");
280+ return NULL;
281+ }
282+
283+ if (!tty)
284+ tty = "";
285+ if (!display)
286+ display = "";
287+ remote_host_name = get_remote_name_or_ip(utmp_len, options.use_dns);
288+ if (!remote_host_name)
289+ remote_host_name = "";
290+
291+ dbus_error_init(&err);
292+ if (!ck_connector_open_session_with_parameters(s->ckc, &err,
293+ "unix-user", &s->pw->pw_uid,
294+ "display-device", &tty,
295+ "x11-display", &display,
296+ "remote-host-name", &remote_host_name,
297+ "is-local", &is_local,
298+ NULL)) {
299+ if (dbus_error_is_set(&err)) {
300+ debug("%s", err.message);
301+ dbus_error_free(&err);
302+ } else {
303+ debug("insufficient privileges or D-Bus / ConsoleKit "
304+ "not available");
305+ }
306+ return NULL;
307+ }
308+
309+ debug("registered uid=%d on tty='%s' with ConsoleKit",
310+ s->pw->pw_uid, s->tty);
311+
312+ cookie = ck_connector_get_cookie(s->ckc);
313+ set_active(cookie);
314+ return xstrdup(cookie);
315+}
316+
317+void
318+consolekit_unregister(Session *s)
319+{
320+ if (s->ckc) {
321+ debug("unregistering ConsoleKit session %s",
322+ ck_connector_get_cookie(s->ckc));
323+ ck_connector_unref(s->ckc);
324+ s->ckc = NULL;
325+ }
326+}
327+
328+#endif /* USE_CONSOLEKIT */
329diff --git a/consolekit.h b/consolekit.h
330new file mode 100644
331index 0000000..8ce3716
332--- /dev/null
333+++ b/consolekit.h
334@@ -0,0 +1,24 @@
335+/*
336+ * Copyright (c) 2008 Colin Watson. All rights reserved.
337+ *
338+ * Permission to use, copy, modify, and distribute this software for any
339+ * purpose with or without fee is hereby granted, provided that the above
340+ * copyright notice and this permission notice appear in all copies.
341+ *
342+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
343+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
344+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
345+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
346+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
347+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
348+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
349+ */
350+
351+#ifdef USE_CONSOLEKIT
352+
353+struct Session;
354+
355+char * consolekit_register(struct Session *, const char *);
356+void consolekit_unregister(struct Session *);
357+
358+#endif /* USE_CONSOLEKIT */
359diff --git a/monitor.c b/monitor.c
360index 3a3d2f0..12ed6fd 100644
361--- a/monitor.c
362+++ b/monitor.c
363@@ -104,6 +104,9 @@
364 #include "authfd.h"
365 #include "match.h"
366 #include "ssherr.h"
367+#ifdef USE_CONSOLEKIT
368+#include "consolekit.h"
369+#endif
370
371 #ifdef GSSAPI
372 static Gssctxt *gsscontext = NULL;
373@@ -169,6 +172,10 @@ int mm_answer_audit_command(int, Buffer *);
374
375 static int monitor_read_log(struct monitor *);
376
377+#ifdef USE_CONSOLEKIT
378+int mm_answer_consolekit_register(int, Buffer *);
379+#endif
380+
381 static Authctxt *authctxt;
382
383 #ifdef WITH_SSH1
384@@ -261,6 +268,9 @@ struct mon_table mon_dispatch_postauth20[] = {
385 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
386 {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command},
387 #endif
388+#ifdef USE_CONSOLEKIT
389+ {MONITOR_REQ_CONSOLEKIT_REGISTER, 0, mm_answer_consolekit_register},
390+#endif
391 {0, 0, NULL}
392 };
393
394@@ -306,6 +316,9 @@ struct mon_table mon_dispatch_postauth15[] = {
395 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
396 {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command},
397 #endif
398+#ifdef USE_CONSOLEKIT
399+ {MONITOR_REQ_CONSOLEKIT_REGISTER, 0, mm_answer_consolekit_register},
400+#endif
401 #endif /* WITH_SSH1 */
402 {0, 0, NULL}
403 };
404@@ -488,6 +501,9 @@ monitor_child_postauth(struct monitor *pmonitor)
405 monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
406 monitor_permit(mon_dispatch, MONITOR_REQ_PTYCLEANUP, 1);
407 }
408+#ifdef USE_CONSOLEKIT
409+ monitor_permit(mon_dispatch, MONITOR_REQ_CONSOLEKIT_REGISTER, 1);
410+#endif
411
412 for (;;)
413 monitor_read(pmonitor, mon_dispatch, NULL);
414@@ -2191,3 +2207,29 @@ mm_answer_gss_updatecreds(int socket, Buffer *m) {
415
416 #endif /* GSSAPI */
417
418+#ifdef USE_CONSOLEKIT
419+int
420+mm_answer_consolekit_register(int sock, Buffer *m)
421+{
422+ Session *s;
423+ char *tty, *display;
424+ char *cookie = NULL;
425+
426+ debug3("%s entering", __func__);
427+
428+ tty = buffer_get_string(m, NULL);
429+ display = buffer_get_string(m, NULL);
430+ s = session_by_tty(tty);
431+ if (s != NULL)
432+ cookie = consolekit_register(s, display);
433+ buffer_clear(m);
434+ buffer_put_cstring(m, cookie != NULL ? cookie : "");
435+ mm_request_send(sock, MONITOR_ANS_CONSOLEKIT_REGISTER, m);
436+
437+ free(cookie);
438+ free(display);
439+ free(tty);
440+
441+ return (0);
442+}
443+#endif /* USE_CONSOLEKIT */
444diff --git a/monitor.h b/monitor.h
445index 2d82b8b..fd8d92c 100644
446--- a/monitor.h
447+++ b/monitor.h
448@@ -70,6 +70,8 @@ enum monitor_reqtype {
449
450 MONITOR_REQ_AUTHROLE = 154,
451
452+ MONITOR_REQ_CONSOLEKIT_REGISTER = 156, MONITOR_ANS_CONSOLEKIT_REGISTER = 157,
453+
454 };
455
456 struct mm_master;
457diff --git a/monitor_wrap.c b/monitor_wrap.c
458index 6ae72a0..2a0fe9b 100644
459--- a/monitor_wrap.c
460+++ b/monitor_wrap.c
461@@ -1151,3 +1151,33 @@ mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
462
463 #endif /* GSSAPI */
464
465+#ifdef USE_CONSOLEKIT
466+char *
467+mm_consolekit_register(Session *s, const char *display)
468+{
469+ Buffer m;
470+ char *cookie;
471+
472+ debug3("%s entering", __func__);
473+
474+ if (s->ttyfd == -1)
475+ return NULL;
476+ buffer_init(&m);
477+ buffer_put_cstring(&m, s->tty);
478+ buffer_put_cstring(&m, display != NULL ? display : "");
479+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_CONSOLEKIT_REGISTER, &m);
480+ buffer_clear(&m);
481+
482+ mm_request_receive_expect(pmonitor->m_recvfd,
483+ MONITOR_ANS_CONSOLEKIT_REGISTER, &m);
484+ cookie = buffer_get_string(&m, NULL);
485+ buffer_free(&m);
486+
487+ /* treat empty cookie as missing cookie */
488+ if (strlen(cookie) == 0) {
489+ free(cookie);
490+ cookie = NULL;
491+ }
492+ return (cookie);
493+}
494+#endif /* USE_CONSOLEKIT */
495diff --git a/monitor_wrap.h b/monitor_wrap.h
496index 57e740f..6829392 100644
497--- a/monitor_wrap.h
498+++ b/monitor_wrap.h
499@@ -108,4 +108,8 @@ int mm_skey_respond(void *, u_int, char **);
500 /* zlib allocation hooks */
501 void mm_init_compression(struct mm_master *);
502
503+#ifdef USE_CONSOLEKIT
504+char *mm_consolekit_register(struct Session *, const char *);
505+#endif /* USE_CONSOLEKIT */
506+
507 #endif /* _MM_WRAP_H_ */
508diff --git a/session.c b/session.c
509index afac4a5..c6bd728 100644
510--- a/session.c
511+++ b/session.c
512@@ -94,6 +94,7 @@
513 #include "kex.h"
514 #include "monitor_wrap.h"
515 #include "sftp.h"
516+#include "consolekit.h"
517
518 #if defined(KRB5) && defined(USE_AFS)
519 #include <kafs.h>
520@@ -1144,6 +1145,9 @@ do_setup_env(Session *s, const char *shell)
521 #if !defined (HAVE_LOGIN_CAP) && !defined (HAVE_CYGWIN)
522 char *path = NULL;
523 #endif
524+#ifdef USE_CONSOLEKIT
525+ const char *ckcookie = NULL;
526+#endif /* USE_CONSOLEKIT */
527
528 /* Initialize the environment. */
529 envsize = 100;
530@@ -1288,6 +1292,11 @@ do_setup_env(Session *s, const char *shell)
531 child_set_env(&env, &envsize, "KRB5CCNAME",
532 s->authctxt->krb5_ccname);
533 #endif
534+#ifdef USE_CONSOLEKIT
535+ ckcookie = PRIVSEP(consolekit_register(s, s->display));
536+ if (ckcookie)
537+ child_set_env(&env, &envsize, "XDG_SESSION_COOKIE", ckcookie);
538+#endif /* USE_CONSOLEKIT */
539 #ifdef USE_PAM
540 /*
541 * Pull in any environment variables that may have
542@@ -2351,6 +2360,10 @@ session_pty_cleanup2(Session *s)
543
544 debug("session_pty_cleanup: session %d release %s", s->self, s->tty);
545
546+#ifdef USE_CONSOLEKIT
547+ consolekit_unregister(s);
548+#endif /* USE_CONSOLEKIT */
549+
550 /* Record that the user has logged out. */
551 if (s->pid != 0)
552 record_logout(s->pid, s->tty, s->pw->pw_name);
553diff --git a/session.h b/session.h
554index ef6593c..a6b6983 100644
555--- a/session.h
556+++ b/session.h
557@@ -26,6 +26,8 @@
558 #ifndef SESSION_H
559 #define SESSION_H
560
561+struct _CkConnector;
562+
563 #define TTYSZ 64
564 typedef struct Session Session;
565 struct Session {
566@@ -61,6 +63,10 @@ struct Session {
567 char *name;
568 char *val;
569 } *env;
570+
571+#ifdef USE_CONSOLEKIT
572+ struct _CkConnector *ckc;
573+#endif /* USE_CONSOLEKIT */
574 };
575
576 void do_authenticated(Authctxt *);
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
new file mode 100644
index 000000000..fd75fd453
--- /dev/null
+++ b/debian/patches/debian-banner.patch
@@ -0,0 +1,111 @@
1From 781bef6cb1a423864072a07c08c9ae95c554b07a Mon Sep 17 00:00:00 2001
2From: Kees Cook <kees@debian.org>
3Date: Sun, 9 Feb 2014 16:10:06 +0000
4Subject: Add DebianBanner server configuration option
5
6Setting this to "no" causes sshd to omit the Debian revision from its
7initial protocol handshake, for those scared by package-versioning.patch.
8
9Bug-Debian: http://bugs.debian.org/562048
10Forwarded: not-needed
11Last-Update: 2015-08-19
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 8a5bd7b..fe3e311 100644
23--- a/servconf.c
24+++ b/servconf.c
25@@ -169,6 +169,7 @@ initialize_server_options(ServerOptions *options)
26 options->ip_qos_bulk = -1;
27 options->version_addendum = NULL;
28 options->fingerprint_hash = -1;
29+ options->debian_banner = -1;
30 }
31
32 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
33@@ -347,6 +348,8 @@ fill_default_server_options(ServerOptions *options)
34 options->fwd_opts.streamlocal_bind_unlink = 0;
35 if (options->fingerprint_hash == -1)
36 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
37+ if (options->debian_banner == -1)
38+ options->debian_banner = 1;
39 /* Turn privilege separation on by default */
40 if (use_privsep == -1)
41 use_privsep = PRIVSEP_NOSANDBOX;
42@@ -419,6 +422,7 @@ typedef enum {
43 sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
44 sStreamLocalBindMask, sStreamLocalBindUnlink,
45 sAllowStreamLocalForwarding, sFingerprintHash,
46+ sDebianBanner,
47 sDeprecated, sUnsupported
48 } ServerOpCodes;
49
50@@ -565,6 +569,7 @@ static struct {
51 { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },
52 { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
53 { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
54+ { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
55 { NULL, sBadOption, 0 }
56 };
57
58@@ -1850,6 +1855,10 @@ process_server_config_line(ServerOptions *options, char *line,
59 options->fingerprint_hash = value;
60 break;
61
62+ case sDebianBanner:
63+ intptr = &options->debian_banner;
64+ goto parse_int;
65+
66 case sDeprecated:
67 logit("%s line %d: Deprecated option %s",
68 filename, linenum, arg);
69diff --git a/servconf.h b/servconf.h
70index b99b270..ba7b739 100644
71--- a/servconf.h
72+++ b/servconf.h
73@@ -196,6 +196,8 @@ typedef struct {
74 char *auth_methods[MAX_AUTH_METHODS];
75
76 int fingerprint_hash;
77+
78+ int debian_banner;
79 } ServerOptions;
80
81 /* Information about the incoming connection as used by Match */
82diff --git a/sshd.c b/sshd.c
83index 96e75c6..7886d0e 100644
84--- a/sshd.c
85+++ b/sshd.c
86@@ -442,7 +442,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 1269bbd..a5afbc3 100644
98--- a/sshd_config.5
99+++ b/sshd_config.5
100@@ -528,6 +528,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..c1666a534
--- /dev/null
+++ b/debian/patches/debian-config.patch
@@ -0,0 +1,198 @@
1From c2ef7b500926be2f7d875d63ec72781b50d69294 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: 2015-08-19
26
27Patch-Name: debian-config.patch
28---
29 readconf.c | 2 +-
30 ssh.1 | 21 +++++++++++++++++++++
31 ssh_config | 7 ++++++-
32 ssh_config.5 | 19 ++++++++++++++++++-
33 sshd_config | 3 ++-
34 sshd_config.5 | 25 +++++++++++++++++++++++++
35 6 files changed, 73 insertions(+), 4 deletions(-)
36
37diff --git a/readconf.c b/readconf.c
38index 5f6c37f..f0769b5 100644
39--- a/readconf.c
40+++ b/readconf.c
41@@ -1748,7 +1748,7 @@ fill_default_options(Options * options)
42 if (options->forward_x11 == -1)
43 options->forward_x11 = 0;
44 if (options->forward_x11_trusted == -1)
45- options->forward_x11_trusted = 0;
46+ options->forward_x11_trusted = 1;
47 if (options->forward_x11_timeout == -1)
48 options->forward_x11_timeout = 1200;
49 if (options->exit_on_forward_failure == -1)
50diff --git a/ssh.1 b/ssh.1
51index 2178863..e2cce49 100644
52--- a/ssh.1
53+++ b/ssh.1
54@@ -670,12 +670,33 @@ option and the
55 directive in
56 .Xr ssh_config 5
57 for more information.
58+.Pp
59+(Debian-specific: X11 forwarding is not subjected to X11 SECURITY extension
60+restrictions by default, because too many programs currently crash in this
61+mode.
62+Set the
63+.Cm ForwardX11Trusted
64+option to
65+.Dq no
66+to restore the upstream behaviour.
67+This may change in future depending on client-side improvements.)
68 .It Fl x
69 Disables X11 forwarding.
70 .It Fl Y
71 Enables trusted X11 forwarding.
72 Trusted X11 forwardings are not subjected to the X11 SECURITY extension
73 controls.
74+.Pp
75+(Debian-specific: This option does nothing in the default configuration: it
76+is equivalent to
77+.Dq Cm ForwardX11Trusted No yes ,
78+which is the default as described above.
79+Set the
80+.Cm ForwardX11Trusted
81+option to
82+.Dq no
83+to restore the upstream behaviour.
84+This may change in future depending on client-side improvements.)
85 .It Fl y
86 Send log information using the
87 .Xr syslog 3
88diff --git a/ssh_config b/ssh_config
89index 228e5ab..c9386aa 100644
90--- a/ssh_config
91+++ b/ssh_config
92@@ -17,9 +17,10 @@
93 # list of available options, their meanings and defaults, please see the
94 # ssh_config(5) man page.
95
96-# Host *
97+Host *
98 # ForwardAgent no
99 # ForwardX11 no
100+# ForwardX11Trusted yes
101 # RhostsRSAAuthentication no
102 # RSAAuthentication yes
103 # PasswordAuthentication yes
104@@ -48,3 +49,7 @@
105 # VisualHostKey no
106 # ProxyCommand ssh -q -W %h:%p gateway.example.com
107 # RekeyLimit 1G 1h
108+ SendEnv LANG LC_*
109+ HashKnownHosts yes
110+ GSSAPIAuthentication yes
111+ GSSAPIDelegateCredentials no
112diff --git a/ssh_config.5 b/ssh_config.5
113index acd581b..844d1a0 100644
114--- a/ssh_config.5
115+++ b/ssh_config.5
116@@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more
117 host-specific declarations should be given near the beginning of the
118 file, and general defaults at the end.
119 .Pp
120+Note that the Debian
121+.Ic openssh-client
122+package sets several options as standard in
123+.Pa /etc/ssh/ssh_config
124+which are not the default in
125+.Xr ssh 1 :
126+.Pp
127+.Bl -bullet -offset indent -compact
128+.It
129+.Cm SendEnv No LANG LC_*
130+.It
131+.Cm HashKnownHosts No yes
132+.It
133+.Cm GSSAPIAuthentication No yes
134+.El
135+.Pp
136 The configuration file has the following format:
137 .Pp
138 Empty lines and lines starting with
139@@ -716,7 +732,8 @@ token used for the session will be set to expire after 20 minutes.
140 Remote clients will be refused access after this time.
141 .Pp
142 The default is
143-.Dq no .
144+.Dq yes
145+(Debian-specific).
146 .Pp
147 See the X11 SECURITY extension specification for full details on
148 the restrictions imposed on untrusted clients.
149diff --git a/sshd_config b/sshd_config
150index 1dfd0f1..23a338f 100644
151--- a/sshd_config
152+++ b/sshd_config
153@@ -41,7 +41,8 @@
154 # Authentication:
155
156 #LoginGraceTime 2m
157-#PermitRootLogin no
158+# See /usr/share/doc/openssh-server/README.Debian.gz.
159+#PermitRootLogin without-password
160 #StrictModes yes
161 #MaxAuthTries 6
162 #MaxSessions 10
163diff --git a/sshd_config.5 b/sshd_config.5
164index 355b445..eb6bff8 100644
165--- a/sshd_config.5
166+++ b/sshd_config.5
167@@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes
168 .Pq \&"
169 in order to represent arguments containing spaces.
170 .Pp
171+Note that the Debian
172+.Ic openssh-server
173+package sets several options as standard in
174+.Pa /etc/ssh/sshd_config
175+which are not the default in
176+.Xr sshd 8 .
177+The exact list depends on whether the package was installed fresh or
178+upgraded from various possible previous versions, but includes at least the
179+following:
180+.Pp
181+.Bl -bullet -offset indent -compact
182+.It
183+.Cm ChallengeResponseAuthentication No no
184+.It
185+.Cm X11Forwarding No yes
186+.It
187+.Cm PrintMotd No no
188+.It
189+.Cm AcceptEnv No LANG LC_*
190+.It
191+.Cm Subsystem No sftp /usr/lib/openssh/sftp-server
192+.It
193+.Cm UsePAM No yes
194+.El
195+.Pp
196 The possible
197 keywords and their meanings are as follows (note that
198 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..57bd567e4
--- /dev/null
+++ b/debian/patches/dnssec-sshfp.patch
@@ -0,0 +1,94 @@
1From dbde51cd7abb931b2d8635230bd77c9ec3b75074 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 f201b60..a406f58 100644
22--- a/dns.c
23+++ b/dns.c
24@@ -206,6 +206,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
25 {
26 u_int counter;
27 int result;
28+ unsigned int rrset_flags = 0;
29 struct rrsetinfo *fingerprints = NULL;
30
31 u_int8_t hostkey_algorithm;
32@@ -229,8 +230,19 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
33 return -1;
34 }
35
36+ /*
37+ * Original getrrsetbyname function, found on OpenBSD for example,
38+ * doesn't accept any flag and prerequisite for obtaining AD bit in
39+ * DNS response is set by "options edns0" in resolv.conf.
40+ *
41+ * Our version is more clever and use RRSET_FORCE_EDNS0 flag.
42+ */
43+#ifndef HAVE_GETRRSETBYNAME
44+ rrset_flags |= RRSET_FORCE_EDNS0;
45+#endif
46 result = getrrsetbyname(hostname, DNS_RDATACLASS_IN,
47- DNS_RDATATYPE_SSHFP, 0, &fingerprints);
48+ DNS_RDATATYPE_SSHFP, rrset_flags, &fingerprints);
49+
50 if (result) {
51 verbose("DNS lookup error: %s", dns_result_totext(result));
52 return -1;
53diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
54index dc6fe05..e061a29 100644
55--- a/openbsd-compat/getrrsetbyname.c
56+++ b/openbsd-compat/getrrsetbyname.c
57@@ -209,8 +209,8 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
58 goto fail;
59 }
60
61- /* don't allow flags yet, unimplemented */
62- if (flags) {
63+ /* Allow RRSET_FORCE_EDNS0 flag only. */
64+ if ((flags & !RRSET_FORCE_EDNS0) != 0) {
65 result = ERRSET_INVAL;
66 goto fail;
67 }
68@@ -226,9 +226,9 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
69 #endif /* DEBUG */
70
71 #ifdef RES_USE_DNSSEC
72- /* turn on DNSSEC if EDNS0 is configured */
73- if (_resp->options & RES_USE_EDNS0)
74- _resp->options |= RES_USE_DNSSEC;
75+ /* turn on DNSSEC if required */
76+ if (flags & RRSET_FORCE_EDNS0)
77+ _resp->options |= (RES_USE_EDNS0|RES_USE_DNSSEC);
78 #endif /* RES_USE_DNSEC */
79
80 /* make query */
81diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
82index 1283f55..dbbc85a 100644
83--- a/openbsd-compat/getrrsetbyname.h
84+++ b/openbsd-compat/getrrsetbyname.h
85@@ -72,6 +72,9 @@
86 #ifndef RRSET_VALIDATED
87 # define RRSET_VALIDATED 1
88 #endif
89+#ifndef RRSET_FORCE_EDNS0
90+# define RRSET_FORCE_EDNS0 0x0001
91+#endif
92
93 /*
94 * Return codes for getrrsetbyname()
diff --git a/debian/patches/doc-hash-tab-completion.patch b/debian/patches/doc-hash-tab-completion.patch
new file mode 100644
index 000000000..878f9aa7b
--- /dev/null
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -0,0 +1,28 @@
1From d5510eadce4e2b22e9c341120e759c1f7da9175d 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 1d0c52b..acd581b 100644
17--- a/ssh_config.5
18+++ b/ssh_config.5
19@@ -802,6 +802,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..323b4de25
--- /dev/null
+++ b/debian/patches/doc-upstart.patch
@@ -0,0 +1,29 @@
1From 99babbe6caea4ebf504fc3378012e0d6889a554e 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 2f4d4f3..42f1520 100644
16--- a/sshd.8
17+++ b/sshd.8
18@@ -67,7 +67,10 @@ over an insecure network.
19 .Nm
20 listens for connections from clients.
21 It is normally started at boot from
22-.Pa /etc/init.d/ssh .
23+.Pa /etc/init.d/ssh
24+(or
25+.Pa /etc/init/ssh.conf
26+on systems using the Upstart init daemon).
27 It forks a new
28 daemon for each incoming connection.
29 The forked daemons handle
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
new file mode 100644
index 000000000..73915dfdb
--- /dev/null
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -0,0 +1,26 @@
1From 2ed0a5ba5af7955d4c5a0c6ff2cf9eabd8f3e3ab 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..3f616af7d
--- /dev/null
+++ b/debian/patches/gssapi.patch
@@ -0,0 +1,3020 @@
1From 5d3dc7ea4c96cab9483d5389a3b04163771fdee2 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: 2015-08-19
21
22Patch-Name: gssapi.patch
23---
24 ChangeLog.gssapi | 113 +++++++++++++++++++
25 Makefile.in | 5 +-
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.ac | 24 ++++
32 gss-genr.c | 275 ++++++++++++++++++++++++++++++++++++++++++++-
33 gss-serv-krb5.c | 85 ++++++++++++--
34 gss-serv.c | 185 +++++++++++++++++++++++++++---
35 kex.c | 16 +++
36 kex.h | 14 +++
37 kexgssc.c | 336 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
38 kexgsss.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++
39 monitor.c | 108 +++++++++++++++++-
40 monitor.h | 3 +
41 monitor_wrap.c | 47 +++++++-
42 monitor_wrap.h | 4 +-
43 readconf.c | 42 +++++++
44 readconf.h | 5 +
45 servconf.c | 28 ++++-
46 servconf.h | 2 +
47 ssh-gss.h | 41 ++++++-
48 ssh_config | 2 +
49 ssh_config.5 | 34 +++++-
50 sshconnect2.c | 124 +++++++++++++++++++-
51 sshd.c | 110 ++++++++++++++++++
52 sshd_config | 2 +
53 sshd_config.5 | 11 ++
54 sshkey.c | 3 +-
55 sshkey.h | 1 +
56 32 files changed, 1955 insertions(+), 46 deletions(-)
57 create mode 100644 ChangeLog.gssapi
58 create mode 100644 kexgssc.c
59 create mode 100644 kexgsss.c
60
61diff --git a/ChangeLog.gssapi b/ChangeLog.gssapi
62new file mode 100644
63index 0000000..f117a33
64--- /dev/null
65+++ b/ChangeLog.gssapi
66@@ -0,0 +1,113 @@
67+20110101
68+ - Finally update for OpenSSH 5.6p1
69+ - Add GSSAPIServerIdentity option from Jim Basney
70+
71+20100308
72+ - [ Makefile.in, key.c, key.h ]
73+ Updates for OpenSSH 5.4p1
74+ - [ servconf.c ]
75+ Include GSSAPI options in the sshd -T configuration dump, and flag
76+ some older configuration options as being unsupported. Thanks to Colin
77+ Watson.
78+ -
79+
80+20100124
81+ - [ sshconnect2.c ]
82+ Adapt to deal with additional element in Authmethod structure. Thanks to
83+ Colin Watson
84+
85+20090615
86+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
87+ sshd.c ]
88+ Fix issues identified by Greg Hudson following a code review
89+ Check return value of gss_indicate_mechs
90+ Protect GSSAPI calls in monitor, so they can only be used if enabled
91+ Check return values of bignum functions in key exchange
92+ Use BN_clear_free to clear other side's DH value
93+ Make ssh_gssapi_id_kex more robust
94+ Only configure kex table pointers if GSSAPI is enabled
95+ Don't leak mechanism list, or gss mechanism list
96+ Cast data.length before printing
97+ If serverkey isn't provided, use an empty string, rather than NULL
98+
99+20090201
100+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h
101+ ssh_config.5 sshconnet2.c ]
102+ Add support for the GSSAPIClientIdentity option, which allows the user
103+ to specify which GSSAPI identity to use to contact a given server
104+
105+20080404
106+ - [ gss-serv.c ]
107+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow
108+ been omitted from a previous version of this patch. Reported by Borislav
109+ Stoichkov
110+
111+20070317
112+ - [ gss-serv-krb5.c ]
113+ Remove C99ism, where new_ccname was being declared in the middle of a
114+ function
115+
116+20061220
117+ - [ servconf.c ]
118+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and
119+ documented, behaviour. Reported by Dan Watson.
120+
121+20060910
122+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c
123+ ssh-gss.h ]
124+ add support for gss-group14-sha1 key exchange mechanisms
125+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ]
126+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of
127+ acceptor principal checking on multi-homed machines.
128+ <Bugzilla #928>
129+ - [ sshd_config ssh_config ]
130+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample
131+ configuration files
132+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ]
133+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf()
134+ Limit length of error messages displayed by client
135+
136+20060909
137+ - [ gss-genr.c gss-serv.c ]
138+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server
139+ only, where they belong
140+ <Bugzilla #1225>
141+
142+20060829
143+ - [ gss-serv-krb5.c ]
144+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment
145+ variable
146+
147+20060828
148+ - [ gss-genr.c ]
149+ Avoid Heimdal context freeing problem
150+ <Fixed upstream 20060829>
151+
152+20060818
153+ - [ gss-genr.c ssh-gss.h sshconnect2.c ]
154+ Make sure that SPENGO is disabled
155+ <Bugzilla #1218 - Fixed upstream 20060818>
156+
157+20060421
158+ - [ gssgenr.c, sshconnect2.c ]
159+ a few type changes (signed versus unsigned, int versus size_t) to
160+ fix compiler errors/warnings
161+ (from jbasney AT ncsa.uiuc.edu)
162+ - [ kexgssc.c, sshconnect2.c ]
163+ fix uninitialized variable warnings
164+ (from jbasney AT ncsa.uiuc.edu)
165+ - [ gssgenr.c ]
166+ pass oid to gss_display_status (helpful when using GSSAPI mechglue)
167+ (from jbasney AT ncsa.uiuc.edu)
168+ <Bugzilla #1220 >
169+ - [ gss-serv-krb5.c ]
170+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
171+ (from jbasney AT ncsa.uiuc.edu)
172+ <Fixed upstream 20060304>
173+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c
174+ add client-side GssapiKeyExchange option
175+ (from jbasney AT ncsa.uiuc.edu)
176+ - [ sshconnect2.c ]
177+ add support for GssapiTrustDns option for gssapi-with-mic
178+ (from jbasney AT ncsa.uiuc.edu)
179+ <gssapi-with-mic support is Bugzilla #1008>
180diff --git a/Makefile.in b/Makefile.in
181index 40cc7aa..3d2a328 100644
182--- a/Makefile.in
183+++ b/Makefile.in
184@@ -91,7 +91,8 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
185 sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \
186 kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
187 kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
188- kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o
189+ kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
190+ kexgssc.o
191
192 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
193 sshconnect.o sshconnect1.o sshconnect2.o mux.o \
194@@ -105,7 +106,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
195 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
196 auth2-none.o auth2-passwd.o auth2-pubkey.o \
197 monitor_mm.o monitor.o monitor_wrap.o auth-krb5.o \
198- auth2-gss.o gss-serv.o gss-serv-krb5.o \
199+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o \
200 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
201 sftp-server.o sftp-common.o \
202 roaming_common.o roaming_serv.o \
203diff --git a/auth-krb5.c b/auth-krb5.c
204index 0089b18..ec47869 100644
205--- a/auth-krb5.c
206+++ b/auth-krb5.c
207@@ -183,8 +183,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
208
209 len = strlen(authctxt->krb5_ticket_file) + 6;
210 authctxt->krb5_ccname = xmalloc(len);
211+#ifdef USE_CCAPI
212+ snprintf(authctxt->krb5_ccname, len, "API:%s",
213+ authctxt->krb5_ticket_file);
214+#else
215 snprintf(authctxt->krb5_ccname, len, "FILE:%s",
216 authctxt->krb5_ticket_file);
217+#endif
218
219 #ifdef USE_PAM
220 if (options.use_pam)
221@@ -241,15 +246,22 @@ krb5_cleanup_proc(Authctxt *authctxt)
222 #ifndef HEIMDAL
223 krb5_error_code
224 ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
225- int tmpfd, ret, oerrno;
226+ int ret, oerrno;
227 char ccname[40];
228 mode_t old_umask;
229+#ifdef USE_CCAPI
230+ char cctemplate[] = "API:krb5cc_%d";
231+#else
232+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
233+ int tmpfd;
234+#endif
235
236 ret = snprintf(ccname, sizeof(ccname),
237- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid());
238+ cctemplate, geteuid());
239 if (ret < 0 || (size_t)ret >= sizeof(ccname))
240 return ENOMEM;
241
242+#ifndef USE_CCAPI
243 old_umask = umask(0177);
244 tmpfd = mkstemp(ccname + strlen("FILE:"));
245 oerrno = errno;
246@@ -266,6 +278,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
247 return oerrno;
248 }
249 close(tmpfd);
250+#endif
251
252 return (krb5_cc_resolve(ctx, ccname, ccache));
253 }
254diff --git a/auth2-gss.c b/auth2-gss.c
255index 1ca8357..3b5036d 100644
256--- a/auth2-gss.c
257+++ b/auth2-gss.c
258@@ -1,7 +1,7 @@
259 /* $OpenBSD: auth2-gss.c,v 1.22 2015/01/19 20:07:45 markus Exp $ */
260
261 /*
262- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
263+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
264 *
265 * Redistribution and use in source and binary forms, with or without
266 * modification, are permitted provided that the following conditions
267@@ -53,6 +53,40 @@ static int input_gssapi_mic(int type, u_int32_t plen, void *ctxt);
268 static int input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
269 static int input_gssapi_errtok(int, u_int32_t, void *);
270
271+/*
272+ * The 'gssapi_keyex' userauth mechanism.
273+ */
274+static int
275+userauth_gsskeyex(Authctxt *authctxt)
276+{
277+ int authenticated = 0;
278+ Buffer b;
279+ gss_buffer_desc mic, gssbuf;
280+ u_int len;
281+
282+ mic.value = packet_get_string(&len);
283+ mic.length = len;
284+
285+ packet_check_eom();
286+
287+ ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
288+ "gssapi-keyex");
289+
290+ gssbuf.value = buffer_ptr(&b);
291+ gssbuf.length = buffer_len(&b);
292+
293+ /* gss_kex_context is NULL with privsep, so we can't check it here */
294+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context,
295+ &gssbuf, &mic))))
296+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
297+ authctxt->pw));
298+
299+ buffer_free(&b);
300+ free(mic.value);
301+
302+ return (authenticated);
303+}
304+
305 /*
306 * We only support those mechanisms that we know about (ie ones that we know
307 * how to check local user kuserok and the like)
308@@ -238,7 +272,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
309
310 packet_check_eom();
311
312- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
313+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
314+ authctxt->pw));
315
316 authctxt->postponed = 0;
317 dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
318@@ -274,7 +309,8 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
319 gssbuf.length = buffer_len(&b);
320
321 if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
322- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
323+ authenticated =
324+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw));
325 else
326 logit("GSSAPI MIC check failed");
327
328@@ -290,6 +326,12 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
329 return 0;
330 }
331
332+Authmethod method_gsskeyex = {
333+ "gssapi-keyex",
334+ userauth_gsskeyex,
335+ &options.gss_authentication
336+};
337+
338 Authmethod method_gssapi = {
339 "gssapi-with-mic",
340 userauth_gssapi,
341diff --git a/auth2.c b/auth2.c
342index 7177962..3f49bdc 100644
343--- a/auth2.c
344+++ b/auth2.c
345@@ -70,6 +70,7 @@ extern Authmethod method_passwd;
346 extern Authmethod method_kbdint;
347 extern Authmethod method_hostbased;
348 #ifdef GSSAPI
349+extern Authmethod method_gsskeyex;
350 extern Authmethod method_gssapi;
351 #endif
352
353@@ -77,6 +78,7 @@ Authmethod *authmethods[] = {
354 &method_none,
355 &method_pubkey,
356 #ifdef GSSAPI
357+ &method_gsskeyex,
358 &method_gssapi,
359 #endif
360 &method_passwd,
361diff --git a/clientloop.c b/clientloop.c
362index dc0e557..77d5498 100644
363--- a/clientloop.c
364+++ b/clientloop.c
365@@ -114,6 +114,10 @@
366 #include "ssherr.h"
367 #include "hostfile.h"
368
369+#ifdef GSSAPI
370+#include "ssh-gss.h"
371+#endif
372+
373 /* import options */
374 extern Options options;
375
376@@ -1609,6 +1613,15 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
377 /* Do channel operations unless rekeying in progress. */
378 if (!rekeying) {
379 channel_after_select(readset, writeset);
380+
381+#ifdef GSSAPI
382+ if (options.gss_renewal_rekey &&
383+ ssh_gssapi_credentials_updated(NULL)) {
384+ debug("credentials updated - forcing rekey");
385+ need_rekeying = 1;
386+ }
387+#endif
388+
389 if (need_rekeying || packet_need_rekeying()) {
390 debug("need rekeying");
391 active_state->kex->done = 0;
392diff --git a/config.h.in b/config.h.in
393index 7e7e38e..6c7de98 100644
394--- a/config.h.in
395+++ b/config.h.in
396@@ -1623,6 +1623,9 @@
397 /* Use btmp to log bad logins */
398 #undef USE_BTMP
399
400+/* platform uses an in-memory credentials cache */
401+#undef USE_CCAPI
402+
403 /* Use libedit for sftp */
404 #undef USE_LIBEDIT
405
406@@ -1638,6 +1641,9 @@
407 /* Use PIPES instead of a socketpair() */
408 #undef USE_PIPES
409
410+/* platform has the Security Authorization Session API */
411+#undef USE_SECURITY_SESSION_API
412+
413 /* Define if you have Solaris process contracts */
414 #undef USE_SOLARIS_PROCESS_CONTRACTS
415
416diff --git a/configure.ac b/configure.ac
417index bb0095f..df21693 100644
418--- a/configure.ac
419+++ b/configure.ac
420@@ -625,6 +625,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
421 [Use tunnel device compatibility to OpenBSD])
422 AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
423 [Prepend the address family to IP tunnel traffic])
424+ AC_MSG_CHECKING([if we have the Security Authorization Session API])
425+ AC_TRY_COMPILE([#include <Security/AuthSession.h>],
426+ [SessionCreate(0, 0);],
427+ [ac_cv_use_security_session_api="yes"
428+ AC_DEFINE([USE_SECURITY_SESSION_API], [1],
429+ [platform has the Security Authorization Session API])
430+ LIBS="$LIBS -framework Security"
431+ AC_MSG_RESULT([yes])],
432+ [ac_cv_use_security_session_api="no"
433+ AC_MSG_RESULT([no])])
434+ AC_MSG_CHECKING([if we have an in-memory credentials cache])
435+ AC_TRY_COMPILE(
436+ [#include <Kerberos/Kerberos.h>],
437+ [cc_context_t c;
438+ (void) cc_initialize (&c, 0, NULL, NULL);],
439+ [AC_DEFINE([USE_CCAPI], [1],
440+ [platform uses an in-memory credentials cache])
441+ LIBS="$LIBS -framework Security"
442+ AC_MSG_RESULT([yes])
443+ if test "x$ac_cv_use_security_session_api" = "xno"; then
444+ AC_MSG_ERROR([*** Need a security framework to use the credentials cache API ***])
445+ fi],
446+ [AC_MSG_RESULT([no])]
447+ )
448 m4_pattern_allow([AU_IPv])
449 AC_CHECK_DECL([AU_IPv4], [],
450 AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
451diff --git a/gss-genr.c b/gss-genr.c
452index d617d60..b4eca3f 100644
453--- a/gss-genr.c
454+++ b/gss-genr.c
455@@ -1,7 +1,7 @@
456 /* $OpenBSD: gss-genr.c,v 1.23 2015/01/20 23:14:00 deraadt Exp $ */
457
458 /*
459- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
460+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
461 *
462 * Redistribution and use in source and binary forms, with or without
463 * modification, are permitted provided that the following conditions
464@@ -41,12 +41,167 @@
465 #include "buffer.h"
466 #include "log.h"
467 #include "ssh2.h"
468+#include "cipher.h"
469+#include "key.h"
470+#include "kex.h"
471+#include <openssl/evp.h>
472
473 #include "ssh-gss.h"
474
475 extern u_char *session_id2;
476 extern u_int session_id2_len;
477
478+typedef struct {
479+ char *encoded;
480+ gss_OID oid;
481+} ssh_gss_kex_mapping;
482+
483+/*
484+ * XXX - It would be nice to find a more elegant way of handling the
485+ * XXX passing of the key exchange context to the userauth routines
486+ */
487+
488+Gssctxt *gss_kex_context = NULL;
489+
490+static ssh_gss_kex_mapping *gss_enc2oid = NULL;
491+
492+int
493+ssh_gssapi_oid_table_ok(void) {
494+ return (gss_enc2oid != NULL);
495+}
496+
497+/*
498+ * Return a list of the gss-group1-sha1 mechanisms supported by this program
499+ *
500+ * We test mechanisms to ensure that we can use them, to avoid starting
501+ * a key exchange with a bad mechanism
502+ */
503+
504+char *
505+ssh_gssapi_client_mechanisms(const char *host, const char *client) {
506+ gss_OID_set gss_supported;
507+ OM_uint32 min_status;
508+
509+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported)))
510+ return NULL;
511+
512+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
513+ host, client));
514+}
515+
516+char *
517+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
518+ const char *host, const char *client) {
519+ Buffer buf;
520+ size_t i;
521+ int oidpos, enclen;
522+ char *mechs, *encoded;
523+ u_char digest[EVP_MAX_MD_SIZE];
524+ char deroid[2];
525+ const EVP_MD *evp_md = EVP_md5();
526+ EVP_MD_CTX md;
527+
528+ if (gss_enc2oid != NULL) {
529+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
530+ free(gss_enc2oid[i].encoded);
531+ free(gss_enc2oid);
532+ }
533+
534+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
535+ (gss_supported->count + 1));
536+
537+ buffer_init(&buf);
538+
539+ oidpos = 0;
540+ for (i = 0; i < gss_supported->count; i++) {
541+ if (gss_supported->elements[i].length < 128 &&
542+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) {
543+
544+ deroid[0] = SSH_GSS_OIDTYPE;
545+ deroid[1] = gss_supported->elements[i].length;
546+
547+ EVP_DigestInit(&md, evp_md);
548+ EVP_DigestUpdate(&md, deroid, 2);
549+ EVP_DigestUpdate(&md,
550+ gss_supported->elements[i].elements,
551+ gss_supported->elements[i].length);
552+ EVP_DigestFinal(&md, digest, NULL);
553+
554+ encoded = xmalloc(EVP_MD_size(evp_md) * 2);
555+ enclen = __b64_ntop(digest, EVP_MD_size(evp_md),
556+ encoded, EVP_MD_size(evp_md) * 2);
557+
558+ if (oidpos != 0)
559+ buffer_put_char(&buf, ',');
560+
561+ buffer_append(&buf, KEX_GSS_GEX_SHA1_ID,
562+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1);
563+ buffer_append(&buf, encoded, enclen);
564+ buffer_put_char(&buf, ',');
565+ buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID,
566+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1);
567+ buffer_append(&buf, encoded, enclen);
568+ buffer_put_char(&buf, ',');
569+ buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID,
570+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1);
571+ buffer_append(&buf, encoded, enclen);
572+
573+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]);
574+ gss_enc2oid[oidpos].encoded = encoded;
575+ oidpos++;
576+ }
577+ }
578+ gss_enc2oid[oidpos].oid = NULL;
579+ gss_enc2oid[oidpos].encoded = NULL;
580+
581+ buffer_put_char(&buf, '\0');
582+
583+ mechs = xmalloc(buffer_len(&buf));
584+ buffer_get(&buf, mechs, buffer_len(&buf));
585+ buffer_free(&buf);
586+
587+ if (strlen(mechs) == 0) {
588+ free(mechs);
589+ mechs = NULL;
590+ }
591+
592+ return (mechs);
593+}
594+
595+gss_OID
596+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) {
597+ int i = 0;
598+
599+ switch (kex_type) {
600+ case KEX_GSS_GRP1_SHA1:
601+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID))
602+ return GSS_C_NO_OID;
603+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
604+ break;
605+ case KEX_GSS_GRP14_SHA1:
606+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID))
607+ return GSS_C_NO_OID;
608+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
609+ break;
610+ case KEX_GSS_GEX_SHA1:
611+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID))
612+ return GSS_C_NO_OID;
613+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1;
614+ break;
615+ default:
616+ return GSS_C_NO_OID;
617+ }
618+
619+ while (gss_enc2oid[i].encoded != NULL &&
620+ strcmp(name, gss_enc2oid[i].encoded) != 0)
621+ i++;
622+
623+ if (gss_enc2oid[i].oid != NULL && ctx != NULL)
624+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid);
625+
626+ return gss_enc2oid[i].oid;
627+}
628+
629 /* Check that the OID in a data stream matches that in the context */
630 int
631 ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
632@@ -199,7 +354,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
633 }
634
635 ctx->major = gss_init_sec_context(&ctx->minor,
636- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid,
637+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid,
638 GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
639 0, NULL, recv_tok, NULL, send_tok, flags, NULL);
640
641@@ -229,8 +384,42 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
642 }
643
644 OM_uint32
645+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name)
646+{
647+ gss_buffer_desc gssbuf;
648+ gss_name_t gssname;
649+ OM_uint32 status;
650+ gss_OID_set oidset;
651+
652+ gssbuf.value = (void *) name;
653+ gssbuf.length = strlen(gssbuf.value);
654+
655+ gss_create_empty_oid_set(&status, &oidset);
656+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
657+
658+ ctx->major = gss_import_name(&ctx->minor, &gssbuf,
659+ GSS_C_NT_USER_NAME, &gssname);
660+
661+ if (!ctx->major)
662+ ctx->major = gss_acquire_cred(&ctx->minor,
663+ gssname, 0, oidset, GSS_C_INITIATE,
664+ &ctx->client_creds, NULL, NULL);
665+
666+ gss_release_name(&status, &gssname);
667+ gss_release_oid_set(&status, &oidset);
668+
669+ if (ctx->major)
670+ ssh_gssapi_error(ctx);
671+
672+ return(ctx->major);
673+}
674+
675+OM_uint32
676 ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
677 {
678+ if (ctx == NULL)
679+ return -1;
680+
681 if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
682 GSS_C_QOP_DEFAULT, buffer, hash)))
683 ssh_gssapi_error(ctx);
684@@ -238,6 +427,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
685 return (ctx->major);
686 }
687
688+/* Priviledged when used by server */
689+OM_uint32
690+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
691+{
692+ if (ctx == NULL)
693+ return -1;
694+
695+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
696+ gssbuf, gssmic, NULL);
697+
698+ return (ctx->major);
699+}
700+
701 void
702 ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
703 const char *context)
704@@ -251,11 +453,16 @@ ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
705 }
706
707 int
708-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
709+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host,
710+ const char *client)
711 {
712 gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
713 OM_uint32 major, minor;
714 gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
715+ Gssctxt *intctx = NULL;
716+
717+ if (ctx == NULL)
718+ ctx = &intctx;
719
720 /* RFC 4462 says we MUST NOT do SPNEGO */
721 if (oid->length == spnego_oid.length &&
722@@ -265,6 +472,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
723 ssh_gssapi_build_ctx(ctx);
724 ssh_gssapi_set_oid(*ctx, oid);
725 major = ssh_gssapi_import_name(*ctx, host);
726+
727+ if (!GSS_ERROR(major) && client)
728+ major = ssh_gssapi_client_identity(*ctx, client);
729+
730 if (!GSS_ERROR(major)) {
731 major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token,
732 NULL);
733@@ -274,10 +485,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
734 GSS_C_NO_BUFFER);
735 }
736
737- if (GSS_ERROR(major))
738+ if (GSS_ERROR(major) || intctx != NULL)
739 ssh_gssapi_delete_ctx(ctx);
740
741 return (!GSS_ERROR(major));
742 }
743
744+int
745+ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
746+ static gss_name_t saved_name = GSS_C_NO_NAME;
747+ static OM_uint32 saved_lifetime = 0;
748+ static gss_OID saved_mech = GSS_C_NO_OID;
749+ static gss_name_t name;
750+ static OM_uint32 last_call = 0;
751+ OM_uint32 lifetime, now, major, minor;
752+ int equal;
753+
754+ now = time(NULL);
755+
756+ if (ctxt) {
757+ debug("Rekey has happened - updating saved versions");
758+
759+ if (saved_name != GSS_C_NO_NAME)
760+ gss_release_name(&minor, &saved_name);
761+
762+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
763+ &saved_name, &saved_lifetime, NULL, NULL);
764+
765+ if (!GSS_ERROR(major)) {
766+ saved_mech = ctxt->oid;
767+ saved_lifetime+= now;
768+ } else {
769+ /* Handle the error */
770+ }
771+ return 0;
772+ }
773+
774+ if (now - last_call < 10)
775+ return 0;
776+
777+ last_call = now;
778+
779+ if (saved_mech == GSS_C_NO_OID)
780+ return 0;
781+
782+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
783+ &name, &lifetime, NULL, NULL);
784+ if (major == GSS_S_CREDENTIALS_EXPIRED)
785+ return 0;
786+ else if (GSS_ERROR(major))
787+ return 0;
788+
789+ major = gss_compare_name(&minor, saved_name, name, &equal);
790+ gss_release_name(&minor, &name);
791+ if (GSS_ERROR(major))
792+ return 0;
793+
794+ if (equal && (saved_lifetime < lifetime + now - 10))
795+ return 1;
796+
797+ return 0;
798+}
799+
800 #endif /* GSSAPI */
801diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
802index 795992d..fd8b371 100644
803--- a/gss-serv-krb5.c
804+++ b/gss-serv-krb5.c
805@@ -1,7 +1,7 @@
806 /* $OpenBSD: gss-serv-krb5.c,v 1.8 2013/07/20 01:55:13 djm Exp $ */
807
808 /*
809- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
810+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
811 *
812 * Redistribution and use in source and binary forms, with or without
813 * modification, are permitted provided that the following conditions
814@@ -121,8 +121,8 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
815 krb5_error_code problem;
816 krb5_principal princ;
817 OM_uint32 maj_status, min_status;
818- int len;
819 const char *errmsg;
820+ const char *new_ccname;
821
822 if (client->creds == NULL) {
823 debug("No credentials stored");
824@@ -181,11 +181,16 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
825 return;
826 }
827
828- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
829+ new_ccname = krb5_cc_get_name(krb_context, ccache);
830+
831 client->store.envvar = "KRB5CCNAME";
832- len = strlen(client->store.filename) + 6;
833- client->store.envval = xmalloc(len);
834- snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
835+#ifdef USE_CCAPI
836+ xasprintf(&client->store.envval, "API:%s", new_ccname);
837+ client->store.filename = NULL;
838+#else
839+ xasprintf(&client->store.envval, "FILE:%s", new_ccname);
840+ client->store.filename = xstrdup(new_ccname);
841+#endif
842
843 #ifdef USE_PAM
844 if (options.use_pam)
845@@ -197,6 +202,71 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
846 return;
847 }
848
849+int
850+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store,
851+ ssh_gssapi_client *client)
852+{
853+ krb5_ccache ccache = NULL;
854+ krb5_principal principal = NULL;
855+ char *name = NULL;
856+ krb5_error_code problem;
857+ OM_uint32 maj_status, min_status;
858+
859+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) {
860+ logit("krb5_cc_resolve(): %.100s",
861+ krb5_get_err_text(krb_context, problem));
862+ return 0;
863+ }
864+
865+ /* Find out who the principal in this cache is */
866+ if ((problem = krb5_cc_get_principal(krb_context, ccache,
867+ &principal))) {
868+ logit("krb5_cc_get_principal(): %.100s",
869+ krb5_get_err_text(krb_context, problem));
870+ krb5_cc_close(krb_context, ccache);
871+ return 0;
872+ }
873+
874+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) {
875+ logit("krb5_unparse_name(): %.100s",
876+ krb5_get_err_text(krb_context, problem));
877+ krb5_free_principal(krb_context, principal);
878+ krb5_cc_close(krb_context, ccache);
879+ return 0;
880+ }
881+
882+
883+ if (strcmp(name,client->exportedname.value)!=0) {
884+ debug("Name in local credentials cache differs. Not storing");
885+ krb5_free_principal(krb_context, principal);
886+ krb5_cc_close(krb_context, ccache);
887+ krb5_free_unparsed_name(krb_context, name);
888+ return 0;
889+ }
890+ krb5_free_unparsed_name(krb_context, name);
891+
892+ /* Name matches, so lets get on with it! */
893+
894+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) {
895+ logit("krb5_cc_initialize(): %.100s",
896+ krb5_get_err_text(krb_context, problem));
897+ krb5_free_principal(krb_context, principal);
898+ krb5_cc_close(krb_context, ccache);
899+ return 0;
900+ }
901+
902+ krb5_free_principal(krb_context, principal);
903+
904+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds,
905+ ccache))) {
906+ logit("gss_krb5_copy_ccache() failed. Sorry!");
907+ krb5_cc_close(krb_context, ccache);
908+ return 0;
909+ }
910+
911+ return 1;
912+}
913+
914 ssh_gssapi_mech gssapi_kerberos_mech = {
915 "toWM5Slw5Ew8Mqkay+al2g==",
916 "Kerberos",
917@@ -204,7 +274,8 @@ ssh_gssapi_mech gssapi_kerberos_mech = {
918 NULL,
919 &ssh_gssapi_krb5_userok,
920 NULL,
921- &ssh_gssapi_krb5_storecreds
922+ &ssh_gssapi_krb5_storecreds,
923+ &ssh_gssapi_krb5_updatecreds
924 };
925
926 #endif /* KRB5 */
927diff --git a/gss-serv.c b/gss-serv.c
928index 53993d6..2f6baf7 100644
929--- a/gss-serv.c
930+++ b/gss-serv.c
931@@ -1,7 +1,7 @@
932 /* $OpenBSD: gss-serv.c,v 1.29 2015/05/22 03:50:02 djm Exp $ */
933
934 /*
935- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
936+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
937 *
938 * Redistribution and use in source and binary forms, with or without
939 * modification, are permitted provided that the following conditions
940@@ -45,17 +45,22 @@
941 #include "session.h"
942 #include "misc.h"
943 #include "servconf.h"
944+#include "uidswap.h"
945
946 #include "ssh-gss.h"
947+#include "monitor_wrap.h"
948+
949+extern ServerOptions options;
950
951 extern ServerOptions options;
952
953 static ssh_gssapi_client gssapi_client =
954 { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
955- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL, NULL}};
956+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL,
957+ {NULL, NULL, NULL, NULL, NULL}, 0, 0};
958
959 ssh_gssapi_mech gssapi_null_mech =
960- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
961+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL};
962
963 #ifdef KRB5
964 extern ssh_gssapi_mech gssapi_kerberos_mech;
965@@ -142,6 +147,29 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
966 }
967
968 /* Unprivileged */
969+char *
970+ssh_gssapi_server_mechanisms(void) {
971+ gss_OID_set supported;
972+
973+ ssh_gssapi_supported_oids(&supported);
974+ return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech,
975+ NULL, NULL));
976+}
977+
978+/* Unprivileged */
979+int
980+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data,
981+ const char *dummy) {
982+ Gssctxt *ctx = NULL;
983+ int res;
984+
985+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
986+ ssh_gssapi_delete_ctx(&ctx);
987+
988+ return (res);
989+}
990+
991+/* Unprivileged */
992 void
993 ssh_gssapi_supported_oids(gss_OID_set *oidset)
994 {
995@@ -151,7 +179,9 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
996 gss_OID_set supported;
997
998 gss_create_empty_oid_set(&min_status, oidset);
999- gss_indicate_mechs(&min_status, &supported);
1000+
1001+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported)))
1002+ return;
1003
1004 while (supported_mechs[i]->name != NULL) {
1005 if (GSS_ERROR(gss_test_oid_set_member(&min_status,
1006@@ -277,8 +307,48 @@ OM_uint32
1007 ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1008 {
1009 int i = 0;
1010+ int equal = 0;
1011+ gss_name_t new_name = GSS_C_NO_NAME;
1012+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER;
1013+
1014+ if (options.gss_store_rekey && client->used && ctx->client_creds) {
1015+ if (client->mech->oid.length != ctx->oid->length ||
1016+ (memcmp(client->mech->oid.elements,
1017+ ctx->oid->elements, ctx->oid->length) !=0)) {
1018+ debug("Rekeyed credentials have different mechanism");
1019+ return GSS_S_COMPLETE;
1020+ }
1021+
1022+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1023+ ctx->client_creds, ctx->oid, &new_name,
1024+ NULL, NULL, NULL))) {
1025+ ssh_gssapi_error(ctx);
1026+ return (ctx->major);
1027+ }
1028+
1029+ ctx->major = gss_compare_name(&ctx->minor, client->name,
1030+ new_name, &equal);
1031+
1032+ if (GSS_ERROR(ctx->major)) {
1033+ ssh_gssapi_error(ctx);
1034+ return (ctx->major);
1035+ }
1036+
1037+ if (!equal) {
1038+ debug("Rekeyed credentials have different name");
1039+ return GSS_S_COMPLETE;
1040+ }
1041
1042- gss_buffer_desc ename;
1043+ debug("Marking rekeyed credentials for export");
1044+
1045+ gss_release_name(&ctx->minor, &client->name);
1046+ gss_release_cred(&ctx->minor, &client->creds);
1047+ client->name = new_name;
1048+ client->creds = ctx->client_creds;
1049+ ctx->client_creds = GSS_C_NO_CREDENTIAL;
1050+ client->updated = 1;
1051+ return GSS_S_COMPLETE;
1052+ }
1053
1054 client->mech = NULL;
1055
1056@@ -293,6 +363,13 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1057 if (client->mech == NULL)
1058 return GSS_S_FAILURE;
1059
1060+ if (ctx->client_creds &&
1061+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1062+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) {
1063+ ssh_gssapi_error(ctx);
1064+ return (ctx->major);
1065+ }
1066+
1067 if ((ctx->major = gss_display_name(&ctx->minor, ctx->client,
1068 &client->displayname, NULL))) {
1069 ssh_gssapi_error(ctx);
1070@@ -310,6 +387,8 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1071 return (ctx->major);
1072 }
1073
1074+ gss_release_buffer(&ctx->minor, &ename);
1075+
1076 /* We can't copy this structure, so we just move the pointer to it */
1077 client->creds = ctx->client_creds;
1078 ctx->client_creds = GSS_C_NO_CREDENTIAL;
1079@@ -357,7 +436,7 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
1080
1081 /* Privileged */
1082 int
1083-ssh_gssapi_userok(char *user)
1084+ssh_gssapi_userok(char *user, struct passwd *pw)
1085 {
1086 OM_uint32 lmin;
1087
1088@@ -367,9 +446,11 @@ ssh_gssapi_userok(char *user)
1089 return 0;
1090 }
1091 if (gssapi_client.mech && gssapi_client.mech->userok)
1092- if ((*gssapi_client.mech->userok)(&gssapi_client, user))
1093+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) {
1094+ gssapi_client.used = 1;
1095+ gssapi_client.store.owner = pw;
1096 return 1;
1097- else {
1098+ } else {
1099 /* Destroy delegated credentials if userok fails */
1100 gss_release_buffer(&lmin, &gssapi_client.displayname);
1101 gss_release_buffer(&lmin, &gssapi_client.exportedname);
1102@@ -383,14 +464,90 @@ ssh_gssapi_userok(char *user)
1103 return (0);
1104 }
1105
1106-/* Privileged */
1107-OM_uint32
1108-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
1109+/* These bits are only used for rekeying. The unpriviledged child is running
1110+ * as the user, the monitor is root.
1111+ *
1112+ * In the child, we want to :
1113+ * *) Ask the monitor to store our credentials into the store we specify
1114+ * *) If it succeeds, maybe do a PAM update
1115+ */
1116+
1117+/* Stuff for PAM */
1118+
1119+#ifdef USE_PAM
1120+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg,
1121+ struct pam_response **resp, void *data)
1122 {
1123- ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
1124- gssbuf, gssmic, NULL);
1125+ return (PAM_CONV_ERR);
1126+}
1127+#endif
1128
1129- return (ctx->major);
1130+void
1131+ssh_gssapi_rekey_creds(void) {
1132+ int ok;
1133+ int ret;
1134+#ifdef USE_PAM
1135+ pam_handle_t *pamh = NULL;
1136+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
1137+ char *envstr;
1138+#endif
1139+
1140+ if (gssapi_client.store.filename == NULL &&
1141+ gssapi_client.store.envval == NULL &&
1142+ gssapi_client.store.envvar == NULL)
1143+ return;
1144+
1145+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store));
1146+
1147+ if (!ok)
1148+ return;
1149+
1150+ debug("Rekeyed credentials stored successfully");
1151+
1152+ /* Actually managing to play with the ssh pam stack from here will
1153+ * be next to impossible. In any case, we may want different options
1154+ * for rekeying. So, use our own :)
1155+ */
1156+#ifdef USE_PAM
1157+ if (!use_privsep) {
1158+ debug("Not even going to try and do PAM with privsep disabled");
1159+ return;
1160+ }
1161+
1162+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name,
1163+ &pamconv, &pamh);
1164+ if (ret)
1165+ return;
1166+
1167+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar,
1168+ gssapi_client.store.envval);
1169+
1170+ ret = pam_putenv(pamh, envstr);
1171+ if (!ret)
1172+ pam_setcred(pamh, PAM_REINITIALIZE_CRED);
1173+ pam_end(pamh, PAM_SUCCESS);
1174+#endif
1175+}
1176+
1177+int
1178+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
1179+ int ok = 0;
1180+
1181+ /* Check we've got credentials to store */
1182+ if (!gssapi_client.updated)
1183+ return 0;
1184+
1185+ gssapi_client.updated = 0;
1186+
1187+ temporarily_use_uid(gssapi_client.store.owner);
1188+ if (gssapi_client.mech && gssapi_client.mech->updatecreds)
1189+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client);
1190+ else
1191+ debug("No update function for this mechanism");
1192+
1193+ restore_uid();
1194+
1195+ return ok;
1196 }
1197
1198 #endif
1199diff --git a/kex.c b/kex.c
1200index dbc55ef..4d8e6f5 100644
1201--- a/kex.c
1202+++ b/kex.c
1203@@ -55,6 +55,10 @@
1204 #include "sshbuf.h"
1205 #include "digest.h"
1206
1207+#ifdef GSSAPI
1208+#include "ssh-gss.h"
1209+#endif
1210+
1211 #if OPENSSL_VERSION_NUMBER >= 0x00907000L
1212 # if defined(HAVE_EVP_SHA256)
1213 # define evp_ssh_sha256 EVP_sha256
1214@@ -97,6 +101,14 @@ static const struct kexalg kexalgs[] = {
1215 #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
1216 { NULL, -1, -1, -1},
1217 };
1218+static const struct kexalg kexalg_prefixes[] = {
1219+#ifdef GSSAPI
1220+ { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, SSH_DIGEST_SHA1 },
1221+ { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
1222+ { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
1223+#endif
1224+ { NULL, -1, -1, -1 },
1225+};
1226
1227 char *
1228 kex_alg_list(char sep)
1229@@ -129,6 +141,10 @@ kex_alg_by_name(const char *name)
1230 if (strcmp(k->name, name) == 0)
1231 return k;
1232 }
1233+ for (k = kexalg_prefixes; k->name != NULL; k++) {
1234+ if (strncmp(k->name, name, strlen(k->name)) == 0)
1235+ return k;
1236+ }
1237 return NULL;
1238 }
1239
1240diff --git a/kex.h b/kex.h
1241index f70b81f..7194b14 100644
1242--- a/kex.h
1243+++ b/kex.h
1244@@ -93,6 +93,9 @@ enum kex_exchange {
1245 KEX_DH_GEX_SHA256,
1246 KEX_ECDH_SHA2,
1247 KEX_C25519_SHA256,
1248+ KEX_GSS_GRP1_SHA1,
1249+ KEX_GSS_GRP14_SHA1,
1250+ KEX_GSS_GEX_SHA1,
1251 KEX_MAX
1252 };
1253
1254@@ -139,6 +142,12 @@ struct kex {
1255 u_int flags;
1256 int hash_alg;
1257 int ec_nid;
1258+#ifdef GSSAPI
1259+ int gss_deleg_creds;
1260+ int gss_trust_dns;
1261+ char *gss_host;
1262+ char *gss_client;
1263+#endif
1264 char *client_version_string;
1265 char *server_version_string;
1266 int (*verify_host_key)(struct sshkey *, struct ssh *);
1267@@ -184,6 +193,11 @@ int kexecdh_server(struct ssh *);
1268 int kexc25519_client(struct ssh *);
1269 int kexc25519_server(struct ssh *);
1270
1271+#ifdef GSSAPI
1272+int kexgss_client(struct ssh *);
1273+int kexgss_server(struct ssh *);
1274+#endif
1275+
1276 int kex_dh_hash(const char *, const char *,
1277 const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
1278 const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
1279diff --git a/kexgssc.c b/kexgssc.c
1280new file mode 100644
1281index 0000000..a49bac2
1282--- /dev/null
1283+++ b/kexgssc.c
1284@@ -0,0 +1,336 @@
1285+/*
1286+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1287+ *
1288+ * Redistribution and use in source and binary forms, with or without
1289+ * modification, are permitted provided that the following conditions
1290+ * are met:
1291+ * 1. Redistributions of source code must retain the above copyright
1292+ * notice, this list of conditions and the following disclaimer.
1293+ * 2. Redistributions in binary form must reproduce the above copyright
1294+ * notice, this list of conditions and the following disclaimer in the
1295+ * documentation and/or other materials provided with the distribution.
1296+ *
1297+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1298+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1299+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1300+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1301+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1302+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1303+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1304+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1305+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1306+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1307+ */
1308+
1309+#include "includes.h"
1310+
1311+#ifdef GSSAPI
1312+
1313+#include "includes.h"
1314+
1315+#include <openssl/crypto.h>
1316+#include <openssl/bn.h>
1317+
1318+#include <string.h>
1319+
1320+#include "xmalloc.h"
1321+#include "buffer.h"
1322+#include "ssh2.h"
1323+#include "key.h"
1324+#include "cipher.h"
1325+#include "kex.h"
1326+#include "log.h"
1327+#include "packet.h"
1328+#include "dh.h"
1329+#include "digest.h"
1330+
1331+#include "ssh-gss.h"
1332+
1333+int
1334+kexgss_client(struct ssh *ssh) {
1335+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1336+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr;
1337+ Gssctxt *ctxt;
1338+ OM_uint32 maj_status, min_status, ret_flags;
1339+ u_int klen, kout, slen = 0, strlen;
1340+ DH *dh;
1341+ BIGNUM *dh_server_pub = NULL;
1342+ BIGNUM *shared_secret = NULL;
1343+ BIGNUM *p = NULL;
1344+ BIGNUM *g = NULL;
1345+ u_char *kbuf;
1346+ u_char *serverhostkey = NULL;
1347+ u_char *empty = "";
1348+ char *msg;
1349+ int type = 0;
1350+ int first = 1;
1351+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
1352+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1353+ size_t hashlen;
1354+
1355+ /* Initialise our GSSAPI world */
1356+ ssh_gssapi_build_ctx(&ctxt);
1357+ if (ssh_gssapi_id_kex(ctxt, ssh->kex->name, ssh->kex->kex_type)
1358+ == GSS_C_NO_OID)
1359+ fatal("Couldn't identify host exchange");
1360+
1361+ if (ssh_gssapi_import_name(ctxt, ssh->kex->gss_host))
1362+ fatal("Couldn't import hostname");
1363+
1364+ if (ssh->kex->gss_client &&
1365+ ssh_gssapi_client_identity(ctxt, ssh->kex->gss_client))
1366+ fatal("Couldn't acquire client credentials");
1367+
1368+ switch (ssh->kex->kex_type) {
1369+ case KEX_GSS_GRP1_SHA1:
1370+ dh = dh_new_group1();
1371+ break;
1372+ case KEX_GSS_GRP14_SHA1:
1373+ dh = dh_new_group14();
1374+ break;
1375+ case KEX_GSS_GEX_SHA1:
1376+ debug("Doing group exchange\n");
1377+ nbits = dh_estimate(ssh->kex->we_need * 8);
1378+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ);
1379+ packet_put_int(min);
1380+ packet_put_int(nbits);
1381+ packet_put_int(max);
1382+
1383+ packet_send();
1384+
1385+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP);
1386+
1387+ if ((p = BN_new()) == NULL)
1388+ fatal("BN_new() failed");
1389+ packet_get_bignum2(p);
1390+ if ((g = BN_new()) == NULL)
1391+ fatal("BN_new() failed");
1392+ packet_get_bignum2(g);
1393+ packet_check_eom();
1394+
1395+ if (BN_num_bits(p) < min || BN_num_bits(p) > max)
1396+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d",
1397+ min, BN_num_bits(p), max);
1398+
1399+ dh = dh_new_group(g, p);
1400+ break;
1401+ default:
1402+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1403+ }
1404+
1405+ /* Step 1 - e is dh->pub_key */
1406+ dh_gen_key(dh, ssh->kex->we_need * 8);
1407+
1408+ /* This is f, we initialise it now to make life easier */
1409+ dh_server_pub = BN_new();
1410+ if (dh_server_pub == NULL)
1411+ fatal("dh_server_pub == NULL");
1412+
1413+ token_ptr = GSS_C_NO_BUFFER;
1414+
1415+ do {
1416+ debug("Calling gss_init_sec_context");
1417+
1418+ maj_status = ssh_gssapi_init_ctx(ctxt,
1419+ ssh->kex->gss_deleg_creds, token_ptr, &send_tok,
1420+ &ret_flags);
1421+
1422+ if (GSS_ERROR(maj_status)) {
1423+ if (send_tok.length != 0) {
1424+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1425+ packet_put_string(send_tok.value,
1426+ send_tok.length);
1427+ }
1428+ fatal("gss_init_context failed");
1429+ }
1430+
1431+ /* If we've got an old receive buffer get rid of it */
1432+ if (token_ptr != GSS_C_NO_BUFFER)
1433+ free(recv_tok.value);
1434+
1435+ if (maj_status == GSS_S_COMPLETE) {
1436+ /* If mutual state flag is not true, kex fails */
1437+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
1438+ fatal("Mutual authentication failed");
1439+
1440+ /* If integ avail flag is not true kex fails */
1441+ if (!(ret_flags & GSS_C_INTEG_FLAG))
1442+ fatal("Integrity check failed");
1443+ }
1444+
1445+ /*
1446+ * If we have data to send, then the last message that we
1447+ * received cannot have been a 'complete'.
1448+ */
1449+ if (send_tok.length != 0) {
1450+ if (first) {
1451+ packet_start(SSH2_MSG_KEXGSS_INIT);
1452+ packet_put_string(send_tok.value,
1453+ send_tok.length);
1454+ packet_put_bignum2(dh->pub_key);
1455+ first = 0;
1456+ } else {
1457+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1458+ packet_put_string(send_tok.value,
1459+ send_tok.length);
1460+ }
1461+ packet_send();
1462+ gss_release_buffer(&min_status, &send_tok);
1463+
1464+ /* If we've sent them data, they should reply */
1465+ do {
1466+ type = packet_read();
1467+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
1468+ debug("Received KEXGSS_HOSTKEY");
1469+ if (serverhostkey)
1470+ fatal("Server host key received more than once");
1471+ serverhostkey =
1472+ packet_get_string(&slen);
1473+ }
1474+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY);
1475+
1476+ switch (type) {
1477+ case SSH2_MSG_KEXGSS_CONTINUE:
1478+ debug("Received GSSAPI_CONTINUE");
1479+ if (maj_status == GSS_S_COMPLETE)
1480+ fatal("GSSAPI Continue received from server when complete");
1481+ recv_tok.value = packet_get_string(&strlen);
1482+ recv_tok.length = strlen;
1483+ break;
1484+ case SSH2_MSG_KEXGSS_COMPLETE:
1485+ debug("Received GSSAPI_COMPLETE");
1486+ packet_get_bignum2(dh_server_pub);
1487+ msg_tok.value = packet_get_string(&strlen);
1488+ msg_tok.length = strlen;
1489+
1490+ /* Is there a token included? */
1491+ if (packet_get_char()) {
1492+ recv_tok.value=
1493+ packet_get_string(&strlen);
1494+ recv_tok.length = strlen;
1495+ /* If we're already complete - protocol error */
1496+ if (maj_status == GSS_S_COMPLETE)
1497+ packet_disconnect("Protocol error: received token when complete");
1498+ } else {
1499+ /* No token included */
1500+ if (maj_status != GSS_S_COMPLETE)
1501+ packet_disconnect("Protocol error: did not receive final token");
1502+ }
1503+ break;
1504+ case SSH2_MSG_KEXGSS_ERROR:
1505+ debug("Received Error");
1506+ maj_status = packet_get_int();
1507+ min_status = packet_get_int();
1508+ msg = packet_get_string(NULL);
1509+ (void) packet_get_string_ptr(NULL);
1510+ fatal("GSSAPI Error: \n%.400s",msg);
1511+ default:
1512+ packet_disconnect("Protocol error: didn't expect packet type %d",
1513+ type);
1514+ }
1515+ token_ptr = &recv_tok;
1516+ } else {
1517+ /* No data, and not complete */
1518+ if (maj_status != GSS_S_COMPLETE)
1519+ fatal("Not complete, and no token output");
1520+ }
1521+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
1522+
1523+ /*
1524+ * We _must_ have received a COMPLETE message in reply from the
1525+ * server, which will have set dh_server_pub and msg_tok
1526+ */
1527+
1528+ if (type != SSH2_MSG_KEXGSS_COMPLETE)
1529+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
1530+
1531+ /* Check f in range [1, p-1] */
1532+ if (!dh_pub_is_valid(dh, dh_server_pub))
1533+ packet_disconnect("bad server public DH value");
1534+
1535+ /* compute K=f^x mod p */
1536+ klen = DH_size(dh);
1537+ kbuf = xmalloc(klen);
1538+ kout = DH_compute_key(kbuf, dh_server_pub, dh);
1539+ if (kout < 0)
1540+ fatal("DH_compute_key: failed");
1541+
1542+ shared_secret = BN_new();
1543+ if (shared_secret == NULL)
1544+ fatal("kexgss_client: BN_new failed");
1545+
1546+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
1547+ fatal("kexdh_client: BN_bin2bn failed");
1548+
1549+ memset(kbuf, 0, klen);
1550+ free(kbuf);
1551+
1552+ hashlen = sizeof(hash);
1553+ switch (ssh->kex->kex_type) {
1554+ case KEX_GSS_GRP1_SHA1:
1555+ case KEX_GSS_GRP14_SHA1:
1556+ kex_dh_hash( ssh->kex->client_version_string,
1557+ ssh->kex->server_version_string,
1558+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1559+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1560+ (serverhostkey ? serverhostkey : empty), slen,
1561+ dh->pub_key, /* e */
1562+ dh_server_pub, /* f */
1563+ shared_secret, /* K */
1564+ hash, &hashlen
1565+ );
1566+ break;
1567+ case KEX_GSS_GEX_SHA1:
1568+ kexgex_hash(
1569+ ssh->kex->hash_alg,
1570+ ssh->kex->client_version_string,
1571+ ssh->kex->server_version_string,
1572+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1573+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1574+ (serverhostkey ? serverhostkey : empty), slen,
1575+ min, nbits, max,
1576+ dh->p, dh->g,
1577+ dh->pub_key,
1578+ dh_server_pub,
1579+ shared_secret,
1580+ hash, &hashlen
1581+ );
1582+ break;
1583+ default:
1584+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1585+ }
1586+
1587+ gssbuf.value = hash;
1588+ gssbuf.length = hashlen;
1589+
1590+ /* Verify that the hash matches the MIC we just got. */
1591+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
1592+ packet_disconnect("Hash's MIC didn't verify");
1593+
1594+ free(msg_tok.value);
1595+
1596+ DH_free(dh);
1597+ free(serverhostkey);
1598+ BN_clear_free(dh_server_pub);
1599+
1600+ /* save session id */
1601+ if (ssh->kex->session_id == NULL) {
1602+ ssh->kex->session_id_len = hashlen;
1603+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
1604+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
1605+ }
1606+
1607+ if (ssh->kex->gss_deleg_creds)
1608+ ssh_gssapi_credentials_updated(ctxt);
1609+
1610+ if (gss_kex_context == NULL)
1611+ gss_kex_context = ctxt;
1612+ else
1613+ ssh_gssapi_delete_ctx(&ctxt);
1614+
1615+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
1616+ BN_clear_free(shared_secret);
1617+ return kex_send_newkeys(ssh);
1618+}
1619+
1620+#endif /* GSSAPI */
1621diff --git a/kexgsss.c b/kexgsss.c
1622new file mode 100644
1623index 0000000..0847469
1624--- /dev/null
1625+++ b/kexgsss.c
1626@@ -0,0 +1,295 @@
1627+/*
1628+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1629+ *
1630+ * Redistribution and use in source and binary forms, with or without
1631+ * modification, are permitted provided that the following conditions
1632+ * are met:
1633+ * 1. Redistributions of source code must retain the above copyright
1634+ * notice, this list of conditions and the following disclaimer.
1635+ * 2. Redistributions in binary form must reproduce the above copyright
1636+ * notice, this list of conditions and the following disclaimer in the
1637+ * documentation and/or other materials provided with the distribution.
1638+ *
1639+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1640+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1641+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1642+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1643+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1644+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1645+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1646+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1647+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1648+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1649+ */
1650+
1651+#include "includes.h"
1652+
1653+#ifdef GSSAPI
1654+
1655+#include <string.h>
1656+
1657+#include <openssl/crypto.h>
1658+#include <openssl/bn.h>
1659+
1660+#include "xmalloc.h"
1661+#include "buffer.h"
1662+#include "ssh2.h"
1663+#include "key.h"
1664+#include "cipher.h"
1665+#include "kex.h"
1666+#include "log.h"
1667+#include "packet.h"
1668+#include "dh.h"
1669+#include "ssh-gss.h"
1670+#include "monitor_wrap.h"
1671+#include "misc.h"
1672+#include "servconf.h"
1673+#include "digest.h"
1674+
1675+extern ServerOptions options;
1676+
1677+int
1678+kexgss_server(struct ssh *ssh)
1679+{
1680+ OM_uint32 maj_status, min_status;
1681+
1682+ /*
1683+ * Some GSSAPI implementations use the input value of ret_flags (an
1684+ * output variable) as a means of triggering mechanism specific
1685+ * features. Initializing it to zero avoids inadvertently
1686+ * activating this non-standard behaviour.
1687+ */
1688+
1689+ OM_uint32 ret_flags = 0;
1690+ gss_buffer_desc gssbuf, recv_tok, msg_tok;
1691+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1692+ Gssctxt *ctxt = NULL;
1693+ u_int slen, klen, kout;
1694+ u_char *kbuf;
1695+ DH *dh;
1696+ int min = -1, max = -1, nbits = -1;
1697+ BIGNUM *shared_secret = NULL;
1698+ BIGNUM *dh_client_pub = NULL;
1699+ int type = 0;
1700+ gss_OID oid;
1701+ char *mechs;
1702+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1703+ size_t hashlen;
1704+
1705+ /* Initialise GSSAPI */
1706+
1707+ /* If we're rekeying, privsep means that some of the private structures
1708+ * in the GSSAPI code are no longer available. This kludges them back
1709+ * into life
1710+ */
1711+ if (!ssh_gssapi_oid_table_ok()) {
1712+ mechs = ssh_gssapi_server_mechanisms();
1713+ free(mechs);
1714+ }
1715+
1716+ debug2("%s: Identifying %s", __func__, ssh->kex->name);
1717+ oid = ssh_gssapi_id_kex(NULL, ssh->kex->name, ssh->kex->kex_type);
1718+ if (oid == GSS_C_NO_OID)
1719+ fatal("Unknown gssapi mechanism");
1720+
1721+ debug2("%s: Acquiring credentials", __func__);
1722+
1723+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
1724+ fatal("Unable to acquire credentials for the server");
1725+
1726+ switch (ssh->kex->kex_type) {
1727+ case KEX_GSS_GRP1_SHA1:
1728+ dh = dh_new_group1();
1729+ break;
1730+ case KEX_GSS_GRP14_SHA1:
1731+ dh = dh_new_group14();
1732+ break;
1733+ case KEX_GSS_GEX_SHA1:
1734+ debug("Doing group exchange");
1735+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ);
1736+ min = packet_get_int();
1737+ nbits = packet_get_int();
1738+ max = packet_get_int();
1739+ min = MAX(DH_GRP_MIN, min);
1740+ max = MIN(DH_GRP_MAX, max);
1741+ packet_check_eom();
1742+ if (max < min || nbits < min || max < nbits)
1743+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
1744+ min, nbits, max);
1745+ dh = PRIVSEP(choose_dh(min, nbits, max));
1746+ if (dh == NULL)
1747+ packet_disconnect("Protocol error: no matching group found");
1748+
1749+ packet_start(SSH2_MSG_KEXGSS_GROUP);
1750+ packet_put_bignum2(dh->p);
1751+ packet_put_bignum2(dh->g);
1752+ packet_send();
1753+
1754+ packet_write_wait();
1755+ break;
1756+ default:
1757+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1758+ }
1759+
1760+ dh_gen_key(dh, ssh->kex->we_need * 8);
1761+
1762+ do {
1763+ debug("Wait SSH2_MSG_GSSAPI_INIT");
1764+ type = packet_read();
1765+ switch(type) {
1766+ case SSH2_MSG_KEXGSS_INIT:
1767+ if (dh_client_pub != NULL)
1768+ fatal("Received KEXGSS_INIT after initialising");
1769+ recv_tok.value = packet_get_string(&slen);
1770+ recv_tok.length = slen;
1771+
1772+ if ((dh_client_pub = BN_new()) == NULL)
1773+ fatal("dh_client_pub == NULL");
1774+
1775+ packet_get_bignum2(dh_client_pub);
1776+
1777+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
1778+ break;
1779+ case SSH2_MSG_KEXGSS_CONTINUE:
1780+ recv_tok.value = packet_get_string(&slen);
1781+ recv_tok.length = slen;
1782+ break;
1783+ default:
1784+ packet_disconnect(
1785+ "Protocol error: didn't expect packet type %d",
1786+ type);
1787+ }
1788+
1789+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
1790+ &send_tok, &ret_flags));
1791+
1792+ free(recv_tok.value);
1793+
1794+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
1795+ fatal("Zero length token output when incomplete");
1796+
1797+ if (dh_client_pub == NULL)
1798+ fatal("No client public key");
1799+
1800+ if (maj_status & GSS_S_CONTINUE_NEEDED) {
1801+ debug("Sending GSSAPI_CONTINUE");
1802+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1803+ packet_put_string(send_tok.value, send_tok.length);
1804+ packet_send();
1805+ gss_release_buffer(&min_status, &send_tok);
1806+ }
1807+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
1808+
1809+ if (GSS_ERROR(maj_status)) {
1810+ if (send_tok.length > 0) {
1811+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1812+ packet_put_string(send_tok.value, send_tok.length);
1813+ packet_send();
1814+ }
1815+ fatal("accept_ctx died");
1816+ }
1817+
1818+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
1819+ fatal("Mutual Authentication flag wasn't set");
1820+
1821+ if (!(ret_flags & GSS_C_INTEG_FLAG))
1822+ fatal("Integrity flag wasn't set");
1823+
1824+ if (!dh_pub_is_valid(dh, dh_client_pub))
1825+ packet_disconnect("bad client public DH value");
1826+
1827+ klen = DH_size(dh);
1828+ kbuf = xmalloc(klen);
1829+ kout = DH_compute_key(kbuf, dh_client_pub, dh);
1830+ if (kout < 0)
1831+ fatal("DH_compute_key: failed");
1832+
1833+ shared_secret = BN_new();
1834+ if (shared_secret == NULL)
1835+ fatal("kexgss_server: BN_new failed");
1836+
1837+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
1838+ fatal("kexgss_server: BN_bin2bn failed");
1839+
1840+ memset(kbuf, 0, klen);
1841+ free(kbuf);
1842+
1843+ hashlen = sizeof(hash);
1844+ switch (ssh->kex->kex_type) {
1845+ case KEX_GSS_GRP1_SHA1:
1846+ case KEX_GSS_GRP14_SHA1:
1847+ kex_dh_hash(
1848+ ssh->kex->client_version_string, ssh->kex->server_version_string,
1849+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1850+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1851+ NULL, 0, /* Change this if we start sending host keys */
1852+ dh_client_pub, dh->pub_key, shared_secret,
1853+ hash, &hashlen
1854+ );
1855+ break;
1856+ case KEX_GSS_GEX_SHA1:
1857+ kexgex_hash(
1858+ ssh->kex->hash_alg,
1859+ ssh->kex->client_version_string, ssh->kex->server_version_string,
1860+ buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
1861+ buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
1862+ NULL, 0,
1863+ min, nbits, max,
1864+ dh->p, dh->g,
1865+ dh_client_pub,
1866+ dh->pub_key,
1867+ shared_secret,
1868+ hash, &hashlen
1869+ );
1870+ break;
1871+ default:
1872+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1873+ }
1874+
1875+ BN_clear_free(dh_client_pub);
1876+
1877+ if (ssh->kex->session_id == NULL) {
1878+ ssh->kex->session_id_len = hashlen;
1879+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
1880+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
1881+ }
1882+
1883+ gssbuf.value = hash;
1884+ gssbuf.length = hashlen;
1885+
1886+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok))))
1887+ fatal("Couldn't get MIC");
1888+
1889+ packet_start(SSH2_MSG_KEXGSS_COMPLETE);
1890+ packet_put_bignum2(dh->pub_key);
1891+ packet_put_string(msg_tok.value,msg_tok.length);
1892+
1893+ if (send_tok.length != 0) {
1894+ packet_put_char(1); /* true */
1895+ packet_put_string(send_tok.value, send_tok.length);
1896+ } else {
1897+ packet_put_char(0); /* false */
1898+ }
1899+ packet_send();
1900+
1901+ gss_release_buffer(&min_status, &send_tok);
1902+ gss_release_buffer(&min_status, &msg_tok);
1903+
1904+ if (gss_kex_context == NULL)
1905+ gss_kex_context = ctxt;
1906+ else
1907+ ssh_gssapi_delete_ctx(&ctxt);
1908+
1909+ DH_free(dh);
1910+
1911+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
1912+ BN_clear_free(shared_secret);
1913+ kex_send_newkeys(ssh);
1914+
1915+ /* If this was a rekey, then save out any delegated credentials we
1916+ * just exchanged. */
1917+ if (options.gss_store_rekey)
1918+ ssh_gssapi_rekey_creds();
1919+ return 0;
1920+}
1921+#endif /* GSSAPI */
1922diff --git a/monitor.c b/monitor.c
1923index b410965..bdc2972 100644
1924--- a/monitor.c
1925+++ b/monitor.c
1926@@ -157,6 +157,8 @@ int mm_answer_gss_setup_ctx(int, Buffer *);
1927 int mm_answer_gss_accept_ctx(int, Buffer *);
1928 int mm_answer_gss_userok(int, Buffer *);
1929 int mm_answer_gss_checkmic(int, Buffer *);
1930+int mm_answer_gss_sign(int, Buffer *);
1931+int mm_answer_gss_updatecreds(int, Buffer *);
1932 #endif
1933
1934 #ifdef SSH_AUDIT_EVENTS
1935@@ -234,11 +236,18 @@ struct mon_table mon_dispatch_proto20[] = {
1936 {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx},
1937 {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok},
1938 {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic},
1939+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign},
1940 #endif
1941 {0, 0, NULL}
1942 };
1943
1944 struct mon_table mon_dispatch_postauth20[] = {
1945+#ifdef GSSAPI
1946+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx},
1947+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
1948+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign},
1949+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds},
1950+#endif
1951 #ifdef WITH_OPENSSL
1952 {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
1953 #endif
1954@@ -353,6 +362,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
1955 /* Permit requests for moduli and signatures */
1956 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
1957 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
1958+#ifdef GSSAPI
1959+ /* and for the GSSAPI key exchange */
1960+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
1961+#endif
1962 } else {
1963 mon_dispatch = mon_dispatch_proto15;
1964
1965@@ -461,6 +474,10 @@ monitor_child_postauth(struct monitor *pmonitor)
1966 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
1967 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
1968 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
1969+#ifdef GSSAPI
1970+ /* and for the GSSAPI key exchange */
1971+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
1972+#endif
1973 } else {
1974 mon_dispatch = mon_dispatch_postauth15;
1975 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
1976@@ -1864,6 +1881,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
1977 # endif
1978 #endif /* WITH_OPENSSL */
1979 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
1980+#ifdef GSSAPI
1981+ if (options.gss_keyex) {
1982+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
1983+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
1984+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
1985+ }
1986+#endif
1987 kex->load_host_public_key=&get_hostkey_public_by_type;
1988 kex->load_host_private_key=&get_hostkey_private_by_type;
1989 kex->host_key_index=&get_hostkey_index;
1990@@ -1963,6 +1987,9 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
1991 OM_uint32 major;
1992 u_int len;
1993
1994+ if (!options.gss_authentication && !options.gss_keyex)
1995+ fatal("In GSSAPI monitor when GSSAPI is disabled");
1996+
1997 goid.elements = buffer_get_string(m, &len);
1998 goid.length = len;
1999
2000@@ -1990,6 +2017,9 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
2001 OM_uint32 flags = 0; /* GSI needs this */
2002 u_int len;
2003
2004+ if (!options.gss_authentication && !options.gss_keyex)
2005+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2006+
2007 in.value = buffer_get_string(m, &len);
2008 in.length = len;
2009 major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);
2010@@ -2007,6 +2037,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
2011 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
2012 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
2013 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
2014+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1);
2015 }
2016 return (0);
2017 }
2018@@ -2018,6 +2049,9 @@ mm_answer_gss_checkmic(int sock, Buffer *m)
2019 OM_uint32 ret;
2020 u_int len;
2021
2022+ if (!options.gss_authentication && !options.gss_keyex)
2023+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2024+
2025 gssbuf.value = buffer_get_string(m, &len);
2026 gssbuf.length = len;
2027 mic.value = buffer_get_string(m, &len);
2028@@ -2044,7 +2078,11 @@ mm_answer_gss_userok(int sock, Buffer *m)
2029 {
2030 int authenticated;
2031
2032- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user);
2033+ if (!options.gss_authentication && !options.gss_keyex)
2034+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2035+
2036+ authenticated = authctxt->valid &&
2037+ ssh_gssapi_userok(authctxt->user, authctxt->pw);
2038
2039 buffer_clear(m);
2040 buffer_put_int(m, authenticated);
2041@@ -2057,5 +2095,73 @@ mm_answer_gss_userok(int sock, Buffer *m)
2042 /* Monitor loop will terminate if authenticated */
2043 return (authenticated);
2044 }
2045+
2046+int
2047+mm_answer_gss_sign(int socket, Buffer *m)
2048+{
2049+ gss_buffer_desc data;
2050+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER;
2051+ OM_uint32 major, minor;
2052+ u_int len;
2053+
2054+ if (!options.gss_authentication && !options.gss_keyex)
2055+ fatal("In GSSAPI monitor when GSSAPI is disabled");
2056+
2057+ data.value = buffer_get_string(m, &len);
2058+ data.length = len;
2059+ if (data.length != 20)
2060+ fatal("%s: data length incorrect: %d", __func__,
2061+ (int) data.length);
2062+
2063+ /* Save the session ID on the first time around */
2064+ if (session_id2_len == 0) {
2065+ session_id2_len = data.length;
2066+ session_id2 = xmalloc(session_id2_len);
2067+ memcpy(session_id2, data.value, session_id2_len);
2068+ }
2069+ major = ssh_gssapi_sign(gsscontext, &data, &hash);
2070+
2071+ free(data.value);
2072+
2073+ buffer_clear(m);
2074+ buffer_put_int(m, major);
2075+ buffer_put_string(m, hash.value, hash.length);
2076+
2077+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
2078+
2079+ gss_release_buffer(&minor, &hash);
2080+
2081+ /* Turn on getpwnam permissions */
2082+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
2083+
2084+ /* And credential updating, for when rekeying */
2085+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1);
2086+
2087+ return (0);
2088+}
2089+
2090+int
2091+mm_answer_gss_updatecreds(int socket, Buffer *m) {
2092+ ssh_gssapi_ccache store;
2093+ int ok;
2094+
2095+ store.filename = buffer_get_string(m, NULL);
2096+ store.envvar = buffer_get_string(m, NULL);
2097+ store.envval = buffer_get_string(m, NULL);
2098+
2099+ ok = ssh_gssapi_update_creds(&store);
2100+
2101+ free(store.filename);
2102+ free(store.envvar);
2103+ free(store.envval);
2104+
2105+ buffer_clear(m);
2106+ buffer_put_int(m, ok);
2107+
2108+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m);
2109+
2110+ return(0);
2111+}
2112+
2113 #endif /* GSSAPI */
2114
2115diff --git a/monitor.h b/monitor.h
2116index 93b8b66..bc50ade 100644
2117--- a/monitor.h
2118+++ b/monitor.h
2119@@ -65,6 +65,9 @@ enum monitor_reqtype {
2120 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
2121 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
2122
2123+ MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
2124+ MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
2125+
2126 };
2127
2128 struct mm_master;
2129diff --git a/monitor_wrap.c b/monitor_wrap.c
2130index e6217b3..71e7c08 100644
2131--- a/monitor_wrap.c
2132+++ b/monitor_wrap.c
2133@@ -1069,7 +1069,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
2134 }
2135
2136 int
2137-mm_ssh_gssapi_userok(char *user)
2138+mm_ssh_gssapi_userok(char *user, struct passwd *pw)
2139 {
2140 Buffer m;
2141 int authenticated = 0;
2142@@ -1086,5 +1086,50 @@ mm_ssh_gssapi_userok(char *user)
2143 debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
2144 return (authenticated);
2145 }
2146+
2147+OM_uint32
2148+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
2149+{
2150+ Buffer m;
2151+ OM_uint32 major;
2152+ u_int len;
2153+
2154+ buffer_init(&m);
2155+ buffer_put_string(&m, data->value, data->length);
2156+
2157+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m);
2158+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m);
2159+
2160+ major = buffer_get_int(&m);
2161+ hash->value = buffer_get_string(&m, &len);
2162+ hash->length = len;
2163+
2164+ buffer_free(&m);
2165+
2166+ return(major);
2167+}
2168+
2169+int
2170+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
2171+{
2172+ Buffer m;
2173+ int ok;
2174+
2175+ buffer_init(&m);
2176+
2177+ buffer_put_cstring(&m, store->filename ? store->filename : "");
2178+ buffer_put_cstring(&m, store->envvar ? store->envvar : "");
2179+ buffer_put_cstring(&m, store->envval ? store->envval : "");
2180+
2181+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m);
2182+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m);
2183+
2184+ ok = buffer_get_int(&m);
2185+
2186+ buffer_free(&m);
2187+
2188+ return (ok);
2189+}
2190+
2191 #endif /* GSSAPI */
2192
2193diff --git a/monitor_wrap.h b/monitor_wrap.h
2194index de4a08f..9758290 100644
2195--- a/monitor_wrap.h
2196+++ b/monitor_wrap.h
2197@@ -58,8 +58,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *);
2198 OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2199 OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
2200 gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
2201-int mm_ssh_gssapi_userok(char *user);
2202+int mm_ssh_gssapi_userok(char *user, struct passwd *);
2203 OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2204+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2205+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *);
2206 #endif
2207
2208 #ifdef USE_PAM
2209diff --git a/readconf.c b/readconf.c
2210index db7d0bb..68dac76 100644
2211--- a/readconf.c
2212+++ b/readconf.c
2213@@ -147,6 +147,8 @@ typedef enum {
2214 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
2215 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
2216 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
2217+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
2218+ oGssServerIdentity,
2219 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
2220 oSendEnv, oControlPath, oControlMaster, oControlPersist,
2221 oHashKnownHosts,
2222@@ -191,10 +193,19 @@ static struct {
2223 { "afstokenpassing", oUnsupported },
2224 #if defined(GSSAPI)
2225 { "gssapiauthentication", oGssAuthentication },
2226+ { "gssapikeyexchange", oGssKeyEx },
2227 { "gssapidelegatecredentials", oGssDelegateCreds },
2228+ { "gssapitrustdns", oGssTrustDns },
2229+ { "gssapiclientidentity", oGssClientIdentity },
2230+ { "gssapiserveridentity", oGssServerIdentity },
2231+ { "gssapirenewalforcesrekey", oGssRenewalRekey },
2232 #else
2233 { "gssapiauthentication", oUnsupported },
2234+ { "gssapikeyexchange", oUnsupported },
2235 { "gssapidelegatecredentials", oUnsupported },
2236+ { "gssapitrustdns", oUnsupported },
2237+ { "gssapiclientidentity", oUnsupported },
2238+ { "gssapirenewalforcesrekey", oUnsupported },
2239 #endif
2240 { "fallbacktorsh", oDeprecated },
2241 { "usersh", oDeprecated },
2242@@ -892,10 +903,30 @@ parse_time:
2243 intptr = &options->gss_authentication;
2244 goto parse_flag;
2245
2246+ case oGssKeyEx:
2247+ intptr = &options->gss_keyex;
2248+ goto parse_flag;
2249+
2250 case oGssDelegateCreds:
2251 intptr = &options->gss_deleg_creds;
2252 goto parse_flag;
2253
2254+ case oGssTrustDns:
2255+ intptr = &options->gss_trust_dns;
2256+ goto parse_flag;
2257+
2258+ case oGssClientIdentity:
2259+ charptr = &options->gss_client_identity;
2260+ goto parse_string;
2261+
2262+ case oGssServerIdentity:
2263+ charptr = &options->gss_server_identity;
2264+ goto parse_string;
2265+
2266+ case oGssRenewalRekey:
2267+ intptr = &options->gss_renewal_rekey;
2268+ goto parse_flag;
2269+
2270 case oBatchMode:
2271 intptr = &options->batch_mode;
2272 goto parse_flag;
2273@@ -1601,7 +1632,12 @@ initialize_options(Options * options)
2274 options->pubkey_authentication = -1;
2275 options->challenge_response_authentication = -1;
2276 options->gss_authentication = -1;
2277+ options->gss_keyex = -1;
2278 options->gss_deleg_creds = -1;
2279+ options->gss_trust_dns = -1;
2280+ options->gss_renewal_rekey = -1;
2281+ options->gss_client_identity = NULL;
2282+ options->gss_server_identity = NULL;
2283 options->password_authentication = -1;
2284 options->kbd_interactive_authentication = -1;
2285 options->kbd_interactive_devices = NULL;
2286@@ -1728,8 +1764,14 @@ fill_default_options(Options * options)
2287 options->challenge_response_authentication = 1;
2288 if (options->gss_authentication == -1)
2289 options->gss_authentication = 0;
2290+ if (options->gss_keyex == -1)
2291+ options->gss_keyex = 0;
2292 if (options->gss_deleg_creds == -1)
2293 options->gss_deleg_creds = 0;
2294+ if (options->gss_trust_dns == -1)
2295+ options->gss_trust_dns = 0;
2296+ if (options->gss_renewal_rekey == -1)
2297+ options->gss_renewal_rekey = 0;
2298 if (options->password_authentication == -1)
2299 options->password_authentication = 1;
2300 if (options->kbd_interactive_authentication == -1)
2301diff --git a/readconf.h b/readconf.h
2302index 576b9e3..ef39c4c 100644
2303--- a/readconf.h
2304+++ b/readconf.h
2305@@ -45,7 +45,12 @@ typedef struct {
2306 int challenge_response_authentication;
2307 /* Try S/Key or TIS, authentication. */
2308 int gss_authentication; /* Try GSS authentication */
2309+ int gss_keyex; /* Try GSS key exchange */
2310 int gss_deleg_creds; /* Delegate GSS credentials */
2311+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
2312+ int gss_renewal_rekey; /* Credential renewal forces rekey */
2313+ char *gss_client_identity; /* Principal to initiate GSSAPI with */
2314+ char *gss_server_identity; /* GSSAPI target principal */
2315 int password_authentication; /* Try password
2316 * authentication. */
2317 int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
2318diff --git a/servconf.c b/servconf.c
2319index df93fc4..2f7f41e 100644
2320--- a/servconf.c
2321+++ b/servconf.c
2322@@ -115,8 +115,10 @@ initialize_server_options(ServerOptions *options)
2323 options->kerberos_ticket_cleanup = -1;
2324 options->kerberos_get_afs_token = -1;
2325 options->gss_authentication=-1;
2326+ options->gss_keyex = -1;
2327 options->gss_cleanup_creds = -1;
2328 options->gss_strict_acceptor = -1;
2329+ options->gss_store_rekey = -1;
2330 options->password_authentication = -1;
2331 options->kbd_interactive_authentication = -1;
2332 options->challenge_response_authentication = -1;
2333@@ -275,10 +277,14 @@ fill_default_server_options(ServerOptions *options)
2334 options->kerberos_get_afs_token = 0;
2335 if (options->gss_authentication == -1)
2336 options->gss_authentication = 0;
2337+ if (options->gss_keyex == -1)
2338+ options->gss_keyex = 0;
2339 if (options->gss_cleanup_creds == -1)
2340 options->gss_cleanup_creds = 1;
2341 if (options->gss_strict_acceptor == -1)
2342- options->gss_strict_acceptor = 0;
2343+ options->gss_strict_acceptor = 1;
2344+ if (options->gss_store_rekey == -1)
2345+ options->gss_store_rekey = 0;
2346 if (options->password_authentication == -1)
2347 options->password_authentication = 1;
2348 if (options->kbd_interactive_authentication == -1)
2349@@ -401,6 +407,7 @@ typedef enum {
2350 sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,
2351 sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
2352 sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
2353+ sGssKeyEx, sGssStoreRekey,
2354 sAcceptEnv, sPermitTunnel,
2355 sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
2356 sUsePrivilegeSeparation, sAllowAgentForwarding,
2357@@ -473,12 +480,20 @@ static struct {
2358 #ifdef GSSAPI
2359 { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
2360 { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
2361+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
2362 { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
2363+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
2364+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
2365 #else
2366 { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
2367 { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
2368+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
2369 { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
2370+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
2371+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
2372 #endif
2373+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
2374+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
2375 { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
2376 { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
2377 { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
2378@@ -1214,6 +1229,10 @@ process_server_config_line(ServerOptions *options, char *line,
2379 intptr = &options->gss_authentication;
2380 goto parse_flag;
2381
2382+ case sGssKeyEx:
2383+ intptr = &options->gss_keyex;
2384+ goto parse_flag;
2385+
2386 case sGssCleanupCreds:
2387 intptr = &options->gss_cleanup_creds;
2388 goto parse_flag;
2389@@ -1222,6 +1241,10 @@ process_server_config_line(ServerOptions *options, char *line,
2390 intptr = &options->gss_strict_acceptor;
2391 goto parse_flag;
2392
2393+ case sGssStoreRekey:
2394+ intptr = &options->gss_store_rekey;
2395+ goto parse_flag;
2396+
2397 case sPasswordAuthentication:
2398 intptr = &options->password_authentication;
2399 goto parse_flag;
2400@@ -2229,7 +2252,10 @@ dump_config(ServerOptions *o)
2401 #endif
2402 #ifdef GSSAPI
2403 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
2404+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
2405 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
2406+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
2407+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
2408 #endif
2409 dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
2410 dump_cfg_fmtint(sKbdInteractiveAuthentication,
2411diff --git a/servconf.h b/servconf.h
2412index 606d80c..b99b270 100644
2413--- a/servconf.h
2414+++ b/servconf.h
2415@@ -117,8 +117,10 @@ typedef struct {
2416 int kerberos_get_afs_token; /* If true, try to get AFS token if
2417 * authenticated with Kerberos. */
2418 int gss_authentication; /* If true, permit GSSAPI authentication */
2419+ int gss_keyex; /* If true, permit GSSAPI key exchange */
2420 int gss_cleanup_creds; /* If true, destroy cred cache on logout */
2421 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
2422+ int gss_store_rekey;
2423 int password_authentication; /* If true, permit password
2424 * authentication. */
2425 int kbd_interactive_authentication; /* If true, permit */
2426diff --git a/ssh-gss.h b/ssh-gss.h
2427index a99d7f0..914701b 100644
2428--- a/ssh-gss.h
2429+++ b/ssh-gss.h
2430@@ -1,6 +1,6 @@
2431 /* $OpenBSD: ssh-gss.h,v 1.11 2014/02/26 20:28:44 djm Exp $ */
2432 /*
2433- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
2434+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
2435 *
2436 * Redistribution and use in source and binary forms, with or without
2437 * modification, are permitted provided that the following conditions
2438@@ -61,10 +61,22 @@
2439
2440 #define SSH_GSS_OIDTYPE 0x06
2441
2442+#define SSH2_MSG_KEXGSS_INIT 30
2443+#define SSH2_MSG_KEXGSS_CONTINUE 31
2444+#define SSH2_MSG_KEXGSS_COMPLETE 32
2445+#define SSH2_MSG_KEXGSS_HOSTKEY 33
2446+#define SSH2_MSG_KEXGSS_ERROR 34
2447+#define SSH2_MSG_KEXGSS_GROUPREQ 40
2448+#define SSH2_MSG_KEXGSS_GROUP 41
2449+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-"
2450+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-"
2451+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-"
2452+
2453 typedef struct {
2454 char *filename;
2455 char *envvar;
2456 char *envval;
2457+ struct passwd *owner;
2458 void *data;
2459 } ssh_gssapi_ccache;
2460
2461@@ -72,8 +84,11 @@ typedef struct {
2462 gss_buffer_desc displayname;
2463 gss_buffer_desc exportedname;
2464 gss_cred_id_t creds;
2465+ gss_name_t name;
2466 struct ssh_gssapi_mech_struct *mech;
2467 ssh_gssapi_ccache store;
2468+ int used;
2469+ int updated;
2470 } ssh_gssapi_client;
2471
2472 typedef struct ssh_gssapi_mech_struct {
2473@@ -84,6 +99,7 @@ typedef struct ssh_gssapi_mech_struct {
2474 int (*userok) (ssh_gssapi_client *, char *);
2475 int (*localname) (ssh_gssapi_client *, char **);
2476 void (*storecreds) (ssh_gssapi_client *);
2477+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *);
2478 } ssh_gssapi_mech;
2479
2480 typedef struct {
2481@@ -94,10 +110,11 @@ typedef struct {
2482 gss_OID oid; /* client */
2483 gss_cred_id_t creds; /* server */
2484 gss_name_t client; /* server */
2485- gss_cred_id_t client_creds; /* server */
2486+ gss_cred_id_t client_creds; /* both */
2487 } Gssctxt;
2488
2489 extern ssh_gssapi_mech *supported_mechs[];
2490+extern Gssctxt *gss_kex_context;
2491
2492 int ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
2493 void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
2494@@ -119,16 +136,32 @@ void ssh_gssapi_build_ctx(Gssctxt **);
2495 void ssh_gssapi_delete_ctx(Gssctxt **);
2496 OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2497 void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
2498-int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
2499+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *);
2500+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
2501+int ssh_gssapi_credentials_updated(Gssctxt *);
2502
2503 /* In the server */
2504+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *,
2505+ const char *);
2506+char *ssh_gssapi_client_mechanisms(const char *, const char *);
2507+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *,
2508+ const char *);
2509+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
2510+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *,
2511+ const char *);
2512 OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2513-int ssh_gssapi_userok(char *name);
2514+int ssh_gssapi_userok(char *name, struct passwd *);
2515 OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2516 void ssh_gssapi_do_child(char ***, u_int *);
2517 void ssh_gssapi_cleanup_creds(void);
2518 void ssh_gssapi_storecreds(void);
2519
2520+char *ssh_gssapi_server_mechanisms(void);
2521+int ssh_gssapi_oid_table_ok(void);
2522+
2523+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store);
2524+void ssh_gssapi_rekey_creds(void);
2525+
2526 #endif /* GSSAPI */
2527
2528 #endif /* _SSH_GSS_H */
2529diff --git a/ssh_config b/ssh_config
2530index 03a228f..228e5ab 100644
2531--- a/ssh_config
2532+++ b/ssh_config
2533@@ -26,6 +26,8 @@
2534 # HostbasedAuthentication no
2535 # GSSAPIAuthentication no
2536 # GSSAPIDelegateCredentials no
2537+# GSSAPIKeyExchange no
2538+# GSSAPITrustDNS no
2539 # BatchMode no
2540 # CheckHostIP yes
2541 # AddressFamily any
2542diff --git a/ssh_config.5 b/ssh_config.5
2543index 268a627..b840261 100644
2544--- a/ssh_config.5
2545+++ b/ssh_config.5
2546@@ -744,11 +744,43 @@ Specifies whether user authentication based on GSSAPI is allowed.
2547 The default is
2548 .Dq no .
2549 Note that this option applies to protocol version 2 only.
2550+.It Cm GSSAPIKeyExchange
2551+Specifies whether key exchange based on GSSAPI may be used. When using
2552+GSSAPI key exchange the server need not have a host key.
2553+The default is
2554+.Dq no .
2555+Note that this option applies to protocol version 2 only.
2556+.It Cm GSSAPIClientIdentity
2557+If set, specifies the GSSAPI client identity that ssh should use when
2558+connecting to the server. The default is unset, which means that the default
2559+identity will be used.
2560+.It Cm GSSAPIServerIdentity
2561+If set, specifies the GSSAPI server identity that ssh should expect when
2562+connecting to the server. The default is unset, which means that the
2563+expected GSSAPI server identity will be determined from the target
2564+hostname.
2565 .It Cm GSSAPIDelegateCredentials
2566 Forward (delegate) credentials to the server.
2567 The default is
2568 .Dq no .
2569-Note that this option applies to protocol version 2 only.
2570+Note that this option applies to protocol version 2 connections using GSSAPI.
2571+.It Cm GSSAPIRenewalForcesRekey
2572+If set to
2573+.Dq yes
2574+then renewal of the client's GSSAPI credentials will force the rekeying of the
2575+ssh connection. With a compatible server, this can delegate the renewed
2576+credentials to a session on the server.
2577+The default is
2578+.Dq no .
2579+.It Cm GSSAPITrustDns
2580+Set to
2581+.Dq yes to indicate that the DNS is trusted to securely canonicalize
2582+the name of the host being connected to. If
2583+.Dq no, the hostname entered on the
2584+command line will be passed untouched to the GSSAPI library.
2585+The default is
2586+.Dq no .
2587+This option only applies to protocol version 2 connections using GSSAPI.
2588 .It Cm HashKnownHosts
2589 Indicates that
2590 .Xr ssh 1
2591diff --git a/sshconnect2.c b/sshconnect2.c
2592index fcaed6b..44c89e6 100644
2593--- a/sshconnect2.c
2594+++ b/sshconnect2.c
2595@@ -160,9 +160,34 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2596 struct kex *kex;
2597 int r;
2598
2599+#ifdef GSSAPI
2600+ char *orig = NULL, *gss = NULL;
2601+ char *gss_host = NULL;
2602+#endif
2603+
2604 xxx_host = host;
2605 xxx_hostaddr = hostaddr;
2606
2607+#ifdef GSSAPI
2608+ if (options.gss_keyex) {
2609+ /* Add the GSSAPI mechanisms currently supported on this
2610+ * client to the key exchange algorithm proposal */
2611+ orig = myproposal[PROPOSAL_KEX_ALGS];
2612+
2613+ if (options.gss_trust_dns)
2614+ gss_host = (char *)get_canonical_hostname(1);
2615+ else
2616+ gss_host = host;
2617+
2618+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity);
2619+ if (gss) {
2620+ debug("Offering GSSAPI proposal: %s", gss);
2621+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
2622+ "%s,%s", gss, orig);
2623+ }
2624+ }
2625+#endif
2626+
2627 if (options.ciphers == (char *)-1) {
2628 logit("No valid ciphers for protocol version 2 given, using defaults.");
2629 options.ciphers = NULL;
2630@@ -200,6 +225,17 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2631 myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
2632 myproposal[PROPOSAL_KEX_ALGS]);
2633
2634+#ifdef GSSAPI
2635+ /* If we've got GSSAPI algorithms, then we also support the
2636+ * 'null' hostkey, as a last resort */
2637+ if (options.gss_keyex && gss) {
2638+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
2639+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],
2640+ "%s,null", orig);
2641+ free(gss);
2642+ }
2643+#endif
2644+
2645 if (options.rekey_limit || options.rekey_interval)
2646 packet_set_rekey_limits((u_int32_t)options.rekey_limit,
2647 (time_t)options.rekey_interval);
2648@@ -218,10 +254,30 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2649 # endif
2650 #endif
2651 kex->kex[KEX_C25519_SHA256] = kexc25519_client;
2652+#ifdef GSSAPI
2653+ if (options.gss_keyex) {
2654+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
2655+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client;
2656+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client;
2657+ }
2658+#endif
2659 kex->client_version_string=client_version_string;
2660 kex->server_version_string=server_version_string;
2661 kex->verify_host_key=&verify_host_key_callback;
2662
2663+#ifdef GSSAPI
2664+ if (options.gss_keyex) {
2665+ kex->gss_deleg_creds = options.gss_deleg_creds;
2666+ kex->gss_trust_dns = options.gss_trust_dns;
2667+ kex->gss_client = options.gss_client_identity;
2668+ if (options.gss_server_identity) {
2669+ kex->gss_host = options.gss_server_identity;
2670+ } else {
2671+ kex->gss_host = gss_host;
2672+ }
2673+ }
2674+#endif
2675+
2676 dispatch_run(DISPATCH_BLOCK, &kex->done, active_state);
2677
2678 if (options.use_roaming && !kex->roaming) {
2679@@ -313,6 +369,7 @@ int input_gssapi_token(int type, u_int32_t, void *);
2680 int input_gssapi_hash(int type, u_int32_t, void *);
2681 int input_gssapi_error(int, u_int32_t, void *);
2682 int input_gssapi_errtok(int, u_int32_t, void *);
2683+int userauth_gsskeyex(Authctxt *authctxt);
2684 #endif
2685
2686 void userauth(Authctxt *, char *);
2687@@ -328,6 +385,11 @@ static char *authmethods_get(void);
2688
2689 Authmethod authmethods[] = {
2690 #ifdef GSSAPI
2691+ {"gssapi-keyex",
2692+ userauth_gsskeyex,
2693+ NULL,
2694+ &options.gss_authentication,
2695+ NULL},
2696 {"gssapi-with-mic",
2697 userauth_gssapi,
2698 NULL,
2699@@ -634,19 +696,31 @@ userauth_gssapi(Authctxt *authctxt)
2700 static u_int mech = 0;
2701 OM_uint32 min;
2702 int ok = 0;
2703+ const char *gss_host;
2704+
2705+ if (options.gss_server_identity)
2706+ gss_host = options.gss_server_identity;
2707+ else if (options.gss_trust_dns)
2708+ gss_host = get_canonical_hostname(1);
2709+ else
2710+ gss_host = authctxt->host;
2711
2712 /* Try one GSSAPI method at a time, rather than sending them all at
2713 * once. */
2714
2715 if (gss_supported == NULL)
2716- gss_indicate_mechs(&min, &gss_supported);
2717+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) {
2718+ gss_supported = NULL;
2719+ return 0;
2720+ }
2721
2722 /* Check to see if the mechanism is usable before we offer it */
2723 while (mech < gss_supported->count && !ok) {
2724 /* My DER encoding requires length<128 */
2725 if (gss_supported->elements[mech].length < 128 &&
2726 ssh_gssapi_check_mechanism(&gssctxt,
2727- &gss_supported->elements[mech], authctxt->host)) {
2728+ &gss_supported->elements[mech], gss_host,
2729+ options.gss_client_identity)) {
2730 ok = 1; /* Mechanism works */
2731 } else {
2732 mech++;
2733@@ -743,8 +817,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt)
2734 {
2735 Authctxt *authctxt = ctxt;
2736 Gssctxt *gssctxt;
2737- int oidlen;
2738- char *oidv;
2739+ u_int oidlen;
2740+ u_char *oidv;
2741
2742 if (authctxt == NULL)
2743 fatal("input_gssapi_response: no authentication context");
2744@@ -857,6 +931,48 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt)
2745 free(lang);
2746 return 0;
2747 }
2748+
2749+int
2750+userauth_gsskeyex(Authctxt *authctxt)
2751+{
2752+ Buffer b;
2753+ gss_buffer_desc gssbuf;
2754+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
2755+ OM_uint32 ms;
2756+
2757+ static int attempt = 0;
2758+ if (attempt++ >= 1)
2759+ return (0);
2760+
2761+ if (gss_kex_context == NULL) {
2762+ debug("No valid Key exchange context");
2763+ return (0);
2764+ }
2765+
2766+ ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service,
2767+ "gssapi-keyex");
2768+
2769+ gssbuf.value = buffer_ptr(&b);
2770+ gssbuf.length = buffer_len(&b);
2771+
2772+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) {
2773+ buffer_free(&b);
2774+ return (0);
2775+ }
2776+
2777+ packet_start(SSH2_MSG_USERAUTH_REQUEST);
2778+ packet_put_cstring(authctxt->server_user);
2779+ packet_put_cstring(authctxt->service);
2780+ packet_put_cstring(authctxt->method->name);
2781+ packet_put_string(mic.value, mic.length);
2782+ packet_send();
2783+
2784+ buffer_free(&b);
2785+ gss_release_buffer(&ms, &mic);
2786+
2787+ return (1);
2788+}
2789+
2790 #endif /* GSSAPI */
2791
2792 int
2793diff --git a/sshd.c b/sshd.c
2794index 6f8c6f2..6b85e6c 100644
2795--- a/sshd.c
2796+++ b/sshd.c
2797@@ -125,6 +125,10 @@
2798 #include "version.h"
2799 #include "ssherr.h"
2800
2801+#ifdef USE_SECURITY_SESSION_API
2802+#include <Security/AuthSession.h>
2803+#endif
2804+
2805 #ifndef O_NOCTTY
2806 #define O_NOCTTY 0
2807 #endif
2808@@ -1823,10 +1827,13 @@ main(int ac, char **av)
2809 logit("Disabling protocol version 1. Could not load host key");
2810 options.protocol &= ~SSH_PROTO_1;
2811 }
2812+#ifndef GSSAPI
2813+ /* The GSSAPI key exchange can run without a host key */
2814 if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) {
2815 logit("Disabling protocol version 2. Could not load host key");
2816 options.protocol &= ~SSH_PROTO_2;
2817 }
2818+#endif
2819 if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
2820 logit("sshd: no hostkeys available -- exiting.");
2821 exit(1);
2822@@ -2141,6 +2148,60 @@ main(int ac, char **av)
2823 remote_ip, remote_port, laddr, get_local_port());
2824 free(laddr);
2825
2826+#ifdef USE_SECURITY_SESSION_API
2827+ /*
2828+ * Create a new security session for use by the new user login if
2829+ * the current session is the root session or we are not launched
2830+ * by inetd (eg: debugging mode or server mode). We do not
2831+ * necessarily need to create a session if we are launched from
2832+ * inetd because Panther xinetd will create a session for us.
2833+ *
2834+ * The only case where this logic will fail is if there is an
2835+ * inetd running in a non-root session which is not creating
2836+ * new sessions for us. Then all the users will end up in the
2837+ * same session (bad).
2838+ *
2839+ * When the client exits, the session will be destroyed for us
2840+ * automatically.
2841+ *
2842+ * We must create the session before any credentials are stored
2843+ * (including AFS pags, which happens a few lines below).
2844+ */
2845+ {
2846+ OSStatus err = 0;
2847+ SecuritySessionId sid = 0;
2848+ SessionAttributeBits sattrs = 0;
2849+
2850+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs);
2851+ if (err)
2852+ error("SessionGetInfo() failed with error %.8X",
2853+ (unsigned) err);
2854+ else
2855+ debug("Current Session ID is %.8X / Session Attributes are %.8X",
2856+ (unsigned) sid, (unsigned) sattrs);
2857+
2858+ if (inetd_flag && !(sattrs & sessionIsRoot))
2859+ debug("Running in inetd mode in a non-root session... "
2860+ "assuming inetd created the session for us.");
2861+ else {
2862+ debug("Creating new security session...");
2863+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote);
2864+ if (err)
2865+ error("SessionCreate() failed with error %.8X",
2866+ (unsigned) err);
2867+
2868+ err = SessionGetInfo(callerSecuritySession, &sid,
2869+ &sattrs);
2870+ if (err)
2871+ error("SessionGetInfo() failed with error %.8X",
2872+ (unsigned) err);
2873+ else
2874+ debug("New Session ID is %.8X / Session Attributes are %.8X",
2875+ (unsigned) sid, (unsigned) sattrs);
2876+ }
2877+ }
2878+#endif
2879+
2880 /*
2881 * We don't want to listen forever unless the other side
2882 * successfully authenticates itself. So we set up an alarm which is
2883@@ -2570,6 +2631,48 @@ do_ssh2_kex(void)
2884 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
2885 list_hostkey_types());
2886
2887+#ifdef GSSAPI
2888+ {
2889+ char *orig;
2890+ char *gss = NULL;
2891+ char *newstr = NULL;
2892+ orig = myproposal[PROPOSAL_KEX_ALGS];
2893+
2894+ /*
2895+ * If we don't have a host key, then there's no point advertising
2896+ * the other key exchange algorithms
2897+ */
2898+
2899+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
2900+ orig = NULL;
2901+
2902+ if (options.gss_keyex)
2903+ gss = ssh_gssapi_server_mechanisms();
2904+ else
2905+ gss = NULL;
2906+
2907+ if (gss && orig)
2908+ xasprintf(&newstr, "%s,%s", gss, orig);
2909+ else if (gss)
2910+ newstr = gss;
2911+ else if (orig)
2912+ newstr = orig;
2913+
2914+ /*
2915+ * If we've got GSSAPI mechanisms, then we've got the 'null' host
2916+ * key alg, but we can't tell people about it unless its the only
2917+ * host key algorithm we support
2918+ */
2919+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
2920+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
2921+
2922+ if (newstr)
2923+ myproposal[PROPOSAL_KEX_ALGS] = newstr;
2924+ else
2925+ fatal("No supported key exchange algorithms");
2926+ }
2927+#endif
2928+
2929 /* start key exchange */
2930 if ((r = kex_setup(active_state, myproposal)) != 0)
2931 fatal("kex_setup: %s", ssh_err(r));
2932@@ -2584,6 +2687,13 @@ do_ssh2_kex(void)
2933 # endif
2934 #endif
2935 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
2936+#ifdef GSSAPI
2937+ if (options.gss_keyex) {
2938+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
2939+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
2940+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
2941+ }
2942+#endif
2943 kex->server = 1;
2944 kex->client_version_string=client_version_string;
2945 kex->server_version_string=server_version_string;
2946diff --git a/sshd_config b/sshd_config
2947index cf7d8e1..1dfd0f1 100644
2948--- a/sshd_config
2949+++ b/sshd_config
2950@@ -84,6 +84,8 @@ AuthorizedKeysFile .ssh/authorized_keys
2951 # GSSAPI options
2952 #GSSAPIAuthentication no
2953 #GSSAPICleanupCredentials yes
2954+#GSSAPIStrictAcceptorCheck yes
2955+#GSSAPIKeyExchange no
2956
2957 # Set this to 'yes' to enable PAM authentication, account processing,
2958 # and session processing. If this is enabled, PAM authentication will
2959diff --git a/sshd_config.5 b/sshd_config.5
2960index 5ab4318..68424f1 100644
2961--- a/sshd_config.5
2962+++ b/sshd_config.5
2963@@ -616,6 +616,12 @@ Specifies whether user authentication based on GSSAPI is allowed.
2964 The default is
2965 .Dq no .
2966 Note that this option applies to protocol version 2 only.
2967+.It Cm GSSAPIKeyExchange
2968+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange
2969+doesn't rely on ssh keys to verify host identity.
2970+The default is
2971+.Dq no .
2972+Note that this option applies to protocol version 2 only.
2973 .It Cm GSSAPICleanupCredentials
2974 Specifies whether to automatically destroy the user's credentials cache
2975 on logout.
2976@@ -637,6 +643,11 @@ machine's default store.
2977 This facility is provided to assist with operation on multi homed machines.
2978 The default is
2979 .Dq yes .
2980+.It Cm GSSAPIStoreCredentialsOnRekey
2981+Controls whether the user's GSSAPI credentials should be updated following a
2982+successful connection rekeying. This option can be used to accepted renewed
2983+or updated credentials from a compatible client. The default is
2984+.Dq no .
2985 .It Cm HostbasedAcceptedKeyTypes
2986 Specifies the key types that will be accepted for hostbased authentication
2987 as a comma-separated pattern list.
2988diff --git a/sshkey.c b/sshkey.c
2989index cfe5980..2c87d80 100644
2990--- a/sshkey.c
2991+++ b/sshkey.c
2992@@ -116,6 +116,7 @@ static const struct keytype keytypes[] = {
2993 { "ssh-dss-cert-v00@openssh.com", "DSA-CERT-V00",
2994 KEY_DSA_CERT_V00, 0, 1 },
2995 #endif /* WITH_OPENSSL */
2996+ { "null", "null", KEY_NULL, 0, 0 },
2997 { NULL, NULL, -1, -1, 0 }
2998 };
2999
3000@@ -204,7 +205,7 @@ key_alg_list(int certs_only, int plain_only)
3001 const struct keytype *kt;
3002
3003 for (kt = keytypes; kt->type != -1; kt++) {
3004- if (kt->name == NULL)
3005+ if (kt->name == NULL || kt->type == KEY_NULL)
3006 continue;
3007 if ((certs_only && !kt->cert) || (plain_only && kt->cert))
3008 continue;
3009diff --git a/sshkey.h b/sshkey.h
3010index cdac0e2..b010b8e 100644
3011--- a/sshkey.h
3012+++ b/sshkey.h
3013@@ -64,6 +64,7 @@ enum sshkey_types {
3014 KEY_ED25519_CERT,
3015 KEY_RSA_CERT_V00,
3016 KEY_DSA_CERT_V00,
3017+ KEY_NULL,
3018 KEY_UNSPEC
3019 };
3020
diff --git a/debian/patches/helpful-wait-terminate.patch b/debian/patches/helpful-wait-terminate.patch
new file mode 100644
index 000000000..ac8630b4c
--- /dev/null
+++ b/debian/patches/helpful-wait-terminate.patch
@@ -0,0 +1,26 @@
1From 5496170cd67abb653e385277bd83b69f1b10905d Mon Sep 17 00:00:00 2001
2From: Matthew Vernon <matthew@debian.org>
3Date: Sun, 9 Feb 2014 16:09:56 +0000
4Subject: Mention ~& when waiting for forwarded connections to terminate
5
6Bug-Debian: http://bugs.debian.org/50308
7Last-Update: 2010-02-27
8
9Patch-Name: helpful-wait-terminate.patch
10---
11 serverloop.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/serverloop.c b/serverloop.c
15index 306ac36..68f0251 100644
16--- a/serverloop.c
17+++ b/serverloop.c
18@@ -687,7 +687,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
19 if (!channel_still_open())
20 break;
21 if (!waiting_termination) {
22- const char *s = "Waiting for forwarded connections to terminate...\r\n";
23+ const char *s = "Waiting for forwarded connections to terminate... (press ~& to background)\r\n";
24 char *cp;
25 waiting_termination = 1;
26 buffer_append(&stderr_buffer, s, strlen(s));
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
new file mode 100644
index 000000000..09c178db4
--- /dev/null
+++ b/debian/patches/keepalive-extensions.patch
@@ -0,0 +1,135 @@
1From 02a61bcb045503a5f3f7e274ac1f4524e30f87c8 Mon Sep 17 00:00:00 2001
2From: Richard Kettlewell <rjk@greenend.org.uk>
3Date: Sun, 9 Feb 2014 16:09:52 +0000
4Subject: Various keepalive extensions
5
6Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut, supported
7in previous versions of Debian's OpenSSH package but since superseded by
8ServerAliveInterval. (We're probably stuck with this bit for
9compatibility.)
10
11In batch mode, default ServerAliveInterval to five minutes.
12
13Adjust documentation to match and to give some more advice on use of
14keepalives.
15
16Author: Ian Jackson <ian@chiark.greenend.org.uk>
17Author: Matthew Vernon <matthew@debian.org>
18Author: Colin Watson <cjwatson@debian.org>
19Last-Update: 2015-08-19
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 85eea48..5c5890c 100644
30--- a/readconf.c
31+++ b/readconf.c
32@@ -159,6 +159,7 @@ typedef enum {
33 oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
34 oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
35 oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
36+ oProtocolKeepAlives, oSetupTimeOut,
37 oIgnoredUnknownOption, oDeprecated, oUnsupported
38 } OpCodes;
39
40@@ -288,6 +289,8 @@ static struct {
41 { "updatehostkeys", oUpdateHostkeys },
42 { "hostbasedkeytypes", oHostbasedKeyTypes },
43 { "ignoreunknown", oIgnoreUnknown },
44+ { "protocolkeepalives", oProtocolKeepAlives },
45+ { "setuptimeout", oSetupTimeOut },
46
47 { NULL, oBadOption }
48 };
49@@ -1299,6 +1302,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@@ -1858,8 +1863,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 f7510b6..21d3e94 100644
76--- a/ssh_config.5
77+++ b/ssh_config.5
78@@ -233,8 +233,12 @@ Valid arguments are
79 If set to
80 .Dq yes ,
81 passphrase/password querying will be disabled.
82+In addition, the
83+.Cm ServerAliveInterval
84+option will be set to 300 seconds by default.
85 This option is useful in scripts and other batch jobs where no user
86-is present to supply the password.
87+is present to supply the password,
88+and where it is desirable to detect a broken network swiftly.
89 The argument must be
90 .Dq yes
91 or
92@@ -1425,8 +1429,15 @@ from the server,
93 will send a message through the encrypted
94 channel to request a response from the server.
95 The default
96-is 0, indicating that these messages will not be sent to the server.
97+is 0, indicating that these messages will not be sent to the server,
98+or 300 if the
99+.Cm BatchMode
100+option is set.
101 This option applies to protocol version 2 only.
102+.Cm ProtocolKeepAlives
103+and
104+.Cm SetupTimeOut
105+are Debian-specific compatibility aliases for this option.
106 .It Cm StreamLocalBindMask
107 Sets the octal file creation mode mask
108 .Pq umask
109@@ -1492,6 +1503,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 68424f1..1269bbd 100644
124--- a/sshd_config.5
125+++ b/sshd_config.5
126@@ -1443,6 +1443,9 @@ This avoids infinitely hanging sessions.
127 .Pp
128 To disable TCP keepalive messages, the value should be set to
129 .Dq no .
130+.Pp
131+This option was formerly called
132+.Cm KeepAlive .
133 .It Cm TrustedUserCAKeys
134 Specifies a file containing public keys of certificate authorities that are
135 trusted to sign user certificates for authentication, or
diff --git a/debian/patches/lintian-symlink-pickiness.patch b/debian/patches/lintian-symlink-pickiness.patch
new file mode 100644
index 000000000..38ce64f04
--- /dev/null
+++ b/debian/patches/lintian-symlink-pickiness.patch
@@ -0,0 +1,32 @@
1From 5919db7dc21a34c31be70170728c2838ff59b740 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 37cb023..f52f903 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -331,9 +331,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..464ddfa1e
--- /dev/null
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -0,0 +1,42 @@
1From 68580f4a03088e52e1d680389a35655c85613c7a Mon Sep 17 00:00:00 2001
2From: Scott Moser <smoser@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:03 +0000
4Subject: Mention ssh-keygen in ssh fingerprint changed warning
5
6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
7Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
8Last-Update: 2015-09-08
9
10Patch-Name: mention-ssh-keygen-on-keychange.patch
11---
12 sshconnect.c | 8 +++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-)
14
15diff --git a/sshconnect.c b/sshconnect.c
16index 8adc943..4aff104 100644
17--- a/sshconnect.c
18+++ b/sshconnect.c
19@@ -1078,9 +1078,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
20 error("%s. This could either mean that", key_msg);
21 error("DNS SPOOFING is happening or the IP address for the host");
22 error("and its host key have changed at the same time.");
23- if (ip_status != HOST_NEW)
24+ if (ip_status != HOST_NEW) {
25 error("Offending key for IP in %s:%lu",
26 ip_found->file, ip_found->line);
27+ error(" remove with:");
28+ error(" ssh-keygen -f \"%s\" -R %s",
29+ ip_found->file, ip);
30+ }
31 }
32 /* The host key has changed. */
33 warn_changed_key(host_key);
34@@ -1088,6 +1092,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
35 user_hostfiles[0]);
36 error("Offending %s key in %s:%lu", key_type(host_found->key),
37 host_found->file, host_found->line);
38+ error(" remove with:");
39+ error(" ssh-keygen -f \"%s\" -R %s", host_found->file, host);
40
41 /*
42 * If strict host key checking is in use, the user will have
diff --git a/debian/patches/no-openssl-version-status.patch b/debian/patches/no-openssl-version-status.patch
new file mode 100644
index 000000000..a62651d1e
--- /dev/null
+++ b/debian/patches/no-openssl-version-status.patch
@@ -0,0 +1,62 @@
1From 0ca693a1acb3b62c1f7d7c1e776d3c160d7c3e84 Mon Sep 17 00:00:00 2001
2From: Kurt Roeckx <kurt@roeckx.be>
3Date: Sun, 9 Feb 2014 16:10:14 +0000
4Subject: Don't check the status field of the OpenSSL version
5
6There is no reason to check the version of OpenSSL (in Debian). If it's
7not compatible the soname will change. OpenSSH seems to want to do a
8check for the soname based on the version number, but wants to keep the
9status of the release the same. Remove that check on the status since
10it doesn't tell you anything about how compatible that version is.
11
12Author: Colin Watson <cjwatson@debian.org>
13Bug-Debian: https://bugs.debian.org/93581
14Bug-Debian: https://bugs.debian.org/664383
15Bug-Debian: https://bugs.debian.org/732940
16Forwarded: not-needed
17Last-Update: 2014-10-07
18
19Patch-Name: no-openssl-version-status.patch
20---
21 openbsd-compat/openssl-compat.c | 6 +++---
22 openbsd-compat/regress/opensslvertest.c | 1 +
23 2 files changed, 4 insertions(+), 3 deletions(-)
24
25diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
26index 63a660c..3f62403 100644
27--- a/openbsd-compat/openssl-compat.c
28+++ b/openbsd-compat/openssl-compat.c
29@@ -36,7 +36,7 @@
30 /*
31 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
32 * We match major, minor, fix and status (not patch) for <1.0.0.
33- * After that, we acceptable compatible fix versions (so we
34+ * After that, we accept compatible fix and status versions (so we
35 * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
36 * within a patch series.
37 */
38@@ -57,10 +57,10 @@ ssh_compatible_openssl(long headerver, long libver)
39 }
40
41 /*
42- * For versions >= 1.0.0, major,minor,status must match and library
43+ * For versions >= 1.0.0, major,minor must match and library
44 * fix version must be equal to or newer than the header.
45 */
46- mask = 0xfff0000fL; /* major,minor,status */
47+ mask = 0xfff00000L; /* major,minor */
48 hfix = (headerver & 0x000ff000) >> 12;
49 lfix = (libver & 0x000ff000) >> 12;
50 if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
51diff --git a/openbsd-compat/regress/opensslvertest.c b/openbsd-compat/regress/opensslvertest.c
52index 5d019b5..5847487 100644
53--- a/openbsd-compat/regress/opensslvertest.c
54+++ b/openbsd-compat/regress/opensslvertest.c
55@@ -35,6 +35,7 @@ struct version_test {
56
57 /* built with 1.0.1b release headers */
58 { 0x1000101fL, 0x1000101fL, 1},/* exact match */
59+ { 0x1000101fL, 0x10001010L, 1}, /* different status: ok */
60 { 0x1000101fL, 0x1000102fL, 1}, /* newer library patch version: ok */
61 { 0x1000101fL, 0x1000100fL, 1}, /* older library patch version: ok */
62 { 0x1000101fL, 0x1000201fL, 1}, /* newer library fix version: ok */
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
new file mode 100644
index 000000000..95388b4a4
--- /dev/null
+++ b/debian/patches/openbsd-docs.patch
@@ -0,0 +1,148 @@
1From 5399167019a01a47c5208b0f8a6f0600b9af3bd5 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:09 +0000
4Subject: Adjust various OpenBSD-specific references in manual pages
5
6No single bug reference for this patch, but history includes:
7 http://bugs.debian.org/154434 (login.conf(5))
8 http://bugs.debian.org/513417 (/etc/rc)
9 http://bugs.debian.org/530692 (ssl(8))
10 https://bugs.launchpad.net/bugs/456660 (ssl(8))
11
12Forwarded: not-needed
13Last-Update: 2014-10-07
14
15Patch-Name: openbsd-docs.patch
16---
17 moduli.5 | 4 ++--
18 ssh-keygen.1 | 12 ++++--------
19 ssh.1 | 4 ++++
20 sshd.8 | 5 ++---
21 sshd_config.5 | 3 +--
22 5 files changed, 13 insertions(+), 15 deletions(-)
23
24diff --git a/moduli.5 b/moduli.5
25index ef0de08..149846c 100644
26--- a/moduli.5
27+++ b/moduli.5
28@@ -21,7 +21,7 @@
29 .Nd Diffie-Hellman moduli
30 .Sh DESCRIPTION
31 The
32-.Pa /etc/moduli
33+.Pa /etc/ssh/moduli
34 file contains prime numbers and generators for use by
35 .Xr sshd 8
36 in the Diffie-Hellman Group Exchange key exchange method.
37@@ -110,7 +110,7 @@ first estimates the size of the modulus required to produce enough
38 Diffie-Hellman output to sufficiently key the selected symmetric cipher.
39 .Xr sshd 8
40 then randomly selects a modulus from
41-.Fa /etc/moduli
42+.Fa /etc/ssh/moduli
43 that best meets the size requirement.
44 .Sh SEE ALSO
45 .Xr ssh-keygen 1 ,
46diff --git a/ssh-keygen.1 b/ssh-keygen.1
47index 9b93666..19bed1e 100644
48--- a/ssh-keygen.1
49+++ b/ssh-keygen.1
50@@ -174,9 +174,7 @@ key in
51 .Pa ~/.ssh/id_ed25519
52 or
53 .Pa ~/.ssh/id_rsa .
54-Additionally, the system administrator may use this to generate host keys,
55-as seen in
56-.Pa /etc/rc .
57+Additionally, the system administrator may use this to generate host keys.
58 .Pp
59 Normally this program generates the key and asks for a file in which
60 to store the private key.
61@@ -223,9 +221,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
62 for which host keys
63 do not exist, generate the host keys with the default key file path,
64 an empty passphrase, default bits for the key type, and default comment.
65-This is used by
66-.Pa /etc/rc
67-to generate new host keys.
68+This is used by system administration scripts to generate new host keys.
69 .It Fl a Ar rounds
70 When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
71 2 key when the
72@@ -638,7 +634,7 @@ option.
73 Valid generator values are 2, 3, and 5.
74 .Pp
75 Screened DH groups may be installed in
76-.Pa /etc/moduli .
77+.Pa /etc/ssh/moduli .
78 It is important that this file contains moduli of a range of bit lengths and
79 that both ends of a connection share common moduli.
80 .Sh CERTIFICATES
81@@ -837,7 +833,7 @@ on all machines
82 where the user wishes to log in using public key authentication.
83 There is no need to keep the contents of this file secret.
84 .Pp
85-.It Pa /etc/moduli
86+.It Pa /etc/ssh/moduli
87 Contains Diffie-Hellman groups used for DH-GEX.
88 The file format is described in
89 .Xr moduli 5 .
90diff --git a/ssh.1 b/ssh.1
91index c84196f..c3e1266 100644
92--- a/ssh.1
93+++ b/ssh.1
94@@ -766,6 +766,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 5afd10f..2f4d4f3 100644
107--- a/sshd.8
108+++ b/sshd.8
109@@ -67,7 +67,7 @@ over an insecure network.
110 .Nm
111 listens for connections from clients.
112 It is normally started at boot from
113-.Pa /etc/rc .
114+.Pa /etc/init.d/ssh .
115 It forks a new
116 daemon for each incoming connection.
117 The forked daemons handle
118@@ -864,7 +864,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@@ -963,7 +963,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 a5afbc3..355b445 100644
137--- a/sshd_config.5
138+++ b/sshd_config.5
139@@ -374,8 +374,7 @@ This option is only available for protocol version 2.
140 By default, no banner is displayed.
141 .It Cm ChallengeResponseAuthentication
142 Specifies whether challenge-response authentication is allowed (e.g. via
143-PAM or through authentication styles supported in
144-.Xr login.conf 5 )
145+PAM).
146 The default is
147 .Dq yes .
148 .It Cm ChrootDirectory
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
new file mode 100644
index 000000000..3113a849b
--- /dev/null
+++ b/debian/patches/package-versioning.patch
@@ -0,0 +1,65 @@
1From d0d72d370d0f02c220401029af04065c88055a4c 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 4aff104..2999061 100644
23--- a/sshconnect.c
24+++ b/sshconnect.c
25@@ -524,10 +524,10 @@ send_client_banner(int connection_out, int minor1)
26 /* Send our own protocol version identification. */
27 if (compat20) {
28 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
29- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
30+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
31 } else {
32 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
33- PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
34+ PROTOCOL_MAJOR_1, minor1, SSH_RELEASE);
35 }
36 if (roaming_atomicio(vwrite, connection_out, client_version_string,
37 strlen(client_version_string)) != strlen(client_version_string))
38diff --git a/sshd.c b/sshd.c
39index 9ff9e8b..96e75c6 100644
40--- a/sshd.c
41+++ b/sshd.c
42@@ -442,7 +442,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 b58fbe1..bff2b3b 100644
53--- a/version.h
54+++ b/version.h
55@@ -3,4 +3,9 @@
56 #define SSH_VERSION "OpenSSH_6.9"
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..ba16a9943
--- /dev/null
+++ b/debian/patches/quieter-signals.patch
@@ -0,0 +1,40 @@
1From 7c26c2f768c5d457c6645c1e1c077ba10a853626 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 964353d..65f90b8 100644
26--- a/clientloop.c
27+++ b/clientloop.c
28@@ -1720,8 +1720,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
29 exit_status = 0;
30 }
31
32- if (received_signal)
33- fatal("Killed by signal %d.", (int) received_signal);
34+ if (received_signal) {
35+ debug("Killed by signal %d.", (int) received_signal);
36+ cleanup_exit((int) received_signal + 128);
37+ }
38
39 /*
40 * In interactive mode (with pseudo tty) display a message indicating
diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch
new file mode 100644
index 000000000..9e0435313
--- /dev/null
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -0,0 +1,172 @@
1From ace4bfab52b31a2833636a243ba150fdf0f48293 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Tue, 7 Oct 2014 13:22:41 +0100
4Subject: Restore TCP wrappers support
5
6Support for TCP wrappers was dropped in OpenSSH 6.7. See this message
7and thread:
8
9 https://lists.mindrot.org/pipermail/openssh-unix-dev/2014-April/032497.html
10
11It is true that this reduces preauth attack surface in sshd. On the
12other hand, this support seems to be quite widely used, and abruptly
13dropping it (from the perspective of users who don't read
14openssh-unix-dev) could easily cause more serious problems in practice.
15
16It's not entirely clear what the right long-term answer for Debian is,
17but it at least probably doesn't involve dropping this feature shortly
18before a freeze.
19
20Forwarded: not-needed
21Last-Update: 2014-10-07
22
23Patch-Name: restore-tcp-wrappers.patch
24---
25 configure.ac | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
26 sshd.8 | 7 +++++++
27 sshd.c | 25 +++++++++++++++++++++++++
28 3 files changed, 89 insertions(+)
29
30diff --git a/configure.ac b/configure.ac
31index df21693..4d55c46 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -1448,6 +1448,62 @@ AC_ARG_WITH([skey],
35 ]
36 )
37
38+# Check whether user wants TCP wrappers support
39+TCPW_MSG="no"
40+AC_ARG_WITH([tcp-wrappers],
41+ [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)],
42+ [
43+ if test "x$withval" != "xno" ; then
44+ saved_LIBS="$LIBS"
45+ saved_LDFLAGS="$LDFLAGS"
46+ saved_CPPFLAGS="$CPPFLAGS"
47+ if test -n "${withval}" && \
48+ test "x${withval}" != "xyes"; then
49+ if test -d "${withval}/lib"; then
50+ if test -n "${need_dash_r}"; then
51+ LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
52+ else
53+ LDFLAGS="-L${withval}/lib ${LDFLAGS}"
54+ fi
55+ else
56+ if test -n "${need_dash_r}"; then
57+ LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
58+ else
59+ LDFLAGS="-L${withval} ${LDFLAGS}"
60+ fi
61+ fi
62+ if test -d "${withval}/include"; then
63+ CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
64+ else
65+ CPPFLAGS="-I${withval} ${CPPFLAGS}"
66+ fi
67+ fi
68+ LIBS="-lwrap $LIBS"
69+ AC_MSG_CHECKING([for libwrap])
70+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
71+#include <sys/types.h>
72+#include <sys/socket.h>
73+#include <netinet/in.h>
74+#include <tcpd.h>
75+int deny_severity = 0, allow_severity = 0;
76+ ]], [[
77+ hosts_access(0);
78+ ]])], [
79+ AC_MSG_RESULT([yes])
80+ AC_DEFINE([LIBWRAP], [1],
81+ [Define if you want
82+ TCP Wrappers support])
83+ SSHDLIBS="$SSHDLIBS -lwrap"
84+ TCPW_MSG="yes"
85+ ], [
86+ AC_MSG_ERROR([*** libwrap missing])
87+
88+ ])
89+ LIBS="$saved_LIBS"
90+ fi
91+ ]
92+)
93+
94 # Check whether user wants to use ldns
95 LDNS_MSG="no"
96 AC_ARG_WITH(ldns,
97@@ -4928,6 +4984,7 @@ echo " KerberosV support: $KRB5_MSG"
98 echo " SELinux support: $SELINUX_MSG"
99 echo " Smartcard support: $SCARD_MSG"
100 echo " S/KEY support: $SKEY_MSG"
101+echo " TCP Wrappers support: $TCPW_MSG"
102 echo " MD5 password support: $MD5_MSG"
103 echo " libedit support: $LIBEDIT_MSG"
104 echo " Solaris process contract support: $SPC_MSG"
105diff --git a/sshd.8 b/sshd.8
106index dcf20f0..5afd10f 100644
107--- a/sshd.8
108+++ b/sshd.8
109@@ -853,6 +853,12 @@ the user's home directory becomes accessible.
110 This file should be writable only by the user, and need not be
111 readable by anyone else.
112 .Pp
113+.It Pa /etc/hosts.allow
114+.It Pa /etc/hosts.deny
115+Access controls that should be enforced by tcp-wrappers are defined here.
116+Further details are described in
117+.Xr hosts_access 5 .
118+.Pp
119 .It Pa /etc/hosts.equiv
120 This file is for host-based authentication (see
121 .Xr ssh 1 ) .
122@@ -956,6 +962,7 @@ The content of this file is not sensitive; it can be world-readable.
123 .Xr ssh-keygen 1 ,
124 .Xr ssh-keyscan 1 ,
125 .Xr chroot 2 ,
126+.Xr hosts_access 5 ,
127 .Xr login.conf 5 ,
128 .Xr moduli 5 ,
129 .Xr sshd_config 5 ,
130diff --git a/sshd.c b/sshd.c
131index 6b85e6c..186ad55 100644
132--- a/sshd.c
133+++ b/sshd.c
134@@ -129,6 +129,13 @@
135 #include <Security/AuthSession.h>
136 #endif
137
138+#ifdef LIBWRAP
139+#include <tcpd.h>
140+#include <syslog.h>
141+int allow_severity;
142+int deny_severity;
143+#endif /* LIBWRAP */
144+
145 #ifndef O_NOCTTY
146 #define O_NOCTTY 0
147 #endif
148@@ -2141,6 +2148,24 @@ main(int ac, char **av)
149 #ifdef SSH_AUDIT_EVENTS
150 audit_connection_from(remote_ip, remote_port);
151 #endif
152+#ifdef LIBWRAP
153+ allow_severity = options.log_facility|LOG_INFO;
154+ deny_severity = options.log_facility|LOG_WARNING;
155+ /* Check whether logins are denied from this host. */
156+ if (packet_connection_is_on_socket()) {
157+ struct request_info req;
158+
159+ request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0);
160+ fromhost(&req);
161+
162+ if (!hosts_access(&req)) {
163+ debug("Connection refused by tcp wrapper");
164+ refuse(&req);
165+ /* NOTREACHED */
166+ fatal("libwrap refuse returns");
167+ }
168+ }
169+#endif /* LIBWRAP */
170
171 /* Log the connection. */
172 laddr = get_local_ipaddr(sock_in);
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
new file mode 100644
index 000000000..fcf389dec
--- /dev/null
+++ b/debian/patches/scp-quoting.patch
@@ -0,0 +1,41 @@
1From 9921536f50f50eb283dea50c77753eb0773d4258 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Nicolas=20Valc=C3=A1rcel?= <nvalcarcel@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:09:59 +0000
4Subject: Adjust scp quoting in verbose mode
5
6Tweak scp's reporting of filenames in verbose mode to be a bit less
7confusing with spaces.
8
9This should be revised to mimic real shell quoting.
10
11Bug-Ubuntu: https://bugs.launchpad.net/bugs/89945
12Last-Update: 2010-02-27
13
14Patch-Name: scp-quoting.patch
15---
16 scp.c | 12 ++++++++++--
17 1 file changed, 10 insertions(+), 2 deletions(-)
18
19diff --git a/scp.c b/scp.c
20index 593fe89..e39294e 100644
21--- a/scp.c
22+++ b/scp.c
23@@ -190,8 +190,16 @@ do_local_cmd(arglist *a)
24
25 if (verbose_mode) {
26 fprintf(stderr, "Executing:");
27- for (i = 0; i < a->num; i++)
28- fprintf(stderr, " %s", a->list[i]);
29+ for (i = 0; i < a->num; i++) {
30+ if (i == 0)
31+ fprintf(stderr, " %s", a->list[i]);
32+ else
33+ /*
34+ * TODO: misbehaves if a->list[i] contains a
35+ * single quote
36+ */
37+ fprintf(stderr, " '%s'", a->list[i]);
38+ }
39 fprintf(stderr, "\n");
40 }
41 if ((pid = fork()) == -1)
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
new file mode 100644
index 000000000..617aa3b11
--- /dev/null
+++ b/debian/patches/selinux-role.patch
@@ -0,0 +1,504 @@
1From 8b3e4a6ddad01fef62d153ac3b033de61a02696e Mon Sep 17 00:00:00 2001
2From: Manoj Srivastava <srivasta@debian.org>
3Date: Sun, 9 Feb 2014 16:09:49 +0000
4Subject: Handle SELinux authorisation roles
5
6Rejected upstream due to discomfort with magic usernames; a better approach
7will need an SSH protocol change. In the meantime, this came from Debian's
8SELinux maintainer, so we'll keep it until we have something better.
9
10Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1641
11Bug-Debian: http://bugs.debian.org/394795
12Last-Update: 2015-08-19
13
14Patch-Name: selinux-role.patch
15---
16 auth.h | 1 +
17 auth1.c | 8 +++++++-
18 auth2.c | 10 ++++++++--
19 monitor.c | 32 +++++++++++++++++++++++++++++---
20 monitor.h | 2 ++
21 monitor_wrap.c | 22 ++++++++++++++++++++--
22 monitor_wrap.h | 3 ++-
23 openbsd-compat/port-linux.c | 27 ++++++++++++++++++++-------
24 openbsd-compat/port-linux.h | 4 ++--
25 platform.c | 4 ++--
26 platform.h | 2 +-
27 session.c | 10 +++++-----
28 session.h | 2 +-
29 sshd.c | 2 +-
30 sshpty.c | 4 ++--
31 sshpty.h | 2 +-
32 16 files changed, 104 insertions(+), 31 deletions(-)
33
34diff --git a/auth.h b/auth.h
35index 8b27575..3c2222f 100644
36--- a/auth.h
37+++ b/auth.h
38@@ -62,6 +62,7 @@ struct Authctxt {
39 char *service;
40 struct passwd *pw; /* set if 'valid' */
41 char *style;
42+ char *role;
43 void *kbdintctxt;
44 char *info; /* Extra info for next auth_log */
45 #ifdef BSD_AUTH
46diff --git a/auth1.c b/auth1.c
47index 5073c49..dd00648 100644
48--- a/auth1.c
49+++ b/auth1.c
50@@ -383,7 +383,7 @@ void
51 do_authentication(Authctxt *authctxt)
52 {
53 u_int ulen;
54- char *user, *style = NULL;
55+ char *user, *style = NULL, *role = NULL;
56
57 /* Get the name of the user that we wish to log in as. */
58 packet_read_expect(SSH_CMSG_USER);
59@@ -392,11 +392,17 @@ do_authentication(Authctxt *authctxt)
60 user = packet_get_cstring(&ulen);
61 packet_check_eom();
62
63+ if ((role = strchr(user, '/')) != NULL)
64+ *role++ = '\0';
65+
66 if ((style = strchr(user, ':')) != NULL)
67 *style++ = '\0';
68+ else if (role && (style = strchr(role, ':')) != NULL)
69+ *style++ = '\0';
70
71 authctxt->user = user;
72 authctxt->style = style;
73+ authctxt->role = role;
74
75 /* Verify that the user is a valid user. */
76 if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL)
77diff --git a/auth2.c b/auth2.c
78index 3f49bdc..6eb3cc7 100644
79--- a/auth2.c
80+++ b/auth2.c
81@@ -216,7 +216,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
82 {
83 Authctxt *authctxt = ctxt;
84 Authmethod *m = NULL;
85- char *user, *service, *method, *style = NULL;
86+ char *user, *service, *method, *style = NULL, *role = NULL;
87 int authenticated = 0;
88
89 if (authctxt == NULL)
90@@ -228,8 +228,13 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
91 debug("userauth-request for user %s service %s method %s", user, service, method);
92 debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
93
94+ if ((role = strchr(user, '/')) != NULL)
95+ *role++ = 0;
96+
97 if ((style = strchr(user, ':')) != NULL)
98 *style++ = 0;
99+ else if (role && (style = strchr(role, ':')) != NULL)
100+ *style++ = '\0';
101
102 if (authctxt->attempt++ == 0) {
103 /* setup auth context */
104@@ -253,8 +258,9 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
105 use_privsep ? " [net]" : "");
106 authctxt->service = xstrdup(service);
107 authctxt->style = style ? xstrdup(style) : NULL;
108+ authctxt->role = role ? xstrdup(role) : NULL;
109 if (use_privsep)
110- mm_inform_authserv(service, style);
111+ mm_inform_authserv(service, style, role);
112 userauth_banner();
113 if (auth2_setup_methods_lists(authctxt) != 0)
114 packet_disconnect("no authentication methods enabled");
115diff --git a/monitor.c b/monitor.c
116index bdc2972..3a3d2f0 100644
117--- a/monitor.c
118+++ b/monitor.c
119@@ -127,6 +127,7 @@ int mm_answer_sign(int, Buffer *);
120 int mm_answer_pwnamallow(int, Buffer *);
121 int mm_answer_auth2_read_banner(int, Buffer *);
122 int mm_answer_authserv(int, Buffer *);
123+int mm_answer_authrole(int, Buffer *);
124 int mm_answer_authpassword(int, Buffer *);
125 int mm_answer_bsdauthquery(int, Buffer *);
126 int mm_answer_bsdauthrespond(int, Buffer *);
127@@ -208,6 +209,7 @@ struct mon_table mon_dispatch_proto20[] = {
128 {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
129 {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
130 {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
131+ {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
132 {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
133 {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
134 #ifdef USE_PAM
135@@ -879,6 +881,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
136 else {
137 /* Allow service/style information on the auth context */
138 monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
139+ monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
140 monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
141 }
142 #ifdef USE_PAM
143@@ -909,14 +912,37 @@ mm_answer_authserv(int sock, Buffer *m)
144
145 authctxt->service = buffer_get_string(m, NULL);
146 authctxt->style = buffer_get_string(m, NULL);
147- debug3("%s: service=%s, style=%s",
148- __func__, authctxt->service, authctxt->style);
149+ authctxt->role = buffer_get_string(m, NULL);
150+ debug3("%s: service=%s, style=%s, role=%s",
151+ __func__, authctxt->service, authctxt->style, authctxt->role);
152
153 if (strlen(authctxt->style) == 0) {
154 free(authctxt->style);
155 authctxt->style = NULL;
156 }
157
158+ if (strlen(authctxt->role) == 0) {
159+ free(authctxt->role);
160+ authctxt->role = NULL;
161+ }
162+
163+ return (0);
164+}
165+
166+int
167+mm_answer_authrole(int sock, Buffer *m)
168+{
169+ monitor_permit_authentications(1);
170+
171+ authctxt->role = buffer_get_string(m, NULL);
172+ debug3("%s: role=%s",
173+ __func__, authctxt->role);
174+
175+ if (strlen(authctxt->role) == 0) {
176+ free(authctxt->role);
177+ authctxt->role = NULL;
178+ }
179+
180 return (0);
181 }
182
183@@ -1544,7 +1570,7 @@ mm_answer_pty(int sock, Buffer *m)
184 res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
185 if (res == 0)
186 goto error;
187- pty_setowner(authctxt->pw, s->tty);
188+ pty_setowner(authctxt->pw, s->tty, authctxt->role);
189
190 buffer_put_int(m, 1);
191 buffer_put_cstring(m, s->tty);
192diff --git a/monitor.h b/monitor.h
193index bc50ade..2d82b8b 100644
194--- a/monitor.h
195+++ b/monitor.h
196@@ -68,6 +68,8 @@ enum monitor_reqtype {
197 MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
198 MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
199
200+ MONITOR_REQ_AUTHROLE = 154,
201+
202 };
203
204 struct mm_master;
205diff --git a/monitor_wrap.c b/monitor_wrap.c
206index 71e7c08..6ae72a0 100644
207--- a/monitor_wrap.c
208+++ b/monitor_wrap.c
209@@ -327,10 +327,10 @@ mm_auth2_read_banner(void)
210 return (banner);
211 }
212
213-/* Inform the privileged process about service and style */
214+/* Inform the privileged process about service, style, and role */
215
216 void
217-mm_inform_authserv(char *service, char *style)
218+mm_inform_authserv(char *service, char *style, char *role)
219 {
220 Buffer m;
221
222@@ -339,12 +339,30 @@ mm_inform_authserv(char *service, char *style)
223 buffer_init(&m);
224 buffer_put_cstring(&m, service);
225 buffer_put_cstring(&m, style ? style : "");
226+ buffer_put_cstring(&m, role ? role : "");
227
228 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHSERV, &m);
229
230 buffer_free(&m);
231 }
232
233+/* Inform the privileged process about role */
234+
235+void
236+mm_inform_authrole(char *role)
237+{
238+ Buffer m;
239+
240+ debug3("%s entering", __func__);
241+
242+ buffer_init(&m);
243+ buffer_put_cstring(&m, role ? role : "");
244+
245+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m);
246+
247+ buffer_free(&m);
248+}
249+
250 /* Do the password authentication */
251 int
252 mm_auth_password(Authctxt *authctxt, char *password)
253diff --git a/monitor_wrap.h b/monitor_wrap.h
254index 9758290..57e740f 100644
255--- a/monitor_wrap.h
256+++ b/monitor_wrap.h
257@@ -41,7 +41,8 @@ void mm_log_handler(LogLevel, const char *, void *);
258 int mm_is_monitor(void);
259 DH *mm_choose_dh(int, int, int);
260 int mm_key_sign(Key *, u_char **, u_int *, const u_char *, u_int);
261-void mm_inform_authserv(char *, char *);
262+void mm_inform_authserv(char *, char *, char *);
263+void mm_inform_authrole(char *);
264 struct passwd *mm_getpwnamallow(const char *);
265 char *mm_auth2_read_banner(void);
266 int mm_auth_password(struct Authctxt *, char *);
267diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
268index 4637a7a..de6ad3f 100644
269--- a/openbsd-compat/port-linux.c
270+++ b/openbsd-compat/port-linux.c
271@@ -29,6 +29,12 @@
272 #include <string.h>
273 #include <stdio.h>
274
275+#ifdef WITH_SELINUX
276+#include "key.h"
277+#include "hostfile.h"
278+#include "auth.h"
279+#endif
280+
281 #include "log.h"
282 #include "xmalloc.h"
283 #include "port-linux.h"
284@@ -58,7 +64,7 @@ ssh_selinux_enabled(void)
285
286 /* Return the default security context for the given username */
287 static security_context_t
288-ssh_selinux_getctxbyname(char *pwname)
289+ssh_selinux_getctxbyname(char *pwname, const char *role)
290 {
291 security_context_t sc = NULL;
292 char *sename = NULL, *lvl = NULL;
293@@ -73,9 +79,16 @@ ssh_selinux_getctxbyname(char *pwname)
294 #endif
295
296 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
297- r = get_default_context_with_level(sename, lvl, NULL, &sc);
298+ if (role != NULL && role[0])
299+ r = get_default_context_with_rolelevel(sename, role, lvl, NULL,
300+ &sc);
301+ else
302+ r = get_default_context_with_level(sename, lvl, NULL, &sc);
303 #else
304- r = get_default_context(sename, NULL, &sc);
305+ if (role != NULL && role[0])
306+ r = get_default_context_with_role(sename, role, NULL, &sc);
307+ else
308+ r = get_default_context(sename, NULL, &sc);
309 #endif
310
311 if (r != 0) {
312@@ -105,7 +118,7 @@ ssh_selinux_getctxbyname(char *pwname)
313
314 /* Set the execution context to the default for the specified user */
315 void
316-ssh_selinux_setup_exec_context(char *pwname)
317+ssh_selinux_setup_exec_context(char *pwname, const char *role)
318 {
319 security_context_t user_ctx = NULL;
320
321@@ -114,7 +127,7 @@ ssh_selinux_setup_exec_context(char *pwname)
322
323 debug3("%s: setting execution context", __func__);
324
325- user_ctx = ssh_selinux_getctxbyname(pwname);
326+ user_ctx = ssh_selinux_getctxbyname(pwname, role);
327 if (setexeccon(user_ctx) != 0) {
328 switch (security_getenforce()) {
329 case -1:
330@@ -136,7 +149,7 @@ ssh_selinux_setup_exec_context(char *pwname)
331
332 /* Set the TTY context for the specified user */
333 void
334-ssh_selinux_setup_pty(char *pwname, const char *tty)
335+ssh_selinux_setup_pty(char *pwname, const char *tty, const char *role)
336 {
337 security_context_t new_tty_ctx = NULL;
338 security_context_t user_ctx = NULL;
339@@ -147,7 +160,7 @@ ssh_selinux_setup_pty(char *pwname, const char *tty)
340
341 debug3("%s: setting TTY context on %s", __func__, tty);
342
343- user_ctx = ssh_selinux_getctxbyname(pwname);
344+ user_ctx = ssh_selinux_getctxbyname(pwname, role);
345
346 /* XXX: should these calls fatal() upon failure in enforcing mode? */
347
348diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
349index e3d1004..80ce13a 100644
350--- a/openbsd-compat/port-linux.h
351+++ b/openbsd-compat/port-linux.h
352@@ -21,8 +21,8 @@
353
354 #ifdef WITH_SELINUX
355 int ssh_selinux_enabled(void);
356-void ssh_selinux_setup_pty(char *, const char *);
357-void ssh_selinux_setup_exec_context(char *);
358+void ssh_selinux_setup_pty(char *, const char *, const char *);
359+void ssh_selinux_setup_exec_context(char *, const char *);
360 void ssh_selinux_change_context(const char *);
361 void ssh_selinux_setfscreatecon(const char *);
362 #endif
363diff --git a/platform.c b/platform.c
364index ee313da..f35ec39 100644
365--- a/platform.c
366+++ b/platform.c
367@@ -143,7 +143,7 @@ platform_setusercontext(struct passwd *pw)
368 * called if sshd is running as root.
369 */
370 void
371-platform_setusercontext_post_groups(struct passwd *pw)
372+platform_setusercontext_post_groups(struct passwd *pw, const char *role)
373 {
374 #if !defined(HAVE_LOGIN_CAP) && defined(USE_PAM)
375 /*
376@@ -184,7 +184,7 @@ platform_setusercontext_post_groups(struct passwd *pw)
377 }
378 #endif /* HAVE_SETPCRED */
379 #ifdef WITH_SELINUX
380- ssh_selinux_setup_exec_context(pw->pw_name);
381+ ssh_selinux_setup_exec_context(pw->pw_name, role);
382 #endif
383 }
384
385diff --git a/platform.h b/platform.h
386index 1c7a45d..436ae7c 100644
387--- a/platform.h
388+++ b/platform.h
389@@ -27,7 +27,7 @@ void platform_post_fork_parent(pid_t child_pid);
390 void platform_post_fork_child(void);
391 int platform_privileged_uidswap(void);
392 void platform_setusercontext(struct passwd *);
393-void platform_setusercontext_post_groups(struct passwd *);
394+void platform_setusercontext_post_groups(struct passwd *, const char *);
395 char *platform_get_krb5_client(const char *);
396 char *platform_krb5_get_principal_name(const char *);
397 int platform_sys_dir_uid(uid_t);
398diff --git a/session.c b/session.c
399index 5a64715..afac4a5 100644
400--- a/session.c
401+++ b/session.c
402@@ -1487,7 +1487,7 @@ safely_chroot(const char *path, uid_t uid)
403
404 /* Set login name, uid, gid, and groups. */
405 void
406-do_setusercontext(struct passwd *pw)
407+do_setusercontext(struct passwd *pw, const char *role)
408 {
409 char *chroot_path, *tmp;
410 #ifdef USE_LIBIAF
411@@ -1518,7 +1518,7 @@ do_setusercontext(struct passwd *pw)
412 endgrent();
413 #endif
414
415- platform_setusercontext_post_groups(pw);
416+ platform_setusercontext_post_groups(pw, role);
417
418 if (options.chroot_directory != NULL &&
419 strcasecmp(options.chroot_directory, "none") != 0) {
420@@ -1677,7 +1677,7 @@ do_child(Session *s, const char *command)
421
422 /* Force a password change */
423 if (s->authctxt->force_pwchange) {
424- do_setusercontext(pw);
425+ do_setusercontext(pw, s->authctxt->role);
426 child_close_fds();
427 do_pwchange(s);
428 exit(1);
429@@ -1704,7 +1704,7 @@ do_child(Session *s, const char *command)
430 /* When PAM is enabled we rely on it to do the nologin check */
431 if (!options.use_pam)
432 do_nologin(pw);
433- do_setusercontext(pw);
434+ do_setusercontext(pw, s->authctxt->role);
435 /*
436 * PAM session modules in do_setusercontext may have
437 * generated messages, so if this in an interactive
438@@ -2115,7 +2115,7 @@ session_pty_req(Session *s)
439 tty_parse_modes(s->ttyfd, &n_bytes);
440
441 if (!use_privsep)
442- pty_setowner(s->pw, s->tty);
443+ pty_setowner(s->pw, s->tty, s->authctxt->role);
444
445 /* Set window size from the packet. */
446 pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
447diff --git a/session.h b/session.h
448index 6a2f35e..ef6593c 100644
449--- a/session.h
450+++ b/session.h
451@@ -77,7 +77,7 @@ void session_pty_cleanup2(Session *);
452 Session *session_new(void);
453 Session *session_by_tty(char *);
454 void session_close(Session *);
455-void do_setusercontext(struct passwd *);
456+void do_setusercontext(struct passwd *, const char *);
457 void child_set_env(char ***envp, u_int *envsizep, const char *name,
458 const char *value);
459
460diff --git a/sshd.c b/sshd.c
461index 186ad55..9ff9e8b 100644
462--- a/sshd.c
463+++ b/sshd.c
464@@ -781,7 +781,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 7bb7641..0e32b39 100644
475--- a/sshpty.c
476+++ b/sshpty.c
477@@ -187,7 +187,7 @@ pty_change_window_size(int ptyfd, u_int row, u_int col,
478 }
479
480 void
481-pty_setowner(struct passwd *pw, const char *tty)
482+pty_setowner(struct passwd *pw, const char *tty, const char *role)
483 {
484 struct group *grp;
485 gid_t gid;
486@@ -209,7 +209,7 @@ pty_setowner(struct passwd *pw, const char *tty)
487 strerror(errno));
488
489 #ifdef WITH_SELINUX
490- ssh_selinux_setup_pty(pw->pw_name, tty);
491+ ssh_selinux_setup_pty(pw->pw_name, tty, role);
492 #endif
493
494 if (st.st_uid != pw->pw_uid || st.st_gid != gid) {
495diff --git a/sshpty.h b/sshpty.h
496index cfa3224..edf2436 100644
497--- a/sshpty.h
498+++ b/sshpty.h
499@@ -24,4 +24,4 @@ int pty_allocate(int *, int *, char *, size_t);
500 void pty_release(const char *);
501 void pty_make_controlling_tty(int *, const char *);
502 void pty_change_window_size(int, u_int, u_int, u_int, u_int);
503-void pty_setowner(struct passwd *, const char *);
504+void pty_setowner(struct passwd *, const char *, const char *);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..15c939708
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,34 @@
1gssapi.patch
2restore-tcp-wrappers.patch
3selinux-role.patch
4ssh-vulnkey-compat.patch
5ssh1-keepalive.patch
6keepalive-extensions.patch
7syslog-level-silent.patch
8quieter-signals.patch
9helpful-wait-terminate.patch
10consolekit.patch
11user-group-modes.patch
12scp-quoting.patch
13shell-path.patch
14dnssec-sshfp.patch
15auth-log-verbosity.patch
16mention-ssh-keygen-on-keychange.patch
17package-versioning.patch
18debian-banner.patch
19authorized-keys-man-symlink.patch
20lintian-symlink-pickiness.patch
21openbsd-docs.patch
22ssh-argv0.patch
23doc-hash-tab-completion.patch
24doc-upstart.patch
25ssh-agent-setgid.patch
26no-openssl-version-status.patch
27gnome-ssh-askpass2-icon.patch
28sigstop.patch
29debian-config.patch
30backport-fix-pty-permissions.patch
31backport-do-not-resend-username-to-pam.patch
32backport-pam-use-after-free.patch
33backport-kbdint-duplicates.patch
34backport-regress-principals-command-noexec.patch
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
new file mode 100644
index 000000000..c12d86132
--- /dev/null
+++ b/debian/patches/shell-path.patch
@@ -0,0 +1,39 @@
1From 865180de0e7d4735170faac2d584603fbe0530b2 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 f41960c..8adc943 100644
20--- a/sshconnect.c
21+++ b/sshconnect.c
22@@ -231,7 +231,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
23 /* Execute the proxy command. Note that we gave up any
24 extra privileges above. */
25 signal(SIGPIPE, SIG_DFL);
26- execv(argv[0], argv);
27+ execvp(argv[0], argv);
28 perror(argv[0]);
29 exit(1);
30 }
31@@ -1471,7 +1471,7 @@ ssh_local_cmd(const char *args)
32 if (pid == 0) {
33 signal(SIGPIPE, SIG_DFL);
34 debug3("Executing %s -c \"%s\"", shell, args);
35- execl(shell, shell, "-c", args, (char *)NULL);
36+ execlp(shell, shell, "-c", args, (char *)NULL);
37 error("Couldn't execute %s -c \"%s\": %s",
38 shell, args, strerror(errno));
39 _exit(1);
diff --git a/debian/patches/sigstop.patch b/debian/patches/sigstop.patch
new file mode 100644
index 000000000..2cd40273c
--- /dev/null
+++ b/debian/patches/sigstop.patch
@@ -0,0 +1,35 @@
1From ef16932c23264c749f4b02af34dbd62a2075c04f Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:17 +0000
4Subject: Support synchronisation with service supervisor using SIGSTOP
5
6Author: Robie Basak <robie.basak@ubuntu.com>
7Forwarded: no
8Last-Update: 2014-04-14
9
10Patch-Name: sigstop.patch
11---
12 sshd.c | 10 ++++++++++
13 1 file changed, 10 insertions(+)
14
15diff --git a/sshd.c b/sshd.c
16index 7886d0e..cc8ecaf 100644
17--- a/sshd.c
18+++ b/sshd.c
19@@ -2038,6 +2038,16 @@ main(int ac, char **av)
20 }
21 }
22
23+ if (getenv("SSH_SIGSTOP")) {
24+ /* Tell service supervisor that we are ready. */
25+ kill(getpid(), SIGSTOP);
26+ /* The service supervisor only ever expects a single
27+ * STOP signal, so do not ever signal it again, even
28+ * in the case of a re-exec or future children.
29+ */
30+ unsetenv("SSH_SIGSTOP");
31+ }
32+
33 /* Accept a connection and return in a forked child */
34 server_accept_loop(&sock_in, &sock_out,
35 &newsock, config_s);
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
new file mode 100644
index 000000000..5119e1b27
--- /dev/null
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -0,0 +1,40 @@
1From 991a1f68f57fd602f65b4ac936daf2695be33b21 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:13 +0000
4Subject: Document consequences of ssh-agent being setgid in ssh-agent(1)
5
6Bug-Debian: http://bugs.debian.org/711623
7Forwarded: no
8Last-Update: 2013-06-08
9
10Patch-Name: ssh-agent-setgid.patch
11---
12 ssh-agent.1 | 15 +++++++++++++++
13 1 file changed, 15 insertions(+)
14
15diff --git a/ssh-agent.1 b/ssh-agent.1
16index d0aa712..2a940d9 100644
17--- a/ssh-agent.1
18+++ b/ssh-agent.1
19@@ -186,6 +186,21 @@ environment variable holds the agent's process ID.
20 .Pp
21 The agent exits automatically when the command given on the command
22 line terminates.
23+.Pp
24+In Debian,
25+.Nm
26+is installed with the set-group-id bit set, to prevent
27+.Xr ptrace 2
28+attacks retrieving private key material.
29+This has the side-effect of causing the run-time linker to remove certain
30+environment variables which might have security implications for set-id
31+programs, including
32+.Ev LD_PRELOAD ,
33+.Ev LD_LIBRARY_PATH ,
34+and
35+.Ev TMPDIR .
36+If you need to set any of these environment variables, you will need to do
37+so in the program executed by ssh-agent.
38 .Sh FILES
39 .Bl -tag -width Ds
40 .It Pa $TMPDIR/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt
diff --git a/debian/patches/ssh-argv0.patch b/debian/patches/ssh-argv0.patch
new file mode 100644
index 000000000..819d1ef02
--- /dev/null
+++ b/debian/patches/ssh-argv0.patch
@@ -0,0 +1,31 @@
1From e3a11cda4f8bc5da2388c9446ed8bc1a18acd2e6 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 c3e1266..2178863 100644
22--- a/ssh.1
23+++ b/ssh.1
24@@ -1487,6 +1487,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..7af91e955
--- /dev/null
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -0,0 +1,42 @@
1From dd02db02d322c9db67d42fe491727854f951c828 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 68dac76..85eea48 100644
21--- a/readconf.c
22+++ b/readconf.c
23@@ -180,6 +180,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 2f7f41e..8a5bd7b 100644
33--- a/servconf.c
34+++ b/servconf.c
35@@ -510,6 +510,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..48308bcff
--- /dev/null
+++ b/debian/patches/ssh1-keepalive.patch
@@ -0,0 +1,74 @@
1From b3d7661669a0f5255ede81f82c25951aeba9576c 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 77d5498..964353d 100644
17--- a/clientloop.c
18+++ b/clientloop.c
19@@ -577,16 +577,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@@ -648,7 +653,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 b840261..f7510b6 100644
61--- a/ssh_config.5
62+++ b/ssh_config.5
63@@ -1414,7 +1414,10 @@ If, for example,
64 .Cm ServerAliveCountMax
65 is left at the default, if the server becomes unresponsive,
66 ssh will disconnect after approximately 45 seconds.
67-This option applies to protocol version 2 only.
68+This option applies to protocol version 2 only; in protocol version
69+1 there is no mechanism to request a response from the server to the
70+server alive messages, so disconnection is the responsibility of the TCP
71+stack.
72 .It Cm ServerAliveInterval
73 Sets a timeout interval in seconds after which if no data has been received
74 from the server,
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
new file mode 100644
index 000000000..e829e50fd
--- /dev/null
+++ b/debian/patches/syslog-level-silent.patch
@@ -0,0 +1,47 @@
1From 9e6bb8525886d99876eb43a3b39c96bdf3032146 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 3fd5a94..d99f7ef 100644
37--- a/ssh.c
38+++ b/ssh.c
39@@ -1105,7 +1105,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..9213c1f29
--- /dev/null
+++ b/debian/patches/user-group-modes.patch
@@ -0,0 +1,266 @@
1From 209c51110996719eab04236d72f776eed6bd8226 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:09:58 +0000
4Subject: Allow harmless group-writability
5
6Allow secure files (~/.ssh/config, ~/.ssh/authorized_keys, etc.) to be
7group-writable, provided that the group in question contains only the file's
8owner. Rejected upstream for IMO incorrect reasons (e.g. a misunderstanding
9about the contents of gr->gr_mem). Given that per-user groups and umask 002
10are the default setup in Debian (for good reasons - this makes operating in
11setgid directories with other groups much easier), we need to permit this by
12default.
13
14Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060
15Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347
16Last-Update: 2013-09-14
17
18Patch-Name: user-group-modes.patch
19---
20 auth-rhosts.c | 6 ++----
21 auth.c | 9 +++-----
22 misc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
23 misc.h | 2 ++
24 platform.c | 16 --------------
25 readconf.c | 5 +++--
26 ssh.1 | 2 ++
27 ssh_config.5 | 2 ++
28 8 files changed, 82 insertions(+), 29 deletions(-)
29
30diff --git a/auth-rhosts.c b/auth-rhosts.c
31index ee9e827..2ff2cff 100644
32--- a/auth-rhosts.c
33+++ b/auth-rhosts.c
34@@ -271,8 +271,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
35 return 0;
36 }
37 if (options.strict_modes &&
38- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
39- (st.st_mode & 022) != 0)) {
40+ !secure_permissions(&st, pw->pw_uid)) {
41 logit("Rhosts authentication refused for %.100s: "
42 "bad ownership or modes for home directory.", pw->pw_name);
43 auth_debug_add("Rhosts authentication refused for %.100s: "
44@@ -298,8 +297,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
45 * allowing access to their account by anyone.
46 */
47 if (options.strict_modes &&
48- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
49- (st.st_mode & 022) != 0)) {
50+ !secure_permissions(&st, pw->pw_uid)) {
51 logit("Rhosts authentication refused for %.100s: bad modes for %.200s",
52 pw->pw_name, buf);
53 auth_debug_add("Bad file modes for %.200s", buf);
54diff --git a/auth.c b/auth.c
55index e6c094d..a99c475 100644
56--- a/auth.c
57+++ b/auth.c
58@@ -422,8 +422,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@@ -485,8 +484,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@@ -501,8 +499,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
79 strlcpy(buf, cp, sizeof(buf));
80
81 if (stat(buf, &st) < 0 ||
82- (!platform_sys_dir_uid(st.st_uid) && st.st_uid != uid) ||
83- (st.st_mode & 022) != 0) {
84+ !secure_permissions(&st, uid)) {
85 snprintf(err, errlen,
86 "bad ownership or modes for directory %s", buf);
87 return -1;
88diff --git a/misc.c b/misc.c
89index ddd2b2d..1c063ea 100644
90--- a/misc.c
91+++ b/misc.c
92@@ -50,8 +50,9 @@
93 #include <netdb.h>
94 #ifdef HAVE_PATHS_H
95 # include <paths.h>
96-#include <pwd.h>
97 #endif
98+#include <pwd.h>
99+#include <grp.h>
100 #ifdef SSH_TUN_OPENBSD
101 #include <net/if.h>
102 #endif
103@@ -60,6 +61,7 @@
104 #include "misc.h"
105 #include "log.h"
106 #include "ssh.h"
107+#include "platform.h"
108
109 /* remove newline at end of string */
110 char *
111@@ -644,6 +646,71 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
112 return -1;
113 }
114
115+/*
116+ * return 1 if the specified uid is a uid that may own a system directory
117+ * otherwise 0.
118+ */
119+int
120+platform_sys_dir_uid(uid_t uid)
121+{
122+ if (uid == 0)
123+ return 1;
124+#ifdef PLATFORM_SYS_DIR_UID
125+ if (uid == PLATFORM_SYS_DIR_UID)
126+ return 1;
127+#endif
128+ return 0;
129+}
130+
131+int
132+secure_permissions(struct stat *st, uid_t uid)
133+{
134+ if (!platform_sys_dir_uid(st->st_uid) && st->st_uid != uid)
135+ return 0;
136+ if ((st->st_mode & 002) != 0)
137+ return 0;
138+ if ((st->st_mode & 020) != 0) {
139+ /* If the file is group-writable, the group in question must
140+ * have exactly one member, namely the file's owner.
141+ * (Zero-member groups are typically used by setgid
142+ * binaries, and are unlikely to be suitable.)
143+ */
144+ struct passwd *pw;
145+ struct group *gr;
146+ int members = 0;
147+
148+ gr = getgrgid(st->st_gid);
149+ if (!gr)
150+ return 0;
151+
152+ /* Check primary group memberships. */
153+ while ((pw = getpwent()) != NULL) {
154+ if (pw->pw_gid == gr->gr_gid) {
155+ ++members;
156+ if (pw->pw_uid != uid)
157+ return 0;
158+ }
159+ }
160+ endpwent();
161+
162+ pw = getpwuid(st->st_uid);
163+ if (!pw)
164+ return 0;
165+
166+ /* Check supplementary group memberships. */
167+ if (gr->gr_mem[0]) {
168+ ++members;
169+ if (strcmp(pw->pw_name, gr->gr_mem[0]) ||
170+ gr->gr_mem[1])
171+ return 0;
172+ }
173+
174+ if (!members)
175+ return 0;
176+ }
177+ return 1;
178+}
179+
180 int
181 tun_open(int tun, int mode)
182 {
183diff --git a/misc.h b/misc.h
184index 374c33c..89e1f75 100644
185--- a/misc.h
186+++ b/misc.h
187@@ -135,4 +135,6 @@ char *read_passphrase(const char *, int);
188 int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
189 int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
190
191+int secure_permissions(struct stat *st, uid_t uid);
192+
193 #endif /* _MISC_H */
194diff --git a/platform.c b/platform.c
195index f35ec39..9a23e6e 100644
196--- a/platform.c
197+++ b/platform.c
198@@ -197,19 +197,3 @@ platform_krb5_get_principal_name(const char *pw_name)
199 return NULL;
200 #endif
201 }
202-
203-/*
204- * return 1 if the specified uid is a uid that may own a system directory
205- * otherwise 0.
206- */
207-int
208-platform_sys_dir_uid(uid_t uid)
209-{
210- if (uid == 0)
211- return 1;
212-#ifdef PLATFORM_SYS_DIR_UID
213- if (uid == PLATFORM_SYS_DIR_UID)
214- return 1;
215-#endif
216- return 0;
217-}
218diff --git a/readconf.c b/readconf.c
219index 5c5890c..5f6c37f 100644
220--- a/readconf.c
221+++ b/readconf.c
222@@ -39,6 +39,8 @@
223 #include <stdio.h>
224 #include <string.h>
225 #include <unistd.h>
226+#include <pwd.h>
227+#include <grp.h>
228 #ifdef HAVE_UTIL_H
229 #include <util.h>
230 #endif
231@@ -1579,8 +1581,7 @@ read_config_file(const char *filename, struct passwd *pw, const char *host,
232
233 if (fstat(fileno(f), &sb) == -1)
234 fatal("fstat %s: %s", filename, strerror(errno));
235- if (((sb.st_uid != 0 && sb.st_uid != getuid()) ||
236- (sb.st_mode & 022) != 0))
237+ if (!secure_permissions(&sb, getuid()))
238 fatal("Bad owner or permissions on %s", filename);
239 }
240
241diff --git a/ssh.1 b/ssh.1
242index df7ac86..c84196f 100644
243--- a/ssh.1
244+++ b/ssh.1
245@@ -1371,6 +1371,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 21d3e94..1d0c52b 100644
256--- a/ssh_config.5
257+++ b/ssh_config.5
258@@ -1706,6 +1706,8 @@ The format of this file is described above.
259 This file is used by the SSH client.
260 Because of the potential for abuse, this file must have strict permissions:
261 read/write for the user, and not accessible by others.
262+It may be group-writable provided that the group in question contains only
263+the user.
264 .It Pa /etc/ssh/ssh_config
265 Systemwide configuration file.
266 This file provides defaults for those
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 000000000..c619f3451
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
[type: gettext/rfc822deb] openssh-server.templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 000000000..2e0eae079
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,55 @@
1# Czech PO debconf template translation of openssh.
2# Copyright (C) 2014 Michal Simunek <michal.simunek@gmail.com>
3# This file is distributed under the same license as the openssh package.
4# Michal Simunek <michal.simunek@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh 1:6.6p1-1\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-06-12 12:25+0200\n"
12"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
13"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
14"Language: cs\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=utf-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "Zakázat ověřování heslem pro uživatele root?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin without-password\", which disables password authentication "
32"for root without breaking systems that have explicitly configured SSH public "
33"key authentication for root."
34msgstr ""
35"Předchozí verze openssh-server dovolovala přihlašovat se přes SSH jako root "
36"pomocí ověřování heslem. Výchozí volba pro nové instalace je nyní "
37"\"PermitRootLogin without-password\", která zakazuje ověřování heslem pro "
38"uživatele root, aniž by to omezilo systémy, které mají explicitně nastaveno "
39"ověřování veřejným SSH klíčem pro uživatele root."
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"Tato změna činí systémy zabezpečenějšími proti útokům hrubou silou na heslo "
52"uživatele root pomocí slovníku (velmi častý cíl útoků). Nicméně, to může "
53"poškodit systémy, které jsou nastaveny s předpokladem, že bude možné se "
54"přihlašovat přes SSH jako root pomocí ověřování heslem. Změnu této volby "
55"byste měli provést pouze pokud ověřování heslem potřebujete."
diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644
index 000000000..403a7077d
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,55 @@
1# Danish translation openssh.
2# Copyright (C) 2014 openssh og nedenstående oversættere.
3# This file is distributed under the same license as the openssh package.
4# Joe Hansen <joedalton2@yahoo.dk>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-21 23:51+0200\n"
12"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
13"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
14"Language: da\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "Deaktiver SSH-adgangskodegodkendelse for root?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin without-password\", which disables password authentication "
32"for root without breaking systems that have explicitly configured SSH public "
33"key authentication for root."
34msgstr ""
35"Tidligere versioner af openssh-server tillod indlogning som root over SSH "
36"med brug af adgangskodegodkendelse. Standarden for nye installationer er nu "
37"»PermitRootLogin without-password«, som deaktiverer adgangskodegodkendelse "
38"for root uden at ødelægge systemer, som eksplicit har konfigureret SSH-"
39"offentlig nøglegodkendelse for root."
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"Denne ændring gør systemer mere sikre mod brute-force angreb vis ordlister "
52"med adgangskoder på root-brugeren (et meget ofte mål for sådanne angreb). "
53"Det kan dog ødelægge systemer, som er opsat med forventning om at kunne SSH "
54"som root via brug af adgangskodegodkendelse. Du skal kun lave denne ændring, "
55"hvis du ikke har brug for dette."
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 000000000..0f0fd2e2f
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,61 @@
1# openssh.
2# Copyright (C) 2014 Colin Watson
3# Copyright (C) 2014 Stephan Beck
4# This file is distributed under the same license as the openssh package.
5# Stephan Beck <sbeck@mailbox.org>, 2014.
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh_1:6.6p1-1\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-03-24 22:21+0100\n"
13"Last-Translator: Stephan Beck <sbeck@mailbox.org>\n"
14"Language-Team: Debian German translation team <debian-l10n-german@lists."
15"debian.org>\n"
16"Language: de\n"
17"MIME-Version: 1.0\n"
18"Content-Type: text/plain; charset=UTF-8\n"
19"Content-Transfer-Encoding: 8bit\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "SSH Passwort-Authentifizierung für »root« deaktivieren?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin without-password\", which disables password authentication "
34"for root without breaking systems that have explicitly configured SSH public "
35"key authentication for root."
36msgstr ""
37"Vorherige Versionen von openssh-server erlaubten das Anmelden als »root« "
38"über SSH unter Verwendung von Passwort-Authentifizierung. Die "
39"Standardeinstellung für Neuinstallationen lautet nun »PermitRootLogin "
40"without-password«, wodurch die Passwort-Authentifizierung für »root« "
41"deaktiviert wird, und Systeme dennoch funktionsfähig bleiben, bei denen "
42"ausdrücklich die Authentifizierung als »root« mittels öffentlichem SSH-"
43"Schlüssel konfiguriert ist."
44
45#. Type: boolean
46#. Description
47#: ../openssh-server.templates:1001
48msgid ""
49"This change makes systems more secure against brute-force password "
50"dictionary attacks on the root user (a very common target for such attacks). "
51"However, it may break systems that are set up with the expectation of being "
52"able to SSH as root using password authentication. You should only make this "
53"change if you do not need to do that."
54msgstr ""
55"Diese Änderung sichert Systeme besser gegen jene Angriffe auf den Benutzer "
56"»root« (ein verbreitetes Ziel solcher Angriffe) ab, die das Passwort durch "
57"simples Ausprobieren aller Einträge von Wörterbüchern zu erraten versuchen. "
58"Sie kann allerdings dazu führen, dass Systeme nicht mehr funktionieren, die "
59"in der Absicht konfiguriert wurden, die Anmeldung als »root« über SSH unter "
60"Verwendung von Passwort-Authentifizierung zuzulassen. Sie sollten diese "
61"Änderung nur vornehmen, wenn Sie auf Letzteres verzichten können."
diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 000000000..47493e406
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,80 @@
1# openssh po-debconf translation to Spanish
2# Copyright (C) 2014 Software in the Public Interest
3# This file is distributed under the same license as the openssh package.
4#
5# Changes:
6# - Initial translation
7# Matías A. Bellone <matiasbellone+debian@gmail.com>, 2014
8#
9# Traductores, si no conocen el formato PO, merece la pena leer la
10# de gettext, especialmente las secciones dedicadas a este
11# formato, por ejemplo ejecutando:
12# info -n '(gettext)PO Files'
13# info -n '(gettext)Header Entry'
14#
15# Equipo de traducción al español, por favor, lean antes de traducir
16# los siguientes documentos:
17#
18# - El proyecto de traducción de Debian al español
19# http://www.debian.org/intl/spanish/
20# especialmente las notas de traducción en
21# http://www.debian.org/intl/spanish/notas
22#
23# - La guía de traducción de po's de debconf:
24# /usr/share/doc/po-debconf/README-trans
25# o http://www.debian.org/intl/l10n/po-debconf/README-trans
26#
27msgid ""
28msgstr ""
29"Project-Id-Version: openssh\n"
30"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
31"POT-Creation-Date: 2014-03-20 02:06+0000\n"
32"PO-Revision-Date: 2014-03-23 20:43-0300\n"
33"Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
34"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
35"Language: es\n"
36"MIME-Version: 1.0\n"
37"Content-Type: text/plain; charset=UTF-8\n"
38"Content-Transfer-Encoding: 8bit\n"
39
40#. Type: boolean
41#. Description
42#: ../openssh-server.templates:1001
43msgid "Disable SSH password authentication for root?"
44msgstr ""
45"¿Desea desactivar la autenticación SSH mediante contraseña para el usuario "
46"root?"
47
48#. Type: boolean
49#. Description
50#: ../openssh-server.templates:1001
51msgid ""
52"Previous versions of openssh-server permitted logging in as root over SSH "
53"using password authentication. The default for new installations is now "
54"\"PermitRootLogin without-password\", which disables password authentication "
55"for root without breaking systems that have explicitly configured SSH public "
56"key authentication for root."
57msgstr ""
58"Las versiones anteriores de openssh-server permitían iniciar sesión como "
59"usuario root utilizando autenticación con contraseña. La configuración "
60"predeterminada para las nuevas instalaciones ahora incluye «PermitRootLogin "
61"without-password», lo que desactiva la autenticación con contraseña para el "
62"usuario root sin romper los sistemas que tienen configurado explícitamente "
63"la autenticación SSH utilizando claves públicas para el usuario root."
64
65#. Type: boolean
66#. Description
67#: ../openssh-server.templates:1001
68msgid ""
69"This change makes systems more secure against brute-force password "
70"dictionary attacks on the root user (a very common target for such attacks). "
71"However, it may break systems that are set up with the expectation of being "
72"able to SSH as root using password authentication. You should only make this "
73"change if you do not need to do that."
74msgstr ""
75"Este cambio hace que los sistemas sean más resistentes contra ataques de "
76"fuerza bruta basados en diccionarios sobre el usuario root (un objetivo muy "
77"común para este tipo de ataques). Sin embargo, podría romper sistemas cuya "
78"configuración permite que el usuario root inicie sesión a través de SSH "
79"utilizando una contraseña. Sólo debería realizar este cambio si no necesita "
80"este comportamiento."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 000000000..3a6db02d0
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,59 @@
1# Translation of openssh debconf template to French
2# Copyright (C) 2014
3# This file is distributed under the same license as the openssh package.
4# Étienne Gilli <etienne.gilli@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh_1:6.5p1-6\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-22 08:26+0100\n"
12"Last-Translator: Étienne Gilli <etienne.gilli@gmail.com>\n"
13"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
14"Language: fr\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr ""
24"Désactiver l’authentification SSH par mot de passe pour le superutilisateur ?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin without-password\", which disables password authentication "
33"for root without breaking systems that have explicitly configured SSH public "
34"key authentication for root."
35msgstr ""
36"Les versions précédentes du paquet openssh-server autorisaient la connexion "
37"par SSH du superutilisateur (root) en utilisant l’authentification par mot "
38"de passe. Par défaut, les nouvelles installations ont maintenant l’option "
39"« PermitRootLogin without-password », qui désactive l’authentification par "
40"mot de passe pour le compte « root », sans casser les systèmes qui ont "
41"configuré explicitement l’authentification SSH par clé publique pour ce "
42"compte."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Cette modification rend les systèmes plus robustes face aux attaques par "
55"force brute et par dictionnaire contre le superutilisateur (très souvent "
56"pris pour cible par ce type d’attaque). Cependant, cela peut rendre "
57"inutilisables les systèmes reposant sur la possibilité de se connecter au "
58"compte « root » par SSH avec authentification par mot de passe. Vous ne "
59"devriez appliquer cette modification que si ce n’est pas votre cas."
diff --git a/debian/po/it.po b/debian/po/it.po
new file mode 100644
index 000000000..2fa12cede
--- /dev/null
+++ b/debian/po/it.po
@@ -0,0 +1,58 @@
1# Italian translation of openssh debconf messages.
2# Copyright (C) 2014, openssh package copyright holder
3# This file is distributed under the same license as the openssh package.
4# Beatrice Torracca <beatricet@libero.it>, 2014.
5msgid ""
6msgstr ""
7"Project-Id-Version: openssh\n"
8"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
9"POT-Creation-Date: 2014-03-20 02:06+0000\n"
10"PO-Revision-Date: 2014-03-28 11:12+0200\n"
11"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
12"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
13"Language: it\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18"X-Generator: Virtaal 0.7.1\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr "Disabilitare l'autenticazione SSH con password per root?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin without-password\", which disables password authentication "
33"for root without breaking systems that have explicitly configured SSH public "
34"key authentication for root."
35msgstr ""
36"Le versioni precedenti di openssh-server permettevano il login come root via "
37"SSH, usando l'autenticazione con password. Il comportamento predefinito "
38"delle nuove installazioni è «PermitRootLogin without-password» che "
39"disabilita l'autenticazione con password per root, senza rendere non "
40"funzionanti sistemi che hanno esplicitamente configurato l'autenticazione "
41"SSH con chiave pubblica per root."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Questo cambiamento rende i sistemi più al sicuro da attacchi di forza bruta "
54"a dizionario sulle password per l'utente root (un obiettivo molto comune per "
55"tali attacchi). Tuttavia, può rendere non funzionanti sistemi che sono "
56"impostati facendo affidamento sulla possibilità di autenticazione SSH come "
57"root usando la password. Si dovrebbe fare questo cambiamento solo se non si "
58"ha bisogno di tale comportamento."
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 000000000..4e6c41e4b
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,55 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# victory <victory.deb@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-20 11:06+0900\n"
12"Last-Translator: victory <victory.deb@gmail.com>\n"
13"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
14"Language: ja\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "root での SSH パスワード認証を無効にしますか?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin without-password\", which disables password authentication "
32"for root without breaking systems that have explicitly configured SSH public "
33"key authentication for root."
34msgstr ""
35"openssh-server の以前のバージョンではパスワード認証を利用した SSH 経由の "
36"root のログインを許可していました。新しくインストールした場合のデフォルト値が"
37"現在は「PermitRootLogin without-password」になり、root のパスワード認証を無効"
38"化しますが SSH の公開鍵認証を root 用に明示的に設定しているシステムでは特に問"
39"題はありません。"
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"この変更によりシステムは root ユーザ (こういった攻撃ではとても一般的な攻撃対"
52"象です) へのブルートフォースによるパスワード辞書攻撃に対してはより安全になり"
53"ます。しかしパスワード認証により root で SSH 接続できることを前提として構成し"
54"たシステムでは問題が発生する可能性があります。そういった必要のない場合にのみ"
55"この変更を行うようにしてください。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 000000000..1cb5cdf48
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,60 @@
1# Dutch translation of openssh debconf templates.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-10-03 23:54+0200\n"
12"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
13"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
14"Language: nl\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr ""
25"Wachtwoordauthenticatie over SSH voor de systeembeheerder uitschakelen?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin without-password\", which disables password authentication "
34"for root without breaking systems that have explicitly configured SSH public "
35"key authentication for root."
36msgstr ""
37"Eerdere versies van de openssh-server lieten de systeembeheerder toe om zich "
38"over SSH te authenticeren met een wachtwoord. Voor nieuwe installaties is de "
39"standaard nu \"PermitRootLogin without-password\". Deze standaardinstelling "
40"maakt het voor de systeembeheerder onmogelijk om zich via een wachtwoord te "
41"authenticeren. Deze instelling heeft geen impact op systemen waarbij de SSH-"
42"configuratie expliciet vereist dat de systeembeheerder zich authenticeert "
43"via een publieke sleutel."
44
45#. Type: boolean
46#. Description
47#: ../openssh-server.templates:1001
48msgid ""
49"This change makes systems more secure against brute-force password "
50"dictionary attacks on the root user (a very common target for such attacks). "
51"However, it may break systems that are set up with the expectation of being "
52"able to SSH as root using password authentication. You should only make this "
53"change if you do not need to do that."
54msgstr ""
55"Deze wijziging maakt systemen veiliger tegenover aanvallen met brute kracht "
56"(met een wachtwoordenwoordenboek) op de systeembeheerder, een zeer courant "
57"doelwit voor zulke aanvallen. Maar het kan systemen onbruikbaar maken die "
58"ingesteld werden vanuit de verwachting dat de systeembeheerder SSH kan "
59"gebruiken met authenticatie via wachtwoord. Enkel wanneer u dit laatste niet "
60"nodig heeft, zou u deze wijziging kunnen doorvoeren."
diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 000000000..282ac8dde
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,58 @@
1# Translation of openssh's debconf messages to European Portuguese
2# Copyright (C) 2014 YEAR THE openssh'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4#
5# Américo Monteiro <a_monteiro@gmx.com>, 2014.
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh 1:6.6p1-1\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-21 21:13+0000\n"
12"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
13"Language-Team: Portuguese <traduz@debianpt.org>\n"
14"Language: pt\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19"X-Generator: Lokalize 1.4\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Desactivar a autenticação SSH por palavra passe para o root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin without-password\", which disables password authentication "
34"for root without breaking systems that have explicitly configured SSH public "
35"key authentication for root."
36msgstr ""
37"As versões anteriores do servidor openssh permitiam iniciar sessão como root "
38"sobre SSH usando autenticação por palavra-passe. A predefinição para novas "
39"instalações é agora \"PermitRootLogin without-password\", a qual desactiva a "
40"autenticação por palavra-passe para o root sem danificar os sistemas que têm "
41"configurados explicitamente autenticação SSH por chave pública para o root."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Esta alteração torna os sistemas mais seguros contra ataques em que se "
54"forçam dicionários de palavras-passe no utilizador root (um alvo muito comum "
55"para tais ataques). No entanto, pode danificar sistemas que estão "
56"configurados com a expectativa de serem capazes de SSH como root usando "
57"autenticação por palavra-passe. Apenas deverá fazer esta alteração se não "
58"precisa de tal método de autenticação."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644
index 000000000..d7252fb99
--- /dev/null
+++ b/debian/po/pt_BR.po
@@ -0,0 +1,57 @@
1# Debconf translations for openssh.
2# Copyright (C) 2014 THE openssh'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# José de Figueiredo <deb.gnulinux@gmail.com>, 2014.
5#
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-11-23 23:49-0200\n"
13"Last-Translator: José de Figueiredo <deb.gnulinux@gmail.com>\n"
14"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
15"org>\n"
16"Language: pt_BR\n"
17"MIME-Version: 1.0\n"
18"Content-Type: text/plain; charset=UTF-8\n"
19"Content-Transfer-Encoding: 8bit\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Desabilitar autenticação por senha do SSH para root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin without-password\", which disables password authentication "
34"for root without breaking systems that have explicitly configured SSH public "
35"key authentication for root."
36msgstr ""
37"Versões anteriores do openssh-server permitiam login como root sobre SSH "
38"usando autenticação por senha. O padrão para as novas instalações agora é "
39"\"PermitRootLogin without-password\", que desabilita a autenticação por "
40"senha para root sem quebrar sistemas que tenham configurado explicitamente o "
41"SSH para autenticação por chave pública para root."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Esta alteração torna sistemas mais seguros contra ataques de força bruta por "
54"dicionário de senhas no usuário root (um alvo muito comum destes ataques). "
55"Entretanto, ela pode quebrar sistemas que foram configurados com a "
56"expectativa de acesso SSH com root usando autenticação por senha. Você deve "
57"fazer esta mudança somente se você não precisa fazer isso."
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 000000000..42375e6e5
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,57 @@
1# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
2# This file is distributed under the same license as the openssh package.
3#
4# Yuri Kozlov <yuray@komyakino.ru>, 2014.
5msgid ""
6msgstr ""
7"Project-Id-Version: openssh 1:6.6p1-1\n"
8"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
9"POT-Creation-Date: 2014-03-20 02:06+0000\n"
10"PO-Revision-Date: 2014-03-22 10:04+0400\n"
11"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
12"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
13"Language: ru\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
18"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19"X-Generator: Lokalize 1.4\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Выключить в SSH аутентификацию по паролю для root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin without-password\", which disables password authentication "
34"for root without breaking systems that have explicitly configured SSH public "
35"key authentication for root."
36msgstr ""
37"В предыдущих версиях openssh-server разрешён вход с правами пользователя "
38"root через SSH с помощью аутентификации по паролю. При новых установках по "
39"умолчанию теперь используется настройка «PermitRootLogin without-password», "
40"которая отключает аутентификацию по паролю для root, что не вредит системам, "
41"у которых в SSH для root настроена аутентификация по открытому ключу."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Это изменение делает системы более стойкими к атакам методом перебора "
54"словарных паролей для пользователя root (самая распространённая цель таких "
55"атак). Однако, это вредит системам, в которых специально настроен вход для "
56"root по SSH с парольной аутентификацией. Если это не ваш случай, то ответьте "
57"утвердительно."
diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 000000000..a0cca7ba9
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,58 @@
1# Swedish translations for openssh package
2# Svenska översättningar för paket openssh.
3# Copyright (C) 2014 THE openssh'S COPYRIGHT HOLDER
4# This file is distributed under the same license as the openssh package.
5# Andreas Rönnquist <gusnan@gusnan.se>, 2014.
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-03-21 21:36+0100\n"
13"Last-Translator: Andreas Rönnquist <gusnan@gusnan.se>\n"
14"Language-Team: Swedish\n"
15"Language: sv\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=2; plural=(n != 1);\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Inaktivera SSH-lösenordsautentisering för root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin without-password\", which disables password authentication "
34"for root without breaking systems that have explicitly configured SSH public "
35"key authentication for root."
36msgstr ""
37"Tidigare versioner av openssh-server tillät inloggning som root över SSH med "
38"hjälp av lösenordsautentisering. Standardinställningen för nya "
39"installationer är nu \"PermitRootLogin without-password\", vilket "
40"inaktiverar lösenordsautentisering för root utan att förstöra system som "
41"explicit har konfigurerat nyckelautentisering med hjälp av publika nycklar "
42"för root."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Denna förändring gör system säkrare mot brute-force-angrepp med hjälp av "
55"ordlistor med lösenord på root-användaren (ett väldigt vanligt mål för "
56"sådana angrepp). Dock så kan detta förstöra system som förväntas kunna "
57"använda SSH som root med hjälp av lösenordsautentisering. Du skall endast "
58"göra denna förändring om du inte har ett behov av att kunna göra detta."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 000000000..70e64acad
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,46 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr ""
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin without-password\", which disables password authentication "
33"for root without breaking systems that have explicitly configured SSH public "
34"key authentication for root."
35msgstr ""
36
37#. Type: boolean
38#. Description
39#: ../openssh-server.templates:1001
40msgid ""
41"This change makes systems more secure against brute-force password "
42"dictionary attacks on the root user (a very common target for such attacks). "
43"However, it may break systems that are set up with the expectation of being "
44"able to SSH as root using password authentication. You should only make this "
45"change if you do not need to do that."
46msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
new file mode 100644
index 000000000..095ac14fc
--- /dev/null
+++ b/debian/po/tr.po
@@ -0,0 +1,58 @@
1# Turkish translation of openssh package
2# Copyright (C) 2014 Mert Dirik
3# This file is distributed under the same license as the openssh package.
4# Mert Dirik <mertdirik@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh-server\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-08-01 14:44+0200\n"
12"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
13"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Generator: Poedit 1.5.4\n"
18"Language: tr\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr "root kullanıcısının parola ile kimlik doğrulaması engellensin mi?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin without-password\", which disables password authentication "
33"for root without breaking systems that have explicitly configured SSH public "
34"key authentication for root."
35msgstr ""
36"openssh-server'ın önceki sürümleri parola ile kimlik doğrulama kullanılarak "
37"root kullanıcısının SSH üzerinden oturum açmasına izin veriyordu. Artık yeni "
38"kurulumların öntanımlı ayarı \"PermitRootLogin without-password\" "
39"şeklindedir. Bu ayar root kullanıcısının parola kullanarak oturum açmasını "
40"yasaklar. SSH genel anahtar doğrulama yöntemine ayrıca izin veren mevcut "
41"sistemler bu ayardan etkilenmez."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Bu ayar sistemleri kaba kuvvet sözlükten parola saldırılarına karşı güvenli "
54"hale getirir (root kullanıcısı bu tarz saldırıların en büyük "
55"hedeflerindendir). Fakat bu ayarın etkinleştirilmesi, root kullanıcısına "
56"parola doğrulama yöntemiyle oturum açılabileceği varsayımıyla hareket eden "
57"sistemlerde eskiden çalışan düzenin bozulmasına sebep olacaktır. Bu "
58"değişikliği yalnızca sorun çıkarmayacağından eminseniz yapın."
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000000000..d377ed2b0
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,230 @@
1#!/usr/bin/make -f
2
3# Uncomment this to turn on verbose mode.
4# export DH_VERBOSE=1
5
6# This has to be exported to make some magic below work.
7export DH_OPTIONS
8
9ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
10 RUN_TESTS := yes
11else
12 RUN_TESTS :=
13endif
14
15ifeq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
16 PARALLEL :=
17else
18 PARALLEL := \
19 -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
20endif
21
22DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
23DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
24DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
25
26ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
27 CC := gcc
28 PKG_CONFIG = pkg-config
29else
30 CC := $(DEB_HOST_GNU_TYPE)-gcc
31 PKG_CONFIG = $(DEB_HOST_GNU_TYPE)-pkg-config
32 RUN_TESTS :=
33endif
34
35DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
36
37# Take account of old dpkg-architecture output.
38ifeq ($(DEB_HOST_ARCH_OS),)
39 DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
40 ifeq ($(DEB_HOST_ARCH_OS),gnu)
41 DEB_HOST_ARCH_OS := hurd
42 endif
43endif
44
45# Change the version string to reflect distribution
46DISTRIBUTION := $(shell dpkg-vendor --query vendor)
47SSH_EXTRAVERSION := $(DISTRIBUTION)-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
48
49DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi)
50ifeq ($(DISTRIBUTOR),Ubuntu)
51DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
52else
53DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/games
54endif
55SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
56
57ifeq ($(DISTRIBUTOR),Ubuntu)
58server_recommends := ssh-import-id
59else
60server_recommends :=
61endif
62
63# Common path configuration.
64confflags += --sysconfdir=/etc/ssh
65confflags += --libexecdir=\$${prefix}/lib/openssh
66
67# Common build options.
68confflags += --disable-strip
69confflags += --with-mantype=doc
70confflags += --with-4in6
71confflags += --with-privsep-path=/var/run/sshd
72
73# The Hurd needs libcrypt for res_query et al.
74ifeq ($(DEB_HOST_ARCH_OS),hurd)
75confflags += --with-libs=-lcrypt
76endif
77
78# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
79ifeq ($(DEB_HOST_ARCH),hppa)
80confflags += --without-hardening
81endif
82
83# Everything above here is common to the deb and udeb builds.
84confflags_udeb := $(confflags)
85
86# Options specific to the deb build.
87confflags += --with-tcp-wrappers
88confflags += --with-pam
89confflags += --with-libedit
90confflags += --with-kerberos5=/usr
91confflags += --with-ssl-engine
92ifeq ($(DEB_HOST_ARCH_OS),linux)
93confflags += --with-selinux
94endif
95ifeq ($(DISTRIBUTOR),Ubuntu)
96confflags += --with-consolekit
97endif
98
99# The deb build wants xauth; the udeb build doesn't.
100confflags += --with-xauth=/usr/bin/xauth
101confflags_udeb += --without-xauth
102
103# Default paths. The udeb build has /usr/games removed.
104confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH)
105confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
106
107# Compiler flags.
108export DEB_BUILD_MAINT_OPTIONS := hardening=+all
109include /usr/share/dpkg/buildflags.mk
110cflags := $(CPPFLAGS) $(CFLAGS)
111cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT
112cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
113cflags_udeb := -Os
114cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
115confflags += --with-cflags='$(cflags)'
116confflags_udeb += --with-cflags='$(cflags_udeb)'
117
118# Linker flags.
119confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))'
120confflags_udeb += --with-ldflags='-Wl,--as-needed'
121
122%:
123 dh $@ --with=autoreconf,systemd
124
125autoreconf:
126 autoreconf -f -i
127 cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
128
129override_dh_autoreconf:
130 dh_autoreconf debian/rules -- autoreconf
131
132override_dh_auto_configure:
133 dh_auto_configure -Bbuild-deb -- $(confflags)
134 dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
135
136override_dh_auto_build:
137 # Avoid libnsl linkage. Ugh.
138 perl -pi -e 's/ +-lnsl//' build-udeb/config.status
139 cd build-udeb && ./config.status
140
141 $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
142 $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
143
144 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
145
146override_dh_auto_test:
147ifeq ($(RUN_TESTS),yes)
148 $(MAKE) -C build-deb regress-prep
149 $(MAKE) -C build-deb $(PARALLEL) \
150 regress/unittests/sshbuf/test_sshbuf \
151 regress/unittests/sshkey/test_sshkey \
152 regress/unittests/bitmap/test_bitmap \
153 regress/unittests/hostkeys/test_hostkeys \
154 regress/unittests/kex/test_kex
155 $(MAKE) -C build-deb/regress \
156 .OBJDIR="$(CURDIR)/build-deb/regress" \
157 .CURDIR="$(CURDIR)/regress" \
158 unit
159 $(MAKE) -C build-deb compat-tests
160 $(MAKE) -C debian/keygen-test
161endif
162
163override_dh_auto_clean:
164 rm -rf build-deb build-udeb
165ifeq ($(RUN_TESTS),yes)
166 $(MAKE) -C debian/keygen-test clean
167endif
168 $(MAKE) -C contrib clean
169 (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
170 > debian/copyright
171
172override_dh_auto_install:
173 $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
174
175override_dh_install:
176 rm -f debian/tmp/etc/ssh/sshd_config
177
178 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
179 dh_install -popenssh-client-udeb -popenssh-server-udeb \
180 --sourcedir=build-udeb
181
182 # Remove version control tags to avoid unnecessary conffile
183 # resolution steps for administrators.
184 sed -i '/\$$OpenBSD:/d' \
185 debian/openssh-client/etc/ssh/moduli \
186 debian/openssh-client/etc/ssh/ssh_config
187
188override_dh_installdocs:
189 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
190 dh_installdocs -popenssh-server -popenssh-sftp-server \
191 --link-doc=openssh-client
192 # Avoid breaking dh_installexamples later.
193 mkdir -p debian/openssh-server/usr/share/doc/openssh-client
194
195override_dh_systemd_enable:
196 dh_systemd_enable -popenssh-server --name ssh ssh.service
197 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
198
199override_dh_installinit:
200 dh_installinit -R --name ssh
201
202debian/openssh-server.sshd.pam: debian/openssh-server.sshd.pam.in
203ifeq ($(DEB_HOST_ARCH_OS),linux)
204 sed 's/^@IF_KEYINIT@//' $< > $@
205else
206 sed '/^@IF_KEYINIT@/d' $< > $@
207endif
208
209override_dh_installpam: debian/openssh-server.sshd.pam
210 dh_installpam --name sshd
211
212override_dh_fixperms:
213 dh_fixperms
214 chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign
215
216# Tighten libssl dependencies to match the check in entropy.c.
217override_dh_shlibdeps:
218 dh_shlibdeps
219 debian/adjust-openssl-dependencies
220
221override_dh_gencontrol:
222 dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'
223
224override_dh_builddeb:
225 dh_builddeb -- -Zxz
226
227debian/faq.html:
228 wget -O - http://www.openssh.org/faq.html | \
229 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \
230 > debian/faq.html
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 000000000..df5790e2e
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
debian/ssh-askpass-gnome.png
diff --git a/debian/ssh-agent.user-session.upstart b/debian/ssh-agent.user-session.upstart
new file mode 100644
index 000000000..385a9ecc6
--- /dev/null
+++ b/debian/ssh-agent.user-session.upstart
@@ -0,0 +1,23 @@
1description "SSH Agent"
2author "Stéphane Graber <stgraber@ubuntu.com>"
3
4start on starting xsession-init
5
6pre-start script
7 [ -e /etc/X11/Xsession.options ] || { stop; exit 0; }
8 grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; }
9 [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; }
10
11 eval "$(ssh-agent -s)" >/dev/null
12 initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK
13 initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID
14 initctl set-env --global SSH_AGENT_LAUNCHER=upstart
15end script
16
17post-stop script
18 [ "$SSH_AGENT_LAUNCHER" = upstart ] || exit 0
19 kill $SSH_AGENT_PID 2>/dev/null || true
20 initctl unset-env --global SSH_AUTH_SOCK
21 initctl unset-env --global SSH_AGENT_PID
22 initctl unset-env --global SSH_AGENT_LAUNCHER
23end script
diff --git a/debian/ssh-argv0 b/debian/ssh-argv0
new file mode 100644
index 000000000..37506a4d7
--- /dev/null
+++ b/debian/ssh-argv0
@@ -0,0 +1,31 @@
1#! /bin/sh
2set -e
3
4# Copyright (c) 2001 Jonathan Amery.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:
9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright
12# notice, this list of conditions and the following disclaimer in the
13# documentation and/or other materials provided with the distribution.
14#
15# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
16# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25
26if [ "${0##*/}" = "ssh-argv0" ]
27then
28 echo 'ssh-argv0: This script should not be run like this, see ssh-argv0(1) for details' 1>&2
29 exit 1
30fi
31exec ssh "${0##*/}" "$@"
diff --git a/debian/ssh-argv0.1 b/debian/ssh-argv0.1
new file mode 100644
index 000000000..a36a63d40
--- /dev/null
+++ b/debian/ssh-argv0.1
@@ -0,0 +1,64 @@
1.Dd September 7, 2001
2.Dt SSH-ARGV0 1
3.Os Debian Project
4.Sh NAME
5.Nm ssh-argv0
6.Nd replaces the old ssh command-name as hostname handling
7.Sh SYNOPSIS
8.Ar hostname | user@hostname
9.Op Fl l Ar login_name
10.Op Ar command
11.Pp
12.Ar hostname | user@hostname
13.Op Fl afgknqstvxACNTX1246
14.Op Fl b Ar bind_address
15.Op Fl c Ar cipher_spec
16.Op Fl e Ar escape_char
17.Op Fl i Ar identity_file
18.Op Fl l Ar login_name
19.Op Fl m Ar mac_spec
20.Op Fl o Ar option
21.Op Fl p Ar port
22.Op Fl F Ar configfile
23.Oo Fl L Xo
24.Sm off
25.Ar port :
26.Ar host :
27.Ar hostport
28.Sm on
29.Xc
30.Oc
31.Oo Fl R Xo
32.Sm off
33.Ar port :
34.Ar host :
35.Ar hostport
36.Sm on
37.Xc
38.Oc
39.Op Fl D Ar port
40.Op Ar command
41.Sh DESCRIPTION
42.Nm
43replaces the old ssh command-name as hostname handling.
44If you link to this script with a hostname then executing the link is
45equivalent to having executed ssh with that hostname as an argument.
46All other arguments are passed to ssh and will be processed normally.
47.Sh OPTIONS
48See
49.Xr ssh 1 .
50.Sh FILES
51See
52.Xr ssh 1 .
53.Sh AUTHORS
54OpenSSH is a derivative of the original and free
55ssh 1.2.12 release by Tatu Ylonen.
56Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
57Theo de Raadt and Dug Song
58removed many bugs, re-added newer features and
59created OpenSSH.
60Markus Friedl contributed the support for SSH
61protocol versions 1.5 and 2.0.
62Jonathan Amery wrote this ssh-argv0 script and the associated documentation.
63.Sh SEE ALSO
64.Xr ssh 1
diff --git a/debian/ssh-askpass-gnome.copyright b/debian/ssh-askpass-gnome.copyright
new file mode 100644
index 000000000..4a71dda00
--- /dev/null
+++ b/debian/ssh-askpass-gnome.copyright
@@ -0,0 +1,44 @@
1This package contains a Gnome based implementation of ssh-askpass
2written by Damien Miller.
3
4It is split out from the main package to isolate the dependency on the
5Gnome and X11 libraries.
6
7It was packaged for Debian by Philip Hands <phil@hands.com>.
8
9Copyright:
10
11/*
12**
13** GNOME ssh passphrase requestor
14**
15** Damien Miller <djm@ibs.com.au>
16**
17** Copyright 1999 Internet Business Solutions
18**
19** Permission is hereby granted, free of charge, to any person
20** obtaining a copy of this software and associated documentation
21** files (the "Software"), to deal in the Software without
22** restriction, including without limitation the rights to use, copy,
23** modify, merge, publish, distribute, sublicense, and/or sell copies
24** of the Software, and to permit persons to whom the Software is
25** furnished to do so, subject to the following conditions:
26**
27** The above copyright notice and this permission notice shall be
28** included in all copies or substantial portions of the Software.
29**
30** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
31** KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
32** WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
33** AND NONINFRINGEMENT. IN NO EVENT SHALL DAMIEN MILLER OR INTERNET
34** BUSINESS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
35** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
36** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
37** OR OTHER DEALINGS IN THE SOFTWARE.
38**
39** Except as contained in this notice, the name of Internet Business
40** Solutions shall not be used in advertising or otherwise to promote
41** the sale, use or other dealings in this Software without prior
42** written authorization from Internet Business Solutions.
43**
44*/
diff --git a/debian/ssh-askpass-gnome.desktop b/debian/ssh-askpass-gnome.desktop
new file mode 100644
index 000000000..eba7a67d1
--- /dev/null
+++ b/debian/ssh-askpass-gnome.desktop
@@ -0,0 +1,12 @@
1[Desktop Entry]
2Version=1.0
3Encoding=UTF-8
4Name=SSH AskPass
5GenericName=ssh-add
6Comment=Enter passphrase to authenticate to the ssh agent
7Exec=/usr/bin/ssh-add
8TryExec=ssh-add
9Terminal=false
10Type=Application
11Icon=ssh-askpass-gnome
12Categories=Network;Security;
diff --git a/debian/ssh-askpass-gnome.examples b/debian/ssh-askpass-gnome.examples
new file mode 100644
index 000000000..66fd8c0e4
--- /dev/null
+++ b/debian/ssh-askpass-gnome.examples
@@ -0,0 +1 @@
debian/ssh-askpass-gnome.desktop
diff --git a/debian/ssh-askpass-gnome.install b/debian/ssh-askpass-gnome.install
new file mode 100755
index 000000000..9b0a8fd8d
--- /dev/null
+++ b/debian/ssh-askpass-gnome.install
@@ -0,0 +1,3 @@
1#! /usr/bin/dh-exec
2contrib/gnome-ssh-askpass2 => usr/lib/openssh/gnome-ssh-askpass
3debian/ssh-askpass-gnome.png usr/share/pixmaps
diff --git a/debian/ssh-askpass-gnome.manpages b/debian/ssh-askpass-gnome.manpages
new file mode 100644
index 000000000..7749f13bb
--- /dev/null
+++ b/debian/ssh-askpass-gnome.manpages
@@ -0,0 +1 @@
debian/gnome-ssh-askpass.1
diff --git a/debian/ssh-askpass-gnome.png b/debian/ssh-askpass-gnome.png
new file mode 100644
index 000000000..06f75764e
--- /dev/null
+++ b/debian/ssh-askpass-gnome.png
Binary files differ
diff --git a/debian/ssh-askpass-gnome.postinst b/debian/ssh-askpass-gnome.postinst
new file mode 100644
index 000000000..8a454e520
--- /dev/null
+++ b/debian/ssh-askpass-gnome.postinst
@@ -0,0 +1,48 @@
1#! /bin/sh
2# postinst script for ssh-askpass-gnome
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <postinst> `configure' <most-recently-configured-version>
10# * <old-postinst> `abort-upgrade' <new version>
11# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
12# <new-version>
13# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
14# <failed-install-package> <version> `removing'
15# <conflicting-package> <version>
16# for details, see /usr/share/doc/packaging-manual/
17#
18# quoting from the policy:
19# Any necessary prompting should almost always be confined to the
20# post-installation script, and should be protected with a conditional
21# so that unnecessary prompting doesn't happen if a package's
22# installation fails and the `postinst' is called with `abort-upgrade',
23# `abort-remove' or `abort-deconfigure'.
24
25case "$1" in
26 configure)
27 update-alternatives --quiet \
28 --install /usr/bin/ssh-askpass ssh-askpass \
29 /usr/lib/openssh/gnome-ssh-askpass 30 \
30 --slave /usr/share/man/man1/ssh-askpass.1.gz \
31 ssh-askpass.1.gz /usr/share/man/man1/gnome-ssh-askpass.1.gz
32 ;;
33
34 abort-upgrade|abort-remove|abort-deconfigure)
35 ;;
36
37 *)
38 echo "postinst called with unknown argument \`$1'" >&2
39 exit 0
40 ;;
41esac
42
43# dh_installdeb will replace this with shell code automatically
44# generated by other debhelper scripts.
45
46#DEBHELPER#
47
48exit 0
diff --git a/debian/ssh-askpass-gnome.prerm b/debian/ssh-askpass-gnome.prerm
new file mode 100644
index 000000000..0adcfc76b
--- /dev/null
+++ b/debian/ssh-askpass-gnome.prerm
@@ -0,0 +1,39 @@
1#! /bin/sh
2# prerm script for ssh-askpass-gnome
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see /usr/share/doc/packaging-manual/
17
18case "$1" in
19 remove|deconfigure)
20 update-alternatives --quiet --remove ssh-askpass /usr/lib/openssh/gnome-ssh-askpass
21 ;;
22 upgrade)
23 ;;
24 failed-upgrade)
25 ;;
26 *)
27 echo "prerm called with unknown argument \`$1'" >&2
28 exit 0
29 ;;
30esac
31
32# dh_installdeb will replace this with shell code automatically
33# generated by other debhelper scripts.
34
35#DEBHELPER#
36
37exit 0
38
39
diff --git a/debian/ssh-krb5.NEWS b/debian/ssh-krb5.NEWS
new file mode 100644
index 000000000..5a6433ab2
--- /dev/null
+++ b/debian/ssh-krb5.NEWS
@@ -0,0 +1,18 @@
1ssh-krb5 (1:4.3p2-7) unstable; urgency=low
2
3 The normal openssh-server and openssh-client packages in Debian now
4 include full GSSAPI support, including key exchange. This package is
5 now only a transitional package that depends on openssh-server and
6 openssh-client and configures openssh-server for GSSAPI authentication
7 if it wasn't already.
8
9 You can now simply install openssh-server and openssh-client directly
10 and remove this package. Just make sure that /etc/ssh/sshd_config
11 contains:
12
13 GSSAPIAuthentication yes
14 GSSAPIKeyExchange yes
15
16 if you want to support GSSAPI authentication to your ssh server.
17
18 -- Russ Allbery <rra@debian.org> Tue, 03 Oct 2006 22:27:27 -0700
diff --git a/debian/ssh-krb5.postinst b/debian/ssh-krb5.postinst
new file mode 100644
index 000000000..f799accfe
--- /dev/null
+++ b/debian/ssh-krb5.postinst
@@ -0,0 +1,61 @@
1#!/bin/sh
2
3set -e
4
5action="$1"
6oldversion="$2"
7
8if [ "$action" = configure ] ; then
9 # Make sure that GSSAPI is enabled. If there is no uncommented GSSAPI
10 # configuration, uncomment any commented-out configuration if present
11 # (this will catch the case of a fresh install of openssh-server).
12 # Otherwise, add configuration turning on GSSAPIAuthentication and
13 # GSSAPIKeyExchange.
14 #
15 # If there is some configuration, we may be upgrading from ssh-krb5. It
16 # enabled GSSAPIKeyExchange without any configuration option. Therefore,
17 # if it isn't explicitly set, always enable it for compatible behavior
18 # with ssh-krb5.
19 if dpkg --compare-versions "$oldversion" ge 1:4.3p2-9; then
20 :
21 else
22 changed=
23 if grep -qi '^[ ]*GSSAPI' /etc/ssh/sshd_config ; then
24 if grep -qi '^[ ]*GSSAPIKeyExchange' /etc/ssh/sshd_config ; then
25 :
26 else
27 changed=true
28 cat >> /etc/ssh/sshd_config <<EOF
29
30# GSSAPI key exchange (added by ssh-krb5 transitional package)
31GSSAPIKeyExchange yes
32EOF
33 fi
34 else
35 changed=true
36 if grep -qi '^#GSSAPI' /etc/ssh/sshd_config ; then
37 perl -pe 's/^\#(GSSAPI(Authentication|KeyExchange))\b.*/$1 yes/i' \
38 < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new
39 chown --reference /etc/ssh/sshd_config \
40 /etc/ssh/sshd_config.dpkg-new
41 chmod --reference /etc/ssh/sshd_config \
42 /etc/ssh/sshd_config.dpkg-new
43 mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config
44 else
45 cat >> /etc/ssh/sshd_config <<EOF
46
47# GSSAPI authentication (added by ssh-krb5 transitional package)
48GSSAPIAuthentication yes
49GSSAPIKeyExchange yes
50EOF
51 fi
52 fi
53 if [ -n "$changed" ]; then
54 invoke-rc.d ssh restart
55 fi
56 fi
57fi
58
59#DEBHELPER#
60
61exit 0
diff --git a/debian/ssh.lintian-overrides b/debian/ssh.lintian-overrides
new file mode 100644
index 000000000..b9bf7ea08
--- /dev/null
+++ b/debian/ssh.lintian-overrides
@@ -0,0 +1 @@
ssh: package-contains-empty-directory usr/share/doc/openssh-client/
diff --git a/debian/ssh.maintscript b/debian/ssh.maintscript
new file mode 100644
index 000000000..efd370e25
--- /dev/null
+++ b/debian/ssh.maintscript
@@ -0,0 +1 @@
symlink_to_dir /usr/share/doc/ssh /usr/share/doc/openssh-client 1:6.6p1-8~
diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service
new file mode 100644
index 000000000..ff28d39c1
--- /dev/null
+++ b/debian/systemd/ssh.service
@@ -0,0 +1,15 @@
1[Unit]
2Description=OpenBSD Secure Shell server
3After=network.target auditd.service
4ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
5
6[Service]
7EnvironmentFile=-/etc/default/ssh
8ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
9ExecReload=/bin/kill -HUP $MAINPID
10KillMode=process
11Restart=on-failure
12
13[Install]
14WantedBy=multi-user.target
15Alias=sshd.service
diff --git a/debian/systemd/ssh.socket b/debian/systemd/ssh.socket
new file mode 100644
index 000000000..5a766dcab
--- /dev/null
+++ b/debian/systemd/ssh.socket
@@ -0,0 +1,12 @@
1[Unit]
2Description=OpenBSD Secure Shell server socket
3Before=ssh.service
4Conflicts=ssh.service
5ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
6
7[Socket]
8ListenStream=22
9Accept=yes
10
11[Install]
12WantedBy=sockets.target
diff --git a/debian/systemd/ssh@.service b/debian/systemd/ssh@.service
new file mode 100644
index 000000000..4b0801dbc
--- /dev/null
+++ b/debian/systemd/ssh@.service
@@ -0,0 +1,8 @@
1[Unit]
2Description=OpenBSD Secure Shell server per-connection daemon
3After=auditd.service
4
5[Service]
6EnvironmentFile=-/etc/default/ssh
7ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS
8StandardInput=socket
diff --git a/debian/systemd/sshd.conf b/debian/systemd/sshd.conf
new file mode 100644
index 000000000..ab7302189
--- /dev/null
+++ b/debian/systemd/sshd.conf
@@ -0,0 +1 @@
d /var/run/sshd 0755 root root
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000000000..1a3070cdd
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
1Tests: regress
2Restrictions: needs-root allow-stderr
3Depends: @builddeps@, openssh-client, openssh-server, openssh-sftp-server, sudo
diff --git a/debian/tests/regress b/debian/tests/regress
new file mode 100644
index 000000000..010d94e73
--- /dev/null
+++ b/debian/tests/regress
@@ -0,0 +1,42 @@
1#! /bin/sh
2set -e
3
4# Don't use "make tests"; we want to test the installed version.
5
6cp -a . "$ADTTMP/tree"
7cd "$ADTTMP/tree"
8
9# We aren't actually going to use most of this build, but we need a basic
10# build tree in place in order to be able to build the regression tests.
11autoreconf -f -i
12cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
13./configure
14make
15
16# The defaults for TEST_SSH_* in regress/test-exec.sh use the system
17# versions, but the top-level Makefile sets things up to test the just-built
18# versions, so we must bypass the latter in order to work correctly under
19# autopkgtest.
20make regress-prep
21make regress/modpipe \
22 regress/setuid-allowed \
23 regress/netcat \
24 regress/unittests/sshbuf/test_sshbuf \
25 regress/unittests/sshkey/test_sshkey \
26 regress/unittests/bitmap/test_bitmap \
27 regress/unittests/hostkeys/test_hostkeys \
28 regress/unittests/kex/test_kex
29
30SRCDIR="$(pwd)"
31BUILDDIR="$SRCDIR"
32make -C regress \
33 .OBJDIR="$BUILDDIR/regress" \
34 .CURDIR="$SRCDIR/regress" \
35 BUILDDIR="$BUILDDIR" \
36 OBJ="$BUILDDIR/regress" \
37 SUDO=sudo \
38 TEST_SHELL=sh \
39 TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
40 TEST_SSH_IPV6=yes \
41 TEST_SSH_ECC=yes \
42 tests interop-tests
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000000000..ac41e6e22
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,44 @@
1-----BEGIN PGP PUBLIC KEY BLOCK-----
2Version: GnuPG v1
3
4mQGdBFKmggUBDICUNqm4cNh7tdEbwaNhbnwqLiHpILeXT6sddGI0Stz5ofB1uvIH
5m9kXYG5XUUwlc5ywjIZm2JeuKqrd/6wAz5laLagFA6k86EZzzuBE3b5FxSQ4EN4K
65XZEJo61xASEF7z1mQCiqoA6/F407ht7nNoiVE95kOmqJlv4cqbpCw3n8f2VW+mV
7UH6MYRZVrYAC9NnJWv24rem2fjgFhNT1/bx44G7H9bVJqL7hMEGa+xYQBI3YT/ul
8Eu9HYmLFVeiZm1gB1eKXW7jS4ctLl5uPrxayA5DX/qNB2yqgVVlIKFwUm8gGPGPO
9nsNKo0xBseE7E0F/KeGpaT5aS9yFgPm9A652Jx9felYgb0e9Ipt3lxriPQwgF/cx
10LGuP/WEbN5fpWFnuV0ViklusuVI2e8GHJGU5bQD5AlzvWu4Sv6oBOcDCabScydY7
11IxPBk/XBWCF9QDIa2qa32Mc9dYc8EnJszPeVCHX5hG23omDRmdLGLwH7F+CuBvCx
12AKCymZtJl5DhRmnhdzRg9d+0VG4hLF7O06ANABEBAAG0H0RhbWllbiBNaWxsZXIg
13PGRqbUBtaW5kcm90Lm9yZz6JAc0EEwECACcCGwMFCQ1H67ECHgECF4AFAlKmjJwE
14CwkIBwYVCgkICwIFFgIDAQAACgkQ0+X1a22SDTB2TAx9E1ozPJKUGWJPZefqsSr8
15KsO6Dp3QuPrw2Zwgo2QfeCT+uzNA5AKCDIAaYEpVbQsvu4sDy8dAW1+HENCxVrMX
16WG+SH41lcdAdI4io0PGHVQDl42R5jX3e9pfjYCQALVv5BDXddK6054nyxEmudQ3I
17CFCYXIcqQbA1nfj3Uk06jGhuM99B2/akbxCoFSiUX9uHDZKNYAGpU7/FCF9xCZF4
18Kd9Twvyy17jDIg7km3/Q4Jy++VP8FyvE5JjBdLRQSBzSG9GCjv9fyKWW7S0bMY4D
193SKKt/Jm1XchEMgpRr4eBpgCs3rxO1hXjzqm3te97uy6/q8CuJUtupJsPKc9Wh4+
20ogUZifC0ta7UrxZp8yZTRvPSUxYrlvDzM32VDLQ3FX6Y2i4VNo48PSJMA+BPUx7D
21TcZKIXt457zsLD4jF4sRdwOk/QF/GXCkH2GAyKHWCPXIOe+jIXgiuajcqZm9cAWj
22L3hidSohKfefvKkzsg75mDmjhvAtDncIbmImJNjXIe2PQU4iY9Vq5i0vlaVKgBgK
23SohGBBARAgAGBQJSpovfAAoJEM6OywOG/5xInf8An0A7MPrfJIz2e643VEV4AX3d
24O9+IAJ9MOsQiB4LnqtTcc9NBMHf9VLE46LkBnQRSpoIFAQyA1OdwfpwXKch+O00W
251FsQSMcEjahGmo84WTroM/qjTd7Ysld300PMv3wkQn2WdhyTca/EmkW0fVTGSYs7
26Z3v5SpPf0prYSjmfu8WlXoz64ApdXqGHjj9KAeq2OuUtWrwobgiQEzU4Hxlz94X/
2765BgG5k7OTyE3J6bgRcMwJCgCkwjK85wbbBkGH+Jo9o/Zw9TPczQcE7BmGYkkLNA
28Xbw7omKBOL4Z6w9sXToz9UnQ0EB9s4TvAbHGKX9y2PEQjZN+wkzR3DavWB7ql8vH
29ZIRmspAsDAJvDT1ofsNtu8MB8wJcxvZaoZ7j9wULYpnaNYx9xxEhgbB9o1mBcYsd
30Dj3xz5jrgtq/cpdgGC6bg+awDc/ylQ1mNglKfY8P9hFIhIANZilnmAlk5GSoWclP
31/69m+u34KKoHU4Yc3I1pPNcL6Nyi0bh8mHqe9WedKfod7Y4yM1S20fXaS4vrLIlK
32gxbsDpWiWrk0ltV03uyC7eqDe3nzzGW/2GLTHj5xsA2+HwGtPom5mmzjvV5PFNpS
337a90JQARAQABiQG1BBgBAgAPBQJSpoIFAhsMBQkNR+uxAAoJENPl9Wttkg0wEScM
34f2QjDWm3XawJxNA8pqqxrFeTEo+GESznVRTUeprrUFd1GHw33qaAvqLixZ+x8cr+
351Gj/fJd5eiIVJfRLYbXlC8su8JZXngfX0VhuMcUob/FTikfpcoYkRzriUsJEB3/O
36mjlLjGgnQm5Gz9TV1ityF3bzoHkR8svWEKKKzNoIEPHLU3y7bqSkOrjnY3bZfdVR
37h618XbjV28NMuoZsV8E4pOuQoy+3s5IjmIf/mkSiFE3VJwdaPem23UsXatFb/eoC
38/Ahi0iCd/8ioFwi+oHT2Pnt9HrzVF6E8gBVO3vKo6UJgDTr9Qt27Nc6eHL0O5j50
39ins9ob/3DoOC3P5A08zhl+w466yGEv5+Es/usUAs/4ng4ksI3DTLK9Ygj70l5oBu
40MFYd3b5KGVfAIlGc5mwIOIG41YLIzZTrGuOuTymjwCdC9cUZJ6R2Cv/Vx0htZ0hq
41DdyaDO0Io9OG/W2s2T7160tY9ic4MwBCFemzwFELIBIIHNY/n/wsmxQGkI3Oj86J
42pOVVgR5lXWR+BrGcBjkSEyg=
43=T9xO
44-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000000000..426797246
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
1version=3
2opts=pgpsigurlmangle=s/$/.asc/ \
3ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-(.*)\.tar\.gz